diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 13:13:13 -0400 |
| commit | 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f (patch) | |
| tree | fe0992fb4cf6f3c2a5d597557552ae69caccbe70 /openssl/doc/apps/ciphers.pod | |
| parent | 9073d97eff3f6d3b33450ef3532a826674c7e1e8 (diff) | |
| download | vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.gz vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.bz2 vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.zip | |
Update openssl to version openssl-1.0.1m
Conflicts:
openssl/Makefile
openssl/Makefile.bak
openssl/crypto/cryptlib.c
Diffstat (limited to 'openssl/doc/apps/ciphers.pod')
| -rw-r--r-- | openssl/doc/apps/ciphers.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/doc/apps/ciphers.pod b/openssl/doc/apps/ciphers.pod index 6086d0a71..0aa1bad11 100644 --- a/openssl/doc/apps/ciphers.pod +++ b/openssl/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> |