summaryrefslogtreecommitdiffstats
path: root/doc/ssl/SSL_CTX_set_cipher_list.pod
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2014-05-12 14:17:22 -0400
committerKurt Roeckx <kurt@roeckx.be>2014-11-10 10:58:49 +0100
commit0ec6898c67aeddc3c414f3cc1af2275d81329c20 (patch)
treec4830e7fa7f797e531264e13112454131edf0d8e /doc/ssl/SSL_CTX_set_cipher_list.pod
parent1e10aee2a7381ffa1680d6239bdb6cf164d8ba1c (diff)
Allow ECDHE and DHE as forward-compatible aliases for EECDH and EDH
see RT #3203 Future versions of OpenSSL use the canonical terms "ECDHE" and "DHE" as configuration strings and compilation constants. This patch introduces aliases so that the stable 1.0.2 branch can be forward-compatible with code and configuration scripts that use the normalized terms, while avoiding changing any library output for stable users. Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'doc/ssl/SSL_CTX_set_cipher_list.pod')
-rw-r--r--doc/ssl/SSL_CTX_set_cipher_list.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ssl/SSL_CTX_set_cipher_list.pod b/doc/ssl/SSL_CTX_set_cipher_list.pod
index bd4df4abd4..c84a8314be 100644
--- a/doc/ssl/SSL_CTX_set_cipher_list.pod
+++ b/doc/ssl/SSL_CTX_set_cipher_list.pod
@@ -41,7 +41,7 @@ RSA export ciphers with a keylength of 512 bits for the RSA key require
a temporary 512 bit RSA key, as typically the supplied key has a length
of 1024 bit (see
L<SSL_CTX_set_tmp_rsa_callback(3)|SSL_CTX_set_tmp_rsa_callback(3)>).
-RSA ciphers using EDH need a certificate and key and additional DH-parameters
+RSA ciphers using DHE need a certificate and key and additional DH-parameters
(see L<SSL_CTX_set_tmp_dh_callback(3)|SSL_CTX_set_tmp_dh_callback(3)>).
A DSA cipher can only be chosen, when a DSA certificate is available.