ruby-mcrypt 0.1.1 → 0.2.0

data/README.rdoc

@@ -15,6 +15,10 @@ supports lots of different ciphers and encryption modes.
 Install the gem:
   gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
 
+If you're installing on Ubuntu: 
+  sudo apt-get install mcrypt libmcrypt-dev
+  gem install ruby-mcrypt
+
 If you want to run the longer test suite, do this instead:
   MCRYPT_TEST_BRUTE=1 \
   gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
@@ -62,7 +66,7 @@ If you find any bugs, please let the author know.
 
 == Copyright and License
 
-Copyright (c) 2009-2010 Philip Garrett.
+Copyright (c) 2009-2013 Philip Garrett.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the

data/Rakefile

@@ -4,7 +4,9 @@ require 'rake'
 require 'rake/testtask'
 
 # http://stackoverflow.com/questions/213368/how-can-i-reliably-discover-the-full-path-of-the-ruby-executable
-RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+RUBY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+
+ENV["MAINTAINER_MODE"] = "1" if File.exists?(File.dirname(__FILE__) + "/MAINTAINER")
 
 task :default => :test
 
@@ -25,13 +27,14 @@ rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
-EXTENSION = "ext/mcrypt.#{Config::CONFIG["DLEXT"]}"
+EXTENSION = "ext/mcrypt.#{RbConfig::CONFIG["DLEXT"]}"
 
 desc "Compile extension"
 task :compile => EXTENSION
 file EXTENSION => FileList["ext/Makefile","ext/*.c"] do
   Dir.chdir("ext") do
-    system("make") || raise("could not build ruby-mcrypt")
+    opts = ENV["MAINTAINER_MODE"] ? ["V=1"] : []
+    system("make", *opts) || raise("could not build ruby-mcrypt")
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/cross.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+[[ -s ~/.rvm/scripts/rvm ]] && source ~/.rvm/scripts/rvm
+
+cd "$(dirname "$0")"
+
+touch MAINTAINER
+
+for ruby in 1.8.7 1.9.3
+do
+  rvm use $ruby
+  rake clean
+  rake || {
+    echo "BUILD FAILED!" >&2
+    exit 1
+  }
+done

data/ext/extconf.rb

@@ -43,4 +43,9 @@ Specifically, if you're using MacPorts, this should work for you:
   EOF
   exit 1
 end
+
+if ENV["MAINTAINER_MODE"]
+  $CFLAGS += " -Werror"
+end
+
 create_makefile(extension_name)

data/ext/mcrypt_wrapper.c

@@ -1,7 +1,7 @@
 /*
  * mcrypt_wrapper.c
  *
- * Copyright (c) 2009 Philip Garrett.
+ * Copyright (c) 2009-2013 Philip Garrett.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -24,6 +24,7 @@
  */
 
 #include "ruby.h"
+#include <limits.h>
 #include <string.h>
 #include <mcrypt.h>
 
@@ -50,6 +51,8 @@ static char *dup_rbstring(VALUE o, int include_null);
 
 static VALUE enumerate_key_sizes(int *sizes, int num_of_sizes, int max_size);
 
+static int safe_len(long orig);
+
 /* globals */
 static VALUE cMcrypt;
 static VALUE cInvalidAlgorithmOrModeError;
