From 299c10bc37ab60b0a0c62e8e931a83f61ce2e0a6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Oct 2014 14:39:59 -0400 Subject: show in info whether a remote uses hybrid encryption or not --- Remote/Helper/Encryptable.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 5e342803d..4903cffb4 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -163,5 +163,10 @@ describeEncryption :: RemoteConfig -> String describeEncryption c = case extractCipher c of Nothing -> "not encrypted" (Just (SharedCipher _)) -> "encrypted (encryption key stored in git repository)" - (Just (EncryptedCipher _ _ (KeyIds { keyIds = ks }))) -> - "encrypted (to gpg keys: " ++ unwords ks ++ ")" + (Just (EncryptedCipher _ v (KeyIds { keyIds = ks }))) -> unwords $ catMaybes + [ Just "encrypted (to gpg keys:" + , Just (unwords ks ++ ")") + , case v of + PubKey -> Nothing + Hybrid -> Just "(hybrid mode)" + ] -- cgit v1.2.3