4383. [bug] OPENSSL_config is no longer re-callable. [RT #41348]

(cherry picked from commit bed6e9d614)
This commit is contained in:
Mark Andrews 2015-12-24 10:31:07 +11:00
parent a3866fa7be
commit 08994ed201
2 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,5 @@
4383. [bug] OPENSSL_config is no longer re-callable. [RT #41348]
4281. [bug] Teach dns_message_totext about BADCOOKIE. [RT #41257]
4280. [performance] Use optimal message sizes to improve compression

View file

@ -206,7 +206,16 @@ dst__openssl_init(const char *engine) {
rm->status = entropy_status;
#ifdef USE_ENGINE
OPENSSL_config(NULL);
/*
* OPENSSL_config() can only be called a single time as of
* 1.0.2e so do the steps individually.
*/
OPENSSL_load_builtin_modules();
ENGINE_load_builtin_engines();
ERR_clear_error();
CONF_modules_load_file(NULL, NULL,
CONF_MFLAGS_DEFAULT_SECTION |
CONF_MFLAGS_IGNORE_MISSING_FILE);
if (engine != NULL && *engine == '\0')
engine = NULL;