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

miss-islington · ned-deily · web-flow · commit bd75abfefed3 · 2019-06-18T01:39:53.000-07:00
(cherry picked from commit f3fb839) Co-authored-by: Ned Deily <nad@python.org>
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
@@ -215,9 +215,9 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.0j",
-              url="https://www.openssl.org/source/openssl-1.1.0j.tar.gz",
-              checksum='b4ca5b78ae6ae79da80790b30dbedbdc',
+              name="OpenSSL 1.1.1c",
+              url="https://www.openssl.org/source/openssl-1.1.1c.tar.gz",
+              checksum='15e21da6efe8aa0e0768ffd8cd37a5f6',
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
@@ -810,6 +810,16 @@ def build_openssl_arch(archbase, arch):
             "ppc": ["darwin-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 = [
             "no-idea",
             "no-mdc2",
diff --git a/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst b/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst
@@ -0,0 +1 @@
+Updated OpenSSL to 1.1.1c in macOS installer.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Updated OpenSSL to 1.1.1c in macOS installer.`