crypto: add AIX operating system

This commit adds AIX operating system to crypto package for ppc64
architecture.

Updates: #25893

Change-Id: I20047ff2fef0051b8b235ec15b064c4a95c2b9c3
Reviewed-on: https://go-review.googlesource.com/c/138722
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/crypto/rand/eagain.go b/src/crypto/rand/eagain.go
index 7ed2f47ea6621a2cb01b2b8fb9af13475a940709..045d037d209f314302a006ba321221db6ab89ec4 100644 (file)
--- a/src/crypto/rand/eagain.go
+++ b/src/crypto/rand/eagain.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
 
 package rand
 

diff --git a/src/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
index d49f693746dcc8af240ad1439cccd3e8ac50d3f7..f3091f51c5fd8ffcd38480e2949d5304d49e40fe 100644 (file)
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris
 
 // Unix cryptographically secure pseudorandom number
 // generator.

diff --git a/src/crypto/x509/root_aix.go b/src/crypto/x509/root_aix.go
new file mode 100644 (file)
index 0000000..6d42773
--- /dev/null
+++ b/src/crypto/x509/root_aix.go
@@ -0,0 +1,10 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package x509
+
+// Possible certificate files; stop after finding one.
+var certFiles = []string{
+       "/var/ssl/certs/ca-bundle.crt",
+}

diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index 8e7036234d7d3d65a134418681ddb01aaad71f2e..48de50b4ea65ff52a5db8e0a41637d41ebad27ec 100644 (file)
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris
+// +build aix dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris
 
 package x509
 
@@ -19,6 +19,7 @@ var certDirectories = []string{
        "/usr/local/share/certs",       // FreeBSD
        "/etc/pki/tls/certs",           // Fedora/RHEL
        "/etc/openssl/certs",           // NetBSD
+       "/var/ssl/certs",               // AIX
 }
 
 const (