Merge remote-tracking branch 'upstream/pull/2524'

[rails.git] / lib / password_hash.rb

diff --git a/lib/password_hash.rb b/lib/password_hash.rb
index fe618ba7af10c79d3e236c049828d1032404f677..9f77fdc0ddd9fd6825ce68dc504cd1e96f9c3500 100644 (file)
--- a/lib/password_hash.rb
+++ b/lib/password_hash.rb
@@ -6,8 +6,8 @@ require "digest/md5"
 module PasswordHash
   SALT_BYTE_SIZE = 32
   HASH_BYTE_SIZE = 32
 module PasswordHash
   SALT_BYTE_SIZE = 32
   HASH_BYTE_SIZE = 32

-  PBKDF2_ITERATIONS = 1000
-  DIGEST_ALGORITHM = "sha512"
+  PBKDF2_ITERATIONS = 10000
+  DIGEST_ALGORITHM = "sha512".freeze

 
   def self.create(password)
     salt = SecureRandom.base64(SALT_BYTE_SIZE)
 
   def self.create(password)
     salt = SecureRandom.base64(SALT_BYTE_SIZE)


@@ -18,7 +18,7 @@ module PasswordHash
   def self.check(hash, salt, candidate)
     if salt.nil?
       candidate = Digest::MD5.hexdigest(candidate)
   def self.check(hash, salt, candidate)
     if salt.nil?
       candidate = Digest::MD5.hexdigest(candidate)

-    elsif salt =~ /!/
+    elsif salt.match?(/!/)

       algorithm, iterations, salt = salt.split("!")
       size = Base64.strict_decode64(hash).length
       candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm)
       algorithm, iterations, salt = salt.split("!")
       size = Base64.strict_decode64(hash).length
       candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm)


@@ -32,7 +32,7 @@ module PasswordHash
   def self.upgrade?(hash, salt)
     if salt.nil?
       return true
   def self.upgrade?(hash, salt)
     if salt.nil?
       return true

-    elsif salt =~ /!/
+    elsif salt.match?(/!/)

       algorithm, iterations, salt = salt.split("!")
       return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE
       return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE
       algorithm, iterations, salt = salt.split("!")
       return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE
       return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE


@@ -45,8 +45,6 @@ module PasswordHash
     false
   end
 
     false
   end
 

-  private
-

   def self.hash(password, salt, iterations, size, algorithm)
     digest = OpenSSL::Digest.new(algorithm)
     pbkdf2 = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, size, digest)
   def self.hash(password, salt, iterations, size, algorithm)
     digest = OpenSSL::Digest.new(algorithm)
     pbkdf2 = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, size, digest)