Commit e3bc1305 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix compilation with no-nextprotoneg 



A guard was in the wrong place in the header file.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2212)
parent 66ed24b1

ssl/ssl_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */



        /*