Updating criterion and num-bigint.

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "redox-ecc"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Armando Faz Hernandez"]
-edition = "2018"
+edition = "2021"
 description = "elliptic curve arithmetic"
 keywords = ["elliptic curve", "math", "crypto", "ecc", "elliptic", "weierstrass"]
 categories = ["cryptography", "math"]
@@ -19,11 +19,11 @@ harness = false
 
 [dependencies]
 impl_ops = "0.1.1"
-num-bigint = "0.2.6"
-num-integer = "0.1.42"
-num-traits = "0.2.11"
+num-bigint = "0.4.3"
+num-integer = "0.1.44"
+num-traits = "0.2.14"
 doc-comment = "0.3.3"
-atomic_refcell = "0.1.6"
+atomic_refcell = "0.1.8"
 
 [dev-dependencies]
-criterion = "0.3.2"
+criterion = "0.3.5"

benches/curve.rs

@@ -1,7 +1,7 @@
 extern crate num_bigint;
 use crate::num_bigint::BigInt;
 
-use criterion::{criterion_group, criterion_main, Benchmark, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 
 use redox_ecc::ellipticcurve::EllipticCurve;
 use redox_ecc::instances::{GetCurve, P256, P384, P521};
@@ -12,12 +12,11 @@ fn arith(c: &mut Criterion) {
  let mut g0 = ec.get_generator();
  let mut g1 = g0.clone();
  let k = ec.new_scalar(BigInt::from(-1));
- c.bench(
- format!("{}/ec", id).as_str(),
- Benchmark::new("add", move |b| b.iter(|| g0 = &g0 + &g0))
- .with_function("mul", move |b| b.iter(|| g1 = &k * &g1))
- .sample_size(10),
- );
+ let mut group = c.benchmark_group(format!("{}/ec", id).as_str());
+ group.sample_size(10);
+ group.bench_function("add", move |b| b.iter(|| g0 = &g0 + &g0));
+ group.bench_function("mul", move |b| b.iter(|| g1 = &k * &g1));
+ group.finish();
  }
 }
 

benches/field.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Benchmark, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 
 use redox_ecc::ellipticcurve::EllipticCurve;
 use redox_ecc::instances::{GetCurve, P256, P384, P521};
@@ -13,14 +13,12 @@ fn arith(c: &mut Criterion) {
  let mut x2 = f.from(-1i64);
  let y0 = f.from(15i64);
  let y1 = f.from(15i64);
-
- c.bench(
- format!("{}/fp", id).as_str(),
- Benchmark::new("add", move |b| b.iter(|| x0 = &x0 + &y0))
- .with_function("mul", move |b| b.iter(|| x1 = &x1 * &y1))
- .with_function("inv", move |b| b.iter(|| x2 = 1u32 / &x2))
- .sample_size(10),
- );
+ let mut group = c.benchmark_group(format!("{}/fp", id).as_str());
+ group.sample_size(10);
+ group.bench_function("add", move |b| b.iter(|| x0 = &x0 + &y0));
+ group.bench_function("mul", move |b| b.iter(|| x1 = &x1 * &y1));
+ group.bench_function("inv", move |b| b.iter(|| x2 = 1u32 / &x2));
+ group.finish();
  }
 }
 

src/edwards/curve.rs

