From: Francis Dupont <fdupont@isc.org>
Date: Wed, 11 Jun 2025 16:41:53 +0000 (+0200)
Subject: [#3553] Addressed comments
X-Git-Tag: Kea-3.1.0~14
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0eaa2c3e1f24a7e06621b582906fa9fa244c2e0f;p=thirdparty%2Fkea.git

[#3553] Addressed comments
---

diff --git a/src/lib/asiolink/botan_wrapper.h b/src/lib/asiolink/botan_wrapper.h
index 9c2a9f09ba..91c130dcde 100644
--- a/src/lib/asiolink/botan_wrapper.h
+++ b/src/lib/asiolink/botan_wrapper.h
@@ -21,6 +21,13 @@
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
 #endif
 
+/// MariaDB defines PROTOCOL_VERSION which is also in a Botan enum...
+
+#ifdef PROTOCOL_VERSION
+#define BOTAN_BACKUP_FOR_PROTOCOL_VERSION PROTOCOL_VERSION
+#undef PROTOCOL_VERSION
+#endif
+
 #include <boost/beast/core/error.hpp>
 
 #ifdef BOTAN_BACKUP_FOR_PROTOCOL_VERSION
diff --git a/src/lib/asiolink/testutils/botan_sample_client.cc b/src/lib/asiolink/testutils/botan_sample_client.cc
index 2ce2e9008d..7c05db616b 100644
--- a/src/lib/asiolink/testutils/botan_sample_client.cc
+++ b/src/lib/asiolink/testutils/botan_sample_client.cc
@@ -72,7 +72,7 @@ public:
                   const std::string&,
                   const std::string&) override
   {
-        return (key_);
+    return (key_);
   }
 
   std::vector<Botan::Certificate_Store*> stores_;
diff --git a/src/lib/asiolink/testutils/botan_sample_server.cc b/src/lib/asiolink/testutils/botan_sample_server.cc
index cdecfbc572..a2122cf300 100644
--- a/src/lib/asiolink/testutils/botan_sample_server.cc
+++ b/src/lib/asiolink/testutils/botan_sample_server.cc
@@ -64,12 +64,12 @@ public:
     return certs_;
   }
 
-    std::shared_ptr<Botan::Private_Key>
+  std::shared_ptr<Botan::Private_Key>
   private_key_for(const Botan::X509_Certificate&,
                   const std::string&,
                   const std::string&) override
   {
-        return (key_);
+    return (key_);
   }
 
   std::vector<Botan::Certificate_Store*> stores_;
diff --git a/src/lib/cryptolink/botan_hmac.cc b/src/lib/cryptolink/botan_hmac.cc
index fc4f773a80..058e4d4670 100644
--- a/src/lib/cryptolink/botan_hmac.cc
+++ b/src/lib/cryptolink/botan_hmac.cc
@@ -10,6 +10,7 @@
 #include <cryptolink/crypto_hmac.h>
 
 #include <botan/mac.h>
+#include <botan/mem_ops.h>
 #include <botan/exceptn.h>
 
 #include <cryptolink/botan_common.h>