Define X509Certificate::intermediate_ca_certs_ as a std::vector of...

net/base/x509_certificate_mac.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/x509_certificate.h"
 
 #include <CommonCrypto/CommonDigest.h>
 #include <time.h>
 
 #include "base/scoped_cftyperef.h"
@@ skipping 436 matching lines @@
   // and our SSL SecPolicyRef. SecTrustCreateWithCertificates() takes an
   // array of certificates, the first of which is the certificate we're
   // verifying, and the subsequent (optional) certificates are used for
   // chain building.
   CFMutableArrayRef cert_array = CFArrayCreateMutable(kCFAllocatorDefault, 0,
                                                       &kCFTypeArrayCallBacks);
   if (!cert_array)
     return ERR_OUT_OF_MEMORY;
   scoped_cftyperef<CFArrayRef> scoped_cert_array(cert_array);
   CFArrayAppendValue(cert_array, cert_handle_);
-  if (intermediate_ca_certs_) {
-    CFIndex intermediate_count = CFArrayGetCount(intermediate_ca_certs_);
-    for (CFIndex i = 0; i < intermediate_count; ++i) {
-      SecCertificateRef intermediate_cert = static_cast<SecCertificateRef>(
-          const_cast<void*>(CFArrayGetValueAtIndex(intermediate_ca_certs_, i)));
-      CFArrayAppendValue(cert_array, intermediate_cert);
-    }
-  }
+  for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i)
+    CFArrayAppendValue(cert_array, intermediate_ca_certs_[i]);
 
   SecTrustRef trust_ref = NULL;
   status = SecTrustCreateWithCertificates(cert_array, ssl_policy, &trust_ref);
   if (status)
     return NetErrorFromOSStatus(status);
   scoped_cftyperef<SecTrustRef> scoped_trust_ref(trust_ref);
 
   // Set the trusted anchor certificates for the SecTrustRef by merging the
   // system trust anchors and the test root certificate.
   CFArrayRef anchor_array =
@@ skipping 173 matching lines @@
 }
 
 bool X509Certificate::VerifyEV() const {
   // We don't call this private method, but we do need to implement it because
   // it's defined in x509_certificate.h. We perform EV checking in the
   // Verify() above.
   NOTREACHED();
   return false;
 }
 
-void X509Certificate::AddIntermediateCertificate(SecCertificateRef cert) {
-  if (cert) {
-    if (!intermediate_ca_certs_) {
-      intermediate_ca_certs_ = CFArrayCreateMutable(kCFAllocatorDefault, 0,
-                                                    &kCFTypeArrayCallBacks);
-    }
-    if (intermediate_ca_certs_) {
-      CFArrayAppendValue(intermediate_ca_certs_, cert);
-    }
-  }
-}
-
 // static
 X509Certificate::OSCertHandle X509Certificate::CreateOSCertHandleFromBytes(
     const char* data, int length) {
   CSSM_DATA cert_data;
   cert_data.Data = const_cast<uint8*>(reinterpret_cast<const uint8*>(data));
   cert_data.Length = length;
 
   OSCertHandle cert_handle = NULL;
   OSStatus status = SecCertificateCreateFromData(&cert_data,
                                                  CSSM_CERT_X_509v3,
@@ skipping 23 matching lines @@
 
   DCHECK(NULL != cert_data.Data);
   DCHECK(0 != cert_data.Length);
 
   CC_SHA1(cert_data.Data, cert_data.Length, sha1.data);
 
   return sha1;
 }
 
 }  // namespace net