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

net/base/x509_certificate.h

 // 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.
 
 #ifndef NET_BASE_X509_CERTIFICATE_H_
 #define NET_BASE_X509_CERTIFICATE_H_
 
 #include <string.h>
 
 #include <map>
@@ skipping 191 matching lines @@
   // Gets the DNS names in the certificate.  Pursuant to RFC 2818, Section 3.1
   // Server Identity, if the certificate has a subjectAltName extension of
   // type dNSName, this method gets the DNS names in that extension.
   // Otherwise, it gets the common name in the subject field.
   void GetDNSNames(std::vector<std::string>* dns_names) const;
 
   // Convenience method that returns whether this certificate has expired as of
   // now.
   bool HasExpired() const;
 
-#if defined(OS_MACOSX)
-    // Adds an untrusted intermediate certificate that may be needed for
-    // chain building.
-    void AddIntermediateCertificate(SecCertificateRef cert);
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  // Adds an untrusted intermediate certificate that may be needed for
+  // chain building.
+  void AddIntermediateCertificate(OSCertHandle cert) {
+    intermediate_ca_certs_.push_back(cert);
+  }
 
-    // Returns intermediate certificates added via AddIntermediateCertificate().
-    // Ownership follows the "get" rule: it is the caller's responsibility to
-    // retain the result.
-    CFArrayRef GetIntermediateCertificates() { return intermediate_ca_certs_; }
+  // Returns intermediate certificates added via AddIntermediateCertificate().
+  // Ownership follows the "get" rule: it is the caller's responsibility to
+  // retain the elements of the result.
+  const std::vector<OSCertHandle>& GetIntermediateCertificates() const {
+    return intermediate_ca_certs_;
+  }
 #endif
 
   // Verifies the certificate against the given hostname.  Returns OK if
   // successful or an error code upon failure.
   //
   // The |*verify_result| structure, including the |verify_result->cert_status|
   // bitmask, is always filled out regardless of the return value.  If the
   // certificate has multiple errors, the corresponding status flags are set in
   // |verify_result->cert_status|, and the error code for the most serious
   // error is returned.
@@ skipping 72 matching lines @@
 
   // This certificate is not valid after |valid_expiry_|
   base::Time valid_expiry_;
 
   // The fingerprint of this certificate.
   Fingerprint fingerprint_;
 
   // A handle to the certificate object in the underlying crypto library.
   OSCertHandle cert_handle_;
 
-#if defined(OS_MACOSX)
-    // Untrusted intermediate certificates associated with this certificate
-    // that may be needed for chain building.
-    CFMutableArrayRef intermediate_ca_certs_;
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  // Untrusted intermediate certificates associated with this certificate
+  // that may be needed for chain building.
+  std::vector<OSCertHandle> intermediate_ca_certs_;
 #endif
 
   // Where the certificate comes from.
   Source source_;
 
   DISALLOW_COPY_AND_ASSIGN(X509Certificate);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_X509_CERTIFICATE_H_