mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

wording

Browse source
This commit is contained in:
Joey Hess 2013-09-04 21:54:10 -04:00
parent 359a8bc318
commit 57a15425e8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Crypto.hs
View file

@ -89,10 +89,11 @@ updateEncryptedCipher [] encipher = return encipher
updateEncryptedCipher newkeys encipher@(EncryptedCipher _ symmetric (KeyIds ks)) = do updateEncryptedCipher newkeys encipher@(EncryptedCipher _ symmetric (KeyIds ks)) = do
dropKeys <- listKeyIds [ k | (False, k) <- newkeys ] dropKeys <- listKeyIds [ k | (False, k) <- newkeys ]
forM_ dropKeys $ \k -> unless (k `elem` ks) $ forM_ dropKeys $ \k -> unless (k `elem` ks) $
error $ "Key " ++ k ++ " is not granted access." error $ "Key " ++ k ++ " was not present; cannot remove."
addKeys <- listKeyIds [ k | (True, k) <- newkeys ] addKeys <- listKeyIds [ k | (True, k) <- newkeys ]
let ks' = (addKeys ++ ks) \\ dropKeys let ks' = (addKeys ++ ks) \\ dropKeys
when (null ks') $ error "That would empty the access list." when (null ks') $
error "Cannot remove the last key."
cipher <- decryptCipher encipher cipher <- decryptCipher encipher
encryptCipher cipher symmetric $ KeyIds ks' encryptCipher cipher symmetric $ KeyIds ks'
where where
@ -108,7 +109,7 @@ describeCipher (EncryptedCipher _ symmetric (KeyIds ks)) =
keys _ = "keys" keys _ = "keys"
{- Encrypts a Cipher to the specified KeyIds. The boolean indicates {- Encrypts a Cipher to the specified KeyIds. The boolean indicates
- whether to encrypt an hybrid cipher (True), which is going to be used - whether to encrypt a hybrid cipher (True), which is going to be used
- both for MAC'ing and symmetric encryption of file contents, or for - both for MAC'ing and symmetric encryption of file contents, or for
- MAC'ing only (False), while pubkey crypto is used for file contents. - MAC'ing only (False), while pubkey crypto is used for file contents.
- -} - -}