coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge cf6d40a92de43a402be22514c479793ba5326ee3 into 3bb373867917b674265067cbd38b9d252c43d014

Browse Source
This commit is contained in:
Paulo Santos 2026-07-20 21:01:37 +01:00 committed by GitHub
commit 02a5da6d66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.d/fix-pms-ecdh-psa-client-size.txt Normal file
View File

@ -0,0 +1,8 @@
Bugfix
* Fix TLS 1.2 ECDHE handshakes failing in PSA-client-only
builds (MBEDTLS_PSA_CRYPTO_C disabled) where
MBEDTLS_ECP_MAX_BYTES collapses to 1 and the
premaster-secret union sized below
PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE caused
psa_raw_key_agreement() to return PSA_ERROR_BUFFER_TOO_SMALL.
Fixes #10757.

18
include/mbedtls/ssl.h
View File

@ -648,18 +648,32 @@
#endif
#endif /* !MBEDTLS_PSK_MAX_LEN */
/**
* In PSA-client-only builds (MBEDTLS_PSA_CRYPTO_C off, e.g. NS-side
* mbedtls dispatching to a secure PSA service like TF-M) the local
* ECP_LIGHT cascade does not run and MBEDTLS_ECP_MAX_BYTES collapses
* to 1. Take the larger of that and PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE,
* which is sized by the enabled PSA_WANT_ECC_* curves and is always
* defined, so psa_raw_key_agreement() has a real output buffer to
* write the ECDH shared secret into.
*/
#define MBEDTLS_SSL_PMS_ECDH_SIZE \
(PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE > MBEDTLS_ECP_MAX_BYTES \
? PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE \
: MBEDTLS_ECP_MAX_BYTES)
/* Dummy type used only for its size */
union mbedtls_ssl_premaster_secret {
unsigned char dummy; /* Make the union non-empty even with SSL disabled */
#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
unsigned char _pms_ecdh[MBEDTLS_ECP_MAX_BYTES]; /* RFC 4492 5.10 */
unsigned char _pms_ecdh[MBEDTLS_SSL_PMS_ECDH_SIZE]; /* RFC 4492 5.10 */
#endif
#if defined(MBEDTLS_KEY_EXCHANGE_PSK_ENABLED)
unsigned char _pms_psk[4 + 2 * MBEDTLS_PSK_MAX_LEN]; /* RFC 4279 2 */
#endif
#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
unsigned char _pms_ecdhe_psk[4 + MBEDTLS_ECP_MAX_BYTES
unsigned char _pms_ecdhe_psk[4 + MBEDTLS_SSL_PMS_ECDH_SIZE
+ MBEDTLS_PSK_MAX_LEN]; /* RFC 5489 2 */
#endif
#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)