Merge branch 'mldsa-test-suite' of github.com:jakemas/aws-lc into mld…

…sa-test-suite
jakemas · Dec 20, 2024 · b489226 · b489226
2 parents f7d1dad + 43e8954
commit b489226
Show file tree

Hide file tree

Showing 1,191 changed files with 1,852 additions and 29 deletions.
diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml
@@ -257,3 +257,24 @@ jobs:
       - name: Run accp build
         run: |
           ./tests/ci/integration/run_accp_integration.sh
+  ruby-releases:
+    if: github.repository_owner == 'aws'
+    strategy:
+      fail-fast: false
+      matrix:
+        fips:
+          - "0"
+          - "1"
+    runs-on: ubuntu-latest
+    name: Ruby releases (FIPS=${{ matrix.fips}})
+    steps:
+      - name: Install OS Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make autoconf ruby libyaml-dev
+      - uses: actions/checkout@v3
+      - name: Build AWS-LC, build ruby, run tests
+        run: |
+          ./tests/ci/integration/run_ruby_integration.sh ruby_3_2 ruby_3_1
+        env:
+          FIPS: ${{ matrix.fips }}
diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt
@@ -207,6 +207,7 @@ if((((ARCH STREQUAL "x86_64") AND NOT MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX) OR
 
     p256/p256_montjscalarmul.S
     p256/p256_montjscalarmul_alt.S
+    p256/bignum_montinv_p256.S
 
     p384/bignum_add_p384.S
     p384/bignum_sub_p384.S
@@ -223,6 +224,7 @@ if((((ARCH STREQUAL "x86_64") AND NOT MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX) OR
     p384/p384_montjdouble_alt.S
     p384/p384_montjscalarmul.S
     p384/p384_montjscalarmul_alt.S
+    p384/bignum_montinv_p384.S
 
     p521/bignum_add_p521.S
     p521/bignum_sub_p521.S
@@ -237,6 +239,7 @@ if((((ARCH STREQUAL "x86_64") AND NOT MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX) OR
     p521/p521_jdouble_alt.S
     p521/p521_jscalarmul.S
     p521/p521_jscalarmul_alt.S
+    p521/bignum_inv_p521.S
 
     curve25519/bignum_mod_n25519.S
     curve25519/bignum_neg_p25519.S

diff --git a/crypto/fipsmodule/ec/p256-nistz.c b/crypto/fipsmodule/ec/p256-nistz.c
@@ -126,6 +126,11 @@ static BN_ULONG is_not_zero(BN_ULONG in) {
 // the Montgomery domain.
 static void ecp_nistz256_mod_inverse_sqr_mont(BN_ULONG r[P256_LIMBS],
                                               const BN_ULONG in[P256_LIMBS]) {
+#if defined(EC_NISTP_USE_S2N_BIGNUM)
+  ec_nistp_felem_limb in_sqr[P256_LIMBS];
+  ecp_nistz256_sqr_mont(in_sqr, in);
+  bignum_montinv_p256(r, in_sqr);
+#else
   // This implements the addition chain described in
   // https://briansmith.org/ecc-inversion-addition-chains-01#p256_field_inversion
   BN_ULONG x2[P256_LIMBS], x3[P256_LIMBS], x6[P256_LIMBS], x12[P256_LIMBS],
@@ -188,6 +193,7 @@ static void ecp_nistz256_mod_inverse_sqr_mont(BN_ULONG r[P256_LIMBS],
 
   ecp_nistz256_sqr_mont(ret, ret);
   ecp_nistz256_sqr_mont(r, ret);  // 2^256 - 2^224 + 2^192 + 2^96 - 2^2
+#endif
 }
 
 // r = p * p_scalar

diff --git a/crypto/fipsmodule/ec/p384.c b/crypto/fipsmodule/ec/p384.c
@@ -131,6 +131,11 @@ static void p384_from_scalar(p384_felem out, const EC_SCALAR *in) {
 //       ffffffff 00000000 00000000 fffffffc
 static void p384_inv_square(p384_felem out,
                             const p384_felem in) {
+#if defined(EC_NISTP_USE_S2N_BIGNUM)
+  ec_nistp_felem_limb in_sqr[P384_NLIMBS];
+  p384_felem_sqr(in_sqr, in);
+  bignum_montinv_p384(out, in_sqr);
+#else
   // This implements the addition chain described in
   // https://briansmith.org/ecc-inversion-addition-chains-01#p384_field_inversion
   // The side comments show the value of the exponent:
@@ -222,6 +227,7 @@ static void p384_inv_square(p384_felem out,
 
   p384_felem_sqr(ret, ret);
   p384_felem_sqr(out, ret);      // 2^384 - 2^128 - 2^96 + 2^32 - 2^2 = p - 3
+#endif
 }
 
 static void p384_point_double(p384_felem x_out,

diff --git a/crypto/fipsmodule/ec/p521.c b/crypto/fipsmodule/ec/p521.c
@@ -183,6 +183,9 @@ static void p521_to_generic(EC_FELEM *out, const p521_felem in) {
 // The code is autogenerated by the ECCKiila project:
 //   https://arxiv.org/abs/2007.11481
 static void p521_felem_inv(p521_felem output, const p521_felem t1) {
+#if defined(EC_NISTP_USE_S2N_BIGNUM)
+    bignum_inv_p521(output, t1);
+#else
     /* temporary variables */
     p521_felem acc, t2, t4, t8, t16, t32, t64;
     p521_felem t128, t256, t512, t516, t518, t519;
@@ -240,6 +243,7 @@ static void p521_felem_inv(p521_felem output, const p521_felem t1) {
     p521_felem_sqr(acc, t519);
     p521_felem_sqr(acc, acc);
     p521_felem_mul(output, acc, t1);
+#endif
 }
 
 static void p521_point_double(p521_felem x_out,

diff --git a/crypto/pkcs7/pkcs7.c b/crypto/pkcs7/pkcs7.c
@@ -1206,6 +1206,12 @@ static BIO *pkcs7_data_decode(PKCS7 *p7, EVP_PKEY *pkey, X509 *pcert) {
     case NID_pkcs7_enveloped:
       rsk = p7->d.enveloped->recipientinfo;
       enc_alg = p7->d.enveloped->enc_data->algorithm;
+      if (enc_alg == NULL || enc_alg->parameter == NULL ||
+          enc_alg->parameter->value.octet_string == NULL ||
+          enc_alg->algorithm == NULL) {
+        OPENSSL_PUT_ERROR(PKCS7, ERR_R_PKCS7_LIB);
+        goto err;
+      }
       // |data_body| is NULL if the optional EncryptedContent is missing.
       data_body = p7->d.enveloped->enc_data->enc_data;
       cipher = EVP_get_cipherbynid(OBJ_obj2nid(enc_alg->algorithm));
@@ -1219,7 +1225,7 @@ static BIO *pkcs7_data_decode(PKCS7 *p7, EVP_PKEY *pkey, X509 *pcert) {
       goto err;
   }
 
-  // Detached content must be supplied via in_bio instead
+  // envelopedData must have data content to decrypt
   if (data_body == NULL) {
     OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_NO_CONTENT);
     goto err;
@@ -1250,7 +1256,10 @@ static BIO *pkcs7_data_decode(PKCS7 *p7, EVP_PKEY *pkey, X509 *pcert) {
       if (!pkcs7_cmp_ri(ri, pcert)) {
         break;
       }
+#if !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
+      // For fuzz testing, we do not want to bail out early.
       ri = NULL;
+#endif
     }
     if (ri == NULL) {
       OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
@@ -1290,14 +1299,14 @@ static BIO *pkcs7_data_decode(PKCS7 *p7, EVP_PKEY *pkey, X509 *pcert) {
       !EVP_CipherInit_ex(evp_ctx, cipher, NULL, NULL, NULL, 0)) {
     goto err;
   }
-  uint8_t iv[EVP_MAX_IV_LENGTH];
-  OPENSSL_memcpy(iv, enc_alg->parameter->value.octet_string->data,
-                 enc_alg->parameter->value.octet_string->length);
   const int expected_iv_len = EVP_CIPHER_CTX_iv_length(evp_ctx);
   if (enc_alg->parameter->value.octet_string->length != expected_iv_len) {
     OPENSSL_PUT_ERROR(PKCS7, ERR_R_PKCS7_LIB);
     goto err;
   }
+  uint8_t iv[EVP_MAX_IV_LENGTH];
+  OPENSSL_memcpy(iv, enc_alg->parameter->value.octet_string->data,
+                 expected_iv_len);
   if (!EVP_CipherInit_ex(evp_ctx, NULL, NULL, NULL, iv, 0)) {
     goto err;
   }
@@ -1323,9 +1332,12 @@ static BIO *pkcs7_data_decode(PKCS7 *p7, EVP_PKEY *pkey, X509 *pcert) {
 
   OPENSSL_free(cek);
   OPENSSL_free(dummy_key);
+  cek = NULL;
+  dummy_key = NULL;
   out = cipher_bio;
 
-  if (data_body && data_body->length > 0) {
+  // We verify data_body != NULL above
+  if (data_body->length > 0) {
     data_bio = BIO_new_mem_buf(data_body->data, data_body->length);
   } else {
     data_bio = BIO_new(BIO_s_mem());
@@ -1360,7 +1372,7 @@ PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509) {
   return ri;
 }
 
-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) {
+int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int _flags) {
   GUARD_PTR(p7);
   GUARD_PTR(pkey);
   GUARD_PTR(data);
@@ -1590,8 +1602,11 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     }
     // NOTE: unlike most of our functions, |X509_verify_cert| can return <= 0
     if (X509_verify_cert(cert_ctx) <= 0) {
+#if !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
+      // For fuzz testing, we do not want to bail out early.
       OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_CERTIFICATE_VERIFY_ERROR);
       goto out;
+#endif
     }
   }
 
@@ -1607,8 +1622,11 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     PKCS7_SIGNER_INFO *si = sk_PKCS7_SIGNER_INFO_value(sinfos, ii);
     X509 *signer = sk_X509_value(signers, ii);
     if (!pkcs7_signature_verify(p7bio, p7, si, signer)) {
+#if !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
+      // For fuzz testing, we do not want to bail out early.
       OPENSSL_PUT_ERROR(PKCS7, PKCS7_R_SIGNATURE_FAILURE);
       goto out;
+#endif
     }
   }
 

diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
@@ -29,6 +29,8 @@ fuzzer(ocsp)
 fuzzer(ocsp_http)
 fuzzer(ocsp_parse_url)
 fuzzer(pkcs12)
+fuzzer(pkcs7_decrypt)
+fuzzer(pkcs7_verify)
 fuzzer(pkcs8)
 fuzzer(pkcs8_v2)
 fuzzer(privkey)

diff --git a/fuzz/pkcs7_decrypt.cc b/fuzz/pkcs7_decrypt.cc
@@ -0,0 +1,157 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0 OR ISC
+
+#include <cstdint>
+
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/pkcs7.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+
+// The corpus was created using the following key.
+// If you change the key, the corpus should be augmented with inputs
+// created using (or "seeded" from) PKCS7 values encrypted with
+// the new key.
+static const char kKey[] = R"(
+-----BEGIN PRIVATE KEY-----
+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
+hJTbHtjEDJ7BHLC/CNUhXbpyyu1y
+-----END PRIVATE KEY-----
+)";
+
+static const char kCert[] = R"(
+-----BEGIN CERTIFICATE-----
+MIIEqzCCApOgAwIBAgIBADANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
+MCAXDTcwMDEwMTAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAPMQ0wCwYDVQQDDARM
+ZWFmMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfjDp/gaKXBFUeED
+L413QMRpFhZZV8kBQ06C/qjoj0VNcjewvCgrZGzgBbbSSDuDv4tImeyqmG55gemF
+APzjQHGpKHJ63aBEoESXFTHgMQ5P9dTrTBeciH3jjjv01HlTZgFGk+t4BWysv2na
+aocybTr/QQZeVXGDRhkhPtMLW5o6ZjbMbpxEEdSiw3Pe3xmB3kXyqEsqwiBBPCGg
+BKShkdkpLt7/ScIe0aY7qYIlAJB+qSZO1TGZub5dsBY2L38rII3jeWbbMRQzGj2G
+UracTMaTXeQvQ7Dti46eTTKRnzRphuGaomkIPM9nCDOhEpjdcwyXVIeSF3ndXzsQ
+WQ/6aFBR9MA0RVp785Wj5oyRBa2CzCvLL5xOZxEKfb7vdyEhQce3KH7Pp4jGlFzx
+KmkUqq7onzdjNYrd5Dn//GGZdb7q7PlbRw+pziaOm3ddft+2gYnSAfwWlp8y6w5k
+k3DxWtbZEx8KC6nPfo04U6vY2esN5QDD6bKHp8g9fVJkAefPfuJDadkiDv07c1UA
+hoED1xNowwpehvWiDzJH76T2SuEx1Ypd1kEQhWJ2HQzuB0F6NmbguEYqoGOcoH3q
+C/n2vZN/N5YMcQB0C0u8bG2lQeNEZn3W3Xr4D2CMGTTTu/HXUZjHUr+iJJ0lvYMn
+Rs2P/27WPrdUlnAWVs59RMKvINkCAwEAAaMQMA4wDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQsFAAOCAgEAMZR8p6FGActr5RNICECEKnp6qfgaZiQFwKg64uovggh3
+PU4VhRGWtNAD4E8/G37I1WjEJwSh6YrthQJrSmfnVxUgXwZqW3Ou5UJpaWwReEMV
+xXwznJTwoUwD9pzh/+2QeNYV+6CPmGPD8znhh9QzOoo1mIaUNdDGN7K6dVBBBr7O
+Dm67qWXf8AoWLUO5XTiha5V19Jsyxszo2Ntfef9mK4LIszuRbMrpfMlUEvuO3oLa
+SLScdPonEPF7CGuyJcyVVJ4T+mqTzmQ9AKzujjXk3sqw5rFbPIC+ei5Fdf0SXsgS
+jEX83uZPZRIMjkyiVjDsWwDDumaTJ/KCUhaqGzJ6/ZKLEvKCgtgDQg2QetmRzS5j
+c9CC6I6Kfx01cJ6wOlJY22DDjWJAviEP40/TVk1xoEWyiErEiYq3vdCRRoxSR55N
+/tjiQM0XbiGfKfx2KrAHFIsRQsqHF0bL4HDjCh29cz3jleWdLGNPwrdfLtPMcXf8
+Eu6/5vlz8BUuaR08fjv59tfdedLDRlbpZFERMio6PINFoRuVtbcgVw5xHucHjl3p
+shp0eY7uylv5j8j1X7m5fp+BZKILGHLKVrE2ihJgyS9je2Jf40Fb+Hu+1dcsAKd+
+jbgtnMeOs3SWELGeAG2TXsKmNOb0OwzGeL5jJpe6tsEUiQQQxhfarBIlxoTPizI=
+-----END CERTIFICATE-----
+)";
+
+class SharedData {
+public:
+  EVP_PKEY *key = nullptr;
+  X509 *cert = nullptr;
+
+  SharedData() {
+    {
+      BIO *key_bio = BIO_new_mem_buf(const_cast<char *>(kKey), sizeof(kKey) - 1);
+      key = PEM_read_bio_PrivateKey(key_bio, nullptr, nullptr, nullptr);
+      BIO_free(key_bio);
+    }
+    {
+      BIO *cert_bio = BIO_new_mem_buf(const_cast<char *>(kCert), sizeof(kCert) - 1);
+      cert = PEM_read_bio_X509(cert_bio, nullptr, nullptr, nullptr);
+      BIO_free(cert_bio);
+    }
+  }
+
+  ~SharedData() {
+    X509_free(cert);
+    EVP_PKEY_free(key);
+  }
+};
+
+static SharedData sharedData;
+
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+  PKCS7 *pkcs7 = nullptr;
+
+  pkcs7 = d2i_PKCS7(nullptr, &buf, len);
+  if (pkcs7 == nullptr) {
+    goto end;
+  }
+
+  {
+    BIO *data_bio = BIO_new(BIO_s_mem());
+OPENSSL_BEGIN_ALLOW_DEPRECATED
+    PKCS7_decrypt(pkcs7, sharedData.key, NULL, data_bio, 0);
+OPENSSL_END_ALLOW_DEPRECATED
+    BIO_free(data_bio);
+  }
+
+  {
+    BIO *data_bio = BIO_new(BIO_s_mem());
+OPENSSL_BEGIN_ALLOW_DEPRECATED
+    PKCS7_decrypt(pkcs7, sharedData.key, sharedData.cert, data_bio, 0);
+OPENSSL_END_ALLOW_DEPRECATED
+    BIO_free(data_bio);
+  }
+
+end:
+  PKCS7_free(pkcs7);
+
+  return 0;
+}
diff --git a/fuzz/pkcs7_decrypt_corpus/0044265af426b7e484433892f4303a6417af0d59 b/fuzz/pkcs7_decrypt_corpus/0044265af426b7e484433892f4303a6417af0d59
diff --git a/fuzz/pkcs7_decrypt_corpus/009b9a1aac818000facb0264a06f03be7dc81a63 b/fuzz/pkcs7_decrypt_corpus/009b9a1aac818000facb0264a06f03be7dc81a63
diff --git a/fuzz/pkcs7_decrypt_corpus/009fee48340637584f5a0138f23edab9f2b3da9c b/fuzz/pkcs7_decrypt_corpus/009fee48340637584f5a0138f23edab9f2b3da9c
@@ -0,0 +1 @@
+2�
diff --git a/fuzz/pkcs7_decrypt_corpus/00fc2467fb33db1ab902476adf00cb3f5c678dd0 b/fuzz/pkcs7_decrypt_corpus/00fc2467fb33db1ab902476adf00cb3f5c678dd0
diff --git a/fuzz/pkcs7_decrypt_corpus/014e51ea793fc6be271bc657e1dd922076dd5b6f b/fuzz/pkcs7_decrypt_corpus/014e51ea793fc6be271bc657e1dd922076dd5b6f
diff --git a/fuzz/pkcs7_decrypt_corpus/0232d6504fe16172b86cacaa0ebb822cf0c22fda b/fuzz/pkcs7_decrypt_corpus/0232d6504fe16172b86cacaa0ebb822cf0c22fda
@@ -0,0 +1 @@
+>�
diff --git a/fuzz/pkcs7_decrypt_corpus/024f365c692b5668b2e01a81de28bf3c985234f3 b/fuzz/pkcs7_decrypt_corpus/024f365c692b5668b2e01a81de28bf3c985234f3
diff --git a/fuzz/pkcs7_decrypt_corpus/02ba570b482c92cf6c47797a2edd069e50d4e53e b/fuzz/pkcs7_decrypt_corpus/02ba570b482c92cf6c47797a2edd069e50d4e53e
diff --git a/fuzz/pkcs7_decrypt_corpus/031b490b164b1a5908fa03afadc7cb6c5b996771 b/fuzz/pkcs7_decrypt_corpus/031b490b164b1a5908fa03afadc7cb6c5b996771
diff --git a/fuzz/pkcs7_decrypt_corpus/05f100f5527e32cc142eb1091b5dfc40d34af7ff b/fuzz/pkcs7_decrypt_corpus/05f100f5527e32cc142eb1091b5dfc40d34af7ff
diff --git a/fuzz/pkcs7_decrypt_corpus/06069a4fd48ce5fdd73b6ba841c4040bc10f57cb b/fuzz/pkcs7_decrypt_corpus/06069a4fd48ce5fdd73b6ba841c4040bc10f57cb
diff --git a/fuzz/pkcs7_decrypt_corpus/062cf23f8f5b2fc6eb8d04f8d0e6391a0307e014 b/fuzz/pkcs7_decrypt_corpus/062cf23f8f5b2fc6eb8d04f8d0e6391a0307e014
diff --git a/fuzz/pkcs7_decrypt_corpus/0700cedb2ad4f2800ea33955945909419aed29db b/fuzz/pkcs7_decrypt_corpus/0700cedb2ad4f2800ea33955945909419aed29db
@@ -0,0 +1 @@
+>S
diff --git a/fuzz/pkcs7_decrypt_corpus/07b9c4c1d02ff66c87863dfbad1dc4542edaf985 b/fuzz/pkcs7_decrypt_corpus/07b9c4c1d02ff66c87863dfbad1dc4542edaf985
diff --git a/fuzz/pkcs7_decrypt_corpus/083b3c3bcbd8e9403c00bb6509424cff44c89ccc b/fuzz/pkcs7_decrypt_corpus/083b3c3bcbd8e9403c00bb6509424cff44c89ccc
diff --git a/fuzz/pkcs7_decrypt_corpus/086be06f79641842409dc1fe6221be0b1623c32e b/fuzz/pkcs7_decrypt_corpus/086be06f79641842409dc1fe6221be0b1623c32e
diff --git a/fuzz/pkcs7_decrypt_corpus/0924aa000df6de6b49916aca3bbfc5fce74d23b7 b/fuzz/pkcs7_decrypt_corpus/0924aa000df6de6b49916aca3bbfc5fce74d23b7
diff --git a/fuzz/pkcs7_decrypt_corpus/094f12c74b0746976f4dd6eb812e3b01327cb455 b/fuzz/pkcs7_decrypt_corpus/094f12c74b0746976f4dd6eb812e3b01327cb455
diff --git a/fuzz/pkcs7_decrypt_corpus/098067e2a6c4c5a4125aa4401ce7e5d3f585f6aa b/fuzz/pkcs7_decrypt_corpus/098067e2a6c4c5a4125aa4401ce7e5d3f585f6aa
diff --git a/fuzz/pkcs7_decrypt_corpus/09da700a7b9835f22c55cfdf366862541d3a55c6 b/fuzz/pkcs7_decrypt_corpus/09da700a7b9835f22c55cfdf366862541d3a55c6
diff --git a/fuzz/pkcs7_decrypt_corpus/0aa6001cb08bfc9a17d11d7f759012e5295c5dc5 b/fuzz/pkcs7_decrypt_corpus/0aa6001cb08bfc9a17d11d7f759012e5295c5dc5
diff --git a/fuzz/pkcs7_decrypt_corpus/0be2c5f1e4ce2c85274015fc84b380ffe2e09038 b/fuzz/pkcs7_decrypt_corpus/0be2c5f1e4ce2c85274015fc84b380ffe2e09038
diff --git a/fuzz/pkcs7_decrypt_corpus/0beb489c1d2815bfcd626aaeaf8f4d49d375ca14 b/fuzz/pkcs7_decrypt_corpus/0beb489c1d2815bfcd626aaeaf8f4d49d375ca14
diff --git a/fuzz/pkcs7_decrypt_corpus/0cac3506813cf700b12702ddcb14ab23ffc43c5f b/fuzz/pkcs7_decrypt_corpus/0cac3506813cf700b12702ddcb14ab23ffc43c5f
diff --git a/fuzz/pkcs7_decrypt_corpus/0d4c0e0d3142bb53f8cade78fda6f9d183588720 b/fuzz/pkcs7_decrypt_corpus/0d4c0e0d3142bb53f8cade78fda6f9d183588720
diff --git a/fuzz/pkcs7_decrypt_corpus/0d5c223cef59f0f1d6c593d91d8be52d6ce42e4c b/fuzz/pkcs7_decrypt_corpus/0d5c223cef59f0f1d6c593d91d8be52d6ce42e4c
diff --git a/fuzz/pkcs7_decrypt_corpus/0dcc0d22a298605d80da9b3b13da46bee73bb7cd b/fuzz/pkcs7_decrypt_corpus/0dcc0d22a298605d80da9b3b13da46bee73bb7cd
diff --git a/fuzz/pkcs7_decrypt_corpus/0dd7236da022f094a3155c752e7efb8ff6808665 b/fuzz/pkcs7_decrypt_corpus/0dd7236da022f094a3155c752e7efb8ff6808665
diff --git a/fuzz/pkcs7_decrypt_corpus/0eb5037935ba1c2791f3b7e9bc8470c3c60d2aff b/fuzz/pkcs7_decrypt_corpus/0eb5037935ba1c2791f3b7e9bc8470c3c60d2aff
@@ -0,0 +1 @@
+0�
diff --git a/fuzz/pkcs7_decrypt_corpus/0ec1f9ebe605ad8a10e390ec96aab642fd06ee1d b/fuzz/pkcs7_decrypt_corpus/0ec1f9ebe605ad8a10e390ec96aab642fd06ee1d
diff --git a/fuzz/pkcs7_decrypt_corpus/0f03cdb21dab2b028019dd9bc1f2c1c2473c20a5 b/fuzz/pkcs7_decrypt_corpus/0f03cdb21dab2b028019dd9bc1f2c1c2473c20a5
diff --git a/fuzz/pkcs7_decrypt_corpus/0f76c5675c0a3ebbd3a706bc055e994a080fdc51 b/fuzz/pkcs7_decrypt_corpus/0f76c5675c0a3ebbd3a706bc055e994a080fdc51
diff --git a/fuzz/pkcs7_decrypt_corpus/1060485b47f76411c255445242abbc6824fe180c b/fuzz/pkcs7_decrypt_corpus/1060485b47f76411c255445242abbc6824fe180c
diff --git a/fuzz/pkcs7_decrypt_corpus/10611bfb8d4d8ac7fdaffc02f5c1e5692f04b5ea b/fuzz/pkcs7_decrypt_corpus/10611bfb8d4d8ac7fdaffc02f5c1e5692f04b5ea
diff --git a/fuzz/pkcs7_decrypt_corpus/1150a9e4dc381f752e9b88801821bf678212b2a5 b/fuzz/pkcs7_decrypt_corpus/1150a9e4dc381f752e9b88801821bf678212b2a5
@@ -0,0 +1 @@
+0�0

diff --git a/fuzz/pkcs7_decrypt_corpus/11a2d559dd0c7ab4d988306e7be81ef3a70d8aeb b/fuzz/pkcs7_decrypt_corpus/11a2d559dd0c7ab4d988306e7be81ef3a70d8aeb
diff --git a/fuzz/pkcs7_decrypt_corpus/12bb5e15cc86608a69a4f519f1df36da7b44c3f6 b/fuzz/pkcs7_decrypt_corpus/12bb5e15cc86608a69a4f519f1df36da7b44c3f6
diff --git a/fuzz/pkcs7_decrypt_corpus/138d1ce3642d39b8d9854c990960c58d0343980c b/fuzz/pkcs7_decrypt_corpus/138d1ce3642d39b8d9854c990960c58d0343980c
diff --git a/fuzz/pkcs7_decrypt_corpus/13ef297d5fd7a3c776b801f5e46fdc37d0603ed4 b/fuzz/pkcs7_decrypt_corpus/13ef297d5fd7a3c776b801f5e46fdc37d0603ed4
diff --git a/fuzz/pkcs7_decrypt_corpus/13ffa1d1a6da4bbb23181c1b4e96d3391851ede0 b/fuzz/pkcs7_decrypt_corpus/13ffa1d1a6da4bbb23181c1b4e96d3391851ede0
diff --git a/fuzz/pkcs7_decrypt_corpus/14b036dda08d81b6433a9f743646680979239dac b/fuzz/pkcs7_decrypt_corpus/14b036dda08d81b6433a9f743646680979239dac
diff --git a/fuzz/pkcs7_decrypt_corpus/14fb4844c7e1de85d1c8304dd591c64633d4ff20 b/fuzz/pkcs7_decrypt_corpus/14fb4844c7e1de85d1c8304dd591c64633d4ff20
diff --git a/fuzz/pkcs7_decrypt_corpus/15cf6f769b0eb2f2e90c1e65ce61c1fe2c0478af b/fuzz/pkcs7_decrypt_corpus/15cf6f769b0eb2f2e90c1e65ce61c1fe2c0478af
diff --git a/fuzz/pkcs7_decrypt_corpus/15fac0cb404c334ddd05dee838de44c41b5b274f b/fuzz/pkcs7_decrypt_corpus/15fac0cb404c334ddd05dee838de44c41b5b274f
diff --git a/fuzz/pkcs7_decrypt_corpus/1693897345b53a46577a90da54ba0169a743d314 b/fuzz/pkcs7_decrypt_corpus/1693897345b53a46577a90da54ba0169a743d314
diff --git a/fuzz/pkcs7_decrypt_corpus/1822ded37095e94743b6b43bdb333b3ef0a1f529 b/fuzz/pkcs7_decrypt_corpus/1822ded37095e94743b6b43bdb333b3ef0a1f529
diff --git a/fuzz/pkcs7_decrypt_corpus/19a589c0a527e7f69f21d309c157ff151edd6bf6 b/fuzz/pkcs7_decrypt_corpus/19a589c0a527e7f69f21d309c157ff151edd6bf6
diff --git a/fuzz/pkcs7_decrypt_corpus/1a04289e329914f65c9e8270e048b2663d613ec3 b/fuzz/pkcs7_decrypt_corpus/1a04289e329914f65c9e8270e048b2663d613ec3
diff --git a/fuzz/pkcs7_decrypt_corpus/1ac7dd5a4f987e50b84ae98434703139789ea2fc b/fuzz/pkcs7_decrypt_corpus/1ac7dd5a4f987e50b84ae98434703139789ea2fc
diff --git a/fuzz/pkcs7_decrypt_corpus/1afb0e0edfc791d2e67bc581bba1b503a6a691d7 b/fuzz/pkcs7_decrypt_corpus/1afb0e0edfc791d2e67bc581bba1b503a6a691d7
diff --git a/fuzz/pkcs7_decrypt_corpus/1b09446b8ef7a43086cff4e9818081e6e541f98e b/fuzz/pkcs7_decrypt_corpus/1b09446b8ef7a43086cff4e9818081e6e541f98e
diff --git a/fuzz/pkcs7_decrypt_corpus/1c08ee7e93311bd653a785e67c098d2a20f824e8 b/fuzz/pkcs7_decrypt_corpus/1c08ee7e93311bd653a785e67c098d2a20f824e8
diff --git a/fuzz/pkcs7_decrypt_corpus/1c58da4e5222e48242845c6f8deb0e9a3162b51e b/fuzz/pkcs7_decrypt_corpus/1c58da4e5222e48242845c6f8deb0e9a3162b51e
diff --git a/fuzz/pkcs7_decrypt_corpus/1c85db399271f76b42a666fc1909d57232d0100a b/fuzz/pkcs7_decrypt_corpus/1c85db399271f76b42a666fc1909d57232d0100a
diff --git a/fuzz/pkcs7_decrypt_corpus/1c86613e69e64b065c69ef32a32c05234c038611 b/fuzz/pkcs7_decrypt_corpus/1c86613e69e64b065c69ef32a32c05234c038611
diff --git a/fuzz/pkcs7_decrypt_corpus/1e810810e923d8e97183f5062ebde0c967fe143e b/fuzz/pkcs7_decrypt_corpus/1e810810e923d8e97183f5062ebde0c967fe143e
diff --git a/fuzz/pkcs7_decrypt_corpus/1f89c6bd993b07465126604a828600115b6e51da b/fuzz/pkcs7_decrypt_corpus/1f89c6bd993b07465126604a828600115b6e51da
diff --git a/fuzz/pkcs7_decrypt_corpus/1fabd13db2a00fb04fd311a0bada2e5fd2a5454b b/fuzz/pkcs7_decrypt_corpus/1fabd13db2a00fb04fd311a0bada2e5fd2a5454b
diff --git a/fuzz/pkcs7_decrypt_corpus/1fae27eaff3211e1c22ba883ea55e89103fd3910 b/fuzz/pkcs7_decrypt_corpus/1fae27eaff3211e1c22ba883ea55e89103fd3910
diff --git a/fuzz/pkcs7_decrypt_corpus/1fe3b1f5d4bba951b2999c98d57e0ba7ab616201 b/fuzz/pkcs7_decrypt_corpus/1fe3b1f5d4bba951b2999c98d57e0ba7ab616201
diff --git a/fuzz/pkcs7_decrypt_corpus/201a92a28474d8d8c280551db614b05e6e98cd85 b/fuzz/pkcs7_decrypt_corpus/201a92a28474d8d8c280551db614b05e6e98cd85
diff --git a/fuzz/pkcs7_decrypt_corpus/2064f80f811db79a33c4e51c10221454e30c74ae b/fuzz/pkcs7_decrypt_corpus/2064f80f811db79a33c4e51c10221454e30c74ae
diff --git a/fuzz/pkcs7_decrypt_corpus/217f2e451d7c8557679b980ff14426c86eb8713a b/fuzz/pkcs7_decrypt_corpus/217f2e451d7c8557679b980ff14426c86eb8713a
@@ -0,0 +1 @@
+;�
diff --git a/fuzz/pkcs7_decrypt_corpus/2187109c0898422a9c30b5681ad4cc4c190cb73d b/fuzz/pkcs7_decrypt_corpus/2187109c0898422a9c30b5681ad4cc4c190cb73d
diff --git a/fuzz/pkcs7_decrypt_corpus/21ed4c7af50d987589a9029fc0422151be3a0fc2 b/fuzz/pkcs7_decrypt_corpus/21ed4c7af50d987589a9029fc0422151be3a0fc2
diff --git a/fuzz/pkcs7_decrypt_corpus/22a65c5269eba028e157db2ea8b18e030ccc9b76 b/fuzz/pkcs7_decrypt_corpus/22a65c5269eba028e157db2ea8b18e030ccc9b76
diff --git a/fuzz/pkcs7_decrypt_corpus/22e5a56861ee661a6743d3aa5ad5c299cbd9b3e6 b/fuzz/pkcs7_decrypt_corpus/22e5a56861ee661a6743d3aa5ad5c299cbd9b3e6
diff --git a/fuzz/pkcs7_decrypt_corpus/2343d89d1a34b8d7898362ff652d2e8e8bfa9aeb b/fuzz/pkcs7_decrypt_corpus/2343d89d1a34b8d7898362ff652d2e8e8bfa9aeb
diff --git a/fuzz/pkcs7_decrypt_corpus/242864ea5aa4f336e28ad39c19ce23f496f1da17 b/fuzz/pkcs7_decrypt_corpus/242864ea5aa4f336e28ad39c19ce23f496f1da17
diff --git a/fuzz/pkcs7_decrypt_corpus/243247379c2954bea2956970bb5a474fc7ccfbba b/fuzz/pkcs7_decrypt_corpus/243247379c2954bea2956970bb5a474fc7ccfbba
diff --git a/fuzz/pkcs7_decrypt_corpus/24b599e8e9a8b25b2d343d0d9ff243ab4332fe57 b/fuzz/pkcs7_decrypt_corpus/24b599e8e9a8b25b2d343d0d9ff243ab4332fe57
diff --git a/fuzz/pkcs7_decrypt_corpus/24e8dc13f437199abc5fc34cccb6e9db23e65cc0 b/fuzz/pkcs7_decrypt_corpus/24e8dc13f437199abc5fc34cccb6e9db23e65cc0
diff --git a/fuzz/pkcs7_decrypt_corpus/2516b2060bc0ae4ec8fc074b1d2d4a571bd21f93 b/fuzz/pkcs7_decrypt_corpus/2516b2060bc0ae4ec8fc074b1d2d4a571bd21f93
diff --git a/fuzz/pkcs7_decrypt_corpus/2570b96b40a0ca678c3fa21968dcb48794027745 b/fuzz/pkcs7_decrypt_corpus/2570b96b40a0ca678c3fa21968dcb48794027745
diff --git a/fuzz/pkcs7_decrypt_corpus/25aaf3c1ff6a055ab2ad3f7b0ca78da112bd575d b/fuzz/pkcs7_decrypt_corpus/25aaf3c1ff6a055ab2ad3f7b0ca78da112bd575d
diff --git a/fuzz/pkcs7_decrypt_corpus/260c92e98087296307190497ae19a68e283bbda0 b/fuzz/pkcs7_decrypt_corpus/260c92e98087296307190497ae19a68e283bbda0
diff --git a/fuzz/pkcs7_decrypt_corpus/26c1c96bd48b7d63bfa0f3a5f5248902bcab3e15 b/fuzz/pkcs7_decrypt_corpus/26c1c96bd48b7d63bfa0f3a5f5248902bcab3e15
diff --git a/fuzz/pkcs7_decrypt_corpus/27889f05559ca6efc9e2200a843dbb09795620ca b/fuzz/pkcs7_decrypt_corpus/27889f05559ca6efc9e2200a843dbb09795620ca
diff --git a/fuzz/pkcs7_decrypt_corpus/27a1b3d8d780d724db16d4d7f44c7ee29825dea8 b/fuzz/pkcs7_decrypt_corpus/27a1b3d8d780d724db16d4d7f44c7ee29825dea8
diff --git a/fuzz/pkcs7_decrypt_corpus/28573953480b4f47ae2b7be6d2d2079696998f94 b/fuzz/pkcs7_decrypt_corpus/28573953480b4f47ae2b7be6d2d2079696998f94
diff --git a/fuzz/pkcs7_decrypt_corpus/29553f7820f4366af6d9731050ac0f681837f712 b/fuzz/pkcs7_decrypt_corpus/29553f7820f4366af6d9731050ac0f681837f712
diff --git a/fuzz/pkcs7_decrypt_corpus/2a5014acc197b4d4d49e12ae8a8128350667db1f b/fuzz/pkcs7_decrypt_corpus/2a5014acc197b4d4d49e12ae8a8128350667db1f
diff --git a/fuzz/pkcs7_decrypt_corpus/2aefa9f1750913c50581d625bf20f0b888d943df b/fuzz/pkcs7_decrypt_corpus/2aefa9f1750913c50581d625bf20f0b888d943df
diff --git a/fuzz/pkcs7_decrypt_corpus/2b08be352b755e78fb5279b539fe074860ff3ab6 b/fuzz/pkcs7_decrypt_corpus/2b08be352b755e78fb5279b539fe074860ff3ab6
diff --git a/fuzz/pkcs7_decrypt_corpus/2b098a5d377b0b7938064b07bf6aa4d199e5f7f5 b/fuzz/pkcs7_decrypt_corpus/2b098a5d377b0b7938064b07bf6aa4d199e5f7f5
diff --git a/fuzz/pkcs7_decrypt_corpus/2bd809a0ba9f795b8b24dab7c7a29f320120f3d6 b/fuzz/pkcs7_decrypt_corpus/2bd809a0ba9f795b8b24dab7c7a29f320120f3d6
diff --git a/fuzz/pkcs7_decrypt_corpus/2c1447058c26753251a7c774cb5db67a3630bb57 b/fuzz/pkcs7_decrypt_corpus/2c1447058c26753251a7c774cb5db67a3630bb57
diff --git a/fuzz/pkcs7_decrypt_corpus/2cce300f75fd99d32d979b2dc7b0cc25e5e7a455 b/fuzz/pkcs7_decrypt_corpus/2cce300f75fd99d32d979b2dc7b0cc25e5e7a455
diff --git a/fuzz/pkcs7_decrypt_corpus/2cd57048ddb52a3b28d25aee3e6cbf2d8d6dbc32 b/fuzz/pkcs7_decrypt_corpus/2cd57048ddb52a3b28d25aee3e6cbf2d8d6dbc32
diff --git a/fuzz/pkcs7_decrypt_corpus/2cf1c6a0659450848008a343d1058585a4aebc1e b/fuzz/pkcs7_decrypt_corpus/2cf1c6a0659450848008a343d1058585a4aebc1e
diff --git a/fuzz/pkcs7_decrypt_corpus/2d3ad740846218fec7eb592218e5376624f77d9d b/fuzz/pkcs7_decrypt_corpus/2d3ad740846218fec7eb592218e5376624f77d9d
diff --git a/fuzz/pkcs7_decrypt_corpus/2dae7ffcafc51f34b2c24855c7a0698d4d8ddc8c b/fuzz/pkcs7_decrypt_corpus/2dae7ffcafc51f34b2c24855c7a0698d4d8ddc8c
diff --git a/fuzz/pkcs7_decrypt_corpus/2e715e45356eab48bb6513ebfa728fb3f150f7b9 b/fuzz/pkcs7_decrypt_corpus/2e715e45356eab48bb6513ebfa728fb3f150f7b9
diff --git a/fuzz/pkcs7_decrypt_corpus/2ecbf92b98fa87bdef9c9af524ff55e268a366d1 b/fuzz/pkcs7_decrypt_corpus/2ecbf92b98fa87bdef9c9af524ff55e268a366d1
diff --git a/fuzz/pkcs7_decrypt_corpus/2f7234099ccd07f9c0939accc13d7f7f6e95dbad b/fuzz/pkcs7_decrypt_corpus/2f7234099ccd07f9c0939accc13d7f7f6e95dbad
diff --git a/fuzz/pkcs7_decrypt_corpus/3048de55c38302c85b905319098196122add3b34 b/fuzz/pkcs7_decrypt_corpus/3048de55c38302c85b905319098196122add3b34
diff --git a/fuzz/pkcs7_decrypt_corpus/307389bbb1ed318a594da26dbbff1b3f26f2e9e9 b/fuzz/pkcs7_decrypt_corpus/307389bbb1ed318a594da26dbbff1b3f26f2e9e9
diff --git a/fuzz/pkcs7_decrypt_corpus/30bd61eb9f30a301983edec74d6bb4b38fe1a8e8 b/fuzz/pkcs7_decrypt_corpus/30bd61eb9f30a301983edec74d6bb4b38fe1a8e8
diff --git a/fuzz/pkcs7_decrypt_corpus/30d8c89c7989740c63630ecdaf5d8b387f61c8e2 b/fuzz/pkcs7_decrypt_corpus/30d8c89c7989740c63630ecdaf5d8b387f61c8e2
diff --git a/fuzz/pkcs7_decrypt_corpus/30eabdc1dfa86e244a22490ae35e8dca7f8d279b b/fuzz/pkcs7_decrypt_corpus/30eabdc1dfa86e244a22490ae35e8dca7f8d279b
diff --git a/fuzz/pkcs7_decrypt_corpus/31338c9d2a6b19f1c30a745563c457ad2e4ec2dc b/fuzz/pkcs7_decrypt_corpus/31338c9d2a6b19f1c30a745563c457ad2e4ec2dc
diff --git a/fuzz/pkcs7_decrypt_corpus/31504a091b65130e36bbed27b1e75f353c2a9813 b/fuzz/pkcs7_decrypt_corpus/31504a091b65130e36bbed27b1e75f353c2a9813
diff --git a/fuzz/pkcs7_decrypt_corpus/31d8365ad44bfaeaf58d4cfb1c9cf12aefbd1198 b/fuzz/pkcs7_decrypt_corpus/31d8365ad44bfaeaf58d4cfb1c9cf12aefbd1198
diff --git a/fuzz/pkcs7_decrypt_corpus/321ac6a73d4c0fea0f368d00fdafe3769c064261 b/fuzz/pkcs7_decrypt_corpus/321ac6a73d4c0fea0f368d00fdafe3769c064261
diff --git a/fuzz/pkcs7_decrypt_corpus/331550c0db1643a8c5e6c9e3a71b9d7b919baa4d b/fuzz/pkcs7_decrypt_corpus/331550c0db1643a8c5e6c9e3a71b9d7b919baa4d
diff --git a/fuzz/pkcs7_decrypt_corpus/333474ec1c23d7f8a6a19c2dac5afb2074d729d8 b/fuzz/pkcs7_decrypt_corpus/333474ec1c23d7f8a6a19c2dac5afb2074d729d8
diff --git a/fuzz/pkcs7_decrypt_corpus/345397504ef40a3dbf4a6c351b5ce9f46d40cc27 b/fuzz/pkcs7_decrypt_corpus/345397504ef40a3dbf4a6c351b5ce9f46d40cc27
diff --git a/fuzz/pkcs7_decrypt_corpus/34623126a8e645828f428e656218d555c54f0237 b/fuzz/pkcs7_decrypt_corpus/34623126a8e645828f428e656218d555c54f0237
diff --git a/fuzz/pkcs7_decrypt_corpus/3472a2c6c01982031c075b892aa2367569e21347 b/fuzz/pkcs7_decrypt_corpus/3472a2c6c01982031c075b892aa2367569e21347
diff --git a/fuzz/pkcs7_decrypt_corpus/34fd97801f80cbfe2688feddce2897423b38c9bc b/fuzz/pkcs7_decrypt_corpus/34fd97801f80cbfe2688feddce2897423b38c9bc
diff --git a/fuzz/pkcs7_decrypt_corpus/34fdcd86c50cc87e2b1a4342fb4aff078c6fc407 b/fuzz/pkcs7_decrypt_corpus/34fdcd86c50cc87e2b1a4342fb4aff078c6fc407
diff --git a/fuzz/pkcs7_decrypt_corpus/35038e6eaa2db0a10e2a444dafcc083e58335333 b/fuzz/pkcs7_decrypt_corpus/35038e6eaa2db0a10e2a444dafcc083e58335333
diff --git a/fuzz/pkcs7_decrypt_corpus/3613c62b8b152641b794139095fcf5a634285110 b/fuzz/pkcs7_decrypt_corpus/3613c62b8b152641b794139095fcf5a634285110
diff --git a/fuzz/pkcs7_decrypt_corpus/3614178fd52a8f09e1c0a86281ec117515dd4ae5 b/fuzz/pkcs7_decrypt_corpus/3614178fd52a8f09e1c0a86281ec117515dd4ae5
diff --git a/fuzz/pkcs7_decrypt_corpus/36254b96ebf17b2ce46fd801ef2baf1b9ac4147c b/fuzz/pkcs7_decrypt_corpus/36254b96ebf17b2ce46fd801ef2baf1b9ac4147c
diff --git a/fuzz/pkcs7_decrypt_corpus/36e94a04baa7fb5e9687c324ca277e927734644d b/fuzz/pkcs7_decrypt_corpus/36e94a04baa7fb5e9687c324ca277e927734644d
diff --git a/fuzz/pkcs7_decrypt_corpus/378c97af3b43fd52e9e89626b14e6bdd6fd1f84a b/fuzz/pkcs7_decrypt_corpus/378c97af3b43fd52e9e89626b14e6bdd6fd1f84a
diff --git a/fuzz/pkcs7_decrypt_corpus/37b8ad1a9aeca6535206d760b6d9279e60949382 b/fuzz/pkcs7_decrypt_corpus/37b8ad1a9aeca6535206d760b6d9279e60949382
diff --git a/fuzz/pkcs7_decrypt_corpus/38244445fb20a497c0023d21d56aa449ef9bfb6c b/fuzz/pkcs7_decrypt_corpus/38244445fb20a497c0023d21d56aa449ef9bfb6c
diff --git a/fuzz/pkcs7_decrypt_corpus/38c99386575397338b5b2c4413796e966ec5f298 b/fuzz/pkcs7_decrypt_corpus/38c99386575397338b5b2c4413796e966ec5f298
diff --git a/fuzz/pkcs7_decrypt_corpus/39e06f84090bed9c33a6b402f8aeeb4253b149c6 b/fuzz/pkcs7_decrypt_corpus/39e06f84090bed9c33a6b402f8aeeb4253b149c6
diff --git a/fuzz/pkcs7_decrypt_corpus/39fe41aac08c5642047aa95d4fb76536c2605e1f b/fuzz/pkcs7_decrypt_corpus/39fe41aac08c5642047aa95d4fb76536c2605e1f
diff --git a/fuzz/pkcs7_decrypt_corpus/3aca114c933b2d0f1b3aea4ded582c361115bef5 b/fuzz/pkcs7_decrypt_corpus/3aca114c933b2d0f1b3aea4ded582c361115bef5
diff --git a/fuzz/pkcs7_decrypt_corpus/3b3e3ed0950c95774d0be2fed5d98d5bf9995c8a b/fuzz/pkcs7_decrypt_corpus/3b3e3ed0950c95774d0be2fed5d98d5bf9995c8a
diff --git a/fuzz/pkcs7_decrypt_corpus/3b6c0e3931401a7564110e165b270ab6c9947696 b/fuzz/pkcs7_decrypt_corpus/3b6c0e3931401a7564110e165b270ab6c9947696
diff --git a/fuzz/pkcs7_decrypt_corpus/3bc232ab4f604ed2b04da28e33c888604383aad8 b/fuzz/pkcs7_decrypt_corpus/3bc232ab4f604ed2b04da28e33c888604383aad8
diff --git a/fuzz/pkcs7_decrypt_corpus/3c71a1a1c41db425c56e219512a418e80508295c b/fuzz/pkcs7_decrypt_corpus/3c71a1a1c41db425c56e219512a418e80508295c
diff --git a/fuzz/pkcs7_decrypt_corpus/3c72c8472d241243067472143e87588f90e03dc6 b/fuzz/pkcs7_decrypt_corpus/3c72c8472d241243067472143e87588f90e03dc6
diff --git a/fuzz/pkcs7_decrypt_corpus/3d35cd7b82abd08dad7a2604056b50913eef636b b/fuzz/pkcs7_decrypt_corpus/3d35cd7b82abd08dad7a2604056b50913eef636b
diff --git a/fuzz/pkcs7_decrypt_corpus/3d3bf4114aa74d1b395769cef6b2fe58b99b8462 b/fuzz/pkcs7_decrypt_corpus/3d3bf4114aa74d1b395769cef6b2fe58b99b8462
diff --git a/fuzz/pkcs7_decrypt_corpus/3da6167e40d223ee8d948dc87f2eed3c0d21aa73 b/fuzz/pkcs7_decrypt_corpus/3da6167e40d223ee8d948dc87f2eed3c0d21aa73
diff --git a/fuzz/pkcs7_decrypt_corpus/3ddf97e8c7c5de648325169f8f3659355d996468 b/fuzz/pkcs7_decrypt_corpus/3ddf97e8c7c5de648325169f8f3659355d996468
diff --git a/fuzz/pkcs7_decrypt_corpus/3e2021e14d9f34d9f42d926df522c3c2ffb053ed b/fuzz/pkcs7_decrypt_corpus/3e2021e14d9f34d9f42d926df522c3c2ffb053ed
diff --git a/fuzz/pkcs7_decrypt_corpus/3eb402c9844ccf52e29e613a3a017be1aa1bad37 b/fuzz/pkcs7_decrypt_corpus/3eb402c9844ccf52e29e613a3a017be1aa1bad37
diff --git a/fuzz/pkcs7_decrypt_corpus/3f5a49cbdcbf901134146e1b6f89aafbb6e578c5 b/fuzz/pkcs7_decrypt_corpus/3f5a49cbdcbf901134146e1b6f89aafbb6e578c5
@@ -0,0 +1 @@
+0
diff --git a/fuzz/pkcs7_decrypt_corpus/3f73d96a324e70b7fe9346f49a88d131e1924643 b/fuzz/pkcs7_decrypt_corpus/3f73d96a324e70b7fe9346f49a88d131e1924643
diff --git a/fuzz/pkcs7_decrypt_corpus/40c8ea604133ffffafdcf586b55a1b587d8f25c6 b/fuzz/pkcs7_decrypt_corpus/40c8ea604133ffffafdcf586b55a1b587d8f25c6
diff --git a/fuzz/pkcs7_decrypt_corpus/40e73c059347a296a90ddab0108df3bb2991b116 b/fuzz/pkcs7_decrypt_corpus/40e73c059347a296a90ddab0108df3bb2991b116
diff --git a/fuzz/pkcs7_decrypt_corpus/40e89aec926a5d4cc19463466efcb3c1debf42ee b/fuzz/pkcs7_decrypt_corpus/40e89aec926a5d4cc19463466efcb3c1debf42ee
@@ -0,0 +1 @@
+$�
diff --git a/fuzz/pkcs7_decrypt_corpus/40e9d465afd7404a545088d7b3f560243a083848 b/fuzz/pkcs7_decrypt_corpus/40e9d465afd7404a545088d7b3f560243a083848
diff --git a/fuzz/pkcs7_decrypt_corpus/429e92c0bf179192f5ec677cb0dfac4c38294e42 b/fuzz/pkcs7_decrypt_corpus/429e92c0bf179192f5ec677cb0dfac4c38294e42
diff --git a/fuzz/pkcs7_decrypt_corpus/435fb7ba28439cdaf129db085f0b2ccf5a186899 b/fuzz/pkcs7_decrypt_corpus/435fb7ba28439cdaf129db085f0b2ccf5a186899
diff --git a/fuzz/pkcs7_decrypt_corpus/43b53bbac7718421dac027c63dcd0b8a3c8d8a4f b/fuzz/pkcs7_decrypt_corpus/43b53bbac7718421dac027c63dcd0b8a3c8d8a4f
diff --git a/fuzz/pkcs7_decrypt_corpus/43c84a3b73ed8a430c0055e40e2cc3c12cb934f7 b/fuzz/pkcs7_decrypt_corpus/43c84a3b73ed8a430c0055e40e2cc3c12cb934f7
diff --git a/fuzz/pkcs7_decrypt_corpus/446651be78c3275d3a22d27b1afee477d220309c b/fuzz/pkcs7_decrypt_corpus/446651be78c3275d3a22d27b1afee477d220309c
diff --git a/fuzz/pkcs7_decrypt_corpus/45339020d063be9df3eb2477844e0b47af6f126c b/fuzz/pkcs7_decrypt_corpus/45339020d063be9df3eb2477844e0b47af6f126c
diff --git a/fuzz/pkcs7_decrypt_corpus/461bd95887b5d7352a5749f5e2069cac157fabb5 b/fuzz/pkcs7_decrypt_corpus/461bd95887b5d7352a5749f5e2069cac157fabb5
diff --git a/fuzz/pkcs7_decrypt_corpus/46b457922ba4036938741d910e27e59b58bc3bac b/fuzz/pkcs7_decrypt_corpus/46b457922ba4036938741d910e27e59b58bc3bac
diff --git a/fuzz/pkcs7_decrypt_corpus/47b82918165be727848e38daefd72594aa79dcef b/fuzz/pkcs7_decrypt_corpus/47b82918165be727848e38daefd72594aa79dcef
diff --git a/fuzz/pkcs7_decrypt_corpus/48e09cfa898ed204eb545514cef28cd92fcf9542 b/fuzz/pkcs7_decrypt_corpus/48e09cfa898ed204eb545514cef28cd92fcf9542
diff --git a/fuzz/pkcs7_decrypt_corpus/4a33ea211bd1bff73e6aee9e70bdaa6f2e976bb2 b/fuzz/pkcs7_decrypt_corpus/4a33ea211bd1bff73e6aee9e70bdaa6f2e976bb2
diff --git a/fuzz/pkcs7_decrypt_corpus/4a877103c32866b2e43f7d58f2e9b6bff2670881 b/fuzz/pkcs7_decrypt_corpus/4a877103c32866b2e43f7d58f2e9b6bff2670881
diff --git a/fuzz/pkcs7_decrypt_corpus/4b464731b48c76963ce6db5541a6e0afddf52f63 b/fuzz/pkcs7_decrypt_corpus/4b464731b48c76963ce6db5541a6e0afddf52f63
diff --git a/fuzz/pkcs7_decrypt_corpus/4bc1f9b871e390999ca3ff9951147ce2b4cdafa8 b/fuzz/pkcs7_decrypt_corpus/4bc1f9b871e390999ca3ff9951147ce2b4cdafa8
diff --git a/fuzz/pkcs7_decrypt_corpus/4be6a426fe63b90d6990221e4c45581c99f3c5e5 b/fuzz/pkcs7_decrypt_corpus/4be6a426fe63b90d6990221e4c45581c99f3c5e5
diff --git a/fuzz/pkcs7_decrypt_corpus/4d9e285f6e66caba1ff602f9d8ec85a818d9b741 b/fuzz/pkcs7_decrypt_corpus/4d9e285f6e66caba1ff602f9d8ec85a818d9b741
diff --git a/fuzz/pkcs7_decrypt_corpus/4ddcee224585ac659b9efdc83f2291f3193c154c b/fuzz/pkcs7_decrypt_corpus/4ddcee224585ac659b9efdc83f2291f3193c154c
@@ -0,0 +1 @@
+0�0�0�
diff --git a/fuzz/pkcs7_decrypt_corpus/4e259d68e2de8f044ba1a48b5a179de960f45372 b/fuzz/pkcs7_decrypt_corpus/4e259d68e2de8f044ba1a48b5a179de960f45372
diff --git a/fuzz/pkcs7_decrypt_corpus/4e61ffbd07cce7ae93c5931f231649cc041a2dd4 b/fuzz/pkcs7_decrypt_corpus/4e61ffbd07cce7ae93c5931f231649cc041a2dd4
diff --git a/fuzz/pkcs7_decrypt_corpus/4e7ae935f359cb47e717b4d15317ca81f5b39bf2 b/fuzz/pkcs7_decrypt_corpus/4e7ae935f359cb47e717b4d15317ca81f5b39bf2
diff --git a/fuzz/pkcs7_decrypt_corpus/4ee33871d1ade7ce1710c89982cca56a5f4cea5d b/fuzz/pkcs7_decrypt_corpus/4ee33871d1ade7ce1710c89982cca56a5f4cea5d
diff --git a/fuzz/pkcs7_decrypt_corpus/4f2950931678d2892661941afd2054db4e617e7b b/fuzz/pkcs7_decrypt_corpus/4f2950931678d2892661941afd2054db4e617e7b
diff --git a/fuzz/pkcs7_decrypt_corpus/4f4326c54c56aa126b24884d35a273b791686767 b/fuzz/pkcs7_decrypt_corpus/4f4326c54c56aa126b24884d35a273b791686767
diff --git a/fuzz/pkcs7_decrypt_corpus/503b4e5c67e41c8a5ef40079d1c7e7a09eb8c5f4 b/fuzz/pkcs7_decrypt_corpus/503b4e5c67e41c8a5ef40079d1c7e7a09eb8c5f4
diff --git a/fuzz/pkcs7_decrypt_corpus/505029af3da56b3ff65767e5da3e13c354864a2d b/fuzz/pkcs7_decrypt_corpus/505029af3da56b3ff65767e5da3e13c354864a2d
diff --git a/fuzz/pkcs7_decrypt_corpus/518750f82b64567a3c2e497b1bd2e8b2109c9ec8 b/fuzz/pkcs7_decrypt_corpus/518750f82b64567a3c2e497b1bd2e8b2109c9ec8
diff --git a/fuzz/pkcs7_decrypt_corpus/520f7d98a029f02975f9a4505d16bd621dfdc33f b/fuzz/pkcs7_decrypt_corpus/520f7d98a029f02975f9a4505d16bd621dfdc33f
diff --git a/fuzz/pkcs7_decrypt_corpus/521b0084f09f2a0c33254f2b6e5c321bfb4d34be b/fuzz/pkcs7_decrypt_corpus/521b0084f09f2a0c33254f2b6e5c321bfb4d34be
diff --git a/fuzz/pkcs7_decrypt_corpus/5253c8f085a65877c34c748a767ac27074ea9733 b/fuzz/pkcs7_decrypt_corpus/5253c8f085a65877c34c748a767ac27074ea9733
diff --git a/fuzz/pkcs7_decrypt_corpus/5295380188f75d696383f8bdb2147f0053791372 b/fuzz/pkcs7_decrypt_corpus/5295380188f75d696383f8bdb2147f0053791372
diff --git a/fuzz/pkcs7_decrypt_corpus/52ac9240a372783aa720e7d07a8ab2cf52348d85 b/fuzz/pkcs7_decrypt_corpus/52ac9240a372783aa720e7d07a8ab2cf52348d85
diff --git a/fuzz/pkcs7_decrypt_corpus/52b1a0974b7239ef67e80875eac2023a47e48aa2 b/fuzz/pkcs7_decrypt_corpus/52b1a0974b7239ef67e80875eac2023a47e48aa2
diff --git a/fuzz/pkcs7_decrypt_corpus/5315535e8c9f268cfccf06f12adcdd1b4de9c0f0 b/fuzz/pkcs7_decrypt_corpus/5315535e8c9f268cfccf06f12adcdd1b4de9c0f0
diff --git a/fuzz/pkcs7_decrypt_corpus/532376b4de635aa570b8fe14848aac81297e0c19 b/fuzz/pkcs7_decrypt_corpus/532376b4de635aa570b8fe14848aac81297e0c19
diff --git a/fuzz/pkcs7_decrypt_corpus/532a54ca63cdba3eb93b58cc92b857c47462556e b/fuzz/pkcs7_decrypt_corpus/532a54ca63cdba3eb93b58cc92b857c47462556e