From 4082fea81c150e9f2643819148d275e500f309a3 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 19 Dec 2013 13:57:49 -0500 Subject: 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. --- ssl/t1_trce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ssl/t1_trce.c') diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 751e0ff..4552c99 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -815,10 +815,10 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "edh"; return SSL_kEDH; } - if (alg_k & SSL_kEECDH) + if (alg_k & SSL_kECDHE) { *pname = "ECDHE"; - return SSL_kEECDH; + return SSL_kECDHE; } if (alg_k & SSL_kECDHr) { @@ -899,7 +899,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl, BIO_puts(bio, "implicit\n"); break; } - case SSL_kEECDH: + case SSL_kECDHE: if (!ssl_print_hexbuf(bio, indent + 2, "ecdh_Yc", 1, &msg, &msglen)) return 0; @@ -950,7 +950,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl, return 0; break; - case SSL_kEECDH: + case SSL_kECDHE: if (msglen < 1) return 0; BIO_indent(bio, indent + 2, 80); -- cgit v1.1