diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-22 16:44:46 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-07 14:51:08 -0500 |
| commit | 691064c47fd6a7d11189df00a0d1b94d8051cbe0 (patch) | |
| tree | 97db763d1c707067db7bb10658b8930f5e9ad0d6 | |
| parent | b9bd7b06cc409e96ceb7606a79a7f5900aa696fe (diff) | |
| download | openssl-691064c47fd6a7d11189df00a0d1b94d8051cbe0.tar.gz | |
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 <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/conf/conf_lib.c | 2 | ||||
| -rw-r--r-- | include/openssl/crypto.h | 2 |
2 files changed, 4 insertions, 0 deletions
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 */ |