Assemble ChangeLog
Signed-off-by: David Horstmann <david.horstmann@arm.com>
diff --git a/ChangeLog b/ChangeLog
index 8eb43fe..1f792b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
Mbed TLS ChangeLog (Sorted per branch, date)
+= Mbed TLS x.x.x branch released xxxx-xx-xx
+
+Security
+ * Fix a buffer overflow in mbedtls_pk_write_pubkey(),
+ mbedtls_pk_write_pubkey_der() and mbedtls_pk_write_key_der().
+ With MBEDTLS_USE_PSA_CRYPTO turned on, these functions would
+ write to a location before the start of the output buffer if it was less
+ than the size of the key being written and also less than
+ PK_MAX_EC_PUBLIC_KEY_SIZE (for EC public keys) and
+ PSA_EXPORT_KEY_PAIR_MAX_SIZE (for RSA private keys).
+ This buffer overflow only occurs for keys with the type MBEDTLS_PK_OPAQUE.
+
= Mbed TLS 3.6.1 branch released 2024-08-30
API changes
diff --git a/ChangeLog.d/fix-pkwrite-buffer-overrun.txt b/ChangeLog.d/fix-pkwrite-buffer-overrun.txt
deleted file mode 100644
index 716b11e..0000000
--- a/ChangeLog.d/fix-pkwrite-buffer-overrun.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Security
- * Fix a buffer overflow in mbedtls_pk_write_pubkey(),
- mbedtls_pk_write_pubkey_der() and mbedtls_pk_write_key_der().
- With MBEDTLS_USE_PSA_CRYPTO turned on, these functions would
- write to a location before the start of the output buffer if it was less
- than the size of the key being written and also less than
- PK_MAX_EC_PUBLIC_KEY_SIZE (for EC public keys) and
- PSA_EXPORT_KEY_PAIR_MAX_SIZE (for RSA private keys).
- This buffer overflow only occurs for keys with the type MBEDTLS_PK_OPAQUE.