[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6a13c9c9842f54ed8d98c6f37cc4ae6c1cde8b7a (commit)
      from  ec5059c3effc59457f4b539ed105123c0b702307 (commit)


- Log -----------------------------------------------------------------
commit 6a13c9c9842f54ed8d98c6f37cc4ae6c1cde8b7a
Author: xuyunjia <yunjiaxu_sse at 163.com>
Date:   Sun Oct 18 23:33:54 2020 +0800

    resolve defects: reverse_inull; row[DB_exp_date] referenced before checking
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13170)

-----------------------------------------------------------------------

Summary of changes:
 apps/ca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 apps/ca.c

diff --git a/apps/ca.c b/apps/ca.c
old mode 100644
new mode 100755
index 4a67d61477..00078f90d4
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1924,8 +1924,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     row[DB_exp_date][tm->length] = '\0';
     row[DB_rev_date] = NULL;
     row[DB_file] = OPENSSL_strdup("unknown");
-    if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
-        (row[DB_file] == NULL) || (row[DB_name] == NULL)) {
+    if ((row[DB_type] == NULL) || (row[DB_file] == NULL)
+        || (row[DB_name] == NULL)) {
         BIO_printf(bio_err, "Memory allocation failure\n");
         goto end;
     }