diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2013-11-13 15:20:22 -0800 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-11-14 01:20:12 +0000 |
| commit | 2911575c6e790541e495927a60121d7546a66962 (patch) | |
| tree | f41125d3a9c716eb9a0f0e33d34930c4c9dd48e2 /ssl/ssl_lib.c | |
| parent | afa23c46d966fc3862804612be999d403a755cd7 (diff) | |
| download | openssl-2911575c6e790541e495927a60121d7546a66962.tar.gz | |
Fix compilation with no-nextprotoneg.
PR#3106
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 54f02a67c4..7eb1a0cafc 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1596,7 +1596,6 @@ int SSL_get_servername_type(const SSL *s) return -1; } -# ifndef OPENSSL_NO_NEXTPROTONEG /* SSL_select_next_proto implements the standard protocol selection. It is * expected that this function is called from the callback set by * SSL_CTX_set_next_proto_select_cb. @@ -1663,6 +1662,7 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, const unsi return status; } +# ifndef OPENSSL_NO_NEXTPROTONEG /* SSL_get0_next_proto_negotiated sets *data and *len to point to the client's * requested protocol for this connection and returns 0. If the client didn't * request any protocol, then *data is set to NULL. |