diff --git a/Cargo.lock b/Cargo.lock index df1b0a3..6f8a9ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,7 +745,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "ostp" -version = "0.1.58" +version = "0.1.60" dependencies = [ "anyhow", "base64", @@ -762,7 +762,7 @@ dependencies = [ [[package]] name = "ostp-client" -version = "0.1.58" +version = "0.1.60" dependencies = [ "anyhow", "bytes", @@ -780,7 +780,7 @@ dependencies = [ [[package]] name = "ostp-core" -version = "0.1.58" +version = "0.1.60" dependencies = [ "anyhow", "async-trait", @@ -813,7 +813,7 @@ dependencies = [ [[package]] name = "ostp-server" -version = "0.1.58" +version = "0.1.60" dependencies = [ "anyhow", "bytes", @@ -828,7 +828,7 @@ dependencies = [ [[package]] name = "ostp-tun-helper" -version = "0.1.58" +version = "0.1.60" dependencies = [ "anyhow", "chrono", diff --git a/ostp-core/src/crypto/mod.rs b/ostp-core/src/crypto/mod.rs index d3925ea..9d06278 100644 --- a/ostp-core/src/crypto/mod.rs +++ b/ostp-core/src/crypto/mod.rs @@ -4,6 +4,6 @@ pub mod noise; pub mod obfuscation; pub use aead::SessionCipher; -pub use kex::{HybridSharedSecret, KeyExchange}; +pub use kex::{HybridSharedSecret, HybridKex}; pub use noise::{NoiseRole, NoiseSession}; pub use obfuscation::{deobfuscate_header_inplace, deobfuscate_packet_inplace, obfuscate_packet_inplace, derive_obfuscation_key, derive_psk}; diff --git a/ostp-server/src/lib.rs b/ostp-server/src/lib.rs index 160326b..62639bb 100644 --- a/ostp-server/src/lib.rs +++ b/ostp-server/src/lib.rs @@ -10,8 +10,8 @@ use dispatcher::{DispatchOutcome, Dispatcher}; use ostp_core::relay::RelayMessage; use ostp_core::{NoiseRole, PaddingStrategy, ProtocolConfig}; use signal::wait_for_shutdown_signal; -use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use tokio::net::{tcp::OwnedWriteHalf, TcpStream, UdpSocket}; +use tokio::io::AsyncReadExt; +use tokio::net::{TcpStream, UdpSocket}; use tokio::sync::mpsc; use tokio::time::{interval, Duration, Instant}; diff --git a/ostp-tun-helper/src/main.rs b/ostp-tun-helper/src/main.rs index 509fa76..430b0d5 100644 --- a/ostp-tun-helper/src/main.rs +++ b/ostp-tun-helper/src/main.rs @@ -29,6 +29,7 @@ enum GuiCmd { #[derive(Serialize)] #[serde(tag = "type", rename_all = "lowercase")] +#[allow(dead_code)] enum HelperMsg { Status { value: u8 }, Log { message: String },