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

Merge pull request from gilles-peskine-arm/ssl_premaster_secret-empty-3.4

Browse Source 
Fix empty union when TLS is disabled
This commit is contained in:
Gilles Peskine 2023-07-27 08:28:21 +00:00 committed by GitHub
commit 7ef14bf8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
ChangeLog.d
ssl_premaster_secret-empty.txt
include/mbedtls
ssl.h

3
ChangeLog.d/ssl_premaster_secret-empty.txt Normal file

@ -0,0 +1,3 @@
Bugfix
* Fix a compilation error on some platforms when including mbedtls/ssl.h
with all TLS support disabled. Fixes #6628.

1
include/mbedtls/ssl.h

@ -619,6 +619,7 @@
/* Dummy type used only for its size */ /* Dummy type used only for its size */
union mbedtls_ssl_premaster_secret { union mbedtls_ssl_premaster_secret {
unsigned char dummy; /* Make the union non-empty even with SSL disabled */
#if defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED)
unsigned char _pms_rsa[48]; /* RFC 5246 8.1.1 */ unsigned char _pms_rsa[48]; /* RFC 5246 8.1.1 */
#endif #endif