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
(cherry picked from commit 82ba021a5a)

bin/tests/system/doth/prereq.sh

@@ -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

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,
 ]
 

bin/tests/system/doth/tests_malicious.py

@@ -22,6 +22,7 @@ import isctest.mark
 
 pytestmark = [
     isctest.mark.with_libnghttp2,
+    isctest.mark.with_fips_dh,
 ]
 
 

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,
 ]
 

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,
 ]
 

bin/tests/system/isctest/mark.py

@@ -134,6 +134,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)"
 )

bin/tests/system/tsiggss/prereq.sh

@@ -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

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,
 ]
 

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,
 ]