feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

SiLabs: renable ecc_ssh_test and disable AES non-12Byte IV

Browse Source
This commit is contained in:
Elms
2020-12-07 13:41:35 -08:00
parent dbcb42e509
commit 44243278a5
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/ecc.c
View File

@@ -4184,7 +4184,8 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
ecc_point* pubOut, WC_RNG* rng) ecc_point* pubOut, WC_RNG* rng)
{ {
int err = MP_OKAY; int err = MP_OKAY;
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) \
&& !defined(WOLFSSL_SILABS_SE_ACCEL)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
ecc_point* base = NULL; ecc_point* base = NULL;
#endif #endif
@@ -4198,7 +4199,8 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) #if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A) \
&& !defined(WOLFSSL_SILABS_SE_ACCEL)
/* 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) {
@@ -4321,7 +4323,7 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
#else #else
(void)curveIn; (void)curveIn;
err = NOT_COMPILED_IN; err = NOT_COMPILED_IN;
#endif /* WOLFSSL_ATECC508A */ #endif /* WOLFSSL_ATECC508A || WOLFSSL_SILABS_SE_ACCEL */
/* change key state if public part is cached */ /* change key state if public part is cached */
if (key->type == ECC_PRIVATEKEY_ONLY && pubOut == NULL) { if (key->type == ECC_PRIVATEKEY_ONLY && pubOut == NULL) {

11
wolfcrypt/src/port/silabs/README.md
View File

@@ -63,18 +63,7 @@ ECDSA 256 verify 148 ops took 1.001 sec, avg 6.764 ms, 147.852 ops/sec
### Benchmarks and Memory Use ### Benchmarks and Memory Use
Software only implementation (SILABS_SE_ACCEL, Fast Math):
```
```
Memory Use:
```
Peak Stack:
Peak Heap:
Total:
```
# Support # Support

2
wolfcrypt/test/test.c
View File

@@ -20796,7 +20796,6 @@ static int ecc_ssh_test(ecc_key* key, WC_RNG* rng)
(void)rng; (void)rng;
#endif #endif
#if !defined(WOLFSSL_SILABS_SE_ACCEL)
/* Use API. */ /* Use API. */
ret = 0; ret = 0;
do { do {
@@ -20808,7 +20807,6 @@ static int ecc_ssh_test(ecc_key* key, WC_RNG* rng)
} while (ret == WC_PENDING_E); } while (ret == WC_PENDING_E);
if (ret != 0) if (ret != 0)
return -10085; return -10085;
#endif
TEST_SLEEP(); TEST_SLEEP();
return 0; return 0;

3
wolfssl/wolfcrypt/ecc.h
View File

@@ -522,8 +522,7 @@ int wc_ecc_shared_secret_ex(ecc_key* private_key, ecc_point* point,
byte* out, word32 *outlen); byte* out, word32 *outlen);
#if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \ #if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \
defined(PLUTON_CRYPTO_ECC) || defined(WOLFSSL_CRYPTOCELL) || \ defined(PLUTON_CRYPTO_ECC) || defined(WOLFSSL_CRYPTOCELL)
defined(WOLFSSL_SILABS_SE_ACCEL)
#define wc_ecc_shared_secret_ssh wc_ecc_shared_secret #define wc_ecc_shared_secret_ssh wc_ecc_shared_secret
#else #else
#define wc_ecc_shared_secret_ssh wc_ecc_shared_secret_ex /* For backwards compat */ #define wc_ecc_shared_secret_ssh wc_ecc_shared_secret_ex /* For backwards compat */