@@ -107,7 +107,7 @@ impl Decode for Curve {
  // based on https://tools.ietf.org/html/rfc8032#section-5.2.3
  fn decode(&self, buf: &[u8]) -> Result<Self::Deser, Error> {
  let modulus = self.get_field().get_modulus();
- let size = (modulus.bits() + 1 + 7) / 8;
+ let size = (modulus.bits() as usize + 1 + 7) / 8;
  // step 1
  if buf.len() != size {
  return Err(Error::new(ErrorKind::Other, "Wrong input buffer size."));
@@ -199,7 +199,7 @@ mod tests {
  let modulus = ec.get_field().get_modulus();
  let gen = ec.get_generator();
  let ser = gen.encode(false); // compression does not exist
- assert_eq!(ser.len(), (modulus.bits() + 1 + 7) / 8);
+ assert_eq!(ser.len(), (modulus.bits() as usize + 1 + 7) / 8);
  let deser = ec.decode(&ser).unwrap();
  assert!(
  ec.is_on_curve(&deser),

src/edwards/point.rs

@@ -44,7 +44,7 @@ impl Encode for Point {
  let x_0 = (((x.sgn0() >> 1) & 0x01) << 7) as u8;
  let mut enc = y.to_bytes_le();
  let p = self.e.f.get_modulus();
- let size = (p.bits() + 1 + 7) / 8;
+ let size = (p.bits() as usize + 1 + 7) / 8;
  enc.resize(size, 0u8);
  let last = enc.len() - 1;
  enc[last] |= x_0;

src/edwards/scalar.rs

@@ -32,7 +32,7 @@ impl EcScalar for Scalar {}
 impl Serialize for Scalar {
  /// serializes the field element into big-endian bytes
  fn to_bytes_be(&self) -> Vec<u8> {
- let field_len = (self.r.bits() + 7) / 8;
+ let field_len = (self.r.bits() as usize + 7) / 8;
  let mut bytes = self.k.to_biguint().unwrap().to_bytes_be();
  let mut out = vec![0; field_len - bytes.len()];
  if !out.is_empty() {
@@ -143,14 +143,14 @@ impl std::iter::Iterator for Iterino {
 
 impl Scalar {
  pub fn iter_lr(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = l - 1usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = true;
  Iterino { l, i, v, is_lr }
  }
  pub fn iter_rl(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = 0usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = false;

src/instances/edw.rs

@@ -19,9 +19,9 @@ impl std::fmt::Display for EdCurveID {
 }
 
 /// EDWARDS25519 is the edwards25519 elliptic curve as specified in RFC-7748.
-pub static EDWARDS25519: EdCurveID = EdCurveID(&EDWARDS25519_PARAMS);
+pub static EDWARDS25519: EdCurveID = EdCurveID(EDWARDS25519_PARAMS);
 /// EDWARDS448 is the edwards448 elliptic curve as specified in RFC-7748.
-pub static EDWARDS448: EdCurveID = EdCurveID(&EDWARDS448_PARAMS);
+pub static EDWARDS448: EdCurveID = EdCurveID(EDWARDS448_PARAMS);
 
 static EDWARDS25519_PARAMS: &Params = &Params {
  name: "edwards25519",

src/macros/mod.rs

@@ -9,7 +9,7 @@ macro_rules! do_if_eq {
  if $cond {
  $body
  } else {
- panic!($error)
+ panic!("{}", $error)
  }
  };
 }

src/montgomery/scalar.rs

@@ -32,7 +32,7 @@ impl EcScalar for Scalar {}
 impl Serialize for Scalar {
  /// serializes the field element into big-endian bytes
  fn to_bytes_be(&self) -> Vec<u8> {
- let field_len = (self.r.bits() + 7) / 8;
+ let field_len = (self.r.bits() as usize + 7) / 8;
  let mut bytes = self.k.to_biguint().unwrap().to_bytes_be();
  let mut out = vec![0; field_len - bytes.len()];
  if !out.is_empty() {
@@ -137,14 +137,14 @@ impl std::iter::Iterator for Iterino {
 
 impl Scalar {
  pub fn iter_lr(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = l - 1usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = true;
  Iterino { l, i, v, is_lr }
  }
  pub fn iter_rl(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = 0usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = false;

src/primefield/mod.rs

@@ -68,7 +68,7 @@ impl Field for Fp {
  self.0.p.clone()
  }
  fn size_bytes(&self) -> usize {
- (self.0.p.bits() + 7) / 8
+ (self.0.p.bits() as usize + 7) / 8
  }
 }
 

src/tests.rs

@@ -2,6 +2,6 @@ use super::{private_version, version};
 
 #[test]
 fn uint_testing() {
- assert_eq!(version(), "0.2.2");
+ assert_eq!(version(), "0.2.3");
  assert_eq!(version(), private_version());
 }

src/weierstrass/scalar.rs

@@ -32,7 +32,7 @@ impl EcScalar for Scalar {}
 impl Serialize for Scalar {
  /// serializes the field element into big-endian bytes
  fn to_bytes_be(&self) -> Vec<u8> {
- let field_len = (self.r.bits() + 7) / 8;
+ let field_len = (self.r.bits() as usize + 7) / 8;
  let mut bytes = self.k.to_biguint().unwrap().to_bytes_be();
  let mut out = vec![0; field_len - bytes.len()];
  if !out.is_empty() {
@@ -137,14 +137,14 @@ impl std::iter::Iterator for Iterino {
 
 impl Scalar {
  pub fn iter_lr(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = l - 1usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = true;
  Iterino { l, i, v, is_lr }
  }
  pub fn iter_rl(&self) -> impl std::iter::Iterator<Item = bool> {
- let l = self.k.bits();
+ let l = self.k.bits() as usize;
  let i = 0usize;
  let (_, v) = self.k.to_u32_digits();
  let is_lr = false;

tests/tests.rs

@@ -2,5 +2,5 @@ use redox_ecc::version;
 
 #[test]
 fn integration_testing() {
- assert_eq!(version(), "0.2.2");
+ assert_eq!(version(), "0.2.3");
 }