Skip to content

chore(x509): remove oids now defined in the oiddb #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Mar 7, 2022
Merged

chore(x509): remove oids now defined in the oiddb #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions x509/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
const-oid = { version = "0.8", features = ["db"], path = "../const-oid" }
Copy link
Contributor Author

@npmccallum npmccallum Mar 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"This belongs in dev-dependencies!" you might say. And you'd be right. I left this as a regular dependency because #464 adds a hard dependency on the oiddb and this will make the rebase easier.

flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }

Expand Down
1 change: 0 additions & 1 deletion x509/src/ext/pkix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pub mod certpolicy;
pub mod constraints;
pub mod crl;
pub mod name;
pub mod oids;

mod access;
mod authkeyid;
Expand Down
193 changes: 0 additions & 193 deletions x509/src/ext/pkix/oids.rs
View file
Open in desktop

This file was deleted.

50 changes: 34 additions & 16 deletions x509/tests/pkix_extensions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ use hex_literal::hex;
use x509::ext::other::{OcspNoCheck, PivNaciIndicator};
use x509::ext::pkix::crl::dp::{DistributionPoint, ReasonFlags, Reasons};
use x509::ext::pkix::name::{DistributionPointName, GeneralName, GeneralNames};
use x509::ext::pkix::{oids::*, *};
use x509::ext::pkix::*;
use x509::ext::Extensions;
use x509::name::Name;
use x509::{Certificate, Version};

use const_oid::db::rfc5280::*;
use const_oid::db::rfc5912::ID_CE_CERTIFICATE_POLICIES;

