4344. [port] Address openssl version differences. [RT #42059]

diff --git a/CHANGES b/CHANGES
index af8bf1b8d399606268790560ead5d98d9fc2d8eb..4a5762736a1af99fe1568002a5f96149a7a69887 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4344.  [port]          Address openssl version differences. [RT #42059]
+
        --- 9.10.4b3 released ---
 
 4342.  [bug]           'rndc flushtree' could fail to clean the tree if there

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 25981e1949dbccf9559eee3f217eb3a357588d54..3a9d8d39af295fa7e5383a999958e73bc299a175 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -206,6 +206,9 @@ dst__openssl_init(const char *engine) {
        rm->status = entropy_status;
 
 #ifdef USE_ENGINE
+#if !defined(CONF_MFLAGS_DEFAULT_SECTION)
+       OPENSSL_config(NULL);
+#else
        /*
         * OPENSSL_config() can only be called a single time as of
         * 1.0.2e so do the steps individually.
@@ -216,6 +219,7 @@ dst__openssl_init(const char *engine) {
        CONF_modules_load_file(NULL, NULL,
                               CONF_MFLAGS_DEFAULT_SECTION |
                               CONF_MFLAGS_IGNORE_MISSING_FILE);
+#endif
 
        if (engine != NULL && *engine == '\0')
                engine = NULL;