summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2015-03-04 21:57:52 +0100
committerKurt Roeckx <kurt@roeckx.be>2015-03-07 23:08:12 +0100
commitbc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28 (patch)
treea6282d6cdc4a87da233b5986849a9f33d672de6d /ssl/ssl.h
parent0440d4ebe41d523d57acc841c483375df0e3e75f (diff)
Remove export ciphers from the DEFAULT cipher list
They are moved to the COMPLEMENTOFDEFAULT instead. This also fixes SSLv2 to be part of COMPLEMENTOFDEFAULT. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f417997a324037025be61737288e40e171a8218c) Conflicts: ssl/ssl_ciph.c
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 551fa2d7b4..b93b67b14b 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -334,7 +334,7 @@ extern "C" {
* The following cipher list is used by default. It also is substituted when
* an application-defined cipher list string starts with 'DEFAULT'.
*/
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2"
+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
/*
* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
* starts with a reasonable order, and all we have to do for DEFAULT is