Skip to content
Snippets Groups Projects
Commit e942d267 authored by chapeau's avatar chapeau
Browse files

petits changements

parent 3f198d2a
Branches unwrap
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ fn sign_gen(
let mut ciphertext = Box::new(&public_key, &secret_key)
.encrypt(&nonce, &payload[..])
.or(Err("cannot encrypt message"))?;
.or(Err("cannot sign message"))?;
// On ajoute le nonce au début du message (24 octets)
let mut signature = nonce.clone().to_vec();
......@@ -57,7 +57,7 @@ fn sign_verif(
let decrypted_plaintext = Box::new(&public_key, &secret_key)
.decrypt(&nonce, recv_msg)
.or(Err("cannot decrypt receveid message"))?;
.or(Err("cannot verify signature"))?;
let endpoint_ip_bytes = endpoint.ip().octets().to_vec();
let endpoint_port_bytes = vec![
......
......@@ -14,13 +14,7 @@ fn tun_recv(
ip_to_thread: &HashMap<Ipv4Addr, u32>,
) -> Result<(), Box<dyn Error>> {
let mut buf = vec![0; super::TUN_PACKET_SIZE];
let long = match iface.recv(&mut buf) {
Ok(l) => l,
Err(e) => {
println!("{:?}", e);
0
}
};
let long = iface.recv(&mut buf)?;
// min ipv4 header size
if long > 24 {
let ip_dest = Ipv4Addr::new(buf[20], buf[21], buf[22], buf[23]);
......@@ -28,7 +22,7 @@ fn tun_recv(
.get(&ip_dest)
.ok_or(format!("no thread id was assigned to {}", &ip_dest))?
as usize;
sender_vec[thread_id].send(super::TunData { payload: buf })?;
sender_vec[thread_id].send(TunData { payload: buf })?;
}
Ok(())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment