Setting serach key and final touches.

.gitignore

@@ -23,3 +23,5 @@ target
 # ignore test data
 *.img
 *.key
+
+bin

nyash_client/src/client.rs

@@ -135,8 +135,8 @@ fn benchmark(exec_context: &mut ocl_utils::ExecContext) -> (u64, usize) {
         work_time[i] = work_time[i] / 3.0;
         println!("Average time {}", work_time[i]);
         if i > 0 {
-            //giving 5% error for speed mesure
-            if (work_time[i]*1.05) > work_time[i - 1] {
+            //giving 10% error for speed mesure
+            if (work_time[i]*1.1) > work_time[i - 1] {
                 break;
             }
         }

nyash_client/src/search_params.rs

@@ -1,22 +1,20 @@
-
-
-pub fn get_params() ->([u32; 4],[u32; 4],[u32; 4]) {
+pub fn get_params() -> ([u32; 4], [u32; 4], [u32; 4]) {
     use crate::num_utils;
 
     const ENCRYPTED_DATA: [u8; 16] = [
-            198, 255, 55, 185, 15, 226, 223, 174, 119, 8, 36, 239, 242, 89, 126, 230
+        10, 51, 110, 227, 194, 181, 104, 65, 151, 47, 69, 37, 66, 223, 71, 137,
     ];
 
     const KEY_DATA: [u8; 32] = [
-        206, 193, 83, 54, 46, 234, 185, 41, 146, 244, 130, 6, 212, 68, 106, 162, 165, 97, 188,
-        218, 39, 111, 141, 236, 67, 159, 157, 157, 166, 79, 89, 134
+        206, 193, 83, 54, 46, 234, 185, 41, 146, 244, 130, 6, 212, 68, 106, 162, 165, 97, 188, 218,
+        39, 111, 141, 236, 67, 159, 157, 157, 166, 79, 89, 134,
     ];
 
     // let key_bytes_reversed: Vec<u8> = KEY_DATA.iter().rev().map(|e| *e).collect();
     // let data_bytes_reversed: Vec<u8> = ENCRYPTED_DATA.iter().rev().map(|e| *e).collect();
 
-    let mut tweak_key_b: [u8;16] = [0u8;16];
-    let mut data_key_b: [u8;16] = [0u8;16];
+    let mut tweak_key_b: [u8; 16] = [0u8; 16];
+    let mut data_key_b: [u8; 16] = [0u8; 16];
 
     data_key_b.copy_from_slice(&KEY_DATA[0..16]);
     tweak_key_b.copy_from_slice(&KEY_DATA[16..32]);
@@ -35,4 +33,4 @@ pub fn get_params() ->([u32; 4],[u32; 4],[u32; 4]) {
     }
 
     return (data_key, tweak_key, encrypted_data);
-}
+}

nyash_client/src/test_data/extract_encrypted_block.py

@@ -3,7 +3,7 @@ from utils import read_metadata
 
 # Init logger
 
-LUKS_FILE_NAME = "test.img"
+LUKS_FILE_NAME = "vg1-volume_1.img"
 KEY_FILE_NAME = "master.key"
 
 
@@ -29,14 +29,12 @@ def main():
 
     print("ENC DATA:")
     print("[" + ",".join([format(a, 'd') for a in enc_data])+"]")
-
-    print()
-    print("KEY DATA:")
-    with open(KEY_FILE_NAME, 'rb') as key_file:
-        key_data = key_file.read(32)
-        print("[" + ",".join([format(a, 'd') for a in key_data])+"]")
-
-
+    #
+    # print()
+    # print("KEY DATA:")
+    # with open(KEY_FILE_NAME, 'rb') as key_file:
+    #     key_data = key_file.read(32)
+    #     print("[" + ",".join([format(a, 'd') for a in key_data])+"]")