Skip to content

Commit 7228dc2

Browse files
authored
Add zOS build support (#1088)
1 parent 73abd52 commit 7228dc2

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## HEAD
44

5+
### Add support for IBM Z operating system z/OS
6+
* Add build tags for zos
7+
58
### Chrome CT Policy Update
69
* #906: Update chromepolicy.go to follow the updated Chrome CT policy.
710

x509/root_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
6-
// +build dragonfly freebsd linux netbsd openbsd solaris
5+
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
6+
// +build dragonfly freebsd linux netbsd openbsd solaris zos
77

88
package x509
99

x509/root_unix_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
6-
// +build dragonfly freebsd linux netbsd openbsd solaris
5+
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
6+
// +build dragonfly freebsd linux netbsd openbsd solaris zos
77

88
package x509
99

x509/root_zos.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2015 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
//go:build zos
6+
// +build zos
7+
8+
package x509
9+
10+
// Possible certificate files; stop after finding one.
11+
var certFiles = []string{
12+
"/etc/cacert.pem", // IBM zOS default
13+
}

0 commit comments

Comments
 (0)