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_1_1_1r~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b755cdfb52ff51830aa004799e1f78548423c00;p=thirdparty%2Fopenssl.git

X509_REQ_get_extensions(): Return empty stack if no extensions found

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/18926)
---

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index dd674926ddb..a69f9a723d7 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -167,7 +167,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) *)