You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.6 KiB
41 lines
1.6 KiB
2 years ago
|
diff -up openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit openssl-3.0.0/test/recipes/90-test_sslapi.t
|
||
|
|
--- openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit 2021-09-22 11:56:49.452507975 +0200
|
||
|
|
+++ openssl-3.0.0/test/recipes/90-test_sslapi.t 2021-09-22 11:57:19.371764742 +0200
|
||
|
|
@@ -40,7 +40,7 @@ unless ($no_fips) {
|
||
|
|
srctop_file("test", "recipes", "90-test_sslapi_data",
|
||
|
|
"passwd.txt"), $tmpfilename, "fips",
|
||
|
|
srctop_file("test", "fips-and-base.cnf")])),
|
||
|
|
- "running sslapitest");
|
||
|
|
+ "running sslapitest - FIPS");
|
||
|
|
}
|
||
|
|
|
||
|
|
unlink $tmpfilename;
|
||
|
|
diff --git a/test/sslapitest.c b/test/sslapitest.c
|
||
|
|
index e95d2657f46c..7af0eab3fce0 100644
|
||
|
|
--- a/test/sslapitest.c
|
||
|
|
+++ b/test/sslapitest.c
|
||
|
|
@@ -1158,6 +1158,11 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
|
||
|
|
goto end;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (is_fips && strstr(cipher, "CHACHA") != NULL) {
|
||
|
|
+ testresult = TEST_skip("CHACHA is not supported in FIPS");
|
||
|
|
+ goto end;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Create a session based on SHA-256 */
|
||
|
|
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
|
||
|
|
TLS_client_method(),
|
||
|
|
@@ -1292,6 +1297,11 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher)
|
||
|
|
goto end;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (is_fips && strstr(cipher, "CHACHA") != NULL) {
|
||
|
|
+ testresult = TEST_skip("CHACHA is not supported in FIPS");
|
||
|
|
+ goto end;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Create a session based on SHA-256 */
|
||
|
|
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
|
||
|
|
TLS_client_method(),
|