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

Side by Side Diff: net/cert/cert_verify_proc.cc

Issue 137553004: NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 // 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/cert/cert_verify_proc.h" 5 #include "net/cert/cert_verify_proc.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/sha1.h" 8 #include "base/sha1.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/base/net_util.h" 12 #include "net/base/net_util.h"
13 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 13 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
14 #include "net/cert/cert_status_flags.h" 14 #include "net/cert/cert_status_flags.h"
15 #include "net/cert/cert_verifier.h" 15 #include "net/cert/cert_verifier.h"
16 #include "net/cert/cert_verify_result.h" 16 #include "net/cert/cert_verify_result.h"
17 #include "net/cert/crl_set.h" 17 #include "net/cert/crl_set.h"
18 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
19 #include "url/url_canon.h" 19 #include "url/url_canon.h"
20 20
21 #if defined(USE_NSS) || defined(OS_IOS) 21 #if defined(OS_CHROMEOS)
22 #include "net/cert/cert_verify_proc_chromeos.h"
23 #elif defined(USE_NSS) || defined(OS_IOS)
22 #include "net/cert/cert_verify_proc_nss.h" 24 #include "net/cert/cert_verify_proc_nss.h"
23 #elif defined(USE_OPENSSL) && !defined(OS_ANDROID) 25 #elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
24 #include "net/cert/cert_verify_proc_openssl.h" 26 #include "net/cert/cert_verify_proc_openssl.h"
25 #elif defined(OS_ANDROID) 27 #elif defined(OS_ANDROID)
26 #include "net/cert/cert_verify_proc_android.h" 28 #include "net/cert/cert_verify_proc_android.h"
27 #elif defined(OS_MACOSX) 29 #elif defined(OS_MACOSX)
28 #include "net/cert/cert_verify_proc_mac.h" 30 #include "net/cert/cert_verify_proc_mac.h"
29 #elif defined(OS_WIN) 31 #elif defined(OS_WIN)
30 #include "net/cert/cert_verify_proc_win.h" 32 #include "net/cert/cert_verify_proc_win.h"
31 #else 33 #else
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 weak_key = true; 160 weak_key = true;
159 } 161 }
160 162
161 return weak_key; 163 return weak_key;
162 } 164 }
163 165
164 } // namespace 166 } // namespace
165 167
166 // static 168 // static
167 CertVerifyProc* CertVerifyProc::CreateDefault() { 169 CertVerifyProc* CertVerifyProc::CreateDefault() {
168 #if defined(USE_NSS) || defined(OS_IOS) 170 #if defined(OS_CHROMEOS)
171 // Creates a CertVerifyProc that doesn't allow any profile-provided certs.
172 return new CertVerifyProcChromeOS();
173 #elif defined(USE_NSS) || defined(OS_IOS)
169 return new CertVerifyProcNSS(); 174 return new CertVerifyProcNSS();
170 #elif defined(USE_OPENSSL) && !defined(OS_ANDROID) 175 #elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
171 return new CertVerifyProcOpenSSL(); 176 return new CertVerifyProcOpenSSL();
172 #elif defined(OS_ANDROID) 177 #elif defined(OS_ANDROID)
173 return new CertVerifyProcAndroid(); 178 return new CertVerifyProcAndroid();
174 #elif defined(OS_MACOSX) 179 #elif defined(OS_MACOSX)
175 return new CertVerifyProcMac(); 180 return new CertVerifyProcMac();
176 #elif defined(OS_WIN) 181 #elif defined(OS_WIN)
177 return new CertVerifyProcWin(); 182 return new CertVerifyProcWin();
178 #else 183 #else
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 return true; 531 return true;
527 } 532 }
528 } 533 }
529 } 534 }
530 } 535 }
531 536
532 return false; 537 return false;
533 } 538 }
534 539
535 } // namespace net 540 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698