From d79568b99f8d17b2016b586a775497461e7c5d5c Mon Sep 17 00:00:00 2001
From: dishmaker <141624503+dishmaker@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:41:12 +0200
Subject: [PATCH] split x509-cert tests into functions

---
 der/src/asn1/any_custom_class.rs   |  3 ++
 x509-cert/tests/pkix_extensions.rs | 58 +++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/der/src/asn1/any_custom_class.rs b/der/src/asn1/any_custom_class.rs
index d18ab8f48..83d2a30a6 100644
--- a/der/src/asn1/any_custom_class.rs
+++ b/der/src/asn1/any_custom_class.rs
@@ -147,6 +147,9 @@ where
     fn decode<R: Reader<'a>>(reader: &mut R) -> Result<Self, Self::Error> {
         let header = Header::decode(reader)?;
 
+        // TODO(dishmaker): x509-cert tests fail due to read_nested:
+        // let value = T::decode_value(reader, header)?;
+
         let value = reader.read_nested(header.length, |reader| T::decode_value(reader, header))?;
 
         if header.tag.is_constructed() != value.tag().is_constructed() {
diff --git a/x509-cert/tests/pkix_extensions.rs b/x509-cert/tests/pkix_extensions.rs
index 809de214e..2fbcae084 100644
--- a/x509-cert/tests/pkix_extensions.rs
+++ b/x509-cert/tests/pkix_extensions.rs
@@ -1,7 +1,10 @@
 //! Certificate tests
 #![allow(clippy::bool_assert_comparison)]
+use const_oid::db::rfc5280::*;
+use const_oid::db::rfc5912::ID_CE_CERTIFICATE_POLICIES;
 use const_oid::AssociatedOid;
 use der::asn1::{Ia5StringRef, OctetString, PrintableStringRef, Utf8StringRef};
+use der::TagNumber;
 use der::{Decode, Encode, ErrorKind, Length, Tag, Tagged};
 use hex_literal::hex;
 use x509_cert::ext::pkix::crl::dp::{DistributionPoint, ReasonFlags, Reasons};
@@ -11,9 +14,6 @@ use x509_cert::ext::Extensions;
 use x509_cert::name::Name;
 use x509_cert::{serial_number::SerialNumber, Certificate, Version};
 
-use const_oid::db::rfc5280::*;
-use const_oid::db::rfc5912::ID_CE_CERTIFICATE_POLICIES;
-
 fn spin_over_exts(exts: &Extensions) {
     for ext in exts {
         match ext.extn_id {
@@ -840,8 +840,6 @@ fn decode_cert() {
 
 #[test]
 fn decode_idp() {
-    use der::TagNumber;
-
     // IDP from 04A8739769B3C090A11DCDFABA3CF33F4BEF21F3.crl in PKITS 2048 in ficam-scvp-testing repo
     let idp = IssuingDistributionPoint::from_der(&hex!("30038201FF")).unwrap();
     assert_eq!(idp.only_contains_ca_certs, true);
@@ -1109,10 +1107,13 @@ fn decode_idp() {
             panic!("Expected FullName")
         }
     }
+}
 
-    //---------------------------------
-    // Negative tests
-    //---------------------------------
+//---------------------------------
+// Negative tests
+//---------------------------------
+#[test]
+fn decode_idp_negative_reasonflags() {
     // Value contains more than length value indicates
     let reason_flags = ReasonFlags::from_der(&hex!("0302079F80"));
     let err = reason_flags.err().unwrap();
@@ -1135,19 +1136,6 @@ fn decode_idp() {
         err.kind()
     );
 
-    // Value incomplete relative to length value
-    let idp =
-        IssuingDistributionPoint::from_der(&hex!("3067A060A05EA45C305A310B3009060355040613025553311F301D060355040A131654657374204365727469666963617465732032303137311C301A060355040B13136F6E6C79536F6D65526561736F6E7320434133310C300A0603550403130343524C8304079F80"));
-    let err = idp.err().unwrap();
-    assert_eq!(err.position().unwrap(), 103u8.into());
-    assert_eq!(
-        ErrorKind::Incomplete {
-            expected_len: 106u8.into(),
-            actual_len: 105u8.into()
-        },
-        err.kind()
-    );
-
     // Truncated
     let reason_flags = ReasonFlags::from_der(&hex!("0303079F"));
     let err = reason_flags.err().unwrap();
@@ -1174,7 +1162,26 @@ fn decode_idp() {
         },
         err.kind()
     );
+}
+
+#[test]
+fn decode_idp_negative_incomplete() {
+    // Value incomplete relative to length value
+    let idp =
+        IssuingDistributionPoint::from_der(&hex!("3067A060A05EA45C305A310B3009060355040613025553311F301D060355040A131654657374204365727469666963617465732032303137311C301A060355040B13136F6E6C79536F6D65526561736F6E7320434133310C300A0603550403130343524C8304079F80"));
+    let err = idp.err().unwrap();
+    assert_eq!(err.position().unwrap(), 103u8.into());
+    assert_eq!(
+        ErrorKind::Incomplete {
+            expected_len: 106u8.into(),
+            actual_len: 105u8.into()
+        },
+        err.kind()
+    );
+}
 
+#[test]
+fn decode_idp_negative_constructed() {
     // Context specific tag that should be primitive is constructed
     let idp = IssuingDistributionPoint::from_der(&hex!("3003A201FF"));
     let err = idp.err().unwrap();
@@ -1187,19 +1194,28 @@ fn decode_idp() {
         },
         err.kind()
     );
+}
 
+#[test]
+fn decode_idp_negative_bool_long() {
     // Boolean value is two bytes long
     let idp =
         IssuingDistributionPoint::from_der(&hex!("30820168A0820161A082015DA4753073310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434136A4753073310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434137A46D306B310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353121301F0603550403131843524C3120666F7220696E64697265637443524C204341358402FFFF"));
     let err = idp.err().unwrap();
     assert_eq!(ErrorKind::Length { tag: Tag::Boolean }, err.kind());
+}
 
+#[test]
+fn decode_idp_negative_bool_invalid() {
     // Boolean value is neither 0x00 nor 0xFF
     let idp =
         IssuingDistributionPoint::from_der(&hex!("30820168A0820161A082015DA4753073310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434136A4753073310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434137A46D306B310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353121301F0603550403131843524C3120666F7220696E64697265637443524C20434135840175"));
     let err = idp.err().unwrap();
     assert_eq!(ErrorKind::Noncanonical { tag: Tag::Boolean }, err.kind());
+}
 
+#[test]
+fn decode_idp_negative_length_rdn() {
     // Length on second RDN in first name indicates more bytes than are present
     let idp =
         IssuingDistributionPoint::from_der(&hex!("30820168A0820161A082015DA4753073310B3009060355040613025553311F301D060355040A13995465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434136A4753073310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353129302706035504031320696E6469726563742043524C20666F7220696E64697265637443524C20434137A46D306B310B3009060355040613025553311F301D060355040A13165465737420436572746966696361746573203230313731183016060355040B130F696E64697265637443524C204341353121301F0603550403131843524C3120666F7220696E64697265637443524C204341358401FF"));