Merging upstream version 1.71.1+dfsg1.

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

10 files changed, 19 insertions, 14 deletions

diff --git a/vendor/base64ct/.cargo-checksum.json b/vendor/base64ct/.cargo-checksum.json
index 37c17ad88..622b5f0c8 100644
--- a/vendor/base64ct/.cargo-checksum.json
+++ b/vendor/base64ct/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"4a89342f9ee1c6213318bbdf492d6c40d9284f0519937fb028846e5350035cc3","Cargo.toml":"a7666e4bef5a26bd22ccf92f7718f09079b107d20d74762ce009f0d586f27a84","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"4e2b34f7d4aacac2e608dae1b57887a7f50b0fa5bac6c9ee6b9bf1077aa8cdb4","README.md":"9bc2bc2fa296d02b888980faa6c8c457a55a045fcd3c6966bc0c4fa1ae4881a5","benches/mod.rs":"5af5be3067bfca0f2925ea4dabbe19368beefe45d6efecf368a4f6a82e78ad52","src/alphabet.rs":"09ac0e9015593980cfbd9c917219f3259853ea73c5ed334d624bf10a6efb46c5","src/alphabet/bcrypt.rs":"326f0dd9b28b3074e030bf4cc375f20059873058131e60e0c1de63c1101ef655","src/alphabet/crypt.rs":"9e5a356a4013a99f1e5bcb2901e2e3b213299900bc636d88e1207873b29b7772","src/alphabet/shacrypt.rs":"632e11c76c356814fbca33b163482c4b9c2ac9ae01fa414163faa6ab723a3b72","src/alphabet/standard.rs":"417f9ad7f4c53f0a899ce35e9c77600823b1cf44b1478c4918505efe53a77f26","src/alphabet/url.rs":"7170e2493dd750649fd2b28dd9836f045caf0b40e21e959b46419bb65a300499","src/decoder.rs":"69fc28000dc660522a96a15fcbcc1cd0b2dc98674919fc8755f7a3413c813e3b","src/encoder.rs":"d885f4938373ee9c5ddab1320b93a8641ae3d3a3d99616c87ce41605e0de3981","src/encoding.rs":"39072704b78acf8ac7402025750ff67b0cfe9fef10006c52a07c0c07fe3fa335","src/errors.rs":"00634f8052a7c2b4b56b009e529861e2cea90340ffa7aac767182b8ff862d468","src/lib.rs":"471b561e81d2f3b47f7df78da08c6b11ef9eb5b9708ffd4c02f16d7ce127fc1c","src/line_ending.rs":"fd8cdb28e947817cbb91e07147590f124aa88a9d3944484b42151aba67589be3","src/test_vectors.rs":"5cdb1f76cf51ffd636527247a04d96223371509d51b5b46f7e1d0cc900859e3a","tests/bcrypt.rs":"ed5ae2b87ad3d91200e34d9019e4b5df038510c4e77da7f35a650c0031ee131b","tests/common/mod.rs":"9ca32161bac1d8cb19bf62566229808e301308ec513299ba532152805abff01c","tests/crypt.rs":"610c2dcd0464ffc3f679afe5f711d57b82b7b608263d10e39d5baa0e2d32fbdf","tests/proptests.proptest-regressions":"2a01eb7f3dc8f73490704630aa88362141fc260a9af42bf8896c131a4687076f","tests/proptests.rs":"7b6bc639e42ca64a2ef66db9bc61d0a8edaa6f2e79fe946d4ba1110bb4c0e56e","tests/shacrypt.rs":"564c6e8ce2759d987b234642a4e910d82d0e892d974f2455805e93376506c51e","tests/standard.rs":"e72109a7a2aa7885ecdadffb6f51947e43e5e29609baef7e53eb1119dbfc2447","tests/url.rs":"076c4421e5f314da73f7a6da0c1c1657e30ead7938afd01cb510a77cd5d8f9e2"},"package":"b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"ec9879e5b98d6077be020933d907958eb1fb95ba72cac76e99893c4fd59a379a","Cargo.toml":"85253ac6e591da3903d2a0e2072f5688ab00a3f637dbb31b11055d507170fbbb","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"4e2b34f7d4aacac2e608dae1b57887a7f50b0fa5bac6c9ee6b9bf1077aa8cdb4","README.md":"83a6220a605b0af059aae55e07bd9151c48e5a4d56490a4ae23b07ae2bf5a030","benches/mod.rs":"5af5be3067bfca0f2925ea4dabbe19368beefe45d6efecf368a4f6a82e78ad52","src/alphabet.rs":"09ac0e9015593980cfbd9c917219f3259853ea73c5ed334d624bf10a6efb46c5","src/alphabet/bcrypt.rs":"326f0dd9b28b3074e030bf4cc375f20059873058131e60e0c1de63c1101ef655","src/alphabet/crypt.rs":"9e5a356a4013a99f1e5bcb2901e2e3b213299900bc636d88e1207873b29b7772","src/alphabet/shacrypt.rs":"632e11c76c356814fbca33b163482c4b9c2ac9ae01fa414163faa6ab723a3b72","src/alphabet/standard.rs":"417f9ad7f4c53f0a899ce35e9c77600823b1cf44b1478c4918505efe53a77f26","src/alphabet/url.rs":"7170e2493dd750649fd2b28dd9836f045caf0b40e21e959b46419bb65a300499","src/decoder.rs":"b1961fddc542effc80d8d6a72cd26b87e13d59d0ed78bdc9b4fa87bd09f25009","src/encoder.rs":"44ecc72230709c4943d04ff6c31230c41de56cb7f040041d684d07b2e4382f08","src/encoding.rs":"80819d279d1a588e9c650041c228d74c667be142266f791e088ce019a2ff6a4e","src/errors.rs":"04366d5c6f93d7dc200b15ee2316a865dfcda74f9c47598144d279419791923c","src/lib.rs":"4b57aa42f978a5a119975ab2bd98839190752fa2d597c54b148f5d8a19e9b590","src/line_ending.rs":"fd8cdb28e947817cbb91e07147590f124aa88a9d3944484b42151aba67589be3","src/test_vectors.rs":"5cdb1f76cf51ffd636527247a04d96223371509d51b5b46f7e1d0cc900859e3a","tests/bcrypt.rs":"ed5ae2b87ad3d91200e34d9019e4b5df038510c4e77da7f35a650c0031ee131b","tests/common/mod.rs":"9ca32161bac1d8cb19bf62566229808e301308ec513299ba532152805abff01c","tests/crypt.rs":"610c2dcd0464ffc3f679afe5f711d57b82b7b608263d10e39d5baa0e2d32fbdf","tests/proptests.proptest-regressions":"2a01eb7f3dc8f73490704630aa88362141fc260a9af42bf8896c131a4687076f","tests/proptests.rs":"d15ab3c39e649f7c6392bb0ade25588fa9599961a1c7d124a8e27ba613b0b904","tests/shacrypt.rs":"564c6e8ce2759d987b234642a4e910d82d0e892d974f2455805e93376506c51e","tests/standard.rs":"e72109a7a2aa7885ecdadffb6f51947e43e5e29609baef7e53eb1119dbfc2447","tests/url.rs":"076c4421e5f314da73f7a6da0c1c1657e30ead7938afd01cb510a77cd5d8f9e2"},"package":"8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"}
\ No newline at end of file
diff --git a/vendor/base64ct/CHANGELOG.md b/vendor/base64ct/CHANGELOG.md
index e09865fbd..73d4ddd9a 100644
--- a/vendor/base64ct/CHANGELOG.md
+++ b/vendor/base64ct/CHANGELOG.md
@@ -4,6 +4,14 @@ 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).
 
