From 6297474142a95c160ea8e395f99e440f05100ac1 Mon Sep 17 00:00:00 2001 From: Kirill Shakirov <38155247+Nyanraltotlapun@users.noreply.github.com> Date: Sat, 28 Mar 2026 00:28:25 +0100 Subject: [PATCH] Small changes. --- nyash_client/Cargo.toml | 2 ++ nyash_client/src/client.rs | 10 +++++----- nyash_client/src/search_params.rs | 19 ++----------------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/nyash_client/Cargo.toml b/nyash_client/Cargo.toml index 120cbb5..5f6629c 100644 --- a/nyash_client/Cargo.toml +++ b/nyash_client/Cargo.toml @@ -24,4 +24,6 @@ ocl-include = "0.6" flate2 = "1.1.9" +[target.aarch64-unknown-linux-gnu] +linker = "aarch64-linux-gnu-gcc" diff --git a/nyash_client/src/client.rs b/nyash_client/src/client.rs index d55d9cd..ab2f0f9 100644 --- a/nyash_client/src/client.rs +++ b/nyash_client/src/client.rs @@ -113,15 +113,15 @@ fn benchmark(exec_context: &mut ocl_utils::ExecContext) -> (u64, usize) { work_size: 128, }; - let total_work: u64 = 1280000000; - let work_sizes: [usize; 8] = [128, 256, 512, 1024, 2048, 4096, 8192, 16384]; - let mut work_time = [0f64; 8]; + let total_work: u64 = 128000000; + let work_sizes: [usize; 9] = [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384]; + let mut work_time = [0f64; 9]; ocl_utils::set_target_data(exec_context, &mut nyan_exec_dat).expect("Error set target data!"); let mut preffered_work_size: usize = work_sizes[0]; let mut preffered_batch_size: u64 = 0; - for i in 0..8 { + for i in 0..9 { let test_work_s = work_sizes[i]; let batch_size: u64 = total_work / test_work_s as u64; nyan_exec_dat.work_size = test_work_s; @@ -202,7 +202,7 @@ async fn main() -> Result<(), Box> { nyash_dev_cfg.work_size, nyash_dev_cfg.batch_size ); - let (_, _, encrypted_data) = search_params::get_params(); + let encrypted_data = search_params::get_params(); //setting data let mut nyan_exec_dat = ocl_utils::ExecData { start_key: Vec::new(), diff --git a/nyash_client/src/search_params.rs b/nyash_client/src/search_params.rs index e15932e..1d087f0 100644 --- a/nyash_client/src/search_params.rs +++ b/nyash_client/src/search_params.rs @@ -1,29 +1,14 @@ -pub fn get_params() -> ([u32; 4], [u32; 4], [u32; 4]) { - use crate::num_utils; +pub fn get_params() -> [u32; 4] { const ENCRYPTED_DATA: [u8; 16] = [ 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, - ]; - // let key_bytes_reversed: Vec = KEY_DATA.iter().rev().map(|e| *e).collect(); // let data_bytes_reversed: Vec = 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]; - data_key_b.copy_from_slice(&KEY_DATA[0..16]); - tweak_key_b.copy_from_slice(&KEY_DATA[16..32]); - // getting keys - let data_key = u128::from_le_bytes(data_key_b); - let tweak_key = u128::from_le_bytes(tweak_key_b); - let data_key = num_utils::u128_to_u32arr(data_key); - let tweak_key = num_utils::u128_to_u32arr(tweak_key); // converting bytes raw data to u32 arr let mut encrypted_data: [u32; 4] = [0u32; 4]; @@ -32,5 +17,5 @@ pub fn get_params() -> ([u32; 4], [u32; 4], [u32; 4]) { encrypted_data[i] = u32::from_le_bytes(enc_dat_bytes_chunks[i]); } - return (data_key, tweak_key, encrypted_data); + return encrypted_data; }