saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-09 21:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix type conversions

Browse source
This commit is contained in:
Oleg Andreev 2019-05-21 13:48:29 -07:00
parent 42648aa460
commit 33b41ac10d
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/backend/vector/scalar_mul/pippenger.rs
View file

@ -13,13 +13,10 @@
use core::borrow::Borrow; use core::borrow::Borrow;
use clear_on_drop::ClearOnDrop;
use backend::vector::{CachedPoint, ExtendedPoint}; use backend::vector::{CachedPoint, ExtendedPoint};
use edwards::EdwardsPoint; use edwards::EdwardsPoint;
use scalar::Scalar; use scalar::Scalar;
use window::{LookupTable, NafLookupTable5}; use traits::{Identity, VartimeMultiscalarMul};
use traits::{Identity, MultiscalarMul, VartimeMultiscalarMul};
#[allow(unused_imports)] #[allow(unused_imports)]
use prelude::*; use prelude::*;
@ -68,7 +65,7 @@ impl VartimeMultiscalarMul for Pippenger {
// Prepare 2^w/2 buckets. // Prepare 2^w/2 buckets.
// buckets[i] corresponds to a multiplication factor (i+1). // buckets[i] corresponds to a multiplication factor (i+1).
let mut buckets: Vec<_> = (0..buckets_count) let mut buckets: Vec<ExtendedPoint> = (0..buckets_count)
.map(|_| ExtendedPoint::identity()) .map(|_| ExtendedPoint::identity())
.collect(); .collect();
@ -105,8 +102,8 @@ impl VartimeMultiscalarMul for Pippenger {
let mut buckets_intermediate_sum = buckets[buckets_count - 1]; let mut buckets_intermediate_sum = buckets[buckets_count - 1];
let mut buckets_sum = buckets[buckets_count - 1]; let mut buckets_sum = buckets[buckets_count - 1];
for i in (0..(buckets_count - 1)).rev() { for i in (0..(buckets_count - 1)).rev() {
buckets_intermediate_sum = &buckets_intermediate_sum + &buckets[i]; buckets_intermediate_sum = &buckets_intermediate_sum + &CachedPoint::from(buckets[i]);
buckets_sum = &buckets_sum + &buckets_intermediate_sum; buckets_sum = &buckets_sum + &CachedPoint::from(buckets_intermediate_sum);
} }
buckets_sum buckets_sum
@ -123,7 +120,7 @@ impl VartimeMultiscalarMul for Pippenger {
.iter() .iter()
.rev() .rev()
.fold(columns[digits_count - 1], |total, &p| { .fold(columns[digits_count - 1], |total, &p| {
&total.mul_by_pow_2(w as u32) + &p &total.mul_by_pow_2(w as u32) + &CachedPoint::from(p)
}) })
.into(), .into(),
) )