From 83e97b86973fc63eda92f5b38c112f0d374503c0 Mon Sep 17 00:00:00 2001 From: joe Date: Sun, 28 Aug 2016 03:16:07 -0400 Subject: Basic gpg-agent support. --- kiki.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kiki.hs') diff --git a/kiki.hs b/kiki.hs index a0eff1a..71222ce 100644 --- a/kiki.hs +++ b/kiki.hs @@ -1146,8 +1146,8 @@ sync bExport bImport bSecret cmdarg args_raw = do ++ pems ++ if bSecret then walts else [] ++ hosts - , opPassphrases = do pfile <- maybeToList passfd - return $ PassphraseSpec Nothing Nothing pfile + , opPassphrases = withAgent $ do pfile <- maybeToList passfd + return $ PassphraseSpec Nothing Nothing pfile , opTransforms = maybe [] (const [Autosign]) $ Map.lookup "--autosign" margs , opHome = homespec } @@ -1252,8 +1252,8 @@ kiki "show" args = do ++ pems ++ walts ++ hosts - , opPassphrases = do pfile <- maybeToList passfd - return $ PassphraseSpec Nothing Nothing pfile + , opPassphrases = withAgent $ do pfile <- maybeToList passfd + return $ PassphraseSpec Nothing Nothing pfile , opTransforms = [] , opHome = homespec } @@ -1537,8 +1537,8 @@ kiki "delete" args = do [ ( HomeSec, buildStreamInfo KF_All KeyRingFile ) , ( HomePub, buildStreamInfo KF_All KeyRingFile ) ] - , opPassphrases = do pfile <- maybeToList passfd - return $ PassphraseSpec Nothing Nothing pfile + , opPassphrases = withAgent $ do pfile <- maybeToList passfd + return $ PassphraseSpec Nothing Nothing pfile , opTransforms = map DeleteSubkeyByFingerprint fps , opHome = homespec } -- cgit v1.2.3