1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 15:18:16 +00:00

switch hash-mode from 4420 to 21200

This commit is contained in:
Gabriele Gristina 2019-07-30 15:23:04 +02:00
parent 6a6c393bc5
commit 16b4f745af
6 changed files with 7 additions and 8 deletions

View File

@ -29,7 +29,7 @@
#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
#endif #endif
KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ()) KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier
@ -188,7 +188,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ())
} }
} }
KERNEL_FQ void m04420_sxx (KERN_ATTR_RULES ()) KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier

View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
#endif #endif
KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ()) KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier
@ -184,7 +184,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ())
} }
} }
KERNEL_FQ void m04420_sxx (KERN_ATTR_BASIC ()) KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier

View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
#endif #endif
KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier
@ -197,7 +197,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ())
} }
} }
KERNEL_FQ void m04420_sxx (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier

View File

@ -74,7 +74,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o
- md5(md5($pass).md5($salt)) - md5(md5($pass).md5($salt))
- md5(strtoupper(md5($pass))) - md5(strtoupper(md5($pass)))
- md5(sha1($pass)) - md5(sha1($pass))
- md5(sha1($salt).md5($pass))
- sha1($pass.$salt) - sha1($pass.$salt)
- sha1($salt.$pass) - sha1($salt.$pass)
- sha1(utf16le($pass).$salt) - sha1(utf16le($pass).$salt)

View File

@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 1;
static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
static const char *HASH_NAME = "md5(sha1($salt).md5($pass))"; static const char *HASH_NAME = "md5(sha1($salt).md5($pass))";
static const u64 KERN_TYPE = 4420; static const u64 KERN_TYPE = 21200;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_EARLY_SKIP | OPTI_TYPE_EARLY_SKIP