From defce32ff150e6026be99e0c5b9092960ad07063 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 11 Apr 2023 09:23:54 -0400 Subject: [PATCH] Remove k256/p256 git revision patch New releases of k256 and p256 make it no longer necessary. --- Cargo.lock | 61 ++++++++++++++++---------------- Cargo.toml | 4 --- crypto/ff-group-tests/Cargo.toml | 4 +-- deny.toml | 1 - 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07c26d0a..64920a38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -406,7 +406,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -1054,7 +1054,7 @@ dependencies = [ "hex", "k256", "minimal-ed448", - "p256 0.13.0", + "p256 0.13.1", "rand_core 0.6.4", "sha2 0.10.6", "sha3", @@ -1136,7 +1136,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -1185,21 +1185,19 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2a68a46b9d8cc90484f0689adc0e4c890eb215bf698ae52e5235bb88f40be7" +checksum = "84f4d04ee18e58356accd644896aeb2094ddeafb6a713e056cef0c0a8e468c15" dependencies = [ "bitvec 0.17.4", "coins-bip32", "getrandom 0.2.9", - "hex", "hmac 0.12.1", "once_cell", "pbkdf2 0.12.1", "rand 0.8.5", "sha2 0.10.6", "thiserror", - "tracing", ] [[package]] @@ -1671,7 +1669,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -1688,7 +1686,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -2733,7 +2731,7 @@ dependencies = [ "bls12_381", "group 0.13.0", "k256", - "p256 0.13.0", + "p256 0.13.1", "pasta_curves", "rand_core 0.6.4", "subtle", @@ -3216,7 +3214,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -4180,8 +4178,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.0" -source = "git+https://github.com/RustCrypto/elliptic-curves?rev=8958c2f535cc973a7cf216bcbad1f797ae6f9cdd#8958c2f535cc973a7cf216bcbad1f797ae6f9cdd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", "ecdsa 0.16.6", @@ -5757,7 +5756,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -5797,8 +5796,9 @@ dependencies = [ [[package]] name = "p256" -version = "0.13.0" -source = "git+https://github.com/RustCrypto/elliptic-curves?rev=8958c2f535cc973a7cf216bcbad1f797ae6f9cdd#8958c2f535cc973a7cf216bcbad1f797ae6f9cdd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc7304b8213f8597952b2f4c3d7f09947d46bb677801df8f287ffd2c4e26f9da" dependencies = [ "ecdsa 0.16.6", "elliptic-curve 0.13.4", @@ -6259,7 +6259,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -6525,8 +6525,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.0" -source = "git+https://github.com/RustCrypto/elliptic-curves?rev=8958c2f535cc973a7cf216bcbad1f797ae6f9cdd#8958c2f535cc973a7cf216bcbad1f797ae6f9cdd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8d3875361e28f7753baefef104386e7aa47642c93023356d97fdef4003bfb5" dependencies = [ "elliptic-curve 0.13.4", ] @@ -7004,7 +7005,7 @@ checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -8834,9 +8835,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -8861,13 +8862,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -10114,9 +10115,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" dependencies = [ "proc-macro2", "quote", @@ -10253,7 +10254,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -10434,7 +10435,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -12059,7 +12060,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1bc91d0c..463d3be4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,3 @@ monero-serai = { opt-level = 3 } [profile.release] panic = "unwind" - -[patch.crates-io] -k256 = { git = "https://github.com/RustCrypto/elliptic-curves", rev = "8958c2f535cc973a7cf216bcbad1f797ae6f9cdd" } -p256 = { git = "https://github.com/RustCrypto/elliptic-curves", rev = "8958c2f535cc973a7cf216bcbad1f797ae6f9cdd" } diff --git a/crypto/ff-group-tests/Cargo.toml b/crypto/ff-group-tests/Cargo.toml index 143ebc63..87719ac3 100644 --- a/crypto/ff-group-tests/Cargo.toml +++ b/crypto/ff-group-tests/Cargo.toml @@ -20,8 +20,8 @@ subtle = "^2.4" group = "0.13" [dev-dependencies] -k256 = { version = "0.13", features = ["bits"] } -p256 = { version = "0.13", features = ["bits"] } +k256 = { version = "^0.13.1", features = ["bits"] } +p256 = { version = "^0.13.1", features = ["bits"] } bls12_381 = "0.8" diff --git a/deny.toml b/deny.toml index 8e9c56c7..e320dfe5 100644 --- a/deny.toml +++ b/deny.toml @@ -82,7 +82,6 @@ unknown-registry = "deny" unknown-git = "deny" allow-registry = ["https://github.com/rust-lang/crates.io-index"] allow-git = [ - "https://github.com/RustCrypto/elliptic-curves", "https://github.com/serai-dex/substrate-bip39", "https://github.com/serai-dex/substrate", ]