Office formats: Implement proper binary hash functions for FMT_BLOB

See #5736

Author: magnumripper

src/office_common.h

@@ -1,14 +1,10 @@
 /*
  * Office 2007-2013 cracker patch for JtR, common code. This software is
  * Copyright (c) 2014 by JimF
- * Copyright (c) 2012-2019 magnum
+ * Copyright (c) 2012-2025 magnum
  * and is hereby released to the general public under the following terms:
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted.
- *
- * This file takes replicated but common code, shared between the CPU
- * office format, and the GPU office formats, and places it into one
- * common location.
  */
 
 #include "formats.h"
@@ -35,10 +31,17 @@ typedef struct ms_office_binary_blob_t {
 	uint8_t encryptedVerifierHash[32];
 } ms_office_binary_blob;
 
-void *ms_office_common_get_salt(char *ciphertext);
-void *ms_office_common_binary(char *ciphertext);
-int ms_office_common_valid(char *ciphertext, struct fmt_main *self);
+extern void *ms_office_common_get_salt(char *ciphertext);
+extern void *ms_office_common_binary(char *ciphertext);
+extern int ms_office_common_valid(char *ciphertext, struct fmt_main *self);
 
 /* other 'common' functions for MSOffice */
-unsigned int ms_office_common_iteration_count(void *salt);
-unsigned int ms_office_common_version(void *salt);
+extern unsigned int ms_office_common_iteration_count(void *salt);
+extern unsigned int ms_office_common_version(void *salt);
+extern int ms_office_binary_hash_0(void *binary);
+extern int ms_office_binary_hash_1(void *binary);
+extern int ms_office_binary_hash_2(void *binary);
+extern int ms_office_binary_hash_3(void *binary);
+extern int ms_office_binary_hash_4(void *binary);
+extern int ms_office_binary_hash_5(void *binary);
+extern int ms_office_binary_hash_6(void *binary);

src/office_common_plug.c

@@ -1,8 +1,10 @@
 /*
- * Office 2007-2013 cracker patch for JtR, common code. 2014 by JimF
- * This file takes replicated but common code, shared between the CPU
- * office format, and the GPU office formats, and places it into one
- * common location (with some tiny tweaks, for things like valid).
+ * Office 2007-2013 cracker patch for JtR, common code. This software is
+ * Copyright (c) 2014 by JimF
+ * Copyright (c) 2012-2025 magnum
+ * and is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
  */
 
 #include "arch.h"
@@ -145,3 +147,23 @@ unsigned int ms_office_common_version(void *salt)
 {
 	return ((ms_office_custom_salt*)salt)->version;
 }
+
+static int ms_office_binary_hash(void *binary, uint32_t mask)
+{
+	fmt_data *blob = binary;
+	ms_office_binary_blob *verifiers = blob->blob;
+	uint8_t *encryptedVerifier = verifiers->encryptedVerifier;
+	uint32_t hash;
+
+	memcpy(&hash, encryptedVerifier, sizeof(hash));
+
+	return hash & mask;
+}
+
+int ms_office_binary_hash_0(void *binary) { return ms_office_binary_hash(binary, PH_MASK_0); }
+int ms_office_binary_hash_1(void *binary) { return ms_office_binary_hash(binary, PH_MASK_1); }
+int ms_office_binary_hash_2(void *binary) { return ms_office_binary_hash(binary, PH_MASK_2); }
+int ms_office_binary_hash_3(void *binary) { return ms_office_binary_hash(binary, PH_MASK_3); }
+int ms_office_binary_hash_4(void *binary) { return ms_office_binary_hash(binary, PH_MASK_4); }
+int ms_office_binary_hash_5(void *binary) { return ms_office_binary_hash(binary, PH_MASK_5); }
+int ms_office_binary_hash_6(void *binary) { return ms_office_binary_hash(binary, PH_MASK_6); }

src/office_fmt_plug.c

@@ -1,7 +1,7 @@
 /*
  * Office 2007 cracker patch for JtR. This software is
  * Copyright (c) 2012 Dhiru Kholia <dhiru.kholia at gmail.com>.
- * Copyright (c) 2012-2021 magnum
+ * Copyright (c) 2012-2025 magnum
  * and is hereby released to the general public under the following terms:
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted.
@@ -802,13 +802,13 @@ struct fmt_main fmt_office = {
 		},
 		fmt_default_source,
 		{
-			fmt_default_binary_hash_0,
-			fmt_default_binary_hash_1,
-			fmt_default_binary_hash_2,
-			fmt_default_binary_hash_3,
-			fmt_default_binary_hash_4,
-			fmt_default_binary_hash_5,
-			fmt_default_binary_hash_6
+			ms_office_binary_hash_0,
+			ms_office_binary_hash_1,
+			ms_office_binary_hash_2,
+			ms_office_binary_hash_3,
+			ms_office_binary_hash_4,
+			ms_office_binary_hash_5,
+			ms_office_binary_hash_6
 		},
 		fmt_default_salt_hash,
 		NULL,

src/opencl_office_fmt_plug.c

@@ -2,7 +2,7 @@
  * MS Office >= 2007 cracker for JtR. OpenCL support by magnum.
  *
  * This software is Copyright (c) 2012, Dhiru Kholia <dhiru.kholia at gmail.com>
- * and Copyright (c) 2012-2021, magnum
+ * and Copyright (c) 2012-2025, magnum
  * and it is hereby released to the general public under the following terms:
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted.
@@ -499,7 +499,13 @@ struct fmt_main fmt_opencl_office = {
 		},
 		fmt_default_source,
 		{
-			fmt_default_binary_hash
+			ms_office_binary_hash_0,
+			ms_office_binary_hash_1,
+			ms_office_binary_hash_2,
+			ms_office_binary_hash_3,
+			ms_office_binary_hash_4,
+			ms_office_binary_hash_5,
+			ms_office_binary_hash_6
 		},
 		fmt_default_salt_hash,
 		NULL,