aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hu <david.hu@arm.com>2020-06-03 17:30:18 +0800
committerDavid Hu <david.hu@arm.com>2020-06-22 07:04:03 +0000
commitfa5a75a6b6407976d9288ed79b26cd0a0c2ac53c (patch)
tree8510b2ceb362657a153f19a936179c465618ef0a
parent528aca21c9cfeca7e9ee6b4d99a878ab77902516 (diff)
downloadtrusted-firmware-m-fa5a75a6b6407976d9288ed79b26cd0a0c2ac53c.tar.gz
Configs: Enable PSA key derivation in Profile Small
It is more resaonable to execute the whole TLS-PSK key derivation inside SPE. Enable PSA key derivation interface in Profile Small. Update the design document accordingly. Change-Id: Ie84dce2f70dbf538661528f877762400ba98d651 Signed-off-by: David Hu <david.hu@arm.com>
-rw-r--r--configs/ConfigDefaultProfileS.cmake1
-rw-r--r--configs/ConfigRegressionProfileS.cmake1
-rw-r--r--docs/design_documents/tfm_profile_small.rst4
3 files changed, 0 insertions, 6 deletions
diff --git a/configs/ConfigDefaultProfileS.cmake b/configs/ConfigDefaultProfileS.cmake
index 82740442d..772eab1fc 100644
--- a/configs/ConfigDefaultProfileS.cmake
+++ b/configs/ConfigDefaultProfileS.cmake
@@ -50,7 +50,6 @@ set(ITS_BUF_SIZE 32)
# Enable Crypto service
set(TFM_PARTITION_CRYPTO ON)
set(CRYPTO_ASYMMETRIC_MODULE_DISABLED ON)
-set(CRYPTO_KEY_DERIVATION_MODULE_DISABLED ON)
# Set the dedicated mbed-crypto default config file
set(MBEDTLS_CONFIG_FILE "tfm_profile_s_mbedcrypto_config.h")
diff --git a/configs/ConfigRegressionProfileS.cmake b/configs/ConfigRegressionProfileS.cmake
index 84576720c..51324fe30 100644
--- a/configs/ConfigRegressionProfileS.cmake
+++ b/configs/ConfigRegressionProfileS.cmake
@@ -53,7 +53,6 @@ set(ITS_BUF_SIZE 32)
# Enable Crypto service
set(TFM_PARTITION_CRYPTO ON)
set(CRYPTO_ASYMMETRIC_MODULE_DISABLED ON)
-set(CRYPTO_KEY_DERIVATION_MODULE_DISABLED ON)
# Set the dedicated mbed-crypto default config file
set(MBEDTLS_CONFIG_FILE "tfm_profile_s_mbedcrypto_config.h")
diff --git a/docs/design_documents/tfm_profile_small.rst b/docs/design_documents/tfm_profile_small.rst
index d427aab4b..67f677985 100644
--- a/docs/design_documents/tfm_profile_small.rst
+++ b/docs/design_documents/tfm_profile_small.rst
@@ -425,9 +425,6 @@ The details will be covered in each module in `Implementation details`_.
* - ``CRYPTO_AEAD_MODULE_DISABLED``
- ``OFF``
- Enable AEAD in Crypto service
- * - ``CRYPTO_KEY_DERIVATION_MODULE_DISABLED``
- - ``ON``
- - Disable key derivation in Crypto service
* - ``MBEDTLS_CONFIG_FILE``
- ``tfm_profile_s_mbedcrypto_config``
- Default mbed-crypto config file for Profile Small under
@@ -527,7 +524,6 @@ config file. Crypto SP modules not supported in TF-M Profile Small are disabled.
The disabled modules are shown below.
- Disable asymmetric cipher
- - Disable key derivation
Other modules and configurations [10]_ are kept as default values.