grpc 1.68.1 → 1.71.0

data/third_party/boringssl-with-bazel/src/ssl/ssl_stat.cc

@@ -1,85 +1,17 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
+// Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2005 Nokia. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include <openssl/ssl.h>
 
@@ -97,9 +29,7 @@ const char *SSL_state_string_long(const SSL *ssl) {
                      : ssl_client_handshake_state(ssl->s3->hs.get());
 }
 
-const char *SSL_state_string(const SSL *ssl) {
-  return "!!!!!!";
-}
+const char *SSL_state_string(const SSL *ssl) { return "!!!!!!"; }
 
 const char *SSL_alert_type_string_long(int value) {
   value >>= 8;
@@ -112,13 +42,9 @@ const char *SSL_alert_type_string_long(int value) {
   return "unknown";
 }
 
-const char *SSL_alert_type_string(int value) {
-  return "!";
-}
+const char *SSL_alert_type_string(int value) { return "!"; }
 
-const char *SSL_alert_desc_string(int value) {
-  return "!!";
-}
+const char *SSL_alert_desc_string(int value) { return "!!"; }
 
 const char *SSL_alert_desc_string_long(int value) {
   switch (value & 0xff) {

data/third_party/boringssl-with-bazel/src/ssl/ssl_transcript.cc

@@ -1,140 +1,22 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE. */
+// Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2005 Nokia. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include <openssl/ssl.h>
 
+#include <string_view>
+
 #include <openssl/buf.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
@@ -144,7 +26,7 @@
 
 BSSL_NAMESPACE_BEGIN
 
-SSLTranscript::SSLTranscript() {}
+SSLTranscript::SSLTranscript(bool is_dtls) : is_dtls_(is_dtls) {}
 
 SSLTranscript::~SSLTranscript() {}
 
@@ -159,25 +41,81 @@ bool SSLTranscript::Init() {
 }
 
 bool SSLTranscript::InitHash(uint16_t version, const SSL_CIPHER *cipher) {
+  version_ = version;
   const EVP_MD *md = ssl_get_handshake_digest(version, cipher);
   if (Digest() == md) {
     // No need to re-hash the buffer.
     return true;
   }
-  return EVP_DigestInit_ex(hash_.get(), md, nullptr) &&
-         EVP_DigestUpdate(hash_.get(), buffer_->data, buffer_->length);
+  if (!HashBuffer(hash_.get(), md)) {
+    return false;
+  }
+  if (is_dtls_ && version_ >= TLS1_3_VERSION) {
+    // In DTLS 1.3, prior to the call to InitHash, the message (if present) in
+    // the buffer has the DTLS 1.2 header. After the call to InitHash, the TLS
+    // 1.3 header is written by SSLTranscript::Update. If the buffer isn't freed
+    // here, it would have a mix of different header formats and using it would
+    // yield wrong results. However, there's no need for the buffer once the
+    // version and the digest for the cipher suite are known, so the buffer is
+    // freed here to avoid potential misuse of the SSLTranscript object.
+    FreeBuffer();
+  }
+  return true;
 }
 
-void SSLTranscript::FreeBuffer() {
-  buffer_.reset();
-}
+bool SSLTranscript::HashBuffer(EVP_MD_CTX *ctx, const EVP_MD *digest) const {
+  if (!EVP_DigestInit_ex(ctx, digest, nullptr)) {
+    return false;
+  }
+  if (!is_dtls_ || version_ < TLS1_3_VERSION) {
+    return EVP_DigestUpdate(ctx, buffer_->data, buffer_->length);
+  }
+
+  // If the version is DTLS 1.3 and we still have a buffer, then there should be
+  // at most a single DTLSHandshake message in the buffer, for the ClientHello.
+  // On the server side, the version (DTLS 1.3) and cipher suite are chosen in
+  // response to the first ClientHello, and InitHash is called before that
+  // ClientHello is added to the SSLTranscript, so the buffer is empty if this
+  // SSLTranscript is on the server.
+  if (buffer_->length == 0) {
+    return true;
+  }
 
-size_t SSLTranscript::DigestLen() const {
-  return EVP_MD_size(Digest());
+  // On the client side, we can receive either a ServerHello or
+  // HelloRetryRequest in response to the ClientHello. Regardless of which
+  // message we receive, the client code calls InitHash before updating the
+  // transcript with that message, so the ClientHello is the only message in the
+  // buffer. In DTLS 1.3, we need to skip the message_seq, fragment_offset, and
+  // fragment_length fields from the DTLSHandshake message in the buffer. The
+  // structure of a DTLSHandshake message is as follows (RFC 9147, section 5.2):
+  //
+  //   struct {
+  //       HandshakeType msg_type;    /* handshake type */
+  //       uint24 length;             /* bytes in message */
+  //       uint16 message_seq;        /* DTLS-required field */
+  //       uint24 fragment_offset;    /* DTLS-required field */
+  //       uint24 fragment_length;    /* DTLS-required field */
+  //       select (msg_type) {
+  //         /* omitted for brevity */
+  //       } body;
+  //   } DTLSHandshake;
+  CBS buf, header;
+  CBS_init(&buf, reinterpret_cast<uint8_t *>(buffer_->data), buffer_->length);
+  if (!CBS_get_bytes(&buf, &header, 4) ||                             //
+      !CBS_skip(&buf, 8) ||                                           //
+      !EVP_DigestUpdate(ctx, CBS_data(&header), CBS_len(&header)) ||  //
+      !EVP_DigestUpdate(ctx, CBS_data(&buf), CBS_len(&buf))) {
+    return false;
+  }
+  return true;
 }
 
+void SSLTranscript::FreeBuffer() { buffer_.reset(); }
+
+size_t SSLTranscript::DigestLen() const { return EVP_MD_size(Digest()); }
+
 const EVP_MD *SSLTranscript::Digest() const {
-  return EVP_MD_CTX_md(hash_.get());
+  return EVP_MD_CTX_get0_md(hash_.get());
 }
 
 bool SSLTranscript::UpdateForHelloRetryRequest() {
@@ -193,8 +131,8 @@ bool SSLTranscript::UpdateForHelloRetryRequest() {
   const uint8_t header[4] = {SSL3_MT_MESSAGE_HASH, 0, 0,
                              static_cast<uint8_t>(hash_len)};
   if (!EVP_DigestInit_ex(hash_.get(), Digest(), nullptr) ||
-      !Update(header) ||
-      !Update(MakeConstSpan(old_hash, hash_len))) {
+      !AddToBufferOrHash(header) ||
+      !AddToBufferOrHash(Span(old_hash, hash_len))) {
     return false;
   }
   return true;
@@ -209,8 +147,7 @@ bool SSLTranscript::CopyToHashContext(EVP_MD_CTX *ctx,
   }
 
   if (buffer_) {
-    return EVP_DigestInit_ex(ctx, digest, nullptr) &&
-           EVP_DigestUpdate(ctx, buffer_->data, buffer_->length);
+    return HashBuffer(ctx, digest);
   }
 
   OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
@@ -218,9 +155,30 @@ bool SSLTranscript::CopyToHashContext(EVP_MD_CTX *ctx,
 }
 
 bool SSLTranscript::Update(Span<const uint8_t> in) {
+  if (!is_dtls_ || version_ < TLS1_3_VERSION) {
+    return AddToBufferOrHash(in);
+  }
+  if (in.size() < DTLS1_HM_HEADER_LENGTH) {
+    return false;
+  }
+  // The message passed into Update is the whole Handshake or DTLSHandshake
+  // message, including the msg_type and length. In DTLS, the DTLSHandshake
+  // message also has message_seq, fragment_offset, and fragment_length
+  // fields. In DTLS 1.3, those fields are omitted so that the same
+  // transcript format as TLS 1.3 is used. This means we write the 1-byte
+  // msg_type, 3-byte length, then skip 2+3+3 bytes for the DTLS-specific
+  // fields that get omitted.
+  if (!AddToBufferOrHash(in.subspan(0, 4)) ||
+      !AddToBufferOrHash(in.subspan(12))) {
+    return false;
+  }
+  return true;
+}
+
+bool SSLTranscript::AddToBufferOrHash(Span<const uint8_t> in) {
   // Depending on the state of the handshake, either the handshake buffer may be
   // active, the rolling hash, or both.
-  if (buffer_ &&
+  if (buffer_ &&  //
       !BUF_MEM_append(buffer_.get(), in.data(), in.size())) {
     return false;
   }
@@ -246,22 +204,16 @@ bool SSLTranscript::GetHash(uint8_t *out, size_t *out_len) const {
 bool SSLTranscript::GetFinishedMAC(uint8_t *out, size_t *out_len,
                                    const SSL_SESSION *session,
                                    bool from_server) const {
-  static const char kClientLabel[] = "client finished";
-  static const char kServerLabel[] = "server finished";
-  auto label = from_server
-                   ? MakeConstSpan(kServerLabel, sizeof(kServerLabel) - 1)
-                   : MakeConstSpan(kClientLabel, sizeof(kClientLabel) - 1);
-
   uint8_t digest[EVP_MAX_MD_SIZE];
   size_t digest_len;
   if (!GetHash(digest, &digest_len)) {
     return false;
   }
 
+  std::string_view label = from_server ? "server finished" : "client finished";
   static const size_t kFinishedLen = 12;
-  if (!tls1_prf(Digest(), MakeSpan(out, kFinishedLen),
-                MakeConstSpan(session->secret, session->secret_length), label,
-                MakeConstSpan(digest, digest_len), {})) {
+  if (!tls1_prf(Digest(), Span(out, kFinishedLen), session->secret, label,
+                Span(digest, digest_len), {})) {
     return false;
   }
 

data/third_party/boringssl-with-bazel/src/ssl/ssl_versions.cc

@@ -1,16 +1,16 @@
-/* Copyright (c) 2017, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+// Copyright 2017 The BoringSSL Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include <openssl/ssl.h>
 
@@ -22,8 +22,8 @@
 #include <openssl/err.h>
 #include <openssl/span.h>
 
-#include "internal.h"
 #include "../crypto/internal.h"
+#include "internal.h"
 
 
 BSSL_NAMESPACE_BEGIN
@@ -46,7 +46,7 @@ bool ssl_protocol_version_from_wire(uint16_t *out, uint16_t version) {
       *out = TLS1_2_VERSION;
       return true;
 
-    case DTLS1_3_EXPERIMENTAL_VERSION:
+    case DTLS1_3_VERSION:
       *out = TLS1_3_VERSION;
       return true;
 
@@ -66,7 +66,7 @@ static const uint16_t kTLSVersions[] = {
 };
 
 static const uint16_t kDTLSVersions[] = {
-    DTLS1_3_EXPERIMENTAL_VERSION,
+    DTLS1_3_VERSION,
     DTLS1_2_VERSION,
     DTLS1_VERSION,
 };
@@ -90,7 +90,7 @@ bool ssl_method_supports_version(const SSL_PROTOCOL_METHOD *method,
 // The following functions map between API versions and wire versions. The
 // public API works on wire versions.
 
-static const char* kUnknownVersion = "unknown";
+static const char *kUnknownVersion = "unknown";
 
 struct VersionInfo {
   uint16_t version;
@@ -104,7 +104,7 @@ static const VersionInfo kVersionNames[] = {
     {TLS1_VERSION, "TLSv1"},
     {DTLS1_VERSION, "DTLSv1"},
     {DTLS1_2_VERSION, "DTLSv1.2"},
-    {DTLS1_3_EXPERIMENTAL_VERSION, "DTLSv1.3"},
+    {DTLS1_3_VERSION, "DTLSv1.3"},
 };
 
 static const char *ssl_version_to_string(uint16_t version) {
@@ -116,9 +116,7 @@ static const char *ssl_version_to_string(uint16_t version) {
   return kUnknownVersion;
 }
 
-static uint16_t wire_version_to_api(uint16_t version) {
-  return version;
-}
+static uint16_t wire_version_to_api(uint16_t version) { return version; }
 
 // api_version_to_wire maps |version| to some representative wire version.
 static bool api_version_to_wire(uint16_t *out, uint16_t version) {
@@ -158,6 +156,8 @@ static bool set_min_version(const SSL_PROTOCOL_METHOD *method, uint16_t *out,
 static bool set_max_version(const SSL_PROTOCOL_METHOD *method, uint16_t *out,
                             uint16_t version) {
   // Zero is interpreted as the default maximum version.
+  // TODO(crbug.com/42290594): Enable DTLS 1.3 by default, after it's
+  // successfully shipped in WebRTC.
   if (version == 0) {
     *out = method->is_dtls ? DTLS1_2_VERSION : TLS1_3_VERSION;
     return true;
@@ -198,7 +198,7 @@ bool ssl_get_version_range(const SSL_HANDSHAKE *hs, uint16_t *out_min_version,
   }
 
   // QUIC requires TLS 1.3.
-  if (hs->ssl->quic_method && min_version < TLS1_3_VERSION) {
+  if (SSL_is_quic(hs->ssl) && min_version < TLS1_3_VERSION) {
     min_version = TLS1_3_VERSION;
   }
 
@@ -234,7 +234,7 @@ bool ssl_get_version_range(const SSL_HANDSHAKE *hs, uint16_t *out_min_version,
     // If there is a disabled version after the first enabled one, all versions
     // after it are implicitly disabled.
     if (any_enabled) {
-      max_version = kProtocolVersions[i-1].version;
+      max_version = kProtocolVersions[i - 1].version;
       break;
     }
   }
@@ -250,18 +250,32 @@ bool ssl_get_version_range(const SSL_HANDSHAKE *hs, uint16_t *out_min_version,
 }
 
 static uint16_t ssl_version(const SSL *ssl) {
-  // In early data, we report the predicted version.
+  // In early data, we report the predicted version. Note it is possible that we
+  // have a predicted version and a *different* true version. This means 0-RTT
+  // has been rejected, but until the reject has reported to the application and
+  // applied with |SSL_reset_early_data_reject|, we continue reporting a
+  // self-consistent connection.
   if (SSL_in_early_data(ssl) && !ssl->server) {
     return ssl->s3->hs->early_session->ssl_version;
   }
-  return ssl->version;
+  if (ssl->s3->version != 0) {
+    return ssl->s3->version;
+  }
+  // The TLS versions has not yet been negotiated. Historically, we would return
+  // (D)TLS 1.2, so preserve that behavior.
+  return SSL_is_dtls(ssl) ? DTLS1_2_VERSION : TLS1_2_VERSION;
+}
+
+bool ssl_has_final_version(const SSL *ssl) {
+  return ssl->s3->version != 0 &&
+         (ssl->s3->hs == nullptr || !ssl->s3->hs->is_early_version);
 }
 
 uint16_t ssl_protocol_version(const SSL *ssl) {
-  assert(ssl->s3->have_version);
+  assert(ssl->s3->version != 0);
   uint16_t version;
-  if (!ssl_protocol_version_from_wire(&version, ssl->version)) {
-    // |ssl->version| will always be set to a valid version.
+  if (!ssl_protocol_version_from_wire(&version, ssl->s3->version)) {
+    // |ssl->s3->version| will always be set to a valid version.
     assert(0);
     return 0;
   }
@@ -393,8 +407,8 @@ const char *SSL_get_version(const SSL *ssl) {
 }
 
 size_t SSL_get_all_version_names(const char **out, size_t max_out) {
-  return GetAllNames(out, max_out, MakeConstSpan(&kUnknownVersion, 1),
-                     &VersionInfo::name, MakeConstSpan(kVersionNames));
+  return GetAllNames(out, max_out, Span(&kUnknownVersion, 1),
+                     &VersionInfo::name, Span(kVersionNames));
 }
 
 const char *SSL_SESSION_get_version(const SSL_SESSION *session) {