diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-01 14:09:29 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-01 14:09:29 -0600 |
| commit | ce3ca541d83aedac70b6c251c149ed91e1fb843a (patch) | |
| tree | fc42c0d5baa9d427f200ddd93b03df31abe6a38f /modules/caddytls/connpolicy.go | |
| parent | 581f1defcb6de580d57f3c3e58b29950d2f42cb7 (diff) | |
caddytls: Update cipher suite names and curve names
Now using IANA-compliant names and Go 1.14's CipherSuites() function so
we don't have to maintain our own mapping of currently-secure cipher
suites.
Diffstat (limited to 'modules/caddytls/connpolicy.go')
| -rw-r--r-- | modules/caddytls/connpolicy.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/caddytls/connpolicy.go b/modules/caddytls/connpolicy.go index c821811..52ccdd9 100644 --- a/modules/caddytls/connpolicy.go +++ b/modules/caddytls/connpolicy.go @@ -214,7 +214,10 @@ func (p *ConnectionPolicy) buildStandardTLSConfig(ctx caddy.Context) error { // add all the cipher suites in order, without duplicates cipherSuitesAdded := make(map[uint16]struct{}) for _, csName := range p.CipherSuites { - csID := SupportedCipherSuites[csName] + csID := CipherSuiteID(csName) + if csID == 0 { + return fmt.Errorf("unsupported cipher suite: %s", csName) + } if _, ok := cipherSuitesAdded[csID]; !ok { cipherSuitesAdded[csID] = struct{}{} cfg.CipherSuites = append(cfg.CipherSuites, csID) |