From c46cb13222cb21a2ffa9ec0320d3da14a37280cd Mon Sep 17 00:00:00 2001 From: Tess Gauthier Date: Fri, 15 May 2026 13:43:51 -0400 Subject: [PATCH 1/3] bump zlib to 1.3.2 --- contrib/win32/openssh/paths.targets | 2 ++ contrib/win32/openssh/ssh-keyscan.vcxproj | 16 ++++++++-------- .../win32/openssh/ssh-pkcs11-helper.vcxproj | 18 +++++++++--------- contrib/win32/openssh/ssh-sk-helper.vcxproj | 16 ++++++++-------- contrib/win32/openssh/ssh.vcxproj | 16 ++++++++-------- contrib/win32/openssh/sshd-auth.vcxproj | 18 +++++++++--------- contrib/win32/openssh/sshd-session.vcxproj | 18 +++++++++--------- contrib/win32/openssh/sshd.vcxproj | 18 +++++++++--------- contrib/win32/openssh/unittest-kex.vcxproj | 16 ++++++++-------- contrib/win32/openssh/vcpkg.json | 2 +- 10 files changed, 71 insertions(+), 69 deletions(-) diff --git a/contrib/win32/openssh/paths.targets b/contrib/win32/openssh/paths.targets index 8185fad5334f..e307830e8e7a 100644 --- a/contrib/win32/openssh/paths.targets +++ b/contrib/win32/openssh/paths.targets @@ -6,6 +6,8 @@ $(SolutionDir)lib\ true libcrypto.lib; + zsd.lib + zs.lib 10.0.22621.0 bcrypt.lib;Userenv.lib;Crypt32.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;Rpcrt4.lib;ntdll.lib false diff --git a/contrib/win32/openssh/ssh-keyscan.vcxproj b/contrib/win32/openssh/ssh-keyscan.vcxproj index 9167803224b2..2f55cefbc617 100644 --- a/contrib/win32/openssh/ssh-keyscan.vcxproj +++ b/contrib/win32/openssh/ssh-keyscan.vcxproj @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj index 0fc338a9bb08..207cb5fa8854 100644 --- a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj +++ b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj @@ -1,4 +1,4 @@ - + @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh-sk-helper.vcxproj b/contrib/win32/openssh/ssh-sk-helper.vcxproj index 212a9ca1f7dd..0e7de6338f93 100644 --- a/contrib/win32/openssh/ssh-sk-helper.vcxproj +++ b/contrib/win32/openssh/ssh-sk-helper.vcxproj @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh.vcxproj b/contrib/win32/openssh/ssh.vcxproj index d7baa0952a11..bf2937c57c87 100644 --- a/contrib/win32/openssh/ssh.vcxproj +++ b/contrib/win32/openssh/ssh.vcxproj @@ -216,7 +216,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -242,7 +242,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -268,7 +268,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -294,7 +294,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -322,7 +322,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /CETCOMPAT %(AdditionalOptions) @@ -352,7 +352,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /CETCOMPAT %(AdditionalOptions) @@ -382,7 +382,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 %(AdditionalOptions) @@ -412,7 +412,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 %(AdditionalOptions) diff --git a/contrib/win32/openssh/sshd-auth.vcxproj b/contrib/win32/openssh/sshd-auth.vcxproj index f8b353a6a04d..ec5469ff52da 100644 --- a/contrib/win32/openssh/sshd-auth.vcxproj +++ b/contrib/win32/openssh/sshd-auth.vcxproj @@ -1,4 +1,4 @@ - + @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/sshd-session.vcxproj b/contrib/win32/openssh/sshd-session.vcxproj index 001b272008e1..1fe85dfd18d2 100644 --- a/contrib/win32/openssh/sshd-session.vcxproj +++ b/contrib/win32/openssh/sshd-session.vcxproj @@ -1,4 +1,4 @@ - + @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/sshd.vcxproj b/contrib/win32/openssh/sshd.vcxproj index ce6f14688b2d..5631bc592b50 100644 --- a/contrib/win32/openssh/sshd.vcxproj +++ b/contrib/win32/openssh/sshd.vcxproj @@ -1,4 +1,4 @@ - + @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/unittest-kex.vcxproj b/contrib/win32/openssh/unittest-kex.vcxproj index 305a3664519a..0e5b0be7ee1a 100644 --- a/contrib/win32/openssh/unittest-kex.vcxproj +++ b/contrib/win32/openssh/unittest-kex.vcxproj @@ -206,7 +206,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -233,7 +233,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -260,7 +260,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -287,7 +287,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -316,7 +316,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -346,7 +346,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -376,7 +376,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -406,7 +406,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) diff --git a/contrib/win32/openssh/vcpkg.json b/contrib/win32/openssh/vcpkg.json index 825f19c04e5b..cb2f368c1dae 100644 --- a/contrib/win32/openssh/vcpkg.json +++ b/contrib/win32/openssh/vcpkg.json @@ -8,7 +8,7 @@ "overrides": [ { "name": "zlib", - "version": "1.3.1" + "version": "1.3.2" }, { "name": "libressl", From ed99c5d254d1df3c207eba3cb4f27b4adc5e2c7b Mon Sep 17 00:00:00 2001 From: Tess Gauthier Date: Fri, 15 May 2026 13:46:04 -0400 Subject: [PATCH 2/3] rename variable --- contrib/win32/openssh/paths.targets | 4 ++-- contrib/win32/openssh/ssh-keyscan.vcxproj | 16 ++++++++-------- contrib/win32/openssh/ssh-pkcs11-helper.vcxproj | 16 ++++++++-------- contrib/win32/openssh/ssh-sk-helper.vcxproj | 16 ++++++++-------- contrib/win32/openssh/ssh.vcxproj | 16 ++++++++-------- contrib/win32/openssh/sshd-auth.vcxproj | 16 ++++++++-------- contrib/win32/openssh/sshd-session.vcxproj | 16 ++++++++-------- contrib/win32/openssh/sshd.vcxproj | 16 ++++++++-------- contrib/win32/openssh/unittest-kex.vcxproj | 16 ++++++++-------- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/contrib/win32/openssh/paths.targets b/contrib/win32/openssh/paths.targets index e307830e8e7a..ea18ff78082d 100644 --- a/contrib/win32/openssh/paths.targets +++ b/contrib/win32/openssh/paths.targets @@ -6,8 +6,8 @@ $(SolutionDir)lib\ true libcrypto.lib; - zsd.lib - zs.lib + zsd.lib + zs.lib 10.0.22621.0 bcrypt.lib;Userenv.lib;Crypt32.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;Rpcrt4.lib;ntdll.lib false diff --git a/contrib/win32/openssh/ssh-keyscan.vcxproj b/contrib/win32/openssh/ssh-keyscan.vcxproj index 2f55cefbc617..876a7603d1a6 100644 --- a/contrib/win32/openssh/ssh-keyscan.vcxproj +++ b/contrib/win32/openssh/ssh-keyscan.vcxproj @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj index 207cb5fa8854..95d065ad316f 100644 --- a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj +++ b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh-sk-helper.vcxproj b/contrib/win32/openssh/ssh-sk-helper.vcxproj index 0e7de6338f93..cbf9f183d5c5 100644 --- a/contrib/win32/openssh/ssh-sk-helper.vcxproj +++ b/contrib/win32/openssh/ssh-sk-helper.vcxproj @@ -205,7 +205,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -230,7 +230,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -255,7 +255,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -280,7 +280,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -308,7 +308,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -338,7 +338,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -368,7 +368,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true @@ -398,7 +398,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);fido2.lib;cbor.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;$(fido2-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true diff --git a/contrib/win32/openssh/ssh.vcxproj b/contrib/win32/openssh/ssh.vcxproj index bf2937c57c87..911460869af3 100644 --- a/contrib/win32/openssh/ssh.vcxproj +++ b/contrib/win32/openssh/ssh.vcxproj @@ -216,7 +216,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -242,7 +242,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions) @@ -268,7 +268,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -294,7 +294,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -322,7 +322,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /CETCOMPAT %(AdditionalOptions) @@ -352,7 +352,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /CETCOMPAT %(AdditionalOptions) @@ -382,7 +382,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 %(AdditionalOptions) @@ -412,7 +412,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 %(AdditionalOptions) diff --git a/contrib/win32/openssh/sshd-auth.vcxproj b/contrib/win32/openssh/sshd-auth.vcxproj index ec5469ff52da..d442c343c686 100644 --- a/contrib/win32/openssh/sshd-auth.vcxproj +++ b/contrib/win32/openssh/sshd-auth.vcxproj @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/sshd-session.vcxproj b/contrib/win32/openssh/sshd-session.vcxproj index 1fe85dfd18d2..4242fef7d4d8 100644 --- a/contrib/win32/openssh/sshd-session.vcxproj +++ b/contrib/win32/openssh/sshd-session.vcxproj @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/sshd.vcxproj b/contrib/win32/openssh/sshd.vcxproj index 5631bc592b50..27642a40107c 100644 --- a/contrib/win32/openssh/sshd.vcxproj +++ b/contrib/win32/openssh/sshd.vcxproj @@ -206,7 +206,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -234,7 +234,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -262,7 +262,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -290,7 +290,7 @@ Console true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -321,7 +321,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -354,7 +354,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -387,7 +387,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup @@ -420,7 +420,7 @@ true true true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) MultiplyDefinedSymbolOnly wmainCRTStartup diff --git a/contrib/win32/openssh/unittest-kex.vcxproj b/contrib/win32/openssh/unittest-kex.vcxproj index 0e5b0be7ee1a..2e619ed978dc 100644 --- a/contrib/win32/openssh/unittest-kex.vcxproj +++ b/contrib/win32/openssh/unittest-kex.vcxproj @@ -206,7 +206,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -233,7 +233,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -260,7 +260,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -287,7 +287,7 @@ Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 /ignore:4098 %(AdditionalOptions) @@ -316,7 +316,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -346,7 +346,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -376,7 +376,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) @@ -406,7 +406,7 @@ true true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup /ignore:4099 %(AdditionalOptions) From 9b07819f48de01add8920308adba0b0cdea5b091 Mon Sep 17 00:00:00 2001 From: Tess Gauthier Date: Fri, 15 May 2026 14:50:14 -0400 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- contrib/win32/openssh/ssh-pkcs11-helper.vcxproj | 2 +- contrib/win32/openssh/sshd-auth.vcxproj | 2 +- contrib/win32/openssh/sshd-session.vcxproj | 2 +- contrib/win32/openssh/sshd.vcxproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj index 95d065ad316f..3d812e47d8f2 100644 --- a/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj +++ b/contrib/win32/openssh/ssh-pkcs11-helper.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/contrib/win32/openssh/sshd-auth.vcxproj b/contrib/win32/openssh/sshd-auth.vcxproj index d442c343c686..bf89c1cdac25 100644 --- a/contrib/win32/openssh/sshd-auth.vcxproj +++ b/contrib/win32/openssh/sshd-auth.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/contrib/win32/openssh/sshd-session.vcxproj b/contrib/win32/openssh/sshd-session.vcxproj index 4242fef7d4d8..2701139919fa 100644 --- a/contrib/win32/openssh/sshd-session.vcxproj +++ b/contrib/win32/openssh/sshd-session.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/contrib/win32/openssh/sshd.vcxproj b/contrib/win32/openssh/sshd.vcxproj index 27642a40107c..bdc52047e0d8 100644 --- a/contrib/win32/openssh/sshd.vcxproj +++ b/contrib/win32/openssh/sshd.vcxproj @@ -1,4 +1,4 @@ - +