diff options
| author | NIIBE Yutaka <[email protected]> | 2019-07-05 06:46:19 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-07-05 06:46:19 +0000 |
| commit | 38b9da7de3350b1e56b85a058cdb1fdded78cf6d (patch) | |
| tree | 2d2483179f031f29038d166f5ce68c2be4910f82 | |
| parent | gpg: Return the last error for pubkey decryption. (diff) | |
| download | gnupg-38b9da7de3350b1e56b85a058cdb1fdded78cf6d.tar.gz gnupg-38b9da7de3350b1e56b85a058cdb1fdded78cf6d.zip | |
sm: Return the last error for pubkey decryption.
* 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 <[email protected]>
| -rw-r--r-- | sm/decrypt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sm/decrypt.c b/sm/decrypt.c index b0ab63f00..ec9800840 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -397,16 +397,17 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp) char *hexkeygrip = NULL; char *desc = NULL; char kidbuf[16+1]; + int tmp_rc; *kidbuf = 0; - rc = ksba_cms_get_issuer_serial (cms, recp, &issuer, &serial); - if (rc == -1 && recp) + tmp_rc = ksba_cms_get_issuer_serial (cms, recp, &issuer, &serial); + if (tmp_rc == -1 && recp) break; /* no more recipients */ audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp); - if (rc) + if (tmp_rc) log_error ("recp %d - error getting info: %s\n", - recp, gpg_strerror (rc)); + recp, gpg_strerror (tmp_rc)); else { 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); if (tmp_rc) log_error ("recp %d - error getting info: %s\n", - recp, gpg_strerror (rc)); + recp, gpg_strerror (tmp_rc)); else { char *tmpstr = gpgsm_format_sn_issuer (serial, issuer); @@ -583,7 +584,8 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp) if (!any_key) { - rc = gpg_error (GPG_ERR_NO_SECKEY); + if (!rc) + rc = gpg_error (GPG_ERR_NO_SECKEY); goto leave; } } |