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..f872f374f51e48e55210d612c45933734ddcca66 100644
--- a/net/third_party/nss/ssl/sslimpl.h
+++ b/net/third_party/nss/ssl/sslimpl.h
@@ -322,11 +322,6 @@ 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. */
-    SECItem      nextProtoNego;
-
     unsigned int useSecurity		: 1;  /*  1 */
     unsigned int useSocks		: 1;  /*  2 */
     unsigned int requestCertificate	: 1;  /*  3 */
@@ -827,7 +822,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;
 
 
@@ -887,13 +881,9 @@ struct ssl3StateStr {
 
     /* In a client: if the server supports Next Protocol Negotiation, then
      * this is the protocol that was requested.

[wtc, 2011/10/11 23:43:04]

Nit: I think "that was negotiated" or "that the client selected"
is clearer than "that was requested".

At least change this to "that the client requested".

[agl, 2011/10/17 17:37:24]

Done.

-     * In a server: this is the protocol that the client requested via Next
-     * Protocol Negotiation.

[wtc, 2011/10/11 23:43:04]

Why do you delete this comment about servers?
Is it because the NPN patch for NSS does't have the
server-side implementation?  (I don't see a
ssl3_ServerSendNextProtoNegoXtn function.)

[agl, 2011/10/17 17:37:24]

Right, the server side hasn't been written and the comment was misleading in
suggesting that server-side support exists.

      *
-     * 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 */
 };
 
 typedef struct {
@@ -1129,6 +1119,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 */