diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-04-29 14:02:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-29 14:02:43 -0400 |
| commit | 1c16f616df9a8469d24cefb6007333df3a35a449 (patch) | |
| tree | 2198232da7d7594d1a8d952724497c08ee22d2ce /Types | |
| parent | d7a4a9a66bd51b18a9e5f4427c3492db1adec40d (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 'Types')
| -rw-r--r-- | Types/Crypto.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Types/Crypto.hs b/Types/Crypto.hs index 686bf5c1a..135522ba1 100644 --- a/Types/Crypto.hs +++ b/Types/Crypto.hs @@ -1,13 +1,13 @@ {- git-annex crypto types - - - Copyright 2011 Joey Hess <joey@kitenet.net> + - Copyright 2011-2012 Joey Hess <joey@kitenet.net> - - Licensed under the GNU GPL version 3 or higher. -} module Types.Crypto ( Cipher(..), - EncryptedCipher(..), + StorableCipher(..), KeyIds(..), ) where @@ -16,5 +16,5 @@ import Utility.Gpg (KeyIds(..)) -- XXX ideally, this would be a locked memory region newtype Cipher = Cipher String -data EncryptedCipher = EncryptedCipher String KeyIds +data StorableCipher = EncryptedCipher String KeyIds | SharedCipher String deriving (Ord, Eq) |