From 691064c47fd6a7d11189df00a0d1b94d8051cbe0 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 22 Feb 2016 16:44:46 +0000 Subject: Elide OPENSSL_INIT_set_config_filename() for no-stdio build Strictly speaking, it isn't stdio and file access which offend me here; it's the fact that UEFI doesn't provide a strdup() function. But the fact that it's pointless without file access is a good enough excuse for compiling it out. Reviewed-by: Tim Hudson Reviewed-by: Rich Salz --- crypto/conf/conf_lib.c | 2 ++ include/openssl/crypto.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index a84b643fc2..f1977148b4 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -387,12 +387,14 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void) } +#ifndef OPENSSL_NO_STDIO void OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings, const char *config_file) { free(settings->config_name); settings->config_name = config_file == NULL ? NULL : strdup(config_file); } +#endif void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings) { diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index a881fada73..bcc5aee94c 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -565,8 +565,10 @@ void OPENSSL_thread_stop(void); /* Low-level control of initialization */ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void); +#ifndef OPENSSL_NO_STDIO void OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings, const char *config_file); +#endif void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings); /* BEGIN ERROR CODES */ -- cgit v1.2.3