From: Matt Caswell <matt@openssl.org>
Date: Thu, 19 Jan 2017 10:07:50 +0000 (+0000)
Subject: Set the kex modes on the client too.
X-Git-Tag: OpenSSL_1_1_1-pre1~2565
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3ad72ce1de399322c4362acc2d4d792f7f14893;p=oweals%2Fopenssl.git

Set the kex modes on the client too.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
---

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 8c663320e1..1e6eddf373 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -516,6 +516,8 @@ int tls_construct_ctos_psk_kex_modes(SSL *s, WPACKET *pkt, X509 *x,
         SSLerr(SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES, ERR_R_INTERNAL_ERROR);
         return 0;
     }
+
+    s->ext.psk_kex_mode = TLSEXT_KEX_MODE_FLAG_KE | TLSEXT_KEX_MODE_FLAG_KE_DHE;
 #endif
 
     return 1;