From b98fc7a909aa477d789340f071fa999aff9be3d0 Mon Sep 17 00:00:00 2001 From: Arvind Mukund Date: Mon, 30 Oct 2023 23:18:02 -0700 Subject: [PATCH] Remove all path dependents of `primeorder` P521 alone uses path based primeorder Signed-off-by: Arvind Mukund --- Cargo.lock | 28 +++++++++++++++++++--------- bign256/Cargo.toml | 2 +- bp256/Cargo.toml | 2 +- bp384/Cargo.toml | 2 +- p192/Cargo.toml | 4 ++-- p224/Cargo.toml | 4 ++-- p256/Cargo.toml | 4 ++-- p384/Cargo.toml | 4 ++-- p521/Cargo.toml | 4 ++-- sm2/Cargo.toml | 2 +- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab0300e2..9f28b934 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ "criterion", "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "proptest", ] @@ -112,7 +112,7 @@ version = "0.6.1" dependencies = [ "ecdsa", "elliptic-curve", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2", ] @@ -122,7 +122,7 @@ version = "0.6.1" dependencies = [ "ecdsa", "elliptic-curve", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2", ] @@ -723,7 +723,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "sec1", "serdect", ] @@ -736,7 +736,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core", "serdect", "sha2", @@ -751,7 +751,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "proptest", "rand_core", "serdect", @@ -767,7 +767,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "proptest", "rand_core", "serdect", @@ -779,7 +779,7 @@ name = "p521" version = "0.13.0" dependencies = [ "elliptic-curve", - "primeorder", + "primeorder 0.13.2", "sha2", ] @@ -844,6 +844,16 @@ dependencies = [ "serdect", ] +[[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", + "serdect", +] + [[package]] name = "proc-macro2" version = "1.0.51" @@ -1149,7 +1159,7 @@ version = "0.13.2" dependencies = [ "elliptic-curve", "hex-literal", - "primeorder", + "primeorder 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "proptest", "rand_core", "rfc6979", diff --git a/bign256/Cargo.toml b/bign256/Cargo.toml index 0347e3a4..fb6a3ae3 100644 --- a/bign256/Cargo.toml +++ b/bign256/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.65" elliptic-curve = { version = "0.13.6", features = ["hazmat", "sec1"] } # optional dependencies -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } [dev-dependencies] criterion = "0.5" diff --git a/bp256/Cargo.toml b/bp256/Cargo.toml index 659505a1..b9af4174 100644 --- a/bp256/Cargo.toml +++ b/bp256/Cargo.toml @@ -17,7 +17,7 @@ elliptic-curve = { version = "0.13", default-features = false, features = ["hazm # optional dependencies ecdsa = { version = "0.16", optional = true, default-features = false, features = ["der"] } -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } sha2 = { version = "0.10", optional = true, default-features = false } [features] diff --git a/bp384/Cargo.toml b/bp384/Cargo.toml index 8c806f36..d9b418f4 100644 --- a/bp384/Cargo.toml +++ b/bp384/Cargo.toml @@ -17,7 +17,7 @@ elliptic-curve = { version = "0.13", default-features = false, features = ["hazm # optional dependencies ecdsa = { version = "0.16", optional = true, default-features = false, features = ["der"] } -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } sha2 = { version = "0.10", optional = true, default-features = false } [features] diff --git a/p192/Cargo.toml b/p192/Cargo.toml index 892db7fd..bbeb8af4 100644 --- a/p192/Cargo.toml +++ b/p192/Cargo.toml @@ -22,13 +22,13 @@ sec1 = { version = "0.7.3", default-features = false } # optional dependencies ecdsa-core = { version = "0.16.6", package = "ecdsa", optional = true, default-features = false, features = ["der"] } hex-literal = { version = "0.4", optional = true } -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } serdect = { version = "0.2", optional = true, default-features = false } [dev-dependencies] ecdsa-core = { version = "0.16", package = "ecdsa", default-features = false, features = ["dev"] } hex-literal = "0.4" -primeorder = { version = "0.13", features = ["dev"], path = "../primeorder" } +primeorder = { version = "0.13.2", features = ["dev"] } [features] default = ["arithmetic", "ecdsa", "pem", "std"] diff --git a/p224/Cargo.toml b/p224/Cargo.toml index 78d7e794..a181acf9 100644 --- a/p224/Cargo.toml +++ b/p224/Cargo.toml @@ -21,7 +21,7 @@ elliptic-curve = { version = "0.13.6", default-features = false, features = ["ha # optional dependencies ecdsa-core = { version = "0.16.6", package = "ecdsa", optional = true, default-features = false, features = ["der"] } hex-literal = { version = "0.4", optional = true } -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } serdect = { version = "0.2", optional = true, default-features = false } sha2 = { version = "0.10", optional = true, default-features = false } @@ -29,7 +29,7 @@ sha2 = { version = "0.10", optional = true, default-features = false } blobby = "0.3" ecdsa-core = { version = "0.16", package = "ecdsa", default-features = false, features = ["dev"] } hex-literal = "0.4" -primeorder = { version = "0.13", features = ["dev"], path = "../primeorder" } +primeorder = { version = "0.13.2", features = ["dev"] } rand_core = { version = "0.6", features = ["getrandom"] } [features] diff --git a/p256/Cargo.toml b/p256/Cargo.toml index 96ebd10c..f97d8506 100644 --- a/p256/Cargo.toml +++ b/p256/Cargo.toml @@ -22,7 +22,7 @@ elliptic-curve = { version = "0.13.6", default-features = false, features = ["ha # optional dependencies ecdsa-core = { version = "0.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] } hex-literal = { version = "0.4", optional = true } -primeorder = { version = "0.13", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } serdect = { version = "0.2", optional = true, default-features = false } sha2 = { version = "0.10", optional = true, default-features = false } @@ -31,7 +31,7 @@ blobby = "0.3" criterion = "0.5" ecdsa-core = { version = "0.16", package = "ecdsa", default-features = false, features = ["dev"] } hex-literal = "0.4" -primeorder = { version = "0.13", features = ["dev"], path = "../primeorder" } +primeorder = { version = "0.13.2", features = ["dev"] } proptest = "1" rand_core = { version = "0.6", features = ["getrandom"] } diff --git a/p384/Cargo.toml b/p384/Cargo.toml index 9f5f5418..58906c84 100644 --- a/p384/Cargo.toml +++ b/p384/Cargo.toml @@ -22,7 +22,7 @@ elliptic-curve = { version = "0.13", default-features = false, features = ["hazm # optional dependencies ecdsa-core = { version = "0.16", package = "ecdsa", optional = true, default-features = false, features = ["der"] } hex-literal = { version = "0.4", optional = true } -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } serdect = { version = "0.2", optional = true, default-features = false } sha2 = { version = "0.10", optional = true, default-features = false } @@ -31,7 +31,7 @@ blobby = "0.3" criterion = "0.5" ecdsa-core = { version = "0.16", package = "ecdsa", default-features = false, features = ["dev"] } hex-literal = "0.4" -primeorder = { version = "0.13", features = ["dev"], path = "../primeorder" } +primeorder = { version = "0.13.2", features = ["dev"] } proptest = "1.3" rand_core = { version = "0.6", features = ["getrandom"] } diff --git a/p521/Cargo.toml b/p521/Cargo.toml index 5b2a2dea..eb462ff2 100644 --- a/p521/Cargo.toml +++ b/p521/Cargo.toml @@ -20,10 +20,10 @@ elliptic-curve = { version = "0.13", default-features = false, features = ["hazm sha2 = { version = "0.10", optional = true, default-features = false } # optional dependencies -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { path = "../primeorder", optional = true } [features] -default = ["pem", "std"] +default = ["pem", "std", "wip-arithmetic-do-not-use"] alloc = ["elliptic-curve/alloc"] std = ["alloc", "elliptic-curve/std"] diff --git a/sm2/Cargo.toml b/sm2/Cargo.toml index 3f37ac73..e0545b62 100644 --- a/sm2/Cargo.toml +++ b/sm2/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.65" elliptic-curve = { version = "0.13", default-features = false, features = ["hazmat", "sec1"] } # optional dependencies -primeorder = { version = "0.13.1", optional = true, path = "../primeorder" } +primeorder = { version = "0.13.2", optional = true } rfc6979 = { version = "0.4", optional = true } serdect = { version = "0.2", optional = true, default-features = false } signature = { version = "2", optional = true }