[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e3bc1305ec97d4ad4ab05fa59a288e92df2b2025 (commit)
      from  66ed24b1624606593a23c9fe78d459718d26409c (commit)


- Log -----------------------------------------------------------------
commit e3bc1305ec97d4ad4ab05fa59a288e92df2b2025
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jan 11 10:35:15 2017 +0000

    Fix compilation with no-nextprotoneg
    
    A guard was in the wrong place in the header file.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2212)

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

Summary of changes:
 ssl/ssl_locl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 1bff6ad..10ae54c 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -807,7 +807,6 @@ struct ssl_ctx_st {
         unsigned char *supportedgroups;
 # endif                         /* OPENSSL_NO_EC */
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
         /*
          * ALPN information (we are in the process of transitioning from NPN to
          * ALPN.)
@@ -837,6 +836,7 @@ struct ssl_ctx_st {
         unsigned char *alpn;
         size_t alpn_len;
 
+# ifndef OPENSSL_NO_NEXTPROTONEG
         /* Next protocol negotiation information */
 
         /*