Skip to content

Commit a674c00

Browse files
committed
vendor: Update quic and lego/acme dependencies
1 parent 98de336 commit a674c00

File tree

85 files changed

+1295
-763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1295
-763
lines changed

caddytls/client.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,26 +240,30 @@ func (c *ACMEClient) Obtain(name string) error {
240240
for attempts := 0; attempts < 2; attempts++ {
241241
namesObtaining.Add([]string{name})
242242
acmeMu.Lock()
243-
certificate, failures := c.acmeClient.ObtainCertificate([]string{name}, true, nil, c.config.MustStaple)
243+
certificate, err := c.acmeClient.ObtainCertificate([]string{name}, true, nil, c.config.MustStaple)
244244
acmeMu.Unlock()
245245
namesObtaining.Remove([]string{name})
246-
if len(failures) > 0 {
246+
if err != nil {
247247
// Error - try to fix it or report it to the user and abort
248248

249-
var errMsg string // combine all the failures into a single error message
250-
for errDomain, obtainErr := range failures {
251-
if obtainErr == nil {
252-
continue
249+
if failures, ok := err.(acme.ObtainError); ok && len(failures) > 0 {
250+
// in this case, we can enumerate the error per-domain
251+
var errMsg string // combine all the failures into a single error message
252+
for errDomain, obtainErr := range failures {
253+
if obtainErr == nil {
254+
continue
255+
}
256+
errMsg += fmt.Sprintf("[%s] failed to get certificate: %v\n", errDomain, obtainErr)
253257
}
254-
errMsg += fmt.Sprintf("[%s] failed to get certificate: %v\n", errDomain, obtainErr)
258+
return errors.New(errMsg)
255259
}
256260

257-
return errors.New(errMsg)
261+
return fmt.Errorf("[%s] failed to obtain certificate: %v", name, err)
258262
}
259263

260264
// double-check that we actually got a certificate; check a couple fields
261265
// TODO: This is a temporary workaround for what I think is a bug in the acmev2 package (March 2018)
262-
// but it might not hurt to keep this extra check in place
266+
// but it might not hurt to keep this extra check in place (April 18, 2018: might be fixed now.)
263267
if certificate.Domain == "" || certificate.Certificate == nil {
264268
return errors.New("returned certificate was empty; probably an unchecked error obtaining it")
265269
}

vendor/github.com/lucas-clemente/aes12/cipher_generic.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/client.go

Lines changed: 15 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/example/client/main.go

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/example/main.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/h2quic/client.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/h2quic/request_writer.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lucas-clemente/quic-go/h2quic/response_writer.go

Lines changed: 12 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)