liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'crioux/crypto-crate-update' into 'main'

Browse Source 
switch back to mainline dalek cryptography crates

See merge request veilid/veilid!24
This commit is contained in:
John Smith
2023-05-29 20:22:41 +00:00
parent ca6e70e1df 4bdf0d58d3
commit 96b42a45e1
5 changed files with 184 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
Cargo.lock generated
View File

@@ -72,9 +72,9 @@ dependencies = [
[[package]] [[package]]
name = "allo-isolate" name = "allo-isolate"
version = "0.1.14" version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ed55848be9f41d44c79df6045b680a74a78bc579e0813f7f196cd7928e22fb1" checksum = "b1766cae4209194f40c58ac2fbe8dcf5cbd618f0a037f10d0078fea2e90b0249"
dependencies = [ dependencies = [
"atomic", "atomic",
] ]
@@ -117,6 +117,12 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]] [[package]]
name = "android_log-sys" name = "android_log-sys"
version = "0.2.0" version = "0.2.0"
@@ -169,6 +175,12 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "anstyle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.71" version = "1.0.71"
@@ -375,7 +387,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -419,7 +431,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -437,9 +449,9 @@ dependencies = [
[[package]] [[package]]
name = "async-tungstenite" name = "async-tungstenite"
version = "0.22.1" version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a48bf42ab2178374a79853bceef600e279258c75049b20481b022d73c908882" checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58"
dependencies = [ dependencies = [
"async-tls 0.12.0", "async-tls 0.12.0",
"futures-io", "futures-io",
@@ -463,7 +475,7 @@ dependencies = [
"futures-util", "futures-util",
"pin-project 1.1.0", "pin-project 1.1.0",
"rustc_version 0.4.0", "rustc_version 0.4.0",
"tokio 1.28.1", "tokio 1.28.2",
"wasm-bindgen-futures", "wasm-bindgen-futures",
] ]
@@ -599,9 +611,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.21.0" version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]] [[package]]
name = "base64ct" name = "base64ct"
@@ -659,9 +671,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.3.0" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f6b0c9ebae276e207a3e4e989ed9f3be8b7ce8728b80629c98c21d27742e6ba" checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
[[package]] [[package]]
name = "bitvec" name = "bitvec"
@@ -681,7 +693,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [ dependencies = [
"digest 0.10.6", "digest 0.10.7",
] ]
[[package]] [[package]]
@@ -695,7 +707,7 @@ dependencies = [
"cc", "cc",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"constant_time_eq", "constant_time_eq",
"digest 0.10.6", "digest 0.10.7",
] ]
[[package]] [[package]]
@@ -777,9 +789,9 @@ dependencies = [
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.12.2" version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]] [[package]]
name = "byte-slice-cast" name = "byte-slice-cast"
@@ -949,13 +961,13 @@ dependencies = [
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.24" version = "0.4.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" checksum = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03"
dependencies = [ dependencies = [
"android-tzdata",
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",
"num-integer",
"num-traits", "num-traits",
"time 0.1.45", "time 0.1.45",
"wasm-bindgen", "wasm-bindgen",
@@ -1042,13 +1054,33 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags 1.3.2", "bitflags 1.3.2",
"clap_lex", "clap_lex 0.2.4",
"indexmap", "indexmap",
"strsim 0.10.0", "strsim 0.10.0",
"termcolor", "termcolor",
"textwrap 0.16.0", "textwrap 0.16.0",
] ]
[[package]]
name = "clap"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
dependencies = [
"anstyle",
"bitflags 1.3.2",
"clap_lex 0.5.0",
]
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.2.4" version = "0.2.4"
@@ -1058,6 +1090,12 @@ dependencies = [
"os_str_bytes", "os_str_bytes",
] ]
[[package]]
name = "clap_lex"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]] [[package]]
name = "cmake" name = "cmake"
version = "0.1.50" version = "0.1.50"
@@ -1146,7 +1184,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"thread_local", "thread_local",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tonic 0.9.2", "tonic 0.9.2",
"tracing", "tracing",
@@ -1238,20 +1276,20 @@ dependencies = [
[[package]] [[package]]
name = "criterion" name = "criterion"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
dependencies = [ dependencies = [
"anes", "anes",
"atty",
"cast", "cast",
"ciborium", "ciborium",
"clap 3.2.25", "clap 4.3.0",
"criterion-plot", "criterion-plot",
"futures", "futures",
"is-terminal",
"itertools", "itertools",
"lazy_static",
"num-traits", "num-traits",
"once_cell",
"oorandom", "oorandom",
"plotters", "plotters",
"rayon", "rayon",
@@ -1325,7 +1363,7 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"crossterm_winapi", "crossterm_winapi",
"libc", "libc",
"mio 0.8.6", "mio 0.8.7",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"signal-hook", "signal-hook",
"signal-hook-mio", "signal-hook-mio",
@@ -1367,24 +1405,14 @@ dependencies = [
"subtle", "subtle",
] ]
[[package]]
name = "ctor"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.2.5" version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2"
dependencies = [ dependencies = [
"nix 0.26.2", "nix 0.26.2",
"windows-sys 0.45.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
@@ -1401,7 +1429,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"signal-hook", "signal-hook",
"tokio 1.28.1", "tokio 1.28.2",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
] ]
@@ -1447,7 +1475,7 @@ dependencies = [
"num", "num",
"owning_ref", "owning_ref",
"time 0.3.21", "time 0.3.21",
"tokio 1.28.1", "tokio 1.28.2",
"toml", "toml",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
@@ -1476,19 +1504,6 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "curve25519-dalek-ng"
version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.6.4",
"subtle-ng",
"zeroize",
]
[[package]] [[package]]
name = "daemonize" name = "daemonize"
version = "0.5.0" version = "0.5.0"
@@ -1542,7 +1557,7 @@ dependencies = [
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -1564,7 +1579,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
dependencies = [ dependencies = [
"darling_core 0.20.1", "darling_core 0.20.1",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -1582,9 +1597,9 @@ dependencies = [
[[package]] [[package]]
name = "data-encoding" name = "data-encoding"
version = "2.3.3" version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]] [[package]]
name = "derivative" name = "derivative"
@@ -1608,9 +1623,9 @@ dependencies = [
[[package]] [[package]]
name = "digest" name = "digest"
version = "0.10.6" version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [ dependencies = [
"block-buffer 0.10.4", "block-buffer 0.10.4",
"crypto-common", "crypto-common",
@@ -1749,7 +1764,7 @@ dependencies = [
"darling 0.20.1", "darling 0.20.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -2079,7 +2094,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -2261,7 +2276,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-util", "tokio-util",
"tracing", "tracing",
] ]
@@ -2466,7 +2481,7 @@ dependencies = [
"itoa", "itoa",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"socket2 0.4.9", "socket2 0.4.9",
"tokio 1.28.1", "tokio 1.28.2",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@@ -2480,7 +2495,7 @@ checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
dependencies = [ dependencies = [
"hyper", "hyper",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-io-timeout", "tokio-io-timeout",
] ]
@@ -2558,7 +2573,7 @@ dependencies = [
"simplelog 0.9.0", "simplelog 0.9.0",
"tokio 0.2.25", "tokio 0.2.25",
"tokio 0.3.7", "tokio 0.3.7",
"tokio 1.28.1", "tokio 1.28.2",
"url", "url",
"xmltree", "xmltree",
] ]
@@ -2649,9 +2664,9 @@ dependencies = [
[[package]] [[package]]
name = "io-lifetimes" name = "io-lifetimes"
version = "1.0.10" version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [ dependencies = [
"hermit-abi 0.3.1", "hermit-abi 0.3.1",
"libc", "libc",
@@ -2685,6 +2700,18 @@ version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "is-terminal"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.5" version = "0.10.5"
@@ -2832,7 +2859,7 @@ dependencies = [
"keyvaluedb", "keyvaluedb",
"keyvaluedb-shared-tests", "keyvaluedb-shared-tests",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"tokio 1.28.1", "tokio 1.28.2",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-bindgen-test", "wasm-bindgen-test",
] ]
@@ -2863,7 +2890,7 @@ dependencies = [
"rusqlite", "rusqlite",
"sysinfo 0.29.0", "sysinfo 0.29.0",
"tempfile", "tempfile",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -2955,9 +2982,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
@@ -2971,11 +2998,10 @@ dependencies = [
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.17" version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [ dependencies = [
"cfg-if 1.0.0",
"value-bag", "value-bag",
] ]
@@ -3124,14 +3150,14 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.6" version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" checksum = "eebffdb73fe72e917997fad08bdbf31ac50b0fa91cec93e69a0662e4264d454c"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.45.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
@@ -3311,7 +3337,7 @@ dependencies = [
"log", "log",
"netlink-packet-core", "netlink-packet-core",
"netlink-sys", "netlink-sys",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -3323,7 +3349,7 @@ dependencies = [
"futures", "futures",
"libc", "libc",
"log", "log",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -3538,9 +3564,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.17.1" version = "1.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
[[package]] [[package]]
name = "oorandom" name = "oorandom"
@@ -3580,7 +3606,7 @@ dependencies = [
"prost", "prost",
"protobuf", "protobuf",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tonic 0.8.3", "tonic 0.8.3",
] ]
@@ -3644,7 +3670,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"rand 0.8.5", "rand 0.8.5",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
] ]
@@ -3855,7 +3881,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -3926,7 +3952,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -4064,9 +4090,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.58" version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@@ -4159,9 +4185,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.27" version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@@ -4316,13 +4342,13 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.8.1" version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-syntax 0.7.1", "regex-syntax 0.7.2",
] ]
[[package]] [[package]]
@@ -4342,9 +4368,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.7.1" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]] [[package]]
name = "rend" name = "rend"
@@ -4452,7 +4478,7 @@ dependencies = [
"netlink-proto", "netlink-proto",
"nix 0.22.3", "nix 0.22.3",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -4461,7 +4487,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
dependencies = [ dependencies = [
"bitflags 2.3.0", "bitflags 2.3.1",
"fallible-iterator", "fallible-iterator",
"fallible-streaming-iterator", "fallible-streaming-iterator",
"hashlink 0.8.2", "hashlink 0.8.2",
@@ -4588,7 +4614,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.2",
] ]
[[package]] [[package]]
@@ -4691,9 +4717,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "2.9.0" version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"core-foundation 0.9.3", "core-foundation 0.9.3",
@@ -4784,7 +4810,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -4806,7 +4832,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -4877,7 +4903,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"cpufeatures", "cpufeatures",
"digest 0.10.6", "digest 0.10.7",
] ]
[[package]] [[package]]
@@ -4907,7 +4933,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"cpufeatures", "cpufeatures",
"digest 0.10.6", "digest 0.10.7",
] ]
[[package]] [[package]]
@@ -4960,7 +4986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
dependencies = [ dependencies = [
"libc", "libc",
"mio 0.8.6", "mio 0.8.7",
"signal-hook", "signal-hook",
] ]
@@ -5167,12 +5193,6 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "subtle-ng"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.109" version = "1.0.109"
@@ -5186,9 +5206,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.16" version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -5302,7 +5322,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -5457,14 +5477,14 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.28.1" version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes 1.4.0", "bytes 1.4.0",
"libc", "libc",
"mio 0.8.6", "mio 0.8.7",
"num_cpus", "num_cpus",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
@@ -5482,7 +5502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
dependencies = [ dependencies = [
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -5493,7 +5513,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -5504,7 +5524,7 @@ checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"tokio 1.28.1", "tokio 1.28.2",
] ]
[[package]] [[package]]
@@ -5518,7 +5538,7 @@ dependencies = [
"futures-io", "futures-io",
"futures-sink", "futures-sink",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"tokio 1.28.1", "tokio 1.28.2",
"tracing", "tracing",
] ]
@@ -5533,15 +5553,15 @@ dependencies = [
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.1" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.19.8" version = "0.19.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"toml_datetime", "toml_datetime",
@@ -5570,7 +5590,7 @@ dependencies = [
"pin-project 1.1.0", "pin-project 1.1.0",
"prost", "prost",
"prost-derive", "prost-derive",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tower", "tower",
@@ -5588,7 +5608,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
"base64 0.21.0", "base64 0.21.2",
"bytes 1.4.0", "bytes 1.4.0",
"futures-core", "futures-core",
"futures-util", "futures-util",
@@ -5600,7 +5620,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project 1.1.0", "pin-project 1.1.0",
"prost", "prost",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tower", "tower",
"tower-layer", "tower-layer",
@@ -5634,7 +5654,7 @@ dependencies = [
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"rand 0.8.5", "rand 0.8.5",
"slab", "slab",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-util", "tokio-util",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
@@ -5685,7 +5705,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]
@@ -5819,7 +5839,7 @@ dependencies = [
"smallvec", "smallvec",
"thiserror", "thiserror",
"tinyvec", "tinyvec",
"tokio 1.28.1", "tokio 1.28.2",
"tracing", "tracing",
"url", "url",
] ]
@@ -5839,7 +5859,7 @@ dependencies = [
"resolv-conf", "resolv-conf",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tracing", "tracing",
"trust-dns-proto", "trust-dns-proto",
] ]
@@ -5920,9 +5940,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.8" version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]] [[package]]
name = "unicode-normalization" name = "unicode-normalization"
@@ -6010,13 +6030,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]] [[package]]
name = "value-bag" name = "value-bag"
version = "1.0.0-alpha.9" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
dependencies = [
"ctor",
"version_check 0.9.4",
]
[[package]] [[package]]
name = "vcpkg" name = "vcpkg"
@@ -6059,7 +6075,7 @@ dependencies = [
"serde_derive", "serde_derive",
"serial_test", "serial_test",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-util", "tokio-util",
"veilid-core", "veilid-core",
] ]
@@ -6074,7 +6090,7 @@ dependencies = [
"async-std", "async-std",
"async-std-resolver", "async-std-resolver",
"async-tls 0.11.0", "async-tls 0.11.0",
"async-tungstenite 0.22.1", "async-tungstenite 0.22.2",
"async_executors", "async_executors",
"backtrace", "backtrace",
"blake3", "blake3",
@@ -6087,11 +6103,11 @@ dependencies = [
"chrono", "chrono",
"config", "config",
"console_error_panic_hook", "console_error_panic_hook",
"curve25519-dalek-ng", "curve25519-dalek",
"data-encoding", "data-encoding",
"digest 0.9.0",
"directories", "directories",
"ed25519-dalek", "ed25519-dalek",
"enum-as-inner",
"enumset", "enumset",
"eyre", "eyre",
"flume", "flume",
@@ -6121,7 +6137,6 @@ dependencies = [
"owo-colors", "owo-colors",
"paranoid-android", "paranoid-android",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"rand 0.7.3",
"range-set-blaze", "range-set-blaze",
"rkyv", "rkyv",
"rtnetlink", "rtnetlink",
@@ -6139,7 +6154,7 @@ dependencies = [
"static_assertions", "static_assertions",
"stop-token", "stop-token",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tracing", "tracing",
@@ -6162,7 +6177,7 @@ dependencies = [
"windows 0.38.0", "windows 0.38.0",
"windows-permissions", "windows-permissions",
"ws_stream_wasm", "ws_stream_wasm",
"x25519-dalek-ng", "x25519-dalek",
] ]
[[package]] [[package]]
@@ -6185,7 +6200,7 @@ dependencies = [
"parking_lot 0.12.1", "parking_lot 0.12.1",
"serde", "serde",
"serde_json", "serde_json",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tracing", "tracing",
@@ -6200,7 +6215,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"async-std", "async-std",
"async-tungstenite 0.22.1", "async-tungstenite 0.22.2",
"backtrace", "backtrace",
"bugsalot", "bugsalot",
"capnp", "capnp",
@@ -6233,7 +6248,7 @@ dependencies = [
"signal-hook-async-std", "signal-hook-async-std",
"stop-token", "stop-token",
"sysinfo 0.28.4", "sysinfo 0.28.4",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tracing", "tracing",
@@ -6282,7 +6297,7 @@ dependencies = [
"static_assertions", "static_assertions",
"stop-token", "stop-token",
"thiserror", "thiserror",
"tokio 1.28.1", "tokio 1.28.2",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-oslog", "tracing-oslog",
@@ -6398,7 +6413,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@@ -6432,7 +6447,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@@ -6887,14 +6902,13 @@ dependencies = [
] ]
[[package]] [[package]]
name = "x25519-dalek-ng" name = "x25519-dalek"
version = "1.1.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7074de8999662970c3c4c8f7f30925028dd8f4ca31ad4c055efa9cdf2ec326" checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
dependencies = [ dependencies = [
"curve25519-dalek-ng", "curve25519-dalek",
"rand 0.8.5", "rand_core 0.5.1",
"rand_core 0.6.4",
"zeroize", "zeroize",
] ]
@@ -6906,9 +6920,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
[[package]] [[package]]
name = "xml-rs" name = "xml-rs"
version = "0.8.11" version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" checksum = "2d8f380ae16a37b30e6a2cf67040608071384b1450c189e61bea3ff57cde922d"
[[package]] [[package]]
name = "xmltree" name = "xmltree"
@@ -6980,7 +6994,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.16", "syn 2.0.18",
] ]
[[package]] [[package]]

2
external/keyvaluedb vendored

Submodule external/keyvaluedb updated: 9bb05a54b4...0de595047a

11
veilid-core/Cargo.toml
View File

@@ -55,16 +55,13 @@ backtrace = { version = "^0" }
owo-colors = "^3" owo-colors = "^3"
stop-token = { version = "^0", default-features = false } stop-token = { version = "^0", default-features = false }
ed25519-dalek = { version = "^1", default_features = false, features = ["alloc", "u64_backend"] } ed25519-dalek = { version = "^1", default_features = false, features = ["alloc", "u64_backend"] }
x25519-dalek = { package = "x25519-dalek-ng", version = "^1", default_features = false, features = ["u64_backend"] } x25519-dalek = { version = "^1", default_features = false, features = ["u64_backend"] }
curve25519-dalek = { package = "curve25519-dalek-ng", version = "^4", default_features = false, features = ["alloc", "u64_backend"] } curve25519-dalek = { version = "^3", default_features = false, features = ["alloc", "u64_backend"] }
# ed25519-dalek needs rand 0.7 until it updates itself blake3 = { version = "^1" }
rand = "0.7"
# curve25519-dalek-ng is stuck on digest 0.9.0
digest = "0.9.0"
blake3 = { version = "1.1.0" }
rtnetlink = { version = "^0", default-features = false, optional = true } rtnetlink = { version = "^0", default-features = false, optional = true }
async-std-resolver = { version = "^0", optional = true } async-std-resolver = { version = "^0", optional = true }
trust-dns-resolver = { version = "^0", optional = true } trust-dns-resolver = { version = "^0", optional = true }
enum-as-inner = "=0.5.1" # temporary fix for trust-dns-resolver v0.22.0
keyvaluedb = { path = "../external/keyvaluedb/keyvaluedb" } keyvaluedb = { path = "../external/keyvaluedb/keyvaluedb" }
rkyv = { version = "^0", default_features = false, features = ["std", "alloc", "strict", "size_32", "validation"] } rkyv = { version = "^0", default_features = false, features = ["std", "alloc", "strict", "size_32", "validation"] }
data-encoding = { version = "^2" } data-encoding = { version = "^2" }

4
veilid-core/src/crypto/blake3digest512.rs
View File

@@ -1,5 +1,5 @@
use digest::generic_array::typenum::U64; use curve25519_dalek::digest::generic_array::typenum::U64;
use digest::{Digest, Output}; use curve25519_dalek::digest::{Digest, Output};
use generic_array::GenericArray; use generic_array::GenericArray;
pub struct Blake3Digest512 { pub struct Blake3Digest512 {

2
veilid-core/src/crypto/vld0/mod.rs
View File

@@ -10,7 +10,7 @@ use chacha20poly1305 as ch;
use chacha20poly1305::aead::{AeadInPlace, NewAead}; use chacha20poly1305::aead::{AeadInPlace, NewAead};
use core::convert::TryInto; use core::convert::TryInto;
use curve25519_dalek as cd; use curve25519_dalek as cd;
use digest::Digest; use curve25519_dalek::digest::Digest;
use ed25519_dalek as ed; use ed25519_dalek as ed;
use x25519_dalek as xd; use x25519_dalek as xd;