Merge pull request #727 from mholt/rename-keytype-ec-to-p

Rename EC256,EC384 to P256,P384

caddy/https/setup.go

@@ -257,8 +257,8 @@ func setDefaultTLSParams(c *server.Config) {
 
 // Map of supported key types
 var supportedKeyTypes = map[string]acme.KeyType{
-	"EC384":   acme.EC384,
-	"EC256":   acme.EC256,
+	"P384":    acme.EC384,
+	"P256":    acme.EC256,
 	"RSA8192": acme.RSA8192,
 	"RSA4096": acme.RSA4096,
 	"RSA2048": acme.RSA2048,

caddy/https/setup_test.go

@@ -221,7 +221,7 @@ func TestSetupParseWithClientAuth(t *testing.T) {
 
 func TestSetupParseWithKeyType(t *testing.T) {
 	params := `tls {
-            key_type ec384
+            key_type p384
         }`
 	c := setup.NewTestController(params)