diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch new file mode 100644 index 00000000000..1884c681ca3 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch @@ -0,0 +1,76 @@ +diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go +index ce88de025e..258ecc45d1 100644 +--- a/src/crypto/x509/root_darwin_amd64.go ++++ b/src/crypto/x509/root_darwin_amd64.go +@@ -10,6 +10,7 @@ import ( + "bytes" + macOS "crypto/x509/internal/macos" + "fmt" ++ "io/ioutil" + "os" + "strings" + ) +@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + var trustedRoots []*Certificate + untrustedRoots := make(map[string]bool) + +diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go +index 5ecc4911b3..14b4205c00 100644 +--- a/src/crypto/x509/root_darwin_ios.go ++++ b/src/crypto/x509/root_darwin_ios.go +@@ -6,6 +6,11 @@ + + package x509 + ++import ( ++ "io/ioutil" ++ "os" ++) ++ + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } +@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + p := NewCertPool() + p.AppendCertsFromPEM([]byte(systemRootsPEM)) + return p, nil +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index b48e618a65..195c1ff25a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { |