yesod-auth 1.3.0.0 → 1.3.0.1

raw patch · 2 files changed

+9/−5 lines, 2 filesdep +base16-bytestringdep +cryptohashdep −SHAdep −pureMD5

Dependencies added: base16-bytestring, cryptohash

Dependencies removed: SHA, pureMD5

Files

• Yesod/Auth/Email.hs +6/−2
• yesod-auth.cabal +3/−3

@@ -34,10 +34,13 @@ import Network.Mail.Mime (randomString) import Yesod.Auth import System.Random-import Data.Digest.Pure.MD5 import qualified Data.Text as TS+import qualified Data.Text as T import qualified Data.Text.Lazy as TL+import qualified Data.Text.Encoding as TE import qualified Data.Text.Lazy.Encoding as TLE+import qualified Crypto.Hash.MD5 as H+import Data.ByteString.Base16 as B16 import Data.Text.Encoding (encodeUtf8, decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) import Data.Text (Text)@@ -526,7 +529,8 @@          . encodeUtf8  saltPass' :: String -> String -> String-saltPass' salt pass = salt ++ show (md5 $ TLE.encodeUtf8 $ TL.pack $ salt ++ pass)+saltPass' salt pass =+    salt ++ T.unpack (TE.decodeUtf8 $ B16.encode $ H.hash $ TE.encodeUtf8 $ T.pack $ salt ++ pass)  isValidPass :: Text -- ^ cleartext password             -> SaltedPass -- ^ salted password

@@ -1,5 +1,5 @@ name:            yesod-auth-version:         1.3.0.0+version:         1.3.0.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman, Patrick Brisbin@@ -25,7 +25,8 @@                    , yesod-core              >= 1.2       && < 1.3                    , wai                     >= 1.4                    , template-haskell-                   , pureMD5                 >= 2.0+                   , base16-bytestring+                   , cryptohash                    , random                  >= 1.0.0.2                    , text                    >= 0.7                    , mime-mail               >= 0.3@@ -39,7 +40,6 @@                    , transformers            >= 0.2.2                    , persistent              >= 1.2       && < 1.4                    , persistent-template     >= 1.2       && < 1.4-                   , SHA                     >= 1.4.1.3                    , http-conduit            >= 1.5                    , aeson                   >= 0.5                    , pwstore-fast            >= 2.2