Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2026-09-14 05:38:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-add -naccept and remove tty hack

Browse Source 
- comment redundant diag line
- make sure $openssl_pid has a value
This commit is contained in:
Dirk Wetter
2026-09-06 22:48:44 +02:00
parent 437e1a3c83
commit be9a8385af
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
t/40_tls13.only.t
+4 -6
View File
@@ -66,7 +66,7 @@ fi
# Start OpenSSL server # Start OpenSSL server
echo "Starting server on port $PORT..." echo "Starting server on port $PORT..."
# $OPENSSL s_server -accept "$IP:$PORT" -cert "$CERT" -key "$KEY" -tls1_3 -ciphersuites "$CIPHER_SUITE" # $OPENSSL s_server -accept "$IP:$PORT" -cert "$CERT" -key "$KEY" -tls1_3 -ciphersuites "$CIPHER_SUITE"
$OPENSSL s_server -accept "$IP:$PORT" -cert "$CERT" -key "$KEY" -tls1_3 $OPENSSL s_server -accept "$IP:$PORT" -cert "$CERT" -key "$KEY" -tls1_3 -naccept 4242
HEREDOC HEREDOC
@@ -84,8 +84,6 @@ if ($pid == 0) {
chdir($temp_dir) or exit 1; chdir($temp_dir) or exit 1;
open(STDOUT, '>', "$temp_dir/server.log") or exit 1; open(STDOUT, '>', "$temp_dir/server.log") or exit 1;
open(STDERR, '>&', STDOUT) or exit 1; open(STDERR, '>&', STDOUT) or exit 1;
pipe(my $r, my $w) or exit 1; # <-- new
open(STDIN, '<&', $r) or exit 1; # <-- new
exec($server_script); exec($server_script);
exit 1; exit 1;
} }
@@ -150,13 +148,13 @@ elsif ($pid > 0) {
$log = <$lfh> // ''; $log = <$lfh> // '';
close $lfh; close $lfh;
} }
diag("Server Log:\n$log"); # diag("Server Log:\n$log");
} }
# Cleanup: Kill the server process. When running locally this is needed # Cleanup: Kill the server process. When running locally this is needed
my $openssl_pid = `lsof -i -Pn | grep \$USER | grep openssl | awk '{ print \$2 }'`; my $openssl_pid = `lsof -i -Pn | grep \$USER | grep openssl | awk '{ print \$2 }'`;
kill 9, $openssl_pid; chomp $openssl_pid;
waitpid($openssl_pid, 0); if ($openssl_pid) { kill 9, $openssl_pid; waitpid($openssl_pid, 0); }
done_testing(); done_testing();