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

…-empty-2.28 Backport 2.28: Fix empty union when TLS is disabled
Mbed-TLS · Jul 27, 2023 · ae68c09 · ae68c09
2 parents b98d39c + e5507d5
commit ae68c09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/ChangeLog.d/ssl_premaster_secret-empty.txt b/ChangeLog.d/ssl_premaster_secret-empty.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fix a compilation error on some platforms when including mbedtls/ssl.h
+     with all TLS support disabled. Fixes #6628.
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
@@ -494,6 +494,7 @@
 
 /* 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_RSA_ENABLED)
     unsigned char _pms_rsa[48];                         /* RFC 5246 8.1.1 */
 #endif