Merge branch 'master' of https://github.com/hashcat/hashcat into DPAPImk

include/cpu_blake2.h

@@ -0,0 +1,19 @@
+/**
+ * Author......: See docs/credits.txt
+ * License.....: MIT
+ */
+
+#ifndef _CPU_BLAKE2_H
+#define _CPU_BLAKE2_H
+
+#include <string.h>
+
+const u64 blake2b_IV[8] =
+{
+  0x6a09e667f3bcc908, 0xbb67ae8584caa73b,
+  0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
+  0x510e527fade682d1, 0x9b05688c2b3e6c1f,
+  0x1f83d9abfb41bd6b, 0x5be0cd19137e2179
+};
+
+#endif // _CPU_BLAKE2_H

include/interface.h

@@ -945,6 +945,8 @@ typedef enum display_len
   DISPLAY_LEN_MIN_501   = 104,
   DISPLAY_LEN_MAX_500   = 3 + 1 + 8 + 22,
   DISPLAY_LEN_MAX_501   = 104,
+  DISPLAY_LEN_MIN_600   = 8 + 128,
+  DISPLAY_LEN_MAX_600   = 8 + 128,
   DISPLAY_LEN_MIN_900   = 32,
   DISPLAY_LEN_MAX_900   = 32,
   DISPLAY_LEN_MIN_910   = 32 + 1 + 0,
@@ -1363,7 +1365,8 @@ typedef enum hash_type
   HASH_TYPE_ITUNES_BACKUP_9     = 56,
   HASH_TYPE_ITUNES_BACKUP_10    = 57,
   HASH_TYPE_SKIP32              = 58,
-  HASH_TYPE_DPAPIMK             = 59,
+  HASH_TYPE_BLAKE2B             = 59,
+  HASH_TYPE_DPAPIMK             = 60,
 
 } hash_type_t;
 
@@ -1387,6 +1390,7 @@ typedef enum kern_type
   KERN_TYPE_MYSQL41                 = 300,
   KERN_TYPE_PHPASS                  = 400,
   KERN_TYPE_MD5CRYPT                = 500,
+  KERN_TYPE_BLAKE2B                 = 600,
   KERN_TYPE_MD4                     = 900,
   KERN_TYPE_MD4_PWU                 = 1000,
   KERN_TYPE_MD44_PWUSLT             = 1100,
@@ -1644,6 +1648,7 @@ int joomla_parse_hash             (u8 *input_buf, u32 input_len, hash_t *hash_bu
 int postgresql_parse_hash         (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
 int netscreen_parse_hash          (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
 int keccak_parse_hash             (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
+int blake2b_parse_hash            (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
 int lm_parse_hash                 (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
 int md4_parse_hash                (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
 int md5_parse_hash                (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);

include/types.h

@@ -280,6 +280,7 @@ typedef enum rule_functions
   RULE_OP_MANGLE_EXTRACT_MEMORY  = 'X',
   RULE_OP_MANGLE_APPEND_MEMORY   = '4',
   RULE_OP_MANGLE_PREPEND_MEMORY  = '6',
+  RULE_OP_MANGLE_TITLE_SEP       = 'e',
 
   RULE_OP_MEMORIZE_WORD          = 'M',
 
@@ -663,6 +664,34 @@ typedef enum user_options_map
  * structs
  */
 
+typedef struct
+{
+  u8  digest_length;
+  u8  key_length;
+  u8  fanout;
+  u8  depth;
+  u32 leaf_length;
+  u32 node_offset;
+  u32 xof_length;
+  u8  node_depth;
+  u8  inner_length;
+  u8  reserved[14];
+  u8  salt[16];
+  u8  personnel[16];
+
+} blake2params_t;
+
+typedef struct
+{
+  u64 h[8];
+  u64 t[2];
+  u64 f[2];
+  u32 buflen;
+  u32 outlen;
+  u8  last_node;
+
+} blake2_t;
+
 typedef struct
 {
   u32 salt_buf[16];