Roll src/third_party/boringssl/src d6c22ee93..d04ca9535

net/socket/ssl_client_socket_impl.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_impl.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 216 matching lines @@
 // TODO(davidben): Remove this after the ECDSA CBC removal sticks.
 // https:/crbug.com/666191.
 const base::Feature kLegacyECDSACiphersFeature{
     "SSLLegacyECDSACiphers", base::FEATURE_DISABLED_BY_DEFAULT};
 
 bool AreLegacyECDSACiphersEnabled() {
   return base::FeatureList::IsEnabled(kLegacyECDSACiphersFeature);
 }
 #endif
 
-const base::Feature kShortRecordHeaderFeature{
-    "SSLShortRecordHeader", base::FEATURE_DISABLED_BY_DEFAULT};
-
 scoped_refptr<X509Certificate> OSChainFromOpenSSL(STACK_OF(X509) *
                                                   openssl_chain) {
   if (sk_X509_num(openssl_chain) == 0) {
     NOTREACHED();
     return nullptr;
   }
 
 #if defined(USE_OPENSSL_CERTS)
   // When OSCertHandle is typedef'ed to X509, this implementation does a short
   // cut to avoid converting back and forth between DER and the X509 struct.
@@ skipping 75 matching lines @@
     SSL_CTX_set_session_cache_mode(
         ssl_ctx_.get(), SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL);
     SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback);
     SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */);
 
     SSL_CTX_set_grease_enabled(ssl_ctx_.get(), 1);
 
     // Deduplicate all certificates minted from the SSL_CTX in memory.
     SSL_CTX_set0_buffer_pool(ssl_ctx_.get(), x509_util::GetBufferPool());
 
-    if (base::FeatureList::IsEnabled(kShortRecordHeaderFeature)) {
-      SSL_CTX_set_short_header_enabled(ssl_ctx_.get(), 1);
-    }
-
     if (!SSL_CTX_add_client_custom_ext(ssl_ctx_.get(), kTbExtNum,
                                        &TokenBindingAddCallback,
                                        &TokenBindingFreeCallback, nullptr,
                                        &TokenBindingParseCallback, nullptr)) {
       NOTREACHED();
     }
   }
 
   static int TokenBindingAddCallback(SSL* ssl,
                                      unsigned int extension_value,
@@ skipping 1639 matching lines @@
     if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
         !certificate_requested_) {
       net_error = ERR_SSL_PROTOCOL_ERROR;
     }
   }
 
   return net_error;
 }
 
 }  // namespace net