Merge branch 'master' of https://github.com/RustCrypto/formats into c…

…ms/pwri-builder

.cargo/audit.toml

@@ -1,4 +1,5 @@
 [advisories]
 ignore = [
     "RUSTSEC-2021-0127", # serde_cbor is unmaintained
+    "RUSTSEC-2023-0071", # rsa: Marvin Attack: potential key recovery
 ]

spki/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.7.3 (2023-11-28)
+### Added
+- public key to `SubjectPublicKeyInfoOwned` helper ([#1269])
+
+[#1269]: https://github.com/RustCrypto/formats/pull/1269
+
 ## 0.7.2 (2023-05-04)
 
 ### Added

spki/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 description = """
 X.509 Subject Public Key Info (RFC5280) describing public keys as well as their
 associated AlgorithmIdentifiers (i.e. OIDs)

spki/src/spki.rs

@@ -181,6 +181,7 @@ impl<Params, Key> PemLabel for SubjectPublicKeyInfo<Params, Key> {
 #[cfg(feature = "alloc")]
 mod allocating {
     use super::*;
+    use crate::EncodePublicKey;
     use der::referenced::*;
 
     impl<'a> RefToOwned<'a> for SubjectPublicKeyInfoRef<'a> {
@@ -202,4 +203,15 @@ mod allocating {
             }
         }
     }
+
+    impl SubjectPublicKeyInfoOwned {
+        /// Create a [`SubjectPublicKeyInfoOwned`] from any object that implements
+        /// [`EncodePublicKey`].
+        pub fn from_key<T>(source: T) -> Result<Self>
+        where
+            T: EncodePublicKey,
+        {
+            Ok(source.to_public_key_der()?.decode_msg::<Self>()?)
+        }
+    }
 }

x509-cert/Cargo.toml

@@ -17,7 +17,7 @@ rust-version = "1.65"
 [dependencies]
 const-oid = { version = "0.9.3", features = ["db"] }
 der = { version = "0.7.6", features = ["alloc", "derive", "flagset", "oid"] }
-spki = { version = "0.7.2", features = ["alloc"] }
+spki = { version = "0.7.3", features = ["alloc"] }
 
 # optional dependencies
 arbitrary = { version = "1.3", features = ["derive"], optional = true }

x509-cert/src/builder.rs

@@ -276,9 +276,7 @@ where
         cert_signer: &'s S,
     ) -> Result<Self> {
         let verifying_key = cert_signer.verifying_key();
-        let signer_pub = verifying_key
-            .to_public_key_der()?
-            .decode_msg::<SubjectPublicKeyInfoOwned>()?;
+        let signer_pub = SubjectPublicKeyInfoOwned::from_key(verifying_key)?;
 
         let signature_alg = cert_signer.signature_algorithm_identifier()?;
         let issuer = profile.get_issuer(&subject);
@@ -370,9 +368,7 @@ where
     pub fn new(subject: Name, req_signer: &'s S) -> Result<Self> {
         let version = Default::default();
         let verifying_key = req_signer.verifying_key();
-        let public_key = verifying_key
-            .to_public_key_der()?
-            .decode_msg::<SubjectPublicKeyInfoOwned>()?;
+        let public_key = SubjectPublicKeyInfoOwned::from_key(verifying_key)?;
         let attributes = Default::default();
         let extension_req = Default::default();