fix: crates depending on context-specific and long TagNumber

Author: dishmaker

pkcs12/tests/cert_tests.rs

@@ -4,7 +4,7 @@ use const_oid::db::{
     rfc5912::ID_SHA_256,
 };
 use der::{
-    asn1::{ContextSpecificExplicit, OctetString},
+    asn1::{AnyCustomClassExplicit, OctetString},
     Decode, Encode,
 };
 use hex_literal::hex;
@@ -199,8 +199,7 @@ fn decode_sample_pfx() {
     for cert_bag in cert_bags {
         match cert_bag.bag_id {
             pkcs12::PKCS_12_CERT_BAG_OID => {
-                let cs: der::asn1::ContextSpecificExplicit<CertBag> =
-                    ContextSpecificExplicit::from_der(&cert_bag.bag_value).unwrap();
+                let cs = AnyCustomClassExplicit::<CertBag>::from_der(&cert_bag.bag_value).unwrap();
                 let cb = cs.value;
                 assert_eq!(
                     include_bytes!("examples/cert.der"),
@@ -242,8 +241,10 @@ fn decode_sample_pfx() {
     for safe_bag in safe_bags {
         match safe_bag.bag_id {
             pkcs12::PKCS_12_PKCS8_KEY_BAG_OID => {
-                let cs: ContextSpecificExplicit<EncryptedPrivateKeyInfoRef<'_>> =
-                    ContextSpecificExplicit::from_der(&safe_bag.bag_value).unwrap();
+                let cs = AnyCustomClassExplicit::<EncryptedPrivateKeyInfoRef<'_>>::from_der(
+                    &safe_bag.bag_value,
+                )
+                .unwrap();
                 let mut ciphertext = cs.value.encrypted_data.as_bytes().to_vec();
                 let plaintext = cs
                     .value
@@ -606,8 +607,7 @@ fn decode_sample_pfx2() {
     for safe_bag in safe_bags {
         match safe_bag.bag_id {
             pkcs12::PKCS_12_CERT_BAG_OID => {
-                let cs: ContextSpecificExplicit<CertBag> =
-                    ContextSpecificExplicit::from_der(&safe_bag.bag_value).unwrap();
+                let cs = AnyCustomClassExplicit::<CertBag>::from_der(&safe_bag.bag_value).unwrap();
                 assert_eq!(
                     include_bytes!("examples/cert.der"),
                     cs.value.cert_value.as_bytes()
@@ -628,8 +628,10 @@ fn decode_sample_pfx2() {
     for safe_bag in safe_bags {
         match safe_bag.bag_id {
             pkcs12::PKCS_12_PKCS8_KEY_BAG_OID => {
-                let cs: ContextSpecificExplicit<EncryptedPrivateKeyInfoRef<'_>> =
-                    ContextSpecificExplicit::from_der(&safe_bag.bag_value).unwrap();
+                let cs = AnyCustomClassExplicit::<EncryptedPrivateKeyInfoRef<'_>>::from_der(
+                    &safe_bag.bag_value,
+                )
+                .unwrap();
                 let mut ciphertext = cs.value.encrypted_data.as_bytes().to_vec();
                 let plaintext = cs
                     .value

pkcs8/src/private_key_info.rs

@@ -3,11 +3,9 @@
 use crate::{Error, Result, Version};
 use core::fmt;
 use der::{
-    asn1::{
-        AnyRef, BitStringRef, ContextSpecificExplicit, ContextSpecificImplicit, OctetStringRef,
-    },
+    asn1::{AnyRef, BitStringRef, ContextSpecificImplicit, OctetStringRef},
     Class, Decode, DecodeValue, Encode, EncodeValue, FixedTag, Header, Length, Reader, Sequence,
-    TagMode, TagNumber, Tagged, Writer,
+    TagNumber, Tagged, Writer,
 };
 use spki::AlgorithmIdentifier;
 

sec1/src/private_key.rs

@@ -5,12 +5,11 @@
 //!
 //! <https://www.secg.org/sec1-v2.pdf>
 
-use crate::{parameters, EcParameters, Error, Result};
+use crate::{EcParameters, Error, Result};
 use core::fmt;
 use der::{
     asn1::{BitStringRef, ContextSpecificExplicit, ContextSpecificExplicitRef, OctetStringRef},
-    Decode, DecodeValue, Encode, EncodeValue, Header, Length, Reader, Sequence, Tag, TagMode,
-    TagNumber, Writer,
+    Decode, DecodeValue, Encode, EncodeValue, Header, Length, Reader, Sequence, Tag, Writer,
 };
 
 #[cfg(all(feature = "alloc", feature = "zeroize"))]
@@ -33,15 +32,9 @@ const VERSION: u8 = 1;
 /// Context-specific tag number for the elliptic curve parameters.
 const EC_PARAMETERS_TAG: u16 = 0;
 
-/// Context-specific tag number for the elliptic curve parameters.
-const EC_PARAMETERS_TAG_NUMBER: TagNumber = TagNumber::new(EC_PARAMETERS_TAG);
-
 /// Context-specific tag number for the public key.
 const PUBLIC_KEY_TAG: u16 = 1;
 
-/// Context-specific tag number for the public key.
-const PUBLIC_KEY_TAG_NUMBER: TagNumber = TagNumber::new(PUBLIC_KEY_TAG);
-
 /// SEC1 elliptic curve private key.
 ///
 /// Described in [SEC1: Elliptic Curve Cryptography (Version 2.0)]

x509-cert/tests/pkix_extensions.rs

@@ -1160,9 +1160,9 @@ fn decode_idp() {
     );
 
     // Nonsensical tag where BIT STRING tag should be
-    let reason_flags = ReasonFlags::from_der(&hex!("FF03079F80"));
+    let reason_flags = ReasonFlags::from_der(&hex!("2503079F80"));
     let err = reason_flags.err().unwrap();
-    assert_eq!(ErrorKind::TagNumberInvalid, err.kind());
+    assert_eq!(ErrorKind::TagUnknown { byte: 0x25 }, err.kind());
 
     // INTEGER tag where BIT STRING expected
     let reason_flags = ReasonFlags::from_der(&hex!("0203079F80"));