yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec: NFC: Refactor scalar_sum to eliminate LIMBS_add_mod use.

Browse Source 
Use the pattern we typically use where one argument is passed by value.

This lets us use `limbs_add_assign_mod`, eliminating the `unsafe`
direct use of `LIMBS_add_mod`. This will make future refactoring easier.

This also eliminates the need to construct and zeroize a new scalar `r`
for the result.
This commit is contained in:
Brian Smith 2023-11-22 13:05:44 -08:00
parent 3afbcc5dc5
commit bc00f7e58c
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ec/suite_b/ecdsa/signing.rs
View File

@ -266,7 +266,7 @@ impl EcdsaKeyPair {
// Step 6. // Step 6.
let s = { let s = {
let dr = scalar_ops.scalar_product(&self.d, &r); let dr = scalar_ops.scalar_product(&self.d, &r);
let e_plus_dr = scalar_sum(cops, &e, &dr); let e_plus_dr = scalar_sum(cops, &e, dr);
scalar_ops.scalar_product(&k_inv, &e_plus_dr) scalar_ops.scalar_product(&k_inv, &e_plus_dr)
}; };
if cops.is_zero(&s) { if cops.is_zero(&s) {

31
src/ec/suite_b/ops.rs
View File

@ -12,7 +12,7 @@
// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
use crate::{arithmetic::limbs_from_hex, arithmetic::montgomery::*, c, error, limb::*}; use crate::{arithmetic::limbs_from_hex, arithmetic::montgomery::*, error, limb::*};
use core::marker::PhantomData; use core::marker::PhantomData;
pub use self::elem::*; pub use self::elem::*;
@ -326,18 +326,13 @@ pub fn elem_reduced_to_scalar(ops: &CommonOps, elem: &Elem<Unencoded>) -> Scalar
} }
} }
pub fn scalar_sum(ops: &CommonOps, a: &Scalar, b: &Scalar) -> Scalar { pub fn scalar_sum(ops: &CommonOps, a: &Scalar, mut b: Scalar) -> Scalar {
let mut r = Scalar::zero(); limbs_add_assign_mod(
unsafe { &mut b.limbs[..ops.num_limbs],
LIMBS_add_mod( &a.limbs[..ops.num_limbs],
r.limbs.as_mut_ptr(), &ops.n.limbs[..ops.num_limbs],
a.limbs.as_ptr(), );
b.limbs.as_ptr(), b
ops.n.limbs.as_ptr(),
ops.num_limbs,
)
}
r
} }
// Returns (`a` squared `squarings` times) * `b`. // Returns (`a` squared `squarings` times) * `b`.
@ -425,16 +420,6 @@ fn parse_big_endian_fixed_consttime<M>(
Ok(r) Ok(r)
} }
prefixed_extern! {
fn LIMBS_add_mod(
r: *mut Limb,
a: *const Limb,
b: *const Limb,
m: *const Limb,
num_limbs: c::size_t,
);
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
extern crate alloc; extern crate alloc;