Try to fix FIPS runs

saltstack · Aug 28, 2024 · 1f72609 · 1f72609
1 parent b897b29
commit 1f72609
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tests/pytests/integration/ssh/x509_v2/conftest.py b/tests/pytests/integration/ssh/x509_v2/conftest.py
@@ -5,6 +5,8 @@
 import pytest
 from saltfactories.utils import random_string
 
+from tests.conftest import FIPS_TESTRUN
+
 log = logging.getLogger(__name__)
 
 
@@ -68,6 +70,10 @@ def x509_master_config(ca_minion_id):
                 "match.compound",
             ],
         },
+        "fips_mode": FIPS_TESTRUN,
+        "publish_signing_algorithm": (
+            "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
+        ),
     }
 
 
@@ -202,9 +208,9 @@ def ca_minion_config(
                 "subjectKeyIdentifier": "hash",
             },
         },
-        "features": {
-            "x509_v2": True,
-        },
+        "fips_mode": FIPS_TESTRUN,
+        "encryption_algorithm": "OAEP-SHA224" if FIPS_TESTRUN else "OAEP-SHA1",
+        "signing_algorithm": "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1",
     }