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

diff --cc Misc/NEWS
index f7de6d05e03293a2c4f3243d148ba7c200157365,80721b0e3cc311c7da8436ce7b6b4539910a8920..56fd60babc94c0e3a0cf9d778d22b287496fb410
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1320,16 -939,6 +1320,15 @@@ Tools/Demo
  - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
    Patch by Arfrever Frehtes Taifersar Arahesis.
  
- - Issue #21671, #22160, CVE-2014-0224: The bundled version of OpenSSL has been
-   updated to 1.0.1i.
 +Windows
 +-------
 +
 +- Issue #21907: Improved the batch scripts provided for building Python.
 +
++- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j.
 +
 +- Issue #10747: Use versioned labels in the Windows start menu.
 +  Patch by Olive Kilburn.
  
  What's New in Python 3.4.0?
  ===========================

diff --cc PCbuild/get_externals.bat
index 783df5c14abb9b219950157477cc98e69cae86bc,0000000000000000000000000000000000000000..84360517f80b25b8bb564f381845f11e6cd9de52
mode 100644,000000..100644
--- 1/PCbuild/get_externals.bat
--- /dev/null
+++ b/PCbuild/get_externals.bat
@@@ -1,100 -1,0 +1,100 @@@
-             openssl-1.0.1i
 +@echo off
 +setlocal
 +rem Simple script to fetch source for external libraries
 +
 +pushd "%~dp0..\.."
 +
 +if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
 +
 +rem Optionally clean up first.  Be warned that this can be very destructive!
 +if not "%1"=="" (
 +    for %%c in (-c --clean --clean-only) do (
 +        if "%1"=="%%c" goto clean
 +    )
 +    goto usage
 +)
 +goto fetch
 +
 +:clean
 +echo.Cleaning up external libraries.
 +for /D %%d in (
 +               bzip2-*
 +               db-*
 +               openssl-*
 +               tcl-*
 +               tcltk*
 +               tk-*
 +               tix-*
 +               sqlite-*
 +               xz-*
 +               ) do (
 +    echo.Removing %%d
 +    rmdir /s /q %%d
 +)
 +if "%1"=="--clean-only" (
 +    goto end
 +)
 +
 +:fetch
 +rem Fetch current versions
 +
 +svn --version > nul 2>&1
 +if ERRORLEVEL 9009 (
 +    echo.svn.exe must be on your PATH.
 +    echo.Try TortoiseSVN (http://tortoisesvn.net/^) and be sure to check the
 +    echo.command line tools option.
 +    popd
 +    exit /b 1
 +)
 +
 +echo.Fetching external libraries...
 +
 +for %%e in (
 +            bzip2-1.0.6
++            openssl-1.0.1j
 +            tcl-8.6.1.0
 +            tk-8.6.1.0
 +            tix-8.4.3.4
 +            sqlite-3.8.3.1
 +            xz-5.0.5
 +            ) do (
 +    if exist %%e (
 +        echo.%%e already exists, skipping.
 +    ) else (
 +        echo.Fetching %%e...
 +        svn export %SVNROOT%%%e
 +    )
 +)
 +
 +goto end
 +
 +:usage
 +echo.invalid argument: %1
 +echo.usage: %~n0 [[ -c ^| --clean ] ^| --clean-only ]
 +echo.
 +echo.Pull all sources necessary for compiling optional extension modules
 +echo.that rely on external libraries.  Requires svn.exe to be on your PATH
 +echo.and pulls sources from %SVNROOT%.
 +echo.
 +echo.Use the -c or --clean option to clean up all external library sources
 +echo.before pulling in the current versions.
 +echo.
 +echo.Use the --clean-only option to do the same cleaning, without pulling in
 +echo.anything new.
 +echo.
 +echo.Only the first argument is checked, all others are ignored.
 +echo.
 +echo.**WARNING**: the cleaning options unconditionally remove any directory
 +echo.that is a child of
 +echo.   %CD%
 +echo.and matches wildcard patterns beginning with bzip2-, db-, openssl-, tcl-,
 +echo.tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential to be
 +echo.very destructive if you are not aware of what it is doing.  Use with
 +echo.caution!
 +popd
 +exit /b -1
 +
 +
 +:end
 +echo Finished.
 +popd

diff --cc PCbuild/pyproject.props
index e566cdc550d41ac9de61a1166036aac8223b24ff,d1e9dc02a0af908b9a02d48cdc0a8c7a9eed2ed4..9f2b0e5a42865860b8af5cf1df709f4c430615f4
--- 1/PCbuild/pyproject.props
--- 2/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@@ -20,11 -20,13 +20,11 @@@
      <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
      <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
      <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
-     <opensslDir>$(externalsDir)\openssl-1.0.1i</opensslDir>
+     <opensslDir>$(externalsDir)\openssl-1.0.1j</opensslDir>
 +    <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
 +    <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
 +    <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>
      <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 -    <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
 -    <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
 -    <tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug>
 -    <tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib>
 -    <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug>
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>

diff --cc Tools/buildbot/build.bat
index d37ec7b31c47a5a7ec087bf8e60c59dc4698660a,be79b10726d70c0327e4defbc6eb293ea8daa0ba..f68b88fde92229e8493c3215dca5fb14f02f4ea5
--- 1/Tools/buildbot/build.bat
--- 2/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@@ -1,17 -1,7 +1,17 @@@
  @rem Used by the buildbot "compile" step.
 -cmd /c Tools\buildbot\external.bat
 -call "%VS100COMNTOOLS%vsvars32.bat"
 -cmd /c Tools\buildbot\clean.bat
  
 -msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
 +@rem Clean up
 +call "%~dp0clean.bat"
  
- @rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
 +@rem If you need the buildbots to start fresh (such as when upgrading to
 +@rem a new version of an external library, especially Tcl/Tk):
 +@rem 1) uncomment the following line:
 +
++call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
 +
 +@rem 2) commit and push
 +@rem 3) wait for all Windows bots to start a build with that changeset
 +@rem 4) re-comment, commit and push again
 +
 +@rem Do the build
 +call "%~dp0..\..\PCbuild\build.bat" -e -d %*