aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-05-30 00:16:02 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-05-30 00:16:02 +0000
commit4ec2cf3bd042a43eed1b46f80449893d149c1a7c (patch)
treee2cdeb9e4e972e844338aa8a2ac37b654e177b76
parent5af3ff21594b92c698fdc43269a0020f95a15c23 (diff)
downloadgcc-4ec2cf3bd042a43eed1b46f80449893d149c1a7c.zip
gcc-4ec2cf3bd042a43eed1b46f80449893d149c1a7c.tar.gz
gcc-4ec2cf3bd042a43eed1b46f80449893d149c1a7c.tar.bz2
crypto/x509: specify path to AIX certificate file
Reviewed-on: https://go-review.googlesource.com/113179 From-SVN: r260908
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/crypto/x509/root_aix.go4
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 319d2f5..76b5e57 100644
--- 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 de5702d..4e7e9dd 100644
--- 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",
+}