summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-29 14:02:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-29 14:02:43 -0400
commit1c16f616df9a8469d24cefb6007333df3a35a449 (patch)
tree2198232da7d7594d1a8d952724497c08ee22d2ce /Annex.hs
parentd7a4a9a66bd51b18a9e5f4427c3492db1adec40d (diff)
Added shared cipher mode to encryptable special remotes.
This option avoids gpg key distribution, at the expense of flexability, and with the requirement that all clones of the git repository be equally trusted.
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex.hs b/Annex.hs
index 441e460be..f2fb1f401 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -90,7 +90,7 @@ data AnnexState = AnnexState
, shared :: Maybe SharedRepository
, forcetrust :: TrustMap
, trustmap :: Maybe TrustMap
- , ciphers :: M.Map EncryptedCipher Cipher
+ , ciphers :: M.Map StorableCipher Cipher
, lockpool :: M.Map FilePath Fd
, flags :: M.Map String Bool
, fields :: M.Map String String