rbpass 0.0.3 → 0.0.4

data/lib/rbpass/password_hasher.rb

@@ -29,7 +29,7 @@ module RbPass
         output = output[0..count]
       end
 
-      return output
+      output
     end
 
     def encode64(input, count)
@@ -68,7 +68,7 @@ module RbPass
         output << @itoa64[(value >> 18) & 0x3f]
       end
 
-      return output
+      output
     end
 
     def gensalt_private(input)
@@ -77,7 +77,7 @@ module RbPass
       output << @itoa64[[@iteration_count_log2 + 5, 30].min]
       output << encode64(input, 6)
       
-      return output
+      output
     end
 
     def crypt_private(password, setting)
@@ -90,13 +90,11 @@ module RbPass
       return output if setting[0,3] != '$P$' and setting[0,3] != '$H$'
 
       count_log2 = @itoa64.index(setting[3])
-
       return output if !count_log2.between?(7, 30)
 
       count = 1 << count_log2
 
       salt = setting[4,8]
-
       return output if salt.length != 8
 
       hash = Digest::MD5.digest(salt + password)
@@ -110,24 +108,7 @@ module RbPass
 
       output << encode64(hash, 16)
 
-      return output
-    end
-
-    # Actually this function is never called within a regular program execution.
-    # Blowfish is the default algorithm, implement ext-des?
-    def gensalt_extended(input)
-      count_log2 = [@iteration_count_log2 + 8, 24].min
-      count = (1 << count_log2) -1
-
-      output = '_'
-
-      output << @itoa64[count & 0x3f]
-      output << @itoa64[(count >> 6) & 0x3f]
-      output << @itoa64[(count >> 12) & 0x3f]
-      output << @itoa64[(count >> 18) & 0x3f]
-      output << encode64(input, 3)
-
-      return output
+      output
     end
 
     def gensalt_blowfish(input)
@@ -164,7 +145,7 @@ module RbPass
           output << itoa64[c2 & 0x3f]
       end
 
-      return output
+      output
     end
 
     def hash(password)
@@ -184,7 +165,7 @@ module RbPass
 
       return hash if hash.length == 34
       
-      return '*'
+      '*'
     end
 
     def check(password, stored_hash)
@@ -194,7 +175,7 @@ module RbPass
         hash = password.crypt(stored_hash)
       end
 
-      return hash == stored_hash
+      hash == stored_hash
     end
   end
 end

data/lib/rbpass.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../rbpass/password_hasher', __FILE__)
 
 module RbPass
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/rbpass.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.authors       = ['Pablo Elices']
   spec.email         = ['contact@pabloelic.es']
-  spec.summary       = 'Ruby port of PHPass, a portable password hashing framework written in php.'
+  spec.summary       = 'Ruby port of PHPass, a portable password hashing framework written in PHP.'
   spec.description   = <<-EOF
-    Ruby port of phpass, a portable password hashing framework written in php.
+    Ruby port of phpass, a portable password hashing framework written in PHP.
     PHPass is used by WordPress, bbPress, Vanilla Forums, PivotX and phpBB.
   EOF
   spec.homepage      = 'https://github.com/pabloelices/rbpass'

data/spec/rbpass/password_hasher_spec.rb

@@ -31,7 +31,7 @@ describe RbPass::PasswordHasher do
     end
   end
 
-  context 'when using portable hashes and a random hardcoded password hash' do
+  context 'when using portable hashes and a random hardcoded hash' do
     let(:password_hasher)     { RbPass::PasswordHasher.new(8, true) }
     let(:valid_password)      { 'test12345' }
     let(:invalid_password)    { 'test12346' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbpass
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2013-01-18 00:00:00.000000000 Z
 dependencies: []
 description: ! "    Ruby port of phpass, a portable password hashing framework written
-  in php.\n    PHPass is used by WordPress, bbPress, Vanilla Forums, PivotX and phpBB.\n"
+  in PHP.\n    PHPass is used by WordPress, bbPress, Vanilla Forums, PivotX and phpBB.\n"
 email:
 - contact@pabloelic.es
 executables:
@@ -56,7 +56,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ruby port of PHPass, a portable password hashing framework written in php.
+summary: Ruby port of PHPass, a portable password hashing framework written in PHP.
 test_files:
 - spec/rbpass/password_hasher_spec.rb
 - spec/rbpass/rbpass_spec.rb