diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-07-18 16:09:19 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-07-22 07:27:42 +0200 |
| commit | bf19b64aaeeddd5463d911823f9e2c3c40091005 (patch) | |
| tree | 66bcfefd4160dc43e4bfe011727eb659787e188c /apps | |
| parent | 4f8fbf372efedb34e5f8172fa4673a19549cf025 (diff) | |
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)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/cmp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index 87daa37dfa..17b5bed6ff 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) |