From 9817392e26f16f83596088f9ffb76f3fb8c8c9fb Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 24 Jul 2025 11:19:21 +0200 Subject: [PATCH] pkd: Run hmac-sha1 tests with OpenSSH This was initially in hurry disabled in ca4c874a9e72be96f407ad7dd7941ce52d80b7ab because dropbear dropped support for these HMACs. The follow-up commit enabled running these tests on old dropbear in c17112f07015161a62e0ad91ca4016d1ad74781d, but still did not run them on openssh, when the new dropbear was installed. This fixes up the above commit to run the HMAC-SHA1 tests with OpenSSH even if the new dropbear is installed. Signed-off-by: Jakub Jelen Reviewed-by: Sahana Prasad --- tests/pkd/pkd_hello.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/pkd/pkd_hello.c b/tests/pkd/pkd_hello.c index 6e6c7c50..11886fef 100644 --- a/tests/pkd/pkd_hello.c +++ b/tests/pkd/pkd_hello.c @@ -445,12 +445,16 @@ static int torture_pkd_setup_ecdsa_521(void **state) { #define PKDTESTS_MAC_FIPS(f, client, maccmd) \ PKDTESTS_MAC_FIPS_BASE(f, client, maccmd) \ PKDTESTS_MAC_FIPS_SHA1(f, client, maccmd) +#define PKDTESTS_MAC_OPENSSHONLY_FIPS_SHA1(f, client, maccmd) #else #define PKDTESTS_MAC_FIPS(f, client, maccmd) \ PKDTESTS_MAC_FIPS_BASE(f, client, maccmd) +#define PKDTESTS_MAC_OPENSSHONLY_FIPS_SHA1(f, client, maccmd) \ + PKDTESTS_MAC_FIPS_SHA1(f, client, maccmd) #endif #define PKDTESTS_MAC_OPENSSHONLY_FIPS(f, client, maccmd) \ + PKDTESTS_MAC_OPENSSHONLY_FIPS_SHA1(f, client, maccmd) \ f(client, ecdsa_256_hmac_sha1_etm, maccmd("hmac-sha1-etm@openssh.com"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_hmac_sha2_256_etm, maccmd("hmac-sha2-256-etm@openssh.com"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_hmac_sha2_512, maccmd("hmac-sha2-512"), setup_ecdsa_256, teardown) \