From 315cd871c4b61f002f658de0ee427f2f4221aa7c Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 3 Mar 2014 23:33:51 +0000 Subject: [PATCH] For self signed root only indicate one error. (cherry picked from commit bdfc0e284c89dd5781259cc19aa264aded538492) --- crypto/x509/x509_vfy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 869a4f29e8..32b07a0306 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -366,8 +366,11 @@ int X509_verify_cert(X509_STORE_CTX *ctx) /* If explicitly rejected error */ if (i == X509_TRUST_REJECTED) goto end; - /* If not explicitly trusted then indicate error */ - if (i != X509_TRUST_TRUSTED) + /* If not explicitly trusted then indicate error unless it's + * a single self signed certificate in which case we've indicated + * an error already and set bad_chain == 1 + */ + if (i != X509_TRUST_TRUSTED && !bad_chain) { if ((chain_ss == NULL) || !ctx->check_issued(ctx, x, chain_ss)) { -- 2.25.1