[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  426005eea5afd64bb76006f0fda69502ab3e008d (commit)
      from  92eb592b3b70a1f8e08b7160e54e367ba0d0aca2 (commit)


- Log -----------------------------------------------------------------
commit 426005eea5afd64bb76006f0fda69502ab3e008d
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 25 08:36:30 2021 +0200

    Fix 'openssl req' to correctly use the algorithm from '-newkey algo:nnnn'
    
    We used the original string, which meant fetching for, for example,
    'rsa:2048'.  That was, of course, doomed to fail.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15912)

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

Summary of changes:
 apps/req.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/req.c b/apps/req.c
index d0c620438b..eb286f8a8e 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1615,14 +1615,14 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
         EVP_PKEY_free(param);
     } else {
         if (keygen_engine != NULL) {
-            int pkey_id = get_legacy_pkey_id(app_get0_libctx(), keytype,
+            int pkey_id = get_legacy_pkey_id(app_get0_libctx(), *pkeytype,
                                              keygen_engine);
 
             if (pkey_id != NID_undef)
                 gctx = EVP_PKEY_CTX_new_id(pkey_id, keygen_engine);
         } else {
             gctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
-                                              keytype, app_get0_propq());
+                                              *pkeytype, app_get0_propq());
         }
     }