crypto/x509: specify path to AIX certificate file

    Reviewed-on: https://go-review.googlesource.com/113179

From-SVN: r260908

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 319d2f5a49c86aa5b01f88a4a831821987d9e823..76b5e57589a0696c1cc25523ef25baa637e43a31 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-290c93f08f4456f0552b0764e28573164e47f259
+572b19513766e9e5cc4aa8d984a89c93880726ba
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/crypto/x509/root_aix.go b/libgo/go/crypto/x509/root_aix.go
index de5702de35d874aa2253e7674b6f826e171039f3..4e7e9dde95384c9ccf6ae177a02f16dcd682b4f5 100644 (file)
--- a/libgo/go/crypto/x509/root_aix.go
+++ b/libgo/go/crypto/x509/root_aix.go
@@ -5,4 +5,6 @@
 package x509
 
 // Possible certificate files; stop after finding one.
-var certFiles []string
+var certFiles = []string{
+       "/var/ssl/certs/ca-bundle.crt",
+}