Merge pull request #38490 from JuliaLang/sk/libgit2-ca-roots

LibGit2: use NetworkOptions to find CA root certificates

Author: StefanKarpinski

deps/checksums/NetworkOptions-b7c9bb8627b2e6d62b32fe14faba7bd9d46b4b16.tar.gz/md5

@@ -0,0 +1 @@
+8f5ccae9127103afb81b19f08f6be71b

deps/checksums/NetworkOptions-b7c9bb8627b2e6d62b32fe14faba7bd9d46b4b16.tar.gz/sha512

@@ -0,0 +1 @@
+f7f215e45bd306fb716aa868d674817ffc82ec5be465642e61ac451f3973f5b87a694ba6d71bf4a0d13c325f1a8f5dec83c9fe079df5e6a8cc9fe94a827e2e79

deps/checksums/NetworkOptions-e61363297db8cd87cd8e4fe087e299dd0f0b3551.tar.gz/md5

@@ -2,13 +2,14 @@ name = "LibGit2"
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 
 [deps]
+NetworkOptions = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
 test = ["Test", "Random", "Serialization", "Sockets"]

deps/checksums/NetworkOptions-e61363297db8cd87cd8e4fe087e299dd0f0b3551.tar.gz/sha512

@@ -8,6 +8,7 @@ module LibGit2
 import Base: ==
 using Base: something, notnothing
 using Printf: @printf
+import NetworkOptions
 
 export with, GitRepo, GitConfig
 
@@ -983,19 +984,8 @@ end
         end
     end
 
-    # Look for OpenSSL env variable for CA bundle (linux only)
-    # windows and macOS use the OS native security backends
-    @static if Sys.islinux()
-        cert_loc = if "SSL_CERT_DIR" in keys(ENV)
-            ENV["SSL_CERT_DIR"]
-        elseif "SSL_CERT_FILE" in keys(ENV)
-            ENV["SSL_CERT_FILE"]
-        else
-            # If we have a bundled ca cert file, point libgit2 at that so SSL connections work.
-            abspath(ccall(:jl_get_julia_bindir, Any, ())::String, Base.DATAROOTDIR, "julia", "cert.pem")
-        end
-        set_ssl_cert_locations(cert_loc)
-    end
+    cert_loc = NetworkOptions.ca_roots()
+    cert_loc !== nothing && set_ssl_cert_locations(cert_loc)
 end
 
 function set_ssl_cert_locations(cert_loc)

stdlib/LibGit2/Project.toml

@@ -1,2 +1,2 @@
 NETWORKOPTIONS_BRANCH = master
-NETWORKOPTIONS_SHA1 = e61363297db8cd87cd8e4fe087e299dd0f0b3551
+NETWORKOPTIONS_SHA1 = b7c9bb8627b2e6d62b32fe14faba7bd9d46b4b16