Skip to content

Commit

Permalink
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) (#3445)
Browse files Browse the repository at this point in the history
(cherry picked from commit dd2000c)
  • Loading branch information
vstinner authored and larryhastings committed Dec 8, 2017
1 parent 6c004b4 commit 092db6c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows build and OS X installers to use OpenSSL 1.0.2k.
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ echo.Fetching external libraries...
for %%e in (
bzip2-1.0.6
nasm-2.11.06
openssl-1.0.2j
openssl-1.0.2k
tcl-8.6.1.0
tk-8.6.1.0
tix-8.4.3.4
Expand Down
4 changes: 2 additions & 2 deletions PCbuild/pyproject.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
Expand All @@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.11.0</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
<opensslDir>$(externalsDir)\openssl-1.0.2j</opensslDir>
<opensslDir>$(externalsDir)\openssl-1.0.2k</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
Python wrapper for version 1.0.2j of the OpenSSL secure sockets
Python wrapper for version 1.0.2k of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
Expand Down

0 comments on commit 092db6c

Please sign in to comment.