Move FIPS-DH prereq.sh checks to a with_fips_dh marker

Completes the conversion of doth and tsiggss, removing both
prereq.sh files.

Assisted-by: Claude:claude-opus-4-8

diff --git a/bin/tests/system/doth/prereq.sh b/bin/tests/system/doth/prereq.sh
deleted file mode 100644 (file)
index 4dabc5b..0000000
--- a/bin/tests/system/doth/prereq.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-$FEATURETEST --have-fips-dh || {
-  echo_i "FIPS mode Diffie-Hellman not working - skipping doth test"
-  exit 255
-}
-
-exit 0

diff --git a/bin/tests/system/doth/tests_gnutls.py b/bin/tests/system/doth/tests_gnutls.py
index 81eb4980d4bd2faba12d716c157013020472b32f..ef36030a3b1d827232d819aa456b1181ebc92a27 100644 (file)
--- a/bin/tests/system/doth/tests_gnutls.py
+++ b/bin/tests/system/doth/tests_gnutls.py
@@ -35,6 +35,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_libnghttp2,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]
 

diff --git a/bin/tests/system/doth/tests_malicious.py b/bin/tests/system/doth/tests_malicious.py
index 34b26b445eeba6029e2897edf79e6be5a594d373..d15440fa2424c6625c185c9f0bd64a91d391c5d3 100644 (file)
--- a/bin/tests/system/doth/tests_malicious.py
+++ b/bin/tests/system/doth/tests_malicious.py
@@ -22,6 +22,7 @@ import isctest.mark
 
 pytestmark = [
     isctest.mark.with_libnghttp2,
+    isctest.mark.with_fips_dh,
 ]
 
 

diff --git a/bin/tests/system/doth/tests_sh_doth.py b/bin/tests/system/doth/tests_sh_doth.py
index 28866395580734d2b9a893708e57ddc79e4a82ec..a68f8c31664dc8a701b3105202b6b7d351fd767b 100644 (file)
--- a/bin/tests/system/doth/tests_sh_doth.py
+++ b/bin/tests/system/doth/tests_sh_doth.py
@@ -23,6 +23,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_libnghttp2,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]
 

diff --git a/bin/tests/system/doth/tests_sslyze.py b/bin/tests/system/doth/tests_sslyze.py
index 9ab801d9423506a1ebf943d6c720c087e010ff12..1b1b5f9a8599193197c56b73c1743da70e6d5f30 100644 (file)
--- a/bin/tests/system/doth/tests_sslyze.py
+++ b/bin/tests/system/doth/tests_sslyze.py
@@ -29,6 +29,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_libnghttp2,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]
 

diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 67a8ddc01c1841749c979db5ef364156835446d1..9aa9e2daefceea75de7c8466a92b33824105d2b2 100644 (file)
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -127,6 +127,10 @@ with_gssapi = pytest.mark.skipif(
     os.getenv("FEATURE_GSSAPI") != "1", reason="GSS-API support disabled in the build"
 )
 
+with_fips_dh = pytest.mark.skipif(
+    os.getenv("FEATURE_FIPS_DH") != "1", reason="FIPS mode Diffie-Hellman is required"
+)
+
 without_tsan = pytest.mark.skipif(
     os.getenv("FEATURE_TSAN") == "1", reason="incompatible with ThreadSanitizer (TSAN)"
 )

diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh
deleted file mode 100644 (file)
index 2098e7e..0000000
--- a/bin/tests/system/tsiggss/prereq.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-$FEATURETEST --have-fips-dh || {
-  echo_i "FIPS mode Diffie-Hellman not working - skipping tsiggss test"
-  exit 255
-}
-
-exit 0

diff --git a/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py b/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
index 867686a8beb63cd9227b437d4abd57290ba5b608..e23b75419c2c5747c26a0a2cf4ae3ea33f3ba48f 100755 (executable)
--- a/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
+++ b/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
@@ -39,6 +39,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_gssapi,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]
 

diff --git a/bin/tests/system/tsiggss/tests_sh_tsiggss.py b/bin/tests/system/tsiggss/tests_sh_tsiggss.py
index 5ddfa2c1347e819d437fc77ffe613bebf3343316..0e8aeac96179a437a3b4911a8029e702e6606b9c 100644 (file)
--- a/bin/tests/system/tsiggss/tests_sh_tsiggss.py
+++ b/bin/tests/system/tsiggss/tests_sh_tsiggss.py
@@ -28,6 +28,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_gssapi,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]
 

diff --git a/bin/tests/system/tsiggss/tests_tkey_duplicate.py b/bin/tests/system/tsiggss/tests_tkey_duplicate.py
index 5fe6518e78dc57e5504745f33cb8b2926cfc266d..d0e3d21444c94fe8a4084f220205d7b9815269ab 100644 (file)
--- a/bin/tests/system/tsiggss/tests_tkey_duplicate.py
+++ b/bin/tests/system/tsiggss/tests_tkey_duplicate.py
@@ -41,6 +41,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_gssapi,
+    isctest.mark.with_fips_dh,
     EXTRA_ARTIFACTS,
 ]