diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2017-03-03 16:07:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 16:07:07 -0600 |
| commit | fc64c351c7757f0ebdb7da65cb74871e494a2add (patch) | |
| tree | ea777ae921b37441bbc280fd0f211df16e0ebc9c /PCbuild | |
| parent | 0705f66eb369aa6a6cdb699e24ff61e1ab2e0c56 (diff) | |
| download | cpython-git-fc64c351c7757f0ebdb7da65cb74871e494a2add.tar.gz | |
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-439)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index a5185becee..98a755d870 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
set libraries=%libraries% sqlite-3.14.2.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
diff --git a/PCbuild/python.props b/PCbuild/python.props index dde94f733a..d6bfd0877e 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -45,7 +45,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 00b50be017..2afa847e3c 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,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/
|