grpc 1.84.0 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/crypto/fipsmodule/cipher/e_aes.cc.inc

@@ -22,6 +22,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/nid.h>
+#include <openssl/span.h>
 
 #include "../../internal.h"
 #include "../aes/internal.h"
@@ -31,6 +32,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 #define AES_GCM_NONCE_LENGTH 12
 
 typedef struct {
@@ -79,23 +82,25 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
     if (hwaes_capable()) {
       ret = aes_hw_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
       dat->block = aes_hw_decrypt;
-      dat->stream.cbc = NULL;
+      dat->stream.cbc = nullptr;
       if (mode == EVP_CIPH_CBC_MODE) {
         dat->stream.cbc = aes_hw_cbc_encrypt;
       }
+#if defined(BSAES)
     } else if (bsaes_capable() && mode == EVP_CIPH_CBC_MODE) {
       assert(vpaes_capable());
       ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
       if (ret == 0) {
         vpaes_decrypt_key_to_bsaes(&dat->ks.ks, &dat->ks.ks);
       }
-      // If |dat->stream.cbc| is provided, |dat->block| is never used.
-      dat->block = NULL;
+      // If `dat->stream.cbc` is provided, `dat->block` is never used.
+      dat->block = nullptr;
       dat->stream.cbc = bsaes_cbc_encrypt;
+#endif
     } else if (vpaes_capable()) {
       ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
       dat->block = vpaes_decrypt;
-      dat->stream.cbc = NULL;
+      dat->stream.cbc = nullptr;
 #if defined(VPAES_CBC)
       if (mode == EVP_CIPH_CBC_MODE) {
         dat->stream.cbc = vpaes_cbc_encrypt;
@@ -104,7 +109,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
     } else {
       ret = aes_nohw_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
       dat->block = aes_nohw_decrypt;
-      dat->stream.cbc = NULL;
+      dat->stream.cbc = nullptr;
       if (mode == EVP_CIPH_CBC_MODE) {
         dat->stream.cbc = aes_nohw_cbc_encrypt;
       }
@@ -112,7 +117,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
   } else if (hwaes_capable()) {
     ret = aes_hw_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
     dat->block = aes_hw_encrypt;
-    dat->stream.cbc = NULL;
+    dat->stream.cbc = nullptr;
     if (mode == EVP_CIPH_CBC_MODE) {
       dat->stream.cbc = aes_hw_cbc_encrypt;
     } else if (mode == EVP_CIPH_CTR_MODE) {
@@ -121,7 +126,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
   } else if (vpaes_capable()) {
     ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
     dat->block = vpaes_encrypt;
-    dat->stream.cbc = NULL;
+    dat->stream.cbc = nullptr;
 #if defined(VPAES_CBC)
     if (mode == EVP_CIPH_CBC_MODE) {
       dat->stream.cbc = vpaes_cbc_encrypt;
@@ -138,7 +143,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
   } else {
     ret = aes_nohw_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
     dat->block = aes_nohw_encrypt;
-    dat->stream.cbc = NULL;
+    dat->stream.cbc = nullptr;
     if (mode == EVP_CIPH_CBC_MODE) {
       dat->stream.cbc = aes_nohw_cbc_encrypt;
     } else if (mode == EVP_CIPH_CTR_MODE) {
@@ -154,8 +159,8 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
   return 1;
 }
 
-static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                          size_t len) {
+static int aes_cbc_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                 const uint8_t *in, size_t len) {
   EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
 
   if (dat->stream.cbc) {
@@ -169,8 +174,8 @@ static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
   return 1;
 }
 
-static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                          size_t len) {
+static int aes_ecb_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                 const uint8_t *in, size_t len) {
   size_t bl = ctx->cipher->block_size;
   EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
 
@@ -186,16 +191,16 @@ static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
   return 1;
 }
 
-static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                          size_t len) {
+static int aes_ctr_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                 const uint8_t *in, size_t len) {
   EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
   CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks.ks, ctx->iv, ctx->buf,
                               &ctx->num, dat->stream.ctr);
   return 1;
 }
 
-static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                          size_t len) {
+static int aes_ofb_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                 const uint8_t *in, size_t len) {
   EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
 
   CRYPTO_ofb128_encrypt(in, out, len, &dat->ks.ks, ctx->iv, &ctx->num,
@@ -216,7 +221,7 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
     OPENSSL_memset(&gctx->gcm, 0, sizeof(gctx->gcm));
     CRYPTO_gcm128_init_aes_key(&gctx->key, key, ctx->key_len);
     // Use the IV if specified. Otherwise, use the saved IV, if any.
-    if (iv == NULL && gctx->iv_set) {
+    if (iv == nullptr && gctx->iv_set) {
       iv = gctx->iv;
     }
     if (iv) {
@@ -262,16 +267,32 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
       if (arg <= 0) {
         return 0;
       }
+      if (arg == gctx->ivlen) {
+        // Some applications set the IV and then do a no-op length change,
+        // expecting the IV to remain set.
+        return 1;
+      }
+
+      // Clear any existing IV or partial IV that may have previously been set.
+      gctx->iv_set = 0;
+      gctx->iv_gen = 0;
 
-      // Allocate memory for IV if needed
-      if (arg > EVP_MAX_IV_LENGTH && arg > gctx->ivlen) {
+      if (arg <= EVP_MAX_IV_LENGTH) {
+        // IVs less than EVP_MAX_IV_LENGTH are stored in the built-in buffer.
         if (gctx->iv != c->iv) {
           OPENSSL_free(gctx->iv);
+          gctx->iv = c->iv;
         }
-        gctx->iv = reinterpret_cast<uint8_t *>(OPENSSL_malloc(arg));
-        if (!gctx->iv) {
+      } else if (arg > gctx->ivlen) {
+        // The existing buffer isn't large enough.
+        uint8_t *new_iv = static_cast<uint8_t *>(OPENSSL_malloc(arg));
+        if (new_iv == nullptr) {
           return 0;
         }
+        if (gctx->iv != c->iv) {
+          OPENSSL_free(gctx->iv);
+        }
+        gctx->iv = new_iv;
       }
       gctx->ivlen = arg;
       return 1;
@@ -302,14 +323,14 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
         gctx->iv_gen = 1;
         return 1;
       }
-      // Fixed field must be at least 4 bytes and invocation field
-      // at least 8.
+      // The fixed field must be at least 4 bytes and the invocation field at
+      // least 8.
       if (arg < 4 || (gctx->ivlen - arg) < 8) {
         return 0;
       }
       OPENSSL_memcpy(gctx->iv, ptr, arg);
       if (c->encrypt) {
-        // |BCM_rand_bytes| calls within the fipsmodule should be wrapped with
+        // `BCM_rand_bytes` calls within the fipsmodule should be wrapped with
         // state lock functions to avoid updating the service indicator with the
         // DRBG functions.
         FIPS_service_indicator_lock_state();
@@ -320,7 +341,7 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
       return 1;
 
     case EVP_CTRL_GCM_IV_GEN: {
-      if (gctx->iv_gen == 0 || gctx->key_set == 0) {
+      if (gctx->iv_gen == 0 || gctx->key_set == 0 || gctx->ivlen < 8) {
         return 0;
       }
       CRYPTO_gcm128_init_ctx(&gctx->key, &gctx->gcm, gctx->iv, gctx->ivlen);
@@ -328,8 +349,6 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
         arg = gctx->ivlen;
       }
       OPENSSL_memcpy(ptr, gctx->iv + gctx->ivlen - arg, arg);
-      // Invocation field will be at least 8 bytes in size, so no need to check
-      // wrap around or increment more than last 8 bytes.
       uint8_t *ctr = gctx->iv + gctx->ivlen - 8;
       CRYPTO_store_u64_be(ctr, CRYPTO_load_u64_be(ctr) + 1);
       gctx->iv_set = 1;
@@ -337,7 +356,8 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
     }
 
     case EVP_CTRL_GCM_SET_IV_INV:
-      if (gctx->iv_gen == 0 || gctx->key_set == 0 || c->encrypt) {
+      if (gctx->iv_gen == 0 || gctx->key_set == 0 || c->encrypt || arg < 0 ||
+          arg > gctx->ivlen) {
         return 0;
       }
       OPENSSL_memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg);
@@ -366,56 +386,55 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) {
   }
 }
 
-static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                          size_t len) {
+static int aes_gcm_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                 const uint8_t *in, size_t len) {
   EVP_AES_GCM_CTX *gctx = reinterpret_cast<EVP_AES_GCM_CTX *>(ctx->cipher_data);
 
   // If not set up, return error
-  if (!gctx->key_set) {
-    return -1;
+  if (!gctx->key_set || !gctx->iv_set) {
+    return 0;
   }
-  if (!gctx->iv_set) {
-    return -1;
+
+  if (ctx->encrypt) {
+    return CRYPTO_gcm128_encrypt(&gctx->key, &gctx->gcm, in, out, len);
+  } else {
+    return CRYPTO_gcm128_decrypt(&gctx->key, &gctx->gcm, in, out, len);
   }
+}
+
+static int aes_gcm_cipher_final(EVP_CIPHER_CTX *ctx) {
+  EVP_AES_GCM_CTX *gctx = reinterpret_cast<EVP_AES_GCM_CTX *>(ctx->cipher_data);
 
-  if (len > INT_MAX) {
-    // This function signature can only express up to |INT_MAX| bytes encrypted.
-    //
-    // TODO(https://crbug.com/boringssl/494): Make the internal |EVP_CIPHER|
-    // calling convention |size_t|-clean.
-    return -1;
+  // If not set up, return error
+  if (!gctx->key_set || !gctx->iv_set) {
+    return 0;
   }
 
-  if (in) {
-    if (out == NULL) {
-      if (!CRYPTO_gcm128_aad(&gctx->key, &gctx->gcm, in, len)) {
-        return -1;
-      }
-    } else if (ctx->encrypt) {
-      if (!CRYPTO_gcm128_encrypt(&gctx->key, &gctx->gcm, in, out, len)) {
-        return -1;
-      }
-    } else {
-      if (!CRYPTO_gcm128_decrypt(&gctx->key, &gctx->gcm, in, out, len)) {
-        return -1;
-      }
-    }
-    return (int)len;
-  } else {
-    if (!ctx->encrypt) {
-      if (gctx->taglen < 0 || !CRYPTO_gcm128_finish(&gctx->key, &gctx->gcm,
-                                                    ctx->buf, gctx->taglen)) {
-        return -1;
-      }
-      gctx->iv_set = 0;
+  if (!ctx->encrypt) {
+    if (gctx->taglen < 0 ||
+        !CRYPTO_gcm128_finish(&gctx->key, &gctx->gcm, ctx->buf, gctx->taglen)) {
       return 0;
     }
-    CRYPTO_gcm128_tag(&gctx->key, &gctx->gcm, ctx->buf, 16);
-    gctx->taglen = 16;
-    // Don't reuse the IV
     gctx->iv_set = 0;
+    return 1;
+  }
+  CRYPTO_gcm128_tag(&gctx->key, &gctx->gcm, ctx->buf, 16);
+  gctx->taglen = 16;
+  // Don't reuse the IV
+  gctx->iv_set = 0;
+  return 1;
+}
+
+static int aes_gcm_update_aad(EVP_CIPHER_CTX *ctx, const uint8_t *in,
+                              size_t len) {
+  EVP_AES_GCM_CTX *gctx = reinterpret_cast<EVP_AES_GCM_CTX *>(ctx->cipher_data);
+
+  // If not set up, return error
+  if (!gctx->key_set || !gctx->iv_set) {
     return 0;
   }
+
+  return CRYPTO_gcm128_aad(&gctx->key, &gctx->gcm, in, len);
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_cbc) {
@@ -428,7 +447,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_cbc) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CBC_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_cbc_cipher;
+  out->cipher_update = aes_cbc_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ctr) {
@@ -441,7 +460,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ctr) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CTR_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ctr_cipher;
+  out->cipher_update = aes_ctr_cipher_update;
 }
 
 DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ecb_generic) {
@@ -453,7 +472,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ecb_generic) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ecb_cipher;
+  out->cipher_update = aes_ecb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ofb) {
@@ -466,7 +485,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ofb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_OFB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ofb_cipher;
+  out->cipher_update = aes_ofb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_gcm) {
@@ -481,7 +500,9 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_gcm) {
                EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT |
                EVP_CIPH_CTRL_INIT | EVP_CIPH_FLAG_AEAD_CIPHER;
   out->init = aes_gcm_init_key;
-  out->cipher = aes_gcm_cipher;
+  out->cipher_update = aes_gcm_cipher_update;
+  out->cipher_final = aes_gcm_cipher_final;
+  out->update_aad = aes_gcm_update_aad;
   out->cleanup = aes_gcm_cleanup;
   out->ctrl = aes_gcm_ctrl;
 }
@@ -496,7 +517,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_cbc) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CBC_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_cbc_cipher;
+  out->cipher_update = aes_cbc_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ctr) {
@@ -509,7 +530,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ctr) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CTR_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ctr_cipher;
+  out->cipher_update = aes_ctr_cipher_update;
 }
 
 DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ecb_generic) {
@@ -521,7 +542,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ecb_generic) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ecb_cipher;
+  out->cipher_update = aes_ecb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ofb) {
@@ -534,7 +555,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ofb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_OFB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ofb_cipher;
+  out->cipher_update = aes_ofb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_gcm) {
@@ -549,7 +570,9 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_gcm) {
                EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT |
                EVP_CIPH_CTRL_INIT | EVP_CIPH_FLAG_AEAD_CIPHER;
   out->init = aes_gcm_init_key;
-  out->cipher = aes_gcm_cipher;
+  out->cipher_update = aes_gcm_cipher_update;
+  out->cipher_final = aes_gcm_cipher_final;
+  out->update_aad = aes_gcm_update_aad;
   out->cleanup = aes_gcm_cleanup;
   out->ctrl = aes_gcm_ctrl;
 }
