Extract Certificate Transparency SCTs from stapled OCSP responses

net/test/spawned_test_server/base_test_server.h

 // Copyright 2013 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.
 
 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 138 matching lines @@
     TLSIntolerantLevel tls_intolerant;
 
     // fallback_scsv_enabled, if true, causes the server to process the
     // TLS_FALLBACK_SCSV cipher suite. This cipher suite is sent by Chrome
     // when performing TLS version fallback in response to an SSL handshake
     // failure. If this option is enabled then the server will reject fallback
     // connections.
     bool fallback_scsv_enabled;
 
     // (Fake) SignedCertificateTimestampList (as a raw binary string) to send in
     // a TLS extension.

[wtc, 2013/12/13 16:15:50]

Delete these two lines (158-159). This is a merge error.

[ekasper, 2013/12/13 17:26:10]

Done.

     // Temporary glue for testing: validation of SCTs is application-controlled
     // and can be appropriately mocked out, so sending fake data here does not
     // affect handshaking behaviour.
     // TODO(ekasper): replace with valid SCT files for test certs.
-    std::string signed_cert_timestamps;
+    // (Fake) SignedCertificateTimestampList (as a raw binary string) to send in
+    // a TLS extension.
+    std::string signed_cert_timestamps_tls_ext;
+    // Whether to staple the OCSP response.

[wtc, 2013/12/13 16:15:50]

Nit: add a blank line before this line.

[ekasper, 2013/12/13 17:26:10]

Done.

+    bool staple_ocsp_response;
   };
 
   // Pass as the 'host' parameter during construction to server on 127.0.0.1
   static const char kLocalhost[];
 
   // Initialize a TestServer listening on a specific host (IP or hostname).
   BaseTestServer(Type type,  const std::string& host);
 
   // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS.
   explicit BaseTestServer(Type type, const SSLOptions& ssl_options);
@@ skipping 93 matching lines @@
   bool log_to_console_;
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_