diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9503e523..5db745e7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -12,7 +12,7 @@ permissions: env: CGO_ENABLED: 0 GO_VERSION: stable - GOLANGCI_LINT_VERSION: v1.58.1 + GOLANGCI_LINT_VERSION: v1.58.2 SHELLCHECK_SCRIPTS: ./*.sh jobs: go-lint-checks: diff --git a/vendor/github.com/letsencrypt/challtestsrv/README.md b/challtestsrv/README.md similarity index 100% rename from vendor/github.com/letsencrypt/challtestsrv/README.md rename to challtestsrv/README.md diff --git a/vendor/github.com/letsencrypt/challtestsrv/challenge-servers.go b/challtestsrv/challenge-servers.go similarity index 97% rename from vendor/github.com/letsencrypt/challtestsrv/challenge-servers.go rename to challtestsrv/challenge-servers.go index 85bb38fa..78ad533b 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/challenge-servers.go +++ b/challtestsrv/challenge-servers.go @@ -3,7 +3,7 @@ package challtestsrv import ( - "fmt" + "errors" "log" "net/http" "os" @@ -118,7 +118,7 @@ func (c *Config) validate() error { len(c.HTTPSOneAddrs) < 1 && len(c.DNSOneAddrs) < 1 && len(c.TLSALPNOneAddrs) < 1 { - return fmt.Errorf( + return errors.New( "config must specify at least one HTTPOneAddrs entry, one HTTPSOneAddr " + "entry, one DOHAddrs, one DNSOneAddrs entry, or one TLSALPNOneAddrs entry") } @@ -177,10 +177,7 @@ func New(config Config) (*ChallSrv, error) { for _, address := range config.DOHAddrs { challSrv.log.Printf("Creating DoH server on %s\n", address) - s, err := dohServer(address, config.DOHCert, config.DOHCertKey, http.HandlerFunc(challSrv.dohHandler)) - if err != nil { - return nil, err - } + s := dohServer(address, config.DOHCert, config.DOHCertKey, http.HandlerFunc(challSrv.dohHandler)) challSrv.servers = append(challSrv.servers, s) } diff --git a/vendor/github.com/letsencrypt/challtestsrv/dns.go b/challtestsrv/dns.go similarity index 99% rename from vendor/github.com/letsencrypt/challtestsrv/dns.go rename to challtestsrv/dns.go index ee0c3bc9..a01d2c38 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/dns.go +++ b/challtestsrv/dns.go @@ -158,7 +158,7 @@ func (s *ChallSrv) caaAnswers(q dns.Question) []dns.RR { } type writeMsg interface { - WriteMsg(*dns.Msg) error + WriteMsg(msg *dns.Msg) error } type dnsToHTTPWriter struct { diff --git a/vendor/github.com/letsencrypt/challtestsrv/dnsone.go b/challtestsrv/dnsone.go similarity index 97% rename from vendor/github.com/letsencrypt/challtestsrv/dnsone.go rename to challtestsrv/dnsone.go index 228e86f2..a336cbac 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/dnsone.go +++ b/challtestsrv/dnsone.go @@ -72,7 +72,7 @@ func (s *doh) ListenAndServe() error { } // dohServer creates a DoH server. -func dohServer(address string, tlsCert, tlsCertKey string, handler http.Handler) (challengeServer, error) { +func dohServer(address string, tlsCert, tlsCertKey string, handler http.Handler) *doh { return &doh{ &http.Server{ Handler: handler, @@ -82,5 +82,5 @@ func dohServer(address string, tlsCert, tlsCertKey string, handler http.Handler) }, tlsCert, tlsCertKey, - }, nil + } } diff --git a/vendor/github.com/letsencrypt/challtestsrv/event.go b/challtestsrv/event.go similarity index 97% rename from vendor/github.com/letsencrypt/challtestsrv/event.go rename to challtestsrv/event.go index ea7713b6..171fd81e 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/event.go +++ b/challtestsrv/event.go @@ -70,10 +70,7 @@ func (e DNSRequestEvent) Type() RequestEventType { // in the question name is removed. func (e DNSRequestEvent) Key() string { key := e.Question.Name - if strings.HasSuffix(key, ".") { - key = strings.TrimSuffix(key, ".") - } - return key + return strings.TrimSuffix(key, ".") } // TLSALPNRequestEvent corresponds to a TLS request received by diff --git a/vendor/github.com/letsencrypt/challtestsrv/httpone.go b/challtestsrv/httpone.go similarity index 99% rename from vendor/github.com/letsencrypt/challtestsrv/httpone.go rename to challtestsrv/httpone.go index 7e90c639..69cec000 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/httpone.go +++ b/challtestsrv/httpone.go @@ -181,7 +181,7 @@ func (c challHTTPServer) Shutdown() error { // resulting challengeServer will run a HTTPS server with a self-signed // certificate useful for HTTP-01 -> HTTPS HTTP-01 redirect responses. If HTTPS // is false the resulting challengeServer will run an HTTP server. -func httpOneServer(address string, handler http.Handler, https bool) challengeServer { +func httpOneServer(address string, handler http.Handler, https bool) challHTTPServer { // If HTTPS is requested build a TLS Config that uses the self-signed // certificate generated at startup. var tlsConfig *tls.Config diff --git a/vendor/github.com/letsencrypt/challtestsrv/mockdns.go b/challtestsrv/mockdns.go similarity index 100% rename from vendor/github.com/letsencrypt/challtestsrv/mockdns.go rename to challtestsrv/mockdns.go diff --git a/vendor/github.com/letsencrypt/challtestsrv/tlsalpnone.go b/challtestsrv/tlsalpnone.go similarity index 95% rename from vendor/github.com/letsencrypt/challtestsrv/tlsalpnone.go rename to challtestsrv/tlsalpnone.go index 22b1fc3a..5e8c845b 100644 --- a/vendor/github.com/letsencrypt/challtestsrv/tlsalpnone.go +++ b/challtestsrv/tlsalpnone.go @@ -69,7 +69,7 @@ func (s *ChallSrv) ServeChallengeCertFunc(k *ecdsa.PrivateKey) func(*tls.ClientH kaHash := sha256.Sum256([]byte(ka)) extValue, err := asn1.Marshal(kaHash[:]) if err != nil { - return nil, fmt.Errorf("failed marshalling hash OCTET STRING: %s", err) + return nil, fmt.Errorf("failed marshaling hash OCTET STRING: %w", err) } certTmpl := x509.Certificate{ SerialNumber: big.NewInt(1729), @@ -84,7 +84,7 @@ func (s *ChallSrv) ServeChallengeCertFunc(k *ecdsa.PrivateKey) func(*tls.ClientH } certBytes, err := x509.CreateCertificate(rand.Reader, &certTmpl, &certTmpl, k.Public(), k) if err != nil { - return nil, fmt.Errorf("failed creating challenge certificate: %s", err) + return nil, fmt.Errorf("failed creating challenge certificate: %w", err) } return &tls.Certificate{ Certificate: [][]byte{certBytes}, @@ -107,7 +107,7 @@ func (c challTLSServer) ListenAndServe() error { return c.Server.ListenAndServeTLS("", "") } -func tlsALPNOneServer(address string, challSrv *ChallSrv) challengeServer { +func tlsALPNOneServer(address string, challSrv *ChallSrv) challTLSServer { key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) if err != nil { panic(err) diff --git a/cmd/pebble-challtestsrv/history.go b/cmd/pebble-challtestsrv/history.go index e2b6734f..5865b737 100644 --- a/cmd/pebble-challtestsrv/history.go +++ b/cmd/pebble-challtestsrv/history.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/letsencrypt/challtestsrv" + "github.com/letsencrypt/pebble/v2/challtestsrv" ) // clearHistory handles an HTTP POST request to clear the challenge server diff --git a/cmd/pebble-challtestsrv/main.go b/cmd/pebble-challtestsrv/main.go index 3b3d7334..668e1764 100644 --- a/cmd/pebble-challtestsrv/main.go +++ b/cmd/pebble-challtestsrv/main.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "github.com/letsencrypt/challtestsrv" + "github.com/letsencrypt/pebble/v2/challtestsrv" "github.com/letsencrypt/pebble/v2/cmd" ) diff --git a/cmd/pebble-challtestsrv/mockdns.go b/cmd/pebble-challtestsrv/mockdns.go index 5b3151f1..c591448b 100644 --- a/cmd/pebble-challtestsrv/mockdns.go +++ b/cmd/pebble-challtestsrv/mockdns.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/letsencrypt/challtestsrv" + "github.com/letsencrypt/pebble/v2/challtestsrv" ) // setDefaultDNSIPv4 handles an HTTP POST request to set the default IPv4 diff --git a/go.mod b/go.mod index 388cee75..57a27087 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.21 require ( github.com/go-jose/go-jose/v4 v4.0.1 - github.com/letsencrypt/challtestsrv v1.3.2 github.com/miekg/dns v1.1.58 ) diff --git a/go.sum b/go.sum index c1d4f94f..e4680b82 100644 --- a/go.sum +++ b/go.sum @@ -4,9 +4,6 @@ github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWq github.com/go-jose/go-jose/v4 v4.0.1/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= -github.com/letsencrypt/challtestsrv v1.3.2/go.mod h1:Ur4e4FvELUXLGhkMztHOsPIsvGxD/kzSJninOrkM+zc= -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -17,19 +14,12 @@ golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/va/va.go b/va/va.go index cc1f098c..d3f5349b 100644 --- a/va/va.go +++ b/va/va.go @@ -24,8 +24,8 @@ import ( "github.com/miekg/dns" - "github.com/letsencrypt/challtestsrv" "github.com/letsencrypt/pebble/v2/acme" + "github.com/letsencrypt/pebble/v2/challtestsrv" "github.com/letsencrypt/pebble/v2/core" "github.com/letsencrypt/pebble/v2/db" ) diff --git a/vendor/github.com/letsencrypt/challtestsrv/.gitignore b/vendor/github.com/letsencrypt/challtestsrv/.gitignore deleted file mode 100644 index f1c181ec..00000000 --- a/vendor/github.com/letsencrypt/challtestsrv/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out diff --git a/vendor/github.com/letsencrypt/challtestsrv/.golangci.yaml b/vendor/github.com/letsencrypt/challtestsrv/.golangci.yaml deleted file mode 100644 index 5aac6ddb..00000000 --- a/vendor/github.com/letsencrypt/challtestsrv/.golangci.yaml +++ /dev/null @@ -1,35 +0,0 @@ -linters-settings: - gocyclo: - min-complexity: 25 - govet: - check-shadowing: false - misspell: - locale: "US" - -linters: - enable-all: true - disable: - - stylecheck - - gosec - - dupl - - maligned - - depguard - - lll - - prealloc - - scopelint - - gocritic - - gochecknoinits - - gochecknoglobals - - gomnd - - wsl - - goerr113 - - godot - -issues: - exclude-use-default: true - max-per-linter: 0 - max-same-issues: 0 - # The following excludes are considered false-positives/known-OK. - exclude-rules: - - path: tlsalpnone.go - text: '`marshalling` is a misspelling of `marshaling`' diff --git a/vendor/github.com/letsencrypt/challtestsrv/.travis.yml b/vendor/github.com/letsencrypt/challtestsrv/.travis.yml deleted file mode 100644 index c2786a5a..00000000 --- a/vendor/github.com/letsencrypt/challtestsrv/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: go - -go: - - "stable" - -cache: - directories: - - $GOPATH/pkg/mod - -# Override the base install phase so that the project can be installed using -# `-mod=vendor` to use the vendored dependencies -install: - # Install `golangci-lint` using their installer script - - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.29.0 - # Install `cover` and `goveralls` without `GO111MODULE` enabled so that we - # don't download project dependencies and just put the tools in $GOPATH/bin - - GO111MODULE=off go get golang.org/x/tools/cmd/cover - - GO111MODULE=off go get github.com/mattn/goveralls - - go mod tidy - - git diff --exit-code go.mod - - git diff --exit-code go.sum - - go mod download - - go mod vendor - - go install -mod=vendor -v -race ./... - -script: - - set -e - - golangci-lint run - - go test -mod=vendor -v -race -covermode=atomic -coverprofile=coverage.out ./... - - goveralls -coverprofile=coverage.out -service=travis-ci diff --git a/vendor/github.com/letsencrypt/challtestsrv/CODE_OF_CONDUCT.md b/vendor/github.com/letsencrypt/challtestsrv/CODE_OF_CONDUCT.md deleted file mode 100644 index 558d84aa..00000000 --- a/vendor/github.com/letsencrypt/challtestsrv/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contributor Code of Conduct - -The contributor code of conduct is available for reference [on the community forum](https://community.letsencrypt.org/guidelines). diff --git a/vendor/github.com/letsencrypt/challtestsrv/LICENSE b/vendor/github.com/letsencrypt/challtestsrv/LICENSE deleted file mode 100644 index a612ad98..00000000 --- a/vendor/github.com/letsencrypt/challtestsrv/LICENSE +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/vendor/modules.txt b/vendor/modules.txt index f34108bc..5c6fe0c1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -5,9 +5,6 @@ github.com/go-jose/go-jose/v4/cipher github.com/go-jose/go-jose/v4/json # github.com/google/go-cmp v0.6.0 ## explicit; go 1.13 -# github.com/letsencrypt/challtestsrv v1.3.2 -## explicit; go 1.13 -github.com/letsencrypt/challtestsrv # github.com/miekg/dns v1.1.58 ## explicit; go 1.19 github.com/miekg/dns