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)
This commit is contained in:
Dr. David von Oheimb 2020-07-18 16:09:19 +02:00
parent 4f8fbf372e
commit bf19b64aae
1 changed files with 3 additions and 5 deletions

View File

@ -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)