ea5843b67f
* Fixes CVE-2022-40674 * Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 as fixed upstream Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
27 lines
1.2 KiB
Groff
27 lines
1.2 KiB
Groff
No use for applink.c OPENSSL_Applink, everything is compiled with the same MSVC
|
|
|
|
--- python3/PCbuild/_ssl.vcxproj.orig2 2019-12-23 15:54:19.254298900 +0100
|
|
+++ python3/PCbuild/_ssl.vcxproj 2019-12-23 15:54:24.693251200 +0100
|
|
@@ -99,9 +99,6 @@
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="..\Modules\_ssl.c" />
|
|
- <ClCompile Include="$(opensslIncludeDir)\applink.c">
|
|
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
- </ClCompile>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ResourceCompile Include="..\PC\python_nt.rc" />
|
|
--- python3/PCbuild/openssl.props.orig 2019-12-23 16:20:34.588135900 +0100
|
|
+++ python3/PCbuild/openssl.props 2019-12-23 16:20:51.074001300 +0100
|
|
@@ -10,9 +10,7 @@
|
|
</Link>
|
|
</ItemDefinitionGroup>
|
|
<PropertyGroup>
|
|
- <_DLLSuffix>-1_1</_DLLSuffix>
|
|
- <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
|
|
- <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
|
|
+ <_DLLSuffix>-3</_DLLSuffix>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
|