2017-10-23 21:03:23 +00:00
|
|
|
// -*- mode: rust; -*-
|
|
|
|
|
//
|
|
|
|
|
// This file is part of curve25519-dalek.
|
|
|
|
|
// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
|
|
|
|
|
// See LICENSE for licensing information.
|
|
|
|
|
//
|
|
|
|
|
// Authors:
|
|
|
|
|
// - Isis Agora Lovecruft <isis@patternsinthevoid.net>
|
|
|
|
|
// - Henry de Valence <hdevalence@hdevalence.ca>
|
|
|
|
|
|
|
|
|
|
//! Extended Twisted Edwards for Curve25519, using AVX2.
|
|
|
|
|
|
|
|
|
|
// just going to own it
|
|
|
|
|
#![allow(bad_style)]
|
|
|
|
|
|
2018-03-19 18:15:52 +00:00
|
|
|
use core::convert::From;
|
|
|
|
|
use core::ops::{Index, Add, Sub, Mul, Neg};
|
|
|
|
|
use core::borrow::Borrow;
|
2017-10-23 21:03:23 +00:00
|
|
|
|
2018-04-04 00:58:23 +00:00
|
|
|
use core::simd::{IntoBits, u32x8, i32x8};
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
use subtle::ConditionallyAssignable;
|
2018-02-07 00:47:30 +00:00
|
|
|
use subtle::Choice;
|
2017-10-23 21:03:23 +00:00
|
|
|
|
|
|
|
|
use edwards;
|
2017-11-10 00:37:50 +00:00
|
|
|
use scalar::Scalar;
|
2018-03-27 00:35:08 +00:00
|
|
|
use scalar_mul::window::{LookupTable, OddLookupTable};
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
use traits::Identity;
|
2017-10-23 21:03:23 +00:00
|
|
|
|
2018-04-04 00:58:23 +00:00
|
|
|
use backend::avx2::field::{D_LANES, Lanes, FieldElement32x4};
|
2017-12-18 19:42:53 +00:00
|
|
|
|
2017-11-30 20:39:23 +00:00
|
|
|
use backend::avx2;
|
|
|
|
|
|
2017-10-23 21:03:23 +00:00
|
|
|
/// A point on Curve25519, represented in an AVX2-friendly format.
|
2017-11-10 00:37:50 +00:00
|
|
|
#[derive(Copy, Clone, Debug)]
|
2018-01-25 20:00:40 +00:00
|
|
|
pub struct ExtendedPoint(pub(super) FieldElement32x4);
|
2017-10-23 21:03:23 +00:00
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl From<edwards::EdwardsPoint> for ExtendedPoint {
|
|
|
|
|
fn from(P: edwards::EdwardsPoint) -> ExtendedPoint {
|
|
|
|
|
ExtendedPoint(FieldElement32x4::new(&P.X, &P.Y, &P.Z, &P.T))
|
2017-10-23 21:03:23 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl From<ExtendedPoint> for edwards::EdwardsPoint {
|
|
|
|
|
fn from(P: ExtendedPoint) -> edwards::EdwardsPoint {
|
2017-10-23 21:03:23 +00:00
|
|
|
let tmp = P.0.split();
|
2018-01-25 02:56:38 +00:00
|
|
|
edwards::EdwardsPoint{X: tmp[0], Y: tmp[1], Z: tmp[2], T: tmp[3]}
|
2017-10-23 21:03:23 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl ConditionallyAssignable for ExtendedPoint {
|
2018-02-07 00:47:30 +00:00
|
|
|
fn conditional_assign(&mut self, other: &ExtendedPoint, choice: Choice) {
|
2017-11-10 00:37:50 +00:00
|
|
|
self.0.conditional_assign(&other.0, choice);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl Default for ExtendedPoint {
|
|
|
|
|
fn default() -> ExtendedPoint {
|
|
|
|
|
ExtendedPoint::identity()
|
2017-12-15 21:56:20 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl Identity for ExtendedPoint {
|
|
|
|
|
fn identity() -> ExtendedPoint {
|
|
|
|
|
ExtendedPoint(FieldElement32x4([
|
2017-11-10 00:37:50 +00:00
|
|
|
u32x8::new(0,1,0,0,1,0,0,0),
|
|
|
|
|
u32x8::splat(0),
|
|
|
|
|
u32x8::splat(0),
|
|
|
|
|
u32x8::splat(0),
|
|
|
|
|
u32x8::splat(0),
|
|
|
|
|
]))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl ExtendedPoint {
|
2018-03-26 22:54:13 +00:00
|
|
|
pub fn double(&self) -> ExtendedPoint {
|
2017-11-10 00:37:50 +00:00
|
|
|
unsafe {
|
2018-04-04 00:58:23 +00:00
|
|
|
use core::arch::x86_64::_mm256_permute2x128_si256;
|
|
|
|
|
use core::arch::x86_64::_mm256_permutevar8x32_epi32;
|
|
|
|
|
use core::arch::x86_64::_mm256_blend_epi32;
|
|
|
|
|
use core::arch::x86_64::_mm256_shuffle_epi32;
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
let P = &self.0;
|
|
|
|
|
|
|
|
|
|
let mut t0 = FieldElement32x4::zero();
|
|
|
|
|
let mut t1 = FieldElement32x4::zero();
|
|
|
|
|
|
2018-01-03 20:34:25 +00:00
|
|
|
// Want to compute (X1 Y1 Z1 X1+Y1).
|
|
|
|
|
// Not sure how to do this less expensively than computing
|
|
|
|
|
// (X1 Y1 Z1 T1) --(256bit shuffle)--> (X1 Y1 X1 Y1)
|
|
|
|
|
// (X1 Y1 X1 Y1) --(2x128b shuffle)--> (Y1 X1 Y1 X1)
|
|
|
|
|
// and then adding.
|
|
|
|
|
|
2017-11-10 00:37:50 +00:00
|
|
|
// Set t0 = (X1 Y1 X1 Y1)
|
2018-04-04 00:58:23 +00:00
|
|
|
t0.0[0] = _mm256_permute2x128_si256(P.0[0].into_bits(), P.0[0].into_bits(), 0b0000_0000).into_bits();
|
|
|
|
|
t0.0[1] = _mm256_permute2x128_si256(P.0[1].into_bits(), P.0[1].into_bits(), 0b0000_0000).into_bits();
|
|
|
|
|
t0.0[2] = _mm256_permute2x128_si256(P.0[2].into_bits(), P.0[2].into_bits(), 0b0000_0000).into_bits();
|
|
|
|
|
t0.0[3] = _mm256_permute2x128_si256(P.0[3].into_bits(), P.0[3].into_bits(), 0b0000_0000).into_bits();
|
|
|
|
|
t0.0[4] = _mm256_permute2x128_si256(P.0[4].into_bits(), P.0[4].into_bits(), 0b0000_0000).into_bits();
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
// Set t1 = (Y1 X1 Y1 X1)
|
2018-04-04 00:58:23 +00:00
|
|
|
t1.0[0] = _mm256_shuffle_epi32(t0.0[0].into_bits(), 0b10_11_00_01).into_bits();
|
|
|
|
|
t1.0[1] = _mm256_shuffle_epi32(t0.0[1].into_bits(), 0b10_11_00_01).into_bits();
|
|
|
|
|
t1.0[2] = _mm256_shuffle_epi32(t0.0[2].into_bits(), 0b10_11_00_01).into_bits();
|
|
|
|
|
t1.0[3] = _mm256_shuffle_epi32(t0.0[3].into_bits(), 0b10_11_00_01).into_bits();
|
|
|
|
|
t1.0[4] = _mm256_shuffle_epi32(t0.0[4].into_bits(), 0b10_11_00_01).into_bits();
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
// Set t0 = (X1+Y1 X1+Y1 X1+Y1 X1+Y1)
|
|
|
|
|
t0.0[0] = t0.0[0] + t1.0[0];
|
|
|
|
|
t0.0[1] = t0.0[1] + t1.0[1];
|
|
|
|
|
t0.0[2] = t0.0[2] + t1.0[2];
|
|
|
|
|
t0.0[3] = t0.0[3] + t1.0[3];
|
|
|
|
|
t0.0[4] = t0.0[4] + t1.0[4];
|
|
|
|
|
|
|
|
|
|
// Set t0 = (X1 Y1 Z1 X1+Y1)
|
2018-01-03 20:34:25 +00:00
|
|
|
// why does this intrinsic take an i32 for the imm8 ???
|
2018-04-04 00:58:23 +00:00
|
|
|
t0.0[0] = _mm256_blend_epi32(P.0[0].into_bits(), t0.0[0].into_bits(), D_LANES as i32).into_bits();
|
|
|
|
|
t0.0[1] = _mm256_blend_epi32(P.0[1].into_bits(), t0.0[1].into_bits(), D_LANES as i32).into_bits();
|
|
|
|
|
t0.0[2] = _mm256_blend_epi32(P.0[2].into_bits(), t0.0[2].into_bits(), D_LANES as i32).into_bits();
|
|
|
|
|
t0.0[3] = _mm256_blend_epi32(P.0[3].into_bits(), t0.0[3].into_bits(), D_LANES as i32).into_bits();
|
|
|
|
|
t0.0[4] = _mm256_blend_epi32(P.0[4].into_bits(), t0.0[4].into_bits(), D_LANES as i32).into_bits();
|
2017-11-10 00:37:50 +00:00
|
|
|
|
2018-01-03 20:34:25 +00:00
|
|
|
// Set t1 = t0^2, negating the D values
|
2018-04-04 00:58:23 +00:00
|
|
|
t1 = t0.square_and_negate_D();
|
2017-11-10 00:37:50 +00:00
|
|
|
|
2017-12-09 01:49:35 +00:00
|
|
|
// Now t1 = (S1 S2 S3 -S4)
|
2017-11-10 00:37:50 +00:00
|
|
|
|
2018-04-04 00:58:23 +00:00
|
|
|
let c0 = u32x8::new(0,0,2,2,0,0,2,2).into_bits(); // (ABCD) -> (AAAA)
|
|
|
|
|
let c1 = u32x8::new(1,1,3,3,1,1,3,3).into_bits(); // (ABCD) -> (BBBB)
|
2017-11-10 00:37:50 +00:00
|
|
|
|
2017-12-18 22:48:44 +00:00
|
|
|
// See discussion of bounds in the module-level documentation.
|
|
|
|
|
//
|
|
|
|
|
// We want to compute
|
2018-01-31 02:19:53 +00:00
|
|
|
//
|
|
|
|
|
// + | S1 | S1 | S1 | S1 |
|
|
|
|
|
// + | S2 | | | S2 |
|
|
|
|
|
// + | | | S3 | |
|
|
|
|
|
// + | | | S3 | |
|
2017-12-09 01:49:35 +00:00
|
|
|
// + | | | |-S4 |
|
2018-01-31 02:19:53 +00:00
|
|
|
// + | | 2p | 2p | |
|
|
|
|
|
// - | | S2 | S2 | |
|
|
|
|
|
// =======================
|
|
|
|
|
// S5 S6 S8 S9
|
2017-11-10 00:37:50 +00:00
|
|
|
//
|
|
|
|
|
for i in 0..5 {
|
2018-04-04 00:58:23 +00:00
|
|
|
let zero = u32x8::splat(0).into_bits();
|
|
|
|
|
let S1: u32x8 = _mm256_permutevar8x32_epi32(t1.0[i].into_bits(), c0).into_bits();
|
|
|
|
|
let S2: u32x8 = _mm256_permutevar8x32_epi32(t1.0[i].into_bits(), c1).into_bits();
|
|
|
|
|
let S3_2: u32x8 = _mm256_blend_epi32(zero, (t1.0[i] + t1.0[i]).into_bits(), 0b01010000).into_bits();
|
2017-12-09 01:49:35 +00:00
|
|
|
// tmp0 = (0 0 2*S3 -S4)
|
2018-04-04 00:58:23 +00:00
|
|
|
let tmp0: u32x8 = _mm256_blend_epi32(S3_2.into_bits(), t1.0[i].into_bits(), 0b10100000).into_bits();
|
2018-01-03 20:13:52 +00:00
|
|
|
t0.0[i] = (avx2::constants::P_TIMES_2_MASKED.0[i] + tmp0) + S1;
|
2018-04-04 00:58:23 +00:00
|
|
|
t0.0[i] = t0.0[i] + _mm256_blend_epi32(zero, S2.into_bits(), 0b10100101).into_bits();
|
|
|
|
|
t0.0[i] = t0.0[i] - _mm256_blend_epi32(S2.into_bits(), zero, 0b10100101).into_bits();
|
2017-11-10 00:37:50 +00:00
|
|
|
}
|
|
|
|
|
|
2018-04-04 00:58:23 +00:00
|
|
|
let c0 = u32x8::new(4,0,6,2,4,0,6,2).into_bits(); // (ABCD) -> (CACA)
|
|
|
|
|
let c1 = u32x8::new(5,1,7,3,1,5,3,7).into_bits(); // (ABCD) -> (DBBD)
|
2017-11-10 00:37:50 +00:00
|
|
|
|
|
|
|
|
for i in 0..5 {
|
|
|
|
|
let tmp = t0.0[i];
|
2018-04-04 00:58:23 +00:00
|
|
|
t0.0[i] = _mm256_permutevar8x32_epi32(tmp.into_bits(), c0).into_bits();
|
|
|
|
|
t1.0[i] = _mm256_permutevar8x32_epi32(tmp.into_bits(), c1).into_bits();
|
2017-11-10 00:37:50 +00:00
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
ExtendedPoint(&t0 * &t1)
|
2017-11-10 00:37:50 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-22 18:35:42 +00:00
|
|
|
pub fn mul_by_pow_2(&self, k: u32) -> ExtendedPoint {
|
2018-01-25 20:00:40 +00:00
|
|
|
let mut tmp: ExtendedPoint = *self;
|
2017-11-10 00:37:50 +00:00
|
|
|
for _ in 0..k {
|
|
|
|
|
tmp = tmp.double();
|
|
|
|
|
}
|
|
|
|
|
tmp
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-27 00:35:08 +00:00
|
|
|
/// A cached point with some precomputed variables used for readdition.
|
|
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
|
|
|
pub struct CachedPoint(pub(super) FieldElement32x4);
|
|
|
|
|
|
|
|
|
|
impl From<ExtendedPoint> for CachedPoint {
|
|
|
|
|
fn from(P: ExtendedPoint) -> CachedPoint {
|
|
|
|
|
let mut x = P.0;
|
|
|
|
|
|
|
|
|
|
// x = (S2 S3 Z2 T2)
|
2018-04-04 00:58:23 +00:00
|
|
|
x.diff_sum(Lanes::AB);
|
2018-03-27 00:35:08 +00:00
|
|
|
|
|
|
|
|
// x = (121666*S2 121666*S3 2*121666*Z2 2*121665*T2)
|
|
|
|
|
x.scale_by_curve_constants();
|
|
|
|
|
|
|
|
|
|
// x = (121666*S2 121666*S3 2*121666*Z2 -2*121665*T2)
|
2018-04-04 00:58:23 +00:00
|
|
|
x.negate_D();
|
2018-03-27 00:35:08 +00:00
|
|
|
|
|
|
|
|
CachedPoint(x)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Default for CachedPoint {
|
|
|
|
|
fn default() -> CachedPoint {
|
|
|
|
|
CachedPoint::identity()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Identity for CachedPoint {
|
|
|
|
|
fn identity() -> CachedPoint {
|
|
|
|
|
CachedPoint(FieldElement32x4([
|
|
|
|
|
u32x8::new(121647, 121666, 0, 0, 243332, 67108845, 0, 33554431),
|
|
|
|
|
u32x8::new(67108864, 0, 33554431, 0, 0, 67108863, 0, 33554431),
|
|
|
|
|
u32x8::new(67108863, 0, 33554431, 0, 0, 67108863, 0, 33554431),
|
|
|
|
|
u32x8::new(67108863, 0, 33554431, 0, 0, 67108863, 0, 33554431),
|
|
|
|
|
u32x8::new(67108863, 0, 33554431, 0, 0, 67108863, 0, 33554431),
|
|
|
|
|
]))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl ConditionallyAssignable for CachedPoint {
|
|
|
|
|
fn conditional_assign(&mut self, other: &CachedPoint, choice: Choice) {
|
|
|
|
|
self.0.conditional_assign(&other.0, choice);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a> Neg for &'a CachedPoint {
|
|
|
|
|
type Output = CachedPoint;
|
|
|
|
|
|
|
|
|
|
fn neg(self) -> CachedPoint {
|
|
|
|
|
let mut neg = *self;
|
|
|
|
|
neg.0.swap_AB();
|
2018-04-04 00:58:23 +00:00
|
|
|
neg.0.negate_D_lazy();
|
2018-03-27 00:35:08 +00:00
|
|
|
neg
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-25 20:00:40 +00:00
|
|
|
impl<'a, 'b> Add<&'b CachedPoint> for &'a ExtendedPoint {
|
|
|
|
|
type Output = ExtendedPoint;
|
2017-12-18 19:42:53 +00:00
|
|
|
|
|
|
|
|
/// Uses a slight tweak of the parallel unified formulas of HWCD'08
|
2018-01-25 20:00:40 +00:00
|
|
|
fn add(self, other: &'b CachedPoint) -> ExtendedPoint {
|
2017-12-18 19:42:53 +00:00
|
|
|
unsafe {
|
2018-04-04 00:58:23 +00:00
|
|
|
use core::arch::x86_64::_mm256_permutevar8x32_epi32;
|
2017-12-18 19:42:53 +00:00
|
|
|
|
|
|
|
|
let mut tmp = self.0;
|
|
|
|
|
|
|
|
|
|
// tmp = (Y1-X1 Y1+X1 Z1 T1) = (S0 S1 Z1 T1)
|
2018-04-04 00:58:23 +00:00
|
|
|
tmp.diff_sum(Lanes::AB);
|
2017-12-18 19:42:53 +00:00
|
|
|
|
|
|
|
|
// tmp = (S0*S2' S1*S3' Z1*Z2' T1*T2') = (S8 S9 S10 S11)
|
|
|
|
|
tmp = &tmp * &other.0;
|
|
|
|
|
|
|
|
|
|
// tmp = (S8 S9 S11 S10)
|
|
|
|
|
tmp.swap_CD();
|
|
|
|
|
|
|
|
|
|
// tmp = (S9-S8 S9+S8 S10-S11 S10+S11) = (S12 S13 S14 S15)
|
2018-04-04 00:58:23 +00:00
|
|
|
tmp.diff_sum(Lanes::ALL);
|
2017-12-18 19:42:53 +00:00
|
|
|
|
|
|
|
|
let c0 = u32x8::new(0,5,2,7,5,0,7,2); // (ABCD) -> (ADDA)
|
|
|
|
|
let c1 = u32x8::new(4,1,6,3,4,1,6,3); // (ABCD) -> (CBCB)
|
|
|
|
|
|
|
|
|
|
// set t0 = (S12 S15 S15 S12)
|
|
|
|
|
// set t1 = (S14 S13 S14 S13)
|
|
|
|
|
let mut t0 = FieldElement32x4::zero();
|
|
|
|
|
let mut t1 = FieldElement32x4::zero();
|
|
|
|
|
for i in 0..5 {
|
2018-04-04 00:58:23 +00:00
|
|
|
t0.0[i] = _mm256_permutevar8x32_epi32(tmp.0[i].into_bits(), c0.into_bits()).into_bits();
|
|
|
|
|
t1.0[i] = _mm256_permutevar8x32_epi32(tmp.0[i].into_bits(), c1.into_bits()).into_bits();
|
2017-12-18 19:42:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// return (S12*S14 S15*S13 S15*S14 S12*S13) = (X3 Y3 Z3 T3)
|
2018-01-25 20:00:40 +00:00
|
|
|
ExtendedPoint(&t0 * &t1)
|
2017-12-18 19:42:53 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-26 22:54:13 +00:00
|
|
|
impl<'a, 'b> Sub<&'b CachedPoint> for &'a ExtendedPoint {
|
|
|
|
|
type Output = ExtendedPoint;
|
|
|
|
|
|
|
|
|
|
/// Implement subtraction by negating the point and adding.
|
|
|
|
|
///
|
|
|
|
|
/// Empirically, this seems about the same cost as a custom subtraction impl (maybe because the
|
|
|
|
|
/// benefit is cancelled by increased code size?)
|
|
|
|
|
fn sub(self, other: &'b CachedPoint) -> ExtendedPoint {
|
|
|
|
|
self + &(-other)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-27 00:35:08 +00:00
|
|
|
impl<'a> From<&'a edwards::EdwardsPoint> for LookupTable<CachedPoint> {
|
|
|
|
|
fn from(point: &'a edwards::EdwardsPoint) -> Self {
|
|
|
|
|
let P = ExtendedPoint::from(*point);
|
2017-12-18 19:42:53 +00:00
|
|
|
let mut points = [CachedPoint::from(P); 8];
|
2017-12-15 21:56:20 +00:00
|
|
|
for i in 0..7 {
|
2017-12-18 19:42:53 +00:00
|
|
|
points[i+1] = (&P + &points[i]).into();
|
2017-12-15 21:56:20 +00:00
|
|
|
}
|
|
|
|
|
LookupTable(points)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-27 00:35:08 +00:00
|
|
|
impl<'a> From<&'a edwards::EdwardsPoint> for OddLookupTable<CachedPoint> {
|
|
|
|
|
fn from(point: &'a edwards::EdwardsPoint) -> Self {
|
|
|
|
|
let A = ExtendedPoint::from(*point);
|
|
|
|
|
let mut Ai = [CachedPoint::from(A); 8];
|
2018-03-26 22:54:13 +00:00
|
|
|
let A2 = A.double();
|
|
|
|
|
for i in 0..7 {
|
|
|
|
|
Ai[i + 1] = (&A2 + &Ai[i]).into();
|
2017-11-14 22:06:13 +00:00
|
|
|
}
|
2018-03-26 22:54:13 +00:00
|
|
|
// Now Ai = [A, 3A, 5A, 7A, 9A, 11A, 13A, 15A]
|
|
|
|
|
OddLookupTable(Ai)
|
2017-11-14 22:06:13 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-08 20:11:36 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
|
mod test {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
2017-11-10 00:37:50 +00:00
|
|
|
use constants;
|
|
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
fn serial_add(P: edwards::EdwardsPoint, Q: edwards::EdwardsPoint) -> edwards::EdwardsPoint {
|
2017-11-19 22:30:32 +00:00
|
|
|
use backend::u64::field::FieldElement64;
|
2017-11-08 20:11:36 +00:00
|
|
|
|
|
|
|
|
let (X1, Y1, Z1, T1) = (P.X, P.Y, P.Z, P.T);
|
|
|
|
|
let (X2, Y2, Z2, T2) = (Q.X, Q.Y, Q.Z, Q.T);
|
|
|
|
|
|
2017-11-08 23:31:02 +00:00
|
|
|
macro_rules! print_var {
|
|
|
|
|
($x:ident) => {
|
|
|
|
|
println!("{} = {:?}", stringify!($x), $x.to_bytes());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-08 20:11:36 +00:00
|
|
|
let S0 = &Y1 - &X1; // R1
|
|
|
|
|
let S1 = &Y1 + &X1; // R3
|
|
|
|
|
let S2 = &Y2 - &X2; // R2
|
|
|
|
|
let S3 = &Y2 + &X2; // R4
|
2017-11-08 23:31:02 +00:00
|
|
|
print_var!(S0);
|
|
|
|
|
print_var!(S1);
|
|
|
|
|
print_var!(S2);
|
|
|
|
|
print_var!(S3);
|
|
|
|
|
println!("");
|
2017-11-08 20:11:36 +00:00
|
|
|
|
|
|
|
|
let S4 = &S0 * &S2; // R5 = R1 * R2
|
|
|
|
|
let S5 = &S1 * &S3; // R6 = R3 * R4
|
2017-11-08 23:31:02 +00:00
|
|
|
let S6 = &Z1 * &Z2; // R8
|
|
|
|
|
let S7 = &T1 * &T2; // R7
|
|
|
|
|
print_var!(S4);
|
|
|
|
|
print_var!(S5);
|
|
|
|
|
print_var!(S6);
|
|
|
|
|
print_var!(S7);
|
|
|
|
|
println!("");
|
|
|
|
|
|
2017-11-19 22:30:32 +00:00
|
|
|
let S8 = &S4 * &FieldElement64([ 121666,0,0,0,0]); // R5
|
|
|
|
|
let S9 = &S5 * &FieldElement64([ 121666,0,0,0,0]); // R6
|
|
|
|
|
let S10 = &S6 * &FieldElement64([2*121666,0,0,0,0]); // R8
|
|
|
|
|
let S11 = &S7 * &(-&FieldElement64([2*121665,0,0,0,0])); // R7
|
2017-11-08 23:31:02 +00:00
|
|
|
print_var!(S8 );
|
|
|
|
|
print_var!(S9 );
|
|
|
|
|
print_var!(S10);
|
|
|
|
|
print_var!(S11);
|
|
|
|
|
println!("");
|
|
|
|
|
|
|
|
|
|
let S12 = &S9 - &S8; // R1
|
|
|
|
|
let S13 = &S9 + &S8; // R4
|
|
|
|
|
let S14 = &S10 - &S11; // R2
|
|
|
|
|
let S15 = &S10 + &S11; // R3
|
|
|
|
|
print_var!(S12);
|
|
|
|
|
print_var!(S13);
|
|
|
|
|
print_var!(S14);
|
|
|
|
|
print_var!(S15);
|
|
|
|
|
println!("");
|
2017-11-08 20:11:36 +00:00
|
|
|
|
|
|
|
|
let X3 = &S12 * &S14; // R1 * R2
|
|
|
|
|
let Y3 = &S15 * &S13; // R3 * R4
|
|
|
|
|
let Z3 = &S15 * &S14; // R2 * R3
|
|
|
|
|
let T3 = &S12 * &S13; // R1 * R4
|
|
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
edwards::EdwardsPoint{X: X3, Y: Y3, Z: Z3, T: T3}
|
2017-11-08 20:11:36 +00:00
|
|
|
}
|
|
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
fn addition_test_helper(P: edwards::EdwardsPoint, Q: edwards::EdwardsPoint) {
|
2017-11-30 19:05:06 +00:00
|
|
|
// Test the serial implementation of the parallel addition formulas
|
2018-01-25 02:56:38 +00:00
|
|
|
let R_serial: edwards::EdwardsPoint = serial_add(P.into(), Q.into()).into();
|
2017-11-30 19:05:06 +00:00
|
|
|
|
2017-12-18 19:42:53 +00:00
|
|
|
// Test the vector implementation of the parallel readdition formulas
|
2018-01-25 20:00:40 +00:00
|
|
|
let cached_Q = CachedPoint::from(ExtendedPoint::from(Q));
|
2018-03-27 00:12:32 +00:00
|
|
|
let R_vector: edwards::EdwardsPoint = (&ExtendedPoint::from(P) + &cached_Q).into();
|
|
|
|
|
let S_vector: edwards::EdwardsPoint = (&ExtendedPoint::from(P) - &cached_Q).into();
|
2017-12-18 19:42:53 +00:00
|
|
|
|
2017-11-08 23:31:02 +00:00
|
|
|
println!("Testing point addition:");
|
|
|
|
|
println!("P = {:?}", P);
|
|
|
|
|
println!("Q = {:?}", Q);
|
2017-12-18 19:42:53 +00:00
|
|
|
println!("cached Q = {:?}", cached_Q);
|
2017-11-30 19:05:06 +00:00
|
|
|
println!("R = P + Q = {:?}", &P + &Q);
|
|
|
|
|
println!("R_serial = {:?}", R_serial);
|
|
|
|
|
println!("R_vector = {:?}", R_vector);
|
|
|
|
|
println!("S = P - Q = {:?}", &P - &Q);
|
|
|
|
|
println!("S_vector = {:?}", S_vector);
|
|
|
|
|
assert_eq!(R_serial.compress(), (&P + &Q).compress());
|
|
|
|
|
assert_eq!(R_vector.compress(), (&P + &Q).compress());
|
|
|
|
|
assert_eq!(S_vector.compress(), (&P - &Q).compress());
|
2017-11-08 23:31:02 +00:00
|
|
|
println!("OK!\n");
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-08 20:11:36 +00:00
|
|
|
#[test]
|
2017-11-09 18:24:58 +00:00
|
|
|
fn vector_addition_vs_serial_addition_vs_edwards_extendedpoint() {
|
2017-11-08 20:11:36 +00:00
|
|
|
use constants;
|
|
|
|
|
use scalar::Scalar;
|
|
|
|
|
|
2017-11-30 19:05:06 +00:00
|
|
|
println!("Testing id +- id");
|
2018-01-25 02:56:38 +00:00
|
|
|
let P = edwards::EdwardsPoint::identity();
|
|
|
|
|
let Q = edwards::EdwardsPoint::identity();
|
2017-11-08 23:31:02 +00:00
|
|
|
addition_test_helper(P, Q);
|
2017-11-08 20:11:36 +00:00
|
|
|
|
2017-11-30 19:05:06 +00:00
|
|
|
println!("Testing id +- B");
|
2018-01-25 02:56:38 +00:00
|
|
|
let P = edwards::EdwardsPoint::identity();
|
2017-11-08 20:11:36 +00:00
|
|
|
let Q = constants::ED25519_BASEPOINT_POINT;
|
2017-11-08 23:31:02 +00:00
|
|
|
addition_test_helper(P, Q);
|
2017-11-08 20:11:36 +00:00
|
|
|
|
2017-11-30 19:05:06 +00:00
|
|
|
println!("Testing B +- B");
|
2017-11-08 20:11:36 +00:00
|
|
|
let P = constants::ED25519_BASEPOINT_POINT;
|
|
|
|
|
let Q = constants::ED25519_BASEPOINT_POINT;
|
2017-11-08 23:31:02 +00:00
|
|
|
addition_test_helper(P, Q);
|
2017-11-08 20:11:36 +00:00
|
|
|
|
2017-11-30 19:05:06 +00:00
|
|
|
println!("Testing B +- kB");
|
2017-11-08 20:11:36 +00:00
|
|
|
let P = constants::ED25519_BASEPOINT_POINT;
|
|
|
|
|
let Q = &constants::ED25519_BASEPOINT_TABLE * &Scalar::from_u64(8475983829);
|
2017-11-08 23:31:02 +00:00
|
|
|
addition_test_helper(P, Q);
|
2017-11-08 20:11:36 +00:00
|
|
|
}
|
2017-11-09 18:24:58 +00:00
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
fn serial_double(P: edwards::EdwardsPoint) -> edwards::EdwardsPoint {
|
2017-11-09 18:24:58 +00:00
|
|
|
let (X1, Y1, Z1, T1) = (P.X, P.Y, P.Z, P.T);
|
|
|
|
|
|
2017-11-10 00:37:50 +00:00
|
|
|
macro_rules! print_var {
|
|
|
|
|
($x:ident) => {
|
|
|
|
|
println!("{} = {:?}", stringify!($x), $x.to_bytes());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-09 18:24:58 +00:00
|
|
|
let S0 = &X1 + &Y1; // R1
|
2017-11-10 00:37:50 +00:00
|
|
|
print_var!(S0);
|
|
|
|
|
println!("");
|
2017-11-09 18:24:58 +00:00
|
|
|
|
|
|
|
|
let S1 = X1.square();
|
|
|
|
|
let S2 = Y1.square();
|
|
|
|
|
let S3 = Z1.square();
|
|
|
|
|
let S4 = S0.square();
|
2017-11-10 00:37:50 +00:00
|
|
|
print_var!(S1);
|
|
|
|
|
print_var!(S2);
|
|
|
|
|
print_var!(S3);
|
|
|
|
|
print_var!(S4);
|
|
|
|
|
println!("");
|
2017-11-09 18:24:58 +00:00
|
|
|
|
|
|
|
|
let S5 = &S1 + &S2;
|
|
|
|
|
let S6 = &S1 - &S2;
|
|
|
|
|
let S7 = &S3 + &S3;
|
|
|
|
|
let S8 = &S7 + &S6;
|
|
|
|
|
let S9 = &S5 - &S4;
|
2017-11-10 00:37:50 +00:00
|
|
|
print_var!(S5);
|
|
|
|
|
print_var!(S6);
|
|
|
|
|
print_var!(S7);
|
|
|
|
|
print_var!(S8);
|
|
|
|
|
print_var!(S9);
|
|
|
|
|
println!("");
|
2017-11-09 18:24:58 +00:00
|
|
|
|
|
|
|
|
let X3 = &S8 * &S9;
|
|
|
|
|
let Y3 = &S5 * &S6;
|
|
|
|
|
let Z3 = &S8 * &S6;
|
|
|
|
|
let T3 = &S5 * &S9;
|
|
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
edwards::EdwardsPoint{X: X3, Y: Y3, Z: Z3, T: T3}
|
2017-11-09 18:24:58 +00:00
|
|
|
}
|
|
|
|
|
|
2018-01-25 02:56:38 +00:00
|
|
|
fn doubling_test_helper(P: edwards::EdwardsPoint) {
|
|
|
|
|
let R1: edwards::EdwardsPoint = serial_double(P.into()).into();
|
2018-01-25 20:00:40 +00:00
|
|
|
let R2: edwards::EdwardsPoint = ExtendedPoint::from(P).double().into();
|
2017-11-09 18:24:58 +00:00
|
|
|
println!("Testing point doubling:");
|
|
|
|
|
println!("P = {:?}", P);
|
|
|
|
|
println!("(serial) R1 = {:?}", R1);
|
2017-11-10 00:37:50 +00:00
|
|
|
println!("(vector) R2 = {:?}", R2);
|
2017-11-09 18:24:58 +00:00
|
|
|
println!("P + P = {:?}", &P + &P);
|
|
|
|
|
assert_eq!(R1.compress(), (&P + &P).compress());
|
2017-11-10 00:37:50 +00:00
|
|
|
assert_eq!(R2.compress(), (&P + &P).compress());
|
2017-11-09 18:24:58 +00:00
|
|
|
println!("OK!\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn vector_doubling_vs_serial_doubling_vs_edwards_extendedpoint() {
|
|
|
|
|
use constants;
|
|
|
|
|
use scalar::Scalar;
|
|
|
|
|
|
|
|
|
|
println!("Testing [2]id");
|
2018-01-25 02:56:38 +00:00
|
|
|
let P = edwards::EdwardsPoint::identity();
|
2017-11-09 18:24:58 +00:00
|
|
|
doubling_test_helper(P);
|
|
|
|
|
|
|
|
|
|
println!("Testing [2]B");
|
|
|
|
|
let P = constants::ED25519_BASEPOINT_POINT;
|
|
|
|
|
doubling_test_helper(P);
|
|
|
|
|
|
|
|
|
|
println!("Testing [2]([k]B)");
|
|
|
|
|
let P = &constants::ED25519_BASEPOINT_TABLE * &Scalar::from_u64(8475983829);
|
|
|
|
|
doubling_test_helper(P);
|
|
|
|
|
}
|
2017-11-08 20:11:36 +00:00
|
|
|
}
|