| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/x509_certificate.h" | 5 #include "net/base/x509_certificate.h" |
| 6 | 6 |
| 7 #include <CommonCrypto/CommonDigest.h> | 7 #include <CommonCrypto/CommonDigest.h> |
| 8 #include <Security/Security.h> | 8 #include <Security/Security.h> |
| 9 #include <time.h> | 9 #include <time.h> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/pickle.h" | 12 #include "base/pickle.h" |
| 13 #include "base/scoped_cftyperef.h" | 13 #include "base/mac/scoped_cftyperef.h" |
| 14 #include "base/sys_string_conversions.h" | 14 #include "base/sys_string_conversions.h" |
| 15 #include "net/base/cert_status_flags.h" | 15 #include "net/base/cert_status_flags.h" |
| 16 #include "net/base/cert_verify_result.h" | 16 #include "net/base/cert_verify_result.h" |
| 17 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
| 18 | 18 |
| 19 using base::mac::ScopedCFTypeRef; |
| 19 using base::Time; | 20 using base::Time; |
| 20 | 21 |
| 21 namespace net { | 22 namespace net { |
| 22 | 23 |
| 23 class MacTrustedCertificates { | 24 class MacTrustedCertificates { |
| 24 public: | 25 public: |
| 25 // Sets the trusted root certificate used by tests. Call with |cert| set | 26 // Sets the trusted root certificate used by tests. Call with |cert| set |
| 26 // to NULL to clear the test certificate. | 27 // to NULL to clear the test certificate. |
| 27 void SetTestCertificate(X509Certificate* cert) { | 28 void SetTestCertificate(X509Certificate* cert) { |
| 28 AutoLock lock(lock_); | 29 AutoLock lock(lock_); |
| (...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 } | 1003 } |
| 1003 CFRelease(cert_chain); | 1004 CFRelease(cert_chain); |
| 1004 } | 1005 } |
| 1005 exit: | 1006 exit: |
| 1006 if (result) | 1007 if (result) |
| 1007 LOG(ERROR) << "CreateIdentityCertificateChain error " << result; | 1008 LOG(ERROR) << "CreateIdentityCertificateChain error " << result; |
| 1008 return chain.release(); | 1009 return chain.release(); |
| 1009 } | 1010 } |
| 1010 | 1011 |
| 1011 } // namespace net | 1012 } // namespace net |
| OLD | NEW |