Skip to content

Commit

Permalink
Avoid importing all oids in crl module
Browse files Browse the repository at this point in the history
  • Loading branch information
djc committed Mar 10, 2024
1 parent 78a82a1 commit f1f89ae
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions rcgen/src/crl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ use time::OffsetDateTime;
use yasna::DERWriter;
use yasna::Tag;

use crate::oid::*;
#[cfg(feature = "pem")]
use crate::ENCODE_CONFIG;
use crate::{
write_distinguished_name, write_dt_utc_or_generalized, write_x509_authority_key_identifier,
write_x509_extension, DistinguishedName, KeyPair,
oid, write_distinguished_name, write_dt_utc_or_generalized,
write_x509_authority_key_identifier, write_x509_extension, Certificate, DistinguishedName,
Error, KeyIdMethod, KeyPair, KeyUsagePurpose, SerialNumber,
};
use crate::{Certificate, Error, KeyIdMethod, KeyUsagePurpose, SerialNumber};

/// A certificate revocation list (CRL)
///
Expand Down Expand Up @@ -291,15 +290,15 @@ impl CertificateRevocationListParams {
);

// Write CRL number.
write_x509_extension(writer.next(), CRL_NUMBER, false, |writer| {
write_x509_extension(writer.next(), oid::CRL_NUMBER, false, |writer| {
writer.write_bigint_bytes(self.crl_number.as_ref(), true);
});

// Write issuing distribution point (if present).
if let Some(issuing_distribution_point) = &self.issuing_distribution_point {
write_x509_extension(
writer.next(),
CRL_ISSUING_DISTRIBUTION_POINT,
oid::CRL_ISSUING_DISTRIBUTION_POINT,
true,
|writer| {
issuing_distribution_point.write_der(writer);
Expand Down Expand Up @@ -402,16 +401,21 @@ impl RevokedCertParams {
writer.next().write_sequence(|writer| {
// Write reason code if present.
if let Some(reason_code) = self.reason_code {
write_x509_extension(writer.next(), CRL_REASONS, false, |writer| {
write_x509_extension(writer.next(), oid::CRL_REASONS, false, |writer| {
writer.write_enum(reason_code as i64);
});
}

// Write invalidity date if present.
if let Some(invalidity_date) = self.invalidity_date {
write_x509_extension(writer.next(), CRL_INVALIDITY_DATE, false, |writer| {
write_dt_utc_or_generalized(writer, invalidity_date);
})
write_x509_extension(
writer.next(),
oid::CRL_INVALIDITY_DATE,
false,
|writer| {
write_dt_utc_or_generalized(writer, invalidity_date);
},
)
}
});
}
Expand Down

0 comments on commit f1f89ae

Please sign in to comment.