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

Merge pull request #8680 from douzzer/20250416-WC_SANITIZE_DISABLE 

20250416-WC_SANITIZE_DISABLE
pull/8683/head
philljj 2025-04-16 16:56:09 -05:00 committed by GitHub
parent 5e8d018ff7 049c4a8910
commit 91cd0e96fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.wolfssl_known_macro_extras
View File

@ -94,6 +94,7 @@ CONFIG_IDF_TARGET_ESP32S2
CONFIG_IDF_TARGET_ESP32S3 CONFIG_IDF_TARGET_ESP32S3
CONFIG_IDF_TARGET_ESP8266 CONFIG_IDF_TARGET_ESP8266
CONFIG_IDF_TARGET_ESP8684 CONFIG_IDF_TARGET_ESP8684
CONFIG_KASAN
CONFIG_MAIN_TASK_STACK_SIZE CONFIG_MAIN_TASK_STACK_SIZE
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
CONFIG_MBEDTLS_PSA_CRYPTO_C CONFIG_MBEDTLS_PSA_CRYPTO_C
@ -803,7 +804,6 @@ WOLFSSL_SILABS_TRNG
WOLFSSL_SM4_EBC WOLFSSL_SM4_EBC
WOLFSSL_SNIFFER_NO_RECOVERY WOLFSSL_SNIFFER_NO_RECOVERY
WOLFSSL_SP_ARM32_UDIV WOLFSSL_SP_ARM32_UDIV
WOLFSSL_SP_DH
WOLFSSL_SP_FAST_NCT_EXPTMOD WOLFSSL_SP_FAST_NCT_EXPTMOD
WOLFSSL_SP_INT_SQR_VOLATILE WOLFSSL_SP_INT_SQR_VOLATILE
WOLFSSL_STACK_CHECK WOLFSSL_STACK_CHECK

4
linuxkm/module_hooks.c
View File

@ -755,6 +755,8 @@ static int updateFipsHash(void)
goto out; goto out;
} }
WC_SANITIZE_DISABLE();
ret = crypto_shash_update(desc, (byte *)(wc_ptr_t)first, (word32)code_sz); ret = crypto_shash_update(desc, (byte *)(wc_ptr_t)first, (word32)code_sz);
if (ret) { if (ret) {
pr_err("crypto_shash_update failed: err %d\n", ret); pr_err("crypto_shash_update failed: err %d\n", ret);
@ -781,6 +783,8 @@ static int updateFipsHash(void)
goto out; goto out;
} }
WC_SANITIZE_ENABLE();
ret = crypto_shash_final(desc, hash); ret = crypto_shash_final(desc, hash);
if (ret) { if (ret) {
pr_err("crypto_shash_final failed: err %d\n", ret); pr_err("crypto_shash_final failed: err %d\n", ret);

9
wolfssl/wolfcrypt/settings.h
View File

@ -3673,6 +3673,15 @@ extern void uITRON4_free(void *p) ;
#endif #endif
#undef WOLFSSL_MIN_AUTH_TAG_SZ #undef WOLFSSL_MIN_AUTH_TAG_SZ
#define WOLFSSL_MIN_AUTH_TAG_SZ 4 #define WOLFSSL_MIN_AUTH_TAG_SZ 4
#ifdef CONFIG_KASAN
#ifndef WC_SANITIZE_DISABLE
#define WC_SANITIZE_DISABLE() kasan_disable_current()
#endif
#ifndef WC_SANITIZE_ENABLE
#define WC_SANITIZE_ENABLE() kasan_enable_current()
#endif
#endif
#endif #endif

7
wolfssl/wolfcrypt/types.h
View File

@ -1886,6 +1886,13 @@ typedef struct w64wrapper {
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING #define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
#endif #endif
#ifndef WC_SANITIZE_DISABLE
#define WC_SANITIZE_DISABLE() WC_DO_NOTHING
#endif
#ifndef WC_SANITIZE_ENABLE
#define WC_SANITIZE_ENABLE() WC_DO_NOTHING
#endif
#if FIPS_VERSION_GE(5,1) #if FIPS_VERSION_GE(5,1)
#define WC_SPKRE_F(x,y) wolfCrypt_SetPrivateKeyReadEnable_fips((x),(y)) #define WC_SPKRE_F(x,y) wolfCrypt_SetPrivateKeyReadEnable_fips((x),(y))
#define PRIVATE_KEY_LOCK() WC_SPKRE_F(0,WC_KEYTYPE_ALL) #define PRIVATE_KEY_LOCK() WC_SPKRE_F(0,WC_KEYTYPE_ALL)