mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 05:42:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tls12: check buffer size before memcpy-ing data into it

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-07-25 11:41:28 +02:00
parent c9ae862225
commit 46520ea52d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/ssl_tls12_client.c
View File

@ -1774,9 +1774,10 @@ static int ssl_parse_server_ecdh_params(mbedtls_ssl_context *ssl,
return MBEDTLS_ERR_SSL_DECODE_ERROR; return MBEDTLS_ERR_SSL_DECODE_ERROR;
} }
/* xxdh_psa_peerkey is sized after maximum supported FFDH public key. if (ecpoint_len > PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_ECC_MAX_CURVE_BITS)) {
* PSA_VENDOR_FFDH_MAX_KEY_BITS is always larger than EC public key, so return MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE;
* we can skip the buffer size check before the memcpy-ing data into it. */ }
memcpy(handshake->xxdh_psa_peerkey, *p, ecpoint_len); memcpy(handshake->xxdh_psa_peerkey, *p, ecpoint_len);
handshake->xxdh_psa_peerkey_len = ecpoint_len; handshake->xxdh_psa_peerkey_len = ecpoint_len;
*p += ecpoint_len; *p += ecpoint_len;