Skip to content

Commit dd2000c

Browse files
authored
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443)
1 parent 6e965d9 commit dd2000c

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Misc/NEWS

+5
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ Tests
127127
determine the candidate encoding for the test regex (allowing it to correctly
128128
skip the test when the default locale encoding is a multi-byte encoding)
129129

130+
Build
131+
-----
132+
133+
- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
134+
130135

131136
What's New in Python 3.5.3?
132137
===========================

PCbuild/get_externals.bat

+1-1
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.2j
57+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
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/python.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
4747
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
4848
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
49-
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
49+
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
5050
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
5151
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
5252
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

PCbuild/readme.txt

+1-1
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.2j of the OpenSSL secure sockets
172+
Python wrapper for version 1.0.2k 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)