arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-09 07:11:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #165 from gm4tr1x/gcc-warnings

Browse Source 
Fixed gcc warnings
This commit is contained in:
Jens Steube 2016-01-27 18:19:50 +01:00
commit 9ec2c86cd0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types.h
View File

@ -239,7 +239,7 @@ typedef struct
{ {
uint dgst32[16]; uint dgst32[16];
u64 dgst64[8]; u64 dgst64[8];
}; } d;
uint dgst_len; uint dgst_len;
uint W_len; uint W_len;
@ -703,7 +703,7 @@ typedef struct
u8 hc1[1][256]; u8 hc1[1][256];
u32 hi1[1][ 64]; u32 hi1[1][ 64];
u64 hl1[1][ 32]; u64 hl1[1][ 32];
}; } h;
uint pw_len; uint pw_len;
uint alignment_placeholder_1; uint alignment_placeholder_1;

12
src/oclHashcat.c
View File

@ -1881,7 +1881,7 @@ static void check_hash (hc_device_param_t *device_param, const uint salt_pos, co
for (int i = 0, j = gidm; i < 16; i++, j++) for (int i = 0, j = gidm; i < 16; i++, j++)
{ {
plain_buf[i] = pw.hi1[0][j]; plain_buf[i] = pw.h.hi1[0][j];
} }
plain_len = pw.pw_len; plain_len = pw.pw_len;
@ -1930,7 +1930,7 @@ static void check_hash (hc_device_param_t *device_param, const uint salt_pos, co
for (int i = 0, j = gidm; i < 16; i++, j++) for (int i = 0, j = gidm; i < 16; i++, j++)
{ {
plain_buf[i] = pw.hi1[0][j]; plain_buf[i] = pw.h.hi1[0][j];
} }
plain_len = pw.pw_len; plain_len = pw.pw_len;
@ -1991,7 +1991,7 @@ static void check_hash (hc_device_param_t *device_param, const uint salt_pos, co
for (int i = 0, j = gidm; i < 16; i++, j++) for (int i = 0, j = gidm; i < 16; i++, j++)
{ {
plain_buf[i] = pw.hi1[0][j]; plain_buf[i] = pw.h.hi1[0][j];
} }
plain_len = pw.pw_len; plain_len = pw.pw_len;
@ -2025,7 +2025,7 @@ static void check_hash (hc_device_param_t *device_param, const uint salt_pos, co
for (int i = 0, j = gidm; i < 16; i++, j++) for (int i = 0, j = gidm; i < 16; i++, j++)
{ {
plain_buf[i] = pw.hi1[0][j]; plain_buf[i] = pw.h.hi1[0][j];
} }
plain_len = pw.pw_len; plain_len = pw.pw_len;
@ -3339,7 +3339,7 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
static void pw_transpose_to_hi1 (const pw_t *p1, pw_t *p2) static void pw_transpose_to_hi1 (const pw_t *p1, pw_t *p2)
{ {
memcpy (p2->hi1, p1->hi1, 64 * sizeof (uint)); memcpy (p2->h.hi1, p1->h.hi1, 64 * sizeof (uint));
} }
static uint pw_add_to_hc1 (hc_device_param_t *device_param, const u8 *pw_buf, const uint pw_len) static uint pw_add_to_hc1 (hc_device_param_t *device_param, const u8 *pw_buf, const uint pw_len)
@ -3350,7 +3350,7 @@ static uint pw_add_to_hc1 (hc_device_param_t *device_param, const u8 *pw_buf, co
uint cache_cnt = pw_cache->cnt; uint cache_cnt = pw_cache->cnt;
u8 *pw_hc1 = pw_cache->pw_buf.hc1[cache_cnt]; u8 *pw_hc1 = pw_cache->pw_buf.h.hc1[cache_cnt];
memcpy (pw_hc1, pw_buf, pw_len); memcpy (pw_hc1, pw_buf, pw_len);

2
src/rp_kernel_on_cpu.c
View File

@ -1663,6 +1663,7 @@ static u32 rule_op_mangle_replace (const u32 p0, const u32 p1, u32 buf0[4], u32
return in_len; return in_len;
} }
/*
static u32 rule_op_mangle_purgechar (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len) static u32 rule_op_mangle_purgechar (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len)
{ {
// TODO // TODO
@ -1674,6 +1675,7 @@ static u32 rule_op_mangle_togglecase_rec (const u32 p0, const u32 p1, u32 buf0[4
// TODO // TODO
return in_len; return in_len;
} }
*/
static u32 rule_op_mangle_dupechar_first (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len) static u32 rule_op_mangle_dupechar_first (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len)
{ {