bcrypt-ruby 2.1.4-java → 3.0.0-java

data/lib/bcrypt_engine.rb

@@ -0,0 +1,34 @@
+require 'ffi'
+
+module BCrypt
+  class Engine
+    extend FFI::Library
+
+    BCRYPT_MAXSALT = 16
+    BCRYPT_SALT_OUTPUT_SIZE = 7 + (BCRYPT_MAXSALT * 4 + 2) / 3 + 1
+    BCRYPT_OUTPUT_SIZE = 128
+
+    ffi_lib File.expand_path("../bcrypt_ext", __FILE__)
+
+    attach_function :ruby_bcrypt, [:buffer_out, :string, :string], :string
+    attach_function :ruby_bcrypt_gensalt, [:buffer_out, :uint8, :pointer], :string
+
+    def self.__bc_salt(cost, seed)
+      buffer_out = FFI::Buffer.alloc_out(BCRYPT_SALT_OUTPUT_SIZE, 1)
+      seed_ptr = FFI::MemoryPointer.new(:uint8, BCRYPT_MAXSALT)
+      seed.bytes.to_a.each_with_index { |b, i| seed_ptr.int8_put(i, b) }
+      out = ruby_bcrypt_gensalt(buffer_out, cost, seed_ptr)
+      seed_ptr.free
+      buffer_out.free
+      out || ""
+    end
+
+    def self.__bc_crypt(key, salt, cost)
+      buffer_out = FFI::Buffer.alloc_out(BCRYPT_OUTPUT_SIZE, 1)
+      out = ruby_bcrypt(buffer_out, key || "", salt)
+      buffer_out.free
+      out && out.any? ? out : nil
+    end
+  end
+end
+

data/spec/bcrypt/engine_spec.rb

@@ -30,9 +30,9 @@ end
 describe "Autodetecting of salt cost" do
 
   specify "should work" do
-    BCrypt::Engine.autodetect_cost("$2a$08$hRx2IVeHNsTSYYtUWn61Ou").should == 8
-    BCrypt::Engine.autodetect_cost("$2a$05$XKd1bMnLgUnc87qvbAaCUu").should == 5
-    BCrypt::Engine.autodetect_cost("$2a$13$Lni.CZ6z5A7344POTFBBV.").should == 13
+    BCrypt::Engine.autodetect_cost("$2a$08$hRx2IVeHNsTSYYtUWn61Ou").should eq 8
+    BCrypt::Engine.autodetect_cost("$2a$05$XKd1bMnLgUnc87qvbAaCUu").should eq 5
+    BCrypt::Engine.autodetect_cost("$2a$13$Lni.CZ6z5A7344POTFBBV.").should eq 13
   end
 
 end

data/spec/bcrypt/password_spec.rb

@@ -39,9 +39,9 @@ describe "Reading a hashed password" do
     password.version.should eql("2a")
     password.cost.should equal(5)
     password.salt.should eql("$2a$05$CCCCCCCCCCCCCCCCCCCCC.")
-    password.salt.class.should == String
+    password.salt.class.should eq String
     password.checksum.should eq("E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW")
-    password.checksum.class.should == String
+    password.checksum.class.should eq String
     password.to_s.should eql(@hash)
   end
 
@@ -65,3 +65,12 @@ describe "Comparing a hashed password with a secret" do
     (@password == "@secret").should be(false)
   end
 end
+
+describe "Validating a generated salt" do
+  specify "should not accept an invalid salt" do
+    BCrypt::Engine.valid_salt?("invalid").should eq(false)
+  end
+  specify "should accept a valid salt" do
+    BCrypt::Engine.valid_salt?(BCrypt::Engine.generate_salt).should eq(true)
+  end
+end

metadata

@@ -1,111 +1,123 @@
 --- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
-    - 2
-    - 1
-    - 4
-  version: 2.1.4
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: java
 authors: 
-  - Coda Hale
+- Coda Hale
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -08:00
-default_executable: 
+date: 2011-08-24 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake-compiler
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: "    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project\n    for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling\n    passwords.\n"
 email: coda.hale@gmail.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/mri/extconf.rb
 extra_rdoc_files: 
