From ab017cabfb547f423fd0d9702865edcb91b58c53 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 21 Oct 2014 16:54:48 -0400 Subject: socket: disallow CBC cipher modes This is related to CVE-2014-3566 a.k.a. POODLE. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3566 POODLE is specific to CBC cipher modes in SSLv3. Because there is no way to prevent SSLv3 fallback on a system with an unpatched version of OpenSSL, users of such systems can only be protected by disallowing CBC modes. The default cipher-mode specification in our code has been changed accordingly. Users can still set their own cipher modes if they wish. To support them, the ssl-authz.t test script provides an example of how to combine the CBC exclusion with other criteria in a script. Change-Id: Ib1fa547082fbb7de9df94ffd182b1800d6e354e5 BUG: 1157659 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/8962 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Vijay Bellur Reviewed-on: http://review.gluster.org/8987 Reviewed-by: Niels de Vos Tested-by: Niels de Vos --- tests/features/ssl-authz.t | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests') diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t index e4ea268b53b..37cbbd789c0 100755 --- a/tests/features/ssl-authz.t +++ b/tests/features/ssl-authz.t @@ -26,6 +26,22 @@ TEST glusterd TEST pidof glusterd TEST $CLI volume info; +# Construct a cipher list that excludes CBC because of POODLE. +# http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3566 +# +# Since this is a bit opaque, here's what it does: +# (1) Get the ciphers matching a normal cipher-list spec +# (2) Delete any colon-separated entries containing "CBC" +# (3) Collapse adjacent colons from deleted entries +# (4) Remove colons at the beginning or end +function valid_ciphers { + openssl ciphers 'HIGH:!SSLv2' | sed \ + -e '/[^:]*CBC[^:]*/s///g' \ + -e '/::*/s//:/g' \ + -e '/^:/s///' \ + -e '/:$/s///' +} + TEST openssl genrsa -out $SSL_KEY 1024 TEST openssl req -new -x509 -key $SSL_KEY -subj /CN=Anyone -out $SSL_CERT ln $SSL_CERT $SSL_CA @@ -33,6 +49,7 @@ ln $SSL_CERT $SSL_CA TEST $CLI volume create $V0 $H0:$B0/1 TEST $CLI volume set $V0 server.ssl on TEST $CLI volume set $V0 client.ssl on +#EST $CLI volume set $V0 ssl.cipher-list $(valid_ciphers) TEST $CLI volume set $V0 auth.ssl-allow Anyone TEST $CLI volume start $V0 -- cgit