arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 19:38:18 +00:00
Code Issues Releases Wiki Activity

applied requested final changes

Browse Source
This commit is contained in:
Sein Coray 2019-03-18 17:47:35 +01:00
parent 7321b03102
commit 17083b8f56
No known key found for this signature in database
GPG Key ID: 44C4180EA69758EC
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenCL/m19500_a1-pure.cl
View File

@ -93,10 +93,11 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t))
sha1_init (&ctx0); sha1_init (&ctx0);
sha1_update (&ctx0, k, site_key_len); sha1_update (&ctx0, k, site_key_len);
sha1_update (&ctx0, glue, 2); sha1_update (&ctx0, glue, 2);
sha1_update (&ctx0, s, salt_len); sha1_update (&ctx0, s, salt_len);
sha1_update (&ctx0, glue, 2); sha1_update (&ctx0, glue, 2);
sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
/** /**
* loop * loop
@ -106,7 +107,6 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t))
{ {
sha1_ctx_t ctx = ctx0; sha1_ctx_t ctx = ctx0;
sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
sha1_update (&ctx, glue, 2); sha1_update (&ctx, glue, 2);
sha1_update (&ctx, k, site_key_len); sha1_update (&ctx, k, site_key_len);
@ -236,10 +236,11 @@ __kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t))
sha1_init (&ctx0); sha1_init (&ctx0);
sha1_update (&ctx0, k, site_key_len); sha1_update (&ctx0, k, site_key_len);
sha1_update (&ctx0, glue, 2); sha1_update (&ctx0, glue, 2);
sha1_update (&ctx0, s, salt_len); sha1_update (&ctx0, s, salt_len);
sha1_update (&ctx0, glue, 2); sha1_update (&ctx0, glue, 2);
sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
/** /**
* loop * loop
@ -249,7 +250,6 @@ __kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t))
{ {
sha1_ctx_t ctx = ctx0; sha1_ctx_t ctx = ctx0;
sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); sha1_update_global_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
sha1_update (&ctx, glue, 2); sha1_update (&ctx, glue, 2);
sha1_update (&ctx, k, site_key_len); sha1_update (&ctx, k, site_key_len);

2
src/modules/module_19500.c
View File

@ -132,7 +132,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
salt->salt_buf[0] = devise_double_salt->salt_buf[0]; salt->salt_buf[0] = devise_double_salt->salt_buf[0];
salt->salt_buf[1] = devise_double_salt->salt_buf[1]; salt->salt_buf[1] = devise_double_salt->salt_buf[1];
salt->salt_len = devise_double_salt->salt_len; salt->salt_len = 8;
return (PARSER_OK); return (PARSER_OK);
} }