From: Matt Caswell <matt@openssl.org>
Date: Fri, 19 Jan 2018 14:48:45 +0000 (+0000)
Subject: Don't crash on a missing Subject in index.txt
X-Git-Tag: OpenSSL_1_1_0h~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=462163e91a6f06e8bf0791a01f6e0a1897ad2081;p=oweals%2Fopenssl.git

Don't crash on a missing Subject in index.txt

An index.txt entry which has an empty Subject name field will cause ca
to crash. Therefore check it when we load it to make sure its not empty.

Fixes #5109

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

(cherry picked from commit 1e05c6d07ff963107286d028f6778d2ccc863a9a)
---

diff --git a/apps/ca.c b/apps/ca.c
index d323ca0f18..633f6e3363 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -666,6 +666,10 @@ end_of_options:
                 goto end;
             }
         }
+        if (pp[DB_name][0] == '\0') {
+            BIO_printf(bio_err, "entry %d: bad Subject\n", i + 1);
+            goto end;
+        }
     }
     if (verbose) {
         TXT_DB_write(bio_out, db->db);