Skip to content

Commit f10ef0f

Browse files
authored
Merge pull request #933 from smallstep/herman/upgrade-crypto-v0.30.0
Depend on `github.com/smallstep/go-attestation` fork
2 parents b31f0b3 + b4f5fe7 commit f10ef0f

File tree

3 files changed

+92
-47
lines changed

3 files changed

+92
-47
lines changed

go.mod

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/Microsoft/go-winio v0.6.1
77
github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944
88
github.com/fxamacker/cbor/v2 v2.4.0
9-
github.com/google/go-attestation v0.4.4-0.20220404204839-8820d49b18d9
109
github.com/google/go-cmp v0.5.9
1110
github.com/google/go-tpm v0.3.3
1211
github.com/google/uuid v1.3.0
@@ -18,14 +17,15 @@ require (
1817
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262
1918
github.com/smallstep/certificates v0.24.1
2019
github.com/smallstep/certinfo v1.11.0
20+
github.com/smallstep/go-attestation v0.4.4-0.20230509120429-e17291421738
2121
github.com/smallstep/truststore v0.12.1
2222
github.com/smallstep/zcrypto v0.0.0-20221001003018-1ab2364d2a91
2323
github.com/smallstep/zlint v0.0.0-20220930192201-67fb4aa21910
2424
github.com/stretchr/testify v1.8.2
2525
github.com/urfave/cli v1.22.13
2626
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
2727
go.step.sm/cli-utils v0.7.6
28-
go.step.sm/crypto v0.29.3
28+
go.step.sm/crypto v0.30.0
2929
go.step.sm/linkedca v0.19.1
3030
golang.org/x/crypto v0.8.0
3131
golang.org/x/sys v0.8.0
@@ -44,12 +44,12 @@ require (
4444
cloud.google.com/go/security v1.13.0 // indirect
4545
filippo.io/edwards25519 v1.0.0 // indirect
4646
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
47-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.5.0 // indirect
48-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.2 // indirect
47+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
48+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
4949
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
50-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 // indirect
51-
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect
52-
github.com/AzureAD/microsoft-authentication-library-for-go v0.9.0 // indirect
50+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
51+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
52+
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
5353
github.com/Masterminds/goutils v1.1.1 // indirect
5454
github.com/Masterminds/semver/v3 v3.2.0 // indirect
5555
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
@@ -74,15 +74,16 @@ require (
7474
github.com/go-logr/logr v1.2.3 // indirect
7575
github.com/go-sql-driver/mysql v1.7.0 // indirect
7676
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
77-
github.com/golang/glog v1.0.0 // indirect
77+
github.com/golang/glog v1.1.0 // indirect
7878
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7979
github.com/golang/protobuf v1.5.3 // indirect
8080
github.com/golang/snappy v0.0.4 // indirect
8181
github.com/google/btree v1.1.2 // indirect
8282
github.com/google/certificate-transparency-go v1.1.4 // indirect
83+
github.com/google/go-attestation v0.4.4-0.20220404204839-8820d49b18d9 // indirect
8384
github.com/google/go-tpm-tools v0.3.11 // indirect
8485
github.com/google/go-tspi v0.3.0 // indirect
85-
github.com/google/s2a-go v0.1.0 // indirect
86+
github.com/google/s2a-go v0.1.3 // indirect
8687
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
8788
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
8889
github.com/huandu/xstrings v1.4.0 // indirect
@@ -127,16 +128,11 @@ require (
127128
golang.org/x/oauth2 v0.7.0 // indirect
128129
golang.org/x/text v0.9.0 // indirect
129130
golang.org/x/tools v0.6.0 // indirect
130-
google.golang.org/api v0.117.0 // indirect
131+
google.golang.org/api v0.121.0 // indirect
131132
google.golang.org/appengine v1.6.7 // indirect
132-
google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
133-
google.golang.org/grpc v1.54.0 // indirect
133+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
134+
google.golang.org/grpc v1.55.0 // indirect
134135
gopkg.in/yaml.v3 v3.0.1 // indirect
135136
howett.net/plist v1.0.0 // indirect
136137
k8s.io/klog/v2 v2.90.0 // indirect
137138
)
138-
139-
// use github.com/smallstep/go-attestation fork with patches for Windows AK
140-
// and QualifyingData support applied; on the CA side, this is primarily used
141-
// when simulating a TPM for testing
142-
replace github.com/google/go-attestation v0.4.4-0.20220404204839-8820d49b18d9 => github.com/smallstep/go-attestation v0.4.4-0.20230224121042-1bcb20a75add

0 commit comments

Comments
 (0)