Skip to content

Commit 6fe57ad

Browse files
zwarezware
committed
Issue python#26268: Update Windows builds to use OpenSSL 1.0.2f
1 parent 16f164e commit 6fe57ad

7 files changed

Lines changed: 14 additions & 12 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ Build
258258

259259
- Issue #25696: Fix installation of Python on UNIX with make -j9.
260260

261-
- Issue #26268: Update OS X 10.5 installer to use OpenSSL 1.0.2f.
261+
- Issue #26268: Update OS X 10.5 installer and Windows builds to use
262+
OpenSSL 1.0.2f.
262263

263264
Windows
264265
-------

‎PCbuild/_hashlib.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</PropertyGroup>
6262
<ItemDefinitionGroup>
6363
<ClCompile>
64-
<AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
</ClCompile>
6666
<Link>
6767
<AdditionalDependencies>ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -87,4 +87,4 @@
8787
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
8888
<ImportGroup Label="ExtensionTargets">
8989
</ImportGroup>
90-
</Project>
90+
</Project>

‎PCbuild/_ssl.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</PropertyGroup>
6262
<ItemDefinitionGroup>
6363
<ClCompile>
64-
<AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
</ClCompile>
6666
<Link>
6767
<AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -91,4 +91,4 @@
9191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9292
<ImportGroup Label="ExtensionTargets">
9393
</ImportGroup>
94-
</Project>
94+
</Project>

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
5454
set libraries=
5555
set libraries=%libraries% bzip2-1.0.6
5656
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
57-
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2d
57+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
5858
set libraries=%libraries% sqlite-3.8.11.0
5959
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
6060
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2

‎PCbuild/openssl.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
<PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" />
1818
<PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" />
1919
<PreprocessorDefinitions Include="OPENSSL_THREADS" />
20-
<PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" />
20+
<!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> -->
2121
<PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" />
22-
<PreprocessorDefinitions Include="OPENSSL_CPUID_OBJ" />
2322
<PreprocessorDefinitions Include="SHA1_ASM" />
2423
<PreprocessorDefinitions Include="SHA256_ASM" />
2524
<PreprocessorDefinitions Include="SHA512_ASM" />
@@ -53,7 +52,7 @@
5352
<ClCompile>
5453
<!-- Suppress 64-bit truncation warnings - they aren't ours to worry about -->
5554
<DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
56-
<AdditionalIncludeDirectories>$(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
55+
<AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
5756
<PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions>
5857
</ClCompile>
5958
</ItemDefinitionGroup>
@@ -74,4 +73,4 @@ $(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
7473
<Lib Include="$(IntDir)%(NasmCompile.Filename).obj" />
7574
</ItemGroup>
7675
</Target>
77-
</Project>
76+
</Project>

‎PCbuild/python.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
4242
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
4343
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
44-
<opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir>
44+
<opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
45+
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
46+
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
4547
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
4648

4749
<!-- Suffix for all binaries when building for debug -->

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ _lzma
169169
Homepage:
170170
http://tukaani.org/xz/
171171
_ssl
172-
Python wrapper for version 1.0.2d of the OpenSSL secure sockets
172+
Python wrapper for version 1.0.2f of the OpenSSL secure sockets
173173
library, which is built by ssl.vcxproj
174174
Homepage:
175175
http://www.openssl.org/

0 commit comments

Comments
 (0)