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/ssl_locl.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/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 6d8047c91c..afd144645b 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -292,10 +292,12 @@ #define SSL_kDHr 0x00000002L /* DH cert, RSA CA cert */ #define SSL_kDHd 0x00000004L /* DH cert, DSA CA cert */ #define SSL_kEDH 0x00000008L /* tmp DH key no DH cert */ +#define SSL_kDHE SSL_kEDH /* forward-compatible synonym */ #define SSL_kKRB5 0x00000010L /* Kerberos5 key exchange */ #define SSL_kECDHr 0x00000020L /* ECDH cert, RSA CA cert */ #define SSL_kECDHe 0x00000040L /* ECDH cert, ECDSA CA cert */ #define SSL_kEECDH 0x00000080L /* ephemeral ECDH */ +#define SSL_kECDHE SSL_kEECDH /* forward-compatible synonym */ #define SSL_kPSK 0x00000100L /* PSK */ #define SSL_kGOST 0x00000200L /* GOST key exchange */ #define SSL_kSRP 0x00000400L /* SRP */ |