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

openssl/ssl/t1_lib.c

 /* ssl/t1_lib.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 254 matching lines @@
                         ret += 2;
                         itmp = i2d_OCSP_RESPID(id, &ret);
                         /* write id len */
                         s2n(itmp, q);
                         }
                 s2n(extlen, ret);
                 if (extlen > 0)
                         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 */
                 if (limit - ret - 4 < 0)
                         return NULL;
                 s2n(TLSEXT_TYPE_next_proto_neg,ret);
                 s2n(0,ret);
                 }
 
         if ((extdatalen = ret-p-2)== 0) 
@@ skipping 629 matching lines @@
                                 }
                         /* Set flag to expect CertificateStatus message */
                         s->tlsext_status_expected = 1;
                         }
                 else if (type == TLSEXT_TYPE_next_proto_neg)
                         {
                         unsigned char *selected;
                         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;
                                 }
                         /* The data must be valid */
                         if (!ssl_next_proto_validate(data, size))
                                 {
                                 *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;
                                 }
                         s->next_proto_negotiated = OPENSSL_malloc(selected_len);
                         if (!s->next_proto_negotiated)
                                 {
                                 *al = TLS1_AD_INTERNAL_ERROR;
                                 return 0;
                                 }
@@ skipping 329 matching lines @@
                 }
         /* If session decrypt failure indicate a cache miss and set state to
          * send a new ticket
          */
         tickerr:        
         s->tlsext_ticket_expected = 1;
         return 0;
         }
 
 #endif