diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-07-18 00:15:01 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-07-18 13:23:11 +0100 |
| commit | c4b4086235b1d5e21fcf1ad72a1b05813e15dcbd (patch) | |
| tree | b2e3301128b2e35510dfc1b563d9b41581d40439 /doc/doc-txt | |
| parent | f7ea5ba1049ba2a53b8cb0bf98893bff6c6bc77f (diff) | |
TLS: ALPN options
Diffstat (limited to 'doc/doc-txt')
| -rw-r--r-- | doc/doc-txt/NewStuff | 4 | ||||
| -rw-r--r-- | doc/doc-txt/OptionLists.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 60bb3762e..6f3d4b31c 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -57,7 +57,9 @@ Version 4.95 16. Main option "hosts_require_helo", requiring HELO or EHLO before MAIL. 17. A main config option "allow_insecure_tainted_data" allows to turn - taint errors into warnings. + +18. TLS ALPN handling. By default, refuse TLS connections that try to specify + a non-smtp (eg. http) use. Options for customising. Version 4.94 diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 366a74b18..4314c534b 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -314,6 +314,8 @@ hosts_pipe_connect host_list unset smtp 4.93 if experimental hosts_randomize boolean false manualroute 4.00 false smtp 3.14 hosts_require_auth host list unset smtp 4.00 +hosts_require_alpn host list unset main 4.95 + smtp 4.95 hosts_require_dane host list unset smtp 4.91 (4.85 experimental) hosts_require_helo host list "*" main 4.95 hosts_require_ocsp host list unset smtp 4.82 if experimental_ocsp @@ -598,7 +600,8 @@ timeout_defer boolean false pipe timeout_frozen_after time 0s main 3.20 timezone string + main 3.15 tls_advertise_hosts host list * main 3.20 -tls_advertise_requiretls host list * main 4.92 if experimental_requiretls +tls_alpn string* unset main 4.95 + smtp 4.95 tls_certificate string* unset main 3.20 unset smtp 3.20 tls_dh_max_bits integer 2236 main 4.80 |