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

openssl/ssl/ssl.h

 /* ssl/ssl.h */
 /* 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 861 matching lines @@
 SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsigned char *Data, int len, int *copy);
 void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type,int val));
 void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val);
 void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey));
 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
 #ifndef OPENSSL_NO_ENGINE
 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
 #endif
 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len));
 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
+#ifndef OPENSSL_NO_TLSEXT
 void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb) (SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg), void *arg);
 void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s, int (*cb) (SSL *ssl, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg), void *arg);
+void SSL_set_next_proto_select_cb(SSL *s, int (*cb) (SSL *ssl, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg), void *arg);
 void SSL_CTX_set_snap_start_orbit(SSL_CTX *s, const unsigned char orbit[8]);
 
 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);
 void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, unsigned *len);
 
 void SSL_get0_suggested_server_random(const SSL *s, const unsigned char **data, unsigned *len);
 void SSL_set_suggested_server_random_validity(SSL *s, char is_valid);
 
 #define OPENSSL_NPN_UNSUPPORTED 0
 #define OPENSSL_NPN_NEGOTIATED  1
 #define OPENSSL_NPN_NO_OVERLAP  2
+#endif
 
 #define SSL_NOTHING     1
 #define SSL_WRITING     2
 #define SSL_READING     3
 #define SSL_X509_LOOKUP 4
 #define SSL_SERVER_RANDOM_VALIDATE      6
 
 /* These will only be used when doing non-blocking IO */
 #define SSL_want_nothing(s)     (SSL_want(s) == SSL_NOTHING)
 #define SSL_want_read(s)        (SSL_want(s) == SSL_READING)
@@ skipping 189 matching lines @@
 
         /* Next protocol negotiation. For the client, this is the protocol that
          * we sent in NextProtocol and is set when handling ServerHello
          * extensions.
          *
          * For a server, this is the client's selected_protocol from
          * NextProtocol and is set when handling the NextProtocol message,
          * before the Finished message. */
         unsigned char *next_proto_negotiated;
         unsigned char next_proto_negotiated_len;
+        /* For a client, this contains a callback function that selects the
+         * next protocol from the list provided by the server. */
+        int (*next_proto_select_cb)(SSL *s, unsigned char **out,
+                                    unsigned char *outlen,
+                                    const unsigned char *in,
+                                    unsigned int inlen,
+                                    void *arg);
+        void *next_proto_select_cb_arg;
 #define session_ctx initial_ctx
 #else
 #define session_ctx ctx
 #endif
         };
 
 #ifdef __cplusplus
 }
 #endif
 
@@ skipping 1059 matching lines @@
 #define SSL_R_WRONG_SSL_VERSION                          266
 #define SSL_R_WRONG_VERSION_NUMBER                       267
 #define SSL_R_X509_LIB                                   268
 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
 /* Next entry: 335 or 1115 */
 
 #ifdef  __cplusplus
 }
 #endif
 #endif