diff --git a/vnt-cli/Cargo.toml b/vnt-cli/Cargo.toml index 709ece6..d459bb4 100644 --- a/vnt-cli/Cargo.toml +++ b/vnt-cli/Cargo.toml @@ -15,7 +15,7 @@ os_info = "3.7.0" dirs = "5.0.1" serde = "1.0" serde_json = "1.0.94" -serde_yaml = "0.9.25" +serde_yaml = "0.8.26" log = "0.4.17" log4rs = "1.2.0" [dependencies.uuid] diff --git a/vnt/Cargo.toml b/vnt/Cargo.toml index 8164797..3e0cb57 100644 --- a/vnt/Cargo.toml +++ b/vnt/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] packet = { path = "./packet" } -bytes = "1.3.0" +bytes = "1.5.0" log = "0.4.17" libc = "0.2.137" crossbeam-utils = "0.8" crossbeam-epoch = "0.9.15" -dashmap = "5.5.1" +dashmap = "5.5.3" parking_lot = "0.12.1" rand = "0.8.5" sha2 = { version = "0.10.6", features = ["oid"] } @@ -21,13 +21,13 @@ protobuf = "3.2.0" socket2 = { version = "0.5.2", features = ["all"] } tokio = { version = "1.32.0", features = ["full"] } aes-gcm = { version = "0.10.2",optional = true } -ring = { version = "0.16.20", optional = true } +ring = { version = "0.17.0", optional = true } cbc = {version = "0.1.2",optional = true} ecb = {version = "0.1.2",optional = true} aes = "0.8.3" stun-format = { version = "1.0.1", features = ["fmt", "rfc3489"] } -rsa = { version = "0.7.2", features = [] ,optional = true} -spki = { version = "0.6.0", features = ["fingerprint", "alloc"] ,optional = true} +rsa = { version = "0.9.2", features = [] ,optional = true} +spki = { version = "0.7.2", features = ["fingerprint", "alloc","base64"] ,optional = true} openssl-sys = { git = "https://github.com/lbl8603/rust-openssl" ,optional = true} libsm = {git="https://github.com/lbl8603/libsm" ,optional = true} @@ -36,7 +36,7 @@ tun = { path = "./rust-tun" } [target.'cfg(target_os = "windows")'.dependencies] win-tun-tap = { path = "./win-tun-tap" } -libloading = "0.7.4" +libloading = "0.8.0" [build-dependencies] diff --git a/vnt/src/cipher/rsa_cipher.rs b/vnt/src/cipher/rsa_cipher.rs index d6d7f55..ce2d248 100644 --- a/vnt/src/cipher/rsa_cipher.rs +++ b/vnt/src/cipher/rsa_cipher.rs @@ -8,7 +8,7 @@ use rand::Rng; #[cfg(feature = "server_encrypt")] use rsa::pkcs8::der::Decode; #[cfg(feature = "server_encrypt")] -use rsa::{PublicKey, RsaPublicKey}; +use rsa::RsaPublicKey; #[cfg(feature = "server_encrypt")] use sha2::Digest; #[cfg(feature = "server_encrypt")] @@ -46,7 +46,7 @@ impl RsaCipher { #[cfg(feature = "server_encrypt")] pub fn finger(&self) -> io::Result { match self.inner.public_key.to_public_key_der() { - Ok(der) => match rsa::pkcs8::SubjectPublicKeyInfo::from_der(der.as_bytes()) { + Ok(der) => match rsa::pkcs8::SubjectPublicKeyInfoRef::from_der(der.as_bytes()) { Ok(spki) => match spki.fingerprint_base64() { Ok(finger) => Ok(finger), Err(e) => Err(io::Error::new( @@ -109,7 +109,7 @@ impl RsaCipher { secret_body.set_finger(&key[16..])?; match self.inner.public_key.encrypt( &mut rng, - rsa::PaddingScheme::PKCS1v15Encrypt, + rsa::pkcs1v15::Pkcs1v15Encrypt, secret_body.buffer(), ) { Ok(enc_data) => { diff --git a/vnt/win-tun-tap/Cargo.toml b/vnt/win-tun-tap/Cargo.toml index 05a137b..ae4edc0 100644 --- a/vnt/win-tun-tap/Cargo.toml +++ b/vnt/win-tun-tap/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] log = "0.4.17" -winreg = "0.7" +winreg = "0.51.0" scopeguard = "1.1" -libloading = "0.7" -widestring = "0.4" +libloading = "0.8.0" +widestring = "1.0.2" once_cell = "1.8" -itertools = "0.10.1" +itertools = "0.11.0" rand = "0.8.5" [dependencies.winapi] version = "0.3"