Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rehaul PQDSA Test Suite #2062

Merged
merged 12 commits into from
Dec 20, 2024
+297 −185
Merged

Rehaul PQDSA Test Suite #2062

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1da78fb
rehaul test suite
jakemas Dec 17, 2024
566d5ce
spacing nit
jakemas Dec 17, 2024
4cb2f9d
Merge branch 'main' into mldsa-test-suite
jakemas Dec 17, 2024
43e8954
Merge branch 'main' into mldsa-test-suite
jakemas Dec 18, 2024
f7d1dad
CR fixes
jakemas Dec 20, 2024
b489226
Merge branch 'mldsa-test-suite' of github.com:jakemas/aws-lc into mld…
jakemas Dec 20, 2024
463aa0d
added macro, CR fixes
jakemas Dec 20, 2024
f7f1fbd
added test macro for err, reason
jakemas Dec 20, 2024
16f48d6
added additional test
jakemas Dec 20, 2024
fe9e43a
CR
jakemas Dec 20, 2024
8b02f45
Merge branch 'main' into mldsa-test-suite
jakemas Dec 20, 2024
cc57ad1
Merge branch 'main' into mldsa-test-suite
nebeid Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions crypto/dilithium/p_pqdsa_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,13 @@ CMP_VEC_AND_PTR(vec, pkey->pkey.pqdsa_key->public_key, len)
#define CMP_VEC_AND_PKEY_SECRET(vec, pkey, len) \
CMP_VEC_AND_PTR(vec, pkey->pkey.pqdsa_key->private_key, len)

#define ERR_PASSED_NULL_CHECK(err) \
{ \
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err)); \
EXPECT_EQ(ERR_R_PASSED_NULL_PARAMETER, ERR_GET_REASON(err)); \
}


static const struct PQDSATestVector parameterSet[] = {
{
"MLDSA44",
Expand Down Expand Up @@ -1156,16 +1163,14 @@ TEST_P(PQDSAParameterTest, KeyGen) {
// ctx is NULL.
ASSERT_FALSE(EVP_PKEY_CTX_pqdsa_set_params(nullptr, nid));
uint32_t err = ERR_get_error();
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err));
EXPECT_EQ(ERR_R_PASSED_NULL_PARAMETER, ERR_GET_REASON(err));
ERR_PASSED_NULL_CHECK(err);

// ctx->data is NULL
void *tmp = ctx.get()->data;
ctx.get()->data = nullptr;
ASSERT_FALSE(EVP_PKEY_CTX_pqdsa_set_params(ctx.get(), nid));
err = ERR_get_error();
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err));
EXPECT_EQ(ERR_R_PASSED_NULL_PARAMETER, ERR_GET_REASON(err));
ERR_PASSED_NULL_CHECK(err);
ctx.get()->data = tmp;

// ctx->pkey is not NULL.
Expand All @@ -1182,11 +1187,6 @@ TEST_P(PQDSAParameterTest, KeyGen) {
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err));
EXPECT_EQ(EVP_R_UNSUPPORTED_ALGORITHM, ERR_GET_REASON(err));
ctx.get()->pkey = (EVP_PKEY*) tmp;

// attempt to change NID after PKEY is set and verify that this null's the key
ASSERT_TRUE(EVP_PKEY_pqdsa_set_params(pkey.get(), nid));
ASSERT_TRUE(pkey.get()->pkey.pqdsa_key->public_key == nullptr);
ASSERT_TRUE(pkey.get()->pkey.pqdsa_key->private_key == nullptr);
jakemas marked this conversation as resolved.
Show resolved Hide resolved
}

// Helper function that:
Expand Down Expand Up @@ -1274,12 +1274,12 @@ TEST_P(PQDSAParameterTest, RawFunctions) {
bssl::UniquePtr<EVP_PKEY> private_pkey(
EVP_PKEY_pqdsa_new_raw_private_key(nid, pkey->pkey.pqdsa_key->private_key, sk_len));

// check that public key is present and private key is not present
// check that public key is present and private key is not present in public_key
ASSERT_NE(public_pkey, nullptr);
EXPECT_NE(public_pkey->pkey.pqdsa_key->public_key, nullptr);
EXPECT_EQ(public_pkey->pkey.pqdsa_key->private_key, nullptr);

// check that private key is present and public key is not present
// check that private key is present and public key is not present in private_key
ASSERT_NE(private_pkey, nullptr);
EXPECT_EQ(private_pkey->pkey.pqdsa_key->public_key, nullptr);
EXPECT_NE(private_pkey->pkey.pqdsa_key->private_key, nullptr);
Expand Down Expand Up @@ -1377,13 +1377,11 @@ TEST_P(PQDSAParameterTest, RawFunctions) {
// Invalid input buffer
ASSERT_FALSE(EVP_PKEY_pqdsa_new_raw_public_key(nid, nullptr, pk_len));
err = ERR_get_error();
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err));
EXPECT_EQ(ERR_R_PASSED_NULL_PARAMETER, ERR_GET_REASON(err));
ERR_PASSED_NULL_CHECK(err);

ASSERT_FALSE(EVP_PKEY_pqdsa_new_raw_private_key(nid, nullptr, sk_len));
err = ERR_get_error();
EXPECT_EQ(ERR_LIB_EVP, ERR_GET_LIB(err));
EXPECT_EQ(ERR_R_PASSED_NULL_PARAMETER, ERR_GET_REASON(err));
ERR_PASSED_NULL_CHECK(err);
}

TEST_P(PQDSAParameterTest, MarshalParse) {
Expand Down
Loading