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

Unified Diff: net/socket/ssl_client_socket_openssl_unittest.cc

Issue 233133002: Fix link error when compiling with OpenSSL while using OS certs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_openssl_unittest.cc
diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc
index 48a4813f1598069ebd28e27d02b57f9374f01850..91c9a93aa7eb3c1af8b230436d79c002dd5df4b2 100644
--- a/net/socket/ssl_client_socket_openssl_unittest.cc
+++ b/net/socket/ssl_client_socket_openssl_unittest.cc
@@ -49,6 +49,8 @@ namespace net {
namespace {
+// These client auth tests are currently dependent on OpenSSL's struct X509.
+#if defined(USE_OPENSSL_CERTS)
typedef OpenSSLClientKeyStore::ScopedEVP_PKEY ScopedEVP_PKEY;
// BIO_free is a macro, it can't be used as a template parameter.
@@ -360,6 +362,7 @@ TEST_F(SSLClientSocketOpenSSLClientAuthTest, FailingChannelID) {
EXPECT_EQ(ERR_UNEXPECTED, rv);
EXPECT_FALSE(sock_->IsConnected());
}
+#endif // defined(USE_OPENSSL_CERTS)
} // namespace
} // namespace net
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698