diff --git a/Cargo.lock b/Cargo.lock index d5690e79..c26d6601 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,6 +19,29 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "amplify_derive" +version = "2.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c3de270e75f27a4468a7c344070109046656e85cb522141f7d40ab4b83803ac" +dependencies = [ + "amplify_syn", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "amplify_syn" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da24db1445cc7bc3842fa072c2d51fe5b25b812b6a572d65842a4c72e87221ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -456,6 +479,16 @@ dependencies = [ "syn", ] +[[package]] +name = "cyphernet" +version = "0.1.0" +source = "git+https://github.com/internet2-wg/rust-cyphernet?rev=dee03a95abe4c964e5d9f8532c7dc76998dfeea7#dee03a95abe4c964e5d9f8532c7dc76998dfeea7" +dependencies = [ + "amplify_derive", + "multibase", + "socks", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -1541,6 +1574,7 @@ dependencies = [ "base64", "byteorder", "crossbeam-channel", + "cyphernet", "ed25519-compact", "fastrand", "git-ref-format", @@ -1618,6 +1652,7 @@ name = "radicle-crypto" version = "0.1.0" dependencies = [ "base64", + "cyphernet", "ed25519-compact", "fastrand", "git-ref-format", @@ -2050,6 +2085,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "socks" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" diff --git a/Cargo.toml b/Cargo.toml index fbf7bead..411eaee5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,3 +27,8 @@ version = "0.3.0" git = "https://github.com/cloudhead/nakamoto" rev = "90cc3eac67aa5cfd5f42cf7cb1e2b155af3214fb" version = "0.3.0" + +[patch.crates-io.cyphernet] +git = "https://github.com/internet2-wg/rust-cyphernet" +rev = "dee03a95abe4c964e5d9f8532c7dc76998dfeea7" +version = "0.1.0" diff --git a/radicle-crypto/Cargo.toml b/radicle-crypto/Cargo.toml index f5bffc91..f503e8c6 100644 --- a/radicle-crypto/Cargo.toml +++ b/radicle-crypto/Cargo.toml @@ -14,6 +14,7 @@ ssh = ["base64", "radicle-ssh", "sha2", "ssh-key"] [dependencies] ed25519-compact = { version = "2.0.2", features = ["pem"] } +cyphernet = { version = "0", optional = true } multibase = { version = "0.9.1" } serde = { version = "1", features = ["derive"] } sqlite = { version = "0.28.1", optional = true } diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml index 448030ce..4e786e58 100644 --- a/radicle/Cargo.toml +++ b/radicle/Cargo.toml @@ -16,6 +16,7 @@ base64 = { version= "0.13" } byteorder = { version = "1.4" } crossbeam-channel = { version = "0.5.6" } ed25519-compact = { version = "2.0.2", features = ["pem"] } +cyphernet = { version = "0", optional = true } fastrand = { version = "1.8.0" } git-ref-format = { version = "0", features = ["serde", "macro"] } multibase = { version = "0.9.1" }