Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: net/third_party/nss/ssl/sslenum.c

Issue 23619044: net: add ChaCha20+Poly1305 support to libssl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Table enumerating all implemented cipher suites 2 * Table enumerating all implemented cipher suites
3 * Part of public API. 3 * Part of public API.
4 * 4 *
5 * This Source Code Form is subject to the terms of the Mozilla Public 5 * This Source Code Form is subject to the terms of the Mozilla Public
6 * License, v. 2.0. If a copy of the MPL was not distributed with this 6 * License, v. 2.0. If a copy of the MPL was not distributed with this
7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8 8
9 #include "ssl.h" 9 #include "ssl.h"
10 #include "sslproto.h" 10 #include "sslproto.h"
(...skipping 13 matching lines...) Expand all
24 * the cipherSuites table in ssl3con.c. 24 * the cipherSuites table in ssl3con.c.
25 * 25 *
26 * If new ECC cipher suites are added, also update the ssl3CipherSuite arrays 26 * If new ECC cipher suites are added, also update the ssl3CipherSuite arrays
27 * in ssl3ecc.c. 27 * in ssl3ecc.c.
28 * 28 *
29 * Finally, update the ssl_V3_SUITES_IMPLEMENTED macro in sslimpl.h. 29 * Finally, update the ssl_V3_SUITES_IMPLEMENTED macro in sslimpl.h.
30 */ 30 */
31 const PRUint16 SSL_ImplementedCiphers[] = { 31 const PRUint16 SSL_ImplementedCiphers[] = {
32 /* AES-GCM */ 32 /* AES-GCM */
33 #ifdef NSS_ENABLE_ECC 33 #ifdef NSS_ENABLE_ECC
34 TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
35 TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
34 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 36 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
35 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 37 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
36 #endif /* NSS_ENABLE_ECC */ 38 #endif /* NSS_ENABLE_ECC */
37 TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, 39 TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
38 TLS_RSA_WITH_AES_128_GCM_SHA256, 40 TLS_RSA_WITH_AES_128_GCM_SHA256,
39 41
40 /* 256-bit */ 42 /* 256-bit */
41 #ifdef NSS_ENABLE_ECC 43 #ifdef NSS_ENABLE_ECC
42 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 44 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
43 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 45 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 SSL_GetImplementedCiphers(void) 143 SSL_GetImplementedCiphers(void)
142 { 144 {
143 return SSL_ImplementedCiphers; 145 return SSL_ImplementedCiphers;
144 } 146 }
145 147
146 PRUint16 148 PRUint16
147 SSL_GetNumImplementedCiphers(void) 149 SSL_GetNumImplementedCiphers(void)
148 { 150 {
149 return SSL_NumImplementedCiphers; 151 return SSL_NumImplementedCiphers;
150 } 152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698