DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Move 198xx DiskCryptor to 200xx to not collide with Kerberos 5, etype 17, Pre-Auth

Browse Source
This commit is contained in:
jsteube
2019-04-20 19:41:37 +02:00
parent 17ab30b29f
commit b9aaaf7809
20 changed files with 120 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/module_07500.c
+1 -1
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 AS-REQ Pre-Auth etype 23";
static const char *HASH_NAME = "Kerberos 5, etype 23, AS-REQ Pre-Auth";
static const u64 KERN_TYPE = 7500;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED;
src/modules/module_13100.c
+1 -1
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 TGS-REP etype 23 (RC4-HMAC-MD5)";
static const char *HASH_NAME = "Kerberos 5, etype 23, TGS-REP";
static const u64 KERN_TYPE = 13100;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED;
src/modules/module_18200.c
+1 -1
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 AS-REP etype 23";
static const char *HASH_NAME = "Kerberos 5, etype 23, AS-REP";
static const u64 KERN_TYPE = 18200;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED;
src/modules/module_19600.c
+1 -1
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)";
static const char *HASH_NAME = "Kerberos 5, etype 17, TGS-REP";
static const u64 KERN_TYPE = 19600;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED
src/modules/module_19700.c
+1 -1
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)";
static const char *HASH_NAME = "Kerberos 5, etype 18, TGS-REP";
static const u64 KERN_TYPE = 19700;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED
src/modules/module_19800.c
+2 -2
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 Pre-Auth etype 17 (AES128-CTS-HMAC-SHA1-96)";
static const char *HASH_NAME = "Kerberos 5, etype 17, Pre-Auth";
static const u64 KERN_TYPE = 19800;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED
@@ -161,7 +161,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
memcpy(account_info_ptr + domain_len, user_pos, user_len);
krb5pa->account_info_len = account_info_len;
// Split checksum
checksum_pos = data_pos + data_len - 24;
data_len = data_len - 24;
src/modules/module_19900.c
+2 -2
View File
@@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL;
static const char *HASH_NAME = "Kerberos 5 Pre-Auth etype 18 (AES256-CTS-HMAC-SHA1-96)";
static const char *HASH_NAME = "Kerberos 5, etype 18, Pre-Auth";
static const u64 KERN_TYPE = 19900;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED
@@ -161,7 +161,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
memcpy(account_info_ptr + domain_len, user_pos, user_len);
krb5pa->account_info_len = account_info_len;
// Split checksum
checksum_pos = data_pos + data_len - 24;
data_len = data_len - 24;
src/modules/module_19811.c → src/modules/module_20011.c
+1 -1
View File
@@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE;
static const char *HASH_NAME = "DiskCryptor SHA512 + XTS 512 bit";
static const u64 KERN_TYPE = 19811;
static const u64 KERN_TYPE = 20011;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_64
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
src/modules/module_19812.c → src/modules/module_20012.c
+1 -1
View File
@@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE;
static const char *HASH_NAME = "DiskCryptor SHA512 + XTS 1024 bit";
static const u64 KERN_TYPE = 19812;
static const u64 KERN_TYPE = 20012;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_64
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
src/modules/module_19813.c → src/modules/module_20013.c
+1 -1
View File
@@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_FDE;
static const char *HASH_NAME = "DiskCryptor SHA512 + XTS 1536 bit";
static const u64 KERN_TYPE = 19813;
static const u64 KERN_TYPE = 20013;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_64
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;