| Index: net/third_party/nss/ssl/sslenum.c
|
| ===================================================================
|
| --- net/third_party/nss/ssl/sslenum.c (revision 127513)
|
| +++ net/third_party/nss/ssl/sslenum.c (working copy)
|
| @@ -39,7 +39,7 @@
|
| * the terms of any one of the MPL, the GPL or the LGPL.
|
| *
|
| * ***** END LICENSE BLOCK ***** */
|
| -/* $Id: sslenum.c,v 1.17 2010/02/10 18:07:21 wtc%google.com Exp $ */
|
| +/* $Id: sslenum.c,v 1.18 2012/03/06 00:26:31 wtc%google.com Exp $ */
|
|
|
| #include "ssl.h"
|
| #include "sslproto.h"
|
| @@ -55,6 +55,9 @@
|
| * Camellia without having to disable AES and RC4, which are needed for
|
| * interoperability with clients that don't yet implement Camellia.
|
| *
|
| + * The ordering of cipher suites in this table must match the ordering in
|
| + * the cipherSuites table in ssl3con.c.
|
| + *
|
| * If new ECC cipher suites are added, also update the ssl3CipherSuite arrays
|
| * in ssl3ecc.c.
|
| */
|
| @@ -95,8 +98,8 @@
|
| #endif /* NSS_ENABLE_ECC */
|
| TLS_RSA_WITH_SEED_CBC_SHA,
|
| TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
| + SSL_RSA_WITH_RC4_128_SHA,
|
| SSL_RSA_WITH_RC4_128_MD5,
|
| - SSL_RSA_WITH_RC4_128_SHA,
|
| TLS_RSA_WITH_AES_128_CBC_SHA,
|
|
|
| /* 112-bit 3DES */
|
|
|