From bc8b34b0294c3746964aaed607fd02f4c5ba9f36 Mon Sep 17 00:00:00 2001
From: Simon Dieterle <simon@prodimpct.eu>
Date: Fri, 30 Dec 2022 19:18:41 +0000
Subject: [PATCH 1/2] add test vector for mixed DER/BER encoding in CMS

---
 pkcs7/tests/content_tests.rs     |  26 +++++++++++++++++++++++++-
 pkcs7/tests/examples/cms_ber.bin | Bin 0 -> 10914 bytes
 pkcs7/tests/examples/cms_der.bin | Bin 0 -> 10872 bytes
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkcs7/tests/examples/cms_ber.bin
 create mode 100644 pkcs7/tests/examples/cms_der.bin

diff --git a/pkcs7/tests/content_tests.rs b/pkcs7/tests/content_tests.rs
index c404adf3d..d5ff923ea 100644
--- a/pkcs7/tests/content_tests.rs
+++ b/pkcs7/tests/content_tests.rs
@@ -2,7 +2,7 @@
 
 use der::{
     asn1::{ObjectIdentifier, OctetStringRef, SequenceRef},
-    Decode, SliceWriter,
+    Decode, Encode, Length, SliceWriter,
 };
 use hex_literal::hex;
 use pkcs7::{
@@ -140,3 +140,27 @@ fn decode_signed_scep_example() {
         _ => panic!("expected ContentInfo::SignedData(Some(_))"),
     }
 }
+
+#[test]
+fn decode_signed_ber() {
+    let path = "./tests/examples/cms_der.bin";
+    let bytes = fs::read(&path).expect(&format!("Failed to read from {}", &path));
+
+    let content = ContentInfo::from_der(&bytes).expect("expected valid data");
+
+    match content {
+        ContentInfo::SignedData(Some(data)) => {
+            assert_eq!(
+                data.encap_content_info
+                    .e_content
+                    .unwrap()
+                    .decode_into::<OctetStringRef>()
+                    .unwrap()
+                    .as_bytes()
+                    .len(),
+                10034
+            )
+        }
+        _ => panic!("expected ContentInfo::SignedData(Some(_))"),
+    }
+}
diff --git a/pkcs7/tests/examples/cms_ber.bin b/pkcs7/tests/examples/cms_ber.bin
new file mode 100644
index 0000000000000000000000000000000000000000..57057fc6da166c577d11560ce06cd3a0f89a99c7
GIT binary patch
literal 10914
zcmXqLVB^$k^Jx3d%gD~OpuwPliILHe-+-5mGoj6cF_oExiIJ7T07((!f(DfamL}#G
zo_U#7nfVII`FSO&d8H-!dR&g9U^E0qLtvPN04T2yGcS#LXEX#xLjX$%jOKMLfifyI
z8Un*G1V;1vFpShuFO7x(mJk@t>sSJ1RA@8=hG7Vd=JjD1siR&R4FN16Fq+q~1j?w;
zXb23$5E#wt!!S}uy)+sESVCYluVV?6QK8Wg7=|G*n%9S6q>g%NGz74O0E-f)AeUQa
zUMkWuItDNRF2!qN%mZSP1<Xv0OiTjB8;}3JThY@oSz+bH>du7^47k`hfD8A|*|IP*
z8SoqO8gR2Qhq5s9u!N)*ml(*2^BP(hm>ZfIni`rL7(@ZNmPlMo4Uq=IZ0un3m>8i3
zGc&R?J29}l&S{%^ZmTSx-O6m`id<pingqFE+4XtX9r#X8T_G2;bUMrTmnp9j{Y(yv
zemH(t=8*PQ|0Rl#%YD{J<o)DY5!AXk$RNOg59l~qen!UsEI{Y7d@zs&@%dQ9SVYoz
zbuW0kzBN9v=x3p4YtbQ&@U8m{<U!KPED{D{4cHYRd7jyW!N8SCkzuXaw&JEOPTSk|
z-SUln<;7*@5Nc5D@92F;{^|B`#kuNC3d+|v)!jY7;};q5O!}I`jQ6XS8tcxj7CBrU
z$h4&V*ULHv2E!)CE?}6q0T)3UC}RW?mPkNdC%K^UyMY9JJtZfzAvc`E&S)S5=Wwzb
z@}oqMVU&RuLe|7k)<7C<3Fbm19~<Z+)Up^Vu_zSz1nz#GyCCYf!s!>UnQLx6Tz_3y
zC|38NZK&?bFHV<y4HDS6p^H2@1(@^=0}cEQd=0!=6yh9o8^taxUE5=~C;M%sw$+t~
zpZ?o$e-SY;ZvA=s^q$QI>IT9~1c?a<B<HcX1LH#><d?S3@8Fy7ckYxv<+Qq``YhAD
zH;?vT`<lGaD*jqV!gXMb-C6hHdiLC%M-*&h7ESPQk=M1#Ykzi0Ca_OhaO#nY^)Zl~
F005Q>6;%KL

literal 0
HcmV?d00001

diff --git a/pkcs7/tests/examples/cms_der.bin b/pkcs7/tests/examples/cms_der.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2a1a3ae484c35905b07291de09959d85d4327e9a
GIT binary patch
literal 10872
zcmeI&Ur19?90zdEy~jJJPEAFPHogAI*-AavrYSKoOPe&wMN%y*BbF$-q0S)n!LBwU
z!bAxrqh=+Q5{CIFwZzgON}?o7q|8z@X%8i$iG)oNUFt*6@w;#yew^Pu{LbgRehDu#
zFhZG8X`B%u0cGN4TEfdtQV4O*M8pVFjY_1YF@<bx2rrFWX+<Vp8i9FfSb{D+KV8qB
z((4RbU7kT7V!sPM5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X
z009sH0T2KI5C8!X009vA4+QMv({);_fSid(IfO?#%W^l-6rw1X)Reydz`Td$wRP20
zV@C36V$axFLV2$hn5Kv`Cn63Eos4Nmd{CQfAl{xLE|TovA~<<?#P)EFrHryF*Zy#X
zxG{po^C+}*FpUIstPKuOwe*V9ediMfIs>B}3g2jgw3?Dk{`ku=^Vro4-=5J)HlS-_
zYSeJ8s^<RWiLxQxta59bSMeRErq=o!%<fwUND^_f3@33$XdYX}#XpE-p?1O^*uA@}
z<Z}TQJ&0^jUmB^LHnZ;o$B56uwm<eF9!2XnSY4i0+K@QP*Jdcy`;elcx%#=fzcjkw
z`XJ-_3Aq+&{5)IbdDR#8cv5Uy_wO-5(L1pue`nbiA4OEp$51w_w>`9K8`DxKYz*Ug
zbkQPiv_u<;{~Drop5X8Fqv_lX@mh{Q3Te(^xey>CUM_^Tob#&ZA+nWSIVT~TRs}0-
ztnN!fS9&q$huIvJx??=cq?u!1efv%q4t{C);O2TP_^Bc}_})}(Um{6m9G2pnLKiBO
zQ<ME9k?g~4`(wM^s>6Y~XqYidq~@B<X-;RQl>wz^YP0i?&Q?4lQsQ=d!@odSjfeLx
zzQ#{XLh74>%rC~pUq>!yb`B`-PTXwnAKX|GtxPHI&8Aq#ju=yGTjQ{@obj6r(!Y(r
TGO3zQdQunj==?90yrb<8MyLd+

literal 0
HcmV?d00001


From c449e87713064b37d3878f06f1bace4052151077 Mon Sep 17 00:00:00 2001
From: Simon Dieterle <simon@prodimpct.eu>
Date: Fri, 30 Dec 2022 19:20:11 +0000
Subject: [PATCH 2/2] remove unused imports

---
 pkcs7/tests/content_tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkcs7/tests/content_tests.rs b/pkcs7/tests/content_tests.rs
index d5ff923ea..702b1e88f 100644
--- a/pkcs7/tests/content_tests.rs
+++ b/pkcs7/tests/content_tests.rs
@@ -2,7 +2,7 @@
 
 use der::{
     asn1::{ObjectIdentifier, OctetStringRef, SequenceRef},
-    Decode, Encode, Length, SliceWriter,
+    Decode, SliceWriter,
 };
 use hex_literal::hex;
 use pkcs7::{