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

Regression testing fixes #8315

Merged
merged 1 commit into from
Dec 24, 2024
Merged

Regression testing fixes #8315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 33 additions & 15 deletions wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45863,8 +45863,10 @@ static wc_test_ret_t dilithium_param_test(int param, WC_RNG* rng)
#endif


#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) || \
defined(WOLFSSL_DILITHIUM_PUBLIC_KEY)
#if (defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)) || \
(defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY))
/* Tests decoding a key from DER without the security level specified */
static wc_test_ret_t test_dilithium_decode_level(const byte* rawKey,
word32 rawKeySz,
Expand All @@ -45877,9 +45879,11 @@ static wc_test_ret_t test_dilithium_decode_level(const byte* rawKey,
#else
dilithium_key key[1];
#endif
word32 idx;
byte* der;
#ifndef WOLFSSL_DILITHIUM_NO_ASN1
word32 derSz;
word32 idx;
#endif

/* Size the buffer to accommodate the largest encoded key size */
const word32 maxDerSz = DILITHIUM_MAX_PRV_KEY_DER_SIZE;
Expand Down Expand Up @@ -45919,6 +45923,7 @@ static wc_test_ret_t test_dilithium_decode_level(const byte* rawKey,
#endif
}

#ifndef WOLFSSL_DILITHIUM_NO_ASN1
/* Export raw key as DER */
if (ret == 0) {
#ifdef WOLFSSL_DILITHIUM_PUBLIC_KEY
Expand Down Expand Up @@ -45992,6 +45997,7 @@ static wc_test_ret_t test_dilithium_decode_level(const byte* rawKey,
ret = WC_TEST_RET_ENC_NC;
}
#endif /* !WOLFSSL_DILITHIUM_FIPS204_DRAFT */
#endif /* WOLFSSL_DILITHIUM_NO_ASN1 */

/* Cleanup */
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
Expand All @@ -46009,15 +46015,18 @@ static wc_test_ret_t dilithium_decode_test(void)
const byte* key;
word32 keySz;

#ifdef WOLFSSL_DILITHIUM_PRIVATE_KEY
#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)
const int isPrvKey = 0;
#endif
#ifdef WOLFSSL_DILITHIUM_PUBLIC_KEY
#if defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY)
const int isPubKey = 1;
#endif

#ifndef WOLFSSL_NO_ML_DSA_44
#ifdef WOLFSSL_DILITHIUM_PRIVATE_KEY
#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)
/* Test ML-DSA-44 */
key = bench_dilithium_level2_key;
keySz = sizeof_bench_dilithium_level2_key;
Expand All @@ -46027,7 +46036,8 @@ static wc_test_ret_t dilithium_decode_test(void)
}
#endif /* WOLFSSL_DILITHIUM_PRIVATE_KEY */

#ifdef WOLFSSL_DILITHIUM_PUBLIC_KEY
#if defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY)
key = bench_dilithium_level2_pubkey;
keySz = sizeof_bench_dilithium_level2_pubkey;
ret = test_dilithium_decode_level(key, keySz, WC_ML_DSA_44, isPubKey);
Expand All @@ -46038,7 +46048,8 @@ static wc_test_ret_t dilithium_decode_test(void)
#endif /* WOLFSSL_NO_ML_DSA_44 */

#ifndef WOLFSSL_NO_ML_DSA_65
#ifdef WOLFSSL_DILITHIUM_PRIVATE_KEY
#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)
/* Test ML-DSA-65 */
key = bench_dilithium_level3_key;
keySz = sizeof_bench_dilithium_level3_key;
Expand All @@ -46048,7 +46059,8 @@ static wc_test_ret_t dilithium_decode_test(void)
}
#endif /* WOLFSSL_DILITHIUM_PRIVATE_KEY */

#ifdef WOLFSSL_DILITHIUM_PUBLIC_KEY
#if defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY)
key = bench_dilithium_level3_pubkey;
keySz = sizeof_bench_dilithium_level3_pubkey;
ret = test_dilithium_decode_level(key, keySz, WC_ML_DSA_65, isPubKey);
Expand All @@ -46059,7 +46071,8 @@ static wc_test_ret_t dilithium_decode_test(void)
#endif /* WOLFSSL_NO_ML_DSA_65 */

#ifndef WOLFSSL_NO_ML_DSA_87
#ifdef WOLFSSL_DILITHIUM_PRIVATE_KEY
#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)
/* Test ML-DSA-87 */
key = bench_dilithium_level5_key;
keySz = sizeof_bench_dilithium_level5_key;
Expand All @@ -46069,7 +46082,8 @@ static wc_test_ret_t dilithium_decode_test(void)
}
#endif /* WOLFSSL_DILITHIUM_PRIVATE_KEY */

#ifdef WOLFSSL_DILITHIUM_PUBLIC_KEY
#if defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY)
key = bench_dilithium_level5_pubkey;
keySz = sizeof_bench_dilithium_level5_pubkey;
ret = test_dilithium_decode_level(key, keySz, WC_ML_DSA_87, isPubKey);
Expand All @@ -46081,7 +46095,8 @@ static wc_test_ret_t dilithium_decode_test(void)

return ret;
}
#endif /* WOLFSSL_DILITHIUM_PUBLIC_KEY || WOLFSSL_DILITHIUM_PRIVATE_KEY */
#endif /* (WOLFSSL_DILITHIUM_PUBLIC_KEY && !WOLFSSL_DILITHIUM_NO_VERIFY) ||
* (WOLFSSL_DILITHIUM_PRIVATE_KEY && !WOLFSSL_DILITHIUM_NO_SIGN) */


WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dilithium_test(void)
Expand Down Expand Up @@ -46142,13 +46157,16 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dilithium_test(void)
#endif
#endif

#if defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) || \
defined(WOLFSSL_DILITHIUM_PUBLIC_KEY)
#if (defined(WOLFSSL_DILITHIUM_PRIVATE_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_SIGN)) || \
(defined(WOLFSSL_DILITHIUM_PUBLIC_KEY) && \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY))
ret = dilithium_decode_test();
if (ret != 0) {
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
}
#endif /* WOLFSSL_DILITHIUM_PRIVATE_KEY || WOLFSSL_DILITHIUM_PUBLIC_KEY */
#endif /* (WOLFSSL_DILITHIUM_PUBLIC_KEY && !WOLFSSL_DILITHIUM_NO_VERIFY) ||
* (WOLFSSL_DILITHIUM_PRIVATE_KEY && !WOLFSSL_DILITHIUM_NO_SIGN) */

#if !defined(WOLFSSL_DILITHIUM_NO_MAKE_KEY) || \
!defined(WOLFSSL_DILITHIUM_NO_VERIFY) || \
Expand Down
Loading