| Index: net/ssl/client_cert_store_nss.cc
|
| diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc
|
| index 1b44bce92daf1c346137b8385aff5d8973cb555b..44aa69005bc7bd838ba48ae3af4025f030443edd 100644
|
| --- a/net/ssl/client_cert_store_nss.cc
|
| +++ b/net/ssl/client_cert_store_nss.cc
|
| @@ -20,13 +20,15 @@ namespace net {
|
|
|
| ClientCertStoreNSS::ClientCertStoreNSS(
|
| const PasswordDelegateFactory& password_delegate_factory)
|
| - : password_delegate_factory_(password_delegate_factory) {}
|
| + : password_delegate_factory_(password_delegate_factory) {
|
| +}
|
|
|
| -ClientCertStoreNSS::~ClientCertStoreNSS() {}
|
| +ClientCertStoreNSS::~ClientCertStoreNSS() {
|
| +}
|
|
|
| void ClientCertStoreNSS::GetClientCerts(const SSLCertRequestInfo& request,
|
| - CertificateList* selected_certs,
|
| - const base::Closure& callback) {
|
| + CertificateList* selected_certs,
|
| + const base::Closure& callback) {
|
| scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> password_delegate;
|
| if (!password_delegate_factory_.is_null()) {
|
| password_delegate.reset(
|
| @@ -95,21 +97,20 @@ void ClientCertStoreNSS::GetClientCertsImpl(CERTCertList* cert_list,
|
|
|
| // Check if the certificate issuer is allowed by the server.
|
| if (request.cert_authorities.empty() ||
|
| - (!query_nssdb &&
|
| - cert->IsIssuedByEncoded(request.cert_authorities)) ||
|
| + (!query_nssdb && cert->IsIssuedByEncoded(request.cert_authorities)) ||
|
| (query_nssdb &&
|
| NSS_CmpCertChainWCANames(node->cert, &ca_names) == SECSuccess)) {
|
| DVLOG(2) << "matched cert: " << base::StringPiece(node->cert->nickname);
|
| selected_certs->push_back(cert);
|
| - }
|
| - else
|
| + } else
|
| DVLOG(2) << "skipped non-matching cert: "
|
| << base::StringPiece(node->cert->nickname);
|
| }
|
| DVLOG(2) << "num_raw:" << num_raw
|
| << " num_selected:" << selected_certs->size();
|
|
|
| - std::sort(selected_certs->begin(), selected_certs->end(),
|
| + std::sort(selected_certs->begin(),
|
| + selected_certs->end(),
|
| x509_util::ClientCertSorter());
|
| }
|
|
|
| @@ -117,12 +118,12 @@ void ClientCertStoreNSS::GetClientCertsOnWorkerThread(
|
| scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> password_delegate,
|
| const SSLCertRequestInfo* request,
|
| CertificateList* selected_certs) {
|
| - CERTCertList* client_certs = CERT_FindUserCertsByUsage(
|
| - CERT_GetDefaultCertDB(),
|
| - certUsageSSLClient,
|
| - PR_FALSE,
|
| - PR_FALSE,
|
| - password_delegate.get());
|
| + CERTCertList* client_certs =
|
| + CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(),
|
| + certUsageSSLClient,
|
| + PR_FALSE,
|
| + PR_FALSE,
|
| + password_delegate.get());
|
| // It is ok for a user not to have any client certs.
|
| if (!client_certs) {
|
| DVLOG(2) << "No client certs found.";
|
|
|