diff options
author | aqua <aqua@iserlohn-fortress.net> | 2023-10-08 19:50:00 +0300 |
---|---|---|
committer | aqua <aqua@iserlohn-fortress.net> | 2023-11-27 21:02:22 +0200 |
commit | fc13fb2ba5993d06d9d6ae5e80bc337aebbdc119 (patch) | |
tree | 9607ab4d5f1d4069d4f761a0b25eada36088bd6b /lib/blake2 | |
parent | rules.mk: make include paths absolute (diff) | |
download | kernel-fc13fb2ba5993d06d9d6ae5e80bc337aebbdc119.tar.xz |
Use meson build system
Diffstat (limited to 'lib/blake2')
-rw-r--r-- | lib/blake2/include/blake2s.h (renamed from lib/blake2/blake2s.h) | 0 | ||||
-rw-r--r-- | lib/blake2/meson.build | 24 | ||||
-rw-r--r-- | lib/blake2/tests/blake2s_kat.h (renamed from lib/blake2/test_blake2_kat.h) | 2 | ||||
-rw-r--r-- | lib/blake2/tests/blake2s_selftest.cc (renamed from lib/blake2/test_blake2s_selftest.cc) | 13 |
4 files changed, 31 insertions, 8 deletions
diff --git a/lib/blake2/blake2s.h b/lib/blake2/include/blake2s.h index ede170c..ede170c 100644 --- a/lib/blake2/blake2s.h +++ b/lib/blake2/include/blake2s.h diff --git a/lib/blake2/meson.build b/lib/blake2/meson.build new file mode 100644 index 0000000..dc06f3e --- /dev/null +++ b/lib/blake2/meson.build @@ -0,0 +1,24 @@ + +blake2s_srcs = files('blake2s.c') +blake2s_incl = include_directories('include') + +blake2s = declare_dependency( + link_with: static_library('blake2s', blake2s_srcs, + include_directories: blake2s_incl, + dependencies: libk), + include_directories: blake2s_incl, +) + +# tests +blake2s_sut = declare_dependency( + link_with: library('blake2s_sut', blake2s_srcs, + include_directories: blake2s_incl, + native: true), + include_directories: blake2s_incl, +) + +test('blake2s selftest', + executable('test_blake2s_selftest', 'tests/blake2s_selftest.cc', + dependencies: [ blake2s_sut, gtest ], + native: true) +) diff --git a/lib/blake2/test_blake2_kat.h b/lib/blake2/tests/blake2s_kat.h index aa42ef5..dec250a 100644 --- a/lib/blake2/test_blake2_kat.h +++ b/lib/blake2/tests/blake2s_kat.h @@ -1,5 +1,7 @@ #pragma once +#include <cstdint> + static const unsigned KATs_len = 256; static const uint8_t KAT_secret[32] = { 0xba, 0x80, 0xfb, 0x8f, 0x1b, 0x7b, 0xa1, 0x49, 0x3c, 0x6a, 0xe8, 0x8f, 0xd, 0x66, 0xa1, 0xae, 0xff, 0xa2, 0x5c, 0x8a, 0x7d, 0x4c, 0x1f, 0xb6, 0x81, 0x1, 0xb5, 0xe4, 0xc2, 0x8e, 0x37, 0x3 }; static const uint8_t KATs[256][32] = { diff --git a/lib/blake2/test_blake2s_selftest.cc b/lib/blake2/tests/blake2s_selftest.cc index 2c046b2..420544d 100644 --- a/lib/blake2/test_blake2s_selftest.cc +++ b/lib/blake2/tests/blake2s_selftest.cc @@ -1,8 +1,11 @@ // Self test Modules for BLAKE2s -#include "blake2s.c" -#include "test_blake2_kat.h" +#include "blake2s_kat.h" #include <gtest/gtest.h> +extern "C" { +#include "blake2s.h" +} + static_assert(sizeof(BLAKE2s_param) == (8 * sizeof(uint32_t)), "sizeof struct BLAKE2s_param"); // Deterministic sequences (Fibonacci generator). @@ -66,12 +69,6 @@ blake2s_selftest() return 0; } -TEST(blake2s, rotr_u32) -{ - EXPECT_EQ(rotr_u32(0xdecafade, 16), 0xfadedeca); - EXPECT_EQ(rotr_u32(0xdecafade, 8), 0xdedecafa); -} - TEST(blake2s, selftest) { EXPECT_EQ(blake2s_selftest(), 0); } TEST(blake2s, selftestAllInOne) |