Skip to content

Commit e98b11e

Browse files
tgauthCopilot
tgauth
and
Copilot
authored
Bump zlib (#849)
* bump zlib to 1.3.2 * rename variable * Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 91b3a3c commit e98b11e

10 files changed

Lines changed: 67 additions & 65 deletions

‎contrib/win32/openssh/paths.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
77
<UseOpenSSL>true</UseOpenSSL>
88
<SSLLib>libcrypto.lib;</SSLLib>
9+
<ZLibName Condition="'$(Configuration)' == 'Debug'">zsd.lib</ZLibName>
10+
<ZLibName Condition="'$(Configuration)' != 'Debug'">zs.lib</ZLibName>
911
<WindowsSDKVersion>10.0.22621.0</WindowsSDKVersion>
1012
<AdditionalDependentLibs>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</AdditionalDependentLibs>
1113
<MinimalCoreWin>false</MinimalCoreWin>

‎contrib/win32/openssh/ssh-keyscan.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<Link>
206206
<SubSystem>Console</SubSystem>
207207
<GenerateDebugInformation>true</GenerateDebugInformation>
208-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
208+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
209209
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
210210
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
211211
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
@@ -230,7 +230,7 @@
230230
<Link>
231231
<SubSystem>Console</SubSystem>
232232
<GenerateDebugInformation>true</GenerateDebugInformation>
233-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
233+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
234234
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
235235
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
236236
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
@@ -255,7 +255,7 @@
255255
<Link>
256256
<SubSystem>Console</SubSystem>
257257
<GenerateDebugInformation>true</GenerateDebugInformation>
258-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
258+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
259259
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
260260
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
261261
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
@@ -280,7 +280,7 @@
280280
<Link>
281281
<SubSystem>Console</SubSystem>
282282
<GenerateDebugInformation>true</GenerateDebugInformation>
283-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
283+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
284284
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
285285
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
286286
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
@@ -308,7 +308,7 @@
308308
<GenerateDebugInformation>true</GenerateDebugInformation>
309309
<EnableCOMDATFolding>true</EnableCOMDATFolding>
310310
<OptimizeReferences>true</OptimizeReferences>
311-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
311+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
312312
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
313313
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
314314
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -338,7 +338,7 @@
338338
<GenerateDebugInformation>true</GenerateDebugInformation>
339339
<EnableCOMDATFolding>true</EnableCOMDATFolding>
340340
<OptimizeReferences>true</OptimizeReferences>
341-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
341+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
342342
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
343343
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
344344
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -368,7 +368,7 @@
368368
<GenerateDebugInformation>true</GenerateDebugInformation>
369369
<EnableCOMDATFolding>true</EnableCOMDATFolding>
370370
<OptimizeReferences>true</OptimizeReferences>
371-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
371+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
372372
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
373373
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
374374
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -398,7 +398,7 @@
398398
<GenerateDebugInformation>true</GenerateDebugInformation>
399399
<EnableCOMDATFolding>true</EnableCOMDATFolding>
400400
<OptimizeReferences>true</OptimizeReferences>
401-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
401+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
402402
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
403403
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
404404
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>

‎contrib/win32/openssh/ssh-pkcs11-helper.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<Link>
206206
<SubSystem>Console</SubSystem>
207207
<GenerateDebugInformation>true</GenerateDebugInformation>
208-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
208+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
209209
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
210210
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
211211
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
@@ -230,7 +230,7 @@
230230
<Link>
231231
<SubSystem>Console</SubSystem>
232232
<GenerateDebugInformation>true</GenerateDebugInformation>
233-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
233+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
234234
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
235235
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
236236
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 /CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
@@ -255,7 +255,7 @@
255255
<Link>
256256
<SubSystem>Console</SubSystem>
257257
<GenerateDebugInformation>true</GenerateDebugInformation>
258-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
258+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
259259
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
260260
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
261261
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
@@ -280,7 +280,7 @@
280280
<Link>
281281
<SubSystem>Console</SubSystem>
282282
<GenerateDebugInformation>true</GenerateDebugInformation>
283-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
283+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
284284
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
285285
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
286286
<AdditionalOptions>/debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no /ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
@@ -308,7 +308,7 @@
308308
<GenerateDebugInformation>true</GenerateDebugInformation>
309309
<EnableCOMDATFolding>true</EnableCOMDATFolding>
310310
<OptimizeReferences>true</OptimizeReferences>
311-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
311+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
312312
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
313313
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
314314
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -338,7 +338,7 @@
338338
<GenerateDebugInformation>true</GenerateDebugInformation>
339339
<EnableCOMDATFolding>true</EnableCOMDATFolding>
340340
<OptimizeReferences>true</OptimizeReferences>
341-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
341+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
342342
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
343343
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
344344
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -368,7 +368,7 @@
368368
<GenerateDebugInformation>true</GenerateDebugInformation>
369369
<EnableCOMDATFolding>true</EnableCOMDATFolding>
370370
<OptimizeReferences>true</OptimizeReferences>
371-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
371+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
372372
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
373373
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
374374
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
@@ -398,7 +398,7 @@
398398
<GenerateDebugInformation>true</GenerateDebugInformation>
399399
<EnableCOMDATFolding>true</EnableCOMDATFolding>
400400
<OptimizeReferences>true</OptimizeReferences>
401-
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;zlib.lib;setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
401+
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(ZLibName);setupapi.lib;hid.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
402402
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\bin;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
403403
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
404404
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>

0 commit comments

Comments
 (0)