Wire up SSL client authentication for OpenSSL/Android through the net/ stack

net/socket/ssl_client_socket_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "base/callback_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_test_util.h"
@@ skipping 1212 matching lines @@
     if (rv == net::ERR_IO_PENDING)
       rv = callback.WaitForResult();
     scoped_refptr<net::SSLCertRequestInfo> request_info =
         new net::SSLCertRequestInfo();
     sock->GetSSLCertRequestInfo(request_info.get());
     sock->Disconnect();
     EXPECT_FALSE(sock->IsConnected());
 
     return request_info;
   }
-
-  // The following is needed to construct paths to certificates passed as
-  // |client_authorities| in server SSLOptions. Current implementation of
-  // RemoteTestServer (used on Android) expects relative paths, as opposed to
-  // LocalTestServer, which expects absolute paths (what to fix?).
-  base::FilePath CertDirectory() {
-#ifdef OS_ANDROID
-    return net::GetTestCertsDirectoryRelative();
-#else
-    return net::GetTestCertsDirectory();
-#endif
-  }
 };
 
 TEST_F(SSLClientSocketCertRequestInfoTest, NoAuthorities) {
   net::TestServer::SSLOptions ssl_options;
   ssl_options.request_client_certificate = true;
   scoped_refptr<net::SSLCertRequestInfo> request_info =
       GetCertRequest(ssl_options);
   ASSERT_TRUE(request_info);
   EXPECT_EQ(0u, request_info->cert_authorities.size());
 }
@@ skipping 22 matching lines @@
     0x67, 0x69, 0x4e, 0x6f, 0x74, 0x61, 0x72, 0x20, 0x52, 0x6f, 0x6f, 0x74,
     0x20, 0x43, 0x41, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x09, 0x2a, 0x86, 0x48,
     0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01, 0x16, 0x11, 0x69, 0x6e, 0x66, 0x6f,
     0x40, 0x64, 0x69, 0x67, 0x69, 0x6e, 0x6f, 0x74, 0x61, 0x72, 0x2e, 0x6e,
     0x6c
   };
   const size_t kDiginotarLen = sizeof(kDiginotarDN);
 
   net::TestServer::SSLOptions ssl_options;
   ssl_options.request_client_certificate = true;
-  ssl_options.client_authorities.push_back(CertDirectory().Append(kThawteFile));
   ssl_options.client_authorities.push_back(
-      CertDirectory().Append(kDiginotarFile));
+      net::GetTestClientCertsDirectory().Append(kThawteFile));
+  ssl_options.client_authorities.push_back(
+      net::GetTestClientCertsDirectory().Append(kDiginotarFile));
   scoped_refptr<net::SSLCertRequestInfo> request_info =
       GetCertRequest(ssl_options);
   ASSERT_TRUE(request_info);
   ASSERT_EQ(2u, request_info->cert_authorities.size());
   EXPECT_EQ(std::string(reinterpret_cast<const char*>(kThawteDN), kThawteLen),
             request_info->cert_authorities[0]);
   EXPECT_EQ(
       std::string(reinterpret_cast<const char*>(kDiginotarDN), kDiginotarLen),
       request_info->cert_authorities[1]);
 }