From 73621ef0f08951885b321f0b9964203ae04c9fb5 Mon Sep 17 00:00:00 2001
From: Nick Child <nick.child@ibm.com>
Date: Fri, 28 Oct 2022 11:23:15 -0500
Subject: [PATCH] pkcs7: Improve verify logic and rebuild test data

Various responses to feedback regarding the
pkcs7_verify_signed_data/hash functions. Mainly, merge these two
functions into one to reduce redudant logic [1]. As a result, an
identified bug about skipping over a signer is patched [2].

Additionally, add a conditional in the verify logic that checks if
the given x509 validity period is expired [3]. During testing of this
conditional, it turned out that all of the testing data was expired.
So, rebuild all of the pkcs7 testing data to refresh timestamps.

[1] https://github.com/Mbed-TLS/mbedtls/pull/3431#discussion_r999652525
[2] https://github.com/Mbed-TLS/mbedtls/pull/3431#discussion_r997090215
[3] https://github.com/Mbed-TLS/mbedtls/pull/3431#discussion_r967238206
Signed-off-by: Nick Child <nick.child@ibm.com>
---
 library/pkcs7.c                               |  87 +++++++-----------
 tests/data_files/pkcs7-rsa-sha256-1.crt       |  32 +++----
 tests/data_files/pkcs7-rsa-sha256-1.der       | Bin 845 -> 845 bytes
 tests/data_files/pkcs7-rsa-sha256-1.key       |  52 +++++------
 tests/data_files/pkcs7-rsa-sha256-1.pem       |  84 ++++++++---------
 tests/data_files/pkcs7-rsa-sha256-2.crt       |  32 +++----
 tests/data_files/pkcs7-rsa-sha256-2.der       | Bin 845 -> 845 bytes
 tests/data_files/pkcs7-rsa-sha256-2.key       |  52 +++++------
 tests/data_files/pkcs7-rsa-sha256-2.pem       |  84 ++++++++---------
 .../data_files/pkcs7_data_cert_encrypted.der  | Bin 452 -> 452 bytes
 .../pkcs7_data_cert_signed_sha1.der           | Bin 1276 -> 1276 bytes
 .../pkcs7_data_cert_signed_sha256.der         | Bin 1284 -> 1284 bytes
 .../pkcs7_data_cert_signed_sha512.der         | Bin 1284 -> 1284 bytes
 .../data_files/pkcs7_data_cert_signed_v2.der  | Bin 1284 -> 1284 bytes
 .../pkcs7_data_cert_signeddata_sha256.der     | Bin 1265 -> 1265 bytes
 .../pkcs7_data_multiple_certs_signed.der      | Bin 2504 -> 2504 bytes
 .../data_files/pkcs7_data_multiple_signed.der | Bin 810 -> 810 bytes
 .../data_files/pkcs7_data_signed_badcert.der  | Bin 1284 -> 1284 bytes
 .../pkcs7_data_signed_badsigner.der           | Bin 1284 -> 1284 bytes
 .../pkcs7_data_without_cert_signed.der        | Bin 435 -> 435 bytes
 .../pkcs7_signerInfo_issuer_invalid_size.der  | Bin 1284 -> 1284 bytes
 .../pkcs7_signerInfo_serial_invalid_size.der  | Bin 1284 -> 1284 bytes
 22 files changed, 200 insertions(+), 223 deletions(-)

diff --git a/library/pkcs7.c b/library/pkcs7.c
index c4d605e009..56b6bb6170 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -623,12 +623,12 @@ out:
     return( ret );
 }
 
-int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
-                                      const mbedtls_x509_crt *cert,
-                                      const unsigned char *data,
-                                      size_t datalen )
+static int mbedtls_pkcs7_data_or_hash_verify( mbedtls_pkcs7 *pkcs7,
+                                             const mbedtls_x509_crt *cert,
+                                             const unsigned char *data,
+                                             size_t datalen,
+                                             const int is_data_hash )
 {
-
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     unsigned char *hash;
     mbedtls_pk_context pk_cxt = cert->pk;
@@ -642,6 +642,14 @@ int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
         goto out;
     }
 
