CertificateList => ScopedCERTCertificateList
This commit is contained in:
parent
0f9f04e4ec
commit
76ef6e3ecc
3 changed files with 16 additions and 15 deletions
|
@ -91,11 +91,12 @@ CertificateManagerModel::CertificateManagerModel(
|
|||
CertificateManagerModel::~CertificateManagerModel() {
|
||||
}
|
||||
|
||||
int CertificateManagerModel::ImportFromPKCS12(PK11SlotInfo* slot_info,
|
||||
const std::string& data,
|
||||
const base::string16& password,
|
||||
bool is_extractable,
|
||||
net::CertificateList* imported_certs) {
|
||||
int CertificateManagerModel::ImportFromPKCS12(
|
||||
PK11SlotInfo* slot_info,
|
||||
const std::string& data,
|
||||
const base::string16& password,
|
||||
bool is_extractable,
|
||||
net::ScopedCERTCertificateList* imported_certs) {
|
||||
return cert_db_->ImportFromPKCS12(slot_info, data, password,
|
||||
is_extractable, imported_certs);
|
||||
}
|
||||
|
@ -105,14 +106,14 @@ int CertificateManagerModel::ImportUserCert(const std::string& data) {
|
|||
}
|
||||
|
||||
bool CertificateManagerModel::ImportCACerts(
|
||||
const net::CertificateList& certificates,
|
||||
const net::ScopedCERTCertificateList& certificates,
|
||||
net::NSSCertDatabase::TrustBits trust_bits,
|
||||
net::NSSCertDatabase::ImportCertFailureList* not_imported) {
|
||||
return cert_db_->ImportCACerts(certificates, trust_bits, not_imported);
|
||||
}
|
||||
|
||||
bool CertificateManagerModel::ImportServerCert(
|
||||
const net::CertificateList& certificates,
|
||||
const net::ScopedCERTCertificateList& certificates,
|
||||
net::NSSCertDatabase::TrustBits trust_bits,
|
||||
net::NSSCertDatabase::ImportCertFailureList* not_imported) {
|
||||
return cert_db_->ImportServerCert(certificates, trust_bits,
|
||||
|
@ -120,13 +121,13 @@ bool CertificateManagerModel::ImportServerCert(
|
|||
}
|
||||
|
||||
bool CertificateManagerModel::SetCertTrust(
|
||||
const net::X509Certificate* cert,
|
||||
CERTCertificate* cert,
|
||||
net::CertType type,
|
||||
net::NSSCertDatabase::TrustBits trust_bits) {
|
||||
return cert_db_->SetCertTrust(cert, type, trust_bits);
|
||||
}
|
||||
|
||||
bool CertificateManagerModel::Delete(net::X509Certificate* cert) {
|
||||
bool CertificateManagerModel::Delete(CERTCertificate* cert) {
|
||||
return cert_db_->DeleteCertAndKey(cert);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue