diff options
author | Reyk Floeter <reyk@esdenera.com> | 2015-02-10 06:19:57 +0100 |
---|---|---|
committer | Reyk Floeter <reyk@esdenera.com> | 2015-02-10 06:19:57 +0100 |
commit | 8a2934048ba934e50ecc1736d554036fc39f6752 (patch) | |
tree | 5b54f9abe4d6af2b148acf2621fced6d87d20d3e /httpd.conf.5 | |
parent | f45dee2d699f0dceaf4794468cd653b45a9ecdb3 (diff) | |
download | httpd-8a2934048ba934e50ecc1736d554036fc39f6752.tar.gz httpd-8a2934048ba934e50ecc1736d554036fc39f6752.zip |
sync with -current, add auto-(e)dhe support, other fixes
Diffstat (limited to 'httpd.conf.5')
-rw-r--r-- | httpd.conf.5 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/httpd.conf.5 b/httpd.conf.5 index d5afe6d..f93b57e 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.48 2015/02/07 01:23:12 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.50 2015/02/07 08:12:30 jmc Exp $ .\" .\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org> .\" @@ -349,6 +349,16 @@ will be used (strong crypto cipher suites without anonymous DH). See the CIPHERS section of .Xr openssl 1 for information about SSL/TLS cipher suites and preference lists. +.It Ic dhe Ar params +Specify the DHE parameters to use for DHE cipher suites. +Valid parameter values are none, legacy and auto. +For legacy a fixed key length of 1024 bits is used, whereas for auto the key +length is determined automatically. +The default is none, which disables DHE cipher suites. +.It Ic ecdhe Ar curve +Specify the ECDHE curve to use for ECDHE cipher suites. +Valid parameter values are none, auto and the short name of any known curve. +The default is auto. .It Ic key Ar file Specify the private key to use for this server. The |