Crypto: migrate support to MbedTLS v2.23.0
This patch migrates the mbedcrypto dependancy for TF-M to
mbedTLS repo v2.23.0 which is the latest release tag. The
PSA crypto headers and the crypto service implementation in
TF-M is updated for additional functionality in this version.
The userguide and other relevant documentation are updated to
reflect the changes to location of repo.
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Change-Id: Ia7d3f95dc961c5815eb4416d2afbd90ec5c0c19e
diff --git a/docs/getting_started/tfm_build_instruction.rst b/docs/getting_started/tfm_build_instruction.rst
index 60edb75..34b5b7b 100644
--- a/docs/getting_started/tfm_build_instruction.rst
+++ b/docs/getting_started/tfm_build_instruction.rst
@@ -28,7 +28,7 @@
cd <base folder>
git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git
- git clone https://github.com/ARMmbed/mbed-crypto.git -b mbedcrypto-3.0.1
+ git clone https://github.com/ARMmbed/mbedtls.git -b mbedtls-2.23.0
git clone https://git.trustedfirmware.org/TF-M/tf-m-tests.git
git clone https://github.com/JuulLabs-OSS/mcuboot.git -b v1.6.0
@@ -279,9 +279,9 @@
- ``Relwithdebinfo``
- ``Minsizerel``
* - -DMBEDCRYPTO_DEBUG=<ON|OFF>
- - Enables debug symbols for Mbed Crypto library. If a cryptographic
- accelerator is enabled then this will also enable debug symbols and
- logging for any accelerator libraries.
+ - Enables debug symbols for Mbed Crypto(MbedTLS) library. If a
+ cryptographic accelerator is enabled then this will also enable
+ debug symbols and logging for any accelerator libraries.
* - -DBUILD_DWARF_VERSION=<dwarf version>
- Configures DWARF version.
The possible values are:
diff --git a/docs/getting_started/tfm_sw_requirement.rst b/docs/getting_started/tfm_sw_requirement.rst
index 91869d2..1edf7d4 100644
--- a/docs/getting_started/tfm_sw_requirement.rst
+++ b/docs/getting_started/tfm_sw_requirement.rst
@@ -126,21 +126,30 @@
In order to build TF-M the following external projects are required:
- - `Mbed Crypto library <https://github.com/ARMmbed/mbed-crypto>`__ v3.0.1
- is used as crypto library on the secure side
+ - `Mbed-crypto(MbedTLS) library <https://github.com/ARMmbed/mbedtls>`__ v2.23.0
+ is used as crypto library on the secure side.
- `MCUboot <https://github.com/JuulLabs-OSS/mcuboot>`__ v1.6.0 is used as
the default bootloader in TF-M
And the following TF-M projects as well:
+
- `TF-M tests <https://git.trustedfirmware.org/TF-M/tf-m-tests.git>`__
+.. Note::
+
+ The development of Mbed-crypto has moved to MbedTLS project and hence
+ wherever mbed-crypto is referred to in TF-M, it refers to the component
+ within MbedTLS project. More details of the move can be found
+ `here <https://github.com/ARMmbed/mbed-crypto/issues/374>`__.
+
+
Each of the listed dependencies should be placed in a common root directory
with trustedfirmware-m
.. code-block:: bash
.
- ├── mbed-crypto
+ ├── mbedtls
├── mcuboot
├── tf-m-tests
└── trusted-firmware-m