wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-26 21:22:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup WOLFSL_STSAFE and fix issue with multi-test macros

Browse Source
This commit is contained in:
David Garske
2026-01-06 14:55:59 -08:00
parent a4c2398265
commit c7ca035baf
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.wolfssl_known_macro_extras
View File

@@ -513,9 +513,6 @@ SQRTMOD_USE_MOD_EXP
SSL_SNIFFER_EXPORTS
SSN_BUILDING_LIBYASSL
STATIC_CHUNKS_ONLY
STSAFE_HOST_KEY_CIPHER
STSAFE_HOST_KEY_MAC
STSAFE_I2C_BUS
STM32F107xC
STM32F207xx
STM32F217xx
@@ -548,6 +545,9 @@ STM32WL55xx
STM32_AESGCM_PARTIAL
STM32_HW_CLOCK_AUTO
STM32_NUTTX_RNG
STSAFE_HOST_KEY_CIPHER
STSAFE_HOST_KEY_MAC
STSAFE_I2C_BUS
TASK_EXTRA_STACK_SIZE
TCP_NODELAY
TFM_ALREADY_SET

4
wolfcrypt/src/wc_port.c
View File

@@ -68,7 +68,7 @@
#if defined(WOLFSSL_RENESAS_RX64_HASH)
#include <wolfssl/wolfcrypt/port/Renesas/renesas-rx64-hw-crypt.h>
#endif
#if defined(WOLFSSL_STSAFEA100) || defined(WOLFSSL_STSAFEA120)
#ifdef WOLFSSL_STSAFE
#include <wolfssl/wolfcrypt/port/st/stsafe.h>
#endif
@@ -303,7 +303,7 @@ int wolfCrypt_Init(void)
return ret;
}
#endif
#if defined(WOLFSSL_STSAFEA100) || defined(WOLFSSL_STSAFEA120)
#ifdef WOLFSSL_STSAFE
ret = stsafe_interface_init();
if (ret != 0) {
WOLFSSL_MSG("STSAFE init failed");

8
wolfssl/wolfcrypt/port/st/stsafe.h
View File

@@ -35,12 +35,6 @@
#include <wolfssl/ssl.h>
#endif
/* Combined STSAFE macro - enables when either A100 or A120 is defined */
#if defined(WOLFSSL_STSAFEA100) || defined(WOLFSSL_STSAFEA120)
#undef WOLFSSL_STSAFE
#define WOLFSSL_STSAFE
#endif
#ifdef WOLFSSL_STSAFE
/* -------------------------------------------------------------------------- */
@@ -52,7 +46,7 @@
* This maintains backwards compatibility with older integrations that
* used a separate interface file.
*
* When NOT defined (default): All code is self-contained in stsafe.c using
* When NOT set (the default): All code is self-contained in stsafe.c using
* the appropriate SDK (STSELib for A120, STSAFE-A1xx SDK for A100/A110).
*
* When defined: Include customer-provided stsafe_interface.h which must define:

6
wolfssl/wolfcrypt/settings.h
View File

@@ -2139,6 +2139,12 @@ extern void uITRON4_free(void *p) ;
#endif /* WOLFSSL_MAXQ1065 || WOLFSSL_MAXQ108X */
/* Combined STSAFE macro - enables when either A100 or A120 is defined */
#if defined(WOLFSSL_STSAFEA100) || defined(WOLFSSL_STSAFEA120)
#undef WOLFSSL_STSAFE
#define WOLFSSL_STSAFE
#endif
#if defined(WOLFSSL_STM32F2) || defined(WOLFSSL_STM32F4) || \
defined(WOLFSSL_STM32F7) || defined(WOLFSSL_STM32F1) || \
defined(WOLFSSL_STM32L4) || defined(WOLFSSL_STM32L5) || \