OLD | NEW |
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 "chromeos/network/onc/onc_certificate_importer.h" | 5 #include "chromeos/network/onc/onc_certificate_importer.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <certdb.h> | 8 #include <certdb.h> |
9 #include <keyhi.h> | 9 #include <keyhi.h> |
10 #include <pk11pub.h> | 10 #include <pk11pub.h> |
11 #include <string> | 11 #include <string> |
12 | 12 |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "chromeos/network/onc/onc_constants.h" | 16 #include "chromeos/network/onc/onc_constants.h" |
17 #include "chromeos/network/onc/onc_test_utils.h" | 17 #include "chromeos/network/onc/onc_test_utils.h" |
18 #include "crypto/nss_util.h" | 18 #include "crypto/nss_util.h" |
19 #include "net/base/cert_type.h" | |
20 #include "net/base/crypto_module.h" | 19 #include "net/base/crypto_module.h" |
21 #include "net/base/nss_cert_database.h" | 20 #include "net/cert/cert_type.h" |
22 #include "net/base/x509_certificate.h" | 21 #include "net/cert/nss_cert_database.h" |
| 22 #include "net/cert/x509_certificate.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
24 | 24 |
25 namespace chromeos { | 25 namespace chromeos { |
26 namespace onc { | 26 namespace onc { |
27 | 27 |
28 #if defined(USE_NSS) | 28 #if defined(USE_NSS) |
29 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use | 29 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use |
30 // the new name of the macro. | 30 // the new name of the macro. |
31 #if !defined(CERTDB_TERMINAL_RECORD) | 31 #if !defined(CERTDB_TERMINAL_RECORD) |
32 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER | 32 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 std::make_pair(net::SERVER_CERT, | 252 std::make_pair(net::SERVER_CERT, |
253 std::make_pair("certificate-server.onc", | 253 std::make_pair("certificate-server.onc", |
254 "certificate-server-update.onc")), | 254 "certificate-server-update.onc")), |
255 std::make_pair( | 255 std::make_pair( |
256 net::CA_CERT, | 256 net::CA_CERT, |
257 std::make_pair("certificate-web-authority.onc", | 257 std::make_pair("certificate-web-authority.onc", |
258 "certificate-web-authority-update.onc")))); | 258 "certificate-web-authority-update.onc")))); |
259 | 259 |
260 } // namespace onc | 260 } // namespace onc |
261 } // namespace chromeos | 261 } // namespace chromeos |
OLD | NEW |