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

Side by Side Diff: net/base/cert_verify_proc_unittest.cc

Issue 10807052: mac: Remove code that was only needed on 10.5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: kill workspaceIDCache_ Created 8 years, 5 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 | « content/renderer/renderer.sb ('k') | sync/util/get_session_name_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/cert_verify_proc.h" 5 #include "net/base/cert_verify_proc.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 // key_types="768-rsa 1024-rsa 2048-rsa prime256v1-ecdsa" 247 // key_types="768-rsa 1024-rsa 2048-rsa prime256v1-ecdsa"
248 // We must use the same key types here. The filenames generated look like: 248 // We must use the same key types here. The filenames generated look like:
249 // 2048-rsa-ee-by-768-rsa-intermediate.pem 249 // 2048-rsa-ee-by-768-rsa-intermediate.pem
250 key_types.push_back("768-rsa"); 250 key_types.push_back("768-rsa");
251 key_types.push_back("1024-rsa"); 251 key_types.push_back("1024-rsa");
252 key_types.push_back("2048-rsa"); 252 key_types.push_back("2048-rsa");
253 253
254 bool use_ecdsa = true; 254 bool use_ecdsa = true;
255 #if defined(OS_WIN) 255 #if defined(OS_WIN)
256 use_ecdsa = base::win::GetVersion() > base::win::VERSION_XP; 256 use_ecdsa = base::win::GetVersion() > base::win::VERSION_XP;
257 #elif defined(OS_MACOSX)
258 use_ecdsa = base::mac::IsOSSnowLeopardOrLater();
259 #endif 257 #endif
260 258
261 if (use_ecdsa) 259 if (use_ecdsa)
262 key_types.push_back("prime256v1-ecdsa"); 260 key_types.push_back("prime256v1-ecdsa");
263 261
264 // Add the root that signed the intermediates for this test. 262 // Add the root that signed the intermediates for this test.
265 scoped_refptr<X509Certificate> root_cert = 263 scoped_refptr<X509Certificate> root_cert =
266 ImportCertFromFile(certs_dir, "2048-rsa-root.pem"); 264 ImportCertFromFile(certs_dir, "2048-rsa-root.pem");
267 ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert); 265 ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert);
268 ScopedTestRoot scoped_root(root_cert); 266 ScopedTestRoot scoped_root(root_cert);
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 #define MAYBE_VerifyMixed DISABLED_VerifyMixed 977 #define MAYBE_VerifyMixed DISABLED_VerifyMixed
980 #else 978 #else
981 #define MAYBE_VerifyMixed VerifyMixed 979 #define MAYBE_VerifyMixed VerifyMixed
982 #endif 980 #endif
983 WRAPPED_INSTANTIATE_TEST_CASE_P( 981 WRAPPED_INSTANTIATE_TEST_CASE_P(
984 MAYBE_VerifyMixed, 982 MAYBE_VerifyMixed,
985 CertVerifyProcWeakDigestTest, 983 CertVerifyProcWeakDigestTest,
986 testing::ValuesIn(kVerifyMixedTestData)); 984 testing::ValuesIn(kVerifyMixedTestData));
987 985
988 } // namespace net 986 } // namespace net
OLDNEW
« no previous file with comments | « content/renderer/renderer.sb ('k') | sync/util/get_session_name_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698