root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix compilation with no-nextprotoneg 

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)
This commit is contained in:
Matt Caswell 2017-01-11 10:35:15 +00:00
parent 66ed24b162
commit e3bc1305ec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/ssl_locl.h
View File

@ -807,7 +807,6 @@ struct ssl_ctx_st {
unsigned char *supportedgroups; unsigned char *supportedgroups;
# endif /* OPENSSL_NO_EC */ # endif /* OPENSSL_NO_EC */
# ifndef OPENSSL_NO_NEXTPROTONEG
/* /*
* ALPN information (we are in the process of transitioning from NPN to * ALPN information (we are in the process of transitioning from NPN to
* ALPN.) * ALPN.)
@ -837,6 +836,7 @@ struct ssl_ctx_st {
unsigned char *alpn; unsigned char *alpn;
size_t alpn_len; size_t alpn_len;
# ifndef OPENSSL_NO_NEXTPROTONEG
/* Next protocol negotiation information */ /* Next protocol negotiation information */
/* /*