From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 10 Nov 2014 04:57:44 +0000 (-0800)
Subject: crypto/x509: add Solaris certificate file location
X-Git-Tag: go1.4rc1~17
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cea69d687732be20e0ca245b162b59eba26fff54;p=gostls13.git

crypto/x509: add Solaris certificate file location

Fixes #9078.

LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://golang.org/cl/172920043
---

diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index c65f626ac8..f77d6c0c57 100644
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -16,6 +16,7 @@ var certFiles = []string{
 	"/etc/ssl/cert.pem",                      // OpenBSD
 	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
 	"/etc/pki/tls/cacert.pem",                // OpenELEC
+	"/etc/certs/ca-certificates.crt",         // Solaris 11.2+
 }
 
 // Possible directories with certificate files; stop after successfully