diff --git a/Cargo.lock b/Cargo.lock index ec8287e..c5db987 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,16 +106,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20stream" -version = "1.0.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a91f983a237d46407e744f0b9c5d2866f018954de5879905d7af6bf06953aea" +checksum = "3a27e1b4a96dea2045de11b4c72d5717f84acd73de7133f3ee6005244d838d56" dependencies = [ "base64 0.13.0", "getrandom 0.2.3", + "libc", "openssl", "pin-project", "rustc_version", "smallvec", + "stackalloc", "tokio 0.2.25", ] diff --git a/Cargo.toml b/Cargo.toml index d3a4e5d..bc9f355 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] bytes = { version = "1.0.1", features = ["serde"] } -chacha20stream = { version = "1.0.3", features = ["async"] } +chacha20stream = { version = "2.0", features = ["async"] } color-eyre = "0.5.11" cryptohelpers = { version = "1.8.1" , features = ["serialise", "full"] } futures = "0.3.16" diff --git a/src/sock/enc.rs b/src/sock/enc.rs index 7e79659..8340022 100644 --- a/src/sock/enc.rs +++ b/src/sock/enc.rs @@ -59,7 +59,7 @@ impl AsyncRead for ReverseSink } } alloc_local_bytes(buf.len(), |temp_buf| -> Poll> { - //XXX: Does this work? I dunno... Maybe just pin and poll a local `async{}` block. + //XXX: Does this work? I dunno... Maybe just pin and poll a local `async{}` block (this doesn't work, because `raw` needs to be `Unpin`... sigh....). // Read encrypted bytes into `temp_buf`. let filled_buffer: &[u8] = try_ready!(proj.raw.poll_read(cx, temp_buf).map_ok(|read| {