Address PR review comments

- Use $(DefaultPlatformToolset) in vcxproj instead of hard-coded v145
- Remove toolset detection step from Windows CI (no longer needed)
- Disable Python tests when Python 3 not found instead of failing build
- Add -noservername flag to s_client (SNI on by default, matching openssl)
- Fix wolfclu_test.py paths to be __file__-relative for location independence
- Add trailing newline to pkcs12 stdin password inputs
- Redirect s_server stdout/stderr to DEVNULL to prevent pipe deadlock

Author: julek-wolfssl

.github/workflows/windows-check.yml

@@ -32,19 +32,12 @@ jobs:
       - name: Replace user_settings.h
         run: cp wolfclu/ide/winvs/user_settings.h wolfssl/IDE/WIN/user_settings.h
 
-      - name: Detect platform toolset
-        id: toolset
-        run: |
-          $major = (vswhere -latest -property installationVersion).Split('.')[0]
-          $ts = @{ "16" = "v142"; "17" = "v143"; "18" = "v144" }[$major]
-          echo "value=$ts" >> $env:GITHUB_OUTPUT
-
       - name: Build wolfSSL
-        run: msbuild /m /p:PlatformToolset=${{ steps.toolset.outputs.value }} /p:Platform=${{ env.BUILD_PLATFORM }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} wolfssl/wolfssl64.sln
+        run: msbuild /m /p:Platform=${{ env.BUILD_PLATFORM }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} wolfssl/wolfssl64.sln
 
       - name: Build wolfCLU
         working-directory: wolfclu
-        run: msbuild /m /p:PlatformToolset=${{ steps.toolset.outputs.value }} /p:Platform=${{ env.BUILD_PLATFORM }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} wolfclu.sln
+        run: msbuild /m /p:Platform=${{ env.BUILD_PLATFORM }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} wolfclu.sln
 
       - name: Run tests
         working-directory: wolfclu

Makefile.am

@@ -48,6 +48,7 @@ man_MANS+= manpages/wolfssl.1
 
 include src/include.am
 include wolfclu/include.am
+if HAVE_PYTHON
 include tests/dh/include.am
 include tests/dsa/include.am
 include tests/pkey/include.am
@@ -65,6 +66,7 @@ include tests/bench/include.am
 include tests/client/include.am
 include tests/server/include.am
 include tests/testEncDec/include.am
+endif
 include ide/include.am
 #####include data/include.am
 

configure.ac

@@ -57,6 +57,7 @@ AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 AM_PATH_PYTHON([3.0],, [:])
 AC_SUBST([PYTHON])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ":"])
 
 # Checks for headers/libraries
 AC_CHECK_HEADERS([sys/time.h string.h termios.h unistd.h])

src/client/clu_client_setup.c

@@ -35,6 +35,7 @@ static const struct option client_options[] = {
     {"-CAfile",              required_argument, 0, WOLFCLU_CAFILE             },
     {"-verify_return_error", no_argument,       0, WOLFCLU_VERIFY_RETURN_ERROR},
     {"-disable_stdin_check", no_argument,       0, WOLFCLU_DISABLE_STDINCHK   },
+    {"-noservername",        no_argument,       0, WOLFCLU_NOSERVERNAME       },
     {"-help",                no_argument,       0, WOLFCLU_HELP               },
     {"-h",                   no_argument,       0, WOLFCLU_HELP               },
 
@@ -54,7 +55,8 @@ static void wolfCLU_ClientHelp(void)
     WOLFCLU_LOG(WOLFCLU_L0, "\t-starttls <proto, i.e. smtp>");
     WOLFCLU_LOG(WOLFCLU_L0, "\t-CAfile <ca file name>");
     WOLFCLU_LOG(WOLFCLU_L0, "\t-verify_return_error close connection on verification error");
-    WOLFCLU_LOG(WOLFCLU_L0, "\t-disable_stdin_check ")
+    WOLFCLU_LOG(WOLFCLU_L0, "\t-disable_stdin_check ");
+    WOLFCLU_LOG(WOLFCLU_L0, "\t-noservername do not send Server Name Indication");
 }
 
 static const char hostFlag[]       = "-h";
@@ -100,6 +102,7 @@ int wolfCLU_Client(int argc, char** argv)
     int   idx  = 0;
     /* Don't verify peer by default (same as OpenSSL). */
     int   verify = 0;
+    int   noservername = 0;
     char* ipv6 = NULL;
 
     int    clientArgc = 0;
@@ -195,8 +198,9 @@ int wolfCLU_Client(int argc, char** argv)
                     }
                 }
 
