From 1b43a7448d949a0de5c5a9beabd58ba9bdb7e192 Mon Sep 17 00:00:00 2001
From: Raef Coles <raef.coles@arm.com>
Date: Thu, 13 Oct 2022 09:44:27 +0100
Subject: [PATCH] Clean up LMS and LMOTS feature dependencies

Remove SHA256 dependencies from tests, fix incorrect boolean logic in
check_config, and change depends_hashes.pl to disable LMS in one test

Signed-off-by: Raef Coles <raef.coles@arm.com>
---
 include/mbedtls/check_config.h         | 2 +-
 tests/scripts/depends-hashes.pl        | 2 +-
 tests/suites/test_suite_lmots.function | 2 +-
 tests/suites/test_suite_lms.function   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 4b2783174f..e6488c09c2 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -354,7 +354,7 @@
 #endif
 
 #if defined(MBEDTLS_LMS_C) &&                                          \
-    ( !defined(MBEDTLS_PSA_CRYPTO_C) && !defined(PSA_WANT_ALG_SHA256) )
+    ! ( defined(MBEDTLS_PSA_CRYPTO_C) && defined(PSA_WANT_ALG_SHA256) )
 #error "MBEDTLS_LMS_C requires MBEDTLS_PSA_CRYPTO_C and PSA_WANT_ALG_SHA256"
 #endif
 
diff --git a/tests/scripts/depends-hashes.pl b/tests/scripts/depends-hashes.pl
index 68297a6a2e..db18a92ae8 100755
--- a/tests/scripts/depends-hashes.pl
+++ b/tests/scripts/depends-hashes.pl
@@ -57,7 +57,7 @@ my @hash_configs = (
     ['unset MBEDTLS_MD5_C'],
     ['unset MBEDTLS_SHA512_C', 'unset MBEDTLS_SHA384_C '],
     ['unset MBEDTLS_SHA384_C'],
-    ['unset MBEDTLS_SHA256_C', 'unset MBEDTLS_SHA224_C'],
+    ['unset MBEDTLS_SHA256_C', 'unset MBEDTLS_SHA224_C', 'unset MBEDTLS_LMS_C', 'unset MBEDTLS_LMS_PRIVATE'],
     ['unset MBEDTLS_SHA1_C'],
 );
 
diff --git a/tests/suites/test_suite_lmots.function b/tests/suites/test_suite_lmots.function
index 94d6b8e036..f2ce29a34b 100644
--- a/tests/suites/test_suite_lmots.function
+++ b/tests/suites/test_suite_lmots.function
@@ -24,7 +24,7 @@ exit:
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
- * depends_on:MBEDTLS_LMS_C:PSA_WANT_ALG_SHA_256
+ * depends_on:MBEDTLS_LMS_C
  * END_DEPENDENCIES
  */
 
diff --git a/tests/suites/test_suite_lms.function b/tests/suites/test_suite_lms.function
index 51addea0f7..dd37f31979 100644
--- a/tests/suites/test_suite_lms.function
+++ b/tests/suites/test_suite_lms.function
@@ -4,7 +4,7 @@
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
- * depends_on:MBEDTLS_LMS_C:PSA_WANT_ALG_SHA_256
+ * depends_on:MBEDTLS_LMS_C
  * END_DEPENDENCIES
  */