1 |
jpp |
1.1 |
diff -up openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit openssl-3.0.0/test/recipes/90-test_sslapi.t |
2 |
|
|
--- openssl-3.0.0/test/recipes/90-test_sslapi.t.beldmit 2021-09-22 11:56:49.452507975 +0200 |
3 |
|
|
+++ openssl-3.0.0/test/recipes/90-test_sslapi.t 2021-09-22 11:57:19.371764742 +0200 |
4 |
|
|
@@ -40,7 +40,7 @@ unless ($no_fips) { |
5 |
|
|
"recipes", |
6 |
|
|
"90-test_sslapi_data", |
7 |
|
|
"dhparams.pem")])), |
8 |
|
|
- "running sslapitest"); |
9 |
|
|
+ "running sslapitest - FIPS"); |
10 |
|
|
} |
11 |
|
|
|
12 |
|
|
unlink $tmpfilename; |
13 |
|
|
diff --git a/test/sslapitest.c b/test/sslapitest.c |
14 |
|
|
index e95d2657f46c..7af0eab3fce0 100644 |
15 |
|
|
--- a/test/sslapitest.c |
16 |
|
|
+++ b/test/sslapitest.c |
17 |
|
|
@@ -1158,6 +1158,11 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls, |
18 |
|
|
goto end; |
19 |
|
|
} |
20 |
|
|
|
21 |
|
|
+ if (is_fips && strstr(cipher, "CHACHA") != NULL) { |
22 |
|
|
+ testresult = TEST_skip("CHACHA is not supported in FIPS"); |
23 |
|
|
+ goto end; |
24 |
|
|
+ } |
25 |
|
|
+ |
26 |
|
|
/* Create a session based on SHA-256 */ |
27 |
|
|
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), |
28 |
|
|
TLS_client_method(), |
29 |
|
|
@@ -1292,6 +1297,11 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher) |
30 |
|
|
goto end; |
31 |
|
|
} |
32 |
|
|
|
33 |
|
|
+ if (is_fips && strstr(cipher, "CHACHA") != NULL) { |
34 |
|
|
+ testresult = TEST_skip("CHACHA is not supported in FIPS"); |
35 |
|
|
+ goto end; |
36 |
|
|
+ } |
37 |
|
|
+ |
38 |
|
|
/* Create a session based on SHA-256 */ |
39 |
|
|
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), |
40 |
|
|
TLS_client_method(), |