feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Intel x86_64, gcc, icc: put branches on 32 byte boundary

Browse Source 
Improved security with compile flag.
This commit is contained in:
Sean Parkinson
2025-03-21 17:20:32 +10:00
parent 18ac695bb2
commit 295ba3b416
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -175,6 +175,19 @@ DEBUG_CFLAGS="-g -DDEBUG -DDEBUG_WOLFSSL"
LIB_ADD= LIB_ADD=
LIB_STATIC_ADD= LIB_STATIC_ADD=
EXTRA_OPTS_CFLAGS=
if test "$host_cpu" = "x86_64"
then
if test "$CC" = "gcc" || test "$CC" = "icc"
then
EXTRA_OPTS_CFLAGS="$EXTRA_OPTS_CFLAGS -Wa,-mbranches-within-32B-boundaries"
fi
fi
OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS $EXTRA_OPTS_CFLAGS"
OPTIMIZE_FAST_CFLAGS="$OPTIMIZE_FAST_CFLAGS $EXTRA_OPTS_CFLAGS"
OPTIMIZE_HUGE_CFLAGS="$OPTIMIZE_HUGE_CFLAGS $EXTRA_OPTS_CFLAGS"
DEBUG_VFLAGS="$DEBUG_VFLAGS $EXTRA_OPTS_CFLAGS"
if test "$output_objdir" = "" if test "$output_objdir" = ""
then then
output_objdir=. output_objdir=.

8
wolfcrypt/benchmark/benchmark.c
View File

@@ -8637,7 +8637,7 @@ void bench_srtpkdf(void)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
do { do {
for (i = 0; i < numBlocks; i++) { for (i = 0; i < numBlocks * 1000; i++) {
ret = wc_SRTP_KDF(key, AES_128_KEY_SIZE, salt, sizeof(salt), ret = wc_SRTP_KDF(key, AES_128_KEY_SIZE, salt, sizeof(salt),
kdrIdx, index, keyE, AES_128_KEY_SIZE, keyA, sizeof(keyA), kdrIdx, index, keyE, AES_128_KEY_SIZE, keyA, sizeof(keyA),
keyS, sizeof(keyS)); keyS, sizeof(keyS));
@@ -8660,7 +8660,7 @@ void bench_srtpkdf(void)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
do { do {
for (i = 0; i < numBlocks; i++) { for (i = 0; i < numBlocks * 1000; i++) {
ret = wc_SRTP_KDF(key, AES_256_KEY_SIZE, salt, sizeof(salt), ret = wc_SRTP_KDF(key, AES_256_KEY_SIZE, salt, sizeof(salt),
kdrIdx, index, keyE, AES_256_KEY_SIZE, keyA, sizeof(keyA), kdrIdx, index, keyE, AES_256_KEY_SIZE, keyA, sizeof(keyA),
keyS, sizeof(keyS)); keyS, sizeof(keyS));
@@ -8683,7 +8683,7 @@ void bench_srtpkdf(void)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
do { do {
for (i = 0; i < numBlocks; i++) { for (i = 0; i < numBlocks * 1000; i++) {
ret = wc_SRTCP_KDF(key, AES_128_KEY_SIZE, salt, sizeof(salt), ret = wc_SRTCP_KDF(key, AES_128_KEY_SIZE, salt, sizeof(salt),
kdrIdx, index, keyE, AES_128_KEY_SIZE, keyA, sizeof(keyA), kdrIdx, index, keyE, AES_128_KEY_SIZE, keyA, sizeof(keyA),
keyS, sizeof(keyS)); keyS, sizeof(keyS));
@@ -8706,7 +8706,7 @@ void bench_srtpkdf(void)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
do { do {
for (i = 0; i < numBlocks; i++) { for (i = 0; i < numBlocks * 1000; i++) {
ret = wc_SRTCP_KDF(key, AES_256_KEY_SIZE, salt, sizeof(salt), ret = wc_SRTCP_KDF(key, AES_256_KEY_SIZE, salt, sizeof(salt),
kdrIdx, index, keyE, AES_256_KEY_SIZE, keyA, sizeof(keyA), kdrIdx, index, keyE, AES_256_KEY_SIZE, keyA, sizeof(keyA),
keyS, sizeof(keyS)); keyS, sizeof(keyS));

16
wolfcrypt/src/kdf.c
View File

@@ -1051,11 +1051,7 @@ int wc_SRTP_KDF(const byte* key, word32 keySz, const byte* salt, word32 saltSz,
ret = MEMORY_E; ret = MEMORY_E;
} }
} }
if (aes != NULL)
#endif #endif
{
XMEMSET(aes, 0, sizeof(Aes));
}
/* Setup AES object. */ /* Setup AES object. */
if (ret == 0) { if (ret == 0) {
@@ -1155,11 +1151,7 @@ int wc_SRTCP_KDF_ex(const byte* key, word32 keySz, const byte* salt, word32 salt
ret = MEMORY_E; ret = MEMORY_E;
} }
} }
if (aes != NULL)
#endif #endif
{
XMEMSET(aes, 0, sizeof(Aes));
}
/* Setup AES object. */ /* Setup AES object. */
if (ret == 0) { if (ret == 0) {
@@ -1256,11 +1248,7 @@ int wc_SRTP_KDF_label(const byte* key, word32 keySz, const byte* salt,
ret = MEMORY_E; ret = MEMORY_E;
} }
} }
if (aes != NULL)
#endif #endif
{
XMEMSET(aes, 0, sizeof(Aes));
}
/* Setup AES object. */ /* Setup AES object. */
if (ret == 0) { if (ret == 0) {
@@ -1339,11 +1327,7 @@ int wc_SRTCP_KDF_label(const byte* key, word32 keySz, const byte* salt,
ret = MEMORY_E; ret = MEMORY_E;
} }
} }
if (aes != NULL)
#endif #endif
{
XMEMSET(aes, 0, sizeof(Aes));
}
/* Setup AES object. */ /* Setup AES object. */
if (ret == 0) { if (ret == 0) {