]> granicus.if.org Git - openssl/commitdiff
Don't allow an empty Subject when creating a Certificate
authorMatt Caswell <matt@openssl.org>
Fri, 19 Jan 2018 14:34:56 +0000 (14:34 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 22 Jan 2018 10:19:55 +0000 (10:19 +0000)
Misconfiguration (e.g. an empty policy section in the config file) can
lead to an empty Subject. Since certificates should have unique Subjects
this should not be allowed.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5115)

apps/ca.c

index 9a839969a204bbc34c0cf1149a5e4278901638ff..df08581e3777910ebad314e704b12791236e9b68 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1672,6 +1672,10 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                    "The Subject's Distinguished Name is as follows\n");
 
     name = X509_REQ_get_subject_name(req);
+    if (X509_NAME_entry_count(name) == 0) {
+        BIO_printf(bio_err, "Error: The supplied Subject is empty\n");
+        goto err;
+    }
     for (i = 0; i < X509_NAME_entry_count(name); i++) {
         ne = X509_NAME_get_entry(name, i);
         str = X509_NAME_ENTRY_get_data(ne);
@@ -1836,6 +1840,12 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
             goto err;
     }
 
+    if (X509_NAME_entry_count(subject) == 0) {
+        BIO_printf(bio_err,
+                   "Error: After applying policy the Subject is empty\n");
+        goto err;
+    }
+
     if (verbose)
         BIO_printf(bio_err,
                    "The subject name appears to be ok, checking data base for clashes\n");