Skip to content

Commit f6ada26

Browse files
committed
[#3552] Addressed comments
1 parent 2a492e0 commit f6ada26

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

doc/sphinx/arm/security.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ that must be used:
7676

7777
Without these header files, or with a Botan version prior
7878
to 2.14.0, Kea cannot build as the TLS/HTTPS support is considered
79-
as essential for security.
79+
essential for security.
8080

8181
- Very old Boost versions provide SSL support (based on OpenSSL)
8282
without offering a choice of the TLS version; Kea can still use them,

src/lib/asiolink/botan_tls.cc

-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ class KeaPolicy : public Botan::TLS::Default_Policy {
182182
static const std::vector<std::string> AllowedSignatureMethodsECDSA;
183183
};
184184

185-
186185
// Kea session manager.
187186
using KeaSessionManager = Botan::TLS::Session_Manager_Noop;
188187

src/lib/asiolink/botan_tls.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TlsContext : public TlsContextBase {
4343

4444
/// @brief Destructor.
4545
///
46-
/// @note The destructor can't be defined here because a unique
46+
/// @note The destructor can't be defined here because a unique
4747
/// pointer to an incomplete type is used.
4848
virtual ~TlsContext();
4949

src/lib/cryptolink/botan_hmac.cc

-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class HMACImpl {
6666
isc_throw(LibraryError, "Botan error: " << exc.what());
6767
}
6868

69-
// If the key length is larger than the block size, we hash the
70-
// key itself first.
7169
try {
7270
// Botan 1.8 considers len 0 a bad key. 1.9 does not,
7371
// but we won't accept it anyway, and fail early

src/lib/http/tests/tls_client_unittests.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
#include <http/tests/tls_response_creator_test.h>
3838

3939
#ifdef WITH_BOTAN
40-
#define DISABLE_SOME_TESTS
40+
// All tests work with last Botan versions so commenting this.
41+
// #define DISABLE_SOME_TESTS
4142
#endif
4243
#ifdef WITH_OPENSSL
4344
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)

0 commit comments

Comments
 (0)