diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-07-01 12:14:37 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-07-03 07:51:04 +0200 |
| commit | 48feaceb53fa6ae924e298b8eba0e247019313e4 (patch) | |
| tree | 535524c1e9e1f24c7e0341e7721416c8e5d175eb /test/uitest.c | |
| parent | 6e2f49b38429d9df00ed12ade60e3de3b9ba43b3 (diff) | |
| download | openssl-48feaceb53fa6ae924e298b8eba0e247019313e4.zip openssl-48feaceb53fa6ae924e298b8eba0e247019313e4.tar.gz openssl-48feaceb53fa6ae924e298b8eba0e247019313e4.tar.bz2 | |
Remove the possibility to disable the UI module entirely
Instead, make it possible to disable the console reader that's part of
the UI module. This makes it possible to use the UI API and other UI
methods in environments where the console reader isn't useful.
To disable the console reader, configure with 'no-ui-console' /
'disable-ui-console'.
'no-ui' / 'disable-ui' is now an alias for 'no-ui-console' /
'disable-ui-console'.
Fixes #3806
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3820)
Diffstat (limited to 'test/uitest.c')
| -rw-r--r-- | test/uitest.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/uitest.c b/test/uitest.c index 469e230..6fef137 100644 --- a/test/uitest.c +++ b/test/uitest.c @@ -17,8 +17,7 @@ /* apps/apps.c depend on these */ char *default_config_file = NULL; -#ifndef OPENSSL_NO_UI -# include <openssl/ui.h> +#include <openssl/ui.h> /* Old style PEM password callback */ static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata) @@ -89,12 +88,8 @@ static int test_new_ui() return ok; } -#endif - void register_tests(void) { -#ifndef OPENSSL_NO_UI ADD_TEST(test_old); ADD_TEST(test_new_ui); -#endif } |