mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removed dependency on haskell SHA library, instead using cryptohash >= 0.11.0.

Browse source
This commit is contained in:
Joey Hess 2015-04-19 11:05:32 -04:00
parent be3895be45
commit 5f73bc3a12
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assistant/WebApp/Configurators/Pairing.hs
View file

@ -39,7 +39,7 @@ import Git
import qualified Data.Text as T import qualified Data.Text as T
#ifdef WITH_PAIRING #ifdef WITH_PAIRING
import qualified Data.Text.Encoding as T import qualified Data.Text.Encoding as T
import qualified Data.ByteString.Lazy as B import qualified Data.ByteString as B
import Data.Char import Data.Char
import qualified Control.Exception as E import qualified Control.Exception as E
import Control.Concurrent import Control.Concurrent
@ -304,7 +304,7 @@ secretProblem s
| otherwise = Nothing | otherwise = Nothing
toSecret :: Text -> Secret toSecret :: Text -> Secret
toSecret s = B.fromChunks [T.encodeUtf8 $ T.toLower $ T.filter isAlphaNum s] toSecret s = T.encodeUtf8 $ T.toLower $ T.filter isAlphaNum s
{- From Dickens -} {- From Dickens -}
sampleQuote :: Text sampleQuote :: Text

11
Utility/Verifiable.hs
View file

@ -7,11 +7,12 @@
module Utility.Verifiable where module Utility.Verifiable where
import Data.Digest.Pure.SHA import Data.ByteString.UTF8 (fromString)
import Data.ByteString.Lazy.UTF8 (fromString) import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
type Secret = L.ByteString import Utility.Hash
type Secret = S.ByteString
type HMACDigest = String type HMACDigest = String
{- A value, verifiable using a HMAC digest and a secret. -} {- A value, verifiable using a HMAC digest and a secret. -}
@ -28,7 +29,7 @@ verify :: (Eq a, Show a) => Verifiable a -> Secret -> Bool
verify v secret = v == mkVerifiable (verifiableVal v) secret verify v secret = v == mkVerifiable (verifiableVal v) secret
calcDigest :: String -> Secret -> HMACDigest calcDigest :: String -> Secret -> HMACDigest
calcDigest v secret = showDigest $ hmacSha1 secret $ fromString v calcDigest v secret = calcMac HmacSha1 secret (fromString v)
{- for quickcheck -} {- for quickcheck -}
prop_verifiable_sane :: String -> String -> Bool prop_verifiable_sane :: String -> String -> Bool

2
debian/changelog vendored
View file

@ -23,6 +23,8 @@ git-annex (5.20150410) UNRELEASED; urgency=medium
* fsck --from remote: Avoid downloading a key if it would go over * fsck --from remote: Avoid downloading a key if it would go over
the annex.diskreserve limit. the annex.diskreserve limit.
* required: New command, like wanted, but for required content. * required: New command, like wanted, but for required content.
* Removed dependency on haskell SHA library,
instead using cryptohash >= 0.11.0.
-- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400 -- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400

1
debian/control vendored
View file

@ -10,7 +10,6 @@ Build-Depends:
libghc-data-default-dev, libghc-data-default-dev,
libghc-hslogger-dev, libghc-hslogger-dev,
libghc-pcre-light-dev, libghc-pcre-light-dev,
libghc-sha-dev,
libghc-cryptohash-dev (>= 0.11.0), libghc-cryptohash-dev (>= 0.11.0),
libghc-dataenc-dev, libghc-dataenc-dev,
libghc-utf8-string-dev, libghc-utf8-string-dev,

2
git-annex.cabal
View file

@ -105,7 +105,7 @@ Executable git-annex
Main-Is: git-annex.hs Main-Is: git-annex.hs
Build-Depends: MissingH, hslogger, directory, filepath, Build-Depends: MissingH, hslogger, directory, filepath,
containers (>= 0.5.0.0), utf8-string, mtl (>= 2), containers (>= 0.5.0.0), utf8-string, mtl (>= 2),
bytestring, old-locale, time, dataenc, SHA, process, json, bytestring, old-locale, time, dataenc, process, json,
base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3),

1
standalone/android/cabal.config
View file

@ -6,7 +6,6 @@ constraints: Crypto ==4.2.5.1,
MissingH ==1.2.1.0, MissingH ==1.2.1.0,
MonadRandom ==0.1.13, MonadRandom ==0.1.13,
QuickCheck ==2.7.6, QuickCheck ==2.7.6,
SHA ==1.6.1,
SafeSemaphore ==0.10.1, SafeSemaphore ==0.10.1,
aeson ==0.7.0.6, aeson ==0.7.0.6,
ansi-terminal ==0.6.1.1, ansi-terminal ==0.6.1.1,

1
standalone/linux/cabal.config
View file

@ -6,7 +6,6 @@ constraints: Crypto ==4.2.5.1,
MissingH ==1.2.1.0, MissingH ==1.2.1.0,
MonadRandom ==0.1.13, MonadRandom ==0.1.13,
QuickCheck ==2.7.6, QuickCheck ==2.7.6,
SHA ==1.6.1,
SafeSemaphore ==0.10.1, SafeSemaphore ==0.10.1,
aeson ==0.7.0.6, aeson ==0.7.0.6,
ansi-terminal ==0.6.1.1, ansi-terminal ==0.6.1.1,