Skip to content

Commit a6bacec

Browse files
Upgrade dependency versions (#641)
* Add flags to not overwrite libressl functions * Add libcrypto.dll to folders of failing unittests * Add libcrypto.dll to folders of all unit tests * Add comment before new HAVE definitions on config.h.vs Co-authored-by: Paul Higinbotham <[email protected]> * Update LibreSSL version to 3.6.1 Co-authored-by: Paul Higinbotham <[email protected]>
1 parent 11e2996 commit a6bacec

10 files changed

+211
-19
lines changed

contrib/win32/openssh/config.h.vs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,5 +1736,37 @@
17361736
#define HAVE_STRUCT_POLLFD_FD 1
17371737
#define HAVE_KILLPG 1
17381738

1739+
/* Definitions needed to prevent re-definition of OpenSSL functions and structs */
1740+
#define HAVE_DSA_GET0_PQG 1
1741+
#define HAVE_DSA_SET0_PQG 1
1742+
#define HAVE_DSA_GET0_KEY 1
1743+
#define HAVE_DSA_SET0_KEY 1
1744+
#define HAVE_RSA_GET0_KEY 1
1745+
#define HAVE_RSA_SET0_KEY 1
1746+
#define HAVE_RSA_GET0_CRT_PARAMS 1
1747+
#define HAVE_RSA_SET0_CRT_PARAMS 1
1748+
#define HAVE_RSA_GET0_FACTORS 1
1749+
#define HAVE_RSA_SET0_FACTORS 1
1750+
#define HAVE_EVP_CIPHER_CTX_GET_IV 1
1751+
#define HAVE_EVP_CIPHER_CTX_SET_IV 1
1752+
#define HAVE_DSA_SIG_GET0 1
1753+
#define HAVE_DSA_SIG_SET0 1
1754+
#define HAVE_ECDSA_SIG_GET0 1
1755+
#define HAVE_ECDSA_SIG_SET0 1
1756+
#define HAVE_DH_GET0_PQG 1
1757+
#define HAVE_DH_SET0_PQG 1
1758+
#define HAVE_DH_GET0_KEY 1
1759+
#define HAVE_DH_SET0_KEY 1
1760+
#define HAVE_DH_SET_LENGTH 1
1761+
#define HAVE_RSA_METH_FREE 1
1762+
#define HAVE_RSA_METH_DUP 1
1763+
#define HAVE_RSA_METH_SET1_NAME 1
1764+
#define HAVE_RSA_METH_GET_FINISH 1
1765+
#define HAVE_RSA_METH_SET_PRIV_ENC 1
1766+
#define HAVE_RSA_METH_SET_PRIV_DEC 1
1767+
#define HAVE_RSA_METH_SET_FINISH 1
1768+
#define HAVE_EVP_PKEY_GET0_RSA 1
1769+
#define HAVE_EVP_MD_CTX_NEW 1
1770+
#define HAVE_EVP_MD_CTX_FREE 1
17391771

17401772

contrib/win32/openssh/paths.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<OpenSSH-Src-Path>$(SolutionDir)..\..\..\</OpenSSH-Src-Path>
55
<OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path>
66
<OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
7-
<LibreSSLVersion>3.4.3.0</LibreSSLVersion>
8-
<ZLibVersion>1.2.11</ZLibVersion>
9-
<fido2Version>1.10.0</fido2Version>
7+
<LibreSSLVersion>3.6.1.0</LibreSSLVersion>
8+
<ZLibVersion>1.2.13</ZLibVersion>
9+
<fido2Version>1.12.0</fido2Version>
1010
<!--libcbor version is not used in the bulid; it is needed for pipeline compliance tasks-->
1111
<libcborVersion>0.8.0</libcborVersion>
1212
<LibreSSL-Path>$(SolutionDir)\LibreSSL\sdk\</LibreSSL-Path>

contrib/win32/openssh/unittest-bitmap.vcxproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@
201201
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
202202
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
203203
</Link>
204+
<PostBuildEvent>
205+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
206+
</PostBuildEvent>
204207
<Manifest>
205208
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
206209
</Manifest>
@@ -224,6 +227,9 @@
224227
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
225228
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
226229
</Link>
230+
<PostBuildEvent>
231+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
232+
</PostBuildEvent>
227233
<Manifest>
228234
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
229235
</Manifest>
@@ -247,6 +253,9 @@
247253
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
248254
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
249255
</Link>
256+
<PostBuildEvent>
257+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
258+
</PostBuildEvent>
250259
<Manifest>
251260
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
252261
</Manifest>
@@ -270,6 +279,9 @@
270279
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
271280
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
272281
</Link>
282+
<PostBuildEvent>
283+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
284+
</PostBuildEvent>
273285
<Manifest>
274286
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
275287
</Manifest>
@@ -295,6 +307,9 @@
295307
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
296308
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
297309
</Link>
310+
<PostBuildEvent>
311+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
312+
</PostBuildEvent>
298313
<Manifest>
299314
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
300315
</Manifest>
@@ -321,6 +336,9 @@
321336
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
322337
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
323338
</Link>
339+
<PostBuildEvent>
340+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
341+
</PostBuildEvent>
324342
<Manifest>
325343
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
326344
</Manifest>
@@ -347,6 +365,9 @@
347365
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
348366
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
349367
</Link>
368+
<PostBuildEvent>
369+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
370+
</PostBuildEvent>
350371
<Manifest>
351372
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
352373
</Manifest>
@@ -373,6 +394,9 @@
373394
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
374395
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
375396
</Link>
397+
<PostBuildEvent>
398+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
399+
</PostBuildEvent>
376400
<Manifest>
377401
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
378402
</Manifest>

contrib/win32/openssh/unittest-hostkeys.vcxproj

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@
205205
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
206206
</Manifest>
207207
<PostBuildEvent>
208-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
208+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
209+
copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</Command>
209210
</PostBuildEvent>
210211
</ItemDefinitionGroup>
211212
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -231,7 +232,8 @@
231232
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
232233
</Manifest>
233234
<PostBuildEvent>
234-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
235+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
236+
copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</Command>
235237
</PostBuildEvent>
236238
</ItemDefinitionGroup>
237239
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -257,7 +259,8 @@
257259
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
258260
</Manifest>
259261
<PostBuildEvent>
260-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
262+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
263+
copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</Command>
261264
</PostBuildEvent>
262265
</ItemDefinitionGroup>
263266
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -283,7 +286,8 @@
283286
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
284287
</Manifest>
285288
<PostBuildEvent>
286-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
289+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
290+
copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</Command>
287291
</PostBuildEvent>
288292
</ItemDefinitionGroup>
289293
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -311,7 +315,8 @@
311315
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
312316
</Manifest>
313317
<PostBuildEvent>
314-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
318+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
319+
copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</Command>
315320
</PostBuildEvent>
316321
</ItemDefinitionGroup>
317322
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -340,7 +345,8 @@
340345
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
341346
</Manifest>
342347
<PostBuildEvent>
343-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
348+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
349+
copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</Command>
344350
</PostBuildEvent>
345351
</ItemDefinitionGroup>
346352
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -369,7 +375,8 @@
369375
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
370376
</Manifest>
371377
<PostBuildEvent>
372-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
378+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
379+
copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</Command>
373380
</PostBuildEvent>
374381
</ItemDefinitionGroup>
375382
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -398,7 +405,8 @@
398405
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
399406
</Manifest>
400407
<PostBuildEvent>
401-
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"</Command>
408+
<Command>xcopy /Y "$(ProjectDir)..\..\..\regress\unittests\hostkeys\testdata\*" "$(OutDir)"
409+
copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</Command>
402410
</PostBuildEvent>
403411
</ItemDefinitionGroup>
404412
<ItemGroup>

contrib/win32/openssh/unittest-kex.vcxproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@
202202
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
203203
<AdditionalOptions>/ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
204204
</Link>
205+
<PostBuildEvent>
206+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
207+
</PostBuildEvent>
205208
<Manifest>
206209
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
207210
</Manifest>
@@ -226,6 +229,9 @@
226229
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
227230
<AdditionalOptions>/ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
228231
</Link>
232+
<PostBuildEvent>
233+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
234+
</PostBuildEvent>
229235
<Manifest>
230236
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
231237
</Manifest>
@@ -250,6 +256,9 @@
250256
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
251257
<AdditionalOptions>/ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
252258
</Link>
259+
<PostBuildEvent>
260+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
261+
</PostBuildEvent>
253262
<Manifest>
254263
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
255264
</Manifest>
@@ -274,6 +283,9 @@
274283
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
275284
<AdditionalOptions>/ignore:4099 /ignore:4098 %(AdditionalOptions)</AdditionalOptions>
276285
</Link>
286+
<PostBuildEvent>
287+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
288+
</PostBuildEvent>
277289
<Manifest>
278290
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
279291
</Manifest>
@@ -300,6 +312,9 @@
300312
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
301313
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
302314
</Link>
315+
<PostBuildEvent>
316+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
317+
</PostBuildEvent>
303318
<Manifest>
304319
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
305320
</Manifest>
@@ -327,6 +342,9 @@
327342
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
328343
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
329344
</Link>
345+
<PostBuildEvent>
346+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
347+
</PostBuildEvent>
330348
<Manifest>
331349
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
332350
</Manifest>
@@ -354,6 +372,9 @@
354372
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
355373
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
356374
</Link>
375+
<PostBuildEvent>
376+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
377+
</PostBuildEvent>
357378
<Manifest>
358379
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
359380
</Manifest>
@@ -381,6 +402,9 @@
381402
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
382403
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
383404
</Link>
405+
<PostBuildEvent>
406+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
407+
</PostBuildEvent>
384408
<Manifest>
385409
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
386410
</Manifest>

contrib/win32/openssh/unittest-match.vcxproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@
201201
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
202202
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
203203
</Link>
204+
<PostBuildEvent>
205+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
206+
</PostBuildEvent>
204207
<Manifest>
205208
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
206209
</Manifest>
@@ -224,6 +227,9 @@
224227
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
225228
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
226229
</Link>
230+
<PostBuildEvent>
231+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
232+
</PostBuildEvent>
227233
<Manifest>
228234
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
229235
</Manifest>
@@ -247,6 +253,9 @@
247253
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
248254
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
249255
</Link>
256+
<PostBuildEvent>
257+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
258+
</PostBuildEvent>
250259
<Manifest>
251260
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
252261
</Manifest>
@@ -270,6 +279,9 @@
270279
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
271280
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
272281
</Link>
282+
<PostBuildEvent>
283+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
284+
</PostBuildEvent>
273285
<Manifest>
274286
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
275287
</Manifest>
@@ -295,6 +307,9 @@
295307
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
296308
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
297309
</Link>
310+
<PostBuildEvent>
311+
<command>copy /Y "$(LibreSSL-x86-Path)\libcrypto.dll" "$(OutDir)"</command>
312+
</PostBuildEvent>
298313
<Manifest>
299314
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
300315
</Manifest>
@@ -321,6 +336,9 @@
321336
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
322337
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
323338
</Link>
339+
<PostBuildEvent>
340+
<command>copy /Y "$(LibreSSL-x64-Path)\libcrypto.dll" "$(OutDir)"</command>
341+
</PostBuildEvent>
324342
<Manifest>
325343
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
326344
</Manifest>
@@ -347,6 +365,9 @@
347365
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
348366
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
349367
</Link>
368+
<PostBuildEvent>
369+
<command>copy /Y "$(LibreSSL-arm64-Path)\libcrypto.dll" "$(OutDir)"</command>
370+
</PostBuildEvent>
350371
<Manifest>
351372
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
352373
</Manifest>
@@ -373,6 +394,9 @@
373394
<AdditionalDependencies>posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies)</AdditionalDependencies>
374395
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
375396
</Link>
397+
<PostBuildEvent>
398+
<command>copy /Y "$(LibreSSL-arm-Path)\libcrypto.dll" "$(OutDir)"</command>
399+
</PostBuildEvent>
376400
<Manifest>
377401
<AdditionalManifestFiles>targetos.manifest</AdditionalManifestFiles>
378402
</Manifest>

0 commit comments

Comments
 (0)