x509-cert: use type aliases

Author: baloo

x509-cert/src/certificate.rs

@@ -169,6 +169,11 @@ impl<P: Profile> TbsCertificate<P> {
     }
 }
 
+/// X.509 certificates are defined in [RFC 5280 Section 4.1].
+///
+/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
+pub type Certificate = CertificateInner<Rfc5280>;
+
 /// X.509 certificates are defined in [RFC 5280 Section 4.1].
 ///
 /// ```text
@@ -183,14 +188,14 @@ impl<P: Profile> TbsCertificate<P> {
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[derive(Clone, Debug, Eq, PartialEq, Sequence, ValueOrd)]
 #[allow(missing_docs)]
-pub struct Certificate<P: Profile = Rfc5280> {
+pub struct CertificateInner<P: Profile = Rfc5280> {
     pub tbs_certificate: TbsCertificate<P>,
     pub signature_algorithm: AlgorithmIdentifierOwned,
     pub signature: BitString,
 }
 
 #[cfg(feature = "pem")]
-impl<P: Profile> PemLabel for Certificate<P> {
+impl<P: Profile> PemLabel for CertificateInner<P> {
     const PEM_LABEL: &'static str = "CERTIFICATE";
 }
 

x509-cert/tests/certificate.rs

@@ -12,7 +12,7 @@ use x509_cert::Certificate;
 use x509_cert::*;
 
 #[cfg(feature = "pem")]
-use der::{pem::LineEnding, DecodePem, EncodePem};
+use der::DecodePem;
 
 // TODO - parse and compare extension values
 const EXTENSIONS: &[(&str, bool)] = &[
@@ -403,7 +403,7 @@ fn decode_cert() {
 fn decode_cert_negative_serial_number() {
     let der_encoded_cert = include_bytes!("examples/28903a635b5280fae6774c0b6da7d6baa64af2e8.der");
 
-    let cert = Certificate::<Rfc5280>::from_der(der_encoded_cert).unwrap();
+    let cert = Certificate::from_der(der_encoded_cert).unwrap();
     assert_eq!(
         cert.tbs_certificate.serial_number.as_bytes(),
         // INTEGER (125 bit) -2.370157924795571e+37
@@ -417,11 +417,14 @@ fn decode_cert_negative_serial_number() {
 #[cfg(all(feature = "pem", feature = "hazmat"))]
 #[test]
 fn decode_cert_overlength_serial_number() {
+    use der::{pem::LineEnding, DecodePem, EncodePem};
+    use x509_cert::certificate::CertificateInner;
+
     let pem_encoded_cert = include_bytes!("examples/qualcomm.pem");
 
-    assert!(Certificate::<Rfc5280>::from_pem(pem_encoded_cert).is_err());
+    assert!(Certificate::from_pem(pem_encoded_cert).is_err());
 
-    let cert = Certificate::<x509_cert::certificate::Raw>::from_pem(pem_encoded_cert).unwrap();
+    let cert = CertificateInner::<x509_cert::certificate::Raw>::from_pem(pem_encoded_cert).unwrap();
     assert_eq!(
         cert.tbs_certificate.serial_number.as_bytes(),
         &[