Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: net/cert/cert_verify_proc_nss.cc

Issue 169193002: Convert scoped_ptr_malloc -> scoped_ptr, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/io_buffer.h ('k') | net/cert/cert_verify_proc_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/cert_verify_proc_nss.h" 5 #include "net/cert/cert_verify_proc_nss.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include <cert.h> 10 #include <cert.h>
(...skipping 19 matching lines...) Expand all
30 30
31 #if defined(OS_IOS) 31 #if defined(OS_IOS)
32 #include <CommonCrypto/CommonDigest.h> 32 #include <CommonCrypto/CommonDigest.h>
33 #include "net/cert/x509_util_ios.h" 33 #include "net/cert/x509_util_ios.h"
34 #endif // defined(OS_IOS) 34 #endif // defined(OS_IOS)
35 35
36 namespace net { 36 namespace net {
37 37
38 namespace { 38 namespace {
39 39
40 typedef scoped_ptr_malloc< 40 typedef scoped_ptr<
41 CERTCertificatePolicies, 41 CERTCertificatePolicies,
42 crypto::NSSDestroyer<CERTCertificatePolicies, 42 crypto::NSSDestroyer<CERTCertificatePolicies,
43 CERT_DestroyCertificatePoliciesExtension> > 43 CERT_DestroyCertificatePoliciesExtension> >
44 ScopedCERTCertificatePolicies; 44 ScopedCERTCertificatePolicies;
45 45
46 typedef scoped_ptr_malloc< 46 typedef scoped_ptr<
47 CERTCertList, 47 CERTCertList,
48 crypto::NSSDestroyer<CERTCertList, CERT_DestroyCertList> > 48 crypto::NSSDestroyer<CERTCertList, CERT_DestroyCertList> >
49 ScopedCERTCertList; 49 ScopedCERTCertList;
50 50
51 // ScopedCERTValOutParam manages destruction of values in the CERTValOutParam 51 // ScopedCERTValOutParam manages destruction of values in the CERTValOutParam
52 // array that cvout points to. cvout must be initialized as passed to 52 // array that cvout points to. cvout must be initialized as passed to
53 // CERT_PKIXVerifyCert, so that the array must be terminated with 53 // CERT_PKIXVerifyCert, so that the array must be terminated with
54 // cert_po_end type. 54 // cert_po_end type.
55 // When it goes out of scope, it destroys values of cert_po_trustAnchor 55 // When it goes out of scope, it destroys values of cert_po_trustAnchor
56 // and cert_po_certList types, but doesn't release the array itself. 56 // and cert_po_certList types, but doesn't release the array itself.
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 return VerifyInternalImpl(cert, 917 return VerifyInternalImpl(cert,
918 hostname, 918 hostname,
919 flags, 919 flags,
920 crl_set, 920 crl_set,
921 additional_trust_anchors, 921 additional_trust_anchors,
922 NULL, // chain_verify_callback 922 NULL, // chain_verify_callback
923 verify_result); 923 verify_result);
924 } 924 }
925 925
926 } // namespace net 926 } // namespace net
OLDNEW
« no previous file with comments | « net/base/io_buffer.h ('k') | net/cert/cert_verify_proc_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698