From c89fa17ba3f20c53cbf9d79f50e10f55768fb3ac Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Tue, 14 Jan 2025 11:45:30 +0000 Subject: [PATCH] Update configs README This commit updates configs/ext/README.md to reflect the necessary files which were removed from Mbed TLS. Signed-off-by: Harry Ramsey --- configs/crypto-config-suite-b.h | 2 +- configs/ext/README.md | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/configs/crypto-config-suite-b.h b/configs/crypto-config-suite-b.h index 3eea061262..3fec3d0f10 100644 --- a/configs/crypto-config-suite-b.h +++ b/configs/crypto-config-suite-b.h @@ -1,5 +1,5 @@ /** - * \file crypto-config-symmetric-only.h + * \file crypto-config-suite-b.h * * \brief \brief Minimal crypto configuration for * TLS NSA Suite B Profile (RFC 6460). diff --git a/configs/ext/README.md b/configs/ext/README.md index b07cbc18c5..f679e32112 100644 --- a/configs/ext/README.md +++ b/configs/ext/README.md @@ -1,26 +1,22 @@ Summary ------- -The two files: +The file: -* crypto_config_profile_medium.h * tfm_mbedcrypto_config_profile_medium.h -are copyright The Mbed TLS Contributors, and are distributed under the license normally +is copyright The Mbed TLS Contributors, and is distributed under the license normally used by Mbed TLS: a dual Apache 2.0 or GPLv2-or-later license. Background ---------- -The two files crypto_config_profile_medium.h and tfm_mbedcrypto_config_profile_medium.h -are taken verbatim from the TF-M source code here: +The file tfm_mbedcrypto_config_profile_medium.h was derived from the file tfm_mbedcrypto_config_profile_medium.h taken from the TF-M source code here: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/lib/ext/mbedcrypto/mbedcrypto_config -In TF-M, they are distributed under a 3-Clause BSD license, as noted at the top of the files. +It was derived according to the Mbed TLS configuration file split that occurred as part of the Mbed TLS repository split, see https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/config-split.md. -In Mbed TLS, with permission from the TF-M project, they are distributed under a dual [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) OR [GPL-2.0-or-later](https://spdx.org/licenses/GPL-2.0-or-later.html) license, with copyright assigned to The Mbed TLS Contributors. +In TF-M, the original file is distributed under a 3-Clause BSD license, as noted at the top of the file. -We only retain the note at the top of the files because the intent is to take these files verbatim, -for ease of maintenance. Currently however, they contain changes, showing how these configurations -will need to be adapted for 4.0. +In Mbed TLS, with permission from the TF-M project, tfm_mbedcrypto_config_profile_medium.h is distributed under a dual [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) OR [GPL-2.0-or-later](https://spdx.org/licenses/GPL-2.0-or-later.html) license, with copyright assigned to The Mbed TLS Contributors.