bcrypt-ruby 2.0.3 → 2.0.4

data/CHANGELOG

@@ -19,3 +19,7 @@
  - Made exception classes descend from StandardError, not Exception [Dan42]
  - Changed BCrypt::Engine.hash to BCrypt::Engine.hash_secret to avoid Merb
    sorting issues. [Lee Pope]
+
+2.0.4  Mar 09 2009
+  - Added Ruby 1.9 compatibility. [Genki Takiuchi]
+  - Fixed segfaults on some different types of empty strings. [Mike Pomraning]

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/rdoctask'
 require "benchmark"
 
 PKG_NAME = "bcrypt-ruby"
-PKG_VERSION   = "2.0.3"
+PKG_VERSION   = "2.0.4"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/ext/bcrypt_ext.c

@@ -10,13 +10,14 @@ VALUE cBCryptEngine;
 /* Given a logarithmic cost parameter, generates a salt for use with +bc_crypt+.
  */
 static VALUE bc_salt(VALUE self, VALUE cost, VALUE seed) {
-	return rb_str_new2((char *)bcrypt_gensalt(NUM2INT(cost), (u_int8_t *)RSTRING(seed)->ptr));
+	return rb_str_new2((char *)bcrypt_gensalt(NUM2INT(cost), (u_int8_t *)RSTRING_PTR(seed)));
 }
 
 /* Given a secret and a salt, generates a salted hash (which you can then store safely).
  */
 static VALUE bc_crypt(VALUE self, VALUE key, VALUE salt) {
-	return rb_str_new2((char *)bcrypt(RSTRING(key)->ptr, (char *)RSTRING(salt)->ptr));
+	const char * safeguarded = RSTRING_PTR(key) ? RSTRING_PTR(key) : "";
+	return rb_str_new2((char *)bcrypt(safeguarded, (char *)RSTRING_PTR(salt)));
 }
 
 /* Create the BCrypt and BCrypt::Internals modules, and populate them with methods. */

data/spec/bcrypt/password_spec.rb

@@ -15,11 +15,17 @@ context "Creating a hashed password" do
     lambda { BCrypt::Password.new(@password) }.should_not raise_error
   end
   
-  specify "should behave normally if the secret not a string" do
+  specify "should behave normally if the secret is not a string" do
     lambda { BCrypt::Password.create(nil) }.should_not raise_error(BCrypt::Errors::InvalidSecret)
     lambda { BCrypt::Password.create({:woo => "yeah"}) }.should_not raise_error(BCrypt::Errors::InvalidSecret)
     lambda { BCrypt::Password.create(false) }.should_not raise_error(BCrypt::Errors::InvalidSecret)
   end
+  
+  specify "should tolerate empty string secrets" do
+    lambda { BCrypt::Password.create( "\n".chop  ) }.should_not raise_error
+    lambda { BCrypt::Password.create( ""         ) }.should_not raise_error
+    lambda { BCrypt::Password.create( String.new ) }.should_not raise_error
+  end
 end
 
 context "Reading a hashed password" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Coda Hale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-07 00:00:00 -07:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,17 +25,17 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/bcrypt.rb
 files: 
-- Rakefile
+- CHANGELOG
 - COPYING
+- Rakefile
 - README
-- CHANGELOG
 - lib/bcrypt.rb
-- spec/spec_helper.rb
-- spec/bcrypt/password_spec.rb
 - spec/bcrypt/engine_spec.rb
-- ext/blowfish.c
+- spec/bcrypt/password_spec.rb
+- spec/spec_helper.rb
 - ext/bcrypt.c
 - ext/bcrypt_ext.c
+- ext/blowfish.c
 - ext/blf.h
 - ext/extconf.rb
 has_rdoc: true
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bcrypt-ruby
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: OpenBSD's bcrypt() password hashing algorithm.