+## 1.6.0 (2023-02-26)
+### Changed
+- MSRV 1.60 ([#802])
+- Lint improvements ([#824])
+
+[#802]: https://github.com/RustCrypto/formats/pull/802
+[#824]: https://github.com/RustCrypto/formats/pull/824
+
 ## 1.5.3 (2022-10-18)
 ### Added
 - `Base64ShaCrypt` alphabet ([#742])
diff --git a/vendor/base64ct/Cargo.toml b/vendor/base64ct/Cargo.toml
index c233f023a..6cf4e32c2 100644
--- a/vendor/base64ct/Cargo.toml
+++ b/vendor/base64ct/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.60"
 name = "base64ct"
-version = "1.5.3"
+version = "1.6.0"
 authors = ["RustCrypto Developers"]
 description = """
 Pure Rust implementation of Base64 (RFC 4648) which avoids any usages of
@@ -45,7 +45,7 @@ rustdoc-args = [
 ]
 
 [dev-dependencies.base64]
-version = "0.13"
+version = "0.21"
 
 [dev-dependencies.proptest]
 version = "1"
diff --git a/vendor/base64ct/README.md b/vendor/base64ct/README.md
index 426cb4f98..b808f4309 100644
--- a/vendor/base64ct/README.md
+++ b/vendor/base64ct/README.md
@@ -43,7 +43,7 @@ fixed-width line wrapping.
 
 ## Minimum Supported Rust Version
 
-This crate requires **Rust 1.56** at a minimum.
+This crate requires **Rust 1.60** at a minimum.
 
 We may change the MSRV in the future, but it will be accompanied by a minor
 version bump.
@@ -72,7 +72,7 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/formats/actions/workflows/base64ct.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/formats/actions/workflows/base64ct.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/300570-formats
 
diff --git a/vendor/base64ct/src/decoder.rs b/vendor/base64ct/src/decoder.rs
index 8d500b578..b10104691 100644
--- a/vendor/base64ct/src/decoder.rs
+++ b/vendor/base64ct/src/decoder.rs
@@ -166,7 +166,6 @@ impl<'i, E: Encoding> Decoder<'i, E> {
     /// If successful, this function will return the total number of bytes
     /// decoded into `buf`.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     pub fn decode_to_end<'o>(&mut self, buf: &'o mut Vec<u8>) -> Result<&'o [u8], Error> {
         let start_len = buf.len();
         let remaining_len = self.remaining_len();
@@ -249,7 +248,6 @@ impl<'i, E: Encoding> Decoder<'i, E> {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl<'i, E: Encoding> io::Read for Decoder<'i, E> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.is_finished() {
diff --git a/vendor/base64ct/src/encoder.rs b/vendor/base64ct/src/encoder.rs
index 74d457efc..0ce8c2f36 100644
--- a/vendor/base64ct/src/encoder.rs
+++ b/vendor/base64ct/src/encoder.rs
@@ -166,7 +166,6 @@ impl<'o, E: Encoding> Encoder<'o, E> {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl<'o, E: Encoding> io::Write for Encoder<'o, E> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.encode(buf)?;
diff --git a/vendor/base64ct/src/encoding.rs b/vendor/base64ct/src/encoding.rs
index 36f37e175..83cbc32fe 100644
--- a/vendor/base64ct/src/encoding.rs
+++ b/vendor/base64ct/src/encoding.rs
@@ -40,7 +40,6 @@ pub trait Encoding: Alphabet {
 
     /// Decode a Base64 string into a byte vector.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     fn decode_vec(input: &str) -> Result<Vec<u8>, Error>;
 
     /// Encode the input byte slice as Base64.
@@ -54,7 +53,6 @@ pub trait Encoding: Alphabet {
     /// # Panics
     /// If `input` length is greater than `usize::MAX/4`.
     #[cfg(feature = "alloc")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
     fn encode_string(input: &[u8]) -> String;
 
     /// Get the length of Base64 produced by encoding the given bytes.
diff --git a/vendor/base64ct/src/errors.rs b/vendor/base64ct/src/errors.rs
index 0ea417173..de08e6981 100644
--- a/vendor/base64ct/src/errors.rs
+++ b/vendor/base64ct/src/errors.rs
@@ -73,7 +73,6 @@ impl From<core::str::Utf8Error> for Error {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl From<Error> for std::io::Error {
     fn from(err: Error) -> std::io::Error {
         // TODO(tarcieri): better customize `ErrorKind`?
@@ -82,5 +81,4 @@ impl From<Error> for std::io::Error {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl std::error::Error for Error {}
diff --git a/vendor/base64ct/src/lib.rs b/vendor/base64ct/src/lib.rs
index b374cefe5..f1094f9f1 100644
--- a/vendor/base64ct/src/lib.rs
+++ b/vendor/base64ct/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![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"
@@ -7,6 +7,7 @@
 #![doc = include_str!("../README.md")]
 #![warn(
     clippy::integer_arithmetic,
+    clippy::mod_module_files,
     clippy::panic,
     clippy::panic_in_result_fn,
     clippy::unwrap_used,
diff --git a/vendor/base64ct/tests/proptests.rs b/vendor/base64ct/tests/proptests.rs
index eaa5ae3ec..4d5e1890a 100644
--- a/vendor/base64ct/tests/proptests.rs
+++ b/vendor/base64ct/tests/proptests.rs
@@ -1,6 +1,9 @@
 //! Equivalence tests between `base64` crate and `base64ct`.
 
 #![cfg(feature = "std")]
+// TODO(tarcieri): fix `base64` crate deprecations
+// warning: use of deprecated function `base64::encode`: Use Engine::encode
+#![allow(deprecated)]
 
 use base64ct::{Base64 as Base64ct, Encoding};
 use proptest::{prelude::*, string::*};