romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 06:23:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

secureserver.pl, genserv.sh: cleanups

Browse source 
stunnel: print configuration actually in file
Instead of duplicating all the logic of writing the stunnel
configuration, and having to keep it up to date, when running in verbose
mode print the actual contents of the file after writing it.

certs/genserv.sh: Fix typo in error message

Closes #16783
This commit is contained in:
Yedaya Katsman 2025-03-15 23:02:27 +02:00 • committed by Viktor Szakats
parent 89f306ae40
commit fd6e6e8c7a
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/certs/scripts/genserv.sh
View file

@ -69,7 +69,7 @@ if [ -z "$CAPREFIX" ]; then
NOTOK=1
else
if [ ! -f "$CAPREFIX-ca.cacert" ]; then
echo "No CA certificate file $CAPREFIX-ca.caert"
echo "No CA certificate file $CAPREFIX-ca.cacert"
NOTOK=1
fi
if [ ! -f "$CAPREFIX-ca.key" ]; then

19
tests/secureserver.pl
View file

@ -322,22 +322,11 @@ if($stunnel_version >= 400) {
if($verbose) {
print uc($proto) ." server (stunnel $ver_major.$ver_minor)\n";
print "cmd: $cmd\n";
print "CApath = $capath\n";
print "cert = $certfile\n";
print "debug = $loglevel\n";
print "socket = $socketopt\n";
if($fips_support) {
print "fips = no\n";
}
if(!$tstunnel_windows) {
print "pid = $pidfile\n";
print "output = $logfile\n";
print "foreground = yes\n";
}
print "stunnel config at $conffile:\n";
open (my $writtenconf, '<', "$conffile") or die "$ssltext could not open the config file after writing\n";
print <$writtenconf>;
print "\n";
print "[curltest]\n";
print "accept = $host_ip:$accept_port\n";
print "connect = $host_ip:$target_port\n";
close ($writtenconf);
}
}