summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2016-02-21 12:36:52 +0100
committerRich Salz <rsalz@openssl.org>2016-03-07 18:52:56 +0100
commitdb922318b3470db8629979f24d4f0f82e9561190 (patch)
tree1aa344725de5446ffccc90998c727d95c91a5a4d /crypto/pem
parentGH768: Minor grammar nits in CRYPTO_get_ex_new_index.pod (diff)
downloadopenssl-db922318b3470db8629979f24d4f0f82e9561190.tar.xz
openssl-db922318b3470db8629979f24d4f0f82e9561190.zip
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>
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_lib.c2
1 files changed, 1 insertions, 1 deletions
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.
*/