1 files changed, 43 insertions, 0 deletions
diff --git a/Remote/Encrypted.hs b/Remote/Encrypted.hs
index ae4044620..2a0fb13bc 100644
--- a/Remote/Encrypted.hs
+++ b/Remote/Encrypted.hs
@@ -13,6 +13,8 @@ import Control.Monad.State (liftIO)
 import Types
 import RemoteClass
 import Crypto
+import qualified Annex
+import Messages
 
 {- Encryption setup for a remote. The user must specify whether to use
  - an encryption key, or not encrypt. An encrypted cipher is created, or is
@@ -29,3 +31,44 @@ encryptionSetup c =
 		use a = do
 			cipher <- liftIO a
 			return $ M.delete "encryption" $ storeCipher c cipher
+
+{- Helpers that can be applied to a Remote's normal actions to
+ - add crypto support. -}
+storeKeyEncrypted :: Maybe RemoteConfig -> (Key -> Maybe (Cipher, Key) -> Annex a) -> Key -> Annex a
+storeKeyEncrypted c a k = a k =<< cipherKey c k
+retrieveKeyFileEncrypted :: Maybe RemoteConfig -> (Key -> FilePath -> Maybe (Cipher, Key) -> Annex a) -> Key -> FilePath -> Annex a
+retrieveKeyFileEncrypted c a k f = a k f =<< cipherKey c k
+removeKeyEncrypted :: Maybe RemoteConfig -> (Key -> Annex a) -> Key -> Annex a
+removeKeyEncrypted = withEncryptedKey
+hasKeyEncrypted :: Maybe RemoteConfig -> (Key -> Annex a) -> Key -> Annex a
+hasKeyEncrypted = withEncryptedKey
+
+{- Gets encryption Cipher, and encrypted version of Key. 
+ -
+ - The decrypted Cipher is cached in the Annex state. -}
+cipherKey :: Maybe RemoteConfig -> Key -> Annex (Maybe (Cipher, Key))
+cipherKey Nothing _ = return Nothing
+cipherKey (Just c) k = do
+	cache <- Annex.getState Annex.cipher
+	case cache of
+		Just cipher -> ret cipher
+		Nothing -> case extractCipher c of
+			Nothing -> return Nothing
+			Just encipher -> do
+				showNote "getting encryption key"
+				cipher <- liftIO $ decryptCipher c encipher
+				Annex.changeState (\s -> s { Annex.cipher = Just cipher })
+				ret cipher
+	where
+		ret cipher = do
+			k' <- liftIO $ encryptKey cipher k
+			return $ Just (cipher, k')
+
+{- Passes the encrypted version of the key to the action when encryption
+ - is enabled, and the non-encrypted version otherwise. -}
+withEncryptedKey :: Maybe RemoteConfig -> (Key -> Annex a) -> Key -> Annex a
+withEncryptedKey c a k = do
+	v <- cipherKey c k
+	case v of
+		Nothing -> a k
+		Just (_, k') -> a k'