scrypt 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8e6a6a6d27c3c9176ac068244a4521b64dd52b
-  data.tar.gz: d8eb3e2bbd53abb27b8bfc869cbbc89257336070
+  metadata.gz: 47be4799daf5f3fd84b4d621688dea4c39ccde5b
+  data.tar.gz: 5bf369b0264bf440229eee7fa05e65227357da68
 SHA512:
-  metadata.gz: 7d1a849cd7013f36c8fe2e37fa7dca5921103682c62ff7e0853536ce61d04fe78db8067ab29143f647af8c9e5299c87f75675a91708c51975ef30b63788394c5
-  data.tar.gz: 2b5c05343e7ca5e18ea3ac826709c33eb6876957928274ebfa46d7a1e278aab7bdef373b5b37a2b87ec4fccc7715f02a6d011a61a023a6a544f072550e7c9dbd
+  metadata.gz: c17413705aeef9517208e2bf83545fa488aa6b8fade35728cbcdf1e4b3f91a513d756db9ae81b4041e69c30c6c21b22484dff1c2530167f0de4e382612986bde
+  data.tar.gz: 2ccfe62cebda01b2d23a91af9e65cc9b2f64b755c6e602b7612fa43a5448959db9a2ae5b6b2d4529e6e5e5c8a7132830e850c47d85d694d41a24f8d91d73ff93

data/README.md

@@ -26,12 +26,12 @@ It works pretty similarly to ruby-bcrypt with a few minor differences, especiall
 require "scrypt"
 
 # hash a user's password
-@password = SCrypt::Password.create("my grand secret")
+password = SCrypt::Password.create("my grand secret")
 # => "400$8$36$78f4ae6983f76119$37ec6ce55a2b928dc56ff9a7d0cdafbd7dbde49d9282c38a40b1434e88f24cf5"
 
 # compare to strings
-@password == "my grand secret" # => true
-@password == "a paltry guess"  # => false
+password == "my grand secret" # => true
+password == "a paltry guess"  # => false
 ```
 
 Password.create takes five options which will determine the key length and salt size, as well as the cost limits of the computation:
@@ -63,10 +63,10 @@ SCrypt::Engine.hash_secret "my grand secret", salt
 
 ```ruby
 # store it safely in the user model
-@user.update_attribute(:password, @password)
+user.update_attribute(:password, @password)
 
 # read it back later
-@user.reload!
-@password = SCrypt::Password.new(@user.password)
-@password == "my grand secret" # => true
-```
+user.reload!
+password = SCrypt::Password.new(user.password)
+password == "my grand secret" # => true
+```

data/lib/scrypt.rb

@@ -150,7 +150,7 @@ module SCrypt
 
       FFI::MemoryPointer.new(:char, key_len) do |buffer|
         retval = SCrypt::Ext.crypto_scrypt(
-          secret, secret.length, salt, salt.length,
+          secret, secret.bytesize, salt, salt.bytesize,
           n, r, p,
           buffer, key_len
         )
@@ -188,7 +188,7 @@ module SCrypt
   #
   class Password < String
     # The hash portion of the stored password hash.
-    attr_reader :hash
+    attr_reader :digest
     # The salt of the store password hash
     attr_reader :salt
     # The cost factor used to create the hash.
@@ -227,7 +227,7 @@ module SCrypt
     def initialize(raw_hash)
       if valid_hash?(raw_hash)
         self.replace(raw_hash)
-        @cost, @salt, @hash = split_hash(self.to_s)
+        @cost, @salt, @digest = split_hash(self.to_s)
       else
         raise Errors::InvalidHash.new("invalid hash")
       end
@@ -235,7 +235,7 @@ module SCrypt
 
     # Compares a potential secret against the hash. Returns true if the secret is the original secret, false otherwise.
     def ==(secret)
-      super(SCrypt::Engine.hash_secret(secret, @cost + @salt, self.hash.length / 2))
+      super(SCrypt::Engine.hash_secret(secret, @cost + @salt, self.digest.length / 2))
     end
     alias_method :is_password?, :==
 

data/lib/scrypt/version.rb

@@ -1,3 +1,3 @@
 module SCrypt
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

data/spec/scrypt/password_spec.rb

@@ -100,17 +100,17 @@ describe "non-default key lengths" do
 
   it "should enforce a minimum keylength of 16 bytes" do
     @password = SCrypt::Password.create(@secret, :key_len => 15)
-    @password.hash.length.should eq(16 * 2)
+    @password.digest.length.should eq(16 * 2)
   end
 
   it "should allow a keylength of 512 bytes" do
     @password = SCrypt::Password.create(@secret, :key_len => 512)
-    @password.hash.length.should eq(512 * 2)
+    @password.digest.length.should eq(512 * 2)
   end
 
   it "should enforce a maximum keylength of 512 bytes" do
     @password = SCrypt::Password.create(@secret, :key_len => 513)
-    @password.hash.length.should eq(512 * 2)
+    @password.digest.length.should eq(512 * 2)
   end
 
   it "should properly compare a non-standard hash" do
@@ -130,3 +130,10 @@ describe "Old-style hashes" do
     (SCrypt::Password.new(@hash) == @secret).should be(true)
   end
 end
+
+describe "Respecting standard ruby behaviors" do
+  it 'should hash as a fixnum' do
+    password = SCrypt::Password.create('')
+    password.hash.should be_kind_of(Fixnum)
+  end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: scrypt
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Patrick Hogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -91,16 +91,9 @@ extensions:
 - ext/scrypt/Rakefile
 extra_rdoc_files: []
 files:
-- Rakefile
-- scrypt.gemspec
-- README.md
 - COPYING
-- lib/scrypt/scrypt_ext.rb
-- lib/scrypt/version.rb
-- lib/scrypt.rb
-- spec/scrypt/engine_spec.rb
-- spec/scrypt/password_spec.rb
-- spec/spec_helper.rb
+- README.md
+- Rakefile
 - autotest/discover.rb
 - ext/scrypt/Rakefile
 - ext/scrypt/crypto_scrypt-sse.c
@@ -117,6 +110,13 @@ files:
 - ext/scrypt/sha256.c
 - ext/scrypt/sha256.h
 - ext/scrypt/sysendian.h
+- lib/scrypt.rb
+- lib/scrypt/scrypt_ext.rb
+- lib/scrypt/version.rb
+- scrypt.gemspec
+- spec/scrypt/engine_spec.rb
+- spec/scrypt/password_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/pbhogan/scrypt
 licenses: []
 metadata: {}
@@ -126,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: scrypt
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: scrypt password hashing algorithm.