security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

sm: Return the last error for pubkey decryption.

Browse Source 
* sm/decrypt.c: Use TMP_RC for ksba_cms_get_issuer_serial,
and return the last error when no key is available.
Fix the error report with TMP_RC for second call of
ksba_cms_get_issuer_serial.

GnuPG-bug-id: 4561
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-07-05 15:46:19 +09:00
parent 6cc4119ec0
commit 38b9da7de3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sm/decrypt.c
View File

@ -397,16 +397,17 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
char *hexkeygrip = NULL; char *hexkeygrip = NULL;
char *desc = NULL; char *desc = NULL;
char kidbuf[16+1]; char kidbuf[16+1];
int tmp_rc;
*kidbuf = 0; *kidbuf = 0;
rc = ksba_cms_get_issuer_serial (cms, recp, &issuer, &serial); tmp_rc = ksba_cms_get_issuer_serial (cms, recp, &issuer, &serial);
if (rc == -1 && recp) if (tmp_rc == -1 && recp)
break; /* no more recipients */ break; /* no more recipients */
audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp); audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp);
if (rc) if (tmp_rc)
log_error ("recp %d - error getting info: %s\n", log_error ("recp %d - error getting info: %s\n",
recp, gpg_strerror (rc)); recp, gpg_strerror (tmp_rc));
else else
{ {
ksba_cert_t cert = NULL; ksba_cert_t cert = NULL;
@ -569,7 +570,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp); audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp);
if (tmp_rc) if (tmp_rc)
log_error ("recp %d - error getting info: %s\n", log_error ("recp %d - error getting info: %s\n",
recp, gpg_strerror (rc)); recp, gpg_strerror (tmp_rc));
else else
{ {
char *tmpstr = gpgsm_format_sn_issuer (serial, issuer); char *tmpstr = gpgsm_format_sn_issuer (serial, issuer);
@ -583,6 +584,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
if (!any_key) if (!any_key)
{ {
if (!rc)
rc = gpg_error (GPG_ERR_NO_SECKEY); rc = gpg_error (GPG_ERR_NO_SECKEY);
goto leave; goto leave;
} }