-  - README
-  - COPYING
-  - CHANGELOG
-  - lib/bcrypt.rb
+- README.md
+- COPYING
+- CHANGELOG
+- lib/bcrypt.rb
+- lib/bcrypt_engine.rb
 files: 
-  - .gitignore
-  - .rspec
-  - CHANGELOG
-  - COPYING
-  - Gemfile
-  - README
-  - Rakefile
-  - bcrypt-ruby.gemspec
-  - ext/jruby/bcrypt_jruby/BCrypt.java
-  - ext/mri/bcrypt.c
-  - ext/mri/bcrypt.h
-  - ext/mri/bcrypt_ext.c
-  - ext/mri/blf.h
-  - ext/mri/blowfish.c
-  - ext/mri/extconf.rb
-  - lib/bcrypt.rb
-  - spec/TestBCrypt.java
-  - spec/bcrypt/engine_spec.rb
-  - spec/bcrypt/password_spec.rb
-  - spec/spec_helper.rb
-  - lib/bcrypt_ext.jar
-has_rdoc: true
+- .gitignore
+- .rspec
+- CHANGELOG
+- COPYING
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
+- bcrypt-ruby.gemspec
+- ext/jruby/bcrypt_jruby/BCrypt.java
+- ext/mri/bcrypt_ext.c
+- ext/mri/crypt.c
+- ext/mri/crypt.h
+- ext/mri/crypt_blowfish.c
+- ext/mri/crypt_gensalt.c
+- ext/mri/extconf.rb
+- ext/mri/ow-crypt.h
+- ext/mri/wrapper.c
+- lib/bcrypt.rb
+- lib/bcrypt_engine.rb
+- spec/TestBCrypt.java
+- spec/bcrypt/engine_spec.rb
+- spec/bcrypt/password_spec.rb
+- spec/spec_helper.rb
+- lib/bcrypt_ext.jar
 homepage: http://bcrypt-ruby.rubyforge.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --title
-  - bcrypt-ruby
-  - --line-numbers
-  - --inline-source
-  - --main
-  - README
+- --title
+- bcrypt-ruby
+- --line-numbers
+- --inline-source
+- --main
+- README.md
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: bcrypt-ruby
-rubygems_version: 1.3.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: OpenBSD's bcrypt() password hashing algorithm.

data/README

