diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2013-12-19 15:11:15 -0500 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-09 15:43:28 +0000 |
commit | 5a21cadbeb9fa13ddeffb31b5749336cdd8c4081 (patch) | |
tree | 5a24b7c405a9969d02771e8f6d184931c64fb56b /doc | |
parent | 75cb3771b4699bb3763ed133c7d45d88383894b1 (diff) |
use SSL_kDHE throughout instead of SSL_kEDH
DHE is the standard term used by the RFCs and by other TLS
implementations. It's useful to have the internal variables use the
standard terminology.
This patch leaves a synonym SSL_kEDH in place, though, so that older
code can still be built against it, since that has been the
traditional API. SSL_kEDH should probably be deprecated at some
point, though.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apps/ciphers.pod | 2 | ||||
-rw-r--r-- | doc/ssleay.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod index c571830950..03056ebb50 100644 --- a/doc/apps/ciphers.pod +++ b/doc/apps/ciphers.pod @@ -179,7 +179,7 @@ attack and so their use is normally discouraged. cipher suites using RSA key exchange, authentication or either respectively. -=item B<kEDH> +=item B<kDHE> cipher suites using ephemeral DH key agreement. diff --git a/doc/ssleay.txt b/doc/ssleay.txt index 868a4a610b..8c0f3aca4e 100644 --- a/doc/ssleay.txt +++ b/doc/ssleay.txt @@ -6026,7 +6026,7 @@ one at a time, or use 'aliases' to specify the preference and order for the ciphers. There are a large number of aliases, but the most importaint are -kRSA, kDHr, kDHd and kEDH for key exchange types. +kRSA, kDHr, kDHd and kDHE for key exchange types. aRSA, aDSS, aNULL and aDH for authentication DES, 3DES, RC4, RC2, IDEA and eNULL for ciphers |