aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Rodgman <dave.rodgman@arm.com>2023-10-04 18:46:47 +0100
committerDave Rodgman <dave.rodgman@arm.com>2023-10-04 18:46:47 +0100
commit5d323bf0e3fb3403938843b333cd4cf9baec4e45 (patch)
tree7017e972a8686a26465351d1a537f456f327ce15
parente35e387ad74c9d94c27542c879442c6965586e98 (diff)
downloadmbedtls-5d323bf0e3fb3403938843b333cd4cf9baec4e45.tar.gz
Re-assemble changelog to add missing item, plus a couple of typo fixes.
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.d/fix-cmake-3rdparty-custom-config.txt3
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index da6fb96a2..85f3665c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,7 +89,7 @@ Features
described in 7.4 of RFC5280, will result in a positive URI verification.
* Add function mbedtls_oid_from_numeric_string() to parse an OID from a
string to a DER-encoded mbedtls_asn1_buf.
- * Add SHA-3 family hash functions.
+ * Add SHA-3 family hash functions.
* Add support to restrict AES to 128-bit keys in order to save code size.
A new configuration option, MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH, can be
used to enable this feature.
@@ -265,6 +265,8 @@ Bugfix
error code on failure. Before, they returned 1 to indicate failure in
some cases involving a missing entry or a full cache.
* mbedtls_pk_parse_key() now rejects trailing garbage in encrypted keys.
+ * Fix the build with CMake when Everest or P256-m is enabled through
+ a user configuration file or the compiler command line. Fixes #8165.
Changes
* Enable Arm / Thumb bignum assembly for most Arm platforms when
@@ -278,7 +280,7 @@ Changes
ensure that conversions between size_t, ULONG, and int are
always done safely. Original contribution by Kevin Kane #635, #730
followed by Simon Butcher #1453.
- * Users intergrating their own PSA drivers should be aware that
+ * Users integrating their own PSA drivers should be aware that
the file library/psa_crypto_driver_wrappers.c has been renamed
to psa_crypto_driver_wrappers_no_static.c.
* When using CBC with the cipher module, the requirement to call
diff --git a/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt b/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt
deleted file mode 100644
index ec543aafc..000000000
--- a/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bugfix
- * Fix the build with CMake when Everest or P256-m is enabled through
- a user configuration file or the compiler command line. Fixes #8165.