Skip to content

fix: impl DecodeValue for AlgorithmIdentifier #449

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 26, 2022
Merged

fix: impl DecodeValue for AlgorithmIdentifier #449

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
12 changes: 5 additions & 7 deletions spki/src/algorithm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

use crate::{Error, Result};
use core::cmp::Ordering;
use der::{
asn1::{Any, ObjectIdentifier},
Decodable, Decoder, DerOrd, Encodable, Sequence, ValueOrd,
};
use der::asn1::{Any, ObjectIdentifier, SequenceRef};
use der::{Decodable, DecodeValue, Decoder, DerOrd, Encodable, Header, Sequence, ValueOrd};

/// X.509 `AlgorithmIdentifier` as defined in [RFC 5280 Section 4.1.1.2].
///
Expand Down Expand Up @@ -96,9 +94,9 @@ impl<'a> AlgorithmIdentifier<'a> {
}
}

impl<'a> Decodable<'a> for AlgorithmIdentifier<'a> {
fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
decoder.sequence(|decoder| {
impl<'a> DecodeValue<'a> for AlgorithmIdentifier<'a> {
fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> der::Result<Self> {
SequenceRef::decode_value(decoder, header)?.decode_body(|decoder| {
let oid = decoder.decode()?;
let parameters = decoder.decode()?;
Ok(Self { oid, parameters })
Expand Down