grpc 1.69.0 → 1.71.0

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

@@ -1,110 +1,16 @@
-/* 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-2002 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 1995-2016 The OpenSSL Project Authors. 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>
 
@@ -262,9 +168,9 @@ static int do_tls_write(SSL *ssl, size_t *out_bytes_written, uint8_t type,
   // NewSessionTicket.
   Span<const uint8_t> pending_flight;
   if (ssl->s3->pending_flight != nullptr) {
-    pending_flight = MakeConstSpan(
-        reinterpret_cast<const uint8_t *>(ssl->s3->pending_flight->data),
-        ssl->s3->pending_flight->length);
+    pending_flight =
+        Span(reinterpret_cast<const uint8_t *>(ssl->s3->pending_flight->data),
+             ssl->s3->pending_flight->length);
     pending_flight = pending_flight.subspan(ssl->s3->pending_flight_offset);
   }
 
@@ -455,8 +361,8 @@ int ssl_send_alert_impl(SSL *ssl, int level, int desc) {
 }
 
 int tls_dispatch_alert(SSL *ssl) {
-  if (ssl->quic_method) {
-    if (!ssl->quic_method->send_alert(ssl, ssl->s3->write_level,
+  if (SSL_is_quic(ssl)) {
+    if (!ssl->quic_method->send_alert(ssl, ssl->s3->quic_write_level,
                                       ssl->s3->send_alert[1])) {
       OPENSSL_PUT_ERROR(SSL, SSL_R_QUIC_INTERNAL_ERROR);
       return 0;

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

@@ -1,16 +1,16 @@
-/* Copyright (c) 2015, 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 2015 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>
 
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include <openssl/aead.h>
-#include <openssl/chacha.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
@@ -34,29 +33,22 @@
 
 BSSL_NAMESPACE_BEGIN
 
-SSLAEADContext::SSLAEADContext(uint16_t version_arg, bool is_dtls_arg,
-                               const SSL_CIPHER *cipher_arg)
+SSLAEADContext::SSLAEADContext(const SSL_CIPHER *cipher_arg)
     : cipher_(cipher_arg),
-      version_(version_arg),
-      is_dtls_(is_dtls_arg),
       variable_nonce_included_in_record_(false),
       random_variable_nonce_(false),
       xor_fixed_nonce_(false),
       omit_length_in_ad_(false),
-      ad_is_header_(false) {
-  OPENSSL_memset(fixed_nonce_, 0, sizeof(fixed_nonce_));
-  CreateRecordNumberEncrypter();
-}
+      ad_is_header_(false) {}
 
 SSLAEADContext::~SSLAEADContext() {}
 
-UniquePtr<SSLAEADContext> SSLAEADContext::CreateNullCipher(bool is_dtls) {
-  return MakeUnique<SSLAEADContext>(0 /* version */, is_dtls,
-                                    nullptr /* cipher */);
+UniquePtr<SSLAEADContext> SSLAEADContext::CreateNullCipher() {
+  return MakeUnique<SSLAEADContext>(/*cipher=*/nullptr);
 }
 
 UniquePtr<SSLAEADContext> SSLAEADContext::Create(
-    enum evp_aead_direction_t direction, uint16_t version, bool is_dtls,
+    enum evp_aead_direction_t direction, uint16_t version,
     const SSL_CIPHER *cipher, Span<const uint8_t> enc_key,
     Span<const uint8_t> mac_key, Span<const uint8_t> fixed_iv) {
   const EVP_AEAD *aead;
@@ -64,8 +56,8 @@ UniquePtr<SSLAEADContext> SSLAEADContext::Create(
   size_t expected_mac_key_len, expected_fixed_iv_len;
   if (!ssl_protocol_version_from_wire(&protocol_version, version) ||
       !ssl_cipher_get_evp_aead(&aead, &expected_mac_key_len,
-                               &expected_fixed_iv_len, cipher, protocol_version,
-                               is_dtls) ||
+                               &expected_fixed_iv_len, cipher,
+                               protocol_version) ||
       // Ensure the caller returned correct key sizes.
       expected_fixed_iv_len != fixed_iv.size() ||
       expected_mac_key_len != mac_key.size()) {
@@ -73,128 +65,72 @@ UniquePtr<SSLAEADContext> SSLAEADContext::Create(
     return nullptr;
   }
 
-  uint8_t merged_key[EVP_AEAD_MAX_KEY_LENGTH];
-  if (!mac_key.empty()) {
-    // This is a "stateful" AEAD (for compatibility with pre-AEAD cipher
-    // suites).
-    if (mac_key.size() + enc_key.size() + fixed_iv.size() >
-        sizeof(merged_key)) {
-      OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
-      return nullptr;
-    }
-    OPENSSL_memcpy(merged_key, mac_key.data(), mac_key.size());
-    OPENSSL_memcpy(merged_key + mac_key.size(), enc_key.data(), enc_key.size());
-    OPENSSL_memcpy(merged_key + mac_key.size() + enc_key.size(),
-                   fixed_iv.data(), fixed_iv.size());
-    enc_key = MakeConstSpan(merged_key,
-                            enc_key.size() + mac_key.size() + fixed_iv.size());
-  }
-
-  UniquePtr<SSLAEADContext> aead_ctx =
-      MakeUnique<SSLAEADContext>(version, is_dtls, cipher);
+  UniquePtr<SSLAEADContext> aead_ctx = MakeUnique<SSLAEADContext>(cipher);
   if (!aead_ctx) {
     return nullptr;
   }
 
-  assert(aead_ctx->ProtocolVersion() == protocol_version);
-
-  if (!EVP_AEAD_CTX_init_with_direction(
-          aead_ctx->ctx_.get(), aead, enc_key.data(), enc_key.size(),
-          EVP_AEAD_DEFAULT_TAG_LENGTH, direction)) {
-    return nullptr;
-  }
-
+  uint8_t merged_key[EVP_AEAD_MAX_KEY_LENGTH];
   assert(EVP_AEAD_nonce_length(aead) <= EVP_AEAD_MAX_NONCE_LENGTH);
   static_assert(EVP_AEAD_MAX_NONCE_LENGTH < 256,
                 "variable_nonce_len doesn't fit in uint8_t");
   aead_ctx->variable_nonce_len_ = (uint8_t)EVP_AEAD_nonce_length(aead);
   if (mac_key.empty()) {
-    assert(fixed_iv.size() <= sizeof(aead_ctx->fixed_nonce_));
-    OPENSSL_memcpy(aead_ctx->fixed_nonce_, fixed_iv.data(), fixed_iv.size());
-    aead_ctx->fixed_nonce_len_ = fixed_iv.size();
+    // This is an actual AEAD.
+    aead_ctx->fixed_nonce_.CopyFrom(fixed_iv);
 
-    if (cipher->algorithm_enc & SSL_CHACHA20POLY1305) {
-      // The fixed nonce into the actual nonce (the sequence number).
+    if (protocol_version >= TLS1_3_VERSION ||
+        cipher->algorithm_enc & SSL_CHACHA20POLY1305) {
+      // TLS 1.3, and TLS 1.2 ChaCha20-Poly1305, XOR the fixed IV with the
+      // sequence number to form the nonce.
       aead_ctx->xor_fixed_nonce_ = true;
       aead_ctx->variable_nonce_len_ = 8;
+      assert(fixed_iv.size() >= aead_ctx->variable_nonce_len_);
     } else {
-      // The fixed IV is prepended to the nonce.
+      // TLS 1.2 AES-GCM prepends the fixed IV to an explicit nonce.
       assert(fixed_iv.size() <= aead_ctx->variable_nonce_len_);
+      assert(cipher->algorithm_enc & (SSL_AES128GCM | SSL_AES256GCM));
       aead_ctx->variable_nonce_len_ -= fixed_iv.size();
-    }
-
-    // AES-GCM uses an explicit nonce.
-    if (cipher->algorithm_enc & (SSL_AES128GCM | SSL_AES256GCM)) {
       aead_ctx->variable_nonce_included_in_record_ = true;
     }
 
-    // The TLS 1.3 construction XORs the fixed nonce into the sequence number
-    // and omits the additional data.
+    // Starting TLS 1.3, the AAD is the whole record header.
     if (protocol_version >= TLS1_3_VERSION) {
-      aead_ctx->xor_fixed_nonce_ = true;
-      aead_ctx->variable_nonce_len_ = 8;
-      aead_ctx->variable_nonce_included_in_record_ = false;
       aead_ctx->ad_is_header_ = true;
-      assert(fixed_iv.size() >= aead_ctx->variable_nonce_len_);
     }
   } else {
+    // This is a CBC cipher suite that implements the |EVP_AEAD| interface. The
+    // |EVP_AEAD| takes the MAC key, encryption key, and fixed IV concatenated
+    // as its input key.
     assert(protocol_version < TLS1_3_VERSION);
+    BSSL_CHECK(mac_key.size() + enc_key.size() + fixed_iv.size() <=
+               sizeof(merged_key));
+    OPENSSL_memcpy(merged_key, mac_key.data(), mac_key.size());
+    OPENSSL_memcpy(merged_key + mac_key.size(), enc_key.data(), enc_key.size());
+    OPENSSL_memcpy(merged_key + mac_key.size() + enc_key.size(),
+                   fixed_iv.data(), fixed_iv.size());
+    enc_key =
+        Span(merged_key, enc_key.size() + mac_key.size() + fixed_iv.size());
+
+    // The |EVP_AEAD|'s per-encryption nonce, if any, is actually the CBC IV. It
+    // must be generated randomly and prepended to the record.
     aead_ctx->variable_nonce_included_in_record_ = true;
     aead_ctx->random_variable_nonce_ = true;
     aead_ctx->omit_length_in_ad_ = true;
   }
 
-  return aead_ctx;
-}
-
-void SSLAEADContext::CreateRecordNumberEncrypter() {
-  if (!cipher_) {
-    return;
-  }
-#if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
-  rn_encrypter_ = MakeUnique<NullRecordNumberEncrypter>();
-#else
-  if (cipher_->algorithm_enc == SSL_AES128GCM) {
-    rn_encrypter_ = MakeUnique<AES128RecordNumberEncrypter>();
-  } else if (cipher_->algorithm_enc == SSL_AES256GCM) {
-    rn_encrypter_ = MakeUnique<AES256RecordNumberEncrypter>();
-  } else if (cipher_->algorithm_enc == SSL_CHACHA20POLY1305) {
-    rn_encrypter_ = MakeUnique<ChaChaRecordNumberEncrypter>();
-  }
-#endif  // BORINGSSL_UNSAFE_FUZZER_MODE
-}
-
-UniquePtr<SSLAEADContext> SSLAEADContext::CreatePlaceholderForQUIC(
-    uint16_t version, const SSL_CIPHER *cipher) {
-  return MakeUnique<SSLAEADContext>(version, false, cipher);
-}
-
-void SSLAEADContext::SetVersionIfNullCipher(uint16_t version) {
-  if (is_null_cipher()) {
-    version_ = version;
+  if (!EVP_AEAD_CTX_init_with_direction(
+          aead_ctx->ctx_.get(), aead, enc_key.data(), enc_key.size(),
+          EVP_AEAD_DEFAULT_TAG_LENGTH, direction)) {
+    return nullptr;
   }
-}
 
-uint16_t SSLAEADContext::ProtocolVersion() const {
-  uint16_t protocol_version;
-  if(!ssl_protocol_version_from_wire(&protocol_version, version_)) {
-    assert(false);
-    return 0;
-  }
-  return protocol_version;
+  return aead_ctx;
 }
 
-uint16_t SSLAEADContext::RecordVersion() const {
-  if (version_ == 0) {
-    assert(is_null_cipher());
-    return is_dtls_ ? DTLS1_VERSION : TLS1_VERSION;
-  }
-
-  if (ProtocolVersion() <= TLS1_2_VERSION) {
-    return version_;
-  }
-
-  return is_dtls_ ? DTLS1_2_VERSION : TLS1_2_VERSION;
+UniquePtr<SSLAEADContext> SSLAEADContext::CreatePlaceholderForQUIC(
+    const SSL_CIPHER *cipher) {
+  return MakeUnique<SSLAEADContext>(cipher);
 }
 
 size_t SSLAEADContext::ExplicitNonceLen() const {
@@ -237,6 +173,43 @@ size_t SSLAEADContext::MaxOverhead() const {
               : EVP_AEAD_max_overhead(EVP_AEAD_CTX_aead(ctx_.get())));
 }
 
+size_t SSLAEADContext::MaxSealInputLen(size_t max_out) const {
+  size_t explicit_nonce_len = ExplicitNonceLen();
+  if (max_out <= explicit_nonce_len) {
+    return 0;
+  }
+  max_out -= explicit_nonce_len;
+  if (is_null_cipher() || FUZZER_MODE) {
+    return max_out;
+  }
+  // TODO(crbug.com/42290602): This should be part of |EVP_AEAD_CTX|.
+  size_t overhead = EVP_AEAD_max_overhead(EVP_AEAD_CTX_aead(ctx_.get()));
+  if (SSL_CIPHER_is_block_cipher(cipher())) {
+    size_t block_size;
+    switch (cipher()->algorithm_enc) {
+      case SSL_AES128:
+      case SSL_AES256:
+        block_size = 16;
+        break;
+      case SSL_3DES:
+        block_size = 8;
+        break;
+      default:
+        abort();
+    }
+
+    // The output for a CBC cipher is always a whole number of blocks. Round the
+    // remaining capacity down.
+    max_out &= ~(block_size - 1);
+    // The maximum overhead is a full block of padding and the MAC, but the
+    // minimum overhead is one byte of padding, once we know the output is
+    // rounded down.
+    assert(overhead > block_size);
+    overhead -= block_size - 1;
+  }
+  return max_out <= overhead ? 0 : max_out - overhead;
+}
+
 Span<const uint8_t> SSLAEADContext::GetAdditionalData(
     uint8_t storage[13], uint8_t type, uint16_t record_version, uint64_t seqnum,
     size_t plaintext_len, Span<const uint8_t> header) {
@@ -253,7 +226,7 @@ Span<const uint8_t> SSLAEADContext::GetAdditionalData(
     storage[len++] = static_cast<uint8_t>((plaintext_len >> 8));
     storage[len++] = static_cast<uint8_t>(plaintext_len);
   }
-  return MakeConstSpan(storage, len);
+  return Span(storage, len);
 }
 
 bool SSLAEADContext::Open(Span<uint8_t> *out, uint8_t type,
@@ -288,11 +261,11 @@ bool SSLAEADContext::Open(Span<uint8_t> *out, uint8_t type,
 
   // Prepend the fixed nonce, or left-pad with zeros if XORing.
   if (xor_fixed_nonce_) {
-    nonce_len = fixed_nonce_len_ - variable_nonce_len_;
+    nonce_len = fixed_nonce_.size() - variable_nonce_len_;
     OPENSSL_memset(nonce, 0, nonce_len);
   } else {
-    OPENSSL_memcpy(nonce, fixed_nonce_, fixed_nonce_len_);
-    nonce_len += fixed_nonce_len_;
+    OPENSSL_memcpy(nonce, fixed_nonce_.data(), fixed_nonce_.size());
+    nonce_len += fixed_nonce_.size();
   }
 
   // Add the variable nonce.
@@ -312,8 +285,8 @@ bool SSLAEADContext::Open(Span<uint8_t> *out, uint8_t type,
 
   // XOR the fixed nonce, if necessary.
   if (xor_fixed_nonce_) {
-    assert(nonce_len == fixed_nonce_len_);
-    for (size_t i = 0; i < fixed_nonce_len_; i++) {
+    assert(nonce_len == fixed_nonce_.size());
+    for (size_t i = 0; i < fixed_nonce_.size(); i++) {
       nonce[i] ^= fixed_nonce_[i];
     }
   }
@@ -365,11 +338,11 @@ bool SSLAEADContext::SealScatter(uint8_t *out_prefix, uint8_t *out,
 
   // Prepend the fixed nonce, or left-pad with zeros if XORing.
   if (xor_fixed_nonce_) {
-    nonce_len = fixed_nonce_len_ - variable_nonce_len_;
+    nonce_len = fixed_nonce_.size() - variable_nonce_len_;
     OPENSSL_memset(nonce, 0, nonce_len);
   } else {
-    OPENSSL_memcpy(nonce, fixed_nonce_, fixed_nonce_len_);
-    nonce_len += fixed_nonce_len_;
+    OPENSSL_memcpy(nonce, fixed_nonce_.data(), fixed_nonce_.size());
+    nonce_len += fixed_nonce_.size();
   }
 
   // Select the variable nonce.
@@ -393,14 +366,14 @@ bool SSLAEADContext::SealScatter(uint8_t *out_prefix, uint8_t *out,
       OPENSSL_PUT_ERROR(SSL, SSL_R_OUTPUT_ALIASES_INPUT);
       return false;
     }
-    OPENSSL_memcpy(out_prefix, nonce + fixed_nonce_len_,
+    OPENSSL_memcpy(out_prefix, nonce + fixed_nonce_.size(),
                    variable_nonce_len_);
   }
 
   // XOR the fixed nonce, if necessary.
   if (xor_fixed_nonce_) {
-    assert(nonce_len == fixed_nonce_len_);
-    for (size_t i = 0; i < fixed_nonce_len_; i++) {
+    assert(nonce_len == fixed_nonce_.size());
+    for (size_t i = 0; i < fixed_nonce_.size(); i++) {
       nonce[i] ^= fixed_nonce_[i];
     }
   }
@@ -446,70 +419,4 @@ bool SSLAEADContext::GetIV(const uint8_t **out_iv, size_t *out_iv_len) const {
          EVP_AEAD_CTX_get_iv(ctx_.get(), out_iv, out_iv_len);
 }
 
-bool SSLAEADContext::GenerateRecordNumberMask(Span<uint8_t> out,
-                                              Span<const uint8_t> sample) {
-  if (!rn_encrypter_) {
-    return false;
-  }
-  return rn_encrypter_->GenerateMask(out, sample);
-}
-
-size_t AES128RecordNumberEncrypter::KeySize() { return 16; }
-
-size_t AES256RecordNumberEncrypter::KeySize() { return 32; }
-
-bool AESRecordNumberEncrypter::SetKey(Span<const uint8_t> key) {
-  return AES_set_encrypt_key(key.data(), key.size() * 8, &key_) == 0;
-}
-
-bool AESRecordNumberEncrypter::GenerateMask(Span<uint8_t> out,
-                                            Span<const uint8_t> sample) {
-  if (sample.size() < AES_BLOCK_SIZE || out.size() != AES_BLOCK_SIZE) {
-    return false;
-  }
-  AES_encrypt(sample.data(), out.data(), &key_);
-  return true;
-}
-
-size_t ChaChaRecordNumberEncrypter::KeySize() { return kKeySize; }
-
-bool ChaChaRecordNumberEncrypter::SetKey(Span<const uint8_t> key) {
-  if (key.size() != kKeySize) {
-    return false;
-  }
-  OPENSSL_memcpy(key_, key.data(), key.size());
-  return true;
-}
-
-bool ChaChaRecordNumberEncrypter::GenerateMask(Span<uint8_t> out,
-                                               Span<const uint8_t> sample) {
-  Array<uint8_t> zeroes;
-  if (!zeroes.Init(out.size())) {
-    return false;
-  }
-  OPENSSL_memset(zeroes.data(), 0, zeroes.size());
-  // RFC 9147 section 4.2.3 uses the first 4 bytes of the sample as the counter
-  // and the next 12 bytes as the nonce. If we have less than 4+12=16 bytes in
-  // the sample, then we'll read past the end of the |sample| buffer.
-  if (sample.size() < 16) {
-    return false;
-  }
-  uint32_t counter = CRYPTO_load_u32_be(sample.data());
-  Span<const uint8_t> nonce = sample.subspan(4);
-  CRYPTO_chacha_20(out.data(), zeroes.data(), zeroes.size(), key_, nonce.data(),
-                   counter);
-  return true;
-}
-
-#if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
-size_t NullRecordNumberEncrypter::KeySize() { return 0; }
-bool NullRecordNumberEncrypter::SetKey(Span<const uint8_t> key) { return true; }
-
-bool NullRecordNumberEncrypter::GenerateMask(Span<uint8_t> out,
-                                             Span<const uint8_t> sample) {
-  OPENSSL_memset(out.data(), 0, out.size());
-  return true;
-}
-#endif  // BORINGSSL_UNSAFE_FUZZER_MODE
-
 BSSL_NAMESPACE_END