factor out base64 code

3 files changed, 22 insertions, 13 deletions

diff --git a/Base64.hs b/Base64.hs
new file mode 100644
index 000000000..cc6346b41
--- /dev/null
+++ b/Base64.hs
@@ -0,0 +1,20 @@
+{- Simple Base64 access
+ -
+ - Copyright 2011 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Base64 (toB64, fromB64) where
+
+import Codec.Binary.Base64
+import Data.Bits.Utils
+
+toB64 :: String -> String		
+toB64 = encode . s2w8
+
+fromB64 :: String -> String
+fromB64 s =
+	case decode s of
+		Nothing -> error "bad base64 encoded data"
+		Just ws -> w82s ws
diff --git a/Crypto.hs b/Crypto.hs
index 2f544f21f..53cd48dd5 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -22,21 +22,17 @@ module Crypto (
 	withDecryptedHandle,
 	withEncryptedContent,
 	withDecryptedContent,
-	toB64,
-	fromB64,
 
 	prop_hmacWithCipher_sane
 ) where
 
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.Map as M
-import qualified Codec.Binary.Base64 as B64
 import Data.ByteString.Lazy.UTF8 (fromString)
 import Data.Digest.Pure.SHA
 import System.Cmd.Utils
 import Data.String.Utils
 import Data.List
-import Data.Bits.Utils
 import System.IO
 import System.Posix.IO
 import System.Posix.Types
@@ -50,6 +46,7 @@ import Types
 import Key
 import RemoteClass
 import Utility
+import Base64
 import CryptoTypes
 
 {- The first half of a Cipher is used for HMAC; the remainder
@@ -246,15 +243,6 @@ configGet c key =
 		Just v -> v
 		Nothing -> error $ "missing " ++ key ++ " in remote config"
 
-toB64 :: String -> String		
-toB64 = B64.encode . s2w8
-
-fromB64 :: String -> String
-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
diff --git a/Remote/S3real.hs b/Remote/S3real.hs
index c1ae0fbcc..d6bfe5487 100644
--- a/Remote/S3real.hs
+++ b/Remote/S3real.hs
@@ -33,6 +33,7 @@ import Remote.Encryptable
 import Crypto
 import Key
 import Content
+import Base64
 
 remote :: RemoteType Annex
 remote = RemoteType {