diff --git a/IDE/ARDUINO/wolfssl-arduino.sh b/IDE/ARDUINO/wolfssl-arduino.sh index a381a597ace..115477aea68 100755 --- a/IDE/ARDUINO/wolfssl-arduino.sh +++ b/IDE/ARDUINO/wolfssl-arduino.sh @@ -238,6 +238,8 @@ if [ "$THIS_DIR" = "ARDUINO" ]; then # cp ../../wolfcrypt/src/*.c ./wolfssl/src/wolfcrypt/src echo "Step 09: cp ${WOLFCRYPT_SRC_TOP}/*.c .${WOLFCRYPT_SRC}" $CP_CMD -r "${WOLFCRYPT_SRC_TOP}"/*.c ."${WOLFCRYPT_SRC}" || exit 1 + # private header included by the wolfcrypt sources (aligned allocation) + $CP_CMD "${WOLFCRYPT_SRC_TOP}"/alloc_align.h ".${WOLFCRYPT_SRC}" || exit 1 $CP_CMD -r "${WOLFCRYPT_SRC_TOP}"/port/atmel/*.c ."${WOLFCRYPT_SRC}"/port/atmel || exit 1 $CP_CMD -r "${WOLFCRYPT_SRC_TOP}"/port/Espressif/*.c ."${WOLFCRYPT_SRC}"/port/Espressif || exit 1 diff --git a/src/ssl_crypto.c b/src/ssl_crypto.c index 4f6be377f3b..272de25ac77 100644 --- a/src/ssl_crypto.c +++ b/src/ssl_crypto.c @@ -20,6 +20,7 @@ */ #include +#include #ifndef WOLFSSL_SSL_CRYPTO_INCLUDED #ifndef WOLFSSL_IGNORE_FILE_WARN @@ -2254,7 +2255,7 @@ WOLFSSL_CMAC_CTX* wolfSSL_CMAC_CTX_new(void) /* Allocate memory for EVP cipher context object. */ ctx->cctx = wolfSSL_EVP_CIPHER_CTX_new(); if (ctx->cctx == NULL) { - XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC((Cmac*)ctx->internal, NULL); XFREE(ctx, NULL, DYNAMIC_TYPE_OPENSSL); ctx = NULL; } @@ -2277,7 +2278,7 @@ void wolfSSL_CMAC_CTX_free(WOLFSSL_CMAC_CTX *ctx) #if (!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 3)) && !defined(HAVE_SELFTEST) wc_CmacFree((Cmac*)ctx->internal); #endif - XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC((Cmac*)ctx->internal, NULL); } if (ctx->cctx != NULL) { wolfSSL_EVP_CIPHER_CTX_cleanup(ctx->cctx); @@ -2363,7 +2364,7 @@ int wolfSSL_CMAC_Init(WOLFSSL_CMAC_CTX* ctx, const void *key, size_t keySz, } else if (ret == 1) { /* Allocate memory for wolfSSL CMAC object. */ - ctx->internal = (Cmac*)XMALLOC(sizeof(Cmac), NULL, DYNAMIC_TYPE_CMAC); + ctx->internal = WC_ALLOC_CMAC(NULL); if (ctx->internal == NULL) ret = 0; } @@ -2372,7 +2373,7 @@ int wolfSSL_CMAC_Init(WOLFSSL_CMAC_CTX* ctx, const void *key, size_t keySz, if ((ret == 1) && (wc_InitCmac((Cmac*)ctx->internal, (const byte*)key, (word32)keySz, WC_CMAC_AES, NULL) != 0)) { WOLFSSL_MSG("wolfSSL_CMAC_Init: wc_InitCmac() failed"); - XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC((Cmac*)ctx->internal, NULL); ctx->internal = NULL; ret = 0; } @@ -2469,7 +2470,7 @@ int wolfSSL_CMAC_Final(WOLFSSL_CMAC_CTX* ctx, unsigned char* out, size_t* len) *len = (size_t)len32; } - XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC((Cmac*)ctx->internal, NULL); ctx->internal = NULL; } diff --git a/tests/unit-mcdc/test_aes_whitebox.c b/tests/unit-mcdc/test_aes_whitebox.c index 5247cd623f8..93da9fff99b 100644 --- a/tests/unit-mcdc/test_aes_whitebox.c +++ b/tests/unit-mcdc/test_aes_whitebox.c @@ -302,10 +302,8 @@ static void wb_ghash_update(void) { WB_NOTE("AESGCM stream off; GHASH_UPDATE ski * ------------------------------------------------------------------------- */ static void wb_release(Aes* aes) { - if (aes != NULL) { - wc_AesFree(aes); - XFREE(aes, NULL, DYNAMIC_TYPE_AES); - } + if (aes != NULL) + (void)wc_AesDelete(aes, NULL); } static void wb_aesnew_common(void) diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index 49420523392..7806e3376eb 100644 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -147,6 +147,7 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits #endif #include +#include #ifdef WOLFSSL_AESNI #include @@ -17013,7 +17014,7 @@ static Aes* _AesNew_common(void* heap, int devId, int *result_code, int idLen, const char* label) { int ret; - Aes* aes = (Aes*)XMALLOC(sizeof(Aes), heap, DYNAMIC_TYPE_AES); + Aes* aes = WC_ALLOC_AES(heap); if (aes == NULL) { ret = MEMORY_E; } @@ -17047,7 +17048,7 @@ static Aes* _AesNew_common(void* heap, int devId, int *result_code, break; } if (ret != 0) { - XFREE(aes, heap, DYNAMIC_TYPE_AES); + WC_FREE_AES(aes, heap); aes = NULL; } } @@ -17092,7 +17093,7 @@ int wc_AesDelete(Aes *aes, Aes** aes_p) return BAD_FUNC_ARG; heap = aes->heap; wc_AesFree(aes); - XFREE(aes, heap, DYNAMIC_TYPE_AES); + WC_FREE_AES(aes, heap); if (aes_p != NULL) *aes_p = NULL; return 0; @@ -18680,8 +18681,7 @@ int wc_AesKeyWrap(const byte* key, word32 keySz, const byte* in, word32 inSz, return BAD_FUNC_ARG; #ifdef WOLFSSL_SMALL_STACK - if ((aes = (Aes *)XMALLOC(sizeof *aes, NULL, - DYNAMIC_TYPE_AES)) == NULL) + if ((aes = WC_ALLOC_AES(NULL)) == NULL) return MEMORY_E; #endif @@ -18700,7 +18700,9 @@ int wc_AesKeyWrap(const byte* key, word32 keySz, const byte* in, word32 inSz, wc_AesFree(aes); out: - WC_FREE_VAR_EX(aes, NULL, DYNAMIC_TYPE_AES); +#ifdef WOLFSSL_SMALL_STACK + WC_FREE_AES(aes, NULL); +#endif return ret; } @@ -18875,8 +18877,7 @@ int wc_AesKeyUnWrap(const byte* key, word32 keySz, const byte* in, word32 inSz, return BAD_FUNC_ARG; #ifdef WOLFSSL_SMALL_STACK - if ((aes = (Aes *)XMALLOC(sizeof *aes, NULL, - DYNAMIC_TYPE_AES)) == NULL) + if ((aes = WC_ALLOC_AES(NULL)) == NULL) return MEMORY_E; #endif @@ -18896,7 +18897,9 @@ int wc_AesKeyUnWrap(const byte* key, word32 keySz, const byte* in, word32 inSz, wc_AesFree(aes); out: - WC_FREE_VAR_EX(aes, NULL, DYNAMIC_TYPE_AES); +#ifdef WOLFSSL_SMALL_STACK + WC_FREE_AES(aes, NULL); +#endif return ret; } @@ -19007,7 +19010,10 @@ int wc_AesKeyWrap_Pad(const byte* key, word32 keySz, const byte* in, return BAD_FUNC_ARG; } - WC_ALLOC_VAR_EX(aes, Aes, 1, NULL, DYNAMIC_TYPE_AES, return MEMORY_E); +#ifdef WOLFSSL_SMALL_STACK + if ((aes = WC_ALLOC_AES(NULL)) == NULL) + return MEMORY_E; +#endif ret = wc_AesInit(aes, NULL, INVALID_DEVID); if (ret != 0) { @@ -19025,7 +19031,9 @@ int wc_AesKeyWrap_Pad(const byte* key, word32 keySz, const byte* in, wc_AesFree(aes); out: - WC_FREE_VAR_EX(aes, NULL, DYNAMIC_TYPE_AES); +#ifdef WOLFSSL_SMALL_STACK + WC_FREE_AES(aes, NULL); +#endif return ret; } @@ -19180,7 +19188,10 @@ int wc_AesKeyUnWrap_Pad(const byte* key, word32 keySz, const byte* in, return BAD_FUNC_ARG; } - WC_ALLOC_VAR_EX(aes, Aes, 1, NULL, DYNAMIC_TYPE_AES, return MEMORY_E); +#ifdef WOLFSSL_SMALL_STACK + if ((aes = WC_ALLOC_AES(NULL)) == NULL) + return MEMORY_E; +#endif ret = wc_AesInit(aes, NULL, INVALID_DEVID); if (ret != 0) { @@ -19198,7 +19209,9 @@ int wc_AesKeyUnWrap_Pad(const byte* key, word32 keySz, const byte* in, wc_AesFree(aes); out: - WC_FREE_VAR_EX(aes, NULL, DYNAMIC_TYPE_AES); +#ifdef WOLFSSL_SMALL_STACK + WC_FREE_AES(aes, NULL); +#endif return ret; } @@ -21156,8 +21169,10 @@ static WARN_UNUSED_RESULT int S2V( if (ret == 0) { if (dataSz >= WC_AES_BLOCK_SIZE) { - WC_ALLOC_VAR_EX(cmac, Cmac, 1, NULL, DYNAMIC_TYPE_CMAC, - ret=MEMORY_E); +#ifdef WOLFSSL_SMALL_STACK + if ((cmac = WC_ALLOC_CMAC(NULL)) == NULL) + ret = MEMORY_E; +#endif if (WC_VAR_OK(cmac)) { #ifdef WOLFSSL_CHECK_MEM_ZERO @@ -21180,7 +21195,7 @@ static WARN_UNUSED_RESULT int S2V( } } #ifdef WOLFSSL_SMALL_STACK - XFREE(cmac, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, NULL); #elif defined(WOLFSSL_CHECK_MEM_ZERO) wc_MemZero_Check(cmac, sizeof(Cmac)); #endif diff --git a/wolfcrypt/src/alloc_align.h b/wolfcrypt/src/alloc_align.h new file mode 100644 index 00000000000..1aff1d7209f --- /dev/null +++ b/wolfcrypt/src/alloc_align.h @@ -0,0 +1,105 @@ +/* alloc_align.h + * + * Copyright (C) 2006-2026 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ + +/* + * Private aligned-allocation helpers for heap contexts whose members carry + * alignment attributes (Aes, Cmac). On 32-bit Arm, malloc may only return an + * 8-byte-aligned pointer, so over-allocate, align, and keep the original + * pointer for XFREE. Included only by the files that allocate those contexts + * on the heap; not part of the public API. + */ +#ifndef WOLFSSL_ALLOC_ALIGN_H +#define WOLFSSL_ALLOC_ALIGN_H + +#include +#include + +#if defined(WOLFSSL_USE_ALIGN) && defined(WC_ALIGNOF) && \ + !defined(WOLFSSL_TI_CRYPT) +#define WC_HAVE_ALIGNED_ALLOC +static WC_INLINE void* wc_alloc_aligned(void* heap, size_t size, + size_t align, int type) +{ + byte* raw = (byte*)XMALLOC(size + align - 1 + sizeof(void*), heap, type); + wc_ptr_t p; + + if (raw == NULL) + return NULL; + p = ((wc_ptr_t)(raw + sizeof(void*)) + align - 1) & + ~((wc_ptr_t)align - 1); + ((void**)p)[-1] = raw; + return (void*)p; +} + +static WC_INLINE void wc_free_aligned(void* p, void* heap, int type) +{ + (void)heap; + (void)type; + if (p != NULL) + XFREE(((void**)p)[-1], heap, type); +} +#endif + +/* Type-specific wrappers: the alignment requirement is the type's, hidden + * here so call sites stay plain. The TI backend and builds without + * WC_ALIGNOF use the plain allocation path, which needs no indirection. + * Each wrapper exists only where its type does. */ +#ifndef NO_AES +#ifdef WC_HAVE_ALIGNED_ALLOC +static WC_INLINE Aes* WC_ALLOC_AES(void* heap) +{ + return (Aes*)wc_alloc_aligned(heap, sizeof(Aes), WC_ALIGNOF(Aes), + DYNAMIC_TYPE_AES); +} + +static WC_INLINE void WC_FREE_AES(Aes* aes, void* heap) +{ + wc_free_aligned((void*)aes, heap, DYNAMIC_TYPE_AES); +} +#else +#define WC_ALLOC_AES(heap) \ + ((Aes*)XMALLOC(sizeof(Aes), (heap), DYNAMIC_TYPE_AES)) +#define WC_FREE_AES(aes, heap) \ + do {XFREE((aes), (heap), DYNAMIC_TYPE_AES);} while (0) +#endif +#endif /* !NO_AES */ + +#ifdef WOLFSSL_CMAC +#ifdef WC_HAVE_ALIGNED_ALLOC +static WC_INLINE Cmac* WC_ALLOC_CMAC(void* heap) +{ + return (Cmac*)wc_alloc_aligned(heap, sizeof(Cmac), WC_ALIGNOF(Cmac), + DYNAMIC_TYPE_CMAC); +} + +static WC_INLINE void WC_FREE_CMAC(Cmac* cmac, void* heap) +{ + wc_free_aligned((void*)cmac, heap, DYNAMIC_TYPE_CMAC); +} +#else +#define WC_ALLOC_CMAC(heap) \ + ((Cmac*)XMALLOC(sizeof(Cmac), (heap), DYNAMIC_TYPE_CMAC)) +#define WC_FREE_CMAC(cmac, heap) \ + do {XFREE((cmac), (heap), DYNAMIC_TYPE_CMAC);} while (0) +#endif +#endif /* WOLFSSL_CMAC */ + +#endif /* WOLFSSL_ALLOC_ALIGN_H */ diff --git a/wolfcrypt/src/cmac.c b/wolfcrypt/src/cmac.c index e14dd4b0316..867ee0d0836 100644 --- a/wolfcrypt/src/cmac.c +++ b/wolfcrypt/src/cmac.c @@ -49,6 +49,7 @@ #include #include +#include #ifdef WOLF_CRYPTO_CB #include @@ -634,8 +635,7 @@ int wc_AesCmacGenerate(byte* out, word32* outSz, } #ifdef WOLFSSL_SMALL_STACK - if ((cmac = (Cmac *)XMALLOC(sizeof *cmac, NULL, - DYNAMIC_TYPE_CMAC)) == NULL) { + if ((cmac = WC_ALLOC_CMAC(NULL)) == NULL) { return MEMORY_E; } #endif @@ -658,7 +658,7 @@ int wc_AesCmacGenerate(byte* out, word32* outSz, #ifdef WOLFSSL_SMALL_STACK ForceZero(cmac, sizeof(Cmac)); - XFREE(cmac, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, NULL); #elif defined(WOLFSSL_CHECK_MEM_ZERO) wc_MemZero_Check(cmac, sizeof(Cmac)); #endif @@ -737,8 +737,7 @@ int wc_AesCmacVerify(const byte* check, word32 checkSz, } #ifdef WOLFSSL_SMALL_STACK - if ((cmac = (Cmac *)XMALLOC(sizeof *cmac, NULL, - DYNAMIC_TYPE_CMAC)) == NULL) { + if ((cmac = WC_ALLOC_CMAC(NULL)) == NULL) { return MEMORY_E; } #endif @@ -760,7 +759,7 @@ int wc_AesCmacVerify(const byte* check, word32 checkSz, #ifdef WOLFSSL_SMALL_STACK ForceZero(cmac, sizeof(Cmac)); - XFREE(cmac, NULL, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, NULL); #elif defined(WOLFSSL_CHECK_MEM_ZERO) wc_MemZero_Check(cmac, sizeof(Cmac)); #endif diff --git a/wolfcrypt/src/include.am b/wolfcrypt/src/include.am index f1768771170..5d74492147d 100644 --- a/wolfcrypt/src/include.am +++ b/wolfcrypt/src/include.am @@ -78,7 +78,8 @@ EXTRA_DIST += \ wolfcrypt/src/fp_sqr_comba_8.i \ wolfcrypt/src/fp_sqr_comba_9.i \ wolfcrypt/src/fp_sqr_comba_small_set.i \ - wolfcrypt/src/fe_x25519_128.h + wolfcrypt/src/fe_x25519_128.h \ + wolfcrypt/src/alloc_align.h EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \ wolfcrypt/src/port/ti/ti-des3.c \ diff --git a/wolfcrypt/src/kdf.c b/wolfcrypt/src/kdf.c index 7e1d977e4ea..b635eb84691 100644 --- a/wolfcrypt/src/kdf.c +++ b/wolfcrypt/src/kdf.c @@ -43,6 +43,7 @@ #include #include +#include #if defined(WC_SRTP_KDF) || defined(HAVE_CMAC_KDF) #include #endif @@ -1670,7 +1671,7 @@ int wc_KDA_KDF_twostep_cmac(const byte * salt, word32 salt_len, #endif #ifdef WOLFSSL_SMALL_STACK - cmac = (Cmac*)XMALLOC(sizeof(Cmac), heap, DYNAMIC_TYPE_CMAC); + cmac = WC_ALLOC_CMAC(heap); if (cmac == NULL) { #ifdef WOLFSSL_CHECK_MEM_ZERO wc_MemZero_Check(Key_kdk, sizeof(Key_kdk)); @@ -1699,7 +1700,7 @@ int wc_KDA_KDF_twostep_cmac(const byte * salt, word32 salt_len, #ifdef WOLFSSL_SMALL_STACK if (cmac) { ForceZero(cmac, sizeof(Cmac)); - XFREE(cmac, heap, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, heap); cmac = NULL; } #endif /* WOLFSSL_SMALL_STACK */ @@ -1777,7 +1778,7 @@ int wc_KDA_KDF_PRF_cmac(const byte* Kin, word32 KinSz, } #ifdef WOLFSSL_SMALL_STACK - cmac = (Cmac*)XMALLOC(sizeof(Cmac), heap, DYNAMIC_TYPE_CMAC); + cmac = WC_ALLOC_CMAC(heap); if (cmac == NULL) { return MEMORY_E; } @@ -1878,7 +1879,7 @@ int wc_KDA_KDF_PRF_cmac(const byte* Kin, word32 KinSz, #ifdef WOLFSSL_SMALL_STACK if (cmac) { ForceZero(cmac, sizeof(Cmac)); - XFREE(cmac, heap, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, heap); cmac = NULL; } #endif /* WOLFSSL_SMALL_STACK */ diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index d3cffb41e1e..e0670b30a79 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -421,6 +421,7 @@ static const byte const_byte_array[] = "A+Gd\0\0\0"; #include #include #include +#include #ifdef HAVE_ECC #include #endif @@ -17699,6 +17700,11 @@ static wc_test_ret_t aes_key_size_test(void) aes = wc_AesNew(HEAP_HINT, devId, &ret); if (aes == NULL) return WC_TEST_RET_ENC_EC(ret); +#if defined(WC_ALIGNOF) && !defined(HAVE_FIPS) && \ + !defined(HAVE_SELFTEST) + if (!WC_IS_ALIGNED(aes, WC_ALIGNOF(Aes))) + ERROR_OUT(WC_TEST_RET_ENC_NC, out); +#endif #else ret = wc_AesInit(aes, HEAP_HINT, devId); /* 0 check OK for FIPSv1 */ @@ -26905,9 +26911,8 @@ typedef struct keywrapVector { * byte alignment through its ALIGN16 members, which XMALLOC does not guarantee * on 32-bit targets, where malloc only promises 8 -- and wc_AesSetIV() lowers * to an alignment-qualified NEON store when building for armv8-a+crypto, which - * faults on an under-aligned object. Neither a plain local nor a plain XMALLOC - * (wc_AesNew() included) satisfies both, so allocate with headroom, align by - * hand, and keep the base pointer for XFREE. */ + * faults on an under-aligned object. Allocate with headroom, align by hand, + * and keep the base pointer for XFREE. */ #define AESKEYWRAP_AES_ALIGN 16 static wc_test_ret_t aeskeywrap_caller_aes_test(const keywrapVector* v, byte* output, word32 outputSz, @@ -86084,8 +86089,13 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cmac_test(void) WOLFSSL_ENTER("cmac_test"); #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) - if ((cmac = (Cmac *)XMALLOC(sizeof *cmac, HEAP_HINT, DYNAMIC_TYPE_CMAC)) == NULL) + if ((cmac = WC_ALLOC_CMAC(HEAP_HINT)) == NULL) ERROR_OUT(WC_TEST_RET_ENC_ERRNO, out); +#if defined(WC_ALIGNOF) && !defined(HAVE_FIPS) && \ + !defined(HAVE_SELFTEST) + if (!WC_IS_ALIGNED(cmac, WC_ALIGNOF(Cmac))) + ERROR_OUT(WC_TEST_RET_ENC_NC, out); +#endif #endif for (i = 0, tc = testCases; @@ -86204,7 +86214,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cmac_test(void) #endif #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) - XFREE(cmac, HEAP_HINT, DYNAMIC_TYPE_CMAC); + WC_FREE_CMAC(cmac, HEAP_HINT); #endif return ret; diff --git a/wolfssl/wolfcrypt/cmac.h b/wolfssl/wolfcrypt/cmac.h index 385207860d8..143f27aefcb 100644 --- a/wolfssl/wolfcrypt/cmac.h +++ b/wolfssl/wolfcrypt/cmac.h @@ -98,7 +98,6 @@ struct Cmac { }; - /* Reasonable defaults */ #ifndef WC_CMAC_TAG_MAX_SZ #define WC_CMAC_TAG_MAX_SZ 16