commit d0190e11639956677747f6bc7bb5bcd610fd8600
author Rich Salz <rsalz@akamai.com> Mon Feb 08 14:03:35 2021 -0500
committer Pauli <ppzgs1@gmail.com> Fri Feb 12 08:34:17 2021 +1000
tree 65b3b8fa880bd32563f4e59bc82624489673da6d
parent 51e5df0ed01efa47335940425cc8744ecff1b6ae

Process digest option after loading providers

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14135)

apps/ts.c

diff --git a/apps/ts.c b/apps/ts.c
index 12958fb..8500968 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -160,7 +160,7 @@
     CONF *conf = NULL;
     const char *CAfile = NULL, *untrusted = NULL, *prog;
     const char *configfile = default_config_file, *engine = NULL;
-    const char *section = NULL;
+    const char *section = NULL, *digestname = NULL;
     char **helpp;
     char *password = NULL;
     char *data = NULL, *digest = NULL, *policy = NULL;
@@ -276,8 +276,7 @@
             engine = opt_arg();
             break;
         case OPT_MD:
-            if (!opt_md(opt_unknown(), &md))
-                goto opthelp;
+            digestname = opt_unknown();
             break;
         case OPT_V_CASES:
             if (!opt_verify(o, vpm))
@@ -293,6 +292,10 @@
         goto opthelp;
 
     app_RAND_load();
+    if (digestname != NULL) {
+        if (!opt_md(digestname, &md))
+            goto opthelp;
+    }
     if (mode == OPT_REPLY && passin &&
         !app_passwd(passin, NULL, &password, NULL)) {
         BIO_printf(bio_err, "Error getting password.\n");