diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-15 23:57:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-19 16:14:51 +0000 |
| commit | bc71f91064a3eec10310fa4cc14fe2a3fd9bc7bb (patch) | |
| tree | 7775c994e7acb1ba45132c84edda69305a3b467a /ssl/t1_trce.c | |
| parent | 74a62e9629b2d07360a62571ff3028c83b69b0d9 (diff) | |
Remove fixed DH ciphersuites.
Remove all fixed DH ciphersuites and associated logic.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 80d0bf80b3..dc718edda8 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -913,14 +913,6 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "rsa"; return SSL_kRSA; } - if (alg_k & SSL_kDHr) { - *pname = "dh_rsa"; - return SSL_kDHr; - } - if (alg_k & SSL_kDHd) { - *pname = "dh_dss"; - return SSL_kDHd; - } if (alg_k & SSL_kDHE) { *pname = "DHE"; return SSL_kDHE; @@ -993,14 +985,6 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl, } break; - /* Implicit parameters only allowed for static DH */ - case SSL_kDHd: - case SSL_kDHr: - if (msglen == 0) { - BIO_indent(bio, indent + 2, 80); - BIO_puts(bio, "implicit\n"); - break; - } case SSL_kDHE: case SSL_kDHEPSK: if (!ssl_print_hexbuf(bio, indent + 2, "dh_Yc", 2, &msg, &msglen)) @@ -1040,8 +1024,6 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl, } switch (id) { /* Should never happen */ - case SSL_kDHd: - case SSL_kDHr: case SSL_kECDHr: case SSL_kECDHe: BIO_indent(bio, indent + 2, 80); |