Update dependencies

$ go get -u -t ./... github.com/russross/blackfriday@v1.5.2 $ go install github.com/grpc-ecosystem/grpc-gateway/... $ go generate ./... $ go mod tidy Had to pin blackfriday to v1 because otherwise it updates to v2, which isn't compatible with prototool.
google · Nov 19, 2019 · fd3985d · fd3985d
1 parent 5183cf9
commit fd3985d
Show file tree

Hide file tree

Showing 8 changed files with 1,574 additions and 121 deletions.
diff --git a/cmd/createtree/pkcs11.go b/cmd/createtree/pkcs11.go
@@ -27,7 +27,7 @@ import (
 	"github.com/google/trillian/cmd/createtree/keys"
 	"github.com/google/trillian/crypto/keyspb"
 
-	pkcs11key "github.com/letsencrypt/pkcs11key/v3"
+	pkcs11key "github.com/letsencrypt/pkcs11key/v4"
 )
 
 var pkcs11ConfigPath = flag.String("pkcs11_config_path", "", "Path to the PKCS #11 key configuration file")

diff --git a/crypto/keys/pkcs11/pkcs11.go b/crypto/keys/pkcs11/pkcs11.go
@@ -24,7 +24,7 @@ import (
 	"github.com/google/trillian/crypto/keys/pem"
 	"github.com/google/trillian/crypto/keyspb"
 
-	pkcs11key "github.com/letsencrypt/pkcs11key/v3"
+	pkcs11key "github.com/letsencrypt/pkcs11key/v4"
 )
 
 // FromConfig returns a crypto.Signer that uses a PKCS#11 interface.

diff --git a/go.mod b/go.mod
@@ -4,73 +4,85 @@ go 1.13
 
 require (
 	bitbucket.org/creachadair/shell v0.0.6
-	cloud.google.com/go v0.41.0
-	contrib.go.opencensus.io/exporter/stackdriver v0.12.1
+	cloud.google.com/go v0.48.0 // indirect
+	cloud.google.com/go/pubsub v1.1.0
+	cloud.google.com/go/spanner v1.1.0
+	contrib.go.opencensus.io/exporter/stackdriver v0.12.8
 	github.com/Masterminds/goutils v1.1.0 // indirect
-	github.com/Masterminds/semver v1.4.2 // indirect
-	github.com/Masterminds/sprig v2.18.0+incompatible // indirect
-	github.com/aws/aws-sdk-go v1.19.49 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
+	github.com/aws/aws-sdk-go v1.25.37 // indirect
+	github.com/bombsimon/wsl v1.2.8 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible
+	github.com/coreos/etcd v3.3.17+incompatible
 	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
-	github.com/emicklei/proto v1.6.13 // indirect
-	github.com/fatih/color v1.7.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/emicklei/proto v1.8.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/gobuffalo/flect v0.1.5 // indirect
+	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
+	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
 	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.2-0.20190517061210-b285ee9cfc6c
+	github.com/golang/protobuf v1.3.2
 	github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect
-	github.com/golangci/golangci-lint v1.17.2-0.20190910081718-bad04bb7378f
+	github.com/golangci/golangci-lint v1.21.0
 	github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect
 	github.com/google/btree v1.0.0
 	github.com/google/certificate-transparency-go v1.1.0
-	github.com/google/go-cmp v0.3.0
+	github.com/google/go-cmp v0.3.1
+	github.com/google/monologue v0.0.0-20191105172128-0324c8b45f6f // indirect
 	github.com/google/uuid v1.1.1 // indirect
-	github.com/gostaticanalysis/analysisutil v0.0.0-20190329151158-56bca42c7635 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
-	github.com/grpc-ecosystem/grpc-gateway v1.9.4
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
+	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/gostaticanalysis/analysisutil v0.0.3 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
+	github.com/grpc-ecosystem/grpc-gateway v1.12.1
 	github.com/huandu/xstrings v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
+	github.com/imdario/mergo v0.3.8 // indirect
+	github.com/json-iterator/go v1.1.8 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kylelemons/godebug v1.1.0
-	github.com/letsencrypt/pkcs11key/v3 v3.0.0
-	github.com/lib/pq v1.1.1
-	github.com/lyft/protoc-gen-validate v0.0.14 // indirect
-	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mwitkow/go-proto-validators v0.0.0-20190212092829-1f388280e944 // indirect
-	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/prometheus/client_golang v1.0.0
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
-	github.com/prometheus/common v0.6.0 // indirect
-	github.com/prometheus/procfs v0.0.3 // indirect
+	github.com/letsencrypt/pkcs11key/v4 v4.0.0
+	github.com/lib/pq v1.2.0
+	github.com/lyft/protoc-gen-validate v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.10 // indirect
+	github.com/mattn/go-runewidth v0.0.6 // indirect
+	github.com/miekg/pkcs11 v1.0.3 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.1 // indirect
+	github.com/mwitkow/go-proto-validators v0.2.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.2 // indirect
+	github.com/pelletier/go-toml v1.6.0 // indirect
+	github.com/prometheus/client_golang v1.2.1
+	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
+	github.com/prometheus/procfs v0.0.7 // indirect
 	github.com/pseudomuto/protoc-gen-doc v1.3.0
 	github.com/pseudomuto/protokit v0.2.0 // indirect
+	github.com/securego/gosec v0.0.0-20191119104125-df484bfa9e9f // indirect
 	github.com/shurcooL/go v0.0.0-20190330031554-6713ea532688 // indirect
-	github.com/sirupsen/logrus v1.4.2 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cobra v0.0.5
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.4.0
-	github.com/uber/prototool v1.8.2-0.20190910022025-7df3b957ffe3
+	github.com/spf13/viper v1.5.0 // indirect
+	github.com/uber/prototool v1.9.0
+	github.com/urfave/cli v1.22.1 // indirect
+	github.com/uudashr/gocognit v1.0.0 // indirect
 	go.etcd.io/bbolt v1.3.3 // indirect
-	go.etcd.io/etcd v3.3.13+incompatible
-	go.opencensus.io v0.22.0
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
-	golang.org/x/tools v0.0.0-20190909030654-5b82db07426d
-	google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532
-	google.golang.org/grpc v1.22.0
-	mvdan.cc/unparam v0.0.0-20190310220240-1b9ccfa71afe // indirect
+	go.etcd.io/etcd v3.3.17+incompatible
+	go.opencensus.io v0.22.2
+	go.uber.org/multierr v1.4.0 // indirect
+	go.uber.org/zap v1.13.0 // indirect
+	golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f
+	golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+	golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
+	golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98
+	google.golang.org/appengine v1.6.5 // indirect
+	google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11
+	google.golang.org/grpc v1.25.1
+	gopkg.in/yaml.v2 v2.2.6 // indirect
+	mvdan.cc/unparam v0.0.0-20191111180625-960b1ec0f2c2 // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
 	sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
 )