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

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

Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix applypatches.sh mistakes Created 6 years, 11 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 23 matching lines...) Expand all
34 * algorithm: GCM, then HMAC-SHA1, then HMAC-SHA256, then HMAC-MD5. 34 * algorithm: GCM, then HMAC-SHA1, then HMAC-SHA256, then HMAC-MD5.
35 * * Within message authentication algorithm sections, order by asymmetric 35 * * Within message authentication algorithm sections, order by asymmetric
36 * signature algorithm: ECDSA, then RSA, then DSS. 36 * signature algorithm: ECDSA, then RSA, then DSS.
37 * 37 *
38 * Exception: Because some servers ignore the high-order byte of the cipher 38 * Exception: Because some servers ignore the high-order byte of the cipher
39 * suite ID, we must be careful about adding cipher suites with IDs larger 39 * suite ID, we must be careful about adding cipher suites with IDs larger
40 * than 0x00ff; see bug 946147. For these broken servers, the first six cipher 40 * than 0x00ff; see bug 946147. For these broken servers, the first six cipher
41 * suites, with the MSB zeroed, look like: 41 * suites, with the MSB zeroed, look like:
42 * TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA { 0x00,0x14 } 42 * TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA { 0x00,0x14 }
43 * TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA { 0x00,0x13 } 43 * TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA { 0x00,0x13 }
44 * TLS_KRB5_EXPORT_WITH_RC4_40_MD5 {0x00,0x2B } 44 * TLS_KRB5_EXPORT_WITH_RC4_40_MD5 { 0x00,0x2B }
45 * TLS_RSA_WITH_AES_128_CBC_SHA { 0x00,0x2F } 45 * TLS_RSA_WITH_AES_128_CBC_SHA { 0x00,0x2F }
46 * TLS_RSA_WITH_3DES_EDE_CBC_SHA { 0x00,0x0A } 46 * TLS_RSA_WITH_3DES_EDE_CBC_SHA { 0x00,0x0A }
47 * TLS_RSA_WITH_DES_CBC_SHA { 0x00,0x09 } 47 * TLS_RSA_WITH_DES_CBC_SHA { 0x00,0x09 }
48 * The broken server only supports the fifth and sixth ones and will select 48 * The broken server only supports the fifth and sixth ones and will select
49 * the fifth one. 49 * the fifth one.
50 */ 50 */
51 const PRUint16 SSL_ImplementedCiphers[] = { 51 const PRUint16 SSL_ImplementedCiphers[] = {
52 #ifdef NSS_ENABLE_ECC 52 #ifdef NSS_ENABLE_ECC
53 TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, 53 TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
54 TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, 54 TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 SSL_GetImplementedCiphers(void) 152 SSL_GetImplementedCiphers(void)
153 { 153 {
154 return SSL_ImplementedCiphers; 154 return SSL_ImplementedCiphers;
155 } 155 }
156 156
157 PRUint16 157 PRUint16
158 SSL_GetNumImplementedCiphers(void) 158 SSL_GetNumImplementedCiphers(void)
159 { 159 {
160 return SSL_NumImplementedCiphers; 160 return SSL_NumImplementedCiphers;
161 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698