diff options
Diffstat (limited to 'chromium/net/cert/cert_verify_proc_win.cc')
| -rw-r--r-- | chromium/net/cert/cert_verify_proc_win.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/net/cert/cert_verify_proc_win.cc b/chromium/net/cert/cert_verify_proc_win.cc index 29885eac18f..b6ab2b60ad1 100644 --- a/chromium/net/cert/cert_verify_proc_win.cc +++ b/chromium/net/cert/cert_verify_proc_win.cc @@ -61,12 +61,11 @@ struct FreeCertContextFunctor { typedef crypto::ScopedCAPIHandle<HCERTCHAINENGINE, FreeChainEngineFunctor> ScopedHCERTCHAINENGINE; -typedef scoped_ptr_malloc<const CERT_CHAIN_CONTEXT, - FreeCertChainContextFunctor> +typedef scoped_ptr<const CERT_CHAIN_CONTEXT, FreeCertChainContextFunctor> ScopedPCCERT_CHAIN_CONTEXT; -typedef scoped_ptr_malloc<const CERT_CONTEXT, - FreeCertContextFunctor> ScopedPCCERT_CONTEXT; +typedef scoped_ptr<const CERT_CONTEXT, FreeCertContextFunctor> + ScopedPCCERT_CONTEXT; //----------------------------------------------------------------------------- @@ -200,7 +199,7 @@ bool CertSubjectCommonNameHasNull(PCCERT_CONTEXT cert) { &name_info, &name_info_size); if (rv) { - scoped_ptr_malloc<CERT_NAME_INFO> scoped_name_info(name_info); + scoped_ptr<CERT_NAME_INFO, base::FreeDeleter> scoped_name_info(name_info); // The Subject field may have multiple common names. According to the // "PKI Layer Cake" paper, CryptoAPI uses every common name in the @@ -349,8 +348,9 @@ void GetCertChainInfo(PCCERT_CHAIN_CONTEXT chain_context, // Decodes the cert's certificatePolicies extension into a CERT_POLICIES_INFO // structure and stores it in *output. -void GetCertPoliciesInfo(PCCERT_CONTEXT cert, - scoped_ptr_malloc<CERT_POLICIES_INFO>* output) { +void GetCertPoliciesInfo( + PCCERT_CONTEXT cert, + scoped_ptr<CERT_POLICIES_INFO, base::FreeDeleter>* output) { PCERT_EXTENSION extension = CertFindExtension(szOID_CERT_POLICIES, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); @@ -570,7 +570,7 @@ int CertVerifyProcWin::VerifyInternal( const_cast<LPSTR*>(usage); // Get the certificatePolicies extension of the certificate. - scoped_ptr_malloc<CERT_POLICIES_INFO> policies_info; + scoped_ptr<CERT_POLICIES_INFO, base::FreeDeleter> policies_info; LPSTR ev_policy_oid = NULL; if (flags & CertVerifier::VERIFY_EV_CERT) { GetCertPoliciesInfo(cert_handle, &policies_info); @@ -722,7 +722,7 @@ int CertVerifyProcWin::VerifyInternal( if (CertSubjectCommonNameHasNull(cert_handle)) verify_result->cert_status |= CERT_STATUS_INVALID; - std::wstring wstr_hostname = ASCIIToWide(hostname); + std::wstring wstr_hostname = base::ASCIIToWide(hostname); SSL_EXTRA_CERT_CHAIN_POLICY_PARA extra_policy_para; memset(&extra_policy_para, 0, sizeof(extra_policy_para)); |