From: Matt Caswell <matt@openssl.org>
Date: Wed, 28 Dec 2016 12:10:28 +0000 (+0000)
Subject: Fix the EC point formats extension
X-Git-Tag: OpenSSL_1_1_1-pre1~2821
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b58c54f26b826abd55a513494ef892e7ad069ad;p=openssl

Fix the EC point formats extension

This should be sent in the ServerHello if a EC based ciphersuite is
negotiated. The relevant flag to do this was missed off in the recent
extensions refactor.

Fixes GitHub Issue #2133

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2153)
---

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 760b150a61..f6b0589ffe 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -120,7 +120,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
 #ifndef OPENSSL_NO_EC
     {
         TLSEXT_TYPE_ec_point_formats,
-        EXT_CLIENT_HELLO | EXT_TLS1_2_AND_BELOW_ONLY,
+        EXT_CLIENT_HELLO | EXT_TLS1_2_SERVER_HELLO | EXT_TLS1_2_AND_BELOW_ONLY,
         NULL, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
         tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
         final_ec_pt_formats