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

Unified Diff: net/cert/test_root_certs.h

Issue 2862543003: Remove CertVerifyProcOpenSSL. (Closed)
Patch Set: . Created 3 years, 8 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
Index: net/cert/test_root_certs.h
diff --git a/net/cert/test_root_certs.h b/net/cert/test_root_certs.h
index 6fa22c1ea0088999b8109656a303bedaae90b1e2..7b2ab5e198dec6fc328b202c29c894ee0a6ddb7c 100644
--- a/net/cert/test_root_certs.h
+++ b/net/cert/test_root_certs.h
@@ -14,8 +14,6 @@
#if defined(USE_NSS_CERTS)
#include <cert.h>
#include <vector>
-#elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
-#include <vector>
#elif defined(OS_WIN)
#include <windows.h>
#include "crypto/wincrypt_shim.h"
@@ -25,10 +23,6 @@
#include "base/mac/scoped_cftyperef.h"
#endif
-#if defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
-typedef struct x509_st X509;
-#endif
-
namespace base {
class FilePath;
}
@@ -79,10 +73,6 @@ class NET_EXPORT TestRootCerts {
// be trusted. By default, this is true, indicating that the TestRootCerts
// are used in addition to OS trust store.
void SetAllowSystemTrust(bool allow_system_trust);
-#elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
- const std::vector<scoped_refptr<X509Certificate> >&
- temporary_roots() const { return temporary_roots_; }
- bool Contains(X509* cert) const;
#elif defined(OS_WIN)
HCERTSTORE temporary_roots() const { return temporary_roots_; }
@@ -130,8 +120,6 @@ class NET_EXPORT TestRootCerts {
// It is necessary to maintain a cache of the original certificate trust
// settings, in order to restore them when Clear() is called.
std::vector<std::unique_ptr<TrustEntry>> trust_cache_;
-#elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
- std::vector<scoped_refptr<X509Certificate>> temporary_roots_;
#elif defined(OS_WIN)
HCERTSTORE temporary_roots_;
#elif defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698