Update net/third_party/nss to NSS_3_15_5_BETA2.

net/third_party/nss/patches/chacha20poly1305.patch

 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c     2014-01-06 14:58:15.904992214 -0800
-+++ b/nss/lib/ssl/ssl3con.c     2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/ssl3con.c     2014-01-17 18:06:41.659713513 -0800
++++ b/nss/lib/ssl/ssl3con.c     2014-01-17 18:07:10.270188062 -0800
 @@ -40,6 +40,21 @@
  #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
  #endif
  
 +/* This is a bodge to allow this code to be compiled against older NSS
 + * headers. */
 +#ifndef CKM_NSS_CHACHA20_POLY1305
 +#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 26)
 +
 +typedef struct CK_NSS_AEAD_PARAMS {
@@ skipping 113 matching lines @@
 -       pwSpec->aead = ssl3_AESGCM;
 +       if (calg == calg_aes_gcm) {
 +           pwSpec->aead = ssl3_AESGCM;
 +       } else {
 +           pwSpec->aead = ssl3_ChaCha20Poly1305;
 +       }
         return SECSuccess;
      }
  
 diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c
---- a/nss/lib/ssl/ssl3ecc.c     2014-01-06 14:57:50.984587086 -0800
-+++ b/nss/lib/ssl/ssl3ecc.c     2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/ssl3ecc.c     2014-01-17 18:04:43.127747463 -0800
++++ b/nss/lib/ssl/ssl3ecc.c     2014-01-17 18:07:10.270188062 -0800
 @@ -904,6 +904,7 @@ static const ssl3CipherSuite ecdhe_ecdsa
      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
 +    TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
      TLS_ECDHE_ECDSA_WITH_NULL_SHA,
      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
      0 /* end of list marker */
 @@ -915,6 +916,7 @@ static const ssl3CipherSuite ecdhe_rsa_s
      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
@@ skipping 13 matching lines @@
      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
 @@ -934,6 +937,7 @@ static const ssl3CipherSuite ecSuites[]
      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
 +    TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
      TLS_ECDHE_RSA_WITH_NULL_SHA,
      TLS_ECDHE_RSA_WITH_RC4_128_SHA,
      TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
 diff -pu a/nss/lib/ssl/sslenum.c b/nss/lib/ssl/sslenum.c
---- a/nss/lib/ssl/sslenum.c     2014-01-06 14:53:43.540566574 -0800
-+++ b/nss/lib/ssl/sslenum.c     2014-01-06 15:11:13.167642594 -0800
+--- a/nss/lib/ssl/sslenum.c     2014-01-17 17:49:26.072517368 -0800
++++ b/nss/lib/ssl/sslenum.c     2014-01-17 18:08:43.791739267 -0800
 @@ -37,17 +37,21 @@
   *
   * Exception: Because some servers ignore the high-order byte of the cipher
   * suite ID, we must be careful about adding cipher suites with IDs larger
 - * than 0x00ff; see bug 946147. For these broken servers, the first four cipher
 + * than 0x00ff; see bug 946147. For these broken servers, the first six cipher
   * suites, with the MSB zeroed, look like:
 + *      TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA { 0x00,0x14 }
 + *      TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA { 0x00,0x13 }
