Skip to content

Commit bd75abf

Browse files
bpo-34631: Updated OpenSSL to 1.1.1c in macOS installer (GH-14187)
(cherry picked from commit f3fb839) Co-authored-by: Ned Deily <[email protected]>
1 parent ae526ee commit bd75abf

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Mac/BuildScript/build-installer.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ def library_recipes():
215215

216216
result.extend([
217217
dict(
218-
name="OpenSSL 1.1.0j",
219-
url="https://www.openssl.org/source/openssl-1.1.0j.tar.gz",
220-
checksum='b4ca5b78ae6ae79da80790b30dbedbdc',
218+
name="OpenSSL 1.1.1c",
219+
url="https://www.openssl.org/source/openssl-1.1.1c.tar.gz",
220+
checksum='15e21da6efe8aa0e0768ffd8cd37a5f6',
221221
buildrecipe=build_universal_openssl,
222222
configure=None,
223223
install=None,
@@ -810,6 +810,16 @@ def build_openssl_arch(archbase, arch):
810810
"ppc": ["darwin-ppc-cc"],
811811
"ppc64": ["darwin64-ppc-cc"],
812812
}
813+
814+
# Somewhere between OpenSSL 1.1.0j and 1.1.1c, changes cause the
815+
# "enable-ec_nistp_64_gcc_128" option to get compile errors when
816+
# building on our 10.6 gcc-4.2 environment. There have been other
817+
# reports of projects running into this when using older compilers.
818+
# So, for now, do not try to use "enable-ec_nistp_64_gcc_128" when
819+
# building for 10.6.
820+
if getDeptargetTuple() == (10, 6):
821+
arch_opts['x86_64'].remove('enable-ec_nistp_64_gcc_128')
822+
813823
configure_opts = [
814824
"no-idea",
815825
"no-mdc2",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated OpenSSL to 1.1.1c in macOS installer.

0 commit comments

Comments
 (0)