From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Oct 2014 21:20:15 +0000 (-0500)
Subject: Issue #22644: Update the Windows build to OpenSSL 1.0.1j
X-Git-Tag: v2.7.9rc1~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10229a450f82b5582abe3116bbc8cb73daba3e2f;p=python

Issue #22644: Update the Windows build to OpenSSL 1.0.1j
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 02f898ba5c..0b7330eb50 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,4 +1,4 @@
-+++++++++++
++++++++++++
 Python News
 +++++++++++
 
@@ -288,7 +288,7 @@ Build
 Windows
 -------
 
-- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
+- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j.
 
 
 
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index f98ca098eb..1c7cee7bff 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1i"
+		Value="$(externalsDir)\openssl-1.0.1j"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 09946799d8..51f82e0c9b 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -24,6 +24,7 @@ cd ..
 @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
 @rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
+@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -37,8 +38,8 @@ if exist db-4.4.20 rd /s/q db-4.4.20
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
-if not exist openssl-1.0.1i svn export http://svn.python.org/projects/external/openssl-1.0.1i
+if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
+if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (