From 250fc9a391aa4a4a13256cc5f9772cd4f3a15eca Mon Sep 17 00:00:00 2001 From: grafju78439 Date: Thu, 15 Dec 2022 12:17:25 +0100 Subject: [PATCH 1/3] added create_vec --- src/bin/message.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/bin/message.rs b/src/bin/message.rs index 378a33d..5fe718a 100644 --- a/src/bin/message.rs +++ b/src/bin/message.rs @@ -1,3 +1,11 @@ +use crypto_box::{ + aead::{Aead, AeadCore, OsRng}, + PublicKey, SalsaBox, SecretKey, +}; +use std::io::Write; +use std::net::TcpStream; + + const KEYLENGTH: u8 = 32; pub enum PayloadType { @@ -40,5 +48,15 @@ impl Message { msg.payload[0] = msg_type as u8; msg } + fn creat_vec(ciphertext: Vec) -> Vec { + let mut vec: Vec = vec![0; 14 + ciphertext.len()]; + + + + for i in 14..(14 + ciphertext.len()){ + vec[i] = ciphertext[i - 14]; + } + vec + } // Methoden der Klasse } From 2b925bdc0d63b40046b44509e907596a23422a76 Mon Sep 17 00:00:00 2001 From: grafju78439 Date: Thu, 15 Dec 2022 12:38:21 +0100 Subject: [PATCH 2/3] completet crate_vec() --- src/bin/message.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/bin/message.rs b/src/bin/message.rs index 92a6b72..c846682 100644 --- a/src/bin/message.rs +++ b/src/bin/message.rs @@ -48,13 +48,23 @@ impl Message { msg.payload[0] = msg_type as u8; msg } - fn creat_vec(ciphertext: Vec) -> Vec { - let mut vec: Vec = vec![0; 14 + ciphertext.len()]; + fn creat_vec(&mut self) -> Vec { + let mut vec: Vec = vec![0; (10 + self.size).into()]; + + vec[0] = ((self.src_id >> 24) & 0xff) as u8; + vec[1] = ((self.src_id >> 16) & 0xff) as u8; + vec[2] = ((self.src_id >> 8) & 0xff) as u8; + vec[3] = (self.src_id & 0xff) as u8; + vec[4] = ((self.dest_id >> 24) & 0xff) as u8; + vec[5] = ((self.dest_id >> 16) & 0xff) as u8; + vec[6] = ((self.dest_id >> 8) & 0xff) as u8; + vec[7] = (self.dest_id & 0xff) as u8; + vec[8] = ((self.size >> 8) & 0xff) as u8; + vec[9] = (self.size & 0xff) as u8; - - for i in 14..(14 + ciphertext.len()){ - vec[i] = ciphertext[i - 14]; + for i in 10..(10 + self.size).into(){ + vec[i] = self.payload[i - 10]; } vec } From f36772d9e5c0507015de02b8c71ff25d84789b98 Mon Sep 17 00:00:00 2001 From: grafju78439 Date: Thu, 15 Dec 2022 12:43:36 +0100 Subject: [PATCH 3/3] clean up --- src/bin/message.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/bin/message.rs b/src/bin/message.rs index c846682..72a3157 100644 --- a/src/bin/message.rs +++ b/src/bin/message.rs @@ -1,10 +1,3 @@ -use crypto_box::{ - aead::{Aead, AeadCore, OsRng}, - PublicKey, SalsaBox, SecretKey, -}; -use std::io::Write; -use std::net::TcpStream; - const KEYLENGTH: u8 = 32;