Merging upstream version 1.72.1+dfsg1.

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

4 files changed, 63 insertions, 15 deletions

diff --git a/vendor/md-5/.cargo-checksum.json b/vendor/md-5/.cargo-checksum.json
index 63d163d38..abcc52a8b 100644
--- a/vendor/md-5/.cargo-checksum.json
+++ b/vendor/md-5/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"b9b6034bd31f809bdeb5548d60683d0be969c26f3a21b95aa62e4f38c1c1ced6","Cargo.toml":"4e463392bd2ac3b9d5cf599dc1f0cb3fb55cf8b7fc0edd77cb4e261d0525b60d","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"23c2e70875a8ccdd29c0c7e929f1769dd8ae1f3e5be5dcd0a368f1d9fab1917b","benches/mod.rs":"10a5c151bf7b145838ab754013d49463e3123297778cfe275c95ebec28c4f7c9","src/compress.rs":"0b6392b665e9ac4e6c380d06370c44380a75f0eb3532ca2e7d50a26c39b3b286","src/lib.rs":"85f4cfea40870a0689cb5ca9c5fe1a327c18859646c6c2fbb121756f237a7eb0","tests/data/md5.blb":"d32b41b81a906139c80f2bdf20920a547a5b5a6aaba2797fc2629665c42aaa47","tests/mod.rs":"b729eff5e20d0fee8da37aa101e6bc36919be11197350fffe2dc2b976f178f96"},"package":"e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"75ed9e0b2e0941de92a0d5eeedb6d413da8f959acfa393a50a2a5866857bb14e","Cargo.toml":"68a313a16ee100979d0c77b4844dbf232f8cf55104799dd8e0bb086ebb2812c4","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"23c2e70875a8ccdd29c0c7e929f1769dd8ae1f3e5be5dcd0a368f1d9fab1917b","benches/mod.rs":"10a5c151bf7b145838ab754013d49463e3123297778cfe275c95ebec28c4f7c9","src/compress.rs":"0b6392b665e9ac4e6c380d06370c44380a75f0eb3532ca2e7d50a26c39b3b286","src/lib.rs":"8b71d4d7999456b0eb538819d470ff472cea28bd6201569689d4de7e1c8c3c78","tests/data/md5.blb":"d32b41b81a906139c80f2bdf20920a547a5b5a6aaba2797fc2629665c42aaa47","tests/mod.rs":"b729eff5e20d0fee8da37aa101e6bc36919be11197350fffe2dc2b976f178f96"},"package":"6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"}
\ No newline at end of file
diff --git a/vendor/md-5/CHANGELOG.md b/vendor/md-5/CHANGELOG.md
index 394eaa3d9..87fec720d 100644
--- a/vendor/md-5/CHANGELOG.md
+++ b/vendor/md-5/CHANGELOG.md
@@ -5,6 +5,36 @@ 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.10.5 (2022-09-32)
+### Added
+- Feature-gated OID support ([#413])
+
+[#413]: https://github.com/RustCrypto/hashes/pull/413
+
+## 0.10.4 (2022-09-02)
+### Fixed
+- MSRV issue which was not resolved by v0.10.3 ([#401])
+
+[#401]: https://github.com/RustCrypto/hashes/pull/401
+
+## 0.10.3 (2022-09-02)
+### Fixed
+- MSRV issue caused by publishing v0.10.2 using a buggy Nightly toolchain ([#399])
+
+[#399]: https://github.com/RustCrypto/hashes/pull/399
+
+## 0.10.2 (2022-08-30)
+### Changed
+- Ignore `asm` feature on unsupported targets ([#388])
+
+[#388]: https://github.com/RustCrypto/hashes/pull/388
+
+## 0.10.1 (2022-02-17)
+### Fixed
+- Minimal versions build ([#363])
+
+[#363]: https://github.com/RustCrypto/hashes/pull/363
+
 ## 0.10.0 (2021-12-07)
 ### Changed
 - Update to `digest` v0.10 ([#217])
diff --git a/vendor/md-5/Cargo.toml b/vendor/md-5/Cargo.toml
index b65ecf0ec..fddb804ce 100644
--- a/vendor/md-5/Cargo.toml
+++ b/vendor/md-5/Cargo.toml
@@ -12,32 +12,43 @@
 [package]
 edition = "2018"
 name = "md-5"
-version = "0.10.0"
+version = "0.10.5"
 authors = ["RustCrypto Developers"]
 description = "MD5 hash function"
 documentation = "https://docs.rs/md-5"
 readme = "README.md"
-keywords = ["crypto", "md5", "hash", "digest"]
-categories = ["cryptography", "no-std"]
+keywords = [
+    "crypto",
+    "md5",
+    "hash",
+    "digest",
+]
+categories = [
+    "cryptography",
+    "no-std",
+]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/RustCrypto/hashes"
 
 [lib]
 name = "md5"
+
 [dependencies.digest]
-version = "0.10"
+version = "0.10.4"
 
-[dependencies.md5-asm]
-version = "0.5"
-optional = true
 [dev-dependencies.digest]
-version = "0.10"
+version = "0.10.4"
 features = ["dev"]
 
 [dev-dependencies.hex-literal]
-version = "0.2"
+version = "0.2.2"
 
 [features]
 asm = ["md5-asm"]
 default = ["std"]
+oid = ["digest/oid"]
 std = ["digest/std"]
+
+[target."cfg(any(target_arch = \"x86\", target_arch = \"x86_64\"))".dependencies.md5-asm]
+version = "0.5"
+optional = true
diff --git a/vendor/md-5/src/lib.rs b/vendor/md-5/src/lib.rs
index fadaf5192..87fe9134f 100644
--- a/vendor/md-5/src/lib.rs
+++ b/vendor/md-5/src/lib.rs
@@ -26,15 +26,14 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/md-5/0.10.0"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 #![warn(missing_docs, rust_2018_idioms)]
 
-#[cfg(feature = "asm")]
+#[cfg(all(feature = "asm", any(target_arch = "x86", target_arch = "x86_64")))]
 extern crate md5_asm as compress;
 
-#[cfg(not(feature = "asm"))]
+#[cfg(not(all(feature = "asm", any(target_arch = "x86", target_arch = "x86_64"))))]
 mod compress;
 
 pub use digest::{self, Digest};
@@ -42,13 +41,15 @@ pub use digest::{self, Digest};
 use compress::compress;
 
 use core::{fmt, slice::from_ref};
+#[cfg(feature = "oid")]
+use digest::const_oid::{AssociatedOid, ObjectIdentifier};
 use digest::{
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         OutputSizeUser, Reset, UpdateCore,
     },
-    generic_array::typenum::{Unsigned, U16, U64},
+    typenum::{Unsigned, U16, U64},
     HashMarker, Output,
 };
 /// Core MD5 hasher state.
@@ -125,6 +126,12 @@ impl fmt::Debug for Md5Core {
     }
 }
 
+#[cfg(feature = "oid")]
+#[cfg_attr(docsrs, doc(cfg(feature = "oid")))]
+impl AssociatedOid for Md5Core {
+    const OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.840.113549.2.5");
+}
+
 /// MD5 hasher state.
 pub type Md5 = CoreWrapper<Md5Core>;