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

Merge branch 'master' into correct-m25400-m26610-plaintextcheck

Browse Source
This commit is contained in:
Your Name 2023-03-08 21:06:15 +01:00
commit 2b5d5e93ea
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenCL/inc_common.cl
View File

@ -2806,6 +2806,24 @@ DECLSPEC int is_valid_base58_32 (const u32 v)
return 1; return 1;
} }
DECLSPEC int is_valid_printable_8 (const u8 v)
{
if (v > (u8) 0x7e) return 0;
if (v < (u8) 0x20) return 0;
return 1;
}
DECLSPEC int is_valid_printable_32 (const u32 v)
{
if (is_valid_printable_8 ((u8) (v >> 0)) == 0) return 0;
if (is_valid_printable_8 ((u8) (v >> 8)) == 0) return 0;
if (is_valid_printable_8 ((u8) (v >> 16)) == 0) return 0;
if (is_valid_printable_8 ((u8) (v >> 24)) == 0) return 0;
return 1;
}
DECLSPEC int hc_find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) DECLSPEC int hc_find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt)
{ {
for (int idx = 0; idx < keyboard_layout_mapping_cnt; idx++) for (int idx = 0; idx < keyboard_layout_mapping_cnt; idx++)

2
OpenCL/inc_common.h
View File

@ -311,6 +311,8 @@ DECLSPEC int is_valid_hex_8 (const u8 v);
DECLSPEC int is_valid_hex_32 (const u32 v); DECLSPEC int is_valid_hex_32 (const u32 v);
DECLSPEC int is_valid_base58_8 (const u8 v); DECLSPEC int is_valid_base58_8 (const u8 v);
DECLSPEC int is_valid_base58_32 (const u32 v); DECLSPEC int is_valid_base58_32 (const u32 v);
DECLSPEC int is_valid_printable_8 (const u8 v);
DECLSPEC int is_valid_printable_32 (const u32 v);
DECLSPEC int hc_find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt); DECLSPEC int hc_find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt);
DECLSPEC int hc_execute_keyboard_layout_mapping (PRIVATE_AS u32 *w, const int pw_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt); DECLSPEC int hc_execute_keyboard_layout_mapping (PRIVATE_AS u32 *w, const int pw_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt);
DECLSPEC void make_utf16be (PRIVATE_AS const u32x *in, PRIVATE_AS u32x *out1, PRIVATE_AS u32x *out2); DECLSPEC void make_utf16be (PRIVATE_AS const u32x *in, PRIVATE_AS u32x *out1, PRIVATE_AS u32x *out2);

12
OpenCL/m25500-pure.cl
View File

@ -334,12 +334,12 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
// iv // iv
const u32 iv[4] = { const u32 iv[4];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0],
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1], iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2];
}; iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3];
const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len; const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len;

12
OpenCL/m26600-pure.cl
View File

@ -334,12 +334,12 @@ KERNEL_FQ void m26600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
// iv // iv
const u32 iv[4] = { const u32 iv[4];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0],
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1], iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2];
}; iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3];
const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len; const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len;