From: Rich Salz <rsalz@akamai.com>
Date: Thu, 15 Apr 2021 21:00:57 +0000 (-0400)
Subject: Fetch before get-by-name
X-Git-Tag: openssl-3.0.0-alpha15~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99adfa455ccd1abb73e264224c33c09e586776d2;p=thirdparty%2Fopenssl.git

Fetch before get-by-name

This causes tests to break.  Pushing it to help others debug.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/14219)
---

diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index d22a884e671..f6324ba323c 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -373,10 +373,10 @@ int opt_cipher(const char *name, EVP_CIPHER **cipherp)
  */
 int opt_md(const char *name, EVP_MD **mdp)
 {
-    *mdp = (EVP_MD *)EVP_get_digestbyname(name);
+    *mdp = EVP_MD_fetch(NULL, name, NULL);
     if (*mdp != NULL)
         return 1;
-    *mdp = EVP_MD_fetch(NULL, name, NULL);
+    *mdp = (EVP_MD *)EVP_get_digestbyname(name);
     if (*mdp != NULL)
         return 1;
     opt_printf_stderr("%s: Unknown option or message digest: %s\n", prog,