saymrwulf/betrusted-curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/betrusted-curve25519-dalek-source.git synced 2026-09-06 20:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "work around compiler bug https://github.com/rust-lang/rust/issues/86693"

Browse source 
turns out we just needed to align $sp to 16-byte boundaries

This reverts commit 279bbc5287.
This commit is contained in:
bunnie 2021-07-11 17:37:15 +08:00
parent beea1311bf
commit c0ee5bf18c
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/scalar.rs
View file

@ -917,17 +917,8 @@ impl Scalar {
let mut naf = [0i8; 256]; let mut naf = [0i8; 256];
// work-around for https://github.com/rust-lang/rust/issues/86693 let mut x_u64 = [0u64; 5];
// riscv32i targets mis-align u64 types, leading to the lower 32 bits being aliased to the upper 32 bits LittleEndian::read_u64_into(&self.bytes, &mut x_u64[0..4]);
// the AlignedU64Slice wrapper forces the enclosed structure to be aligned, thus avoiding this problem.
#[repr(align(32))]
struct AlignedU64Slice([u64; 5]);
let mut x_u64 = AlignedU64Slice([0u64; 5]);
LittleEndian::read_u64_into(&self.bytes, &mut x_u64.0[0..4]);
#[cfg(feature = "betrusted")]
log::trace!("x_u64: {:?}", x_u64.0);
let width = 1 << w; let width = 1 << w;
let window_mask = width - 1; let window_mask = width - 1;
@ -941,10 +932,10 @@ impl Scalar {
let bit_buf: u64; let bit_buf: u64;
if bit_idx < 64 - w { if bit_idx < 64 - w {
// This window's bits are contained in a single u64 // This window's bits are contained in a single u64
bit_buf = x_u64.0[u64_idx] >> bit_idx; bit_buf = x_u64[u64_idx] >> bit_idx;
} else { } else {
// Combine the current u64's bits with the bits from the next u64 // Combine the current u64's bits with the bits from the next u64
bit_buf = (x_u64.0[u64_idx] >> bit_idx) | (x_u64.0[1+u64_idx] << (64 - bit_idx)); bit_buf = (x_u64[u64_idx] >> bit_idx) | (x_u64[1+u64_idx] << (64 - bit_idx));
} }
// Add the carry into the current window // Add the carry into the current window
@ -960,17 +951,9 @@ impl Scalar {
} }
if window < width/2 { if window < width/2 {
#[cfg(feature = "betrusted")]
log::trace!("carry 0 width {} naf[{}] = {}; c.{} bb.{:x} wm.{} idx64.{} idxbit.{} xu64[0].{:x}", width, pos, window,
carry, bit_buf, window_mask, u64_idx, bit_idx, x_u64.0[0],
);
carry = 0; carry = 0;
naf[pos] = window as i8; naf[pos] = window as i8;
} else { } else {
#[cfg(feature = "betrusted")]
log::trace!("carry 1 width {} naf[{}] = {}/{}; c.{} bb.{:x} wm.{} idx64.{} idxbit.{} xu64[0].{:x}", width, pos, window, (window as i8).wrapping_sub(width as i8),
carry, bit_buf, window_mask, u64_idx, bit_idx, x_u64.0[0]
);
carry = 1; carry = 1;
naf[pos] = (window as i8).wrapping_sub(width as i8); naf[pos] = (window as i8).wrapping_sub(width as i8);
} }