From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Sat, 18 Jul 2020 14:09:19 +0000 (+0200)
Subject: Fix UI method setup, which should be independent of (deprecated) engine use
X-Git-Tag: openssl-3.0.0-alpha6~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf19b64aaeeddd5463d911823f9e2c3c40091005;p=thirdparty%2Fopenssl.git

Fix UI method setup, which should be independent of (deprecated) engine use

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12422)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index 87daa37dfa2..17b5bed6ff4 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2924,15 +2924,13 @@ int cmp_main(int argc, char **argv)
     ret = 0;
 
     if (opt_batch) {
-#ifndef OPENSSL_NO_ENGINE
         UI_METHOD *ui_fallback_method;
-# ifndef OPENSSL_NO_UI_CONSOLE
+#ifndef OPENSSL_NO_UI_CONSOLE
         ui_fallback_method = UI_OpenSSL();
-# else
+#else
         ui_fallback_method = (UI_METHOD *)UI_null();
-# endif
-        UI_method_set_reader(ui_fallback_method, NULL);
 #endif
+        UI_method_set_reader(ui_fallback_method, NULL);
     }
 
     if (opt_engine != NULL)