spki: ensure params are encoded with Any

Author: baloo

spki/src/algorithm.rs

@@ -3,7 +3,7 @@
 use crate::{Error, Result};
 use core::cmp::Ordering;
 use der::{
-    asn1::{AnyRef, Choice, ObjectIdentifier},
+    asn1::{AnyLike, AnyRef, Choice, ObjectIdentifier},
     Decode, DecodeValue, DerOrd, Encode, EncodeValue, Header, Length, Reader, Sequence, ValueOrd,
     Writer,
 };
@@ -22,7 +22,7 @@ use der::asn1::Any;
 /// [RFC 5280 Section 4.1.1.2]: https://tools.ietf.org/html/rfc5280#section-4.1.1.2
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub struct AlgorithmIdentifier<Params> {
+pub struct AlgorithmIdentifier<Params: AnyLike> {
     /// Algorithm OID, i.e. the `algorithm` field in the `AlgorithmIdentifier`
     /// ASN.1 schema.
     pub oid: ObjectIdentifier,
@@ -31,7 +31,7 @@ pub struct AlgorithmIdentifier<Params> {
     pub parameters: Option<Params>,
 }
 
-impl<'a, Params> DecodeValue<'a> for AlgorithmIdentifier<Params>
+impl<'a, Params: AnyLike> DecodeValue<'a> for AlgorithmIdentifier<Params>
 where
     Params: Choice<'a, Error = der::Error>,
 {
@@ -47,7 +47,7 @@ where
     }
 }
 
-impl<Params> EncodeValue for AlgorithmIdentifier<Params>
+impl<Params: AnyLike> EncodeValue for AlgorithmIdentifier<Params>
 where
     Params: Encode,
 {
@@ -62,12 +62,12 @@ where
     }
 }
 
-impl<'a, Params> Sequence<'a> for AlgorithmIdentifier<Params> where
+impl<'a, Params: AnyLike> Sequence<'a> for AlgorithmIdentifier<Params> where
     Params: Choice<'a, Error = der::Error> + Encode
 {
 }
 
-impl<'a, Params> TryFrom<&'a [u8]> for AlgorithmIdentifier<Params>
+impl<'a, Params: AnyLike> TryFrom<&'a [u8]> for AlgorithmIdentifier<Params>
 where
     Params: Choice<'a, Error = der::Error> + Encode,
 {
@@ -78,7 +78,7 @@ where
     }
 }
 
-impl<Params> ValueOrd for AlgorithmIdentifier<Params>
+impl<Params: AnyLike> ValueOrd for AlgorithmIdentifier<Params>
 where
     Params: DerOrd,
 {
@@ -100,7 +100,7 @@ pub type AlgorithmIdentifierWithOid = AlgorithmIdentifier<ObjectIdentifier>;
 #[cfg(feature = "alloc")]
 pub type AlgorithmIdentifierOwned = AlgorithmIdentifier<Any>;
 
-impl<Params> AlgorithmIdentifier<Params> {
+impl<Params: AnyLike> AlgorithmIdentifier<Params> {
     /// Assert the `algorithm` OID is an expected value.
     pub fn assert_algorithm_oid(&self, expected_oid: ObjectIdentifier) -> Result<ObjectIdentifier> {
         if self.oid == expected_oid {

spki/src/lib.rs

@@ -21,14 +21,15 @@
 //! Borrow the [`ObjectIdentifier`] first then use [`der::AnyRef::from`] or `.into()`:
 //!
 //! ```
+//! use der::asn1::Any;
 //! use spki::{AlgorithmIdentifier, ObjectIdentifier};
 //!
 //! let alg_oid = "1.2.840.10045.2.1".parse::<ObjectIdentifier>().unwrap();
 //! let params_oid = "1.2.840.10045.3.1.7".parse::<ObjectIdentifier>().unwrap();
 //!
 //! let alg_id = AlgorithmIdentifier {
 //!     oid: alg_oid,
-//!     parameters: Some(params_oid)
+//!     parameters: Some(Any::encode_from(&params_oid).unwrap())
 //! };
 //! ```
 

spki/src/spki.rs

@@ -3,7 +3,7 @@
 use crate::{AlgorithmIdentifier, Error, Result};
 use core::cmp::Ordering;
 use der::{
-    asn1::{AnyRef, BitStringRef},
+    asn1::{AnyLike, AnyRef, BitStringRef},
     Choice, Decode, DecodeValue, DerOrd, Encode, EncodeValue, FixedTag, Header, Length, Reader,
     Sequence, ValueOrd, Writer,
 };
@@ -41,7 +41,7 @@ pub type SubjectPublicKeyInfoOwned = SubjectPublicKeyInfo<Any, BitString>;
 /// [RFC 5280 § 4.1.2.7]: https://tools.ietf.org/html/rfc5280#section-4.1.2.7
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct SubjectPublicKeyInfo<Params, Key> {
+pub struct SubjectPublicKeyInfo<Params: AnyLike, Key> {
     /// X.509 [`AlgorithmIdentifier`] for the public key type
     pub algorithm: AlgorithmIdentifier<Params>,
 
@@ -51,7 +51,7 @@ pub struct SubjectPublicKeyInfo<Params, Key> {
 
 impl<'a, Params, Key> SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     // TODO: replace FixedTag with FixedTag<TAG = { Tag::BitString }> once
     // https://github.com/rust-lang/rust/issues/92827 is fixed
     Key: Decode<'a, Error = der::Error> + Encode + FixedTag,
@@ -84,7 +84,7 @@ where
 
 impl<'a: 'k, 'k, Params, Key: 'k> DecodeValue<'a> for SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Decode<'a, Error = der::Error>,
 {
     type Error = der::Error;
@@ -101,7 +101,7 @@ where
 
 impl<'a, Params, Key> EncodeValue for SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Encode,
 {
     fn value_len(&self) -> der::Result<Length> {
@@ -117,14 +117,14 @@ where
 
 impl<'a, Params, Key> Sequence<'a> for SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Decode<'a, Error = der::Error> + Encode + FixedTag,
 {
 }
 
 impl<'a, Params, Key> TryFrom<&'a [u8]> for SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Decode<'a, Error = der::Error> + Encode + FixedTag,
 {
     type Error = Error;
@@ -136,7 +136,7 @@ where
 
 impl<'a, Params, Key> ValueOrd for SubjectPublicKeyInfo<Params, Key>
 where
-    Params: Choice<'a, Error = der::Error> + DerOrd + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + DerOrd + Encode,
     Key: ValueOrd,
 {
     fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
@@ -150,7 +150,7 @@ where
 #[cfg(feature = "alloc")]
 impl<'a: 'k, 'k, Params, Key: 'k> TryFrom<SubjectPublicKeyInfo<Params, Key>> for Document
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Decode<'a, Error = der::Error> + Encode + FixedTag,
     BitStringRef<'a>: From<&'k Key>,
 {
@@ -164,7 +164,7 @@ where
 #[cfg(feature = "alloc")]
 impl<'a: 'k, 'k, Params, Key: 'k> TryFrom<&SubjectPublicKeyInfo<Params, Key>> for Document
 where
-    Params: Choice<'a, Error = der::Error> + Encode,
+    Params: AnyLike + Choice<'a, Error = der::Error> + Encode,
     Key: Decode<'a, Error = der::Error> + Encode + FixedTag,
     BitStringRef<'a>: From<&'k Key>,
 {
@@ -176,7 +176,10 @@ where
 }
 
 #[cfg(feature = "pem")]
-impl<Params, Key> PemLabel for SubjectPublicKeyInfo<Params, Key> {
+impl<Params, Key> PemLabel for SubjectPublicKeyInfo<Params, Key>
+where
+    Params: AnyLike,
+{
     const PEM_LABEL: &'static str = "PUBLIC KEY";
 }
 

spki/src/traits.rs

@@ -1,7 +1,7 @@
 //! Traits for encoding/decoding SPKI public keys.
 
 use crate::{AlgorithmIdentifier, Error, Result, SubjectPublicKeyInfoRef};
-use der::{EncodeValue, Tagged};
+use der::{asn1::AnyLike, EncodeValue, Tagged};
 
 #[cfg(feature = "alloc")]
 use {
@@ -103,7 +103,7 @@ pub trait EncodePublicKey {
 /// This is useful for e.g. keys for digital signature algorithms.
 pub trait AssociatedAlgorithmIdentifier {
     /// Algorithm parameters.
-    type Params: Tagged + EncodeValue;
+    type Params: Tagged + EncodeValue + AnyLike;
 
     /// `AlgorithmIdentifier` for this structure.
     const ALGORITHM_IDENTIFIER: AlgorithmIdentifier<Self::Params>;
@@ -141,7 +141,7 @@ where
 /// private keys.
 pub trait SignatureAlgorithmIdentifier {
     /// Algorithm parameters.
-    type Params: Tagged + EncodeValue;
+    type Params: Tagged + EncodeValue + AnyLike;
 
     /// `AlgorithmIdentifier` for the corresponding singature system.
     const SIGNATURE_ALGORITHM_IDENTIFIER: AlgorithmIdentifier<Self::Params>;

spki/tests/spki.rs

@@ -1,6 +1,6 @@
 //! `SubjectPublicKeyInfo` tests.
 
-use der::asn1::ObjectIdentifier;
+use der::asn1::{AnyLike, ObjectIdentifier};
 use hex_literal::hex;
 use spki::SubjectPublicKeyInfoRef;