diff --git a/OpenCL/m27500-pure.cl b/OpenCL/m27500-pure.cl index c331304d1..8d72b593d 100644 --- a/OpenCL/m27500-pure.cl +++ b/OpenCL/m27500-pure.cl @@ -92,7 +92,7 @@ DECLSPEC void xts_mul2 (u32 *in, u32 *out) out[0] ^= c * 0x87; } -KERNEL_FQ void m26800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { /** * base @@ -176,7 +176,7 @@ KERNEL_FQ void m26800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); @@ -282,7 +282,7 @@ KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -538,7 +538,7 @@ KERNEL_FQ void m26800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27500_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); @@ -644,7 +644,7 @@ KERNEL_FQ void m26800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m27600-pure.cl b/OpenCL/m27600-pure.cl index f5a330d2d..e952ad9a4 100644 --- a/OpenCL/m27600-pure.cl +++ b/OpenCL/m27600-pure.cl @@ -92,7 +92,7 @@ DECLSPEC void xts_mul2 (u32 *in, u32 *out) out[0] ^= c * 0x87; } -KERNEL_FQ void m26900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { /** * base @@ -176,7 +176,7 @@ KERNEL_FQ void m26900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); @@ -282,7 +282,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26900_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -616,7 +616,7 @@ KERNEL_FQ void m26900_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26900_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27600_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); @@ -722,7 +722,7 @@ KERNEL_FQ void m26900_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) } } -KERNEL_FQ void m26900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) +KERNEL_FQ void m27600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); diff --git a/src/modules/module_27500.c b/src/modules/module_27500.c index 45f49f421..a156fac92 100644 --- a/src/modules/module_27500.c +++ b/src/modules/module_27500.c @@ -19,7 +19,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE; static const char *HASH_NAME = "VirtualBox (PBKDF2-HMAC-SHA256 & AES-128-XTS)"; -static const u64 KERN_TYPE = 26800; +static const u64 KERN_TYPE = 27500; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_SLOW_HASH_SIMD_LOOP | OPTI_TYPE_SLOW_HASH_SIMD_LOOP2; @@ -352,6 +352,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_benchmark_salt = module_benchmark_salt; module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; module_ctx->module_deep_comp_kernel = MODULE_DEFAULT; + module_ctx->module_deprecated_notice = MODULE_DEFAULT; module_ctx->module_dgst_pos0 = module_dgst_pos0; module_ctx->module_dgst_pos1 = module_dgst_pos1; module_ctx->module_dgst_pos2 = module_dgst_pos2; @@ -361,6 +362,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_esalt_size = module_esalt_size; module_ctx->module_extra_buffer_size = MODULE_DEFAULT; module_ctx->module_extra_tmp_size = MODULE_DEFAULT; + module_ctx->module_extra_tuningdb_block = MODULE_DEFAULT; module_ctx->module_forced_outfile_format = MODULE_DEFAULT; module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; diff --git a/src/modules/module_27600.c b/src/modules/module_27600.c index e1a1be090..5e11a9be9 100644 --- a/src/modules/module_27600.c +++ b/src/modules/module_27600.c @@ -19,7 +19,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE; static const char *HASH_NAME = "VirtualBox (PBKDF2-HMAC-SHA256 & AES-256-XTS)"; -static const u64 KERN_TYPE = 26900; +static const u64 KERN_TYPE = 27600; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_SLOW_HASH_SIMD_LOOP | OPTI_TYPE_SLOW_HASH_SIMD_LOOP2; @@ -368,6 +368,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_benchmark_salt = module_benchmark_salt; module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; module_ctx->module_deep_comp_kernel = MODULE_DEFAULT; + module_ctx->module_deprecated_notice = MODULE_DEFAULT; module_ctx->module_dgst_pos0 = module_dgst_pos0; module_ctx->module_dgst_pos1 = module_dgst_pos1; module_ctx->module_dgst_pos2 = module_dgst_pos2; @@ -377,6 +378,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_esalt_size = module_esalt_size; module_ctx->module_extra_buffer_size = MODULE_DEFAULT; module_ctx->module_extra_tmp_size = MODULE_DEFAULT; + module_ctx->module_extra_tuningdb_block = MODULE_DEFAULT; module_ctx->module_forced_outfile_format = MODULE_DEFAULT; module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT;