diff options
| author | Daniel Gustafsson <daniel@yesql.se> | 2019-06-17 13:11:02 +0200 |
|---|---|---|
| committer | Daniel Gustafsson <daniel@yesql.se> | 2019-06-17 13:11:02 +0200 |
| commit | 03a22a26c6f9bb5fe122f7b61b508486c2a03f32 (patch) | |
| tree | 48a8bbe2663063bc3a145c3d8333fbf45a4c53eb | |
| parent | 4b1e7dd4ee70e898d00c74e2d4c6b0a60ded6dc3 (diff) | |
| download | curl-03a22a26c6f9bb5fe122f7b61b508486c2a03f32.tar.gz | |
openssl: remove outdated comment
OpenSSL used to call exit(1) on syntax errors in OPENSSL_config(),
which is why we switched to CONF_modules_load_file() and introduced
a comment stating why. This behavior was however changed in OpenSSL
commit abdd677125f3a9e3082f8c5692203590fdb9b860, so remove the now
outdated and incorrect comment. The mentioned commit also declares
OPENSSL_config() deprecated so keep the current coding.
Closes #4033
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
| -rw-r--r-- | lib/vtls/openssl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 85e9be616..1a7a18563 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1022,14 +1022,8 @@ static int Curl_ossl_init(void) ENGINE_load_builtin_engines(); #endif - /* OPENSSL_config(NULL); is "strongly recommended" to use but unfortunately - that function makes an exit() call on wrongly formatted config files - which makes it hard to use in some situations. OPENSSL_config() itself - calls CONF_modules_load_file() and we use that instead and we ignore - its return code! */ - - /* CONF_MFLAGS_DEFAULT_SECTION introduced some time between 0.9.8b and - 0.9.8e */ +/* CONF_MFLAGS_DEFAULT_SECTION was introduced some time between 0.9.8b and + 0.9.8e */ #ifndef CONF_MFLAGS_DEFAULT_SECTION #define CONF_MFLAGS_DEFAULT_SECTION 0x0 #endif |