Skip to content
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

x509-cert: make RdnSequence's inner field private #1508

Merged
merged 1 commit into from
Sep 9, 2024
Merged

x509-cert: make RdnSequence's inner field private #1508

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
8 changes: 2 additions & 6 deletions cms/tests/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ fn signer_identifier(id: i32) -> SignerIdentifier {
value: Any::from(Utf8StringRef::new(&format!("test client {id}")).unwrap()),
}];
let set_of_vector = SetOfVec::try_from(rdn.to_vec()).unwrap();
rdn_sequence
.0
.push(RelativeDistinguishedName::from(set_of_vector));
rdn_sequence.push(RelativeDistinguishedName::from(set_of_vector));
SignerIdentifier::IssuerAndSerialNumber(IssuerAndSerialNumber {
issuer: rdn_sequence,
serial_number: SerialNumber::new(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06])
Expand All @@ -73,9 +71,7 @@ fn recipient_identifier(id: i32) -> RecipientIdentifier {
value: Any::from(Utf8StringRef::new(&format!("test client {id}")).unwrap()),
}];
let set_of_vector = SetOfVec::try_from(rdn.to_vec()).unwrap();
rdn_sequence
.0
.push(RelativeDistinguishedName::from(set_of_vector));
rdn_sequence.push(RelativeDistinguishedName::from(set_of_vector));
RecipientIdentifier::IssuerAndSerialNumber(IssuerAndSerialNumber {
issuer: rdn_sequence,
serial_number: SerialNumber::new(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06])
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/src/builder/profile/cabf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pub fn check_names_encoding(name: &Name, multiple_allowed: bool) -> Result<()> {

let mut seen = HashSet::new();

for rdn in name.0.iter() {
for rdn in name.iter() {
if rdn.0.len() != 1 {
return Err(Error::NonUniqueRdn);
}
Expand Down Expand Up @@ -87,7 +87,7 @@ pub fn ca_certificate_naming(subject: &Name) -> Result<()> {

check_names_encoding(subject, false)?;

for rdn in subject.0.iter() {
for rdn in subject.iter() {
for atv in rdn.0.iter() {
if !allowed.remove(&atv.oid) {
return Err(Error::InvalidAttribute { oid: atv.oid });
Expand Down
1 change: 0 additions & 1 deletion x509-cert/src/builder/profile/cabf/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ impl CertificateType {
// TODO(baloo): not very happy with all that, might as well throw that in a helper
// or something.
let rdns: vec::Vec<RelativeDistinguishedName> = subject
.0
.iter()
.filter_map(|rdn| {
let out = SetOfVec::<AttributeTypeAndValue>::from_iter(
Expand Down
17 changes: 16 additions & 1 deletion x509-cert/src/name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub type Name = RdnSequence;
/// [RFC 5280 Section 4.1.2.4]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.4
#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct RdnSequence(pub Vec<RelativeDistinguishedName>);
pub struct RdnSequence(Vec<RelativeDistinguishedName>);

impl RdnSequence {
/// Converts an `RDNSequence` string into an encoded `RDNSequence`.
Expand All @@ -36,6 +36,21 @@ impl RdnSequence {
pub fn is_empty(&self) -> bool {
self.0.is_empty()
}

/// Iterate over this [`RdnSequence`].
pub fn iter(&self) -> impl Iterator<Item = &RelativeDistinguishedName> {
self.0.iter()
}

/// Length of this [`RdnSequence`].
pub fn len(&self) -> usize {
self.0.len()
}

/// Push a [`RelativeDistinguishedName`] onto this [`RdnSequence`].
pub fn push(&mut self, name: RelativeDistinguishedName) {
self.0.push(name)
}
}

/// Parse an [`RdnSequence`] string.
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/tests/certificate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ fn decode_cert() {
.is_null());

let mut counter = 0;
let i = cert.tbs_certificate().issuer().0.iter();
let i = cert.tbs_certificate().issuer().iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -294,7 +294,7 @@ fn decode_cert() {
);

counter = 0;
let i = cert.tbs_certificate().subject().0.iter();
let i = cert.tbs_certificate().subject().iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/tests/certreq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ fn decode_rsa_2048_der() {
assert_eq!(cr.info.version, Version::V1);

// Check all the RDNs.
assert_eq!(cr.info.subject.0.len(), NAMES.len());
for (name, (oid, val)) in cr.info.subject.0.iter().zip(NAMES) {
assert_eq!(cr.info.subject.len(), NAMES.len());
for (name, (oid, val)) in cr.info.subject.iter().zip(NAMES) {
let kind = name.0.get(0).unwrap();
let value = match kind.value.tag() {
Tag::Utf8String => Utf8StringRef::try_from(&kind.value).unwrap().as_str(),
Expand Down
6 changes: 3 additions & 3 deletions x509-cert/tests/name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn decode_name() {
let rdn1a = rdn1.unwrap();

let mut counter = 0;
let i = rdn1a.0.iter();
let i = rdn1a.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -338,7 +338,7 @@ fn rdns_serde() {
let mut brdns = RdnSequence::default();
for rdn in rdns.iter() {
let sofv = SetOfVec::try_from(rdn.to_vec()).unwrap();
brdns.0.push(RelativeDistinguishedName::from(sofv));
brdns.push(RelativeDistinguishedName::from(sofv));
}

// Check that serialization matches the expected output.
Expand All @@ -356,7 +356,7 @@ fn rdns_serde() {

let rdns = RdnSequence::from_der(&der).unwrap();

for (l, r) in brdns.0.iter().zip(rdns.0.iter()) {
for (l, r) in brdns.iter().zip(rdns.iter()) {
for (ll, rr) in l.0.iter().zip(r.0.iter()) {
assert_eq!(ll, rr);
}
Expand Down
16 changes: 8 additions & 8 deletions x509-cert/tests/pkix_extensions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ fn decode_cert() {
);

let mut counter = 0;
let i = cert.tbs_certificate().issuer().0.iter();
let i = cert.tbs_certificate().issuer().iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -632,7 +632,7 @@ fn decode_cert() {
);

counter = 0;
let i = cert.tbs_certificate().subject().0.iter();
let i = cert.tbs_certificate().subject().iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -869,19 +869,19 @@ fn decode_idp() {

let n =
Name::from_der(&hex!("305A310B3009060355040613025553311F301D060355040A131654657374204365727469666963617465732032303137311C301A060355040B13136F6E6C79536F6D65526561736F6E7320434133310C300A0603550403130343524C")).unwrap();
assert_eq!(4, n.0.len());
assert_eq!(4, n.len());

let gn =
GeneralName::from_der(&hex!("A45C305A310B3009060355040613025553311F301D060355040A131654657374204365727469666963617465732032303137311C301A060355040B13136F6E6C79536F6D65526561736F6E7320434133310C300A0603550403130343524C")).unwrap();
if let GeneralName::DirectoryName(gn) = gn {
assert_eq!(4, gn.0.len());
assert_eq!(4, gn.len());
}

let gns =
GeneralNames::from_der(&hex!("305EA45C305A310B3009060355040613025553311F301D060355040A131654657374204365727469666963617465732032303137311C301A060355040B13136F6E6C79536F6D65526561736F6E7320434133310C300A0603550403130343524C")).unwrap();
assert_eq!(1, gns.len());
if let GeneralName::DirectoryName(gn) = gns.first().unwrap() {
assert_eq!(4, gn.0.len());
assert_eq!(4, gn.len());
}

//TODO - fix decode impl (expecting a SEQUENCE despite this being a CHOICE). Sort out FixedTag implementation.
Expand All @@ -906,7 +906,7 @@ fn decode_idp() {
if let DistributionPointName::FullName(dpn) = dp.distribution_point.unwrap() {
assert_eq!(1, dpn.len());
if let GeneralName::DirectoryName(gn) = dpn.first().unwrap() {
assert_eq!(4, gn.0.len());
assert_eq!(4, gn.len());
}
}

Expand Down Expand Up @@ -1084,7 +1084,7 @@ fn decode_idp() {
for gn in dp {
match gn {
GeneralName::DirectoryName(gn) => {
assert_eq!(4, gn.0.len());
assert_eq!(4, gn.len());
}
_ => {
panic!("Expected DirectoryName")
Expand Down Expand Up @@ -1113,7 +1113,7 @@ fn decode_idp() {
for gn in dp {
match gn {
GeneralName::DirectoryName(gn) => {
assert_eq!(4, gn.0.len());
assert_eq!(4, gn.len());
}
_ => {
panic!("Expected DirectoryName")
Expand Down
12 changes: 6 additions & 6 deletions x509-cert/tests/trust_anchor_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fn decode_ta1() {
}

counter = 0;
let i = cert_path.ta_name.0.iter();
let i = cert_path.ta_name.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -167,7 +167,7 @@ fn decode_ta2() {
let cert_path = tai.cert_path.as_ref().unwrap();

let mut counter = 0;
let i = cert_path.ta_name.0.iter();
let i = cert_path.ta_name.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -214,7 +214,7 @@ fn decode_ta2() {
for gs in gsi {
match &gs.base {
GeneralName::DirectoryName(dn) => {
let i = dn.0.iter();
let i = dn.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -294,7 +294,7 @@ fn decode_ta3() {
);

let mut counter = 0;
let i = cert_path.ta_name.0.iter();
let i = cert_path.ta_name.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -341,7 +341,7 @@ fn decode_ta3() {
for gs in gsi {
match &gs.base {
GeneralName::DirectoryName(dn) => {
let i = dn.0.iter();
let i = dn.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down Expand Up @@ -414,7 +414,7 @@ fn decode_ta4() {
let cert_path = tai.cert_path.as_ref().unwrap();

let mut counter = 0;
let i = cert_path.ta_name.0.iter();
let i = cert_path.ta_name.iter();
for rdn in i {
let i1 = rdn.0.iter();
for atav in i1 {
Expand Down
Loading