diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-03-14 23:23:26 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-03-23 21:08:20 +0100 |
| commit | 93f1c13619c5b41f2dcfdbf6ae666f867922a87a (patch) | |
| tree | 8f6fc1f7b9808e435c10a0fd805ea506391194f6 | |
| parent | 24a0d3933d24059942a3cf99695d486c8fadd576 (diff) | |
| download | openssl-93f1c13619c5b41f2dcfdbf6ae666f867922a87a.tar.gz | |
Don't send a for ServerKeyExchange for kDHr and kDHd
The certificate already contains the DH parameters in that case.
ssl3_send_server_key_exchange() would fail in that case anyway.
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | ssl/d1_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index b89c369768..b55af35c75 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -484,7 +484,7 @@ int dtls1_accept(SSL *s) #ifndef OPENSSL_NO_PSK || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint) #endif - || (alg_k & (SSL_kDHE | SSL_kDHr | SSL_kDHd)) + || (alg_k & SSL_kDHE) || (alg_k & SSL_kECDHE) || ((alg_k & SSL_kRSA) && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL |