diff options
| author | Phil Pennock <pdp@exim.org> | 2012-05-28 01:11:48 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2012-05-28 01:11:48 -0400 |
| commit | 3ecab1575ef1f45a5e7cd3c48cd937ffa8eb0ad9 (patch) | |
| tree | b12a012b6aa387392d01990b8627f0b0859a4bf0 /doc | |
| parent | 4789da3a20432b8ce9cdccfb0713c027f91447c9 (diff) | |
| parent | f0f5a555bee153477d12bcbce90875d46884281c (diff) | |
Merge openssl_disable_ssl2 branchexim-4_80_RC7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 2 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 4 | ||||
| -rw-r--r-- | doc/doc-txt/OptionLists.txt | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index f368608a0..ae1f7df03 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -14385,7 +14385,7 @@ harm. This option overrides the &%pipe_as_creator%& option of the &(pipe)& transport driver. -.option openssl_options main "string list" unset +.option openssl_options main "string list" "+no_sslv2" .cindex "OpenSSL "compatibility options" This option allows an administrator to adjust the SSL options applied by OpenSSL to connections. It is given as a space-separated list of items, diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 4f8154c7e..6c0554b5a 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -163,6 +163,8 @@ PP/38 Overhaul DH prime handling, supply RFC-specified DH primes as built tls_dhparam take prime identifiers. Also unbreak combination of OpenSSL+DH_params+TLSSNI. +PP/39 Disable SSLv2 by default in OpenSSL support. + Exim version 4.77 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 0c3fccb74..4b9142238 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -106,6 +106,10 @@ Version 4.80 Set to "historic" to get the old GnuTLS behaviour of auto-generated DH primes. +17. SSLv2 now disabled by default in OpenSSL. (Never supported by GnuTLS). + Use "openssl_options -no_sslv2" to re-enable support, if your OpenSSL + install was not built with OPENSSL_NO_SSL2 ("no-ssl2"). + Version 4.77 ------------ diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index a79182975..45b7997d1 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -373,7 +373,7 @@ once string* unset autoreply once_file_size integer 0 autoreply 3.20 once_repeat time 0s autoreply 2.95 one_time boolean false redirect 4.00 -openssl_options string unset main 4.73 default to unset in 4.80 +openssl_options string +no_sslv2 main 4.73 default changed in 4.80 optional boolean false iplookup 4.00 oracle_servers string unset main 4.00 owners string list unset redirect 4.00 |