bcrypt-ruby 3.0.0 → 3.0.1

data/CHANGELOG

@@ -42,3 +42,6 @@
 3.0.0 Aug 24, 2011
   - Bcrypt C implementation replaced with a public domain implementation.
   - License changed to MIT
+
+3.0.1
+  - create raises an exception if the cost is higher than 31. GH #27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.0)
 
 GEM
   remote: http://rubygems.org/

data/bcrypt-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt-ruby'
-  s.version = '3.0.0'
+  s.version = '3.0.1'
 
   s.summary = "OpenBSD's bcrypt() password hashing algorithm."
   s.description = <<-EOF

data/ext/mri/bcrypt_ext.c

@@ -44,7 +44,7 @@ static VALUE bc_salt(VALUE self, VALUE prefix, VALUE count, VALUE input) {
     if(!salt) return Qnil;
 
     str_salt = rb_str_new2(salt);
-    free(salt);
+    xfree(salt);
 
     return str_salt;
 }
@@ -72,7 +72,7 @@ static VALUE bc_crypt(VALUE self, VALUE key, VALUE setting) {
 
     out = rb_str_new(data, size - 1);
 
-    free(data);
+    xfree(data);
 
     return out;
 }

data/ext/mri/wrapper.c

@@ -23,6 +23,9 @@
 #endif
 #endif
 
+#include <ruby.h>
+#include <util.h>
+
 #define CRYPT_OUTPUT_SIZE		(7 + 22 + 31 + 1)
 #define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
 
@@ -234,7 +237,7 @@ char *__crypt_gensalt_ra(__CONST char *prefix, unsigned long count,
 		input, size, output, sizeof(output));
 
 	if (retval) {
-		retval = strdup(retval);
+		retval = ruby_strdup(retval);
 #ifndef __GLIBC__
 		/* strdup(3) on glibc sets errno, so we don't need to bother */
 		if (!retval)

data/lib/bcrypt.rb

@@ -157,6 +157,7 @@ module BCrypt
       #
       #   @password = BCrypt::Password.create("my secret", :cost => 13)
       def create(secret, options = { :cost => BCrypt::Engine::DEFAULT_COST })
+        raise ArgumentError if options[:cost] > 31
         Password.new(BCrypt::Engine.hash_secret(secret, BCrypt::Engine.generate_salt(options[:cost]), options[:cost]))
       end
     end

data/spec/bcrypt/password_spec.rb

@@ -34,6 +34,12 @@ describe "Reading a hashed password" do
     @hash = "$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW"
   end
 
+  specify "the cost is too damn high" do
+    lambda {
+      BCrypt::Password.create("hello", :cost => 32)
+    }.should raise_error(ArgumentError)
+  end
+
   specify "should read the version, cost, salt, and hash" do
     password = BCrypt::Password.new(@hash)
     password.version.should eql("2a")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Coda Hale
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler