wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7454 from lealem47/stm32AesCtr

Browse Source 
Fix for AES CTR on STM32
This commit is contained in:
David Garske
2024-04-22 10:04:06 -07:00
committed by GitHub
parent b17ad46b30 eafa425019
commit 3a89c452b3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1915,9 +1915,9 @@ AC_ARG_ENABLE([opensslcoexist],
if test "x$ENABLED_OPENSSLCOEXIST" = "xyes" || test "$ENABLED_WOLFENGINE" = "yes" if test "x$ENABLED_OPENSSLCOEXIST" = "xyes" || test "$ENABLED_WOLFENGINE" = "yes"
then then
# make sure old names are disabled # make sure old names are disabled (except RNG)
enable_oldnames=no AM_CFLAGS="$AM_CFLAGS -DNO_OLD_WC_NAMES -DNO_OLD_SSL_NAMES"
AM_CFLAGS="$AM_CFLAGS -DNO_OLD_SHA_NAMES -DNO_OLD_MD5_NAME"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_COEXIST" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_COEXIST"
fi fi

2
wolfcrypt/src/aes.c
View File

@ -6151,7 +6151,7 @@ int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
return wc_AesSetKeyLocal(aes, key, len, iv, dir, 0); return wc_AesSetKey(aes, key, len, iv, dir);
} }
#endif /* NEED_AES_CTR_SOFT */ #endif /* NEED_AES_CTR_SOFT */

8
wolfcrypt/test/test.c
View File

@ -996,6 +996,10 @@ wc_test_ret_t wolfcrypt_test(void* args)
heap_baselineBytes = wolfCrypt_heap_peakBytes_checkpoint(); heap_baselineBytes = wolfCrypt_heap_peakBytes_checkpoint();
#endif #endif
#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif
printf("------------------------------------------------------------------------------\n"); printf("------------------------------------------------------------------------------\n");
printf(" wolfSSL version %s\n", LIBWOLFSSL_VERSION_STRING); printf(" wolfSSL version %s\n", LIBWOLFSSL_VERSION_STRING);
#ifdef WOLF_CRYPTO_CB #ifdef WOLF_CRYPTO_CB
@ -2094,10 +2098,6 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
printf("Math: %s\n", wc_GetMathInfo()); printf("Math: %s\n", wc_GetMathInfo());
#endif #endif
#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif
#ifdef HAVE_STACK_SIZE #ifdef HAVE_STACK_SIZE
StackSizeCheck(&args, wolfcrypt_test); StackSizeCheck(&args, wolfcrypt_test);
#else #else

2
wolfssl/wolfcrypt/settings.h
View File

@ -388,7 +388,7 @@
* system or other set of headers included by wolfSSL already defines * system or other set of headers included by wolfSSL already defines
* RNG. Examples are: * RNG. Examples are:
* wolfEngine, wolfProvider and potentially other use-cases */ * wolfEngine, wolfProvider and potentially other use-cases */
#ifndef RNG #if !defined(RNG) && !defined(NO_OLD_RNGNAME)
#define RNG WC_RNG #define RNG WC_RNG
#endif #endif
#endif #endif