diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2013-12-19 21:11:15 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-09 16:43:28 +0100 |
| commit | 5a21cadbeb9fa13ddeffb31b5749336cdd8c4081 (patch) | |
| tree | 5a24b7c405a9969d02771e8f6d184931c64fb56b /ssl/d1_srvr.c | |
| parent | emit "DHE" instead of "edh" for kX packet trace output (diff) | |
| download | openssl-5a21cadbeb9fa13ddeffb31b5749336cdd8c4081.tar.xz openssl-5a21cadbeb9fa13ddeffb31b5749336cdd8c4081.zip | |
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 'ssl/d1_srvr.c')
| -rw-r--r-- | ssl/d1_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 267b8caee3..7816bbb503 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -491,7 +491,7 @@ int dtls1_accept(SSL *s) #ifndef OPENSSL_NO_PSK || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint) #endif - || (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) + || (alg_k & (SSL_kDHE|SSL_kDHr|SSL_kDHd)) || (alg_k & SSL_kECDHE) || ((alg_k & SSL_kRSA) && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL |