From 12066ff2768d48443fc690427e96bc678a92656d Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Mon, 14 Apr 2014 10:20:49 +0800 Subject: [PATCH] Updated cabal dependencies and made change for new scrypt API. --- scat.cabal | 12 +++++++++--- src/Scat.hs | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scat.cabal b/scat.cabal index 3647c69..b3f35f6 100644 --- a/scat.cabal +++ b/scat.cabal @@ -10,7 +10,7 @@ name: scat -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 1.0.2.0 +version: 1.0.2.1 -- A short (one-line) description of the package. synopsis: Generates unique passwords for various websites from a single password. @@ -67,5 +67,11 @@ executable scat other-modules: Scat.Builder, Scat.Schemas, Scat.Options, Scat.Utils.Permutation, Paths_scat -- Other library packages from which modules are imported. - build-depends: base ==4.5.*, scrypt ==0.3.*, bytestring ==0.9.*, optparse-applicative ==0.5.*, mtl ==2.1.*, vector ==0.10.*, ansi-terminal ==0.6.* - \ No newline at end of file + build-depends: base >=4.5 && <5 + , scrypt == 0.5.* + , bytestring + , optparse-applicative >= 0.5 + , mtl + , vector == 0.10.* + , ansi-terminal >= 0.6.1 + diff --git a/src/Scat.hs b/src/Scat.hs index b86fcda..1f972eb 100644 --- a/src/Scat.hs +++ b/src/Scat.hs @@ -20,7 +20,7 @@ import Scat.Options -- | Generates the seed integer given a service, a password and a code. scatter :: ByteString -> ByteString -> ByteString -> Integer scatter k pw c = foldr (\ n s -> fromIntegral n + 256 * s) 0 $ - unpack $ unHash $ scrypt params (Salt k) (Pass $ pw <> c) + unpack $ getHash $ scrypt params (Salt k) (Pass $ pw <> c) where Just params = scryptParams 14 8 50