From 165675d036d6e0c5dc75c846eaede36c61b7c3a2 Mon Sep 17 00:00:00 2001 From: Rene Meusel Date: Wed, 19 Jul 2023 09:02:07 +0200 Subject: [PATCH] FIX: silent module dependencies in TLS and XMSS tests --- src/tests/test_tls_messages.cpp | 6 +++++- src/tests/test_xmss.cpp | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/tests/test_tls_messages.cpp b/src/tests/test_tls_messages.cpp index 88794e277aa..716b4d0f3ac 100644 --- a/src/tests/test_tls_messages.cpp +++ b/src/tests/test_tls_messages.cpp @@ -206,6 +206,7 @@ class TLS_Message_Parsing_Test final : public Text_Based_Test { BOTAN_REGISTER_TEST("tls", "tls_messages", TLS_Message_Parsing_Test); #if defined(BOTAN_HAS_TLS_13) + #if defined(BOTAN_HAS_CURVE_25519) class TLS_Key_Share_CH_Generation_Test final : public Text_Based_Test { public: TLS_Key_Share_CH_Generation_Test() : @@ -238,6 +239,10 @@ class TLS_Key_Share_CH_Generation_Test final : public Text_Based_Test { } }; +BOTAN_REGISTER_TEST("tls_extensions", "tls_extensions_key_share_client_hello", TLS_Key_Share_CH_Generation_Test); + + #endif + class TLS_Extension_Parsing_Test final : public Text_Based_Test { public: TLS_Extension_Parsing_Test() : @@ -393,7 +398,6 @@ class TLS_Extension_Parsing_Test final : public Text_Based_Test { }; BOTAN_REGISTER_TEST("tls_extensions", "tls_extensions_parsing", TLS_Extension_Parsing_Test); -BOTAN_REGISTER_TEST("tls_extensions", "tls_extensions_key_share_client_hello", TLS_Key_Share_CH_Generation_Test); class TLS_13_Message_Parsing_Test final : public Text_Based_Test { public: diff --git a/src/tests/test_xmss.cpp b/src/tests/test_xmss.cpp index b9520579058..a4a39852256 100644 --- a/src/tests/test_xmss.cpp +++ b/src/tests/test_xmss.cpp @@ -12,6 +12,7 @@ #if defined(BOTAN_HAS_XMSS_RFC8391) #include "test_pubkey.h" #include "test_rng.h" + #include #include #endif @@ -116,6 +117,12 @@ class XMSS_Keygen_Reference_Test final : public Text_Based_Test { } bool skip_this_test(const std::string& /*header*/, const VarMap& vars) override { + // skip if this build does not provide the requested hash function + const auto params = Botan::XMSS_Parameters(vars.get_req_str("Params")); + if(Botan::HashFunction::create(params.hash_function_name()) == nullptr) { + return true; + } + if(Test::run_long_tests()) { return false; }