Skip to content

Fix length calculation for explicit tags #400

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
Feb 8, 2022
Merged

Fix length calculation for explicit tags #400

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
18 changes: 16 additions & 2 deletions der/derive/src/choice/variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,22 @@ impl ChoiceVariant {
/// Derive a match arm for the impl body for `der::EncodeValue::value_len`.
pub(super) fn to_value_len_tokens(&self) -> TokenStream {
let ident = &self.ident;
quote! {
Self::#ident(variant) => variant.value_len(),

match self.attrs.context_specific {
Some(tag_number) => {
let tag_number = tag_number.to_tokens();
let tag_mode = self.attrs.tag_mode.to_tokens();

quote! {
Self::#ident(variant) => ::der::asn1::ContextSpecificRef {
tag_number: #tag_number,
tag_mode: #tag_mode,
value: variant,
}.value_len(),
}
}

_ => quote! { Self::#ident(variant) => variant.value_len(), },
}
}

Expand Down