Merge branch 'master' into fq2_neg_nonresidue

bls12_377/src/fields/fq2.rs

@@ -25,6 +25,7 @@ impl Fp2Parameters for Fq2Parameters {
         field_new!(Fq, "-1"),
     ];
 
+    // Mul by -5
     #[inline(always)]
     fn mul_fp_by_nonresidue(fe: &Self::Fp) -> Self::Fp {
         let original = fe;
@@ -32,6 +33,35 @@ impl Fp2Parameters for Fq2Parameters {
         fe.double_in_place();
         fe - original
     }
+
+    // x + -5 * y, computed as x - 5*y
+    #[inline(always)]
+    fn add_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        // c becomes 5 * y
+        let mut c = y.double();
+        c.double_in_place();
+        c += y;
+        *x - c
+    }
+
+    // x + y + (-5 * y), computed as x - 4*y
+    #[inline(always)]
+    fn add_and_mul_fp_by_nonresidue_plus_one(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        // c becomes 4 * y
+        let mut c = y.double();
+        c.double_in_place();
+        *x - c
+    }
+
+    // x - (-5 * y), computed as x + 5*y
+    #[inline(always)]
+    fn sub_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        // c becomes 5 * y
+        let mut c = y.double();
+        c.double_in_place();
+        c += y;
+        *x + c
+    }
 }
 
 pub const FQ2_ZERO: Fq2 = field_new!(Fq2, FQ_ZERO, FQ_ZERO);

bls12_381/src/fields/fq2.rs

@@ -29,6 +29,18 @@ impl Fp2Parameters for Fq2Parameters {
     fn mul_fp_by_nonresidue(fp: &Self::Fp) -> Self::Fp {
         -(*fp)
     }
+
+    // x + -1 * y, computed as x - y
+    #[inline(always)]
+    fn add_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        *x - y
+    }
+
+    // x - (-1 * y), computed as x + y
+    #[inline(always)]
+    fn sub_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        *x + y
+    }
 }
 
 pub const FQ2_ZERO: Fq2 = field_new!(Fq2, FQ_ZERO, FQ_ZERO);

bn254/src/fields/fq2.rs

@@ -32,6 +32,18 @@ impl Fp2Parameters for Fq2Parameters {
     fn mul_fp_by_nonresidue(fe: &Self::Fp) -> Self::Fp {
         -(*fe)
     }
+
+    // x + -1 * y, computed as x - y
+    #[inline(always)]
+    fn add_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        *x - y
+    }
+
+    // x - (-1 * y), computed as x + y
+    #[inline(always)]
+    fn sub_and_mul_fp_by_nonresidue(x: &Self::Fp, y: &Self::Fp) -> Self::Fp {
+        *x + y
+    }
 }
 
 pub const FQ2_ZERO: Fq2 = field_new!(Fq2, FQ_ZERO, FQ_ZERO);