Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 19 additions & 5 deletions spki/src/spki.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
//! X.509 `SubjectPublicKeyInfo`

use crate::{AlgorithmIdentifier, Error, Result};
use der::{asn1::BitString, Decodable, Decoder, Encodable, Sequence};
use core::cmp::Ordering;
use der::{asn1::BitString, Decodable, Decoder, DerOrd, Encodable, Sequence, ValueOrd};

#[cfg(feature = "fingerprint")]
use sha2::{digest, Digest, Sha256};
Expand Down Expand Up @@ -49,6 +50,11 @@ impl<'a> SubjectPublicKeyInfo<'a> {
pub fn fingerprint_base64(&self) -> Result<String> {
Ok(Base64::encode_string(self.fingerprint()?.as_slice()))
}

/// Get a [`BitString`] representing the `subject_public_key`
fn subject_public_key_bitstring(&self) -> der::Result<BitString<'a>> {
BitString::from_bytes(self.subject_public_key)
}
}

impl<'a> Decodable<'a> for SubjectPublicKeyInfo<'a> {
Expand All @@ -73,10 +79,7 @@ impl<'a> Sequence<'a> for SubjectPublicKeyInfo<'a> {
where
F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
{
f(&[
&self.algorithm,
&BitString::from_bytes(self.subject_public_key)?,
])
f(&[&self.algorithm, &self.subject_public_key_bitstring()?])
}
}

Expand All @@ -87,3 +90,14 @@ impl<'a> TryFrom<&'a [u8]> for SubjectPublicKeyInfo<'a> {
Ok(Self::from_der(bytes)?)
}
}

impl ValueOrd for SubjectPublicKeyInfo<'_> {
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
match self.algorithm.der_cmp(&other.algorithm)? {
Ordering::Equal => self
.subject_public_key_bitstring()?
.der_cmp(&other.subject_public_key_bitstring()?),
other => Ok(other),
}
}
}