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

Merge branch 'master' of https://github.com/wolfSSL/wolfssl into BenchmarkEnhancements

Browse Source
This commit is contained in:
gojimmypi
2022-12-16 14:00:16 -08:00
parent c370529975 3d1775320b
commit 64a7d511b8
4 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -8013,7 +8013,7 @@ then
AM_CFLAGS="$AM_CFLAGS -DNO_OLD_MD5_NAME" AM_CFLAGS="$AM_CFLAGS -DNO_OLD_MD5_NAME"
fi fi
if test "$ENABLED_WOLFENGINE" = "yes" && test "$ENABLED_FIPS" != "v2" if test "$ENABLED_WOLFENGINE" = "yes" && test "$FIPS_VERSION" != "v2"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PSS_LONG_SALT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PSS_LONG_SALT"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PSS_SALT_LEN_DISCOVER" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PSS_SALT_LEN_DISCOVER"

2
src/internal.c
View File

@ -34194,7 +34194,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (ssl->ctx->ticketEncCb == NULL if (ssl->ctx->ticketEncCb == NULL
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL)
|| ||
/* SSL_OP_NO_TICKET turns off tickets in < 1.2. Forces /* SSL_OP_NO_TICKET turns off tickets in <= 1.2. Forces
* "stateful" tickets for 1.3 so just use the regular * "stateful" tickets for 1.3 so just use the regular
* stateless ones. */ * stateless ones. */
(!IsAtLeastTLSv1_3(ssl->version) && (!IsAtLeastTLSv1_3(ssl->version) &&

15
src/ssl.c
View File

@ -13358,6 +13358,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if (ssl->options.createTicket && !ssl->options.noTicketTls12) { if (ssl->options.createTicket && !ssl->options.noTicketTls12) {
if ( (ssl->error = SendTicket(ssl)) != 0) { if ( (ssl->error = SendTicket(ssl)) != 0) {
WOLFSSL_MSG("Thought we need ticket but failed");
WOLFSSL_ERROR(ssl->error); WOLFSSL_ERROR(ssl->error);
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
@ -16774,6 +16775,12 @@ cleanup:
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
ctx->mask = wolf_set_options(ctx->mask, opt); ctx->mask = wolf_set_options(ctx->mask, opt);
#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \
|| defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL))
if ((ctx->mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {
ctx->noTicketTls12 = 1;
}
#endif
return ctx->mask; return ctx->mask;
} }
@ -23556,6 +23563,14 @@ long wolfSSL_set_options(WOLFSSL* ssl, long op)
#endif #endif
} }
#if defined(HAVE_SESSION_TICKET) && (defined(OPENSSL_EXTRA) \
|| defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL))
if ((ssl->options.mask & WOLFSSL_OP_NO_TICKET) == WOLFSSL_OP_NO_TICKET) {
ssl->options.noTicketTls12 = 1;
}
#endif
/* in the case of a version change the cipher suites should be reset */ /* in the case of a version change the cipher suites should be reset */
#ifndef NO_PSK #ifndef NO_PSK
havePSK = ssl->options.havePSK; havePSK = ssl->options.havePSK;

48
wolfcrypt/benchmark/benchmark.c
View File

@ -3625,9 +3625,9 @@ static void bench_aesecb_internal(int useDeviceID,
Aes enc[BENCH_MAX_PENDING]; Aes enc[BENCH_MAX_PENDING];
double start; double start;
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
int benchSz = AES_BLOCK_SIZE; static const int benchSz = AES_BLOCK_SIZE;
#else #else
int benchSz = BENCH_SIZE; static const int benchSz = BENCH_SIZE;
#endif #endif
/* clear for done cleanup */ /* clear for done cleanup */
@ -3650,7 +3650,7 @@ static void bench_aesecb_internal(int useDeviceID,
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
int outer_loop_limit = ((bench_size / AES_BLOCK_SIZE) * 10) + 1; int outer_loop_limit = ((bench_size / benchSz) * 10) + 1;
for (times = 0; for (times = 0;
times < outer_loop_limit /* numBlocks */ || pending > 0; times < outer_loop_limit /* numBlocks */ || pending > 0;
) { ) {
@ -3692,7 +3692,7 @@ exit_aes_enc:
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
int outer_loop_limit = (10 * (bench_size / AES_BLOCK_SIZE)) + 1; int outer_loop_limit = (10 * (bench_size / benchSz)) + 1;
for (times = 0; times < outer_loop_limit || pending > 0; ) { for (times = 0; times < outer_loop_limit || pending > 0; ) {
bench_async_poll(&pending); bench_async_poll(&pending);
@ -3947,7 +3947,7 @@ void bench_aesctr(void)
#ifdef HAVE_AESCCM #ifdef HAVE_AESCCM
void bench_aesccm(int useDevId) void bench_aesccm(int useDeviceID)
{ {
Aes enc; Aes enc;
double start; double start;
@ -3967,7 +3967,7 @@ void bench_aesccm(int useDevId)
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ); XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
if ((ret = wc_AesInit(&enc, HEAP_HINT, if ((ret = wc_AesInit(&enc, HEAP_HINT,
(useDevId)? devId: INVALID_DEVID)) != 0) { useDeviceID ? devId : INVALID_DEVID)) != 0) {
printf("wc_AesInit failed, ret = %d\n", ret); printf("wc_AesInit failed, ret = %d\n", ret);
goto exit; goto exit;
} }
@ -3986,7 +3986,7 @@ void bench_aesccm(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-enc"), useDevId, count, bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-enc"), useDeviceID, count,
bench_size, start, ret); bench_size, start, ret);
if (ret != 0) { if (ret != 0) {
printf("wc_AesCcmEncrypt failed, ret = %d\n", ret); printf("wc_AesCcmEncrypt failed, ret = %d\n", ret);
@ -4002,7 +4002,7 @@ void bench_aesccm(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-dec"), useDevId, count, bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-dec"), useDeviceID, count,
bench_size, start, ret); bench_size, start, ret);
if (ret != 0) { if (ret != 0) {
printf("wc_AesCcmEncrypt failed, ret = %d\n", ret); printf("wc_AesCcmEncrypt failed, ret = %d\n", ret);
@ -5629,7 +5629,7 @@ void bench_blake2s(void)
#ifdef WOLFSSL_CMAC #ifdef WOLFSSL_CMAC
static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId) static void bench_cmac_helper(int keySz, const char* outMsg, int useDeviceID)
{ {
Cmac cmac; Cmac cmac;
byte digest[AES_BLOCK_SIZE]; byte digest[AES_BLOCK_SIZE];
@ -5647,14 +5647,14 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
keyType = CAAM_KEYTYPE_AES256; keyType = CAAM_KEYTYPE_AES256;
} }
if (useDevId && if (useDeviceID &&
wc_SECO_GenerateKey(CAAM_GENERATE_KEY, keyGroup, pubKey, 0, keyType, wc_SECO_GenerateKey(CAAM_GENERATE_KEY, keyGroup, pubKey, 0, keyType,
keyInfo, &keyID) != 0) { keyInfo, &keyID) != 0) {
printf("Error generating key in hsm\n"); printf("Error generating key in hsm\n");
return; return;
} }
#endif #endif
(void)useDevId; (void)useDeviceID;
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
@ -5662,14 +5662,14 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL); ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL);
#else #else
ret = wc_InitCmac_ex(&cmac, bench_key, keySz, WC_CMAC_AES, NULL, ret = wc_InitCmac_ex(&cmac, bench_key, keySz, WC_CMAC_AES, NULL,
HEAP_HINT, (useDevId)? devId: INVALID_DEVID); HEAP_HINT, useDeviceID ? devId : INVALID_DEVID);
#endif #endif
if (ret != 0) { if (ret != 0) {
printf("InitCmac failed, ret = %d\n", ret); printf("InitCmac failed, ret = %d\n", ret);
return; return;
} }
#ifdef WOLFSSL_SECO_CAAM #ifdef WOLFSSL_SECO_CAAM
if (useDevId) { if (useDeviceID) {
wc_SECO_CMACSetKeyID(&cmac, keyID); wc_SECO_CMACSetKeyID(&cmac, keyID);
} }
#endif #endif
@ -5692,13 +5692,13 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
bench_stats_sym_finish(outMsg, 0, count, bench_size, start, ret); bench_stats_sym_finish(outMsg, 0, count, bench_size, start, ret);
} }
void bench_cmac(int useDevId) void bench_cmac(int useDeviceID)
{ {
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
bench_cmac_helper(16, "AES-128-CMAC", useDevId); bench_cmac_helper(16, "AES-128-CMAC", useDeviceID);
#endif #endif
#ifdef WOLFSSL_AES_256 #ifdef WOLFSSL_AES_256
bench_cmac_helper(32, "AES-256-CMAC", useDevId); bench_cmac_helper(32, "AES-256-CMAC", useDeviceID);
#endif #endif
} }
@ -7336,7 +7336,7 @@ exit:
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
void bench_curve25519KeyGen(int useDevId) void bench_curve25519KeyGen(int useDeviceID)
{ {
curve25519_key genKey; curve25519_key genKey;
double start; double start;
@ -7347,8 +7347,8 @@ void bench_curve25519KeyGen(int useDevId)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
for (i = 0; i < genTimes; i++) { for (i = 0; i < genTimes; i++) {
ret = wc_curve25519_init_ex(&genKey, HEAP_HINT, (useDevId)? devId : ret = wc_curve25519_init_ex(&genKey, HEAP_HINT,
INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) { if (ret != 0) {
printf("wc_curve25519_init_ex failed: %d\n", ret); printf("wc_curve25519_init_ex failed: %d\n", ret);
break; break;
@ -7363,12 +7363,12 @@ void bench_curve25519KeyGen(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_asym_finish("CURVE", 25519, desc[2], useDevId, count, start, bench_stats_asym_finish("CURVE", 25519, desc[2], useDeviceID, count, start,
ret); ret);
} }
#ifdef HAVE_CURVE25519_SHARED_SECRET #ifdef HAVE_CURVE25519_SHARED_SECRET
void bench_curve25519KeyAgree(int useDevId) void bench_curve25519KeyAgree(int useDeviceID)
{ {
curve25519_key genKey, genKey2; curve25519_key genKey, genKey2;
double start; double start;
@ -7378,9 +7378,9 @@ void bench_curve25519KeyAgree(int useDevId)
word32 x = 0; word32 x = 0;
wc_curve25519_init_ex(&genKey, HEAP_HINT, wc_curve25519_init_ex(&genKey, HEAP_HINT,
(useDevId)? devId : INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
wc_curve25519_init_ex(&genKey2, HEAP_HINT, wc_curve25519_init_ex(&genKey2, HEAP_HINT,
(useDevId)? devId : INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
ret = wc_curve25519_make_key(&gRng, 32, &genKey); ret = wc_curve25519_make_key(&gRng, 32, &genKey);
if (ret != 0) { if (ret != 0) {
@ -7408,7 +7408,7 @@ void bench_curve25519KeyAgree(int useDevId)
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
exit: exit:
bench_stats_asym_finish("CURVE", 25519, desc[3], useDevId, count, start, bench_stats_asym_finish("CURVE", 25519, desc[3], useDeviceID, count, start,
ret); ret);
wc_curve25519_free(&genKey2); wc_curve25519_free(&genKey2);