Skip to content

Commit

Permalink
x509roots/fallback: add //go:build go1.20 to bundle.go
Browse files Browse the repository at this point in the history
Package fallback has no API; its only purpose is to automatically call
x509.SetFallbackRoots with a set of fallback roots. That API was added
in Go 1.20, hence the go1.20 build constraint in fallback.go.

Add that constraint to bundle.go too, so that it fails to build rather
than quietly being a no-op in Go 1.19.

Also simplify Write(fmt.Sprintf()) into fmt.Fprintf while here.

Add a temporary workaround for go.dev/issue/52287.
It has no effect on the public API in this module.

For golang/go#57792.
For golang/go#52287.

Change-Id: I1fe13f7d54b07b0b031e8bae685cffd7a8160165
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/505578
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
  • Loading branch information
dmitshur authored and gopherbot committed Jun 23, 2023
1 parent 64c3993 commit a9e447d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
2 changes: 2 additions & 0 deletions x509roots/fallback/bundle.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion x509roots/fallback/fallback.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build go1.20
// +build go1.20

// Package fallback embeds a set of fallback X.509 trusted roots in the
// application by automatically invoking [x509.SetFallbackRoots]. This allows
Expand Down
8 changes: 8 additions & 0 deletions x509roots/fallback/internal/goissue52287/goissue52287.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2023 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 goissue52287 is an empty internal package.
// It exists only to work around go.dev/issue/52287 and
// can be removed after Go 1.19 stops being supported.
package goissue52287
14 changes: 8 additions & 6 deletions x509roots/gen_fallback_bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import (

const tmpl = `// Code generated by gen_fallback_bundle.go; DO NOT EDIT.
//go:build go1.20
package fallback
import "crypto/x509"
Expand All @@ -41,7 +43,7 @@ func mustParse(b []byte) []*x509.Certificate {
break
}
if block.Type != "CERTIFICATE" {
panic("unexpected PEM block type: "+block.Type)
panic("unexpected PEM block type: " + block.Type)
}
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
Expand Down Expand Up @@ -97,9 +99,9 @@ func main() {
return string(certs[i].X509.RawSubjectPublicKeyInfo) < string(certs[j].X509.RawSubjectPublicKeyInfo)
})

b := bytes.NewBuffer(nil)
b.Write([]byte(tmpl))
b.Write([]byte("const pemRoots = `\n"))
b := new(bytes.Buffer)
b.WriteString(tmpl)
fmt.Fprintln(b, "const pemRoots = `")
for _, c := range certs {
if len(c.Constraints) > 0 {
// Until the constrained roots API lands, skip anything that has any
Expand All @@ -108,10 +110,10 @@ func main() {
// new version.
continue
}
b.Write([]byte(fmt.Sprintf("# %s\n# %x\n", c.X509.Subject.String(), sha256.Sum256(c.X509.Raw))))
fmt.Fprintf(b, "# %s\n# %x\n", c.X509.Subject.String(), sha256.Sum256(c.X509.Raw))
pem.Encode(b, &pem.Block{Type: "CERTIFICATE", Bytes: c.X509.Raw})
}
b.Write([]byte("`\n"))
fmt.Fprintln(b, "`")

formatted, err := format.Source(b.Bytes())
if err != nil {
Expand Down

0 comments on commit a9e447d

Please sign in to comment.