aboutsummaryrefslogtreecommitdiff
path: root/BRANCHES.md
diff options
context:
space:
mode:
authorGilles Peskine <Gilles.Peskine@arm.com>2022-06-29 14:29:52 +0200
committerGilles Peskine <Gilles.Peskine@arm.com>2022-06-29 14:29:52 +0200
commit4fd898e87663311ac26d4ad8dd7c63689c2a82a5 (patch)
treeee845d0ed7e3c93c0b9b77c276d8647762338433 /BRANCHES.md
parent3dc9ac95ec7ab9fde365447be87600482c98762a (diff)
downloadmbedtls-4fd898e87663311ac26d4ad8dd7c63689c2a82a5.zip
mbedtls-4fd898e87663311ac26d4ad8dd7c63689c2a82a5.tar.gz
mbedtls-4fd898e87663311ac26d4ad8dd7c63689c2a82a5.tar.bz2
More wording improvements
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
Diffstat (limited to 'BRANCHES.md')
-rw-r--r--BRANCHES.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/BRANCHES.md b/BRANCHES.md
index 446d00e..3aca159 100644
--- a/BRANCHES.md
+++ b/BRANCHES.md
@@ -40,7 +40,7 @@ Note that this guarantee only applies if you either use the default
compile-time configuration (`mbedtls/mbedtls_config.h`) or the same modified
compile-time configuration. Changing compile-time configuration options can
result in an incompatible API or ABI, although features will generally not
-affect independent features (for example, enabling or disabling a
+affect unrelated features (for example, enabling or disabling a
cryptographic algorithm does not break code that does not use that
algorithm).
@@ -67,12 +67,12 @@ but always attempt to provide a compatibility option.
## Backward compatibility for the key store
-We maintain backward compatibility with previous versions of versions of the
+We maintain backward compatibility with previous versions of the
PSA Crypto persistent storage since Mbed TLS 2.25.0, provided that the
storage backend (PSA ITS implementation) is configured in a compatible way.
We intend to maintain this backward compatibility throughout a major version
of Mbed TLS (for example, all Mbed TLS 3.y versions will be able to read
-keys written under any Mbed TLS 3.x with x < y).
+keys written under any Mbed TLS 3.x with x <= y).
Mbed TLS 3.x can also read keys written by Mbed TLS 2.25.0 through 2.28.x
LTS, but future major version upgrades (for example from 2.28.x/3.x to 4.y)