Skip to content

Commit 42d4b9c

Browse files
committed
Issue python#26930: Update Windows build to OpenSSL 1.0.2h
1 parent f7c5624 commit 42d4b9c

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

‎Misc/NEWS‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ Release date: 2016-06-26
1010
Core and Builtins
1111
-----------------
1212

13-
Library
14-
-------
13+
- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
14+
15+
Tests
16+
-----
17+
18+
- Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
19+
20+
IDLE
21+
----
22+
23+
- Issue #27365: Allow non-ascii in idlelib/NEWS.txt - minimal part for 3.5.2.
1524

1625

1726
What's New in Python 3.5.2 release candidate 1?

‎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.2g
57+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
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.2g\</opensslDir>
44+
<opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
4545
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
4646
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
4747
<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.2g of the OpenSSL secure sockets
172+
Python wrapper for version 1.0.2h 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)