diff --git a/go.mod b/go.mod index b04d86cf..c6611430 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-bindata/go-bindata v3.1.2+incompatible + github.com/go-jose/go-jose/v3 v3.0.0 github.com/go-openapi/jsonpointer v0.19.5 github.com/go-openapi/runtime v0.24.2 github.com/go-sql-driver/mysql v1.7.0 @@ -89,7 +90,6 @@ require ( gonum.org/v1/plot v0.12.0 google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 - gopkg.in/square/go-jose.v2 v2.6.0 ) require ( diff --git a/go.sum b/go.sum index adc2dc34..b14035fd 100644 --- a/go.sum +++ b/go.sum @@ -213,6 +213,8 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= +github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -1482,8 +1484,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/josex/generate.go b/josex/generate.go index c8185d8a..055a4c5c 100644 --- a/josex/generate.go +++ b/josex/generate.go @@ -26,7 +26,7 @@ import ( "errors" "fmt" - "gopkg.in/square/go-jose.v2" + "github.com/go-jose/go-jose/v3" ) // NewSigningKey generates a keypair for corresponding SignatureAlgorithm. diff --git a/josex/public.go b/josex/public.go index 562e2478..667a2cbb 100644 --- a/josex/public.go +++ b/josex/public.go @@ -3,7 +3,7 @@ package josex import ( "crypto" - "gopkg.in/square/go-jose.v2" + "github.com/go-jose/go-jose/v3" ) // ToPublicKey returns the public key of the given private key. diff --git a/josex/utils.go b/josex/utils.go index df18e030..036f36aa 100644 --- a/josex/utils.go +++ b/josex/utils.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "gopkg.in/square/go-jose.v2" + "github.com/go-jose/go-jose/v3" ) // LoadJSONWebKey returns a *jose.JSONWebKey for a given JSON string. diff --git a/jwksx/fetcher.go b/jwksx/fetcher.go index fe7d49a3..01958e1d 100644 --- a/jwksx/fetcher.go +++ b/jwksx/fetcher.go @@ -8,8 +8,8 @@ import ( "net/http" "sync" + "github.com/go-jose/go-jose/v3" "github.com/pkg/errors" - "gopkg.in/square/go-jose.v2" ) // Fetcher is a small helper for fetching JSON Web Keys from remote endpoints. diff --git a/modx/version_test.go b/modx/version_test.go index c14f5759..34182a57 100644 --- a/modx/version_test.go +++ b/modx/version_test.go @@ -81,7 +81,7 @@ require ( gonum.org/v1/plot v0.0.0-20200111075622-4abb28f724d5 google.golang.org/grpc v1.36.0 gopkg.in/DataDog/dd-trace-go.v1 v1.27.0 - gopkg.in/square/go-jose.v2 v2.2.2 + github.com/go-jose/go-jose/v3 v3.0.0 ) go 1.16