lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-10 05:03:02 +03:00
Code Activity

Merge pull request #7987 from gilles-peskine-arm/ssl_premaster_secret-empty-2.28

Browse Source 
Backport 2.28: Fix empty union when TLS is disabled
This commit is contained in:
Gilles Peskine
2023-07-27 10:29:27 +02:00
committed by GitHub
parent b98d39ce2a e5507d5f20
commit ae68c09a69
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/ssl_premaster_secret-empty.txt Normal file
View 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
View File

@@ -494,6 +494,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