From e0ddf2706a99598252d65a87ff1f626e096272b0 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Fri, 20 Jun 2014 12:00:00 -0700 Subject: [PATCH] For self signed root only indicate one error. (Imported from upstream's 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 b8889376..f4fb3d50 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -363,8 +363,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)) {