summaryrefslogtreecommitdiff
path: root/pith
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2018-04-21 14:49:34 -0600
committerEduardo Chappa <chappa@washington.edu>2018-04-21 14:49:34 -0600
commit3d69487e36e25aad64778ac2a91572f3fe3a3218 (patch)
tree8e0b6f4e2469302e87a24987dec1166c2561dd16 /pith
parent784b14806812d40f8258b78b20a5d54a0507ffb1 (diff)
downloadalpine-3d69487e36e25aad64778ac2a91572f3fe3a3218.tar.xz
* If verification of a signed message fails due to an error in verifying
a certificate (as opposed to the message is corrupt) retry at most two more times to get the data out using the PKCS7_verify function, and let the user know about the error.
Diffstat (limited to 'pith')
-rw-r--r--pith/smime.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/pith/smime.c b/pith/smime.c
index e899c9c8..a6ddc8fa 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -2840,13 +2840,18 @@ do_signature_verify(PKCS7 *p7, BIO *in, BIO *out, int silent)
if(out && err==ERR_PACK(ERR_LIB_PKCS7,PKCS7_F_PKCS7_VERIFY,PKCS7_R_CERTIFICATE_VERIFY_ERROR)){
- /* Retry verification so we can get the plain text */
- /* Might be better to reimplement PKCS7_verify here? */
-
- PKCS7_verify(p7, otherCerts, s_cert_store, in, out, PKCS7_NOVERIFY);
+ /*
+ * verification failed due to an error in verifying a certificate.
+ * Just write the "out" BIO, and leave. Of course let the user
+ * know about this. Make two more attempts to get the data out. The
+ * last one should succeed. In any case, let the user know why it
+ * failed.
+ */
+ if(PKCS7_verify(p7, otherCerts, s_cert_store, in, out, PKCS7_NOVERIFY) == 0)
+ PKCS7_verify(p7, otherCerts, s_cert_store, in, out, PKCS7_NOVERIFY|PKCS7_NOSIGS);
}
if (!silent) q_status_message1(SM_ORDER | SM_DING, 3, 3,
- _("Couldn't verify S/MIME signature: %s"), (char*) openssl_error_string());
+ _("Couldn't verify S/MIME signature: %s"), (char *) openssl_error_string());
}
sk_X509_pop_free(otherCerts, X509_free);