OLD | NEW |
1 // Copyright (c) 2011 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_database.h" | 5 #include "net/base/cert_database.h" |
6 | 6 |
7 #include <Security/Security.h> | 7 #include <Security/Security.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/mac_logging.h" |
10 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
11 #include "crypto/mac_security_services_lock.h" | 12 #include "crypto/mac_security_services_lock.h" |
12 #include "net/base/net_errors.h" | 13 #include "net/base/net_errors.h" |
13 #include "net/base/x509_certificate.h" | 14 #include "net/base/x509_certificate.h" |
14 | 15 |
15 namespace net { | 16 namespace net { |
16 | 17 |
17 CertDatabase::CertDatabase() { | 18 CertDatabase::CertDatabase() { |
18 } | 19 } |
19 | 20 |
(...skipping 26 matching lines...) Expand all Loading... |
46 base::AutoLock locked(crypto::GetMacSecurityServicesLock()); | 47 base::AutoLock locked(crypto::GetMacSecurityServicesLock()); |
47 err = SecCertificateAddToKeychain(cert->os_cert_handle(), NULL); | 48 err = SecCertificateAddToKeychain(cert->os_cert_handle(), NULL); |
48 } | 49 } |
49 switch (err) { | 50 switch (err) { |
50 case noErr: | 51 case noErr: |
51 CertDatabase::NotifyObserversOfUserCertAdded(cert); | 52 CertDatabase::NotifyObserversOfUserCertAdded(cert); |
52 // Fall through. | 53 // Fall through. |
53 case errSecDuplicateItem: | 54 case errSecDuplicateItem: |
54 return OK; | 55 return OK; |
55 default: | 56 default: |
56 LOG(ERROR) << "CertDatabase failed to add cert to keychain: " << err; | 57 OSSTATUS_LOG(ERROR, err) << "CertDatabase failed to add cert to keychain"; |
57 // TODO(snej): Map the error code more intelligently. | 58 // TODO(snej): Map the error code more intelligently. |
58 return ERR_ADD_USER_CERT_FAILED; | 59 return ERR_ADD_USER_CERT_FAILED; |
59 } | 60 } |
60 } | 61 } |
61 | 62 |
62 } // namespace net | 63 } // namespace net |
OLD | NEW |