FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Issue #26268: Update Windows builds to use OpenSSL 1.0.2f · python/cpython@c46a2eb · GitHub

/ cpython Public

Commit c46a2eb

Browse files
zware
committed
Issue #26268: Update Windows builds to use OpenSSL 1.0.2f
1 parent be9ddc1 commit c46a2eb

9 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ Build
148148
- Issue #26268: Update OS X 10.5+ 32-bit-only installer to build
149149
and link with OpenSSL 1.0.2f.
150150

151+
- Issue #26268: Update Windows builds to use OpenSSL 1.0.2f.
152+
151153

152154
What's New in Python 2.7.11?
153155
============================

‎PC/VS9.0/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
/>
8383
<UserMacro
8484
Name="opensslDir"
85-
Value="$(externalsDir)\openssl-1.0.2d"
85+
Value="$(externalsDir)\openssl-1.0.2f"
8686
/>
8787
<UserMacro
8888
Name="tcltkDir"

‎PC/VS9.0/readme.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ _ssl
132132

133133
Get the source code through
134134

135-
svn export http://svn.python.org/projects/external/openssl-1.0.2d
135+
svn export http://svn.python.org/projects/external/openssl-1.0.2f
136136

137137
** NOTE: if you use the PCbuild\get_externals.bat approach for
138138
obtaining external sources then you don't need to manually get the source
@@ -145,11 +145,10 @@ _ssl
145145
http://www.nasm.us/
146146
and add NASM to your PATH.
147147

148-
You can also install ActivePerl from
148+
You will also need ActivePerl from
149149
http://www.activestate.com/activeperl/
150-
if you like to use the official sources instead of the files from
151-
python's subversion repository. The svn version contains pre-build
152-
makefiles and assembly files.
150+
in order to create the necessary makefiles and .asm files for building
151+
OpenSSL.
153152

154153
The build process makes sure that no patented algorithms are included.
155154
For now RC5, MDC2 and IDEA are excluded from the build. You may have

‎PCbuild/_hashlib.vcxproj‎

Lines changed: 1 addition & 1 deletion
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>

‎PCbuild/_ssl.vcxproj‎

Lines changed: 1 addition & 1 deletion
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>

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ set libraries=
5858
set libraries=%libraries% bzip2-1.0.6
5959
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
6060
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
61-
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2d
61+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
6262
set libraries=%libraries% sqlite-3.6.21
6363
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
6464
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0

‎PCbuild/openssl.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
<PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" />
1616
<PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" />
1717
<PreprocessorDefinitions Include="OPENSSL_THREADS" />
18-
<PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" />
18+
<!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> -->
1919
<PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" />
20-
<PreprocessorDefinitions Include="OPENSSL_CPUID_OBJ" />
2120
<PreprocessorDefinitions Include="SHA1_ASM" />
2221
<PreprocessorDefinitions Include="SHA256_ASM" />
2322
<PreprocessorDefinitions Include="SHA512_ASM" />
@@ -51,7 +50,7 @@
5150
<ClCompile>
5251
<!-- Suppress 64-bit truncation warnings - they aren't ours to worry about -->
5352
<DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
54-
<AdditionalIncludeDirectories>$(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
53+
<AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
5554
<PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions>
5655
</ClCompile>
5756
</ItemDefinitionGroup>

‎PCbuild/python.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
<sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
3636
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
3737
<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
38-
<opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir>
38+
<opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
39+
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
40+
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
3941
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
4042

4143
<!-- 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
@@ -183,7 +183,7 @@ _bz2
183183
Homepage:
184184
http://www.bzip.org/
185185
_ssl
186-
Python wrapper for version 1.0.2d of the OpenSSL secure sockets
186+
Python wrapper for version 1.0.2f of the OpenSSL secure sockets
187187
library, which is built by ssl.vcxproj
188188
Homepage:
189189
http://www.openssl.org/

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL