evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the unordered parameter to the tlv derive macro

Browse source
This commit is contained in:
Shane Snover 2023-09-19 22:55:34 -06:00
parent 5cda85898b
commit f8cd402153
1 changed files with 2 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
rs-matter/src/cert/mod.rs
View file

@ -215,8 +215,8 @@ fn encode_extension_end(w: &mut dyn CertConsumer) -> Result<(), Error> {
w.end_seq() w.end_seq()
} }
#[derive(ToTLV, Default, Debug, PartialEq)] #[derive(FromTLV, ToTLV, Default, Debug, PartialEq)]
#[tlvargs(lifetime = "'a", start = 1, datatype = "list")] #[tlvargs(lifetime = "'a", start = 1, datatype = "list", unordered)]
struct Extensions<'a> { struct Extensions<'a> {
basic_const: Option<BasicConstraints>, basic_const: Option<BasicConstraints>,
key_usage: Option<u16>, key_usage: Option<u16>,
@ -272,56 +272,6 @@ impl<'a> Extensions<'a> {
} }
} }
impl<'a> crate::tlv::FromTLV<'a> for Extensions<'a> {
fn from_tlv(t: &TLVElement<'a>) -> Result<Self, Error> {
let tlv_iter = t
.confirm_list()?
.enter()
.ok_or_else(|| Error::new(ErrorCode::Invalid))?;
let mut extensions = Extensions::default();
for item in tlv_iter {
if item.check_ctx_tag(1u8) {
if extensions.basic_const.is_none() {
extensions.basic_const = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
} else if item.check_ctx_tag(2u8) {
if extensions.key_usage.is_none() {
extensions.key_usage = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
} else if item.check_ctx_tag(3u8) {
if extensions.ext_key_usage.is_none() {
extensions.ext_key_usage = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
} else if item.check_ctx_tag(4u8) {
if extensions.subj_key_id.is_none() {
extensions.subj_key_id = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
} else if item.check_ctx_tag(5u8) {
if extensions.auth_key_id.is_none() {
extensions.auth_key_id = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
} else if item.check_ctx_tag(6u8) {
if extensions.future_extensions.is_none() {
extensions.future_extensions = Option::from_tlv(&item)?;
} else {
return Err(Error::new(ErrorCode::InvalidData));
}
}
}
Ok(extensions)
}
}
#[derive(FromPrimitive, Copy, Clone)] #[derive(FromPrimitive, Copy, Clone)]
enum DnTags { enum DnTags {
CommonName = 1, CommonName = 1,