Switch from MbedTLS to OpenSSL (#56708)

Based on @fxcoudert's openssl branch and pull request at #53891. - diff re-applied to current Julia master (hence the new commit) - LibCURL, LibGit2, LibSSH2, OpenSSL updated to newest version - MbedTLS removed Fix #48799. --------- Co-authored-by: Zentrik <[email protected]> Co-authored-by: Ian Butterworth <[email protected]> Co-authored-by: Mosè Giordano <[email protected]> Co-authored-by: Mosè Giordano <[email protected]>
JuliaLang · Jan 4, 2025 · 638dacc · 638dacc
1 parent eee709e
commit 638dacc
Show file tree

Hide file tree

Showing 44 changed files with 431 additions and 535 deletions.
diff --git a/Make.inc b/Make.inc
@@ -51,7 +51,7 @@ USE_SYSTEM_MPFR:=0
 USE_SYSTEM_LIBSUITESPARSE:=0
 USE_SYSTEM_LIBUV:=0
 USE_SYSTEM_UTF8PROC:=0
-USE_SYSTEM_MBEDTLS:=0
+USE_SYSTEM_OPENSSL:=0
 USE_SYSTEM_LIBSSH2:=0
 USE_SYSTEM_NGHTTP2:=0
 USE_SYSTEM_CURL:=0
@@ -1355,7 +1355,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.33|GLIBCXX_3\.5\.|GLIBCXX_4\.
 # Note: we explicitly _do not_ define `CSL` here, since it requires some more
 # advanced techniques to decide whether it should be installed from a BB source
 # or not.  See `deps/csl.mk` for more detail.
-BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT BOLT
+BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT BOLT
 define SET_BB_DEFAULT
 # First, check to see if BB is disabled on a global setting
 ifeq ($$(USE_BINARYBUILDER),0)

diff --git a/Makefile b/Makefile
@@ -228,7 +228,7 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_GMP) += libgmp libgmpxx
 JL_PRIVATE_LIBS-$(USE_SYSTEM_MPFR) += libmpfr
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2
 JL_PRIVATE_LIBS-$(USE_SYSTEM_NGHTTP2) += libnghttp2
-JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509
+JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENSSL) += libcrypto libssl
 JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUV) += libuv

