diff --git a/Cargo.lock b/Cargo.lock index ac84d3efc8..c4494f4f15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ "http", "log", "openssl", - "rustls", + "rustls 0.18.1", "tokio-openssl", - "tokio-rustls", + "tokio-rustls 0.14.1", "trust-dns-proto", "trust-dns-resolver", "webpki", @@ -275,11 +275,11 @@ dependencies = [ "actix-utils", "futures-util", "openssl", - "rustls", + "rustls 0.18.1", "tokio-openssl", - "tokio-rustls", + "tokio-rustls 0.14.1", "webpki", - "webpki-roots", + "webpki-roots 0.20.0", ] [[package]] @@ -333,7 +333,7 @@ dependencies = [ "openssl", "pin-project 1.0.5", "regex", - "rustls", + "rustls 0.18.1", "serde", "serde_json", "serde_urlencoded 0.7.0", @@ -502,7 +502,7 @@ dependencies = [ "openssl", "percent-encoding", "rand 0.7.3", - "rustls", + "rustls 0.18.1", "serde", "serde_json", "serde_urlencoded 0.7.0", @@ -690,9 +690,9 @@ dependencies = [ [[package]] name = "candid" -version = "0.6.16" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9669668454dd04c144d6f6674b4266b6e8fd0ef75f0240f0d08ec60869f654aa" +checksum = "7f9b7a91e4c220c5daeafaebfc775e06afcab733e4068075ea2eb7ab81ff5b84" dependencies = [ "arbitrary", "byteorder", @@ -712,15 +712,16 @@ dependencies = [ "pretty 0.10.0", "rand 0.8.3", "serde", + "serde_bytes", "serde_dhall", "thiserror", ] [[package]] name = "candid_derive" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5603430e22543ff48a72020277340132dea6653e6c91b47c9e1f90f91ae82c54" +checksum = "e3c7113fdbc587057808a551cfdf56ddcfcd4d2c68dd27599f102d03e1ed1712" dependencies = [ "lazy_static", "proc-macro2", @@ -1858,9 +1859,24 @@ dependencies = [ "futures-util", "hyper 0.13.10", "log", - "rustls", + "rustls 0.18.1", "tokio 0.2.25", - "tokio-rustls", + "tokio-rustls 0.14.1", + "webpki", +] + +[[package]] +name = "hyper-rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +dependencies = [ + "futures-util", + "hyper 0.14.4", + "log", + "rustls 0.19.0", + "tokio 1.2.0", + "tokio-rustls 0.22.0", "webpki", ] @@ -1892,8 +1908,8 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#447d4fadfe76a038bc2994d26b067e4a964d7996" +version = "0.2.0" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#38027c0aca0b403ac01fc1b5aa607550a916ac21" dependencies = [ "async-trait", "base32", @@ -1908,22 +1924,22 @@ dependencies = [ "openssl", "pem 0.8.2", "rand 0.7.3", - "reqwest 0.10.10", + "reqwest 0.11.0", "ring", - "rustls", + "rustls 0.19.0", "serde", "serde_bytes", "serde_cbor", "simple_asn1", "thiserror", "url", - "webpki-roots", + "webpki-roots 0.20.0", ] [[package]] name = "ic-identity-hsm" -version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#447d4fadfe76a038bc2994d26b067e4a964d7996" +version = "0.2.0" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#38027c0aca0b403ac01fc1b5aa607550a916ac21" dependencies = [ "hex", "ic-agent", @@ -1938,7 +1954,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#447d4fadfe76a038bc2994d26b067e4a964d7996" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#38027c0aca0b403ac01fc1b5aa607550a916ac21" dependencies = [ "base32", "crc32fast", @@ -1949,8 +1965,8 @@ dependencies = [ [[package]] name = "ic-utils" -version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#447d4fadfe76a038bc2994d26b067e4a964d7996" +version = "0.2.0" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#38027c0aca0b403ac01fc1b5aa607550a916ac21" dependencies = [ "async-trait", "candid", @@ -1958,6 +1974,7 @@ dependencies = [ "ic-agent", "ic-types", "serde", + "serde_bytes", "thiserror", ] @@ -3299,7 +3316,7 @@ dependencies = [ "http", "http-body 0.3.1", "hyper 0.13.10", - "hyper-rustls", + "hyper-rustls 0.21.0", "hyper-tls 0.4.3", "ipnet", "js-sys", @@ -3310,18 +3327,18 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite 0.2.4", - "rustls", + "rustls 0.18.1", "serde", "serde_json", "serde_urlencoded 0.7.0", "tokio 0.2.25", - "tokio-rustls", + "tokio-rustls 0.14.1", "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.20.0", "winreg 0.7.0", ] @@ -3339,6 +3356,7 @@ dependencies = [ "http", "http-body 0.4.0", "hyper 0.14.4", + "hyper-rustls 0.22.1", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -3348,14 +3366,18 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite 0.2.4", + "rustls 0.19.0", "serde", + "serde_json", "serde_urlencoded 0.7.0", "tokio 1.2.0", "tokio-native-tls", + "tokio-rustls 0.22.0", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 0.21.0", "winreg 0.7.0", ] @@ -3430,6 +3452,19 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" +dependencies = [ + "base64 0.13.0", + "log", + "ring", + "sct", + "webpki", +] + [[package]] name = "rustversion" version = "1.0.4" @@ -4138,11 +4173,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", - "rustls", + "rustls 0.18.1", "tokio 0.2.25", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls 0.19.0", + "tokio 1.2.0", + "webpki", +] + [[package]] name = "tokio-tls" version = "0.3.1" @@ -4574,6 +4620,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" +dependencies = [ + "webpki", +] + [[package]] name = "widestring" version = "0.4.3" diff --git a/Cargo.toml b/Cargo.toml index aee1e308fe..17bb5b4054 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,25 +4,25 @@ members = [ ] [patch.crates-io.ic-agent] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [patch.crates-io.ic-identity-hsm] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [patch.crates-io.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [patch.crates-io.ic-utils] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index ffc938ba26..490dc0bf73 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -70,28 +70,28 @@ walkdir = "2.2.9" wasmparser = "0.45.0" [dependencies.ic-agent] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [dependencies.ic-identity-hsm] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [dependencies.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [dependencies.ic-utils] -version = "0.1.0" +version = "0.2.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "447d4fadfe76a038bc2994d26b067e4a964d7996" +rev = "38027c0aca0b403ac01fc1b5aa607550a916ac21" [dev-dependencies] env_logger = "0.6"