nixpkgs/pkgs/development/compilers/go/cacert-1.7.patch

79 lines
2.2 KiB
Diff
Raw Normal View History

2016-09-13 00:23:56 +02:00
diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
index a4b33c7..9700b75 100644
--- a/src/crypto/x509/root_cgo_darwin.go
+++ b/src/crypto/x509/root_cgo_darwin.go
@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) {
import "C"
import (
"errors"
+ "io/ioutil"
+ "os"
"unsafe"
)
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
var data C.CFDataRef = nil
err := C.FetchPEMRoots(&data)
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
2016-12-15 15:59:25 +01:00
index 59b303d..d4a34ac 100644
2016-09-13 00:23:56 +02:00
--- a/src/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
2016-12-15 15:59:25 +01:00
@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
// The linker will not include these unused functions in binaries built with cgo enabled.
2016-09-13 00:23:56 +02:00
func execSecurityRoots() (*CertPool, error) {
2016-12-15 15:59:25 +01:00
+ var (
+ mu sync.Mutex
+ roots = NewCertPool()
+ )
+
2016-09-13 00:23:56 +02:00
+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
2016-12-15 15:59:25 +01:00
+
2016-09-13 00:23:56 +02:00
cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
data, err := cmd.Output()
if err != nil {
return nil, err
}
2016-12-15 15:59:25 +01:00
- var (
- mu sync.Mutex
- roots = NewCertPool()
- )
add := func(cert *Certificate) {
mu.Lock()
defer mu.Unlock()
2016-09-13 00:23:56 +02:00
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index 7bcb3d6..3986e1a 100644
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
+
var firstErr error
for _, file := range certFiles {
data, err := ioutil.ReadFile(file)