summaryrefslogtreecommitdiff
path: root/Creds.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-21 15:15:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-21 15:15:16 -0400
commiteaebc278765f0989092be6700cd70e9bec057b52 (patch)
treecfd55505e8701e94937488d5b2ccce7edb3b1b55 /Creds.hs
parent8f3d1dd13b495083fa4f09c8416677f5127d3ec2 (diff)
note whether or not embedded creds are encrypted
Diffstat (limited to 'Creds.hs')
-rw-r--r--Creds.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Creds.hs b/Creds.hs
index 64ff3ffeb..76d610e57 100644
--- a/Creds.hs
+++ b/Creds.hs
@@ -24,7 +24,7 @@ import Annex.Perms
import Utility.FileMode
import Crypto
import Types.Remote (RemoteConfig, RemoteConfigKey)
-import Remote.Helper.Encryptable (remoteCipher, remoteCipher', embedCreds, EncryptionIsSetup)
+import Remote.Helper.Encryptable (remoteCipher, remoteCipher', embedCreds, EncryptionIsSetup, extractCipher)
import Utility.Env (getEnv)
import qualified Data.ByteString.Lazy.Char8 as L
@@ -182,6 +182,8 @@ includeCredsInfo c storage info = do
( ret "stored locally"
, ret "not available"
)
- Just _ -> ret "embedded in git repository"
+ Just _ -> case extractCipher c of
+ Just (EncryptedCipher _ _ _) -> ret "embedded in git repository (gpg encrypted)"
+ _ -> ret "embedded in git repository (not encrypted)"
where
ret s = return $ ("creds", s) : info