traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-34631: Updated OpenSSL to 1.1.1c in macOS installer (GH-14187)

This commit is contained in:
Ned Deily 2019-06-18 04:17:33 -04:00 committed by GitHub
parent 9bbece9d7a
commit f3fb8393e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mac/BuildScript/build-installer.py
View File

@ -215,9 +215,9 @@ def library_recipes():
result.extend([ result.extend([
dict( dict(
name="OpenSSL 1.1.0j", name="OpenSSL 1.1.1c",
url="https://www.openssl.org/source/openssl-1.1.0j.tar.gz", url="https://www.openssl.org/source/openssl-1.1.1c.tar.gz",
checksum='b4ca5b78ae6ae79da80790b30dbedbdc', checksum='15e21da6efe8aa0e0768ffd8cd37a5f6',
buildrecipe=build_universal_openssl, buildrecipe=build_universal_openssl,
configure=None, configure=None,
install=None, install=None,
@ -810,6 +810,16 @@ def build_universal_openssl(basedir, archList):
"ppc": ["darwin-ppc-cc"], "ppc": ["darwin-ppc-cc"],
"ppc64": ["darwin64-ppc-cc"], "ppc64": ["darwin64-ppc-cc"],
} }
# Somewhere between OpenSSL 1.1.0j and 1.1.1c, changes cause the
# "enable-ec_nistp_64_gcc_128" option to get compile errors when
# building on our 10.6 gcc-4.2 environment. There have been other
# reports of projects running into this when using older compilers.
# So, for now, do not try to use "enable-ec_nistp_64_gcc_128" when
# building for 10.6.
if getDeptargetTuple() == (10, 6):
arch_opts['x86_64'].remove('enable-ec_nistp_64_gcc_128')
configure_opts = [ configure_opts = [
"no-idea", "no-idea",
"no-mdc2", "no-mdc2",

1
Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst Normal file
View File

@ -0,0 +1 @@
Updated OpenSSL to 1.1.1c in macOS installer.