Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 21 insertions, 3 deletions

diff --git a/vendor/spki/.cargo-checksum.json b/vendor/spki/.cargo-checksum.json
index 15d9a370e..c3dc2cd34 100644
--- a/vendor/spki/.cargo-checksum.json
+++ b/vendor/spki/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"1736ee61c8c80b2514ec671e859704b7692f2fa2f54151161b9b50386f0b47c2","Cargo.toml":"03bb748e86f6e87b3ca7bf7f7c243ddcd369345c7b9524d8720bf47099da915e","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"c995204cc6bad2ed67dd41f7d89bb9f1a9d48e0edd745732b30640d7912089a4","README.md":"0738222d834cb56592ce68453f1ce42687497fd9576cd5a1a2cbbe1be5ad7164","src/algorithm.rs":"70a0990e4321052b98904a8b737389cb618813e5172f072022351183169690af","src/error.rs":"ce99da5f369ae830bbac6a958ee0e93c8045df5ca7b7ea306e55bb3209c1f81f","src/fingerprint.rs":"4cb6f1e1d2ca0df933636ffcae30884fe029e2d581a42477081593271a6aa49b","src/lib.rs":"3da6d5ea63f7578b5e97328604e354d6e2bf6a9002c7a24ea1b66c89e4ba8518","src/spki.rs":"099e68939ade57dd9707e51f5c4191ac777e4afc22f21d197e0e4859f0967437","src/traits.rs":"dd32e84c63ea109cb01d7b776bfbf6a67d8c161aff468788cade402307cba0b0","tests/examples/ed25519-pub.der":"55dd4c74b0e48534e2f4e173ceceb50df8f27a7ac2aa8991cc7ae914e030bced","tests/examples/ed25519-pub.pem":"36d717203cbca1812f05f30e0415251c928b659882092e653221a028571c6853","tests/examples/p256-pub.der":"b9968d56ed8d6aa3fb43b15fa01e355d7a3a0203b1408b3fd2733637c4d1642c","tests/examples/p256-pub.pem":"d1ff198dc495da63f5f909db0254d6e49cff519487fcb26d055a762fc3ca47a1","tests/examples/rsa2048-pub.der":"efeda9bfead9fd0594f6a5cf6fdf6c163116a3b1fad6d73cea05295b68fd1794","tests/examples/rsa2048-pub.pem":"078c3983093e86784590a2a454547acad1d50992419334be697e442e954f02f8","tests/spki.rs":"ce90b576d072fe2ab91b57b0ecd256baf25b0597abc1790b8b03b4d948617ed4","tests/traits.rs":"8ccaa20167d1ada765bcc938b8636b722fd3fa17c5f185e216053306a21faa7e"},"package":"9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"119ebe6bab78b405f61bfd4068a65090d1b641b1971d54aed6286f0f2b81fffc","Cargo.toml":"c2ce81d32a2e9586591d313c324e83bd3822ba13736fdd5209f06da1ac27bd5e","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"c995204cc6bad2ed67dd41f7d89bb9f1a9d48e0edd745732b30640d7912089a4","README.md":"0738222d834cb56592ce68453f1ce42687497fd9576cd5a1a2cbbe1be5ad7164","src/algorithm.rs":"70a0990e4321052b98904a8b737389cb618813e5172f072022351183169690af","src/error.rs":"ce99da5f369ae830bbac6a958ee0e93c8045df5ca7b7ea306e55bb3209c1f81f","src/fingerprint.rs":"4cb6f1e1d2ca0df933636ffcae30884fe029e2d581a42477081593271a6aa49b","src/lib.rs":"3da6d5ea63f7578b5e97328604e354d6e2bf6a9002c7a24ea1b66c89e4ba8518","src/spki.rs":"cb6ef0e7723da7e9fb22f7fe691a210504f060230bfa544787de55e44fe61c3c","src/traits.rs":"dd32e84c63ea109cb01d7b776bfbf6a67d8c161aff468788cade402307cba0b0","tests/examples/ed25519-pub.der":"55dd4c74b0e48534e2f4e173ceceb50df8f27a7ac2aa8991cc7ae914e030bced","tests/examples/ed25519-pub.pem":"36d717203cbca1812f05f30e0415251c928b659882092e653221a028571c6853","tests/examples/p256-pub.der":"b9968d56ed8d6aa3fb43b15fa01e355d7a3a0203b1408b3fd2733637c4d1642c","tests/examples/p256-pub.pem":"d1ff198dc495da63f5f909db0254d6e49cff519487fcb26d055a762fc3ca47a1","tests/examples/rsa2048-pub.der":"efeda9bfead9fd0594f6a5cf6fdf6c163116a3b1fad6d73cea05295b68fd1794","tests/examples/rsa2048-pub.pem":"078c3983093e86784590a2a454547acad1d50992419334be697e442e954f02f8","tests/spki.rs":"7d7e717d4591126a1e8e8627d4a02f68dec9ad08db885281c90d6000eaa8ebf5","tests/traits.rs":"8ccaa20167d1ada765bcc938b8636b722fd3fa17c5f185e216053306a21faa7e"},"package":"d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"}
\ No newline at end of file
diff --git a/vendor/spki/CHANGELOG.md b/vendor/spki/CHANGELOG.md
index c20ba8b77..cf3722dde 100644
--- a/vendor/spki/CHANGELOG.md
+++ b/vendor/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
diff --git a/vendor/spki/Cargo.toml b/vendor/spki/Cargo.toml
index b0e830a01..1c7f30544 100644
--- a/vendor/spki/Cargo.toml
+++ b/vendor/spki/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.65"
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 authors = ["RustCrypto Developers"]
 description = """
 X.509 Subject Public Key Info (RFC5280) describing public keys as well as their
diff --git a/vendor/spki/src/spki.rs b/vendor/spki/src/spki.rs
index 3d949f887..b7e4c9280 100644
--- a/vendor/spki/src/spki.rs
+++ b/vendor/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>()?)
+        }
+    }
 }
diff --git a/vendor/spki/tests/spki.rs b/vendor/spki/tests/spki.rs
index abecdb8c6..f912d4875 100644
--- a/vendor/spki/tests/spki.rs
+++ b/vendor/spki/tests/spki.rs
@@ -41,7 +41,7 @@ const ED25519_SPKI_FINGERPRINT_BASE64: &str = "Vd1MdLDkhTTi9OFzzs61DfjyenrCqomRz
 /// The SPKI fingerprint for `ED25519_SPKI_FINGERPRINT` as straight hash bytes
 ///
 /// Generated using `cat ed25519-pub.der | openssl dgst -sha256`
-#[cfg(all(feature = "fingerprint"))]
+#[cfg(feature = "fingerprint")]
 const ED25519_SPKI_FINGERPRINT: &[u8] =
     &hex!("55dd4c74b0e48534e2f4e173ceceb50df8f27a7ac2aa8991cc7ae914e030bced");