Skip to content

Commit 4f52cbb

Browse files
committed
Copy LibreSSL change of naming scheme from t/61_diff_testsslsh.t
... also if NOW only ciphers seem affected.
1 parent b8aadef commit 4f52cbb

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

t/12_diff_opensslversions.t

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,21 @@ $cat_csvfile2 =~ s/.nonce-.* //g;
7878
$cat_csvfile =~ s/","google.com\/.*","443/","google.com","443/g;
7979
$cat_csvfile2 =~ s/","google.com\/.*","443/","google.com","443/g;
8080

81+
# Now address the differences for LibreSSL, see t/61_diff_testsslsh.t
82+
#
83+
# MacOS / LibreSSL has different OpenSSL names for TLS 1.3 ciphers. That should be rather solved in
84+
# testssl.sh, see #2763. But for now we do this here.
85+
$cat_csvfile =~ s/AEAD-AES128-GCM-SHA256/TLS_AES_128_GCM_SHA256/g;
86+
$cat_csvfile =~ s/AEAD-AES256-GCM-SHA384/TLS_AES_256_GCM_SHA384/g
87+
# this is a bit ugly but otherwise the line cipher-tls1_3_x1303 with the CHACHA20 cipher misses a space
88+
$cat_csvfile =~ s/x1303 AEAD-CHACHA20-POLY1305-SHA256/x1303 TLS_CHACHA20_POLY1305_SHA256 /g;
89+
# now the other lines, where we don't need to insert the additional space:
90+
$cat_csvfile =~ s/AEAD-CHACHA20-POLY1305-SHA256/TLS_CHACHA20_POLY1305_SHA256/g;
91+
92+
# Same with ECDH bit length
93+
$cat_csv =~ s/ECDH 253/ECDH 256/g;
94+
$baseline_csv =~ s/ECDH 253/ECDH 256/g;
95+
8196
$diff = diff \$cat_csvfile, \$cat_csvfile2;
8297

8398
# Compare the differences -- and print them if there were any

0 commit comments

Comments
 (0)