Rename -m 29700 to 25300

OpenCL/m25300-pure.cl

@@ -23,7 +23,7 @@ typedef struct office2016_tmp
 
 } office2016_tmp_t;
 
-KERNEL_FQ void m29700_init (KERN_ATTR_TMPS (office2016_tmp_t))
+KERNEL_FQ void m25300_init (KERN_ATTR_TMPS (office2016_tmp_t))
 {
   /**
    * base
@@ -53,7 +53,7 @@ KERNEL_FQ void m29700_init (KERN_ATTR_TMPS (office2016_tmp_t))
   tmps[gid].out[7] = ctx.h[7];
 }
 
-KERNEL_FQ void m29700_loop (KERN_ATTR_TMPS (office2016_tmp_t))
+KERNEL_FQ void m25300_loop (KERN_ATTR_TMPS (office2016_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
@@ -163,7 +163,7 @@ KERNEL_FQ void m29700_loop (KERN_ATTR_TMPS (office2016_tmp_t))
   unpack64v (tmps, out, gid, 7, t7);
 }
 
-KERNEL_FQ void m29700_comp (KERN_ATTR_TMPS (office2016_tmp_t))
+KERNEL_FQ void m25300_comp (KERN_ATTR_TMPS (office2016_tmp_t))
 {
   const u64 gid = get_global_id (0);
 

docs/changes.txt

@@ -10,6 +10,7 @@
 - Added hash-mode: BestCrypt v3 Volume Encryption
 - Added hash-mode: Bitwarden
 - Added hash-mode: Dahua Authentication MD5
+- Added hash-mode: MS Office 2016 - SheetProtection
 - Added hash-mode: PKCS#8 Private Keys
 - Added hash-mode: RAR3-p (Compressed)
 - Added hash-mode: RAR3-p (Uncompressed)
@@ -18,7 +19,6 @@
 - Added hash-mode: Stuffit5
 - Added hash-mode: Umbraco HMAC-SHA1
 - Added hash-mode: sha1(sha1($pass).$salt)
-- Added hash-mode: MS Office 2016 - SheetProtection
 
 ##
 ## Bugs

docs/readme.txt

@@ -266,13 +266,13 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - MS Office 2007
 - MS Office 2010
 - MS Office 2013
+- MS Office 2016 - SheetProtection
 - MS Office <= 2003 $0/$1, MD5 + RC4
 - MS Office <= 2003 $0/$1, MD5 + RC4, collider #1
 - MS Office <= 2003 $0/$1, MD5 + RC4, collider #2
 - MS Office <= 2003 $3/$4, SHA1 + RC4
 - MS Office <= 2003 $3, SHA1 + RC4, collider #1
 - MS Office <= 2003 $3, SHA1 + RC4, collider #2
-- MS Office 2016 - SheetProtection
 - Open Document Format (ODF) 1.2 (SHA-256, AES)
 - Open Document Format (ODF) 1.1 (SHA-1, Blowfish)
 - Apple Keychain

src/modules/module_25300.c

@@ -18,7 +18,7 @@ static const u32   DGST_POS3      = 7;
 static const u32   DGST_SIZE      = DGST_SIZE_8_8;
 static const u32   HASH_CATEGORY  = HASH_CATEGORY_DOCUMENTS;
 static const char *HASH_NAME      = "MS Office 2016 - SheetProtection";
-static const u64   KERN_TYPE      = 29700;
+static const u64   KERN_TYPE      = 25300;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
                                   | OPTI_TYPE_USES_BITS_64
                                   | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;