diff --git a/Cargo.lock b/Cargo.lock index 5a36deafb..c9c0c4f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,7 +390,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" dependencies = [ "either", - "radium", + "radium 0.3.0", +] + +[[package]] +name = "bitvec" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" +dependencies = [ + "funty", + "radium 0.5.3", + "tap", + "wyz", ] [[package]] @@ -561,7 +573,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -1309,7 +1321,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e66558629d772c3be040566b7be07be8c8f5aecee95e4a092dfe2efc313277ad" dependencies = [ - "nom", + "nom 5.1.2", "num-bigint 0.3.0", "num-traits", "proc-macro-hack", @@ -1322,7 +1334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caca07c50eaae94d43e21f4d14eca5543b6f5f5ce64715e9b7665ac5f5185b4e" dependencies = [ "der-oid-macro", - "nom", + "nom 5.1.2", "num-bigint 0.3.0", "num-traits", "proc-macro-hack", @@ -1734,6 +1746,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8" + [[package]] name = "futures" version = "0.1.29" @@ -2925,7 +2943,7 @@ dependencies = [ "generic-array 0.14.4", "hkdf 0.10.0", "hpke", - "nom", + "nom 6.0.0", "once_cell", "p256", "parity-scale-codec", @@ -3038,6 +3056,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4489ccc7d668957ddf64af7cd027c081728903afa6479d35da7e99bf5728f75f" +dependencies = [ + "bitvec 0.19.4", + "lexical-core", + "memchr", + "version_check", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -3185,7 +3215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" dependencies = [ "arrayvec 0.5.1", - "bitvec", + "bitvec 0.17.4", "byte-slice-cast", "parity-scale-codec-derive", "serde", @@ -3706,6 +3736,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + [[package]] name = "rand" version = "0.4.6" @@ -4138,7 +4174,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a9050636e8a1b487ba1fbe99114021cd7594dde3ce6ed95bfc1691e5b5367b" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -4704,6 +4740,12 @@ dependencies = [ "chrono", ] +[[package]] +name = "tap" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" + [[package]] name = "tdb-enclave-app" version = "0.6.0" @@ -5740,6 +5782,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "x509-parser" version = "0.8.2" @@ -5752,7 +5800,7 @@ dependencies = [ "der-oid-macro", "der-parser", "lazy_static", - "nom", + "nom 5.1.2", "num-bigint 0.3.0", "rusticata-macros", "rustversion", diff --git a/chain-tx-enclave-next/mls/Cargo.toml b/chain-tx-enclave-next/mls/Cargo.toml index 3f7e0ba05..5b26a5d37 100644 --- a/chain-tx-enclave-next/mls/Cargo.toml +++ b/chain-tx-enclave-next/mls/Cargo.toml @@ -11,7 +11,7 @@ ring = { version = "0.16.15", features = ["std"] } thiserror = "1.0" rustls = "0.18" x509-parser = "0.8.2" -nom = "5.1" +nom = "6.0" secrecy = "0.7.0" sha2 = "0.9" hkdf = { version = "0.10", features = ["std"] }