From 464b05556822e904951851f715387f77a295490d Mon Sep 17 00:00:00 2001
From: Paul Rouse <pgr@doynton.org>
Date: Tue, 29 Aug 2017 13:40:32 +0100
Subject: [PATCH] Expose Yesod.Auth.Util.PasswordStore

---
 yesod-auth/ChangeLog.md                     |  4 ++++
 yesod-auth/Yesod/Auth/Email.hs              |  2 +-
 yesod-auth/Yesod/Auth/Util/PasswordStore.hs | 11 +++--------
 yesod-auth/yesod-auth.cabal                 |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md
index dc96c5dd..2a529171 100644
--- a/yesod-auth/ChangeLog.md
+++ b/yesod-auth/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.4.18
+
+* Expose Yesod.Auth.Util.PasswordStore
+
 ## 1.4.17.3
 
 * Some translation fixes
diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs
index 0c6aa34d..44990a8e 100644
--- a/yesod-auth/Yesod/Auth/Email.hs
+++ b/yesod-auth/Yesod/Auth/Email.hs
@@ -116,7 +116,7 @@ import           Yesod.Auth
 import qualified Yesod.Auth.Message       as Msg
 import           Yesod.Core
 import           Yesod.Form
-import qualified Yesod.PasswordStore      as PS
+import qualified Yesod.Auth.Util.PasswordStore as PS
 import           Control.Applicative      ((<$>), (<*>))
 import qualified Crypto.Hash              as H
 import qualified Crypto.Nonce             as Nonce
diff --git a/yesod-auth/Yesod/Auth/Util/PasswordStore.hs b/yesod-auth/Yesod/Auth/Util/PasswordStore.hs
index 9e32a48e..7e093db1 100755
--- a/yesod-auth/Yesod/Auth/Util/PasswordStore.hs
+++ b/yesod-auth/Yesod/Auth/Util/PasswordStore.hs
@@ -1,13 +1,8 @@
 {-# LANGUAGE OverloadedStrings, BangPatterns #-}
 {-# LANGUAGE CPP #-}
 -- |
--- Module      : Crypto.PasswordStore
--- Copyright   : (c) Peter Scott, 2011
--- License     : BSD-style
---
--- Maintainer  : pjscott@iastate.edu
--- Stability   : experimental
--- Portability : portable
+-- This is a fork of pwstore-fast, originally copyright (c) Peter Scott, 2011,
+-- and released under a BSD-style licence.
 --
 -- Securely store hashed, salted passwords. If you need to store and verify
 -- passwords, there are many wrong ways to do it, most of them all too
@@ -71,7 +66,7 @@
 -- iteration count. This does not have a significant effect on security, but can
 -- be handy for compatibility with other code.
 
-module Yesod.PasswordStore (
+module Yesod.Auth.Util.PasswordStore (
 
         -- * Algorithms
         pbkdf1,                 -- :: ByteString -> Salt -> Int -> ByteString
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 75339439..839a41d3 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         1.4.17.3
+version:         1.4.18
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -77,8 +77,8 @@ library
                      Yesod.Auth.GoogleEmail
                      Yesod.Auth.GoogleEmail2
                      Yesod.Auth.Hardcoded
+                     Yesod.Auth.Util.PasswordStore
     other-modules:   Yesod.Auth.Routes
-                     Yesod.PasswordStore
     ghc-options:     -Wall
 
 source-repository head