- Fix #4206: OpenSSL 1.0.2 hostname verification for FreeBSD 11.2.

git-svn-id: file:///svn/unbound/trunk@5106 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/remote.c b/daemon/remote.c
index 48efba7409c8bce401715a9e92324afc470b41c4..1689154f5721cf808c70e36b028b8f8bb7c7f225 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1987,7 +1987,7 @@ parse_delegpt(RES* ssl, char* args, uint8_t* nm, int allow_names)
                                return NULL;
                        }
                } else {
-#ifndef HAVE_SSL_SET1_HOST
+#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST)
                        if(auth_name)
                          log_err("no name verification functionality in "
                                "ssl library, ignored name for %s", todo);

diff --git a/doc/Changelog b/doc/Changelog
index 1f718fc1e75ad88e199324820f02a320e56d43e0..2f06464f1931e1eb855711853e8f3495fb0ee477 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+7 February 2019: Wouter
+       - Fix #4206: OpenSSL 1.0.2 hostname verification for FreeBSD 11.2.
+
 4 February 2019: Wouter
        - Fix that log-replies prints the correct name for local-alias
          names, for names that have a CNAME in local-data configuration.

diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c
index 4eb0eb71860796bbe1ebd20b7bc2fbd50f11d675..ea3d70e07320f5b149ec2dac776cb30a1e3bfc92 100644 (file)
--- a/iterator/iter_fwd.c
+++ b/iterator/iter_fwd.c
@@ -239,7 +239,7 @@ read_fwds_addr(struct config_stub* s, struct delegpt* dp)
                                s->name, p->str);
                        return 0;
                }
-#ifndef HAVE_SSL_SET1_HOST
+#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST)
                if(tls_auth_name)
                        log_err("no name verification functionality in "
                                "ssl library, ignored name for %s", p->str);

diff --git a/iterator/iter_hints.c b/iterator/iter_hints.c
index 0b35a9d9e24fd6baf921555c40de74fe73b967b0..60e518122ed14d1106ce9aed9889ed8d0bf5cb00 100644 (file)
--- a/iterator/iter_hints.c
+++ b/iterator/iter_hints.c
@@ -252,7 +252,7 @@ read_stubs_addr(struct config_stub* s, struct delegpt* dp)
                                s->name, p->str);
                        return 0;
                }
-#ifndef HAVE_SSL_SET1_HOST
+#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST)
                if(auth_name)
                        log_err("no name verification functionality in "
                                "ssl library, ignored name for %s", p->str);