diff --git a/Cargo.lock b/Cargo.lock index faf158f71..e023c4330 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -942,7 +942,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio-tungstenite", + "tokio-tungstenite 0.15.0", "url", ] @@ -978,7 +978,7 @@ dependencies = [ "tempfile", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.15.0", "tracing", "tracing-appender", "tracing-futures", @@ -1092,7 +1092,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.15.0", "tracing", "url", "uuid", @@ -2327,6 +2327,15 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64", +] + [[package]] name = "ryu" version = "1.0.5" @@ -2782,7 +2791,19 @@ dependencies = [ "pin-project 1.0.5", "tokio", "tokio-native-tls", - "tungstenite", + "tungstenite 0.14.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.17.3", ] [[package]] @@ -2931,6 +2952,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand 0.8.3", + "sha-1 0.10.0", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.12.0" @@ -3073,9 +3113,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" dependencies = [ "bytes", "futures-channel", @@ -3088,14 +3128,15 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project 1.0.5", + "rustls-pemfile", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite", - "tokio-util 0.6.7", + "tokio-tungstenite 0.17.2", + "tokio-util 0.7.2", "tower-service", "tracing", ] diff --git a/crates/ilp-node/Cargo.toml b/crates/ilp-node/Cargo.toml index f8cfb3300..2a7a31993 100644 --- a/crates/ilp-node/Cargo.toml +++ b/crates/ilp-node/Cargo.toml @@ -55,7 +55,7 @@ tokio-stream = { version = "0.1.7", features = ["sync"] } tracing = { version = "0.1.12", default-features = false, features = ["log"] } url = { version = "2.1.1", default-features = false } libc = { version = "0.2.62", default-features = false } -warp = { version = "0.3.1", default-features = false, features = ["websocket"] } +warp = { version = "0.3.3", default-features = false, features = ["websocket"] } secrecy = { version = "0.8", default-features = false, features = ["alloc", "serde"] } uuid = { version = "0.8.1", default-features = false, features = ["v4"] } diff --git a/crates/interledger-api/Cargo.toml b/crates/interledger-api/Cargo.toml index 3fa65f287..ebdc02886 100644 --- a/crates/interledger-api/Cargo.toml +++ b/crates/interledger-api/Cargo.toml @@ -32,7 +32,7 @@ serde_json = { version = "1.0.41", default-features = false } reqwest = { version = "0.11.4", default-features = false, features = ["default-tls", "json"] } url = { version = "2.1.1", default-features = false, features = ["serde"] } uuid = { version = "0.8.1", default-features = false} -warp = { version = "0.3.1", default-features = false } +warp = { version = "0.3.3", default-features = false } secrecy = { version = "0.8", default-features = false, features = ["serde"] } once_cell = "1.3.1" async-trait = "0.1.22" diff --git a/crates/interledger-btp/Cargo.toml b/crates/interledger-btp/Cargo.toml index bc8a177d9..00854e3c3 100644 --- a/crates/interledger-btp/Cargo.toml +++ b/crates/interledger-btp/Cargo.toml @@ -26,7 +26,7 @@ stream-cancel = { version = "0.8.1", default-features = false } tokio-tungstenite = { version = "0.15.0", default-features = false, features = ["native-tls", "connect"] } url = { version = "2.1.1", default-features = false } uuid = { version = "0.8.1", default-features = false, features = ["v4"]} -warp = { version = "0.3.1", default-features = false, features = ["websocket"] } +warp = { version = "0.3.3", default-features = false, features = ["websocket"] } secrecy = { version = "0.8", default-features = false, features = ["alloc"] } async-trait = { version = "0.1.22", default-features = false } tokio = { version = "1.9.0", default-features = false, features = ["rt", "time", "macros"] } diff --git a/crates/interledger-errors/Cargo.toml b/crates/interledger-errors/Cargo.toml index a97d40a32..7e6a55c41 100644 --- a/crates/interledger-errors/Cargo.toml +++ b/crates/interledger-errors/Cargo.toml @@ -17,7 +17,7 @@ serde_path_to_error = { version = "0.1", default-features = false } http = { version = "0.2.0", default-features = false } chrono = { version = "0.4.20", default-features = false, features = ["clock"] } regex = { version ="1.5", default-features = false, features = ["std"] } -warp = { version = "0.3.1", default-features = false } +warp = { version = "0.3.3", default-features = false } redis = { package = "redis", version = "0.21.0", optional = true, default-features = false, features = ["tokio-comp"] } url = { version = "2.1.1", default-features = false } diff --git a/crates/interledger-http/Cargo.toml b/crates/interledger-http/Cargo.toml index 159a5e7b5..b1b26bb4f 100644 --- a/crates/interledger-http/Cargo.toml +++ b/crates/interledger-http/Cargo.toml @@ -17,7 +17,7 @@ futures = { version = "0.3.7", default-features = false } tracing = { version = "0.1.12", default-features = false, features = ["log"] } reqwest = { version = "0.11.4", default-features = false, features = ["default-tls"] } url = { version = "2.1.1", default-features = false } -warp = { version = "0.3.1", default-features = false } +warp = { version = "0.3.3", default-features = false } serde = { version = "1.0.101", default-features = false, features = ["derive"] } serde_json = { version = "1.0.41", default-features = false } serde_path_to_error = { version = "0.1", default-features = false } diff --git a/crates/interledger-settlement/Cargo.toml b/crates/interledger-settlement/Cargo.toml index 79226bc06..e9832920a 100644 --- a/crates/interledger-settlement/Cargo.toml +++ b/crates/interledger-settlement/Cargo.toml @@ -26,7 +26,7 @@ ring = { version = "0.16.9", default-features = false } tokio = { version = "1.9.0", default-features = false, features = ["macros", "rt"] } num-bigint = { version = "0.2.3", default-features = false, features = ["std"] } num-traits = { version = "0.2.8", default-features = false } -warp = { version = "0.3.1", default-features = false } +warp = { version = "0.3.3", default-features = false } http = { version = "0.2.0", default-features = false } redis_crate = { package = "redis", version = "0.21.0", optional = true, default-features = false, features = ["tokio-comp"] } async-trait = { version = "0.1.22", default-features = false }