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 /test/ssl_test.c | |
| parent | a051af0e75bf717cc818db498d9b977953816f80 (diff) | |
| download | openssl-dbabc862966b9afbcc55c59cc07ab643a14ffb31.tar.gz | |
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 'test/ssl_test.c')
| -rw-r--r-- | test/ssl_test.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index f2a18121bb..7453a9d10e 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -467,6 +467,11 @@ static int test_handshake(int idx) } } +#ifdef OPENSSL_NO_AUTOLOAD_CONFIG + if (!TEST_true(OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL))) + goto err; +#endif + if (!TEST_ptr(server_ctx) || !TEST_ptr(client_ctx) || !TEST_int_gt(CONF_modules_load(conf, test_app, 0), 0)) |