From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 16 May 2025 12:26:42 +0000 (+0200)
Subject: dnsdist: two fixes to enable building on OpenBSD with quic enabled
X-Git-Tag: dnsdist-2.0.0-alpha2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15564%2Fhead;p=thirdparty%2Fpdns.git

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 7651a3025a..a175d07cd6 100644
--- 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 efa534d1cc..a5a241841a 100644
--- 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