generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use SSL_kDHE throughout instead of SSL_kEDH

Browse Source 
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.
This commit is contained in:
Daniel Kahn Gillmor
2013-12-19 15:11:15 -05:00
committed by Dr. Stephen Henson
parent 75cb3771b4
commit 5a21cadbeb
10 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/s3_srvr.c
View File

@@ -493,7 +493,7 @@ int ssl3_accept(SSL *s)
/* SRP: send ServerKeyExchange */
|| (alg_k & SSL_kSRP)
#endif
|| (alg_k & SSL_kEDH)
|| (alg_k & SSL_kDHE)
|| (alg_k & SSL_kECDHE)
|| ((alg_k & SSL_kRSA)
&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
@@ -1414,7 +1414,7 @@ int ssl3_get_client_hello(SSL *s)
/* check whether we should disable session resumption */
if (s->not_resumable_session_cb != NULL)
s->session->not_resumable=s->not_resumable_session_cb(s,
((c->algorithm_mkey & (SSL_kEDH | SSL_kECDHE)) != 0));
((c->algorithm_mkey & (SSL_kDHE | SSL_kECDHE)) != 0));
if (s->session->not_resumable)
/* do not send a session ticket */
s->tlsext_ticket_expected = 0;
@@ -1663,7 +1663,7 @@ int ssl3_send_server_key_exchange(SSL *s)
else
#endif
#ifndef OPENSSL_NO_DH
if (type & SSL_kEDH)
if (type & SSL_kDHE)
{
dhp=cert->dh_tmp;
if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL))
@@ -2346,7 +2346,7 @@ int ssl3_get_client_key_exchange(SSL *s)
else
#endif
#ifndef OPENSSL_NO_DH
if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
if (alg_k & (SSL_kDHE|SSL_kDHr|SSL_kDHd))
{
int idx = -1;
EVP_PKEY *skey = NULL;