wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8249 from julek-wolfssl/sessionIDSz-fix

Browse Source 
Add size checks to sessionID
This commit is contained in:
Daniel Pouzzner
2024-12-04 10:06:25 -06:00
committed by GitHub
parent f7a55c6e76 8ff79dc26e
commit 35e50742db
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -30288,7 +30288,9 @@ static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
#endif #endif
ret = ret || ret = ret ||
(ssl->options.haveSessionId && XMEMCMP(ssl->arrays->sessionID, (ssl->options.haveSessionId && ssl->arrays->sessionIDSz == ID_LEN
&& ssl->session->sessionIDSz == ID_LEN
&& XMEMCMP(ssl->arrays->sessionID,
ssl->session->sessionID, ID_LEN) == 0); ssl->session->sessionID, ID_LEN) == 0);
return ret; return ret;

4
src/sniffer.c
View File

@@ -3854,7 +3854,9 @@ static int ProcessServerHello(int msgSz, const byte* input, int* sslBytes,
#endif #endif
if (session->sslServer->options.haveSessionId) { if (session->sslServer->options.haveSessionId) {
if (XMEMCMP(session->sslServer->arrays->sessionID, if (session->sslServer->arrays->sessionIDSz == ID_LEN &&
session->sslClient->arrays->sessionIDSz == ID_LEN &&
XMEMCMP(session->sslServer->arrays->sessionID,
session->sslClient->arrays->sessionID, ID_LEN) == 0) { session->sslClient->arrays->sessionID, ID_LEN) == 0) {
doResume = 1; doResume = 1;
} }

11
src/ssl_sess.c
View File

@@ -823,10 +823,8 @@ void wolfSSL_flush_sessions(WOLFSSL_CTX* ctx, long tm)
void wolfSSL_CTX_flush_sessions(WOLFSSL_CTX* ctx, long tm) void wolfSSL_CTX_flush_sessions(WOLFSSL_CTX* ctx, long tm)
{ {
int i, j; int i, j;
byte id[ID_LEN];
(void)ctx; (void)ctx;
XMEMSET(id, 0, ID_LEN);
WOLFSSL_ENTER("wolfSSL_flush_sessions"); WOLFSSL_ENTER("wolfSSL_flush_sessions");
for (i = 0; i < SESSION_ROWS; ++i) { for (i = 0; i < SESSION_ROWS; ++i) {
if (SESSION_ROW_WR_LOCK(&SessionCache[i]) != 0) { if (SESSION_ROW_WR_LOCK(&SessionCache[i]) != 0) {
@@ -843,8 +841,7 @@ void wolfSSL_CTX_flush_sessions(WOLFSSL_CTX* ctx, long tm)
#ifdef SESSION_CACHE_DYNAMIC_MEM #ifdef SESSION_CACHE_DYNAMIC_MEM
s != NULL && s != NULL &&
#endif #endif
s->sessionIDSz == ID_LEN && s->sessionIDSz > 0 &&
XMEMCMP(s->sessionID, id, ID_LEN) != 0 &&
s->bornOn + s->timeout < (word32)tm s->bornOn + s->timeout < (word32)tm
) )
{ {
@@ -3135,6 +3132,10 @@ static void SESSION_ex_data_cache_update(WOLFSSL_SESSION* session, int idx,
id = session->sessionID; id = session->sessionID;
if (session->haveAltSessionID) if (session->haveAltSessionID)
id = session->altSessionID; id = session->altSessionID;
else if (session->sessionIDSz != ID_LEN) {
WOLFSSL_MSG("Incorrect sessionIDSz");
return;
}
row = (int)(HashObject(id, ID_LEN, &error) % SESSION_ROWS); row = (int)(HashObject(id, ID_LEN, &error) % SESSION_ROWS);
if (error != 0) { if (error != 0) {
@@ -3159,7 +3160,7 @@ static void SESSION_ex_data_cache_update(WOLFSSL_SESSION* session, int idx,
#else #else
cacheSession = &sessRow->Sessions[i]; cacheSession = &sessRow->Sessions[i];
#endif #endif
if (cacheSession && if (cacheSession && cacheSession->sessionIDSz == ID_LEN &&
XMEMCMP(id, cacheSession->sessionID, ID_LEN) == 0 XMEMCMP(id, cacheSession->sessionID, ID_LEN) == 0
&& session->side == cacheSession->side && session->side == cacheSession->side
#if defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET) #if defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET)