Merging upstream version 1.72.1+dfsg1.

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

6 files changed, 32 insertions, 5 deletions

diff --git a/vendor/spki/.cargo-checksum.json b/vendor/spki/.cargo-checksum.json
index 469b1b2b4..15d9a370e 100644
--- a/vendor/spki/.cargo-checksum.json
+++ b/vendor/spki/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"e726085516c3067008fa753392aaeef43cece4065bd46511ffc652a57462066a","Cargo.toml":"588b6717991baeb3275d8a8d423b872792728d36325a6a20ffe8526a12845976","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"c995204cc6bad2ed67dd41f7d89bb9f1a9d48e0edd745732b30640d7912089a4","README.md":"0738222d834cb56592ce68453f1ce42687497fd9576cd5a1a2cbbe1be5ad7164","src/algorithm.rs":"97ea657a991c65477b17a8c447b469d9281ccb7e37c145af8a7e8ae5bda39926","src/error.rs":"ce99da5f369ae830bbac6a958ee0e93c8045df5ca7b7ea306e55bb3209c1f81f","src/fingerprint.rs":"4cb6f1e1d2ca0df933636ffcae30884fe029e2d581a42477081593271a6aa49b","src/lib.rs":"75dd58078144d0678335a03c1a550062603f0717bb33727351237627104f4525","src/spki.rs":"099e68939ade57dd9707e51f5c4191ac777e4afc22f21d197e0e4859f0967437","src/traits.rs":"68e2d6c4bedb0e1166241b392ebbd6b50929c32541a2e4d6ce769ce59b3c1270","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":"37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e"}
\ No newline at end of file
+{"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
diff --git a/vendor/spki/CHANGELOG.md b/vendor/spki/CHANGELOG.md
index b17b5cb98..c20ba8b77 100644
--- a/vendor/spki/CHANGELOG.md
+++ b/vendor/spki/CHANGELOG.md
@@ -4,6 +4,20 @@ 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.2 (2023-05-04)
+
+### Added
+- `AlgorithmIdentifierWithOid` trait ([#986])
+- `SignatureBitStringEncoding` trait ([#1047])
+
+### Changed
+-  Bump `hex-literal` to v0.4.1 ([#999])
+
+[#986]: https://github.com/RustCrypto/formats/pull/986
+[#999]: https://github.com/RustCrypto/formats/pull/999
+[#1047]: https://github.com/RustCrypto/formats/pull/1047
+
+
 ## 0.7.1 (2023-04-04)
 ### Added
 - `AssociatedAlgorithmIdentifier` trait ([#962], [#966])
diff --git a/vendor/spki/Cargo.toml b/vendor/spki/Cargo.toml
index c5c2104a0..b0e830a01 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.1"
+version = "0.7.2"
 authors = ["RustCrypto Developers"]
 description = """
 X.509 Subject Public Key Info (RFC5280) describing public keys as well as their
@@ -60,7 +60,7 @@ optional = true
 default-features = false
 
 [dev-dependencies.hex-literal]
-version = "0.3"
+version = "0.4"
 
 [dev-dependencies.tempfile]
 version = "3"
diff --git a/vendor/spki/src/algorithm.rs b/vendor/spki/src/algorithm.rs
index b0e08b5b3..5f4b5e8c2 100644
--- a/vendor/spki/src/algorithm.rs
+++ b/vendor/spki/src/algorithm.rs
@@ -88,6 +88,9 @@ where
 /// `AlgorithmIdentifier` reference which has `AnyRef` parameters.
 pub type AlgorithmIdentifierRef<'a> = AlgorithmIdentifier<AnyRef<'a>>;
 
+/// `AlgorithmIdentifier` with `ObjectIdentifier` parameters.
+pub type AlgorithmIdentifierWithOid = AlgorithmIdentifier<ObjectIdentifier>;
+
 /// `AlgorithmIdentifier` reference which has `Any` parameters.
 #[cfg(feature = "alloc")]
 pub type AlgorithmIdentifierOwned = AlgorithmIdentifier<Any>;
diff --git a/vendor/spki/src/lib.rs b/vendor/spki/src/lib.rs
index 2ac8d9d12..6c0caa72a 100644
--- a/vendor/spki/src/lib.rs
+++ b/vendor/spki/src/lib.rs
@@ -47,7 +47,7 @@ mod traits;
 mod fingerprint;
 
 pub use crate::{
-    algorithm::{AlgorithmIdentifier, AlgorithmIdentifierRef},
+    algorithm::{AlgorithmIdentifier, AlgorithmIdentifierRef, AlgorithmIdentifierWithOid},
     error::{Error, Result},
     spki::{SubjectPublicKeyInfo, SubjectPublicKeyInfoRef},
     traits::{AssociatedAlgorithmIdentifier, DecodePublicKey, SignatureAlgorithmIdentifier},
@@ -61,6 +61,7 @@ pub use {
         spki::SubjectPublicKeyInfoOwned,
         traits::{
             DynAssociatedAlgorithmIdentifier, DynSignatureAlgorithmIdentifier, EncodePublicKey,
+            SignatureBitStringEncoding,
         },
     },
     der::Document,
diff --git a/vendor/spki/src/traits.rs b/vendor/spki/src/traits.rs
index 1126c7c40..764b02a4a 100644
--- a/vendor/spki/src/traits.rs
+++ b/vendor/spki/src/traits.rs
@@ -6,7 +6,7 @@ use der::{EncodeValue, Tagged};
 #[cfg(feature = "alloc")]
 use {
     crate::AlgorithmIdentifierOwned,
-    der::{Any, Document},
+    der::{asn1::BitString, Any, Document},
 };
 
 #[cfg(feature = "pem")]
@@ -173,3 +173,12 @@ where
         })
     }
 }
+
+/// Returns the `BitString` encoding of the signature.
+///
+/// X.509 and CSR structures require signatures to be BitString encoded.
+#[cfg(feature = "alloc")]
+pub trait SignatureBitStringEncoding {
+    /// `BitString` encoding for this signature.
+    fn to_bitstring(&self) -> der::Result<BitString>;
+}