net: rework the NPN patch.

net/third_party/nss/ssl/sslimpl.h

Index: net/third_party/nss/ssl/sslimpl.h
diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h
index d73a0e3e5d00b849c9b2311ffba9f647de3ab964..d9f2bd7d177e8d9e17a9e394a9def8ac5fb73eda 100644
--- a/net/third_party/nss/ssl/sslimpl.h
+++ b/net/third_party/nss/ssl/sslimpl.h
@@ -322,9 +322,8 @@ typedef struct {
 #endif /* NSS_ENABLE_ECC */
 
 typedef struct sslOptionsStr {
-    /* For clients, this is a validated list of protocols in preference order
-     * and wire format. For servers, this is the list of support protocols,
-     * also in wire format. */
+    /* If SSL_SetNextProtoNego has been called, then this contains the
+     * list of supported protocols. */

[wtc, 2011/10/18 00:58:08]

Unless this comment would also be correct for the server side,
we should clarify that this applies to the client side only.

[agl, 2011/10/18 16:44:43]

I believe that it would apply to the server side code.

     SECItem      nextProtoNego;
 
     unsigned int useSecurity		: 1;  /*  1 */
@@ -827,7 +826,6 @@ const ssl3CipherSuiteDef *suite_def;
 #ifdef NSS_ENABLE_ECC
     PRUint32              negotiatedECCurves; /* bit mask */
 #endif /* NSS_ENABLE_ECC */
-    PRBool                nextProtoNego;/* Our peer has sent this extension */
 } SSL3HandshakeState;
 
 
@@ -886,14 +884,11 @@ struct ssl3StateStr {
     ssl3CipherSpec       specs[2];	/* one is current, one is pending. */
 
     /* In a client: if the server supports Next Protocol Negotiation, then
-     * this is the protocol that was requested.
-     * In a server: this is the protocol that the client requested via Next
-     * Protocol Negotiation.
+     * this is the protocol that was negotiated.
      *
-     * In either case, if the data pointer is non-NULL, then it is malloced
-     * data.  */
+     * If the data pointer is non-NULL, then it is malloced data.  */
     SECItem		nextProto;
-    int			nextProtoState;	/* See SSL_NEXT_PROTO_* defines */
+    int			nextProtoState; /* See NEXT_PROTO_* defines */
 };
 
 typedef struct {
@@ -1129,6 +1124,8 @@ const unsigned char *  preferredCipher;
     SSLHandshakeCallback      handshakeCallback;
     void                     *handshakeCallbackData;
     void                     *pkcs11PinArg;
+    SSLNextProtoCallback      nextProtoCallback;
+    void                     *nextProtoArg;
 
     PRIntervalTime            rTimeout; /* timeout for NSPR I/O */
     PRIntervalTime            wTimeout; /* timeout for NSPR I/O */