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 /crypto/evp/evp_key.c | |
| parent | 6e2f49b38429d9df00ed12ade60e3de3b9ba43b3 (diff) | |
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 'crypto/evp/evp_key.c')
| -rw-r--r-- | crypto/evp/evp_key.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index 8a4297cf6e..0d63e4f5bf 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -14,7 +14,6 @@ #include <openssl/evp.h> #include <openssl/ui.h> -#ifndef OPENSSL_NO_UI /* should be init to zeros. */ static char prompt_string[80]; @@ -69,7 +68,6 @@ int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, OPENSSL_cleanse(buff, BUFSIZ); return ret; } -#endif /* OPENSSL_NO_UI */ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, const unsigned char *salt, const unsigned char *data, |