commit 13be69f3e67f8b974183e6fff6d12d9a841ee97f
author Dr. Stephen Henson <steve@openssl.org> Tue Jun 30 16:39:41 2015 +0100
committer Dr. Stephen Henson <steve@openssl.org> Thu Jul 30 14:43:35 2015 +0100
tree cc8246c1b2b24d1b2fa53ff0bd35be65ba4ad874
parent 526f94ad68345a18559ee334e03d7f31c96f47d6

Check for kECDH with extensions.

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

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index f5575e0..a91e152 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1157,7 +1157,7 @@
 
             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;