dnsdist: two fixes to enable building on OpenBSD with quic enabled

Meson setup used:

meson setup build \
        -Dlibedit=auto \
        -Dcdb=auto \
        -Dcpp_args=-DDISABLE_OCSP_STAPLING \
        -Ddns-over-http3=enabled \
        -Ddns-over-https=enabled \
        -Ddns-over-quic=enabled \
        -Ddns-over-tls=enabled \
        -Dlmdb=enabled \
        -Dsnmp=disabled \
        -Dtls-gnutls=disabled \
        -Dtls-libssl-dir=/usr/local/eboringssl \
        -Dunit-tests=true \
        -Dyaml=enabled \
        -Ddnstap=enabled \

diff --git a/meson/libssl/meson.build b/meson/libssl/meson.build
index 7651a3025a6dfc2e927d8d1266ab4afae22e4a55..a175d07cd60ec2ec20ae0665d3da7189e5054368 100644 (file)
--- a/meson/libssl/meson.build
+++ b/meson/libssl/meson.build
@@ -5,7 +5,7 @@ opt_libssl_dir = get_option('tls-libssl-dir')
 if opt_libssl_dir != ''
   dep_libssl = declare_dependency(
     include_directories: [opt_libssl_dir / 'include'],
-    link_args: ['-L' + opt_libssl_dir / 'lib', '-lssl'],
+    link_args: ['-L' + opt_libssl_dir / 'lib', '-lssl', '-lcrypto'],
   )
 else
   dep_libssl = dependency('libssl', required: opt_libssl)

diff --git a/pdns/libssl.cc b/pdns/libssl.cc
index efa534d1cc89c26dbef79dd4ffe41a96b78419a8..a5a241841a33b7476f4cca9ff02518595acf04a3 100644 (file)
--- a/pdns/libssl.cc
+++ b/pdns/libssl.cc
@@ -547,7 +547,7 @@ struct StackOfNamesDeleter
 
 #if defined(OPENSSL_IS_BORINGSSL)
 /* return type of OpenSSL's sk_XXX_num() */
-using SSLStackIndex size_t;
+using SSLStackIndex = size_t;
 #else
 using SSLStackIndex = int;
 #endif