Merge pull request #18997 from JuliaLang/sf/libgit_certfix

Expand ssl certificate file search parameters
JuliaLang · Oct 19, 2016 · 90a3740 · 90a3740 · nanosoldier · Oct 19, 2016
2 parents bed6663 + d5d8ac4
commit 90a3740
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/base/libgit2/libgit2.jl b/base/libgit2/libgit2.jl
@@ -540,6 +540,8 @@ end
 function __init__()
     # Look for OpenSSL env variable for CA bundle (linux only)
     # windows and macOS use the OS native security backends
+    old_ssl_cert_dir = Base.get(ENV, "SSL_CERT_DIR", nothing)
+    old_ssl_cert_file = Base.get(ENV, "SSL_CERT_FILE", nothing)
     @static if is_linux()
         cert_loc = if "SSL_CERT_DIR" in keys(ENV)
             ENV["SSL_CERT_DIR"]
@@ -557,6 +559,23 @@ function __init__()
     atexit() do
         ccall((:git_libgit2_shutdown, :libgit2), Cint, ())
     end
+
+    @static if is_linux()
+        if old_ssl_cert_dir != Base.get(ENV, "SSL_CERT_DIR", "")
+            if old_ssl_cert_dir === nothing
+                delete!(ENV, "SSL_CERT_DIR")
+            else
+                ENV["SSL_CERT_DIR"] = old_ssl_cert_dir
+            end
+        end
+        if old_ssl_cert_file != Base.get(ENV, "SSL_CERT_FILE", "")
+            if old_ssl_cert_file === nothing
+                delete!(ENV, "SSL_CERT_FILE")
+            else
+                ENV["SSL_CERT_FILE"] = old_ssl_cert_file
+            end
+        end
+    end
 end
 
 

diff --git a/deps/libgit2.mk b/deps/libgit2.mk
@@ -42,8 +42,18 @@ endif
 
 # We need to bundle ca certs on linux now that we're using libgit2 with ssl
 ifeq ($(OS),Linux)
-ifeq ($(shell [ -e $(shell openssl version -d | cut -d '"' -f 2)/cert.pem ] && echo exists),exists)
-CERTFILE=$(shell openssl version -d | cut -d '"' -f 2)/cert.pem
+OPENSSL_DIR=$(shell openssl version -d | cut -d '"' -f 2)
+# This certfile location observed on Ubuntu 14.04
+ifeq ($(shell [ -e $(OPENSSL_DIR)/cert.pem ] && echo exists),exists)
+CERTFILE=$(OPENSSL_DIR)/cert.pem
+endif
+# This certfile location observed on Debian 7
+ifeq ($(shell [ -e $(OPENSSL_DIR)/certs/ca.pem ] && echo exists),exists)
+CERTFILE=$(OPENSSL_DIR)/certs/ca.pem
+endif
+# This certfile location observed on openSUSE Leap 42.1
+ifeq ($(shell [ -e $(OPENSSL_DIR)/ca-bundle.pem ] && echo exists),exists)
+CERTFILE=$(OPENSSL_DIR)/ca-bundle.pem
 endif
 endif