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

Merge pull request #7341 from dgarske/psk_openssl

Browse Source 
Fix for PSK callback with OPENSSL_EXTRA to correctly handle the 0 length
This commit is contained in:
JacobBarthelmeh
2024-03-16 02:22:24 +07:00
committed by GitHub
parent 2f43cc1c7b 8d1714a307
commit 5a5648a6ac
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tls.c
View File

@@ -13364,7 +13364,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
MAX_PSK_ID_LEN, ssl->arrays->psk_key, MAX_PSK_KEY_LEN); MAX_PSK_ID_LEN, ssl->arrays->psk_key, MAX_PSK_KEY_LEN);
} }
if ( if (
#ifndef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
/* OpenSSL treats a PSK key length of 0 /* OpenSSL treats a PSK key length of 0
* to indicate no PSK available. * to indicate no PSK available.
*/ */
@@ -13372,7 +13372,9 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
#endif #endif
(ssl->arrays->psk_keySz > MAX_PSK_KEY_LEN && (ssl->arrays->psk_keySz > MAX_PSK_KEY_LEN &&
(int)ssl->arrays->psk_keySz != USE_HW_PSK)) { (int)ssl->arrays->psk_keySz != USE_HW_PSK)) {
#ifndef OPENSSL_EXTRA
ret = PSK_KEY_ERROR; ret = PSK_KEY_ERROR;
#endif
} }
else { else {
ssl->arrays->client_identity[MAX_PSK_ID_LEN] = '\0'; ssl->arrays->client_identity[MAX_PSK_ID_LEN] = '\0';