net: add ChaCha20+Poly1305 support to libssl.

net/third_party/nss/ssl/sslinfo.c

Index: net/third_party/nss/ssl/sslinfo.c
diff --git a/net/third_party/nss/ssl/sslinfo.c b/net/third_party/nss/ssl/sslinfo.c
index 959720948d1392c6fda5f551cbdfaeac758e83de..62a177f06b0eba8d46a8449f6769a18a96c382cf 100644
--- a/net/third_party/nss/ssl/sslinfo.c
+++ b/net/third_party/nss/ssl/sslinfo.c
@@ -118,6 +118,7 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len)
 #define C_NULL  "NULL", calg_null
 #define C_SJ 	"SKIPJACK", calg_sj
 #define C_AESGCM "AES-GCM", calg_aes_gcm
+#define C_C20P1305 "CHACHA20POLY1305", calg_c20p1305
 
 #define B_256	256, 256, 256
 #define B_128	128, 128, 128
@@ -136,6 +137,8 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len)
 
 static const SSLCipherSuiteInfo suiteInfo[] = {
 /* <------ Cipher suite --------------------> <auth> <KEA>  <bulk cipher> <MAC> <FIPS> */
+{0,CS(TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305),S_ECDSA,K_ECDHE,C_C20P1305,B_256,M_AEAD_128,$0, 0, 0, },

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

There is a "$0" in this line. It should be "0".

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

Thanks! A vim movement command that slipped in.

+{0,CS(TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305),  S_RSA,K_ECDHE,C_C20P1305,B_256,M_AEAD_128, 0, 0, 0, },

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

Move these to the ECDHE_ECDSA and ECDHE_RSA sections, respectively.

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

Done.

 {0,CS(TLS_RSA_WITH_AES_128_GCM_SHA256),       S_RSA, K_RSA, C_AESGCM, B_128, M_AEAD_128, 1, 0, 0, },
 
 {0,CS(TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA), S_RSA, K_DHE, C_CAMELLIA, B_256, M_SHA, 0, 0, 0, },