Merging upstream version 1.71.1+dfsg1.

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

3 files changed, 95 insertions, 4 deletions

diff --git a/vendor/crypto-bigint/tests/const_residue.rs b/vendor/crypto-bigint/tests/const_residue.rs
new file mode 100644
index 000000000..d02bdb44a
--- /dev/null
+++ b/vendor/crypto-bigint/tests/const_residue.rs
@@ -0,0 +1,10 @@
+//! Test to ensure that `const_residue!` works from outside this crate.
+
+use crypto_bigint::{const_residue, impl_modulus, modular::constant_mod::ResidueParams, U64};
+
+impl_modulus!(TestMod, U64, "30e4b8f030ab42f3");
+
+fn _test_fun() {
+    let base = U64::from(2u64);
+    let _base_mod = const_residue!(base, TestMod);
+}
diff --git a/vendor/crypto-bigint/tests/impl_modulus.rs b/vendor/crypto-bigint/tests/impl_modulus.rs
new file mode 100644
index 000000000..98f5fe5d6
--- /dev/null
+++ b/vendor/crypto-bigint/tests/impl_modulus.rs
@@ -0,0 +1,5 @@
+//! Test to ensure that `impl_modulus!` works from outside this crate.
+
+use crypto_bigint::{impl_modulus, U64};
+
+impl_modulus!(TestMod, U64, "30e4b8f030ab42f3");
diff --git a/vendor/crypto-bigint/tests/proptests.rs b/vendor/crypto-bigint/tests/proptests.rs
index 42a3066c6..9f489f0a8 100644
--- a/vendor/crypto-bigint/tests/proptests.rs
+++ b/vendor/crypto-bigint/tests/proptests.rs
@@ -1,7 +1,11 @@
 //! Equivalence tests between `num-bigint` and `crypto-bigint`
 
-use crypto_bigint::{Encoding, U256};
+use crypto_bigint::{
+    modular::runtime_mod::{DynResidue, DynResidueParams},
+    Encoding, Limb, NonZero, Word, U256,
+};
 use num_bigint::BigUint;
+use num_integer::Integer;
 use num_traits::identities::Zero;
 use proptest::prelude::*;
 use std::mem;
@@ -15,9 +19,9 @@ fn to_biguint(uint: &U256) -> BigUint {
 }
 
 fn to_uint(big_uint: BigUint) -> U256 {
-    let mut input = [0u8; U256::BYTE_SIZE];
+    let mut input = [0u8; U256::BYTES];
     let encoded = big_uint.to_bytes_le();
-    let l = encoded.len().min(U256::BYTE_SIZE);
+    let l = encoded.len().min(U256::BYTES);
     input[..l].copy_from_slice(&encoded[..l]);
 
     U256::from_le_slice(&input)
@@ -33,6 +37,11 @@ prop_compose! {
         a.wrapping_rem(&p)
     }
 }
+prop_compose! {
+    fn nonzero_limb()(x in any::<Word>()) -> Limb {
+        if x == 0 { Limb::from(1u32) } else {Limb::from(x)}
+    }
+}
 
 proptest! {
     #[test]
@@ -41,6 +50,16 @@ proptest! {
     }
 
     #[test]
+    fn shl_vartime(a in uint(), shift in any::<u8>()) {
+        let a_bi = to_biguint(&a);
+
+        let expected = to_uint(a_bi << shift);
+        let actual = a.shl_vartime(shift as usize);
+
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
     fn wrapping_add(a in uint(), b in uint()) {
         let a_bi = to_biguint(&a);
         let b_bi = to_biguint(&b);
@@ -131,6 +150,30 @@ proptest! {
     }
 
     #[test]
+    fn div_rem_limb(a in uint(), b in nonzero_limb()) {
+        let a_bi = to_biguint(&a);
+        let b_bi = to_biguint(&U256::from(b));
+
+        let (expected_quo, expected_rem) = a_bi.div_rem(&b_bi);
+        let (actual_quo, actual_rem) = a.div_rem_limb(NonZero::new(b).unwrap());
+        assert_eq!(to_uint(expected_quo), actual_quo);
+        assert_eq!(to_uint(expected_rem), U256::from(actual_rem));
+    }
+
+    #[test]
+    fn div_rem_limb_min_max(a in uint()) {
+        let a_bi = to_biguint(&a);
+
+        for b in [Limb::from(1u32), Limb::MAX] {
+            let b_bi = to_biguint(&U256::from(b));
+            let (expected_quo, expected_rem) = a_bi.div_rem(&b_bi);
+            let (actual_quo, actual_rem) = a.div_rem_limb(NonZero::new(b).unwrap());
+            assert_eq!(to_uint(expected_quo), actual_quo);
+            assert_eq!(to_uint(expected_rem), U256::from(actual_rem));
+        }
+    }
+
+    #[test]
     fn wrapping_rem(a in uint(), b in uint()) {
         let a_bi = to_biguint(&a);
         let b_bi = to_biguint(&b);
@@ -205,5 +248,38 @@ proptest! {
         let mut bytes = a.to_le_bytes();
         bytes.reverse();
         assert_eq!(a, U256::from_be_bytes(bytes));
-}
+    }
+
+    #[test]
+    fn residue_pow(a in uint_mod_p(P), b in uint()) {
+        let a_bi = to_biguint(&a);
+        let b_bi = to_biguint(&b);
+        let p_bi = to_biguint(&P);
+
+        let expected = to_uint(a_bi.modpow(&b_bi, &p_bi));
+
+        let params = DynResidueParams::new(&P);
+        let a_m = DynResidue::new(&a, params);
+        let actual = a_m.pow(&b).retrieve();
+
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn residue_pow_bounded_exp(a in uint_mod_p(P), b in uint(), exponent_bits in any::<u8>()) {
+
+        let b_masked = b & (U256::ONE << exponent_bits.into()).wrapping_sub(&U256::ONE);
+
+        let a_bi = to_biguint(&a);
+        let b_bi = to_biguint(&b_masked);
+        let p_bi = to_biguint(&P);
+
+        let expected = to_uint(a_bi.modpow(&b_bi, &p_bi));
+
+        let params = DynResidueParams::new(&P);
+        let a_m = DynResidue::new(&a, params);
+        let actual = a_m.pow_bounded_exp(&b, exponent_bits.into()).retrieve();
+
+        assert_eq!(expected, actual);
+    }
 }