+    if( mbedtls_x509_time_is_past( &cert->valid_to ) ||
+        mbedtls_x509_time_is_future( &cert->valid_from ))
+    {
+        printf("EXPRED\n");
+        ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
+        goto out;
+    }
+
     /*
      * Potential TODOs
      * Currently we iterate over all signers and return success if any of them
@@ -676,8 +684,17 @@ int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
             ret = MBEDTLS_ERR_PKCS7_ALLOC_FAILED;
             goto out;
         }
-
-        ret = mbedtls_md( md_info, data, datalen, hash );
+        if( is_data_hash )
+        {
+            if( datalen != mbedtls_md_get_size( md_info ))
+                ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
+            else
+                memcpy(hash, data, datalen);
+        }
+        else
+        {
+            ret = mbedtls_md( md_info, data, datalen, hash );
+        }
         if( ret != 0 )
         {
             ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
@@ -688,7 +705,6 @@ int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
         ret = mbedtls_pk_verify( &pk_cxt, md_alg, hash,
                                  mbedtls_md_get_size( md_info ),
                                  signer->sig.p, signer->sig.len );
-
         mbedtls_free( hash );
 
         if( ret == 0 )
@@ -698,59 +714,20 @@ int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
 out:
     return( ret );
 }
+int mbedtls_pkcs7_signed_data_verify( mbedtls_pkcs7 *pkcs7,
+                                      const mbedtls_x509_crt *cert,
+                                      const unsigned char *data,
+                                      size_t datalen )
+{
+    return( mbedtls_pkcs7_data_or_hash_verify( pkcs7, cert, data, datalen, 0 ) );
+}
 
 int mbedtls_pkcs7_signed_hash_verify( mbedtls_pkcs7 *pkcs7,
                                       const mbedtls_x509_crt *cert,
                                       const unsigned char *hash,
                                       size_t hashlen )
 {
-    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-    const mbedtls_md_info_t *md_info;
-    mbedtls_md_type_t md_alg;
-    mbedtls_pk_context pk_cxt;
-    mbedtls_pkcs7_signer_info *signer;
-
-    pk_cxt = cert->pk;
-
-    if( pkcs7->signed_data.no_of_signers == 0 )
-    {
-        ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
-        goto out;
-    }
-
-    signer = &pkcs7->signed_data.signers;
-    for( signer = &pkcs7->signed_data.signers; signer; signer = signer->next )
-    {
-        ret = mbedtls_oid_get_md_alg( &signer->alg_identifier, &md_alg );
-        if( ret != 0 )
-        {
-            ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
-            continue;
-        }
-
-        md_info = mbedtls_md_info_from_type( md_alg );
-        if( md_info == NULL )
-        {
-            ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
-            continue;
-        }
-
-        if( hashlen != mbedtls_md_get_size( md_info ) )
-        {
-            ret = MBEDTLS_ERR_PKCS7_VERIFY_FAIL;
-            signer = signer->next;
-            continue;
-        }
-
-        ret = mbedtls_pk_verify( &pk_cxt, md_alg, hash, hashlen,
-                                 pkcs7->signed_data.signers.sig.p,
-                                 pkcs7->signed_data.signers.sig.len );
-        if( ret == 0 )
-            break;
-    }
-
-out:
-    return( ret );
+    return( mbedtls_pkcs7_data_or_hash_verify( pkcs7, cert, hash, hashlen, 1 ) );
 }
 
 /*
diff --git a/tests/data_files/pkcs7-rsa-sha256-1.crt b/tests/data_files/pkcs7-rsa-sha256-1.crt
index ebbaf7cc6e..9e461cd0c6 100644
--- a/tests/data_files/pkcs7-rsa-sha256-1.crt
+++ b/tests/data_files/pkcs7-rsa-sha256-1.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUMBERfOWtW1Y8Y661YJt3KlBYYZ0wDQYJKoZIhvcNAQEL
+MIIDSTCCAjGgAwIBAgIUe97d0kRM0c3+XEGoECyJt98ubL8wDQYJKoZIhvcNAQEL
 BQAwNDELMAkGA1UEBhMCTkwxDjAMBgNVBAoMBVBLQ1M3MRUwEwYDVQQDDAxQS0NT
-NyBDZXJ0IDEwHhcNMjAxMTI0MTQxMDE5WhcNMjExMTI0MTQxMDE5WjA0MQswCQYD
+NyBDZXJ0IDEwHhcNMjIxMDI4MTYxMDU2WhcNMjMxMDI4MTYxMDU2WjA0MQswCQYD
 VQQGEwJOTDEOMAwGA1UECgwFUEtDUzcxFTATBgNVBAMMDFBLQ1M3IENlcnQgMTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfqRyKXRqfkj/BThWvwcKfv
-qsTiZmVOE6sIusfY86qae4Yv8R8AaBgA3eYbSOat/Xyr3VFgZGtv9Hc8iDM7K1h9
-U9WBKPGN1gGw12LzAxIbf+t5qkH21YtPNkr7liwJruhTh/JLypKE/SVW1XIS47PE
-Ug92emsRMKfgsReO7x/EmB/c5cnXfwnrc+DKog2eB+6eIPhq2uq0g+/bV8hkx8+D
-N50Qq1OMdy0s/RXeurlYG72jhpj978eOq467vUIIxyD4ggsh9f3ZMOEGFlGjSiZL
-CXTgbIbwXnndamf3iqWWN5ZiDH6NVP1UTfCvxvX4HfBE928z0OXu4k7QxNaboEEC
-AwEAAaNTMFEwHQYDVR0OBBYEFF1d36HSc95cdyWYy/SRZPsmWncJMB8GA1UdIwQY
-MBaAFF1d36HSc95cdyWYy/SRZPsmWncJMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAIqAZJRQFPL8GFpxp0ZjF4vSiKX/D0/+LJB+vei4ZGZMaqRo
-afT9LBAquK1JjXYXJ9wz56ueVxggouVLb6XTrAwsHISwVxKzxkmBde2egPZ9L7tw
-EJdb2YPAkdoi3fY259N6KS8S0MwMMi/YmiXpVpQiPQ5tQFdbT9oSqewi/C7TudFc
-hez1M7ToYfbMaZ1yQxf5otT8wKVKhLdEb9ncE2Jku6eH+5+lcVFsliLcNo28bd0c
-joRYufduegaxmFluq4YWCozgET38AFKiG9Y8fK34He/qJIwHn7nWJ3cy3j+NAh3X
-gpobw4JhCNXaInaNx/BZsoedjXnkunhgRijykOU=
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMi2z2mJnNHw67TKZFwF5w4N
+Lv7dzGHQicvVFaOaNXm5I0O2HsdQBg+07TeHYzJADkJfHTdsfnXClzMU7fS7MMj4
+3QO5/P+VWiRdSRN61uYAVsrBlVKoZdUhhxh8wELJxJ4+OpwXpTS0U82rwMsRO09j
+9bMXS57pkCsZENEUlqJ5p0Mmrc/uEL/Z5+uvuzd76bY5WRZdE91XURccra08HTra
+xovIAR1htUz2AXi+NoOaiayRq0GePKN9a6iB0lUYxNtovKb3yDYC9pmoaxf7Hnc7
+y+dLuTpJslGuhkKLV0Dhhoux1vq54ocS6Y7DGa2Pyk1zAQxLCcS4BFiWHnzwg1MC
+AwEAAaNTMFEwHQYDVR0OBBYEFIru5ZR8xnxd1RWnbip+zTHuUv3IMB8GA1UdIwQY
+MBaAFIru5ZR8xnxd1RWnbip+zTHuUv3IMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAIIda5jNRX3r0rCBrKJ+vs1Pk6zIKEQ7Oeq/+p+k6eRUO0b8
+wx4rW0gXeQPeppaaxKLMZXBlA5DxsI1DpML5dcfti/M1bHIYOAISRRqPEd5GVTy8
+1ltCVN249mg06yHdoqjzO1geFIRVesoblO6JMd3xYDe3pxcTIakZNq/Cf/zjld51
+1fcMuLWu4F/1BwiNZa8eQ5Zs1Cy+b3+s+NrgVd2CIrFpZSFyP4EkUXhZXJha6Rf9
+SzmYdz4al7e9EAhURvQlm8wJpFSSkoLBuJtx7Vh6d14KPUU2NB9F2ulp6AbJb+/H
+EGd3bAK6IhIrkZmxTAwowESHUJBwuX890tbZcnM=
 -----END CERTIFICATE-----
diff --git a/tests/data_files/pkcs7-rsa-sha256-1.der b/tests/data_files/pkcs7-rsa-sha256-1.der
index 622df1e7a38899b4da3a3601badd4fb36a333238..0d799ea335a51b79ecc1f0b50037469ab0b69ade 100644
GIT binary patch
delta 668
zcmV;N0%QHn2F(T|FoFX~FoFUxpaTK{0s<6!-rdqfOwrB$TtTQ1EQz<@E^NP%BT5=F
zF)%VXF*Y$UH8xro4Kgz^FfuqXHZd?YHj#%|f5^7aX^EWC@awe7WLyR34h=5;-OORo
ziOba$qnb5&xg$fi9>-7y547z!hhs884nkiYH*9`&!k04??ex1a$oSm@x%~f?S|nXb
z6MEL>09MMul~Sl>)ggx%e857<#GXDnoEN1uv{TKiz{?RkPh<777fYV$kSiGw(G-@V
ze|e`vCaurz5Wm^y>#w^vd+D}0Sr%Or-B(c;9IdT99Xi^^i^u^TVYN*50eHSPgPMt~
zk*h(TJfnSUsDaW|7{uFXyr%caHUjpUsB0Jd9(Oy-=S#UdNwQI{hC+*1K;edqvDW&z
z;)fFHj>8$PkIGGR0SrqC#JB`lmL7cYOM_Da0|5X5qf;<ZFdYU1RUHll76cTE?&Xwx
z#(Z7X6{l`0e$6rNQvJv<9|i+e9U}x7FcyFmitgo<e8zlT)fK01Dt^r|?o$28lPCfu
ze}Wxrn9W6f>(a1+tfGFt%}<l8$S6cRIqJXqpQP#JR69oe!yYSJNEdkn-lmqC#G=e)
zaAgCK@vx0Uq{8`i$L)*rHEePiI06zy8jlg)MpZn#)>}eU-MIE>H0vSVqNwvbSRNFF
zReH)Bl<tW!-SJ>Ix2G2qA*mTQufl))f8&+jb=CI_xV5g}U-btFjb*PMLzZmREWU4l
ztoYjCRo#Ljv1w%?azBA2QFvKgm|E!<{YyERcRm`Ix4jSuR7UhAo6HHMRFaZ{!MK}o
z?O1wuUJ5-$HZ&ha+UaTN2FY*l#}H?CYy!F>5-X9Ju}lmoz(j{okZ`$wJ<`_M0&;Vx
C%{4m!

delta 668
zcmV;N0%QHn2F(T|FoFX~FoFUxpaTK{0s<5;5fOalty@++W3IJen|CTuSYe%!BT5=D
zF)=bUF*GqSF*#Zn4Kgt?F)}nUG%+wSIgy80f5+-aB9}&|<d5)Eg=_F|r|+u7;$~$|
z6RQZi$Jq0#ntO&X@gD$a7y#Yo8%XA@{d}w4QD9_iZ}fLOh%-AYSbbB~fhh5f)&a2B
zV)FwM8-MG0szLVEi%&L6`<5&TuIN*T@=MB+g#9H})p8Q!v&2#lc6w_OFsI<L7mn{A
zf5ey{+~vvFe+lbz;L4&6o(JxpAoyz9>a>IJ+gHeB$IpW|oe-;2jCU<8{T1H2xmX*$
zqlTFM@5hd-j=Q}=2*)7!f(s$_{n;?#1{P7HN+wGQbl_};@LqY{YG?O~rIt6AVhnzb
zRQ*&<@UO=8_#N;>_ir=M<?iB6(8Si8OQ1ml0|5X5qf;<ZFdYU1RUHll76cSsUEiV7
zbKYEcC78?fk!1TOT6YOB9|i+e9U}x7FcyFmU0vUy(sSNicO{t1^pRxyCR%q1lPCfu
ze~N%)lu#7%{1{qsr$%EJi_(at{|`_8ERcS^=(uENOlqWPY4rUp5GuH>NsV?FC)_jV
ztDaXFAfn|<Z>7_$3@jXkuvZeZ#z}#7?Vf=4eJ{Ik5SLrogTRs6BHi{j=hJ#AFA~tq
z3^Fg+nkDI0lp;M2Z9rFBPudcx>>~Uwf77|qT!rlQGqmVo_RMLWazhvSqSXArrAmai
zL~q&L6Jlh$r-%EWrEyVgmLl9Xjl6B$9FBxox%X~*2C<k~ZmWhC3XI?pJ^TPtq8rvc
ze69E$@9HFs2cNmtCwDU5KaBz%*MgcG!-8Q5)!HI<jmPj=vWK0GdE~lyU`8nN0+8iC
CaXuyh

diff --git a/tests/data_files/pkcs7-rsa-sha256-1.key b/tests/data_files/pkcs7-rsa-sha256-1.key
index 0c7d37d880..e31159d561 100644
--- a/tests/data_files/pkcs7-rsa-sha256-1.key
+++ b/tests/data_files/pkcs7-rsa-sha256-1.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDH6kcil0an5I/w
-U4Vr8HCn76rE4mZlThOrCLrH2POqmnuGL/EfAGgYAN3mG0jmrf18q91RYGRrb/R3
-PIgzOytYfVPVgSjxjdYBsNdi8wMSG3/reapB9tWLTzZK+5YsCa7oU4fyS8qShP0l
-VtVyEuOzxFIPdnprETCn4LEXju8fxJgf3OXJ138J63PgyqINngfuniD4atrqtIPv
-21fIZMfPgzedEKtTjHctLP0V3rq5WBu9o4aY/e/HjquOu71CCMcg+IILIfX92TDh
-BhZRo0omSwl04GyG8F553Wpn94qlljeWYgx+jVT9VE3wr8b1+B3wRPdvM9Dl7uJO
-0MTWm6BBAgMBAAECggEASx6bUEIryJa4B4Q61E5q5o/GSWkRNOvbtB75oHLDTM3z
-sH5/Sjjq5Goe94I1KIkkgR5LcXKZCU3uPIfAXg/Tv9KIF+gKrImxar06kfHiq4Et
-1hvHgDXyFADV0+MpkK6qzJ3mrYMRQXE7djZkyhKTAU+5zhmk8mppMAvcP4/0Bqk8
-EQRd6rPzeQdK6Lz0UPHsjO2bqksdqtts090W07VY13tZdSL3Xsjig0TEsM0Oalv9
-VKTU+xBLQuD9cn2QYQfSflQl7ZGrS2N7OeZ4Ju5Spygo7YO/Lsl3WMYKNPiX7E7T
-Z+sD6duWLbPC6atWgk1XmD9oZLBsx/jZT/Lp+cOLaQKBgQD3u8iNs4AafDnxAdZc
-3vQBH0yablI5nRtRrAmpjyj8gNNbszoeCM+7MBJ2Npw3qnYtqRWw5vKljU3gVLXG
-aPxUnyAJIVBWZDdlnnqOjKY++k6IF+3vcal9In+j5W0HYEfngLSm1/mJJHfK4N21
-JaJMwIxXJBkt0AbhyJlFc5WWowKBgQDOlgPY2xabKU5r+st3n1QKReirkb07rUR0
-ky3nBDGfI3svglX+5ZC/cDsl/YjAkGgOYgpgf1z0KUj2GmkQ6eMj9QVwzstwhKql
-Asg4BXTd36Ia4zAbIYluUqHgbQOXKItLwJ3o1UImRlOosxG1hrHm1YpBZu9LEq//
-medOr+nvywKBgA5eNMaLJ53hoJaqzZz7TVmXUCEQzvIKe6AkAzdzVyQ18Iw7+93s
-Eug/ZIK4rhzIZSxGxzxIWMBjTqX5I8XLJv9db0U4SmmITHI3W9JSs/2pFM7t3F3r
-0LGyQ4bk8orf+auimlem5REgLVZ17kXoVd5vuHQBYvh2PT/xG3qctotTAoGAeVgW
-lGdEJQmjPbvHjdExjQM5QqXNUGNbBVp6KOsGtqIhtmtJVfrEBh7HL253yBxKcsBV
-tg65q9UgPSaQNlYbjEBc3MErMEFM9rXmozlZRwYX8tElrZoKXpn86ZU++afgAjP2
-zQ+O1mqSs1HTghvHHX6qwfXTcvZcGLfu7QJZV/cCgYEAkpfg4Ev8zPPTpDTeS3h+
-uUhrU7cQ6Ry1+S1effLjaDLm+YdpXJ7DGhtV6yLSXbZPlcmbzYZyvBmYixdz8oqw
-btJym460gKjAQLIrMcLL3tJcX5ww6oRCL5hqZgvcFeIlmYSTIEZs0X69Ft8trWSu
-A3BsQ4P24o/FXcvGAv0gH0E=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIts9piZzR8Ou0
+ymRcBecODS7+3cxh0InL1RWjmjV5uSNDth7HUAYPtO03h2MyQA5CXx03bH51wpcz
+FO30uzDI+N0Dufz/lVokXUkTetbmAFbKwZVSqGXVIYcYfMBCycSePjqcF6U0tFPN
+q8DLETtPY/WzF0ue6ZArGRDRFJaieadDJq3P7hC/2efrr7s3e+m2OVkWXRPdV1EX
+HK2tPB062saLyAEdYbVM9gF4vjaDmomskatBnjyjfWuogdJVGMTbaLym98g2AvaZ
+qGsX+x53O8vnS7k6SbJRroZCi1dA4YaLsdb6ueKHEumOwxmtj8pNcwEMSwnEuARY
+lh588INTAgMBAAECggEBAIg+P1B+TurbRMQ11iX5A7wwCsSKPh/vdHneLJAfL0lu
++JcP2piko1iqEZPt3NHRVVyMP8LNbJH3Ardz74p+PkFNXIkZCLlc4hFpGR+V9KWv
+eTqsaPXwxR8FYTSoCcHMQCDCUPp/um6qMXCcs4OkMMRVMATfPT+jf28h1p52AUJL
+aAoBJfn7gP3WiB0FWq0bRZgSZzNYowE/MhGAQ+DuBGTSASSK3YJcxE94044fBVE8
+EqYKrxoY/x56li5cZ0v9kaURCrvhqCeq2+U5kIkgtvp2l6wF0Mm1du3BLxo2LQEI
+Y2j+6BFEV74Mtv48GTwrZcyit787zyo9vVGcviSD5VECgYEA/mgLc5KfF/cQLmM/
+20T4k0edvktkRIJHFUBphowt5Hb0a0wM5C1VM4z3yN3b9ikQK+ZaQXETdPATBXIe
+LntX1D1xtbMxdcAfd1FSq8QxAuaPknJZBgtzlpCsx3ZvMnNuzKZN/TU8kR1biwPE
+9HaeEG3bouUu+CI/l/DqrBbQRacCgYEAyfiqsLWGhXQ7e3pLk47PDYlMOsjDWPjs
+SGcatH1/lIMWyZue4W2IUcFMbpbjA6QWibo3VnOavIRSTn97JNUWYvgc5MmaQ7iX
+Iss4m3vJ1LIqx30iUgw3EfDoWdpufEEYssZ/VxJPs3sdmZGALgd3CaqxHJuhuS+U
+eVhWzD6LonUCgYBRCbt8GRxsedrBrAPPSO0VnR52W3WZDRavglEa9tQ3jlzVQOhq
+VrZpMWJMrb8/bl0kXsApUGeuPDsS5QMQM2IKzXfHNUlwBL8BNvpqlJg4IFFjiOEq
+t8MeFv+ymdtZ6sNElUUKf0bHwt5CLfUzGgXHnfb0sKSBjgdL0wYtwyacyQKBgQDJ
+NcyG4zEy/srLhtiIFnu8Fo40+hFzL/nlX6JBMc3KHJa1Hy43krF+ET6d5gAffndd
+moDKxbzgFksRHPuHhCobSucuHpJq6RjYdvDcJYS7OwxXVRi9+KFcZE52RaBQdWGv
+qQTvr7RrMDoa5dN3B8TVgpGT2JBTN02JXjKKo7zkiQKBgCZwKDiXl7qsGidvlFZc
+4CEtFsCgnNgdRTzsTL/Pr8q9CBK3BhjZjNzQALF1iGFDC1FdFYFOwI1E3j+MRHJB
+rQMF8zbmmlZ6SC5QtqatCSCCKUyrUjD5J+4UfJqWFjiBBdwz+5VJojHw1yijEwl4
+LrS/V2yBrDJVczQQM4psonLF
 -----END PRIVATE KEY-----
diff --git a/tests/data_files/pkcs7-rsa-sha256-1.pem b/tests/data_files/pkcs7-rsa-sha256-1.pem
index fe1e16f8dc..3795b71887 100644
--- a/tests/data_files/pkcs7-rsa-sha256-1.pem
+++ b/tests/data_files/pkcs7-rsa-sha256-1.pem
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUMBERfOWtW1Y8Y661YJt3KlBYYZ0wDQYJKoZIhvcNAQEL
+MIIDSTCCAjGgAwIBAgIUe97d0kRM0c3+XEGoECyJt98ubL8wDQYJKoZIhvcNAQEL
 BQAwNDELMAkGA1UEBhMCTkwxDjAMBgNVBAoMBVBLQ1M3MRUwEwYDVQQDDAxQS0NT
-NyBDZXJ0IDEwHhcNMjAxMTI0MTQxMDE5WhcNMjExMTI0MTQxMDE5WjA0MQswCQYD
+NyBDZXJ0IDEwHhcNMjIxMDI4MTYxMDU2WhcNMjMxMDI4MTYxMDU2WjA0MQswCQYD
 VQQGEwJOTDEOMAwGA1UECgwFUEtDUzcxFTATBgNVBAMMDFBLQ1M3IENlcnQgMTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfqRyKXRqfkj/BThWvwcKfv
-qsTiZmVOE6sIusfY86qae4Yv8R8AaBgA3eYbSOat/Xyr3VFgZGtv9Hc8iDM7K1h9
-U9WBKPGN1gGw12LzAxIbf+t5qkH21YtPNkr7liwJruhTh/JLypKE/SVW1XIS47PE
-Ug92emsRMKfgsReO7x/EmB/c5cnXfwnrc+DKog2eB+6eIPhq2uq0g+/bV8hkx8+D
-N50Qq1OMdy0s/RXeurlYG72jhpj978eOq467vUIIxyD4ggsh9f3ZMOEGFlGjSiZL
-CXTgbIbwXnndamf3iqWWN5ZiDH6NVP1UTfCvxvX4HfBE928z0OXu4k7QxNaboEEC
-AwEAAaNTMFEwHQYDVR0OBBYEFF1d36HSc95cdyWYy/SRZPsmWncJMB8GA1UdIwQY
-MBaAFF1d36HSc95cdyWYy/SRZPsmWncJMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAIqAZJRQFPL8GFpxp0ZjF4vSiKX/D0/+LJB+vei4ZGZMaqRo
-afT9LBAquK1JjXYXJ9wz56ueVxggouVLb6XTrAwsHISwVxKzxkmBde2egPZ9L7tw
-EJdb2YPAkdoi3fY259N6KS8S0MwMMi/YmiXpVpQiPQ5tQFdbT9oSqewi/C7TudFc
-hez1M7ToYfbMaZ1yQxf5otT8wKVKhLdEb9ncE2Jku6eH+5+lcVFsliLcNo28bd0c
-joRYufduegaxmFluq4YWCozgET38AFKiG9Y8fK34He/qJIwHn7nWJ3cy3j+NAh3X
-gpobw4JhCNXaInaNx/BZsoedjXnkunhgRijykOU=
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMi2z2mJnNHw67TKZFwF5w4N
+Lv7dzGHQicvVFaOaNXm5I0O2HsdQBg+07TeHYzJADkJfHTdsfnXClzMU7fS7MMj4
+3QO5/P+VWiRdSRN61uYAVsrBlVKoZdUhhxh8wELJxJ4+OpwXpTS0U82rwMsRO09j
+9bMXS57pkCsZENEUlqJ5p0Mmrc/uEL/Z5+uvuzd76bY5WRZdE91XURccra08HTra
+xovIAR1htUz2AXi+NoOaiayRq0GePKN9a6iB0lUYxNtovKb3yDYC9pmoaxf7Hnc7
+y+dLuTpJslGuhkKLV0Dhhoux1vq54ocS6Y7DGa2Pyk1zAQxLCcS4BFiWHnzwg1MC
+AwEAAaNTMFEwHQYDVR0OBBYEFIru5ZR8xnxd1RWnbip+zTHuUv3IMB8GA1UdIwQY
+MBaAFIru5ZR8xnxd1RWnbip+zTHuUv3IMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAIIda5jNRX3r0rCBrKJ+vs1Pk6zIKEQ7Oeq/+p+k6eRUO0b8
+wx4rW0gXeQPeppaaxKLMZXBlA5DxsI1DpML5dcfti/M1bHIYOAISRRqPEd5GVTy8
+1ltCVN249mg06yHdoqjzO1geFIRVesoblO6JMd3xYDe3pxcTIakZNq/Cf/zjld51
+1fcMuLWu4F/1BwiNZa8eQ5Zs1Cy+b3+s+NrgVd2CIrFpZSFyP4EkUXhZXJha6Rf9
+SzmYdz4al7e9EAhURvQlm8wJpFSSkoLBuJtx7Vh6d14KPUU2NB9F2ulp6AbJb+/H
+EGd3bAK6IhIrkZmxTAwowESHUJBwuX890tbZcnM=
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDH6kcil0an5I/w
-U4Vr8HCn76rE4mZlThOrCLrH2POqmnuGL/EfAGgYAN3mG0jmrf18q91RYGRrb/R3
-PIgzOytYfVPVgSjxjdYBsNdi8wMSG3/reapB9tWLTzZK+5YsCa7oU4fyS8qShP0l
-VtVyEuOzxFIPdnprETCn4LEXju8fxJgf3OXJ138J63PgyqINngfuniD4atrqtIPv
-21fIZMfPgzedEKtTjHctLP0V3rq5WBu9o4aY/e/HjquOu71CCMcg+IILIfX92TDh
-BhZRo0omSwl04GyG8F553Wpn94qlljeWYgx+jVT9VE3wr8b1+B3wRPdvM9Dl7uJO
-0MTWm6BBAgMBAAECggEASx6bUEIryJa4B4Q61E5q5o/GSWkRNOvbtB75oHLDTM3z
-sH5/Sjjq5Goe94I1KIkkgR5LcXKZCU3uPIfAXg/Tv9KIF+gKrImxar06kfHiq4Et
-1hvHgDXyFADV0+MpkK6qzJ3mrYMRQXE7djZkyhKTAU+5zhmk8mppMAvcP4/0Bqk8
-EQRd6rPzeQdK6Lz0UPHsjO2bqksdqtts090W07VY13tZdSL3Xsjig0TEsM0Oalv9
-VKTU+xBLQuD9cn2QYQfSflQl7ZGrS2N7OeZ4Ju5Spygo7YO/Lsl3WMYKNPiX7E7T
-Z+sD6duWLbPC6atWgk1XmD9oZLBsx/jZT/Lp+cOLaQKBgQD3u8iNs4AafDnxAdZc
-3vQBH0yablI5nRtRrAmpjyj8gNNbszoeCM+7MBJ2Npw3qnYtqRWw5vKljU3gVLXG
-aPxUnyAJIVBWZDdlnnqOjKY++k6IF+3vcal9In+j5W0HYEfngLSm1/mJJHfK4N21
-JaJMwIxXJBkt0AbhyJlFc5WWowKBgQDOlgPY2xabKU5r+st3n1QKReirkb07rUR0
-ky3nBDGfI3svglX+5ZC/cDsl/YjAkGgOYgpgf1z0KUj2GmkQ6eMj9QVwzstwhKql
-Asg4BXTd36Ia4zAbIYluUqHgbQOXKItLwJ3o1UImRlOosxG1hrHm1YpBZu9LEq//
-medOr+nvywKBgA5eNMaLJ53hoJaqzZz7TVmXUCEQzvIKe6AkAzdzVyQ18Iw7+93s
-Eug/ZIK4rhzIZSxGxzxIWMBjTqX5I8XLJv9db0U4SmmITHI3W9JSs/2pFM7t3F3r
-0LGyQ4bk8orf+auimlem5REgLVZ17kXoVd5vuHQBYvh2PT/xG3qctotTAoGAeVgW
-lGdEJQmjPbvHjdExjQM5QqXNUGNbBVp6KOsGtqIhtmtJVfrEBh7HL253yBxKcsBV
-tg65q9UgPSaQNlYbjEBc3MErMEFM9rXmozlZRwYX8tElrZoKXpn86ZU++afgAjP2
-zQ+O1mqSs1HTghvHHX6qwfXTcvZcGLfu7QJZV/cCgYEAkpfg4Ev8zPPTpDTeS3h+
-uUhrU7cQ6Ry1+S1effLjaDLm+YdpXJ7DGhtV6yLSXbZPlcmbzYZyvBmYixdz8oqw
-btJym460gKjAQLIrMcLL3tJcX5ww6oRCL5hqZgvcFeIlmYSTIEZs0X69Ft8trWSu
-A3BsQ4P24o/FXcvGAv0gH0E=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIts9piZzR8Ou0
+ymRcBecODS7+3cxh0InL1RWjmjV5uSNDth7HUAYPtO03h2MyQA5CXx03bH51wpcz
+FO30uzDI+N0Dufz/lVokXUkTetbmAFbKwZVSqGXVIYcYfMBCycSePjqcF6U0tFPN
+q8DLETtPY/WzF0ue6ZArGRDRFJaieadDJq3P7hC/2efrr7s3e+m2OVkWXRPdV1EX
+HK2tPB062saLyAEdYbVM9gF4vjaDmomskatBnjyjfWuogdJVGMTbaLym98g2AvaZ
+qGsX+x53O8vnS7k6SbJRroZCi1dA4YaLsdb6ueKHEumOwxmtj8pNcwEMSwnEuARY
+lh588INTAgMBAAECggEBAIg+P1B+TurbRMQ11iX5A7wwCsSKPh/vdHneLJAfL0lu
++JcP2piko1iqEZPt3NHRVVyMP8LNbJH3Ardz74p+PkFNXIkZCLlc4hFpGR+V9KWv
+eTqsaPXwxR8FYTSoCcHMQCDCUPp/um6qMXCcs4OkMMRVMATfPT+jf28h1p52AUJL
+aAoBJfn7gP3WiB0FWq0bRZgSZzNYowE/MhGAQ+DuBGTSASSK3YJcxE94044fBVE8
+EqYKrxoY/x56li5cZ0v9kaURCrvhqCeq2+U5kIkgtvp2l6wF0Mm1du3BLxo2LQEI
+Y2j+6BFEV74Mtv48GTwrZcyit787zyo9vVGcviSD5VECgYEA/mgLc5KfF/cQLmM/
+20T4k0edvktkRIJHFUBphowt5Hb0a0wM5C1VM4z3yN3b9ikQK+ZaQXETdPATBXIe
+LntX1D1xtbMxdcAfd1FSq8QxAuaPknJZBgtzlpCsx3ZvMnNuzKZN/TU8kR1biwPE
+9HaeEG3bouUu+CI/l/DqrBbQRacCgYEAyfiqsLWGhXQ7e3pLk47PDYlMOsjDWPjs
+SGcatH1/lIMWyZue4W2IUcFMbpbjA6QWibo3VnOavIRSTn97JNUWYvgc5MmaQ7iX
+Iss4m3vJ1LIqx30iUgw3EfDoWdpufEEYssZ/VxJPs3sdmZGALgd3CaqxHJuhuS+U
+eVhWzD6LonUCgYBRCbt8GRxsedrBrAPPSO0VnR52W3WZDRavglEa9tQ3jlzVQOhq
+VrZpMWJMrb8/bl0kXsApUGeuPDsS5QMQM2IKzXfHNUlwBL8BNvpqlJg4IFFjiOEq
+t8MeFv+ymdtZ6sNElUUKf0bHwt5CLfUzGgXHnfb0sKSBjgdL0wYtwyacyQKBgQDJ
+NcyG4zEy/srLhtiIFnu8Fo40+hFzL/nlX6JBMc3KHJa1Hy43krF+ET6d5gAffndd
+moDKxbzgFksRHPuHhCobSucuHpJq6RjYdvDcJYS7OwxXVRi9+KFcZE52RaBQdWGv
+qQTvr7RrMDoa5dN3B8TVgpGT2JBTN02JXjKKo7zkiQKBgCZwKDiXl7qsGidvlFZc
+4CEtFsCgnNgdRTzsTL/Pr8q9CBK3BhjZjNzQALF1iGFDC1FdFYFOwI1E3j+MRHJB
+rQMF8zbmmlZ6SC5QtqatCSCCKUyrUjD5J+4UfJqWFjiBBdwz+5VJojHw1yijEwl4
+LrS/V2yBrDJVczQQM4psonLF
 -----END PRIVATE KEY-----
diff --git a/tests/data_files/pkcs7-rsa-sha256-2.crt b/tests/data_files/pkcs7-rsa-sha256-2.crt
index 0cd377afcc..a0df7d93db 100644
--- a/tests/data_files/pkcs7-rsa-sha256-2.crt
+++ b/tests/data_files/pkcs7-rsa-sha256-2.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUSbz5H6XcKL1urGmyF9I9v63PwccwDQYJKoZIhvcNAQEL
+MIIDSTCCAjGgAwIBAgIUVk1VQCWvWZ4ycHmycg7wDfN8+3wwDQYJKoZIhvcNAQEL
 BQAwNDELMAkGA1UEBhMCTkwxDjAMBgNVBAoMBVBLQ1M3MRUwEwYDVQQDDAxQS0NT
-NyBDZXJ0IDIwHhcNMjAxMTI0MTQxMDE5WhcNMjExMTI0MTQxMDE5WjA0MQswCQYD
+NyBDZXJ0IDIwHhcNMjIxMDI4MTYxMDU2WhcNMjMxMDI4MTYxMDU2WjA0MQswCQYD
 VQQGEwJOTDEOMAwGA1UECgwFUEtDUzcxFTATBgNVBAMMDFBLQ1M3IENlcnQgMjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4tAEi8b+ZE3OIuv91WduiU
-qQQXPqMNndTj3Q3hxd5CvYCZ3dAoYQOdPOtGWxLe89zpqUI/Sp8hSpCOw0ucgxCe
-96ahpx/BVvMG6BabtxSXWYmGv0rJmFE3LwzskvK9P8dwaGLZler+9CgjKtcgfhTc
-zbwhSDeHCHAZWqJUtLpAACiU8rn78p7x8zWoUUsntUiTCyw1SCHvIhGPeCbT4QVX
-YNxIP2H52s7waHqtHLpGtJSsSxTxfbxcmbMQlrDaY/8ArLxo2VKqvGJv90IDjbGy
-ORHRMOuxxxjowC9+yH4xtVRl821dsJFSSnmAEBXas3hkneFVBxiR7vUf61Wv760C
-AwEAAaNTMFEwHQYDVR0OBBYEFNdysL6wT6p/KA7w/efpAyX7/FXZMB8GA1UdIwQY
-MBaAFNdysL6wT6p/KA7w/efpAyX7/FXZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAKGSxRvoL+FpC4LtiT4Cie53yKlzISq+ZMR4eHm1BFSidiFv
-apntxj9k1JIIlDzbabVEJdy+O8EzipqUNFdPky+EpnZTnoTXilNusPH2FW+R6qMx
-XrDl4MwtSYnH1RwkjF+yjYysp6pdxm+gr6k7lS4biHq6VfUYSvQBvSuIYMn+XZa/
-ZgQs0NWeh3GgVFkpGkG/yxXMq1WRGSrFfmqExLVpMeNXTINQsK5PH/JMaj44c4T7
-+qbq9Rf4U4ezkTUXHsQQsA3dFpPiL5Lv6RS+31VKLpXYJQ9j/Z+IWBFjTf/utt5T
-VA2cEFCZIkNYUoX8RVs23cQr/ZNBxxgO/7JYNSE=
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmVNZZ0/qcT+h/lVNO+gP65
+lERTTudQ15h8QTLjaKhx5SSTLnuUhD0jLbR+ng8PMqdJ8ePkZEh1+7mi9MHzID4Y
+c47jH8M+Jc/JdBr6cSjbFd23QHESUjKKmV1IjSHc6Llbxe962z4gEXYjJAMkfr6B
+g1iecK3AlnEI4F0BsQfC5dgA4Qce2okvcTuhYgvHtLZ+UN4ca50Kw0o4u5FYdl89
+KDCE4zNp8MaaxGC83xcM4A9XqjHyZ7a2wvACTlmLQ2q/E+RN/8THEel4Y+yv82Uj
+j2LqqEaA06dvSdOPdaGz9jUZauqBw7TcuGGVzrrsZ0g/sHXKng9TppehAV/HrJUC
+AwEAAaNTMFEwHQYDVR0OBBYEFI5FVrtfLwPXRERcyVX6qBVvfoduMB8GA1UdIwQY
+MBaAFI5FVrtfLwPXRERcyVX6qBVvfoduMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAKRl0wgREe6eAduJSV5fs+Ec0s2qs2lHQqt/0JGEIbZBBtka
+q1UH9CIMMAd6Kb0kh5GlJT2shg/EAYWoitMwntkeRYTln2k2/B5jux+U5Ph4HyC+
+ad2GqmsoXWDru79rltT7Pv1hS1ofJyQ4Jv88vQA/SuIIRGdTC24VAVgg00JxvDRB
+xeqsQ9Pld4ebg4VvqsInnSpmKCcxfWxFhJk/Ax8bK/tV/GnrPiwsvry1j9nZyebS
+IyI01/6DwJS2ZhFnsLGyPHFOAFNtomjIdQ6gf2L1wq0qiGOKj/K9IzFNCpCz82a+
+gMgqFzCT5TCZC16kUG2NA2pXAx9O4uppKjRk97U=
 -----END CERTIFICATE-----
diff --git a/tests/data_files/pkcs7-rsa-sha256-2.der b/tests/data_files/pkcs7-rsa-sha256-2.der
index a88ecb45126aed4764c06702fa09fa29dd2b184f..fc7a3eabf7b575630dd1a9d74ad17c128a902cbb 100644
GIT binary patch
delta 668
zcmX@hc9u=qpo!Vjpoz(F0W%XL6O%}oZ>WRn`p9`k1(lnM_&)G{uK8UvQQ1q%$k4#Z
z!qCjnz|<^CoY%-0!JXJ1QGar(>9mr6%Y}c*KMlFOui@X$DK5c&&jYT{sBtuUoUx+t
zsmf%%>M1R@%DP+X=JE3zE%*HR_(_UK>F=G3z8w6lU?)-B_gMb0o$C3MB~rf%HExUE
z-R@8*6lByjGuES5@y?5#(MR7`-L_K@EK^otR;k<9*c>shVC{ivg&YrJ88@=mA9{L&
z;UT-+txo+y>xD_&$G2>&3%DnfJ(ugSm&NXh5oPhV8U`(ojWa(Sn{^~%&wX*82mIly
z3_qoB+ji&!lV4=FbJl+0C%*rW92b09k^E-;=TznXq*p848ZIx-_q^O+x^VM1Q^~AX
zjfc0~*^xN)+^#q29`+kbPtD^GUN(IpWBhUNHB*_G85tNC2O9($$g(kq%JQ*@v554!
zhV72mXTI*@5_2;2*9y`6y7oK+d62X+i-dt#16Bo-HJDWEm!w|i5EOhjkMVY=XI%W|
zhccJWuG*aG?zFo8!o(KEZH{a=rB;Wse^KHwV6W2LtI|GksjBUoHvS`wtt+}N8_c^Y
z=i2ggex}(Ux#ZpQQ=a^&kXP83dADs<wnl8i>)rdar(OAN_czfyN?u*XLhZlJUIu%w
zM;tEc!Q6SGj1dZ#o$3qsm^dDNwZ{4K)AIJ&&8_*X4yn)8O4Cp`tj%$4nQ6}~FRlGM
z^iSq%I~|>Ud$#u9ym|83C1oX(>;IY$Oxczun7(1-CYwS(hTz;q87E5l7StzwJ+xM<
zBe|>p(_UpmU#<z8Kd0?$IH4tOF!`y$OzyZP0lB@*S>ep`eve*dYMG=kecuWIcTFeT

delta 668
zcmV;N0%QHn2F(T|FoFX~FoFUxpaTK{0s<6Cy!juc+$g<ntZA|r(mlVe&%wu$BT5=D
zF)=bUF*GqSF*#Zn4Kgt?F)}nUG%+wSIgy80f8H$sNW5?6MBL&ozui`L=#;4h7e1p6
zoz&yq4dKP!LcM^Q-Owmu1D!nUMq3iz^W5pFLO)8MAxe;r!%Lil5T5s@p{F0gR`Ukv
z7Mr&emsyF1ze>rNQ8zCP?2_`mKgV!rV%e4I{`4p#D%T)>6x_|cAxJle2yhu%qExiH
ze?R~zl=8Xz@}BYYHK<WbC$&hE3oJEAA@3p)k9a22;RRP<+(<uR`P$C#XnL(2x<<5=
ztV<N}eY{+mvk;cB+GGC!th{L1QmVXSZ}&n2jj^&h5z#Q~vBwzbz%PEtelfLFW%F%a
zu#r+qd4LcV+Ov3Mo#9mn7?JMvAL~`GOYf}$0|5X5qf;<ZFdYU1RUHll76cU6a<IOz
zPpW??4)Fcw=>sME{8ia79|i+e9U}x7FcyFm*K)AFuurOgC=T%b=jj6_`}|eelPCfu
zf1#4a8|W|LX$ykwi9P~}?sv$kb0I3eWW;!Qd9?&oqIMx~YMJfEKV;OB2$VeAX|+Tp
z+`c=(Gm4s&G*?fPFNCIcQ=Wv^ic@Z|@%9yOk?Nx{Ua;lh%q>ZY$JHDpj9;>ijI5`s
zUB+*quc<qgE*pq?x>fZUO7sD}D~MppfBs#Tzh(q1(AA!YaiCOLDH=h)%N5M4RgoDg
z#eQmp#I<QL<5x_BP_V8~AM#9UJ~(rP`}(Hp^%wY4hqIA27aqhAunpZ7lj1Lu@97l2
z-&IO3mDnW@WBs3qSP^4Q|L(TlQ&bI{5Kx&SLs(LU{6$+f-NY;XlR?KA4*#-P0yQB?
Cr#Wf>

diff --git a/tests/data_files/pkcs7-rsa-sha256-2.key b/tests/data_files/pkcs7-rsa-sha256-2.key
index 6226f8ad46..659c015666 100644
--- a/tests/data_files/pkcs7-rsa-sha256-2.key
+++ b/tests/data_files/pkcs7-rsa-sha256-2.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDeLQBIvG/mRNzi
-Lr/dVnbolKkEFz6jDZ3U490N4cXeQr2Amd3QKGEDnTzrRlsS3vPc6alCP0qfIUqQ
-jsNLnIMQnvemoacfwVbzBugWm7cUl1mJhr9KyZhRNy8M7JLyvT/HcGhi2ZXq/vQo
-IyrXIH4U3M28IUg3hwhwGVqiVLS6QAAolPK5+/Ke8fM1qFFLJ7VIkwssNUgh7yIR
-j3gm0+EFV2DcSD9h+drO8Gh6rRy6RrSUrEsU8X28XJmzEJaw2mP/AKy8aNlSqrxi
-b/dCA42xsjkR0TDrsccY6MAvfsh+MbVUZfNtXbCRUkp5gBAV2rN4ZJ3hVQcYke71
-H+tVr++tAgMBAAECggEANzztAyiGkbOxTzLcVQV4Tt8XHoNA+X0bLqDwhtEJRvdE
-8kJPGb/QTvu696voXMq9ysD1ahkeTm4Sgdpcx+HD3FAJto4eZRDGs2mWLnjMjfwL
-MNwll0yD6D1WH1p6NovC3a0e5uS+F00IGyqTLiVP85PqOsnzkIqsGGLVW+K/hEaK
-lRqKEf5tYzkdmlay8SfJQf03TuJVFp6qAgG/gH2EkGR/B4SLotXYDNXLFAzlx/N3
-QXHRIKhYOcvznbJ7Doww+nCyO613cUeZ1t3/22QRC3Vm8WMaYzxivGoMzmGM2YqI
-MtUG+zXm4if9+MmT0CQ3meWLYwkIbFax6/6DLS6iKQKBgQD4EU4CEEjCsnYm7668
-0THvkcEsOTvSKroLYPKsuUbeoBfCvK4/o6kb2dQbR9c8MnHAJ8yN9gMbuP/njPUu
-G9/sycI3uDRYpsQDeBcD74NtCAKqB1s7kcucMzxudwAqw/jJCJxyPqGiS8HJGQRO
-sQMtBkvQx9RqKKagAgCWwaiLQwKBgQDlR76cQN3GSVRZfsA2rqTyZo8b4ECSEu0O
-4vSQ0i5xMWp8uJLRBxktRYYCMfzH6dHDG+GNYearolOHm7BfC3QUH2EC6kE2D/9P
-A40JrF7QEkDRtQ2rmNOQ2diLB1wYQiqRJieuXVIIzaRcyenRxP6ec2YMmHl9FaPh
-dmYzjtDSTwKBgFr2/YQENKowhuMAQTM8AvO2nv94fVc0E8TYaCSuTC6Wxh/C0KLF
-gN2VoxHd5i9M0CmGbpwf+kPQMwbVyZJ+5j4OPgnwokFf5cDf6JCo46i3p0JyMCJH
-9EHzB9X6DTWhZzlQzw2Vqe+5l/YGFm5EusVn6aVFob7L6U4DbfPaT9PBAoGAD1Hi
-55fh+azOqQgyGbVDqjq2Fzu9tMT0+AisJL0Wg1O09M50aOkbgo3hrWXfqQ/zhyDm
-ykafXhqDkE0T1NX0FKAgIEy8vLsG6SWol9vfnfGKSTjax/t3L3eO44NDYQ+Svo4Z
-Gqp7n8D12YlYST7rcHTvfan2fCglAhyiKZHCXDsCgYEA0BeqGpJ6Oz6O8g61JixG
-EryjO2cCnQLWlwlal40L63wY5tNDCixuDM6zJFq/tT9DYMuNANrfsqWU2ImKTNPE
-kwlMgP813aPXREgyV3ylL4KLusfDF6hqPtDcU2QK05LuTX7puHwi0pR8jAmPzrng
-Y2ncNnRJI7vczDETaW1vuoE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJlTWWdP6nE/of
+5VTTvoD+uZREU07nUNeYfEEy42ioceUkky57lIQ9Iy20fp4PDzKnSfHj5GRIdfu5
+ovTB8yA+GHOO4x/DPiXPyXQa+nEo2xXdt0BxElIyipldSI0h3Oi5W8Xvets+IBF2
+IyQDJH6+gYNYnnCtwJZxCOBdAbEHwuXYAOEHHtqJL3E7oWILx7S2flDeHGudCsNK
+OLuRWHZfPSgwhOMzafDGmsRgvN8XDOAPV6ox8me2tsLwAk5Zi0NqvxPkTf/ExxHp
+eGPsr/NlI49i6qhGgNOnb0nTj3Whs/Y1GWrqgcO03Lhhlc667GdIP7B1yp4PU6aX
+oQFfx6yVAgMBAAECggEBAMVHm3w134qQCHfyroPTqtaftDTx+wRyn6yB3iT5XdGM
+NZ8H07Pp80kKBo7gY7uFOiNyQKKxQFuR69sPWc3+LI3YzC8IpGslhUfHdjN46gn7
+73hfAVgnf/4qmlEq0cRUOAY/hIUMjUhNhglB9tqEeu3iPjMaTFgfZJwW/czH/QMD
+w4zj5XoLgwRkqVvUceu/dBgV8KP5DpON+q8wpfWtjunv7rg5Nc3BVBrpb5SadJ7T
+i5TsS+pZQyp+mTvyCI3A1hkr2Vw5tULWO8SPhuEQkdtC/CL+luCUO7L16lU6KhFB
+qP5Fduik5skyLCVvAMUkjKcrC22k0gkhOHvfmMhjaAECgYEA68+hAQIiV9ErZGk9
+ZLu+VJHBSPmEQCkUcbviwzoRo8YSyka12TZERy+NJcvmD9deNgFbp8GyZf01XJWH
+slSYt6LyInrJrTpv+3q2Vl5GQp0f+39i7MHnwGGKbWsDbSAm+L9yKTJzYJz1O5fo
+in06AiyyGPwnXd1cm5bTXVX+dQECgYEA2tdi6DXF8awE23pv4HphPBhXS5hmYP/D
+NC7CtP8wQsxjPdiIxkBFFVEaFCC2njq1VhTyJb5noJM4kOIwcoaQ/zgyyxQa0u7w
++CqvAh1WwG+sT/B7vivrtDmmYeyGQapFo5DRIz+MflKAhzDhtnEyT9vLuCdn8J95
+0YvxZJ9+k5UCgYEAh+e7SER9nJUt6AoLWyIlGMKEXlWIFh5W7RG3KIMwJW6D59aG
++fAfu9M5Cx6PsnOSlZeExpOJCOS9O2Xmti2xcqzT1nFkCJWUcqCPtAlTfxLlmuIZ
+FpDOy36r9FHnwJ32OAjGd93ex0DOyZDMcfyoURaHcoTo/10UAYwUt0dXhwECgYAI
+xad2TWmA1XdgYNkJM36gTQ16v0IjUz084z70yGHj25OC0CIzaDIct6KG+gS39Px9
+1dsa/jXjLuOOkzKD9LbtNBB9KXIl0GQiXnujZw+qKQ/MKISdS99n2wO7WyLKkQu3
+kb+AXTTBf4cdZC04BfORVesll5bIA2x7pNNpSCdnvQKBgG7VXYcPlIV7iAyi2xFa
+uN1jccu/AK7xA0G1jz2SHNlpet74LmWR8XsTujJeo8WG1IRFxSky4h/pAP0XWIFO
+0LPK7eeDtnFq6y1/DXpI+/9BWX5T/8+4Yk93p37YrBVWKfd21dhrAklQs11m3rlQ
+Qn6c/zyvMKSyrCVxo5pTd5Il
 -----END PRIVATE KEY-----
diff --git a/tests/data_files/pkcs7-rsa-sha256-2.pem b/tests/data_files/pkcs7-rsa-sha256-2.pem
index 0f03a43a04..b11a00a199 100644
--- a/tests/data_files/pkcs7-rsa-sha256-2.pem
+++ b/tests/data_files/pkcs7-rsa-sha256-2.pem
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUSbz5H6XcKL1urGmyF9I9v63PwccwDQYJKoZIhvcNAQEL
+MIIDSTCCAjGgAwIBAgIUVk1VQCWvWZ4ycHmycg7wDfN8+3wwDQYJKoZIhvcNAQEL
 BQAwNDELMAkGA1UEBhMCTkwxDjAMBgNVBAoMBVBLQ1M3MRUwEwYDVQQDDAxQS0NT
-NyBDZXJ0IDIwHhcNMjAxMTI0MTQxMDE5WhcNMjExMTI0MTQxMDE5WjA0MQswCQYD
+NyBDZXJ0IDIwHhcNMjIxMDI4MTYxMDU2WhcNMjMxMDI4MTYxMDU2WjA0MQswCQYD
 VQQGEwJOTDEOMAwGA1UECgwFUEtDUzcxFTATBgNVBAMMDFBLQ1M3IENlcnQgMjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4tAEi8b+ZE3OIuv91WduiU
-qQQXPqMNndTj3Q3hxd5CvYCZ3dAoYQOdPOtGWxLe89zpqUI/Sp8hSpCOw0ucgxCe
-96ahpx/BVvMG6BabtxSXWYmGv0rJmFE3LwzskvK9P8dwaGLZler+9CgjKtcgfhTc
-zbwhSDeHCHAZWqJUtLpAACiU8rn78p7x8zWoUUsntUiTCyw1SCHvIhGPeCbT4QVX
-YNxIP2H52s7waHqtHLpGtJSsSxTxfbxcmbMQlrDaY/8ArLxo2VKqvGJv90IDjbGy
-ORHRMOuxxxjowC9+yH4xtVRl821dsJFSSnmAEBXas3hkneFVBxiR7vUf61Wv760C
-AwEAAaNTMFEwHQYDVR0OBBYEFNdysL6wT6p/KA7w/efpAyX7/FXZMB8GA1UdIwQY
-MBaAFNdysL6wT6p/KA7w/efpAyX7/FXZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAKGSxRvoL+FpC4LtiT4Cie53yKlzISq+ZMR4eHm1BFSidiFv
-apntxj9k1JIIlDzbabVEJdy+O8EzipqUNFdPky+EpnZTnoTXilNusPH2FW+R6qMx
-XrDl4MwtSYnH1RwkjF+yjYysp6pdxm+gr6k7lS4biHq6VfUYSvQBvSuIYMn+XZa/
-ZgQs0NWeh3GgVFkpGkG/yxXMq1WRGSrFfmqExLVpMeNXTINQsK5PH/JMaj44c4T7
-+qbq9Rf4U4ezkTUXHsQQsA3dFpPiL5Lv6RS+31VKLpXYJQ9j/Z+IWBFjTf/utt5T
-VA2cEFCZIkNYUoX8RVs23cQr/ZNBxxgO/7JYNSE=
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmVNZZ0/qcT+h/lVNO+gP65
+lERTTudQ15h8QTLjaKhx5SSTLnuUhD0jLbR+ng8PMqdJ8ePkZEh1+7mi9MHzID4Y
+c47jH8M+Jc/JdBr6cSjbFd23QHESUjKKmV1IjSHc6Llbxe962z4gEXYjJAMkfr6B
+g1iecK3AlnEI4F0BsQfC5dgA4Qce2okvcTuhYgvHtLZ+UN4ca50Kw0o4u5FYdl89
+KDCE4zNp8MaaxGC83xcM4A9XqjHyZ7a2wvACTlmLQ2q/E+RN/8THEel4Y+yv82Uj
+j2LqqEaA06dvSdOPdaGz9jUZauqBw7TcuGGVzrrsZ0g/sHXKng9TppehAV/HrJUC
+AwEAAaNTMFEwHQYDVR0OBBYEFI5FVrtfLwPXRERcyVX6qBVvfoduMB8GA1UdIwQY
+MBaAFI5FVrtfLwPXRERcyVX6qBVvfoduMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAKRl0wgREe6eAduJSV5fs+Ec0s2qs2lHQqt/0JGEIbZBBtka
+q1UH9CIMMAd6Kb0kh5GlJT2shg/EAYWoitMwntkeRYTln2k2/B5jux+U5Ph4HyC+
+ad2GqmsoXWDru79rltT7Pv1hS1ofJyQ4Jv88vQA/SuIIRGdTC24VAVgg00JxvDRB
+xeqsQ9Pld4ebg4VvqsInnSpmKCcxfWxFhJk/Ax8bK/tV/GnrPiwsvry1j9nZyebS
+IyI01/6DwJS2ZhFnsLGyPHFOAFNtomjIdQ6gf2L1wq0qiGOKj/K9IzFNCpCz82a+
+gMgqFzCT5TCZC16kUG2NA2pXAx9O4uppKjRk97U=
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDeLQBIvG/mRNzi
-Lr/dVnbolKkEFz6jDZ3U490N4cXeQr2Amd3QKGEDnTzrRlsS3vPc6alCP0qfIUqQ
-jsNLnIMQnvemoacfwVbzBugWm7cUl1mJhr9KyZhRNy8M7JLyvT/HcGhi2ZXq/vQo
-IyrXIH4U3M28IUg3hwhwGVqiVLS6QAAolPK5+/Ke8fM1qFFLJ7VIkwssNUgh7yIR
-j3gm0+EFV2DcSD9h+drO8Gh6rRy6RrSUrEsU8X28XJmzEJaw2mP/AKy8aNlSqrxi
-b/dCA42xsjkR0TDrsccY6MAvfsh+MbVUZfNtXbCRUkp5gBAV2rN4ZJ3hVQcYke71
-H+tVr++tAgMBAAECggEANzztAyiGkbOxTzLcVQV4Tt8XHoNA+X0bLqDwhtEJRvdE
-8kJPGb/QTvu696voXMq9ysD1ahkeTm4Sgdpcx+HD3FAJto4eZRDGs2mWLnjMjfwL
-MNwll0yD6D1WH1p6NovC3a0e5uS+F00IGyqTLiVP85PqOsnzkIqsGGLVW+K/hEaK
-lRqKEf5tYzkdmlay8SfJQf03TuJVFp6qAgG/gH2EkGR/B4SLotXYDNXLFAzlx/N3
-QXHRIKhYOcvznbJ7Doww+nCyO613cUeZ1t3/22QRC3Vm8WMaYzxivGoMzmGM2YqI
-MtUG+zXm4if9+MmT0CQ3meWLYwkIbFax6/6DLS6iKQKBgQD4EU4CEEjCsnYm7668
-0THvkcEsOTvSKroLYPKsuUbeoBfCvK4/o6kb2dQbR9c8MnHAJ8yN9gMbuP/njPUu
-G9/sycI3uDRYpsQDeBcD74NtCAKqB1s7kcucMzxudwAqw/jJCJxyPqGiS8HJGQRO
-sQMtBkvQx9RqKKagAgCWwaiLQwKBgQDlR76cQN3GSVRZfsA2rqTyZo8b4ECSEu0O
-4vSQ0i5xMWp8uJLRBxktRYYCMfzH6dHDG+GNYearolOHm7BfC3QUH2EC6kE2D/9P
-A40JrF7QEkDRtQ2rmNOQ2diLB1wYQiqRJieuXVIIzaRcyenRxP6ec2YMmHl9FaPh
-dmYzjtDSTwKBgFr2/YQENKowhuMAQTM8AvO2nv94fVc0E8TYaCSuTC6Wxh/C0KLF
-gN2VoxHd5i9M0CmGbpwf+kPQMwbVyZJ+5j4OPgnwokFf5cDf6JCo46i3p0JyMCJH
-9EHzB9X6DTWhZzlQzw2Vqe+5l/YGFm5EusVn6aVFob7L6U4DbfPaT9PBAoGAD1Hi
-55fh+azOqQgyGbVDqjq2Fzu9tMT0+AisJL0Wg1O09M50aOkbgo3hrWXfqQ/zhyDm
-ykafXhqDkE0T1NX0FKAgIEy8vLsG6SWol9vfnfGKSTjax/t3L3eO44NDYQ+Svo4Z
-Gqp7n8D12YlYST7rcHTvfan2fCglAhyiKZHCXDsCgYEA0BeqGpJ6Oz6O8g61JixG
-EryjO2cCnQLWlwlal40L63wY5tNDCixuDM6zJFq/tT9DYMuNANrfsqWU2ImKTNPE
-kwlMgP813aPXREgyV3ylL4KLusfDF6hqPtDcU2QK05LuTX7puHwi0pR8jAmPzrng
-Y2ncNnRJI7vczDETaW1vuoE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJlTWWdP6nE/of
+5VTTvoD+uZREU07nUNeYfEEy42ioceUkky57lIQ9Iy20fp4PDzKnSfHj5GRIdfu5
+ovTB8yA+GHOO4x/DPiXPyXQa+nEo2xXdt0BxElIyipldSI0h3Oi5W8Xvets+IBF2
+IyQDJH6+gYNYnnCtwJZxCOBdAbEHwuXYAOEHHtqJL3E7oWILx7S2flDeHGudCsNK
+OLuRWHZfPSgwhOMzafDGmsRgvN8XDOAPV6ox8me2tsLwAk5Zi0NqvxPkTf/ExxHp
+eGPsr/NlI49i6qhGgNOnb0nTj3Whs/Y1GWrqgcO03Lhhlc667GdIP7B1yp4PU6aX
+oQFfx6yVAgMBAAECggEBAMVHm3w134qQCHfyroPTqtaftDTx+wRyn6yB3iT5XdGM
+NZ8H07Pp80kKBo7gY7uFOiNyQKKxQFuR69sPWc3+LI3YzC8IpGslhUfHdjN46gn7
+73hfAVgnf/4qmlEq0cRUOAY/hIUMjUhNhglB9tqEeu3iPjMaTFgfZJwW/czH/QMD
+w4zj5XoLgwRkqVvUceu/dBgV8KP5DpON+q8wpfWtjunv7rg5Nc3BVBrpb5SadJ7T
+i5TsS+pZQyp+mTvyCI3A1hkr2Vw5tULWO8SPhuEQkdtC/CL+luCUO7L16lU6KhFB
+qP5Fduik5skyLCVvAMUkjKcrC22k0gkhOHvfmMhjaAECgYEA68+hAQIiV9ErZGk9
+ZLu+VJHBSPmEQCkUcbviwzoRo8YSyka12TZERy+NJcvmD9deNgFbp8GyZf01XJWH
+slSYt6LyInrJrTpv+3q2Vl5GQp0f+39i7MHnwGGKbWsDbSAm+L9yKTJzYJz1O5fo
+in06AiyyGPwnXd1cm5bTXVX+dQECgYEA2tdi6DXF8awE23pv4HphPBhXS5hmYP/D
+NC7CtP8wQsxjPdiIxkBFFVEaFCC2njq1VhTyJb5noJM4kOIwcoaQ/zgyyxQa0u7w
++CqvAh1WwG+sT/B7vivrtDmmYeyGQapFo5DRIz+MflKAhzDhtnEyT9vLuCdn8J95
+0YvxZJ9+k5UCgYEAh+e7SER9nJUt6AoLWyIlGMKEXlWIFh5W7RG3KIMwJW6D59aG
++fAfu9M5Cx6PsnOSlZeExpOJCOS9O2Xmti2xcqzT1nFkCJWUcqCPtAlTfxLlmuIZ
+FpDOy36r9FHnwJ32OAjGd93ex0DOyZDMcfyoURaHcoTo/10UAYwUt0dXhwECgYAI
+xad2TWmA1XdgYNkJM36gTQ16v0IjUz084z70yGHj25OC0CIzaDIct6KG+gS39Px9
+1dsa/jXjLuOOkzKD9LbtNBB9KXIl0GQiXnujZw+qKQ/MKISdS99n2wO7WyLKkQu3
+kb+AXTTBf4cdZC04BfORVesll5bIA2x7pNNpSCdnvQKBgG7VXYcPlIV7iAyi2xFa
+uN1jccu/AK7xA0G1jz2SHNlpet74LmWR8XsTujJeo8WG1IRFxSky4h/pAP0XWIFO
+0LPK7eeDtnFq6y1/DXpI+/9BWX5T/8+4Yk93p37YrBVWKfd21dhrAklQs11m3rlQ
+Qn6c/zyvMKSyrCVxo5pTd5Il
 -----END PRIVATE KEY-----
diff --git a/tests/data_files/pkcs7_data_cert_encrypted.der b/tests/data_files/pkcs7_data_cert_encrypted.der
index 0d0706931e625b35b37466511e87ea4da5a731ba..763057d9e5eb7be478369ddaba4f227fbe94afee 100644
GIT binary patch
delta 366
zcmV-!0g?X11H=Q6Uw?bv-O@x%(aru`L8uTciMQV_Y`-uK1_>&LNQU<f0RaI800e>o
z07}fdUAVJ>X*kQqd%D*rLG$nqctJVMX|%rz8CJY0cOZ|=bocqC8hzAniNN`<C>=Iq
zg~|@O?Gp`C`nG6LWNiH}uQV;lvC7Iq>~EVGRC&qVB&h7M3V&(J7{f#jt%@Bd*gWd-
zMfq+qY7!9F!t%(f_B<HnZ)89qEzwn<^Ux{as;~|w`MCaU-G+t98S4_)A9>#}$tOR!
z>kStU9iTuzl0dPYpx!o0?a6Pq&oW{hS6<lR#W_efiBR$kqNKPd`{D-vZGYv$SOhR;
z%j;~Fmdg6gBxf{5uVfk2Td9m|&3WXV!wze}sjC%M!6^G1XS1IPi9sP_CXhEA!jjN1
zJO&9WhDe6@4FLxMFdYU7V1`HmWdj5ODg+SHT!{tsZi@9eo<4YI8mAC|5HivakWKb0
M$u@4q^b+Kl_?O74N&o-=

delta 366
zcmV-!0g?X11H=Q6Uw<$W5q#yXTUI<{uC-vBcPda=VVy7y1_>&LNQU<f0RaI800e>o
z01MTcgrxL5dy@l*VL5lRlyDm?g)3;67Ot5m=D4eHp1yroHeJsaMz@eznL)aHdzF@W
z`L^fGvI-n8JF6vSG~uiUuSN4WLRZ=kt<}U1PsMO$_m}q5!GDh1{Wy+Mhg(GKA%rl-
z@sdwGUn<LKk-2nQ%w2ejH+nkdwtrX8%S?b-#yv^i8Pstlag>!=!UWY{X&uig>@}@2
zJ%Sql=M9|xz+Dk5zXs@I7r*vWg|S{en$X5uW@;P%+#7~y7P7vpi>sgYFC-PxwAqbz
z<;2LE_6QQLgJ<*+BYG42=5sl(_A1-;UC7e7B@5w%zz5lxjUF+0XkuP5GJ_9Tl6gEZ
zJO&9WhDe6@4FLxMFdYU7V1`HmWdj5ODg+QZckg~VIky`(o)-umhz_rS5NV*BB$WjF
MN+nIx-1da?hxulsi~s-t

diff --git a/tests/data_files/pkcs7_data_cert_signed_sha1.der b/tests/data_files/pkcs7_data_cert_signed_sha1.der
index a888525244b49ec910b7e4b46c338fd3e74f9d37..b6f95998fc3eb91ccb47856b79f61d06bac9af24 100644
GIT binary patch
delta 943
zcmeyv`G<3YyGZrDyO&&iE}s1t<G4aVr*r##y`23MqrIez3=NDd49yG;OwFRid5w$_
z+==@m>Q8JtpV>L*;)mB;PNl@KKIh}r`*-(D;)TxBS49`kGOgUH?7U6xcmNy!mbd2Z
z$wm%*PVutlId!FnrW=dA{j%HO#E-koJOBKj8l@8JDO`2!8AI5qgHwZ6q+V5Qm#8`5
zbn?hNJF7Y3OHH-}pIv?6w4k+r^4HDc-t%5g(3TXqC^BtPedTgzwYBHp3GBc5{Pp_X
z=G8B^Sw@P*3f~P66qi}M)<)Lq*0JsrjIxPaeZDbP>@#bg)wyQkYR7pti)*u2G+qjo
zIC48<&$90)%$UB-T#+sQTdv&t^mFf>R-T&z*R?ryhdVrM>)v?n*Um@nLNEIcORnud
z<y*|i<IQ<w2TQ~>xtb5&&B08}j0}v6gAD==WZ9TQW%*ddSVX$sJ)Kf>tS0uV=<+<R
zy0eDwg8rT`kOxUCvq%_-HDFaRIe|&FzDYKF##z_e*OxXlu31#K@2vmiH77J&tSw*d
z|22Qf%O@e$ZhsETX-9jAS2EvQHf`3CMQ2hAQkf@w+|cX1<j~L3<8Qk^o8}ZrSTG5>
zO7#oga|^ZEb1m8_<nE4d878k4?=D*L**Zc_q$RZKl=PH$orZTmCYWzuE-tLNQqpYw
zq541dkEh-%z51PJ$JTWZ;=i(U^ro(tbDoxSMQ2}r{hA-Q9)#X)QreiAs#s*-s1jHa
z88aj5rTAZO%NgZ%Qq#BZ72pVQ`=UDg4Cj)NNt2om?wDQpHlnILj?327%tYSx*2~Nn
zY$x;I9~Ve3&tcl7B&0oY=0+bLjRP+20TT*#*4tjXc9W^7cycSVE7rs~`5v=eeVcyD
zn*<@j^H$fdsVwcu&^2sg4LNvv{Rx@43hAVVd4_ur{g!-H_-Vm@w@=2_z5bRdW#^<r
zF21*X@t|Gp;Kv;a&HlEfj&qc6w>^J#Q0!LwzR!-cGR4a?_?E>*%FK|h)wyr>{&K#v
zO0TH7BiE{VP5s&dZYFHWYV~!qjNYrS3awXLROQ_lqRV#OR{5Y);L~01pKU(!8U|hd
z5UIrb<i+;t1t-~D(h^p%PyEs6=s(eZ&y?z^2HuCXEj}A19&G)4`{=W&%bl}-M)BPD
zYYl1t-11V6bGzPxJ*Lw97c`aATb3{Sti!+N=e}fxb(_1aQ`;iN*VX)Ly}a+iwwsqe
MEjqJwGgIwR0045qdH?_b

delta 943
zcmeyv`G<3YyNH3HV9nFD(P1{p>$WD$F4qc(NSr${+Dpp7(9p=l(8SQd&@xJ#*T@jT
zowz@u{`f0*rRi?VpY(qSZq5Esu>Ae1BahNj{e)L@>^gqq^Qu|ZZTcVO88Rdo?mm<D
zc((R$&FZ^>2`Sn6U&?JdjIFgJYJ;yfYJBXy#<<~n(r0EN>H61|s~o>w?e;hG`aMmD
zbKQ&J_D|lYCbj%k4ZB(-^my};ApWwdY(azN4>pSTy_c^)GDH5()05ZhIbRn)IJJm(
z9{am_3O}-Lz1q_J{&x6@l;h`{&F2cN4(=(})%h!WZ`aNU>Aj2FX8e7Byl-{i?!8VN
z#}$4waVviPd(+?{n^@ptFEww@k_S0$AL1(SW~G1cS~|^qS`trPZ^+*e-w*4Lef=T(
z!R33t@r9@F9{F83a&5Nv0!JohMh3>k!3Kc_vTV$uvV1IJEF!V7_ZMC&z86!jI^*=0
zi7CI;qRKf9<U!KPED{D{4OkUSPGC~4?`lYy5+L&Fk3>}Aa<^ph?n@m@|MUC*)0t4W
z_r;EsG@q;`8JS=H>Ii7<SnJtaCa!+R`1$I2;Svgqo_gmmy}X7;N2X;%xX|Wfo{gn%
z=QVt*)!$tpFg^Na^MQ%Cl<s~rdw#h}Q(x%986G438?#hjhD}kj<;!&lkM_SMwDOJ8
zAHDj^J1@qxzWHjr<wfGRGnsRXoW*}Gy7K41Qm>ZnF8Md_2q&fNUf%wD{?fw0oM}pT
z%zF3a-j(TViP-r)uZnHsjL5vzZDL$K4+L%hFa#}<zGhRi_J{2IS1LX1^LJiTFE_ep
z-^(O>y=j*8;ig26tGATOdXImI+|)j|xAMuZiUc=}PfQb@PHts(#hMr=-(!}mXLO0S
zbr0kgJrXY4*qo;&+Nji@-1<VwFmiH|*17W$mS)FS%*t5uIoZJ|=}MXR%d1-AdE1%(
zYjRxY)ik~Q^?AwujG1f88&$PVJZAZ>J?Br8?i#h_kG95l`<DB0KJB`>&L*`;-BL8_
zZI8IOUe32WPgq+_?dCLV<nBCf6~4J|Q+;aZyU>7uC6<!gKHUjYWd44kFK*_2`Pn8~
z`hS#kN((!doy$Ak+W6Y5ws4)E*KQv^A<yZH%{D%9TJ-q+hsRMCmp*;n9`@t-3xkTa
z+gv_==UDP^YWR|k|0a3JZ{zN{)z4M`Frq7CzUTCNZy62xl}&f0*#v1Z-&|p@_0<0J
L-xD7@n7sP{55>nF

diff --git a/tests/data_files/pkcs7_data_cert_signed_sha256.der b/tests/data_files/pkcs7_data_cert_signed_sha256.der
index 3f2dfb5ace1ae4c6571da3551fac2c2c0d65d89a..778fb7b4246a314999cac675ef2bf0147f8439b8 100644
GIT binary patch
delta 947
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4FU~h*_cCR`B=nQM7rKRol<kGCibf6
z@;t4&vxe`2{+=+92T3clNEnDUU{x?Vg-Nx(Nj7`NS=ZXvmo_x6SyZ?0tpDUSCp28F
zEnn^bHGj#=Cn45ue-6uOM|+4@GT&P^ZPt-RXHpANnJ0YQ(CfV9(9hE2Z@WL6<`hX-
zFbTOz^$Xr}3$@vEE!rvM?v8I6Ca)FmE?V)~IzmpQCA8|4^ptm<hIc<Em~US$F08mx
z(ro>q`akuLr`{{Q`kiOT)^!i!zp``mrmmNBo|bb(XJ3B(njg0wgx+mZ+L)QDSY+R*
z5?B!#Gb8Gy_+M|!8Rd3T)3@&x;0SU1qB{Ew=aP^~lbR0hm|gfbqN+TO%huJ*MBeq*
z%gh&SC-dJQ7f3J9VcMl6q&;!wMjsxH11{|W6AE_L+g`eMlc}h9awoGZ)&x2E5wlW#
ziDvax!;Gx`PFtoX#JOreFxl##^dO+n_E1T`!4W^xuFPt?&6Q1c_pc^rUD<KgTd?ld
ze2;elIyWUgl*hL*2pzfqpGjr&ucdP|=CRdonRa-?Ym+AH55=Ntx#q6T5|;`T#h?Dl
zOcztQ#<=UQ`A6<o>l%8FXvcTFD$w6>aN+Em+4aYgGUb%(XQ+o1sP_eMdd{4edE>G%
zV`giN`oXe0F?QX`aTCA3ROp?(=Wq6wt#5W#CG9uRxXHBhdgLtWb)gPLH4SEuyg6!q
zZoDMIT3cke#QCM~BrUI?ds1w3pY<yTuj+^@Zog{3vRHoQCk>g&S}7u@`!$Odgze4i
OE(e_cEcJv*F$MrvY`x<E

delta 947
zcmZqSYT=sTEn*-jSo3skbeK)@x~&Pb%e4X`66a2g_mVa+G&C|XG%++Vw2TtxH8Mov
zPRui(_*<d=_$zm%>2AxP^nVC$&HhlZ{QasUkJ3{8gjaLyI)3Bxs#(=-`XA*PG9(!8
zK9lx%w)St$>brpnDcSj7%56G~t+gX+gReGfeC)l(xZ!%zXJ#Sk`q!1K9KT)d_BZqT
zJxzym-HYJ%Pu`~{wft2LyILglc=M4U{<5lUL4)NFHj4MXm#;rEL;lXwlh^AxUl%_(
zwTO2f`@4AxKeBGU+S2^~cKC^u<L8^r=L)P2?kU&R`73&F*Ukv(y^Gss{C$7CZ*|}9
zy-pm*6@D~vD}McZ)8HYSSm0tWHE+(62RUsY;wtZErGM{QI?a4q5>H)k$lnm(59^P8
z{UQ6o<$J#Ig{SWx`CT}2ZMOFUM<!-Q2FAs~27v~$Y|Npud@N!tBC)ae7hWp97gMe}
z<Mfw_DZkaC$~g_>LDI@B5(Z)oSQSi8VN$K{YDk$9AoA&tL{#B&w`B3|OC3x9^ZWnP
znNYX)#g3FTpR6SrnP2|u2x#qC>)Bf-u71b(`RaM$5(<l+dgm{_yoN_dre#C8(B@;F
zjiqnrHGHep-(4UuJ^E(zfr+=2?tU|Sez{6hU+BUa9wYr5vs7P(O;NJt%XJ8k_P-^x
z@{Q6Tz52^LFUGXK`D(o7MdG(JnRAPr#eXik^5?)(ua@mD`8V$fC#CFO-u`?3(!#);
zX-ap@diUhsmFa7V*!exLif!YJ$h_5UVq85B1a1E?1TB)jW>d5FhwS@TDn0D;cV1I3
zH@auv%OrcfX_oZirbLdbx0K3ykAH~V)IPVj^2x4>1UHROOcS0??qqhwnjj}XVpghm
z+kL3@>*2TIooQc|i9Zy1B2aVd`Dz}Ycl_G(w(f9Ft?pua*m*Nd^v2|wp(}0*9u-PH
zxxXfW^Kk#tCd)sDAzpqRmC4b(p_h{uCbtN5B;LDr>lv@Y^4?>{N<TO8p4ec&sncn1
zs`}Kmhn|1%^-|u}5wpQ$yH>}Qjm51hoMt7OcJ-;(w=WC6YS5)OlX2d>br){eIQ6dd
z&ib?J?a2<A_-8?L9?Ay%*=WefxHh^x+IpLANOH#KtWOK3U%h-#-u<|}n`dyy+T4Hl
z4ohBIuBz}{L$hgONJ3WR>`nG}M3xwuTvO$oJhis_q-C+|jqDzQy(#{0`(`dNS#oY0
Pw^pJzTPjx?lOqoRq+iEN

diff --git a/tests/data_files/pkcs7_data_cert_signed_sha512.der b/tests/data_files/pkcs7_data_cert_signed_sha512.der
index bf143a56f0b499929747df519279532d86354d61..41849a943e54d4d08d0d1fdf9926f2c362fc986b 100644
GIT binary patch
delta 947
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4FU~h*_cCR`B=nQM7rKRol<kGCibf6
z@;t4&vxe`2{+=+92T3clNEnDUU{x?Vg-Nx(Nj7`NS=ZXvmo_x6SyZ?0tpDUSCp28F
zEnn^bHGj#=Cn45ue-6uOM|+4@GT&P^ZPt-RXHpANnJ0YQ(CfV9(9hE2Z@WL6<`hX-
zFbTOz^$Xr}3$@vEE!rvM?v8I6Ca)FmE?V)~IzmpQCA8|4^ptm<hIc<Em~US$F08mx
z(ro>q`akuLr`{{Q`kiOT)^!i!zp``mrmmNBo|bb(XJ3B(njg0wgx+mZ+L)QDSY+R*
z5?B!#Gb8Gy_+M|!8Rd3T)3@&x;0SU1qB{Ew=aP^~lbR0hm|gfbqN+TO%huJ*MBeq*
z%gh&SC-dJQ7f3J9VcMl6q&;!wMjsxH11{|W6AE_L+g`eMlc}h9awoGZ)&x2E5wlXg
zUDKZ{D|r+8ul;Jgp?mAZnm&(}-(|n7;+t^I|0i1*&&QfqVhnEfDzTO&KLu<4?AoQr
z&6a7pj47`3r@*0G@83KN-+VkaHT#!B(BfO^mfj!F-g3@(BUMs+k)^YeJ?y0S!8a%G
z#2Brt$Tc;JnPT|m_jZwsTyI$97=7;udG;TRIa%MHzp6a>l9^dqy>{s99~mVq*X!mL
zyuR1&6?gE@=cuLXasMV&1W2s)&A08pqb9EQe%*rGmOHJNtU7$K$hfCVZiNKf#e(~@
z1g5;d#B$)}<~VbqRg?Ecn|`T%xGM4Vnczc0r&z9U`+MIp{AuY_d;jK+cN{8fW*5ER
QDG*~-KO;icmTBgH01S=CAOHXW

delta 947
zcmZqSYT=sTEn*-jSo3skbeK)@x~&Pb%e4X`66a2g_mVa+G&C|XG%++Vw2TtxH8Mov
zPRui(_*<d=_$zm%>2AxP^nVC$&HhlZ{QasUkJ3{8gjaLyI)3Bxs#(=-`XA*PG9(!8
zK9lx%w)St$>brpnDcSj7%56G~t+gX+gReGfeC)l(xZ!%zXJ#Sk`q!1K9KT)d_BZqT
zJxzym-HYJ%Pu`~{wft2LyILglc=M4U{<5lUL4)NFHj4MXm#;rEL;lXwlh^AxUl%_(
zwTO2f`@4AxKeBGU+S2^~cKC^u<L8^r=L)P2?kU&R`73&F*Ukv(y^Gss{C$7CZ*|}9
zy-pm*6@D~vD}McZ)8HYSSm0tWHE+(62RUsY;wtZErGM{QI?a4q5>H)k$lnm(59^P8
z{UQ6o<$J#Ig{SWx`CT}2ZMOFUM<!-Q2FAs~27v~$Y|Npud@N!tBC)ae7hWp97gMe}
z<Mfw_DZkaC$~g_>LDI@B5(Z)oSQSi8VN$K{YDk$9AoA&tL{#B&w`B3|OC3x9^ZWnP
znNYX)#g3FTpR6SrnP2|u2x#qC>)Bf-u71b(`RaM$5(<l+dgm{_yoN_dre#C8(B@;F
zjiqnrHGHep-(4UuJ^E(zfr+=2?tU|Sez{6hU+BUa9wYr5vs7P(O;NJt%XJ8k_P-^x
z@{Q6Tz52^LFUGXK`D(o7MdG(JnRAPr#eXik^5?)(ua@mD`8V$fC#CFO-u`?3(!#);
zX-ap@diUhsmFa7V*!exLif!YJ$h_5UVq85B1a1E?1TB)jW>d5FhwS@TDn0D;cV1I3
zH@auv%OrcfX_oZirbLdbx0K3ykAH~V)IPVj^2x4>1UHROOcS0??qqhwnjj}XVpgi>
z7k{95aZ*_J!lkb`S_M|W<xzCnzGD8~-L>9x`-NmRxqWrcOSgXK$bUOMw}?}4ckXKQ
z?RVSveiU54_l5>bce$S9fj{!A7T$a7oqn17>e5QKtmhpK0p9mNG)6vno6oyl!MHEP
z)nN{!xulzt!=*QU>)*7MuzpBZh)CDGue8Z&RsB?fut3d&OCO&&`1|S4mN(Z7Z}Ta<
z<NN-*d)J-RZxS7UUfvX&G0Rtf{q+s(*SbD*|1Z9jA3rtiWS47wnYctygKSuY8W-n_
z^p9UezJ58i>cO7|dsT+6rJ0vmMGM>?9W$@lvD%|nT+w%-Zjg(i{KvMvewvG?Eh}C;
PBYi=!>z)7pOyZ{i)pf~#

diff --git a/tests/data_files/pkcs7_data_cert_signed_v2.der b/tests/data_files/pkcs7_data_cert_signed_v2.der
index 1a24a8a2e3b72232f8ec4c2a1b2a45df051a2444..befd17c190253d2fc76833b5f6cc60b6a2742a2c 100644
GIT binary patch
delta 960
zcmZqSYT=q7$;o8MZ@|mOnb0;-NmHcy-rY+sJ{Qmai*Z~bpwqeizFyA$iSb_2MurAP
z7KUbq2Bv0F;=D%2NZg5e<`aJ_)SuXPKC^Sq#SgEyoJxsdea^?L_wVkR#0#CLuZk|7
zWm>sY*?F7X@c=gdEpN@+lZ_nsoZ@B8bLvVDO*a;K`(?Mmi63{FcmDZ5HA*GcQ@HBd
zGlsBJ2d4(DNWH4qE>Uy9>Ew}lc2;x5mzrz|KD+wBX+dlM<gc5>z3080pe-qIQDoYp
z`pV_bYHQEG6WD+A`Rnz&&8uH-vy2pr6}}rDC@!;ht&ObJtz+FM7-bW;`g~)o*k{%}
zt8>l7)sFLQ7T0F4XuK3EapZQ!o@L)pm@$2uxguNqw_LgP>F3@%tvojcu4{AZ4tIFi
z*1hrCubq$Dg<kd@mR#F^%D0%2$D8xW4wi^%ay1{kn}eB{85tNC2O9($$g(kq%JQ*@
zv50iNdpf1&SWWCz(dBtsb!QFV1^qo?AP<sOW|1%uYrv{tatf1beUohVjI*w_uP<$A
zT(hWd-&z03YffmmSX;i@|7-q|mrp{h-ToYw(~kBKuVlWrY}%|Ni_WALq%u$VxS`j1
z$)TU6$KQ5;Hq9xLuwW8$mFgF~=N4+S=UTK=$lV>^GE818-d(ifvvq`=NK0tdDd{Qi
zIt}lBOfcWRTwGXjrKH*VL-l{^A5Xnkdi6Wcj;-q+#D8Vy=uKTO=R7Uviq5|L`ZYgp
zJqW$qq_i<JRk6svQ6;b<GG<29OYy(nmNUxjq^57*E5H%r_C<B}8O|jklO{DC+%dcG
zZA4Xh9G9)DnTfpXt(TcE*iPoZKQ547p2M_DNl1I*%#A)g8V6k3111#gthc>%?Iu%E
z@#IcsSF8zg@*`%Y`V!6RtA-g_`<=E-O^9>VeqgfIKj}e0q3xlPeuE=^rd^rUcAG1k
z>h51n&bqSWthZp@t@$4B0(5Rld?=4^V-PxW|38z;=3h(aXv|})-7@X)hSw%d)*p&R
z)pE^Un<Xw4D2hM*m6<N4aE)=-UGtCJuhup69MO*NcvYak;o!pAH?!-HC1uJf*UwN7
zDNyeV;Pjk1FZ0G_W5&$Z81;i?cVg_imE$IUeW}npd(YqOEnDC0tV-H%pmCFF=k>^0
z((6JUifS6n9(i-r{M>j+gtfNFaEbFv-$`0tLHDHC=059J4qnv}Ros5ner2)z%1;_H
bleJPrPWNjTD+t@0*If=c{aNY>lVS`2W9h&O

delta 960
zcmZqSYT=q7$*G%~rw~(NV8k_1NmIl?P_X9d+UPKw<aJvUW|wOPL?q6g81E%*U}$J$
zVrXJ$U}za7&TC|d#GRODKJm9g{qa}sO4HqzKk5Gv+?xHNVEOx1M;@i6`U$V**meBI
z=T)<++w?!mGh|3G+<hkP@oeqin$>p$6H>DCzm(f_7+Y&c)CON|)cDwYjd8>Eq|eMk
z()F(^S2=#W+U;-V^?RBQ=eifc?Vr3)O=|h88g{iv=<((wLHuP^*@6bkA8ZuwdoN#q
zWQP2mrzfx1bG|NqaB30nJob0<6n<pgdbOqb{q67*DaX$@o6i+k9o$o{tMga%-maYy
z(t8)T&G`HNc;D*2-Fuxljw}3V;#U0n_ol%^HnG6PUTWT)B@c4iKEzet%}W2?wRD>K
zv?QLo-jKf`z8}^f`}#xngUk1P;|ovUJ@UJ7<l1cS1&&P2j0}v6gAD==WZ9TQW%*dd
zSVUrD?=QSmd@rV4b;jv06H|VxMU`_J$b+PnStJa^8n7yuoWi79-_?*ZB|zlUABm{K
z<!;I1-IqF+{^$4qr!%2$?~5HNX+Bv?GBUsX)e+FzvDUM<OkDkr@$=R5!X*?IJ@w9C
zdU*|xj!esjaG}k|JR3{j&TIHqtG~NIV0!e;<^vONDc${M_WW{{roPaHGdxE6H)g56
z44a~4%a`jA9_@ciXyqHFKYI0-cV3KXee>0L%ZtQsXENs&Ig9^Xbmh;1rCu%DUGi_<
z5l%|ky}bSR{H29~In$KxnDy?-y(`n#60!4pUKQKM8IgIb+r+qf9thh0VF+3zea)t3
z?GM@auT*;2=kL6xUT$>HzL!b%debcF!%c}CS8pkm^&bBaxv70_Z{?F+6$x${pO_{*
zo!rUniZww_e#ER)@3#9;>(|3?!#mTyEE9hy@<gEK*7MaoKJWOo=WX5LoLb$*^sw`0
znCOkkGecM06g(=Fd~$zH0O#TUrA?N93`4y9Ix3T+c|$KJElh3^=t#VG?bb71h2_1+
zjFo<F;ytm!ep9E@-c<FeYY#pD;OnKlts`cG$#$)dD;tYjRXEK`H0|nBuWw%#eAS>!
zZzkisdFw9Ru5s#J>7Dgw)!UODGV#xX<~)=Q__NWFk#TKwd9?L5-H_yr&sm=qOuu^h
zpuGEWdpFPEkhQu0?j4rAv|Lr;xrS!b#E^un$l06h?}#ihG`XhAIeBVr_eslQ*BjYA
c0((>Z-}cR1VzT7iHg2s%Z?;sfG$uzL03W2vUH||9

diff --git a/tests/data_files/pkcs7_data_cert_signeddata_sha256.der b/tests/data_files/pkcs7_data_cert_signeddata_sha256.der
index 7c631f9d7495886951dc80a63dc299421620b8de..85ea9f9fc1f29c7a68936a17ddf3825f10e9636f 100644
GIT binary patch
delta 943
zcmey!`H^#ig-G?iyO&&iE}s1t<G4aVr*r##y`23MeY~WM3=NDd49yG;OwFRid5w$_
z+=&|^>Q8JtpV>L*;)mB;PNl@KKIh}r`*-(D;)TxBS49`kGOgUH?7U6xcmNy!mbd2Z
z$wm%*PVutlId!FnrW=dA{j%HO#E-koJOBKj8l@8JDO`2!8AI5qgHwZ6q+V5Qm#8`5
zbn?hNJF7Y3OHH-}pIv?6w4k+r^4HDc-t%5g(3TXqC^BtPedTgzwYBHp3GBc5{Pp_X
z=G8B^Sw@P*3f~P66qi}M)<)Lq*0JsrjIxPaeZDbP>@#bg)wyQkYR7pti)*u2G+qjo
zIC48<&$90)%$UB-T#+sQTdv&t^mFf>R-T&z*R?ryhdVrM>)v?n*Um@nLNEIcORnud
z<y*|i<IQ<w2TQ~>xtb5&&B08}j0}v6gAD==WZ9TQW%*ddSVX$sJ)Kf>tS0uV=<+<R
zy0eDwg8rT`kOxUCvq%_-HDFaRIgm-UzDYKF##z_e*OxXlu31#K@2vmiH77J&tSw*d
z|22Qf%O@e$ZhsETX-9jAS2EvQHf`3CMQ2hAQkf@w+|cX1<j~L3<8Qk^o8}ZrSTG5>
zO7#oga|^ZEb1m8_<nE4d878k4?=D*L**Zc_q$RZKl=PH$orZTmCYWzuE-tLNQqpYw
zq541dkEh-%z51PJ$JTWZ;=i(U^ro(tbDoxSMQ2}r{hA-Q9)#X)QreiAs#s*-s1jHa
z88aj5rTAZO%NgZ%Qq#BZ72pVQ`=UDg4Cj)NNt2om?wDQpHlnILj?327%tYSx*2~Nn
zY$x;I9~Ve3&tcl7B&0oY=0+bLjRP+20TT*#*4tjXc9W^7cybxDE7rs~`8=~yeTioE
zRl|&|{Z3n^Cd9dFKQP(qpY$N0(DqPCzrhhd)2_^FyUmqNb@#6(XI<HG)?2Xd)_jk5
z0XjD&K9t9|F$f*G|DQ=^^RK0IH0H6@Zkcv?!)uc!>kq}EYPsgF%@UUi6vdzZ%1jqi
zxW>5auK7pqSL+&jj%desyeiP&aB$)5o7wfpk}~C#>u0Ek6sY$FaC*+1mwDr|F=J+H
zjQYW{J27_M%5f9FzEtR)z2|TCmaT7gRweB>(74I8^Lpeg>2;wFMKuj(kGwf*er~)Z
z!dhEoxWxIT?<6g+pnFnmbD#Aq2e0agDsI1Ozp_|<<tGi9$yzBQr~5UF6@=~0>n;bJ
L{w(!`NihZhmT0`V

delta 943
zcmey!`H^#ig@}QmV9nFD(P1{p>$WD$F4qc(NSr&-$4kn<(9p=l(8SQd&@xJ#*T@jT
zowy;Q{`f0*rRi?VpY(qSZq5Esu>Ae1BahNj{e)L@>^gqq^Qu|ZZTcVO88Rdo?mm<D
zc((R$&FZ^>2`Sn6U&?JdjIFgJYJ;yfYJBXy#<<~n(r0EN>H61|s~o>w?e;hG`aMmD
zbKQ&J_D|lYCbj%k4ZB(-^my};ApWwdY(azN4>pSTy_c^)GDH5()05ZhIbRn)IJJm(
z9{am_3O}-Lz1q_J{&x6@l;h`{&F2cN4(=(})%h!WZ`aNU>Aj2FX8e7Byl-{i?!8VN
z#}$4waVviPd(+?{n^@ptFEww@k_S0$AL1(SW~G1cS~|^qS`trPZ^+*e-w*4Lef=T(
z!R33t@r9@F9{F83a&5Nv0!JohMh3>k!3Kc_vTV$uvV1IJEF!V7_ZMC&z86!jI^*=0
zi7CI;qRKf9<U!KPED{D{4OkUS4rEfT?`lYy5+L&Fk3>}Aa<^ph?n@m@|MUC*)0t4W
z_r;EsG@q;`8JS=H>Ii7<SnJtaCa!+R`1$I2;Svgqo_gmmy}X7;N2X;%xX|Wfo{gn%
z=QVt*)!$tpFg^Na^MQ%Cl<s~rdw#h}Q(x%986G438?#hjhD}kj<;!&lkM_SMwDOJ8
zAHDj^J1@qxzWHjr<wfGRGnsRXoW*}Gy7K41Qm>ZnF8Md_2q&fNUf%wD{?fw0oM}pT
z%zF3a-j(TViP-r)uZnHsjL5vzZDL$K4+L%hFa#}<zGhRi_J{2IS1LX1^LJiTFE_ep
z-^(O>y=j*8;ig26tGATOdXImI+|)j|xAMuZiUc=}PfQb@PA+41#hMr=pJ!I8ciVla
z_3Poc;hkw;mWe+Uc_L7A>-lOPpLhJ)^S17APOa`@df0h0O!UU&nV~Cg3LX_oKDoap
zfb($w(k9D4h9O>l9hJ$^yrGwq7ACg{bR^!pcIz3h!t&l@#!5do@t)XVzp2w{Z>sv#
zwTGU6@byyO))BM8WV=?!m5s%%Dx78|ns)W6*S9YVzG~2=H<NMRymc3D*EsdA^v?RT
z>g~x6nfPZxa~{eD{Ml&8$hbDTJlcAjZb)**=d4c)reD2$P~QExy_;un$lBb0_YO;5
zTCS?_Ttl;IVn{+(<m^rMcSM#Lnp{)moIJI*`=n*D>y7LlfxRjIZ~JC0F<EkM8@E=X
MH(M%K8j~Xr0Pg$7AOHXW

diff --git a/tests/data_files/pkcs7_data_multiple_certs_signed.der b/tests/data_files/pkcs7_data_multiple_certs_signed.der
index 73755dbbdf77afe9bedabad2214bfd1755b4e8d9..69371ae202cfa21a20a1dfdaf11e115c4daa4ffa 100644
GIT binary patch
delta 1910
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
T#S3fWuj`x4Q}*hBhpc}Av>SPe

delta 1910
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
RH{h*eiL5Z=eSp)<zX0P^iQoVL

diff --git a/tests/data_files/pkcs7_data_multiple_signed.der b/tests/data_files/pkcs7_data_multiple_signed.der
index a38c3ef63fd7d725c4aa7620eaddb76e1f3a0289..5821a7c6fee67ca72129290679eb409d0e9840da 100644
GIT binary patch
delta 578
zcmV-I0=@mJ2C4>-eH44%-O@x%(aru`L8uTciMQV_Y`>9_B7bx#d(|;$YQI9Xm0(^)
zE8sM>Ph#LuaXrFxk1)heHHv9_KC^j(e&5w&YSg&ROA&tBpGfXdEZG?FcVC7862#yC
z0wlBgrJN|927R=a!?5c#f;;eY6((&rMS~d9a3L4v`e|ntAl3o8-8b<I>aKu{#4BHj
z>ToZx!J(VkYk$UKX&xhgm?u<lCyr1FNtvE$*wZrsX@y)T!FJqSK8qt>k@e{yjhnpv
zYqYiOxq4#1Feupqxz|~m8?IGAa(sX`;!6m8`LWUz1$}Zcq(kXVk}674-Wmp-=8q#&
zs)$;1ht)r+b04YlC>)b2WE9JfDRUqbKR15UP|Ncg<N_gFkvu*ZG6ED<O;tc8uUVcl
zaCx$F4)6{0eEWQnks^OSJphOhW`u=Y5v&NDr2+hL#E!UuY0t93ZdioH_Gzcyo3WL$
zvy0N6RGq-uU@(JX)74%1b#RJ3)R94kn@=RXl*-MLD|yDTVqT<4yfimarvtr)Vw+mI
z!x!#tPC;BBz^ZFkq%in#x8cklGWEW+;#$GvQNiI=<aY;){~Lc=dOvz7kNa;|ZsY{3
zv47)qaCvY);UQ&1V&4_CJOonJR!;D1xK8wQl6&*6QzH<gnKvueHL!r4L^wI*PyUL_
z)qq{PtDro5?fc0^{1FU1Pg~m4b6v_gp-Au6qYJG2$K?uSn<{MXt2C{MHFO_R^Tui#
QnXQC6LQ3JA`K|)|)siS2PXGV_

delta 578
zcmV-I0=@mJ2C4>-eH1Ve5q#yXTUI<{uC-vBcPda=VV#kYB7a7^!iDw2?N^Cr^rjc#
z6yy+m+UKhbOzsaWp0&6`WqXPO;fdK+71)!RRjAn!#S&x5zkE;$!;htcIs7qHN=}G*
zV_OYX(_*1xgb;{f-qzaY4IrnD#xo-MvJJ?vKeCBJy=5nrt-|N<O-duSh+MEVw<?I#
zv2%qa2{v>oK7VD`x299oFp4gj0iK?&(A#`Mjj2m&{HpEAh#X($Qk>x(Q2enm0RgRB
zcUwEQEmUJ@^J?;-m(|n3A4kVOMoCjtt!@6^!x_@2B_QW0DT0wyU}{;LvOnAuq%kzs
zB?*(2eT&ICb4A!|j1awKPwkGGq%@??whJm@O9o{MW&%MBkvu*ZG6EDyy!juc+$g<n
ztZA|r(mlVe&%wu$ks^P6BML2UiipcqbyU}#jzEvnxDw#)q}NW%y^2KR6%>2jZ}SvN
zew6kYK$D{Mvb+g}T=7X{EDI8WgADk*0<ctq0d)o^5vO<E$+#wPshs@xH3%v{AQGY+
zxdnCSo{NW2T${@&zCyaA$kXZ*UAMLqP7}<P@L29NrbKvs*I<9MHE(ek%aINHmY`yK
z=l6|QdNZ43dM|WT-SE85XyOR~aAX(TIe{+n3iVdp=5)(00e|aV7Xpo9YRzwkxV=CW
z?{5f%&zEvFV<H2*spqW}2Yk0|`sxRtRTyU(b{$cmE1shTEH9Pf3ZCanpMXxFA)R4K
Q23P}Zoe7Y2HTVKi;KS|`EC2ui

diff --git a/tests/data_files/pkcs7_data_signed_badcert.der b/tests/data_files/pkcs7_data_signed_badcert.der
index 9c7d96245ecd28b60f99be905d14698ef0e4f1d1..1da6e6a9605a64729b6cbb22edc8c0f4f00a7a81 100644
GIT binary patch
delta 947
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4Hg>6vN4Cs^0A1qh;+SsI;G}VP3%?C
z<#}3lXAR#4{XJnI50X}9kuVTzz^Y(!3X^JmlWg{kv#zzTFKuXCv#4(0S^vpvPH4DT
zTfW-=YyOg#PeQES{v4Lmj`k3*WWKj-+N>js&ZHKkGEexpq1SoIp`WG4-*$gC%_)+w
zU=nhb>KDA{7HYHSTC`Kh-5uXDOkOMAU9{q}b%dNqOK8<8=_&6z4ex$TFyFphTv&0X
zq}lpI^?&LgPrX-q^*hgwt?M4de`V+BO<gbNJT2#n&c6KmH9u}W2))~+v@tVPvB<tr
zC9ongW=7OY@xR`dGs^9xrf=UXz!Bp1MRoQW&Lts}CN&-0F}v_>L{)hlm#wRriM;Er
zmzgivPUgQqE|6ZH!?a6DNPFVUjXpdY2VB|%CKT+fx4m@jCR0)I<W6Q+tO;`RBW9)g
z63yzXh8bD=owiI(h;!9`V6xRe=|MoD?V*x>gCl;XU76K(n=6~@?q5yLy0YV}w_x3^
z`5x~AbZ$y~D35Pr5IS=IKa<MlUrXm`%wwzFGVSn&*CtKYABsiQa?M?vB`y^xia-68
znJ%Vqjd9mq^N-xG);07T(T?wURiMA&;KJEAv+Iu~Wy&en&rlC3Q11)i^qe^_^TuUk
z#?00j^@C-1V(hw=<0gK6sn9!n&)@7VTi@)gO4@Irag%B1^~hP$>p~rhY8uQQd2`hK
z+;~ZZwYJD`iStX}Nm^b(_oUe7KI>NwUeys*+<w)5WwHFqPZ~0lwNgY*_iGj_2-}<2
OT@E<?S?URsVhjKm`@S;(

delta 947
zcmZqSYT=sTEn*-jSo3skbeK)@x~&Pb%e4X`66a2g_mVa+G&C|XG%++Vw2TtxH8Mov
zPRui(_*<d=_$zm%>2AxP^nVC$&HhlZ{QasUkJ3{8gjaLyI)3Bxs#(=-`XA*PG9(!8
zK9lx%w)St$>brpnDcSj7%56G~t+gX+gReGfeC)l(xZ!%zXJ#Sk`q!1K9KT)d_BZqT
zJxzym-HYJ%Pu`~{wft2LyILglc=M4U{<5lUL4)NFHj4MXm#;rEL;lXwlh^AxUl%_(
zwTO2f`@4AxKeBGU+S2^~cKC^u<L8^r=L)P2?kU&R`73&F*Ukv(y^Gss{C$7CZ*|}9
zy-pm*6@D~vD}McZ)8HYSSm0tWHE+(62RUsY;wtZErGM{QI?a4q5>H)k$lnm(59^P8
z{UQ6o<$J#Ig{SWx`CT}2ZMOFUM<!-Q2FAs~2D+(v3NaOlhFoGSBC)ae7hWp97gMe}
z<Mfw_DZkaC$~g_>*_cCRm02VV#2T<Fn4H3-THn=>G9^Id(;tbb!sTws;@y`zmj37W
z|EDvdZtsg7DQP}gOENOQ{M8ZA+OgKNw@h69j`8!=^TH(*7CrUOUwU~BkB&^shH#<H
z$2=QL-_C3JR;$0eKwx_G&E^9WZz<jVX7>DYm8QPXg)=-x`Zs2&z6_h9WXqT95FYJ+
zOK9aAr9XQ0mv>%_X?^q6c*~2#Z)Y;+7CDRmTy*8nfu&w8+g<W+-Vshp*}c5|_xz=W
zfjQHZ?wIxN$-OJn*AlVwdtMdW#u<@$tJ}o5dL9Vc{$U7OBz?`MX6+Bz_pelX*yr!O
zre1Dz&%T#Q_IlGS>BCKl99M5CmGvI~5V@&+Zg1t2T@?v#8lRXZJe}Oh?20u(PJYC!
zRPVO?Q0v#jZ^Jv&zAO`eDDp(0=GODoJU;LEwdZZ!;hb9C#q_ZAW|-)W$umP&+!Q=2
zlzei3O#tWN{-sTpe+)ys{5mR=qj^IwCoN2F5$H&~ckR|QUWMho$BdPJZsI+$!G2Sx
z)816|scR2C|KRJTysaZ<gUNQSjw>6BTU9vCN;K{2Q?GAd7JSv9OK&FQym{*`+^%uz
zUFn_mXVu%29WwFHg62Gw4fwOskdbk1ba}M(Hr<fqjL%u07EHf-`JlY}aeFt<;E=Vs
z|Lz@@ytG_Z;kkxp)5MU3tjO7$?C*#yF*LcR$~k#zZTCsbV%HnlJpy}E{NMJ?Tw=21
R+%|5lL~piKt~4e`9sv2D$glta

diff --git a/tests/data_files/pkcs7_data_signed_badsigner.der b/tests/data_files/pkcs7_data_signed_badsigner.der
index 9ea4231a6eb9e0c4645d1007ca30cb3170e580f3..aff1448728d2d6f7dd2cf447251fe08cf7ac28e8 100644
GIT binary patch
delta 962
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4FU~h*_cCR`B=nQM7rKRol<kGCibf6
z@;t4&vxe`2{+=+92T3clNEnDUU{x?Vg-Nx(Nj7`NS=ZXvmo_x6SyZ?0tpDUSCp28F
zEnn^bHGj#=Cn45ue-6uOM|+4@GT&P^ZPt-RXHpANnJ0YQ(CfV9(9hE2Z@WL6<`hX-
zFbTOz^$Xr}3$@vEE!rvM?v8I6Ca)FmE?V)~IzmpQCA8|4^ptm<hIc<Em~US$F08mx
z(ro>q`akuLr`{{Q`kiOT)^!i!zp``mrmmNBo|bb(XJ3B(njg0wgx+mZ+L)QDSY+R*
z5?B!#Gb8Gy_+M|!8Rd3T)3@&x;0SU1qB{Ew=aP^~lbR0hm|gfbqN+TO%huJ*MBeq*
z%gh&SC-dJQ7f3J9VcMl6q&;!wMjsxH11{|W6AE_L+g`eMQ=q8Wu!*tUpoy`ViILI3
zXW_(rQ!ys2>2vZUW~KTP&FZU$8Cm<CwoFZkbJc!eveiH7K|rDHp^|=sBYvh`nbmfi
zE1T->Uro-svg53`VBM|x9`6ElZc2P8k8fiTI&%L%lgj2_OXq0JW2@aV?eK=zCQa5K
zibd6O&0U)%E)^(>KmC=NE~apeao1h*kKC`;HS`?Oj_-I?pugeZ!r3>o>yIU6$|={+
zP!B0k?+f7coH;M^#${v1%+?t7gJpMO?7EfXCVqXX&^vq2-|Q`0-|VbP+Hat7lWFJm
z$XU|sLLG`~8q6MfbJYCYcu9n{w#aaa^Gn}JT3$i-q}b*@>sJn5)e%+Pe${?uvHZ$U
d8Zwi$QbbPoYZfaA+nd*24mkZ;>Isu#3;=4#!At-E

delta 969
zcmZqSYT=sTEn*-jSo3skbeK)@x~&Pb%e4X`66a2g_mVa+G&C|XG%++Vw2TtxH8Mov
zPRui(_*<d=_$zm%>2AxP^nVC$&HhlZ{QasUkJ3{8gjaLyI)3Bxs#(=-`XA*PG9(!8
zK9lx%w)St$>brpnDcSj7%56G~t+gX+gReGfeC)l(xZ!%zXJ#Sk`q!1K9KT)d_BZqT
zJxzym-HYJ%Pu`~{wft2LyILglc=M4U{<5lUL4)NFHj4MXm#;rEL;lXwlh^AxUl%_(
zwTO2f`@4AxKeBGU+S2^~cKC^u<L8^r=L)P2?kU&R`73&F*Ukv(y^Gss{C$7CZ*|}9
zy-pm*6@D~vD}McZ)8HYSSm0tWHE+(62RUsY;wtZErGM{QI?a4q5>H)k$lnm(59^P8
z{UQ6o<$J#Ig{SWx`CT}2ZMOFUM<!-Q2FAs~27v~$Y|Npud@N!tBC)ae7hWp97gMe}
z<Mfw_DZkaC$~g_>LDI@B5(Z)oSQSi8VN$K{YDk$9AoA&tL{#B&w`B3|OC3x9^ZWnP
znNYX)#g3FTpR6SrnP2|u2x#qC>)Bf-u71b(`RaM$5(<l+dgm{_yoN_dre#C8(B@;F
zjiqnrHGHep-(4UuJ^E(zfr+=2?tU|Sez{6hU+BUa9wYr5vs7P(O;NJt%XJ8k_P-^x
z@{Q6Tz52^LFUGXK`D(o7MdG(JnRAPr#eXik^5?)(ua@mD`8V$fC#CFO-u`?3(!#);
zX-ap@diUhsmFa7V*!exLif!YJ$h_5UVq85B1a1E?1TB)jW>d5FhwS@TDn0D;cV1I3
zH@auv%OrcfX_oZirbLdbx0K3ykAH~V)IPVj^2x4>1UHRO5)+;pHZhhPG%*%4F)|wX
z=%(f=#8f02a!sDktdBLBPJYC!RPVO?Q0v#jZ^Jv&zAO`eDDp(0=GODoJU;LEwdZZ!
z;hb9C#q_ZAW|-)W$umP&+!Q=2lzei3O#tWN{-sTpe+)ys{5mR=qj^IwCoN2F5$H&~
zckR|QUWMho$BdPJZsI+$!G2Sx)816|scR2C|KRJTysaZ<gUNQSjw>6BTU9vCN;K{2
zQ?GAd7JSv9OK&FQym{*`+^%uzUFn_mXVu%29WwFHg62Gw4fwOskdbk1ba}M(Hr<fq
zjL%u07EHf-`JlY}aeFt<;E=Vs|Lz@@ytG_Z;kkxp)5MU3tjO7$?C*#yF*LcR$~k#z
lZTCsbV%HnlJpy}E{NMJ?Tw=21+%|5lL~piKt~4e`9spn5%)$Tw

diff --git a/tests/data_files/pkcs7_data_without_cert_signed.der b/tests/data_files/pkcs7_data_without_cert_signed.der
index 3c8e9514e145063bdbbaa2c52a922385220383c6..dbff326ad33bb0fbedf6716cfa01f015537a8572 100644
GIT binary patch
delta 289
zcmV++0p9+z1G58=eH44%-O@x%(aru`L8uTciMQV_Y`>9_B7bx#d(|;$YQI9Xm0(^)
zE8sM>Ph#LuaXrFxk1)heHHv9_KC^j(e&5w&YSg&ROA&tBpGfXdEZG?FcVC7862#yC
z0wlBgrJN|927R=a!?5c#f;;eY6((&rMS~d9a3L4v`e|ntAl3o8-8b<I>aKu{#4BHj
z>ToZx!J(VkYk$UKX&xhgm?u<lCyr1FNtvE$*wZrsX@y)T!FJqSK8qt>k@e{yjhnpv
zYqYiOxq4#1Feupqxz|~m8?IGAa(sX`;!6m8`LWUz1$}Zcq(kXVk}674-Wmp-=8q#&
ns)$;1ht)r+b04YlC>)b2WE9JfDRUqbKR15UP|Ncg<N_gFlm>}{

delta 289
zcmV++0p9+z1G58=eH1Ve5q#yXTUI<{uC-vBcPda=VV#kYB7a7^!iDw2?N^Cr^rjc#
z6yy+m+UKhbOzsaWp0&6`WqXPO;fdK+71)!RRjAn!#S&x5zkE;$!;htcIs7qHN=}G*
zV_OYX(_*1xgb;{f-qzaY4IrnD#xo-MvJJ?vKeCBJy=5nrt-|N<O-duSh+MEVw<?I#
zv2%qa2{v>oK7VD`x299oFp4gj0iK?&(A#`Mjj2m&{HpEAh#X($Qk>x(Q2enm0RgRB
zcUwEQEmUJ@^J?;-m(|n3A4kVOMoCjtt!@6^!x_@2B_QW0DT0wyU}{;LvOnAuq%kzs
nB?*(2eT&ICb4A!|j1awKPwkGGq%@??whJm@O9o{MW&%MBQ09sM

diff --git a/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der b/tests/data_files/pkcs7_signerInfo_issuer_invalid_size.der
index cfaac2fa78e46fa9db2efe9fbf1bb71b6519d4ab..2973ccd7e50b2f7e667d651e76d939d01fc0f287 100644
GIT binary patch
delta 963
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4FU~h*_cCR`B=nQM7rKRol<kGCibf6
z@;t4&vxe`2{+=+92T3clNEnDUU{x?Vg-Nx(Nj7`NS=ZXvmo_x6SyZ?0tpDUSCp28F
zEnn^bHGj#=Cn45ue-6uOM|+4@GT&P^ZPt-RXHpANnJ0YQ(CfV9(9hE2Z@WL6<`hX-
zFbTOz^$Xr}3$@vEE!rvM?v8I6Ca)FmE?V)~IzmpQCA8|4^ptm<hIc<Em~US$F08mx
z(ro>q`akuLr`{{Q`kiOT)^!i!zp``mrmmNBo|bb(XJ3B(njg0wgx+mZ+L)QDSY+R*
z5?B!#Gb8Gy_+M|!8Rd3T)3@&x;0SU1qB{Ew=aP^~lbR0hm|gfbqN+TO%huJ*MBeq*
z%gh&SC-dJQ7f3J9VcMl6q&;!wMjsxH11{|W6AE_L+g`eMQ?RJmu!*tUpoy`ViILI3
z$G~)Afr%Is)&x5F5wlW#iDvax!;Gx`PFtoX#JOreFxl##^dO+n_E1T`!4W^xuFPt?
z&6Q1c_pc^rUD<KgTd?lde2;elIyWUgl*hL*2pzfqpGjr&ucdP|=CRdonRa-?Ym+AH
z55=Ntx#q6T5|;`T#h?DlOcztQ#<=UQ`A6<o>l%8FXvcTFD$w6>aN+Em+4aYgGUb%(
zXQ+o1sP_eMdd{4edE>G%V`giN`oXe0F?QX`aTCA3ROp?(=Wq6wt#5W#CG9uRxXHBh
zdgLtWb)gPLH4SEuyg6!qZoDMIT3cke#QCM~BrUI?ds1w3pY<yTuj+^@Zog{3vRHoQ
eCk>g&S}7u@`!$Odgze4iE(e_cEcJv*F$Mr&G{F%7

delta 970
zcmZqSYT=sTEn*-jSo3skbeK)@x~&Pb%e4X`66a2g_mVa+G&C|XG%++Vw2TtxH8Mov
zPRui(_*<d=_$zm%>2AxP^nVC$&HhlZ{QasUkJ3{8gjaLyI)3Bxs#(=-`XA*PG9(!8
zK9lx%w)St$>brpnDcSj7%56G~t+gX+gReGfeC)l(xZ!%zXJ#Sk`q!1K9KT)d_BZqT
zJxzym-HYJ%Pu`~{wft2LyILglc=M4U{<5lUL4)NFHj4MXm#;rEL;lXwlh^AxUl%_(
zwTO2f`@4AxKeBGU+S2^~cKC^u<L8^r=L)P2?kU&R`73&F*Ukv(y^Gss{C$7CZ*|}9
zy-pm*6@D~vD}McZ)8HYSSm0tWHE+(62RUsY;wtZErGM{QI?a4q5>H)k$lnm(59^P8
z{UQ6o<$J#Ig{SWx`CT}2ZMOFUM<!-Q2FAs~27v~$Y|Npud@N!tBC)ae7hWp97gMe}
z<Mfw_DZkaC$~g_>LDI@B5(Z)oSQSi8VN$K{YDk$9AoA&tL{#B&w`B3|OC3x9^ZWnP
znNYX)#g3FTpR6SrnP2|u2x#qC>)Bf-u71b(`RaM$5(<l+dgm{_yoN_dre#C8(B@;F
zjiqnrHGHep-(4UuJ^E(zfr+=2?tU|Sez{6hU+BUa9wYr5vs7P(O;NJt%XJ8k_P-^x
z@{Q6Tz52^LFUGXK`D(o7MdG(JnRAPr#eXik^5?)(ua@mD`8V$fC#CFO-u`?3(!#);
zX-ap@diUhsmFa7V*!exLif!YJ$h_5UVq85B1a1E?1TB)jW>d5FhwS@TDn0D;cV1I3
zH@auv%OrcfX_oZirbLdbx0K3ykAH~V)IPVj^2x4>1UHROk`ta9HZhhPG%*%4F)|wX
z80e<vDa2G5n{rKFz^sQgolbtltW@u|`%vrG!*9bo)4nVde<<=qpyt-|)jU4$__gP4
z-Qk>C-Np2<^JbXnjma}ZSKJglDwKS3e@y`A;r^vfmVXRGy!<*UlcRY<FDETbZV~86
zym#%^GhT(|y~m7|es1DDvB7>*r_<h4^{HzQJ^$eArM#^pW`oIgt&S@ji(6GV%}O-w
z>Qk?8Ulx4Tpi6Hi<Ggw6F5Iqh>Rsub^=H-FlN~bg&w}PWlnwZ^(U6gGZFG6G^)}s*
z<c!Z*pB7BNdikKd`*C|W&)|@?x&Q7Rmb|oFRpGgYX4AxwgsjNfo9yq1EHN~>rph^a
mYHjyP%VO6X**yY#Q~cld&0J!#<lHuHtwe9ORIW58M;-vGDa^?L

diff --git a/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der b/tests/data_files/pkcs7_signerInfo_serial_invalid_size.der
index 871e77db708b2ac4d3e045f61421e96c73d921eb..2db359072b44bcabbecbc1d0cae2c647c2406131 100644
GIT binary patch
delta 948
zcmZqSYT=sTEmD2&?j;wWi)a7EIIa-T>D+!_FK7S6crR%qLjxlVLo-7IQ?n>>UL#{9
z?!-LviN6)<Pi#A%**WLphu2$9rNpp4=i}A;clS)<h0fDgMHkO9t=y^XyiM+S02}|7
zx9081Mh<*V@v`PQb)|=<8;iXCvfJRqkGsq}|NNgCr4s8YTy^akL)fW<Q-fBdUR7+D
zs5#(t^2j_pt2yFJO|}G|U47uRptXPU*UjSI^IlHSmK3-sGHp?P<#K1Wwddan?7#W^
z_4?iB)i1YMMvBD>-wh8Gmsz{kM%L=qvF;O$vWZ)LzA;wpGi#pJxn|;O$9Xo3YqM80
zUJ8{sayw(svhOF%n7++ikuCmPuH5?cbMKv2o|^*KwK;W%J3MUb-gxcT&PVM+FZ&Kl
zuI)eNTg=Gg&3R-8OT;v}nh)O1!A#7I42+9|4FU~h*_cCR`B=nQM7rKRol<kGCibf6
z@;t4&vxe`2{+=+92T3clNEnDUU{x?Vg-Nx(Nj7`NS=ZXvmo_x6SyZ?0tpDUSCp28F
zEnn^bHGj#=Cn45ue-6uOM|+4@GT&P^ZPt-RXHpANnJ0YQ(CfV9(9hE2Z@WL6<`hX-
zFbTOz^$Xr}3$@vEE!rvM?v8I6Ca)FmE?V)~IzmpQCA8|4^ptm<hIc<Em~US$F08mx
z(ro>q`akuLr`{{Q`kiOT)^!i!zp``mrmmNBo|bb(XJ3B(njg0wgx+mZ+L)QDSY+R*
z5?B!#Gb8Gy_+M|!8Rd3T)3@&x;0SU1qB{Ew=aP^~lbR0hm|gfbqN+TO%huJ*MBeq*
z%gh&SC-dJQ7f3J9VcMl6q&;!wMjsxH11{|W6AE_L+g`eMlc}h9awoHks3^7+Ir$N@
zQhkYL^;N@+to=?~rY6L>YCka9>Ywx=pwRYENx#7nKhv(vYP-#qO?CILCTCsQan@U~
z?$&&dcL6##B|enLw=oDEx&NO@W%IA4b2R3$)oz(~c*ARxChHHyqH4M3uFVpc3KYek
z{>n@jQ@F;s>#q4n?pNy?dX8wvcf2al-*9l@?3>y3$C5JTl<Q}xhZLyy1#o)KoR@jy
zvN2<3YmEBAvO6($-O6zjzrIxHoxSI8_Li-0c2*_rH_*7rwDWr8Ea`Qj4n;K$W{<o%
zYJP6KB*I!-WVponrSBvyub_KUY;&LWD+jOYh$?QsYQM5re&r_(naNryBB%Q`ixq_J
Q&Fd})oc=8Jgh??50Hsj9_y7O^

delta 948
zcmV;l155mb3WN%fOB65>5q#yXTUI<{uC-vBcPda=VV#j*N*gdSF)}nUG%+wSIa(JD
zGBGhRGBhzXF)%SXT9Ixyk^3Nj$LdESmqw@LkML84Yw&QV@2bS&W@Szjs|dQs*z>BI
zdxkIZ9{^|=0Nv&rNan5me5>72U}S4=^mjanGdn9-eN)weDDjQf0kGF%^8*qaf9rXw
zLH5;)Pc};XmMjUb=u?OCOUjaj{Uuh_auVaS#8MA-dTS9dr{J*{j_)6T#F!u4<;mB7
z3F~v<%AyUP2kxFA_-fkfw1e;4SIA_?&x1Fe5UW#+cP%Xa72dkJSR1{ghM4{D$BwIx
zyS+jP#~}EE3nBIW*)ZV-7Ez;0CQAu);B1EQUU}VWXZMPwmN%AS41SGN{Zvixug3NG
z9q>f=Z!^&4?&40+#MYZjpg{ry0RRD`Q!r659R>qc9S#H*1QcCe-=WfT-duMjn9KB$
zWcwyscL^{b1_M<cBLo;Q7Jw98UEiV7bKYEcC78?fk!1TOT6YPPWCA6BihyL4P!#g~
z7+P_sMq?L?(uk%14^RFqkbb@BxMXHbYNTjs^!+RlD!8pljdm9&+%xB^o>v$kqUB3(
zrPHhoEF6TeR}!<vNr83ko`Cj!FS~FMms{C`z>(S_-S#%;(|Rc{641;HGB4PgCFxd_
zB0UamKv!E&+7hYkBK$6Y)49=Hh3xe+wCG{>%xRr+Ll^m?)cnAuN`$vWZ`s@vVr09g
zhx?zUaZzlRBHT8Oylveaj)Yjb_ilOyv6xwItA-W|jNlPH`~Xs-8`eC0t@s`9>LiQ@
zpSjj2cQW2TjRGClf|?t{f?){N+9Gz1$M9LQhn<ai<hpoZMkw+EkmZw!14I=qWo{r`
zcri5!JY%l4V4HU;P*`D|li~v+e@45)h4sVjSBYlyrWfH9<Pdz?=c^1%?hh-TwYWoN
zdx`?#iP=^a*pr!6sM!(45@X4~d{7C)kEMb+{4rEYPKbG9TMbpyVxeP%5Qt&k*4pL`
zAg7JSGa~u24al%RvWY^yWha%b!sqZ!N+Y(2T(C5^Du~pvbA==cHgqXIe`VLVrc>20
ziY}P}o}RAI+k8TesY`17s_n^$9AD;AoZ%f%{IM|s0j*niTRXNbRAXrKYVx3$)ziTr
zN5?-#NmEp<ZT{ZF8PcaEAm=D4f{|2UYFV4IKim|gF*MdC36qt5i^(~2Mc8YM5WQqi
W?T(qGG^Eb93o2nt24xCn0znKb&BmSp