From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 18 Nov 2013 16:52:10 +0000 (+0000)
Subject: Don't define SSL_select_next_proto if OPENSSL_NO_TLSEXT set
X-Git-Tag: OpenSSL_1_0_2-beta1~154
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bba0bda61656885343b81c0ca76de900d2b4266;p=oweals%2Fopenssl.git

Don't define SSL_select_next_proto if OPENSSL_NO_TLSEXT set
(cherry picked from commit 60aeb18750382362ec1c4e1cf05a7222c99ec886)
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 480da2fbc8..5eb45f902e 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1227,9 +1227,11 @@ void SSL_get0_next_proto_negotiated(const SSL *s,
 				    const unsigned char **data, unsigned *len);
 #endif
 
+#ifndef OPENSSL_NO_TLSEXT
 int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
 			  const unsigned char *in, unsigned int inlen,
 			  const unsigned char *client, unsigned int client_len);
+#endif
 
 #define OPENSSL_NPN_UNSUPPORTED	0
 #define OPENSSL_NPN_NEGOTIATED	1