crypto tests: various fixes

This commit is contained in:
sowle 2022-05-12 20:50:14 +02:00
parent 4393db02bc
commit 67b5551eea
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 10 additions and 17 deletions

View file

@ -29,9 +29,6 @@ add_executable(net_load_tests_srv net_load_tests/srv.cpp)
add_dependencies(coretests version)
target_link_libraries(coretests rpc wallet currency_core common crypto zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
if (UNIX AND NOT APPLE)
target_link_libraries(coretests dl)
endif()
target_link_libraries(functional_tests rpc wallet currency_core crypto common zlibstatic ethash libminiupnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(hash-tests crypto ethash)
target_link_libraries(hash-target-tests crypto currency_core ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
@ -46,6 +43,8 @@ if(NOT MSVC)
if(APPLE)
set_property(TARGET gtest gtest_main APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unused-private-field")
endif()
target_link_libraries(coretests dl)
target_link_libraries(functional_tests dl)
endif()

View file

@ -1177,7 +1177,7 @@ TEST(crypto, neg_identity)
// also do zero-byte pub key / key image checks
public_key zzz_pk;
memset(&zzz_pk, 0, sizeof public_key);
memset(&zzz_pk, 0, sizeof(public_key));
ASSERT_TRUE(check_key(zzz_pk));
@ -1186,7 +1186,7 @@ TEST(crypto, neg_identity)
ASSERT_FALSE(zzz.is_in_main_subgroup());
key_image zzz_ki;
memset(&zzz_ki, 0, sizeof key_image);
memset(&zzz_ki, 0, sizeof(key_image));
ASSERT_FALSE(validate_key_image(zzz_ki));
@ -1280,12 +1280,12 @@ TEST(ml2s, hs)
scalar_t x, y;
crypto::generate_random_bytes(32, y.m_s);
x = y;
memset(x.m_s + 18, 0xff, 13);
memset(x.m_s + 20, 0xff, 11);
sc_reduce32(x.m_s);
uint64_t lo = *(uint64_t*)(x.m_s + 18);
uint64_t hi = *(uint64_t*)(x.m_s + 26) & 0xffffffffff;
uint64_t lo = *(uint64_t*)(x.m_s + 20);
uint64_t hi = *(uint64_t*)(x.m_s + 28) & 0xffffff;
ASSERT_EQ(lo, 0xffffffffffffffff);
ASSERT_EQ(hi, 0xffffffffff);
ASSERT_EQ(hi, 0xffffff);
}
@ -1822,12 +1822,6 @@ TEST(crypto, sc_get_bit)
ASSERT_EQ(v.get_bit(static_cast<uint8_t>(n)), true);
}
// bits out of the [0; 255] range supposed to be always 0
for (size_t n = 256; n < 2048; ++n)
{
ASSERT_EQ(v.get_bit(static_cast<uint8_t>(n)), false);
}
// check random value
const scalar_t x = scalar_t::random();
for (size_t n = 0; n < 64; ++n)

View file

@ -152,7 +152,7 @@ TEST(bpp, power_256)
scalar_vec_t values = { 5 };
scalar_vec_t masks = { scalar_t(77 + 256 * 77) };
r = bpp_gen<bpp_crypto_trait_zano<N>>(values, masks, bpp_sig, commitments, &err);
r = bpp_gen<bpp_crypto_trait_zano<>>(values, masks, bpp_sig, commitments, &err);
ASSERT_TRUE(r);
sig_commit_refs.emplace_back(bpp_sig, commitments);
@ -173,7 +173,7 @@ TEST(bpp, power_256)
sig_commit_refs.emplace_back(bpp_sig, commitments);
}
r = bpp_verify<bpp_crypto_trait_zano<N>>(sig_commit_refs, &err);
r = bpp_verify<bpp_crypto_trait_zano<>>(sig_commit_refs, &err);
ASSERT_TRUE(r);