From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 30 Jun 2015 15:39:41 +0000 (+0100)
Subject: Check for kECDH with extensions.
X-Git-Tag: OpenSSL_1_1_0-pre1~890
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=13be69f3e67f8b974183e6fff6d12d9a841ee97f;p=oweals%2Fopenssl.git

Check for kECDH with extensions.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index f5575e06ad..a91e152cb9 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1157,7 +1157,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
 
             alg_k = c->algorithm_mkey;
             alg_a = c->algorithm_auth;
-            if ((alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe)
+            if ((alg_k & (SSL_kECDHE | SSL_kECDHr | SSL_kECDHe | SSL_kECDHEPSK)
                  || (alg_a & SSL_aECDSA))) {
                 using_ecc = 1;
                 break;