254a4a5619
Hi, currently tests don't build with MSVC, because the Base64 test tries to initialize multiple arrays with a length value that was derived from a non-const context. I have fixed this by using vectors instead. Sincerely Johannes Hayeß From 2d76972a862f0aa04b5011537bef71a49aa82a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Haye=C3=9F?= <jhaye@mailbox.org> Date: Sun, 27 Jun 2021 17:46:24 +0200 Subject: [PATCH] Fix compiling with MSVC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously attempts to initialize arrays with non-const value. This seemingly works on GCC/clang due to their static code analysis, but fails with MSVC. This switches to dynamic memory allocation with std::vector, to solve the problem. Signed-off-by: Johannes Hayeß <jhaye@mailbox.org>
88 lines
2.7 KiB
C++
88 lines
2.7 KiB
C++
#include "olm/base64.hh"
|
|
#include "olm/base64.h"
|
|
#include "unittest.hh"
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
int main() {
|
|
|
|
{ /* Base64 encode test */
|
|
TestCase test_case("Base64 C++ binding encode test");
|
|
|
|
std::uint8_t input[] = "Hello World";
|
|
std::uint8_t expected_output[] = "SGVsbG8gV29ybGQ";
|
|
std::size_t input_length = sizeof(input) - 1;
|
|
|
|
std::size_t output_length = olm::encode_base64_length(input_length);
|
|
assert_equals(std::size_t(15), output_length);
|
|
|
|
std::uint8_t output[15];
|
|
olm::encode_base64(input, input_length, output);
|
|
assert_equals(expected_output, output, output_length);
|
|
}
|
|
|
|
{
|
|
TestCase test_case("Base64 C binding encode test");
|
|
|
|
std::uint8_t input[] = "Hello World";
|
|
std::uint8_t expected_output[] = "SGVsbG8gV29ybGQ";
|
|
std::size_t input_length = sizeof(input) - 1;
|
|
|
|
std::size_t output_length = ::_olm_encode_base64_length(input_length);
|
|
assert_equals(std::size_t(15), output_length);
|
|
|
|
std::uint8_t output[15];
|
|
output_length = ::_olm_encode_base64(input, input_length, output);
|
|
assert_equals(std::size_t(15), output_length);
|
|
assert_equals(expected_output, output, output_length);
|
|
}
|
|
|
|
{ /* Base64 decode test */
|
|
TestCase test_case("Base64 C++ binding decode test");
|
|
|
|
std::uint8_t input[] = "SGVsbG8gV29ybGQ";
|
|
std::uint8_t expected_output[] = "Hello World";
|
|
std::size_t input_length = sizeof(input) - 1;
|
|
|
|
std::size_t output_length = olm::decode_base64_length(input_length);
|
|
assert_equals(std::size_t(11), output_length);
|
|
|
|
std::uint8_t output[11];
|
|
olm::decode_base64(input, input_length, output);
|
|
assert_equals(expected_output, output, output_length);
|
|
}
|
|
|
|
{
|
|
TestCase test_case("Base64 C binding decode test");
|
|
|
|
std::uint8_t input[] = "SGVsbG8gV29ybGQ";
|
|
std::uint8_t expected_output[] = "Hello World";
|
|
std::size_t input_length = sizeof(input) - 1;
|
|
|
|
std::size_t output_length = ::_olm_decode_base64_length(input_length);
|
|
assert_equals(std::size_t(11), output_length);
|
|
|
|
std::uint8_t output[11];
|
|
output_length = ::_olm_decode_base64(input, input_length, output);
|
|
assert_equals(std::size_t(11), output_length);
|
|
assert_equals(expected_output, output, output_length);
|
|
}
|
|
|
|
{
|
|
TestCase test_case("Decoding base64 of invalid length fails with -1");
|
|
std::uint8_t input[] = "SGVsbG8gV29ybGQab";
|
|
std::size_t input_length = sizeof(input) - 1;
|
|
|
|
/* We use a longer but valid input length here so that we don't get back -1.
|
|
* Nothing will be written to the output buffer anyway because the input is
|
|
* invalid. */
|
|
std::size_t buf_length = olm::decode_base64_length(input_length + 1);
|
|
std::vector<std::uint8_t> output(buf_length, 0);
|
|
std::vector<std::uint8_t> expected_output(buf_length, 0);
|
|
|
|
std::size_t output_length = ::_olm_decode_base64(input, input_length, output.data());
|
|
assert_equals(std::size_t(-1), output_length);
|
|
assert_equals(0, memcmp(output.data(), expected_output.data(), buf_length));
|
|
}
|
|
|
|
}
|