Fix compilation with no-nextprotoneg
authorMatt Caswell <matt@openssl.org>
Wed, 11 Jan 2017 10:35:15 +0000 (10:35 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 11 Jan 2017 17:51:51 +0000 (17:51 +0000)
A guard was in the wrong place in the header file.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2212)

ssl/ssl_locl.h

index 1bff6ad..10ae54c 100644 (file)
@@ -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 */
 
         /*