Skip to content

Commit bf4a023

Browse files
eschnetteschnett
committed
Switch from MbedTLS to OpenSSL
Based on @fxcoudert's openssl branch and pull request at JuliaLang#53891. - diff re-applied to current Julia master (hence the new commit) - LibCURL, LibGit2, LibSSH2, OpenSSL updated to newest version - MbedTSL removed
1 parent 1ed2b98 commit bf4a023

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+369
-504
lines changed

‎Make.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ USE_SYSTEM_MPFR:=0
5151
USE_SYSTEM_LIBSUITESPARSE:=0
5252
USE_SYSTEM_LIBUV:=0
5353
USE_SYSTEM_UTF8PROC:=0
54-
USE_SYSTEM_MBEDTLS:=0
54+
USE_SYSTEM_OPENSSL:=0
5555
USE_SYSTEM_LIBSSH2:=0
5656
USE_SYSTEM_NGHTTP2:=0
5757
USE_SYSTEM_CURL:=0

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_GMP) += libgmp libgmpxx
228228
JL_PRIVATE_LIBS-$(USE_SYSTEM_MPFR) += libmpfr
229229
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2
230230
JL_PRIVATE_LIBS-$(USE_SYSTEM_NGHTTP2) += libnghttp2
231-
JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509
231+
JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENSSL) += libcrypto libssl
232232
JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl
233233
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2
234234
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUV) += libuv

