From b1dc07509f78b354e83f5f4a902f1ff80c7bb05d Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 13 Apr 2018 17:30:34 -0700 Subject: bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463) --- Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst | 1 + PCbuild/get_externals.bat | 4 ++-- PCbuild/python.props | 4 ++-- PCbuild/readme.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst diff --git a/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst new file mode 100644 index 0000000..ca47a98 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst @@ -0,0 +1 @@ +Update Windows installer to use OpenSSL 1.1.0h. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 6d30751..f4bde04 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -49,7 +49,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0h set libraries=%libraries% sqlite-3.21.0.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0 @@ -72,7 +72,7 @@ for %%e in (%libraries%) do ( echo.Fetching external binaries... set binaries= -if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0f +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0h if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index f943313..f7adaf4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -49,8 +49,8 @@ $(ExternalsDir)sqlite-3.21.0.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ - $(ExternalsDir)openssl-1.1.0f\ - $(ExternalsDir)openssl-bin-1.1.0f\$(ArchName)\ + $(ExternalsDir)openssl-1.1.0h\ + $(ExternalsDir)openssl-bin-1.1.0h\$(ArchName)\ $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ $(ExternalsDir)\zlib-1.2.11\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 6af38fb..c847328 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -165,7 +165,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.0.2k of the OpenSSL secure sockets + Python wrapper for version 1.1.0h of the OpenSSL secure sockets library, which is downloaded from our binaries repository at https://github.com/python/cpython-bin-deps. -- cgit v0.12 id=001734ca7fd4fb4f53040c83bf06579cc171aded'>logstatsplain -rw-r--r--Bastion.py5619logstatsplain -rw-r--r--CGIHTTPServer.py11071logstatsplain -rw-r--r--ConfigParser.py22138logstatsplain -rw-r--r--Cookie.py25180logstatsplain -rw-r--r--DocXMLRPCServer.py11032logstatsplain -rw-r--r--FCNTL.py404logstatsplain -rw-r--r--HTMLParser.py13109logstatsplain -rw-r--r--MimeWriter.py6341logstatsplain -rw-r--r--Queue.py7834logstatsplain -rw-r--r--SimpleHTTPServer.py6446logstatsplain -rw-r--r--SimpleXMLRPCServer.py17548logstatsplain -rw-r--r--SocketServer.py18408logstatsplain -rw-r--r--StringIO.py7508logstatsplain -rw-r--r--TERMIOS.py416logstatsplain -rw-r--r--UserDict.py5446logstatsplain -rw-r--r--UserList.py3691logstatsplain -rwxr-xr-xUserString.py7871logstatsplain -rw-r--r--__future__.py3405logstatsplain -rw-r--r--__phello__.foo.py64logstatsplain -rw-r--r--_strptime.py16449logstatsplain -rw-r--r--aifc.py33334logstatsplain -rw-r--r--anydbm.py2620logstatsplain -rw-r--r--asynchat.py10714logstatsplain -rw-r--r--asyncore.py16073logstatsplain -rw-r--r--atexit.py1273logstatsplain -rw-r--r--audiodev.py7477logstatsplain -rwxr-xr-xbase64.py1988logstatsplain -rw-r--r--bdb.py18261logstatsplain -rw-r--r--binhex.py15077logstatsplain -rw-r--r--bisect.py2178logstatsplain d---------bsddb293logstatsplain -rw-r--r--calendar.py7429logstatsplain -rwxr-xr-xcgi.py34002logstatsplain -rw-r--r--cgitb.py11813logstatsplain -rw-r--r--chunk.py5372logstatsplain -rw-r--r--cmd.py14733logstatsplain -rw-r--r--code.py9968logstatsplain -rw-r--r--codecs.py21697logstatsplain -rw-r--r--codeop.py6145logstatsplain -rw-r--r--colorsys.py3185logstatsplain -rw-r--r--commands.py2279logstatsplain -rw-r--r--compileall.py5189logstatsplain d---------compiler415logstatsplain -rw-r--r--copy.py11307logstatsplain -rw-r--r--copy_reg.py6244logstatsplain -rw-r--r--csv.py15946logstatsplain d---------curses225logstatsplain -rw-r--r--dbhash.py404logstatsplain -rw-r--r--difflib.py49681logstatsplain -rw-r--r--dircache.py1006logstatsplain -rw-r--r--dis.py6452logstatsplain d---------distutils1094logstatsplain -rw-r--r--doctest.py51017logstatsplain -rw-r--r--dumbdbm.py8365logstatsplain -rw-r--r--dummy_thread.py4284logstatsplain -rw-r--r--dummy_threading.py2138logstatsplain d---------email906logstatsplain d---------encodings3078logstatsplain -rw-r--r--filecmp.py9867logstatsplain -rw-r--r--fileinput.py12373logstatsplain -rw-r--r--fnmatch.py3019logstatsplain -rw-r--r--formatter.py15099logstatsplain -rw-r--r--fpformat.py4567logstatsplain -rw-r--r--ftplib.py26786logstatsplain -rw-r--r--getopt.py7316logstatsplain -rw-r--r--getpass.py3122logstatsplain -rw-r--r--gettext.py16370logstatsplain -rw-r--r--glob.py1439logstatsplain -rw-r--r--gopherlib.py5584logstatsplain -rw-r--r--gzip.py15917logstatsplain -rw-r--r--hmac.py3032logstatsplain d---------hotshot146logstatsplain -rw-r--r--htmlentitydefs.py18054logstatsplain -rw-r--r--htmllib.py12534logstatsplain -rw-r--r--httplib.py43234logstatsplain d---------idlelib2818logstatsplain -rw-r--r--ihooks.py17192logstatsplain -rw-r--r--imaplib.py44698logstatsplain -rw-r--r--imghdr.py3408logstatsplain -rw-r--r--imputil.py25394logstatsplain -rw-r--r--inspect.py31678logstatsplain -rwxr-xr-xkeyword.py2021logstatsplain d---------lib-old722logstatsplain d---------lib-tk682logstatsplain -rw-r--r--linecache.py2703logstatsplain -rw-r--r--locale.py29799logstatsplain d---------logging115logstatsplain -rw-r--r--macpath.py7352logstatsplain -rw-r--r--macurl2path.py3099logstatsplain -rwxr-xr-xmailbox.py9448logstatsplain -rw-r--r--mailcap.py7427logstatsplain -rw-r--r--markupbase.py14050logstatsplain -rw-r--r--mhlib.py33200logstatsplain -rw-r--r--mimetools.py6751logstatsplain -rw-r--r--mimetypes.py17644logstatsplain -rwxr-xr-xmimify.py14885logstatsplain -rw-r--r--modulefinder.py20983logstatsplain -rw-r--r--multifile.py4729logstatsplain -rw-r--r--mutex.py1710logstatsplain -rw-r--r--netrc.py4111logstatsplain -rw-r--r--new.py541logstatsplain -rw-r--r--nntplib.py19693logstatsplain -rw-r--r--ntpath.py15737logstatsplain -rw-r--r--nturl2path.py2032logstatsplain -rw-r--r--opcode.py5103logstatsplain -rw-r--r--optparse.py50900logstatsplain -rw-r--r--os.py21054logstatsplain -rw-r--r--os2emxpath.py12679logstatsplain -rw-r--r--pdb.doc7483logstatsplain -rwxr-xr-xpdb.py33044logstatsplain -rw-r--r--pickle.py45684logstatsplain -rw-r--r--pickletools.py73495logstatsplain -rw-r--r--pipes.py9973logstatsplain -rw-r--r--pkgutil.py3100logstatsplain d---------plat-aix366logstatsplain d---------plat-aix466logstatsplain d---------plat-atheos102logstatsplain d---------plat-beos566logstatsplain d---------plat-darwin66logstatsplain d---------plat-freebsd266logstatsplain d---------plat-freebsd366logstatsplain d---------plat-freebsd466logstatsplain d---------plat-freebsd566logstatsplain d---------plat-generic33logstatsplain d---------plat-irix5916logstatsplain d---------plat-irix6879logstatsplain d---------plat-linux166logstatsplain d---------plat-linux2174logstatsplain d---------plat-mac1336logstatsplain d---------plat-netbsd166logstatsplain