Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(779)

Unified Diff: lib/ssl/sslimpl.h

Issue 277090043: Bug 1227905 - Support ChaCha20+Poly1305 cipher suites (Closed)
Patch Set: ssl.sh cleanup wrt CLONG/CSHORT Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/ssl/sslenum.c ('k') | lib/ssl/sslinfo.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/ssl/sslimpl.h
diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h
index af12971b75415b110905fcb19082919705c02660..113ee0b3d5dd69b1a334d42d416c0be6f3292c3f 100644
--- a/lib/ssl/sslimpl.h
+++ b/lib/ssl/sslimpl.h
@@ -50,6 +50,7 @@ typedef SSLMACAlgorithm SSL3MACAlgorithm;
#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
@@ -285,9 +286,9 @@ typedef struct {
} ssl3CipherSuiteCfg;
#ifndef NSS_DISABLE_ECC
-#define ssl_V3_SUITES_IMPLEMENTED 64
+#define ssl_V3_SUITES_IMPLEMENTED 67
#else
-#define ssl_V3_SUITES_IMPLEMENTED 40
+#define ssl_V3_SUITES_IMPLEMENTED 41
#endif /* NSS_DISABLE_ECC */
#define MAX_DTLS_SRTP_CIPHER_SUITES 4
@@ -472,6 +473,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;
« no previous file with comments | « lib/ssl/sslenum.c ('k') | lib/ssl/sslinfo.c » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b