6ed7c9
diff -up openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit openssl-3.0.0/test/recipes/90-test_sslapi.t
6ed7c9
--- openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit	2021-09-22 11:56:49.452507975 +0200
6ed7c9
+++ openssl-3.0.0/test/recipes/90-test_sslapi.t	2021-09-22 11:57:19.371764742 +0200
6ed7c9
@@ -40,7 +40,7 @@ unless ($no_fips) {
1ac26c
                              "recipes",
1ac26c
                              "90-test_sslapi_data",
1ac26c
                              "dhparams.pem")])),
6ed7c9
-                 "running sslapitest");
6ed7c9
+                 "running sslapitest - FIPS");
6ed7c9
 }
6ed7c9
 
6ed7c9
 unlink $tmpfilename;
6ed7c9
diff --git a/test/sslapitest.c b/test/sslapitest.c
6ed7c9
index e95d2657f46c..7af0eab3fce0 100644
6ed7c9
--- a/test/sslapitest.c
6ed7c9
+++ b/test/sslapitest.c
6ed7c9
@@ -1158,6 +1158,11 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
6ed7c9
         goto end;
6ed7c9
     }
6ed7c9
 
6ed7c9
+    if (is_fips && strstr(cipher, "CHACHA") != NULL) {
6ed7c9
+        testresult = TEST_skip("CHACHA is not supported in FIPS");
6ed7c9
+        goto end;
6ed7c9
+    }
6ed7c9
+
6ed7c9
     /* Create a session based on SHA-256 */
6ed7c9
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
6ed7c9
                                        TLS_client_method(),
6ed7c9
@@ -1292,6 +1297,11 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher)
6ed7c9
         goto end;
6ed7c9
     }
6ed7c9
 
6ed7c9
+    if (is_fips && strstr(cipher, "CHACHA") != NULL) {
6ed7c9
+        testresult = TEST_skip("CHACHA is not supported in FIPS");
6ed7c9
+        goto end;
6ed7c9
+    }
6ed7c9
+
6ed7c9
     /* Create a session based on SHA-256 */
6ed7c9
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
6ed7c9
                                        TLS_client_method(),