Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try migration to OpenSSL #53891

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ USE_SYSTEM_MPFR:=0
USE_SYSTEM_LIBSUITESPARSE:=0
USE_SYSTEM_LIBUV:=0
USE_SYSTEM_UTF8PROC:=0
USE_SYSTEM_OPENSSL:=0
USE_SYSTEM_MBEDTLS:=0
USE_SYSTEM_LIBSSH2:=0
USE_SYSTEM_NGHTTP2:=0
Expand Down Expand Up @@ -1268,7 +1269,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
BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP MBEDTLS OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT
define SET_BB_DEFAULT
# First, check to see if BB is disabled on a global setting
ifeq ($$(USE_BINARYBUILDER),0)
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ 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
Expand Down
1 change: 1 addition & 0 deletions THIRDPARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Julia's `stdlib` uses the following external libraries, which have their own lic
- [MBEDTLS](https://github.com/ARMmbed/mbedtls/blob/development/LICENSE) [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]
- [OPENSSL](https://www.openssl.org/source/license.html) [Apache 2.0]
- [LAPACK](https://netlib.org/lapack/LICENSE.txt) [BSD-3]
- [PCRE](https://www.pcre.org/licence.txt) [BSD-3]
- [SUITESPARSE](https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/master/LICENSE.txt) [mix of LGPL2+ and GPL2+; see individual module licenses]
Expand Down
2 changes: 2 additions & 0 deletions base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ $(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))
Expand Down
2 changes: 1 addition & 1 deletion contrib/refresh_checksums.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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=mbedtls 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
Expand Down
17 changes: 13 additions & 4 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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 openssl patchelf libuv curl
# custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich
# CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls libtracyclient
#
Expand Down Expand Up @@ -120,8 +120,8 @@ DEP_LIBS += gmp
endif

ifeq ($(USE_SYSTEM_LIBGIT2), 0)
ifeq ($(USE_SYSTEM_MBEDTLS), 0)
DEP_LIBS += mbedtls
ifeq ($(USE_SYSTEM_OPENSSL), 0)
DEP_LIBS += openssl
endif

ifeq ($(USE_SYSTEM_LIBSSH2), 0)
Expand All @@ -139,10 +139,18 @@ endif
DEP_LIBS += libgit2
endif # USE_SYSTEM_LIBGIT2

ifeq ($(USE_SYSTEM_MBEDTLS), 0)
DEP_LIBS += mbedtls
endif

ifeq ($(USE_SYSTEM_MPFR), 0)
DEP_LIBS += mpfr
endif

ifeq ($(USE_SYSTEM_OPENSSL), 0)
DEP_LIBS += openssl
endif

ifeq ($(USE_GPL_LIBS), 1)
ifeq ($(USE_SYSTEM_LIBSUITESPARSE), 0)
DEP_LIBS += libsuitesparse
Expand Down Expand Up @@ -192,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 \
openlibm dsfmt blastrampoline openblas lapack gmp mpfr openssl patchelf utf8proc \
objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
sanitizers libsuitesparse lld libtracyclient ittapi JuliaSyntax
DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL)
Expand Down Expand Up @@ -245,6 +253,7 @@ include $(SRCDIR)/zlib.mk
include $(SRCDIR)/unwind.mk
include $(SRCDIR)/gmp.mk
include $(SRCDIR)/mpfr.mk
include $(SRCDIR)/openssl.mk
include $(SRCDIR)/patchelf.mk
include $(SRCDIR)/mbedtls.mk
include $(SRCDIR)/libssh2.mk
Expand Down
68 changes: 34 additions & 34 deletions deps/checksums/curl
Original file line number Diff line number Diff line change
@@ -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.7.1+1.aarch64-apple-darwin.tar.gz/md5/245ffacc48db91f72594316f94669573
LibCURL.v8.7.1+1.aarch64-apple-darwin.tar.gz/sha512/9b959d0c1835b55171a97e51d8fbf6573fdb247fb6616b519620cdbe87fcc40b41d11b76fcda02a6baf872f6eb62a868ec6634ae7729fc0210fe59ed077f1d01
LibCURL.v8.7.1+1.aarch64-linux-gnu.tar.gz/md5/c511a95a6bac9c2d8cfe7d801a797fe4
LibCURL.v8.7.1+1.aarch64-linux-gnu.tar.gz/sha512/07695231237f09ad29ec3f8f72b9a92ddc10daac24638ee519b0c81b5ee99b8128ee47a61959dbb84e164bdf5782657153148dff3063a1cdb50e431c3045be58
LibCURL.v8.7.1+1.aarch64-linux-musl.tar.gz/md5/0971bc0485aacb2ea157d89da0ac249f
LibCURL.v8.7.1+1.aarch64-linux-musl.tar.gz/sha512/fcaab2b68ce312224c9d7dabb998605b318b9689b4fb5193a8acbc9f353ecae577f3cb0858f4c90ed9e7c869e0aa06e6bbd33097f0ffafd328a5919d93936175
LibCURL.v8.7.1+1.armv6l-linux-gnueabihf.tar.gz/md5/b1c61184f43b3e9eb36fd688ed86b8f4
LibCURL.v8.7.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/2b8cee90c12860ede61859717534c2bdf450027dbcb629db055fe1798bb7d96c232a6c85ff12828740a954b5a2a93dbb580fbfecb7dacf23c191702828c979f1
LibCURL.v8.7.1+1.armv6l-linux-musleabihf.tar.gz/md5/3db28f06f6ec26a4f4a274742b9d966f
LibCURL.v8.7.1+1.armv6l-linux-musleabihf.tar.gz/sha512/3315ed4a303d54beae2515787c0cce0232e0c48eb56255e3e14cbce3ed01b52ea2b1b302736d134a32c39664605ace1aa8426783bbb9693d88e10e6c0f6dd7e8
LibCURL.v8.7.1+1.armv7l-linux-gnueabihf.tar.gz/md5/bff67eb717843f830eb4fb12a724d221
LibCURL.v8.7.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/d26cb6df44ae42ed487a4eb4918e5bc03c00d25cb4eba1d69c0aa57bb081e8410fb6dec25052663d089c1cef46497c7097762de81a79754406400222598ebe0f
LibCURL.v8.7.1+1.armv7l-linux-musleabihf.tar.gz/md5/5c9d04c9a4783151b0725a261f5c5ce4
LibCURL.v8.7.1+1.armv7l-linux-musleabihf.tar.gz/sha512/6b7ce5e84f0e7432dd8caeab4b49c6c48b3203f59b14be2317e3fa1eb81d25267944865ad16d5348f1913ccd530750808940043705096027e03aaa25391bdb58
LibCURL.v8.7.1+1.i686-linux-gnu.tar.gz/md5/4d17ae2004a438fa4d1e26ca49677459
LibCURL.v8.7.1+1.i686-linux-gnu.tar.gz/sha512/d44bd52640a2e513f7b5123567529ea41e14c78640b544c260aad9c3c256016cddc9855d3c5f3d0bd228e213e31f2f2aa6f52ce3e686ec5ec37f7ba68527d399
LibCURL.v8.7.1+1.i686-linux-musl.tar.gz/md5/d7577614f22ec54e20b488595ef1c8c8
LibCURL.v8.7.1+1.i686-linux-musl.tar.gz/sha512/5858c4ab86d49d060d74fa0991096509e58c97ba35e89440d55cd82ff07b25287e6dbe8069fb4b9f6e83b8296a3a47a8112ab38135740a2000c88d044c6b5300
LibCURL.v8.7.1+1.i686-w64-mingw32.tar.gz/md5/8abb0cb4d6d4045a942f73e51667f525
LibCURL.v8.7.1+1.i686-w64-mingw32.tar.gz/sha512/84ab9a01fe3ef9929de74962232201f2481ef587340b6d242ece5d949d27b5bf66223bd3ceed49b1fabd9be3f4db6d16dad39ae6498f3931acc71aa6a6a623ff
LibCURL.v8.7.1+1.powerpc64le-linux-gnu.tar.gz/md5/6a42c4fe9cdea7954597ed9ec03b2b6a
LibCURL.v8.7.1+1.powerpc64le-linux-gnu.tar.gz/sha512/dfeb44c1f3a8c2f9cff6b0b213e93904d070cfb2f5432788ee1545fdd6ea792528a707eb08057c261587b9f82d2632011d47be303ad806d64c027a71b60d4b94
LibCURL.v8.7.1+1.x86_64-apple-darwin.tar.gz/md5/c00b0df6dd6fe758acf2f6b469751908
LibCURL.v8.7.1+1.x86_64-apple-darwin.tar.gz/sha512/d2bc627e563e2b53791f02c39dc014a57c919f7caca73d639a42d2fe7e90dfff69687e085bfd374ff853eaa5499608dd3ab305367fb6de531db7cd52afcaec3a
LibCURL.v8.7.1+1.x86_64-linux-gnu.tar.gz/md5/cb9e684239cbae5cfa3718220baf8b81
LibCURL.v8.7.1+1.x86_64-linux-gnu.tar.gz/sha512/1b15b390e9e2c3ae166e74eed0df3d41f3d555d9f7e52a857798445c05a0ab7d4324656dfcf668d903066d43b3939f8ea18313d974296fd27a6934337f9a56bd
LibCURL.v8.7.1+1.x86_64-linux-musl.tar.gz/md5/06c9e58a59cebb4e3c2d0b42f262ad7c
LibCURL.v8.7.1+1.x86_64-linux-musl.tar.gz/sha512/3f097758bcf22a337d2f93efd17cedf53905545b37b7a5161c49192037ac5cb602ad6b24f98eeca85509a91d29c7dbf552089c132e0bda24c0bb031419db6fd0
LibCURL.v8.7.1+1.x86_64-unknown-freebsd.tar.gz/md5/da9920a242c3836661026535116c8b6a
LibCURL.v8.7.1+1.x86_64-unknown-freebsd.tar.gz/sha512/6873f196ab64d3fb5606cee4d242681632a38597dd216eb18991cf64271da98fdd2431558318749a6a53579c70e63723201da622cdcfb3862d903ab47990870e
LibCURL.v8.7.1+1.x86_64-w64-mingw32.tar.gz/md5/4c0a32b2248fb786995a883aa447aa3a
LibCURL.v8.7.1+1.x86_64-w64-mingw32.tar.gz/sha512/4f03c3c0d593391e7a198bc44275302f6b1e15faa68cf7c38011ccd7b3fd3945f3736fe68624398d2aab816ea36c8971c6140040fba7fa706ff24af2af81b654
curl-8.7.1.tar.bz2/md5/a7335b3daf80b9a0ee884fcb62324f88
curl-8.7.1.tar.bz2/sha512/f6ba02470c1772ee5479dcf27d32df7cdcca8ebd2feb94fa12fa7ecccfcfb1f5d20428dbb1d93e81108f711ee721f4d4583678355d71570f6c93ffd03535753b
Loading