1 files changed, 5 insertions, 3 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 178cd23d0..e4546ee5a 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -868,9 +868,11 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
           m_free (orig_codeset);
           return pw;
         }
-      else if (nread > 7 && !memcmp (pw, "ERR 111", 7)
-               && (pw[7] == ' ' || pw[7] == '\n') ) 
-        {
+      else if (nread > 4 && !memcmp (pw, "ERR ", 4)
+	       && (0xffff & strtoul (&pw[4], NULL, 0)) == 99)
+	{
+	  /* 99 is GPG_ERR_CANCELED.  FIXME: Check tail and overflow,
+	     and use gpg-error.  */
           log_info (_("cancelled by user\n") );
           if (canceled)
             *canceled = 1;