Skip to content

Commit fc64c35

Browse files
authored
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-439)
1 parent 0705f66 commit fc64c35

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Misc/NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,8 @@ Documentation
806806
Build
807807
-----
808808

809+
- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
810+
809811
- Issue #27659: Prohibit implicit C function declarations: use
810812
-Werror=implicit-function-declaration when possible (GCC and Clang, but it
811813
depends on the compiler version). Patch written by Chi Hsuan Yen.

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.2j
57+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
5858
set libraries=%libraries% sqlite-3.14.2.0
5959
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
6060
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0

PCbuild/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
4646
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
4747
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
48-
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
48+
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
4949
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
5050
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
5151
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

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.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)