@@ -564,7 +587,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_cbc) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CBC_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_cbc_cipher;
+  out->cipher_update = aes_cbc_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ctr) {
@@ -577,7 +600,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ctr) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_CTR_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ctr_cipher;
+  out->cipher_update = aes_ctr_cipher_update;
 }
 
 DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ecb_generic) {
@@ -589,7 +612,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ecb_generic) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ecb_cipher;
+  out->cipher_update = aes_ecb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ofb) {
@@ -602,7 +625,7 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ofb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_OFB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_ofb_cipher;
+  out->cipher_update = aes_ofb_cipher_update;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_gcm) {
@@ -617,15 +640,17 @@ DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_gcm) {
                EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT |
                EVP_CIPH_CTRL_INIT | EVP_CIPH_FLAG_AEAD_CIPHER;
   out->init = aes_gcm_init_key;
-  out->cipher = aes_gcm_cipher;
+  out->cipher_update = aes_gcm_cipher_update;
+  out->cipher_final = aes_gcm_cipher_final;
+  out->update_aad = aes_gcm_update_aad;
   out->cleanup = aes_gcm_cleanup;
   out->ctrl = aes_gcm_ctrl;
 }
 
 #if defined(HWAES_ECB)
 
-static int aes_hw_ecb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out,
-                             const uint8_t *in, size_t len) {
+static int aes_hw_ecb_cipher_update(EVP_CIPHER_CTX *ctx, uint8_t *out,
+                                    const uint8_t *in, size_t len) {
   size_t bl = ctx->cipher->block_size;
 
   if (len < bl) {
@@ -648,7 +673,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_128_ecb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_hw_ecb_cipher;
+  out->cipher_update = aes_hw_ecb_cipher_update;
 }
 
 DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_192_ecb) {
@@ -660,7 +685,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_192_ecb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_hw_ecb_cipher;
+  out->cipher_update = aes_hw_ecb_cipher_update;
 }
 
 DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_256_ecb) {
@@ -672,22 +697,22 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_256_ecb) {
   out->ctx_size = sizeof(EVP_AES_KEY);
   out->flags = EVP_CIPH_ECB_MODE;
   out->init = aes_init_key;
-  out->cipher = aes_hw_ecb_cipher;
+  out->cipher_update = aes_hw_ecb_cipher_update;
 }
 
