diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 12:52:55 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 12:52:55 +0000 |
| commit | 38a1c18941e670cd18ac5aa719e942f5037f6b05 (patch) | |
| tree | e1e3038cc76bd4740d61f54bd55869e5793ba117 /net/base/test_root_certs.h | |
| parent | 849d2167057a0bf54c95ca4f743e136555a13150 (diff) | |
| download | chromium_src-38a1c18941e670cd18ac5aa719e942f5037f6b05.zip chromium_src-38a1c18941e670cd18ac5aa719e942f5037f6b05.tar.gz chromium_src-38a1c18941e670cd18ac5aa719e942f5037f6b05.tar.bz2 | |
Port test_root_certs_nss to iOS.
BUG=145954
Review URL: https://chromiumcodereview.appspot.com/10964014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/test_root_certs.h')
| -rw-r--r-- | net/base/test_root_certs.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/base/test_root_certs.h b/net/base/test_root_certs.h index 7ac5f33..4d52dbc 100644 --- a/net/base/test_root_certs.h +++ b/net/base/test_root_certs.h @@ -10,15 +10,15 @@ #include "build/build_config.h" #include "net/base/net_export.h" -#if defined(OS_WIN) +#if defined(USE_NSS) || defined(OS_IOS) +#include <list> +#elif defined(OS_WIN) #include <windows.h> #include <wincrypt.h> #elif defined(OS_MACOSX) #include <CoreFoundation/CFArray.h> #include <Security/SecTrust.h> #include "base/mac/scoped_cftyperef.h" -#elif defined(USE_NSS) -#include <list> #endif class FilePath; @@ -54,7 +54,7 @@ class NET_EXPORT_PRIVATE TestRootCerts { // Returns true if there are no certificates that have been marked trusted. bool IsEmpty() const; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) CFArrayRef temporary_roots() const { return temporary_roots_; } // Modifies the root certificates of |trust_ref| to include the @@ -80,15 +80,15 @@ class NET_EXPORT_PRIVATE TestRootCerts { // Performs platform-dependent initialization. void Init(); -#if defined(OS_MACOSX) - base::mac::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_; -#elif defined(OS_WIN) - HCERTSTORE temporary_roots_; -#elif defined(USE_NSS) +#if defined(USE_NSS) || defined(OS_IOS) // It is necessary to maintain a cache of the original certificate trust // settings, in order to restore them when Clear() is called. class TrustEntry; std::list<TrustEntry*> trust_cache_; +#elif defined(OS_WIN) + HCERTSTORE temporary_roots_; +#elif defined(OS_MACOSX) + base::mac::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_; #endif #if defined(OS_WIN) || defined(USE_OPENSSL) |