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

plumb RemoteGitConfig through to encryptCipher

Browse source
This commit is contained in:
Joey Hess 2016-05-23 17:48:15 -04:00
parent b9ce477fa2
commit 0d0a796d63
Failed to extract signature
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/Helper/Encryptable.hs
View file

@ -63,8 +63,8 @@ encryptionSetup c gc = do
-- hybrid encryption is the default when a keyid is
-- specified but no encryption
_ | maybe (M.member "keyid" c) (== "hybrid") encryption ->
encsetup $ genEncryptedCipher cmd key Hybrid
Just "pubkey" -> encsetup $ genEncryptedCipher cmd key PubKey
encsetup $ genEncryptedCipher cmd (c, gc) key Hybrid
Just "pubkey" -> encsetup $ genEncryptedCipher cmd (c, gc) key PubKey
Just "sharedpubkey" -> encsetup $ genSharedPubKeyCipher cmd key
_ -> error $ "Specify " ++ intercalate " or "
(map ("encryption=" ++)