-#define EVP_ECB_CIPHER_FUNCTION(keybits)            \
-  const EVP_CIPHER *EVP_aes_##keybits##_ecb(void) { \
-    if (hwaes_capable()) {                          \
-      return aes_hw_##keybits##_ecb();              \
-    }                                               \
-    return aes_##keybits##_ecb_generic();           \
+#define EVP_ECB_CIPHER_FUNCTION(keybits)        \
+  const EVP_CIPHER *EVP_aes_##keybits##_ecb() { \
+    if (hwaes_capable()) {                      \
+      return aes_hw_##keybits##_ecb();          \
+    }                                           \
+    return aes_##keybits##_ecb_generic();       \
   }
 
 #else
 
-#define EVP_ECB_CIPHER_FUNCTION(keybits)            \
-  const EVP_CIPHER *EVP_aes_##keybits##_ecb(void) { \
-    return aes_##keybits##_ecb_generic();           \
+#define EVP_ECB_CIPHER_FUNCTION(keybits)        \
+  const EVP_CIPHER *EVP_aes_##keybits##_ecb() { \
+    return aes_##keybits##_ecb_generic();       \
   }
 
 #endif  // HWAES_ECB
@@ -728,7 +753,7 @@ static int aead_aes_gcm_init_impl(struct aead_aes_gcm_ctx *gcm_ctx,
   return 1;
 }
 