fn spin_over_exts<'a>(exts: Extensions<'a>) {
let i = exts.iter();
for ext in i {
Expand Down Expand Up @@ -264,7 +267,7 @@ fn decode_cert() {
let mut counter = 0;
for ext in i {
if 0 == counter {
assert_eq!(ext.extn_id.to_string(), CE_KEY_USAGE.to_string());
assert_eq!(ext.extn_id.to_string(), ID_CE_KEY_USAGE.to_string());
assert_eq!(ext.critical, true);

let ku = KeyUsage::from_der(ext.extn_value).unwrap();
Expand All @@ -273,7 +276,7 @@ fn decode_cert() {
let reencoded = ku.to_vec().unwrap();
assert_eq!(ext.extn_value, reencoded);
} else if 1 == counter {
assert_eq!(ext.extn_id.to_string(), CE_BASIC_CONSTRAINTS.to_string());
assert_eq!(ext.extn_id.to_string(), ID_CE_BASIC_CONSTRAINTS.to_string());
assert_eq!(ext.critical, true);
let bc = BasicConstraints::from_der(ext.extn_value).unwrap();
assert_eq!(true, bc.ca);
Expand All @@ -282,7 +285,7 @@ fn decode_cert() {
let reencoded = bc.to_vec().unwrap();
assert_eq!(ext.extn_value, reencoded);
} else if 2 == counter {
assert_eq!(ext.extn_id.to_string(), CE_POLICY_MAPPINGS.to_string());
assert_eq!(ext.extn_id.to_string(), ID_CE_POLICY_MAPPINGS.to_string());
assert_eq!(ext.critical, false);
let pm = PolicyMappings::from_der(ext.extn_value).unwrap();
assert_eq!(19, pm.len());
Expand Down Expand Up @@ -347,7 +350,10 @@ fn decode_cert() {
counter_pm += 1;
}
} else if 3 == counter {
assert_eq!(ext.extn_id.to_string(), CE_CERTIFICATE_POLICIES.to_string());
assert_eq!(
ext.extn_id.to_string(),
ID_CE_CERTIFICATE_POLICIES.to_string()
);
assert_eq!(ext.critical, false);
let cps = CertificatePolicies::from_der(ext.extn_value).unwrap();
assert_eq!(19, cps.len());
Expand Down Expand Up @@ -407,7 +413,7 @@ fn decode_cert() {
} else if 4 == counter {
assert_eq!(
ext.extn_id.to_string(),
CE_SUBJECT_KEY_IDENTIFIER.to_string()
ID_CE_SUBJECT_KEY_IDENTIFIER.to_string()
);
assert_eq!(ext.critical, false);
let skid = SubjectKeyIdentifier::from_der(ext.extn_value).unwrap();
Expand All @@ -422,7 +428,7 @@ fn decode_cert() {
} else if 5 == counter {
assert_eq!(
ext.extn_id.to_string(),
CE_CRL_DISTRIBUTION_POINTS.to_string()
ID_CE_CRL_DISTRIBUTION_POINTS.to_string()
);
assert_eq!(ext.critical, false);
let crl_dps = CrlDistributionPoints::from_der(ext.extn_value).unwrap();
Expand Down Expand Up @@ -478,7 +484,10 @@ fn decode_cert() {
crldp_counter += 1;
}
} else if 6 == counter {
assert_eq!(ext.extn_id.to_string(), PE_SUBJECTINFOACCESS.to_string());
assert_eq!(
ext.extn_id.to_string(),
ID_PE_SUBJECT_INFO_ACCESS.to_string()
);
assert_eq!(ext.critical, false);
let sias = SubjectInfoAccessSyntax::from_der(ext.extn_value).unwrap();
assert_eq!(1, sias.len());
Expand All @@ -502,7 +511,10 @@ fn decode_cert() {
}
}
} else if 7 == counter {
assert_eq!(ext.extn_id.to_string(), PE_AUTHORITYINFOACCESS.to_string());
assert_eq!(
ext.extn_id.to_string(),
ID_PE_AUTHORITY_INFO_ACCESS.to_string()
);
assert_eq!(ext.critical, false);
let aias = AuthorityInfoAccessSyntax::from_der(ext.extn_value).unwrap();
assert_eq!(2, aias.len());
Expand Down Expand Up @@ -545,7 +557,10 @@ fn decode_cert() {
aia_counter += 1;
}
} else if 8 == counter {
assert_eq!(ext.extn_id.to_string(), CE_INHIBIT_ANY_POLICY.to_string());
assert_eq!(
ext.extn_id.to_string(),
ID_CE_INHIBIT_ANY_POLICY.to_string()
);
assert_eq!(ext.critical, false);
let iap = InhibitAnyPolicy::from_der(ext.extn_value).unwrap();
assert_eq!(0, iap);
Expand All @@ -555,7 +570,7 @@ fn decode_cert() {
} else if 9 == counter {
assert_eq!(
ext.extn_id.to_string(),
CE_AUTHORITY_KEY_IDENTIFIER.to_string()
ID_CE_AUTHORITY_KEY_IDENTIFIER.to_string()
);
assert_eq!(ext.critical, false);
let akid = AuthorityKeyIdentifier::from_der(ext.extn_value).unwrap();
Expand Down Expand Up @@ -697,7 +712,7 @@ fn decode_cert() {
if 0 == counter {
assert_eq!(
ext.extn_id.to_string(),
CE_AUTHORITY_KEY_IDENTIFIER.to_string()
ID_CE_AUTHORITY_KEY_IDENTIFIER.to_string()
);
assert_eq!(ext.critical, false);
let akid = AuthorityKeyIdentifier::from_der(ext.extn_value).unwrap();
Expand All @@ -708,7 +723,7 @@ fn decode_cert() {
} else if 1 == counter {
assert_eq!(
ext.extn_id.to_string(),
CE_SUBJECT_KEY_IDENTIFIER.to_string()
ID_CE_SUBJECT_KEY_IDENTIFIER.to_string()
);
assert_eq!(ext.critical, false);
let skid = SubjectKeyIdentifier::from_der(ext.extn_value).unwrap();
Expand All @@ -717,12 +732,15 @@ fn decode_cert() {
&hex!("580184241BBC2B52944A3DA510721451F5AF3AC9")[..]
);
} else if 2 == counter {
assert_eq!(ext.extn_id.to_string(), CE_KEY_USAGE.to_string());
assert_eq!(ext.extn_id.to_string(), ID_CE_KEY_USAGE.to_string());
assert_eq!(ext.critical, true);
let ku = KeyUsage::from_der(ext.extn_value).unwrap();
assert_eq!(KeyUsages::KeyCertSign | KeyUsages::CRLSign, ku);
} else if 3 == counter {
assert_eq!(ext.extn_id.to_string(), CE_CERTIFICATE_POLICIES.to_string());
assert_eq!(
ext.extn_id.to_string(),
ID_CE_CERTIFICATE_POLICIES.to_string()
);
assert_eq!(ext.critical, false);
let r = CertificatePolicies::from_der(ext.extn_value);
let cp = r.unwrap();
Expand All @@ -731,7 +749,7 @@ fn decode_cert() {
assert_eq!(p.policy_identifier.to_string(), "2.16.840.1.101.3.2.1.48.1");
}
} else if 4 == counter {
assert_eq!(ext.extn_id.to_string(), CE_BASIC_CONSTRAINTS.to_string());
assert_eq!(ext.extn_id.to_string(), ID_CE_BASIC_CONSTRAINTS.to_string());
assert_eq!(ext.critical, true);
let bc = BasicConstraints::from_der(ext.extn_value).unwrap();
assert_eq!(bc.ca, true);
Expand Down