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

Unified Diff: net/cert/x509_util_mac.cc

Issue 2864133002: Convert iOS to use X509CertificateBytes. (Closed)
Patch Set: static_cast, more unittest Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/x509_util_mac.h ('k') | net/ssl/client_cert_store_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_util_mac.cc
diff --git a/net/cert/x509_util_mac.cc b/net/cert/x509_util_mac.cc
index c8f6a2f4a8e0110714e5932a68bacaecda9705c9..d5335887387cdb94894e9664c0029207f77e9e30 100644
--- a/net/cert/x509_util_mac.cc
+++ b/net/cert/x509_util_mac.cc
@@ -92,39 +92,6 @@ CreateSecCertificateFromX509Certificate(const X509Certificate* cert) {
#endif
}
-base::ScopedCFTypeRef<CFMutableArrayRef>
-CreateSecCertificateArrayForX509Certificate(X509Certificate* cert) {
- base::ScopedCFTypeRef<CFMutableArrayRef> cert_list(
- CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
- if (!cert_list)
- return base::ScopedCFTypeRef<CFMutableArrayRef>();
-#if BUILDFLAG(USE_BYTE_CERTS)
- std::string bytes;
- base::ScopedCFTypeRef<SecCertificateRef> sec_cert(
- CreateSecCertificateFromBytes(CRYPTO_BUFFER_data(cert->os_cert_handle()),
- CRYPTO_BUFFER_len(cert->os_cert_handle())));
- if (!sec_cert)
- return base::ScopedCFTypeRef<CFMutableArrayRef>();
- CFArrayAppendValue(cert_list, sec_cert);
- for (X509Certificate::OSCertHandle intermediate :
- cert->GetIntermediateCertificates()) {
- base::ScopedCFTypeRef<SecCertificateRef> sec_cert(
- CreateSecCertificateFromBytes(CRYPTO_BUFFER_data(intermediate),
- CRYPTO_BUFFER_len(intermediate)));
- if (!sec_cert)
- return base::ScopedCFTypeRef<CFMutableArrayRef>();
- CFArrayAppendValue(cert_list, sec_cert);
- }
-#else
- X509Certificate::OSCertHandles intermediate_ca_certs =
- cert->GetIntermediateCertificates();
- CFArrayAppendValue(cert_list, cert->os_cert_handle());
- for (size_t i = 0; i < intermediate_ca_certs.size(); ++i)
- CFArrayAppendValue(cert_list, intermediate_ca_certs[i]);
-#endif
- return cert_list;
-}
-
scoped_refptr<X509Certificate> CreateX509CertificateFromSecCertificate(
SecCertificateRef sec_cert,
const std::vector<SecCertificateRef>& sec_chain) {
« no previous file with comments | « net/cert/x509_util_mac.h ('k') | net/ssl/client_cert_store_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698