[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  3d0b56785aeefd2b5a08a0da99d6a09ae6a494b9 (commit)
      from  8bf611bc7f68ae6480f30e4ef085d141f3a2b884 (commit)


- Log -----------------------------------------------------------------
commit 3d0b56785aeefd2b5a08a0da99d6a09ae6a494b9
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 10 10:34:18 2021 +0000

    Don't crash if the pkeyopt doesn't have a value
    
    All pkeyopt's must have a ":" and a value for the option. Not supplying
    one can cause a crash
    
    Fixes #14494
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14496)

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

Summary of changes:
 apps/lib/apps.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 2a5ec6bb65..2938e91620 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -1790,17 +1790,21 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
 
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
 {
-    int rv;
+    int rv = 0;
     char *stmp, *vtmp = NULL;
+
     stmp = OPENSSL_strdup(value);
-    if (!stmp)
+    if (stmp == NULL)
         return -1;
     vtmp = strchr(stmp, ':');
-    if (vtmp) {
-        *vtmp = 0;
-        vtmp++;
-    }
+    if (vtmp == NULL)
+        goto err;
+
+    *vtmp = 0;
+    vtmp++;
     rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
+
+ err:
     OPENSSL_free(stmp);
     return rv;
 }