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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1274143002: ClientCertStoreChromeOS: support additional non-platform certs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/platform_keys/platform_keys_nss.cc ('k') | net/ssl/client_cert_store_chromeos.h » ('j') | net/ssl/client_cert_store_chromeos.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index b8db2b3dba581c82a5f3ca06bfe3b16911fee276..3588eba3e5e653b29c2395b3f13c191931bc296b 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -135,6 +135,7 @@
#include "crypto/nss_util_internal.h"
#include "net/cert/cert_verifier.h"
#include "net/cert/multi_threaded_cert_verifier.h"
+#include "net/cert/x509_certificate.h"
#include "net/ssl/client_cert_store_chromeos.h"
#endif // defined(OS_CHROMEOS)
@@ -941,6 +942,7 @@ ProfileIOData::ResourceContext::CreateClientCertStore() {
return io_data_->client_cert_store_factory_.Run();
#if defined(OS_CHROMEOS)
return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreChromeOS(
+ net::CertificateList(), // no additional certificates
make_scoped_ptr(new chromeos::ClientCertFilterChromeOS(
io_data_->use_system_key_slot(), io_data_->username_hash())),
base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
« no previous file with comments | « chrome/browser/chromeos/platform_keys/platform_keys_nss.cc ('k') | net/ssl/client_cert_store_chromeos.h » ('j') | net/ssl/client_cert_store_chromeos.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698