grpc 1.84.1 → 1.85.0.pre1

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

@@ -17,6 +17,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <iterator>
+
 #include <openssl/aead.h>
 #include <openssl/aes.h>
 #include <openssl/bn.h>
@@ -31,6 +33,8 @@
 #include <openssl/nid.h>
 #include <openssl/rsa.h>
 #include <openssl/sha.h>
+#include <openssl/span.h>
+#include <openssl/tls_prf.h>
 
 #include "../../bcm_support.h"
 #include "../../internal.h"
@@ -44,21 +48,22 @@
 #include "../tls/internal.h"
 
 
-static void hexdump(FILE *out, const void *in, size_t len) {
-  const uint8_t *in8 = reinterpret_cast<const uint8_t *>(in);
-  for (size_t i = 0; i < len; i++) {
-    fprintf(out, "%02x", in8[i]);
+using namespace bssl;
+
+static void hexdump(FILE *out, Span<const uint8_t> in) {
+  for (uint8_t b : in) {
+    fprintf(out, "%02x", b);
   }
 }
 
-int BORINGSSL_check_test(const void *expected, const void *actual,
-                         size_t expected_len, const char *name) {
-  if (OPENSSL_memcmp(actual, expected, expected_len) != 0) {
+int bssl::BORINGSSL_check_test(Span<const uint8_t> expected,
+                               Span<const uint8_t> actual, const char *name) {
+  if (expected != actual) {
     FILE *err = CRYPTO_get_stderr();
     fprintf(err, "%s failed.\nExpected:   ", name);
-    hexdump(err, expected, expected_len);
+    hexdump(err, expected);
     fprintf(err, "\nCalculated: ");
-    hexdump(err, actual, expected_len);
+    hexdump(err, actual);
     fprintf(err, "\n");
     fflush(err);
     return 0;
@@ -66,45 +71,50 @@ int BORINGSSL_check_test(const void *expected, const void *actual,
   return 1;
 }
 
-// MSVC wants to put a NUL byte at the end of non-char arrays and so cannot
-// compile the real logic.
-#if defined(_MSC_VER)
-
-int BORINGSSL_self_test(void) { return 0; }
+static int set_bignum(UniquePtr<BIGNUM> *out, Span<const uint8_t> in) {
+  out->reset(BN_bin2bn(in.data(), in.size(), nullptr));
+  return *out != nullptr;
+}
 
-#else
+static const uint8_t kRSASelfTestN[] = {
+    0xd3, 0x3a, 0x62, 0x9f, 0x07, 0x77, 0xb0, 0x18, 0xf3, 0xff, 0xfe, 0xcc,
+    0xc9, 0xa2, 0xc2, 0x3a, 0xa6, 0x1d, 0xd8, 0xf0, 0x26, 0x5b, 0x38, 0x90,
+    0x17, 0x48, 0x15, 0xce, 0x21, 0xcd, 0xd6, 0x62, 0x99, 0xe2, 0xd7, 0xda,
+    0x40, 0x80, 0x3c, 0xad, 0x18, 0xb7, 0x26, 0xe9, 0x30, 0x8a, 0x23, 0x3f,
+    0x68, 0x9a, 0x9c, 0x31, 0x34, 0x91, 0x99, 0x06, 0x11, 0x36, 0xb2, 0x9e,
+    0x3a, 0xd0, 0xbc, 0xb9, 0x93, 0x4e, 0xb8, 0x72, 0xa1, 0x9f, 0xb6, 0x8c,
+    0xd5, 0x17, 0x1f, 0x7e, 0xaa, 0x75, 0xbb, 0xdf, 0xa1, 0x70, 0x48, 0xc4,
+    0xec, 0x9a, 0x51, 0xed, 0x41, 0xc9, 0x74, 0xc0, 0x3e, 0x1e, 0x85, 0x2f,
+    0xbe, 0x34, 0xc7, 0x65, 0x34, 0x8b, 0x4d, 0x55, 0x4b, 0xe1, 0x45, 0x54,
+    0x0d, 0x75, 0x7e, 0x89, 0x4d, 0x0c, 0xf6, 0x33, 0xe5, 0xfc, 0xfb, 0x56,
+    0x1b, 0xf2, 0x39, 0x9d, 0xe0, 0xff, 0x55, 0xcf, 0x02, 0x05, 0xb9, 0x74,
+    0xd2, 0x91, 0xfc, 0x87, 0xe1, 0xbb, 0x97, 0x2a, 0xe4, 0xdd, 0x20, 0xc0,
+    0x38, 0x47, 0xc0, 0x76, 0x3f, 0xa1, 0x9b, 0x5c, 0x20, 0xff, 0xff, 0xc7,
+    0x49, 0x3b, 0x4c, 0xaf, 0x99, 0xa6, 0x3e, 0x82, 0x5c, 0x58, 0x27, 0xce,
+    0x01, 0x03, 0xc3, 0x16, 0x35, 0x20, 0xe9, 0xf0, 0x15, 0x7a, 0x41, 0xd5,
+    0x1f, 0x52, 0xea, 0xdf, 0xad, 0x4c, 0xbb, 0x0d, 0xcb, 0x04, 0x91, 0xb0,
+    0x95, 0xa8, 0xce, 0x25, 0xfd, 0xd2, 0x62, 0x47, 0x77, 0xee, 0x13, 0xf1,
+    0x48, 0x72, 0x9e, 0xd9, 0x2d, 0xe6, 0x5f, 0xa4, 0xc6, 0x9e, 0x5a, 0xb2,
+    0xc6, 0xa2, 0xf7, 0x0a, 0x16, 0x17, 0xae, 0x6b, 0x1c, 0x30, 0x7c, 0x63,
+    0x08, 0x83, 0xe7, 0x43, 0xec, 0x54, 0x5e, 0x2c, 0x08, 0x0b, 0x5e, 0x46,
+    0xa7, 0x10, 0x93, 0x43, 0x53, 0x4e, 0xe3, 0x16, 0x73, 0x55, 0xce, 0xf2,
+    0x94, 0xc0, 0xbe, 0xb3,
+};
+static const uint8_t kRSASelfTestE[] = {0x01, 0x00, 0x01};  // 65537
+
+static RSA *self_test_rsa_public_key() {
+  RSAImpl *rsa = FromOpaque(RSA_new());
+  if (rsa == nullptr ||  //
+      !set_bignum(&rsa->n, kRSASelfTestN) ||
+      !set_bignum(&rsa->e, kRSASelfTestE)) {
+    RSA_free(rsa);
+    return nullptr;
+  }
 
-static int set_bignum(BIGNUM **out, const uint8_t *in, size_t len) {
-  *out = BN_bin2bn(in, len, NULL);
-  return *out != NULL;
+  return rsa;
 }
 
-static RSA *self_test_rsa_key(void) {
-  static const uint8_t kN[] = {
-      0xd3, 0x3a, 0x62, 0x9f, 0x07, 0x77, 0xb0, 0x18, 0xf3, 0xff, 0xfe, 0xcc,
-      0xc9, 0xa2, 0xc2, 0x3a, 0xa6, 0x1d, 0xd8, 0xf0, 0x26, 0x5b, 0x38, 0x90,
-      0x17, 0x48, 0x15, 0xce, 0x21, 0xcd, 0xd6, 0x62, 0x99, 0xe2, 0xd7, 0xda,
-      0x40, 0x80, 0x3c, 0xad, 0x18, 0xb7, 0x26, 0xe9, 0x30, 0x8a, 0x23, 0x3f,
-      0x68, 0x9a, 0x9c, 0x31, 0x34, 0x91, 0x99, 0x06, 0x11, 0x36, 0xb2, 0x9e,
-      0x3a, 0xd0, 0xbc, 0xb9, 0x93, 0x4e, 0xb8, 0x72, 0xa1, 0x9f, 0xb6, 0x8c,
-      0xd5, 0x17, 0x1f, 0x7e, 0xaa, 0x75, 0xbb, 0xdf, 0xa1, 0x70, 0x48, 0xc4,
-      0xec, 0x9a, 0x51, 0xed, 0x41, 0xc9, 0x74, 0xc0, 0x3e, 0x1e, 0x85, 0x2f,
-      0xbe, 0x34, 0xc7, 0x65, 0x34, 0x8b, 0x4d, 0x55, 0x4b, 0xe1, 0x45, 0x54,
-      0x0d, 0x75, 0x7e, 0x89, 0x4d, 0x0c, 0xf6, 0x33, 0xe5, 0xfc, 0xfb, 0x56,
-      0x1b, 0xf2, 0x39, 0x9d, 0xe0, 0xff, 0x55, 0xcf, 0x02, 0x05, 0xb9, 0x74,
-      0xd2, 0x91, 0xfc, 0x87, 0xe1, 0xbb, 0x97, 0x2a, 0xe4, 0xdd, 0x20, 0xc0,
-      0x38, 0x47, 0xc0, 0x76, 0x3f, 0xa1, 0x9b, 0x5c, 0x20, 0xff, 0xff, 0xc7,
-      0x49, 0x3b, 0x4c, 0xaf, 0x99, 0xa6, 0x3e, 0x82, 0x5c, 0x58, 0x27, 0xce,
-      0x01, 0x03, 0xc3, 0x16, 0x35, 0x20, 0xe9, 0xf0, 0x15, 0x7a, 0x41, 0xd5,
-      0x1f, 0x52, 0xea, 0xdf, 0xad, 0x4c, 0xbb, 0x0d, 0xcb, 0x04, 0x91, 0xb0,
-      0x95, 0xa8, 0xce, 0x25, 0xfd, 0xd2, 0x62, 0x47, 0x77, 0xee, 0x13, 0xf1,
-      0x48, 0x72, 0x9e, 0xd9, 0x2d, 0xe6, 0x5f, 0xa4, 0xc6, 0x9e, 0x5a, 0xb2,
-      0xc6, 0xa2, 0xf7, 0x0a, 0x16, 0x17, 0xae, 0x6b, 0x1c, 0x30, 0x7c, 0x63,
-      0x08, 0x83, 0xe7, 0x43, 0xec, 0x54, 0x5e, 0x2c, 0x08, 0x0b, 0x5e, 0x46,
-      0xa7, 0x10, 0x93, 0x43, 0x53, 0x4e, 0xe3, 0x16, 0x73, 0x55, 0xce, 0xf2,
-      0x94, 0xc0, 0xbe, 0xb3,
-  };
-  static const uint8_t kE[] = {0x01, 0x00, 0x01};  // 65537
+static RSA *self_test_rsa_private_key() {
   static const uint8_t kD[] = {
       0x2f, 0x2c, 0x1e, 0xd2, 0x3d, 0x2c, 0xb1, 0x9b, 0x21, 0x02, 0xce, 0xb8,
       0x95, 0x5f, 0x4f, 0xd9, 0x21, 0x38, 0x11, 0x36, 0xb0, 0x9a, 0x36, 0xab,
@@ -195,24 +205,24 @@ static RSA *self_test_rsa_key(void) {
       0x89, 0x29, 0xc7, 0x05, 0x27, 0x68, 0x90, 0x15,
   };
 
-  RSA *rsa = RSA_new();
-  if (rsa == NULL ||  //
-      !set_bignum(&rsa->n, kN, sizeof(kN)) ||
-      !set_bignum(&rsa->e, kE, sizeof(kE)) ||
-      !set_bignum(&rsa->d, kD, sizeof(kD)) ||
-      !set_bignum(&rsa->p, kP, sizeof(kP)) ||
-      !set_bignum(&rsa->q, kQ, sizeof(kQ)) ||
-      !set_bignum(&rsa->dmp1, kDModPMinusOne, sizeof(kDModPMinusOne)) ||
-      !set_bignum(&rsa->dmq1, kDModQMinusOne, sizeof(kDModQMinusOne)) ||
-      !set_bignum(&rsa->iqmp, kQInverseModP, sizeof(kQInverseModP))) {
+  RSAImpl *rsa = FromOpaque(RSA_new());
+  if (rsa == nullptr ||  //
+      !set_bignum(&rsa->n, kRSASelfTestN) ||
+      !set_bignum(&rsa->e, kRSASelfTestE) ||  //
+      !set_bignum(&rsa->d, kD) ||             //
+      !set_bignum(&rsa->p, kP) ||             //
+      !set_bignum(&rsa->q, kQ) ||             //
+      !set_bignum(&rsa->dmp1, kDModPMinusOne) ||
+      !set_bignum(&rsa->dmq1, kDModQMinusOne) ||
+      !set_bignum(&rsa->iqmp, kQInverseModP)) {
     RSA_free(rsa);
-    return NULL;
+    return nullptr;
   }
 
   return rsa;
 }
 
-static EC_KEY *self_test_ecdsa_key(void) {
+static EC_KEY *self_test_ecdsa_key() {
   static const uint8_t kQx[] = {
       0xc8, 0x15, 0x61, 0xec, 0xf2, 0xe5, 0x4e, 0xde, 0xfe, 0x66, 0x17,
       0xdb, 0x1c, 0x7a, 0x34, 0xa7, 0x07, 0x44, 0xdd, 0xb2, 0x61, 0xf2,
@@ -230,15 +240,15 @@ static EC_KEY *self_test_ecdsa_key(void) {
   };
 
   EC_KEY *ec_key = EC_KEY_new();
-  BIGNUM *qx = BN_bin2bn(kQx, sizeof(kQx), NULL);
-  BIGNUM *qy = BN_bin2bn(kQy, sizeof(kQy), NULL);
-  BIGNUM *d = BN_bin2bn(kD, sizeof(kD), NULL);
-  if (ec_key == NULL || qx == NULL || qy == NULL || d == NULL ||
+  BIGNUM *qx = BN_bin2bn(kQx, sizeof(kQx), nullptr);
+  BIGNUM *qy = BN_bin2bn(kQy, sizeof(kQy), nullptr);
+  BIGNUM *d = BN_bin2bn(kD, sizeof(kD), nullptr);
+  if (ec_key == nullptr || qx == nullptr || qy == nullptr || d == nullptr ||
       !EC_KEY_set_group(ec_key, EC_group_p256()) ||
       !EC_KEY_set_public_key_affine_coordinates(ec_key, qx, qy) ||
       !EC_KEY_set_private_key(ec_key, d)) {
     EC_KEY_free(ec_key);
-    ec_key = NULL;
+    ec_key = nullptr;
   }
 
   BN_free(qx);
@@ -247,10 +257,10 @@ static EC_KEY *self_test_ecdsa_key(void) {
   return ec_key;
 }
 
-static DH *self_test_dh(void) {
+static DH *self_test_dh() {
   DH *dh = DH_get_rfc7919_2048();
   if (!dh) {
-    return NULL;
+    return nullptr;
   }
 
   BIGNUM *priv = BN_new();
@@ -269,9 +279,9 @@ static DH *self_test_dh(void) {
   };
 
   bn_set_static_words(priv, kFFDHE2048PrivateKeyData,
-                      OPENSSL_ARRAY_SIZE(kFFDHE2048PrivateKeyData));
+                      std::size(kFFDHE2048PrivateKeyData));
 
-  if (!DH_set0_key(dh, NULL, priv)) {
+  if (!DH_set0_key(dh, nullptr, priv)) {
     goto err;
   }
   return dh;
@@ -279,7 +289,7 @@ static DH *self_test_dh(void) {
 err:
   BN_free(priv);
   DH_free(dh);
-  return NULL;
+  return nullptr;
 }
 
 
@@ -287,20 +297,14 @@ err:
 //
 // Self tests that are slow are deferred until the corresponding algorithm is
 // actually exercised, in FIPS mode. (In non-FIPS mode these tests are only run
-// when requested by |BORINGSSL_self_test|.)
-
-static int boringssl_self_test_rsa(void) {
-  int ret = 0;
-  uint8_t output[256];
+// when requested by `BORINGSSL_self_test`.)
 
-  RSA *const rsa_key = self_test_rsa_key();
-  if (rsa_key == NULL) {
+static int boringssl_self_test_rsa_sign() {
+  UniquePtr<RSA> rsa_key(self_test_rsa_private_key());
+  if (rsa_key == nullptr) {
     fprintf(CRYPTO_get_stderr(), "RSA key construction failed\n");
-    goto err;
+    return 0;
   }
-  // Disable blinding for the power-on tests because it's not needed and
-  // triggers an entropy draw.
-  rsa_key->flags |= RSA_FLAG_NO_BLINDING;
 
   // RSA Sign KAT
 
@@ -334,13 +338,24 @@ static int boringssl_self_test_rsa(void) {
       0x10, 0xaf, 0x72, 0x67,
   };
 
+  uint8_t output[256];
   unsigned sig_len;
   if (!rsa_sign_no_self_test(NID_sha256, kRSASignDigest, sizeof(kRSASignDigest),
-                             output, &sig_len, rsa_key) ||
-      !BORINGSSL_check_test(kRSASignSignature, output,
-                            sizeof(kRSASignSignature), "RSA-sign KAT")) {
+                             output, &sig_len, rsa_key.get()) ||
+      !BORINGSSL_check_test(kRSASignSignature, Span(output, sig_len),
+                            "RSA-sign KAT")) {
     fprintf(CRYPTO_get_stderr(), "RSA signing test failed.\n");
-    goto err;
+    return 0;
+  }
+
+  return 1;
+}
+
+static int boringssl_self_test_rsa_verify() {
+  UniquePtr<RSA> rsa_key(self_test_rsa_public_key());
+  if (rsa_key == nullptr) {
+    fprintf(CRYPTO_get_stderr(), "RSA key construction failed\n");
+    return 0;
   }
 
   // RSA Verify KAT
@@ -376,33 +391,28 @@ static int boringssl_self_test_rsa(void) {
   };
   if (!rsa_verify_no_self_test(NID_sha256, kRSAVerifyDigest,
                                sizeof(kRSAVerifyDigest), kRSAVerifySignature,
-                               sizeof(kRSAVerifySignature), rsa_key)) {
+                               sizeof(kRSAVerifySignature), rsa_key.get())) {
     fprintf(CRYPTO_get_stderr(), "RSA-verify KAT failed.\n");
-    goto err;
+    return 0;
   }
 
-  ret = 1;
-
-err:
-  RSA_free(rsa_key);
-
-  return ret;
+  return 1;
 }
 
-static int boringssl_self_test_ecc(void) {
+static int boringssl_self_test_ecc() {
   int ret = 0;
-  EC_KEY *ec_key = NULL;
-  EC_POINT *ec_point_in = NULL;
-  EC_POINT *ec_point_out = NULL;
-  BIGNUM *ec_scalar = NULL;
-  const EC_GROUP *ec_group = NULL;
+  EC_KEY *ec_key = nullptr;
+  EC_POINT *ec_point_in = nullptr;
+  EC_POINT *ec_point_out = nullptr;
+  BIGNUM *ec_scalar = nullptr;
+  const EC_GROUP *ec_group = nullptr;
 
   // The 'k' value for ECDSA is fixed to avoid an entropy draw.
   uint8_t ecdsa_k[32] = {0};
   ecdsa_k[31] = 42;
 
   ec_key = self_test_ecdsa_key();
-  if (ec_key == NULL) {
+  if (ec_key == nullptr) {
     fprintf(CRYPTO_get_stderr(), "ECDSA KeyGen failed\n");
     goto err;
   }
@@ -429,8 +439,8 @@ static int boringssl_self_test_ecc(void) {
           kECDSASignDigest, sizeof(kECDSASignDigest), ecdsa_sign_output,
           &ecdsa_sign_output_len, sizeof(ecdsa_sign_output), ec_key, ecdsa_k,
           sizeof(ecdsa_k)) ||
-      !BORINGSSL_check_test(kECDSASignSig, ecdsa_sign_output,
-                            sizeof(ecdsa_sign_output),
+      !BORINGSSL_check_test(kECDSASignSig,
+                            Span(ecdsa_sign_output, ecdsa_sign_output_len),
                             "ECDSA-sign signature")) {
     fprintf(CRYPTO_get_stderr(), "ECDSA-sign KAT failed.\n");
     goto err;
@@ -474,7 +484,7 @@ static int boringssl_self_test_ecc(void) {
       0xa5, 0x2c, 0xb5, 0x9f, 0xeb, 0x70, 0xae, 0xde, 0x6c, 0xe3, 0xbf,
       0xb3, 0xe0, 0x10, 0x54, 0x85, 0xab, 0xd8, 0x61, 0xd7, 0x7b,
   };
-  // kP256PointResult is |kP256Scalar|×|kP256Point|.
+  // kP256PointResult is `kP256Scalar`×`kP256Point`.
   static const uint8_t kP256PointResult[65] = {
       0x04, 0xf1, 0x63, 0x00, 0x88, 0xc5, 0xd5, 0xe9, 0x05, 0x52, 0xac,
       0xb6, 0xec, 0x68, 0x76, 0xb8, 0x73, 0x7f, 0x0f, 0x72, 0x34, 0xe6,
@@ -489,16 +499,18 @@ static int boringssl_self_test_ecc(void) {
   ec_point_out = EC_POINT_new(ec_group);
   ec_scalar = BN_new();
   uint8_t z_comp_result[65];
-  if (ec_point_in == NULL || ec_point_out == NULL || ec_scalar == NULL ||
+  if (ec_point_in == nullptr || ec_point_out == nullptr ||
+      ec_scalar == nullptr ||
       !EC_POINT_oct2point(ec_group, ec_point_in, kP256Point, sizeof(kP256Point),
-                          NULL) ||
+                          nullptr) ||
       !BN_bin2bn(kP256Scalar, sizeof(kP256Scalar), ec_scalar) ||
-      !ec_point_mul_no_self_test(ec_group, ec_point_out, NULL, ec_point_in,
-                                 ec_scalar, NULL) ||
-      !EC_POINT_point2oct(ec_group, ec_point_out, POINT_CONVERSION_UNCOMPRESSED,
-                          z_comp_result, sizeof(z_comp_result), NULL) ||
+      !ec_point_mul_no_self_test(ec_group, ec_point_out, nullptr, ec_point_in,
+                                 ec_scalar, nullptr) ||
+      EC_POINT_point2oct(ec_group, ec_point_out, POINT_CONVERSION_UNCOMPRESSED,
+                         z_comp_result, sizeof(z_comp_result),
+                         nullptr) != sizeof(z_comp_result) ||
       !BORINGSSL_check_test(kP256PointResult, z_comp_result,
-                            sizeof(z_comp_result), "Z Computation Result")) {
+                            "Z Computation Result")) {
     fprintf(CRYPTO_get_stderr(), "Z-computation KAT failed.\n");
     goto err;
   }
@@ -514,10 +526,10 @@ err:
   return ret;
 }
 
-static int boringssl_self_test_ffdh(void) {
+static int boringssl_self_test_ffdh() {
   int ret = 0;
-  DH *dh = NULL;
-  BIGNUM *ffdhe2048_value = NULL;
+  DH *dh = nullptr;
+  BIGNUM *ffdhe2048_value = nullptr;
 
   // FFC Diffie-Hellman KAT
 
@@ -569,15 +581,16 @@ static int boringssl_self_test_ffdh(void) {
   ffdhe2048_value = BN_new();
   if (ffdhe2048_value) {
     bn_set_static_words(ffdhe2048_value, kFFDHE2048PublicValueData,
-                        OPENSSL_ARRAY_SIZE(kFFDHE2048PublicValueData));
+                        std::size(kFFDHE2048PublicValueData));
   }
 
   dh = self_test_dh();
   uint8_t dh_out[sizeof(kDHOutput)];
-  if (dh == NULL || ffdhe2048_value == NULL || sizeof(dh_out) != DH_size(dh) ||
+  if (dh == nullptr || ffdhe2048_value == nullptr ||
+      sizeof(dh_out) != DH_size(dh) ||
       dh_compute_key_padded_no_self_test(dh_out, ffdhe2048_value, dh) !=
           sizeof(dh_out) ||
-      !BORINGSSL_check_test(kDHOutput, dh_out, sizeof(dh_out), "FFC DH")) {
+      !BORINGSSL_check_test(kDHOutput, dh_out, "FFC DH")) {
     fprintf(CRYPTO_get_stderr(), "FFDH failed.\n");
     goto err;
   }
@@ -593,21 +606,35 @@ err:
 
 #if defined(BORINGSSL_FIPS)
 
-static void run_self_test_rsa(void) {
+static void run_self_test_rsa_sign() {
+  FIPS_service_indicator_lock_state();
+  if (!boringssl_self_test_rsa_sign()) {
+    BORINGSSL_FIPS_abort();
+  }
+  FIPS_service_indicator_unlock_state();
+}
+
+DEFINE_STATIC_ONCE(g_self_test_once_rsa_sign)
+
+void bssl::boringssl_ensure_rsa_sign_self_test() {
+  CRYPTO_once(g_self_test_once_rsa_sign_bss_get(), run_self_test_rsa_sign);
+}
+
+static void run_self_test_rsa_verify() {
   FIPS_service_indicator_lock_state();
-  if (!boringssl_self_test_rsa()) {
+  if (!boringssl_self_test_rsa_verify()) {
     BORINGSSL_FIPS_abort();
   }
   FIPS_service_indicator_unlock_state();
 }
 
-DEFINE_STATIC_ONCE(g_self_test_once_rsa)
+DEFINE_STATIC_ONCE(g_self_test_once_rsa_verify)
 
-void boringssl_ensure_rsa_self_test(void) {
-  CRYPTO_once(g_self_test_once_rsa_bss_get(), run_self_test_rsa);
+void bssl::boringssl_ensure_rsa_verify_self_test() {
+  CRYPTO_once(g_self_test_once_rsa_verify_bss_get(), run_self_test_rsa_verify);
 }
 
-static void run_self_test_ecc(void) {
+static void run_self_test_ecc() {
   FIPS_service_indicator_lock_state();
   if (!boringssl_self_test_ecc()) {
     BORINGSSL_FIPS_abort();
@@ -617,11 +644,11 @@ static void run_self_test_ecc(void) {
 
 DEFINE_STATIC_ONCE(g_self_test_once_ecc)
 
-void boringssl_ensure_ecc_self_test(void) {
+void bssl::boringssl_ensure_ecc_self_test() {
   CRYPTO_once(g_self_test_once_ecc_bss_get(), run_self_test_ecc);
 }
 
-static void run_self_test_ffdh(void) {
+static void run_self_test_ffdh() {
   FIPS_service_indicator_lock_state();
   if (!boringssl_self_test_ffdh()) {
     BORINGSSL_FIPS_abort();
@@ -631,7 +658,7 @@ static void run_self_test_ffdh(void) {
 
 DEFINE_STATIC_ONCE(g_self_test_once_ffdh)
 
-void boringssl_ensure_ffdh_self_test(void) {
+void bssl::boringssl_ensure_ffdh_self_test() {
   CRYPTO_once(g_self_test_once_ffdh_bss_get(), run_self_test_ffdh);
 }
 
@@ -642,7 +669,7 @@ void boringssl_ensure_ffdh_self_test(void) {
 //
 // These tests are run at process start when in FIPS mode.
 
-int boringssl_self_test_sha256(void) {
+int bssl::boringssl_self_test_sha256() {
   static const uint8_t kInput[16] = {
       0xff, 0x3b, 0x85, 0x7d, 0xa7, 0x23, 0x6a, 0x2b,
       0xaa, 0x0f, 0x39, 0x6b, 0x51, 0x52, 0x22, 0x17,
@@ -656,11 +683,10 @@ int boringssl_self_test_sha256(void) {
 
   // SHA-256 KAT
   SHA256(kInput, sizeof(kInput), output);
-  return BORINGSSL_check_test(kPlaintextSHA256, output,
-                              sizeof(kPlaintextSHA256), "SHA-256 KAT");
+  return BORINGSSL_check_test(kPlaintextSHA256, output, "SHA-256 KAT");
 }
 
-int boringssl_self_test_sha512(void) {
+int bssl::boringssl_self_test_sha512() {
   static const uint8_t kInput[16] = {
       0x21, 0x25, 0x12, 0xf8, 0xd2, 0xad, 0x83, 0x22,
       0x78, 0x1c, 0x6c, 0x4d, 0x69, 0xa9, 0xda, 0xa1,
@@ -677,11 +703,10 @@ int boringssl_self_test_sha512(void) {
 
   // SHA-512 KAT
   SHA512(kInput, sizeof(kInput), output);
-  return BORINGSSL_check_test(kPlaintextSHA512, output,
-                              sizeof(kPlaintextSHA512), "SHA-512 KAT");
+  return BORINGSSL_check_test(kPlaintextSHA512, output, "SHA-512 KAT");
 }
 
-int boringssl_self_test_hmac_sha256(void) {
+int bssl::boringssl_self_test_hmac_sha256() {
   static const uint8_t kInput[16] = {
       0xda, 0xd9, 0x12, 0x93, 0xdf, 0xcf, 0x2a, 0x7c,
       0x8e, 0xcd, 0x13, 0xfe, 0x35, 0x3f, 0xa7, 0x5b,
@@ -694,351 +719,358 @@ int boringssl_self_test_hmac_sha256(void) {
   uint8_t output[EVP_MAX_MD_SIZE];
 
   unsigned output_len;
-  HMAC(EVP_sha256(), kInput, sizeof(kInput), kInput, sizeof(kInput), output,
-       &output_len);
-  return output_len == sizeof(kPlaintextHMACSHA256) &&
-         BORINGSSL_check_test(kPlaintextHMACSHA256, output,
-                              sizeof(kPlaintextHMACSHA256), "HMAC-SHA-256 KAT");
+  return nullptr != HMAC(EVP_sha256(), kInput, sizeof(kInput), kInput,
+                         sizeof(kInput), output, &output_len) &&
+         BORINGSSL_check_test(kPlaintextHMACSHA256, Span(output, output_len),
+                              "HMAC-SHA-256 KAT");
 }
 
-static int boringssl_self_test_fast(void) {
+static int boringssl_self_test_fast() {
   static const uint8_t kAESKey[16] = {
       'B', 'o', 'r', 'i', 'n', 'g', 'C', 'r',
       'y', 'p', 't', 'o', ' ', 'K', 'e', 'y',
   };
-  static const uint8_t kAESIV[16] = {0};
 
-  EVP_AEAD_CTX aead_ctx;
-  EVP_AEAD_CTX_zero(&aead_ctx);
-  int ret = 0;
-
-  AES_KEY aes_key;
-  uint8_t aes_iv[16];
-  uint8_t output[256];
-
-  // AES-CBC Encryption KAT
-  static const uint8_t kAESCBCEncPlaintext[32] = {
-      0x07, 0x86, 0x09, 0xa6, 0xc5, 0xac, 0x25, 0x44, 0x69, 0x9a, 0xdf,
-      0x68, 0x2f, 0xa3, 0x77, 0xf9, 0xbe, 0x8a, 0xb6, 0xae, 0xf5, 0x63,
-      0xe8, 0xc5, 0x6a, 0x36, 0xb8, 0x4f, 0x55, 0x7f, 0xad, 0xd3,
-  };
-  static const uint8_t kAESCBCEncCiphertext[sizeof(kAESCBCEncPlaintext)] = {
-      0x56, 0x46, 0xc1, 0x41, 0xf4, 0x13, 0xd6, 0xff, 0x62, 0x92, 0x41,
-      0x7a, 0x26, 0xc6, 0x86, 0xbd, 0x30, 0x5f, 0xb6, 0x57, 0xa7, 0xd2,
-      0x50, 0x3a, 0xc5, 0x5e, 0x8e, 0x93, 0x40, 0xf2, 0x10, 0xd8,
-  };
-  memcpy(aes_iv, kAESIV, sizeof(kAESIV));
-  if (!bcm_success(
-          BCM_aes_set_encrypt_key(kAESKey, 8 * sizeof(kAESKey), &aes_key))) {
-    fprintf(CRYPTO_get_stderr(), "BCM_aes_set_encrypt_key failed.\n");
-    goto err;
-  }
-  AES_cbc_encrypt(kAESCBCEncPlaintext, output, sizeof(kAESCBCEncPlaintext),
-                  &aes_key, aes_iv, AES_ENCRYPT);
-  if (!BORINGSSL_check_test(kAESCBCEncCiphertext, output,
-                            sizeof(kAESCBCEncCiphertext),
-                            "AES-CBC-encrypt KAT")) {
-    goto err;
+  {
+    // AES-CBC Encryption KAT
+    static const uint8_t kAESCBCEncPlaintext[32] = {
+        0x07, 0x86, 0x09, 0xa6, 0xc5, 0xac, 0x25, 0x44, 0x69, 0x9a, 0xdf,
+        0x68, 0x2f, 0xa3, 0x77, 0xf9, 0xbe, 0x8a, 0xb6, 0xae, 0xf5, 0x63,
+        0xe8, 0xc5, 0x6a, 0x36, 0xb8, 0x4f, 0x55, 0x7f, 0xad, 0xd3,
+    };
+    static const uint8_t kAESCBCEncCiphertext[sizeof(kAESCBCEncPlaintext)] = {
+        0x56, 0x46, 0xc1, 0x41, 0xf4, 0x13, 0xd6, 0xff, 0x62, 0x92, 0x41,
+        0x7a, 0x26, 0xc6, 0x86, 0xbd, 0x30, 0x5f, 0xb6, 0x57, 0xa7, 0xd2,
+        0x50, 0x3a, 0xc5, 0x5e, 0x8e, 0x93, 0x40, 0xf2, 0x10, 0xd8,
+    };
+    AES_KEY aes_key;
+    if (!bcm_success(
+            BCM_aes_set_encrypt_key(kAESKey, 8 * sizeof(kAESKey), &aes_key))) {
+      fprintf(CRYPTO_get_stderr(), "BCM_aes_set_encrypt_key failed.\n");
+      return 0;
+    }
+    uint8_t aes_iv[16] = {};
+    uint8_t output[sizeof(kAESCBCEncPlaintext)];
+    AES_cbc_encrypt(kAESCBCEncPlaintext, output, sizeof(kAESCBCEncPlaintext),
+                    &aes_key, aes_iv, AES_ENCRYPT);
+    if (!BORINGSSL_check_test(kAESCBCEncCiphertext, output,
+                              "AES-CBC-encrypt KAT")) {
+      return 0;
+    }
   }
 
-  // AES-CBC Decryption KAT
-  static const uint8_t kAESCBCDecCiphertext[32] = {
-      0x34, 0x7a, 0xa5, 0xa0, 0x24, 0xb2, 0x82, 0x57, 0xb3, 0x65, 0x10,
-      0xbe, 0x58, 0x3d, 0x4f, 0x47, 0xad, 0xb7, 0xbb, 0xee, 0xdc, 0x60,
-      0x05, 0xbb, 0xbd, 0x0d, 0x0a, 0x9f, 0x06, 0xbb, 0x7b, 0x10,
-  };
-  static const uint8_t kAESCBCDecPlaintext[sizeof(kAESCBCDecCiphertext)] = {
-      0x51, 0xa7, 0xa0, 0x1f, 0x6b, 0x79, 0x6c, 0xcd, 0x48, 0x03, 0xa1,
-      0x41, 0xdc, 0x56, 0xa6, 0xc2, 0x16, 0xb5, 0xd1, 0xd3, 0xb7, 0x06,
-      0xb2, 0x25, 0x6f, 0xa6, 0xd0, 0xd2, 0x0e, 0x6f, 0x19, 0xb5,
-  };
-  memcpy(aes_iv, kAESIV, sizeof(kAESIV));
-  if (!bcm_success(
-          BCM_aes_set_decrypt_key(kAESKey, 8 * sizeof(kAESKey), &aes_key))) {
-    fprintf(CRYPTO_get_stderr(), "BCM_aes_set_decrypt_key failed.\n");
-    goto err;
-  }
-  AES_cbc_encrypt(kAESCBCDecCiphertext, output, sizeof(kAESCBCDecCiphertext),
-                  &aes_key, aes_iv, AES_DECRYPT);
-  if (!BORINGSSL_check_test(kAESCBCDecPlaintext, output,
-                            sizeof(kAESCBCDecPlaintext),
-                            "AES-CBC-decrypt KAT")) {
-    goto err;
+  {
+    // AES-CBC Decryption KAT
+    static const uint8_t kAESCBCDecCiphertext[32] = {
+        0x34, 0x7a, 0xa5, 0xa0, 0x24, 0xb2, 0x82, 0x57, 0xb3, 0x65, 0x10,
+        0xbe, 0x58, 0x3d, 0x4f, 0x47, 0xad, 0xb7, 0xbb, 0xee, 0xdc, 0x60,
+        0x05, 0xbb, 0xbd, 0x0d, 0x0a, 0x9f, 0x06, 0xbb, 0x7b, 0x10,
+    };
+    static const uint8_t kAESCBCDecPlaintext[sizeof(kAESCBCDecCiphertext)] = {
+        0x51, 0xa7, 0xa0, 0x1f, 0x6b, 0x79, 0x6c, 0xcd, 0x48, 0x03, 0xa1,
+        0x41, 0xdc, 0x56, 0xa6, 0xc2, 0x16, 0xb5, 0xd1, 0xd3, 0xb7, 0x06,
+        0xb2, 0x25, 0x6f, 0xa6, 0xd0, 0xd2, 0x0e, 0x6f, 0x19, 0xb5,
+    };
+    AES_KEY aes_key;
+    if (!bcm_success(
+            BCM_aes_set_decrypt_key(kAESKey, 8 * sizeof(kAESKey), &aes_key))) {
+      fprintf(CRYPTO_get_stderr(), "BCM_aes_set_decrypt_key failed.\n");
+      return 0;
+    }
+    uint8_t aes_iv[16] = {};
+    uint8_t output[sizeof(kAESCBCDecCiphertext)];
+    AES_cbc_encrypt(kAESCBCDecCiphertext, output, sizeof(kAESCBCDecCiphertext),
+                    &aes_key, aes_iv, AES_DECRYPT);
+    if (!BORINGSSL_check_test(kAESCBCDecPlaintext, output,
+                              "AES-CBC-decrypt KAT")) {
+      return 0;
+    }
   }
 
-  size_t out_len;
-  uint8_t nonce[EVP_AEAD_MAX_NONCE_LENGTH];
-  OPENSSL_memset(nonce, 0, sizeof(nonce));
-  if (!EVP_AEAD_CTX_init(&aead_ctx, EVP_aead_aes_128_gcm(), kAESKey,
-                         sizeof(kAESKey), 0, NULL)) {
-    fprintf(CRYPTO_get_stderr(), "EVP_AEAD_CTX_init for AES-128-GCM failed.\n");
-    goto err;
-  }
-
-  // AES-GCM Encryption KAT
-  static const uint8_t kAESGCMEncPlaintext[32] = {
-      0x8f, 0xcc, 0x40, 0x99, 0x80, 0x8e, 0x75, 0xca, 0xaf, 0xf5, 0x82,
-      0x89, 0x88, 0x48, 0xa8, 0x8d, 0x80, 0x8b, 0x55, 0xab, 0x4e, 0x93,
-      0x70, 0x79, 0x7d, 0x94, 0x0b, 0xe8, 0xcc, 0x1d, 0x78, 0x84,
-  };
-  static const uint8_t kAESGCMCiphertext[sizeof(kAESGCMEncPlaintext) + 16] = {
-      0x87, 0x7b, 0xd5, 0x8d, 0x96, 0x3e, 0x4b, 0xe6, 0x64, 0x94, 0x40, 0x2f,
-      0x61, 0x9b, 0x7e, 0x56, 0x52, 0x7d, 0xa4, 0x5a, 0xf9, 0xa6, 0xe2, 0xdb,
-      0x1c, 0x63, 0x2e, 0x97, 0x93, 0x0f, 0xfb, 0xed, 0xb5, 0x9e, 0x1c, 0x20,
-      0xb2, 0xb0, 0x58, 0xda, 0x48, 0x07, 0x2d, 0xbd, 0x96, 0x0d, 0x34, 0xc6,
-  };
-  if (!EVP_AEAD_CTX_seal(&aead_ctx, output, &out_len, sizeof(output), nonce,
-                         EVP_AEAD_nonce_length(EVP_aead_aes_128_gcm()),
-                         kAESGCMEncPlaintext, sizeof(kAESGCMEncPlaintext), NULL,
-                         0) ||
-      !BORINGSSL_check_test(kAESGCMCiphertext, output,
-                            sizeof(kAESGCMCiphertext), "AES-GCM-encrypt KAT")) {
-    fprintf(CRYPTO_get_stderr(), "EVP_AEAD_CTX_seal for AES-128-GCM failed.\n");
-    goto err;
-  }
-
-  // AES-GCM Decryption KAT
-  static const uint8_t kAESGCMDecCiphertext[48] = {
-      0x35, 0xf3, 0x05, 0x8f, 0x87, 0x57, 0x60, 0xff, 0x09, 0xd3, 0x12, 0x0f,
-      0x70, 0xc4, 0xbc, 0x9e, 0xd7, 0xa8, 0x68, 0x72, 0xe1, 0x34, 0x52, 0x20,
-      0x21, 0x76, 0xf7, 0x37, 0x1a, 0xe0, 0x4f, 0xaa, 0xe1, 0xdd, 0x39, 0x19,
-      0x20, 0xf5, 0xd1, 0x39, 0x53, 0xd8, 0x96, 0x78, 0x59, 0x94, 0x82, 0x3c,
-  };
-  static const uint8_t kAESGCMDecPlaintext[sizeof(kAESGCMDecCiphertext) - 16] =
-      {
-          0x3d, 0x44, 0x90, 0x9b, 0x91, 0xe7, 0x5e, 0xd3, 0xc2, 0xb2, 0xd0,
-          0xa9, 0x99, 0x17, 0x6a, 0x45, 0x05, 0x5e, 0x99, 0x83, 0x56, 0x01,
-          0xc0, 0x82, 0x40, 0x81, 0xd2, 0x48, 0x45, 0xf2, 0xcc, 0xc3,
-      };
-  if (!EVP_AEAD_CTX_open(&aead_ctx, output, &out_len, sizeof(output), nonce,
-                         EVP_AEAD_nonce_length(EVP_aead_aes_128_gcm()),
-                         kAESGCMDecCiphertext, sizeof(kAESGCMDecCiphertext),
-                         NULL, 0) ||
-      !BORINGSSL_check_test(kAESGCMDecPlaintext, output,
-                            sizeof(kAESGCMDecPlaintext),
-                            "AES-GCM-decrypt KAT")) {
-    fprintf(CRYPTO_get_stderr(),
-            "AES-GCM-decrypt KAT failed because EVP_AEAD_CTX_open failed.\n");
-    goto err;
+  {
+    size_t out_len;
+    ScopedEVP_AEAD_CTX aead_ctx;
+    if (!EVP_AEAD_CTX_init(aead_ctx.get(), EVP_aead_aes_128_gcm(), kAESKey,
+                           sizeof(kAESKey), 0, nullptr)) {
+      fprintf(CRYPTO_get_stderr(),
+              "EVP_AEAD_CTX_init for AES-128-GCM failed.\n");
+      return 0;
+    }
+
+    // AES-GCM Encryption KAT
+    static const uint8_t kAESGCMEncPlaintext[32] = {
+        0x8f, 0xcc, 0x40, 0x99, 0x80, 0x8e, 0x75, 0xca, 0xaf, 0xf5, 0x82,
+        0x89, 0x88, 0x48, 0xa8, 0x8d, 0x80, 0x8b, 0x55, 0xab, 0x4e, 0x93,
+        0x70, 0x79, 0x7d, 0x94, 0x0b, 0xe8, 0xcc, 0x1d, 0x78, 0x84,
+    };
+    static const uint8_t kAESGCMCiphertext[sizeof(kAESGCMEncPlaintext) + 16] = {
+        0x87, 0x7b, 0xd5, 0x8d, 0x96, 0x3e, 0x4b, 0xe6, 0x64, 0x94, 0x40, 0x2f,
+        0x61, 0x9b, 0x7e, 0x56, 0x52, 0x7d, 0xa4, 0x5a, 0xf9, 0xa6, 0xe2, 0xdb,
+        0x1c, 0x63, 0x2e, 0x97, 0x93, 0x0f, 0xfb, 0xed, 0xb5, 0x9e, 0x1c, 0x20,
+        0xb2, 0xb0, 0x58, 0xda, 0x48, 0x07, 0x2d, 0xbd, 0x96, 0x0d, 0x34, 0xc6,
+    };
+    uint8_t nonce[12] = {};
+    uint8_t output[sizeof(kAESGCMCiphertext)];
+    if (!EVP_AEAD_CTX_seal(aead_ctx.get(), output, &out_len, sizeof(output),
+                           nonce, sizeof(nonce), kAESGCMEncPlaintext,
+                           sizeof(kAESGCMEncPlaintext), nullptr, 0) ||
+        !BORINGSSL_check_test(kAESGCMCiphertext, Span(output, out_len),
+                              "AES-GCM-encrypt KAT")) {
+      fprintf(CRYPTO_get_stderr(),
+              "EVP_AEAD_CTX_seal for AES-128-GCM failed.\n");
+      return 0;
+    }
+
+    // AES-GCM Decryption KAT
+    static const uint8_t kAESGCMDecCiphertext[48] = {
+        0x35, 0xf3, 0x05, 0x8f, 0x87, 0x57, 0x60, 0xff, 0x09, 0xd3, 0x12, 0x0f,
+        0x70, 0xc4, 0xbc, 0x9e, 0xd7, 0xa8, 0x68, 0x72, 0xe1, 0x34, 0x52, 0x20,
+        0x21, 0x76, 0xf7, 0x37, 0x1a, 0xe0, 0x4f, 0xaa, 0xe1, 0xdd, 0x39, 0x19,
+        0x20, 0xf5, 0xd1, 0x39, 0x53, 0xd8, 0x96, 0x78, 0x59, 0x94, 0x82, 0x3c,
+    };
+    static const uint8_t
+        kAESGCMDecPlaintext[sizeof(kAESGCMDecCiphertext) - 16] = {
+            0x3d, 0x44, 0x90, 0x9b, 0x91, 0xe7, 0x5e, 0xd3, 0xc2, 0xb2, 0xd0,
+            0xa9, 0x99, 0x17, 0x6a, 0x45, 0x05, 0x5e, 0x99, 0x83, 0x56, 0x01,
+            0xc0, 0x82, 0x40, 0x81, 0xd2, 0x48, 0x45, 0xf2, 0xcc, 0xc3,
+        };
+    if (!EVP_AEAD_CTX_open(aead_ctx.get(), output, &out_len, sizeof(output),
+                           nonce, sizeof(nonce),
+                           kAESGCMDecCiphertext, sizeof(kAESGCMDecCiphertext),
+                           nullptr, 0) ||
+        !BORINGSSL_check_test(kAESGCMDecPlaintext, Span(output, out_len),
+                              "AES-GCM-decrypt KAT")) {
+      fprintf(CRYPTO_get_stderr(),
+              "AES-GCM-decrypt KAT failed because EVP_AEAD_CTX_open failed.\n");
+      return 0;
+    }
   }
 
-  // SHA-1 KAT
-  static const uint8_t kSHA1Input[16] = {
-      0x13, 0x2f, 0xd9, 0xba, 0xd5, 0xc1, 0x82, 0x62,
-      0x63, 0xba, 0xfb, 0xb6, 0x99, 0xf7, 0x07, 0xa5,
-  };
-  static const uint8_t kSHA1Digest[20] = {
-      0x94, 0x19, 0x55, 0x93, 0x0a, 0x58, 0x29, 0x38, 0xeb, 0xf5,
-      0x09, 0x11, 0x6d, 0x1a, 0xfd, 0x0f, 0x1e, 0x11, 0xe3, 0xcb,
-  };
-  SHA1(kSHA1Input, sizeof(kSHA1Input), output);
-  if (!BORINGSSL_check_test(kSHA1Digest, output, sizeof(kSHA1Digest),
-                            "SHA-1 KAT")) {
-    goto err;
+  {
+    // SHA-1 KAT
+    static const uint8_t kSHA1Input[16] = {
+        0x13, 0x2f, 0xd9, 0xba, 0xd5, 0xc1, 0x82, 0x62,
+        0x63, 0xba, 0xfb, 0xb6, 0x99, 0xf7, 0x07, 0xa5,
+    };
+    static const uint8_t kSHA1Digest[20] = {
+        0x94, 0x19, 0x55, 0x93, 0x0a, 0x58, 0x29, 0x38, 0xeb, 0xf5,
+        0x09, 0x11, 0x6d, 0x1a, 0xfd, 0x0f, 0x1e, 0x11, 0xe3, 0xcb,
+    };
+    uint8_t output[SHA_DIGEST_LENGTH];
+    SHA1(kSHA1Input, sizeof(kSHA1Input), output);
+    if (!BORINGSSL_check_test(kSHA1Digest, output, "SHA-1 KAT")) {
+      return 0;
+    }
   }
 
-  if (!boringssl_self_test_sha256() || !boringssl_self_test_sha512() ||
+  if (!boringssl_self_test_sha256() ||  //
+      !boringssl_self_test_sha512() ||  //
       !boringssl_self_test_hmac_sha256()) {
-    goto err;
-  }
-
-  // DBRG KAT
-  static const uint8_t kDRBGEntropy[48] = {
-      0xc4, 0xda, 0x07, 0x40, 0xd5, 0x05, 0xf1, 0xee, 0x28, 0x0b, 0x95, 0xe5,
-      0x8c, 0x49, 0x31, 0xac, 0x6d, 0xe8, 0x46, 0xa0, 0x15, 0x2f, 0xbb, 0x4a,
-      0x3f, 0x17, 0x4c, 0xf4, 0x78, 0x7a, 0x4f, 0x1a, 0x40, 0xc2, 0xb5, 0x0b,
-      0xab, 0xe1, 0x4a, 0xae, 0x53, 0x0b, 0xe5, 0x88, 0x6d, 0x91, 0x0a, 0x27,
-  };
-  static const uint8_t kDRBGPersonalization[18] = {
-      'B', 'C', 'M', 'P', 'e', 'r', 's', 'o', 'n',
-      'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n'};
-  static const uint8_t kDRBGAD[16] = {'B', 'C', 'M', ' ', 'D', 'R', 'B', 'G',
-                                      ' ', 'K', 'A', 'T', ' ', 'A', 'D', ' '};
-  static const uint8_t kDRBGOutput[64] = {
-      0x19, 0x1f, 0x2b, 0x49, 0x76, 0x85, 0xfd, 0x51, 0xb6, 0x56, 0xbc,
-      0x1c, 0x7d, 0xd5, 0xdd, 0x44, 0x76, 0xa3, 0x5e, 0x17, 0x9b, 0x8e,
-      0xb8, 0x98, 0x65, 0x12, 0xca, 0x35, 0x6c, 0xa0, 0x6f, 0xa0, 0x22,
-      0xe4, 0xf6, 0xd8, 0x43, 0xed, 0x4e, 0x2d, 0x97, 0x39, 0x43, 0x3b,
-      0x57, 0xfc, 0x23, 0x3f, 0x71, 0x0a, 0xe0, 0xed, 0xfe, 0xd5, 0xb8,
-      0x67, 0x7a, 0x00, 0x39, 0xb2, 0x6e, 0xa9, 0x25, 0x97,
-  };
-  static const uint8_t kDRBGEntropy2[48] = {
-      0xc7, 0x16, 0x1c, 0xa3, 0x6c, 0x23, 0x09, 0xb7, 0x16, 0xe9, 0x85, 0x9b,
-      0xb9, 0x6c, 0x6d, 0x49, 0xbd, 0xc8, 0x35, 0x21, 0x03, 0xa1, 0x8c, 0xd2,
-      0x4e, 0xf4, 0x2e, 0xc9, 0x7e, 0xf4, 0x6b, 0xf4, 0x46, 0xeb, 0x1a, 0x45,
-      0x76, 0xc1, 0x86, 0xe9, 0x35, 0x18, 0x03, 0x76, 0x3a, 0x79, 0x12, 0xfe,
-  };
-  static const uint8_t kDRBGReseedOutput[64] = {
-      0x00, 0xf2, 0x05, 0xaa, 0xfd, 0x11, 0x6c, 0x77, 0xbc, 0x81, 0x86,
-      0x99, 0xca, 0x51, 0xcf, 0x80, 0x15, 0x9f, 0x02, 0x9e, 0x0b, 0xcd,
-      0x26, 0xc8, 0x4b, 0x87, 0x8a, 0x15, 0x1a, 0xdd, 0xf2, 0xf3, 0xeb,
-      0x94, 0x0b, 0x08, 0xc8, 0xc9, 0x57, 0xa4, 0x0b, 0x4b, 0x0f, 0x13,
-      0xde, 0x7c, 0x0c, 0x6a, 0xac, 0x34, 0x4a, 0x9a, 0xf2, 0xd0, 0x83,
-      0x02, 0x05, 0x17, 0xc9, 0x81, 0x8f, 0x2a, 0x81, 0x92,
-  };
-  CTR_DRBG_STATE drbg;
-  if (!CTR_DRBG_init(&drbg, kDRBGEntropy, kDRBGPersonalization,
-                     sizeof(kDRBGPersonalization)) ||
-      !CTR_DRBG_generate(&drbg, output, sizeof(kDRBGOutput), kDRBGAD,
-                         sizeof(kDRBGAD)) ||
-      !BORINGSSL_check_test(kDRBGOutput, output, sizeof(kDRBGOutput),
-                            "DRBG Generate KAT") ||
-      !CTR_DRBG_reseed(&drbg, kDRBGEntropy2, kDRBGAD, sizeof(kDRBGAD)) ||
-      !CTR_DRBG_generate(&drbg, output, sizeof(kDRBGReseedOutput), kDRBGAD,
-                         sizeof(kDRBGAD)) ||
-      !BORINGSSL_check_test(kDRBGReseedOutput, output,
-                            sizeof(kDRBGReseedOutput), "DRBG-reseed KAT")) {
-    fprintf(CRYPTO_get_stderr(), "CTR-DRBG failed.\n");
-    goto err;
-  }
-  CTR_DRBG_clear(&drbg);
-
-  CTR_DRBG_STATE kZeroDRBG;
-  memset(&kZeroDRBG, 0, sizeof(kZeroDRBG));
-  if (!BORINGSSL_check_test(&kZeroDRBG, &drbg, sizeof(drbg),
-                            "DRBG Clear KAT")) {
-    goto err;
-  }
-
-  // TLS KDF KAT
-  static const char kTLSLabel[] = "FIPS self test";
-  static const uint8_t kTLSSeed1[16] = {
-      0x8f, 0x0d, 0xe8, 0xb6, 0x90, 0x8f, 0xb1, 0xd2,
-      0x6d, 0x51, 0xf4, 0x79, 0x18, 0x63, 0x51, 0x65,
-  };
-  static const uint8_t kTLSSeed2[16] = {
-      0x7d, 0x24, 0x1a, 0x9d, 0x3c, 0x59, 0xbf, 0x3c,
-      0x31, 0x1e, 0x2b, 0x21, 0x41, 0x8d, 0x32, 0x81,
-  };
-
-  static const uint8_t kTLS10Secret[32] = {
-      0xab, 0xc3, 0x65, 0x7b, 0x09, 0x4c, 0x76, 0x28, 0xa0, 0xb2, 0x82,
-      0x99, 0x6f, 0xe7, 0x5a, 0x75, 0xf4, 0x98, 0x4f, 0xd9, 0x4d, 0x4e,
-      0xcc, 0x2f, 0xcf, 0x53, 0xa2, 0xc4, 0x69, 0xa3, 0xf7, 0x31,
-  };
-  static const uint8_t kTLS10Output[32] = {
-      0x69, 0x7c, 0x4e, 0x2c, 0xee, 0x82, 0xb1, 0xd2, 0x8b, 0xac, 0x90,
-      0x7a, 0xa1, 0x8a, 0x81, 0xfe, 0xc5, 0x58, 0x45, 0x57, 0x61, 0x2f,
-      0x7a, 0x8d, 0x80, 0xfb, 0x44, 0xd8, 0x81, 0x60, 0xe5, 0xf8,
-  };
-  uint8_t tls10_output[sizeof(kTLS10Output)];
-  if (!CRYPTO_tls1_prf(EVP_md5_sha1(), tls10_output, sizeof(tls10_output),
-                       kTLS10Secret, sizeof(kTLS10Secret), kTLSLabel,
-                       sizeof(kTLSLabel), kTLSSeed1, sizeof(kTLSSeed1),
-                       kTLSSeed2, sizeof(kTLSSeed2)) ||
-      !BORINGSSL_check_test(kTLS10Output, tls10_output, sizeof(kTLS10Output),
-                            "TLS10-KDF KAT")) {
-    fprintf(CRYPTO_get_stderr(), "TLS KDF failed.\n");
-    goto err;
+    return 0;
   }
 
-  static const uint8_t kTLS12Secret[32] = {
-      0xc5, 0x43, 0x8e, 0xe2, 0x6f, 0xd4, 0xac, 0xbd, 0x25, 0x9f, 0xc9,
-      0x18, 0x55, 0xdc, 0x69, 0xbf, 0x88, 0x4e, 0xe2, 0x93, 0x22, 0xfc,
-      0xbf, 0xd2, 0x96, 0x6a, 0x46, 0x23, 0xd4, 0x2e, 0xc7, 0x81,
-  };
-  static const uint8_t kTLS12Output[32] = {
-      0xee, 0x4a, 0xcd, 0x3f, 0xa3, 0xd3, 0x55, 0x89, 0x9e, 0x6f, 0xf1,
-      0x38, 0x46, 0x9d, 0x2b, 0x33, 0xaa, 0x7f, 0xc4, 0x7f, 0x51, 0x85,
-      0x8a, 0xf3, 0x13, 0x84, 0xbf, 0x53, 0x6a, 0x65, 0x37, 0x51,
-  };
-  uint8_t tls12_output[sizeof(kTLS12Output)];
-  if (!CRYPTO_tls1_prf(EVP_sha256(), tls12_output, sizeof(tls12_output),
-                       kTLS12Secret, sizeof(kTLS12Secret), kTLSLabel,
-                       sizeof(kTLSLabel), kTLSSeed1, sizeof(kTLSSeed1),
-                       kTLSSeed2, sizeof(kTLSSeed2)) ||
-      !BORINGSSL_check_test(kTLS12Output, tls12_output, sizeof(kTLS12Output),
-                            "TLS12-KDF KAT")) {
-    fprintf(CRYPTO_get_stderr(), "TLS KDF failed.\n");
-    goto err;
+  {
+    // DBRG KAT
+    static const uint8_t kDRBGEntropy[32] = {
+        0xc4, 0xda, 0x07, 0x40, 0xd5, 0x05, 0xf1, 0xee, 0x28, 0x0b, 0x95,
+        0xe5, 0x8c, 0x49, 0x31, 0xac, 0x6d, 0xe8, 0x46, 0xa0, 0x15, 0x2f,
+        0xbb, 0x4a, 0x3f, 0x17, 0x4c, 0xf4, 0x78, 0x7a, 0x4f, 0x1a,
+    };
+    static const uint8_t kDRBGNonce[CTR_DRBG_NONCE_LEN] = {
+        0x40, 0xc2, 0xb5, 0x0b, 0xab, 0xe1, 0x4a, 0xae,
+        0x53, 0x0b, 0xe5, 0x88, 0x6d, 0x91, 0x0a, 0x27,
+    };
+    static const uint8_t kDRBGPersonalization[18] = {
+        'B', 'C', 'M', 'P', 'e', 'r', 's', 'o', 'n',
+        'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n'};
+    static const uint8_t kDRBGAD[16] = {'B', 'C', 'M', ' ', 'D', 'R', 'B', 'G',
+                                        ' ', 'K', 'A', 'T', ' ', 'A', 'D', ' '};
+    static const uint8_t kDRBGOutput[64] = {
+        0x55, 0x88, 0x81, 0x88, 0x16, 0x49, 0x68, 0xd8, 0x23, 0xc8, 0x18,
+        0x57, 0x5d, 0x06, 0xc3, 0x5f, 0x60, 0x3a, 0xe8, 0xfe, 0x7c, 0x7e,
+        0x1c, 0x4a, 0x6a, 0xa8, 0x91, 0x07, 0xc0, 0x0d, 0x1f, 0x70, 0x4a,
+        0xbb, 0x20, 0x42, 0xd3, 0x3f, 0x19, 0xf1, 0xb1, 0xfc, 0xef, 0xa1,
+        0x71, 0xfd, 0xf7, 0xaf, 0xc5, 0x12, 0x7a, 0x98, 0xad, 0x42, 0xbc,
+        0x01, 0xe6, 0xa2, 0x83, 0xbc, 0x73, 0xb5, 0xba, 0x84,
+    };
+    static const uint8_t kDRBGEntropy2[48] = {
+        0xc7, 0x16, 0x1c, 0xa3, 0x6c, 0x23, 0x09, 0xb7, 0x16, 0xe9, 0x85, 0x9b,
+        0xb9, 0x6c, 0x6d, 0x49, 0xbd, 0xc8, 0x35, 0x21, 0x03, 0xa1, 0x8c, 0xd2,
+        0x4e, 0xf4, 0x2e, 0xc9, 0x7e, 0xf4, 0x6b, 0xf4, 0x46, 0xeb, 0x1a, 0x45,
+        0x76, 0xc1, 0x86, 0xe9, 0x35, 0x18, 0x03, 0x76, 0x3a, 0x79, 0x12, 0xfe,
+    };
+    static const uint8_t kDRBGReseedOutput[64] = {
+        0xda, 0x49, 0xa1, 0x01, 0x31, 0x71, 0x77, 0xde, 0xf6, 0x8d, 0xb5,
+        0x4f, 0x86, 0x0d, 0xc8, 0xd6, 0x3c, 0xaa, 0xbc, 0x72, 0x0a, 0x9c,
+        0x8b, 0x68, 0xa9, 0x70, 0xf1, 0x21, 0x13, 0xce, 0xc6, 0xbc, 0xff,
+        0xaf, 0xa8, 0xd5, 0x26, 0x76, 0x26, 0xcc, 0x0d, 0x89, 0x66, 0xab,
+        0xc2, 0x11, 0xa8, 0x2f, 0xf1, 0x36, 0xa3, 0x2b, 0x52, 0xcd, 0x1a,
+        0x2d, 0xe4, 0x82, 0xac, 0x3c, 0xbb, 0xa9, 0x17, 0x90,
+    };
+    CTR_DRBG_STATE drbg;
+    uint8_t output[64];
+    if (!CTR_DRBG_init(&drbg, /*df=*/true, kDRBGEntropy, sizeof(kDRBGEntropy),
+                       kDRBGNonce, kDRBGPersonalization,
+                       sizeof(kDRBGPersonalization)) ||
+        !CTR_DRBG_generate(&drbg, output, sizeof(output), kDRBGAD,
+                           sizeof(kDRBGAD)) ||
+        !BORINGSSL_check_test(kDRBGOutput, output, "DRBG Generate KAT") ||
+        !CTR_DRBG_reseed_ex(&drbg, kDRBGEntropy2, sizeof(kDRBGEntropy2),
+                            kDRBGAD, sizeof(kDRBGAD)) ||
+        !CTR_DRBG_generate(&drbg, output, sizeof(output), kDRBGAD,
+                           sizeof(kDRBGAD)) ||
+        !BORINGSSL_check_test(kDRBGReseedOutput, output, "DRBG-reseed KAT")) {
+      fprintf(CRYPTO_get_stderr(), "CTR-DRBG failed.\n");
+      return 0;
+    }
+    CTR_DRBG_clear(&drbg);
+
+    uint8_t kZeroDRBG[sizeof(drbg)] = {};
+    if (!BORINGSSL_check_test(
+            kZeroDRBG,
+            Span(reinterpret_cast<const uint8_t *>(&drbg), sizeof(drbg)),
+            "DRBG Clear KAT")) {
+      return 0;
+    }
   }
 
-  // TLS v1.3: derives a dummy client-early-traffic secret.
-  static const uint8_t kTLS13Secret[32] = {
-      0x02, 0x4a, 0x0d, 0x80, 0xf3, 0x57, 0xf2, 0x49, 0x9a, 0x12, 0x44,
-      0xda, 0xc2, 0x6d, 0xab, 0x66, 0xfc, 0x13, 0xed, 0x85, 0xfc, 0xa7,
-      0x1d, 0xac, 0xe1, 0x46, 0x21, 0x11, 0x19, 0x52, 0x58, 0x74,
-  };
-  static const uint8_t kTLS13Salt[16] = {
-      0x54, 0x61, 0x11, 0x36, 0x75, 0x91, 0xf0, 0xf8,
-      0x92, 0xec, 0x70, 0xbd, 0x78, 0x2a, 0xef, 0x61,
-  };
-  static const uint8_t kTLS13Label[] = "c e traffic";
-  static const uint8_t kTLS13ClientHelloHash[32] = {
-      0x1d, 0xe8, 0x67, 0xed, 0x93, 0x6a, 0x73, 0x65, 0x9b, 0x05, 0xcf,
-      0x8a, 0x22, 0x77, 0xb7, 0x37, 0x29, 0xf2, 0x44, 0x94, 0x81, 0x6a,
-      0x83, 0x33, 0x7f, 0x09, 0xbb, 0x6c, 0xc2, 0x6f, 0x48, 0x9c,
-  };
-  static const uint8_t kTLS13ExpandLabelOutput[32] = {
-      0x62, 0x91, 0x52, 0x90, 0x2e, 0xc9, 0xcf, 0x9c, 0x5f, 0x1e, 0x0a,
-      0xb7, 0x00, 0x33, 0x42, 0x24, 0xc4, 0xe3, 0xba, 0x01, 0x40, 0x32,
-      0x06, 0xab, 0x09, 0x23, 0x8a, 0xdd, 0x01, 0xa4, 0x05, 0xcd,
-  };
-  uint8_t tls13_extract_output[32];
-  size_t tls13_extract_output_len;
-  uint8_t tls13_expand_label_output[32];
-  if (!HKDF_extract(tls13_extract_output, &tls13_extract_output_len,
-                    EVP_sha256(), kTLS13Secret, sizeof(kTLS13Secret),
-                    kTLS13Salt, sizeof(kTLS13Salt)) ||
-      tls13_extract_output_len != sizeof(tls13_extract_output) ||
-      !CRYPTO_tls13_hkdf_expand_label(
-          tls13_expand_label_output, sizeof(tls13_expand_label_output),
-          EVP_sha256(), tls13_extract_output, sizeof(tls13_extract_output),
-          kTLS13Label, sizeof(kTLS13Label) - 1, kTLS13ClientHelloHash,
-          sizeof(kTLS13ClientHelloHash)) ||
-      !BORINGSSL_check_test(kTLS13ExpandLabelOutput, tls13_expand_label_output,
-                            sizeof(kTLS13ExpandLabelOutput),
-                            "CRYPTO_tls13_hkdf_expand_label")) {
-    fprintf(CRYPTO_get_stderr(), "TLS13-KDF failed.\n");
-    goto err;
+  {
+    // TLS KDF KAT
+    static const uint8_t kTLSLabel[] = "FIPS self test";
+    static const uint8_t kTLSSeed1[16] = {
+        0x8f, 0x0d, 0xe8, 0xb6, 0x90, 0x8f, 0xb1, 0xd2,
+        0x6d, 0x51, 0xf4, 0x79, 0x18, 0x63, 0x51, 0x65,
+    };
+    static const uint8_t kTLSSeed2[16] = {
+        0x7d, 0x24, 0x1a, 0x9d, 0x3c, 0x59, 0xbf, 0x3c,
+        0x31, 0x1e, 0x2b, 0x21, 0x41, 0x8d, 0x32, 0x81,
+    };
+
+    static const uint8_t kTLS10Secret[32] = {
+        0xab, 0xc3, 0x65, 0x7b, 0x09, 0x4c, 0x76, 0x28, 0xa0, 0xb2, 0x82,
+        0x99, 0x6f, 0xe7, 0x5a, 0x75, 0xf4, 0x98, 0x4f, 0xd9, 0x4d, 0x4e,
+        0xcc, 0x2f, 0xcf, 0x53, 0xa2, 0xc4, 0x69, 0xa3, 0xf7, 0x31,
+    };
+    static const uint8_t kTLS10Output[32] = {
+        0x69, 0x7c, 0x4e, 0x2c, 0xee, 0x82, 0xb1, 0xd2, 0x8b, 0xac, 0x90,
+        0x7a, 0xa1, 0x8a, 0x81, 0xfe, 0xc5, 0x58, 0x45, 0x57, 0x61, 0x2f,
+        0x7a, 0x8d, 0x80, 0xfb, 0x44, 0xd8, 0x81, 0x60, 0xe5, 0xf8,
+    };
+    uint8_t tls10_output[sizeof(kTLS10Output)];
+    // For this test, labels null-terminated
+    if (!CRYPTO_tls1_prf(EVP_md5_sha1(), tls10_output, sizeof(tls10_output),
+                         kTLS10Secret, sizeof(kTLS10Secret), kTLSLabel,
+                         sizeof(kTLSLabel), kTLSSeed1, sizeof(kTLSSeed1),
+                         kTLSSeed2, sizeof(kTLSSeed2)) ||
+        !BORINGSSL_check_test(kTLS10Output, tls10_output, "TLS10-KDF KAT")) {
+      fprintf(CRYPTO_get_stderr(), "TLS KDF failed.\n");
+      return 0;
+    }
+
+    static const uint8_t kTLS12Secret[32] = {
+        0xc5, 0x43, 0x8e, 0xe2, 0x6f, 0xd4, 0xac, 0xbd, 0x25, 0x9f, 0xc9,
+        0x18, 0x55, 0xdc, 0x69, 0xbf, 0x88, 0x4e, 0xe2, 0x93, 0x22, 0xfc,
+        0xbf, 0xd2, 0x96, 0x6a, 0x46, 0x23, 0xd4, 0x2e, 0xc7, 0x81,
+    };
+    static const uint8_t kTLS12Output[32] = {
+        0xee, 0x4a, 0xcd, 0x3f, 0xa3, 0xd3, 0x55, 0x89, 0x9e, 0x6f, 0xf1,
+        0x38, 0x46, 0x9d, 0x2b, 0x33, 0xaa, 0x7f, 0xc4, 0x7f, 0x51, 0x85,
+        0x8a, 0xf3, 0x13, 0x84, 0xbf, 0x53, 0x6a, 0x65, 0x37, 0x51,
+    };
+    uint8_t tls12_output[sizeof(kTLS12Output)];
+    if (!CRYPTO_tls1_prf(EVP_sha256(), tls12_output, sizeof(tls12_output),
+                         kTLS12Secret, sizeof(kTLS12Secret), kTLSLabel,
+                         sizeof(kTLSLabel), kTLSSeed1, sizeof(kTLSSeed1),
+                         kTLSSeed2, sizeof(kTLSSeed2)) ||
+        !BORINGSSL_check_test(kTLS12Output, tls12_output, "TLS12-KDF KAT")) {
+      fprintf(CRYPTO_get_stderr(), "TLS KDF failed.\n");
+      return 0;
+    }
+
+    // TLS v1.3: derives a dummy client-early-traffic secret.
+    static const uint8_t kTLS13Secret[32] = {
+        0x02, 0x4a, 0x0d, 0x80, 0xf3, 0x57, 0xf2, 0x49, 0x9a, 0x12, 0x44,
+        0xda, 0xc2, 0x6d, 0xab, 0x66, 0xfc, 0x13, 0xed, 0x85, 0xfc, 0xa7,
+        0x1d, 0xac, 0xe1, 0x46, 0x21, 0x11, 0x19, 0x52, 0x58, 0x74,
+    };
+    static const uint8_t kTLS13Salt[16] = {
+        0x54, 0x61, 0x11, 0x36, 0x75, 0x91, 0xf0, 0xf8,
+        0x92, 0xec, 0x70, 0xbd, 0x78, 0x2a, 0xef, 0x61,
+    };
+    static const uint8_t kTLS13Label[] = "c e traffic";
+    static const uint8_t kTLS13ClientHelloHash[32] = {
+        0x1d, 0xe8, 0x67, 0xed, 0x93, 0x6a, 0x73, 0x65, 0x9b, 0x05, 0xcf,
+        0x8a, 0x22, 0x77, 0xb7, 0x37, 0x29, 0xf2, 0x44, 0x94, 0x81, 0x6a,
+        0x83, 0x33, 0x7f, 0x09, 0xbb, 0x6c, 0xc2, 0x6f, 0x48, 0x9c,
+    };
+    static const uint8_t kTLS13ExpandLabelOutput[32] = {
+        0x62, 0x91, 0x52, 0x90, 0x2e, 0xc9, 0xcf, 0x9c, 0x5f, 0x1e, 0x0a,
+        0xb7, 0x00, 0x33, 0x42, 0x24, 0xc4, 0xe3, 0xba, 0x01, 0x40, 0x32,
+        0x06, 0xab, 0x09, 0x23, 0x8a, 0xdd, 0x01, 0xa4, 0x05, 0xcd,
+    };
+    uint8_t tls13_extract_output[32];
+    size_t tls13_extract_output_len;
+    uint8_t tls13_expand_label_output[32];
+    if (!HKDF_extract(tls13_extract_output, &tls13_extract_output_len,
+                      EVP_sha256(), kTLS13Secret, sizeof(kTLS13Secret),
+                      kTLS13Salt, sizeof(kTLS13Salt)) ||
+        tls13_extract_output_len != sizeof(tls13_extract_output) ||
+        !CRYPTO_tls13_hkdf_expand_label(
+            tls13_expand_label_output, sizeof(tls13_expand_label_output),
+            EVP_sha256(), tls13_extract_output, sizeof(tls13_extract_output),
+            kTLS13Label, sizeof(kTLS13Label) - 1, kTLS13ClientHelloHash,
+            sizeof(kTLS13ClientHelloHash)) ||
+        !BORINGSSL_check_test(kTLS13ExpandLabelOutput,
+                              tls13_expand_label_output,
+                              "CRYPTO_tls13_hkdf_expand_label")) {
+      fprintf(CRYPTO_get_stderr(), "TLS13-KDF failed.\n");
+      return 0;
+    }
   }
 
-  // HKDF
-  static const uint8_t kHKDFSecret[32] = {
-      0x68, 0x67, 0x85, 0x04, 0xb9, 0xb3, 0xad, 0xd1, 0x7d, 0x59, 0x67,
-      0xa1, 0xa7, 0xbd, 0x37, 0x99, 0x3f, 0xd8, 0xa3, 0x3c, 0xe7, 0x30,
-      0x30, 0x71, 0xf3, 0x9c, 0x09, 0x6d, 0x16, 0x35, 0xb3, 0xc9,
-  };
-  static const uint8_t kHKDFSalt[32] = {
-      0x8a, 0xab, 0x18, 0xb4, 0x9b, 0x0a, 0x17, 0xf9, 0xe8, 0xe6, 0x97,
-      0x1a, 0x3d, 0xff, 0xda, 0x9b, 0x26, 0x8b, 0x3d, 0x17, 0x78, 0x0a,
-      0xb3, 0xea, 0x65, 0xdb, 0x2a, 0xc0, 0x29, 0x9c, 0xfa, 0x72,
-  };
-  static const uint8_t kHKDFInfo[32] = {
-      0xe5, 0x6f, 0xf9, 0xe1, 0x18, 0x5e, 0x64, 0x8c, 0x6c, 0x8f, 0xee,
-      0xc6, 0x93, 0x5a, 0xc5, 0x14, 0x8c, 0xf3, 0xd9, 0x78, 0xd2, 0x3a,
-      0x86, 0xdd, 0x01, 0xdf, 0xb9, 0xe9, 0x5e, 0xe5, 0x1a, 0x56,
-  };
-  static const uint8_t kHKDFOutput[32] = {
-      0xa6, 0x29, 0xb4, 0xd7, 0xf4, 0xc1, 0x16, 0x64, 0x71, 0x5e, 0xa4,
-      0xa8, 0xe6, 0x60, 0x8c, 0xf3, 0xc1, 0xa5, 0x03, 0xe2, 0x22, 0xf9,
-      0x89, 0xe2, 0x12, 0x18, 0xbe, 0xef, 0x16, 0x86, 0xe0, 0xec,
-  };
-  uint8_t hkdf_output[sizeof(kHKDFOutput)];
-  if (!HKDF(hkdf_output, sizeof(hkdf_output), EVP_sha256(), kHKDFSecret,
-            sizeof(kHKDFSecret), kHKDFSalt, sizeof(kHKDFSalt), kHKDFInfo,
-            sizeof(kHKDFInfo)) ||
-      !BORINGSSL_check_test(kHKDFOutput, hkdf_output, sizeof(kHKDFOutput),
-                            "HKDF")) {
-    fprintf(CRYPTO_get_stderr(), "HKDF failed.\n");
-    goto err;
+  {
+    // HKDF
+    static const uint8_t kHKDFSecret[32] = {
+        0x68, 0x67, 0x85, 0x04, 0xb9, 0xb3, 0xad, 0xd1, 0x7d, 0x59, 0x67,
+        0xa1, 0xa7, 0xbd, 0x37, 0x99, 0x3f, 0xd8, 0xa3, 0x3c, 0xe7, 0x30,
+        0x30, 0x71, 0xf3, 0x9c, 0x09, 0x6d, 0x16, 0x35, 0xb3, 0xc9,
+    };
+    static const uint8_t kHKDFSalt[32] = {
+        0x8a, 0xab, 0x18, 0xb4, 0x9b, 0x0a, 0x17, 0xf9, 0xe8, 0xe6, 0x97,
+        0x1a, 0x3d, 0xff, 0xda, 0x9b, 0x26, 0x8b, 0x3d, 0x17, 0x78, 0x0a,
+        0xb3, 0xea, 0x65, 0xdb, 0x2a, 0xc0, 0x29, 0x9c, 0xfa, 0x72,
+    };
+    static const uint8_t kHKDFInfo[32] = {
+        0xe5, 0x6f, 0xf9, 0xe1, 0x18, 0x5e, 0x64, 0x8c, 0x6c, 0x8f, 0xee,
+        0xc6, 0x93, 0x5a, 0xc5, 0x14, 0x8c, 0xf3, 0xd9, 0x78, 0xd2, 0x3a,
+        0x86, 0xdd, 0x01, 0xdf, 0xb9, 0xe9, 0x5e, 0xe5, 0x1a, 0x56,
+    };
+    static const uint8_t kHKDFOutput[32] = {
+        0xa6, 0x29, 0xb4, 0xd7, 0xf4, 0xc1, 0x16, 0x64, 0x71, 0x5e, 0xa4,
+        0xa8, 0xe6, 0x60, 0x8c, 0xf3, 0xc1, 0xa5, 0x03, 0xe2, 0x22, 0xf9,
+        0x89, 0xe2, 0x12, 0x18, 0xbe, 0xef, 0x16, 0x86, 0xe0, 0xec,
+    };
+    uint8_t hkdf_output[sizeof(kHKDFOutput)];
+    if (!HKDF(hkdf_output, sizeof(hkdf_output), EVP_sha256(), kHKDFSecret,
+              sizeof(kHKDFSecret), kHKDFSalt, sizeof(kHKDFSalt), kHKDFInfo,
+              sizeof(kHKDFInfo)) ||
+        !BORINGSSL_check_test(kHKDFOutput, hkdf_output, "HKDF")) {
+      fprintf(CRYPTO_get_stderr(), "HKDF failed.\n");
+      return 0;
+    }
   }
 
-  ret = 1;
-
-err:
-  EVP_AEAD_CTX_cleanup(&aead_ctx);
-
-  return ret;
+  return 1;
 }
 
-int BORINGSSL_self_test(void) {
+int BORINGSSL_self_test() {
   if (!boringssl_self_test_fast() ||
       // When requested to run self tests, also run some of the lazy tests.
-      !boringssl_self_test_rsa() ||    //
-      !boringssl_self_test_ecc() ||    //
-      !boringssl_self_test_ffdh() ||   //
-      !boringssl_self_test_mlkem() ||  //
+      !boringssl_self_test_rsa_sign() ||    //
+      !boringssl_self_test_rsa_verify() ||  //
+      !boringssl_self_test_ecc() ||         //
+      !boringssl_self_test_ffdh() ||        //
+      !boringssl_self_test_mlkem() ||       //
       !boringssl_self_test_mldsa()) {
     return 0;
   }
@@ -1046,7 +1078,7 @@ int BORINGSSL_self_test(void) {
   return 1;
 }
 
-int BORINGSSL_self_test_all(void) {
+int BORINGSSL_self_test_all() {
   if (!BORINGSSL_self_test() ||
       // When requested to run all self tests, add in the really slow tests.
       !boringssl_self_test_slhdsa()) {
@@ -1057,7 +1089,5 @@ int BORINGSSL_self_test_all(void) {
 }
 
 #if defined(BORINGSSL_FIPS)
-int boringssl_self_test_startup(void) { return boringssl_self_test_fast(); }
+int bssl::boringssl_self_test_startup() { return boringssl_self_test_fast(); }
 #endif
-
-#endif  // !_MSC_VER