summaryrefslogtreecommitdiff
path: root/Crypto.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-05-01 14:05:10 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-05-01 14:05:10 -0400
commit1f84c7a9642378e26d2b076def52255361591a04 (patch)
tree29a6be9bac36b84f1a59c362d64dd72a93d8c7fe /Crypto.hs
parent110b1e2b0a4d8355b3de5ebde1710b6b7cd61911 (diff)
S3: When encryption is enabled, the Amazon S3 login credentials are stored, encrypted, in .git-annex/remotes.log, so environment variables need not be set after the remote is initialized.
Diffstat (limited to 'Crypto.hs')
-rw-r--r--Crypto.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Crypto.hs b/Crypto.hs
index 20b999f65..2f544f21f 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -22,6 +22,8 @@ module Crypto (
withDecryptedHandle,
withEncryptedContent,
withDecryptedContent,
+ toB64,
+ fromB64,
prop_hmacWithCipher_sane
) where
@@ -252,6 +254,7 @@ fromB64 s =
case B64.decode s of
Nothing -> error "bad base64 encoded data"
Just ws -> w82s ws
+
hmacWithCipher :: Cipher -> String -> String
hmacWithCipher c = hmacWithCipher' (cipherHmac c)
hmacWithCipher' :: String -> String -> String