From ec34e561710c7757bd5075436f763b883cf0f486 Mon Sep 17 00:00:00 2001 From: przydatek Date: Mon, 3 Jun 2024 09:17:39 +0200 Subject: [PATCH] Pin iota-fork (#2484) * Pin iota-fork * Update Cargo.lock --- Cargo.lock | 102 +++---------------------------- demos/vc_issuer/Cargo.lock | 102 +++---------------------------- src/canister_tests/Cargo.toml | 2 +- src/internet_identity/Cargo.toml | 2 +- src/vc_util/Cargo.toml | 6 +- 5 files changed, 19 insertions(+), 195 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd6fc29716..703bef455a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -832,34 +832,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "platforms", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -1087,15 +1059,6 @@ dependencies = [ "spki", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "signature", -] - [[package]] name = "ed25519-consensus" version = "2.1.0" @@ -1111,21 +1074,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-zebra" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" -dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519", - "hashbrown 0.14.5", - "hex", - "rand_core 0.6.4", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "either" version = "1.12.0" @@ -1238,12 +1186,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1855,7 +1797,7 @@ version = "0.9.0" source = "git+https://github.com/dfinity/ic?rev=e69bcc7b319cbb3ebc22ec55af35287741244db6#e69bcc7b319cbb3ebc22ec55af35287741244db6" dependencies = [ "base64 0.13.1", - "curve25519-dalek 3.2.0", + "curve25519-dalek", "ed25519-consensus", "hex", "ic-crypto-internal-basic-sig-der-utils", @@ -2312,7 +2254,7 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "identity_core" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "ic-cdk", "iota-crypto", @@ -2329,7 +2271,7 @@ dependencies = [ [[package]] name = "identity_credential" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "async-trait", "identity_core", @@ -2351,7 +2293,7 @@ dependencies = [ [[package]] name = "identity_did" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "did_url_parser", "form_urlencoded", @@ -2364,7 +2306,7 @@ dependencies = [ [[package]] name = "identity_document" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "did_url_parser", "identity_core", @@ -2379,7 +2321,7 @@ dependencies = [ [[package]] name = "identity_jose" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "identity_core", "iota-crypto", @@ -2394,7 +2336,7 @@ dependencies = [ [[package]] name = "identity_verification" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "identity_core", "identity_did", @@ -2534,14 +2476,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5db0e2d85e258d6d0db66f4a6bf1e8bdf5b10c3353aa87d98b168778d13fdc1" dependencies = [ "autocfg", - "curve25519-dalek 3.2.0", "digest 0.10.7", - "ed25519-zebra", "k256", "serde", "sha2 0.10.8", - "x25519-dalek", - "zeroize", ] [[package]] @@ -3112,12 +3050,6 @@ dependencies = [ "spki", ] -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "png" version = "0.17.13" @@ -3399,15 +3331,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustversion" version = "1.0.17" @@ -4351,17 +4274,6 @@ dependencies = [ "tap", ] -[[package]] -name = "x25519-dalek" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" -dependencies = [ - "curve25519-dalek 3.2.0", - "rand_core 0.5.1", - "zeroize", -] - [[package]] name = "yansi" version = "0.5.1" diff --git a/demos/vc_issuer/Cargo.lock b/demos/vc_issuer/Cargo.lock index 6ad053e2a2..e053943242 100644 --- a/demos/vc_issuer/Cargo.lock +++ b/demos/vc_issuer/Cargo.lock @@ -785,34 +785,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "platforms", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -1040,15 +1012,6 @@ dependencies = [ "spki", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "signature", -] - [[package]] name = "ed25519-consensus" version = "2.1.0" @@ -1064,21 +1027,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-zebra" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" -dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519", - "hashbrown 0.14.5", - "hex", - "rand_core 0.6.4", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "either" version = "1.12.0" @@ -1173,12 +1121,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1663,7 +1605,7 @@ version = "0.9.0" source = "git+https://github.com/dfinity/ic?rev=e69bcc7b319cbb3ebc22ec55af35287741244db6#e69bcc7b319cbb3ebc22ec55af35287741244db6" dependencies = [ "base64 0.13.1", - "curve25519-dalek 3.2.0", + "curve25519-dalek", "ed25519-consensus", "hex", "ic-crypto-internal-basic-sig-der-utils", @@ -2114,7 +2056,7 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "identity_core" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "ic-cdk", "iota-crypto", @@ -2131,7 +2073,7 @@ dependencies = [ [[package]] name = "identity_credential" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "async-trait", "identity_core", @@ -2153,7 +2095,7 @@ dependencies = [ [[package]] name = "identity_did" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "did_url_parser", "form_urlencoded", @@ -2166,7 +2108,7 @@ dependencies = [ [[package]] name = "identity_document" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "did_url_parser", "identity_core", @@ -2181,7 +2123,7 @@ dependencies = [ [[package]] name = "identity_jose" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "identity_core", "iota-crypto", @@ -2196,7 +2138,7 @@ dependencies = [ [[package]] name = "identity_verification" version = "1.3.0" -source = "git+https://github.com/dfinity/identity.rs.git#f389b48991b37d11100510447764dadc1e102c7a" +source = "git+https://github.com/dfinity/identity.rs.git?rev=63d3683cf6b6e48136ffb6812125dd8addfbbe75#63d3683cf6b6e48136ffb6812125dd8addfbbe75" dependencies = [ "identity_core", "identity_did", @@ -2283,14 +2225,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5db0e2d85e258d6d0db66f4a6bf1e8bdf5b10c3353aa87d98b168778d13fdc1" dependencies = [ "autocfg", - "curve25519-dalek 3.2.0", "digest 0.10.7", - "ed25519-zebra", "k256", "serde", "sha2 0.10.8", - "x25519-dalek", - "zeroize", ] [[package]] @@ -2841,12 +2779,6 @@ dependencies = [ "spki", ] -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "powerfmt" version = "0.2.0" @@ -3106,15 +3038,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustversion" version = "1.0.17" @@ -4044,17 +3967,6 @@ dependencies = [ "tap", ] -[[package]] -name = "x25519-dalek" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" -dependencies = [ - "curve25519-dalek 3.2.0", - "rand_core 0.5.1", - "zeroize", -] - [[package]] name = "yansi" version = "0.5.1" diff --git a/src/canister_tests/Cargo.toml b/src/canister_tests/Cargo.toml index 59ca9f2717..1421eddb60 100644 --- a/src/canister_tests/Cargo.toml +++ b/src/canister_tests/Cargo.toml @@ -17,7 +17,7 @@ sha2.workspace = true internet_identity_interface.workspace = true vc_util.workspace = true -identity_jose = { git = "https://github.com/dfinity/identity.rs.git", default-features = false} +identity_jose = { git = "https://github.com/dfinity/identity.rs.git", rev = "63d3683cf6b6e48136ffb6812125dd8addfbbe75", default-features = false} # All IC deps candid.workspace = true diff --git a/src/internet_identity/Cargo.toml b/src/internet_identity/Cargo.toml index 6fc73681bb..f19003202c 100644 --- a/src/internet_identity/Cargo.toml +++ b/src/internet_identity/Cargo.toml @@ -50,7 +50,7 @@ canister_tests.workspace = true hex-literal = "0.4" regex.workspace = true ic-response-verification.workspace = true -identity_jose = { git = "https://github.com/dfinity/identity.rs.git", default-features = false} +identity_jose = { git = "https://github.com/dfinity/identity.rs.git", rev = "63d3683cf6b6e48136ffb6812125dd8addfbbe75", default-features = false} [features] diff --git a/src/vc_util/Cargo.toml b/src/vc_util/Cargo.toml index 184005046d..96aba3c193 100644 --- a/src/vc_util/Cargo.toml +++ b/src/vc_util/Cargo.toml @@ -13,9 +13,9 @@ ic-types.workspace = true canister_sig_util.workspace = true # vc dependencies -identity_core = { git = "https://github.com/dfinity/identity.rs.git", default-features = false, features = ["ic-wasm"] } -identity_credential = { git = "https://github.com/dfinity/identity.rs.git", default-features = false , features = ["ic-wasm", "validator"] } -identity_jose = { git = "https://github.com/dfinity/identity.rs.git", default-features = false} +identity_core = { git = "https://github.com/dfinity/identity.rs.git", rev = "63d3683cf6b6e48136ffb6812125dd8addfbbe75", default-features = false, features = ["ic-wasm"] } +identity_credential = { git = "https://github.com/dfinity/identity.rs.git", rev = "63d3683cf6b6e48136ffb6812125dd8addfbbe75", default-features = false , features = ["ic-wasm", "validator"] } +identity_jose = { git = "https://github.com/dfinity/identity.rs.git", rev = "63d3683cf6b6e48136ffb6812125dd8addfbbe75", default-features = false} # other dependencies serde.workspace = true