Plumbing SSLPrivateKey

net/ssl/ssl_client_auth_cache_unittest.cc

Index: net/ssl/ssl_client_auth_cache_unittest.cc
diff --git a/net/ssl/ssl_client_auth_cache_unittest.cc b/net/ssl/ssl_client_auth_cache_unittest.cc
index 567418a3fb451076fc1e3baadc47c7535ced70ff..46276e4c7d8aa629aab73aac6d835adfbc3b843c 100644
--- a/net/ssl/ssl_client_auth_cache_unittest.cc
+++ b/net/ssl/ssl_client_auth_cache_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/time/time.h"
 #include "net/cert/x509_certificate.h"
+#include "net/ssl/ssl_private_key.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -29,48 +30,49 @@ TEST(SSLClientAuthCacheTest, LookupAddRemove) {
     new X509Certificate("foo3", "CA", start_date, expiration_date));
 
   scoped_refptr<X509Certificate> cached_cert;
+  scoped_refptr<SSLPrivateKey> cached_pkey;
   // Lookup non-existent client certificate.
   cached_cert = NULL;
-  EXPECT_FALSE(cache.Lookup(server1, &cached_cert));
+  EXPECT_FALSE(cache.Lookup(server1, &cached_cert, &cached_pkey));
 
   // Add client certificate for server1.
-  cache.Add(server1, cert1.get());
+  cache.Add(server1, cert1.get(), NULL);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert1, cached_cert);
 
   // Add client certificate for server2.
-  cache.Add(server2, cert2.get());
+  cache.Add(server2, cert2.get(), NULL);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert1.get(), cached_cert.get());
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert2, cached_cert);
 
   // Overwrite the client certificate for server1.
-  cache.Add(server1, cert3.get());
+  cache.Add(server1, cert3.get(), NULL);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert3, cached_cert);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert2, cached_cert);
 
   // Remove client certificate of server1.
   cache.Remove(server1);
   cached_cert = NULL;
-  EXPECT_FALSE(cache.Lookup(server1, &cached_cert));
+  EXPECT_FALSE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert2, cached_cert);
 
   // Remove non-existent client certificate.
   cache.Remove(server1);
   cached_cert = NULL;
-  EXPECT_FALSE(cache.Lookup(server1, &cached_cert));
+  EXPECT_FALSE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert2, cached_cert);
 }
 
@@ -90,13 +92,14 @@ TEST(SSLClientAuthCacheTest, LookupWithPort) {
   scoped_refptr<X509Certificate> cert2(
       new X509Certificate("foo", "CA", start_date, expiration_date));
 
-  cache.Add(server1, cert1.get());
-  cache.Add(server2, cert2.get());
+  cache.Add(server1, cert1.get(), NULL);
+  cache.Add(server2, cert2.get(), NULL);
 
   scoped_refptr<X509Certificate> cached_cert;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  scoped_refptr<SSLPrivateKey> cached_pkey;
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert1.get(), cached_cert.get());
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert2.get(), cached_cert.get());
 }
 
@@ -111,29 +114,30 @@ TEST(SSLClientAuthCacheTest, LookupNullPreference) {
   scoped_refptr<X509Certificate> cert1(
       new X509Certificate("foo", "CA", start_date, expiration_date));
 
-  cache.Add(server1, NULL);
+  cache.Add(server1, NULL, NULL);
 
   scoped_refptr<X509Certificate> cached_cert(cert1);
+  scoped_refptr<SSLPrivateKey> cached_pkey;
   // Make sure that |cached_cert| is updated to NULL, indicating the user
   // declined to send a certificate to |server1|.
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(NULL, cached_cert.get());
 
   // Remove the existing cached certificate.
   cache.Remove(server1);
   cached_cert = NULL;
-  EXPECT_FALSE(cache.Lookup(server1, &cached_cert));
+  EXPECT_FALSE(cache.Lookup(server1, &cached_cert, &cached_pkey));
 
   // Add a new preference for a specific certificate.
-  cache.Add(server1, cert1.get());
+  cache.Add(server1, cert1.get(), NULL);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert1, cached_cert);
 
   // Replace the specific preference with a NULL certificate.
-  cache.Add(server1, NULL);
+  cache.Add(server1, NULL, NULL);
   cached_cert = NULL;
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(NULL, cached_cert.get());
 }
 
@@ -147,25 +151,26 @@ TEST(SSLClientAuthCacheTest, OnCertAdded) {
   scoped_refptr<X509Certificate> cert1(
       new X509Certificate("foo", "CA", start_date, expiration_date));
 
-  cache.Add(server1, cert1.get());
+  cache.Add(server1, cert1.get(), NULL);
 
   HostPortPair server2("foo2", 443);
-  cache.Add(server2, NULL);
+  cache.Add(server2, NULL, NULL);
 
   scoped_refptr<X509Certificate> cached_cert;
+  scoped_refptr<SSLPrivateKey> cached_pkey;
 
   // Demonstrate the set up is correct.
-  EXPECT_TRUE(cache.Lookup(server1, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server1, &cached_cert, &cached_pkey));
   EXPECT_EQ(cert1, cached_cert);
 
-  EXPECT_TRUE(cache.Lookup(server2, &cached_cert));
+  EXPECT_TRUE(cache.Lookup(server2, &cached_cert, &cached_pkey));
   EXPECT_EQ(NULL, cached_cert.get());
 
   cache.OnCertAdded(NULL);
 
   // Check that we no longer have entries for either server.
-  EXPECT_FALSE(cache.Lookup(server1, &cached_cert));
-  EXPECT_FALSE(cache.Lookup(server2, &cached_cert));
+  EXPECT_FALSE(cache.Lookup(server1, &cached_cert, &cached_pkey));
+  EXPECT_FALSE(cache.Lookup(server2, &cached_cert, &cached_pkey));
 }
 
 }  // namespace net