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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 16394004: Support the new TLS 1.2 HMAC-SHA256 cipher suites specified in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add a patch Created 7 years, 6 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
« no previous file with comments | « net/third_party/nss/ssl/ssl3con.c ('k') | net/third_party/nss/ssl/sslenum.c » ('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 * SSL3 Protocol 2 * SSL3 Protocol
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 7
8 /* ECC code moved here from ssl3con.c */ 8 /* ECC code moved here from ssl3con.c */
9 /* $Id$ */ 9 /* $Id$ */
10 10
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, 904 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
905 TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, 905 TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
906 TLS_ECDH_RSA_WITH_NULL_SHA, 906 TLS_ECDH_RSA_WITH_NULL_SHA,
907 TLS_ECDH_RSA_WITH_RC4_128_SHA, 907 TLS_ECDH_RSA_WITH_RC4_128_SHA,
908 0 /* end of list marker */ 908 0 /* end of list marker */
909 }; 909 };
910 910
911 static const ssl3CipherSuite ecdhe_ecdsa_suites[] = { 911 static const ssl3CipherSuite ecdhe_ecdsa_suites[] = {
912 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, 912 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
913 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, 913 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
914 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
914 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 915 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
915 TLS_ECDHE_ECDSA_WITH_NULL_SHA, 916 TLS_ECDHE_ECDSA_WITH_NULL_SHA,
916 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, 917 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
917 0 /* end of list marker */ 918 0 /* end of list marker */
918 }; 919 };
919 920
920 static const ssl3CipherSuite ecdhe_rsa_suites[] = { 921 static const ssl3CipherSuite ecdhe_rsa_suites[] = {
921 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, 922 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
922 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, 923 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
924 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
923 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 925 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
924 TLS_ECDHE_RSA_WITH_NULL_SHA, 926 TLS_ECDHE_RSA_WITH_NULL_SHA,
925 TLS_ECDHE_RSA_WITH_RC4_128_SHA, 927 TLS_ECDHE_RSA_WITH_RC4_128_SHA,
926 0 /* end of list marker */ 928 0 /* end of list marker */
927 }; 929 };
928 930
929 /* List of all ECC cipher suites */ 931 /* List of all ECC cipher suites */
930 static const ssl3CipherSuite ecSuites[] = { 932 static const ssl3CipherSuite ecSuites[] = {
931 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, 933 TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
932 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, 934 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
935 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
933 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 936 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
934 TLS_ECDHE_ECDSA_WITH_NULL_SHA, 937 TLS_ECDHE_ECDSA_WITH_NULL_SHA,
935 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, 938 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
936 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, 939 TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
937 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, 940 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
941 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
938 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 942 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
939 TLS_ECDHE_RSA_WITH_NULL_SHA, 943 TLS_ECDHE_RSA_WITH_NULL_SHA,
940 TLS_ECDHE_RSA_WITH_RC4_128_SHA, 944 TLS_ECDHE_RSA_WITH_RC4_128_SHA,
941 TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, 945 TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
942 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, 946 TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
943 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, 947 TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
944 TLS_ECDH_ECDSA_WITH_NULL_SHA, 948 TLS_ECDH_ECDSA_WITH_NULL_SHA,
945 TLS_ECDH_ECDSA_WITH_RC4_128_SHA, 949 TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
946 TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, 950 TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
947 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, 951 TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 ssl3_DisableECCSuites(ss, ecdhe_ecdsa_suites); 1267 ssl3_DisableECCSuites(ss, ecdhe_ecdsa_suites);
1264 return SECFailure; 1268 return SECFailure;
1265 1269
1266 loser: 1270 loser:
1267 /* no common curve supported */ 1271 /* no common curve supported */
1268 ssl3_DisableECCSuites(ss, ecSuites); 1272 ssl3_DisableECCSuites(ss, ecSuites);
1269 return SECFailure; 1273 return SECFailure;
1270 } 1274 }
1271 1275
1272 #endif /* NSS_ENABLE_ECC */ 1276 #endif /* NSS_ENABLE_ECC */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/ssl3con.c ('k') | net/third_party/nss/ssl/sslenum.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698