github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-13 17:28:58 +01:00
Code Releases Activity

Fix some updated buffer sizes and new optimizer descriptions

Browse Source
This commit is contained in:
Jens Steube 2016-02-06 23:22:26 +01:00
parent 7b652239f9
commit ab5ecd8eaa
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/shared.h
View File

@ -1628,6 +1628,10 @@ extern hc_thread_mutex_t mux_display;
#define OPTI_STR_SINGLE_SALT "Single-Salt" #define OPTI_STR_SINGLE_SALT "Single-Salt"
#define OPTI_STR_BRUTE_FORCE "Brute-Force" #define OPTI_STR_BRUTE_FORCE "Brute-Force"
#define OPTI_STR_RAW_HASH "Raw-Hash" #define OPTI_STR_RAW_HASH "Raw-Hash"
#define OPTI_STR_USES_BITS_8 "Uses-8-Bit"
#define OPTI_STR_USES_BITS_16 "Uses-16-Bit"
#define OPTI_STR_USES_BITS_32 "Uses-32-Bit"
#define OPTI_STR_USES_BITS_64 "Uses-64-Bit"
/** /**
* hash options * hash options

4
src/oclHashcat.c
View File

@ -11606,7 +11606,7 @@ int main (int argc, char **argv)
if (hash_mode == 6800) if (hash_mode == 6800)
{ {
if (i < 48) // 48 = 12 * uint in salt_buf[] if (i < 64) // 64 = 16 * uint in salt_buf[]
{ {
// manipulate salt_buf // manipulate salt_buf
memcpy (hash_buf.salt->salt_buf, line_buf, i); memcpy (hash_buf.salt->salt_buf, line_buf, i);
@ -11618,7 +11618,7 @@ int main (int argc, char **argv)
} }
else if (hash_mode == 2500) else if (hash_mode == 2500)
{ {
if (i < 48) // 48 = 12 * uint in salt_buf[] if (i < 64) // 64 = 16 * uint in salt_buf[]
{ {
// here we have in line_buf: ESSID:MAC1:MAC2 (without the plain) // here we have in line_buf: ESSID:MAC1:MAC2 (without the plain)
// manipulate salt_buf // manipulate salt_buf

14
src/shared.c
View File

@ -4320,7 +4320,7 @@ int sort_by_salt (const void *v1, const void *v2)
uint n; uint n;
n = 12; n = 16;
while (n--) while (n--)
{ {
@ -4350,7 +4350,7 @@ int sort_by_salt_buf (const void *v1, const void *v2)
const salt_t *s1 = h1->salt; const salt_t *s1 = h1->salt;
const salt_t *s2 = h2->salt; const salt_t *s2 = h2->salt;
uint n = 12; uint n = 16;
while (n--) while (n--)
{ {
@ -4370,7 +4370,7 @@ int sort_by_hash_t_salt (const void *v1, const void *v2)
const salt_t *s2 = h2->salt; const salt_t *s2 = h2->salt;
// testphase: this should work // testphase: this should work
uint n = 12; uint n = 16;
while (n--) while (n--)
{ {
@ -4403,8 +4403,8 @@ int sort_by_hash_t_salt_hccap (const void *v1, const void *v2)
const salt_t *s1 = h1->salt; const salt_t *s1 = h1->salt;
const salt_t *s2 = h2->salt; const salt_t *s2 = h2->salt;
// 12 - 2 (since last 2 uints contain the digest) // 16 - 2 (since last 2 uints contain the digest)
uint n = 10; uint n = 14;
while (n--) while (n--)
{ {
@ -5540,6 +5540,10 @@ char *stroptitype (const uint opti_type)
case OPTI_TYPE_SINGLE_SALT: return ((char *) OPTI_STR_SINGLE_SALT); break; case OPTI_TYPE_SINGLE_SALT: return ((char *) OPTI_STR_SINGLE_SALT); break;
case OPTI_TYPE_BRUTE_FORCE: return ((char *) OPTI_STR_BRUTE_FORCE); break; case OPTI_TYPE_BRUTE_FORCE: return ((char *) OPTI_STR_BRUTE_FORCE); break;
case OPTI_TYPE_RAW_HASH: return ((char *) OPTI_STR_RAW_HASH); break; case OPTI_TYPE_RAW_HASH: return ((char *) OPTI_STR_RAW_HASH); break;
case OPTI_TYPE_USES_BITS_8: return ((char *) OPTI_STR_USES_BITS_8); break;
case OPTI_TYPE_USES_BITS_16: return ((char *) OPTI_STR_USES_BITS_16); break;
case OPTI_TYPE_USES_BITS_32: return ((char *) OPTI_STR_USES_BITS_32); break;
case OPTI_TYPE_USES_BITS_64: return ((char *) OPTI_STR_USES_BITS_64); break;
} }
return (NULL); return (NULL);