From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Sep 2017 08:46:10 +0000 (+0200)
Subject: Make sure that a cert with extensions gets version number 2 (v3)
X-Git-Tag: OpenSSL_1_1_1-pre1~630
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4881d849da23528e19b7312f963d28916d9804b1;p=oweals%2Fopenssl.git

Make sure that a cert with extensions gets version number 2 (v3)

Fixes #4419

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4420)
---

diff --git a/apps/ca.c b/apps/ca.c
index 976f6bb5f0..3bcbcbb678 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1735,7 +1735,6 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     /* Lets add the extensions, if there are any */
     if (ext_sect) {
         X509V3_CTX ctx;
-        X509_set_version(ret, 2);
 
         /* Initialize the context structure */
         if (selfsign)
@@ -1790,6 +1789,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         goto end;
     }
 
+    {
+        const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(ret);
+
+        if (exts != NULL && sk_X509_EXTENSION_num(exts) > 0)
+            /* Make it an X509 v3 certificate. */
+            if (!X509_set_version(ret, 2))
+                goto end;
+    }
+
     /* Set the right value for the noemailDN option */
     if (email_dn == 0) {
         if (!X509_set_subject_name(ret, dn_subject))