57 lines
1.3 KiB
Diff
57 lines
1.3 KiB
Diff
|
Index: go/src/crypto/x509/root_unix.go
|
||
|
|
===================================================================
|
||
|
|
--- go.orig/src/crypto/x509/root_unix.go
|
||
|
|
+++ go/src/crypto/x509/root_unix.go
|
||
|
|
@@ -6,7 +6,10 @@
|
||
|
|
|
||
|
|
package x509
|
||
|
|
|
||
|
|
-import "io/ioutil"
|
||
|
|
+import (
|
||
|
|
+ "io/ioutil"
|
||
|
|
+ "os"
|
||
|
|
+)
|
||
|
|
|
||
|
|
// Possible certificate files; stop after finding one.
|
||
|
|
var certFiles = []string{
|
||
|
|
@@ -23,7 +26,7 @@ var certFiles = []string{
|
||
|
|
// reading at least one file from a directory.
|
||
|
|
var certDirectories = []string{
|
||
|
|
"/system/etc/security/cacerts", // Android
|
||
|
|
-
|
||
|
|
+ "/etc/ssl/certs", // SLE11
|
||
|
|
}
|
||
|
|
|
||
|
|
func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
|
||
|
|
@@ -41,22 +44,25 @@ func initSystemRoots() {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ rootsAdded := false
|
||
|
|
for _, directory := range certDirectories {
|
||
|
|
fis, err := ioutil.ReadDir(directory)
|
||
|
|
if err != nil {
|
||
|
|
continue
|
||
|
|
}
|
||
|
|
- rootsAdded := false
|
||
|
|
for _, fi := range fis {
|
||
|
|
+ if fi.Mode()&os.ModeSymlink != 0 {
|
||
|
|
+ continue
|
||
|
|
+ }
|
||
|
|
data, err := ioutil.ReadFile(directory + "/" + fi.Name())
|
||
|
|
if err == nil && roots.AppendCertsFromPEM(data) {
|
||
|
|
rootsAdded = true
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- if rootsAdded {
|
||
|
|
- systemRoots = roots
|
||
|
|
- return
|
||
|
|
- }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if rootsAdded {
|
||
|
|
+ systemRoots = roots
|
||
|
|
}
|
||
|
|
|
||
|
|
// All of the files failed to load. systemRoots will be nil which will
|