diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2013-12-19 19:57:49 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-09 16:43:27 +0100 |
| commit | 4082fea81c150e9f2643819148d275e500f309a3 (patch) | |
| tree | 0fb647fb2be306c2b8a488ab1c91b63d981f89ee /ssl/t1_trce.c | |
| parent | emit "ECDHE" instead of "EECDH" for kX packet trace output (diff) | |
| download | openssl-4082fea81c150e9f2643819148d275e500f309a3.tar.xz openssl-4082fea81c150e9f2643819148d275e500f309a3.zip | |
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/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 751e0fff5c..4552c99ede 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); |