From fe84f38e262c36e04bf9c6c8fea749006ecd5057 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 29 Jun 2022 14:29:52 +0200 Subject: [PATCH] More wording improvements Signed-off-by: Gilles Peskine --- BRANCHES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BRANCHES.md b/BRANCHES.md index b57b0fd0d7..7fb706d692 100644 --- a/BRANCHES.md +++ b/BRANCHES.md @@ -28,7 +28,7 @@ Note that this guarantee only applies if you either use the default compile-time configuration (`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). @@ -52,12 +52,12 @@ CONTRIBUTING](CONTRIBUTING.md#backwards-compatibility). ## 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)