Merge pull request #1042 from daverodgman/mbedtls-2.28.4rc0-pr

Mbedtls 2.28.4rc0 pr
2025-09-07 06:05:03 -04:00 · 2023-08-02 17:45:58 +01:00 · 2023-08-02 17:45:58 +01:00 · 8fd5eefe9b
commit 8fd5eefe9b
parent c5f24c0128 8abc2e6112
17 changed files with 38 additions and 43 deletions
--- a/BRANCHES.md
+++ b/BRANCHES.md
@ -76,6 +76,6 @@ The following branches are currently maintained:
 - [`development`](https://github.com/Mbed-TLS/mbedtls/)
 - [`mbedtls-2.28`](https://github.com/Mbed-TLS/mbedtls/tree/mbedtls-2.28)
 maintained until at least the end of 2024, see
-  <https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.3>.
+  <https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.4>.

 Users are urged to always use the latest version of a maintained branch.
--- a/26
+++ b/26
@ -1,5 +1,31 @@
 Mbed TLS ChangeLog (Sorted per branch, date)

+= Mbed TLS 2.28.4 branch released 2023-08-04
+
+Features
+   * Allow MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE to be set by
+     setting the CMake variable of the same name at configuration time.
+
+Bugfix
+   * Fix crypt_and_hash decryption fail when used with a stream cipher
+     mode of operation, due to the input not being a multiple of the block
+     size. Resolves #7417.
+   * Fix a bug where mbedtls_x509_string_to_names() would return success
+     when given a invalid name string, if it did not contain '=' or ','.
+   * Fix missing PSA initialization in sample programs when
+     MBEDTLS_USE_PSA_CRYPTO is enabled.
+   * Fix clang and armclang compilation error when targeting certain Arm
+     M-class CPUs (Cortex-M0, Cortex-M0+, Cortex-M1, Cortex-M23,
+     SecurCore SC000). Fixes #1077.
+   * Fixed an issue that caused compile errors when using CMake and the IAR
+     toolchain.
+   * Fix the build with MBEDTLS_PSA_INJECT_ENTROPY. Fixes #7516.
+   * Fix builds on Windows with clang.
+   * Fix compilation warnings in aes.c for certain combinations
+     of configuration options.
+   * Fix a compilation error on some platforms when including mbedtls/ssl.h
+     with all TLS support disabled. Fixes #6628.
+
 = Mbed TLS 2.28.3 branch released 2023-03-28

 Features
--- a/ChangeLog.d/armclang-compile-fix.txt
+++ b/ChangeLog.d/armclang-compile-fix.txt
@ -1,5 +0,0 @@
-Bugfix
-   * Fix clang and armclang compilation error when targeting certain Arm
-     M-class CPUs (Cortex-M0, Cortex-M0+, Cortex-M1, Cortex-M23,
-     SecurCore SC000). Fixes #1077.
-
--- a/ChangeLog.d/bugfix_iar_typo.txt
+++ b/ChangeLog.d/bugfix_iar_typo.txt
@ -1,3 +0,0 @@
-Bugfix
-   * Fixed an issue that caused compile errors when using CMake and the IAR
-     toolchain.
--- a/ChangeLog.d/cmake-pass-through-config-defines.txt
+++ b/ChangeLog.d/cmake-pass-through-config-defines.txt
@ -1,3 +0,0 @@
-Features
-   * Allow MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE to be set by
-     setting the CMake variable of the same name at configuration time.
--- a/ChangeLog.d/fix-crypt_and_hash-decrypt-issue.txt
+++ b/ChangeLog.d/fix-crypt_and_hash-decrypt-issue.txt
@ -1,4 +0,0 @@
-Bugfix
-   * Fix crypt_and_hash decryption fail when used with a stream cipher
-     mode of operation due to the input not being multiple of block size.
-     Resolves #7417.
--- a/ChangeLog.d/fix-string-to-names-retcode.txt
+++ b/ChangeLog.d/fix-string-to-names-retcode.txt
@ -1,3 +0,0 @@
-Bugfix
-   * Fix a bug in which mbedtls_x509_string_to_names() would return success
-     when given a invalid name string if it did not contain '=' or ','.
--- a/ChangeLog.d/fix-tfm-build.txt
+++ b/ChangeLog.d/fix-tfm-build.txt
@ -1,3 +0,0 @@
-Bugfix
-   * Fix compilation warnings in aes.c for certain combinations
-     of configuration options.
--- a/ChangeLog.d/fix-win32-llvm-build.txt
+++ b/ChangeLog.d/fix-win32-llvm-build.txt
@ -1,2 +0,0 @@
-Bugfix
-   * Fix builds on Windows with clang
--- a/ChangeLog.d/inject-entropy.txt
+++ b/ChangeLog.d/inject-entropy.txt
@ -1,2 +0,0 @@
-Bugfix
-   * Fix the build with MBEDTLS_PSA_INJECT_ENTROPY. Fixes #7516.
--- a/ChangeLog.d/programs_psa_fix.txt
+++ b/ChangeLog.d/programs_psa_fix.txt
@ -1,3 +0,0 @@
-Bugfix
-   * Fix missing PSA initialization in sample programs when
-     MBEDTLS_USE_PSA_CRYPTO is enabled.
--- a/ChangeLog.d/ssl_premaster_secret-empty.txt
+++ b/ChangeLog.d/ssl_premaster_secret-empty.txt
@ -1,3 +0,0 @@
-Bugfix
-   * Fix a compilation error on some platforms when including mbedtls/ssl.h
-     with all TLS support disabled. Fixes #6628.
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@ -22,7 +22,7 @@
 */

 /**
- * @mainpage Mbed TLS v2.28.3 API Documentation
+ * @mainpage Mbed TLS v2.28.4 API Documentation
 *
 * This documentation describes the internal structure of Mbed TLS.  It was
 * automatically generated from specially formatted comment blocks in
--- a/doxygen/mbedtls.doxyfile
+++ b/doxygen/mbedtls.doxyfile
@ -1,4 +1,4 @@
-PROJECT_NAME           = "mbed TLS v2.28.3"
+PROJECT_NAME           = "mbed TLS v2.28.4"
 OUTPUT_DIRECTORY       = ../apidoc/
 FULL_PATH_NAMES        = NO
 OPTIMIZE_OUTPUT_FOR_C  = YES
--- a/include/mbedtls/version.h
+++ b/include/mbedtls/version.h
@ -38,16 +38,16 @@
 */
 #define MBEDTLS_VERSION_MAJOR  2
 #define MBEDTLS_VERSION_MINOR  28
-#define MBEDTLS_VERSION_PATCH  3
+#define MBEDTLS_VERSION_PATCH  4

 /**
 * The single version number has the following structure:
 *    MMNNPP00
 *    Major version | Minor version | Patch version
 */
-#define MBEDTLS_VERSION_NUMBER         0x021C0300
-#define MBEDTLS_VERSION_STRING         "2.28.3"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.28.3"
+#define MBEDTLS_VERSION_NUMBER         0x021C0400
+#define MBEDTLS_VERSION_STRING         "2.28.4"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.28.4"

 #if defined(MBEDTLS_VERSION_C)

--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@ -204,15 +204,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
 if(USE_SHARED_MBEDTLS_LIBRARY)
    set(CMAKE_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR})
    add_library(${mbedcrypto_target} SHARED ${src_crypto})
-    set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 2.28.3 SOVERSION 7)
+    set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 2.28.4 SOVERSION 7)
    target_link_libraries(${mbedcrypto_target} PUBLIC ${libs})

    add_library(${mbedx509_target} SHARED ${src_x509})
-    set_target_properties(${mbedx509_target} PROPERTIES VERSION 2.28.3 SOVERSION 1)
+    set_target_properties(${mbedx509_target} PROPERTIES VERSION 2.28.4 SOVERSION 1)
    target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target})

    add_library(${mbedtls_target} SHARED ${src_tls})
-    set_target_properties(${mbedtls_target} PROPERTIES VERSION 2.28.3 SOVERSION 14)
+    set_target_properties(${mbedtls_target} PROPERTIES VERSION 2.28.4 SOVERSION 14)
    target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target})
 endif(USE_SHARED_MBEDTLS_LIBRARY)

--- a/tests/suites/test_suite_version.data
+++ b/tests/suites/test_suite_version.data
@ -1,8 +1,8 @@
 Check compile time library version
-check_compiletime_version:"2.28.3"
+check_compiletime_version:"2.28.4"

 Check runtime library version
-check_runtime_version:"2.28.3"
+check_runtime_version:"2.28.4"

 Check for MBEDTLS_VERSION_C
 check_feature:"MBEDTLS_VERSION_C":0