Bump elliptic-curve; make ORDER a NonZero; remove JWK

- Bumps `crypto-bigint` from 0.7.0-rc.0 to 0.7.0-rc.1
- Make ORDER a NonZero
- Use `NonZero::from_be_byte_array` whenever available
- Bumps the pin for `elliptic-curve` to latest master
- Removes the support for JWK in the crates.
  JWK consumers are invited to use `jose-jwk` instead:

https://github.com/RustCrypto/JOSE/tree/master/jose-jwk

Author: baloo

.github/workflows/k256.yml

@@ -50,15 +50,14 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa-core
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features jwk
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pem
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pkcs8
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features schnorr
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features serde
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features sha256
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa,sha256
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features bits,critical-section,ecdh,ecdsa,hash2curve,jwk,pem,pkcs8,schnorr,serde,sha256
+      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features bits,critical-section,ecdh,ecdsa,hash2curve,pem,pkcs8,schnorr,serde,sha256
 
   benches:
     runs-on: ubuntu-latest

.github/workflows/p256.yml

@@ -49,13 +49,12 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa-core
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features jwk
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features oprf
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pem
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pkcs8
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features serde
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features sha256
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic,bits,ecdh,ecdsa,hash2curve,jwk,oprf,pem,pkcs8,serde,sha256
+      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic,bits,ecdh,ecdsa,hash2curve,oprf,pem,pkcs8,serde,sha256
 
   benches:
     runs-on: ubuntu-latest

.github/workflows/p384.yml

@@ -46,13 +46,12 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa-core
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features jwk
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features oprf
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pem
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pkcs8
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features serde
       - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features sha384
-      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa-core,hash2curve,jwk,oprf,pem,pkcs8,serde,sha384
+      - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdsa-core,hash2curve,oprf,pem,pkcs8,serde,sha384
 
   benches:
     runs-on: ubuntu-latest

Cargo.lock

@@ -21,7 +21,10 @@ members = [
 opt-level = 2
 
 [patch.crates-io]
-ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
+crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint" }
+
+elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
+ecdsa          = { git = "https://github.com/RustCrypto/signatures.git" }
 
 hash2curve = { path = "hash2curve" }
 primefield = { path = "primefield" }

Cargo.toml

@@ -33,14 +33,16 @@ use self::field_impl::*;
 use crate::{BignP256, FieldBytes, U256};
 use elliptic_curve::{
     FieldBytesEncoding,
+    bigint::NonZero,
     ff::PrimeField,
     subtle::{Choice, ConstantTimeEq, CtOption},
 };
 
 /// Constant representing the modulus
 /// p = 2^{256} − 189
-pub(crate) const MODULUS: U256 =
-    U256::from_be_hex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF43");
+pub(crate) const MODULUS: NonZero<U256> = NonZero::<U256>::from_be_hex(
+    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF43",
+);
 
 /// Element of the bign-256 base field used for curve coordinates.
 #[derive(Clone, Copy)]

bign256/src/arithmetic/field.rs

@@ -122,7 +122,7 @@ impl FromUintUnchecked for Scalar {
 
 impl IsHigh for Scalar {
     fn is_high(&self) -> Choice {
-        const MODULUS_SHR1: U256 = BignP256::ORDER.shr_vartime(1);
+        const MODULUS_SHR1: U256 = BignP256::ORDER.as_ref().shr_vartime(1);
         self.to_canonical().ct_gt(&MODULUS_SHR1)
     }
 }

bign256/src/arithmetic/scalar.rs

@@ -114,7 +114,7 @@ impl PrehashSigner<Signature> for SigningKey {
         //2. Generate 𝑘 ← rand(1,..,𝑞-1)
         let k = Scalar::from_repr(rfc6979::generate_k::<BeltHash, _>(
             &self.secret_scalar.to_repr(),
-            &FieldBytesEncoding::<BignP256>::encode_field_bytes(&BignP256::ORDER),
+            &FieldBytesEncoding::<BignP256>::encode_field_bytes(BignP256::ORDER.as_ref()),
             &h.to_bytes(),
             &[],
         ))

bign256/src/ecdsa/signing.rs

@@ -30,7 +30,11 @@
 extern crate alloc;
 
 pub use elliptic_curve::{self, bigint::U256};
-use elliptic_curve::{Error, FieldBytesEncoding, bigint::ArrayEncoding, consts::U32};
+use elliptic_curve::{
+    Error, FieldBytesEncoding,
+    bigint::{ArrayEncoding, NonZero},
+    consts::U32,
+};
 
 #[cfg(feature = "arithmetic")]
 pub use arithmetic::{AffinePoint, ProjectivePoint, scalar::Scalar};
@@ -89,7 +93,7 @@ impl elliptic_curve::Curve for BignP256 {
     type Uint = U256;
 
     /// Order of BIGN P-256's elliptic curve group (i.e. scalar modulus).
-    const ORDER: U256 = U256::from_be_hex(ORDER_HEX);
+    const ORDER: NonZero<U256> = NonZero::<U256>::from_be_hex(ORDER_HEX);
 }
 
 impl elliptic_curve::PrimeCurve for BignP256 {}

bign256/src/lib.rs

@@ -17,14 +17,15 @@ mod field_impl;
 use self::field_impl::*;
 use crate::{FieldBytes, U256};
 use elliptic_curve::{
+    bigint::NonZero,
     ff::PrimeField,
     subtle::{Choice, ConstantTimeEq, CtOption},
 };
 
 /// Constant representing the modulus serialized as hex.
 const MODULUS_HEX: &str = "a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377";
 
-const MODULUS: U256 = U256::from_be_hex(MODULUS_HEX);
+const MODULUS: NonZero<U256> = NonZero::<U256>::from_be_hex(MODULUS_HEX);
 
 /// Element of the brainpoolP256's base field used for curve point coordinates.
 #[derive(Clone, Copy)]