Allow NPN enable on a per-SSL connection basis...

openssl/ssl/t1_lib.c

Index: openssl/ssl/t1_lib.c
===================================================================
--- openssl/ssl/t1_lib.c	(revision 65717)
+++ openssl/ssl/t1_lib.c	(working copy)
@@ -272,7 +272,7 @@
 			i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, &ret);
 		}
 
-	if (s->ctx->next_proto_select_cb)
+	if (s->next_proto_select_cb)
 		{
 		/* The client advertises an emtpy extension to indicate its
 		 * support for Next Protocol Negotiation */
@@ -922,7 +922,7 @@
 			unsigned char selected_len;
 
 			/* We must have requested it. */
-			if ((s->ctx->next_proto_select_cb == NULL))
+			if ((s->next_proto_select_cb == NULL))
 				{
 				*al = TLS1_AD_UNSUPPORTED_EXTENSION;
 				return 0;
@@ -933,7 +933,7 @@
 				*al = TLS1_AD_DECODE_ERROR;
 				return 0;
 				}
-			if (s->ctx->next_proto_select_cb(s, &selected, &selected_len, data, size, s->ctx->next_proto_select_cb_arg) != SSL_TLSEXT_ERR_OK)
+			if (s->next_proto_select_cb(s, &selected, &selected_len, data, size, s->next_proto_select_cb_arg) != SSL_TLSEXT_ERR_OK)
 				{
 				*al = TLS1_AD_INTERNAL_ERROR;
 				return 0;