-static_assert(sizeof(((EVP_AEAD_CTX *)NULL)->state) >=
+static_assert(sizeof(((EVP_AEAD_CTX *)nullptr)->state) >=
                   sizeof(struct aead_aes_gcm_ctx),
               "AEAD state is too small");
 static_assert(alignof(union evp_aead_ctx_st_state) >=
@@ -751,91 +776,89 @@ static int aead_aes_gcm_init(EVP_AEAD_CTX *ctx, const uint8_t *key,
 
 static void aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx) {}
 
-static int aead_aes_gcm_seal_scatter_impl(
-    const struct aead_aes_gcm_ctx *gcm_ctx, uint8_t *out, uint8_t *out_tag,
-    size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *nonce,
-    size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *extra_in,
-    size_t extra_in_len, const uint8_t *ad, size_t ad_len, size_t tag_len) {
-  if (extra_in_len + tag_len < tag_len) {
-    OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_TOO_LARGE);
-    return 0;
-  }
-  if (max_out_tag_len < extra_in_len + tag_len) {
+static int aead_aes_gcm_sealv_impl(const struct aead_aes_gcm_ctx *gcm_ctx,
+                                   Span<const CRYPTO_IOVEC> iovecs,
+                                   Span<uint8_t> out_tag, size_t *out_tag_len,
+                                   Span<const uint8_t> nonce,
+                                   Span<const CRYPTO_IVEC> aadvecs,
+                                   size_t tag_len) {
+  if (out_tag.size() < tag_len) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BUFFER_TOO_SMALL);
     return 0;
   }
-  if (nonce_len == 0) {
+
+  if (nonce.size() == 0) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_INVALID_NONCE_SIZE);
     return 0;
   }
 
   const GCM128_KEY *key = &gcm_ctx->key;
   GCM128_CONTEXT gcm;
-  CRYPTO_gcm128_init_ctx(key, &gcm, nonce, nonce_len);
-
-  if (ad_len > 0 && !CRYPTO_gcm128_aad(key, &gcm, ad, ad_len)) {
-    return 0;
-  }
+  CRYPTO_gcm128_init_ctx(key, &gcm, nonce.data(), nonce.size());
 
-  if (!CRYPTO_gcm128_encrypt(key, &gcm, in, out, in_len)) {
-    return 0;
+  for (const CRYPTO_IVEC &aadvec : aadvecs) {
+    if (!CRYPTO_gcm128_aad(key, &gcm, aadvec.in, aadvec.len)) {
+      return 0;
+    }
   }
 
-  if (extra_in_len > 0 &&
-      !CRYPTO_gcm128_encrypt(key, &gcm, extra_in, out_tag, extra_in_len)) {
-    return 0;
+  for (const CRYPTO_IOVEC &iovec : iovecs) {
+    if (!CRYPTO_gcm128_encrypt(key, &gcm, iovec.in, iovec.out, iovec.len)) {
+      return 0;
+    }
   }
 
-  CRYPTO_gcm128_tag(key, &gcm, out_tag + extra_in_len, tag_len);
-  *out_tag_len = tag_len + extra_in_len;
+  CRYPTO_gcm128_tag(key, &gcm, out_tag.data(), tag_len);
+  *out_tag_len = tag_len;
 
   return 1;
 }
 
-static int aead_aes_gcm_seal_scatter(
-    const EVP_AEAD_CTX *ctx, uint8_t *out, uint8_t *out_tag,
-    size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *nonce,
-    size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *extra_in,
-    size_t extra_in_len, const uint8_t *ad, size_t ad_len) {
+static int aead_aes_gcm_sealv(const EVP_AEAD_CTX *ctx,
+                              Span<const CRYPTO_IOVEC> iovecs,
+                              Span<uint8_t> out_tag, size_t *out_tag_len,
+                              Span<const uint8_t> nonce,
+                              Span<const CRYPTO_IVEC> aadvecs) {
   const struct aead_aes_gcm_ctx *gcm_ctx =
       (const struct aead_aes_gcm_ctx *)&ctx->state;
-  return aead_aes_gcm_seal_scatter_impl(
-      gcm_ctx, out, out_tag, out_tag_len, max_out_tag_len, nonce, nonce_len, in,
-      in_len, extra_in, extra_in_len, ad, ad_len, ctx->tag_len);
+  return aead_aes_gcm_sealv_impl(gcm_ctx, iovecs, out_tag, out_tag_len, nonce,
+                                 aadvecs, ctx->tag_len);
 }
 
-static int aead_aes_gcm_open_gather_impl(const struct aead_aes_gcm_ctx *gcm_ctx,
-                                         uint8_t *out, const uint8_t *nonce,
-                                         size_t nonce_len, const uint8_t *in,
-                                         size_t in_len, const uint8_t *in_tag,
-                                         size_t in_tag_len, const uint8_t *ad,
-                                         size_t ad_len, size_t tag_len) {
+static int aead_aes_gcm_openv_detached_impl(
+    const struct aead_aes_gcm_ctx *gcm_ctx, Span<const CRYPTO_IOVEC> iovecs,
+    Span<const uint8_t> nonce, Span<const uint8_t> in_tag,
+    Span<const CRYPTO_IVEC> aadvecs, size_t tag_len) {
   uint8_t tag[EVP_AEAD_AES_GCM_TAG_LEN];
 
-  if (nonce_len == 0) {
+  if (nonce.size() == 0) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_INVALID_NONCE_SIZE);
     return 0;
   }
 
-  if (in_tag_len != tag_len) {
+  if (in_tag.size() != tag_len) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BAD_DECRYPT);
     return 0;
   }
 
   const GCM128_KEY *key = &gcm_ctx->key;
   GCM128_CONTEXT gcm;
-  CRYPTO_gcm128_init_ctx(key, &gcm, nonce, nonce_len);
+  CRYPTO_gcm128_init_ctx(key, &gcm, nonce.data(), nonce.size());
 
-  if (!CRYPTO_gcm128_aad(key, &gcm, ad, ad_len)) {
-    return 0;
+  for (const CRYPTO_IVEC &aadvec : aadvecs) {
+    if (!CRYPTO_gcm128_aad(key, &gcm, aadvec.in, aadvec.len)) {
+      return 0;
+    }
   }
 
-  if (!CRYPTO_gcm128_decrypt(key, &gcm, in, out, in_len)) {
-    return 0;
+  for (const CRYPTO_IOVEC &iovec : iovecs) {
+    if (!CRYPTO_gcm128_decrypt(key, &gcm, iovec.in, iovec.out, iovec.len)) {
+      return 0;
+    }
   }
 
   CRYPTO_gcm128_tag(key, &gcm, tag, tag_len);
-  if (CRYPTO_memcmp(tag, in_tag, tag_len) != 0) {
+  if (CRYPTO_memcmp(tag, in_tag.data(), tag_len) != 0) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BAD_DECRYPT);
     return 0;
   }
@@ -843,15 +866,14 @@ static int aead_aes_gcm_open_gather_impl(const struct aead_aes_gcm_ctx *gcm_ctx,
   return 1;
 }
 
-static int aead_aes_gcm_open_gather(const EVP_AEAD_CTX *ctx, uint8_t *out,
-                                    const uint8_t *nonce, size_t nonce_len,
-                                    const uint8_t *in, size_t in_len,
-                                    const uint8_t *in_tag, size_t in_tag_len,
-                                    const uint8_t *ad, size_t ad_len) {
+static int aead_aes_gcm_openv_detached(const EVP_AEAD_CTX *ctx,
+                                       Span<const CRYPTO_IOVEC> iovecs,
+                                       Span<const uint8_t> nonce,
+                                       Span<const uint8_t> in_tag,
+                                       Span<const CRYPTO_IVEC> aadvecs) {
   struct aead_aes_gcm_ctx *gcm_ctx = (struct aead_aes_gcm_ctx *)&ctx->state;
-  if (!aead_aes_gcm_open_gather_impl(gcm_ctx, out, nonce, nonce_len, in, in_len,
-                                     in_tag, in_tag_len, ad, ad_len,
-                                     ctx->tag_len)) {
+  if (!aead_aes_gcm_openv_detached_impl(gcm_ctx, iovecs, nonce, in_tag, aadvecs,
+                                        ctx->tag_len)) {
     return 0;
   }
 
@@ -866,12 +888,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_128_gcm) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_192_gcm) {
@@ -881,12 +902,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_192_gcm) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm) {
@@ -896,12 +916,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 static int aead_aes_gcm_init_randnonce(EVP_AEAD_CTX *ctx, const uint8_t *key,
@@ -923,24 +942,24 @@ static int aead_aes_gcm_init_randnonce(EVP_AEAD_CTX *ctx, const uint8_t *key,
   return 1;
 }
 
-static int aead_aes_gcm_seal_scatter_randnonce(
-    const EVP_AEAD_CTX *ctx, uint8_t *out, uint8_t *out_tag,
-    size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *external_nonce,
-    size_t external_nonce_len, const uint8_t *in, size_t in_len,
-    const uint8_t *extra_in, size_t extra_in_len, const uint8_t *ad,
-    size_t ad_len) {
-  if (external_nonce_len != 0) {
+static int aead_aes_gcm_sealv_randnonce(const EVP_AEAD_CTX *ctx,
+                                        Span<const CRYPTO_IOVEC> iovecs,
+                                        Span<uint8_t> out_tag,
+                                        size_t *out_tag_len,
+                                        Span<const uint8_t> external_nonce,
+                                        Span<const CRYPTO_IVEC> aadvecs) {
+  if (external_nonce.size() != 0) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_INVALID_NONCE_SIZE);
     return 0;
   }
 
   uint8_t nonce[AES_GCM_NONCE_LENGTH];
-  if (max_out_tag_len < sizeof(nonce)) {
+  if (out_tag.size() < sizeof(nonce)) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BUFFER_TOO_SMALL);
     return 0;
   }
 
-  // |BCM_rand_bytes| calls within the fipsmodule should be wrapped with state
+  // `BCM_rand_bytes` calls within the fipsmodule should be wrapped with state
   // lock functions to avoid updating the service indicator with the DRBG
   // functions.
   FIPS_service_indicator_lock_state();
@@ -949,43 +968,39 @@ static int aead_aes_gcm_seal_scatter_randnonce(
 
   const struct aead_aes_gcm_ctx *gcm_ctx =
       (const struct aead_aes_gcm_ctx *)&ctx->state;
-  if (!aead_aes_gcm_seal_scatter_impl(gcm_ctx, out, out_tag, out_tag_len,
-                                      max_out_tag_len - AES_GCM_NONCE_LENGTH,
-                                      nonce, sizeof(nonce), in, in_len,
-                                      extra_in, extra_in_len, ad, ad_len,
-                                      ctx->tag_len - AES_GCM_NONCE_LENGTH)) {
+  if (!aead_aes_gcm_sealv_impl(
+          gcm_ctx, iovecs, out_tag.first(out_tag.size() - AES_GCM_NONCE_LENGTH),
+          out_tag_len, nonce, aadvecs, ctx->tag_len - AES_GCM_NONCE_LENGTH)) {
     return 0;
   }
 
-  assert(*out_tag_len + sizeof(nonce) <= max_out_tag_len);
-  memcpy(out_tag + *out_tag_len, nonce, sizeof(nonce));
+  assert(*out_tag_len + sizeof(nonce) <= out_tag.size());
+  CopyToPrefix(nonce, out_tag.subspan(*out_tag_len));
   *out_tag_len += sizeof(nonce);
 
   AEAD_GCM_verify_service_indicator(ctx);
   return 1;
 }
 
-static int aead_aes_gcm_open_gather_randnonce(
-    const EVP_AEAD_CTX *ctx, uint8_t *out, const uint8_t *external_nonce,
-    size_t external_nonce_len, const uint8_t *in, size_t in_len,
-    const uint8_t *in_tag, size_t in_tag_len, const uint8_t *ad,
-    size_t ad_len) {
-  if (external_nonce_len != 0) {
+static int aead_aes_gcm_openv_detached_randnonce(
+    const EVP_AEAD_CTX *ctx, Span<const CRYPTO_IOVEC> iovecs,
+    Span<const uint8_t> external_nonce, Span<const uint8_t> in_tag,
+    Span<const CRYPTO_IVEC> aadvecs) {
+  if (external_nonce.size() != 0) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_INVALID_NONCE_SIZE);
     return 0;
   }
 
-  if (in_tag_len < AES_GCM_NONCE_LENGTH) {
+  if (in_tag.size() < AES_GCM_NONCE_LENGTH) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BAD_DECRYPT);
     return 0;
   }
-  const uint8_t *nonce = in_tag + in_tag_len - AES_GCM_NONCE_LENGTH;
 
   const struct aead_aes_gcm_ctx *gcm_ctx =
       (const struct aead_aes_gcm_ctx *)&ctx->state;
-  if (!aead_aes_gcm_open_gather_impl(
-          gcm_ctx, out, nonce, AES_GCM_NONCE_LENGTH, in, in_len, in_tag,
-          in_tag_len - AES_GCM_NONCE_LENGTH, ad, ad_len,
+  if (!aead_aes_gcm_openv_detached_impl(
+          gcm_ctx, iovecs, in_tag.last(AES_GCM_NONCE_LENGTH),
+          in_tag.first(in_tag.size() - AES_GCM_NONCE_LENGTH), aadvecs,
           ctx->tag_len - AES_GCM_NONCE_LENGTH)) {
     return 0;
   }
@@ -1001,12 +1016,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_128_gcm_randnonce) {
   out->nonce_len = 0;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN + AES_GCM_NONCE_LENGTH;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN + AES_GCM_NONCE_LENGTH;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_init_randnonce;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_seal_scatter_randnonce;
-  out->open_gather = aead_aes_gcm_open_gather_randnonce;
+  out->sealv = aead_aes_gcm_sealv_randnonce;
+  out->openv_detached = aead_aes_gcm_openv_detached_randnonce;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_randnonce) {
@@ -1016,12 +1030,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_randnonce) {
   out->nonce_len = 0;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN + AES_GCM_NONCE_LENGTH;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN + AES_GCM_NONCE_LENGTH;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_init_randnonce;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_seal_scatter_randnonce;
-  out->open_gather = aead_aes_gcm_open_gather_randnonce;
+  out->sealv = aead_aes_gcm_sealv_randnonce;
+  out->openv_detached = aead_aes_gcm_openv_detached_randnonce;
 }
 
 namespace {
@@ -1031,7 +1044,7 @@ struct aead_aes_gcm_tls12_ctx {
 };
 }  // namespace
 
-static_assert(sizeof(((EVP_AEAD_CTX *)NULL)->state) >=
+static_assert(sizeof(((EVP_AEAD_CTX *)nullptr)->state) >=
                   sizeof(struct aead_aes_gcm_tls12_ctx),
               "AEAD state is too small");
 static_assert(alignof(union evp_aead_ctx_st_state) >=
@@ -1055,22 +1068,22 @@ static int aead_aes_gcm_tls12_init(EVP_AEAD_CTX *ctx, const uint8_t *key,
   return 1;
 }
 
-static int aead_aes_gcm_tls12_seal_scatter(
-    const EVP_AEAD_CTX *ctx, uint8_t *out, uint8_t *out_tag,
-    size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *nonce,
-    size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *extra_in,
-    size_t extra_in_len, const uint8_t *ad, size_t ad_len) {
+static int aead_aes_gcm_tls12_sealv(const EVP_AEAD_CTX *ctx,
+                                    Span<const CRYPTO_IOVEC> iovecs,
+                                    Span<uint8_t> out_tag, size_t *out_tag_len,
+                                    Span<const uint8_t> nonce,
+                                    Span<const CRYPTO_IVEC> aadvecs) {
   struct aead_aes_gcm_tls12_ctx *gcm_ctx =
       (struct aead_aes_gcm_tls12_ctx *)&ctx->state;
 
-  if (nonce_len != AES_GCM_NONCE_LENGTH) {
+  if (nonce.size() != AES_GCM_NONCE_LENGTH) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE);
     return 0;
   }
 
   // The given nonces must be strictly monotonically increasing.
   uint64_t given_counter =
-      CRYPTO_load_u64_be(nonce + nonce_len - sizeof(uint64_t));
+      CRYPTO_load_u64_be(nonce.last(sizeof(uint64_t)).data());
   if (given_counter == UINT64_MAX || given_counter < gcm_ctx->min_next_nonce) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_INVALID_NONCE);
     return 0;
@@ -1078,9 +1091,7 @@ static int aead_aes_gcm_tls12_seal_scatter(
 
   gcm_ctx->min_next_nonce = given_counter + 1;
 
-  if (!aead_aes_gcm_seal_scatter(ctx, out, out_tag, out_tag_len,
-                                 max_out_tag_len, nonce, nonce_len, in, in_len,
-                                 extra_in, extra_in_len, ad, ad_len)) {
+  if (!aead_aes_gcm_sealv(ctx, iovecs, out_tag, out_tag_len, nonce, aadvecs)) {
     return 0;
   }
 
@@ -1095,12 +1106,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_128_gcm_tls12) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_tls12_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_tls12_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_tls12_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_tls12) {
@@ -1110,12 +1120,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_tls12) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_tls12_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_tls12_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_tls12_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 namespace {
@@ -1126,7 +1135,7 @@ struct aead_aes_gcm_tls13_ctx {
 };
 }  // namespace
 
-static_assert(sizeof(((EVP_AEAD_CTX *)NULL)->state) >=
+static_assert(sizeof(((EVP_AEAD_CTX *)nullptr)->state) >=
                   sizeof(struct aead_aes_gcm_tls13_ctx),
               "AEAD state is too small");
 static_assert(alignof(union evp_aead_ctx_st_state) >=
@@ -1150,15 +1159,15 @@ static int aead_aes_gcm_tls13_init(EVP_AEAD_CTX *ctx, const uint8_t *key,
   return 1;
 }
 
-static int aead_aes_gcm_tls13_seal_scatter(
-    const EVP_AEAD_CTX *ctx, uint8_t *out, uint8_t *out_tag,
-    size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *nonce,
-    size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *extra_in,
-    size_t extra_in_len, const uint8_t *ad, size_t ad_len) {
+static int aead_aes_gcm_tls13_sealv(const EVP_AEAD_CTX *ctx,
+                                    Span<const CRYPTO_IOVEC> iovecs,
+                                    Span<uint8_t> out_tag, size_t *out_tag_len,
+                                    Span<const uint8_t> nonce,
+                                    Span<const CRYPTO_IVEC> aadvecs) {
   struct aead_aes_gcm_tls13_ctx *gcm_ctx =
       (struct aead_aes_gcm_tls13_ctx *)&ctx->state;
 
-  if (nonce_len != AES_GCM_NONCE_LENGTH) {
+  if (nonce.size() != AES_GCM_NONCE_LENGTH) {
     OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE);
     return 0;
   }
@@ -1167,7 +1176,7 @@ static int aead_aes_gcm_tls13_seal_scatter(
   // https://tools.ietf.org/html/rfc8446#section-5.3 for details of the TLS 1.3
   // nonce construction.
   uint64_t given_counter =
-      CRYPTO_load_u64_be(nonce + nonce_len - sizeof(uint64_t));
+      CRYPTO_load_u64_be(nonce.last(sizeof(uint64_t)).data());
 
   if (gcm_ctx->min_next_nonce == 0) {
     // In the first call the sequence number will be zero and therefore the
@@ -1184,9 +1193,7 @@ static int aead_aes_gcm_tls13_seal_scatter(
     gcm_ctx->min_next_nonce = given_counter + 1;
   }
 
-  if (!aead_aes_gcm_seal_scatter(ctx, out, out_tag, out_tag_len,
-                                 max_out_tag_len, nonce, nonce_len, in, in_len,
-                                 extra_in, extra_in_len, ad, ad_len)) {
+  if (!aead_aes_gcm_sealv(ctx, iovecs, out_tag, out_tag_len, nonce, aadvecs)) {
     return 0;
   }
 
@@ -1201,12 +1208,11 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_128_gcm_tls13) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_tls13_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_tls13_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_tls13_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
 DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_tls13) {
@@ -1216,15 +1222,14 @@ DEFINE_METHOD_FUNCTION(EVP_AEAD, EVP_aead_aes_256_gcm_tls13) {
   out->nonce_len = AES_GCM_NONCE_LENGTH;
   out->overhead = EVP_AEAD_AES_GCM_TAG_LEN;
   out->max_tag_len = EVP_AEAD_AES_GCM_TAG_LEN;
-  out->seal_scatter_supports_extra_in = 1;
 
   out->init = aead_aes_gcm_tls13_init;
   out->cleanup = aead_aes_gcm_cleanup;
-  out->seal_scatter = aead_aes_gcm_tls13_seal_scatter;
-  out->open_gather = aead_aes_gcm_open_gather;
+  out->sealv = aead_aes_gcm_tls13_sealv;
+  out->openv_detached = aead_aes_gcm_openv_detached;
 }
 
-int EVP_has_aes_hardware(void) {
+int EVP_has_aes_hardware() {
 #if defined(OPENSSL_X86) || defined(OPENSSL_X86_64)
   return hwaes_capable() && crypto_gcm_clmul_enabled();
 #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)