ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source
This commit is contained in:
Mark Andrews
2015-12-24 10:31:07 +11:00
parent c1e2310a37
commit bed6e9d614
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
4383. [bug] OPENSSL_config is no longer re-callable. [RT #41348]
4282. [func] 'dig +[no]mapped' determine whether the use of mapped
IPv4 addresses over IPv6 is permitted or not. The
default is +mapped. [RT #41307]

11
lib/dns/openssl_link.c
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;