[lxc-devel] [lxd/master] Tweak TLS cipher list a bit

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 619 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160607/29c5c8a6/attachment.bin>
-------------- next part --------------
From 94eba19b2d3a229e4bb346eef20aa96822597c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 7 Jun 2016 16:36:18 -0400
Subject: [PATCH] Tweak TLS cipher list a bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - This drops the ECDSA ciphers from the announced list by the server as
   since our certificate is RSA, those cannot be used.

 - We also now allow connections using CBC-SHA instead of GCM-SHA256 as
   this is needed by some older clients.

Closes #2034

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/daemon.go     | 4 ++--
 shared/network.go | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lxd/daemon.go b/lxd/daemon.go
index 0215f0d..4fed593 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -803,8 +803,8 @@ func (d *Daemon) Init() error {
 			MinVersion:         tls.VersionTLS12,
 			MaxVersion:         tls.VersionTLS12,
 			CipherSuites: []uint16{
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
+				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA},
 			PreferServerCipherSuites: true,
 		}
 
diff --git a/shared/network.go b/shared/network.go
index 9ad35e4..53bd15a 100644
--- a/shared/network.go
+++ b/shared/network.go
@@ -39,7 +39,9 @@ func initTLSConfig() *tls.Config {
 		MaxVersion: tls.VersionTLS12,
 		CipherSuites: []uint16{
 			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA},
 		PreferServerCipherSuites: true,
 	}
 }