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

Fix for SNI refactor handling of return codes. Fix for possible use of NULL on client array.

Browse Source
This commit is contained in:
David Garske
2021-07-16 11:23:20 -07:00
parent 3ff21171cb
commit fe77e29ba0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sniffer.c
View File

@ -3199,6 +3199,7 @@ static int ProcessServerHello(int msgSz, const byte* input, int* sslBytes,
} }
#ifdef HAVE_SNI #ifdef HAVE_SNI
/* Function return value must be 0 for success */
static int LoadNamedKey(SnifferSession* session, const byte* name, word16 nameSz) static int LoadNamedKey(SnifferSession* session, const byte* name, word16 nameSz)
{ {
int ret = 0; int ret = 0;
@ -3216,8 +3217,6 @@ static int LoadNamedKey(SnifferSession* session, const byte* name, word16 nameSz
ret = wolfSSL_set_ephemeral_key(ssl, ret = wolfSSL_set_ephemeral_key(ssl,
WC_PK_TYPE_NONE, (const char*)namedKey->key, WC_PK_TYPE_NONE, (const char*)namedKey->key,
namedKey->keySz, WOLFSSL_FILETYPE_ASN1); namedKey->keySz, WOLFSSL_FILETYPE_ASN1);
if (ret == 0)
ret = WOLFSSL_SUCCESS;
} }
else else
#endif #endif
@ -3225,16 +3224,15 @@ static int LoadNamedKey(SnifferSession* session, const byte* name, word16 nameSz
ret = wolfSSL_use_PrivateKey_buffer(ssl, ret = wolfSSL_use_PrivateKey_buffer(ssl,
namedKey->key, namedKey->keySz, namedKey->key, namedKey->keySz,
WOLFSSL_FILETYPE_ASN1); WOLFSSL_FILETYPE_ASN1);
/* translate return code */
ret = (ret == WOLFSSL_SUCCESS) ? 0 : -1;
} }
if (ret != WOLFSSL_SUCCESS) { if (ret == 0) {
ret = -1; session->sni = namedKey->name;
break;
} }
session->sni = namedKey->name;
break; break;
} }
else namedKey = namedKey->next;
namedKey = namedKey->next;
} }
wc_UnLockMutex(&session->context->namedKeysMutex); wc_UnLockMutex(&session->context->namedKeysMutex);
return ret; return ret;
@ -3287,7 +3285,8 @@ static int ProcessClientHello(const byte* input, int* sslBytes,
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
XMEMCPY(session->sslClient->session.sessionID, input, ID_LEN); XMEMCPY(session->sslClient->session.sessionID, input, ID_LEN);
#endif #endif
XMEMCPY(session->sslClient->arrays->sessionID, input, ID_LEN); if (session->sslClient->arrays)
XMEMCPY(session->sslClient->arrays->sessionID, input, ID_LEN);
session->sslClient->options.haveSessionId = 1; session->sslClient->options.haveSessionId = 1;
} }