Skip to content

Commit a53e05c

Browse files
jsteubejsteube
committed
Update -m 33400 to latest hashcat base
1 parent b324177 commit a53e05c

2 files changed

Lines changed: 28 additions & 26 deletions

File tree

‎OpenCL/m33400-pure.cl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ DECLSPEC void transform_racf_key (const u32 w0, const u32 w1, PRIVATE_AS u32 *ke
292292
| c_ascii_to_ebcdic_pc[((w1 >> 24) & 0xff)] << 24;
293293
}
294294

295-
KERNEL_FQ void m33400_init (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
295+
KERNEL_FQ KERNEL_FA void m33400_init (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
296296
{
297297
/**
298298
* base
@@ -360,7 +360,7 @@ KERNEL_FQ void m33400_init (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
360360

361361
u32 des_output[2];
362362
_des_crypt_encrypt (des_output, data, Kc, Kd, s_SPtrans);
363-
363+
364364
// set tmps->key
365365
tmps[gid].key[0] = hc_swap32_S(des_output[0]);
366366
tmps[gid].key[1] = hc_swap32_S(des_output[1]);
@@ -396,7 +396,7 @@ KERNEL_FQ void m33400_init (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
396396

397397
DECLSPEC void hmac_sha256_run_V (PRIVATE_AS u32x *w0, PRIVATE_AS u32x *w1, PRIVATE_AS u32x *w2, PRIVATE_AS u32x *w3, PRIVATE_AS u32x *ipad, PRIVATE_AS u32x *opad, PRIVATE_AS u32x *digest)
398398
{
399-
399+
400400
digest[0] = ipad[0];
401401
digest[1] = ipad[1];
402402
digest[2] = ipad[2];
@@ -442,7 +442,7 @@ DECLSPEC void racf_pbkdf_sha256_hmac_V (PRIVATE_AS u32x *key, u32 key_len, PRIVA
442442
{
443443

444444
/**
445-
* PBKDF2-SHA256-HMAC init
445+
* PBKDF2-SHA256-HMAC init
446446
*/
447447

448448
sha256_hmac_ctx_vector_t sha256_hmac_ctx;
@@ -514,7 +514,7 @@ DECLSPEC void racf_pbkdf_sha256_hmac_V (PRIVATE_AS u32x *key, u32 key_len, PRIVA
514514
tmpx->out[7] = tmpx->dgst[7];
515515

516516
/**
517-
* PBKDF2-SHA256-HMAC loop
517+
* PBKDF2-SHA256-HMAC loop
518518
*/
519519

520520
// convert tmpx to array sha256_tmps[VECT_SIZE]
@@ -639,7 +639,7 @@ DECLSPEC void racf_pbkdf_sha256_hmac_V (PRIVATE_AS u32x *key, u32 key_len, PRIVA
639639
convert_pbkdf2_sha256_to_V(sha256_tmps, tmpx);
640640
}
641641

642-
KERNEL_FQ void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
642+
KERNEL_FQ KERNEL_FA void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
643643
{
644644
const u64 gid = get_global_id (0);
645645
const u64 lid = get_local_id (0);
@@ -648,13 +648,13 @@ KERNEL_FQ void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
648648
if ((gid * VECT_SIZE) >= GID_CNT) return;
649649

650650
/*
651-
* set key and salt
651+
* set key and salt
652652
*/
653-
653+
654654
u32x key[16] = {0};
655655
u32x salt[16] = {0};
656656
u32 salt_len = tmps[gid].salt_len;
657-
657+
658658
key[0] = packv (tmps, key, gid, 0);
659659
key[1] = packv (tmps, key, gid, 1);
660660

@@ -674,9 +674,9 @@ KERNEL_FQ void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
674674
pbkdf2_sha256_tmpx_t pbkdf2_tmpx = {0};
675675

676676
/*
677-
* internal loop with PBKDF2-SHA256-HMAC
677+
* internal loop with PBKDF2-SHA256-HMAC
678678
*/
679-
679+
680680
for (u32 i = 0; i < LOOP_CNT; i += 1)
681681
{
682682
racf_pbkdf_sha256_hmac_V(key, 8, salt, salt_len, esalt_bufs[DIGESTS_OFFSET_HOST].rep_fac * 100, &pbkdf2_tmpx);
@@ -708,7 +708,7 @@ KERNEL_FQ void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
708708
}
709709

710710
/*
711-
* set salt_buf for the next mem_fact iteration
711+
* set salt_buf for the next mem_fact iteration
712712
*/
713713

714714
unpackv (tmps, salt_buf, gid, 0, pbkdf2_tmpx.dgst[0]);
@@ -724,23 +724,23 @@ KERNEL_FQ void m33400_loop (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
724724
unpackv (tmps, salt_buf, gid, 9, pbkdf2_tmpx.out[5]);
725725
unpackv (tmps, salt_buf, gid, 10, pbkdf2_tmpx.out[6]);
726726
unpackv (tmps, salt_buf, gid, 11, pbkdf2_tmpx.out[7]);
727-
727+
728728
u32x salt_len_x = 48;
729729
unpack (tmps, salt_len, gid, salt_len_x);
730730
}
731731

732732

733-
KERNEL_FQ void m33400_init2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
733+
KERNEL_FQ KERNEL_FA void m33400_init2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
734734
{
735735
const u64 gid = get_global_id (0);
736736
const u64 lid = get_local_id (0);
737737

738738
if (gid >= GID_CNT) return;
739739

740740
/**
741-
* memory buffer preparation (transposition + PBKDF2-SHA256-HMAC with iter=1)
741+
* memory buffer preparation (transposition + PBKDF2-SHA256-HMAC with iter=1)
742742
*/
743-
743+
744744
// set key
745745
tmps[gid].key[0] = tmps[gid].salt_buf[4];
746746
tmps[gid].key[1] = tmps[gid].salt_buf[5];
@@ -772,7 +772,7 @@ KERNEL_FQ void m33400_init2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfae
772772
tmps[gid].salt_buf[6] = tmps[gid].out[n_key*8+6];
773773
tmps[gid].salt_buf[7] = tmps[gid].out[n_key*8+7];
774774

775-
// do PBKDF2-SHA256-HMAC
775+
// do PBKDF2-SHA256-HMAC
776776
sha256_hmac_ctx_t sha256_hmac_ctx;
777777

778778
sha256_hmac_init_global (&sha256_hmac_ctx, tmps[gid].key, 32);
@@ -823,7 +823,7 @@ KERNEL_FQ void m33400_init2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfae
823823
tmps[gid].key[4] = sha256_hmac_ctx.opad.h[4];
824824
tmps[gid].key[5] = sha256_hmac_ctx.opad.h[5];
825825
tmps[gid].key[6] = sha256_hmac_ctx.opad.h[6];
826-
tmps[gid].key[7] = sha256_hmac_ctx.opad.h[7];
826+
tmps[gid].key[7] = sha256_hmac_ctx.opad.h[7];
827827
}
828828

829829
/**
@@ -913,11 +913,11 @@ KERNEL_FQ void m33400_init2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfae
913913
tmps[gid].pbkdf2_tmps.out[i + 6] = tmps[gid].pbkdf2_tmps.dgst[i + 6];
914914
tmps[gid].pbkdf2_tmps.out[i + 7] = tmps[gid].pbkdf2_tmps.dgst[i + 7];
915915
}
916-
916+
917917
}
918918

919919

920-
KERNEL_FQ void m33400_loop2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
920+
KERNEL_FQ KERNEL_FA void m33400_loop2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
921921
{
922922
const u64 gid = get_global_id (0);
923923
const u64 lid = get_local_id (0);
@@ -944,7 +944,7 @@ KERNEL_FQ void m33400_loop2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfae
944944
opad[5] = packv (tmps, pbkdf2_tmps.opad, gid, 5);
945945
opad[6] = packv (tmps, pbkdf2_tmps.opad, gid, 6);
946946
opad[7] = packv (tmps, pbkdf2_tmps.opad, gid, 7);
947-
947+
948948
for (u32 i = 0; i < 8; i += 8)
949949
{
950950
u32x dgst[8];
@@ -1022,10 +1022,10 @@ KERNEL_FQ void m33400_loop2 (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfae
10221022
unpackv (tmps, pbkdf2_tmps.out, gid, i + 6, out[6]);
10231023
unpackv (tmps, pbkdf2_tmps.out, gid, i + 7, out[7]);
10241024
}
1025-
1025+
10261026
}
10271027

1028-
KERNEL_FQ void m33400_comp (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
1028+
KERNEL_FQ KERNEL_FA void m33400_comp (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes_t))
10291029
{
10301030
/**
10311031
* base
@@ -1110,7 +1110,7 @@ KERNEL_FQ void m33400_comp (KERN_ATTR_TMPS_ESALT (racf_kdfaes_tmp_t, racf_kdfaes
11101110

11111111
u32 cipher_text[4] = {0};
11121112

1113-
// AES
1113+
// AES
11141114
u32 aes_ks[60];
11151115

11161116
AES256_set_encrypt_key (aes_ks, aes_key, s_te0, s_te1, s_te2, s_te3);

‎src/modules/module_33400.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
199199
token.len[4] = 32;
200200
token.attr[4] = TOKEN_ATTR_FIXED_LENGTH
201201
| TOKEN_ATTR_VERIFY_HEX;
202-
202+
203203
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
204204

205205
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
@@ -252,7 +252,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
252252
*/
253253
racf_kdfaes->mem_fac = (2 << (mem_fac - 1)) / 32;
254254
/**
255-
* racf_kdfaes->rep_fac defines a number of iteration in PBKDF2-SHA256-HMAC
255+
* racf_kdfaes->rep_fac defines a number of iteration in PBKDF2-SHA256-HMAC
256256
*/
257257
racf_kdfaes->rep_fac = rep_fac;
258258

@@ -308,6 +308,8 @@ void module_init (module_ctx_t *module_ctx)
308308
module_ctx->module_benchmark_mask = MODULE_DEFAULT;
309309
module_ctx->module_benchmark_charset = MODULE_DEFAULT;
310310
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
311+
module_ctx->module_bridge_name = MODULE_DEFAULT;
312+
module_ctx->module_bridge_type = MODULE_DEFAULT;
311313
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
312314
module_ctx->module_deep_comp_kernel = MODULE_DEFAULT;
313315
module_ctx->module_deprecated_notice = MODULE_DEFAULT;

0 commit comments

Comments
 (0)