diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-15 12:02:25 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-17 16:33:15 +0200 |
| commit | dbabc862966b9afbcc55c59cc07ab643a14ffb31 (patch) | |
| tree | 85d5a843d9d259a32be3d87b5bcde50b97ba64bb /ssl/ssl_init.c | |
| parent | Prepare for 1.1.1-pre6-dev (diff) | |
| download | openssl-dbabc862966b9afbcc55c59cc07ab643a14ffb31.tar.xz openssl-dbabc862966b9afbcc55c59cc07ab643a14ffb31.zip | |
Add a config option to disable automatic config loading
./config no-autoload-config
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5959)
Diffstat (limited to 'ssl/ssl_init.c')
| -rw-r--r-- | ssl/ssl_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 607355681d..ed2bf845d4 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -195,7 +195,9 @@ int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings) } if (!OPENSSL_init_crypto(opts +#ifndef OPENSSL_NO_AUTOLOAD_CONFIG | OPENSSL_INIT_LOAD_CONFIG +#endif | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, settings)) |