From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 23 Oct 2023 15:18:44 +0000 (+0200)
Subject: Allow building of dnsdist against boringssl.
X-Git-Tag: rec-5.0.0-beta1~36^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd303e7a06d94e131378bad2ed7f0fb51f252e87;p=thirdparty%2Fpdns.git

Allow building of dnsdist against boringssl.

DISABLE_OCSP_STAPLING has to be defined as well, since boring does not
seem to have it.
---

diff --git a/pdns/dnsdist-idstate.hh b/pdns/dnsdist-idstate.hh
index 63daead602..158bae03b2 100644
--- a/pdns/dnsdist-idstate.hh
+++ b/pdns/dnsdist-idstate.hh
@@ -21,6 +21,8 @@
  */
 #pragma once
 
+#include <unordered_map>
+
 #include "config.h"
 #include "dnscrypt.hh"
 #include "dnsname.hh"
diff --git a/pdns/dnsdistdist/m4/dnsdist_enable_doq.m4 b/pdns/dnsdistdist/m4/dnsdist_enable_doq.m4
index e0ea5fc6a1..0488e0ee83 100644
--- a/pdns/dnsdistdist/m4/dnsdist_enable_doq.m4
+++ b/pdns/dnsdistdist/m4/dnsdist_enable_doq.m4
@@ -1,5 +1,5 @@
 AC_DEFUN([DNSDIST_ENABLE_DNS_OVER_QUIC], [
-  AC_MSG_CHECKING([whether to enable incoming DNS over QUIC (DoH) support])
+  AC_MSG_CHECKING([whether to enable incoming DNS over QUIC (DoQ) support])
   AC_ARG_ENABLE([dns-over-quic],
     AS_HELP_STRING([--enable-dns-over-quic], [enable incoming DNS over QUIC (DoQ) support (requires quiche) @<:@default=no@:>@]),
     [enable_dns_over_quic=$enableval],
diff --git a/pdns/libssl.cc b/pdns/libssl.cc
index 7be8348261..c56c7bebef 100644
--- a/pdns/libssl.cc
+++ b/pdns/libssl.cc
@@ -32,6 +32,8 @@
 #include <openssl/core.h>
 #include <openssl/core_names.h>
 #include <openssl/evp.h>
+#else
+#include <openssl/hmac.h>
 #endif
 
 #ifdef HAVE_LIBSODIUM
@@ -288,7 +290,7 @@ int libssl_ticket_key_callback(SSL* /* s */, OpenSSLTLSTicketKeysRing& keyring,
   return 1;
 }
 
-static long libssl_server_name_callback(SSL* ssl, int* al, void* arg)
+static int libssl_server_name_callback(SSL* ssl, int* al, void* arg)
 {
   (void) al;
   (void) arg;