New format -m 13400, Keepass 1 (AES/Twofish) and Keepass 2 (AES)

[hashcat.git] / OpenCL / types_ocl.c

diff --git a/OpenCL/types_ocl.c b/OpenCL/types_ocl.c
index 173c468..61c1be3 100644 (file)
--- a/OpenCL/types_ocl.c
+++ b/OpenCL/types_ocl.c
@@ -1375,6 +1375,8 @@ typedef struct
   u32  digest_buf[4];
   #elif defined _AXCRYPT_
   u32  digest_buf[4];
+  #elif defined _KEEPASS_
+  u32  digest_buf[4];
   #endif
 
 } digest_t;
@@ -1590,6 +1592,25 @@ typedef struct
 
 } oldoffice34_t;
 
+typedef struct
+{
+  u32 version;
+  u32 algorithm;
+
+  u32 final_random_seed[8];
+  u32 transf_random_seed[8];
+  u32 enc_iv[4];
+  u32 contents_hash[8];
+
+  /* specific to version 1 */
+  u32 contents_len;
+  u32 contents[12500];
+
+  /* specific to version 2 */
+  u32 expected_bytes[8];
+
+} keepass_t;
+
 typedef struct
 {
   u32 digest[4];
@@ -1913,6 +1934,12 @@ typedef struct
 
 } axcrypt_tmp_t;
 
+typedef struct
+{
+  u32 tmp_digest[8];
+
+} keepass_tmp_t;
+
 typedef struct
 {
   u32 Kc[16];