summaryrefslogtreecommitdiffstats
path: root/ssl/d1_srvr.c
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2013-12-19 13:57:49 -0500
committerDr. Stephen Henson <steve@openssl.org>2014-01-09 15:43:27 +0000
commit4082fea81c150e9f2643819148d275e500f309a3 (patch)
tree0fb647fb2be306c2b8a488ab1c91b63d981f89ee /ssl/d1_srvr.c
parent0be085d34aad30caeecd976d69ca43b0a1c2c5f0 (diff)
use SSL_kECDHE throughout instead of SSL_kEECDH
ECDHE 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_kEECDH in place, though, so that older code can still be built against it, since that has been the traditional API. SSL_kEECDH should probably be deprecated at some point, though.
Diffstat (limited to 'ssl/d1_srvr.c')
-rw-r--r--ssl/d1_srvr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index c69d44b839..267b8caee3 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -492,7 +492,7 @@ int dtls1_accept(SSL *s)
|| ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
#endif
|| (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
- || (alg_k & SSL_kEECDH)
+ || (alg_k & SSL_kECDHE)
|| ((alg_k & SSL_kRSA)
&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
|| (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)