From 7248859a6cddc1eea2b8c4882020d64feb138c6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 19:38:10 +0000 Subject: [PATCH] Bump prost-types from 0.7.0 to 0.8.0 (#38) * Bump prost-types from 0.7.0 to 0.8.0 Bumps [prost-types](https://github.com/tokio-rs/prost) from 0.7.0 to 0.8.0. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](https://github.com/tokio-rs/prost/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: prost-types dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update other deps and change code to accommodate --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: lhchavez --- Cargo.lock | 102 +++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 8 ++--- src/auth.rs | 6 ++-- 3 files changed, 88 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e16f66..08c14af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,20 +223,21 @@ dependencies = [ [[package]] name = "cipher" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ "generic-array", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] @@ -269,6 +270,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -281,13 +292,11 @@ dependencies = [ [[package]] name = "des" -version = "0.6.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24e7c748888aa2fa8bce21d8c64a52efc810663285315ac7476f7197a982fae" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" dependencies = [ - "byteorder", - "cipher 0.2.5", - "opaque-debug", + "cipher 0.4.4", ] [[package]] @@ -688,6 +697,15 @@ dependencies = [ "hashbrown 0.14.3", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "input_buffer" version = "0.4.0" @@ -715,6 +733,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.7" @@ -1211,7 +1238,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.7.0", +] + +[[package]] +name = "prost" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +dependencies = [ + "bytes", + "prost-derive 0.8.0", ] [[package]] @@ -1222,12 +1259,12 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.9.0", "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.7.0", + "prost-types 0.7.0", "tempfile", "which", ] @@ -1239,7 +1276,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools", + "itertools 0.9.0", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +dependencies = [ + "anyhow", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -1252,7 +1302,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ "bytes", - "prost", + "prost 0.7.0", +] + +[[package]] +name = "prost-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +dependencies = [ + "bytes", + "prost 0.8.0", ] [[package]] @@ -1400,7 +1460,7 @@ dependencies = [ "byte-slice-cast", "bytes", "chrono", - "cipher 0.2.5", + "cipher 0.4.4", "clap", "des", "env_logger", @@ -1417,9 +1477,9 @@ dependencies = [ "opus", "paseto", "path-clean", - "prost", + "prost 0.8.0", "prost-build", - "prost-types", + "prost-types 0.8.0", "rand 0.8.3", "ring", "serde_json", @@ -1795,9 +1855,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" diff --git a/Cargo.toml b/Cargo.toml index e15ada8..3143b2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,9 +10,9 @@ base64 = "0.13.0" byte-slice-cast = "1.0.0" bytes = "1.0.1" chrono = "0.4" -cipher = "*" +cipher = "0.4" clap = "2.33" -des = "0.6.0" +des = "0.8" env_logger = "*" futures = "0.3.12" http = "0.2" @@ -24,8 +24,8 @@ log = "*" opus = "0.2.1" paseto = { version = "2.0.2+1.0.3", features = ["v2"] } path-clean = "0.1" -prost = "0.7" -prost-types = "0.7" +prost = "0.8" +prost-types = "0.8" psimple = { package = "libpulse-simple-binding", version = "2.20.1" } pulse = { package = "libpulse-binding", version = "2.20.0" } rand = "0.8.2" diff --git a/src/auth.rs b/src/auth.rs index 955f319..17cbd01 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use anyhow::{anyhow, bail, Context, Result}; use bytes::BytesMut; -use des::cipher::{BlockCipher, NewBlockCipher}; +use cipher::{BlockEncrypt, KeyInit}; use futures::{SinkExt, StreamExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio_tungstenite::tungstenite::protocol::Message as WebSocketMessage; @@ -487,9 +487,9 @@ fn vnc_des_encrypt(password: &str, buf: &mut [u8]) { x >>= 1; } } - let des = des::Des::new(cipher::block::Key::::from_slice(&key)); + let des = des::Des::new(cipher::Key::::from_slice(&key)); for i in (0..buf.len()).step_by(8) { - des.encrypt_block(cipher::block::Block::::from_mut_slice( + des.encrypt_block(cipher::Block::::from_mut_slice( &mut buf[i..i + 8], )); }