diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-11 10:35:15 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-11 17:51:51 +0000 |
| commit | e3bc1305ec97d4ad4ab05fa59a288e92df2b2025 (patch) | |
| tree | 317a661699d32808c875c102db0e79db298563ee | |
| parent | 66ed24b1624606593a23c9fe78d459718d26409c (diff) | |
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)
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 1bff6ada41..10ae54c5b6 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 */ /* |