From 8c2cb4b43115072a1fdaaa5c4e5707c8305c9bb5 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Wed, 16 Mar 2022 15:47:15 -0700 Subject: [PATCH] go.mod: update to latest certstore It includes a fix to allow us to use Go 1.18. We can now remove our Tailscale-only build tags. Signed-off-by: Josh Bleecher Snyder --- cmd/tailscaled/depaware.txt | 2 ++ control/controlclient/sign_supported.go | 4 ++-- control/controlclient/sign_supported_test.go | 4 ++-- control/controlclient/sign_unsupported.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 645453a86..9d7b4566a 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -88,6 +88,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L github.com/mdlayher/sdnotify from tailscale.com/util/systemd L 💣 github.com/mdlayher/socket from github.com/mdlayher/netlink 💣 github.com/mitchellh/go-ps from tailscale.com/safesocket + W github.com/pkg/errors from github.com/tailscale/certstore + W 💣 github.com/tailscale/certstore from tailscale.com/control/controlclient github.com/tailscale/goupnp from github.com/tailscale/goupnp/dcps/internetgateway2+ github.com/tailscale/goupnp/dcps/internetgateway2 from tailscale.com/net/portmapper github.com/tailscale/goupnp/httpu from github.com/tailscale/goupnp+ diff --git a/control/controlclient/sign_supported.go b/control/controlclient/sign_supported.go index 2d628fd23..3c51126a2 100644 --- a/control/controlclient/sign_supported.go +++ b/control/controlclient/sign_supported.go @@ -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 windows && cgo && tailscale_go -// +build windows,cgo,tailscale_go +//go:build windows && cgo +// +build windows,cgo // darwin,cgo is also supported by certstore but machineCertificateSubject will // need to be loaded by a different mechanism, so this is not currently enabled diff --git a/control/controlclient/sign_supported_test.go b/control/controlclient/sign_supported_test.go index 2055cb3f9..c196cbb44 100644 --- a/control/controlclient/sign_supported_test.go +++ b/control/controlclient/sign_supported_test.go @@ -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 windows && cgo && tailscale_go -// +build windows,cgo,tailscale_go +//go:build windows && cgo +// +build windows,cgo package controlclient diff --git a/control/controlclient/sign_unsupported.go b/control/controlclient/sign_unsupported.go index 6f7c4b4b2..936806557 100644 --- a/control/controlclient/sign_unsupported.go +++ b/control/controlclient/sign_unsupported.go @@ -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 !windows || !cgo || !tailscale_go -// +build !windows !cgo !tailscale_go +//go:build !windows || !cgo +// +build !windows !cgo package controlclient diff --git a/go.mod b/go.mod index 7ba72fe07..202bd23d8 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/peterbourgon/ff/v3 v3.1.2 github.com/pkg/sftp v1.13.4 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - github.com/tailscale/certstore v0.0.0-20210528134328-066c94b793d3 + github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502 github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41 github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 diff --git a/go.sum b/go.sum index 90a27c820..cd31990cd 100644 --- a/go.sum +++ b/go.sum @@ -1198,6 +1198,8 @@ github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tailscale/certstore v0.0.0-20210528134328-066c94b793d3 h1:fEubocuQkrlcuYeXelhYq/YcKvVVe1Ah7saQEtj98Mo= github.com/tailscale/certstore v0.0.0-20210528134328-066c94b793d3/go.mod h1:2P+hpOwd53e7JMX/L4f3VXkv1G+33ES6IWZSrkIeWNs= +github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d h1:K3j02b5j2Iw1xoggN9B2DIEkhWGheqFOeDkdJdBrJI8= +github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d/go.mod h1:2P+hpOwd53e7JMX/L4f3VXkv1G+33ES6IWZSrkIeWNs= github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502 h1:34icjjmqJ2HPjrSuJYEkdZ+0ItmGQAQ75cRHIiftIyE= github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8= github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41 h1:/V2rCMMWcsjYaYO2MeovLw+ClP63OtXgCF2Y1eb8+Ns=