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

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

Issue 21696002: Implement the AES GCM cipher suites for TLS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Also update the ecdhe_ecdsa_suites and ecdhe_rsa_suites arrays Created 7 years, 4 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 11 matching lines...) Expand all
22 * 22 *
23 * The ordering of cipher suites in this table must match the ordering in 23 * The ordering of cipher suites in this table must match the ordering in
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 TLS_RSA_WITH_AES_128_GCM_SHA256,
32 /* 256-bit */ 33 /* 256-bit */
33 #ifdef NSS_ENABLE_ECC 34 #ifdef NSS_ENABLE_ECC
35 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
36 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
34 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 37 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
35 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 38 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
36 #endif /* NSS_ENABLE_ECC */ 39 #endif /* NSS_ENABLE_ECC */
37 TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, 40 TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
38 TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, 41 TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
39 TLS_DHE_RSA_WITH_AES_256_CBC_SHA, 42 TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
40 TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, 43 TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
41 TLS_DHE_DSS_WITH_AES_256_CBC_SHA, 44 TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
42 #ifdef NSS_ENABLE_ECC 45 #ifdef NSS_ENABLE_ECC
43 TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, 46 TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 SSL_GetImplementedCiphers(void) 136 SSL_GetImplementedCiphers(void)
134 { 137 {
135 return SSL_ImplementedCiphers; 138 return SSL_ImplementedCiphers;
136 } 139 }
137 140
138 PRUint16 141 PRUint16
139 SSL_GetNumImplementedCiphers(void) 142 SSL_GetNumImplementedCiphers(void)
140 { 143 {
141 return SSL_NumImplementedCiphers; 144 return SSL_NumImplementedCiphers;
142 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698