| Index: net/socket/ssl_client_socket.cc
|
| diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
|
| index be58cea7cd941c440a27f8b99f5088d48153815d..c524ae49479b378b54a1667bd022edf464e14b2e 100644
|
| --- a/net/socket/ssl_client_socket.cc
|
| +++ b/net/socket/ssl_client_socket.cc
|
| @@ -4,9 +4,11 @@
|
|
|
| #include "net/socket/ssl_client_socket.h"
|
|
|
| +#include "base/feature_list.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "base/strings/string_util.h"
|
| +#include "build/build_config.h"
|
| #include "crypto/ec_private_key.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/socket/ssl_client_socket_impl.h"
|
| @@ -15,6 +17,13 @@
|
|
|
| namespace net {
|
|
|
| +namespace {
|
| +#if !defined(OS_NACL)
|
| +const base::Feature kPostQuantumExperiment{"SSLPostQuantumExperiment",
|
| + base::FEATURE_DISABLED_BY_DEFAULT};
|
| +#endif
|
| +} // namespace
|
| +
|
| SSLClientSocket::SSLClientSocket()
|
| : signed_cert_timestamps_received_(false),
|
| stapled_ocsp_response_received_(false) {}
|
| @@ -80,6 +89,15 @@ bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
|
| }
|
|
|
| // static
|
| +bool SSLClientSocket::IsPostQuantumExperimentEnabled() {
|
| +#if !defined(OS_NACL)
|
| + return base::FeatureList::IsEnabled(kPostQuantumExperiment);
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| +// static
|
| std::vector<uint8_t> SSLClientSocket::SerializeNextProtos(
|
| const NextProtoVector& next_protos) {
|
| std::vector<uint8_t> wire_protos;
|
|
|