Merging upstream version 1.71.1+dfsg1.

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

1 files changed, 54 insertions, 22 deletions

diff --git a/vendor/p384/src/arithmetic.rs b/vendor/p384/src/arithmetic.rs
index 6ffbcb7b3..09163d445 100644
--- a/vendor/p384/src/arithmetic.rs
+++ b/vendor/p384/src/arithmetic.rs
@@ -1,32 +1,64 @@
 //! Pure Rust implementation of group operations on secp384r1.
 //!
-//! Curve parameters can be found in FIPS 186-4: Digital Signature Standard
-//! (DSS): <https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf>
+//! Curve parameters can be found in [NIST SP 800-186] § G.1.3: Curve P-384.
 //!
-//! See section D.1.2.4: Curve P-384.
+//! [NIST SP 800-186]: https://csrc.nist.gov/publications/detail/sp/800-186/final
 
 #[macro_use]
 mod macros;
 
-pub(crate) mod affine;
 pub(crate) mod field;
-pub(crate) mod projective;
+#[cfg(feature = "hash2curve")]
+mod hash2curve;
 pub(crate) mod scalar;
 
-use self::{
-    affine::AffinePoint,
-    field::{FieldElement, MODULUS},
-    projective::ProjectivePoint,
-    scalar::Scalar,
-};
-
-/// a = -3 (0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc)
-const CURVE_EQUATION_A: FieldElement = FieldElement::ZERO
-    .sub(&FieldElement::ONE)
-    .sub(&FieldElement::ONE)
-    .sub(&FieldElement::ONE);
-
-/// b = b3312fa7 e23ee7e4 988e056b e3f82d19 181d9c6e fe814112
-///     0314088f 5013875a c656398d 8a2ed19d 2a85c8ed d3ec2aef
-const CURVE_EQUATION_B: FieldElement =
-    FieldElement::from_be_hex("b3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875ac656398d8a2ed19d2a85c8edd3ec2aef");
+use self::{field::FieldElement, scalar::Scalar};
+use crate::NistP384;
+use elliptic_curve::{CurveArithmetic, PrimeCurveArithmetic};
+use primeorder::{point_arithmetic, PrimeCurveParams};
+
+/// Elliptic curve point in affine coordinates.
+pub type AffinePoint = primeorder::AffinePoint<NistP384>;
+
+/// Elliptic curve point in projective coordinates.
+pub type ProjectivePoint = primeorder::ProjectivePoint<NistP384>;
+
+impl CurveArithmetic for NistP384 {
+    type AffinePoint = AffinePoint;
+    type ProjectivePoint = ProjectivePoint;
+    type Scalar = Scalar;
+}
+
+impl PrimeCurveArithmetic for NistP384 {
+    type CurveGroup = ProjectivePoint;
+}
+
+/// Adapted from [NIST SP 800-186] § G.1.3: Curve P-384.
+///
+/// [NIST SP 800-186]: https://csrc.nist.gov/publications/detail/sp/800-186/final
+impl PrimeCurveParams for NistP384 {
+    type FieldElement = FieldElement;
+    type PointArithmetic = point_arithmetic::EquationAIsMinusThree;
+
+    /// a = -3 (0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc)
+    const EQUATION_A: FieldElement = FieldElement::from_u64(3).neg();
+
+    /// b = b3312fa7 e23ee7e4 988e056b e3f82d19 181d9c6e fe814112
+    ///     0314088f 5013875a c656398d 8a2ed19d 2a85c8ed d3ec2aef
+    const EQUATION_B: FieldElement = FieldElement::from_hex("b3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875ac656398d8a2ed19d2a85c8edd3ec2aef");
+
+    /// Base point of P-384.
+    ///
+    /// Defined in NIST SP 800-186 § G.1.3: Curve P-384.
+    ///
+    /// ```text
+    /// Gₓ = aa87ca22 be8b0537 8eb1c71e f320ad74 6e1d3b62 8ba79b98
+    ///      59f741e0 82542a38 5502f25d bf55296c 3a545e38 72760ab7
+    /// Gᵧ = 3617de4a 96262c6f 5d9e98bf 9292dc29 f8f41dbd 289a147c
+    ///      e9da3113 b5f0b8c0 0a60b1ce 1d7e819d 7a431d7c 90ea0e5f
+    /// ```
+    const GENERATOR: (FieldElement, FieldElement) = (
+        FieldElement::from_hex("aa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a385502f25dbf55296c3a545e3872760ab7"),
+        FieldElement::from_hex("3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b1ce1d7e819d7a431d7c90ea0e5f"),
+    );
+}