Merging upstream version 1.67.1+dfsg1.

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

1 files changed, 49 insertions, 5 deletions

diff --git a/vendor/digest/src/mac.rs b/vendor/digest/src/mac.rs
index 76f8df2c9..1c31359ea 100644
--- a/vendor/digest/src/mac.rs
+++ b/vendor/digest/src/mac.rs
@@ -11,7 +11,7 @@ use subtle::{Choice, ConstantTimeEq};
 #[cfg_attr(docsrs, doc(cfg(feature = "mac")))]
 pub trait MacMarker {}
 
-/// Convinience wrapper trait covering functionality of Message Authentication algorithms.
+/// Convenience wrapper trait covering functionality of Message Authentication algorithms.
 ///
 /// This trait wraps [`KeyInit`], [`Update`], [`FixedOutput`], and [`MacMarker`]
 /// traits and provides additional convenience methods.
@@ -59,6 +59,12 @@ pub trait Mac: OutputSizeUser + Sized {
     /// Check if tag/code value is correct for the processed input.
     fn verify(self, tag: &Output<Self>) -> Result<(), MacError>;
 
+    /// Check if tag/code value is correct for the processed input and reset
+    /// [`Mac`] instance.
+    fn verify_reset(&mut self, tag: &Output<Self>) -> Result<(), MacError>
+    where
+        Self: FixedOutputReset;
+
     /// Check truncated tag correctness using all bytes
     /// of calculated tag.
     ///
@@ -66,6 +72,15 @@ pub trait Mac: OutputSizeUser + Sized {
     /// to MAC's output.
     fn verify_slice(self, tag: &[u8]) -> Result<(), MacError>;
 
+    /// Check truncated tag correctness using all bytes
+    /// of calculated tag and reset [`Mac`] instance.
+    ///
+    /// Returns `Error` if `tag` is not valid or not equal in length
+    /// to MAC's output.
+    fn verify_slice_reset(&mut self, tag: &[u8]) -> Result<(), MacError>
+    where
+        Self: FixedOutputReset;
+
     /// Check truncated tag correctness using left side bytes
     /// (i.e. `tag[..n]`) of calculated tag.
     ///
@@ -138,13 +153,42 @@ impl<T: Update + FixedOutput + MacMarker> Mac for T {
     }
 
     #[inline]
+    fn verify_reset(&mut self, tag: &Output<Self>) -> Result<(), MacError>
+    where
+        Self: FixedOutputReset,
+    {
+        if self.finalize_reset() == tag.into() {
+            Ok(())
+        } else {
+            Err(MacError)
+        }
+    }
+
+    #[inline]
     fn verify_slice(self, tag: &[u8]) -> Result<(), MacError> {
         let n = tag.len();
         if n != Self::OutputSize::USIZE {
             return Err(MacError);
         }
         let choice = self.finalize_fixed().ct_eq(tag);
-        if choice.unwrap_u8() == 1 {
+        if choice.into() {
+            Ok(())
+        } else {
+            Err(MacError)
+        }
+    }
+
+    #[inline]
+    fn verify_slice_reset(&mut self, tag: &[u8]) -> Result<(), MacError>
+    where
+        Self: FixedOutputReset,
+    {
+        let n = tag.len();
+        if n != Self::OutputSize::USIZE {
+            return Err(MacError);
+        }
+        let choice = self.finalize_fixed_reset().ct_eq(tag);
+        if choice.into() {
             Ok(())
         } else {
             Err(MacError)
@@ -158,7 +202,7 @@ impl<T: Update + FixedOutput + MacMarker> Mac for T {
         }
         let choice = self.finalize_fixed()[..n].ct_eq(tag);
 
-        if choice.unwrap_u8() == 1 {
+        if choice.into() {
             Ok(())
         } else {
             Err(MacError)
@@ -173,7 +217,7 @@ impl<T: Update + FixedOutput + MacMarker> Mac for T {
         let m = Self::OutputSize::USIZE - n;
         let choice = self.finalize_fixed()[m..].ct_eq(tag);
 
-        if choice.unwrap_u8() == 1 {
+        if choice.into() {
             Ok(())
         } else {
             Err(MacError)
@@ -239,7 +283,7 @@ impl<T: OutputSizeUser> ConstantTimeEq for CtOutput<T> {
 impl<T: OutputSizeUser> PartialEq for CtOutput<T> {
     #[inline(always)]
     fn eq(&self, x: &CtOutput<T>) -> bool {
-        self.ct_eq(x).unwrap_u8() == 1
+        self.ct_eq(x).into()
     }
 }