Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add build tags for zOS #1088

Merged
merged 1 commit into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## HEAD

### Add support for IBM Z operating system z/OS
* Add build tags for zos

### Chrome CT Policy Update
* #906: Update chromepolicy.go to follow the updated Chrome CT policy.

Expand Down
4 changes: 2 additions & 2 deletions x509/root_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build dragonfly freebsd linux netbsd openbsd solaris
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build dragonfly freebsd linux netbsd openbsd solaris zos

package x509

Expand Down
4 changes: 2 additions & 2 deletions x509/root_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build dragonfly freebsd linux netbsd openbsd solaris
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build dragonfly freebsd linux netbsd openbsd solaris zos

package x509

Expand Down
13 changes: 13 additions & 0 deletions x509/root_zos.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright 2015 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.

//go:build zos
// +build zos

package x509

// Possible certificate files; stop after finding one.
var certFiles = []string{
"/etc/cacert.pem", // IBM zOS default
}