Trying to make a project look nice.
modified: Cargo.lock modified: Cargo.toml modified: frida_cli/Cargo.toml modified: frida_client/Cargo.toml modified: frida_client/src/client.rs modified: frida_core/Cargo.toml modified: frida_lib/Cargo.toml modified: frida_server/Cargo.toml modified: frida_server/src/server.rs
This commit is contained in:
parent
ecf1c920a3
commit
1b3cc1289a
754
Cargo.lock
generated
754
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
15
Cargo.toml
15
Cargo.toml
@ -1,3 +1,16 @@
|
||||
[workspace]
|
||||
resolver = "2"
|
||||
members = ["frida_core","frida_client","frida_server","frida_cli","frida_gui","frida_lib"]
|
||||
members = ["frida_core","frida_client","frida_server","frida_cli","frida_gui","frida_lib"]
|
||||
|
||||
[workspace.dependencies]
|
||||
env_logger = "0.11.6"
|
||||
log = "0.4.20"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
serde_yaml = "0.9.34"
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0.190"
|
||||
base64 = "0.22.1"
|
||||
rand = { version = "0.8.5", features = ["small_rng", "getrandom", "std_rng"] }
|
||||
aes-gcm = "0.10.3"
|
||||
x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] }
|
@ -11,13 +11,10 @@ workspace = "../"
|
||||
|
||||
[dependencies]
|
||||
clap = "2.33"
|
||||
env_logger = "0.9"
|
||||
log = "0.4.20"
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0.190"
|
||||
serde_yaml = "0.9.34"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
serde_yaml = { workspace = true }
|
||||
log = { workspace = true }
|
||||
env_logger = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
frida_core = { path = "../frida_core" }
|
||||
frida_client = { path = "../frida_client" }
|
||||
frida_server = { path = "../frida_server" }
|
@ -13,12 +13,11 @@ crate-type = ["staticlib", "cdylib", "lib"]
|
||||
|
||||
[dependencies]
|
||||
frida_core = { path = "../frida_core", package = "frida_core" }
|
||||
aes-gcm = "0.10.3"
|
||||
x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] }
|
||||
base64 = "0.22.1"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
env_logger = "0.9"
|
||||
log = "0.4.20"
|
||||
regex = "1.11.1"
|
||||
rand = { version = "0.8.5", features = ["small_rng", "getrandom", "std_rng"] }
|
||||
aes-gcm = { workspace = true }
|
||||
x25519-dalek = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
tokio-util = { workspace = true }
|
||||
base64 = { workspace = true }
|
||||
log = { workspace = true }
|
||||
rand = { workspace = true }
|
@ -51,7 +51,7 @@ pub mod general {
|
||||
let mut rng = OsPRNG::default();
|
||||
sock_hnd.send(&handshake.serialize()).await.unwrap();
|
||||
loop {
|
||||
time::sleep(Duration::from_millis(1000 * rng.gen_range(40..=480))).await;
|
||||
time::sleep(Duration::from_millis(1000 * rng.gen_range(80..=480))).await;
|
||||
info!("The handshake has been sent!");
|
||||
sock_hnd.send(&handshake.serialize()).await.unwrap();
|
||||
}
|
||||
|
@ -12,37 +12,23 @@ readme = "../README.md"
|
||||
crate-type = ["staticlib", "cdylib", "lib"]
|
||||
|
||||
[dependencies]
|
||||
clap = "2.33"
|
||||
aes-gcm = "0.10.3"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0.190"
|
||||
rand = { version = "0.8.5", features = ["small_rng", "getrandom", "std_rng"] }
|
||||
block-modes = "0.8"
|
||||
block-padding = "0.2"
|
||||
generic-array = "0.14"
|
||||
env_logger = "0.9"
|
||||
log = "0.4.20"
|
||||
futures = "0.3.30"
|
||||
packet = "0.1.4"
|
||||
async-channel = "2.3.1"
|
||||
hex = "0.4"
|
||||
serde_yaml = "0.9.34"
|
||||
x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] }
|
||||
base64 = "0.22.1"
|
||||
chrono = "0.4.38"
|
||||
console-subscriber = "0.4.0"
|
||||
tun = { version = "0.7.5", features = ["async"] }
|
||||
base64 = { workspace = true }
|
||||
x25519-dalek = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
serde_derive = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
|
||||
[target.'cfg(target_os="windows")'.dependencies]
|
||||
iced = { version = "0.13.1", features = ["tokio"] }
|
||||
dirs = "5.0.1"
|
||||
dirs = "6.0.0"
|
||||
tray-item = "0.10.0"
|
||||
wintun = "0.5.0"
|
||||
|
||||
[target.'cfg(target_os="windows")'.build-dependencies]
|
||||
embed-resource = "2.3"
|
||||
embed-resource = "3.0.1"
|
||||
|
||||
[target.'cfg(target_os="macos")'.dependencies]
|
||||
nix = { version = "0.29.0", features = ["socket"] }
|
||||
|
@ -15,15 +15,8 @@ path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
hex = "0.4"
|
||||
serde_yaml = "0.9.34"
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0.190"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
frida_core = { path = "../frida_core" }
|
||||
frida_client = { path = "../frida_client" }
|
||||
env_logger = "0.9"
|
||||
log = "0.4.20"
|
||||
|
||||
[target.'cfg(target_os="android")'.dependencies]
|
||||
jni = "^0.20"
|
||||
|
@ -13,11 +13,9 @@ crate-type = ["staticlib", "cdylib", "lib"]
|
||||
|
||||
[dependencies]
|
||||
frida_core = { path = "../frida_core", package = "frida_core" }
|
||||
aes-gcm = "0.10.3"
|
||||
x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] }
|
||||
base64 = "0.22.1"
|
||||
tokio = { version = "1", features = ["full", "signal", "tracing"] }
|
||||
tokio-util = "0.7.12"
|
||||
env_logger = "0.9"
|
||||
log = "0.4.20"
|
||||
network-interface = "2.0.0"
|
||||
network-interface = "2.0.0"
|
||||
aes-gcm = { workspace = true }
|
||||
x25519-dalek = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
base64 = { workspace = true }
|
||||
log = { workspace = true }
|
@ -204,11 +204,11 @@ pub async fn server_mode(server_config: ServerConfiguration, s_interface: Option
|
||||
match h {
|
||||
0 => {
|
||||
let handshake = UDPVpnHandshake::deserialize(&buf);
|
||||
info!("Got handshake from {:?}", handshake.request_ip);
|
||||
//info!("Got handshake from {:?}", handshake.request_ip);
|
||||
let skey = BASE64_STANDARD.encode(&handshake.public_key);
|
||||
if plp.iter().any(|c| c.ip == handshake.request_ip && c.public_key == skey) {
|
||||
let internal_ip = IpAddr::V4(handshake.request_ip);
|
||||
info!("Accepted client");
|
||||
info!("Accepted client from {:?}", handshake.request_ip);
|
||||
let mut k = [0u8; 32];
|
||||
for (&x, p) in handshake.public_key.iter().zip(k.iter_mut()) {
|
||||
*p = x;
|
||||
|
Loading…
x
Reference in New Issue
Block a user