elliptic-curve: bump crypto-bigint to v0.6.0-pre.8; MSRV 1.73 (#1463)

The latest prerelease of `crypto-bigint` includes changes necessary to also support heap-backed integers (not that we're planning on using them), but also includes expanded modular arithmetic support including an implementation of the Bernstein-Yang modular inversion algorithm. It also includes a migration to `hybrid-array` which will be necessary for everything to work together correctly.
RustCrypto · Jan 9, 2024 · ace5ceb · ace5ceb
1 parent 1ac412b
commit ace5ceb
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 12 deletions.
diff --git a/.github/workflows/elliptic-curve.yml b/.github/workflows/elliptic-curve.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.71.0 # MSRV
+          - 1.73.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -58,6 +58,8 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,hazmat,hash2curve,jwk,pem,pkcs8,sec1,serde,voprf
 
   minimal-versions:
+    # Temporarily disabled until elliptic-curve 0.13.0-pre.0 is published
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -74,7 +76,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.71.0 # MSRV
+          - 1.73.0 # MSRV
           - stable
           - nightly
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/elliptic-curve/Cargo.toml b/elliptic-curve/Cargo.toml
@@ -13,11 +13,11 @@ readme = "README.md"
 categories = ["cryptography", "no-std"]
 keywords = ["crypto", "ecc", "elliptic", "weierstrass"]
 edition = "2021"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [dependencies]
 base16ct = "0.2"
-crypto-bigint = { version = "0.5", default-features = false, features = ["rand_core", "generic-array", "zeroize"] }
+crypto-bigint = { version = "=0.6.0-pre.8", default-features = false, features = ["rand_core", "hybrid-array", "zeroize"] }
 hybrid-array = { version = "=0.2.0-pre.8", default-features = false, features = ["zeroize"] }
 rand_core = { version = "0.6.4", default-features = false }
 subtle = { version = "2", default-features = false }

diff --git a/elliptic-curve/README.md b/elliptic-curve/README.md
@@ -15,7 +15,7 @@ and public/secret keys composed thereof.
 
 ## Minimum Supported Rust Version
 
-Requires Rust **1.71** or higher.
+Requires Rust **1.73** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be
 done with a minor version bump.
@@ -49,6 +49,6 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/traits/actions/workflows/elliptic-curve.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/traits/actions/workflows/elliptic-curve.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.71+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.73+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260040-elliptic-curves
diff --git a/elliptic-curve/src/dev.rs b/elliptic-curve/src/dev.rs
@@ -4,9 +4,9 @@
 //! the traits in this crate.
 
 use crate::{
+    array::typenum::U32,
     bigint::{Limb, U256},
     error::{Error, Result},
-    hybrid_array::typenum::U32,
     ops::{Invert, LinearCombination, MulByGenerator, Reduce, ShrAssign},
     pkcs8,
     point::AffineCoordinates,

diff --git a/elliptic-curve/src/lib.rs b/elliptic-curve/src/lib.rs
@@ -119,7 +119,8 @@ pub use crate::{
     secret_key::SecretKey,
 };
 pub use crypto_bigint as bigint;
-pub use hybrid_array::{self, typenum::consts};
+pub use hybrid_array as array;
+pub use hybrid_array::typenum::consts;
 pub use rand_core;
 pub use subtle;
 pub use zeroize;
@@ -178,7 +179,7 @@ pub trait Curve: 'static + Copy + Clone + Debug + Default + Eq + Ord + Send + Sy
     type Uint: bigint::ArrayEncoding
         + bigint::AddMod<Output = Self::Uint>
         + bigint::Encoding
-        + bigint::Integer
+        + bigint::FixedInteger
         + bigint::NegMod<Output = Self::Uint>
         + bigint::Random
         + bigint::RandomMod

diff --git a/elliptic-curve/src/scalar.rs b/elliptic-curve/src/scalar.rs
@@ -7,6 +7,7 @@ mod nonzero;
 mod primitive;
 
 pub use self::primitive::ScalarPrimitive;
+
 #[cfg(feature = "arithmetic")]
 pub use self::{blinded::BlindedScalar, nonzero::NonZeroScalar};
 

diff --git a/elliptic-curve/src/scalar/primitive.rs b/elliptic-curve/src/scalar/primitive.rs
@@ -1,6 +1,7 @@
 //! Generic scalar type with primitive functionality.
 
 use crate::{
+    array::Array,
     bigint::{prelude::*, Limb, NonZero},
     scalar::FromUintUnchecked,
     scalar::IsHigh,
@@ -13,7 +14,6 @@ use core::{
     ops::{Add, AddAssign, Neg, ShrAssign, Sub, SubAssign},
     str,
 };
-use hybrid_array::Array;
 use rand_core::CryptoRngCore;
 use subtle::{
     Choice, ConditionallySelectable, ConstantTimeEq, ConstantTimeGreater, ConstantTimeLess,
@@ -357,7 +357,7 @@ where
     C: Curve,
 {
     fn is_high(&self) -> Choice {
-        let n_2 = C::ORDER >> 1;
+        let n_2 = C::ORDER >> 1u32;
         self.inner.ct_gt(&n_2)
     }
 }