Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ntor"
version = "0.1.0"
version = "0.1.2"
edition = "2024"

[dependencies]
Expand All @@ -17,8 +17,7 @@ x25519-dalek = {version="^2.0.1", features = ["static_secrets"] }
#wasm compatible
getrandom = { version = "0.2", features = ["js"] }
aes-gcm = "0.10"
serde = { version = "1.0.219", features = ["derive"] }

log = "0.4.26"
hex = "0.4.3"
bincode = "2.0.1"

8 changes: 0 additions & 8 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ impl NTorClient {
server_certificate: &NTorCertificate,
msg: &InitSessionResponse,
) -> bool {
println!("Client:");

// Step 18: Compute the shared secret.
let mut buffer: Vec<u8> = Vec::new();

Expand All @@ -53,15 +51,13 @@ impl NTorClient {
.diffie_hellman(&msg.server_ephemeral_public_key)
.to_bytes()
.to_vec();
println!("[Debug] ECDH result 1: {:?}", ecdh_result_1);
buffer.append(&mut ecdh_result_1);

// ECDH Client private ephemeral * server ephemeral public Key
let mut ecdh_result_2 = taken_private_key
.diffie_hellman(&server_certificate.public_key)
.to_bytes()
.to_vec();
println!("[Debug] ECDH result 2: {:?}", ecdh_result_2);
buffer.append(&mut ecdh_result_2);

// Server id
Expand All @@ -88,7 +84,6 @@ impl NTorClient {
};

let secret_key_prime = &sha256_hash[0..16];
println!("[Debug] Client secret key prime: {:?}", secret_key_prime);

let secret_key = &sha256_hash[16..];

Expand All @@ -109,11 +104,8 @@ impl NTorClient {
if computed_t_b_hash == msg.t_b_hash {
self.shared_secret = Some(secret_key.to_vec());

println!("Shared secret:");
println!("{:?}\n", secret_key);
true
} else {
println!("Failed to verify the shared secret: try again bro.");
false
}
}
Expand Down
1 change: 1 addition & 0 deletions src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ impl InitSessionResponse {
}
}

#[derive(bincode::Encode, bincode::Decode)]
pub struct EncryptedMessage {
pub nonce: [u8; 12],
pub data: Vec<u8>
Expand Down
8 changes: 0 additions & 8 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ impl NTorServer {
&mut self,
init_msg: &InitSessionMessage,
) -> InitSessionResponse {
println!("Server:");

// generate session-specific ephemeral key pair
self.ephemeral_key_pair = generate_private_public_key_pair();

Expand All @@ -66,7 +64,6 @@ impl NTorServer {
.diffie_hellman(&init_msg.client_ephemeral_public_key)
.to_bytes()
.to_vec();
println!("[Debug] ECDH result 1: {:?}", ecdh_results_1);
buffer.append(&mut ecdh_results_1);

// client_ephemeral_public^server_static_private (X^b),
Expand All @@ -75,7 +72,6 @@ impl NTorServer {
.diffie_hellman(&init_msg.client_ephemeral_public_key)
.to_bytes()
.to_vec();
println!("[Debug] ECDH result 2: {:?}", ecdh_results_2);
buffer.append(&mut ecdh_results_2);

// server id
Expand Down Expand Up @@ -103,7 +99,6 @@ impl NTorServer {

let secret_key_prime = &sha256_hash[0..16];
let secret_key = &sha256_hash[16..];
println!("[Debug] Server secret key prime: {:?}", secret_key_prime);

// Step 12: Compute HMAC (t_b in the paper):
let mut hmac_key_buffer: Vec<u8> = Vec::new();
Expand All @@ -124,9 +119,6 @@ impl NTorServer {

self.shared_secret = Some(secret_key.to_vec());

println!("Shared secret:");
println!("{:?}\n", secret_key);

InitSessionResponse {
server_ephemeral_public_key: self.ephemeral_key_pair.public_key,
t_b_hash,
Expand Down