Skip to content

Commit

Permalink
Merge pull request #9908 from Harry-Ramsey/move-configs-to-tf-psa-crypto
Browse files Browse the repository at this point in the history
Move configs to TF-PSA-Crypto
  • Loading branch information
ronald-cron-arm authored Feb 4, 2025
2 parents 2a992bf + 94c386a commit 7b4b176
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 830 deletions.
28 changes: 0 additions & 28 deletions configs/crypto-config-ccm-aes-sha256.h

This file was deleted.

2 changes: 1 addition & 1 deletion configs/crypto-config-suite-b.h
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
91 changes: 0 additions & 91 deletions configs/crypto-config-symmetric-only.h

This file was deleted.

16 changes: 6 additions & 10 deletions configs/ext/README.md
Original file line number Diff line number Diff line change
@@ -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.
Loading

0 comments on commit 7b4b176

Please sign in to comment.