From fd6e6e8c7a172521e21c2fc4c64e881b36a86918 Mon Sep 17 00:00:00 2001
From: Yedaya Katsman <yedaya.ka@gmail.com>
Date: Sat, 15 Mar 2025 23:02:27 +0200
Subject: [PATCH] secureserver.pl, genserv.sh: cleanups

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
---
 tests/certs/scripts/genserv.sh |  2 +-
 tests/secureserver.pl          | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh
index c2701ed87e..cf99d511d2 100755
--- a/tests/certs/scripts/genserv.sh
+++ b/tests/certs/scripts/genserv.sh
@@ -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
diff --git a/tests/secureserver.pl b/tests/secureserver.pl
index 12c5dfbe22..8e8049fc0a 100755
--- a/tests/secureserver.pl
+++ b/tests/secureserver.pl
@@ -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);
     }
 }