X-Git-Url: http://git.euphorik.ch/?p=crypto_lab1.git;a=blobdiff_plain;f=lab1_rust%2Fsrc%2Foracle_machine.rs;fp=lab1_rust%2Fsrc%2Foracle_machine.rs;h=a5be2d758b5c6a9003f4728332d8608358e4eba0;hp=2feb31b4f1c3f98b532763273073e8d6dd5b4237;hb=307b73948c18f26a4ff12fc29f9055397a999f44;hpb=ed4d8f3e7e028bf645089edb775af84e6c3f7bd4

diff --git a/lab1_rust/src/oracle_machine.rs b/lab1_rust/src/oracle_machine.rs
index 2feb31b..a5be2d7 100644
--- a/lab1_rust/src/oracle_machine.rs
+++ b/lab1_rust/src/oracle_machine.rs
@@ -6,9 +6,9 @@ use packet;
 use packet::{ Packet, Error };
 use end_point::EndPoint;
 
-/// Try to decypher a cyphered data block by using the previous xor operand and an oracle on the provided address and port.
+/// Try to decipher a ciphered data block by using the previous xor operand and an oracle on the provided address and port.
 /// May prints some message on the stdout.
-pub fn decypher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cypherblock: &[u8, ..16], variant: packet::Variant) -> Option<Vec<u8>> {
+pub fn decipher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cipherblock: &[u8, ..16], variant: packet::Variant) -> Option<Vec<u8>> {
    let mut end_point = EndPoint::new(
       match TcpStream::connect(address, port) {
          Ok(s) => s,
@@ -22,10 +22,10 @@ pub fn decypher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cyp
 
    let mut final_packet = [0u8, ..2 + 1 + 8 + 32 + 10];
    final_packet[1] = 1 + 8 + 32 + 10; // Data length.
-   copy_memory(final_packet.slice_mut(2 + 1 + 8 + 16, 2 + 1 + 8 + 32), cypherblock);
+   copy_memory(final_packet.slice_mut(2 + 1 + 8 + 16, 2 + 1 + 8 + 32), cipherblock);
 
-   let mut decypher_block = [0u8, ..16]; // The result.
-   let mut x_prime_block = [0u8, ..16]; // The cypher block ('cypherblock') after AES and before XOR.
+   let mut decipher_block = [0u8, ..16]; // The result.
+   let mut x_prime_block = [0u8, ..16]; // The cipher block ('cipherblock') after AES and before XOR.
    let mut current_timestamp = 0u64;
    let mut first_byte = 0u8; // Used to save the first byte for the first iteration.
 
@@ -49,7 +49,8 @@ pub fn decypher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cyp
          forged_xor_operand(&mut final_packet)[byte] = v;
 
          match end_point.send_raw_with_result(final_packet) {
-            Ok(Ok(Packet { t: Error(packet::AuthError), .. })) => {
+            Ok(Ok(p @ Packet { t: Error(packet::AuthError), .. })) => {
+               println!("We received a MAC Error: {}", p);
 
                // If we already got a MAC mismatch for the first byte then the second byte is incremented and the loop is replayed.
                if byte == 15 && get_mac_mismatch_error {
@@ -61,7 +62,7 @@ pub fn decypher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cyp
 
                let padding_value = 16 - byte;
                x_prime_block[byte] = v ^ (padding_value as u8);
-               decypher_block[byte] = x_prime_block[byte] ^ original_xor_operand[byte];
+               decipher_block[byte] = x_prime_block[byte] ^ original_xor_operand[byte];
 
                // We set the processed bytes of the forged XOR operand to have the next padding value.
                for i in range(16 - padding_value, 16) {
@@ -93,5 +94,5 @@ pub fn decypher(address: &str, port: u16, original_xor_operand: &[u8, ..16], cyp
       byte -= 1;
    }
 
-   Some(decypher_block.to_vec())
+   Some(decipher_block.to_vec())
 }
\ No newline at end of file