Merge branch 'wk-gpg-keybox'

[gnupg.git] / agent / pkdecrypt.c

diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 11d0cc3..7df7f1d 100644 (file)
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -36,7 +36,7 @@
 int
 agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                  const unsigned char *ciphertext, size_t ciphertextlen,
-                 membuf_t *outbuf) 
+                 membuf_t *outbuf)
 {
   gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL;
   unsigned char *shadow_info = NULL;
@@ -67,8 +67,6 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   rc = agent_key_from_file (ctrl, NULL, desc_text,
                             ctrl->keygrip, &shadow_info,
                             CACHE_MODE_NORMAL, NULL, &s_skey, NULL);
-  if (gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED)
-    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
   if (rc)
     {
       if (gpg_err_code (rc) == GPG_ERR_ENOENT)
@@ -138,7 +136,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
           put_membuf (outbuf, buf, len);
           put_membuf (outbuf, ")", 2);
         }
-    }      
+    }
 
 
  leave:
@@ -149,5 +147,3 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   xfree (shadow_info);
   return rc;
 }
-
-