Merge pull request #1809 from hashcat/master

Backports from master

include/interface.h

@@ -423,6 +423,25 @@ typedef struct oldoffice34
 
 } oldoffice34_t;
 
+typedef struct odf12_tmp
+{
+  u32  ipad[5];
+  u32  opad[5];
+
+  u32  dgst[10];
+  u32  out[10];
+
+} odf12_tmp_t;
+
+typedef struct odf12
+{
+  u32 iterations;
+  u32 iv[4];
+  u32 checksum[8];
+  u32 encrypted_data[256];
+
+} odf12_t;
+
 typedef struct pstoken
 {
   u32 salt_buf[128];
@@ -1149,6 +1168,7 @@ typedef enum hash_type
   HASH_TYPE_WPA_PMKID_PMK       = 69,
   HASH_TYPE_ANSIBLE_VAULT       = 70,
   HASH_TYPE_KRB5ASREP           = 71,
+  HASH_TYPE_ODF12               = 72,
 
 } hash_type_t;
 
@@ -1376,6 +1396,7 @@ typedef enum kern_type
   KERN_TYPE_TOTP_HMACSHA1           = 18100,
   KERN_TYPE_KRB5ASREP               = 18200,
   KERN_TYPE_APFS                    = 18300,
+  KERN_TYPE_ODF12                   = 18400,
   KERN_TYPE_PLAINTEXT               = 99999,
 
 } kern_type_t;
@@ -1419,6 +1440,7 @@ typedef enum rounds_count
    ROUNDS_OFFICE2007         = 50000,
    ROUNDS_OFFICE2010         = 100000,
    ROUNDS_OFFICE2013         = 100000,
+   ROUNDS_LIBREOFFICE        = 100000,
    ROUNDS_DJANGOPBKDF2       = 20000,
    ROUNDS_SAPH_SHA1          = 1024,
    ROUNDS_PDF14              = (50 + 20),