crmf: make CertId not profile specific

Author: baloo

cmpv2/src/oob.rs

@@ -5,11 +5,12 @@ use der::asn1::BitString;
 
 use crmf::controls::CertId;
 use spki::AlgorithmIdentifierOwned;
+use x509_cert::certificate::{Profile, Rfc5280};
 
 #[cfg(feature = "digest")]
 use {
     der::{DigestWriter, Encode, asn1::Null, oid::AssociatedOid},
-    x509_cert::{Certificate, ext::pkix::name::GeneralName},
+    x509_cert::{certificate::CertificateInner, ext::pkix::name::GeneralName},
 };
 
 use crate::header::CmpCertificate;
@@ -37,7 +38,7 @@ pub type OobCert = CmpCertificate;
 /// [RFC 4210 Section 5.2.5]: https://www.rfc-editor.org/rfc/rfc4210#section-5.2.5
 #[derive(Clone, Debug, Eq, PartialEq, Sequence)]
 #[allow(missing_docs)]
-pub struct OobCertHash {
+pub struct OobCertHash<P: Profile = Rfc5280> {
     #[asn1(
         context_specific = "0",
         tag_mode = "EXPLICIT",
@@ -51,14 +52,17 @@ pub struct OobCertHash {
         constructed = "true",
         optional = "true"
     )]
-    pub cert_id: Option<CertId>,
+    pub cert_id: Option<CertId<P>>,
     pub hash_val: BitString,
 }
 
 #[cfg(feature = "digest")]
-impl OobCertHash {
+impl<P> OobCertHash<P>
+where
+    P: Profile,
+{
     /// Create an [`OobCertHash`] from a given certificate
-    pub fn from_certificate<D>(cert: &Certificate) -> der::Result<Self>
+    pub fn from_certificate<D>(cert: &CertificateInner<P>) -> der::Result<Self>
     where
         D: digest::Digest + AssociatedOid,
     {

crmf/src/controls.rs

@@ -9,7 +9,10 @@ use cms::enveloped_data::EnvelopedData;
 use spki::{AlgorithmIdentifierOwned, SubjectPublicKeyInfoOwned};
 use x509_cert::attr::AttributeTypeAndValue;
 use x509_cert::ext::pkix::name::GeneralName;
-use x509_cert::serial_number::SerialNumber;
+use x509_cert::{
+    certificate::{Profile, Rfc5280},
+    serial_number::SerialNumber,
+};
 
 /// The `Controls` type is defined in [RFC 4211 Section 6].
 ///
@@ -231,7 +234,7 @@ pub type KeyGenParameters = OctetString;
 /// ```
 ///
 /// [RFC 4211 Section 6.5]: https://www.rfc-editor.org/rfc/rfc4211#section-6.5
-pub type OldCertId = CertId;
+pub type OldCertId<P> = CertId<P>;
 
 /// The `CertId` control is defined in [RFC 4211 Section 6.5].
 ///
@@ -244,9 +247,9 @@ pub type OldCertId = CertId;
 /// [RFC 4211 Section 6.5]: https://www.rfc-editor.org/rfc/rfc4211#section-6.5
 #[derive(Clone, Debug, Eq, PartialEq, Sequence)]
 #[allow(missing_docs)]
-pub struct CertId {
+pub struct CertId<P: Profile = Rfc5280> {
     pub issuer: GeneralName,
-    pub serial_number: SerialNumber,
+    pub serial_number: SerialNumber<P>,
 }
 
 /// The `ProtocolEncrKey` control is defined in [RFC 4211 Section 6.6].