mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-07-06 14:50:51 +02:00
Fix multi-test issues
This commit is contained in:
@@ -845,6 +845,17 @@ WOLFSSL_NO_TICKET_EXPIRE
|
||||
WOLFSSL_NO_TRUSTED_CERTS_VERIFY
|
||||
WOLFSSL_NO_WORD64_OPS
|
||||
WOLFSSL_NO_XOR_OPS
|
||||
WOLFSSL_NXP_LPC55S69_WITH_HWACCEL
|
||||
WOLFSSL_NXP_LPC55S69_NO_HWACCEL
|
||||
WOLFSSL_NXP_CASPER
|
||||
WOLFSSL_NXP_CASPER_ECC_MULMOD
|
||||
WOLFSSL_NXP_CASPER_ECC_MUL2ADD
|
||||
WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD
|
||||
WOLFSSL_NXP_HASHCRYPT
|
||||
WOLFSSL_NXP_HASHCRYPT_AES
|
||||
WOLFSSL_NXP_HASHCRYPT_SHA
|
||||
WOLFSSL_NXP_HASHCRYPT_SHA256
|
||||
WOLFSSL_NXP_RNG_1
|
||||
WOLFSSL_NRF51_AES
|
||||
WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
|
||||
WOLFSSL_OLD_SET_CURVES_LIST
|
||||
|
||||
@@ -86,7 +86,7 @@ int casper_rsa_public_exptmod(
|
||||
|
||||
|
||||
/* 32 for 256 bits, 48 for 384 bits and 72 for 521 bits... */
|
||||
#define CASPER_MAX_ECC_SIZE_BYTES (72)
|
||||
#define CASPER_MAX_ECC_SIZE_BYTES (72)
|
||||
|
||||
#if defined(HAVE_ECC) && defined(WOLFSSL_NXP_CASPER_ECC_MULMOD)
|
||||
/* calculates R = m*P[X, Y] */
|
||||
@@ -156,7 +156,7 @@ int casper_ecc_mulmod(
|
||||
mp_set(R->z, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_ECC) && defined(WOLFSSL_NXP_CASPER_ECC_MUL2ADD)
|
||||
@@ -247,7 +247,7 @@ int casper_ecc_mul2add(
|
||||
mp_set(R->z, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* WOLFSSL_NXP_CASPER */
|
||||
|
||||
@@ -67,9 +67,6 @@ int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId)
|
||||
if (sha256 == NULL)
|
||||
return BAD_FUNC_ARG;
|
||||
|
||||
// if (wolfSSL_CryptHwMutexLock() != 0)
|
||||
// return BAD_MUTEX_E;
|
||||
|
||||
XMEMSET(sha256, 0, sizeof(wc_Sha256));
|
||||
if (HASHCRYPT_SHA_Init(HASHCRYPT, &hash_ctx, kHASHCRYPT_Sha256)
|
||||
!= kStatus_Success)
|
||||
@@ -199,13 +196,13 @@ static int _hashcrypt_set_key(Aes* aes)
|
||||
aes_handle.keyType = kHASHCRYPT_UserKey;
|
||||
|
||||
if (aes->keylen == 128/8)
|
||||
aes_handle.keySize = kHASHCRYPT_Aes128;
|
||||
aes_handle.keySize = kHASHCRYPT_Aes128;
|
||||
else if (aes->keylen == 192/8)
|
||||
aes_handle.keySize = kHASHCRYPT_Aes192;
|
||||
aes_handle.keySize = kHASHCRYPT_Aes192;
|
||||
else if (aes->keylen == 256/8)
|
||||
aes_handle.keySize = kHASHCRYPT_Aes256;
|
||||
else
|
||||
return BAD_FUNC_ARG;
|
||||
return BAD_FUNC_ARG;
|
||||
|
||||
if (HASHCRYPT_AES_SetKey(
|
||||
HASHCRYPT, &aes_handle, (const uint8_t *)aes->devKey, aes->keylen
|
||||
|
||||
@@ -2105,7 +2105,6 @@ extern void uITRON4_free(void *p) ;
|
||||
#define WOLFSSL_NXP_HASHCRYPT_SHA
|
||||
#define WOLFSSL_NXP_HASHCRYPT_SHA256
|
||||
#define WOLFSSL_NXP_CASPER
|
||||
// #define WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD
|
||||
#elif defined(WOLFSSL_NXP_LPC55S69_NO_HWACCEL)
|
||||
#define WOLFSSL_NXP_RNG_1
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user