@@ -1,175 +0,0 @@
-= bcrypt-ruby
-
-An easy way to keep your users' passwords secure.
-
-* http://bcrypt-ruby.rubyforge.org/
-* http://github.com/codahale/bcrypt-ruby/tree/master
-
-== Why you should use bcrypt
-
-If you store user passwords in the clear, then an attacker who steals a copy of your database has a giant list of emails
-and passwords. Some of your users will only have one password -- for their email account, for their banking account, for
-your application. A simple hack could escalate into massive identity theft.
-
-It's your responsibility as a web developer to make your web application secure -- blaming your users for not being
-security experts is not a professional response to risk.
-
-bcrypt allows you to easily harden your application against these kinds of attacks.
-
-== How to install bcrypt
-
-  sudo gem install bcrypt-ruby
-  
-You'll need a working compiler. (Win32 folks should use Cygwin or um, something else.)
-
-== How to use bcrypt in your Rails application
-
-=== The +User+ model
-
-  require 'bcrypt'
-  
-  class User < ActiveRecord::Base
-    # users.password_hash in the database is a :string
-    include BCrypt
-    
-    def password
-      @password ||= Password.new(password_hash)
-    end
-    
-    def password=(new_password)
-      @password = Password.create(new_password)
-      self.password_hash = @password
-    end
-    
-  end
-
-=== Creating an account
-
-  def create
-    @user = User.new(params[:user])
-    @user.password = params[:password]
-    @user.save!
-  end
-
-=== Authenticating a user
-
-  def login
-    @user = User.find_by_email(params[:email])
-    if @user.password == params[:password]
-      give_token
-    else
-      redirect_to home_url
-    end
-  end
-
-=== If a user forgets their password?
-
-  # assign them a random one and mail it to them, asking them to change it
-  def forgot_password
-    @user = User.find_by_email(params[:email])
-    random_password = Array.new(10).map { (65 + rand(58)).chr }.join
-    @user.password = random_password
-    @user.save!
-    Mailer.create_and_deliver_password_change(@user, random_password)
-  end
-
-== How to use bcrypt-ruby in general
-
-  require 'bcrypt'
-  
-  my_password = BCrypt::Password.create("my password") #=> "$2a$10$vI8aWBnW3fID.ZQ4/zo1G.q1lRps.9cGLcZEiGDMVr5yUP1KUOYTa"
-  
-  my_password.version              #=> "2a"
-  my_password.cost                 #=> 10
-  my_password == "my password"     #=> true
-  my_password == "not my password" #=> false
-  
-  my_password = BCrypt::Password.new("$2a$10$vI8aWBnW3fID.ZQ4/zo1G.q1lRps.9cGLcZEiGDMVr5yUP1KUOYTa")
-  my_password == "my password"     #=> true
-  my_password == "not my password" #=> false
-
-Check the rdocs for more details -- BCrypt, BCrypt::Password.
-
-== How bcrypt() works
-
-bcrypt() is a hashing algorithm designed by Niels Provos and David Mazières of the OpenBSD Project.
-
-=== Background
-
-Hash algorithms take a chunk of data (e.g., your user's password) and create a "digital fingerprint," or hash, of it.
-Because this process is not reversible, there's no way to go from the hash back to the password.
-
-In other words:
-
-  hash(p) #=> <unique gibberish>
-
-You can store the hash and check it against a hash made of a potentially valid password:
-
-  <unique gibberish> =? hash(just_entered_password)
-
-=== Rainbow Tables
-
-But even this has weaknesses -- attackers can just run lists of possible passwords through the same algorithm, store the
-results in a big database, and then look up the passwords by their hash:
-
-  PrecomputedPassword.find_by_hash(<unique gibberish>).password #=> "secret1"
-
-=== Salts
-
-The solution to this is to add a small chunk of random data -- called a salt -- to the password before it's hashed:
-
-  hash(salt + p) #=> <really unique gibberish>
-
-The salt is then stored along with the hash in the database, and used to check potentially valid passwords:
-
-  <really unique gibberish> =? hash(salt + just_entered_password)
-  
-bcrypt-ruby automatically handles the storage and generation of these salts for you.
-
-Adding a salt means that an attacker has to have a gigantic database for each unique salt -- for a salt made of 4
-letters, that's 456,976 different databases. Pretty much no one has that much storage space, so attackers try a
-different, slower method -- throw a list of potential passwords at each individual password:
-
-  hash(salt + "aadvark") =? <really unique gibberish>
-  hash(salt + "abacus")  =? <really unique gibberish>
-  etc.
-  
-This is much slower than the big database approach, but most hash algorithms are pretty quick -- and therein lies the
-problem. Hash algorithms aren't usually designed to be slow, they're designed to turn gigabytes of data into secure
-fingerprints as quickly as possible. bcrypt(), though, is designed to be computationally expensive:
-
-  Ten thousand iterations:
-               user     system      total        real
-  md5      0.070000   0.000000   0.070000 (  0.070415)
-  bcrypt  22.230000   0.080000  22.310000 ( 22.493822)
-
-If an attacker was using Ruby to check each password, they could check ~140,000 passwords a second with MD5 but only
-~450 passwords a second with bcrypt().
-
-=== Cost Factors
-
-In addition, bcrypt() allows you to increase the amount of work required to hash a password as computers get faster. Old
-passwords will still work fine, but new passwords can keep up with the times.
-
-The default cost factor used by bcrypt-ruby is 10, which is fine for session-based authentication. If you are using a
-stateless authentication architecture (e.g., HTTP Basic Auth), you will want to lower the cost factor to reduce your
-server load and keep your request times down. This will lower the security provided you, but there are few alternatives.
-
-== More Information
-
-bcrypt() is currently used as the default password storage hash in OpenBSD, widely regarded as the most secure operating
-system available. 
-
-
-For a more technical explanation of the algorithm and its design criteria, please read Niels Provos and David Mazières'
-Usenix99 paper:
-http://www.usenix.org/events/usenix99/provos.html
-
-If you'd like more down-to-earth advice regarding cryptography, I suggest reading <i>Practical Cryptography</i> by Niels
-Ferguson and Bruce Schneier:
-http://www.schneier.com/book-practical.html
-
-= Etc
-
-Author  :: Coda Hale <coda.hale@gmail.com>
-Website :: http://blog.codahale.com