From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Fri, 8 Jan 2021 07:27:17 +0000 (+0100)
Subject: X509_REQ_get_extensions(): Return empty stack if no extensions found
X-Git-Tag: openssl-3.0.0-alpha11~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2039ac07b401932fa30a05ade80b3626e189d78a;p=thirdparty%2Fopenssl.git

X509_REQ_get_extensions(): Return empty stack if no extensions found

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13841)
---

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 4f4319a30c2..0d9fce303ef 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -152,7 +152,9 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
         ext = X509_ATTRIBUTE_get0_type(attr, 0);
         break;
     }
-    if (!ext || (ext->type != V_ASN1_SEQUENCE))
+    if (ext == NULL) /* no extensions is not an error */
+        return sk_X509_EXTENSION_new_null();
+    if (ext->type != V_ASN1_SEQUENCE)
         return NULL;
     p = ext->value.sequence->data;
     return (STACK_OF(X509_EXTENSION) *)