From ce3ca541d83aedac70b6c251c149ed91e1fb843a Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 1 Apr 2020 14:09:29 -0600 Subject: 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. --- caddyconfig/httpcaddyfile/builtins.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'caddyconfig/httpcaddyfile') diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go index 9fe52a7..26a421c 100644 --- a/caddyconfig/httpcaddyfile/builtins.go +++ b/caddyconfig/httpcaddyfile/builtins.go @@ -166,7 +166,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) { case "ciphers": for h.NextArg() { - if _, ok := caddytls.SupportedCipherSuites[h.Val()]; !ok { + if !caddytls.CipherSuiteNameSupported(h.Val()) { return nil, h.Errf("Wrong cipher suite name or cipher suite not supported: '%s'", h.Val()) } cp.CipherSuites = append(cp.CipherSuites, h.Val()) -- cgit v1.2.3