Don't define SSL_select_next_proto if OPENSSL_NO_TLSEXT set
authorDr. Stephen Henson <steve@openssl.org>
Mon, 18 Nov 2013 16:52:10 +0000 (16:52 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 18 Nov 2013 18:59:03 +0000 (18:59 +0000)
(cherry picked from commit 60aeb18750382362ec1c4e1cf05a7222c99ec886)

ssl/ssl.h

index 480da2fbc8f1004a8dc4570210a98d1667b59021..5eb45f902ebdc88665771d23dcde686de5becbe9 100644 (file)
--- 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