Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

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

5 files changed, 528 insertions, 0 deletions

diff --git a/vendor/digest-0.8.1/src/dev.rs b/vendor/digest-0.8.1/src/dev.rs
new file mode 100644
index 000000000..e9950ee79
--- /dev/null
+++ b/vendor/digest-0.8.1/src/dev.rs
@@ -0,0 +1,218 @@
+use super::{Input, VariableOutput, ExtendableOutput, Reset, XofReader};
+use core::fmt::Debug;
+
+#[macro_export]
+macro_rules! new_test {
+    ($name:ident, $test_name:expr, $hasher:ty, $test_func:ident) => {
+        #[test]
+        fn $name() {
+            use digest::blobby::Blob2Iterator;
+            let data = include_bytes!(concat!("data/", $test_name, ".blb"));
+
+            for (i, row) in Blob2Iterator::new(data).unwrap().enumerate() {
+                let input = row[0];
+                let output = row[1];
+                if let Some(desc) = $test_func::<$hasher>(input, output) {
+                    panic!("\n\
+                        Failed test №{}: {}\n\
+                        input:\t{:?}\n\
+                        output:\t{:?}\n",
+                        i, desc, input, output,
+                    );
+                }
+            }
+        }
+    }
+}
+
+// module to separate Digest from other traits
+mod foo {
+    use super::super::Digest;
+    use core::fmt::Debug;
+
+    pub fn digest_test<D>(input: &[u8], output: &[u8]) -> Option<&'static str>
+        where D: Digest + Debug + Clone
+    {
+        let mut hasher = D::new();
+        // Test that it works when accepting the message all at once
+        hasher.input(input);
+        let mut hasher2 = hasher.clone();
+        if hasher.result().as_slice() != output {
+            return Some("whole message");
+        }
+
+        // Test if reset works correctly
+        hasher2.reset();
+        hasher2.input(input);
+        if hasher2.result().as_slice() != output {
+            return Some("whole message after reset");
+        }
+
+        // Test that it works when accepting the message in pieces
+        let mut hasher = D::new();
+        let len = input.len();
+        let mut left = len;
+        while left > 0 {
+            let take = (left + 1) / 2;
+            hasher.input(&input[len - left..take + len - left]);
+            left = left - take;
+        }
+        if hasher.result().as_slice() != output {
+            return Some("message in pieces");
+        }
+
+        // Test processing byte-by-byte
+        let mut hasher = D::new();
+        for chunk in input.chunks(1) {
+            hasher.input(chunk)
+        }
+        if hasher.result().as_slice() != output {
+            return Some("message byte-by-byte");
+        }
+        None
+    }
+
+
+    pub fn one_million_a<D>(expected: &[u8])
+        where D: Digest + Debug + Clone
+    {
+        let mut sh = D::new();
+        for _ in 0..50_000 {
+            sh.input(&[b'a'; 10]);
+        }
+        sh.input(&[b'a'; 500_000][..]);
+        let out = sh.result();
+        assert_eq!(out[..], expected[..]);
+    }
+}
+
+pub use self::foo::{digest_test, one_million_a};
+
+pub fn xof_test<D>(input: &[u8], output: &[u8])
+    -> Option<&'static str>
+    where D: Input + ExtendableOutput + Default + Debug + Reset  + Clone
+{
+    let mut hasher = D::default();
+    let mut buf = [0u8; 1024];
+    // Test that it works when accepting the message all at once
+    hasher.input(input);
+
+    let mut hasher2 = hasher.clone();
+    {
+        let out = &mut buf[..output.len()];
+        hasher.xof_result().read(out);
+
+        if out != output { return Some("whole message"); }
+    }
+
+    // Test if hasher resets correctly
+    hasher2.reset();
+    hasher2.input(input);
+
+    {
+        let out = &mut buf[..output.len()];
+        hasher2.xof_result().read(out);
+
+        if out != output { return Some("whole message after reset"); }
+    }
+
+    // Test if hasher accepts message in pieces correctly
+    let mut hasher = D::default();
+    let len = input.len();
+    let mut left = len;
+    while left > 0 {
+        let take = (left + 1) / 2;
+        hasher.input(&input[len - left..take + len - left]);
+        left = left - take;
+    }
+
+    {
+        let out = &mut buf[..output.len()];
+        hasher.xof_result().read(out);
+        if out != output { return Some("message in pieces"); }
+    }
+
+    // Test reading from reader byte by byte
+    let mut hasher = D::default();
+    hasher.input(input);
+
+    let mut reader = hasher.xof_result();
+    let out = &mut buf[..output.len()];
+    for chunk in out.chunks_mut(1) {
+        reader.read(chunk);
+    }
+
+    if out != output { return Some("message in pieces"); }
+    None
+}
+
+pub fn variable_test<D>(input: &[u8], output: &[u8])
+    -> Option<&'static str>
+    where D: Input + VariableOutput  + Reset + Debug + Clone
+{
+    let mut hasher = D::new(output.len()).unwrap();
+    let mut buf = [0u8; 128];
+    let buf = &mut buf[..output.len()];
+    // Test that it works when accepting the message all at once
+    hasher.input(input);
+    let mut hasher2 = hasher.clone();
+    hasher.variable_result(|res| buf.copy_from_slice(res));
+    if buf != output { return Some("whole message"); }
+
+    // Test if reset works correctly
+    hasher2.reset();
+    hasher2.input(input);
+    hasher2.variable_result(|res| buf.copy_from_slice(res));
+    if buf != output { return Some("whole message after reset"); }
+
+    // Test that it works when accepting the message in pieces
+    let mut hasher = D::new(output.len()).unwrap();
+    let len = input.len();
+    let mut left = len;
+    while left > 0 {
+        let take = (left + 1) / 2;
+        hasher.input(&input[len - left..take + len - left]);
+        left = left - take;
+    }
+    hasher.variable_result(|res| buf.copy_from_slice(res));
+    if buf != output { return Some("message in pieces"); }
+
+    // Test processing byte-by-byte
+    let mut hasher = D::new(output.len()).unwrap();
+    for chunk in input.chunks(1) {
+        hasher.input(chunk)
+    }
+    hasher.variable_result(|res| buf.copy_from_slice(res));
+    if buf != output { return Some("message byte-by-byte"); }
+    None
+}
+
+
+#[macro_export]
+macro_rules! bench {
+    ($name:ident, $engine:path, $bs:expr) => {
+        #[bench]
+        fn $name(b: &mut Bencher) {
+            let mut d = <$engine>::default();
+            let data = [0; $bs];
+
+            b.iter(|| {
+                d.input(&data[..]);
+            });
+
+            b.bytes = $bs;
+        }
+    };
+
+    ($engine:path) => {
+        extern crate test;
+
+        use test::Bencher;
+        use digest::Digest;
+
+        bench!(bench1_10,    $engine, 10);
+        bench!(bench2_100,   $engine, 100);
+        bench!(bench3_1000,  $engine, 1000);
+        bench!(bench4_10000, $engine, 10000);
+    }
+}
diff --git a/vendor/digest-0.8.1/src/digest.rs b/vendor/digest-0.8.1/src/digest.rs
new file mode 100644
index 000000000..50128e13e
--- /dev/null
+++ b/vendor/digest-0.8.1/src/digest.rs
@@ -0,0 +1,86 @@
+use super::{Input, FixedOutput, Reset};
+use generic_array::{GenericArray, ArrayLength};
+use generic_array::typenum::Unsigned;
+
+/// The `Digest` trait specifies an interface common for digest functions.
+///
+/// It's a convenience wrapper around `Input`, `FixedOutput`, `Reset`, `Clone`,
+/// and `Default` traits. It also provides additional convenience methods.
+pub trait Digest {
+    type OutputSize: ArrayLength<u8>;
+    /// Create new hasher instance
+    fn new() -> Self;
+
+    /// Digest input data.
+    ///
+    /// This method can be called repeatedly for use with streaming messages.
+    fn input<B: AsRef<[u8]>>(&mut self, data: B);
+
+    /// Digest input data in a chained manner.
+    fn chain<B: AsRef<[u8]>>(self, data: B) -> Self where Self: Sized;
+
+    /// Retrieve result and consume hasher instance.
+    fn result(self) -> GenericArray<u8, Self::OutputSize>;
+
+    /// Retrieve result and reset hasher instance.
+    ///
+    /// This method sometimes can be more efficient compared to hasher
+    /// re-creation.
+    fn result_reset(&mut self) -> GenericArray<u8, Self::OutputSize>;
+
+    /// Reset hasher instance to its initial state.
+    fn reset(&mut self);
+
+    /// Get output size of the hasher
+    fn output_size() -> usize;
+
+    /// Convenience function to compute hash of the `data`. It will handle
+    /// hasher creation, data feeding and finalization.
+    ///
+    /// Example:
+    ///
+    /// ```rust,ignore
+    /// println!("{:x}", sha2::Sha256::digest(b"Hello world"));
+    /// ```
+    fn digest(data: &[u8]) -> GenericArray<u8, Self::OutputSize>;
+}
+
+impl<D: Input + FixedOutput + Reset + Clone + Default> Digest for D {
+    type OutputSize = <Self as FixedOutput>::OutputSize;
+
+    fn new() -> Self {
+        Self::default()
+    }
+
+    fn input<B: AsRef<[u8]>>(&mut self, data: B) {
+        Input::input(self, data);
+    }
+
+    fn chain<B: AsRef<[u8]>>(self, data: B) -> Self where Self: Sized {
+        Input::chain(self, data)
+    }
+
+    fn result(self) -> GenericArray<u8, Self::OutputSize> {
+        self.fixed_result()
+    }
+
+    fn result_reset(&mut self) -> GenericArray<u8, Self::OutputSize> {
+        let res = self.clone().fixed_result();
+        self.reset();
+        res
+    }
+
+    fn reset(&mut self) {
+        <Self as Reset>::reset(self)
+    }
+
+    fn output_size() -> usize {
+        Self::OutputSize::to_usize()
+    }
+
+    fn digest(data: &[u8]) -> GenericArray<u8, Self::OutputSize> {
+        let mut hasher = Self::default();
+        Input::input(&mut hasher, data);
+        hasher.fixed_result()
+    }
+}
diff --git a/vendor/digest-0.8.1/src/dyn_digest.rs b/vendor/digest-0.8.1/src/dyn_digest.rs
new file mode 100644
index 000000000..2af43a8e3
--- /dev/null
+++ b/vendor/digest-0.8.1/src/dyn_digest.rs
@@ -0,0 +1,63 @@
+#![cfg(feature = "std")]
+use std::boxed::Box;
+
+use super::{Input, FixedOutput, Reset};
+use generic_array::typenum::Unsigned;
+
+/// The `DynDigest` trait is a modification of `Digest` trait suitable
+/// for trait objects.
+pub trait DynDigest {
+    /// Digest input data.
+    ///
+    /// This method can be called repeatedly for use with streaming messages.
+    fn input(&mut self, data: &[u8]);
+
+    /// Retrieve result and reset hasher instance
+    fn result_reset(&mut self) -> Box<[u8]>;
+
+    /// Retrieve result and consume boxed hasher instance
+    fn result(self: Box<Self>) -> Box<[u8]>;
+
+    /// Reset hasher instance to its initial state.
+    fn reset(&mut self);
+
+    /// Get output size of the hasher
+    fn output_size(&self) -> usize;
+
+    /// Clone hasher state into a boxed trait object
+    fn box_clone(&self) -> Box<DynDigest>;
+}
+
+impl<D: Input + FixedOutput + Reset + Clone + 'static> DynDigest for D {
+    fn input(&mut self, data: &[u8]) {
+        Input::input(self, data);
+    }
+
+    fn result_reset(&mut self) -> Box<[u8]> {
+        let res = self.clone().fixed_result().to_vec().into_boxed_slice();
+        Reset::reset(self);
+        res
+    }
+
+    fn result(self: Box<Self>) -> Box<[u8]> {
+        self.fixed_result().to_vec().into_boxed_slice()
+    }
+
+    fn reset(&mut self) {
+        Reset::reset(self);
+    }
+
+    fn output_size(&self) -> usize {
+        <Self as FixedOutput>::OutputSize::to_usize()
+    }
+
+    fn box_clone(&self) -> Box<DynDigest> {
+        Box::new(self.clone())
+    }
+}
+
+impl Clone for Box<DynDigest> {
+    fn clone(&self) -> Self {
+        self.box_clone()
+    }
+}
diff --git a/vendor/digest-0.8.1/src/errors.rs b/vendor/digest-0.8.1/src/errors.rs
new file mode 100644
index 000000000..aa026a21a
--- /dev/null
+++ b/vendor/digest-0.8.1/src/errors.rs
@@ -0,0 +1,20 @@
+use core::fmt;
+#[cfg(feature = "std")]
+use std::error;
+
+/// The error type for variable hasher initialization
+#[derive(Clone, Copy, Debug, Default)]
+pub struct InvalidOutputSize;
+
+impl fmt::Display for InvalidOutputSize {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str("invalid output size")
+    }
+}
+
+#[cfg(feature = "std")]
+impl error::Error for InvalidOutputSize {
+    fn description(&self) -> &str {
+        "invalid output size"
+    }
+}
diff --git a/vendor/digest-0.8.1/src/lib.rs b/vendor/digest-0.8.1/src/lib.rs
new file mode 100644
index 000000000..f03c50107
--- /dev/null
+++ b/vendor/digest-0.8.1/src/lib.rs
@@ -0,0 +1,141 @@
+//! This crate provides traits which describe functionality of cryptographic hash
+//! functions.
+//!
+//! Traits in this repository can be separated into two levels:
+//! - Low level traits: `Input`, `BlockInput`, `Reset`, `FixedOutput`,
+//! `VariableOutput`, `ExtendableOutput`. These traits atomically describe
+//! available functionality of hash function implementations.
+//! - Convenience trait: `Digest`, `DynDigest`. They are wrappers around
+//! low level traits for most common hash-function use-cases.
+//!
+//! Additionally hash functions implement traits from `std`: `Default`, `Clone`,
+//! `Write`. (the latter depends on enabled-by-default `std` crate feature)
+//!
+//! The `Digest` trait is the most commonly used trait.
+#![no_std]
+#![doc(html_logo_url =
+    "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
+pub extern crate generic_array;
+#[cfg(feature = "std")]
+#[macro_use] extern crate std;
+#[cfg(feature = "dev")]
+pub extern crate blobby;
+use generic_array::{GenericArray, ArrayLength};
+#[cfg(feature = "std")]
+use std::vec::Vec;
+
+mod digest;
+mod dyn_digest;
+mod errors;
+#[cfg(feature = "dev")]
+pub mod dev;
+
+pub use errors::InvalidOutputSize;
+pub use digest::Digest;
+#[cfg(feature = "std")]
+pub use dyn_digest::DynDigest;
+
+/// Trait for processing input data
+pub trait Input {
+    /// Digest input data.
+    ///
+    /// This method can be called repeatedly, e.g. for processing streaming
+    /// messages.
+    fn input<B: AsRef<[u8]>>(&mut self, data: B);
+
+    /// Digest input data in a chained manner.
+    fn chain<B: AsRef<[u8]>>(mut self, data: B) -> Self where Self: Sized {
+        self.input(data);
+        self
+    }
+}
+
+/// Trait to indicate that digest function processes data in blocks of size
+/// `BlockSize`.
+///
+/// The main usage of this trait is for implementing HMAC generically.
+pub trait BlockInput {
+    type BlockSize: ArrayLength<u8>;
+}
+
+/// Trait for returning digest result with the fixed size
+pub trait FixedOutput {
+    type OutputSize: ArrayLength<u8>;
+
+    /// Retrieve result and consume hasher instance.
+    fn fixed_result(self) -> GenericArray<u8, Self::OutputSize>;
+}
+
+/// Trait for returning digest result with the variable size
+pub trait VariableOutput: core::marker::Sized {
+    /// Create new hasher instance with the given output size.
+    ///
+    /// It will return `Err(InvalidOutputSize)` in case if hasher can not return
+    /// specified output size. It will always return an error if output size
+    /// equals to zero.
+    fn new(output_size: usize) -> Result<Self, InvalidOutputSize>;
+
+    /// Get output size of the hasher instance provided to the `new` method
+    fn output_size(&self) -> usize;
+
+    /// Retrieve result via closure and consume hasher.
+    ///
+    /// Closure is guaranteed to be called, length of the buffer passed to it
+    /// will be equal to `output_size`.
+    fn variable_result<F: FnOnce(&[u8])>(self, f: F);
+
+    /// Retrieve result into vector and consume hasher.
+    #[cfg(feature = "std")]
+    fn vec_result(self) -> Vec<u8> {
+        let mut buf = Vec::with_capacity(self.output_size());
+        self.variable_result(|res| buf.extend_from_slice(res));
+        buf
+    }
+}
+
+/// Trait for describing readers which are used to extract extendable output
+/// from XOF (extendable-output function) result.
+pub trait XofReader {
+    /// Read output into the `buffer`. Can be called unlimited number of times.
+    fn read(&mut self, buffer: &mut [u8]);
+}
+
+/// Trait which describes extendable-output functions (XOF).
+pub trait ExtendableOutput: core::marker::Sized {
+    type Reader: XofReader;
+
+    /// Retrieve XOF reader and consume hasher instance.
+    fn xof_result(self) -> Self::Reader;
+
+    /// Retrieve result into vector of specified length.
+    #[cfg(feature = "std")]
+    fn vec_result(self, n: usize) -> Vec<u8> {
+        let mut buf = vec![0u8; n];
+        self.xof_result().read(&mut buf);
+        buf
+    }
+}
+
+/// Trait for resetting hash instances
+pub trait Reset {
+    /// Reset hasher instance to its initial state and return current state.
+    fn reset(&mut self);
+}
+
+#[macro_export]
+/// Implements `std::io::Write` trait for implementer of `Input`
+macro_rules! impl_write {
+    ($hasher:ident) => {
+        #[cfg(feature = "std")]
+        impl ::std::io::Write for $hasher {
+            fn write(&mut self, buf: &[u8]) -> ::std::io::Result<usize> {
+                Input::input(self, buf);
+                Ok(buf.len())
+            }
+
+            fn flush(&mut self) -> ::std::io::Result<()> {
+                Ok(())
+            }
+        }
+    }
+}