From d60a429c2fb2a1466889325692432c6dd6880119 Mon Sep 17 00:00:00 2001
From: Norman Ashley <nashley@cisco.com>
Date: Wed, 13 Sep 2023 13:17:11 -0400
Subject: [PATCH] Block XMSS from secret key tests until after support code has
 been added.

---
 tests/test_sig_stfl.c | 115 ++++++++++++++++++++++--------------------
 1 file changed, 61 insertions(+), 54 deletions(-)

diff --git a/tests/test_sig_stfl.c b/tests/test_sig_stfl.c
index b9cd0d2eaf..6176bb21cb 100644
--- a/tests/test_sig_stfl.c
+++ b/tests/test_sig_stfl.c
@@ -455,64 +455,71 @@ static OQS_STATUS sig_stfl_test_secret_key(const char *method_name) {
 	 * Temporarily skip algs with long key generation times.
 	 */
 
-	if (0) {
-
-#ifdef OQS_ENABLE_SIG_STFL_xmss_sha256_h16
-	} else if (strcmp(method_name, OQS_SIG_STFL_alg_xmss_sha256_h16) == 0) {
-		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmss_sha256_h20
-	} else if (strcmp(method_name, OQS_SIG_STFL_alg_xmss_sha256_h20) == 0) {
-		goto skip_test;
-#endif
-
-#ifdef OQS_ENABLE_SIG_STFL_xmss_shake128_h16
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake128_h16)) {
-		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmss_shake128_h20
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake128_h20)) {
-		goto skip_test;
-#endif
-
-#ifdef OQS_ENABLE_SIG_STFL_xmss_sha512_h16
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_sha512_h16)) {
-		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmss_sha512_h20
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_sha512_h20)) {
-		goto skip_test;
-#endif
-
-#ifdef OQS_ENABLE_SIG_STFL_xmss_shake256_h16
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake256_h16)) {
-		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmss_shake256_h20
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake256_h20)) {
-		goto skip_test;
-#endif
-
-#ifdef OQS_ENABLE_SIG_STFL_xmssmt_sha256_h40_2
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_sha256_h40_2)) {
-		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmssmt_sha256_h60_3
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_sha256_h60_3)) {
-		goto skip_test;
-#endif
-
-#ifdef OQS_ENABLE_SIG_STFL_xmssmt_shake128_h40_2
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_shake128_h40_2)) {
+	if (strcmp(method_name, OQS_SIG_STFL_alg_lms_sha256_n32_h5_w1) != 0) {
 		goto skip_test;
-#endif
-#ifdef OQS_ENABLE_SIG_STFL_xmssmt_shake128_h60_3
-	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_shake128_h60_3)) {
-		goto skip_test;
-#endif
 	} else {
 		goto keep_going;
 	}
+
+//	if (0) {
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_sha256_h16
+//	} else if (strcmp(method_name, OQS_SIG_STFL_alg_xmss_sha256_h16) == 0) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_sha256_h20
+//	} else if (strcmp(method_name, OQS_SIG_STFL_alg_xmss_sha256_h20) == 0) {
+//		goto skip_test;
+//#endif
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_shake128_h16
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake128_h16)) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_shake128_h20
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake128_h20)) {
+//		goto skip_test;
+//#endif
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_sha512_h16
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_sha512_h16)) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_sha512_h20
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_sha512_h20)) {
+//		goto skip_test;
+//#endif
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_shake256_h16
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake256_h16)) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmss_shake256_h20
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmss_shake256_h20)) {
+//		goto skip_test;
+//#endif
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmssmt_sha256_h40_2
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_sha256_h40_2)) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmssmt_sha256_h60_3
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_sha256_h60_3)) {
+//		goto skip_test;
+//#endif
+//
+//#ifdef OQS_ENABLE_SIG_STFL_xmssmt_shake128_h40_2
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_shake128_h40_2)) {
+//		goto skip_test;
+//#endif
+//#ifdef OQS_ENABLE_SIG_STFL_xmssmt_shake128_h60_3
+//	} else if (0 == strcasecmp(method_name, OQS_SIG_STFL_alg_xmssmt_shake128_h60_3)) {
+//		goto skip_test;
+//#endif
+//	} else {
+//		goto keep_going;
+//	}
+
 skip_test:
 	printf("Skip slow test %s.\n", method_name);
 	return rc;