From: Richard Levitte <levitte@openssl.org>
Date: Wed, 25 Nov 2020 13:13:30 +0000 (+0100)
Subject: APPS: Modify apps/cmp.c to use set_base_ui_method() for its -batch option
X-Git-Tag: openssl-3.0.0-alpha10~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=467f441bc63f5c017a3626bcba9582e96d4790ad;p=thirdparty%2Fopenssl.git

APPS: Modify apps/cmp.c to use set_base_ui_method() for its -batch option

Fixes #13511

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13512)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index 17173374dfe..c9bbbb32ba8 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2697,12 +2697,8 @@ int cmp_main(int argc, char **argv)
         goto err;
     ret = 0;
 
-    if (opt_batch) {
-#ifndef OPENSSL_NO_UI_CONSOLE
-        UI_method_set_reader(UI_OpenSSL(), NULL);
-        /* can't change get_ui_method() here as load_key_certs_crls() uses it */
-#endif
-    }
+    if (opt_batch)
+        set_base_ui_method(UI_null());
 
     if (opt_engine != NULL)
         engine = setup_engine_methods(opt_engine, 0 /* not: ENGINE_METHOD_ALL */, 0);