-                /* Set SNI hostname so modern servers accept the connection */
-                if (ret == WOLFCLU_SUCCESS && host != NULL) {
+                /* Set SNI hostname so modern servers accept the connection.
+                 * Matches openssl s_client default; use -noservername to disable. */
+                if (ret == WOLFCLU_SUCCESS && host != NULL && !noservername) {
                     ret = _addClientArg(clientArgv, sniFlag, &clientArgc);
                     if (ret == WOLFCLU_SUCCESS) {
                         ret = _addClientArg(clientArgv, host, &clientArgc);
@@ -234,6 +238,10 @@ int wolfCLU_Client(int argc, char** argv)
                         &clientArgc);
                 }
                 break;
+
+            case WOLFCLU_NOSERVERNAME:
+                noservername = 1;
+                break;
             case WOLFCLU_HELP:
                 wolfCLU_ClientHelp();
                 return WOLFCLU_SUCCESS;

tests/pkcs/pkcs12-test.py

@@ -40,7 +40,7 @@ def test_nocerts(self):
         r = subprocess.run(
             [WOLFSSL_BIN, "pkcs12", "-nodes", "-nocerts",
              "-passin", "stdin", "-passout", "pass:", "-in", P12_FILE],
-            input=b"wolfSSL test", capture_output=True, text=False,
+            input=b"wolfSSL test\n", capture_output=True, text=False,
             timeout=60,
         )
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -50,7 +50,7 @@ def test_nokeys(self):
         r = subprocess.run(
             [WOLFSSL_BIN, "pkcs12", "-nokeys",
              "-passin", "stdin", "-passout", "pass:", "-in", P12_FILE],
-            input=b"wolfSSL test", capture_output=True, text=False,
+            input=b"wolfSSL test\n", capture_output=True, text=False,
             timeout=60,
         )
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -65,7 +65,7 @@ def test_nocerts_with_passout(self):
         r = subprocess.run(
             [WOLFSSL_BIN, "pkcs12", "-passin", "stdin", "-passout", "pass:",
              "-in", P12_FILE, "-nocerts"],
-            input=b"wolfSSL test", capture_output=True, text=False,
+            input=b"wolfSSL test\n", capture_output=True, text=False,
             timeout=60,
         )
         self.assertEqual(r.returncode, 0, r.stderr)

tests/server/server-test.py

@@ -36,7 +36,7 @@ def test_server_client(self):
              "-key", os.path.join(CERTS_DIR, "server-key.pem"),
              "-cert", os.path.join(CERTS_DIR, "server-cert.pem"),
              "-noVerify", "-readyFile", readyfile],
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
             stdin=subprocess.DEVNULL,
         )
 
@@ -64,8 +64,6 @@ def test_server_client(self):
         finally:
             server.terminate()
             server.wait(timeout=5)
-            server.stdout.close()
-            server.stderr.close()
 
 
 if __name__ == "__main__":

tests/wolfclu_test.py

@@ -4,20 +4,23 @@
 import platform
 import subprocess
 
+_TESTS_DIR = os.path.dirname(os.path.abspath(__file__))
+_PROJECT_ROOT = os.path.dirname(_TESTS_DIR)
+
 
 def _find_wolfssl_bin():
     """Locate the wolfssl binary, searching common build output paths."""
     if platform.system() == "Windows":
         candidates = [
-            os.path.join(".", "x64", "Debug", "wolfssl.exe"),
-            os.path.join(".", "x64", "Release", "wolfssl.exe"),
-            os.path.join(".", "Debug", "wolfssl.exe"),
-            os.path.join(".", "Release", "wolfssl.exe"),
-            os.path.join(".", "wolfssl.exe"),
+            os.path.join(_PROJECT_ROOT, "x64", "Debug", "wolfssl.exe"),
+            os.path.join(_PROJECT_ROOT, "x64", "Release", "wolfssl.exe"),
+            os.path.join(_PROJECT_ROOT, "Debug", "wolfssl.exe"),
+            os.path.join(_PROJECT_ROOT, "Release", "wolfssl.exe"),
+            os.path.join(_PROJECT_ROOT, "wolfssl.exe"),
         ]
     else:
         candidates = [
-            os.path.join(".", "wolfssl"),
+            os.path.join(_PROJECT_ROOT, "wolfssl"),
         ]
 
     for path in candidates:
@@ -29,7 +32,7 @@ def _find_wolfssl_bin():
 
 
 WOLFSSL_BIN = _find_wolfssl_bin()
-CERTS_DIR = os.path.join(".", "certs")
+CERTS_DIR = os.path.join(_PROJECT_ROOT, "certs")
 
 
 def run_wolfssl(*args, stdin_data=None, timeout=60):

wolfCLU.vcxproj

@@ -28,22 +28,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v145</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v145</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v145</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v145</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

wolfclu/clu_optargs.h

@@ -114,6 +114,7 @@ enum {
     WOLFCLU_CHECK,
     WOLFCLU_VERIFY_RETURN_ERROR,
     WOLFCLU_DISABLE_STDINCHK,
+    WOLFCLU_NOSERVERNAME,
     WOLFCLU_NOCRYPT,
     WOLFCLU_TOPKCS8,
 };