[#3553] Addressed comments

diff --git a/src/lib/asiolink/botan_wrapper.h b/src/lib/asiolink/botan_wrapper.h
index 9c2a9f09ba2cd96b688f890dc602acffc6e56299..91c130dcdef65fc24d969ae4771f43a5928ac7bb 100644 (file)
--- 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 2ce2e9008dc6ef36633a3918c21046119c951753..7c05db616b08a882f02c01efa979c5861bd96cac 100644 (file)
--- 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 cdecfbc5721165c030d429d1b0e754b9cb744763..a2122cf30056002a355c0b704d43016ee0e1129c 100644 (file)
--- 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 fc4f773a80fb35a66d0834c55b75162462dc05dc..058e4d4670d5a4e26eae9839c7eff917867eef4f 100644 (file)
--- 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>