Merge branch 'letsencrypt:main' into ci-overhaul

letsencrypt · Feb 27, 2024 · 0aaad56 · 0aaad56
2 parents dfe8d4f + ace9542
commit 0aaad56
Show file tree

Hide file tree

Showing 42 changed files with 832 additions and 437 deletions.
diff --git a/core/types.go b/core/types.go
@@ -11,8 +11,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/go-jose/go-jose/v4"
+
 	"github.com/letsencrypt/pebble/v2/acme"
-	"gopkg.in/square/go-jose.v2"
 )
 
 type Order struct {

diff --git a/db/memorystore.go b/db/memorystore.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/square/go-jose.v2"
+	"github.com/go-jose/go-jose/v4"
 
 	"github.com/letsencrypt/pebble/v2/acme"
 	"github.com/letsencrypt/pebble/v2/core"

diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/letsencrypt/pebble/v2
 go 1.21
 
 require (
+	github.com/go-jose/go-jose/v4 v4.0.0
 	github.com/letsencrypt/challtestsrv v1.3.2
 	github.com/miekg/dns v1.1.58
-	gopkg.in/square/go-jose.v2 v2.6.0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-jose/go-jose/v4 v4.0.0 h1:gHOVQyfrqsagdy/Yj9PTz5HMYzr3UpYh1CcFpktmRoY=
+github.com/go-jose/go-jose/v4 v4.0.0/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/letsencrypt/challtestsrv v1.3.2 h1:pIDLBCLXR3B1DLmOmkkqg29qVa7DDozBnsOpL9PxmAY=
@@ -30,7 +32,5 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
 golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
-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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/vendor/gopkg.in/square/go-jose.v2/.gitignore → .../github.com/go-jose/go-jose/v4/.gitignore b/vendor/gopkg.in/square/go-jose.v2/.gitignore → .../github.com/go-jose/go-jose/v4/.gitignore
diff --git a/vendor/github.com/go-jose/go-jose/v4/.golangci.yml b/vendor/github.com/go-jose/go-jose/v4/.golangci.yml
diff --git a/vendor/github.com/go-jose/go-jose/v4/.travis.yml b/vendor/github.com/go-jose/go-jose/v4/.travis.yml
diff --git a/vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md b/vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md
diff --git a/...opkg.in/square/go-jose.v2/CONTRIBUTING.md → ...ub.com/go-jose/go-jose/v4/CONTRIBUTING.md b/...opkg.in/square/go-jose.v2/CONTRIBUTING.md → ...ub.com/go-jose/go-jose/v4/CONTRIBUTING.md
diff --git a/vendor/gopkg.in/square/go-jose.v2/LICENSE → vendor/github.com/go-jose/go-jose/v4/LICENSE b/vendor/gopkg.in/square/go-jose.v2/LICENSE → vendor/github.com/go-jose/go-jose/v4/LICENSE
diff --git a/vendor/gopkg.in/square/go-jose.v2/README.md → ...r/github.com/go-jose/go-jose/v4/README.md b/vendor/gopkg.in/square/go-jose.v2/README.md → ...r/github.com/go-jose/go-jose/v4/README.md
diff --git a/vendor/github.com/go-jose/go-jose/v4/SECURITY.md b/vendor/github.com/go-jose/go-jose/v4/SECURITY.md