Merging upstream version 1.71.1+dfsg1.

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

2 files changed, 24 insertions, 31 deletions

diff --git a/vendor/crypto-bigint/src/uint/encoding/der.rs b/vendor/crypto-bigint/src/uint/encoding/der.rs
index cf1b9c31e..dcd766b2b 100644
--- a/vendor/crypto-bigint/src/uint/encoding/der.rs
+++ b/vendor/crypto-bigint/src/uint/encoding/der.rs
@@ -1,69 +1,64 @@
-//! Support for decoding/encoding [`UInt`] as an ASN.1 DER `INTEGER`.
+//! Support for decoding/encoding [`Uint`] as an ASN.1 DER `INTEGER`.
 
-use crate::{generic_array::GenericArray, ArrayEncoding, UInt};
+use crate::{generic_array::GenericArray, ArrayEncoding, Uint};
 use ::der::{
-    asn1::{AnyRef, UIntRef},
+    asn1::{AnyRef, UintRef},
     DecodeValue, EncodeValue, FixedTag, Length, Tag,
 };
 
-#[cfg_attr(docsrs, doc(cfg(feature = "der")))]
-impl<'a, const LIMBS: usize> TryFrom<AnyRef<'a>> for UInt<LIMBS>
+impl<'a, const LIMBS: usize> TryFrom<AnyRef<'a>> for Uint<LIMBS>
 where
-    UInt<LIMBS>: ArrayEncoding,
+    Uint<LIMBS>: ArrayEncoding,
 {
     type Error = der::Error;
 
-    fn try_from(any: AnyRef<'a>) -> der::Result<UInt<LIMBS>> {
-        UIntRef::try_from(any)?.try_into()
+    fn try_from(any: AnyRef<'a>) -> der::Result<Uint<LIMBS>> {
+        UintRef::try_from(any)?.try_into()
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "der")))]
-impl<'a, const LIMBS: usize> TryFrom<UIntRef<'a>> for UInt<LIMBS>
+impl<'a, const LIMBS: usize> TryFrom<UintRef<'a>> for Uint<LIMBS>
 where
-    UInt<LIMBS>: ArrayEncoding,
+    Uint<LIMBS>: ArrayEncoding,
 {
     type Error = der::Error;
 
-    fn try_from(bytes: UIntRef<'a>) -> der::Result<UInt<LIMBS>> {
+    fn try_from(bytes: UintRef<'a>) -> der::Result<Uint<LIMBS>> {
         let mut array = GenericArray::default();
         let offset = array.len().saturating_sub(bytes.len().try_into()?);
         array[offset..].copy_from_slice(bytes.as_bytes());
-        Ok(UInt::from_be_byte_array(array))
+        Ok(Uint::from_be_byte_array(array))
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "der")))]
-impl<'a, const LIMBS: usize> DecodeValue<'a> for UInt<LIMBS>
+impl<'a, const LIMBS: usize> DecodeValue<'a> for Uint<LIMBS>
 where
-    UInt<LIMBS>: ArrayEncoding,
+    Uint<LIMBS>: ArrayEncoding,
 {
     fn decode_value<R: der::Reader<'a>>(reader: &mut R, header: der::Header) -> der::Result<Self> {
-        UIntRef::decode_value(reader, header)?.try_into()
+        UintRef::decode_value(reader, header)?.try_into()
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "der")))]
-impl<const LIMBS: usize> EncodeValue for UInt<LIMBS>
+impl<const LIMBS: usize> EncodeValue for Uint<LIMBS>
 where
-    UInt<LIMBS>: ArrayEncoding,
+    Uint<LIMBS>: ArrayEncoding,
 {
     fn value_len(&self) -> der::Result<Length> {
         // TODO(tarcieri): more efficient length calculation
         let array = self.to_be_byte_array();
-        UIntRef::new(&array)?.value_len()
+        UintRef::new(&array)?.value_len()
     }
 
-    fn encode_value(&self, encoder: &mut dyn der::Writer) -> der::Result<()> {
+    fn encode_value(&self, encoder: &mut impl der::Writer) -> der::Result<()> {
         let array = self.to_be_byte_array();
-        UIntRef::new(&array)?.encode_value(encoder)
+        UintRef::new(&array)?.encode_value(encoder)
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "der")))]
-impl<const LIMBS: usize> FixedTag for UInt<LIMBS>
+impl<const LIMBS: usize> FixedTag for Uint<LIMBS>
 where
-    UInt<LIMBS>: ArrayEncoding,
+    Uint<LIMBS>: ArrayEncoding,
 {
     const TAG: Tag = Tag::Integer;
 }
diff --git a/vendor/crypto-bigint/src/uint/encoding/rlp.rs b/vendor/crypto-bigint/src/uint/encoding/rlp.rs
index 8a10170d5..0f85bc350 100644
--- a/vendor/crypto-bigint/src/uint/encoding/rlp.rs
+++ b/vendor/crypto-bigint/src/uint/encoding/rlp.rs
@@ -1,10 +1,9 @@
 //! Recursive Length Prefix (RLP) encoding support.
 
-use crate::{Encoding, UInt};
+use crate::{Encoding, Uint};
 use rlp::{DecoderError, Rlp, RlpStream};
 
-#[cfg_attr(docsrs, doc(cfg(feature = "rlp")))]
-impl<const LIMBS: usize> rlp::Encodable for UInt<LIMBS>
+impl<const LIMBS: usize> rlp::Encodable for Uint<LIMBS>
 where
     Self: Encoding,
 {
@@ -20,8 +19,7 @@ where
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "rlp")))]
-impl<const LIMBS: usize> rlp::Decodable for UInt<LIMBS>
+impl<const LIMBS: usize> rlp::Decodable for Uint<LIMBS>
 where
     Self: Encoding,
     <Self as Encoding>::Repr: Default,