Skip to content

Commit a5d8a2f

Browse files
committed
FIPS and KTLS may interfere
New Linux kernels (>= 5.11) enable KTLS CHACHA which is not FIPS-suitable. Fixes #16657 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #16658)
1 parent aa58071 commit a5d8a2f

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,19 @@ jobs:
179179
- name: make test
180180
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
181181

182+
fips_and_ktls:
183+
runs-on: ubuntu-latest
184+
steps:
185+
- uses: actions/checkout@v2
186+
- name: modprobe tls
187+
run: sudo modprobe tls
188+
- name: config
189+
run: ./config --banner=Configured --strict-warnings enable-ktls enable-fips && perl configdata.pm --dump
190+
- name: make
191+
run: make -s -j4
192+
- name: make test
193+
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
194+
182195
no-legacy:
183196
runs-on: ubuntu-latest
184197
steps:

test/sslapitest.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,11 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
11581158
goto end;
11591159
}
11601160

1161+
if (is_fips && strstr(cipher, "CHACHA") != NULL) {
1162+
testresult = TEST_skip("CHACHA is not supported in FIPS");
1163+
goto end;
1164+
}
1165+
11611166
/* Create a session based on SHA-256 */
11621167
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
11631168
TLS_client_method(),
@@ -1292,6 +1297,11 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher)
12921297
goto end;
12931298
}
12941299

1300+
if (is_fips && strstr(cipher, "CHACHA") != NULL) {
1301+
testresult = TEST_skip("CHACHA is not supported in FIPS");
1302+
goto end;
1303+
}
1304+
12951305
/* Create a session based on SHA-256 */
12961306
if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
12971307
TLS_client_method(),

0 commit comments

Comments
 (0)