| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/crypto/cssm_init.h" | 9 #include "base/crypto/mac_security_services_lock.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
| 12 #include "net/base/net_errors.h" | 12 #include "net/base/net_errors.h" |
| 13 #include "net/base/x509_certificate.h" | 13 #include "net/base/x509_certificate.h" |
| 14 | 14 |
| 15 namespace net { | 15 namespace net { |
| 16 | 16 |
| 17 CertDatabase::CertDatabase() { | 17 CertDatabase::CertDatabase() { |
| 18 } | 18 } |
| 19 | 19 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 case errSecDuplicateItem: | 51 case errSecDuplicateItem: |
| 52 return OK; | 52 return OK; |
| 53 default: | 53 default: |
| 54 LOG(ERROR) << "CertDatabase failed to add cert to keychain: " << err; | 54 LOG(ERROR) << "CertDatabase failed to add cert to keychain: " << err; |
| 55 // TODO(snej): Map the error code more intelligently. | 55 // TODO(snej): Map the error code more intelligently. |
| 56 return ERR_ADD_USER_CERT_FAILED; | 56 return ERR_ADD_USER_CERT_FAILED; |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace net | 60 } // namespace net |
| OLD | NEW |