aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio de Angelis <Antonio.deAngelis@arm.com>2021-07-29 11:33:48 +0200
committerAntonio de Angelis <Antonio.deAngelis@arm.com>2021-08-02 14:41:15 +0200
commit6eb5ecb2b17132d63948b8d41de2e0883fdc493d (patch)
tree6961782f739bf655b1ecfd6c09c43c22fa451cfa
parent401c1e5272edc3bab3391c61e52653970e2e20cd (diff)
downloadtrusted-firmware-m-master.tar.gz
Build: Disable ECDH crypto test for profile smallHEADmaster
This patch disables the ECDH test in the Crypto regression for profile small which does not support the feature. The documentation is updated accordingly in relevant places. Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com> Change-Id: I3781c473864d90ac26584b357c2903f750ed5190
-rw-r--r--config/config_default.cmake4
-rw-r--r--config/profile/profile_large.cmake3
-rw-r--r--config/profile/profile_medium.cmake3
-rw-r--r--config/profile/profile_small.cmake3
-rw-r--r--docs/technical_references/design_docs/profiles/tfm_profile_large.rst2
-rw-r--r--docs/technical_references/design_docs/profiles/tfm_profile_medium.rst2
-rw-r--r--docs/technical_references/design_docs/profiles/tfm_profile_small.rst4
-rw-r--r--docs/technical_references/instructions/tfm_build_instruction.rst4
8 files changed, 18 insertions, 7 deletions
diff --git a/config/config_default.cmake b/config/config_default.cmake
index d3d61602f..c5d0a3b63 100644
--- a/config/config_default.cmake
+++ b/config/config_default.cmake
@@ -162,8 +162,8 @@ set(TFM_CRYPTO_TEST_ALG_CFB ON CACHE BOOL "Test CFB cr
set(TFM_CRYPTO_TEST_ALG_CTR ON CACHE BOOL "Test CTR cryptography mode")
set(TFM_CRYPTO_TEST_ALG_GCM ON CACHE BOOL "Test GCM cryptography mode")
set(TFM_CRYPTO_TEST_ALG_SHA_512 ON CACHE BOOL "Test SHA-512 cryptography algorithm")
-set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test SHA-512 cryptography algorithm")
-
+set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test the HKDF key derivation algorithm")
+set(TFM_CRYPTO_TEST_ECDH ON CACHE BOOL "Test the ECDH key agreement algorithm")
set(TFM_FWU_TEST_REQUEST_REBOOT OFF CACHE BOOL "Test psa_fwu_request_reboot")
set(TFM_FWU_TEST_WRITE_WITH_NULL OFF CACHE BOOL "Test psa_fwu_write with data block NULL")
set(TFM_FWU_TEST_QUERY_WITH_NULL OFF CACHE BOOL "Test psa_fwu_query with info NULL")
diff --git a/config/profile/profile_large.cmake b/config/profile/profile_large.cmake
index bcef94ffe..b1ee510fc 100644
--- a/config/profile/profile_large.cmake
+++ b/config/profile/profile_large.cmake
@@ -35,7 +35,8 @@ set(TFM_CRYPTO_TEST_ALG_CFB OFF CACHE BOOL "Test CFB cr
set(TFM_CRYPTO_TEST_ALG_CTR OFF CACHE BOOL "Test CTR cryptography mode")
set(TFM_CRYPTO_TEST_ALG_GCM ON CACHE BOOL "Test GCM cryptography mode")
set(TFM_CRYPTO_TEST_ALG_SHA_512 ON CACHE BOOL "Test SHA-512 cryptography algorithm")
-set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test SHA-512 cryptography algorithm")
+set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test the HKDF key derivation algorithm")
+set(TFM_CRYPTO_TEST_ECDH ON CACHE BOOL "Test the ECDH key agreement algorithm")
################################## Dependencies ################################
diff --git a/config/profile/profile_medium.cmake b/config/profile/profile_medium.cmake
index 16f9c226a..25ebd4b6a 100644
--- a/config/profile/profile_medium.cmake
+++ b/config/profile/profile_medium.cmake
@@ -28,7 +28,8 @@ set(TFM_CRYPTO_TEST_ALG_CFB OFF CACHE BOOL "Test CFB cr
set(TFM_CRYPTO_TEST_ALG_CTR OFF CACHE BOOL "Test CTR cryptography mode")
set(TFM_CRYPTO_TEST_ALG_GCM OFF CACHE BOOL "Test GCM cryptography mode")
set(TFM_CRYPTO_TEST_ALG_SHA_512 OFF CACHE BOOL "Test SHA-512 cryptography algorithm")
-set(TFM_CRYPTO_TEST_HKDF OFF CACHE BOOL "Test SHA-512 cryptography algorithm")
+set(TFM_CRYPTO_TEST_HKDF OFF CACHE BOOL "Test the HKDF key derivation algorithm")
+set(TFM_CRYPTO_TEST_ECDH ON CACHE BOOL "Test the ECDH key agreement algorithm")
################################## Dependencies ################################
diff --git a/config/profile/profile_small.cmake b/config/profile/profile_small.cmake
index 4ce6f6f47..27e576e8d 100644
--- a/config/profile/profile_small.cmake
+++ b/config/profile/profile_small.cmake
@@ -48,7 +48,8 @@ set(TFM_CRYPTO_TEST_ALG_CFB OFF CACHE BOOL "Test CFB cr
set(TFM_CRYPTO_TEST_ALG_CTR OFF CACHE BOOL "Test CTR cryptography mode")
set(TFM_CRYPTO_TEST_ALG_GCM OFF CACHE BOOL "Test GCM cryptography mode")
set(TFM_CRYPTO_TEST_ALG_SHA_512 OFF CACHE BOOL "Test SHA-512 cryptography algorithm")
-set(TFM_CRYPTO_TEST_HKDF OFF CACHE BOOL "Test SHA-512 cryptography algorithm")
+set(TFM_CRYPTO_TEST_HKDF OFF CACHE BOOL "Test the HKDF key derivation algorithm")
+set(TFM_CRYPTO_TEST_ECDH OFF CACHE BOOL "Test the ECDH key agreement algorithm")
################################## Dependencies ################################
diff --git a/docs/technical_references/design_docs/profiles/tfm_profile_large.rst b/docs/technical_references/design_docs/profiles/tfm_profile_large.rst
index d59ae61f0..dd64e0097 100644
--- a/docs/technical_references/design_docs/profiles/tfm_profile_large.rst
+++ b/docs/technical_references/design_docs/profiles/tfm_profile_large.rst
@@ -383,6 +383,8 @@ top-level CMake config file ``config/profile/profile_large``.
+--------------------------------------------+---------------+-----------------------------------------+
| ``TFM_CRYPTO_TEST_ALG_CTR`` | ``OFF`` | Test CTR cryptography mode |
+--------------------------------------------+---------------+-----------------------------------------+
+ | ``TFM_CRYPTO_TEST_ECDH`` | ``ON`` | Test ECDH key agreement algorithm |
+ +--------------------------------------------+---------------+-----------------------------------------+
****************
Platform support
diff --git a/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst b/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
index 5bc4d57a3..c7c75164e 100644
--- a/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
+++ b/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
@@ -313,6 +313,8 @@ Some cryptography tests are disabled due to the reduced Mbed Crypto config.
+--------------------------------------------+---------------+--------------------------------+
| ``TFM_CRYPTO_TEST_HKDF`` | ``OFF`` | Disable HKDF algorithm test |
+--------------------------------------------+---------------+--------------------------------+
+ | ``TFM_CRYPTO_TEST_ECDH`` | ``ON`` | Enable ECDH key agreement test |
+ +--------------------------------------------+---------------+--------------------------------+
Device configuration extension
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/technical_references/design_docs/profiles/tfm_profile_small.rst b/docs/technical_references/design_docs/profiles/tfm_profile_small.rst
index 51d78f22e..5a02cde01 100644
--- a/docs/technical_references/design_docs/profiles/tfm_profile_small.rst
+++ b/docs/technical_references/design_docs/profiles/tfm_profile_small.rst
@@ -437,7 +437,9 @@ Some cryptography tests are disabled due to the reduced Mbed Crypto config.
+--------------------------------------------+-----------------------------------------------------------------------------------------------------+-------------------------------------+
| ``TFM_CRYPTO_TEST_ALG_SHA_512`` | ``OFF`` | Test SHA-512 cryptography algorithm |
+--------------------------------------------+-----------------------------------------------------------------------------------------------------+-------------------------------------+
- | ``TFM_CRYPTO_TEST_HKDF`` | ``OFF`` | Test SHA-512 cryptography algorithm |
+ | ``TFM_CRYPTO_TEST_HKDF`` | ``OFF`` | Test HKDF key derivation algorithm |
+ +--------------------------------------------+-----------------------------------------------------------------------------------------------------+-------------------------------------+
+ | ``TFM_CRYPTO_TEST_ECDH`` | ``OFF`` | Test ECDH key agreement algorithm |
+--------------------------------------------+-----------------------------------------------------------------------------------------------------+-------------------------------------+
Device configuration extension
diff --git a/docs/technical_references/instructions/tfm_build_instruction.rst b/docs/technical_references/instructions/tfm_build_instruction.rst
index 49bdeffc2..80c695554 100644
--- a/docs/technical_references/instructions/tfm_build_instruction.rst
+++ b/docs/technical_references/instructions/tfm_build_instruction.rst
@@ -160,7 +160,9 @@ used which does not support all features.
+-----------------------------+-------------------------------------+---------------+
| TFM_CRYPTO_TEST_ALG_SHA_512 | Test SHA-512 cryptography algorithm | ON |
+-----------------------------+-------------------------------------+---------------+
-| TFM_CRYPTO_TEST_HKDF | Test SHA-512 cryptography algorithm | ON |
+| TFM_CRYPTO_TEST_HKDF | Test HKDF key derivation algorithm | ON |
++-----------------------------+-------------------------------------+---------------+
+| TFM_CRYPTO_TEST_ECDH | Test ECDH key agreement algorithm | ON |
+-----------------------------+-------------------------------------+---------------+
TF-M Profiles