wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4604 from tmael/fix_cc_ecc

Browse Source 
Fix Cryptocell ecc build
This commit is contained in:
David Garske
2021-11-29 11:01:33 -08:00
committed by GitHub
parent ae0cefc48d b2c0bacb06
commit c78256702d
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/ecc.c
View File

@ -1607,7 +1607,8 @@ static void alt_fp_init(mp_int* a)
#endif /* ALT_ECC_SIZE */ #endif /* ALT_ECC_SIZE */
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) && \
!defined(WOLFSSL_CRYPTOCELL)
#if !defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_PUBLIC_ECC_ADD_DBL) #if !defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_PUBLIC_ECC_ADD_DBL)
@ -2296,7 +2297,10 @@ int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
#endif #endif
} }
#if !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_STM32_PKA) #if !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_STM32_PKA) && \
!defined(WOLFSSL_CRYPTOCELL)
/** /**
Map a projective Jacobian point back to affine space Map a projective Jacobian point back to affine space
P [in/out] The point to map P [in/out] The point to map
@ -2524,8 +2528,8 @@ int ecc_map(ecc_point* P, mp_int* modulus, mp_digit mp)
} }
#endif /* !WOLFSSL_SP_MATH || WOLFSSL_PUBLIC_ECC_ADD_DBL */ #endif /* !WOLFSSL_SP_MATH || WOLFSSL_PUBLIC_ECC_ADD_DBL */
#if !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_STM32_PKA) #if !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_STM32_PKA) && \
!defined(WOLFSSL_CRYPTOCELL)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
#ifndef ECC_TIMING_RESISTANT #ifndef ECC_TIMING_RESISTANT
@ -4464,7 +4468,8 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
SAVE_VECTOR_REGISTERS(return _svr_ret;); SAVE_VECTOR_REGISTERS(return _svr_ret;);
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) \ #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) \
&& !defined(WOLFSSL_SILABS_SE_ACCEL) && !defined(WOLFSSL_KCAPI_ECC) && !defined(WOLFSSL_SILABS_SE_ACCEL) && !defined(WOLFSSL_KCAPI_ECC) && \
!defined(WOLFSSL_CRYPTOCELL)
/* if ecc_point passed in then use it as output for public key point */ /* if ecc_point passed in then use it as output for public key point */
if (pubOut != NULL) { if (pubOut != NULL) {

10
wolfcrypt/src/signature.c
View File

@ -48,11 +48,11 @@
/* Signature wrapper disabled check */ /* Signature wrapper disabled check */
#ifndef NO_SIG_WRAPPER #ifndef NO_SIG_WRAPPER
#ifdef WOLFSSL_CRYPTOCELL #if !defined(NO_RSA) && defined(WOLFSSL_CRYPTOCELL)
extern int cc310_RsaSSL_Verify(const byte* in, word32 inLen, byte* sig, extern int cc310_RsaSSL_Verify(const byte* in, word32 inLen, byte* sig,
RsaKey* key, CRYS_RSA_HASH_OpMode_t mode); RsaKey* key, CRYS_RSA_HASH_OpMode_t mode);
extern int cc310_RsaSSL_Sign(const byte* in, word32 inLen, byte* out, extern int cc310_RsaSSL_Sign(const byte* in, word32 inLen, byte* out,
word32 outLen, RsaKey* key, CRYS_RSA_HASH_OpMode_t mode); word32 outLen, RsaKey* key, CRYS_RSA_HASH_OpMode_t mode);
#endif #endif
#if !defined(NO_RSA) && !defined(NO_ASN) #if !defined(NO_RSA) && !defined(NO_ASN)

14
wolfcrypt/test/test.c
View File

@ -21580,12 +21580,12 @@ static int ecc_test_make_pub(WC_RNG* rng)
if (pubPoint == NULL) { if (pubPoint == NULL) {
ERROR_OUT(-9858, done); ERROR_OUT(-9858, done);
} }
#if !defined(WOLFSSL_CRYPTOCELL)
ret = wc_ecc_make_pub(key, pubPoint); ret = wc_ecc_make_pub(key, pubPoint);
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-9859, done); ERROR_OUT(-9859, done);
} }
#endif
TEST_SLEEP(); TEST_SLEEP();
#ifdef HAVE_ECC_KEY_EXPORT #ifdef HAVE_ECC_KEY_EXPORT
@ -22840,7 +22840,8 @@ done:
} }
#endif /* HAVE_ECC_KEY_IMPORT && HAVE_ECC_KEY_EXPORT */ #endif /* HAVE_ECC_KEY_IMPORT && HAVE_ECC_KEY_EXPORT */
#if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT) #if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT) && \
!defined(WOLFSSL_CRYPTOCELL)
static int ecc_mulmod_test(ecc_key* key1) static int ecc_mulmod_test(ecc_key* key1)
{ {
int ret; int ret;
@ -22999,7 +23000,7 @@ static int ecc_def_curve_test(WC_RNG *rng)
#endif #endif
TEST_SLEEP(); TEST_SLEEP();
#ifdef HAVE_ECC_DHE #if defined(HAVE_ECC_DHE) && !defined(WOLFSSL_CRYPTOCELL)
ret = ecc_ssh_test(key, rng); ret = ecc_ssh_test(key, rng);
if (ret < 0) if (ret < 0)
goto done; goto done;
@ -23038,7 +23039,8 @@ static int ecc_def_curve_test(WC_RNG *rng)
if (ret < 0) if (ret < 0)
goto done; goto done;
#endif #endif
#if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT) #if defined(HAVE_ECC_KEY_IMPORT) && !defined(WOLFSSL_VALIDATE_ECC_IMPORT) && \
!defined(WOLFSSL_CRYPTOCELL)
ret = ecc_mulmod_test(key); ret = ecc_mulmod_test(key);
if (ret < 0) if (ret < 0)
goto done; goto done;