From 75c66e5568dd8c113df3b075f6be31d455273ceb Mon Sep 17 00:00:00 2001 From: Yosuke Shimizu Date: Mon, 15 Jun 2026 16:42:40 +0900 Subject: [PATCH 1/3] Fix broken user_settings.h flip in windows-check workflow --- .github/workflows/windows-check.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/windows-check.yml b/.github/workflows/windows-check.yml index 89b48d3a6..f9ab6597d 100644 --- a/.github/workflows/windows-check.yml +++ b/.github/workflows/windows-check.yml @@ -43,13 +43,12 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}}wolfssl run: nuget restore ${{env.WOLFSSL_SOLUTION_FILE_PATH}} - - name: updated user_settings.h for sshd and x509 + - name: Update user_settings.h for sshd and x509 working-directory: ${{env.GITHUB_WORKSPACE}} - run: cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}} - - - name: replace wolfSSL user_settings.h with wolfSSH user_settings.h - working-directory: ${{env.GITHUB_WORKSPACE}} - run: get-content ${{env.USER_SETTINGS_H_NEW}} | %{$_ -replace "if 0","if 1"} + shell: bash + run: | + sed -i 's/#if 0/#if 1/g' ${{env.USER_SETTINGS_H_NEW}} + cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}} - name: Build wolfssl library working-directory: ${{env.GITHUB_WORKSPACE}}wolfssl @@ -117,11 +116,12 @@ jobs: # These env paths already include the wolfssh/ and wolfssl/ checkout # prefixes, so they must run from the workspace root (as the build job does). - - name: updated user_settings.h for sshd and x509 - run: cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}} - - - name: replace wolfSSL user_settings.h with wolfSSH user_settings.h - run: get-content ${{env.USER_SETTINGS_H_NEW}} | %{$_ -replace "if 0","if 1"} + - name: Update user_settings.h for sshd and x509 + working-directory: ${{env.GITHUB_WORKSPACE}} + shell: bash + run: | + sed -i 's/#if 0/#if 1/g' ${{env.USER_SETTINGS_H_NEW}} + cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}} # WholeProgramOptimization=false disables /GL so the v142-independent objects # link without a cross-version code-generation requirement (C1047). From 475774179bfb8c0bc3474fd4bc04e650ae002eeb Mon Sep 17 00:00:00 2001 From: Yosuke Shimizu Date: Wed, 24 Jun 2026 09:26:08 +0900 Subject: [PATCH 2/3] Initialize Winsock in api-test --- tests/api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/api.c b/tests/api.c index d511419ca..3045b7787 100644 --- a/tests/api.c +++ b/tests/api.c @@ -3708,6 +3708,8 @@ int wolfSSH_ApiTest(int argc, char** argv) #ifdef WOLFSSH_TEST_BLOCK return 77; #else + WSTARTTCP(); + AssertIntEQ(wolfSSH_Init(), WS_SUCCESS); #if defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,2) From ed236fea0d57f470b27256f16682ce2a26b7f2e3 Mon Sep 17 00:00:00 2001 From: Yosuke Shimizu Date: Wed, 24 Jun 2026 09:48:35 +0900 Subject: [PATCH 3/3] Exclude threaded echoserver tests from api-test on Windows --- tests/api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/api.c b/tests/api.c index 3045b7787..9e8d91750 100644 --- a/tests/api.c +++ b/tests/api.c @@ -1389,7 +1389,7 @@ static void test_wolfSSH_agent_signrequest_success(void) #if defined(WOLFSSH_SFTP) && !defined(NO_WOLFSSH_CLIENT) && \ - !defined(SINGLE_THREADED) + !defined(SINGLE_THREADED) && !defined(USE_WINDOWS_API) byte userPassword[256]; @@ -2615,7 +2615,8 @@ static void test_wolfSSH_SFTP_SetDefaultPath(void) { ; } #if defined(WOLFSSH_SCP) && !defined(NO_WOLFSSH_CLIENT) && \ !defined(SINGLE_THREADED) && !defined(NO_FILESYSTEM) && \ - !defined(WOLFSSH_SCP_USER_CALLBACKS) && !defined(WOLFSSH_ZEPHYR) + !defined(WOLFSSH_SCP_USER_CALLBACKS) && !defined(WOLFSSH_ZEPHYR) && \ + !defined(USE_WINDOWS_API) /* Upper bound on non-blocking retry iterations. A legitimate transfer across a * forced rekey completes in well under this; the bound keeps a regression from