mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-07-07 20:00:50 +02:00
[TA-100] Fix build/test regressions in non-TA100 builds
This commit is contained in:
committed by
Daniele Lacamera
parent
8f9ecd1afb
commit
4d94b8e8d5
-1750
File diff suppressed because it is too large
Load Diff
@@ -1572,7 +1572,7 @@ int test_wc_ecc_shared_secret_ssh(void)
|
||||
ExpectIntEQ(wc_ecc_set_rng(&key, &rng), 0);
|
||||
#endif
|
||||
|
||||
ExpectIntEQ(wc_ecc_shared_secret_ssh(&key, key2.pubkey, secret,
|
||||
ExpectIntEQ(wc_ecc_shared_secret_ssh(&key, &key2.pubkey, secret,
|
||||
&secretLen), 0);
|
||||
/* Pass in bad args. */
|
||||
ExpectIntEQ(wc_ecc_shared_secret_ssh(NULL, &key2.pubkey, secret,
|
||||
|
||||
+15
-3
@@ -24737,7 +24737,6 @@ static wc_test_ret_t rsa_pss_test(WC_RNG* rng, RsaKey* key)
|
||||
const char inStr[] = TEST_STRING;
|
||||
word32 inLen = (word32)TEST_STRING_SZ;
|
||||
word32 outSz;
|
||||
word32 sigSz;
|
||||
word32 plainSz;
|
||||
word32 digestSz;
|
||||
int i, j;
|
||||
@@ -24830,14 +24829,14 @@ static wc_test_ret_t rsa_pss_test(WC_RNG* rng, RsaKey* key)
|
||||
if (ret <= 0)
|
||||
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa_pss);
|
||||
outSz = (word32)ret;
|
||||
/* Preserve signature length for TA100 verify. */
|
||||
sigSz = outSz;
|
||||
|
||||
XMEMCPY(sig, out, outSz);
|
||||
plain = NULL;
|
||||
TEST_SLEEP();
|
||||
|
||||
#if defined(WOLFSSL_MICROCHIP_TA100)
|
||||
{
|
||||
word32 sigSz = outSz;
|
||||
do {
|
||||
#if defined(WOLFSSL_ASYNC_CRYPT)
|
||||
ret = wc_AsyncWait(ret, &key->asyncDev,
|
||||
@@ -24852,6 +24851,7 @@ static wc_test_ret_t rsa_pss_test(WC_RNG* rng, RsaKey* key)
|
||||
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa_pss);
|
||||
/* TA100 PSS verify done; skip remaining software-only variants. */
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
do {
|
||||
#if defined(WOLFSSL_ASYNC_CRYPT)
|
||||
@@ -26888,6 +26888,18 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t rsa_test(void)
|
||||
ERROR_OUT(WC_TEST_RET_ENC_NC, exit_rsa);
|
||||
}
|
||||
TEST_SLEEP();
|
||||
|
||||
do {
|
||||
#if defined(WOLFSSL_ASYNC_CRYPT)
|
||||
ret = wc_AsyncWait(ret, &key->asyncDev, WC_ASYNC_FLAG_CALL_AGAIN);
|
||||
#endif
|
||||
if (ret >= 0) {
|
||||
ret = wc_RsaSSL_Sign(in, inLen, out, outSz, key, &rng);
|
||||
}
|
||||
} while (ret == WC_NO_ERR_TRACE(WC_PENDING_E));
|
||||
if (ret < 0)
|
||||
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa);
|
||||
TEST_SLEEP();
|
||||
#endif /* !WOLFSSL_MICROCHIP_TA100 */
|
||||
|
||||
#elif defined(WOLFSSL_PUBLIC_MP)
|
||||
|
||||
Reference in New Issue
Block a user