net: add ChaCha20+Poly1305 support to libssl.

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 0fe12d0d7e294e80a9487a8a826cb8ad506321bf..855c38b0a889d7a0853e16bf7fef1ad42d372dc3 100644
--- a/net/third_party/nss/ssl/sslimpl.h
+++ b/net/third_party/nss/ssl/sslimpl.h
@@ -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_c20p1305	ssl_calg_c20p1305
 
 #define mac_null	ssl_mac_null
 #define mac_md5 	ssl_mac_md5
@@ -292,9 +293,9 @@ 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
+#define ssl_V3_SUITES_IMPLEMENTED 39

[wtc, 2013/09/13 17:29:14]

This should be 37 (unchanged) because the two new ciphers are ECC ciphers.

[agl, 2013/09/13 20:51:45]

Done.

 #endif /* NSS_ENABLE_ECC */
 
 #define MAX_DTLS_SRTP_CIPHER_SUITES 4
@@ -474,6 +475,7 @@ typedef enum {
     cipher_camellia_256,
     cipher_seed,
     cipher_aes_128_gcm,
+    cipher_c20p1305,

[wtc, 2013/09/13 17:29:14]

I think we should at least say "cha". "c" seems too short :-)

But I can see it may make some names too long.

[agl, 2013/09/13 20:51:45]

I've changed to cipher_chacha20, which is less precise but also less confusing.
These names appear in tables and it's very difficult to maintain a limited
line-length with the full name. Let me know whatever you prefer.

     cipher_missing              /* reserved for no such supported cipher */
     /* This enum must match ssl3_cipherName[] in ssl3con.c.  */
 } SSL3BulkCipher;