diff --git a/api/go.mod b/api/go.mod index 92f9bc79801..73b80f332db 100644 --- a/api/go.mod +++ b/api/go.mod @@ -5,7 +5,7 @@ go 1.23.10 require ( github.com/charlievieth/strcase v0.0.5 github.com/coreos/go-semver v0.3.1 - github.com/go-piv/piv-go v1.11.0 + github.com/go-piv/piv-go/v2 v2.3.0 github.com/gobwas/ws v1.4.0 github.com/gogo/protobuf v1.3.2 github.com/google/go-cmp v0.7.0 diff --git a/api/go.sum b/api/go.sum index 2da62fd598e..1a12877d2dc 100644 --- a/api/go.sum +++ b/api/go.sum @@ -16,8 +16,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= -github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= +github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= +github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= diff --git a/api/utils/keys/piv/service.go b/api/utils/keys/piv/service.go index 50a54335a02..a2b51278129 100644 --- a/api/utils/keys/piv/service.go +++ b/api/utils/keys/piv/service.go @@ -25,7 +25,7 @@ import ( "io" "sync" - "github.com/go-piv/piv-go/piv" + "github.com/go-piv/piv-go/v2/piv" "github.com/gravitational/trace" "github.com/gravitational/teleport/api/utils/keys/hardwarekey" diff --git a/api/utils/keys/piv/service_test.go b/api/utils/keys/piv/service_test.go index 471a42842f7..1845e2d94d9 100644 --- a/api/utils/keys/piv/service_test.go +++ b/api/utils/keys/piv/service_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - pivgo "github.com/go-piv/piv-go/piv" + pivgo "github.com/go-piv/piv-go/v2/piv" "github.com/gravitational/trace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/api/utils/keys/piv/yubikey.go b/api/utils/keys/piv/yubikey.go index 7a62e95e88f..006c967639e 100644 --- a/api/utils/keys/piv/yubikey.go +++ b/api/utils/keys/piv/yubikey.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/go-piv/piv-go/piv" + "github.com/go-piv/piv-go/v2/piv" "github.com/gravitational/trace" "github.com/gravitational/teleport/api" @@ -688,7 +688,7 @@ func (c *sharedPIVConnection) reset() error { return trace.Wrap(c.conn.Reset()) } -func (c *sharedPIVConnection) setCertificate(key [24]byte, slot piv.Slot, cert *x509.Certificate) error { +func (c *sharedPIVConnection) setCertificate(key []byte, slot piv.Slot, cert *x509.Certificate) error { release, err := c.connect() if err != nil { return trace.Wrap(err) @@ -715,7 +715,7 @@ func (c *sharedPIVConnection) certificate(slot piv.Slot) (*x509.Certificate, err return cert, trace.Wrap(err) } -func (c *sharedPIVConnection) generateKey(key [24]byte, slot piv.Slot, opts piv.Key) (crypto.PublicKey, error) { +func (c *sharedPIVConnection) generateKey(key []byte, slot piv.Slot, opts piv.Key) (crypto.PublicKey, error) { release, err := c.connect() if err != nil { return nil, trace.Wrap(err) diff --git a/api/utils/keys/piv/yubikey_test.go b/api/utils/keys/piv/yubikey_test.go index 0715910564e..2876d533b26 100644 --- a/api/utils/keys/piv/yubikey_test.go +++ b/api/utils/keys/piv/yubikey_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/go-piv/piv-go/piv" + "github.com/go-piv/piv-go/v2/piv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/api/utils/keys/policy_piv.go b/api/utils/keys/policy_piv.go index a99fc532f30..43b76aaad53 100644 --- a/api/utils/keys/policy_piv.go +++ b/api/utils/keys/policy_piv.go @@ -16,7 +16,7 @@ limitations under the License. package keys import ( - "github.com/go-piv/piv-go/piv" + "github.com/go-piv/piv-go/v2/piv" ) // GetPrivateKeyPolicyFromAttestation returns the PrivateKeyPolicy satisfied by the given hardware key attestation. diff --git a/e_imports.go b/e_imports.go index a3f3ca74754..363008a5923 100644 --- a/e_imports.go +++ b/e_imports.go @@ -73,7 +73,10 @@ import ( _ "github.com/ghodss/yaml" _ "github.com/go-jose/go-jose/v3" _ "github.com/go-jose/go-jose/v3/json" + + // TODO(Joerger): Remove once /e uses v2 _ "github.com/go-piv/piv-go/piv" + _ "github.com/go-piv/piv-go/v2/piv" _ "github.com/gogo/protobuf/proto" _ "github.com/golang-jwt/jwt/v5" _ "github.com/google/go-attestation/attest" diff --git a/go.mod b/go.mod index 005c77ed8da..2048f3f3f9c 100644 --- a/go.mod +++ b/go.mod @@ -116,6 +116,7 @@ require ( github.com/go-logr/logr v1.4.3 github.com/go-mysql-org/go-mysql v1.9.1 // replaced github.com/go-piv/piv-go v1.11.0 + github.com/go-piv/piv-go/v2 v2.3.0 github.com/go-resty/resty/v2 v2.16.5 github.com/go-webauthn/webauthn v0.11.2 github.com/gobwas/ws v1.4.0 diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index 3cce5c37da1..929d9c9c4ce 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -157,6 +157,7 @@ require ( github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect github.com/go-piv/piv-go v1.11.0 // indirect + github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/go-webauthn/webauthn v0.13.0 // indirect github.com/go-webauthn/x v0.1.21 // indirect diff --git a/integrations/event-handler/go.sum b/integrations/event-handler/go.sum index 0e0f38357b6..77f6a3c4598 100644 --- a/integrations/event-handler/go.sum +++ b/integrations/event-handler/go.sum @@ -359,6 +359,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= +github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= +github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= diff --git a/integrations/terraform-mwi/go.mod b/integrations/terraform-mwi/go.mod index 70e78281b76..5e6e8bac2d5 100644 --- a/integrations/terraform-mwi/go.mod +++ b/integrations/terraform-mwi/go.mod @@ -113,6 +113,7 @@ require ( github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect github.com/go-piv/piv-go v1.11.0 // indirect + github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/go-webauthn/webauthn v0.11.2 // indirect github.com/go-webauthn/x v0.1.21 // indirect diff --git a/integrations/terraform-mwi/go.sum b/integrations/terraform-mwi/go.sum index c84c78cc8a3..532f6b9482c 100644 --- a/integrations/terraform-mwi/go.sum +++ b/integrations/terraform-mwi/go.sum @@ -349,6 +349,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= +github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= +github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI= github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index ec1e2c0df73..a4d13282776 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -182,6 +182,7 @@ require ( github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect github.com/go-piv/piv-go v1.11.0 // indirect + github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/go-webauthn/webauthn v0.13.0 // indirect diff --git a/integrations/terraform/go.sum b/integrations/terraform/go.sum index 33f2f73d387..ff3f4d0ad53 100644 --- a/integrations/terraform/go.sum +++ b/integrations/terraform/go.sum @@ -531,6 +531,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= +github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= +github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=