[#1665] Cleaned up configure warnings

diff --git a/ChangeLog b/ChangeLog
index 0f5ec5467c9e67d859ba1ed26431ee07014e678b..fa28d999bea440b353c44719fed97b36074a9710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1893.  [func]          fdupont
+       Botan 2.14 or later can now be used as a crypto library for
+       TLS/HTTPS support in Kea.
+       (Gitlab #1665)
+
 1892.  [func]          fdupont
        Added + operator as an convenient alias to concat() function
        in expressions.

diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index db277b15e7abe355eac00d10f9e25534869443b7..7af641807b5b0629f4a459e5bcdf365a271de8a3 100644 (file)
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -395,10 +395,9 @@ then
                [Define to 1 if Botan boost TLS is available])],
               [AC_MSG_RESULT(no)
                BOTAN_BOOST="no"
-               AC_MSG_WARN([Botan is configured with boost support but is too old: only Botan >= 2.14.0 can be used for TLS])])],
+               AC_MSG_WARN([Botan is configured with boost support but is too old: only Botan >= 2.14.0 can be used for TLS support.])])],
         [BOTAN_BOOST="no"
-         AC_MSG_RESULT([Botan was not configured with boost support.])
-         AC_MSG_WARN([Botan cannot be used for TLS support.])])
+         AC_MSG_WARN([Botan cannot be used for TLS support, because it was compiled without boost support, so required headers are missing.])])
     CPPFLAGS=${CPPFLAGS_SAVED}
 fi
 if test "x${CRYPTO_NAME}" = "xOpenSSL"

diff --git a/src/lib/asiolink/tests/tls_unittest.cc b/src/lib/asiolink/tests/tls_unittest.cc
index 90fba69ea70d15537ad9b3f8e1c2edfe18f44e27..f57c4400dc008f0d4a7e9962c3a02574c1abde68 100644 (file)
--- a/src/lib/asiolink/tests/tls_unittest.cc
+++ b/src/lib/asiolink/tests/tls_unittest.cc
@@ -695,7 +695,7 @@ TEST(TLSTest, configureError) {
         string key = string(TEST_CA_DIR) + "/kea-client.key";
         TlsContext::configure(ctx1, TlsRole::CLIENT,
                               ca, cert, key, true);
-        // The context is reseted on errors.
+        // The context is reset on errors.
         EXPECT_FALSE(ctx1);
     });
     if (Expecteds::displayErrMsg()) {