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

Side by Side Diff: chromeos/network/onc/onc_certificate_importer_impl.cc

Issue 2724013002: net: remove CryptoModule class (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_impl.h" 5 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <keyhi.h> 8 #include <keyhi.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 #include <stddef.h> 10 #include <stddef.h>
11 11
12 #include "base/base64.h" 12 #include "base/base64.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/sequenced_task_runner.h" 18 #include "base/sequenced_task_runner.h"
19 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "base/values.h" 21 #include "base/values.h"
22 #include "chromeos/network/network_event_log.h" 22 #include "chromeos/network/network_event_log.h"
23 #include "chromeos/network/onc/onc_utils.h" 23 #include "chromeos/network/onc/onc_utils.h"
24 #include "crypto/scoped_nss_types.h" 24 #include "crypto/scoped_nss_types.h"
25 #include "net/base/crypto_module.h"
26 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
27 #include "net/cert/nss_cert_database.h" 26 #include "net/cert/nss_cert_database.h"
28 #include "net/cert/x509_certificate.h" 27 #include "net/cert/x509_certificate.h"
29 28
30 namespace chromeos { 29 namespace chromeos {
31 namespace onc { 30 namespace onc {
32 31
33 namespace { 32 namespace {
34 33
35 void CallBackOnOriginLoop( 34 void CallBackOnOriginLoop(
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 PK11_SetPrivateKeyNickname(private_key, const_cast<char*>(guid.c_str())); 320 PK11_SetPrivateKeyNickname(private_key, const_cast<char*>(guid.c_str()));
322 SECKEY_DestroyPrivateKey(private_key); 321 SECKEY_DestroyPrivateKey(private_key);
323 } else { 322 } else {
324 LOG(WARNING) << "Unable to find private key for certificate."; 323 LOG(WARNING) << "Unable to find private key for certificate.";
325 } 324 }
326 return true; 325 return true;
327 } 326 }
328 327
329 } // namespace onc 328 } // namespace onc
330 } // namespace chromeos 329 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698