‎THIRDPARTY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Julia's `stdlib` uses the following external libraries, which have their own lic
3636
- [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception]
3737
- [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative]
3838
- [LIBSSH2](https://github.com/libssh2/libssh2/blob/master/COPYING) [BSD-3]
39-
- [MBEDTLS](https://github.com/ARMmbed/mbedtls/blob/development/LICENSE) [Apache 2.0]
39+
- [OPENSSL](https://www.openssl.org/source/license.html) [Apache 2.0]
4040
- [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying) [LGPL3+]
4141
- [OPENBLAS](https://raw.github.com/xianyi/OpenBLAS/master/LICENSE) [BSD-3]
4242
- [LAPACK](https://netlib.org/lapack/LICENSE.txt) [BSD-3]

‎base/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,8 @@ $(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
264264
endif
265265
$(eval $(call symlink_system_library,GMP,libgmp))
266266
$(eval $(call symlink_system_library,MPFR,libmpfr))
267-
$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
268-
$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
269-
$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
267+
$(eval $(call symlink_system_library,OPENSSL,libcrypto))
268+
$(eval $(call symlink_system_library,OPENSSL,libssl))
270269
$(eval $(call symlink_system_library,LIBSSH2,libssh2))
271270
$(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
272271
$(eval $(call symlink_system_library,CURL,libcurl))

‎contrib/refresh_checksums.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CLANG_TRIPLETS=$(filter %-darwin %-freebsd,$(TRIPLETS))
2424
NON_CLANG_TRIPLETS=$(filter-out %-darwin %-freebsd,$(TRIPLETS))
2525

2626
# These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
27-
BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient
27+
BB_PROJECTS=openssl libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient
2828
BB_GCC_EXPANDED_PROJECTS=openblas csl
2929
BB_CXX_EXPANDED_PROJECTS=gmp llvm clang llvm-tools lld
3030
# These are non-BB source-only deps

‎deps/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST)
2222
# additionally all targets should be listed in the getall target for easier off-line compilation
2323
# if you are adding a new target, it can help to copy an similar, existing target
2424
#
25-
# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl
25+
# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl openssl
2626
# custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich
27-
# CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls libtracyclient
27+
# CMake libs: llvm llvmunwind libgit2 libssh2 libtracyclient
2828
#
2929
# downloadable via git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2, libtracyclient
3030
#
@@ -119,8 +119,8 @@ ifeq ($(USE_SYSTEM_GMP), 0)
119119
DEP_LIBS += gmp
120120
endif
121121

122-
ifeq ($(USE_SYSTEM_MBEDTLS), 0)
123-
DEP_LIBS += mbedtls
122+
ifeq ($(USE_SYSTEM_OPENSSL), 0)
123+
DEP_LIBS += openssl
124124
endif
125125

126126
ifeq ($(USE_SYSTEM_LIBSSH2), 0)
@@ -200,7 +200,7 @@ DEP_LIBS_STAGED := $(DEP_LIBS)
200200
# list all targets
201201
DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \
202202
openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \
203-
objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
203+
objconv openssl libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
204204
sanitizers libsuitesparse lld libtracyclient ittapi nvtx JuliaSyntax \
205205
terminfo
206206
DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL)
@@ -256,7 +256,7 @@ include $(SRCDIR)/unwind.mk
256256
include $(SRCDIR)/gmp.mk
257257
include $(SRCDIR)/mpfr.mk
258258
include $(SRCDIR)/patchelf.mk
259-
include $(SRCDIR)/mbedtls.mk
259+
include $(SRCDIR)/openssl.mk
260260
include $(SRCDIR)/libssh2.mk
261261
include $(SRCDIR)/nghttp2.mk
262262
include $(SRCDIR)/curl.mk

‎deps/checksums/curl‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/md5/e8c53aa3fb963c80921787d5d565eb2c
2-
LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/sha512/8e442ea834299df9c02acb87226c121395ad8e550025ac5ee1103df09c6ff43817e9e48dd1bcbc92c80331ef3ddff531962430269115179acbec2bab2de5b011
3-
LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/md5/83854e8cdd078ec1fc5f92da2816e379
4-
LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/sha512/f3b3cc5804d9a7986ed9ea7c3186caa8dba0f4d6bbcb9b5d2070b4e6412234f2ed7908446dbe217323510c6d3b042540e18ec7839093c2c3c66f3195937a6a3b
5-
LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/md5/880014fface52bddaa1a0240e0668dde
6-
LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/sha512/a29b923e14425ad729484648ce15577e717a97acf6138e0ec3d35a8000aeef17f27ce01d1fdc1642c6eda72d8d8b46642d79844ef9a50f30a0148e29452565c1
7-
LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/md5/b84fcb98f1305803d941f7a5accbfdb1
8-
LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/sha512/0880dc91109aedd9b108f2e28a25bf7091ac976a6f94e65000f647802c57a01e8111d421b91a91244c3cfb56990155af2c47b3499997be2af8ab93d344b8331d
9-
LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/md5/24249f42db0bc99c2dde4cf61d61f11f
10-
LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/350443c86f7b6733fb6a28f8a2fe7a6c0e91462b9e4078fed3475059ec7e12fef5014e22d0d0babe44f172ace7258292de577a0ab90f90c65d825d74940c9c47
11-
LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/md5/375c01cef98204c4f63ac218b08c4c7b
12-
LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/sha512/ed0981d458c6ddc9f380b90f1ec25cbaa6be910f0dab5d5485e4d1e9a33f8a918d210722a5e6685b4d3b917e0800194856f826164ee2e90b8a886ada7498a52b
13-
LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/md5/4c81aa99065cf797d6e09ce172dd2fa7
14-
LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/08bbb1bc80411a5fd65699a0d721fc70a9bba1005194f2937accc2e98f7f803bac4a704c88aa1fc1d72e54e7c327a113963f8a4c52ebb1e5921778d1dd549143
15-
LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/md5/6865b2f2d93754b5206d618048c32b57
16-
LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/sha512/c1a5891f4c487d5f7cf91db7cd2d85394d9686cda01c89cddaf7afba09782aa9f00713592d72ed8a0dd20439884dd75c1e001a9ecb16dd8ce5f08f79c194c7c8
17-
LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/md5/3f35cc6a2dc7e9dba5e3b4aeaf130160
18-
LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/sha512/b34c5ba2fee272e6ca848c42335ffa0c4d0c06337608504a3a2cfeb111e228da3f82d91c0c4387c76fc347babbf50b368992b5b8d5fda1a60ed5c0ce5d9242db
19-
LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/md5/0072b83eaf91d9da4a8d25ef65fd8ca8
20-
LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/sha512/029552e3dac29857726988352a01a3b57859bfe5e327e7b759bd9968ed5af5498fd27ab490810d2d3ef05b1003c1a950fd092d1dbce7732a911f7cb6e5714303
21-
LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/md5/d58ef948bc9a04a8c934a88b7ab5599d
22-
LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/sha512/1e1742ea39f2fe1f13b0aff5907f96401276e3fc469a8f09f2bc31fffc72367a92856973db66eb9b05d20fd708764ad9429e385913f6236ce8067ec4e11dbb33
23-
LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/md5/60ec16b6dfd3e30eb0655cf177b026c7
24-
LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/sha512/f591897972c8b01edf64701885f636fc1d5c04cce8fc63577d06108e14e5480bad74306d6ee31515911bd8ba3db10d1f2c733a6149aceae32aa4b77e263087c3
25-
LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/md5/c6bc0d9cd0a9f9c35ed2aac058ae332f
26-
LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/sha512/038f55bfb06dce877540ea7d50f5a0b8fdc070539c505774139a7c23df276a5fc75b5cecabecbc2826417e091028382d79298a51ed73c3d776249b4ff35f9f26
27-
LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/md5/18bf9d909dd5eebc0554d23bf4a4ee0f
28-
LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/sha512/35e60faa1ee072003fdd5cd510295bc310aa99375aee6ef94eee3ee2d5e0b7844145866a74927c588c14131939c1d9865d6f5128ac4f6b93606a68042a94f39f
29-
LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/md5/213190e1d79c9c291ff460e1648a61d3
30-
LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/sha512/4ea063982520400c02dcdf44ed3f018dec19607ad20762231316eb745cdb1cd054b18677fee1b5c5fb0bd55eb845121a2113704c5301be1d76edfc8a4a09d93f
31-
LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/md5/30dda5aaeb7977eb3563c603af08cd6c
32-
LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/sha512/edf603a6c013d3f6e01fc4fd6f12caf93ff99df9baf14bc73b610638a5b5ff90ec3118b112d9a39221294f5f419f3bf12232c16eaf91b07a68d92342a5c56912
33-
LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/md5/9a2c980db329393f5274d42f87c2aec6
34-
LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/sha512/6b926a87a3470796eb111e448c459a8ff1267533513f14d58f6e08cbebfb3e838c114827fcf39298bcefe8d76b8578bb4d3903c848bfafb0590022e6a49b2a00
35-
curl-8.6.0.tar.bz2/md5/4418e0d94f29d352afafdab445e37a3d
36-
curl-8.6.0.tar.bz2/sha512/726fe7e21f8a2a925ab4ab6fe4e4ad099105f00656bfdc702beec12e1549ba2cb63d908d1d19f43b90feeb1d950ae5a6ac9a72a27447f5acf1907df396d1823c
1+
LibCURL.v8.11.0+0.aarch64-apple-darwin.tar.gz/md5/05e72d3693794f891b04f3f4ddcdf6fb
2+
LibCURL.v8.11.0+0.aarch64-apple-darwin.tar.gz/sha512/a71a5fd68e2ff6a6ddbb0149798dc608ceb0d5000da38292611188abdfeba1727e014faad8017b86a7a1dac46b214ace8d2d635b6b5cdff4bf661c07f9371a84
3+
LibCURL.v8.11.0+0.aarch64-linux-gnu.tar.gz/md5/a110b82b54077a01fb9f98318fcc1adf
4+
LibCURL.v8.11.0+0.aarch64-linux-gnu.tar.gz/sha512/cf992c486c2885a9f5b226f9218a80a159e05ebe97fbd622b1157d69e795ca722b259320bdfb54af873e227f2ed90ad3a31c5a4596bfdd1a5ade29fffeeda65c
5+
LibCURL.v8.11.0+0.aarch64-linux-musl.tar.gz/md5/0a29b7002dd3a500012812bdb1ed02dc
6+
LibCURL.v8.11.0+0.aarch64-linux-musl.tar.gz/sha512/734beb59b76fa3f78bbd72a3c2bb548be9bc2fe553f7ae659429bf579e007d39e80c46e34563d00afc576a22ee74cc4896549829d918b5e8a97ee6c697ca852c
7+
LibCURL.v8.11.0+0.aarch64-unknown-freebsd.tar.gz/md5/cabe51ed84c69641777df9e4f6548951
8+
LibCURL.v8.11.0+0.aarch64-unknown-freebsd.tar.gz/sha512/2312be24f39d8bc914b3f6292c674f8b8ec2f13c892fac4bdef230f1852ab284e06ce85899c2e57ddb5652754334ea7e20c7647c355393e94e44bfe4e2cd7bd1
9+
LibCURL.v8.11.0+0.armv6l-linux-gnueabihf.tar.gz/md5/4a2a5afa364e099d8d5153dc11046ef9
10+
LibCURL.v8.11.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/5fa89440aad8ff77bff54cae72c9c849d8990cca4515373a020a54543b617121db6ba3cd2cf50bd01e86dda40e449b69b518e79c485838391e6e0d0ef6819fc7
11+
LibCURL.v8.11.0+0.armv6l-linux-musleabihf.tar.gz/md5/25ea385950d5157a6aa1766a4d79021c
12+
LibCURL.v8.11.0+0.armv6l-linux-musleabihf.tar.gz/sha512/2bb5d9c76bd48e4d7004c388256fd491e80f936d849caae48be52ef933de916b3b66b162e67d010d44be0751f7a29c34319314146c5d6a7f1886fb09d57dbf41
13+
LibCURL.v8.11.0+0.armv7l-linux-gnueabihf.tar.gz/md5/da15f5538a994aa6b06708a86992ff55
14+
LibCURL.v8.11.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/3e27d73a485e8a4f4b7522bd9c1e819e886825e6a8e52bd8fe8ff790f31e819097d698b861641976b8dd3cbc024269308493842fea7a966894f29768c71ef3b7
15+
LibCURL.v8.11.0+0.armv7l-linux-musleabihf.tar.gz/md5/e6e44679611025b0e5f6d2bce75d1235
16+
LibCURL.v8.11.0+0.armv7l-linux-musleabihf.tar.gz/sha512/09994a27eb83764f5fcb230f9e74459b4f08de2c392ad450b61d35317387bce6ec2f26e4fbcd254bfddd2aff76493290e0578535d8d6594df2705724d78df209
17+
LibCURL.v8.11.0+0.i686-linux-gnu.tar.gz/md5/e4898b4e2b98686e5fc81ef4eea27a73
18+
LibCURL.v8.11.0+0.i686-linux-gnu.tar.gz/sha512/09721b07fb9339e193687b5e0b87eb45cfb53454211da50981eb2f637b10523a1925793c81f9964944e069385947070d46283d545d816c2d426d3d8e809e2fdd
19+
LibCURL.v8.11.0+0.i686-linux-musl.tar.gz/md5/579e5b342ba451927b441b761ae24c7e
20+
LibCURL.v8.11.0+0.i686-linux-musl.tar.gz/sha512/6886913759b8bfb4bb96d462e733fa399cac0db9b3f8b54a7ea5ee70b8af67b0ff824e7509c5b863b0e941e99a0abb3033679fd69d7c22f0a54a4b250089981d
21+
LibCURL.v8.11.0+0.i686-w64-mingw32.tar.gz/md5/2f9e268c899485c4bba11726cbdbdb79
22+
LibCURL.v8.11.0+0.i686-w64-mingw32.tar.gz/sha512/61436602de0285e0b2a71d0c7a518b51ace92ed8ba272851b804093620741dbd50f062044e55fe99b41f209cacef70508c05e61da026d437ab30c803974accff
23+
LibCURL.v8.11.0+0.powerpc64le-linux-gnu.tar.gz/md5/585db495ff2c169ab81a20631212ba56
24+
LibCURL.v8.11.0+0.powerpc64le-linux-gnu.tar.gz/sha512/3cd64edf6455a118a291cb529000754b2c8fd683aff705c4a4ed2fa4cb77bc1b3cc87c172f720d7b7e0ba389cc5c4280303c21263687268437ed3be7cff40675
25+
LibCURL.v8.11.0+0.x86_64-apple-darwin.tar.gz/md5/38ab1ff3832952d2510650fc9dc7c00c
26+
LibCURL.v8.11.0+0.x86_64-apple-darwin.tar.gz/sha512/224584e5e0a7fa34f71f915f78609677436c20abc12cb2399c0b2ce498f0196359efe23bd3a25d7b65adebe92342191c32fe6424316270b81d6908ff879129f7
27+
LibCURL.v8.11.0+0.x86_64-linux-gnu.tar.gz/md5/32d0b308c323931b03ce1ffa18ea83f2
28+
LibCURL.v8.11.0+0.x86_64-linux-gnu.tar.gz/sha512/dc09321c006c4964cc526c5658365b42f48603571672af5586e1dd0c810a63c7513db0d09acc5061e15d2acd3f29ea8c46a2cde29a1222b2c7a106a394b7f75d
29+
LibCURL.v8.11.0+0.x86_64-linux-musl.tar.gz/md5/82a6b24a402df45729a06aa9aee90f7d
30+
LibCURL.v8.11.0+0.x86_64-linux-musl.tar.gz/sha512/6c2bdaa56452c2dde8c0f81cd55c54ab923be038a650151121aadeb459f8de75eb2e2bf58805e35a2b48381d04e98c221d01e6ac18c14b34f4e796941738479a
31+
LibCURL.v8.11.0+0.x86_64-unknown-freebsd.tar.gz/md5/f1d011e8efbd113f425e8809e7db3a18
32+
LibCURL.v8.11.0+0.x86_64-unknown-freebsd.tar.gz/sha512/22f232561558fd15e34e63b84fa1dceae03b2e1bf18650748864c78f1f1a0120c5ce05ccf9fe485dacd5aad4f68ba851d297d44a5d58096ff738f0fced123a0b
33+
LibCURL.v8.11.0+0.x86_64-w64-mingw32.tar.gz/md5/f0bf0c9e413323b9bf1fa1dce43ab0d6
34+
LibCURL.v8.11.0+0.x86_64-w64-mingw32.tar.gz/sha512/cf68d767ee35ff176cbecc86619083866c64ba7b04115ac2c607c71dc301030897a25fc01b0617a2c1ac460c13d4f337d224d3d37577630428f90af1402ab2f2
35+
curl-8.11.0.tar.bz2/md5/5ba1f5d144166ea9a5a828c57f7728b0
36+
curl-8.11.0.tar.bz2/sha512/22fcdd2c19b5d9652a86b32d4ad1359e796edb4245c65adae4b1bc2a6c45d0acc0b40a85eea44565c1c62f51a0464f52addb46a01152e9ad0311284a0e6ff04d

0 commit comments

Comments
 (0)