net: rework the NPN patch.

net/third_party/nss/ssl/sslerr.h

 /*
  * Enumeration of all SSL-specific error codes.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 186 matching lines @@
 
 SSL_ERROR_DECOMPRESSION_FAILURE         = (SSL_ERROR_BASE + 111),
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED     = (SSL_ERROR_BASE + 112),
 SSL_ERROR_UNSAFE_NEGOTIATION            = (SSL_ERROR_BASE + 113),
 
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD     = (SSL_ERROR_BASE + 114),
 
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY  = (SSL_ERROR_BASE + 115),
 
 SSL_ERROR_RX_UNEXPECTED_CERT_STATUS     = (SSL_ERROR_BASE + 116),
+// SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID results if the peer sends invalid next
+// protocol information during a handshake.

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

Use a C-style comment /* */.

This comment should be added to a different file that contains
the error messages.  On the NSS trunk (NSS 3.13), that file is
http://mxr.mozilla.org/security/source/security/nss/lib/ssl/SSLerrs.h

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

Have removed the comment here. We don't that that trunk file yet so the addition
will have to wait for the next upstream sync.

+SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID    = (SSL_ERROR_BASE + 117),
 
 SSL_ERROR_END_OF_LIST   /* let the c compiler determine the value of this. */
 } SSLErrorCodes;
 #endif /* NO_SECURITY_ERROR_ENUM */
 
 #endif /* __SSL_ERR_H_ */