diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-05-23 17:27:15 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-05-23 17:33:32 -0400 |
commit | 9a8ff4c743fae057520caebb59a760caf29001b4 (patch) | |
tree | 6fb8bde572a73366a6749c07ecf711fe550a1bd5 /Creds.hs | |
parent | 063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff) |
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Creds.hs')
-rw-r--r-- | Creds.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -58,7 +58,7 @@ setRemoteCredPair encsetup c gc storage mcreds = case mcreds of Just creds | embedCreds c -> case credPairRemoteKey storage of Nothing -> localcache creds - Just key -> storeconfig creds key =<< remoteCipher =<< localcache creds + Just key -> storeconfig creds key =<< flip remoteCipher gc =<< localcache creds | otherwise -> localcache creds where localcache creds = do @@ -84,7 +84,7 @@ getRemoteCredPair c gc storage = maybe fromcache (return . Just) =<< fromenv fromcache = maybe fromconfig (return . Just) =<< readCacheCredPair storage fromconfig = case credPairRemoteKey storage of Just key -> do - mcipher <- remoteCipher' c + mcipher <- remoteCipher' c gc case (M.lookup key c, mcipher) of (Nothing, _) -> return Nothing (Just enccreds, Just (cipher, storablecipher)) -> |