From 82bdd6419361136e7be533d31a990ba0476fced3 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Tue, 8 Sep 2020 09:39:33 +0200 Subject: check_chain_extensions(): Require X.509 v3 if extensions are present Reviewed-by: Kurt Roeckx Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/12478) --- crypto/x509/x509_txt.c | 2 ++ crypto/x509/x509_vfy.c | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'crypto/x509') diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c index 9cb6c8b739..53b19e46df 100644 --- a/crypto/x509/x509_txt.c +++ b/crypto/x509/x509_txt.c @@ -208,6 +208,8 @@ const char *X509_verify_cert_error_string(long n) return "Subject Key Identifier marked critical"; case X509_V_ERR_CA_CERT_MISSING_KEY_USAGE: return "CA cert does not include key usage extension"; + case X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3: + return "Using cert extension requires at least X509v3"; default: /* Printing an error number into a static buffer is not thread-safe */ diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 83dae9a79b..4a067e5ff4 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -26,6 +26,7 @@ #include "x509_local.h" DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(X509_REVOKED) DEFINE_STACK_OF(GENERAL_NAME) DEFINE_STACK_OF(X509_CRL) @@ -585,6 +586,9 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) /* Check SKID presence acc. to RFC 5280 section 4.2.1.2 */ if ((x->ex_flags & EXFLAG_CA) != 0 && x->skid == NULL) ctx->error = X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER; + } else { + if (sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0) + ctx->error = X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3; } } if (ctx->error != X509_V_OK) -- cgit v1.2.3