[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Kurt Roeckx]

The branch OpenSSL_1_0_2-stable has been updated
       via  fe82be2b33714949e24f107af94b5b75206a28cd (commit)
      from  8509128179a93e0b797ab80dadc2dff63ae194b3 (commit)


- Log -----------------------------------------------------------------
commit fe82be2b33714949e24f107af94b5b75206a28cd
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Mar 14 23:23:26 2015 +0100

    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 at openssl.org>
    (cherry picked from commit 93f1c13619c5b41f2dcfdbf6ae666f867922a87a)

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index eafa012..a184150 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -486,7 +486,7 @@ int dtls1_accept(SSL *s)
 #ifndef OPENSSL_NO_PSK
                 || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
-                || (alg_k & (SSL_kEDH | SSL_kDHr | SSL_kDHd))
+                || (alg_k & SSL_kDHE)
                 || (alg_k & SSL_kEECDH)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL