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

Merge pull request #4983 from douzzer/20220324-gcc-12-fixes

Browse Source 
fixups for warnings from gcc-12
This commit is contained in:
David Garske
2022-03-24 19:16:27 -07:00
committed by GitHub
parent 7eb95674ee 12776b3772
commit 04e2b6c62a
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/sniffer-tls13-gen.sh
View File

@ -70,7 +70,7 @@ fi
# Run this script from the wolfSSL root # Run this script from the wolfSSL root
if [ ! -f wolfssl/ssl.h ]; then if [ ! -f wolfssl/ssl.h ]; then
echo "Run from the wolfssl root" echo "Run from the wolfssl root"
exit -1 exit 1
fi fi
run_sequence() { run_sequence() {

20
src/internal.c
View File

@ -30632,7 +30632,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
byte haveEMS; /* have extended master secret */ byte haveEMS; /* have extended master secret */
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
byte ageAdd[AGEADD_LEN]; /* Obfuscation of age */ byte ageAdd[AGEADD_LEN]; /* Obfuscation of age */
byte namedGroup[NAMEDGREOUP_LEN]; /* Named group used */ byte namedGroup[NAMEDGROUP_LEN]; /* Named group used */
TicketNonce ticketNonce; /* Ticket nonce */ TicketNonce ticketNonce; /* Ticket nonce */
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
byte maxEarlyDataSz[MAXEARLYDATASZ_LEN]; /* Max size of byte maxEarlyDataSz[MAXEARLYDATASZ_LEN]; /* Max size of
@ -30652,17 +30652,23 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
(a->pv.minor == b->pv.minor) && (a->pv.minor == b->pv.minor) &&
(XMEMCMP(a->suite,b->suite,sizeof a->suite) == 0) && (XMEMCMP(a->suite,b->suite,sizeof a->suite) == 0) &&
(XMEMCMP(a->msecret,b->msecret,sizeof a->msecret) == 0) && (XMEMCMP(a->msecret,b->msecret,sizeof a->msecret) == 0) &&
(a->timestamp == b->timestamp) && (XMEMCMP(a->timestamp, b->timestamp, sizeof a->timestamp) == 0) &&
(a->haveEMS == b->haveEMS) (a->haveEMS == b->haveEMS)
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
&& &&
(a->ageAdd == b->ageAdd) && (XMEMCMP(a->ageAdd, b->ageAdd, sizeof a->ageAdd) == 0) &&
(a->namedGroup == b->namedGroup) && (XMEMCMP(a->namedGroup, b->namedGroup, sizeof a->namedGroup)
== 0) &&
(a->ticketNonce.len == b->ticketNonce.len) && (a->ticketNonce.len == b->ticketNonce.len) &&
(XMEMCMP(a->ticketNonce.data, b->ticketNonce.data, (XMEMCMP(
a->ticketNonce.len) == 0) a->ticketNonce.data,
b->ticketNonce.data,
a->ticketNonce.len) == 0)
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
&& (a->maxEarlyDataSz == b->maxEarlyDataSz) && (XMEMCMP(
a->maxEarlyDataSz,
b->maxEarlyDataSz,
sizeof a->maxEarlyDataSz) == 0)
#endif #endif
#endif #endif
) )

4
src/ssl.c
View File

@ -13720,7 +13720,7 @@ static int CheckcipherList(const char* list)
if (current_length < length) { if (current_length < length) {
length = current_length; length = current_length;
} }
XSTRNCPY(name, current, length); XMEMCPY(name, current, length);
name[length] = 0; name[length] = 0;
ret = wolfSSL_get_cipher_suite_from_name(name, &cipherSuite0, ret = wolfSSL_get_cipher_suite_from_name(name, &cipherSuite0,
@ -13792,7 +13792,7 @@ static int wolfSSL_parse_cipher_list(WOLFSSL_CTX* ctx, Suites* suites,
if (current_length < length) { if (current_length < length) {
length = current_length; length = current_length;
} }
XSTRNCPY(name, current, length); XMEMCPY(name, current, length);
name[length] = 0; name[length] = 0;
/* check for "not" case */ /* check for "not" case */

2
wolfssl/internal.h
View File

@ -1188,7 +1188,7 @@ enum Misc {
TIMESTAMP_LEN = 4, /* timestamp size in ticket */ TIMESTAMP_LEN = 4, /* timestamp size in ticket */
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
AGEADD_LEN = 4, /* ageAdd size in ticket */ AGEADD_LEN = 4, /* ageAdd size in ticket */
NAMEDGREOUP_LEN = 2, /* namedGroup size in ticket */ NAMEDGROUP_LEN = 2, /* namedGroup size in ticket */
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
MAXEARLYDATASZ_LEN = 4, /* maxEarlyDataSz size in ticket */ MAXEARLYDATASZ_LEN = 4, /* maxEarlyDataSz size in ticket */
#endif #endif