projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add a config option to disable automatic config loading
[oweals/openssl.git]
/
ssl
/
ssl_init.c
diff --git
a/ssl/ssl_init.c
b/ssl/ssl_init.c
index 607355681d12d732d0b6d4aa9f8e640a24c121b0..ed2bf845d40939878542a37f51420a487d7bca35 100644
(file)
--- 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))