diff --git a/THIRDPARTY.md b/THIRDPARTY.md
@@ -36,7 +36,7 @@ Julia's `stdlib` uses the following external libraries, which have their own lic
 - [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception]
 - [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative]
 - [LIBSSH2](https://github.com/libssh2/libssh2/blob/master/COPYING) [BSD-3]
-- [MBEDTLS](https://github.com/ARMmbed/mbedtls/blob/development/LICENSE) [Apache 2.0]
+- [OPENSSL](https://www.openssl.org/source/license.html) [Apache 2.0]
 - [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying) [LGPL3+]
 - [OPENBLAS](https://raw.github.com/xianyi/OpenBLAS/master/LICENSE) [BSD-3]
 - [LAPACK](https://netlib.org/lapack/LICENSE.txt) [BSD-3]

diff --git a/base/Makefile b/base/Makefile
@@ -264,9 +264,8 @@ $(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
 endif
 $(eval $(call symlink_system_library,GMP,libgmp))
 $(eval $(call symlink_system_library,MPFR,libmpfr))
-$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
-$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
-$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
+$(eval $(call symlink_system_library,OPENSSL,libcrypto))
+$(eval $(call symlink_system_library,OPENSSL,libssl))
 $(eval $(call symlink_system_library,LIBSSH2,libssh2))
 $(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
 $(eval $(call symlink_system_library,CURL,libcurl))

diff --git a/contrib/refresh_checksums.mk b/contrib/refresh_checksums.mk
@@ -24,7 +24,7 @@ CLANG_TRIPLETS=$(filter %-darwin %-freebsd,$(TRIPLETS))
 NON_CLANG_TRIPLETS=$(filter-out %-darwin %-freebsd,$(TRIPLETS))
 
 # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
-BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient
+BB_PROJECTS=openssl libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient
 BB_GCC_EXPANDED_PROJECTS=openblas csl
 BB_CXX_EXPANDED_PROJECTS=gmp llvm clang llvm-tools lld
 # These are non-BB source-only deps

diff --git a/deps/Makefile b/deps/Makefile
@@ -22,9 +22,9 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST)
 # additionally all targets should be listed in the getall target for easier off-line compilation
 # if you are adding a new target, it can help to copy an similar, existing target
 #
-# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl
+# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl openssl
 # custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich
-# CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls libtracyclient
+# CMake libs: llvm llvmunwind libgit2 libssh2 libtracyclient
 #
 # downloadable via git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2, libtracyclient
 #
@@ -119,8 +119,8 @@ ifeq ($(USE_SYSTEM_GMP), 0)
 DEP_LIBS += gmp
 endif
 
-ifeq ($(USE_SYSTEM_MBEDTLS), 0)
-DEP_LIBS += mbedtls
+ifeq ($(USE_SYSTEM_OPENSSL), 0)
+DEP_LIBS += openssl
 endif
 
 ifeq ($(USE_SYSTEM_LIBSSH2), 0)
@@ -200,7 +200,7 @@ DEP_LIBS_STAGED := $(DEP_LIBS)
 # list all targets
 DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \
 	openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \
-	objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
+	objconv openssl libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
 	sanitizers libsuitesparse lld libtracyclient ittapi nvtx JuliaSyntax \
 	terminfo
 DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL)
@@ -256,7 +256,7 @@ include $(SRCDIR)/unwind.mk
 include $(SRCDIR)/gmp.mk
 include $(SRCDIR)/mpfr.mk
 include $(SRCDIR)/patchelf.mk
-include $(SRCDIR)/mbedtls.mk
+include $(SRCDIR)/openssl.mk
 include $(SRCDIR)/libssh2.mk
 include $(SRCDIR)/nghttp2.mk
 include $(SRCDIR)/curl.mk

diff --git a/deps/checksums/curl b/deps/checksums/curl
@@ -1,36 +1,36 @@
 LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/md5/e8c53aa3fb963c80921787d5d565eb2c
 LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/sha512/8e442ea834299df9c02acb87226c121395ad8e550025ac5ee1103df09c6ff43817e9e48dd1bcbc92c80331ef3ddff531962430269115179acbec2bab2de5b011
-LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/md5/83854e8cdd078ec1fc5f92da2816e379
-LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/sha512/f3b3cc5804d9a7986ed9ea7c3186caa8dba0f4d6bbcb9b5d2070b4e6412234f2ed7908446dbe217323510c6d3b042540e18ec7839093c2c3c66f3195937a6a3b
-LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/md5/880014fface52bddaa1a0240e0668dde
-LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/sha512/a29b923e14425ad729484648ce15577e717a97acf6138e0ec3d35a8000aeef17f27ce01d1fdc1642c6eda72d8d8b46642d79844ef9a50f30a0148e29452565c1
-LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/md5/b84fcb98f1305803d941f7a5accbfdb1
-LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/sha512/0880dc91109aedd9b108f2e28a25bf7091ac976a6f94e65000f647802c57a01e8111d421b91a91244c3cfb56990155af2c47b3499997be2af8ab93d344b8331d
-LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/md5/24249f42db0bc99c2dde4cf61d61f11f
-LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/350443c86f7b6733fb6a28f8a2fe7a6c0e91462b9e4078fed3475059ec7e12fef5014e22d0d0babe44f172ace7258292de577a0ab90f90c65d825d74940c9c47
-LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/md5/375c01cef98204c4f63ac218b08c4c7b
-LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/sha512/ed0981d458c6ddc9f380b90f1ec25cbaa6be910f0dab5d5485e4d1e9a33f8a918d210722a5e6685b4d3b917e0800194856f826164ee2e90b8a886ada7498a52b
-LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/md5/4c81aa99065cf797d6e09ce172dd2fa7
-LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/08bbb1bc80411a5fd65699a0d721fc70a9bba1005194f2937accc2e98f7f803bac4a704c88aa1fc1d72e54e7c327a113963f8a4c52ebb1e5921778d1dd549143
-LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/md5/6865b2f2d93754b5206d618048c32b57
-LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/sha512/c1a5891f4c487d5f7cf91db7cd2d85394d9686cda01c89cddaf7afba09782aa9f00713592d72ed8a0dd20439884dd75c1e001a9ecb16dd8ce5f08f79c194c7c8
-LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/md5/3f35cc6a2dc7e9dba5e3b4aeaf130160
-LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/sha512/b34c5ba2fee272e6ca848c42335ffa0c4d0c06337608504a3a2cfeb111e228da3f82d91c0c4387c76fc347babbf50b368992b5b8d5fda1a60ed5c0ce5d9242db
-LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/md5/0072b83eaf91d9da4a8d25ef65fd8ca8
-LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/sha512/029552e3dac29857726988352a01a3b57859bfe5e327e7b759bd9968ed5af5498fd27ab490810d2d3ef05b1003c1a950fd092d1dbce7732a911f7cb6e5714303
-LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/md5/d58ef948bc9a04a8c934a88b7ab5599d
-LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/sha512/1e1742ea39f2fe1f13b0aff5907f96401276e3fc469a8f09f2bc31fffc72367a92856973db66eb9b05d20fd708764ad9429e385913f6236ce8067ec4e11dbb33
-LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/md5/60ec16b6dfd3e30eb0655cf177b026c7
-LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/sha512/f591897972c8b01edf64701885f636fc1d5c04cce8fc63577d06108e14e5480bad74306d6ee31515911bd8ba3db10d1f2c733a6149aceae32aa4b77e263087c3
-LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/md5/c6bc0d9cd0a9f9c35ed2aac058ae332f
-LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/sha512/038f55bfb06dce877540ea7d50f5a0b8fdc070539c505774139a7c23df276a5fc75b5cecabecbc2826417e091028382d79298a51ed73c3d776249b4ff35f9f26
-LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/md5/18bf9d909dd5eebc0554d23bf4a4ee0f
-LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/sha512/35e60faa1ee072003fdd5cd510295bc310aa99375aee6ef94eee3ee2d5e0b7844145866a74927c588c14131939c1d9865d6f5128ac4f6b93606a68042a94f39f
-LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/md5/213190e1d79c9c291ff460e1648a61d3
-LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/sha512/4ea063982520400c02dcdf44ed3f018dec19607ad20762231316eb745cdb1cd054b18677fee1b5c5fb0bd55eb845121a2113704c5301be1d76edfc8a4a09d93f
-LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/md5/30dda5aaeb7977eb3563c603af08cd6c
-LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/sha512/edf603a6c013d3f6e01fc4fd6f12caf93ff99df9baf14bc73b610638a5b5ff90ec3118b112d9a39221294f5f419f3bf12232c16eaf91b07a68d92342a5c56912
-LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/md5/9a2c980db329393f5274d42f87c2aec6
-LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/sha512/6b926a87a3470796eb111e448c459a8ff1267533513f14d58f6e08cbebfb3e838c114827fcf39298bcefe8d76b8578bb4d3903c848bfafb0590022e6a49b2a00
-curl-8.6.0.tar.bz2/md5/4418e0d94f29d352afafdab445e37a3d
-curl-8.6.0.tar.bz2/sha512/726fe7e21f8a2a925ab4ab6fe4e4ad099105f00656bfdc702beec12e1549ba2cb63d908d1d19f43b90feeb1d950ae5a6ac9a72a27447f5acf1907df396d1823c
+LibCURL.v8.9.1+0.aarch64-apple-darwin.tar.gz/md5/8a1929a2dc1a6682ff9ff7f66cda25f4
+LibCURL.v8.9.1+0.aarch64-apple-darwin.tar.gz/sha512/e491542103f6e1a34caf96cfae7f31ba12588c50517ca2c974be907c664cd873b554009e538fd7db7d31ebe46d68330da3fcf14ffe9fcbbda73b6d1919ea966d
+LibCURL.v8.9.1+0.aarch64-linux-gnu.tar.gz/md5/eb5f8fdb31189047527af3b98c6959b0
+LibCURL.v8.9.1+0.aarch64-linux-gnu.tar.gz/sha512/6fd5e489f63edec29efd20165b0888e86d0b53a19d352bebbdb0afc00a1f6478eec524143797307ab7a799cf924d2c76bd5ece9d9fd8fdc9346ba3c739a1fe83
+LibCURL.v8.9.1+0.aarch64-linux-musl.tar.gz/md5/6202ec4890ae02cf2a7999fe5e24d77c
+LibCURL.v8.9.1+0.aarch64-linux-musl.tar.gz/sha512/caf00ed30075d000efc638586520dac2e22f8ba04924d42dbe27bc1bd715aa7b2dbede062de296fc080a33d0aead6099a870f38d017a69693097413056629b1b
+LibCURL.v8.9.1+0.armv6l-linux-gnueabihf.tar.gz/md5/5bd474f4e09b4fe7658b2497861a580e
+LibCURL.v8.9.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/ff6b58cfff9a7433d9191766e3fe652f0b5b10fbc6da8fb03ca04ed44a46a36158fb7d8096932617011389fb5505844d5c4ef2c29bcf1c8da811287def4e91f9
+LibCURL.v8.9.1+0.armv6l-linux-musleabihf.tar.gz/md5/8f071c5389ba1df7d4d22683f068b6de
+LibCURL.v8.9.1+0.armv6l-linux-musleabihf.tar.gz/sha512/b8be3a8df717d0921ec225ce87dd9cd4fc9e13fd1f39c4906d02f30dcae24971f1798b017f3af346c603030cfa80869c117cdb5dff8e7762ee2e72c4027ef7a1
+LibCURL.v8.9.1+0.armv7l-linux-gnueabihf.tar.gz/md5/120e51d99907522150d79c44812decfa
+LibCURL.v8.9.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/b512a75cb3185904661375760250132c58678f43002a9ba0608de60dcca6afc1e2eef567a9f42f2d3dfa0be1ff01cb15f68980adebada220728521b13367b77d
+LibCURL.v8.9.1+0.armv7l-linux-musleabihf.tar.gz/md5/e8a59894ccb325fb424a3e5861c854f7
+LibCURL.v8.9.1+0.armv7l-linux-musleabihf.tar.gz/sha512/3bb4afef9b7be04f17a4e2e20e020bcfbf5fb4a36bc699a90337d76a108f75600fff49c877652956431946a948f42054497621593f1c6c593a537fe08ceda1c2
+LibCURL.v8.9.1+0.i686-linux-gnu.tar.gz/md5/1034cd95f6369cd994979c8653786639
+LibCURL.v8.9.1+0.i686-linux-gnu.tar.gz/sha512/5f7f755d17770dc8b995f2bbc817fda96db23da751439e5929526482b8f854f4ed73c6e930df0dd1657756f8951edd4f3c41be80f3b812a793678b6ededd855e
+LibCURL.v8.9.1+0.i686-linux-musl.tar.gz/md5/ad4a4cf21d15b48ce27275af67079075
+LibCURL.v8.9.1+0.i686-linux-musl.tar.gz/sha512/9e5c6d0d91d966154e3ecd8cd71c9b31841debc036b847dec684dcf3189ca617cd0bca4b73cf9440e55133e36ebafb02730c598c133dc33a9e164ba43c689506
+LibCURL.v8.9.1+0.i686-w64-mingw32.tar.gz/md5/300a71d7ba8c858f9ed85d761dfeef32
+LibCURL.v8.9.1+0.i686-w64-mingw32.tar.gz/sha512/a916f60a7c8ed41a56686d1145be73dc0162349ce1d098dbd12441fcc97a3f0bd4c5750d3e58e4cfe7e9ba7e0d3817bf592bd99a946cd6b45b296636c3220766
+LibCURL.v8.9.1+0.powerpc64le-linux-gnu.tar.gz/md5/0657e472b888b089c448695d200346d0
+LibCURL.v8.9.1+0.powerpc64le-linux-gnu.tar.gz/sha512/a81f25260c4204a069a87463d9ef58169d9286125daaf23b4e2295fc8108ef536049fd07248ca3f1caa2aac3eb0b376d2c64281d0302dfea6f0a782dfb3988fd
+LibCURL.v8.9.1+0.x86_64-apple-darwin.tar.gz/md5/3638b3365e97dd516d1eaa6f03892fe6
+LibCURL.v8.9.1+0.x86_64-apple-darwin.tar.gz/sha512/4e6c76fde045134c869dbaab52b28dc809541209077aa54d2e870b9aa29f3d43a8040f3194e06e519642348fc4de6aa49fcb04880a4707bae4e55206ac70f01b
+LibCURL.v8.9.1+0.x86_64-linux-gnu.tar.gz/md5/e48dd6fe9078600bf6db0fdd6f986b76
+LibCURL.v8.9.1+0.x86_64-linux-gnu.tar.gz/sha512/e6c33bdac80c9463d6d067f77cf7f2f595258e5f292fd133b5f5782e678004bed925c8bcbba1c708f2f535a0db7a0527fce9acef5250469a958ee11dff533c8f
+LibCURL.v8.9.1+0.x86_64-linux-musl.tar.gz/md5/2d219b4c0ba83dfce64b93c1e4d6ef24
+LibCURL.v8.9.1+0.x86_64-linux-musl.tar.gz/sha512/5fb8bb08d357ea3b7c9e417838bf37198ae673185c4f4564ecd1a06ce0e72c4c804909e8c6ffeafefb3460ad151308f662b3128ab5d4149f035de0fa9890506b
+LibCURL.v8.9.1+0.x86_64-unknown-freebsd.tar.gz/md5/66e715f6934f360398e527f534f6f5c5
+LibCURL.v8.9.1+0.x86_64-unknown-freebsd.tar.gz/sha512/64334fb156c15b7aa56e4ef81b9d81f93be6ee4c7a61d921bb09cb9951eeb3309197ac89150bde0187e7cecd6e53626e91b7bba14f0daaa0ba472563541c9ff1
+LibCURL.v8.9.1+0.x86_64-w64-mingw32.tar.gz/md5/672ffcacf3e1bc72d7cf244af0cbc5a2
+LibCURL.v8.9.1+0.x86_64-w64-mingw32.tar.gz/sha512/ea265d172a242026cbf7e6b991904aa403a7f491a1c55f91b444776782ad0ca2fdf4882735d1ed04e90df8b38a754f4d0181ad8c17f5fbd75b40a6b908ebbd36
+curl-8.9.1.tar.bz2/md5/8feb255a16590f2465926d7627f86583
+curl-8.9.1.tar.bz2/sha512/27e4b36550b676c42d1a533ade5b2b35ac7ca95e1998bd05cc34b5dfa3bdc9c0539ec7000481230b6431baa549e64da1b46b39d6ba1f112e37458d7b35948c2e