summaryrefslogtreecommitdiff
path: root/PCbuild
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-03-08 10:26:39 -0800
committerSteve Dower <steve.dower@microsoft.com>2016-03-08 10:26:39 -0800
commitb3fbbf4b3525e06b0804f6e7a6bab54e33384b50 (patch)
tree4ff605c966aac4b17d2b3b3b5c9ad9eb0e9de038 /PCbuild
parent69b7f812faf4c707a3e89b4d67c13ffb12a4bd16 (diff)
downloadcpython-git-b3fbbf4b3525e06b0804f6e7a6bab54e33384b50.tar.gz
Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/python.props2
-rw-r--r--PCbuild/readme.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 333ee8250c..2c940fa16f 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
set libraries=%libraries% sqlite-3.6.21
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
diff --git a/PCbuild/python.props b/PCbuild/python.props
index d51e58baa8..23dfb561a6 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
- <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+ <opensslDir>$(ExternalsDir)openssl-1.0.2g\</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 c15c3643ba..9b21bea84f 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@ _bz2
Homepage:
http://www.bzip.org/
_ssl
- Python wrapper for version 1.0.2f of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2g of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/