diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-03-04 21:57:52 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-03-07 23:08:12 +0100 |
| commit | bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28 (patch) | |
| tree | a6282d6cdc4a87da233b5986849a9f33d672de6d /doc/apps/ciphers.pod | |
| parent | 0440d4ebe41d523d57acc841c483375df0e3e75f (diff) | |
| download | openssl-new-bc2e18a3c818ae7e2d8c996b6648aa4ae8e3ee28.tar.gz | |
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 'doc/apps/ciphers.pod')
| -rw-r--r-- | doc/apps/ciphers.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod index 6086d0a715..0aa1bad111 100644 --- a/doc/apps/ciphers.pod +++ b/doc/apps/ciphers.pod @@ -109,8 +109,8 @@ The following is a list of all permitted cipher strings and their meanings. =item B<DEFAULT> -the default cipher list. This is determined at compile time and, as of OpenSSL -1.0.0, is normally B<ALL:!aNULL:!eNULL>. This must be the first cipher string +the default cipher list. This is determined at compile time and +is normally B<ALL:!EXPORT:!aNULL:!eNULL:!SSLv2>. This must be the firstcipher string specified. =item B<COMPLEMENTOFDEFAULT> |