diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2014-05-12 14:17:22 -0400 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2014-11-10 10:58:49 +0100 |
| commit | 0ec6898c67aeddc3c414f3cc1af2275d81329c20 (patch) | |
| tree | c4830e7fa7f797e531264e13112454131edf0d8e /ssl/tls1.h | |
| parent | 1e10aee2a7381ffa1680d6239bdb6cf164d8ba1c (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 'ssl/tls1.h')
| -rw-r--r-- | ssl/tls1.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/tls1.h b/ssl/tls1.h index 3c8de73032..874479b820 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -555,12 +555,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) #define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032 /* XXX - * Inconsistency alert: - * The OpenSSL names of ciphers with ephemeral DH here include the string - * "DHE", while elsewhere it has always been "EDH". - * (The alias for the list of all such ciphers also is "EDH".) - * The specifications speak of "EDH"; maybe we should allow both forms - * for everything. */ +* Backward compatibility alert: ++ * Older versions of OpenSSL gave some DHE ciphers names with "EDH" ++ * instead of "DHE". Going forward, we should be using DHE ++ * everywhere, though we may indefinitely maintain aliases for users ++ * or configurations that used "EDH" ++ */ #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" |