| Index: chromeos/cert_loader.cc
|
| diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc
|
| index d34b6d19126b8cb806fd1cd53686c07e66551ad8..b72d43aa17b0b9bf34248ae273531b4f05e42635 100644
|
| --- a/chromeos/cert_loader.cc
|
| +++ b/chromeos/cert_loader.cc
|
| @@ -115,7 +115,8 @@ bool CertLoader::CertificatesLoading() const {
|
| return database_ && !certificates_loaded_;
|
| }
|
|
|
| -// This is copied from chrome/common/net/x509_certificate_model_nss.cc.
|
| +// static
|
| +//
|
| // For background see this discussion on dev-tech-crypto.lists.mozilla.org:
|
| // http://web.archiveorange.com/archive/v/6JJW7E40sypfZGtbkzxX
|
| //
|
| @@ -123,8 +124,6 @@ bool CertLoader::CertificatesLoading() const {
|
| // is shared between a certificate and its associated private and public
|
| // keys. I tried to implement this with PK11_GetLowLevelKeyIDForCert(),
|
| // but that always returns NULL on Chrome OS for me.
|
| -
|
| -// static
|
| std::string CertLoader::GetPkcs11IdForCert(const net::X509Certificate& cert) {
|
| CERTCertificateStr* cert_handle = cert.os_cert_handle();
|
| SECKEYPrivateKey *priv_key =
|
|
|