| Index: net/base/default_origin_bound_cert_store.cc
|
| diff --git a/net/base/default_origin_bound_cert_store.cc b/net/base/default_origin_bound_cert_store.cc
|
| index 82aec7d4293103967a122acbfd9ef919d6cf8824..4d814991e6c7d6119dfab8f6e0297c3fc59c6fc2 100644
|
| --- a/net/base/default_origin_bound_cert_store.cc
|
| +++ b/net/base/default_origin_bound_cert_store.cc
|
| @@ -29,6 +29,7 @@ void DefaultOriginBoundCertStore::FlushStore(
|
|
|
| bool DefaultOriginBoundCertStore::GetOriginBoundCert(
|
| const std::string& origin,
|
| + SSLClientCertType* type,
|
| std::string* private_key_result,
|
| std::string* cert_result) {
|
| base::AutoLock autolock(lock_);
|
| @@ -40,6 +41,7 @@ bool DefaultOriginBoundCertStore::GetOriginBoundCert(
|
| return false;
|
|
|
| OriginBoundCert* cert = it->second;
|
| + *type = cert->type();
|
| *private_key_result = cert->private_key();
|
| *cert_result = cert->cert();
|
|
|
| @@ -48,14 +50,15 @@ bool DefaultOriginBoundCertStore::GetOriginBoundCert(
|
|
|
| void DefaultOriginBoundCertStore::SetOriginBoundCert(
|
| const std::string& origin,
|
| + SSLClientCertType type,
|
| const std::string& private_key,
|
| const std::string& cert) {
|
| base::AutoLock autolock(lock_);
|
| InitIfNecessary();
|
|
|
| InternalDeleteOriginBoundCert(origin);
|
| - InternalInsertOriginBoundCert(origin,
|
| - new OriginBoundCert(origin, private_key, cert));
|
| + InternalInsertOriginBoundCert(
|
| + origin, new OriginBoundCert(origin, type, private_key, cert));
|
| }
|
|
|
| void DefaultOriginBoundCertStore::DeleteOriginBoundCert(
|
| @@ -86,6 +89,7 @@ void DefaultOriginBoundCertStore::GetAllOriginBoundCerts(
|
| it != origin_bound_certs_.end(); ++it) {
|
| OriginBoundCertInfo cert_info = {
|
| it->second->origin(),
|
| + it->second->type(),
|
| it->second->private_key(),
|
| it->second->cert()
|
| };
|
| @@ -164,9 +168,11 @@ DefaultOriginBoundCertStore::OriginBoundCert::OriginBoundCert() {}
|
|
|
| DefaultOriginBoundCertStore::OriginBoundCert::OriginBoundCert(
|
| const std::string& origin,
|
| + SSLClientCertType type,
|
| const std::string& private_key,
|
| const std::string& cert)
|
| : origin_(origin),
|
| + type_(type),
|
| private_key_(private_key),
|
| cert_(cert) {}
|
|
|
|
|