diff --git a/crypto/fipsmodule/FIPS.md b/crypto/fipsmodule/FIPS.md
index 20e596a46c..c671a2380a 100644
--- a/crypto/fipsmodule/FIPS.md
+++ b/crypto/fipsmodule/FIPS.md
@@ -45,6 +45,9 @@ Some FIPS tests cannot be broken by replacing a known string in the binary. For
 
 1. `RSA_PWCT`
 2. `ECDSA_PWCT`
+3. `EDDSA_PWCT`
+4. `MLKEM_PWCT`
+5. `MLDSA_PWCT`
 
 ## Running ACVP tests
 
diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c
index 07d54dffd6..5be601c0d9 100644
--- a/crypto/fipsmodule/bcm.c
+++ b/crypto/fipsmodule/bcm.c
@@ -270,8 +270,7 @@ static void BORINGSSL_bcm_power_on_self_test(void) {
 
 #if defined(FIPS_ENTROPY_SOURCE_JITTER_CPU)
   if (jent_entropy_init()) {
-    fprintf(stderr, "CPU Jitter entropy RNG initialization failed.\n");
-    AWS_LC_FIPS_failure("CPU Jitter failed to initilize");
+    AWS_LC_FIPS_failure("CPU Jitter entropy RNG initialization failed");
   }
 #endif
 
@@ -333,8 +332,8 @@ int BORINGSSL_integrity_test(void) {
 
   uint8_t result[SHA256_DIGEST_LENGTH];
   const EVP_MD *const kHashFunction = EVP_sha256();
-  if (!boringssl_self_test_sha256(true) ||
-      !boringssl_self_test_hmac_sha256(true)) {
+  if (!boringssl_self_test_sha256() ||
+      !boringssl_self_test_hmac_sha256()) {
     return 0;
   }
 
@@ -379,11 +378,11 @@ int BORINGSSL_integrity_test(void) {
 
 #if defined(BORINGSSL_FIPS_BREAK_TESTS)
   // Check the integrity but don't call AWS_LC_FIPS_failure or return 0
-  check_test(expected, result, sizeof(result), "FIPS integrity test", false);
+  check_test_optional_abort(expected, result, sizeof(result), "FIPS integrity test", false);
 #else
   // Check the integrity, call AWS_LC_FIPS_failure if it doesn't match which will
   // result in an abort
-  check_test(expected, result, sizeof(result), "FIPS integrity test", true);
+  check_test_optional_abort(expected, result, sizeof(result), "FIPS integrity test", true);
 #endif
 
   OPENSSL_cleanse(result, sizeof(result)); // FIPS 140-3, AS05.10.
@@ -393,14 +392,19 @@ int BORINGSSL_integrity_test(void) {
 
 void AWS_LC_FIPS_failure(const char* message) {
   fprintf(stderr, "AWS-LC FIPS failure caused by:\n%s\n", message);
+  fflush(stderr);
   for (;;) {
     abort();
     exit(1);
   }
 }
 
+#else  // BORINGSSL_FIPS
+void AWS_LC_FIPS_failure(const char* message) {
+  fprintf(stderr, "AWS-LC FIPS failure caused by:\n%s\n", message);
+  fflush(stderr);
+}
 #endif  // BORINGSSL_FIPS
-
 #if !defined(AWSLC_FIPS) && !defined(BORINGSSL_SHARED_LIBRARY)
 // When linking with a static library, if no symbols in an object file are
 // referenced then the object file is discarded, even if it has a constructor
diff --git a/crypto/fipsmodule/curve25519/curve25519.c b/crypto/fipsmodule/curve25519/curve25519.c
index aed3a8c4b9..841de4b41e 100644
--- a/crypto/fipsmodule/curve25519/curve25519.c
+++ b/crypto/fipsmodule/curve25519/curve25519.c
@@ -117,8 +117,15 @@ static void ed25519_keypair_pct(uint8_t public_key[ED25519_PUBLIC_KEY_LEN],
 #if defined(AWSLC_FIPS)
   uint8_t msg[16] = {16};
   uint8_t out_sig[ED25519_SIGNATURE_LEN];
-  if (ED25519_sign_no_self_test(out_sig, msg, 16, private_key) != 1 ||
-      ED25519_verify_no_self_test(msg, 16, out_sig, public_key) != 1) {
+  if (ED25519_sign_no_self_test(out_sig, msg, 16, private_key) != 1) {
+    // This should never happen and static analysis will say that ED25519_sign_no_self_test
+    // always returns 1
+    AWS_LC_FIPS_failure("Ed25519 keygen PCT failed");
+  }
+  if (boringssl_fips_break_test("EDDSA_PWCT")) {
+    msg[0] = ~msg[0];
+  }
+  if (ED25519_verify_no_self_test(msg, 16, out_sig, public_key) != 1) {
     AWS_LC_FIPS_failure("Ed25519 keygen PCT failed");
   }
 #endif
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/sign.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/sign.c
index 355574adf8..da410d2d53 100644
--- a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/sign.c
+++ b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/sign.c
@@ -25,13 +25,16 @@
 static int ml_dsa_keypair_pct(ml_dsa_params *params,
                               uint8_t *pk,
                               uint8_t *sk) {
+  uint8_t message[1] = {0};
   uint8_t signature[MLDSA87_SIGNATURE_BYTES];
-  uint8_t empty_msg[1] = {0};
-  int ret = ml_dsa_sign(params, signature, &params->bytes, empty_msg, 0, NULL, 0, sk);
+  int ret = ml_dsa_sign(params, signature, &params->bytes, message, sizeof(message), NULL, 0, sk);
   if (ret < 0) {
     return 0;
   }
-  return ml_dsa_verify(params, signature, params->bytes, empty_msg, 0, NULL, 0, pk) == 0;
+  if (boringssl_fips_break_test("MLDSA_PWCT")) {
+    message[0] = ~message[0];
+  }
+  return ml_dsa_verify(params, signature, params->bytes, message, sizeof(message), NULL, 0, pk) == 0;
 }
 #endif
 
diff --git a/crypto/fipsmodule/ml_kem/ml_kem.c b/crypto/fipsmodule/ml_kem/ml_kem.c
index 1da7350e4b..771a49c240 100644
--- a/crypto/fipsmodule/ml_kem/ml_kem.c
+++ b/crypto/fipsmodule/ml_kem/ml_kem.c
@@ -34,16 +34,32 @@ int ml_kem_512_keypair_deterministic_no_self_test(uint8_t *public_key  /* OUT */
                                                   uint8_t *secret_key  /* OUT */,
                                                   const uint8_t *seed  /* IN */) {
   ml_kem_params params;
+  int res;
   ml_kem_512_params_init(&params);
-  return ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+  res = ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_512_keypair(uint8_t *public_key /* OUT */,
                            uint8_t *secret_key /* OUT */) {
   boringssl_ensure_ml_kem_self_test();
+  int res;
   ml_kem_params params;
   ml_kem_512_params_init(&params);
-  return ml_kem_keypair_ref(&params, public_key, secret_key);
+  res = ml_kem_keypair_ref(&params, public_key, secret_key);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_512_encapsulate_deterministic(uint8_t *ciphertext       /* OUT */,
@@ -94,16 +110,32 @@ int ml_kem_768_keypair_deterministic(uint8_t *public_key  /* OUT */,
                                          const uint8_t *seed  /* IN */) {
   boringssl_ensure_ml_kem_self_test();
   ml_kem_params params;
+  int res;
   ml_kem_768_params_init(&params);
-  return ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+  res = ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_768_keypair(uint8_t *public_key /* OUT */,
                            uint8_t *secret_key /* OUT */) {
   boringssl_ensure_ml_kem_self_test();
   ml_kem_params params;
+  int res;
   ml_kem_768_params_init(&params);
-  return ml_kem_keypair_ref(&params, public_key, secret_key);
+  res = ml_kem_keypair_ref(&params, public_key, secret_key);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_768_encapsulate_deterministic(uint8_t *ciphertext       /* OUT */,
@@ -139,16 +171,32 @@ int ml_kem_1024_keypair_deterministic(uint8_t *public_key  /* OUT */,
                                           const uint8_t *seed  /* IN */) {
   boringssl_ensure_ml_kem_self_test();
   ml_kem_params params;
+  int res;
   ml_kem_1024_params_init(&params);
-  return ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+  res = ml_kem_keypair_derand_ref(&params, public_key, secret_key, seed);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_1024_keypair(uint8_t *public_key /* OUT */,
                             uint8_t *secret_key /* OUT */) {
   boringssl_ensure_ml_kem_self_test();
   ml_kem_params params;
+  int res;
   ml_kem_1024_params_init(&params);
-  return ml_kem_keypair_ref(&params, public_key, secret_key);
+  res = ml_kem_keypair_ref(&params, public_key, secret_key);
+#if defined(AWSLC_FIPS)
+  /* PCT failure is the only failure condition for key generation. */
+  if (res != 0) {
+      AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+  }
+#endif
+  return res;
 }
 
 int ml_kem_1024_encapsulate_deterministic(uint8_t *ciphertext       /* OUT */,
diff --git a/crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c b/crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c
index b2b28d201c..7f74bc8365 100644
--- a/crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c
+++ b/crypto/fipsmodule/ml_kem/ml_kem_ref/kem.c
@@ -7,7 +7,6 @@
 #include "./verify.h"
 #include "./reduce.h"
 #include "./symmetric.h"
-#include "../../../internal.h"
 
 #include "openssl/rand.h"
 
@@ -24,6 +23,10 @@ static int keygen_pct(ml_kem_params *params, const uint8_t *ek, const uint8_t *d
   crypto_kem_enc(params, ct, ss_enc, ek);
   crypto_kem_dec(params, ss_dec, ct, dk);
 
+  if (boringssl_fips_break_test("MLKEM_PWCT")) {
+    ss_enc[0] = ~ss_enc[0];
+  }
+
   return verify(ss_enc, ss_dec, KYBER_SSBYTES);
 }
 #endif
@@ -40,8 +43,9 @@ static int keygen_pct(ml_kem_params *params, const uint8_t *ek, const uint8_t *d
 *                (an already allocated array of KYBER_SECRETKEYBYTES bytes)
 *              - uint8_t *coins: pointer to input randomness
 *                (an already allocated array filled with 2*KYBER_SYMBYTES random bytes)
-**
-* Returns 0 on success, aborts on failure.
+*
+* Returns:     - 0 on success
+*              - -1 upon PCT failure (if AWSLC_FIPS is set)
 **************************************************/
 int crypto_kem_keypair_derand(ml_kem_params *params,
                               uint8_t *pk,
@@ -57,7 +61,7 @@ int crypto_kem_keypair_derand(ml_kem_params *params,
 #if defined(AWSLC_FIPS)
   // Abort in case of PCT failure.
   if (keygen_pct(params, pk, sk)) {
-    AWS_LC_FIPS_failure("ML-KEM keygen PCT failed");
+    return -1;
   }
 #endif
   return 0;
@@ -74,7 +78,8 @@ int crypto_kem_keypair_derand(ml_kem_params *params,
 *              - uint8_t *sk: pointer to output private key
 *                (an already allocated array of KYBER_SECRETKEYBYTES bytes)
 *
-* Returns 0 on success, aborts on failure.
+* Returns:     - 0 on success
+*              - -1 upon PCT failure (if AWSLC_FIPS is set)
 **************************************************/
 int crypto_kem_keypair(ml_kem_params *params,
                        uint8_t *pk,
@@ -83,7 +88,6 @@ int crypto_kem_keypair(ml_kem_params *params,
   uint8_t coins[2*KYBER_SYMBYTES];
   RAND_bytes(coins, 2*KYBER_SYMBYTES);
   int res = crypto_kem_keypair_derand(params, pk, sk, coins);
-  assert(res == 0);
 
   // FIPS 203. Section 3.3 Destruction of intermediate values.
   OPENSSL_cleanse(coins, sizeof(coins));
diff --git a/crypto/fipsmodule/self_check/self_check.c b/crypto/fipsmodule/self_check/self_check.c
index 0591955f4c..3a8923034f 100644
--- a/crypto/fipsmodule/self_check/self_check.c
+++ b/crypto/fipsmodule/self_check/self_check.c
@@ -60,9 +60,8 @@ static void hexdump(char buf[MAX_HEXDUMP_SIZE], const uint8_t *in, size_t in_len
     }
 }
 
-static int check_test(const void *expected, const void *actual,
-                      size_t expected_len, const char *name,
-                      const bool call_aws_lc_fips_failure) {
+static int check_test_optional_abort(const void *expected, const void *actual,
+                      size_t expected_len, const char *name, const bool call_fips_failure) {
   if (OPENSSL_memcmp(actual, expected, expected_len) != 0) {
     assert(sizeof(name) < MAX_NAME);
     char expected_hex[MAX_HEXDUMP_SIZE] = {0};
@@ -74,22 +73,21 @@ static int check_test(const void *expected, const void *actual,
     snprintf(error_msg, sizeof(error_msg),
                "%s failed.\nExpected:   %s\nCalculated: %s\n",
                name, expected_hex, actual_hex);
-#if defined(BORINGSSL_FIPS)
-    if (call_aws_lc_fips_failure) {
+    if (call_fips_failure) {
       AWS_LC_FIPS_failure(error_msg);
     } else {
-      fprintf(stderr, "%s", error_msg);
-      fflush(stderr);
+      fprintf(stderr, "%s\n", error_msg);
     }
-#else
-    fprintf(stderr, "%s", error_msg);
-    fflush(stderr);
-#endif
     return 0;
   }
   return 1;
 }
 
+static int check_test(const void *expected, const void *actual,
+                      size_t expected_len, const char *name) {
+  return check_test_optional_abort(expected, actual, expected_len, name, true);
+}
+
 static int set_bignum(BIGNUM **out, const uint8_t *in, size_t len) {
   *out = BN_bin2bn(in, len, NULL);
   return *out != NULL;
@@ -440,7 +438,7 @@ static DH *self_test_dh(void) {
 // 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(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_rsa(void) {
   int ret = 0;
   uint8_t output[256];
 
@@ -489,7 +487,7 @@ static int boringssl_self_test_rsa(const bool call_aws_lc_fips_failure) {
   if (!rsa_digestsign_no_self_test(EVP_sha256(), kRSASignPlaintext,
                          sizeof(kRSASignPlaintext),output, &sig_len, rsa_key) ||
       !check_test(kRSASignSignature, output, sizeof(kRSASignSignature),
-                  "RSA-sign KAT", call_aws_lc_fips_failure)) {
+                  "RSA-sign KAT")) {
     goto err;
   }
 
@@ -527,7 +525,7 @@ static int boringssl_self_test_rsa(const bool call_aws_lc_fips_failure) {
   if (!rsa_digestverify_no_self_test(EVP_sha256(), kRSAVerifyPlaintext,
                                sizeof(kRSAVerifyPlaintext), kRSAVerifySignature,
                                sizeof(kRSAVerifySignature), rsa_key)) {
-    fprintf(stderr, "RSA-verify KAT failed.\n");
+    AWS_LC_FIPS_failure("RSA-verify KAT failed");
     goto err;
   }
 
@@ -539,7 +537,7 @@ static int boringssl_self_test_rsa(const bool call_aws_lc_fips_failure) {
   return ret;
 }
 
-static int boringssl_self_test_ecc(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_ecc(void) {
   int ret = 0;
   EC_KEY *ec_key = NULL;
   EC_POINT *ec_point_in = NULL;
@@ -580,8 +578,8 @@ static int boringssl_self_test_ecc(const bool call_aws_lc_fips_failure) {
   if (sig == NULL ||
       !serialize_ecdsa_sig(ecdsa_sign_output, sizeof(ecdsa_sign_output), sig) ||
       !check_test(kECDSASignSig, ecdsa_sign_output, sizeof(ecdsa_sign_output),
-                  "ECDSA-sign signature", call_aws_lc_fips_failure)) {
-    fprintf(stderr, "ECDSA-sign KAT failed.\n");
+                  "ECDSA-sign signature")) {
+    AWS_LC_FIPS_failure("ECDSA-sign KAT failed");
     goto err;
   }
 
@@ -604,7 +602,7 @@ static int boringssl_self_test_ecc(const bool call_aws_lc_fips_failure) {
   if (!sig ||
       !ecdsa_digestverify_no_self_test(EVP_sha256(), kECDSAVerifyPlaintext,
                                   sizeof(kECDSAVerifyPlaintext), sig, ec_key)) {
-    fprintf(stderr, "ECDSA-verify KAT failed.\n");
+    AWS_LC_FIPS_failure("ECDSA-verify KAT failed");
     goto err;
   }
 
@@ -649,7 +647,7 @@ static int boringssl_self_test_ecc(const bool call_aws_lc_fips_failure) {
       !EC_POINT_point2oct(ec_group, ec_point_out, POINT_CONVERSION_UNCOMPRESSED,
                           z_comp_result, sizeof(z_comp_result), NULL) ||
       !check_test(kP256PointResult, z_comp_result, sizeof(z_comp_result),
-                  "Z-computation", call_aws_lc_fips_failure)) {
+                  "Z-computation")) {
     goto err;
   }
 
@@ -665,7 +663,7 @@ static int boringssl_self_test_ecc(const bool call_aws_lc_fips_failure) {
   return ret;
 }
 
-static int boringssl_self_test_ffdh(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_ffdh(void) {
   int ret = 0;
   DH *dh = NULL;
   DH *fb_dh = NULL;
@@ -790,7 +788,7 @@ static int boringssl_self_test_ffdh(const bool call_aws_lc_fips_failure) {
   if (dh == NULL || ffdhe2048_value == NULL || sizeof(dh_out) != DH_size(dh) ||
       dh_compute_key_padded_no_self_test(dh_out, ffdhe2048_value, dh) !=
           sizeof(dh_out) ||
-      !check_test(kDHOutput, dh_out, sizeof(dh_out), "FFC DH", call_aws_lc_fips_failure)) {
+      !check_test(kDHOutput, dh_out, sizeof(dh_out), "FFC DH")) {
     goto err;
   }
 
@@ -802,7 +800,7 @@ static int boringssl_self_test_ffdh(const bool call_aws_lc_fips_failure) {
       sizeof(fb_dh_out) != DH_size(fb_dh) ||
       dh_compute_key_padded_no_self_test(fb_dh_out, fb_peers_key, fb_dh) !=
           sizeof(fb_dh_out) ||
-      !check_test(kDH_fb_z, fb_dh_out, sizeof(fb_dh_out), "FFC DH FB", call_aws_lc_fips_failure)) {
+      !check_test(kDH_fb_z, fb_dh_out, sizeof(fb_dh_out), "FFC DH FB")) {
     goto err;
   }
 
@@ -817,7 +815,7 @@ static int boringssl_self_test_ffdh(const bool call_aws_lc_fips_failure) {
   return ret;
 }
 
-static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_ml_kem(void) {
   int ret = 0;
 
   static const uint8_t kKeyGenEKSeed[MLKEM512_KEYGEN_SEED_LEN] = {
@@ -902,7 +900,7 @@ static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
   if (ml_kem_512_keypair_deterministic_no_self_test(
           keygen_encaps, keygen_decaps, kKeyGenEKSeed) ||
       !check_test(kKeyGenEK, keygen_encaps, sizeof(keygen_encaps),
-              "ML-KEM-keyGen-encaps", call_aws_lc_fips_failure)) {
+              "ML-KEM-keyGen-encaps")) {
     goto err;
   }
 
@@ -1060,7 +1058,7 @@ static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
   if (ml_kem_512_keypair_deterministic_no_self_test(
           keygen_encaps, keygen_decaps, kKeyGenDKSeed) ||
       !check_test(kKeyGenDK, keygen_decaps, sizeof(keygen_decaps),
-                  "ML-KEM-keyGen-decaps", call_aws_lc_fips_failure)) {
+                  "ML-KEM-keyGen-decaps")) {
     goto err;
   }
 
@@ -1212,9 +1210,9 @@ static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
   if (ml_kem_512_encapsulate_deterministic_no_self_test(
           ciphertext, shared_secret, kEncapEK, kEncapM) ||
       !check_test(kEncapCiphertext, ciphertext, sizeof(kEncapCiphertext),
-                  "ML-KEM-encapsulate-ciphertext", call_aws_lc_fips_failure) ||
+                  "ML-KEM-encapsulate-ciphertext") ||
       !check_test(kEncapSharedSecret, shared_secret, sizeof(kEncapSharedSecret),
-                  "ML-KEM-encapsulate-shared-secret", call_aws_lc_fips_failure)) {
+                  "ML-KEM-encapsulate-shared-secret")) {
     goto err;
   }
 
@@ -1497,12 +1495,12 @@ static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
   if (ml_kem_512_decapsulate_no_self_test(shared_secret, kDecapCiphertext,
                                           kDecapDK) ||
       !check_test(kDecapSharedSecret, shared_secret, sizeof(kDecapSharedSecret),
-                  "ML-KEM decapsulate non-rejection", call_aws_lc_fips_failure) ||
+                  "ML-KEM decapsulate non-rejection") ||
       ml_kem_512_decapsulate_no_self_test(
           shared_secret, kDecapCiphertextRejection, kDecapDK) ||
       !check_test(kDecapSharedSecretRejection, shared_secret,
                   sizeof(kDecapSharedSecretRejection),
-                  "ML-KEM decapsulate implicit rejection", call_aws_lc_fips_failure)) {
+                  "ML-KEM decapsulate implicit rejection")) {
     goto err;
   }
 
@@ -1511,7 +1509,7 @@ static int boringssl_self_test_ml_kem(const bool call_aws_lc_fips_failure) {
   return ret;
 }
 
-static int boringssl_self_test_ml_dsa(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_ml_dsa(void) {
   int ret = 0;
 
   // Examples kMLDSAKeyGenSeed, kMLDSAKeyGenPublicKey, kMLDSAKeyGenPrivateKey from
@@ -2077,8 +2075,8 @@ static int boringssl_self_test_ml_dsa(const bool call_aws_lc_fips_failure) {
   uint8_t private_key[MLDSA44_PRIVATE_KEY_BYTES] = {0};
 
   if (!ml_dsa_44_keypair_internal_no_self_test(public_key, private_key, kMLDSAKeyGenSeed) ||
-      !check_test(kMLDSAKeyGenPublicKey, public_key, sizeof(public_key), "ML-DSA keyGen public", call_aws_lc_fips_failure) ||
-      !check_test(kMLDSAKeyGenPrivateKey, private_key, sizeof(private_key), "ML-DSA keyGen private", call_aws_lc_fips_failure)) {
+      !check_test(kMLDSAKeyGenPublicKey, public_key, sizeof(public_key), "ML-DSA keyGen public") ||
+      !check_test(kMLDSAKeyGenPrivateKey, private_key, sizeof(private_key), "ML-DSA keyGen private")) {
     goto err;
   }
 
@@ -2089,7 +2087,7 @@ static int boringssl_self_test_ml_dsa(const bool call_aws_lc_fips_failure) {
 
   if (!ml_dsa_44_sign_internal_no_self_test(private_key, signature, &sig_len, kMLDSASignPlaintext,
                                             mlen_int, NULL, 0, kMLDSASigGenSeed) ||
-      !check_test(kMLDSASignSignature, signature, sizeof(signature), "ML-DSA SigGen signature", call_aws_lc_fips_failure)) {
+      !check_test(kMLDSASignSignature, signature, sizeof(signature), "ML-DSA SigGen signature")) {
     goto err;
   }
 
@@ -2104,7 +2102,7 @@ static int boringssl_self_test_ml_dsa(const bool call_aws_lc_fips_failure) {
     return ret;
 }
 
-static int boringssl_self_test_eddsa(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_eddsa(void) {
   int ret = 0;
 
   static const uint8_t kEd25519PrivateKey[ED25519_PRIVATE_KEY_SEED_LEN] = {
@@ -2140,8 +2138,8 @@ static int boringssl_self_test_eddsa(const bool call_aws_lc_fips_failure) {
                                  sizeof(kEd25519SignMessage),
                                  ed25519_private_key) ||
       !check_test(kEd25519SignSignature, ed25519_out_sig,
-                  ED25519_SIGNATURE_LEN, "ED25519-sign", call_aws_lc_fips_failure)) {
-    fprintf(stderr, "ED25519-sign failed.\n");
+                  ED25519_SIGNATURE_LEN, "ED25519-sign")) {
+    AWS_LC_FIPS_failure("ED25519-sign failed");
     goto err;
   }
 
@@ -2158,7 +2156,7 @@ static int boringssl_self_test_eddsa(const bool call_aws_lc_fips_failure) {
     0x78, 0x89, 0x67, 0x0a};
   if (!ED25519_verify_no_self_test(kEd25519VerifyMessage, sizeof(kEd25519VerifyMessage),
                                    kEd25519VerifySignature, kEd25519PublicKey)) {
-    fprintf(stderr, "ED25519-verify failed.\n");
+    AWS_LC_FIPS_failure("ED25519-verify failed");
     goto err;
   }
 
@@ -2167,7 +2165,7 @@ static int boringssl_self_test_eddsa(const bool call_aws_lc_fips_failure) {
   return ret;
 }
 
-static int boringssl_self_test_hasheddsa(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_hasheddsa(void) {
   int ret = 0;
 
   static const uint8_t kEd25519PrivateKey[ED25519_PRIVATE_KEY_SEED_LEN] = {
@@ -2211,7 +2209,7 @@ static int boringssl_self_test_hasheddsa(const bool call_aws_lc_fips_failure) {
           &ed25519_out_sig[0], kEd25519SignMessage, sizeof(kEd25519SignMessage),
           ed25519_private_key, kEd25519Context, sizeof(kEd25519Context)) ||
       !check_test(kEd25519SignSignature, ed25519_out_sig,
-                  ED25519_SIGNATURE_LEN, "ED25519ph-sign", call_aws_lc_fips_failure)) {
+                  ED25519_SIGNATURE_LEN, "ED25519ph-sign")) {
     goto err;
   }
 
@@ -2230,7 +2228,7 @@ static int boringssl_self_test_hasheddsa(const bool call_aws_lc_fips_failure) {
 };
   if (!ED25519ph_verify_no_self_test(kEd25519VerifyMessage, sizeof(kEd25519VerifyMessage),
                                    kEd25519VerifySignature, kEd25519PublicKey, kEd25519Context, sizeof(kEd25519Context))) {
-    fprintf(stderr, "ED25519ph-verify failed.\n");
+    AWS_LC_FIPS_failure("ED25519ph-verify failed");
     goto err;
   }
 
@@ -2242,7 +2240,7 @@ static int boringssl_self_test_hasheddsa(const bool call_aws_lc_fips_failure) {
 #if defined(BORINGSSL_FIPS)
 
 static void run_self_test_rsa(void) {
-  if (!boringssl_self_test_rsa(true)) {
+  if (!boringssl_self_test_rsa()) {
     AWS_LC_FIPS_failure("RSA self tests failed");
   }
 }
@@ -2254,7 +2252,7 @@ void boringssl_ensure_rsa_self_test(void) {
 }
 
 static void run_self_test_ecc(void) {
-  if (!boringssl_self_test_ecc(true)) {
+  if (!boringssl_self_test_ecc()) {
     AWS_LC_FIPS_failure("ECC self tests failed");
   }
 }
@@ -2266,7 +2264,7 @@ void boringssl_ensure_ecc_self_test(void) {
 }
 
 static void run_self_test_ffdh(void) {
-  if (!boringssl_self_test_ffdh(true)) {
+  if (!boringssl_self_test_ffdh()) {
     AWS_LC_FIPS_failure("FFDH self tests failed");
   }
 }
@@ -2278,7 +2276,7 @@ void boringssl_ensure_ffdh_self_test(void) {
 }
 
 static void run_self_test_ml_kem(void) {
-  if (!boringssl_self_test_ml_kem(true)) {
+  if (!boringssl_self_test_ml_kem()) {
     AWS_LC_FIPS_failure("RSA self tests failed");
   }
 }
@@ -2290,7 +2288,7 @@ void boringssl_ensure_ml_kem_self_test(void) {
 }
 
 static void run_self_test_ml_dsa(void) {
-  if (!boringssl_self_test_ml_dsa(true)) {
+  if (!boringssl_self_test_ml_dsa()) {
     AWS_LC_FIPS_failure("ML-DSA self tests failed");
   }
 }
@@ -2302,7 +2300,7 @@ void boringssl_ensure_ml_dsa_self_test(void) {
 }
 
 static void run_self_test_eddsa(void) {
-  if (!boringssl_self_test_eddsa(true)) {
+  if (!boringssl_self_test_eddsa()) {
     AWS_LC_FIPS_failure("EdDSA self tests failed");
   }
 }
@@ -2314,7 +2312,7 @@ void boringssl_ensure_eddsa_self_test(void) {
 }
 
 static void run_self_test_hasheddsa(void) {
-  if (!boringssl_self_test_hasheddsa(true)) {
+  if (!boringssl_self_test_hasheddsa()) {
     AWS_LC_FIPS_failure("EdDSA-ph self tests failed");
   }
 }
@@ -2333,7 +2331,7 @@ void boringssl_ensure_hasheddsa_self_test(void) {
 // These tests are run at process start when in FIPS mode. Note that the SHA256
 // and HMAC-SHA256 tests are also used from bcm.c, so they can't be static.
 
-int boringssl_self_test_sha256(const bool call_aws_lc_fips_failure) {
+int boringssl_self_test_sha256(void) {
   static const uint8_t kInput[16] = {
       0xff, 0x3b, 0x85, 0x7d, 0xa7, 0x23, 0x6a, 0x2b,
       0xaa, 0x0f, 0x39, 0x6b, 0x51, 0x52, 0x22, 0x17,
@@ -2348,10 +2346,10 @@ int boringssl_self_test_sha256(const bool call_aws_lc_fips_failure) {
   // SHA-256 KAT
   SHA256(kInput, sizeof(kInput), output);
   return check_test(kPlaintextSHA256, output, sizeof(kPlaintextSHA256),
-                    "SHA-256 KAT", call_aws_lc_fips_failure);
+                    "SHA-256 KAT");
 }
 
-static int boringssl_self_test_sha512(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_sha512(void) {
   static const uint8_t kInput[16] = {
       0x21, 0x25, 0x12, 0xf8, 0xd2, 0xad, 0x83, 0x22,
       0x78, 0x1c, 0x6c, 0x4d, 0x69, 0xa9, 0xda, 0xa1,
@@ -2369,10 +2367,10 @@ static int boringssl_self_test_sha512(const bool call_aws_lc_fips_failure) {
   // SHA-512 KAT
   SHA512(kInput, sizeof(kInput), output);
   return check_test(kPlaintextSHA512, output, sizeof(kPlaintextSHA512),
-                    "SHA-512 KAT", call_aws_lc_fips_failure);
+                    "SHA-512 KAT");
 }
 
-int boringssl_self_test_hmac_sha256(const bool call_aws_lc_fips_failure) {
+int boringssl_self_test_hmac_sha256(void) {
   static const uint8_t kInput[16] = {
       0xda, 0xd9, 0x12, 0x93, 0xdf, 0xcf, 0x2a, 0x7c,
       0x8e, 0xcd, 0x13, 0xfe, 0x35, 0x3f, 0xa7, 0x5b,
@@ -2389,10 +2387,10 @@ int boringssl_self_test_hmac_sha256(const bool call_aws_lc_fips_failure) {
        &output_len);
   return output_len == sizeof(kPlaintextHMACSHA256) &&
          check_test(kPlaintextHMACSHA256, output, sizeof(kPlaintextHMACSHA256),
-                    "HMAC-SHA-256 KAT", call_aws_lc_fips_failure);
+                    "HMAC-SHA-256 KAT");
 }
 
-static int boringssl_self_test_hkdf_sha256(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_hkdf_sha256(void) {
   static const uint8_t kHKDF_ikm_tc1[] = {   // RFC 5869 Test Case 1
       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b
@@ -2417,10 +2415,10 @@ static int boringssl_self_test_hkdf_sha256(const bool call_aws_lc_fips_failure)
        kHKDF_salt_tc1, sizeof(kHKDF_salt_tc1),
        kHKDF_info_tc1, sizeof(kHKDF_info_tc1));
   return check_test(kHKDF_okm_tc1_sha256, output, sizeof(output),
-                    "HKDF-SHA-256 KAT", call_aws_lc_fips_failure);
+                    "HKDF-SHA-256 KAT");
 }
 
-static int boringssl_self_test_sha3_256(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_sha3_256(void) {
   // From: SHA3_256ShortMsg.txt
   // Len = 128
   // Msg = d83c721ee51b060c5a41438a8221e040
@@ -2439,10 +2437,10 @@ static int boringssl_self_test_sha3_256(const bool call_aws_lc_fips_failure) {
   // SHA3-256 KAT
   SHA3_256(kInput, sizeof(kInput), output);
   return check_test(kPlaintextSHA3_256, output, sizeof(kPlaintextSHA3_256),
-                    "SHA3-256 KAT", call_aws_lc_fips_failure);
+                    "SHA3-256 KAT");
 }
 
-static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
+static int boringssl_self_test_fast(void) {
   static const uint8_t kAESKey[16] = {'B', 'o', 'r', 'i', 'n', 'g', 'C', 'r',
                                       'y', 'p', 't', 'o', ' ', 'K', 'e', 'y'};
   // Older versions of the gcc release build on ARM will optimize out the
@@ -2484,7 +2482,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
   AES_cbc_encrypt(kAESCBCEncPlaintext, output, sizeof(kAESCBCEncPlaintext),
                   &aes_key, aes_iv, AES_ENCRYPT);
   if (!check_test(kAESCBCEncCiphertext, output, sizeof(kAESCBCEncCiphertext),
-                  "AES-CBC-encrypt KAT", call_aws_lc_fips_failure)) {
+                  "AES-CBC-encrypt KAT")) {
     goto err;
   }
 
@@ -2507,7 +2505,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
   AES_cbc_encrypt(kAESCBCDecCiphertext, output, sizeof(kAESCBCDecCiphertext),
                   &aes_key, aes_iv, AES_DECRYPT);
   if (!check_test(kAESCBCDecPlaintext, output, sizeof(kAESCBCDecPlaintext),
-                  "AES-CBC-decrypt KAT", call_aws_lc_fips_failure)) {
+                  "AES-CBC-decrypt KAT")) {
     goto err;
   }
 
@@ -2537,7 +2535,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                          kAESGCMEncPlaintext, sizeof(kAESGCMEncPlaintext), NULL,
                          0) ||
       !check_test(kAESGCMCiphertext, output, sizeof(kAESGCMCiphertext),
-                  "AES-GCM-encrypt KAT", call_aws_lc_fips_failure)) {
+                  "AES-GCM-encrypt KAT")) {
     fprintf(stderr, "EVP_AEAD_CTX_seal for AES-128-GCM failed.\n");
     goto err;
   }
@@ -2560,9 +2558,8 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                          kAESGCMDecCiphertext, sizeof(kAESGCMDecCiphertext),
                          NULL, 0) ||
       !check_test(kAESGCMDecPlaintext, output, sizeof(kAESGCMDecPlaintext),
-                  "AES-GCM-decrypt KAT", call_aws_lc_fips_failure)) {
-    fprintf(stderr,
-            "AES-GCM-decrypt KAT failed because EVP_AEAD_CTX_open failed.\n");
+                  "AES-GCM-decrypt KAT")) {
+    AWS_LC_FIPS_failure("AES-GCM-decrypt KAT failed because EVP_AEAD_CTX_open failed");
     goto err;
   }
 
@@ -2577,13 +2574,13 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
   };
   SHA1(kSHA1Input, sizeof(kSHA1Input), output);
   if (!check_test(kSHA1Digest, output, sizeof(kSHA1Digest),
-                  "SHA-1 KAT", call_aws_lc_fips_failure)) {
+                  "SHA-1 KAT")) {
     goto err;
   }
 
-  if (!boringssl_self_test_sha512(call_aws_lc_fips_failure) ||
-      !boringssl_self_test_sha3_256(call_aws_lc_fips_failure) ||
-      !boringssl_self_test_hkdf_sha256(call_aws_lc_fips_failure)) {
+  if (!boringssl_self_test_sha512() ||
+      !boringssl_self_test_sha3_256() ||
+      !boringssl_self_test_hkdf_sha256()) {
     goto err;
   }
 
@@ -2627,20 +2624,20 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
       !CTR_DRBG_generate(&drbg, output, sizeof(kDRBGOutput), kDRBGAD,
                          sizeof(kDRBGAD)) ||
       !check_test(kDRBGOutput, output, sizeof(kDRBGOutput),
-                  "DRBG Generate KAT", call_aws_lc_fips_failure) ||
+                  "DRBG Generate KAT") ||
       !CTR_DRBG_reseed(&drbg, kDRBGEntropy2, kDRBGAD, sizeof(kDRBGAD)) ||
       !CTR_DRBG_generate(&drbg, output, sizeof(kDRBGReseedOutput), kDRBGAD,
                          sizeof(kDRBGAD)) ||
       !check_test(kDRBGReseedOutput, output, sizeof(kDRBGReseedOutput),
-                  "DRBG-reseed KAT", call_aws_lc_fips_failure)) {
-    fprintf(stderr, "CTR-DRBG failed.\n");
+                  "DRBG-reseed KAT")) {
+    AWS_LC_FIPS_failure("CTR-DRBG failed");
     goto err;
   }
   CTR_DRBG_clear(&drbg);
 
   CTR_DRBG_STATE kZeroDRBG;
   memset(&kZeroDRBG, 0, sizeof(kZeroDRBG));
-  if (!check_test(&kZeroDRBG, &drbg, sizeof(drbg), "DRBG Clear KAT", call_aws_lc_fips_failure)) {
+  if (!check_test(&kZeroDRBG, &drbg, sizeof(drbg), "DRBG Clear KAT")) {
     goto err;
   }
 
@@ -2669,7 +2666,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                        sizeof(kTLSSecret), kTLSLabel, sizeof(kTLSLabel),
                        kTLSSeed1, sizeof(kTLSSeed1), kTLSSeed2,
                        sizeof(kTLSSeed2)) ||
-      !check_test(kTLSOutput, tls_output, sizeof(kTLSOutput), "TLS-KDF KAT", call_aws_lc_fips_failure)) {
+      !check_test(kTLSOutput, tls_output, sizeof(kTLSOutput), "TLS-KDF KAT")) {
     goto err;
   }
 
@@ -2696,7 +2693,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                          EVP_sha256(), sizeof(kPBKDF2DerivedKey),
                          pbkdf2_output) ||
       !check_test(kPBKDF2DerivedKey, pbkdf2_output, sizeof(kPBKDF2DerivedKey),
-                  "PBKDF2 KAT", call_aws_lc_fips_failure)) {
+                  "PBKDF2 KAT")) {
     goto err;
   }
 
@@ -2739,7 +2736,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                     sizeof(kSSKDFDigestSharedSecret), &kSSKDFDigestInfo[0],
                     sizeof(kSSKDFDigestInfo)) ||
       !check_test(kSSKDFDigestDerivedKey, sskdf_digest_output,
-                  sizeof(kSSKDFDigestDerivedKey), "SSKDF_digest KAT", call_aws_lc_fips_failure)) {
+                  sizeof(kSSKDFDigestDerivedKey), "SSKDF_digest KAT")) {
     fprintf(stderr, "SSKDF_digest failed.\n");
     goto err;
   }
@@ -2769,7 +2766,7 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
                       kKBKDF_ctr_hmac_info, sizeof(kKBKDF_ctr_hmac_info)) ||
       !check_test(kKBKDF_ctr_hmac_output, kbkdf_ctr_hmac_output,
                   sizeof(kbkdf_ctr_hmac_output),
-                  "KBKDF-CTR-HMAC-SHA-256 KAT", call_aws_lc_fips_failure)) {
+                  "KBKDF-CTR-HMAC-SHA-256 KAT")) {
     goto err;
   }
   ret = 1;
@@ -2782,15 +2779,15 @@ static int boringssl_self_test_fast(const bool call_aws_lc_fips_failure) {
 
 // BORINGSSL_self_test does not abort if any tests fail
 int BORINGSSL_self_test(void) {
-  if (!boringssl_self_test_fast(false) ||
+  if (!boringssl_self_test_fast() ||
       // When requested to run self tests, also run the lazy tests.
-      !boringssl_self_test_rsa(false) ||
-      !boringssl_self_test_ecc(false) ||
-      !boringssl_self_test_ffdh(false) ||
-      !boringssl_self_test_ml_kem(false) ||
-      !boringssl_self_test_ml_dsa(false) ||
-      !boringssl_self_test_eddsa(false) ||
-      !boringssl_self_test_hasheddsa(false)) {
+      !boringssl_self_test_rsa() ||
+      !boringssl_self_test_ecc() ||
+      !boringssl_self_test_ffdh() ||
+      !boringssl_self_test_ml_kem() ||
+      !boringssl_self_test_ml_dsa() ||
+      !boringssl_self_test_eddsa() ||
+      !boringssl_self_test_hasheddsa()) {
     return 0;
   }
 
@@ -2799,6 +2796,6 @@ int BORINGSSL_self_test(void) {
 
 #if defined(BORINGSSL_FIPS)
 int boringssl_self_test_startup(void) {
-  return boringssl_self_test_fast(true);
+  return boringssl_self_test_fast();
 }
 #endif
diff --git a/crypto/fipsmodule/service_indicator/service_indicator_test.cc b/crypto/fipsmodule/service_indicator/service_indicator_test.cc
index bdb36bab1b..c9153c1a80 100644
--- a/crypto/fipsmodule/service_indicator/service_indicator_test.cc
+++ b/crypto/fipsmodule/service_indicator/service_indicator_test.cc
@@ -5296,7 +5296,7 @@ TEST(ServiceIndicatorTest, ED25519SigGenVerify) {
 // Since this is running in FIPS mode it should end in FIPS
 // Update this when the AWS-LC version number is modified
 TEST(ServiceIndicatorTest, AWSLCVersionString) {
-  ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.45.0");
+  ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.46.0");
 }
 
 #else
@@ -5339,6 +5339,6 @@ TEST(ServiceIndicatorTest, BasicTest) {
 // Since this is not running in FIPS mode it shouldn't end in FIPS
 // Update this when the AWS-LC version number is modified
 TEST(ServiceIndicatorTest, AWSLCVersionString) {
-  ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.45.0");
+  ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.46.0");
 }
 #endif // AWSLC_FIPS
diff --git a/crypto/internal.h b/crypto/internal.h
index 4e42bb5b5b..5a59c1e11f 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -1270,8 +1270,8 @@ static inline uint64_t CRYPTO_subc_u64(uint64_t x, uint64_t y, uint64_t borrow,
 #if defined(BORINGSSL_FIPS)
 
 // AWS_LC_FIPS_failure is called when a FIPS power-on or continuous test
-// fails. It prevents any further cryptographic operations by the current
-// process.
+// fails. If the library is built in FIPS mode it prevents any further
+// cryptographic operations by the current process.
 #if defined(_MSC_VER)
 __declspec(noreturn) void AWS_LC_FIPS_failure(const char* message);
 #else
@@ -1330,17 +1330,16 @@ OPENSSL_INLINE void boringssl_ensure_ml_dsa_self_test(void) {}
 OPENSSL_INLINE void boringssl_ensure_eddsa_self_test(void) {}
 OPENSSL_INLINE void boringssl_ensure_hasheddsa_self_test(void) {}
 
+// Outside of FIPS mode AWS_LC_FIPS_failure simply logs the message to stderr
+void AWS_LC_FIPS_failure(const char* message);
+
 #endif  // FIPS
 
-// boringssl_self_test_sha256 performs a SHA-256 KAT, |call_aws_lc_fips_failure|
-// determines if error messages should be printed to |stderr| call
-// |AWS_LC_FIPS_failure| with the message.
-int boringssl_self_test_sha256(const bool call_aws_lc_fips_failure);
+// boringssl_self_test_sha256 performs a SHA-256 KAT
+int boringssl_self_test_sha256(void);
 
-  // boringssl_self_test_hmac_sha256 performs an HMAC-SHA-256 KAT,
-  // |call_aws_lc_fips_failure| determines if error messages should be printed
-  // to |stderr| or call |AWS_LC_FIPS_failure| with the message.
-int boringssl_self_test_hmac_sha256(const bool call_aws_lc_fips_failure);
+  // boringssl_self_test_hmac_sha256 performs an HMAC-SHA-256 KAT
+int boringssl_self_test_hmac_sha256(void);
 
 #if defined(BORINGSSL_FIPS_COUNTERS)
 void boringssl_fips_inc_counter(enum fips_counter_t counter);
diff --git a/fuzz/pkcs8_corpus/002b08323cff0388fbf6d48f166e2abf3df42920 b/fuzz/pkcs8_corpus/002b08323cff0388fbf6d48f166e2abf3df42920
new file mode 100644
index 0000000000..9567e82024
Binary files /dev/null and b/fuzz/pkcs8_corpus/002b08323cff0388fbf6d48f166e2abf3df42920 differ
diff --git a/fuzz/pkcs8_corpus/0092f5eb2634925b4339a4e129616efb5e9abdce b/fuzz/pkcs8_corpus/0092f5eb2634925b4339a4e129616efb5e9abdce
deleted file mode 100644
index ff2c3a5d16..0000000000
--- a/fuzz/pkcs8_corpus/0092f5eb2634925b4339a4e129616efb5e9abdce
+++ /dev/null
@@ -1 +0,0 @@
-0

\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/00c89b61f80cd2dd479044f38eb60ffc5a73b42e b/fuzz/pkcs8_corpus/00c89b61f80cd2dd479044f38eb60ffc5a73b42e
new file mode 100644
index 0000000000..135b064cc5
Binary files /dev/null and b/fuzz/pkcs8_corpus/00c89b61f80cd2dd479044f38eb60ffc5a73b42e differ
diff --git a/fuzz/pkcs8_corpus/01c9bcb8017504c39e0b9d5ee58726b4637fc172 b/fuzz/pkcs8_corpus/01c9bcb8017504c39e0b9d5ee58726b4637fc172
deleted file mode 100644
index d2ec381f83..0000000000
Binary files a/fuzz/pkcs8_corpus/01c9bcb8017504c39e0b9d5ee58726b4637fc172 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/01d2ab60b1329f0982839b490605e00f9db98baa b/fuzz/pkcs8_corpus/01d2ab60b1329f0982839b490605e00f9db98baa
new file mode 100644
index 0000000000..8a87f5fdc3
Binary files /dev/null and b/fuzz/pkcs8_corpus/01d2ab60b1329f0982839b490605e00f9db98baa differ
diff --git a/fuzz/pkcs8_corpus/030bd8935e1f4f5f93d9611d88b21f3e15e1e9eb b/fuzz/pkcs8_corpus/030bd8935e1f4f5f93d9611d88b21f3e15e1e9eb
new file mode 100644
index 0000000000..0d34df13ee
Binary files /dev/null and b/fuzz/pkcs8_corpus/030bd8935e1f4f5f93d9611d88b21f3e15e1e9eb differ
diff --git a/fuzz/pkcs8_corpus/032a005f840d212025184f0b6cf5b47206d27d20 b/fuzz/pkcs8_corpus/032a005f840d212025184f0b6cf5b47206d27d20
new file mode 100644
index 0000000000..e862490819
Binary files /dev/null and b/fuzz/pkcs8_corpus/032a005f840d212025184f0b6cf5b47206d27d20 differ
diff --git a/fuzz/pkcs8_corpus/0380d54edcd5c9a44a383253e5f61bd30f441af7 b/fuzz/pkcs8_corpus/0380d54edcd5c9a44a383253e5f61bd30f441af7
new file mode 100644
index 0000000000..0655680811
Binary files /dev/null and b/fuzz/pkcs8_corpus/0380d54edcd5c9a44a383253e5f61bd30f441af7 differ
diff --git a/fuzz/pkcs8_corpus/04583859ffb18da3ed64b816f9937ad605f96e0b b/fuzz/pkcs8_corpus/04583859ffb18da3ed64b816f9937ad605f96e0b
new file mode 100644
index 0000000000..8f456fb664
Binary files /dev/null and b/fuzz/pkcs8_corpus/04583859ffb18da3ed64b816f9937ad605f96e0b differ
diff --git a/fuzz/pkcs8_corpus/0576016a98b3ba0a1b942a9f4432583d8be4b2c8 b/fuzz/pkcs8_corpus/0576016a98b3ba0a1b942a9f4432583d8be4b2c8
new file mode 100644
index 0000000000..10efa69e0e
Binary files /dev/null and b/fuzz/pkcs8_corpus/0576016a98b3ba0a1b942a9f4432583d8be4b2c8 differ
diff --git a/fuzz/pkcs8_corpus/063a979ac61f217fad635449d982316ce3409985 b/fuzz/pkcs8_corpus/063a979ac61f217fad635449d982316ce3409985
new file mode 100644
index 0000000000..9498010e9a
Binary files /dev/null and b/fuzz/pkcs8_corpus/063a979ac61f217fad635449d982316ce3409985 differ
diff --git a/fuzz/pkcs8_corpus/07b32b9049afc2692c5557a841194e12381124ff b/fuzz/pkcs8_corpus/07b32b9049afc2692c5557a841194e12381124ff
new file mode 100644
index 0000000000..e44d491bc4
Binary files /dev/null and b/fuzz/pkcs8_corpus/07b32b9049afc2692c5557a841194e12381124ff differ
diff --git a/fuzz/pkcs8_corpus/07d64fd618ea79de629e063f561964e3e00c2fe6 b/fuzz/pkcs8_corpus/07d64fd618ea79de629e063f561964e3e00c2fe6
new file mode 100644
index 0000000000..475ff4b14a
Binary files /dev/null and b/fuzz/pkcs8_corpus/07d64fd618ea79de629e063f561964e3e00c2fe6 differ
diff --git a/fuzz/pkcs8_corpus/089d5aa6c68409cba05ea4ed94e5d505f037e232 b/fuzz/pkcs8_corpus/089d5aa6c68409cba05ea4ed94e5d505f037e232
new file mode 100644
index 0000000000..01a53f1900
Binary files /dev/null and b/fuzz/pkcs8_corpus/089d5aa6c68409cba05ea4ed94e5d505f037e232 differ
diff --git a/fuzz/pkcs8_corpus/08aeec77173f2505bdc22116f88264fd1c87f97b b/fuzz/pkcs8_corpus/08aeec77173f2505bdc22116f88264fd1c87f97b
new file mode 100644
index 0000000000..d03fde0c98
Binary files /dev/null and b/fuzz/pkcs8_corpus/08aeec77173f2505bdc22116f88264fd1c87f97b differ
diff --git a/fuzz/pkcs8_corpus/08b25c2e6aa385df0b1e9b9508f077fe33f7f371 b/fuzz/pkcs8_corpus/08b25c2e6aa385df0b1e9b9508f077fe33f7f371
deleted file mode 100644
index 31a59d67b0..0000000000
Binary files a/fuzz/pkcs8_corpus/08b25c2e6aa385df0b1e9b9508f077fe33f7f371 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/0a2d5e0e606a523614c3deebe460e88746f9e948 b/fuzz/pkcs8_corpus/0a2d5e0e606a523614c3deebe460e88746f9e948
deleted file mode 100644
index fbee221eba..0000000000
Binary files a/fuzz/pkcs8_corpus/0a2d5e0e606a523614c3deebe460e88746f9e948 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/0bb51312291a826e1d728e7332d8ac8a923461ad b/fuzz/pkcs8_corpus/0bb51312291a826e1d728e7332d8ac8a923461ad
new file mode 100644
index 0000000000..fae69ec4dc
Binary files /dev/null and b/fuzz/pkcs8_corpus/0bb51312291a826e1d728e7332d8ac8a923461ad differ
diff --git a/fuzz/pkcs8_corpus/0d1d667630de07cf1c43786c33cb4715caea83d2 b/fuzz/pkcs8_corpus/0d1d667630de07cf1c43786c33cb4715caea83d2
deleted file mode 100644
index 6f0eb6a30b..0000000000
Binary files a/fuzz/pkcs8_corpus/0d1d667630de07cf1c43786c33cb4715caea83d2 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/0d9d7f3a9aeb5e633c0db27806fd0250a5cd8ebe b/fuzz/pkcs8_corpus/0d9d7f3a9aeb5e633c0db27806fd0250a5cd8ebe
new file mode 100644
index 0000000000..5bbd6d9ec6
Binary files /dev/null and b/fuzz/pkcs8_corpus/0d9d7f3a9aeb5e633c0db27806fd0250a5cd8ebe differ
diff --git a/fuzz/pkcs8_corpus/0ea75e9a074eec9890e5fe6e287c13c0f8a4c243 b/fuzz/pkcs8_corpus/0ea75e9a074eec9890e5fe6e287c13c0f8a4c243
deleted file mode 100644
index 866b54cdd2..0000000000
Binary files a/fuzz/pkcs8_corpus/0ea75e9a074eec9890e5fe6e287c13c0f8a4c243 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/0f79dd9629f28ff9592b49f87471ad90d0bfac3e b/fuzz/pkcs8_corpus/0f79dd9629f28ff9592b49f87471ad90d0bfac3e
new file mode 100644
index 0000000000..74bcac928c
Binary files /dev/null and b/fuzz/pkcs8_corpus/0f79dd9629f28ff9592b49f87471ad90d0bfac3e differ
diff --git a/fuzz/pkcs8_corpus/0f82964ff2cd1a76449301c5f9ea81dec548f96e b/fuzz/pkcs8_corpus/0f82964ff2cd1a76449301c5f9ea81dec548f96e
deleted file mode 100644
index 372d58b656..0000000000
Binary files a/fuzz/pkcs8_corpus/0f82964ff2cd1a76449301c5f9ea81dec548f96e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/0fa0cdbbdc04f868e9a0525f547a7fe132829035 b/fuzz/pkcs8_corpus/0fa0cdbbdc04f868e9a0525f547a7fe132829035
new file mode 100644
index 0000000000..5328b0bff2
Binary files /dev/null and b/fuzz/pkcs8_corpus/0fa0cdbbdc04f868e9a0525f547a7fe132829035 differ
diff --git a/fuzz/pkcs8_corpus/0fbeed7e299f7bcfdf97baa1d4c0a7c2bb251e65 b/fuzz/pkcs8_corpus/0fbeed7e299f7bcfdf97baa1d4c0a7c2bb251e65
new file mode 100644
index 0000000000..4e8d43b834
Binary files /dev/null and b/fuzz/pkcs8_corpus/0fbeed7e299f7bcfdf97baa1d4c0a7c2bb251e65 differ
diff --git a/fuzz/pkcs8_corpus/0fe72a4f3df1e427e2d19810a143695a2414012b b/fuzz/pkcs8_corpus/0fe72a4f3df1e427e2d19810a143695a2414012b
new file mode 100644
index 0000000000..0156079b5e
Binary files /dev/null and b/fuzz/pkcs8_corpus/0fe72a4f3df1e427e2d19810a143695a2414012b differ
diff --git a/fuzz/pkcs8_corpus/101a7ea1b57cc42bb11fc95de71374775a17000e b/fuzz/pkcs8_corpus/101a7ea1b57cc42bb11fc95de71374775a17000e
deleted file mode 100644
index 968c300772..0000000000
Binary files a/fuzz/pkcs8_corpus/101a7ea1b57cc42bb11fc95de71374775a17000e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/10398cc847ef28dd70fd4fb1009e0dc98cc84188 b/fuzz/pkcs8_corpus/10398cc847ef28dd70fd4fb1009e0dc98cc84188
new file mode 100644
index 0000000000..59e5f485ef
Binary files /dev/null and b/fuzz/pkcs8_corpus/10398cc847ef28dd70fd4fb1009e0dc98cc84188 differ
diff --git a/fuzz/pkcs8_corpus/12e525ce4a95f38e1086ef08ec20f35843f174aa b/fuzz/pkcs8_corpus/12e525ce4a95f38e1086ef08ec20f35843f174aa
new file mode 100644
index 0000000000..b79f4de5c8
Binary files /dev/null and b/fuzz/pkcs8_corpus/12e525ce4a95f38e1086ef08ec20f35843f174aa differ
diff --git a/fuzz/pkcs8_corpus/13032cf18840b849e5240212d9502c91996a594b b/fuzz/pkcs8_corpus/13032cf18840b849e5240212d9502c91996a594b
new file mode 100644
index 0000000000..634e14fed3
Binary files /dev/null and b/fuzz/pkcs8_corpus/13032cf18840b849e5240212d9502c91996a594b differ
diff --git a/fuzz/pkcs8_corpus/1353c943a50134e0573221d43cece07955279941 b/fuzz/pkcs8_corpus/1353c943a50134e0573221d43cece07955279941
new file mode 100644
index 0000000000..411d4e412a
--- /dev/null
+++ b/fuzz/pkcs8_corpus/1353c943a50134e0573221d43cece07955279941
@@ -0,0 +1 @@
+0ÿ*
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/1456bb35cd78a777969a6b0b88a87802de985bf1 b/fuzz/pkcs8_corpus/1456bb35cd78a777969a6b0b88a87802de985bf1
new file mode 100644
index 0000000000..69a3a22a40
Binary files /dev/null and b/fuzz/pkcs8_corpus/1456bb35cd78a777969a6b0b88a87802de985bf1 differ
diff --git a/fuzz/pkcs8_corpus/1531eaec4e0b351560ea9cd8e00ea8053505974a b/fuzz/pkcs8_corpus/1531eaec4e0b351560ea9cd8e00ea8053505974a
new file mode 100644
index 0000000000..c2bb4d71c2
Binary files /dev/null and b/fuzz/pkcs8_corpus/1531eaec4e0b351560ea9cd8e00ea8053505974a differ
diff --git a/fuzz/pkcs8_corpus/1539aebed585bb66906f5d9bdd20553a45f63e9d b/fuzz/pkcs8_corpus/1539aebed585bb66906f5d9bdd20553a45f63e9d
deleted file mode 100644
index 493d155f2e..0000000000
Binary files a/fuzz/pkcs8_corpus/1539aebed585bb66906f5d9bdd20553a45f63e9d and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/1573c3c2f22587aa62f5efe37c48af1f06aca8a5 b/fuzz/pkcs8_corpus/1573c3c2f22587aa62f5efe37c48af1f06aca8a5
new file mode 100644
index 0000000000..fd6fa42374
Binary files /dev/null and b/fuzz/pkcs8_corpus/1573c3c2f22587aa62f5efe37c48af1f06aca8a5 differ
diff --git a/fuzz/pkcs8_corpus/15a72c0a37fa13f5f25632a00d6c4295705c44f5 b/fuzz/pkcs8_corpus/15a72c0a37fa13f5f25632a00d6c4295705c44f5
new file mode 100644
index 0000000000..a240dea70b
Binary files /dev/null and b/fuzz/pkcs8_corpus/15a72c0a37fa13f5f25632a00d6c4295705c44f5 differ
diff --git a/fuzz/pkcs8_corpus/16fefc95506572f3fe0ee6628842c85c58e84423 b/fuzz/pkcs8_corpus/16fefc95506572f3fe0ee6628842c85c58e84423
new file mode 100644
index 0000000000..ece91188cb
Binary files /dev/null and b/fuzz/pkcs8_corpus/16fefc95506572f3fe0ee6628842c85c58e84423 differ
diff --git a/fuzz/pkcs8_corpus/174d72383d56a78aa2e310865cdef3d933e41df9 b/fuzz/pkcs8_corpus/174d72383d56a78aa2e310865cdef3d933e41df9
deleted file mode 100644
index a34500f887..0000000000
Binary files a/fuzz/pkcs8_corpus/174d72383d56a78aa2e310865cdef3d933e41df9 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/17bf5bbc08ecaef1c6fc1784e1d106016205ec94 b/fuzz/pkcs8_corpus/17bf5bbc08ecaef1c6fc1784e1d106016205ec94
deleted file mode 100644
index d2414ee3ee..0000000000
Binary files a/fuzz/pkcs8_corpus/17bf5bbc08ecaef1c6fc1784e1d106016205ec94 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/17c55ee09d4975c9d1dd1c1abfe866211faf942e b/fuzz/pkcs8_corpus/17c55ee09d4975c9d1dd1c1abfe866211faf942e
new file mode 100644
index 0000000000..1d2d51144c
Binary files /dev/null and b/fuzz/pkcs8_corpus/17c55ee09d4975c9d1dd1c1abfe866211faf942e differ
diff --git a/fuzz/pkcs8_corpus/18e154c9f6e98bce06ec8f6129d39e6b62004188 b/fuzz/pkcs8_corpus/18e154c9f6e98bce06ec8f6129d39e6b62004188
new file mode 100644
index 0000000000..7dde2a4d59
Binary files /dev/null and b/fuzz/pkcs8_corpus/18e154c9f6e98bce06ec8f6129d39e6b62004188 differ
diff --git a/fuzz/pkcs8_corpus/19d1cb7cfc31e8d66242b8b82c334833345399ef b/fuzz/pkcs8_corpus/19d1cb7cfc31e8d66242b8b82c334833345399ef
new file mode 100644
index 0000000000..8efc57308e
Binary files /dev/null and b/fuzz/pkcs8_corpus/19d1cb7cfc31e8d66242b8b82c334833345399ef differ
diff --git a/fuzz/pkcs8_corpus/1a672d08f000242c231d85ef8ea43aaf1ea40d3c b/fuzz/pkcs8_corpus/1a672d08f000242c231d85ef8ea43aaf1ea40d3c
deleted file mode 100644
index 6619e72951..0000000000
Binary files a/fuzz/pkcs8_corpus/1a672d08f000242c231d85ef8ea43aaf1ea40d3c and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/1bf984781217bf01c62db4c791fcddf3e24ee281 b/fuzz/pkcs8_corpus/1bf984781217bf01c62db4c791fcddf3e24ee281
new file mode 100644
index 0000000000..1bb5c088fc
Binary files /dev/null and b/fuzz/pkcs8_corpus/1bf984781217bf01c62db4c791fcddf3e24ee281 differ
diff --git a/fuzz/pkcs8_corpus/1deca77ce89223a4eb095d225a89b720d028e32e b/fuzz/pkcs8_corpus/1deca77ce89223a4eb095d225a89b720d028e32e
new file mode 100644
index 0000000000..8487a23a3f
Binary files /dev/null and b/fuzz/pkcs8_corpus/1deca77ce89223a4eb095d225a89b720d028e32e differ
diff --git a/fuzz/pkcs8_corpus/1ebe2311af5b758396a47f5b3221d281cf70850c b/fuzz/pkcs8_corpus/1ebe2311af5b758396a47f5b3221d281cf70850c
deleted file mode 100644
index b2ac4543ea..0000000000
Binary files a/fuzz/pkcs8_corpus/1ebe2311af5b758396a47f5b3221d281cf70850c and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/1f75c01ea06a09157c5f1564bc471e83e69dcbaf b/fuzz/pkcs8_corpus/1f75c01ea06a09157c5f1564bc471e83e69dcbaf
new file mode 100644
index 0000000000..264247e5cd
Binary files /dev/null and b/fuzz/pkcs8_corpus/1f75c01ea06a09157c5f1564bc471e83e69dcbaf differ
diff --git a/fuzz/pkcs8_corpus/b120677592bffdb3c2e2e53bfc424a9e48297aa5 b/fuzz/pkcs8_corpus/1fc6f7287b928711f4e070ad8b963a580e9ec121
similarity index 73%
rename from fuzz/pkcs8_corpus/b120677592bffdb3c2e2e53bfc424a9e48297aa5
rename to fuzz/pkcs8_corpus/1fc6f7287b928711f4e070ad8b963a580e9ec121
index e5895e9b8a..442e0280c3 100644
Binary files a/fuzz/pkcs8_corpus/b120677592bffdb3c2e2e53bfc424a9e48297aa5 and b/fuzz/pkcs8_corpus/1fc6f7287b928711f4e070ad8b963a580e9ec121 differ
diff --git a/fuzz/pkcs8_corpus/205d46979bd9fccd491d44b67cafcc8dafa0485b b/fuzz/pkcs8_corpus/205d46979bd9fccd491d44b67cafcc8dafa0485b
new file mode 100644
index 0000000000..7a8530e43b
Binary files /dev/null and b/fuzz/pkcs8_corpus/205d46979bd9fccd491d44b67cafcc8dafa0485b differ
diff --git a/fuzz/pkcs8_corpus/20d1337273c43bafec4be1df91e655a848f28ccd b/fuzz/pkcs8_corpus/20d1337273c43bafec4be1df91e655a848f28ccd
new file mode 100644
index 0000000000..f83fb2e023
Binary files /dev/null and b/fuzz/pkcs8_corpus/20d1337273c43bafec4be1df91e655a848f28ccd differ
diff --git a/fuzz/pkcs8_corpus/20dc70bada5cbcc9d819b2eaa410fbce746c560d b/fuzz/pkcs8_corpus/20dc70bada5cbcc9d819b2eaa410fbce746c560d
new file mode 100644
index 0000000000..cf72b4d8ce
Binary files /dev/null and b/fuzz/pkcs8_corpus/20dc70bada5cbcc9d819b2eaa410fbce746c560d differ
diff --git a/fuzz/pkcs8_corpus/20e77aa6747870beabd37125191369b1c82d03a1 b/fuzz/pkcs8_corpus/20e77aa6747870beabd37125191369b1c82d03a1
new file mode 100644
index 0000000000..e4e22baac0
Binary files /dev/null and b/fuzz/pkcs8_corpus/20e77aa6747870beabd37125191369b1c82d03a1 differ
diff --git a/fuzz/pkcs8_corpus/214ba563bf26e2a36b1541a0b44c6b7a4b306818 b/fuzz/pkcs8_corpus/214ba563bf26e2a36b1541a0b44c6b7a4b306818
deleted file mode 100644
index 86a6a0bb2e..0000000000
Binary files a/fuzz/pkcs8_corpus/214ba563bf26e2a36b1541a0b44c6b7a4b306818 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/21706bba66061eeaa1c05090e79d301c5c685cc4 b/fuzz/pkcs8_corpus/21706bba66061eeaa1c05090e79d301c5c685cc4
new file mode 100644
index 0000000000..6b24b6eec1
Binary files /dev/null and b/fuzz/pkcs8_corpus/21706bba66061eeaa1c05090e79d301c5c685cc4 differ
diff --git a/fuzz/pkcs8_corpus/22a026352cd5dea75177321bdd8dd1cba997cfcf b/fuzz/pkcs8_corpus/22a026352cd5dea75177321bdd8dd1cba997cfcf
deleted file mode 100644
index 08284b7140..0000000000
Binary files a/fuzz/pkcs8_corpus/22a026352cd5dea75177321bdd8dd1cba997cfcf and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/236c1f025ebe27d17c7e01927ddcc5b49b153605 b/fuzz/pkcs8_corpus/236c1f025ebe27d17c7e01927ddcc5b49b153605
new file mode 100644
index 0000000000..d14d4f2538
--- /dev/null
+++ b/fuzz/pkcs8_corpus/236c1f025ebe27d17c7e01927ddcc5b49b153605
@@ -0,0 +1 @@
+0*�ÿ
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/23f1e0687b121d8aaafc63f3dd8a9d496e8a851f b/fuzz/pkcs8_corpus/23f1e0687b121d8aaafc63f3dd8a9d496e8a851f
new file mode 100644
index 0000000000..034c63a109
Binary files /dev/null and b/fuzz/pkcs8_corpus/23f1e0687b121d8aaafc63f3dd8a9d496e8a851f differ
diff --git a/fuzz/pkcs8_corpus/23f3ef78cf48fb33b72fe8f36486ebbbcfb461c2 b/fuzz/pkcs8_corpus/23f3ef78cf48fb33b72fe8f36486ebbbcfb461c2
deleted file mode 100644
index 06aaf09006..0000000000
Binary files a/fuzz/pkcs8_corpus/23f3ef78cf48fb33b72fe8f36486ebbbcfb461c2 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/24889c30903206fc8b17c6e3cf374fe1a5c1ef16 b/fuzz/pkcs8_corpus/24889c30903206fc8b17c6e3cf374fe1a5c1ef16
new file mode 100644
index 0000000000..c773ad4281
Binary files /dev/null and b/fuzz/pkcs8_corpus/24889c30903206fc8b17c6e3cf374fe1a5c1ef16 differ
diff --git a/fuzz/pkcs8_corpus/2575b0ff0d65f0fa013ff8f5b1c0fb46714eb211 b/fuzz/pkcs8_corpus/2575b0ff0d65f0fa013ff8f5b1c0fb46714eb211
new file mode 100644
index 0000000000..7230b8b88f
Binary files /dev/null and b/fuzz/pkcs8_corpus/2575b0ff0d65f0fa013ff8f5b1c0fb46714eb211 differ
diff --git a/fuzz/pkcs8_corpus/269720d83a1fbad4f6ad06bfa42a9c0802ba18e1 b/fuzz/pkcs8_corpus/269720d83a1fbad4f6ad06bfa42a9c0802ba18e1
new file mode 100644
index 0000000000..d02ed44db1
Binary files /dev/null and b/fuzz/pkcs8_corpus/269720d83a1fbad4f6ad06bfa42a9c0802ba18e1 differ
diff --git a/fuzz/pkcs8_corpus/28573fef423109d4e96abe84d2ff924f34129b22 b/fuzz/pkcs8_corpus/28573fef423109d4e96abe84d2ff924f34129b22
new file mode 100644
index 0000000000..688fd58aa6
Binary files /dev/null and b/fuzz/pkcs8_corpus/28573fef423109d4e96abe84d2ff924f34129b22 differ
diff --git a/fuzz/pkcs8_corpus/290996559961e9c9da51f44abc9ac70de601e885 b/fuzz/pkcs8_corpus/290996559961e9c9da51f44abc9ac70de601e885
new file mode 100644
index 0000000000..6b968761d9
Binary files /dev/null and b/fuzz/pkcs8_corpus/290996559961e9c9da51f44abc9ac70de601e885 differ
diff --git a/fuzz/pkcs8_corpus/29332af7489e72d38c3fb078d1ad78ae03ebdc84 b/fuzz/pkcs8_corpus/29332af7489e72d38c3fb078d1ad78ae03ebdc84
new file mode 100644
index 0000000000..3a67603e12
Binary files /dev/null and b/fuzz/pkcs8_corpus/29332af7489e72d38c3fb078d1ad78ae03ebdc84 differ
diff --git a/fuzz/pkcs8_corpus/2b9f1f341adf4947264a9443e8304f27bbed93a1 b/fuzz/pkcs8_corpus/2b9f1f341adf4947264a9443e8304f27bbed93a1
new file mode 100644
index 0000000000..d2990cf745
Binary files /dev/null and b/fuzz/pkcs8_corpus/2b9f1f341adf4947264a9443e8304f27bbed93a1 differ
diff --git a/fuzz/pkcs8_corpus/2bda17cdd8ab0070d36cb5f021706a84a326b7df b/fuzz/pkcs8_corpus/2bda17cdd8ab0070d36cb5f021706a84a326b7df
new file mode 100644
index 0000000000..21d887c078
Binary files /dev/null and b/fuzz/pkcs8_corpus/2bda17cdd8ab0070d36cb5f021706a84a326b7df differ
diff --git a/fuzz/pkcs8_corpus/2c98bcd4bfe34f32cc30f7dac676f2879ac6dfbb b/fuzz/pkcs8_corpus/2c98bcd4bfe34f32cc30f7dac676f2879ac6dfbb
new file mode 100644
index 0000000000..0be24cfeec
Binary files /dev/null and b/fuzz/pkcs8_corpus/2c98bcd4bfe34f32cc30f7dac676f2879ac6dfbb differ
diff --git a/fuzz/pkcs8_corpus/3135c9de2427cabeae6552bc0ab09ef7e285a164 b/fuzz/pkcs8_corpus/2cc666dd49c60c0605b2b4ea599f95b09c4d2490
similarity index 80%
rename from fuzz/pkcs8_corpus/3135c9de2427cabeae6552bc0ab09ef7e285a164
rename to fuzz/pkcs8_corpus/2cc666dd49c60c0605b2b4ea599f95b09c4d2490
index 57fa35ae19..37c681609a 100644
Binary files a/fuzz/pkcs8_corpus/3135c9de2427cabeae6552bc0ab09ef7e285a164 and b/fuzz/pkcs8_corpus/2cc666dd49c60c0605b2b4ea599f95b09c4d2490 differ
diff --git a/fuzz/pkcs8_corpus/2d14ab97cc3dc294c51c0d6814f4ea45f4b4e312 b/fuzz/pkcs8_corpus/2d14ab97cc3dc294c51c0d6814f4ea45f4b4e312
deleted file mode 100644
index 1c8a0e7976..0000000000
--- a/fuzz/pkcs8_corpus/2d14ab97cc3dc294c51c0d6814f4ea45f4b4e312
+++ /dev/null
@@ -1 +0,0 @@
-;
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/2d2173401415fec77bf4b80973c7a157f0399c61 b/fuzz/pkcs8_corpus/2d2173401415fec77bf4b80973c7a157f0399c61
deleted file mode 100644
index 1fb78bb65c..0000000000
Binary files a/fuzz/pkcs8_corpus/2d2173401415fec77bf4b80973c7a157f0399c61 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/2e6c3880d529bc7e703fd5d1680fe5394cd09eb6 b/fuzz/pkcs8_corpus/2e6c3880d529bc7e703fd5d1680fe5394cd09eb6
new file mode 100644
index 0000000000..35f391349b
Binary files /dev/null and b/fuzz/pkcs8_corpus/2e6c3880d529bc7e703fd5d1680fe5394cd09eb6 differ
diff --git a/fuzz/pkcs8_corpus/2e6f289fccb8525dc256b39406df4953ab34a557 b/fuzz/pkcs8_corpus/2e6f289fccb8525dc256b39406df4953ab34a557
new file mode 100644
index 0000000000..5122e1a232
Binary files /dev/null and b/fuzz/pkcs8_corpus/2e6f289fccb8525dc256b39406df4953ab34a557 differ
diff --git a/fuzz/pkcs8_corpus/2ea33427750fbe9c68a2e4464543b67fb9aa7a88 b/fuzz/pkcs8_corpus/2ea33427750fbe9c68a2e4464543b67fb9aa7a88
new file mode 100644
index 0000000000..84bb738cdd
Binary files /dev/null and b/fuzz/pkcs8_corpus/2ea33427750fbe9c68a2e4464543b67fb9aa7a88 differ
diff --git a/fuzz/pkcs8_corpus/2ef017eda7c1086a0ebfef036325682a5a61dfc1 b/fuzz/pkcs8_corpus/2ef017eda7c1086a0ebfef036325682a5a61dfc1
deleted file mode 100644
index c511a04b0c..0000000000
Binary files a/fuzz/pkcs8_corpus/2ef017eda7c1086a0ebfef036325682a5a61dfc1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/2f25567b8b2fd855ca6a6ace4acfbaee457dfc6a b/fuzz/pkcs8_corpus/2f25567b8b2fd855ca6a6ace4acfbaee457dfc6a
new file mode 100644
index 0000000000..3d4f2d2652
Binary files /dev/null and b/fuzz/pkcs8_corpus/2f25567b8b2fd855ca6a6ace4acfbaee457dfc6a differ
diff --git a/fuzz/pkcs8_corpus/2f2f7efb04d2e62cdc86744c0e8cd42eb376abbb b/fuzz/pkcs8_corpus/2f2f7efb04d2e62cdc86744c0e8cd42eb376abbb
new file mode 100644
index 0000000000..576629540f
Binary files /dev/null and b/fuzz/pkcs8_corpus/2f2f7efb04d2e62cdc86744c0e8cd42eb376abbb differ
diff --git a/fuzz/pkcs8_corpus/300687683ea030a2cd0b7e99b4a1e0bade278d5b b/fuzz/pkcs8_corpus/300687683ea030a2cd0b7e99b4a1e0bade278d5b
deleted file mode 100644
index 82f5b3195b..0000000000
Binary files a/fuzz/pkcs8_corpus/300687683ea030a2cd0b7e99b4a1e0bade278d5b and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/308c88edc3f1a04eafe04bfce13294f62a71519c b/fuzz/pkcs8_corpus/308c88edc3f1a04eafe04bfce13294f62a71519c
new file mode 100644
index 0000000000..703a84a9a7
Binary files /dev/null and b/fuzz/pkcs8_corpus/308c88edc3f1a04eafe04bfce13294f62a71519c differ
diff --git a/fuzz/pkcs8_corpus/335c62fefb06d669e8047b017b150b263348130e b/fuzz/pkcs8_corpus/335c62fefb06d669e8047b017b150b263348130e
deleted file mode 100644
index c45050da10..0000000000
Binary files a/fuzz/pkcs8_corpus/335c62fefb06d669e8047b017b150b263348130e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/344a7b9e4008e7b79a5a1637671d6cdbe3a185b1 b/fuzz/pkcs8_corpus/344a7b9e4008e7b79a5a1637671d6cdbe3a185b1
new file mode 100644
index 0000000000..a9c2c38218
Binary files /dev/null and b/fuzz/pkcs8_corpus/344a7b9e4008e7b79a5a1637671d6cdbe3a185b1 differ
diff --git a/fuzz/pkcs8_corpus/351df8cd2cff3f1d57b43623689ece9d63bec010 b/fuzz/pkcs8_corpus/351df8cd2cff3f1d57b43623689ece9d63bec010
new file mode 100644
index 0000000000..862c783ef1
Binary files /dev/null and b/fuzz/pkcs8_corpus/351df8cd2cff3f1d57b43623689ece9d63bec010 differ
diff --git a/fuzz/pkcs8_corpus/35812ac76492fe1cb1c11ef2ed561d3eaa028a16 b/fuzz/pkcs8_corpus/35812ac76492fe1cb1c11ef2ed561d3eaa028a16
new file mode 100644
index 0000000000..b1b8bc795e
Binary files /dev/null and b/fuzz/pkcs8_corpus/35812ac76492fe1cb1c11ef2ed561d3eaa028a16 differ
diff --git a/fuzz/pkcs8_corpus/3033b336d833baef80981f40394c281c20677f53 b/fuzz/pkcs8_corpus/3633a013698c7bc440fc8d20d361595df58cc073
similarity index 90%
rename from fuzz/pkcs8_corpus/3033b336d833baef80981f40394c281c20677f53
rename to fuzz/pkcs8_corpus/3633a013698c7bc440fc8d20d361595df58cc073
index a13699c4f9..81d061f9d5 100644
Binary files a/fuzz/pkcs8_corpus/3033b336d833baef80981f40394c281c20677f53 and b/fuzz/pkcs8_corpus/3633a013698c7bc440fc8d20d361595df58cc073 differ
diff --git a/fuzz/pkcs8_corpus/36b6051a5088146dbfcdf9c17ce9d22f03a0b991 b/fuzz/pkcs8_corpus/36b6051a5088146dbfcdf9c17ce9d22f03a0b991
new file mode 100644
index 0000000000..e0e4f7427c
Binary files /dev/null and b/fuzz/pkcs8_corpus/36b6051a5088146dbfcdf9c17ce9d22f03a0b991 differ
diff --git a/fuzz/pkcs8_corpus/36cf476e8f3270c23b3f0258ece48347a6cb3bb7 b/fuzz/pkcs8_corpus/36cf476e8f3270c23b3f0258ece48347a6cb3bb7
deleted file mode 100644
index 2e11cdb9eb..0000000000
Binary files a/fuzz/pkcs8_corpus/36cf476e8f3270c23b3f0258ece48347a6cb3bb7 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/370d0ac6d75262e5b4146b748caa68bb35c09943 b/fuzz/pkcs8_corpus/370d0ac6d75262e5b4146b748caa68bb35c09943
new file mode 100644
index 0000000000..60987a006e
Binary files /dev/null and b/fuzz/pkcs8_corpus/370d0ac6d75262e5b4146b748caa68bb35c09943 differ
diff --git a/fuzz/pkcs8_corpus/3715c2f07cb9c27580156d280c7d953e40ffaa0e b/fuzz/pkcs8_corpus/3715c2f07cb9c27580156d280c7d953e40ffaa0e
new file mode 100644
index 0000000000..989f56f95c
Binary files /dev/null and b/fuzz/pkcs8_corpus/3715c2f07cb9c27580156d280c7d953e40ffaa0e differ
diff --git a/fuzz/pkcs8_corpus/3863bb2b5a7ab3f36ec15f136719f47fc6ef4170 b/fuzz/pkcs8_corpus/3863bb2b5a7ab3f36ec15f136719f47fc6ef4170
deleted file mode 100644
index 586ff63d35..0000000000
Binary files a/fuzz/pkcs8_corpus/3863bb2b5a7ab3f36ec15f136719f47fc6ef4170 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/391fb579ca925ed11110198c3844509bd8073788 b/fuzz/pkcs8_corpus/391fb579ca925ed11110198c3844509bd8073788
new file mode 100644
index 0000000000..c18704db8b
Binary files /dev/null and b/fuzz/pkcs8_corpus/391fb579ca925ed11110198c3844509bd8073788 differ
diff --git a/fuzz/pkcs8_corpus/3a47cc3fc1be0e358a5270afb34483f3b17ee055 b/fuzz/pkcs8_corpus/3a47cc3fc1be0e358a5270afb34483f3b17ee055
new file mode 100644
index 0000000000..6dc274ec41
Binary files /dev/null and b/fuzz/pkcs8_corpus/3a47cc3fc1be0e358a5270afb34483f3b17ee055 differ
diff --git a/fuzz/pkcs8_corpus/3b4a25ddd1bf680ca075a946df4f8325805ebc79 b/fuzz/pkcs8_corpus/3b4a25ddd1bf680ca075a946df4f8325805ebc79
new file mode 100644
index 0000000000..59d01e6f97
Binary files /dev/null and b/fuzz/pkcs8_corpus/3b4a25ddd1bf680ca075a946df4f8325805ebc79 differ
diff --git a/fuzz/pkcs8_corpus/3c956f9819a2c47c9f5514c8b240cd94a2c0eac2 b/fuzz/pkcs8_corpus/3c956f9819a2c47c9f5514c8b240cd94a2c0eac2
new file mode 100644
index 0000000000..3915799b19
Binary files /dev/null and b/fuzz/pkcs8_corpus/3c956f9819a2c47c9f5514c8b240cd94a2c0eac2 differ
diff --git a/fuzz/pkcs8_corpus/3ce9fbe8867b022ca83a2df79bc62b58d9ae89f0 b/fuzz/pkcs8_corpus/3ce9fbe8867b022ca83a2df79bc62b58d9ae89f0
deleted file mode 100644
index 0dd9b3dd68..0000000000
Binary files a/fuzz/pkcs8_corpus/3ce9fbe8867b022ca83a2df79bc62b58d9ae89f0 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/3d955726c0c3467d313315d9ee58d06485d0e0f0 b/fuzz/pkcs8_corpus/3d955726c0c3467d313315d9ee58d06485d0e0f0
new file mode 100644
index 0000000000..89bb7ddd3d
Binary files /dev/null and b/fuzz/pkcs8_corpus/3d955726c0c3467d313315d9ee58d06485d0e0f0 differ
diff --git a/fuzz/pkcs8_corpus/c858dc50601a2ca38398477fada3a08dc03a9aea b/fuzz/pkcs8_corpus/3e056da9f57fd8ff3b2ab0f49daafad8b7497577
similarity index 52%
rename from fuzz/pkcs8_corpus/c858dc50601a2ca38398477fada3a08dc03a9aea
rename to fuzz/pkcs8_corpus/3e056da9f57fd8ff3b2ab0f49daafad8b7497577
index 9617517fa6..692406048a 100644
Binary files a/fuzz/pkcs8_corpus/c858dc50601a2ca38398477fada3a08dc03a9aea and b/fuzz/pkcs8_corpus/3e056da9f57fd8ff3b2ab0f49daafad8b7497577 differ
diff --git a/fuzz/pkcs8_corpus/3e5fcf3479afcddab685e8db0c8e27af7ce5da7f b/fuzz/pkcs8_corpus/3e5fcf3479afcddab685e8db0c8e27af7ce5da7f
deleted file mode 100644
index de9d79da97..0000000000
Binary files a/fuzz/pkcs8_corpus/3e5fcf3479afcddab685e8db0c8e27af7ce5da7f and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/400d9e42d81b0832db778dfc03fc2d576ce03fab b/fuzz/pkcs8_corpus/400d9e42d81b0832db778dfc03fc2d576ce03fab
new file mode 100644
index 0000000000..ffbccc21d4
Binary files /dev/null and b/fuzz/pkcs8_corpus/400d9e42d81b0832db778dfc03fc2d576ce03fab differ
diff --git a/fuzz/pkcs8_corpus/40e5ba9fdfb130864bc8e49d5792d317d7b781ed b/fuzz/pkcs8_corpus/40e5ba9fdfb130864bc8e49d5792d317d7b781ed
new file mode 100644
index 0000000000..e5326caac7
Binary files /dev/null and b/fuzz/pkcs8_corpus/40e5ba9fdfb130864bc8e49d5792d317d7b781ed differ
diff --git a/fuzz/pkcs8_corpus/42646b33b50b6aa15e22733c8900716f0fe19e1d b/fuzz/pkcs8_corpus/42646b33b50b6aa15e22733c8900716f0fe19e1d
deleted file mode 100644
index 35974cd685..0000000000
Binary files a/fuzz/pkcs8_corpus/42646b33b50b6aa15e22733c8900716f0fe19e1d and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/431d1bbb6214a0d66218f26cc82229b1b4ac9eb4 b/fuzz/pkcs8_corpus/431d1bbb6214a0d66218f26cc82229b1b4ac9eb4
new file mode 100644
index 0000000000..4778a596ad
Binary files /dev/null and b/fuzz/pkcs8_corpus/431d1bbb6214a0d66218f26cc82229b1b4ac9eb4 differ
diff --git a/fuzz/pkcs8_corpus/439cca89c25eb1c72d7062116afeca0ee9a6e9be b/fuzz/pkcs8_corpus/439cca89c25eb1c72d7062116afeca0ee9a6e9be
new file mode 100644
index 0000000000..5ef37924c5
Binary files /dev/null and b/fuzz/pkcs8_corpus/439cca89c25eb1c72d7062116afeca0ee9a6e9be differ
diff --git a/fuzz/pkcs8_corpus/43d170962c711c8254508d0cb05aed5f50a7b862 b/fuzz/pkcs8_corpus/43d170962c711c8254508d0cb05aed5f50a7b862
new file mode 100644
index 0000000000..27c4545f84
Binary files /dev/null and b/fuzz/pkcs8_corpus/43d170962c711c8254508d0cb05aed5f50a7b862 differ
diff --git a/fuzz/pkcs8_corpus/43db286bddd0a6f9264ab00215ca06944f281d03 b/fuzz/pkcs8_corpus/43db286bddd0a6f9264ab00215ca06944f281d03
new file mode 100644
index 0000000000..228acdcbb7
Binary files /dev/null and b/fuzz/pkcs8_corpus/43db286bddd0a6f9264ab00215ca06944f281d03 differ
diff --git a/fuzz/pkcs8_corpus/43fa9c70558d7fa44c46ba97b99deef0b98aa9b3 b/fuzz/pkcs8_corpus/43fa9c70558d7fa44c46ba97b99deef0b98aa9b3
new file mode 100644
index 0000000000..73cdea4599
Binary files /dev/null and b/fuzz/pkcs8_corpus/43fa9c70558d7fa44c46ba97b99deef0b98aa9b3 differ
diff --git a/fuzz/pkcs8_corpus/456407b9d56a4f1a86690fdbc8c68392536686d3 b/fuzz/pkcs8_corpus/456407b9d56a4f1a86690fdbc8c68392536686d3
new file mode 100644
index 0000000000..01f98f887d
Binary files /dev/null and b/fuzz/pkcs8_corpus/456407b9d56a4f1a86690fdbc8c68392536686d3 differ
diff --git a/fuzz/pkcs8_corpus/4588adf21ccf7b61b28ad759931129a131f96fbc b/fuzz/pkcs8_corpus/4588adf21ccf7b61b28ad759931129a131f96fbc
new file mode 100644
index 0000000000..26da206b91
Binary files /dev/null and b/fuzz/pkcs8_corpus/4588adf21ccf7b61b28ad759931129a131f96fbc differ
diff --git a/fuzz/pkcs8_corpus/469fbcb8abbfdbe2ffb0f70a445a5a710d0c2a9b b/fuzz/pkcs8_corpus/469fbcb8abbfdbe2ffb0f70a445a5a710d0c2a9b
new file mode 100644
index 0000000000..b5a8168a50
Binary files /dev/null and b/fuzz/pkcs8_corpus/469fbcb8abbfdbe2ffb0f70a445a5a710d0c2a9b differ
diff --git a/fuzz/pkcs8_corpus/484272518d11bad785cf42957e0105946fdeea64 b/fuzz/pkcs8_corpus/484272518d11bad785cf42957e0105946fdeea64
deleted file mode 100644
index f78c1b0918..0000000000
Binary files a/fuzz/pkcs8_corpus/484272518d11bad785cf42957e0105946fdeea64 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/49ff206d0d9ba4ab04e4bbae31825f719de83bc4 b/fuzz/pkcs8_corpus/49ff206d0d9ba4ab04e4bbae31825f719de83bc4
deleted file mode 100644
index 57f22c6376..0000000000
Binary files a/fuzz/pkcs8_corpus/49ff206d0d9ba4ab04e4bbae31825f719de83bc4 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/4b12d9aaf0d59086f529cdf2b5eda287a56ad119 b/fuzz/pkcs8_corpus/4b12d9aaf0d59086f529cdf2b5eda287a56ad119
new file mode 100644
index 0000000000..6f89d45e3f
Binary files /dev/null and b/fuzz/pkcs8_corpus/4b12d9aaf0d59086f529cdf2b5eda287a56ad119 differ
diff --git a/fuzz/pkcs8_corpus/4b2d808c8321d9603a7f496b6ff4be4b3c5f4523 b/fuzz/pkcs8_corpus/4b2d808c8321d9603a7f496b6ff4be4b3c5f4523
deleted file mode 100644
index 831d5731b9..0000000000
--- a/fuzz/pkcs8_corpus/4b2d808c8321d9603a7f496b6ff4be4b3c5f4523
+++ /dev/null
@@ -1 +0,0 @@
-Ÿ

\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/4be5b694c6a74ca1de1b3917e8a8c9b29e0cd8b0 b/fuzz/pkcs8_corpus/4be5b694c6a74ca1de1b3917e8a8c9b29e0cd8b0
new file mode 100644
index 0000000000..0fba1951e4
Binary files /dev/null and b/fuzz/pkcs8_corpus/4be5b694c6a74ca1de1b3917e8a8c9b29e0cd8b0 differ
diff --git a/fuzz/pkcs8_corpus/4c5a8661dbfc3b341e1f5d695bccc6ef3f59785d b/fuzz/pkcs8_corpus/4c5a8661dbfc3b341e1f5d695bccc6ef3f59785d
deleted file mode 100644
index 7d3719233a..0000000000
Binary files a/fuzz/pkcs8_corpus/4c5a8661dbfc3b341e1f5d695bccc6ef3f59785d and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/5a1b88ab22c9c5d38f3f8392b03af386475aab14 b/fuzz/pkcs8_corpus/4c9f51479d68a6e770ceb1ca6d34999a45820ac7
similarity index 67%
rename from fuzz/pkcs8_corpus/5a1b88ab22c9c5d38f3f8392b03af386475aab14
rename to fuzz/pkcs8_corpus/4c9f51479d68a6e770ceb1ca6d34999a45820ac7
index 02bcf9dcf5..7aafb9f57d 100644
Binary files a/fuzz/pkcs8_corpus/5a1b88ab22c9c5d38f3f8392b03af386475aab14 and b/fuzz/pkcs8_corpus/4c9f51479d68a6e770ceb1ca6d34999a45820ac7 differ
diff --git a/fuzz/pkcs8_corpus/4d295ca5b0c1e4ae98e94a9c8c6fff0fdf92df09 b/fuzz/pkcs8_corpus/4d295ca5b0c1e4ae98e94a9c8c6fff0fdf92df09
deleted file mode 100644
index 92863e980c..0000000000
Binary files a/fuzz/pkcs8_corpus/4d295ca5b0c1e4ae98e94a9c8c6fff0fdf92df09 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/4db5fd0f96c64f54ae8d32ac2a49c9e92d2bbf88 b/fuzz/pkcs8_corpus/4db5fd0f96c64f54ae8d32ac2a49c9e92d2bbf88
new file mode 100644
index 0000000000..908c12fa32
--- /dev/null
+++ b/fuzz/pkcs8_corpus/4db5fd0f96c64f54ae8d32ac2a49c9e92d2bbf88
@@ -0,0 +1 @@
+0
¦
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/4e0a6433cea9435bfc78371807d316b39d5b44e2 b/fuzz/pkcs8_corpus/4e0a6433cea9435bfc78371807d316b39d5b44e2
deleted file mode 100644
index 61b6ce041a..0000000000
--- a/fuzz/pkcs8_corpus/4e0a6433cea9435bfc78371807d316b39d5b44e2
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/4ee33a0c35e79fd4120f7de421eecbc7a901d900 b/fuzz/pkcs8_corpus/4ee33a0c35e79fd4120f7de421eecbc7a901d900
deleted file mode 100644
index cc30b06e0f..0000000000
Binary files a/fuzz/pkcs8_corpus/4ee33a0c35e79fd4120f7de421eecbc7a901d900 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/517081933296945fb47182f87f309c22b7a1cc13 b/fuzz/pkcs8_corpus/517081933296945fb47182f87f309c22b7a1cc13
new file mode 100644
index 0000000000..efe9ce4dce
Binary files /dev/null and b/fuzz/pkcs8_corpus/517081933296945fb47182f87f309c22b7a1cc13 differ
diff --git a/fuzz/pkcs8_corpus/5351d6eb867bdcb85866e07765eaeb401d9a5104 b/fuzz/pkcs8_corpus/5351d6eb867bdcb85866e07765eaeb401d9a5104
new file mode 100644
index 0000000000..e9729b8baa
Binary files /dev/null and b/fuzz/pkcs8_corpus/5351d6eb867bdcb85866e07765eaeb401d9a5104 differ
diff --git a/fuzz/pkcs8_corpus/5375b981fcf8358030376bb4cb944fbd13704dd4 b/fuzz/pkcs8_corpus/5375b981fcf8358030376bb4cb944fbd13704dd4
deleted file mode 100644
index a5e32f3f14..0000000000
Binary files a/fuzz/pkcs8_corpus/5375b981fcf8358030376bb4cb944fbd13704dd4 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/53fc7c5b2434ad621056f352c65413688276dad2 b/fuzz/pkcs8_corpus/53fc7c5b2434ad621056f352c65413688276dad2
new file mode 100644
index 0000000000..5b5a675df5
Binary files /dev/null and b/fuzz/pkcs8_corpus/53fc7c5b2434ad621056f352c65413688276dad2 differ
diff --git a/fuzz/pkcs8_corpus/54a8db28cb4872c5ea935e36277aecb3eeafd219 b/fuzz/pkcs8_corpus/54a8db28cb4872c5ea935e36277aecb3eeafd219
deleted file mode 100644
index 190695a821..0000000000
Binary files a/fuzz/pkcs8_corpus/54a8db28cb4872c5ea935e36277aecb3eeafd219 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/55809b7479f5a29816bae245ce75de5e2bfc06e2 b/fuzz/pkcs8_corpus/55809b7479f5a29816bae245ce75de5e2bfc06e2
new file mode 100644
index 0000000000..1db1a5c3e9
Binary files /dev/null and b/fuzz/pkcs8_corpus/55809b7479f5a29816bae245ce75de5e2bfc06e2 differ
diff --git a/fuzz/pkcs8_corpus/55d8cbb6b1b54daca6af5a6f0b5222d984b14105 b/fuzz/pkcs8_corpus/55d8cbb6b1b54daca6af5a6f0b5222d984b14105
new file mode 100644
index 0000000000..3f609c7fea
Binary files /dev/null and b/fuzz/pkcs8_corpus/55d8cbb6b1b54daca6af5a6f0b5222d984b14105 differ
diff --git a/fuzz/pkcs8_corpus/56fa2e23e893a58040d8715dfb310b9104640ecc b/fuzz/pkcs8_corpus/56fa2e23e893a58040d8715dfb310b9104640ecc
new file mode 100644
index 0000000000..d87198a243
Binary files /dev/null and b/fuzz/pkcs8_corpus/56fa2e23e893a58040d8715dfb310b9104640ecc differ
diff --git a/fuzz/pkcs8_corpus/571427b0ece7937bd9e988436353a0385eff41d9 b/fuzz/pkcs8_corpus/571427b0ece7937bd9e988436353a0385eff41d9
new file mode 100644
index 0000000000..c2e7827bd7
Binary files /dev/null and b/fuzz/pkcs8_corpus/571427b0ece7937bd9e988436353a0385eff41d9 differ
diff --git a/fuzz/pkcs8_corpus/57280b718c28e6e50c41f09a80b1202cb683a381 b/fuzz/pkcs8_corpus/57280b718c28e6e50c41f09a80b1202cb683a381
new file mode 100644
index 0000000000..c22386878e
Binary files /dev/null and b/fuzz/pkcs8_corpus/57280b718c28e6e50c41f09a80b1202cb683a381 differ
diff --git a/fuzz/pkcs8_corpus/58b7837aa4a51abfd33ec0ee947accba10ad90b3 b/fuzz/pkcs8_corpus/58b7837aa4a51abfd33ec0ee947accba10ad90b3
deleted file mode 100644
index 7286f61594..0000000000
Binary files a/fuzz/pkcs8_corpus/58b7837aa4a51abfd33ec0ee947accba10ad90b3 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/58d366d0f549ebc4b844d86c8eee12d55c874e8a b/fuzz/pkcs8_corpus/58d366d0f549ebc4b844d86c8eee12d55c874e8a
new file mode 100644
index 0000000000..46bed791d4
--- /dev/null
+++ b/fuzz/pkcs8_corpus/58d366d0f549ebc4b844d86c8eee12d55c874e8a
@@ -0,0 +1 @@
+0�·
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/5a7315306d136ca3dd47aa0a39f1646531d42760 b/fuzz/pkcs8_corpus/5a7315306d136ca3dd47aa0a39f1646531d42760
new file mode 100644
index 0000000000..8e1c48426c
Binary files /dev/null and b/fuzz/pkcs8_corpus/5a7315306d136ca3dd47aa0a39f1646531d42760 differ
diff --git a/fuzz/pkcs8_corpus/5c64377f2b8b6b96d8e75a0a2beccee127236330 b/fuzz/pkcs8_corpus/5c64377f2b8b6b96d8e75a0a2beccee127236330
new file mode 100644
index 0000000000..400627b27a
Binary files /dev/null and b/fuzz/pkcs8_corpus/5c64377f2b8b6b96d8e75a0a2beccee127236330 differ
diff --git a/fuzz/pkcs8_corpus/5cca0a6c6748ce577493d9bd8bd01a6200cef82f b/fuzz/pkcs8_corpus/5cca0a6c6748ce577493d9bd8bd01a6200cef82f
new file mode 100644
index 0000000000..33321098d2
Binary files /dev/null and b/fuzz/pkcs8_corpus/5cca0a6c6748ce577493d9bd8bd01a6200cef82f differ
diff --git a/fuzz/pkcs8_corpus/5ccd4fb0a652a84e31ef5ac2acafd5a3c86b281d b/fuzz/pkcs8_corpus/5ccd4fb0a652a84e31ef5ac2acafd5a3c86b281d
new file mode 100644
index 0000000000..46c712a9f4
--- /dev/null
+++ b/fuzz/pkcs8_corpus/5ccd4fb0a652a84e31ef5ac2acafd5a3c86b281d
@@ -0,0 +1 @@
+0;
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/5df74e3f2be4cb21f83e419ba622fa3e70da48f7 b/fuzz/pkcs8_corpus/5df74e3f2be4cb21f83e419ba622fa3e70da48f7
new file mode 100644
index 0000000000..36ea7fb658
Binary files /dev/null and b/fuzz/pkcs8_corpus/5df74e3f2be4cb21f83e419ba622fa3e70da48f7 differ
diff --git a/fuzz/pkcs8_corpus/5e0f6caad5a821563267676f6355f7a71f4535d0 b/fuzz/pkcs8_corpus/5e0f6caad5a821563267676f6355f7a71f4535d0
deleted file mode 100644
index 4c1660e9f5..0000000000
Binary files a/fuzz/pkcs8_corpus/5e0f6caad5a821563267676f6355f7a71f4535d0 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/5ebb798d42b1d1aeb4c7b79588b1baa715d1ceac b/fuzz/pkcs8_corpus/5ebb798d42b1d1aeb4c7b79588b1baa715d1ceac
new file mode 100644
index 0000000000..fde8adbb05
Binary files /dev/null and b/fuzz/pkcs8_corpus/5ebb798d42b1d1aeb4c7b79588b1baa715d1ceac differ
diff --git a/fuzz/pkcs8_corpus/5ee0bd060abae559586059c7b6efd0b0ee256b05 b/fuzz/pkcs8_corpus/5ee0bd060abae559586059c7b6efd0b0ee256b05
new file mode 100644
index 0000000000..7bfa81f6fc
Binary files /dev/null and b/fuzz/pkcs8_corpus/5ee0bd060abae559586059c7b6efd0b0ee256b05 differ
diff --git a/fuzz/pkcs8_corpus/602ab19a433a73e5585407486c19a6db7cdd5997 b/fuzz/pkcs8_corpus/602ab19a433a73e5585407486c19a6db7cdd5997
new file mode 100644
index 0000000000..ae86c7b588
Binary files /dev/null and b/fuzz/pkcs8_corpus/602ab19a433a73e5585407486c19a6db7cdd5997 differ
diff --git a/fuzz/pkcs8_corpus/60d66c92e604079be02ec2dd7a41190602703c40 b/fuzz/pkcs8_corpus/60d66c92e604079be02ec2dd7a41190602703c40
new file mode 100644
index 0000000000..6ead8d5e24
Binary files /dev/null and b/fuzz/pkcs8_corpus/60d66c92e604079be02ec2dd7a41190602703c40 differ
diff --git a/fuzz/pkcs8_corpus/61ad5866df7ab89b26921a575fda8be954af85f1 b/fuzz/pkcs8_corpus/61ad5866df7ab89b26921a575fda8be954af85f1
deleted file mode 100644
index d8c497df2b..0000000000
Binary files a/fuzz/pkcs8_corpus/61ad5866df7ab89b26921a575fda8be954af85f1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/629788f4cf21115198accd849ef79acde5478d73 b/fuzz/pkcs8_corpus/629788f4cf21115198accd849ef79acde5478d73
new file mode 100644
index 0000000000..a53d51cbbb
Binary files /dev/null and b/fuzz/pkcs8_corpus/629788f4cf21115198accd849ef79acde5478d73 differ
diff --git a/fuzz/pkcs8_corpus/62f3819b8f6bf4e5f9a42883fa19bcb8ba26af06 b/fuzz/pkcs8_corpus/62f3819b8f6bf4e5f9a42883fa19bcb8ba26af06
deleted file mode 100644
index 9bf96684ec..0000000000
Binary files a/fuzz/pkcs8_corpus/62f3819b8f6bf4e5f9a42883fa19bcb8ba26af06 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/6320cc012d123720251b750d447692535df63691 b/fuzz/pkcs8_corpus/6320cc012d123720251b750d447692535df63691
new file mode 100644
index 0000000000..f51ab9b381
Binary files /dev/null and b/fuzz/pkcs8_corpus/6320cc012d123720251b750d447692535df63691 differ
diff --git a/fuzz/pkcs8_corpus/6324eb02cbf59bd4f8e180c0ed7b33f6a3d70e3d b/fuzz/pkcs8_corpus/6324eb02cbf59bd4f8e180c0ed7b33f6a3d70e3d
new file mode 100644
index 0000000000..b7a06e0dd2
Binary files /dev/null and b/fuzz/pkcs8_corpus/6324eb02cbf59bd4f8e180c0ed7b33f6a3d70e3d differ
diff --git a/fuzz/pkcs8_corpus/634f2f1e6aa86f82fa2d00d479658aa40a410129 b/fuzz/pkcs8_corpus/634f2f1e6aa86f82fa2d00d479658aa40a410129
deleted file mode 100644
index d28e3e60b5..0000000000
Binary files a/fuzz/pkcs8_corpus/634f2f1e6aa86f82fa2d00d479658aa40a410129 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/63d5a6a469f863d7842da3126fdb8512c022679b b/fuzz/pkcs8_corpus/63d5a6a469f863d7842da3126fdb8512c022679b
new file mode 100644
index 0000000000..1d7312501e
Binary files /dev/null and b/fuzz/pkcs8_corpus/63d5a6a469f863d7842da3126fdb8512c022679b differ
diff --git a/fuzz/pkcs8_corpus/63db540b41d440b544914daed6c7dad94b90aa67 b/fuzz/pkcs8_corpus/63db540b41d440b544914daed6c7dad94b90aa67
deleted file mode 100644
index 54b8cba70d..0000000000
Binary files a/fuzz/pkcs8_corpus/63db540b41d440b544914daed6c7dad94b90aa67 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/643df5be089721f481cdeac2e026fa5198f84cda b/fuzz/pkcs8_corpus/643df5be089721f481cdeac2e026fa5198f84cda
new file mode 100644
index 0000000000..157995c90a
Binary files /dev/null and b/fuzz/pkcs8_corpus/643df5be089721f481cdeac2e026fa5198f84cda differ
diff --git a/fuzz/pkcs8_corpus/6660291ab9517fcd03a19db231d02fc42f0b81a9 b/fuzz/pkcs8_corpus/6660291ab9517fcd03a19db231d02fc42f0b81a9
deleted file mode 100644
index 17d5df2ed3..0000000000
Binary files a/fuzz/pkcs8_corpus/6660291ab9517fcd03a19db231d02fc42f0b81a9 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/66b1e06660bf22834a4070e1b36a9a1cb293b9f7 b/fuzz/pkcs8_corpus/66b1e06660bf22834a4070e1b36a9a1cb293b9f7
new file mode 100644
index 0000000000..65c250d1ad
Binary files /dev/null and b/fuzz/pkcs8_corpus/66b1e06660bf22834a4070e1b36a9a1cb293b9f7 differ
diff --git a/fuzz/pkcs8_corpus/66de316f241bd8474ccff075182cbfb98042100e b/fuzz/pkcs8_corpus/66de316f241bd8474ccff075182cbfb98042100e
new file mode 100644
index 0000000000..177bed1e41
Binary files /dev/null and b/fuzz/pkcs8_corpus/66de316f241bd8474ccff075182cbfb98042100e differ
diff --git a/fuzz/pkcs8_corpus/6771a12d373ed2c5f52f952b652d3f89961eae93 b/fuzz/pkcs8_corpus/6771a12d373ed2c5f52f952b652d3f89961eae93
new file mode 100644
index 0000000000..d66cad7f7c
Binary files /dev/null and b/fuzz/pkcs8_corpus/6771a12d373ed2c5f52f952b652d3f89961eae93 differ
diff --git a/fuzz/pkcs8_corpus/6808dea038d19791d861a6e05b4e2d4c3b17ddd5 b/fuzz/pkcs8_corpus/6808dea038d19791d861a6e05b4e2d4c3b17ddd5
new file mode 100644
index 0000000000..5dde330da1
Binary files /dev/null and b/fuzz/pkcs8_corpus/6808dea038d19791d861a6e05b4e2d4c3b17ddd5 differ
diff --git a/fuzz/pkcs8_corpus/69c86351bf55fd9005cac9f752fe143730354576 b/fuzz/pkcs8_corpus/69c86351bf55fd9005cac9f752fe143730354576
new file mode 100644
index 0000000000..765a7f1bf2
Binary files /dev/null and b/fuzz/pkcs8_corpus/69c86351bf55fd9005cac9f752fe143730354576 differ
diff --git a/fuzz/pkcs8_corpus/6a121bc0b65a1fac233f59b7e22f9b700895fd32 b/fuzz/pkcs8_corpus/6a121bc0b65a1fac233f59b7e22f9b700895fd32
deleted file mode 100644
index 8213eeb952..0000000000
Binary files a/fuzz/pkcs8_corpus/6a121bc0b65a1fac233f59b7e22f9b700895fd32 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/6b835e6006e1199285568c92e1b5fe93dd4fb59d b/fuzz/pkcs8_corpus/6b835e6006e1199285568c92e1b5fe93dd4fb59d
new file mode 100644
index 0000000000..d11212881a
Binary files /dev/null and b/fuzz/pkcs8_corpus/6b835e6006e1199285568c92e1b5fe93dd4fb59d differ
diff --git a/fuzz/pkcs8_corpus/6bb86b6571a08319f2823ad3e9666d474a2db848 b/fuzz/pkcs8_corpus/6bb86b6571a08319f2823ad3e9666d474a2db848
deleted file mode 100644
index 0f0037fcb4..0000000000
Binary files a/fuzz/pkcs8_corpus/6bb86b6571a08319f2823ad3e9666d474a2db848 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/6c0298fb1b99fdf184220a9f882a9eb460192434 b/fuzz/pkcs8_corpus/6c0298fb1b99fdf184220a9f882a9eb460192434
new file mode 100644
index 0000000000..f185154bcf
Binary files /dev/null and b/fuzz/pkcs8_corpus/6c0298fb1b99fdf184220a9f882a9eb460192434 differ
diff --git a/fuzz/pkcs8_corpus/6d3072e121549a9d18aab2c2e1668a7f1f8898ef b/fuzz/pkcs8_corpus/6d3072e121549a9d18aab2c2e1668a7f1f8898ef
new file mode 100644
index 0000000000..6ab7366596
Binary files /dev/null and b/fuzz/pkcs8_corpus/6d3072e121549a9d18aab2c2e1668a7f1f8898ef differ
diff --git a/fuzz/pkcs8_corpus/6ef90d1301b04c1a17ecac665260e729e77eeaff b/fuzz/pkcs8_corpus/6ef90d1301b04c1a17ecac665260e729e77eeaff
new file mode 100644
index 0000000000..81d4a512cb
Binary files /dev/null and b/fuzz/pkcs8_corpus/6ef90d1301b04c1a17ecac665260e729e77eeaff differ
diff --git a/fuzz/pkcs8_corpus/6f95da414a7a86de0fdebbcc11e3898fe294303d b/fuzz/pkcs8_corpus/6f95da414a7a86de0fdebbcc11e3898fe294303d
new file mode 100644
index 0000000000..870a20a29a
Binary files /dev/null and b/fuzz/pkcs8_corpus/6f95da414a7a86de0fdebbcc11e3898fe294303d differ
diff --git a/fuzz/pkcs8_corpus/70093bf1aea6c169bee524e7e438f99d567b024f b/fuzz/pkcs8_corpus/70093bf1aea6c169bee524e7e438f99d567b024f
new file mode 100644
index 0000000000..77b757cbe1
Binary files /dev/null and b/fuzz/pkcs8_corpus/70093bf1aea6c169bee524e7e438f99d567b024f differ
diff --git a/fuzz/pkcs8_corpus/70404c1c557e3657e57ed465f1bfaae7900abb42 b/fuzz/pkcs8_corpus/70404c1c557e3657e57ed465f1bfaae7900abb42
new file mode 100644
index 0000000000..efdceb846d
--- /dev/null
+++ b/fuzz/pkcs8_corpus/70404c1c557e3657e57ed465f1bfaae7900abb42
@@ -0,0 +1 @@
+ÿÿÿÿÿÿÿÿÿ+
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/7058bf3c4065a18bf60fda2ef0c081f0f1877b65 b/fuzz/pkcs8_corpus/7058bf3c4065a18bf60fda2ef0c081f0f1877b65
new file mode 100644
index 0000000000..19ff1e8405
Binary files /dev/null and b/fuzz/pkcs8_corpus/7058bf3c4065a18bf60fda2ef0c081f0f1877b65 differ
diff --git a/fuzz/pkcs8_corpus/745219a42c0288e063766c123d0837c8e4655584 b/fuzz/pkcs8_corpus/745219a42c0288e063766c123d0837c8e4655584
new file mode 100644
index 0000000000..1231fec916
Binary files /dev/null and b/fuzz/pkcs8_corpus/745219a42c0288e063766c123d0837c8e4655584 differ
diff --git a/fuzz/pkcs8_corpus/74538b8e2debdefd039e5deecf742892d2fea7c1 b/fuzz/pkcs8_corpus/74538b8e2debdefd039e5deecf742892d2fea7c1
deleted file mode 100644
index c0644a742a..0000000000
Binary files a/fuzz/pkcs8_corpus/74538b8e2debdefd039e5deecf742892d2fea7c1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/748fc649057b4bed80b758a2d2b179a33feb02e1 b/fuzz/pkcs8_corpus/748fc649057b4bed80b758a2d2b179a33feb02e1
deleted file mode 100644
index fc32b5e9ff..0000000000
Binary files a/fuzz/pkcs8_corpus/748fc649057b4bed80b758a2d2b179a33feb02e1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/782db1249a29d63aa31f373fdc69d175d33da295 b/fuzz/pkcs8_corpus/782db1249a29d63aa31f373fdc69d175d33da295
deleted file mode 100644
index 6649564ffa..0000000000
Binary files a/fuzz/pkcs8_corpus/782db1249a29d63aa31f373fdc69d175d33da295 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/783ba2eba5f3b312de5ee183fa578e821c998f0d b/fuzz/pkcs8_corpus/783ba2eba5f3b312de5ee183fa578e821c998f0d
new file mode 100644
index 0000000000..5505e70d4a
Binary files /dev/null and b/fuzz/pkcs8_corpus/783ba2eba5f3b312de5ee183fa578e821c998f0d differ
diff --git a/fuzz/pkcs8_corpus/795889faf93d1bb25f85fd1352dbc5b1a2e2d3b3 b/fuzz/pkcs8_corpus/795889faf93d1bb25f85fd1352dbc5b1a2e2d3b3
new file mode 100644
index 0000000000..971eb1aeb9
Binary files /dev/null and b/fuzz/pkcs8_corpus/795889faf93d1bb25f85fd1352dbc5b1a2e2d3b3 differ
diff --git a/fuzz/pkcs8_corpus/798e43571a3ac85a4095714e95eb76b3396162a3 b/fuzz/pkcs8_corpus/798e43571a3ac85a4095714e95eb76b3396162a3
new file mode 100644
index 0000000000..aebeb3e7f0
Binary files /dev/null and b/fuzz/pkcs8_corpus/798e43571a3ac85a4095714e95eb76b3396162a3 differ
diff --git a/fuzz/pkcs8_corpus/79e0b26b5534d722ae988618cc55a56bc37e3aeb b/fuzz/pkcs8_corpus/79e0b26b5534d722ae988618cc55a56bc37e3aeb
new file mode 100644
index 0000000000..f375d24039
Binary files /dev/null and b/fuzz/pkcs8_corpus/79e0b26b5534d722ae988618cc55a56bc37e3aeb differ
diff --git a/fuzz/pkcs8_corpus/7b1074fe66485472169453a430a286dd92a6e07d b/fuzz/pkcs8_corpus/7b1074fe66485472169453a430a286dd92a6e07d
deleted file mode 100644
index 29bc77e346..0000000000
Binary files a/fuzz/pkcs8_corpus/7b1074fe66485472169453a430a286dd92a6e07d and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/7e2810290afbbfdac4447564d636506149fb5d2b b/fuzz/pkcs8_corpus/7e2810290afbbfdac4447564d636506149fb5d2b
new file mode 100644
index 0000000000..9c024937ab
Binary files /dev/null and b/fuzz/pkcs8_corpus/7e2810290afbbfdac4447564d636506149fb5d2b differ
diff --git a/fuzz/pkcs8_corpus/7e58178ded1b6a4fa81d51c868a5dd9243616307 b/fuzz/pkcs8_corpus/7e58178ded1b6a4fa81d51c868a5dd9243616307
new file mode 100644
index 0000000000..619b7380f0
Binary files /dev/null and b/fuzz/pkcs8_corpus/7e58178ded1b6a4fa81d51c868a5dd9243616307 differ
diff --git a/fuzz/pkcs8_corpus/7f783cc723941c169933826f353cef0b3c32b55a b/fuzz/pkcs8_corpus/7f783cc723941c169933826f353cef0b3c32b55a
new file mode 100644
index 0000000000..d2ef94a7fb
Binary files /dev/null and b/fuzz/pkcs8_corpus/7f783cc723941c169933826f353cef0b3c32b55a differ
diff --git a/fuzz/pkcs8_corpus/80991b8acadd33477190ebff77e4ed9de3823d65 b/fuzz/pkcs8_corpus/80991b8acadd33477190ebff77e4ed9de3823d65
new file mode 100644
index 0000000000..a9fdeb6980
Binary files /dev/null and b/fuzz/pkcs8_corpus/80991b8acadd33477190ebff77e4ed9de3823d65 differ
diff --git a/fuzz/pkcs8_corpus/819175d9d13ed1959bdfb091ca81b8b99f36d1e9 b/fuzz/pkcs8_corpus/819175d9d13ed1959bdfb091ca81b8b99f36d1e9
new file mode 100644
index 0000000000..b966aa5141
Binary files /dev/null and b/fuzz/pkcs8_corpus/819175d9d13ed1959bdfb091ca81b8b99f36d1e9 differ
diff --git a/fuzz/pkcs8_corpus/8195acee7c1c37d901e4d3876da23cf17d68dc12 b/fuzz/pkcs8_corpus/8195acee7c1c37d901e4d3876da23cf17d68dc12
new file mode 100644
index 0000000000..064d2cfd45
Binary files /dev/null and b/fuzz/pkcs8_corpus/8195acee7c1c37d901e4d3876da23cf17d68dc12 differ
diff --git a/fuzz/pkcs8_corpus/83a5831e5e468dce947df03df1ed28f19072ea48 b/fuzz/pkcs8_corpus/83a5831e5e468dce947df03df1ed28f19072ea48
new file mode 100644
index 0000000000..07e370e46f
--- /dev/null
+++ b/fuzz/pkcs8_corpus/83a5831e5e468dce947df03df1ed28f19072ea48
@@ -0,0 +1 @@
+ÿƶò
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/84ee3658bc4b650ccdb917e7019d1eb5558f76dc b/fuzz/pkcs8_corpus/84ee3658bc4b650ccdb917e7019d1eb5558f76dc
new file mode 100644
index 0000000000..f40fe63982
Binary files /dev/null and b/fuzz/pkcs8_corpus/84ee3658bc4b650ccdb917e7019d1eb5558f76dc differ
diff --git a/fuzz/pkcs8_corpus/84f13f3cb9136b803579fe53a73324661b3a7434 b/fuzz/pkcs8_corpus/84f13f3cb9136b803579fe53a73324661b3a7434
new file mode 100644
index 0000000000..9cea8e067e
Binary files /dev/null and b/fuzz/pkcs8_corpus/84f13f3cb9136b803579fe53a73324661b3a7434 differ
diff --git a/fuzz/pkcs8_corpus/857d20337458d64413ac8c91f3ab879f8a64762e b/fuzz/pkcs8_corpus/857d20337458d64413ac8c91f3ab879f8a64762e
deleted file mode 100644
index c5492a2760..0000000000
Binary files a/fuzz/pkcs8_corpus/857d20337458d64413ac8c91f3ab879f8a64762e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/862890c911ae0a3092ee47ecd8268073b2c627d3 b/fuzz/pkcs8_corpus/862890c911ae0a3092ee47ecd8268073b2c627d3
new file mode 100644
index 0000000000..fad85a2f27
Binary files /dev/null and b/fuzz/pkcs8_corpus/862890c911ae0a3092ee47ecd8268073b2c627d3 differ
diff --git a/fuzz/pkcs8_corpus/894575fdae986dc4d02d4d34db8d78c2bb6a71ce b/fuzz/pkcs8_corpus/894575fdae986dc4d02d4d34db8d78c2bb6a71ce
new file mode 100644
index 0000000000..5a5b54bcb4
Binary files /dev/null and b/fuzz/pkcs8_corpus/894575fdae986dc4d02d4d34db8d78c2bb6a71ce differ
diff --git a/fuzz/pkcs8_corpus/8c4101a44c1a2f990e1ea29fece3c5f866fe561b b/fuzz/pkcs8_corpus/8c4101a44c1a2f990e1ea29fece3c5f866fe561b
deleted file mode 100644
index 7b407dbd97..0000000000
Binary files a/fuzz/pkcs8_corpus/8c4101a44c1a2f990e1ea29fece3c5f866fe561b and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/8c54f6befd991243a9f2b4d4e8425f4595852cc1 b/fuzz/pkcs8_corpus/8c54f6befd991243a9f2b4d4e8425f4595852cc1
new file mode 100644
index 0000000000..03d1a70d16
Binary files /dev/null and b/fuzz/pkcs8_corpus/8c54f6befd991243a9f2b4d4e8425f4595852cc1 differ
diff --git a/fuzz/pkcs8_corpus/8d5be5fb2097dc95545d14811db4989513097567 b/fuzz/pkcs8_corpus/8d5be5fb2097dc95545d14811db4989513097567
new file mode 100644
index 0000000000..5219fab6e5
Binary files /dev/null and b/fuzz/pkcs8_corpus/8d5be5fb2097dc95545d14811db4989513097567 differ
diff --git a/fuzz/pkcs8_corpus/8d73d2f0eae57b003c5cf1ccd35e7ae139eab851 b/fuzz/pkcs8_corpus/8d73d2f0eae57b003c5cf1ccd35e7ae139eab851
new file mode 100644
index 0000000000..cd778768b7
Binary files /dev/null and b/fuzz/pkcs8_corpus/8d73d2f0eae57b003c5cf1ccd35e7ae139eab851 differ
diff --git a/fuzz/pkcs8_corpus/8d7af3ba61c765f1d2ef8b13488df679add88363 b/fuzz/pkcs8_corpus/8d7af3ba61c765f1d2ef8b13488df679add88363
deleted file mode 100644
index 0b1e027151..0000000000
Binary files a/fuzz/pkcs8_corpus/8d7af3ba61c765f1d2ef8b13488df679add88363 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/8d9f4f1ad6f77098042e0be83af6f63a8714a18d b/fuzz/pkcs8_corpus/8d9f4f1ad6f77098042e0be83af6f63a8714a18d
new file mode 100644
index 0000000000..1f52f4c465
--- /dev/null
+++ b/fuzz/pkcs8_corpus/8d9f4f1ad6f77098042e0be83af6f63a8714a18d
@@ -0,0 +1 @@
+ÿà
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/8e4527dc0d608e2a3c16b67502a417723ac83ca7 b/fuzz/pkcs8_corpus/8e4527dc0d608e2a3c16b67502a417723ac83ca7
new file mode 100644
index 0000000000..0938cdc7c4
Binary files /dev/null and b/fuzz/pkcs8_corpus/8e4527dc0d608e2a3c16b67502a417723ac83ca7 differ
diff --git a/fuzz/pkcs8_corpus/8fd057f87c649062ff6f24461f890a81936b56f7 b/fuzz/pkcs8_corpus/8fd057f87c649062ff6f24461f890a81936b56f7
new file mode 100644
index 0000000000..061ba2d3a6
Binary files /dev/null and b/fuzz/pkcs8_corpus/8fd057f87c649062ff6f24461f890a81936b56f7 differ
diff --git a/fuzz/pkcs8_corpus/8fe3cb80e41b9fcfaa0f1daf2c9450b1ac3b9172 b/fuzz/pkcs8_corpus/8fe3cb80e41b9fcfaa0f1daf2c9450b1ac3b9172
new file mode 100644
index 0000000000..7144b4fefe
Binary files /dev/null and b/fuzz/pkcs8_corpus/8fe3cb80e41b9fcfaa0f1daf2c9450b1ac3b9172 differ
diff --git a/fuzz/pkcs8_corpus/905447f97baefe6811ebefb34eebadddb2f4888d b/fuzz/pkcs8_corpus/905447f97baefe6811ebefb34eebadddb2f4888d
new file mode 100644
index 0000000000..acc59553f3
Binary files /dev/null and b/fuzz/pkcs8_corpus/905447f97baefe6811ebefb34eebadddb2f4888d differ
diff --git a/fuzz/pkcs8_corpus/90a19f5cb0984e78a71a360c7b2f52b3eb5143e4 b/fuzz/pkcs8_corpus/90a19f5cb0984e78a71a360c7b2f52b3eb5143e4
new file mode 100644
index 0000000000..802e267217
Binary files /dev/null and b/fuzz/pkcs8_corpus/90a19f5cb0984e78a71a360c7b2f52b3eb5143e4 differ
diff --git a/fuzz/pkcs8_corpus/90d80b0214715c2117f1db310cc56f1e87dc4775 b/fuzz/pkcs8_corpus/90d80b0214715c2117f1db310cc56f1e87dc4775
new file mode 100644
index 0000000000..e7ddd93dfa
--- /dev/null
+++ b/fuzz/pkcs8_corpus/90d80b0214715c2117f1db310cc56f1e87dc4775
@@ -0,0 +1 @@
+0


\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/918622aeb1d4aa071815f33bdad999300f6a9667 b/fuzz/pkcs8_corpus/918622aeb1d4aa071815f33bdad999300f6a9667
new file mode 100644
index 0000000000..6f5cbafa95
Binary files /dev/null and b/fuzz/pkcs8_corpus/918622aeb1d4aa071815f33bdad999300f6a9667 differ
diff --git a/fuzz/pkcs8_corpus/9195dee0b4b454b7c6cf1ca55495ec475ca0ba85 b/fuzz/pkcs8_corpus/9195dee0b4b454b7c6cf1ca55495ec475ca0ba85
new file mode 100644
index 0000000000..22da030b40
Binary files /dev/null and b/fuzz/pkcs8_corpus/9195dee0b4b454b7c6cf1ca55495ec475ca0ba85 differ
diff --git a/fuzz/pkcs8_corpus/91b3f807ca829acd36dd44b67705872ffe1f862d b/fuzz/pkcs8_corpus/91b3f807ca829acd36dd44b67705872ffe1f862d
deleted file mode 100644
index b8e570657c..0000000000
Binary files a/fuzz/pkcs8_corpus/91b3f807ca829acd36dd44b67705872ffe1f862d and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/91cdf885a7c87b57f100c31ae0f8136d62fc5297 b/fuzz/pkcs8_corpus/91cdf885a7c87b57f100c31ae0f8136d62fc5297
new file mode 100644
index 0000000000..20ddf41a60
Binary files /dev/null and b/fuzz/pkcs8_corpus/91cdf885a7c87b57f100c31ae0f8136d62fc5297 differ
diff --git a/fuzz/pkcs8_corpus/92b113de6be163ccade0f97dc04bc04b0c9e8ac2 b/fuzz/pkcs8_corpus/92b113de6be163ccade0f97dc04bc04b0c9e8ac2
new file mode 100644
index 0000000000..8137379ba9
Binary files /dev/null and b/fuzz/pkcs8_corpus/92b113de6be163ccade0f97dc04bc04b0c9e8ac2 differ
diff --git a/fuzz/pkcs8_corpus/92e8d03e3c47bf661a5d41b88ff3c5ea8ab10a1a b/fuzz/pkcs8_corpus/92e8d03e3c47bf661a5d41b88ff3c5ea8ab10a1a
new file mode 100644
index 0000000000..f93b2bd4e8
Binary files /dev/null and b/fuzz/pkcs8_corpus/92e8d03e3c47bf661a5d41b88ff3c5ea8ab10a1a differ
diff --git a/fuzz/pkcs8_corpus/939acab929161a0832aa482296e328eb2dfaa759 b/fuzz/pkcs8_corpus/939acab929161a0832aa482296e328eb2dfaa759
new file mode 100644
index 0000000000..0b3454f3e5
Binary files /dev/null and b/fuzz/pkcs8_corpus/939acab929161a0832aa482296e328eb2dfaa759 differ
diff --git a/fuzz/pkcs8_corpus/93b76adb8f15bc4278eec22b7da40cfc72fd8803 b/fuzz/pkcs8_corpus/93b76adb8f15bc4278eec22b7da40cfc72fd8803
new file mode 100644
index 0000000000..47e08c7b89
Binary files /dev/null and b/fuzz/pkcs8_corpus/93b76adb8f15bc4278eec22b7da40cfc72fd8803 differ
diff --git a/fuzz/pkcs8_corpus/9440b0b67c8eaa8816354d29f8f604a596b54b08 b/fuzz/pkcs8_corpus/9440b0b67c8eaa8816354d29f8f604a596b54b08
new file mode 100644
index 0000000000..e8d4cc6122
Binary files /dev/null and b/fuzz/pkcs8_corpus/9440b0b67c8eaa8816354d29f8f604a596b54b08 differ
diff --git a/fuzz/pkcs8_corpus/9567edd93c6744377e2afdb51861a4923003d418 b/fuzz/pkcs8_corpus/9567edd93c6744377e2afdb51861a4923003d418
new file mode 100644
index 0000000000..dc12a016fd
Binary files /dev/null and b/fuzz/pkcs8_corpus/9567edd93c6744377e2afdb51861a4923003d418 differ
diff --git a/fuzz/pkcs8_corpus/9699c216f168a1561d3e9cca7c37eadd4c97a759 b/fuzz/pkcs8_corpus/9699c216f168a1561d3e9cca7c37eadd4c97a759
new file mode 100644
index 0000000000..0f878edc2e
Binary files /dev/null and b/fuzz/pkcs8_corpus/9699c216f168a1561d3e9cca7c37eadd4c97a759 differ
diff --git a/fuzz/pkcs8_corpus/97a1c4e819b116d1f2a94e85bb47b726f8aea9de b/fuzz/pkcs8_corpus/97a1c4e819b116d1f2a94e85bb47b726f8aea9de
new file mode 100644
index 0000000000..c2e95cf31c
Binary files /dev/null and b/fuzz/pkcs8_corpus/97a1c4e819b116d1f2a94e85bb47b726f8aea9de differ
diff --git a/fuzz/pkcs8_corpus/98913f2349b3301f1f5e62f8ec939194c7ad589b b/fuzz/pkcs8_corpus/98913f2349b3301f1f5e62f8ec939194c7ad589b
new file mode 100644
index 0000000000..7aaee60b92
Binary files /dev/null and b/fuzz/pkcs8_corpus/98913f2349b3301f1f5e62f8ec939194c7ad589b differ
diff --git a/fuzz/pkcs8_corpus/989ef19a925310c279e4b393167e00345c599c30 b/fuzz/pkcs8_corpus/989ef19a925310c279e4b393167e00345c599c30
new file mode 100644
index 0000000000..62b4198de9
Binary files /dev/null and b/fuzz/pkcs8_corpus/989ef19a925310c279e4b393167e00345c599c30 differ
diff --git a/fuzz/pkcs8_corpus/99f2c592b667131c19223628e73d779370492788 b/fuzz/pkcs8_corpus/99f2c592b667131c19223628e73d779370492788
deleted file mode 100644
index b0b1903e2b..0000000000
Binary files a/fuzz/pkcs8_corpus/99f2c592b667131c19223628e73d779370492788 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/9b14e107a8956b7d323df8e637d7c68278335028 b/fuzz/pkcs8_corpus/9b14e107a8956b7d323df8e637d7c68278335028
deleted file mode 100644
index 79532ff218..0000000000
Binary files a/fuzz/pkcs8_corpus/9b14e107a8956b7d323df8e637d7c68278335028 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/9b16668f4e16c0e9932661855b7bcb5bad8b0f72 b/fuzz/pkcs8_corpus/9b16668f4e16c0e9932661855b7bcb5bad8b0f72
new file mode 100644
index 0000000000..f7a8cadeb5
--- /dev/null
+++ b/fuzz/pkcs8_corpus/9b16668f4e16c0e9932661855b7bcb5bad8b0f72
@@ -0,0 +1 @@
+ö
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/9b3dd06557c5d9e1f8f49655f94c16153af3e17d b/fuzz/pkcs8_corpus/9b3dd06557c5d9e1f8f49655f94c16153af3e17d
new file mode 100644
index 0000000000..aed0769ab5
Binary files /dev/null and b/fuzz/pkcs8_corpus/9b3dd06557c5d9e1f8f49655f94c16153af3e17d differ
diff --git a/fuzz/pkcs8_corpus/9b49af85e538ddc1223af0b055cf772cd03c69cb b/fuzz/pkcs8_corpus/9b49af85e538ddc1223af0b055cf772cd03c69cb
deleted file mode 100644
index ff5f47feab..0000000000
Binary files a/fuzz/pkcs8_corpus/9b49af85e538ddc1223af0b055cf772cd03c69cb and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/9b4a2578979a31252e0810e8a769be0eab17ec39 b/fuzz/pkcs8_corpus/9b4a2578979a31252e0810e8a769be0eab17ec39
new file mode 100644
index 0000000000..4689595f57
Binary files /dev/null and b/fuzz/pkcs8_corpus/9b4a2578979a31252e0810e8a769be0eab17ec39 differ
diff --git a/fuzz/pkcs8_corpus/9ba193b58ba781f6a3e1ba6b057f5c720ad807e0 b/fuzz/pkcs8_corpus/9ba193b58ba781f6a3e1ba6b057f5c720ad807e0
deleted file mode 100644
index 6efb4f2778..0000000000
Binary files a/fuzz/pkcs8_corpus/9ba193b58ba781f6a3e1ba6b057f5c720ad807e0 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/9d674f1fdaea4e7d1f1becddfb42c41c68b8030f b/fuzz/pkcs8_corpus/9d674f1fdaea4e7d1f1becddfb42c41c68b8030f
new file mode 100644
index 0000000000..477e459ba6
--- /dev/null
+++ b/fuzz/pkcs8_corpus/9d674f1fdaea4e7d1f1becddfb42c41c68b8030f
@@ -0,0 +1 @@
+0ÿÿ
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/9ea316a4f44169f1c81426e4b501712c115fe3c7 b/fuzz/pkcs8_corpus/9ea316a4f44169f1c81426e4b501712c115fe3c7
new file mode 100644
index 0000000000..26faff2949
Binary files /dev/null and b/fuzz/pkcs8_corpus/9ea316a4f44169f1c81426e4b501712c115fe3c7 differ
diff --git a/fuzz/pkcs8_corpus/9ee10def3562611901d0ddb931d5418f77e57967 b/fuzz/pkcs8_corpus/9ee10def3562611901d0ddb931d5418f77e57967
deleted file mode 100644
index 62f1c9e4c0..0000000000
Binary files a/fuzz/pkcs8_corpus/9ee10def3562611901d0ddb931d5418f77e57967 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/9f95b82973a2300bd7f117d3f624c588be6f7b66 b/fuzz/pkcs8_corpus/9f95b82973a2300bd7f117d3f624c588be6f7b66
new file mode 100644
index 0000000000..b05577bf5f
Binary files /dev/null and b/fuzz/pkcs8_corpus/9f95b82973a2300bd7f117d3f624c588be6f7b66 differ
diff --git a/fuzz/pkcs8_corpus/a0263997cbd29f81f39c510c7c141ba84a8483e8 b/fuzz/pkcs8_corpus/a0263997cbd29f81f39c510c7c141ba84a8483e8
new file mode 100644
index 0000000000..8a73e5d91a
Binary files /dev/null and b/fuzz/pkcs8_corpus/a0263997cbd29f81f39c510c7c141ba84a8483e8 differ
diff --git a/fuzz/pkcs8_corpus/a02f1e1cf8e6e9515548498f129ec19d5f7a2740 b/fuzz/pkcs8_corpus/a02f1e1cf8e6e9515548498f129ec19d5f7a2740
deleted file mode 100644
index 1a03b5fdf0..0000000000
Binary files a/fuzz/pkcs8_corpus/a02f1e1cf8e6e9515548498f129ec19d5f7a2740 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/a26e4339d7f246fab12d985cf4a4174fbca93b48 b/fuzz/pkcs8_corpus/a26e4339d7f246fab12d985cf4a4174fbca93b48
new file mode 100644
index 0000000000..190f64a5e8
--- /dev/null
+++ b/fuzz/pkcs8_corpus/a26e4339d7f246fab12d985cf4a4174fbca93b48
@@ -0,0 +1 @@
+0
¶
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/a361b15d5b20358ba0406c910ae84773ca896ee6 b/fuzz/pkcs8_corpus/a361b15d5b20358ba0406c910ae84773ca896ee6
new file mode 100644
index 0000000000..362c9713a8
Binary files /dev/null and b/fuzz/pkcs8_corpus/a361b15d5b20358ba0406c910ae84773ca896ee6 differ
diff --git a/fuzz/pkcs8_corpus/a537f83a9fac896974d91ee4348447c96aa7661e b/fuzz/pkcs8_corpus/a537f83a9fac896974d91ee4348447c96aa7661e
new file mode 100644
index 0000000000..8b7afb428a
Binary files /dev/null and b/fuzz/pkcs8_corpus/a537f83a9fac896974d91ee4348447c96aa7661e differ
diff --git a/fuzz/pkcs8_corpus/a5b08a26a8bbafe10076a8d90815ab4aaee56d30 b/fuzz/pkcs8_corpus/a5b08a26a8bbafe10076a8d90815ab4aaee56d30
new file mode 100644
index 0000000000..043fe875aa
Binary files /dev/null and b/fuzz/pkcs8_corpus/a5b08a26a8bbafe10076a8d90815ab4aaee56d30 differ
diff --git a/fuzz/pkcs8_corpus/a5f811b487f0ea7f4f6a54088e2864f959c008fc b/fuzz/pkcs8_corpus/a5f811b487f0ea7f4f6a54088e2864f959c008fc
new file mode 100644
index 0000000000..e217be35cb
Binary files /dev/null and b/fuzz/pkcs8_corpus/a5f811b487f0ea7f4f6a54088e2864f959c008fc differ
diff --git a/fuzz/pkcs8_corpus/a7971d8a2fe0428dd049b677aebf6baaa7cd3c02 b/fuzz/pkcs8_corpus/a7971d8a2fe0428dd049b677aebf6baaa7cd3c02
new file mode 100644
index 0000000000..70444f129d
Binary files /dev/null and b/fuzz/pkcs8_corpus/a7971d8a2fe0428dd049b677aebf6baaa7cd3c02 differ
diff --git a/fuzz/pkcs8_corpus/a84b85211c4ed1bd4f3eb2d6ebb2512609f6e396 b/fuzz/pkcs8_corpus/a84b85211c4ed1bd4f3eb2d6ebb2512609f6e396
deleted file mode 100644
index 33bd875975..0000000000
Binary files a/fuzz/pkcs8_corpus/a84b85211c4ed1bd4f3eb2d6ebb2512609f6e396 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/a8d8d4c90e7f69515c846b80a3150822c81fcf6b b/fuzz/pkcs8_corpus/a8d8d4c90e7f69515c846b80a3150822c81fcf6b
new file mode 100644
index 0000000000..291547baef
Binary files /dev/null and b/fuzz/pkcs8_corpus/a8d8d4c90e7f69515c846b80a3150822c81fcf6b differ
diff --git a/fuzz/pkcs8_corpus/aa55f791d1455d12b12cdb2b1a98b3b14a8a8f0f b/fuzz/pkcs8_corpus/aa55f791d1455d12b12cdb2b1a98b3b14a8a8f0f
new file mode 100644
index 0000000000..212d3a6ca8
Binary files /dev/null and b/fuzz/pkcs8_corpus/aa55f791d1455d12b12cdb2b1a98b3b14a8a8f0f differ
diff --git a/fuzz/pkcs8_corpus/ab352c5fb846372b806013dce5d68ad4938dbb78 b/fuzz/pkcs8_corpus/ab352c5fb846372b806013dce5d68ad4938dbb78
new file mode 100644
index 0000000000..4b81bae990
Binary files /dev/null and b/fuzz/pkcs8_corpus/ab352c5fb846372b806013dce5d68ad4938dbb78 differ
diff --git a/fuzz/pkcs8_corpus/ab69fa1ab6bb831506efcad83900fee751e85f6f b/fuzz/pkcs8_corpus/ab69fa1ab6bb831506efcad83900fee751e85f6f
new file mode 100644
index 0000000000..962fc922ad
Binary files /dev/null and b/fuzz/pkcs8_corpus/ab69fa1ab6bb831506efcad83900fee751e85f6f differ
diff --git a/fuzz/pkcs8_corpus/e27c9b64495d2ccddabe7601c0a724298522baea b/fuzz/pkcs8_corpus/ab8cf1fc79449672cf1345064fea0a4eb5cca90c
similarity index 57%
rename from fuzz/pkcs8_corpus/e27c9b64495d2ccddabe7601c0a724298522baea
rename to fuzz/pkcs8_corpus/ab8cf1fc79449672cf1345064fea0a4eb5cca90c
index 800a47ba5a..0c113400d6 100644
Binary files a/fuzz/pkcs8_corpus/e27c9b64495d2ccddabe7601c0a724298522baea and b/fuzz/pkcs8_corpus/ab8cf1fc79449672cf1345064fea0a4eb5cca90c differ
diff --git a/fuzz/pkcs8_corpus/ab906a144e973012b119adf4c2616a41289c76de b/fuzz/pkcs8_corpus/ab906a144e973012b119adf4c2616a41289c76de
new file mode 100644
index 0000000000..1239add84b
Binary files /dev/null and b/fuzz/pkcs8_corpus/ab906a144e973012b119adf4c2616a41289c76de differ
diff --git a/fuzz/pkcs8_corpus/abb957a7e620dbbc565568d60e4b121d17758865 b/fuzz/pkcs8_corpus/abb957a7e620dbbc565568d60e4b121d17758865
deleted file mode 100644
index ef10e66c43..0000000000
Binary files a/fuzz/pkcs8_corpus/abb957a7e620dbbc565568d60e4b121d17758865 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/ac06dc1cb97ff3144a1f4f7fc0a8d98374fb85a3 b/fuzz/pkcs8_corpus/ac06dc1cb97ff3144a1f4f7fc0a8d98374fb85a3
new file mode 100644
index 0000000000..b641e74ef8
Binary files /dev/null and b/fuzz/pkcs8_corpus/ac06dc1cb97ff3144a1f4f7fc0a8d98374fb85a3 differ
diff --git a/fuzz/pkcs8_corpus/ac4a99c64a1b2ff02f2537ee428a31944ad2a802 b/fuzz/pkcs8_corpus/ac4a99c64a1b2ff02f2537ee428a31944ad2a802
new file mode 100644
index 0000000000..918176de31
Binary files /dev/null and b/fuzz/pkcs8_corpus/ac4a99c64a1b2ff02f2537ee428a31944ad2a802 differ
diff --git a/fuzz/pkcs8_corpus/ac868c852a6216d35c12e6efc95c6aabfb380343 b/fuzz/pkcs8_corpus/ac868c852a6216d35c12e6efc95c6aabfb380343
new file mode 100644
index 0000000000..9a78ea5303
Binary files /dev/null and b/fuzz/pkcs8_corpus/ac868c852a6216d35c12e6efc95c6aabfb380343 differ
diff --git a/fuzz/pkcs8_corpus/ac8ffb85ff424447e78eff6297105c94c58355f5 b/fuzz/pkcs8_corpus/ac8ffb85ff424447e78eff6297105c94c58355f5
new file mode 100644
index 0000000000..c041eb42d4
Binary files /dev/null and b/fuzz/pkcs8_corpus/ac8ffb85ff424447e78eff6297105c94c58355f5 differ
diff --git a/fuzz/pkcs8_corpus/acc95fb670e069bf9dff9d839f2e010344c83ff2 b/fuzz/pkcs8_corpus/acc95fb670e069bf9dff9d839f2e010344c83ff2
new file mode 100644
index 0000000000..6b69946057
Binary files /dev/null and b/fuzz/pkcs8_corpus/acc95fb670e069bf9dff9d839f2e010344c83ff2 differ
diff --git a/fuzz/pkcs8_corpus/ad23013f53576e6bb362f485693d2ac71de248c2 b/fuzz/pkcs8_corpus/ad23013f53576e6bb362f485693d2ac71de248c2
new file mode 100644
index 0000000000..aa04dc6b49
Binary files /dev/null and b/fuzz/pkcs8_corpus/ad23013f53576e6bb362f485693d2ac71de248c2 differ
diff --git a/fuzz/pkcs8_corpus/ad4ef1344ebe93adf4ef12a13467326634f66488 b/fuzz/pkcs8_corpus/ad4ef1344ebe93adf4ef12a13467326634f66488
new file mode 100644
index 0000000000..5c5410a55d
Binary files /dev/null and b/fuzz/pkcs8_corpus/ad4ef1344ebe93adf4ef12a13467326634f66488 differ
diff --git a/fuzz/pkcs8_corpus/adc641b8350273f50d429bdda21b6736f7c8055e b/fuzz/pkcs8_corpus/adc641b8350273f50d429bdda21b6736f7c8055e
new file mode 100644
index 0000000000..a275440f32
Binary files /dev/null and b/fuzz/pkcs8_corpus/adc641b8350273f50d429bdda21b6736f7c8055e differ
diff --git a/fuzz/pkcs8_corpus/ae72bf155e5c51527a08fd75e379f81fcb7f08d5 b/fuzz/pkcs8_corpus/ae72bf155e5c51527a08fd75e379f81fcb7f08d5
new file mode 100644
index 0000000000..e9b251dc86
Binary files /dev/null and b/fuzz/pkcs8_corpus/ae72bf155e5c51527a08fd75e379f81fcb7f08d5 differ
diff --git a/fuzz/pkcs8_corpus/aee3014ec29d71543773850e6ed57477d77d6c98 b/fuzz/pkcs8_corpus/aee3014ec29d71543773850e6ed57477d77d6c98
deleted file mode 100644
index 4e8951d1a6..0000000000
Binary files a/fuzz/pkcs8_corpus/aee3014ec29d71543773850e6ed57477d77d6c98 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/aefc19266d87c349e6f34478dae4050e855500cc b/fuzz/pkcs8_corpus/aefc19266d87c349e6f34478dae4050e855500cc
new file mode 100644
index 0000000000..751353935a
Binary files /dev/null and b/fuzz/pkcs8_corpus/aefc19266d87c349e6f34478dae4050e855500cc differ
diff --git a/fuzz/pkcs8_corpus/b1daa04a6fd1fc79a24449b76f7242fb97713a1b b/fuzz/pkcs8_corpus/b1daa04a6fd1fc79a24449b76f7242fb97713a1b
deleted file mode 100644
index b898c6a531..0000000000
Binary files a/fuzz/pkcs8_corpus/b1daa04a6fd1fc79a24449b76f7242fb97713a1b and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/b1dcfd1fd2c416b06ecfec8731a2aac20bf9ce26 b/fuzz/pkcs8_corpus/b1dcfd1fd2c416b06ecfec8731a2aac20bf9ce26
new file mode 100644
index 0000000000..034ad8d26e
Binary files /dev/null and b/fuzz/pkcs8_corpus/b1dcfd1fd2c416b06ecfec8731a2aac20bf9ce26 differ
diff --git a/fuzz/pkcs8_corpus/b2480446d1887b166ab76872b49c020838446338 b/fuzz/pkcs8_corpus/b2480446d1887b166ab76872b49c020838446338
new file mode 100644
index 0000000000..54826d6e6e
Binary files /dev/null and b/fuzz/pkcs8_corpus/b2480446d1887b166ab76872b49c020838446338 differ
diff --git a/fuzz/pkcs8_corpus/b2663fbbc05e336cd8c034810005b9af867d0f44 b/fuzz/pkcs8_corpus/b2663fbbc05e336cd8c034810005b9af867d0f44
new file mode 100644
index 0000000000..fb384d6386
Binary files /dev/null and b/fuzz/pkcs8_corpus/b2663fbbc05e336cd8c034810005b9af867d0f44 differ
diff --git a/fuzz/pkcs8_corpus/b2fbea7cdefd18a4eb048ede703dcf9031e6059c b/fuzz/pkcs8_corpus/b2fbea7cdefd18a4eb048ede703dcf9031e6059c
deleted file mode 100644
index a4c02a0002..0000000000
Binary files a/fuzz/pkcs8_corpus/b2fbea7cdefd18a4eb048ede703dcf9031e6059c and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/b34ceee093b8ba109dd3ba2fbfec7add0ce6de32 b/fuzz/pkcs8_corpus/b34ceee093b8ba109dd3ba2fbfec7add0ce6de32
new file mode 100644
index 0000000000..5c6589099a
Binary files /dev/null and b/fuzz/pkcs8_corpus/b34ceee093b8ba109dd3ba2fbfec7add0ce6de32 differ
diff --git a/fuzz/pkcs8_corpus/b3572b0ddecf9d073672ec0d1f267ff35708e2db b/fuzz/pkcs8_corpus/b3572b0ddecf9d073672ec0d1f267ff35708e2db
deleted file mode 100644
index 3c8f462845..0000000000
Binary files a/fuzz/pkcs8_corpus/b3572b0ddecf9d073672ec0d1f267ff35708e2db and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/b3ec9575d8dfa8494641dc251e1872afc70f39b6 b/fuzz/pkcs8_corpus/b3ec9575d8dfa8494641dc251e1872afc70f39b6
new file mode 100644
index 0000000000..6167f9fea7
Binary files /dev/null and b/fuzz/pkcs8_corpus/b3ec9575d8dfa8494641dc251e1872afc70f39b6 differ
diff --git a/fuzz/pkcs8_corpus/b44a0a470b197cf19293809193b6b8499184648a b/fuzz/pkcs8_corpus/b44a0a470b197cf19293809193b6b8499184648a
new file mode 100644
index 0000000000..a189c2ef74
Binary files /dev/null and b/fuzz/pkcs8_corpus/b44a0a470b197cf19293809193b6b8499184648a differ
diff --git a/fuzz/pkcs8_corpus/b4df71b7546d26409c2a50b0c3bcf6e170d0d59b b/fuzz/pkcs8_corpus/b4df71b7546d26409c2a50b0c3bcf6e170d0d59b
new file mode 100644
index 0000000000..d07dfd353e
Binary files /dev/null and b/fuzz/pkcs8_corpus/b4df71b7546d26409c2a50b0c3bcf6e170d0d59b differ
diff --git a/fuzz/pkcs8_corpus/b5d02eea613d65a517442fcadc6065d1057231df b/fuzz/pkcs8_corpus/b5d02eea613d65a517442fcadc6065d1057231df
new file mode 100644
index 0000000000..a6e3d99959
Binary files /dev/null and b/fuzz/pkcs8_corpus/b5d02eea613d65a517442fcadc6065d1057231df differ
diff --git a/fuzz/pkcs8_corpus/b670cd0080a60eef0785e8e3474aaccfe34ae284 b/fuzz/pkcs8_corpus/b670cd0080a60eef0785e8e3474aaccfe34ae284
new file mode 100644
index 0000000000..88a91e421d
Binary files /dev/null and b/fuzz/pkcs8_corpus/b670cd0080a60eef0785e8e3474aaccfe34ae284 differ
diff --git a/fuzz/pkcs8_corpus/b7267209cad6f49b9492e178e785896c51177455 b/fuzz/pkcs8_corpus/b7267209cad6f49b9492e178e785896c51177455
new file mode 100644
index 0000000000..7e441cea5d
Binary files /dev/null and b/fuzz/pkcs8_corpus/b7267209cad6f49b9492e178e785896c51177455 differ
diff --git a/fuzz/pkcs8_corpus/b85b726c8e50daec1567167fb779d6bc5cb73d26 b/fuzz/pkcs8_corpus/b85b726c8e50daec1567167fb779d6bc5cb73d26
new file mode 100644
index 0000000000..709ba5e985
Binary files /dev/null and b/fuzz/pkcs8_corpus/b85b726c8e50daec1567167fb779d6bc5cb73d26 differ
diff --git a/fuzz/pkcs8_corpus/b90c57ec03c8a6ebd2f798ba5231d5f480c15c2e b/fuzz/pkcs8_corpus/b90c57ec03c8a6ebd2f798ba5231d5f480c15c2e
deleted file mode 100644
index b71c4fb5d6..0000000000
Binary files a/fuzz/pkcs8_corpus/b90c57ec03c8a6ebd2f798ba5231d5f480c15c2e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/b92cdcfc4adf3ec20901efcd8e8308556cefddd9 b/fuzz/pkcs8_corpus/b92cdcfc4adf3ec20901efcd8e8308556cefddd9
new file mode 100644
index 0000000000..1eafed079e
Binary files /dev/null and b/fuzz/pkcs8_corpus/b92cdcfc4adf3ec20901efcd8e8308556cefddd9 differ
diff --git a/fuzz/pkcs8_corpus/b97e2d7aec63618b7fa7a7813c0117d6dceb8387 b/fuzz/pkcs8_corpus/b97e2d7aec63618b7fa7a7813c0117d6dceb8387
new file mode 100644
index 0000000000..f1a6ecc068
Binary files /dev/null and b/fuzz/pkcs8_corpus/b97e2d7aec63618b7fa7a7813c0117d6dceb8387 differ
diff --git a/fuzz/pkcs8_corpus/bb01aa3fe4e61751288c5467b16dea043cc00f37 b/fuzz/pkcs8_corpus/bb01aa3fe4e61751288c5467b16dea043cc00f37
new file mode 100644
index 0000000000..80946f5d4d
Binary files /dev/null and b/fuzz/pkcs8_corpus/bb01aa3fe4e61751288c5467b16dea043cc00f37 differ
diff --git a/fuzz/pkcs8_corpus/bb63c23fa3b93de8bf4e931e2c97adfe0f07ba1e b/fuzz/pkcs8_corpus/bb63c23fa3b93de8bf4e931e2c97adfe0f07ba1e
deleted file mode 100644
index 34450ae8b0..0000000000
Binary files a/fuzz/pkcs8_corpus/bb63c23fa3b93de8bf4e931e2c97adfe0f07ba1e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/bb75b51c0b3c971da437ea39e33859e6d29a610c b/fuzz/pkcs8_corpus/bb75b51c0b3c971da437ea39e33859e6d29a610c
new file mode 100644
index 0000000000..83041caf86
Binary files /dev/null and b/fuzz/pkcs8_corpus/bb75b51c0b3c971da437ea39e33859e6d29a610c differ
diff --git a/fuzz/pkcs8_corpus/bc8475f047f4faa3da5c51265acd0772b27c35a9 b/fuzz/pkcs8_corpus/bc8475f047f4faa3da5c51265acd0772b27c35a9
new file mode 100644
index 0000000000..05196de441
Binary files /dev/null and b/fuzz/pkcs8_corpus/bc8475f047f4faa3da5c51265acd0772b27c35a9 differ
diff --git a/fuzz/pkcs8_corpus/bd03c21561ee541a0038fb805e47530441352d21 b/fuzz/pkcs8_corpus/bd03c21561ee541a0038fb805e47530441352d21
new file mode 100644
index 0000000000..a75055f2e7
Binary files /dev/null and b/fuzz/pkcs8_corpus/bd03c21561ee541a0038fb805e47530441352d21 differ
diff --git a/fuzz/pkcs8_corpus/bd24ee8b6ed318fe4bad6e48fc118657b01ddab8 b/fuzz/pkcs8_corpus/bd24ee8b6ed318fe4bad6e48fc118657b01ddab8
new file mode 100644
index 0000000000..657fee98a7
Binary files /dev/null and b/fuzz/pkcs8_corpus/bd24ee8b6ed318fe4bad6e48fc118657b01ddab8 differ
diff --git a/fuzz/pkcs8_corpus/dbd42ea7bea6afb9d482118b06f88b80726bbee7 b/fuzz/pkcs8_corpus/bd43082d504cb17df38bd0984fa9eae60f26d18b
similarity index 68%
rename from fuzz/pkcs8_corpus/dbd42ea7bea6afb9d482118b06f88b80726bbee7
rename to fuzz/pkcs8_corpus/bd43082d504cb17df38bd0984fa9eae60f26d18b
index dda2dffd2f..6a0eeda68d 100644
Binary files a/fuzz/pkcs8_corpus/dbd42ea7bea6afb9d482118b06f88b80726bbee7 and b/fuzz/pkcs8_corpus/bd43082d504cb17df38bd0984fa9eae60f26d18b differ
diff --git a/fuzz/pkcs8_corpus/be1de722fe92e8fa2a18bf8bf16ff9bf808eb6a2 b/fuzz/pkcs8_corpus/be1de722fe92e8fa2a18bf8bf16ff9bf808eb6a2
new file mode 100644
index 0000000000..c72191f024
Binary files /dev/null and b/fuzz/pkcs8_corpus/be1de722fe92e8fa2a18bf8bf16ff9bf808eb6a2 differ
diff --git a/fuzz/pkcs8_corpus/bf0299380aff6d4ce2426359556049296d05a9c6 b/fuzz/pkcs8_corpus/bf0299380aff6d4ce2426359556049296d05a9c6
new file mode 100644
index 0000000000..41b65a562f
Binary files /dev/null and b/fuzz/pkcs8_corpus/bf0299380aff6d4ce2426359556049296d05a9c6 differ
diff --git a/fuzz/pkcs8_corpus/c04d545d7fc25e773fee34d9430bf3328ab50d1f b/fuzz/pkcs8_corpus/c04d545d7fc25e773fee34d9430bf3328ab50d1f
new file mode 100644
index 0000000000..d0d6e07860
Binary files /dev/null and b/fuzz/pkcs8_corpus/c04d545d7fc25e773fee34d9430bf3328ab50d1f differ
diff --git a/fuzz/pkcs8_corpus/c083ee41f86e2e3eb50136f672746cde9c3f76c2 b/fuzz/pkcs8_corpus/c083ee41f86e2e3eb50136f672746cde9c3f76c2
new file mode 100644
index 0000000000..4f513e98c0
Binary files /dev/null and b/fuzz/pkcs8_corpus/c083ee41f86e2e3eb50136f672746cde9c3f76c2 differ
diff --git a/fuzz/pkcs8_corpus/c0bcf352653a010db127790c5451d885eb3add49 b/fuzz/pkcs8_corpus/c0bcf352653a010db127790c5451d885eb3add49
deleted file mode 100644
index ea12009930..0000000000
Binary files a/fuzz/pkcs8_corpus/c0bcf352653a010db127790c5451d885eb3add49 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/c11f55cc6b9da77f60409f9f55c1ab9a2509901e b/fuzz/pkcs8_corpus/c11f55cc6b9da77f60409f9f55c1ab9a2509901e
new file mode 100644
index 0000000000..a871441c7d
Binary files /dev/null and b/fuzz/pkcs8_corpus/c11f55cc6b9da77f60409f9f55c1ab9a2509901e differ
diff --git a/fuzz/pkcs8_corpus/c2ee1e7cb50f5b4a49af1dbff3aa65990680816f b/fuzz/pkcs8_corpus/c2ee1e7cb50f5b4a49af1dbff3aa65990680816f
new file mode 100644
index 0000000000..8e6593b2d9
Binary files /dev/null and b/fuzz/pkcs8_corpus/c2ee1e7cb50f5b4a49af1dbff3aa65990680816f differ
diff --git a/fuzz/pkcs8_corpus/c368d8e1c9b79df767f384fb5d07fefe892305e9 b/fuzz/pkcs8_corpus/c368d8e1c9b79df767f384fb5d07fefe892305e9
new file mode 100644
index 0000000000..8ba461fd06
Binary files /dev/null and b/fuzz/pkcs8_corpus/c368d8e1c9b79df767f384fb5d07fefe892305e9 differ
diff --git a/fuzz/pkcs8_corpus/c3906395f16224a34f748a7d972dcba61e23caa2 b/fuzz/pkcs8_corpus/c3906395f16224a34f748a7d972dcba61e23caa2
new file mode 100644
index 0000000000..73b6afdbf4
Binary files /dev/null and b/fuzz/pkcs8_corpus/c3906395f16224a34f748a7d972dcba61e23caa2 differ
diff --git a/fuzz/pkcs8_corpus/c4e5811bf8a8e4e772c178f18eeb67e5c48120b0 b/fuzz/pkcs8_corpus/c4e5811bf8a8e4e772c178f18eeb67e5c48120b0
new file mode 100644
index 0000000000..3a06af282f
Binary files /dev/null and b/fuzz/pkcs8_corpus/c4e5811bf8a8e4e772c178f18eeb67e5c48120b0 differ
diff --git a/fuzz/pkcs8_corpus/c519abdab0fa2e41bb5f9a66294863676579540a b/fuzz/pkcs8_corpus/c519abdab0fa2e41bb5f9a66294863676579540a
new file mode 100644
index 0000000000..474ad8782a
Binary files /dev/null and b/fuzz/pkcs8_corpus/c519abdab0fa2e41bb5f9a66294863676579540a differ
diff --git a/fuzz/pkcs8_corpus/c5ed7dac71a2cae2eb21db4e658d7200ccfee854 b/fuzz/pkcs8_corpus/c5ed7dac71a2cae2eb21db4e658d7200ccfee854
new file mode 100644
index 0000000000..7ae910ef9a
Binary files /dev/null and b/fuzz/pkcs8_corpus/c5ed7dac71a2cae2eb21db4e658d7200ccfee854 differ
diff --git a/fuzz/pkcs8_corpus/c5f36d7ffc4bc5ae6f99f614c9dcc6de8506879f b/fuzz/pkcs8_corpus/c5f36d7ffc4bc5ae6f99f614c9dcc6de8506879f
new file mode 100644
index 0000000000..75f47c6622
Binary files /dev/null and b/fuzz/pkcs8_corpus/c5f36d7ffc4bc5ae6f99f614c9dcc6de8506879f differ
diff --git a/fuzz/pkcs8_corpus/c671f9169206ac138ee223fd00d66d3ae89ff1ac b/fuzz/pkcs8_corpus/c671f9169206ac138ee223fd00d66d3ae89ff1ac
deleted file mode 100644
index 76e30844b7..0000000000
Binary files a/fuzz/pkcs8_corpus/c671f9169206ac138ee223fd00d66d3ae89ff1ac and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/ca62412a10806775a11e7f934e6256a1f01f38f7 b/fuzz/pkcs8_corpus/ca62412a10806775a11e7f934e6256a1f01f38f7
deleted file mode 100644
index 1ec0b8a39b..0000000000
Binary files a/fuzz/pkcs8_corpus/ca62412a10806775a11e7f934e6256a1f01f38f7 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/ca6db9d9787c543accc2c7a8f65734c20e9456ab b/fuzz/pkcs8_corpus/ca6db9d9787c543accc2c7a8f65734c20e9456ab
deleted file mode 100644
index 80ce1a4130..0000000000
Binary files a/fuzz/pkcs8_corpus/ca6db9d9787c543accc2c7a8f65734c20e9456ab and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/caa4abba5d0f0ff88f5a2cc8f0e2f6576ff40563 b/fuzz/pkcs8_corpus/caa4abba5d0f0ff88f5a2cc8f0e2f6576ff40563
new file mode 100644
index 0000000000..81e8a8cbf6
Binary files /dev/null and b/fuzz/pkcs8_corpus/caa4abba5d0f0ff88f5a2cc8f0e2f6576ff40563 differ
diff --git a/fuzz/pkcs8_corpus/cf3f84a6002ba67ae6d1855d3412517e7cf9d62f b/fuzz/pkcs8_corpus/cf3f84a6002ba67ae6d1855d3412517e7cf9d62f
new file mode 100644
index 0000000000..1b59aa4788
Binary files /dev/null and b/fuzz/pkcs8_corpus/cf3f84a6002ba67ae6d1855d3412517e7cf9d62f differ
diff --git a/fuzz/pkcs8_corpus/cf9d9324ec8d64ca55442213d1ee788f0ba708a1 b/fuzz/pkcs8_corpus/cf9d9324ec8d64ca55442213d1ee788f0ba708a1
deleted file mode 100644
index 4db7b936de..0000000000
Binary files a/fuzz/pkcs8_corpus/cf9d9324ec8d64ca55442213d1ee788f0ba708a1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d1ab3dd153c9b5e0c26aa8f3eb8fb9792e0dbe6e b/fuzz/pkcs8_corpus/d1ab3dd153c9b5e0c26aa8f3eb8fb9792e0dbe6e
deleted file mode 100644
index 6576b84602..0000000000
Binary files a/fuzz/pkcs8_corpus/d1ab3dd153c9b5e0c26aa8f3eb8fb9792e0dbe6e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d1c67e5fbb0ee3f459bcdfbf0fdec479f29060d3 b/fuzz/pkcs8_corpus/d1c67e5fbb0ee3f459bcdfbf0fdec479f29060d3
new file mode 100644
index 0000000000..c7a488f22d
Binary files /dev/null and b/fuzz/pkcs8_corpus/d1c67e5fbb0ee3f459bcdfbf0fdec479f29060d3 differ
diff --git a/fuzz/pkcs8_corpus/63443716bdcde7d74390777e98b09d5531346052 b/fuzz/pkcs8_corpus/d25003bacda28c4bc771a83e14247271eefa860d
similarity index 66%
rename from fuzz/pkcs8_corpus/63443716bdcde7d74390777e98b09d5531346052
rename to fuzz/pkcs8_corpus/d25003bacda28c4bc771a83e14247271eefa860d
index 5f7bdc6986..f3d19ef296 100644
Binary files a/fuzz/pkcs8_corpus/63443716bdcde7d74390777e98b09d5531346052 and b/fuzz/pkcs8_corpus/d25003bacda28c4bc771a83e14247271eefa860d differ
diff --git a/fuzz/pkcs8_corpus/d38e79992de4ffaf585a6450ba2e6f21188fdd08 b/fuzz/pkcs8_corpus/d38e79992de4ffaf585a6450ba2e6f21188fdd08
deleted file mode 100644
index fe360394f9..0000000000
Binary files a/fuzz/pkcs8_corpus/d38e79992de4ffaf585a6450ba2e6f21188fdd08 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d39dfd5b490f0782687a667d19d0b138247050d4 b/fuzz/pkcs8_corpus/d39dfd5b490f0782687a667d19d0b138247050d4
new file mode 100644
index 0000000000..6820596b19
Binary files /dev/null and b/fuzz/pkcs8_corpus/d39dfd5b490f0782687a667d19d0b138247050d4 differ
diff --git a/fuzz/pkcs8_corpus/d40aebee60a051d1dd51cf886ae4b28750c68933 b/fuzz/pkcs8_corpus/d40aebee60a051d1dd51cf886ae4b28750c68933
new file mode 100644
index 0000000000..2846e186ed
Binary files /dev/null and b/fuzz/pkcs8_corpus/d40aebee60a051d1dd51cf886ae4b28750c68933 differ
diff --git a/fuzz/pkcs8_corpus/d4125c5aacd7f09b9c535db9fb6131d681bfb605 b/fuzz/pkcs8_corpus/d4125c5aacd7f09b9c535db9fb6131d681bfb605
new file mode 100644
index 0000000000..fa012f67d6
Binary files /dev/null and b/fuzz/pkcs8_corpus/d4125c5aacd7f09b9c535db9fb6131d681bfb605 differ
diff --git a/fuzz/pkcs8_corpus/d4c1beff65e2e4cd25b8d6f8dda251db4d611fcd b/fuzz/pkcs8_corpus/d4c1beff65e2e4cd25b8d6f8dda251db4d611fcd
new file mode 100644
index 0000000000..952baaba71
Binary files /dev/null and b/fuzz/pkcs8_corpus/d4c1beff65e2e4cd25b8d6f8dda251db4d611fcd differ
diff --git a/fuzz/pkcs8_corpus/79c0ee6b99c7dab19a5a8c2836fa9135021994bc b/fuzz/pkcs8_corpus/d4d1164593351c36513ff23b4ba564757ba29958
similarity index 81%
rename from fuzz/pkcs8_corpus/79c0ee6b99c7dab19a5a8c2836fa9135021994bc
rename to fuzz/pkcs8_corpus/d4d1164593351c36513ff23b4ba564757ba29958
index bf71f3c580..95dd7835ce 100644
Binary files a/fuzz/pkcs8_corpus/79c0ee6b99c7dab19a5a8c2836fa9135021994bc and b/fuzz/pkcs8_corpus/d4d1164593351c36513ff23b4ba564757ba29958 differ
diff --git a/fuzz/pkcs8_corpus/d6d8f6f32c711d2457306614a45cbba7737b8704 b/fuzz/pkcs8_corpus/d6d8f6f32c711d2457306614a45cbba7737b8704
deleted file mode 100644
index 7f8ce18a6e..0000000000
Binary files a/fuzz/pkcs8_corpus/d6d8f6f32c711d2457306614a45cbba7737b8704 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d6fa75bac335c2108fb67f0686005cf7719078de b/fuzz/pkcs8_corpus/d6fa75bac335c2108fb67f0686005cf7719078de
new file mode 100644
index 0000000000..c34289e2e6
--- /dev/null
+++ b/fuzz/pkcs8_corpus/d6fa75bac335c2108fb67f0686005cf7719078de
@@ -0,0 +1 @@
+ÿÿÿ€¿)
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/d7401c23893e3ad8d2e491fc426edc9057b02a00 b/fuzz/pkcs8_corpus/d7401c23893e3ad8d2e491fc426edc9057b02a00
deleted file mode 100644
index d77260375f..0000000000
Binary files a/fuzz/pkcs8_corpus/d7401c23893e3ad8d2e491fc426edc9057b02a00 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d9066cbc23a433031c9083906d6bba0f4738fce1 b/fuzz/pkcs8_corpus/d9066cbc23a433031c9083906d6bba0f4738fce1
deleted file mode 100644
index 1f0f8c23fa..0000000000
Binary files a/fuzz/pkcs8_corpus/d9066cbc23a433031c9083906d6bba0f4738fce1 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d949f21a6beb9b09a6fd314702fcc2a5145c72be b/fuzz/pkcs8_corpus/d949f21a6beb9b09a6fd314702fcc2a5145c72be
new file mode 100644
index 0000000000..ba93a96dbe
Binary files /dev/null and b/fuzz/pkcs8_corpus/d949f21a6beb9b09a6fd314702fcc2a5145c72be differ
diff --git a/fuzz/pkcs8_corpus/d964a6059516210233a4c63bdb13d502a110c0fc b/fuzz/pkcs8_corpus/d964a6059516210233a4c63bdb13d502a110c0fc
deleted file mode 100644
index c0c3534fcb..0000000000
Binary files a/fuzz/pkcs8_corpus/d964a6059516210233a4c63bdb13d502a110c0fc and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/d99461e4e016c79285b6005bae6387f2405a5e3d b/fuzz/pkcs8_corpus/d99461e4e016c79285b6005bae6387f2405a5e3d
new file mode 100644
index 0000000000..14a484f942
Binary files /dev/null and b/fuzz/pkcs8_corpus/d99461e4e016c79285b6005bae6387f2405a5e3d differ
diff --git a/fuzz/pkcs8_corpus/dafba270970cf6bc776b57e0b3a442376c773249 b/fuzz/pkcs8_corpus/dafba270970cf6bc776b57e0b3a442376c773249
new file mode 100644
index 0000000000..0bfdf40c8a
Binary files /dev/null and b/fuzz/pkcs8_corpus/dafba270970cf6bc776b57e0b3a442376c773249 differ
diff --git a/fuzz/pkcs8_corpus/dcd3103a5782524acd73d8fa46789e8435f365a1 b/fuzz/pkcs8_corpus/dcd3103a5782524acd73d8fa46789e8435f365a1
new file mode 100644
index 0000000000..0e0c86e501
Binary files /dev/null and b/fuzz/pkcs8_corpus/dcd3103a5782524acd73d8fa46789e8435f365a1 differ
diff --git a/fuzz/pkcs8_corpus/0ae52a2f477af2d49a7b792bd6095a5584c2d4f0 b/fuzz/pkcs8_corpus/dd149c5de64ab8d13f97b0799fbd60119188b82b
similarity index 68%
rename from fuzz/pkcs8_corpus/0ae52a2f477af2d49a7b792bd6095a5584c2d4f0
rename to fuzz/pkcs8_corpus/dd149c5de64ab8d13f97b0799fbd60119188b82b
index 50648b2814..5fd62dc552 100644
Binary files a/fuzz/pkcs8_corpus/0ae52a2f477af2d49a7b792bd6095a5584c2d4f0 and b/fuzz/pkcs8_corpus/dd149c5de64ab8d13f97b0799fbd60119188b82b differ
diff --git a/fuzz/pkcs8_corpus/de8567fabc3b84c4d4574d1cccd4240439f6bf77 b/fuzz/pkcs8_corpus/de8567fabc3b84c4d4574d1cccd4240439f6bf77
deleted file mode 100644
index 0d50efe7ea..0000000000
Binary files a/fuzz/pkcs8_corpus/de8567fabc3b84c4d4574d1cccd4240439f6bf77 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/deaad11e801dbe9543853d8a248a4a3cc5514b99 b/fuzz/pkcs8_corpus/deaad11e801dbe9543853d8a248a4a3cc5514b99
new file mode 100644
index 0000000000..dc1420fd47
Binary files /dev/null and b/fuzz/pkcs8_corpus/deaad11e801dbe9543853d8a248a4a3cc5514b99 differ
diff --git a/fuzz/pkcs8_corpus/ded86d86c30c04490f60189c8d0538f24b1b4aa8 b/fuzz/pkcs8_corpus/ded86d86c30c04490f60189c8d0538f24b1b4aa8
new file mode 100644
index 0000000000..54a40ba6ab
Binary files /dev/null and b/fuzz/pkcs8_corpus/ded86d86c30c04490f60189c8d0538f24b1b4aa8 differ
diff --git a/fuzz/pkcs8_corpus/deec01201bbc195914e13ef72232b7c9037621d6 b/fuzz/pkcs8_corpus/deec01201bbc195914e13ef72232b7c9037621d6
new file mode 100644
index 0000000000..7cd294287e
Binary files /dev/null and b/fuzz/pkcs8_corpus/deec01201bbc195914e13ef72232b7c9037621d6 differ
diff --git a/fuzz/pkcs8_corpus/e04a67f8450728abc1cb798333fb02662af73783 b/fuzz/pkcs8_corpus/e04a67f8450728abc1cb798333fb02662af73783
new file mode 100644
index 0000000000..c779d2f84a
Binary files /dev/null and b/fuzz/pkcs8_corpus/e04a67f8450728abc1cb798333fb02662af73783 differ
diff --git a/fuzz/pkcs8_corpus/e068ada1130b0b15c89ea2ca6f6669f1c93e15ad b/fuzz/pkcs8_corpus/e068ada1130b0b15c89ea2ca6f6669f1c93e15ad
new file mode 100644
index 0000000000..0865dd97bf
Binary files /dev/null and b/fuzz/pkcs8_corpus/e068ada1130b0b15c89ea2ca6f6669f1c93e15ad differ
diff --git a/fuzz/pkcs8_corpus/e11800bf2fdd16e161fe7953a32188ce258f2b2f b/fuzz/pkcs8_corpus/e11800bf2fdd16e161fe7953a32188ce258f2b2f
new file mode 100644
index 0000000000..546f599188
Binary files /dev/null and b/fuzz/pkcs8_corpus/e11800bf2fdd16e161fe7953a32188ce258f2b2f differ
diff --git a/fuzz/pkcs8_corpus/e2e4eb9677b89340b2f5417f632c482547c82351 b/fuzz/pkcs8_corpus/e2e4eb9677b89340b2f5417f632c482547c82351
deleted file mode 100644
index b63d7b2538..0000000000
Binary files a/fuzz/pkcs8_corpus/e2e4eb9677b89340b2f5417f632c482547c82351 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/e30141f11b44f80ec4ae687b21c808cc3a37cdae b/fuzz/pkcs8_corpus/e30141f11b44f80ec4ae687b21c808cc3a37cdae
new file mode 100644
index 0000000000..25da73f090
Binary files /dev/null and b/fuzz/pkcs8_corpus/e30141f11b44f80ec4ae687b21c808cc3a37cdae differ
diff --git a/fuzz/pkcs8_corpus/e351dfb1894da4959f00e796e5de180696749107 b/fuzz/pkcs8_corpus/e351dfb1894da4959f00e796e5de180696749107
deleted file mode 100644
index fe88b4bee1..0000000000
Binary files a/fuzz/pkcs8_corpus/e351dfb1894da4959f00e796e5de180696749107 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/e40542b2b673b16062a3aaaf5faf17858fa7a881 b/fuzz/pkcs8_corpus/e40542b2b673b16062a3aaaf5faf17858fa7a881
new file mode 100644
index 0000000000..1c3fb8a289
Binary files /dev/null and b/fuzz/pkcs8_corpus/e40542b2b673b16062a3aaaf5faf17858fa7a881 differ
diff --git a/fuzz/pkcs8_corpus/ce930261d399a8646694d43c310c4c8271807e42 b/fuzz/pkcs8_corpus/e6a68cb366b6cd41a6d22d72fcfd7ed2b52f175a
similarity index 87%
rename from fuzz/pkcs8_corpus/ce930261d399a8646694d43c310c4c8271807e42
rename to fuzz/pkcs8_corpus/e6a68cb366b6cd41a6d22d72fcfd7ed2b52f175a
index ad26fa52a2..6e6120b2df 100644
Binary files a/fuzz/pkcs8_corpus/ce930261d399a8646694d43c310c4c8271807e42 and b/fuzz/pkcs8_corpus/e6a68cb366b6cd41a6d22d72fcfd7ed2b52f175a differ
diff --git a/fuzz/pkcs8_corpus/e6b71e9b658d168a0d916139816a7a61294cad14 b/fuzz/pkcs8_corpus/e6b71e9b658d168a0d916139816a7a61294cad14
new file mode 100644
index 0000000000..828781d780
Binary files /dev/null and b/fuzz/pkcs8_corpus/e6b71e9b658d168a0d916139816a7a61294cad14 differ
diff --git a/fuzz/pkcs8_corpus/e80465720724be777d760ff01466f0ddfcd2007d b/fuzz/pkcs8_corpus/e80465720724be777d760ff01466f0ddfcd2007d
new file mode 100644
index 0000000000..706d623659
Binary files /dev/null and b/fuzz/pkcs8_corpus/e80465720724be777d760ff01466f0ddfcd2007d differ
diff --git a/fuzz/pkcs8_corpus/e874b38d89f3f8d86d460b22700f8a17ccc912ab b/fuzz/pkcs8_corpus/e874b38d89f3f8d86d460b22700f8a17ccc912ab
new file mode 100644
index 0000000000..65c6de2e86
--- /dev/null
+++ b/fuzz/pkcs8_corpus/e874b38d89f3f8d86d460b22700f8a17ccc912ab
@@ -0,0 +1 @@
+­�
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/e8b2e9ef1ceb07df2906442289378882f71d8b65 b/fuzz/pkcs8_corpus/e8b2e9ef1ceb07df2906442289378882f71d8b65
deleted file mode 100644
index b3c1318b64..0000000000
Binary files a/fuzz/pkcs8_corpus/e8b2e9ef1ceb07df2906442289378882f71d8b65 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/e922ba00132e742d435c6caafed22be03024e3dc b/fuzz/pkcs8_corpus/e922ba00132e742d435c6caafed22be03024e3dc
new file mode 100644
index 0000000000..3b88186886
--- /dev/null
+++ b/fuzz/pkcs8_corpus/e922ba00132e742d435c6caafed22be03024e3dc
@@ -0,0 +1 @@
+0*
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/e95f12e24ffae5a90ae74fb56a472129d12f3d3e b/fuzz/pkcs8_corpus/e95f12e24ffae5a90ae74fb56a472129d12f3d3e
new file mode 100644
index 0000000000..0be822a89d
Binary files /dev/null and b/fuzz/pkcs8_corpus/e95f12e24ffae5a90ae74fb56a472129d12f3d3e differ
diff --git a/fuzz/pkcs8_corpus/e9c7b2536d0d0e3d86a7ab8efe741c95d3bc8d94 b/fuzz/pkcs8_corpus/e9c7b2536d0d0e3d86a7ab8efe741c95d3bc8d94
deleted file mode 100644
index ac73590a05..0000000000
Binary files a/fuzz/pkcs8_corpus/e9c7b2536d0d0e3d86a7ab8efe741c95d3bc8d94 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/ea4bae09a2b01346d85cad8fbcca21fafff0a644 b/fuzz/pkcs8_corpus/ea4bae09a2b01346d85cad8fbcca21fafff0a644
deleted file mode 100644
index 498310dc63..0000000000
--- a/fuzz/pkcs8_corpus/ea4bae09a2b01346d85cad8fbcca21fafff0a644
+++ /dev/null
@@ -1 +0,0 @@
-ÿÿÿÿÿ
\ No newline at end of file
diff --git a/fuzz/pkcs8_corpus/eabc61290e8a09e65aca0cdc76139dafe3faeefd b/fuzz/pkcs8_corpus/eabc61290e8a09e65aca0cdc76139dafe3faeefd
new file mode 100644
index 0000000000..1bf1ea25d6
Binary files /dev/null and b/fuzz/pkcs8_corpus/eabc61290e8a09e65aca0cdc76139dafe3faeefd differ
diff --git a/fuzz/pkcs8_corpus/eaea25b77d88b692199ca4fb0fda6d20fcebf572 b/fuzz/pkcs8_corpus/eaea25b77d88b692199ca4fb0fda6d20fcebf572
new file mode 100644
index 0000000000..0d8f70345e
Binary files /dev/null and b/fuzz/pkcs8_corpus/eaea25b77d88b692199ca4fb0fda6d20fcebf572 differ
diff --git a/fuzz/pkcs8_corpus/eb02e0eee33723456180c11cecbe2f600fa88be6 b/fuzz/pkcs8_corpus/eb02e0eee33723456180c11cecbe2f600fa88be6
deleted file mode 100644
index 738a5d146b..0000000000
Binary files a/fuzz/pkcs8_corpus/eb02e0eee33723456180c11cecbe2f600fa88be6 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/eb2eb7b79c6a2f9d5b3dc692e97de3a55cc881e4 b/fuzz/pkcs8_corpus/eb2eb7b79c6a2f9d5b3dc692e97de3a55cc881e4
deleted file mode 100644
index 1cf74634a8..0000000000
Binary files a/fuzz/pkcs8_corpus/eb2eb7b79c6a2f9d5b3dc692e97de3a55cc881e4 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/eb87589a58b3e16e86ccfc64f56c8f7c0afb23a9 b/fuzz/pkcs8_corpus/eb87589a58b3e16e86ccfc64f56c8f7c0afb23a9
new file mode 100644
index 0000000000..084c068db9
Binary files /dev/null and b/fuzz/pkcs8_corpus/eb87589a58b3e16e86ccfc64f56c8f7c0afb23a9 differ
diff --git a/fuzz/pkcs8_corpus/ec80d7cc2ed4e35b08f617fb7ddce963ac44f093 b/fuzz/pkcs8_corpus/ec80d7cc2ed4e35b08f617fb7ddce963ac44f093
deleted file mode 100644
index 79e863737a..0000000000
Binary files a/fuzz/pkcs8_corpus/ec80d7cc2ed4e35b08f617fb7ddce963ac44f093 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/ec8d1cae4a6deacbeb36c7a58856d31289a360bc b/fuzz/pkcs8_corpus/ec8d1cae4a6deacbeb36c7a58856d31289a360bc
new file mode 100644
index 0000000000..529f44325c
Binary files /dev/null and b/fuzz/pkcs8_corpus/ec8d1cae4a6deacbeb36c7a58856d31289a360bc differ
diff --git a/fuzz/pkcs8_corpus/ed0c62096d5507dbb680b7fbdb2eae52dd153845 b/fuzz/pkcs8_corpus/ed0c62096d5507dbb680b7fbdb2eae52dd153845
new file mode 100644
index 0000000000..3d55a17757
Binary files /dev/null and b/fuzz/pkcs8_corpus/ed0c62096d5507dbb680b7fbdb2eae52dd153845 differ
diff --git a/fuzz/pkcs8_corpus/ee9663d0c30947d1c902c1d0ae5a03a2fb2bca2d b/fuzz/pkcs8_corpus/ee9663d0c30947d1c902c1d0ae5a03a2fb2bca2d
new file mode 100644
index 0000000000..f78d646ef6
Binary files /dev/null and b/fuzz/pkcs8_corpus/ee9663d0c30947d1c902c1d0ae5a03a2fb2bca2d differ
diff --git a/fuzz/pkcs8_corpus/efcc91e52ff2ae8a9b2608dec413d6f5c370248f b/fuzz/pkcs8_corpus/efcc91e52ff2ae8a9b2608dec413d6f5c370248f
deleted file mode 100644
index e66afb0384..0000000000
Binary files a/fuzz/pkcs8_corpus/efcc91e52ff2ae8a9b2608dec413d6f5c370248f and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f08b2992481c1d8e4f8214aa147ab372c473881c b/fuzz/pkcs8_corpus/f08b2992481c1d8e4f8214aa147ab372c473881c
new file mode 100644
index 0000000000..96a04a2092
Binary files /dev/null and b/fuzz/pkcs8_corpus/f08b2992481c1d8e4f8214aa147ab372c473881c differ
diff --git a/fuzz/pkcs8_corpus/f0905766f64484a50773b8120fd61ad3539f59cc b/fuzz/pkcs8_corpus/f0905766f64484a50773b8120fd61ad3539f59cc
deleted file mode 100644
index a9794307f3..0000000000
Binary files a/fuzz/pkcs8_corpus/f0905766f64484a50773b8120fd61ad3539f59cc and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f1c64b0ae0dabf9972a70a6247b1becce128b8e0 b/fuzz/pkcs8_corpus/f1c64b0ae0dabf9972a70a6247b1becce128b8e0
deleted file mode 100644
index 1471610177..0000000000
Binary files a/fuzz/pkcs8_corpus/f1c64b0ae0dabf9972a70a6247b1becce128b8e0 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f20103052fde2168ab8ec0ad21d184f2ea10572c b/fuzz/pkcs8_corpus/f20103052fde2168ab8ec0ad21d184f2ea10572c
new file mode 100644
index 0000000000..7e16f9ff46
Binary files /dev/null and b/fuzz/pkcs8_corpus/f20103052fde2168ab8ec0ad21d184f2ea10572c differ
diff --git a/fuzz/pkcs8_corpus/f3050a7a27493bd15440ceb463952c904e8a4631 b/fuzz/pkcs8_corpus/f3050a7a27493bd15440ceb463952c904e8a4631
deleted file mode 100644
index 6b81253ba0..0000000000
Binary files a/fuzz/pkcs8_corpus/f3050a7a27493bd15440ceb463952c904e8a4631 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f32f61eda13ad477b8be57bb4c31d28004a41a7c b/fuzz/pkcs8_corpus/f32f61eda13ad477b8be57bb4c31d28004a41a7c
deleted file mode 100644
index a48d062393..0000000000
Binary files a/fuzz/pkcs8_corpus/f32f61eda13ad477b8be57bb4c31d28004a41a7c and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f358b957ffbb7186253e4d399c5caecd6622ae4e b/fuzz/pkcs8_corpus/f358b957ffbb7186253e4d399c5caecd6622ae4e
deleted file mode 100644
index 8c66d55ffd..0000000000
Binary files a/fuzz/pkcs8_corpus/f358b957ffbb7186253e4d399c5caecd6622ae4e and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/7b2e8b7ea5573404c91a82f1af8c308909e477d5 b/fuzz/pkcs8_corpus/f3bccf51081b02a69e567f8778200d63cade1198
similarity index 87%
rename from fuzz/pkcs8_corpus/7b2e8b7ea5573404c91a82f1af8c308909e477d5
rename to fuzz/pkcs8_corpus/f3bccf51081b02a69e567f8778200d63cade1198
index b203e598f7..326e4cfa02 100644
Binary files a/fuzz/pkcs8_corpus/7b2e8b7ea5573404c91a82f1af8c308909e477d5 and b/fuzz/pkcs8_corpus/f3bccf51081b02a69e567f8778200d63cade1198 differ
diff --git a/fuzz/pkcs8_corpus/f407a9dcb0d70a4bf906a622f95c795e0c8e553e b/fuzz/pkcs8_corpus/f407a9dcb0d70a4bf906a622f95c795e0c8e553e
new file mode 100644
index 0000000000..3c817b5796
Binary files /dev/null and b/fuzz/pkcs8_corpus/f407a9dcb0d70a4bf906a622f95c795e0c8e553e differ
diff --git a/fuzz/pkcs8_corpus/f449712e8da7b4ee8092ebd3df7f0e9f84619e7b b/fuzz/pkcs8_corpus/f449712e8da7b4ee8092ebd3df7f0e9f84619e7b
deleted file mode 100644
index 0ab9ff5d6c..0000000000
Binary files a/fuzz/pkcs8_corpus/f449712e8da7b4ee8092ebd3df7f0e9f84619e7b and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f4575edfbfd85b63cf022f79338ca01976550780 b/fuzz/pkcs8_corpus/f4575edfbfd85b63cf022f79338ca01976550780
new file mode 100644
index 0000000000..7bbf5099f7
Binary files /dev/null and b/fuzz/pkcs8_corpus/f4575edfbfd85b63cf022f79338ca01976550780 differ
diff --git a/fuzz/pkcs8_corpus/12b3670a3ab023226b893498900481604713aa40 b/fuzz/pkcs8_corpus/f479a91092f0ad311e38669d39d6ef186886ed67
similarity index 50%
rename from fuzz/pkcs8_corpus/12b3670a3ab023226b893498900481604713aa40
rename to fuzz/pkcs8_corpus/f479a91092f0ad311e38669d39d6ef186886ed67
index 1c1b19afd5..7c67e43552 100644
Binary files a/fuzz/pkcs8_corpus/12b3670a3ab023226b893498900481604713aa40 and b/fuzz/pkcs8_corpus/f479a91092f0ad311e38669d39d6ef186886ed67 differ
diff --git a/fuzz/pkcs8_corpus/f54f8e5533e4c5881b84e78677d4cc9574131d54 b/fuzz/pkcs8_corpus/f54f8e5533e4c5881b84e78677d4cc9574131d54
new file mode 100644
index 0000000000..e7b1910372
Binary files /dev/null and b/fuzz/pkcs8_corpus/f54f8e5533e4c5881b84e78677d4cc9574131d54 differ
diff --git a/fuzz/pkcs8_corpus/f5752ad6a1c61e7ae1e10d0defd1bf789577997f b/fuzz/pkcs8_corpus/f5752ad6a1c61e7ae1e10d0defd1bf789577997f
new file mode 100644
index 0000000000..3159b35e2b
Binary files /dev/null and b/fuzz/pkcs8_corpus/f5752ad6a1c61e7ae1e10d0defd1bf789577997f differ
diff --git a/fuzz/pkcs8_corpus/f67d5cb936a708038d4e30af67becce341b47a55 b/fuzz/pkcs8_corpus/f67d5cb936a708038d4e30af67becce341b47a55
new file mode 100644
index 0000000000..f5d7c0d57f
Binary files /dev/null and b/fuzz/pkcs8_corpus/f67d5cb936a708038d4e30af67becce341b47a55 differ
diff --git a/fuzz/pkcs8_corpus/f68fcf79c86b6dc1c9aa5953e25626437e79289f b/fuzz/pkcs8_corpus/f68fcf79c86b6dc1c9aa5953e25626437e79289f
deleted file mode 100644
index 4523d54529..0000000000
Binary files a/fuzz/pkcs8_corpus/f68fcf79c86b6dc1c9aa5953e25626437e79289f and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/f6b3c452a36a3e63f448971071bd4d43a8705269 b/fuzz/pkcs8_corpus/f6b3c452a36a3e63f448971071bd4d43a8705269
new file mode 100644
index 0000000000..abcca6bce7
Binary files /dev/null and b/fuzz/pkcs8_corpus/f6b3c452a36a3e63f448971071bd4d43a8705269 differ
diff --git a/fuzz/pkcs8_corpus/f8a9060fcd6d37388da0d664a863952c5894bcb1 b/fuzz/pkcs8_corpus/f8a9060fcd6d37388da0d664a863952c5894bcb1
new file mode 100644
index 0000000000..26606ebafc
Binary files /dev/null and b/fuzz/pkcs8_corpus/f8a9060fcd6d37388da0d664a863952c5894bcb1 differ
diff --git a/fuzz/pkcs8_corpus/f8bd5a42e527e67e198e2396eb9be56a39f27ca5 b/fuzz/pkcs8_corpus/f8bd5a42e527e67e198e2396eb9be56a39f27ca5
new file mode 100644
index 0000000000..f9a349a2bf
Binary files /dev/null and b/fuzz/pkcs8_corpus/f8bd5a42e527e67e198e2396eb9be56a39f27ca5 differ
diff --git a/fuzz/pkcs8_corpus/f94a9ad7d6f5d6c64c615134d0398294e49d70ad b/fuzz/pkcs8_corpus/f94a9ad7d6f5d6c64c615134d0398294e49d70ad
new file mode 100644
index 0000000000..977eb9ceeb
Binary files /dev/null and b/fuzz/pkcs8_corpus/f94a9ad7d6f5d6c64c615134d0398294e49d70ad differ
diff --git a/fuzz/pkcs8_corpus/f9b79d8d9c628413e562888befc7adf746c14092 b/fuzz/pkcs8_corpus/f9b79d8d9c628413e562888befc7adf746c14092
deleted file mode 100644
index edb168df1c..0000000000
Binary files a/fuzz/pkcs8_corpus/f9b79d8d9c628413e562888befc7adf746c14092 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/fa3a3297e26624648f6df74faa90d9641f14f984 b/fuzz/pkcs8_corpus/fa3a3297e26624648f6df74faa90d9641f14f984
deleted file mode 100644
index f32de06f7a..0000000000
Binary files a/fuzz/pkcs8_corpus/fa3a3297e26624648f6df74faa90d9641f14f984 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/fa914e9e1e3d70bbadb0ec0f0a3d20b2db3cea86 b/fuzz/pkcs8_corpus/fa914e9e1e3d70bbadb0ec0f0a3d20b2db3cea86
deleted file mode 100644
index d52ba521da..0000000000
Binary files a/fuzz/pkcs8_corpus/fa914e9e1e3d70bbadb0ec0f0a3d20b2db3cea86 and /dev/null differ
diff --git a/fuzz/pkcs8_corpus/fa97fc60cf527b173996aff54c52c7820cba7085 b/fuzz/pkcs8_corpus/fa97fc60cf527b173996aff54c52c7820cba7085
new file mode 100644
index 0000000000..d49c6f124a
Binary files /dev/null and b/fuzz/pkcs8_corpus/fa97fc60cf527b173996aff54c52c7820cba7085 differ
diff --git a/fuzz/pkcs8_corpus/faf1791bc3a02483e98e54e5d669f93e187416b3 b/fuzz/pkcs8_corpus/faf1791bc3a02483e98e54e5d669f93e187416b3
new file mode 100644
index 0000000000..993c2ed0d8
Binary files /dev/null and b/fuzz/pkcs8_corpus/faf1791bc3a02483e98e54e5d669f93e187416b3 differ
diff --git a/fuzz/pkcs8_corpus/fb555f80172c1a6962a6f4ea56896f7ed91714b5 b/fuzz/pkcs8_corpus/fb555f80172c1a6962a6f4ea56896f7ed91714b5
new file mode 100644
index 0000000000..a670322166
Binary files /dev/null and b/fuzz/pkcs8_corpus/fb555f80172c1a6962a6f4ea56896f7ed91714b5 differ
diff --git a/fuzz/pkcs8_corpus/fb8b3ac04431e3f9809348fb2473b903124a777b b/fuzz/pkcs8_corpus/fb8b3ac04431e3f9809348fb2473b903124a777b
new file mode 100644
index 0000000000..5bfeafa7bd
Binary files /dev/null and b/fuzz/pkcs8_corpus/fb8b3ac04431e3f9809348fb2473b903124a777b differ
diff --git a/fuzz/pkcs8_corpus/fc65a242d2c36639c677e0ff442640daeee12ceb b/fuzz/pkcs8_corpus/fc65a242d2c36639c677e0ff442640daeee12ceb
new file mode 100644
index 0000000000..965fd39ab5
Binary files /dev/null and b/fuzz/pkcs8_corpus/fc65a242d2c36639c677e0ff442640daeee12ceb differ
diff --git a/fuzz/pkcs8_corpus/fda1d6a275e1206ec1362df5a3289a47760e4d2b b/fuzz/pkcs8_corpus/fda1d6a275e1206ec1362df5a3289a47760e4d2b
new file mode 100644
index 0000000000..cd6c0d2256
Binary files /dev/null and b/fuzz/pkcs8_corpus/fda1d6a275e1206ec1362df5a3289a47760e4d2b differ
diff --git a/fuzz/pkcs8_corpus/dd1a38b3f0865e046e433e406b1c27999559428f b/fuzz/pkcs8_corpus/fe3ade46436956f091c973c6437584932b02fbf3
similarity index 81%
rename from fuzz/pkcs8_corpus/dd1a38b3f0865e046e433e406b1c27999559428f
rename to fuzz/pkcs8_corpus/fe3ade46436956f091c973c6437584932b02fbf3
index 7d27f6fe39..76b6b65504 100644
Binary files a/fuzz/pkcs8_corpus/dd1a38b3f0865e046e433e406b1c27999559428f and b/fuzz/pkcs8_corpus/fe3ade46436956f091c973c6437584932b02fbf3 differ
diff --git a/fuzz/pkcs8_corpus/fed1badacb72d74cab102a3dbdbc5914caa0ce47 b/fuzz/pkcs8_corpus/fed1badacb72d74cab102a3dbdbc5914caa0ce47
new file mode 100644
index 0000000000..a93972c508
Binary files /dev/null and b/fuzz/pkcs8_corpus/fed1badacb72d74cab102a3dbdbc5914caa0ce47 differ
diff --git a/include/openssl/base.h b/include/openssl/base.h
index b2ed56d1b2..8416520aa1 100644
--- a/include/openssl/base.h
+++ b/include/openssl/base.h
@@ -122,7 +122,7 @@ extern "C" {
 // ServiceIndicatorTest.AWSLCVersionString
 // Note: there are two versions of this test. Only one test is compiled
 // depending on FIPS mode.
-#define AWSLC_VERSION_NUMBER_STRING "1.45.0"
+#define AWSLC_VERSION_NUMBER_STRING "1.46.0"
 
 #if defined(BORINGSSL_SHARED_LIBRARY)
 
diff --git a/include/openssl/target.h b/include/openssl/target.h
index a3582c0f18..2a907dd797 100644
--- a/include/openssl/target.h
+++ b/include/openssl/target.h
@@ -49,6 +49,10 @@
 #define OPENSSL_64_BIT
 #define OPENSSL_S390X
 #define OPENSSL_BIG_ENDIAN
+#elif defined(__sparc__) && defined(_BIG_ENDIAN)
+#define OPENSSL_64_BIT
+#define OPENSSL_SPARCV9
+#define OPENSSL_BIG_ENDIAN
 #elif defined(__MIPSEL__) && !defined(__LP64__)
 #define OPENSSL_32_BIT
 #define OPENSSL_MIPS
diff --git a/tests/ci/integration/run_openssh_integration.sh b/tests/ci/integration/run_openssh_integration.sh
index 771b92df5a..8eac1dfdc8 100755
--- a/tests/ci/integration/run_openssh_integration.sh
+++ b/tests/ci/integration/run_openssh_integration.sh
@@ -49,11 +49,17 @@ function install_aws_lc() {
 function openssh_build() {
   pushd "${OPENSSH_WORKSPACE_FOLDER}"
   autoreconf
-  # The RSA_meth_XXX functions are not implemented by AWS-LC, and the implementation provided by OpenSSH also doesn't compile for us.
-  # Fortunately, these functions are only needed for pkcs11 support, which is disabled for our build.
-  # See: https://github.com/openssh/openssh-portable/pull/385
-  export CFLAGS="-DBN_FLG_CONSTTIME=0x04 -DHAVE_RSA_METH_FREE=1 -DHAVE_RSA_METH_DUP=1 -DHAVE_RSA_METH_SET1_NAME=1 -DHAVE_RSA_METH_GET_FINISH=1 -DHAVE_RSA_METH_SET_PRIV_ENC=1 -DHAVE_RSA_METH_SET_PRIV_DEC=1 -DHAVE_RSA_METH_SET_FINISH=1 "
-  ./configure --with-ssl-dir="${AWS_LC_INSTALL_FOLDER}" --prefix="${OPENSSH_INSTALL_FOLDER}" --disable-pkcs11
+
+  if [ "$OPENSSH_BRANCH" == "master" ]; then
+    ./configure --with-ssl-dir="${AWS_LC_INSTALL_FOLDER}" --prefix="${OPENSSH_INSTALL_FOLDER}"
+  else
+    # The RSA_meth_XXX functions are not implemented by AWS-LC, and the implementation provided by OpenSSH also doesn't compile for us.
+    # Fortunately, these functions are only needed for pkcs11 support, which is disabled for our build.
+    # See: https://github.com/openssh/openssh-portable/pull/385
+    export CFLAGS="-DBN_FLG_CONSTTIME=0x04 -DHAVE_RSA_METH_DUP=1 -DHAVE_RSA_METH_SET1_NAME=1 -DHAVE_RSA_METH_GET_FINISH=1 "
+    ./configure --with-ssl-dir="${AWS_LC_INSTALL_FOLDER}" --prefix="${OPENSSH_INSTALL_FOLDER}" --disable-pkcs11
+  fi
+
   make -j "$NUM_CPU_THREADS"
   make install
   ls -R "${OPENSSH_INSTALL_FOLDER}"
diff --git a/tests/ci/run_fips_tests.sh b/tests/ci/run_fips_tests.sh
index b3841c3bc7..af432696eb 100755
--- a/tests/ci/run_fips_tests.sh
+++ b/tests/ci/run_fips_tests.sh
@@ -34,6 +34,7 @@ if static_linux_supported || static_openbsd_supported; then
   echo "Testing AWS-LC static breakable release build"
   run_build -DFIPS=1 -DCMAKE_C_FLAGS="-DBORINGSSL_FIPS_BREAK_TESTS"
   ./util/fipstools/test-break-kat.sh
+  ./util/fipstools/test-runtime-pwct.sh
   export BORINGSSL_FIPS_BREAK_TEST="RSA_PWCT"
   ${BUILD_ROOT}/crypto/crypto_test --gtest_filter="RSADeathTest.KeygenFailAndDie"
   unset BORINGSSL_FIPS_BREAK_TEST
diff --git a/tool-openssl/crl.cc b/tool-openssl/crl.cc
index 5449c4b2b7..d47e9757df 100644
--- a/tool-openssl/crl.cc
+++ b/tool-openssl/crl.cc
@@ -17,7 +17,9 @@ static const argument_t kArguments[] = {
 
 bool CRLTool(const args_list_t &args) {
   args_map_t parsed_args;
-  if (!ParseKeyValueArguments(&parsed_args, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(parsed_args, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool-openssl/rsa.cc b/tool-openssl/rsa.cc
index 9cc4da79a7..4a1457f76b 100644
--- a/tool-openssl/rsa.cc
+++ b/tool-openssl/rsa.cc
@@ -17,7 +17,9 @@ static const argument_t kArguments[] = {
 // Map arguments using tool/args.cc
 bool rsaTool(const args_list_t &args) {
   args_map_t parsed_args;
-  if (!ParseKeyValueArguments(&parsed_args, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(parsed_args, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool-openssl/s_client.cc b/tool-openssl/s_client.cc
index eb15c3d959..d6e414a727 100644
--- a/tool-openssl/s_client.cc
+++ b/tool-openssl/s_client.cc
@@ -30,8 +30,10 @@ static const argument_t kArguments[] = {
 
 bool SClientTool(const args_list_t &args) {
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool-openssl/verify.cc b/tool-openssl/verify.cc
index 6c77a6638f..98cf080d55 100644
--- a/tool-openssl/verify.cc
+++ b/tool-openssl/verify.cc
@@ -10,11 +10,16 @@
 // be a required argument. Once support for default trust stores is added,
 // make it an optional argument.
 static const argument_t kArguments[] = {
-        { "-help", kBooleanArgument, "Display option summary" },
-        { "-CAfile", kRequiredArgument, "A file of trusted certificates. The "
-                "file should contain one or more certificates in PEM format." },
-        { "", kOptionalArgument, "" }
-};
+    {"-help", kBooleanArgument, "Display option summary"},
+    {"-CAfile", kRequiredArgument,
+     "A file of trusted certificates. The "
+     "file should contain one or more certificates in PEM format."},
+    {"-untrusted", kOptionalArgument,
+     "A file of untrusted certificates to be used for chain building. The "
+     "file should contain one or more certificates in PEM format."},
+    {"-x509_strict", kBooleanArgument,
+     "This argument is a no-op. AWS-LC is always strict."},
+    {"", kOptionalArgument, ""}};
 
 // setup_verification_store sets up an X509 certificate store for verification.
 // It configures the store with file and directory lookups. It loads the
@@ -88,14 +93,43 @@ static int cb(int ok, X509_STORE_CTX *ctx) {
   return ok;
 }
 
-static int check(X509_STORE *ctx, const char *file) {
+static int check(X509_STORE *ctx, const char* chainfile, const char *certfile) {
+  bssl::UniquePtr<STACK_OF(X509)> chain(sk_X509_new_null());
   bssl::UniquePtr<X509> cert;
   int i = 0, ret = 0;
 
-  if (file) {
-    ScopedFILE cert_file(fopen(file, "rb"));
+  if (chainfile) {
+    ScopedFILE chain_file(fopen(chainfile, "rb"));
+    if (!chain_file) {
+      fprintf(stderr, "error %s: reading certificate failed\n", certfile);
+      return 0;
+    }
+    bssl::UniquePtr<BIO> chain_bio(BIO_new_fp(chain_file.get(), BIO_NOCLOSE));
+    size_t count = 0;
+    while(1) {
+      bssl::UniquePtr<X509> chain_cert(PEM_read_bio_X509(chain_bio.get(), NULL, NULL, NULL));
+      if (chain_cert.get() == nullptr) {
+        uint32_t error = ERR_peek_last_error();
+        if (ERR_GET_LIB(error) == ERR_LIB_PEM &&
+            ERR_GET_REASON(error) == PEM_R_NO_START_LINE && count > 0) {
+          ERR_clear_error();
+          break;
+        }
+        fprintf(stderr, "error %s: reading chain certificates failed\n",
+                chainfile);
+        return 0;
+      }
+      if(!sk_X509_push(chain.get(), chain_cert.release())) {
+        return 0;
+      }
+      count++;
+    }
+  }
+
+  if (certfile) {
+    ScopedFILE cert_file(fopen(certfile, "rb"));
     if (!cert_file) {
-      fprintf(stderr, "error %s: reading certificate failed\n", file);
+      fprintf(stderr, "error %s: reading certificate failed\n", certfile);
       return 0;
     }
     cert.reset(PEM_read_X509(cert_file.get(), nullptr, nullptr, nullptr));
@@ -112,35 +146,39 @@ static int check(X509_STORE *ctx, const char *file) {
   bssl::UniquePtr<X509_STORE_CTX> store_ctx(X509_STORE_CTX_new());
   if (store_ctx == nullptr || store_ctx.get() == nullptr) {
     fprintf(stderr, "error %s: X.509 store context allocation failed\n",
-               (file == nullptr) ? "stdin" : file);
+               (certfile == nullptr) ? "stdin" : certfile);
     return 0;
   }
 
-  if (!X509_STORE_CTX_init(store_ctx.get(), ctx, cert.get(), nullptr)) {
+  if (!X509_STORE_CTX_init(store_ctx.get(), ctx, cert.get(), chain.get())) {
     fprintf(stderr,
                "error %s: X.509 store context initialization failed\n",
-               (file == nullptr) ? "stdin" : file);
+               (certfile == nullptr) ? "stdin" : certfile);
     return 0;
   }
 
   i = X509_verify_cert(store_ctx.get());
   if (i > 0 && X509_STORE_CTX_get_error(store_ctx.get()) == X509_V_OK) {
-    fprintf(stdout, "%s: OK\n", (file == nullptr) ? "stdin" : file);
+    fprintf(stdout, "%s: OK\n", (certfile == nullptr) ? "stdin" : certfile);
     ret = 1;
   } else {
     fprintf(stderr,
                "error %s: verification failed\n",
-               (file == nullptr) ? "stdin" : file);
+               (certfile == nullptr) ? "stdin" : certfile);
   }
 
   return ret;
 }
 
 bool VerifyTool(const args_list_t &args) {
-  std::string cafile;
-  size_t i = 0;
+  args_map_t parsed_args;
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(parsed_args, extra_args, args, kArguments)) {
+    PrintUsage(kArguments);
+    return false;
+  }
 
-  if (args.size() == 1 && args[0] == "-help") {
+  if (parsed_args.count("-help") || parsed_args.size() == 0) {
     fprintf(stderr,
             "Usage: verify [options] [cert.pem...]\n"
             "Certificates must be in PEM format. They can be specified in one or more files.\n"
@@ -150,15 +188,7 @@ bool VerifyTool(const args_list_t &args) {
     return false;
   }
 
-  // i helps track whether input will be provided via stdin or through a file
-  if (args.size() >= 1 && args[0] == "-CAfile") {
-    cafile = args[1];
-    i += 2;
-  } else {
-    fprintf(stderr, "-CAfile must be specified. This tool does not load"
-                    " the default trust store.\n");
-    return false;
-  }
+  std::string cafile = parsed_args["-CAfile"];
 
   bssl::UniquePtr<X509_STORE> store(setup_verification_store(cafile));
   // Initialize certificate verification store
@@ -172,13 +202,15 @@ bool VerifyTool(const args_list_t &args) {
 
   int ret = 1;
 
+  const char *chain = parsed_args.count("-untrusted") ? parsed_args["-untrusted"].c_str() : NULL;
+
   // No additional file or certs provided, read from stdin
-  if (args.size() == i) {
-    ret &= check(store.get(), NULL);
+  if (extra_args.size() == 0) {
+    ret &= check(store.get(), chain, NULL);
   } else {
     // Certs provided as files
-    for (; i < args.size(); i++) {
-      ret &= check(store.get(), args[i].c_str());
+    for (size_t i = 0; i < extra_args.size(); i++) {
+      ret &= check(store.get(), chain, extra_args[i].c_str());
     }
   }
 
diff --git a/tool-openssl/verify_test.cc b/tool-openssl/verify_test.cc
index 9915a69bf3..3c905aefdf 100644
--- a/tool-openssl/verify_test.cc
+++ b/tool-openssl/verify_test.cc
@@ -13,6 +13,7 @@ class VerifyTest : public ::testing::Test {
 protected:
     void SetUp() override {
       ASSERT_GT(createTempFILEpath(ca_path), 0u);
+      ASSERT_GT(createTempFILEpath(chain_path), 0u);
       ASSERT_GT(createTempFILEpath(in_path), 0u);
 
       bssl::UniquePtr<X509> x509(CreateAndSignX509Certificate());
@@ -25,12 +26,18 @@ class VerifyTest : public ::testing::Test {
       ScopedFILE ca_file(fopen(ca_path, "wb"));
       ASSERT_TRUE(ca_file);
       ASSERT_TRUE(PEM_write_X509(ca_file.get(), x509.get()));
+
+      ScopedFILE chain_file(fopen(chain_path, "wb"));
+      ASSERT_TRUE(chain_file);
+      ASSERT_TRUE(PEM_write_X509(chain_file.get(), x509.get()));
     }
     void TearDown() override {
       RemoveFile(ca_path);
+      RemoveFile(chain_path);
       RemoveFile(in_path);
     }
     char ca_path[PATH_MAX];
+    char chain_path[PATH_MAX];
     char in_path[PATH_MAX];
 };
 
@@ -51,6 +58,19 @@ TEST_F(VerifyTest, VerifyTestSelfSignedCertWithoutCAfile) {
   ASSERT_FALSE(result);
 }
 
+// Test certificate with -untrusted
+TEST_F(VerifyTest, VerifyTestSelfSignedCertWithUntrustedChain) {
+  args_list_t args = {"-untrusted", chain_path, in_path};
+  bool result = VerifyTool(args);
+  ASSERT_FALSE(result);
+}
+
+// Test certificate with -untrusted and -CAfile
+TEST_F(VerifyTest, VerifyTestSelfSignedCertWithCAFileAndUntrustedChain) {
+  args_list_t args = {"-CAfile", ca_path, "-untrusted", chain_path, in_path};
+  bool result = VerifyTool(args);
+  ASSERT_TRUE(result);
+}
 
 // -------------------- Verify OpenSSL Comparison Tests --------------------------
 
diff --git a/tool-openssl/version.cc b/tool-openssl/version.cc
index 294a444893..7643ba5337 100644
--- a/tool-openssl/version.cc
+++ b/tool-openssl/version.cc
@@ -10,7 +10,9 @@ static const argument_t kArguments[] = {
 
 bool VersionTool(const args_list_t &args) {
   args_map_t parsed_args;
-  if (!ParseKeyValueArguments(&parsed_args, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(parsed_args, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool-openssl/x509.cc b/tool-openssl/x509.cc
index b12fc66ede..037dc6f664 100644
--- a/tool-openssl/x509.cc
+++ b/tool-openssl/x509.cc
@@ -6,6 +6,7 @@
 #include <openssl/rsa.h>
 #include "internal.h"
 #include <ctime>
+#include <string>
 
 static const argument_t kArguments[] = {
   { "-help", kBooleanArgument, "Display option summary" },
@@ -41,6 +42,14 @@ static bool WriteSignedCertificate(X509 *x509, bssl::UniquePtr<BIO> &output_bio,
   return true;
 }
 
+static bool isCharUpperCaseEqual(char a, char b) {
+  return ::toupper(a) ==  ::toupper(b);
+}
+
+static bool isStringUpperCaseEqual(const std::string &a, const std::string &b) {
+  return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin(), isCharUpperCaseEqual);
+}
+
 bool LoadPrivateKeyAndSignCertificate(X509 *x509, const std::string &signkey_path) {
   ScopedFILE signkey_file(fopen(signkey_path.c_str(), "rb"));
   if (!signkey_file) {
@@ -69,7 +78,9 @@ bool IsNumeric(const std::string& str) {
 // Map arguments using tool/args.cc
 bool X509Tool(const args_list_t &args) {
   args_map_t parsed_args;
-  if (!ParseKeyValueArguments(&parsed_args, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(parsed_args, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
@@ -151,7 +162,7 @@ bool X509Tool(const args_list_t &args) {
 
   // Check -inform has a valid value
   if(!inform.empty()) {
-    if (inform != "DER" && inform != "PEM") {
+    if (!isStringUpperCaseEqual(inform, "DER") && !isStringUpperCaseEqual(inform, "PEM")) {
       fprintf(stderr, "Error: '-inform' option must specify a valid encoding DER|PEM\n");
       return false;
     }
@@ -171,7 +182,7 @@ bool X509Tool(const args_list_t &args) {
 
   if (req) {
     bssl::UniquePtr<X509_REQ> csr;
-    if (!inform.empty() && inform == "DER") {
+    if (!inform.empty() && isStringUpperCaseEqual(inform, "DER")) {
       csr.reset(d2i_X509_REQ_fp(in_file.get(), nullptr));
     } else {
       csr.reset(PEM_read_X509_REQ(in_file.get(), nullptr, nullptr, nullptr));
@@ -230,7 +241,7 @@ bool X509Tool(const args_list_t &args) {
   } else {
     // Parse x509 certificate from input file
     bssl::UniquePtr<X509> x509;
-    if (!inform.empty() && inform == "DER") {
+    if (!inform.empty() && isStringUpperCaseEqual(inform, "DER")) {
       x509.reset(d2i_X509_fp(in_file.get(), nullptr));
     } else {
       x509.reset(PEM_read_X509(in_file.get(), nullptr, nullptr, nullptr));
diff --git a/tool/args.cc b/tool/args.cc
index 642856ce57..fdcaf9e5b5 100644
--- a/tool/args.cc
+++ b/tool/args.cc
@@ -23,10 +23,16 @@
 
 #include "internal.h"
 
-bool ParseKeyValueArguments(args_map_t *out_args,
+bool IsFlag(const std::string& arg) {
+  return arg.length() > 1 && (arg[0] == '-' || (arg.length() > 2 && arg[0] == '-' && arg[1] == '-'));
+}
+
+bool ParseKeyValueArguments(args_map_t &out_args,
+                          args_list_t &extra_args,
                           const args_list_t &args,
                           const argument_t *templates) {
-  out_args->clear();
+  out_args.clear();
+  extra_args.clear();
 
   for (size_t i = 0; i < args.size(); i++) {
     const std::string &arg = args[i];
@@ -39,30 +45,34 @@ bool ParseKeyValueArguments(args_map_t *out_args,
     }
 
     if (templ == nullptr) {
-      fprintf(stderr, "Unknown argument: %s\n", arg.c_str());
-      return false;
+      if(IsFlag(arg)) {
+        fprintf(stderr, "Unknown flag: %s\n", arg.c_str());
+        return false;
+      }
+      extra_args.push_back(arg);
+      continue;
     }
 
-    if (out_args->find(arg) != out_args->end()) {
+    if (out_args.find(arg) != out_args.end()) {
       fprintf(stderr, "Duplicate argument: %s\n", arg.c_str());
       return false;
     }
 
     if (templ->type == kBooleanArgument) {
-      (*out_args)[arg] = "";
+      out_args[arg] = "";
     } else {
       if (i + 1 >= args.size()) {
         fprintf(stderr, "Missing argument for option: %s\n", arg.c_str());
         return false;
       }
-      (*out_args)[arg] = args[++i];
+      out_args[arg] = args[++i];
     }
   }
 
   for (size_t j = 0; templates[j].name[0] != 0; j++) {
     const argument_t *templ = &templates[j];
     if (templ->type == kRequiredArgument &&
-        out_args->find(templ->name) == out_args->end()) {
+        out_args.find(templ->name) == out_args.end()) {
       fprintf(stderr, "Missing value for required argument: %s\n", templ->name);
       return false;
     }
diff --git a/tool/ciphers.cc b/tool/ciphers.cc
index f74b5f98ad..0a35ce2638 100644
--- a/tool/ciphers.cc
+++ b/tool/ciphers.cc
@@ -45,9 +45,11 @@ static const argument_t kArguments[] = {
 };
 
 bool Ciphers(const std::vector<std::string> &args) {
-
   args_map_t args_map;
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  args_list_t extra_args;
+
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/client.cc b/tool/client.cc
index b2f0df7c51..2ef0ccf5a7 100644
--- a/tool/client.cc
+++ b/tool/client.cc
@@ -531,8 +531,10 @@ static int verify_cb(int ok, X509_STORE_CTX *ctx)
 
 bool Client(const std::vector<std::string> &args) {
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/generate_ech.cc b/tool/generate_ech.cc
index 4387b57a8a..93c6f6bc83 100644
--- a/tool/generate_ech.cc
+++ b/tool/generate_ech.cc
@@ -68,7 +68,9 @@ static const struct argument_t kArguments[] = {
 
 bool GenerateECH(const std::vector<std::string> &args) {
   std::map<std::string, std::string> args_map;
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/generate_ed25519.cc b/tool/generate_ed25519.cc
index fd90823bb1..43e0559880 100644
--- a/tool/generate_ed25519.cc
+++ b/tool/generate_ed25519.cc
@@ -36,8 +36,10 @@ static const argument_t kArguments[] = {
 
 bool GenerateEd25519Key(const std::vector<std::string> &args) {
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/genrsa.cc b/tool/genrsa.cc
index 448fa92dbe..f60dd81ef0 100644
--- a/tool/genrsa.cc
+++ b/tool/genrsa.cc
@@ -33,8 +33,10 @@ static const argument_t kArguments[] = {
 
 bool GenerateRSAKey(const std::vector<std::string> &args) {
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/internal.h b/tool/internal.h
index ddf919642b..a4247a3a46 100644
--- a/tool/internal.h
+++ b/tool/internal.h
@@ -113,10 +113,16 @@ typedef struct argument_t {
 typedef std::vector<std::string> args_list_t;
 typedef std::map<std::string, std::string> args_map_t;
 
+bool IsFlag(const std::string& arg);
+
 // ParseKeyValueArguments converts the list of strings |args| ["-filter", "RSA", "-Timeout", "10"] into a map in
 // |out_args| of key value pairs {"-filter": "RSA", "-Timeout": "10"}. It uses |templates| to determine what arguments
-// are option or required.
-bool ParseKeyValueArguments(args_map_t *out_args, const args_list_t &args, const argument_t *templates);
+// are option or required. Any extra arguments that don't look like an unknown flag argument (prefixed by "-" or "--")
+// will be appended to extra_args in the order they appear in.
+bool ParseKeyValueArguments(args_map_t &out_args,
+                            args_list_t &extra_args,
+                            const args_list_t &args,
+                            const argument_t *templates);
 
 // PrintUsage prints the description from the list of templates in |templates| to stderr.
 void PrintUsage(const argument_t *templates);
diff --git a/tool/pkcs12.cc b/tool/pkcs12.cc
index 18f3a14b1f..42daa3da3d 100644
--- a/tool/pkcs12.cc
+++ b/tool/pkcs12.cc
@@ -52,9 +52,10 @@ static const argument_t kArguments[] = {
 
 bool DoPKCS12(const std::vector<std::string> &args) {
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments) ||
-      args_map["-dump"].empty()) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      args_map["-dump"].empty() || extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/rand.cc b/tool/rand.cc
index b6dd779388..4f637fdc08 100644
--- a/tool/rand.cc
+++ b/tool/rand.cc
@@ -53,7 +53,10 @@ bool Rand(const std::vector<std::string> &args) {
     }
 
     std::map<std::string, std::string> args_map;
-    if (!ParseKeyValueArguments(&args_map, args_copy, kArguments)) {
+    args_list_t extra_args;
+    if (!ParseKeyValueArguments(args_map, extra_args, args_copy,
+                                kArguments) ||
+        extra_args.size() > 0) {
       PrintUsage(kArguments);
       return false;
     }
diff --git a/tool/server.cc b/tool/server.cc
index dcd4ae6a59..071efefa27 100644
--- a/tool/server.cc
+++ b/tool/server.cc
@@ -236,8 +236,10 @@ bool Server(const std::vector<std::string> &args) {
   }
 
   std::map<std::string, std::string> args_map;
+  args_list_t extra_args;
 
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/sign.cc b/tool/sign.cc
index e4e1bc8916..38f542401d 100644
--- a/tool/sign.cc
+++ b/tool/sign.cc
@@ -30,7 +30,9 @@ static const argument_t kArguments[] = {
 
 bool Sign(const args_list_t &args) {
   args_map_t args_map;
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/tool/speed.cc b/tool/speed.cc
index 051b11b3e6..11264a0e56 100644
--- a/tool/speed.cc
+++ b/tool/speed.cc
@@ -2684,7 +2684,9 @@ bool Speed(const std::vector<std::string> &args) {
   EVP_MD_unstable_sha3_enable(true);
 #endif
   std::map<std::string, std::string> args_map;
-  if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+  args_list_t extra_args;
+  if (!ParseKeyValueArguments(args_map, extra_args, args, kArguments) ||
+      extra_args.size() > 0) {
     PrintUsage(kArguments);
     return false;
   }
diff --git a/util/fipstools/test-runtime-pwct.sh b/util/fipstools/test-runtime-pwct.sh
new file mode 100755
index 0000000000..5090fe4798
--- /dev/null
+++ b/util/fipstools/test-runtime-pwct.sh
@@ -0,0 +1,48 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR ISC
+
+# This script attempts to break each of the key generation pair wise consistency tests and checks that doing so
+# seems to work and at least mentions the correct KAT in the output.
+
+set -x
+set -e
+
+TEST_FIPS_BIN="test_build_dir/util/fipstools/test_fips"
+
+if [ ! -f $TEST_FIPS_BIN ]; then
+  echo "$TEST_FIPS_BIN is missing. Run this script from the top level of a"
+  echo "BoringSSL checkout and ensure that ./build-fips-break-test-binaries.sh"
+  echo "has been run first."
+  exit 1
+fi
+
+check_test_output() {
+  local test_name="$1"
+  local output="$2"
+  case "$test_name" in
+    "ECDSA_PWCT")  expected="EC keygen checks failed" ;;
+    "RSA_PWCT")    expected="RSA keygen checks failed" ;;
+    "MLKEM_PWCT")  expected="ML-KEM keygen PCT failed" ;;
+    "MLDSA_PWCT")  expected="ML-DSA keygen PCT failed" ;;
+    "EDDSA_PWCT")  expected="Ed25519 keygen PCT failed" ;;
+    *)             echo "Unknown test: $test_name"; return 1 ;;
+  esac
+
+  if ! echo "$output" | grep -q "$expected"; then
+    echo "Failure for ${test_name} did not contain expected message: '${expected}'"
+    echo "Actual output was: '${output}'"
+    return 1
+  fi
+  return 0
+}
+
+for runtime_test in ECDSA_PWCT RSA_PWCT EDDSA_PWCT MLKEM_PWCT MLDSA_PWCT; do
+  output=$(2>&1 BORINGSSL_FIPS_BREAK_TEST=$runtime_test $TEST_FIPS_BIN 2>&1 >/dev/null || true)
+  echo $output
+  if ! check_test_output "$runtime_test" "$output"; then
+    exit 1
+  fi
+done
+
+echo "All tests broken as expected"
+
diff --git a/util/fipstools/test_fips.c b/util/fipstools/test_fips.c
index 7593b6d59c..9abf2f67cc 100644
--- a/util/fipstools/test_fips.c
+++ b/util/fipstools/test_fips.c
@@ -36,6 +36,7 @@
 
 #include "../../crypto/fipsmodule/evp/internal.h"
 #include "../../crypto/fipsmodule/kem/internal.h"
+#include "../../crypto/fipsmodule/pqdsa/internal.h"
 #include "../../crypto/fipsmodule/rand/internal.h"
 #include "../../crypto/internal.h"
 
@@ -431,18 +432,33 @@ int main(int argc, char **argv) {
 
   /* ML-KEM */
   printf("About to Generate ML-KEM key\n");
-  EVP_PKEY *raw = NULL;
-  EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_KEM, NULL);
-  if (ctx == NULL || !EVP_PKEY_CTX_kem_set_params(ctx, NID_MLKEM512) ||
-    !EVP_PKEY_keygen_init(ctx) ||
-    !EVP_PKEY_keygen(ctx, &raw)) {
+  EVP_PKEY *kem_raw = NULL;
+  EVP_PKEY_CTX *kem_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_KEM, NULL);
+  if (kem_ctx == NULL || !EVP_PKEY_CTX_kem_set_params(kem_ctx, NID_MLKEM512) ||
+    !EVP_PKEY_keygen_init(kem_ctx) ||
+    !EVP_PKEY_keygen(kem_ctx, &kem_raw)) {
     printf("ML-KEM keygen failed.\n");
     goto err;
   }
   printf("Generated public key: ");
-  hexdump(raw->pkey.kem_key->public_key, raw->pkey.kem_key->kem->public_key_len);
-  EVP_PKEY_free(raw);
-  EVP_PKEY_CTX_free(ctx);
+  hexdump(kem_raw->pkey.kem_key->public_key, kem_raw->pkey.kem_key->kem->public_key_len);
+  EVP_PKEY_free(kem_raw);
+  EVP_PKEY_CTX_free(kem_ctx);
+
+  /* ML-DSA */
+  printf("About to Generate ML-DSA key\n");
+  EVP_PKEY *dsa_raw = NULL;
+  EVP_PKEY_CTX *dsa_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_PQDSA, NULL);
+  if (dsa_ctx == NULL || !EVP_PKEY_CTX_pqdsa_set_params(dsa_ctx, NID_MLDSA44) ||
+    !EVP_PKEY_keygen_init(dsa_ctx) ||
+    !EVP_PKEY_keygen(dsa_ctx, &dsa_raw)) {
+    printf("ML-DSA keygen failed.\n");
+    goto err;
+    }
+  printf("Generated public key: ");
+  hexdump(dsa_raw->pkey.pqdsa_key->public_key, dsa_raw->pkey.pqdsa_key->pqdsa->public_key_len);
+  EVP_PKEY_free(dsa_raw);
+  EVP_PKEY_CTX_free(dsa_ctx);
 
   /* DBRG */
   CTR_DRBG_STATE drbg;