Better gpg-agent support.

1 files changed, 12 insertions, 11 deletions

diff --git a/lib/GnuPGAgent.hs b/lib/GnuPGAgent.hs
index 4a0e8c8..5878357 100644
--- a/lib/GnuPGAgent.hs
+++ b/lib/GnuPGAgent.hs
@@ -60,15 +60,15 @@ percentPlusEscape :: String -> String
 percentPlusEscape s = do
     c <- s
     case c of
-        ' ' -> "+"
-        '+' -> "%2B"
-        '"' -> "%22"
-        '%' -> "%25"
+        ' '         -> "+"
+        '+'         -> "%2B"
+        '"'         -> "%22"
+        '%'         -> "%25"
         _ | c < ' ' -> printf "%%%02X" (ord c)
-        _ -> return c
+        _           -> return c
 
 clearPassphrase agent key = do
-    let cmd = "clear_passphrase "++fingerprint key
+    let cmd = "clear_passphrase --mode=normal "++fingerprint key
     hPutStrLn (agentHandle agent) cmd
 
 data Query = Query
@@ -78,21 +78,22 @@ data Query = Query
     }
  deriving Show
 
-data QueryMode = AskNot | AskAgain String | Ask
+data QueryMode = AskNot | AskAgain String | AskExisting | AskNew
  deriving (Show,Eq,Ord)
 
 getPassphrase :: GnuPGAgent -> QueryMode -> Query -> IO (Maybe String)
 getPassphrase agent ask (Query key uid masterkey) = do
     let (er0,pr,desc) = prompts key uid masterkey
         (er,askopt) = case ask of
-                        AskNot         -> (er0,"--no-ask")
+                        AskNot         -> (er0,"--no-ask ")
                         AskAgain ermsg -> (ermsg,"")
-                        Ask            -> (er0,"")
+                        AskExisting    -> (er0,"")
+                        AskNew         -> (er0,"--repeat=1 ")
         cmd = "get_passphrase "++askopt++fingerprint key++" "++unwords (map percentPlusEscape [er,pr,desc])
-    -- putStrLn cmd
+    hPutStrLn stderr $ "gpg-agent <- " ++ cmd
     hPutStrLn (agentHandle agent) cmd
     r0 <- hGetLine (agentHandle agent)
-    -- putStrLn $ "agent says: " ++ r0
+    -- hPutStrLn stderr $ "agent says: " ++ r0
     case takeWhile (/=' ') r0 of
         "OK" -> hGetLine (agentHandle agent) >>= unhex . drop 3
             where