-  *      TLS_KRB5_EXPORT_WITH_RC4_40_MD5 {0x00,0x2B }
+  *      TLS_KRB5_EXPORT_WITH_RC4_40_MD5 { 0x00,0x2B }
   *      TLS_RSA_WITH_AES_128_CBC_SHA { 0x00,0x2F }
   *      TLS_RSA_WITH_3DES_EDE_CBC_SHA { 0x00,0x0A }
   *      TLS_RSA_WITH_DES_CBC_SHA { 0x00,0x09 }
 - * The broken server only supports the third and fourth ones and will select
 - * the third one.
 + * The broken server only supports the fifth and sixth ones and will select
 + * the fifth one.
   */
  const PRUint16 SSL_ImplementedCiphers[] = {
  #ifdef NSS_ENABLE_ECC
 +    TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
 +    TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
      /* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA must appear before
 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h     2014-01-06 14:57:46.654516696 -0800
-+++ b/nss/lib/ssl/sslimpl.h     2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/sslimpl.h     2014-01-17 18:03:47.906831535 -0800
++++ b/nss/lib/ssl/sslimpl.h     2014-01-17 18:07:10.270188062 -0800
 @@ -65,6 +65,7 @@ typedef SSLSignType     SSL3SignType;
  #define calg_camellia  ssl_calg_camellia
  #define calg_seed      ssl_calg_seed
  #define calg_aes_gcm    ssl_calg_aes_gcm
 +#define calg_chacha20  ssl_calg_chacha20
  
  #define mac_null       ssl_mac_null
  #define mac_md5        ssl_mac_md5
-@@ -292,7 +293,7 @@ typedef struct {
+@@ -299,7 +300,7 @@ typedef struct {
  } ssl3CipherSuiteCfg;
  
  #ifdef NSS_ENABLE_ECC
 -#define ssl_V3_SUITES_IMPLEMENTED 61
 +#define ssl_V3_SUITES_IMPLEMENTED 63
  #else
  #define ssl_V3_SUITES_IMPLEMENTED 37
  #endif /* NSS_ENABLE_ECC */
-@@ -474,6 +475,7 @@ typedef enum {
+@@ -483,6 +484,7 @@ typedef enum {
      cipher_camellia_256,
      cipher_seed,
      cipher_aes_128_gcm,
 +    cipher_chacha20,
      cipher_missing              /* reserved for no such supported cipher */
      /* This enum must match ssl3_cipherName[] in ssl3con.c.  */
  } SSL3BulkCipher;
 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c
---- a/nss/lib/ssl/sslinfo.c     2014-01-06 14:57:21.444106895 -0800
-+++ b/nss/lib/ssl/sslinfo.c     2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/sslinfo.c     2014-01-17 18:00:45.503806125 -0800
++++ b/nss/lib/ssl/sslinfo.c     2014-01-17 18:07:10.270188062 -0800
 @@ -110,6 +110,7 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLCh
  #define C_NULL  "NULL", calg_null
  #define C_SJ   "SKIPJACK", calg_sj
  #define C_AESGCM "AES-GCM", calg_aes_gcm
 +#define C_CHACHA20 "CHACHA20POLY1305", calg_chacha20
  
  #define B_256  256, 256, 256
  #define B_128  128, 128, 128
 @@ -188,12 +189,14 @@ static const SSLCipherSuiteInfo suiteInf
  {0,CS(TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA),  S_ECDSA, K_ECDHE, C_AES, B_128, M_SHA, 1, 0, 0, },
  {0,CS(TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256), S_ECDSA, K_ECDHE, C_AES, B_128, M_SHA256, 1, 0, 0, },
  {0,CS(TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA),  S_ECDSA, K_ECDHE, C_AES, B_256, M_SHA, 1, 0, 0, },
 +{0,CS(TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305),S_ECDSA,K_ECDHE,C_CHACHA20,B_256,M_AEAD_128,0, 0, 0, },
  
  {0,CS(TLS_ECDH_RSA_WITH_NULL_SHA),            S_RSA, K_ECDH, C_NULL, B_0, M_SHA, 0, 0, 0, },
  {0,CS(TLS_ECDH_RSA_WITH_RC4_128_SHA),         S_RSA, K_ECDH, C_RC4, B_128, M_SHA, 0, 0, 0, },
  {0,CS(TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA),    S_RSA, K_ECDH, C_3DES, B_3DES, M_SHA, 1, 0, 0, },
  {0,CS(TLS_ECDH_RSA_WITH_AES_128_CBC_SHA),     S_RSA, K_ECDH, C_AES, B_128, M_SHA, 1, 0, 0, },
  {0,CS(TLS_ECDH_RSA_WITH_AES_256_CBC_SHA),     S_RSA, K_ECDH, C_AES, B_256, M_SHA, 1, 0, 0, },
 +{0,CS(TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305),  S_RSA,K_ECDHE,C_CHACHA20,B_256,M_AEAD_128, 0, 0, 0, },
  
  {0,CS(TLS_ECDHE_RSA_WITH_NULL_SHA),           S_RSA, K_ECDHE, C_NULL, B_0, M_SHA, 0, 0, 0, },
  {0,CS(TLS_ECDHE_RSA_WITH_RC4_128_SHA),        S_RSA, K_ECDHE, C_RC4, B_128, M_SHA, 0, 0, 0, },
 diff -pu a/nss/lib/ssl/sslproto.h b/nss/lib/ssl/sslproto.h
---- a/nss/lib/ssl/sslproto.h    2014-01-06 14:53:43.540566574 -0800
-+++ b/nss/lib/ssl/sslproto.h    2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/sslproto.h    2014-01-17 17:49:26.072517368 -0800
++++ b/nss/lib/ssl/sslproto.h    2014-01-17 18:07:10.270188062 -0800
 @@ -213,6 +213,9 @@
  #define TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256   0xC02F
  #define TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256    0xC031
  
 +#define TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305   0xCC13
 +#define TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 0xCC14
 +
  /* Netscape "experimental" cipher suites. */
  #define SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA  0xffe0
  #define SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA       0xffe1
 diff -pu a/nss/lib/ssl/sslt.h b/nss/lib/ssl/sslt.h
---- a/nss/lib/ssl/sslt.h        2014-01-06 14:58:13.034945554 -0800
-+++ b/nss/lib/ssl/sslt.h        2014-01-06 14:58:25.635150408 -0800
+--- a/nss/lib/ssl/sslt.h        2014-01-17 18:03:47.906831535 -0800
++++ b/nss/lib/ssl/sslt.h        2014-01-17 18:07:10.270188062 -0800
 @@ -94,7 +94,8 @@ typedef enum {
      ssl_calg_aes      = 7,
      ssl_calg_camellia = 8,
      ssl_calg_seed     = 9,
 -    ssl_calg_aes_gcm  = 10
 +    ssl_calg_aes_gcm  = 10,
 +    ssl_calg_chacha20 = 11
  } SSLCipherAlgorithm;
  
  typedef enum {