Update to NSS 3.12.7.

net/third_party/nss/ssl/sslproto.h

 /*
  * Various and sundry protocol constants. DON'T CHANGE THESE. These values 
  * are mostly defined by the SSL2, SSL3, or TLS protocol specifications.
  * Cipher kinds and ciphersuites are part of the public API.
  *
  * ***** 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
@@ skipping 21 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslproto.h,v 1.14 2010/01/28 06:19:12 nelson%bolyard.com Exp $ */
+/* $Id: sslproto.h,v 1.15 2010/02/16 18:56:48 wtc%google.com Exp $ */
 
 #ifndef __sslproto_h_
 #define __sslproto_h_
 
 /* All versions less than 3_0 are treated as SSL version 2 */
 #define SSL_LIBRARY_VERSION_2                   0x0002
 #define SSL_LIBRARY_VERSION_3_0                 0x0300
 #define SSL_LIBRARY_VERSION_3_1_TLS             0x0301
 
 /* Header lengths of some of the messages */
@@ skipping 121 matching lines @@
 
 #define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA       0x0084
 #define TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA    0x0085
 #define TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA    0x0086
 #define TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA   0x0087
 #define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA   0x0088
 #define TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA   0x0089
 
 #define TLS_RSA_WITH_SEED_CBC_SHA               0x0096
 
-/* TLS "Signalling Cipher Suite Value" (SCSV). May be requested by client.
+/* TLS "Signaling Cipher Suite Value" (SCSV). May be requested by client.
  * Must NEVER be chosen by server.  SSL 3.0 server acknowledges by sending
  * back an empty Renegotiation Info (RI) server hello extension.
  */
-#define TLS_RENEGO_PROTECTION_REQUEST           0x00FF
+#define TLS_EMPTY_RENEGOTIATION_INFO_SCSV       0x00FF
 
 /* Cipher Suite Values starting with 0xC000 are defined in informational
  * RFCs.
  */
 #define TLS_ECDH_ECDSA_WITH_NULL_SHA            0xC001
 #define TLS_ECDH_ECDSA_WITH_RC4_128_SHA         0xC002
 #define TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    0xC003
 #define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     0xC004
 #define TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA     0xC005
 
@@ skipping 23 matching lines @@
 
 /* Netscape "experimental" cipher suites. */
 #define SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA   0xffe0
 #define SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA        0xffe1
 
 /* New non-experimental openly spec'ed versions of those cipher suites. */
 #define SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA      0xfeff
 #define SSL_RSA_FIPS_WITH_DES_CBC_SHA           0xfefe
 
 #endif /* __sslproto_h_ */