From 6217b656495a87c47598d19504bf0f29a5fed993 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 16 May 2025 14:26:42 +0200 Subject: [PATCH] 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 \ --- meson/libssl/meson.build | 2 +- pdns/libssl.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.2