diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-21 11:36:52 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-07 12:52:56 -0500 |
| commit | db922318b3470db8629979f24d4f0f82e9561190 (patch) | |
| tree | 1aa344725de5446ffccc90998c727d95c91a5a4d | |
| parent | d3054fb663a6a3a4689e52c10bb3094c39a3bce8 (diff) | |
Elide EVP_read_pw_string() and friends for no-ui
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
| -rw-r--r-- | crypto/evp/evp_key.c | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 2 | ||||
| -rw-r--r-- | include/openssl/evp.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index ccd9280d92..995d35503c 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -62,6 +62,7 @@ #include <openssl/evp.h> #include <openssl/ui.h> +#ifndef OPENSSL_NO_UI /* should be init to zeros. */ static char prompt_string[80]; @@ -116,6 +117,7 @@ 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, diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 946b00ef6d..54ddc1efbb 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -81,7 +81,7 @@ int pem_check_suffix(const char *pem_str, const char *suffix); int PEM_def_callback(char *buf, int num, int w, void *key) { -#ifdef OPENSSL_NO_STDIO +#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI) /* * We should not ever call the default callback routine from windows. */ diff --git a/include/openssl/evp.h b/include/openssl/evp.h index aef43f411b..0b6b82a0f9 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -557,11 +557,13 @@ int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags); __owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s); +#ifndef OPENSSL_NO_UI int EVP_read_pw_string(char *buf, int length, const char *prompt, int verify); int EVP_read_pw_string_min(char *buf, int minlen, int maxlen, const char *prompt, int verify); void EVP_set_pw_prompt(const char *prompt); char *EVP_get_pw_prompt(void); +#endif __owur int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, const unsigned char *salt, |