diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2013-12-19 15:11:15 -0500 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-09 15:43:28 +0000 |
| commit | 5a21cadbeb9fa13ddeffb31b5749336cdd8c4081 (patch) | |
| tree | 5a24b7c405a9969d02771e8f6d184931c64fb56b /ssl/t1_trce.c | |
| parent | 75cb3771b4699bb3763ed133c7d45d88383894b1 (diff) | |
| download | openssl-5a21cadbeb9fa13ddeffb31b5749336cdd8c4081.tar.gz | |
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/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index bc901556a6..2d0a74ce80 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -810,10 +810,10 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "krb5"; return SSL_kKRB5; } - if (alg_k & SSL_kEDH) + if (alg_k & SSL_kDHE) { *pname = "DHE"; - return SSL_kEDH; + return SSL_kDHE; } if (alg_k & SSL_kECDHE) { @@ -885,7 +885,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl, BIO_puts(bio, "implicit\n"); break; } - case SSL_kEDH: + case SSL_kDHE: if (!ssl_print_hexbuf(bio, indent + 2, "dh_Yc", 2, &msg, &msglen)) return 0; @@ -938,7 +938,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl, return 0; break; - case SSL_kEDH: + case SSL_kDHE: if (!ssl_print_hexbuf(bio, indent + 2, "dh_p", 2, &msg, &msglen)) return 0; |