From e41a2c4c609a8f64dfab2d832e975b0b37ff286d Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Mon, 7 Sep 2020 22:38:46 +0200 Subject: check_chain_extensions(): Change exclusion condition w.r.t. RFC 6818 section 2 Reviewed-by: Kurt Roeckx Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/12478) --- 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 29a7f3ff52..83dae9a79b 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -526,8 +526,11 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) * because RFC 5280 does not apply to them according RFC 6818 section 2. */ if ((ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0 - && !(i == 0 && (x->ex_flags & EXFLAG_CA) == 0 - && (x->ex_flags & EXFLAG_SI) != 0)) { + && num > 1) { /* + * this should imply + * !(i == 0 && (x->ex_flags & EXFLAG_CA) == 0 + * && (x->ex_flags & EXFLAG_SI) != 0) + */ /* Check Basic Constraints according to RFC 5280 section 4.2.1.9 */ if (x->ex_pathlen != -1) { if ((x->ex_flags & EXFLAG_CA) == 0) -- cgit v1.2.3