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

Unified Diff: chromeos/network/certificate_handler.h

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trust update. Add a utils test. Remove X509 dependency from Shill parsing. Created 7 years, 6 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
Index: chromeos/network/certificate_handler.h
diff --git a/chromeos/network/certificate_handler.h b/chromeos/network/certificate_handler.h
index 7b899d26cd29eca4468e69702c0f6c9cab1348ed..ac866b5eddb9457f002b1d3cc6715bd6f6d08821 100644
--- a/chromeos/network/certificate_handler.h
+++ b/chromeos/network/certificate_handler.h
@@ -5,6 +5,8 @@
#ifndef CHROMEOS_NETWORK_CERTIFICATE_HANDLER_H_
#define CHROMEOS_NETWORK_CERTIFICATE_HANDLER_H_
+#include <map>
+
#include "chromeos/chromeos_export.h"
#include "chromeos/network/onc/onc_constants.h"
#include "net/cert/x509_certificate.h"
@@ -17,6 +19,9 @@ namespace chromeos {
class CHROMEOS_EXPORT CertificateHandler {
public:
+ typedef std::map<std::string, scoped_refptr<net::X509Certificate> >
+ CertsByGUID;
+
CertificateHandler();
virtual ~CertificateHandler();
@@ -27,7 +32,8 @@ class CHROMEOS_EXPORT CertificateHandler {
virtual bool ImportCertificates(
const base::ListValue& certificates,
onc::ONCSource source,
- net::CertificateList* onc_trusted_certificates);
+ net::CertificateList* onc_trusted_certificates,
+ CertsByGUID* imported_server_and_ca_certs);
private:
DISALLOW_COPY_AND_ASSIGN(CertificateHandler);

Powered by Google App Engine
This is Rietveld 408576698