Merge pull request #31 from typed-io/curve25519-opt

Curve25519 latest round of optimisations
typed-io · Jan 28, 2022 · 3581d0b · 3581d0b
2 parents fe657be + 1050ee1
commit 3581d0b
Show file tree

Hide file tree

Showing 10 changed files with 365 additions and 241 deletions.
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -189,7 +189,7 @@ APPENDIX: How to apply the Apache License to your work.
 Copyright 2006-2009 Graydon Hoare
 Copyright 2009-2013 Mozilla Foundation
 Copyright 2018 Input Output HK
-Copyright 2018-2021 Typed IO
+Copyright 2018-2022 Typed IO
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -1,7 +1,7 @@
 Copyright (c) 2006-2009 Graydon Hoare
 Copyright (c) 2009-2013 Mozilla Foundation
 Copyright (c) 2018 Input Output HK
-Copyright (c) 2018-2021 Typed IO
+Copyright (c) 2018-2022 Typed IO
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

diff --git a/src/curve25519/fe/fe32/mod.rs b/src/curve25519/fe/fe32/mod.rs
@@ -552,6 +552,19 @@ impl Fe {
             h5 as i32, h6 as i32, h7 as i32, h8 as i32, h9 as i32])
     }
 
+    pub(crate) fn negate_mut(&mut self) {
+        self.0[0] = -self.0[0];
+        self.0[1] = -self.0[1];
+        self.0[2] = -self.0[2];
+        self.0[3] = -self.0[3];
+        self.0[4] = -self.0[4];
+        self.0[5] = -self.0[5];
+        self.0[6] = -self.0[6];
+        self.0[7] = -self.0[7];
+        self.0[8] = -self.0[8];
+        self.0[9] = -self.0[9];
+    }
+
     /*
     h = f * f
     Can overlap h with f.

diff --git a/src/curve25519/fe/fe64/mod.rs b/src/curve25519/fe/fe64/mod.rs
@@ -10,6 +10,10 @@ use core::ops::{Add, Mul, Neg, Sub};
 
 pub mod precomp;
 
+// multiple of P
+const FOUR_P0: u64 = 0x1fffffffffffb4;
+const FOUR_P1234: u64 = 0x1ffffffffffffc;
+
 /// Field Element in \Z/(2^255-19)
 #[derive(Clone)]
 pub struct Fe(pub(crate) [u64; 5]);
@@ -90,10 +94,6 @@ impl Sub for &Fe {
 
     #[rustfmt::skip]
     fn sub(self, rhs: &Fe) -> Fe {
-        // multiple of P
-        const FOUR_P0: u64 = 0x1fffffffffffb4;
-        const FOUR_P1234: u64 = 0x1ffffffffffffc;
-
         let Fe([f0, f1, f2, f3, f4]) = *self;
         let Fe([g0, g1, g2, g3, g4]) = *rhs;
 
@@ -110,8 +110,17 @@ impl Sub for &Fe {
 impl Neg for &Fe {
     type Output = Fe;
 
+    #[rustfmt::skip]
     fn neg(self) -> Fe {
-        &Fe::ZERO - &self
+        let Fe([g0, g1, g2, g3, g4]) = *self;
+
+        let mut h0 = FOUR_P0    - g0    ; let c = h0 >> 51; h0 &= MASK;
+        let mut h1 = FOUR_P1234 - g1 + c; let c = h1 >> 51; h1 &= MASK;
+        let mut h2 = FOUR_P1234 - g2 + c; let c = h2 >> 51; h2 &= MASK;
+        let mut h3 = FOUR_P1234 - g3 + c; let c = h3 >> 51; h3 &= MASK;
+        let mut h4 = FOUR_P1234 - g4 + c; let c = h4 >> 51; h4 &= MASK;
+        h0 += c * 19;
+        Fe([h0, h1, h2, h3, h4])
     }
 }
 
@@ -279,6 +288,16 @@ impl Fe {
         Fe([r0, r1, r2, r3, r4])
     }
 
+    #[rustfmt::skip]
+    pub(crate) fn negate_mut(&mut self) {
+        self.0[0] = FOUR_P0    - self.0[0]    ; let c = self.0[0] >> 51; self.0[0] &= MASK;
+        self.0[1] = FOUR_P1234 - self.0[1] + c; let c = self.0[1] >> 51; self.0[1] &= MASK;
+        self.0[2] = FOUR_P1234 - self.0[2] + c; let c = self.0[2] >> 51; self.0[2] &= MASK;
+        self.0[3] = FOUR_P1234 - self.0[3] + c; let c = self.0[3] >> 51; self.0[3] &= MASK;
+        self.0[4] = FOUR_P1234 - self.0[4] + c; let c = self.0[4] >> 51; self.0[4] &= MASK;
+        self.0[0] += c * 19;
+    }
+
     /// Compute the square of the field element
     #[rustfmt::skip]
     pub fn square(&self) -> Fe {