Skip to content

Commit 815e737

Browse files
committed
Check the correct file
1 parent 1f58956 commit 815e737

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

t/12_diff_opensslversions.t

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if ( $os eq "linux" ){
4545
system("@args") == 0
4646
or die ("FAILED: \"@args\"");
4747

48-
# 2
48+
# 2 (LibreSSL in case of MacOS)
4949
printf "\n%s\n", "Test with $distro_openssl against \"$uri\" and save it";
5050
@args="$prg $check2run $csvfile2 --openssl=$distro_openssl $uri >/dev/null";
5151
system("@args") == 0
@@ -78,17 +78,20 @@ $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-
# we changed above the ECDH bit length already
81+
82+
if ( $os eq "darwin" ){
83+
# Now address the differences for LibreSSL, see t/61_diff_testsslsh.t
84+
#
85+
# MacOS / LibreSSL has different OpenSSL names for TLS 1.3 ciphers. That should be rather solved in
86+
# testssl.sh, see #2763. But for now we do this here.
87+
$cat_csvfile2 =~ s/AEAD-AES128-GCM-SHA256/TLS_AES_128_GCM_SHA256/g;
88+
$cat_csvfile2 =~ s/AEAD-AES256-GCM-SHA384/TLS_AES_256_GCM_SHA384/g;
89+
# this is a bit ugly but otherwise the line cipher-tls1_3_x1303 with the CHACHA20 cipher misses a space
90+
$cat_csvfile2 =~ s/x1303 AEAD-CHACHA20-POLY1305-SHA256/x1303 TLS_CHACHA20_POLY1305_SHA256 /g;
91+
# now the other lines, where we don't need to insert the additional space:
92+
$cat_csvfile2 =~ s/AEAD-CHACHA20-POLY1305-SHA256/TLS_CHACHA20_POLY1305_SHA256/g;
93+
# we changed above the ECDH bit length already
94+
}
9295

9396
$diff = diff \$cat_csvfile, \$cat_csvfile2;
9497

0 commit comments

Comments
 (0)