Skip to content

Commit 6d33216

Browse files
authored
Merge pull request #2921 from testssl/fix_unittest_3.2
Fix unittest 3.2
2 parents a3372ed + e8631fb commit 6d33216

File tree

4 files changed

+143
-145
lines changed

4 files changed

+143
-145
lines changed

.github/workflows/unit_tests_macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
- 'doc/**'
99
- 'bin/**'
1010
- '**.md'
11+
- '**.1'
12+
- '**.html'
1113
- '**.pem'
1214
- '**.pdf'
13-
- '**.html'
1415
- '**.yml'
1516
- 'LICENSE'
1617
- 'Dockerfile'

.github/workflows/unit_tests_ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
- 'doc/**'
99
- 'bin/**'
1010
- '**.md'
11+
- '**.1'
12+
- '**.html'
1113
- '**.pem'
1214
- '**.pdf'
13-
- '**.html'
1415
- '**.yml'
1516
- 'LICENSE'
1617
- 'Dockerfile'

t/61_diff_testsslsh.t

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,16 @@ $cat_csv =~ s/x1303 AEAD-CHACHA20-POLY1305-SHA256/x1303 TLS_CHACHA20_PO
5959
# now the other lines, where we don't need to insert the additional space:
6060
$cat_csv =~ s/AEAD-CHACHA20-POLY1305-SHA256/TLS_CHACHA20_POLY1305_SHA256/g;
6161

62+
# For Ubuntu 24.04 we don't have MLKEMs yet
63+
$cat_csv =~ s/ECDH\/MLKEM AESGCM/ECDH 253 AESGCM/g;
64+
$baseline_csv =~ s/ECDH\/MLKEM AESGCM/ECDH 253 AESGCM/g;
65+
$cat_csv =~ s/ECDH\/MLKEM ChaCha20/ECDH 253 ChaCha20/g;
66+
$baseline_csv =~ s/ECDH\/MLKEM ChaCha20/ECDH 253 ChaCha20/g;
67+
6268
# Same with ECDH bit length
6369
$cat_csv =~ s/ECDH 253/ECDH 256/g;
6470
$baseline_csv =~ s/ECDH 253/ECDH 256/g;
6571

66-
6772
# this could contain the openssl path
6873
$cat_csv =~ s/"engine_problem.*\n//g;
6974
$baseline_csv =~ s/"engine_problem.*\n//g;

0 commit comments

Comments
 (0)