@@ -106,11 +109,11 @@ static VALUE mc_initialize(int argc, VALUE *argv, VALUE self)
 
     *box = mcrypt_module_open(s_algo, NULL, s_mode, NULL);
     if (*box == MCRYPT_FAILED) {
+        char message[256];
         /* MCRYPT_FAILED is currently 0, but we should explicitly set
            to zero in case they change that. We don't want to attempt to
            free it later. */
         *box = 0;
-        char message[256];
         snprintf(message, sizeof(message),
                  "Could not initialize using algorithm '%s' with mode "
                  "'%s'.  Check mcrypt(3) for supported combinations.",
@@ -145,7 +148,7 @@ static VALUE mc_generic_init(VALUE self)
 
     rv = mcrypt_generic_init(*box,
                              (void *)RSTRING_PTR(key),
-                             RSTRING_LEN(key),
+                             safe_len(RSTRING_LEN(key)),
                              RSTR_N(iv));
     if (rv < 0) {
         const char *err = mcrypt_strerror(rv);
@@ -177,7 +180,8 @@ static VALUE mc_encrypt_generic(VALUE self, VALUE plaintext)
     /* rb_str_dup doesn't actually copy the buffer, hence rb_str_new */
     ciphertext = rb_str_new(RSTRING_PTR(plaintext), RSTRING_LEN(plaintext));
 
-    rv = mcrypt_generic(*box, (void *)RSTRING_PTR(ciphertext), RSTRING_LEN(ciphertext));
+    rv = mcrypt_generic(*box, (void *)RSTRING_PTR(ciphertext),
+                        safe_len(RSTRING_LEN(ciphertext)));
     if (rv != 0)
         rb_raise(cMcryptRuntimeError, "internal error: mcrypt_generic returned %d", rv);
     return ciphertext;
@@ -196,7 +200,8 @@ static VALUE mc_decrypt_generic(VALUE self, VALUE ciphertext)
     /* rb_str_dup doesn't actually copy the buffer, hence rb_str_new */
     plaintext = rb_str_new(RSTRING_PTR(ciphertext), RSTRING_LEN(ciphertext));
 
-    rv = mdecrypt_generic(*box, (void *)RSTRING_PTR(plaintext), RSTRING_LEN(plaintext));
+    rv = mdecrypt_generic(*box, (void *)RSTRING_PTR(plaintext),
+                          safe_len(RSTRING_LEN(plaintext)));
     if (rv != 0)
         rb_raise(cMcryptRuntimeError, "internal error: mdecrypt_generic returned %d", rv);
     return plaintext;
@@ -586,3 +591,14 @@ static VALUE enumerate_key_sizes(int *sizes, int num_of_sizes, int max_size)
         return Qnil;    /* quell warning */
     }
 }
+
+static int safe_len(long orig)
+{
+    int result = (int)orig;
+    if (result != orig) {
+        rb_raise(cMcryptRuntimeError, "The string is too large. "
+                 "This version of mcrypt can only handle %d bytes (32-bit signed int)",
+                 INT_MAX);
+    }
+    return result;
+}

data/lib/mcrypt.rb

@@ -1,7 +1,7 @@
 #
 # mcrypt.rb
 #
-# Copyright (c) 2009 Philip Garrett.
+# Copyright (c) 2009-2013 Philip Garrett.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the

data/ruby-mcrypt.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-mcrypt}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip Garrett"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2013-02-24}
   s.description = %q{= Mcrypt - libmcrypt bindings for Ruby
 
 Mcrypt provides Ruby-language bindings for libmcrypt(3), a
@@ -27,6 +27,10 @@ supports lots of different ciphers and encryption modes.
 Install the gem:
   gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
 
+If you're installing on Ubuntu: 
+  sudo apt-get install mcrypt libmcrypt-dev
+  gem install ruby-mcrypt
+
 If you want to run the longer test suite, do this instead:
   MCRYPT_TEST_BRUTE=1 \
   gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
@@ -74,7 +78,7 @@ If you find any bugs, please let the author know.
 
 == Copyright and License
 
-Copyright (c) 2009-2010 Philip Garrett.
+Copyright (c) 2009-2013 Philip Garrett.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
@@ -101,44 +105,37 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Manifest",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "ext/.gitignore",
-     "ext/extconf.rb",
-     "ext/mcrypt_wrapper.c",
-     "lib/.gitignore",
-     "lib/mcrypt.rb",
-     "ruby-mcrypt.gemspec",
-     "test/generate/.gitignore",
-     "test/generate/Makefile",
-     "test/generate/generate_testcases.c",
-     "test/helper.rb",
-     "test/test_basics.rb",
-     "test/test_brute.rb",
-     "test/test_reciprocity.rb"
+    "Manifest",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "cross.sh",
+    "ext/.gitignore",
+    "ext/extconf.rb",
+    "ext/mcrypt_wrapper.c",
+    "lib/.gitignore",
+    "lib/mcrypt.rb",
+    "ruby-mcrypt.gemspec",
+    "test/generate/.gitignore",
+    "test/generate/Makefile",
+    "test/generate/generate_testcases.c",
+    "test/helper.rb",
+    "test/test_basics.rb",
+    "test/test_brute.rb",
+    "test/test_reciprocity.rb"
   ]
   s.homepage = %q{http://github.com/kingpong/ruby-mcrypt}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.requirements = ["libmcrypt (2.5.x or 2.6.x, tested with 2.5.8)"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby bindings for libmcrypt}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_basics.rb",
-     "test/test_brute.rb",
-     "test/test_reciprocity.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/generate/generate_testcases.c

@@ -4,7 +4,7 @@
  * Generates a list of known-good inputs/outputs to be compared against the
  * output of ruby-mcrypt.
  *
- * Copyright (c) 2009 Philip Garrett.
+ * Copyright (c) 2009-2013 Philip Garrett.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mcrypt
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Philip Garrett
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2013-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +36,10 @@ description: |
   Install the gem:
     gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
   
+  If you're installing on Ubuntu: 
+    sudo apt-get install mcrypt libmcrypt-dev
+    gem install ruby-mcrypt
+  
   If you want to run the longer test suite, do this instead:
     MCRYPT_TEST_BRUTE=1 \
     gem install ruby-mcrypt --test -- --with-mcrypt-dir=/path/to/mcrypt/prefix
@@ -84,7 +87,7 @@ description: |
   
   == Copyright and License
   
-  Copyright (c) 2009-2010 Philip Garrett.
+  Copyright (c) 2009-2013 Philip Garrett.
   
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the
@@ -113,11 +116,11 @@ extensions:
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - Manifest
 - README.rdoc
 - Rakefile
 - VERSION
+- cross.sh
 - ext/.gitignore
 - ext/extconf.rb
 - ext/mcrypt_wrapper.c
@@ -136,39 +139,32 @@ homepage: http://github.com/kingpong/ruby-mcrypt
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
       segments: 
       - 1
       - 8
       - 6
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - libmcrypt (2.5.x or 2.6.x, tested with 2.5.8)
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libmcrypt
-test_files: 
-- test/helper.rb
-- test/test_basics.rb
-- test/test_brute.rb
-- test/test_reciprocity.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-.config
-InstalledFiles
-*.gem
-doc
-*.swp