WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7262 from gojimmypi/PR-SHA-Interleave 

Introduce SHA256/SHA512 interleave testing, HAVE_DSA; revised ERROR_OUT
pull/7299/head
Sean Parkinson 2024-03-05 10:13:10 +10:00 committed by GitHub
parent 39002d82b4 0775baa2e1
commit ee39a8f17f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 503 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pk.c
View File

@ -8499,7 +8499,7 @@ int wolfSSL_DH_compute_key(unsigned char* key, const WOLFSSL_BIGNUM* otherPub,
word32 keySz = 0; word32 keySz = 0;
int pubSz = MAX_DHKEY_SZ; int pubSz = MAX_DHKEY_SZ;
int privSz = MAX_DHKEY_SZ; int privSz = MAX_DHKEY_SZ;
int sz; int sz = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
unsigned char* pub = NULL; unsigned char* pub = NULL;
unsigned char* priv = NULL; unsigned char* priv = NULL;

9
wolfcrypt/src/port/Espressif/esp32_sha.c
View File

@ -2244,14 +2244,18 @@ int esp_sha512_digest_process(struct wc_Sha512* sha, byte blockproc)
#if defined(WOLFSSL_ESP32_CRYPT) && defined(WOLFSSL_HW_METRICS) #if defined(WOLFSSL_ESP32_CRYPT) && defined(WOLFSSL_HW_METRICS)
int esp_sw_sha256_count_add(void) { int esp_sw_sha256_count_add(void) {
int ret = 0;
#if !defined(NO_WOLFSSL_ESP32_CRYPT_HASH)
esp_sha256_sw_fallback_usage_ct++; esp_sha256_sw_fallback_usage_ct++;
return esp_sha256_sw_fallback_usage_ct; ret = esp_sha256_sw_fallback_usage_ct;
#endif
return ret;
} }
int esp_hw_show_sha_metrics(void) int esp_hw_show_sha_metrics(void)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_ESP32_CRYPT #if defined(WOLFSSL_ESP32_CRYPT) && !defined(NO_WOLFSSL_ESP32_CRYPT_HASH)
ESP_LOGI(TAG, "--------------------------------------------------------"); ESP_LOGI(TAG, "--------------------------------------------------------");
ESP_LOGI(TAG, "------------- wolfSSL ESP HW SHA Metrics----------------"); ESP_LOGI(TAG, "------------- wolfSSL ESP HW SHA Metrics----------------");
ESP_LOGI(TAG, "--------------------------------------------------------"); ESP_LOGI(TAG, "--------------------------------------------------------");
@ -2280,7 +2284,6 @@ int esp_hw_show_sha_metrics(void)
ret = 0; ret = 0;
#endif /* HW_MATH_ENABLED */ #endif /* HW_MATH_ENABLED */
return ret; return ret;
} }
#endif /* WOLFSSL_ESP32_CRYPT and WOLFSSL_HW_METRICS */ #endif /* WOLFSSL_ESP32_CRYPT and WOLFSSL_HW_METRICS */

584
wolfcrypt/test/test.c
View File

File diff suppressed because it is too large Load Diff

22
wolfssl/wolfcrypt/settings.h
View File

@ -444,6 +444,8 @@
#define TFM_TIMING_RESISTANT #define TFM_TIMING_RESISTANT
#define ECC_TIMING_RESISTANT #define ECC_TIMING_RESISTANT
/* WC_RSA_BLINDING takes up extra space! */
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
#define WC_NO_CACHE_RESISTANT #define WC_NO_CACHE_RESISTANT
#endif /* !WOLFSSL_ESPIDF_NO_DEFAULT */ #endif /* !WOLFSSL_ESPIDF_NO_DEFAULT */
@ -997,7 +999,8 @@ extern void uITRON4_free(void *p) ;
#define XFREE(p, h, type) ((void)(h), (void)(type), vPortFree((p))) #define XFREE(p, h, type) ((void)(h), (void)(type), vPortFree((p)))
#if defined(WOLFSSL_ESPIDF) #if defined(WOLFSSL_ESPIDF)
/* In IDF, realloc(p, n) is equivalent to /* In IDF, realloc(p, n) is equivalent to
* heap_caps_realloc(p, s, MALLOC_CAP_8BIT) */ * heap_caps_realloc(p, s, MALLOC_CAP_8BIT)
* there's no pvPortRealloc available */
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), realloc((p), (n))) #define XREALLOC(p, n, h, t) ((void)(h), (void)(t), realloc((p), (n)))
/* FreeRTOS pvPortRealloc() implementation can be found here: /* FreeRTOS pvPortRealloc() implementation can be found here:
* https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */ * https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */
@ -1019,8 +1022,10 @@ extern void uITRON4_free(void *p) ;
#define NO_DH #define NO_DH
#endif #endif
#endif #endif
#ifndef NO_DSA #ifndef HAVE_DSA
#define NO_DSA #ifndef NO_DSA
#define NO_DSA
#endif
#endif #endif
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
@ -3418,6 +3423,17 @@ extern void uITRON4_free(void *p) ;
#error "Found both ESPIDF and ARDUINO. Pick one." #error "Found both ESPIDF and ARDUINO. Pick one."
#endif #endif
#if defined(WOLFSSL_CAAM_BLOB)
#ifndef WOLFSSL_CAAM
#error "WOLFSSL_CAAM_BLOB requires WOLFSSL_CAAM"
#endif
#endif
#if defined(HAVE_ED25519)
#ifndef WOLFSSL_SHA512
#error "HAVE_ED25519 requires WOLFSSL_SHA512"
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */