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

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

Issue 1511123006: Uprev NSS (in libssl) to NSS 3.21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated deps Created 5 years 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
« no previous file with comments | « net/third_party/nss/ssl/sslcon.c ('k') | net/third_party/nss/ssl/sslerr.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, 63 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
64 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, 64 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
65 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 65 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
66 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, 66 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
67 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, 67 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
68 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, 68 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
69 TLS_ECDHE_RSA_WITH_RC4_128_SHA, 69 TLS_ECDHE_RSA_WITH_RC4_128_SHA,
70 #endif /* NSS_DISABLE_ECC */ 70 #endif /* NSS_DISABLE_ECC */
71 71
72 TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, 72 TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
73 TLS_DHE_DSS_WITH_AES_128_GCM_SHA256,
73 TLS_DHE_RSA_WITH_AES_128_CBC_SHA, 74 TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
74 TLS_DHE_DSS_WITH_AES_128_CBC_SHA, 75 TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
75 TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, 76 TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
77 TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
76 TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, 78 TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
77 TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, 79 TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
78 TLS_DHE_RSA_WITH_AES_256_CBC_SHA, 80 TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
79 TLS_DHE_DSS_WITH_AES_256_CBC_SHA, 81 TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
80 TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, 82 TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
83 TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
81 TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, 84 TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
82 TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, 85 TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
83 TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, 86 TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
84 TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA, 87 TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
85 TLS_DHE_DSS_WITH_RC4_128_SHA, 88 TLS_DHE_DSS_WITH_RC4_128_SHA,
86 89
87 #ifndef NSS_DISABLE_ECC 90 #ifndef NSS_DISABLE_ECC
88 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, 91 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
89 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, 92 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
90 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, 93 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 SSL_GetImplementedCiphers(void) 155 SSL_GetImplementedCiphers(void)
153 { 156 {
154 return SSL_ImplementedCiphers; 157 return SSL_ImplementedCiphers;
155 } 158 }
156 159
157 PRUint16 160 PRUint16
158 SSL_GetNumImplementedCiphers(void) 161 SSL_GetNumImplementedCiphers(void)
159 { 162 {
160 return SSL_NumImplementedCiphers; 163 return SSL_NumImplementedCiphers;
161 } 164 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslcon.c ('k') | net/third_party/nss/ssl/sslerr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698