diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-12 10:06:45 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-12 10:06:45 +0000 |
| commit | c6f9019b6966db3efd5d3df74826f055fc48aa82 (patch) | |
| tree | 68a1d7baec0858bf48c28782fea6a3953f3bc761 /ssl | |
| parent | 04b76df3f72de65625c84eac2a00b4e3596c1102 (diff) | |
| download | openssl-c6f9019b6966db3efd5d3df74826f055fc48aa82.zip openssl-c6f9019b6966db3efd5d3df74826f055fc48aa82.tar.gz openssl-c6f9019b6966db3efd5d3df74826f055fc48aa82.tar.bz2 | |
Fix the enable-ssl-trace config option
The recent removal of static ECDH broke the enable-ssl-trace compilation.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_trce.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index de1cac7..fdc61a5 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -920,14 +920,6 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "ECDHE"; return SSL_kECDHE; } - if (alg_k & SSL_kECDHr) { - *pname = "ECDH RSA"; - return SSL_kECDHr; - } - if (alg_k & SSL_kECDHe) { - *pname = "ECDH ECDSA"; - return SSL_kECDHe; - } if (alg_k & SSL_kPSK) { *pname = "PSK"; return SSL_kPSK; @@ -990,13 +982,6 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl, return 0; break; - case SSL_kECDHr: - case SSL_kECDHe: - if (msglen == 0) { - BIO_indent(bio, indent + 2, 80); - BIO_puts(bio, "implicit\n"); - break; - } case SSL_kECDHE: case SSL_kECDHEPSK: if (!ssl_print_hexbuf(bio, indent + 2, "ecdh_Yc", 1, &msg, &msglen)) @@ -1022,13 +1007,6 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl, return 0; } switch (id) { - /* Should never happen */ - case SSL_kECDHr: - case SSL_kECDHe: - BIO_indent(bio, indent + 2, 80); - BIO_printf(bio, "Unexpected Message\n"); - break; - case SSL_kRSA: if (!ssl_print_hexbuf(bio, indent + 2, "rsa_modulus", 2, |