From 8fb09ada55c85070e47dbf4e99a384c32bc14520 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 10 Oct 2016 21:57:04 -0500
Subject: [PATCH] Issue #28248: Update Windows build to use OpenSSL 1.0.2j

---
 Misc/NEWS                  | 2 ++
 PC/VS9.0/pyproject.vsprops | 2 +-
 PC/VS9.0/readme.txt        | 2 +-
 PCbuild/get_externals.bat  | 2 +-
 PCbuild/python.props       | 2 +-
 PCbuild/readme.txt         | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index d8771466dfd..c68e5f29445 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,8 @@ Tests
 Build
 -----
 
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 - Issue #28258: Fixed build with Estonian locale (distclean target in
   Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.
 
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 49012515533..13d9b1c08be 100644
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.2h"
+		Value="$(externalsDir)\openssl-1.0.2j"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 3345af964d9..21de0c025d6 100644
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.2h
+    svn export http://svn.python.org/projects/external/openssl-1.0.2j
 
     ** NOTE: if you use the PCbuild\get_externals.bat approach for
     obtaining external sources then you don't need to manually get the source
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 90b1068ca1e..387d9aed9c9 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.2h
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j
 set libraries=%libraries%                                    sqlite-3.8.11.0
 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 e40751aad0a..21ea5fa2a8d 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2j\</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 7fee48f5054..67adb7f0a02 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.2h of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2j of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/