From 51855128c784d0b70c29af1c9a5ca0915ad50354 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 31 Oct 2024 13:29:12 +0000 Subject: [PATCH] [Test] A workaround for brain-damaged libstdc++ from prehistoric ages --- test/rspamd_cxx_unit_cryptobox.hxx | 38 +++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/test/rspamd_cxx_unit_cryptobox.hxx b/test/rspamd_cxx_unit_cryptobox.hxx index 18ccd98ce..7d9c76b4e 100644 --- a/test/rspamd_cxx_unit_cryptobox.hxx +++ b/test/rspamd_cxx_unit_cryptobox.hxx @@ -21,7 +21,23 @@ #include "libcryptobox/cryptobox.h" #include #include -#include +#include +#include + +namespace std// NOLINT(cert-dcl58-cpp) +{ +template +ostream &operator<<(ostream &stream, const vector &in) +{ + stream << "["; + for (size_t i = 0; i < in.size(); ++i) { + if (i != 0) { stream << ", "; } + stream << in[i]; + } + stream << "]"; + return stream; +} +}// namespace std TEST_SUITE("rspamd_cryptobox") { @@ -190,10 +206,10 @@ TEST_SUITE("rspamd_cryptobox") const char *pk = "k4nz984k36xmcynm1hr9kdbn6jhcxf4ggbrb1quay7f88rpm9kay"; gsize outlen; auto *pk_decoded = rspamd_decode_base32(pk, strlen(pk), &outlen, RSPAMD_BASE32_DEFAULT); - const unsigned char expected[32] = {95, 76, 225, 188, 0, 26, 146, 94, 70, 249, - 90, 189, 35, 51, 1, 42, 9, 37, 94, 254, 204, 55, 198, 91, 180, 90, - 46, 217, 140, 226, 211, 90}; - const auto expected_arr = std::to_array(expected); + unsigned char expected[32] = {95, 76, 225, 188, 0, 26, 146, 94, 70, 249, + 90, 189, 35, 51, 1, 42, 9, 37, 94, 254, 204, 55, 198, 91, 180, 90, + 46, 217, 140, 226, 211, 90}; + const auto expected_arr = std::vector(std::begin(expected), std::end(expected)); CHECK(outlen == 32); unsigned char out[32]; @@ -202,7 +218,7 @@ TEST_SUITE("rspamd_cryptobox") sk[31] &= 127; sk[31] |= 64; CHECK(crypto_scalarmult(out, sk, pk_decoded) != -1); - auto out_arr = std::to_array(out); + auto out_arr = std::vector(std::begin(out), std::end(out)); CHECK(out_arr == expected_arr); } @@ -217,16 +233,16 @@ TEST_SUITE("rspamd_cryptobox") const char *pk = "k4nz984k36xmcynm1hr9kdbn6jhcxf4ggbrb1quay7f88rpm9kay"; gsize outlen; auto *pk_decoded = rspamd_decode_base32(pk, strlen(pk), &outlen, RSPAMD_BASE32_DEFAULT); - const unsigned char expected[32] = {61, 109, 220, 195, 100, 174, 127, 237, 148, - 122, 154, 61, 165, 83, 93, 105, 127, 166, 153, 112, 103, 224, 2, 200, - 136, 243, 73, 51, 8, 163, 150, 7}; - const auto expected_arr = std::to_array(expected); + unsigned char expected[32] = {61, 109, 220, 195, 100, 174, 127, 237, 148, + 122, 154, 61, 165, 83, 93, 105, 127, 166, 153, 112, 103, 224, 2, 200, + 136, 243, 73, 51, 8, 163, 150, 7}; + const auto expected_arr = std::vector(std::begin(expected), std::end(expected)); CHECK(outlen == 32); unsigned char out[32]; rspamd_cryptobox_nm(out, pk_decoded, sk); - auto out_arr = std::to_array(out); + auto out_arr = std::vector(std::begin(out), std::end(out)); CHECK(out_arr == expected_arr); } } -- 2.39.5