haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "2b" version prefix in bcrypt hashes

Browse Source 
Makes docs and code consistent - the code now generates hashes
with the "2b" prefix instead of "2a". Shouldn't make any difference
in practice since previously generated hashes should still validate.
This commit is contained in:
Luke Taylor 2017-11-27 15:19:23 +00:00
parent 2293c69f87
commit 5e354f9bfc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Crypto/KDF/BCrypt.hs
View File

@ -27,13 +27,16 @@
-- salt and hash bytes (each separately Base64 encoded. Incrementing the -- salt and hash bytes (each separately Base64 encoded. Incrementing the
-- cost parameter approximately doubles the time taken to calculate the hash. -- cost parameter approximately doubles the time taken to calculate the hash.
-- --
-- The different version numbers have evolved because of bugs in the standard -- The different version numbers evolved to account for bugs in the standard
-- C implementations. The most up to date version is @2b@ and this -- C implementations. They don't represent different versions of the algorithm
-- implementation the @2b@ version prefix, but will also attempt to validate -- itself and in most cases should produce identical results.
-- The most up to date version is @2b@ and this implementation uses the
-- @2b@ version prefix, but will also attempt to validate
-- against hashes with versions @2a@ and @2y@. Version @2@ or @2x@ will be -- against hashes with versions @2a@ and @2y@. Version @2@ or @2x@ will be
-- rejected. No attempt is made to differentiate between the different versions -- rejected. No attempt is made to differentiate between the different versions
-- when validating a password, but in practice this shouldn't cause any problems -- when validating a password, but in practice this shouldn't cause any problems
-- if passwords are UTF-8 encoded (which they should be). -- if passwords are UTF-8 encoded (which they should be) and less than 256
-- characters long.
-- --
-- The cost parameter can be between 4 and 31 inclusive, but anything less than -- The cost parameter can be between 4 and 31 inclusive, but anything less than
-- 10 is probably not strong enough. High values may be prohibitively slow -- 10 is probably not strong enough. High values may be prohibitively slow
@ -93,7 +96,7 @@ bcrypt :: (ByteArray salt, ByteArray password, ByteArray output)
bcrypt cost salt password = B.concat [header, B.snoc costBytes dollar, b64 salt, b64 hash] bcrypt cost salt password = B.concat [header, B.snoc costBytes dollar, b64 salt, b64 hash]
where where
hash = rawHash 'b' realCost salt password hash = rawHash 'b' realCost salt password
header = B.pack [dollar, fromIntegral (ord '2'), fromIntegral (ord 'a'), dollar] header = B.pack [dollar, fromIntegral (ord '2'), fromIntegral (ord 'b'), dollar]
dollar = fromIntegral (ord '$') dollar = fromIntegral (ord '$')
zero = fromIntegral (ord '0') zero = fromIntegral (ord '0')
costBytes = B.pack [zero + fromIntegral (realCost `div` 10), zero + fromIntegral (realCost `mod` 10)] costBytes = B.pack [zero + fromIntegral (realCost `div` 10), zero + fromIntegral (realCost `mod` 10)]