Skip to content

Commit 79b5ec8

Browse files
Merge pull request #8015 from gojimmypi/pr-mp_read_radix
gate test mp_read_radix on OPENSSL_EXTRA or !NO_DSA or HAVE_ECC
2 parents 2328a7e + 3930720 commit 79b5ec8

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

wolfcrypt/test/test.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55026,6 +55026,7 @@ static wc_test_ret_t mp_test_cmp(mp_int* a, mp_int* b)
5502655026
if (ret != MP_GT)
5502755027
return WC_TEST_RET_ENC_NC;
5502855028

55029+
#if defined(OPENSSL_EXTRA) || !defined(NO_DSA) || defined(HAVE_ECC)
5502955030
mp_read_radix(b, "1234567890123456789", MP_RADIX_HEX);
5503055031
ret = mp_cmp_d(b, -1);
5503155032
if (ret != MP_GT)
@@ -55040,9 +55041,12 @@ static wc_test_ret_t mp_test_cmp(mp_int* a, mp_int* b)
5504055041
ret = mp_cmp(b, b);
5504155042
if (ret != MP_EQ)
5504255043
return WC_TEST_RET_ENC_NC;
55044+
#endif
5504355045

5504455046
#if (!defined(WOLFSSL_SP_MATH) && !defined(WOLFSSL_SP_MATH_ALL)) || \
5504555047
defined(WOLFSSL_SP_INT_NEGATIVE)
55048+
55049+
#if defined(OPENSSL_EXTRA) || !defined(NO_DSA) || defined(HAVE_ECC)
5504655050
mp_read_radix(a, "-1", MP_RADIX_HEX);
5504755051
mp_read_radix(a, "1", MP_RADIX_HEX);
5504855052
ret = mp_cmp(a, b);
@@ -55059,12 +55063,15 @@ static wc_test_ret_t mp_test_cmp(mp_int* a, mp_int* b)
5505955063
ret = mp_cmp(b, a);
5506055064
if (ret != MP_LT)
5506155065
return WC_TEST_RET_ENC_NC;
55066+
#endif
5506255067

55068+
#if defined(OPENSSL_EXTRA) || !defined(NO_DSA) || defined(HAVE_ECC)
5506355069
mp_read_radix(a, "-2", MP_RADIX_HEX);
5506455070
ret = mp_cmp(a, b);
5506555071
if (ret != MP_EQ)
5506655072
return WC_TEST_RET_ENC_NC;
5506755073
#endif
55074+
#endif
5506855075

5506955076
#if defined(HAVE_ECC) && !defined(WC_NO_RNG) && \
5507055077
defined(WOLFSSL_ECC_GEN_REJECT_SAMPLING)
@@ -55824,12 +55831,16 @@ static wc_test_ret_t mp_test_invmod(mp_int* a, mp_int* m, mp_int* r)
5582455831
#endif
5582555832

5582655833
#if !defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_INT_NEGATIVE)
55834+
55835+
#if defined(OPENSSL_EXTRA) || !defined(NO_DSA) || defined(HAVE_ECC)
5582755836
mp_read_radix(a, "-3", 16);
5582855837
ret = mp_invmod(a, m, r);
5582955838
if (ret != MP_OKAY)
5583055839
return WC_TEST_RET_ENC_EC(ret);
5583155840
#endif
5583255841

55842+
#endif
55843+
5583355844
#if defined(WOLFSSL_SP_MATH_ALL) && defined(HAVE_ECC)
5583455845
mp_set(a, 0);
5583555846
mp_set(m, 3);

0 commit comments

Comments
 (0)