From 84d650cc4acacd8f60220e3f1ac641500aacb29a Mon Sep 17 00:00:00 2001 From: Devin Canterberry Date: Tue, 13 Mar 2018 09:25:03 -0700 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=93=9D=20Clarify=20the=20list=20of=20?= =?UTF-8?q?supported=20TLS=20cipher=20suites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the documentation linked to Golang's source code, which can drift from the list of cipher suites supported by Consul. Consul has a hard-coded mapping of string values to Golang cipher suites, so this is a more direct source of truth to help users understand which string values are accepted in the `tls_cipher_suites` configuration value. --- website/source/docs/agent/options.html.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md index b503d18860..931b0a805e 100644 --- a/website/source/docs/agent/options.html.md +++ b/website/source/docs/agent/options.html.md @@ -1341,7 +1341,8 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass * `tls_cipher_suites` Added in Consul 0.8.2, this specifies the list of supported ciphersuites as a comma-separated-list. The list of all - available ciphersuites is available in the [Golang TLS documentation](https://golang.org/src/crypto/tls/cipher_suites.go). + supported ciphersuites is available in the [`tlsutil.ParseCiphers` source as the keys of the `cipherMap` + map](https://github.com/hashicorp/consul/blob/6378d607fd887327cfd1aadccf1ccb683da745b6/tlsutil/config.go#L363). * `tls_prefer_server_cipher_suites` Added in Consul 0.8.2, this will cause Consul to prefer the From 961aea97fe9378565dc10481a8c85598decd7f04 Mon Sep 17 00:00:00 2001 From: Devin Canterberry Date: Thu, 15 Mar 2018 10:25:27 -0700 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20Prefer=20brevity=20at=20the?= =?UTF-8?q?=20cost=20of=20some=20ambiguity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/source/docs/agent/options.html.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md index 931b0a805e..d8241ea8d2 100644 --- a/website/source/docs/agent/options.html.md +++ b/website/source/docs/agent/options.html.md @@ -1341,8 +1341,7 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass * `tls_cipher_suites` Added in Consul 0.8.2, this specifies the list of supported ciphersuites as a comma-separated-list. The list of all - supported ciphersuites is available in the [`tlsutil.ParseCiphers` source as the keys of the `cipherMap` - map](https://github.com/hashicorp/consul/blob/6378d607fd887327cfd1aadccf1ccb683da745b6/tlsutil/config.go#L363). + supported ciphersuites is available in the [source code](https://github.com/hashicorp/consul/blob/6378d607fd887327cfd1aadccf1ccb683da745b6/tlsutil/config.go#L363). * `tls_prefer_server_cipher_suites` Added in Consul 0.8.2, this will cause Consul to prefer the From 37c07b3cac6ab92f85afe6c0943f54e25461b004 Mon Sep 17 00:00:00 2001 From: Paul Banks Date: Mon, 19 Mar 2018 16:50:52 +0000 Subject: [PATCH 3/3] Use master --- website/source/docs/agent/options.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md index d8241ea8d2..16150ae5e7 100644 --- a/website/source/docs/agent/options.html.md +++ b/website/source/docs/agent/options.html.md @@ -1341,7 +1341,7 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass * `tls_cipher_suites` Added in Consul 0.8.2, this specifies the list of supported ciphersuites as a comma-separated-list. The list of all - supported ciphersuites is available in the [source code](https://github.com/hashicorp/consul/blob/6378d607fd887327cfd1aadccf1ccb683da745b6/tlsutil/config.go#L363). + supported ciphersuites is available in the [source code](https://github.com/hashicorp/consul/blob/master/tlsutil/config.go#L363). * `tls_prefer_server_cipher_suites` Added in Consul 0.8.2, this will cause Consul to prefer the