[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  cf53cbea5bbf9c3a1998e2ddd0173881a5a97475 (commit)
      from  76e0d0b21cc4e8a879d54f4d78a392826dadb1d1 (commit)


- Log -----------------------------------------------------------------
commit cf53cbea5bbf9c3a1998e2ddd0173881a5a97475
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 10 17:09:35 2017 +0200

    Fix 'no-ec'
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3430)

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

Summary of changes:
 ssl/statem/extensions_srvr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index 22d2c4a..381e72b 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -868,6 +868,7 @@ int tls_construct_stoc_ec_pt_formats(SSL *s, WPACKET *pkt, unsigned int context,
 }
 #endif
 
+#ifndef OPENSSL_NO_EC
 int tls_construct_stoc_supported_groups(SSL *s, WPACKET *pkt,
                                         unsigned int context, X509 *x,
                                         size_t chainidx, int *al)
@@ -923,6 +924,7 @@ int tls_construct_stoc_supported_groups(SSL *s, WPACKET *pkt,
 
     return 1;
 }
+#endif
 
 int tls_construct_stoc_session_ticket(SSL *s, WPACKET *pkt,
                                       unsigned int context, X509 *x,