MS SQL formats: Support lowercase hash encodings

Based on logic in mysqlSHA1_fmt_plug.c Fixes #5461
openwall · Apr 20, 2024 · 06049b7 · 06049b7
1 parent c8e21e8
commit 06049b7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/src/mssql-old_fmt_plug.c b/src/mssql-old_fmt_plug.c
@@ -125,13 +125,22 @@ static int valid(char *ciphertext, struct fmt_main *self)
 		return 0;
 	for (i = 6; i < CIPHERTEXT_LENGTH; i++){
 		if (!(  (('0' <= ciphertext[i])&&(ciphertext[i] <= '9')) ||
-					//(('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
+					(('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
 					(('A' <= ciphertext[i])&&(ciphertext[i] <= 'F'))))
 			return 0;
 	}
 	return 1;
 }
 
+static char *split(char *ciphertext, int index, struct fmt_main *self)
+{
+	static char out[CIPHERTEXT_LENGTH + 1];
+
+	strnzcpy(out, ciphertext, sizeof(out));
+	strupr(out + 6); /* Skip first 6 chars to retain lowercase 'x' */
+	return out;
+}
+
 static void set_salt(void *salt)
 {
 	memcpy(cursalt, salt, SALT_SIZE);
@@ -416,7 +425,7 @@ struct fmt_main fmt_mssql = {
 		SALT_ALIGN,
 		MIN_KEYS_PER_CRYPT,
 		MAX_KEYS_PER_CRYPT,
-		FMT_8_BIT | FMT_UNICODE | FMT_ENC,
+		FMT_8_BIT | FMT_SPLIT_UNIFIES_CASE | FMT_UNICODE | FMT_ENC,
 		{ NULL },
 		{ NULL },
 		tests
@@ -426,7 +435,7 @@ struct fmt_main fmt_mssql = {
 		fmt_default_reset,
 		fmt_default_prepare,
 		valid,
-		fmt_default_split,
+		split,
 		get_binary,
 		get_salt,
 		{ NULL },

diff --git a/src/mssql05_fmt_plug.c b/src/mssql05_fmt_plug.c
@@ -121,13 +121,22 @@ static int valid(char *ciphertext, struct fmt_main *self)
 		return 0;
 	for (i = 6; i < CIPHERTEXT_LENGTH; i++){
 		if (!(  (('0' <= ciphertext[i])&&(ciphertext[i] <= '9')) ||
-					//(('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
+					(('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
 					(('A' <= ciphertext[i])&&(ciphertext[i] <= 'F'))))
 			return 0;
 	}
 	return 1;
 }
 
+static char *split(char *ciphertext, int index, struct fmt_main *self)
+{
+	static char out[CIPHERTEXT_LENGTH + 1];
+
+	strnzcpy(out, ciphertext, sizeof(out));
+	strupr(out + 6); /* Skip first 6 chars to retain lowercase 'x' */
+	return out;
+}
+
 // Handle full hashes (old and new in one long string) as well. This means the
 // [other] mssql format should be registered before this one. If there are
 // old-style hashes we should crack them first using that format, then run
@@ -605,7 +614,7 @@ struct fmt_main fmt_mssql05 = {
 		SALT_ALIGN,
 		MIN_KEYS_PER_CRYPT,
 		MAX_KEYS_PER_CRYPT,
-		FMT_CASE | FMT_8_BIT | FMT_UNICODE | FMT_ENC,
+		FMT_CASE | FMT_8_BIT | FMT_SPLIT_UNIFIES_CASE | FMT_UNICODE | FMT_ENC,
 		{ NULL },
 		{ NULL },
 		tests
@@ -615,7 +624,7 @@ struct fmt_main fmt_mssql05 = {
 		fmt_default_reset,
 		prepare,
 		valid,
-		fmt_default_split,
+		split,
 		get_binary,
 		get_salt,
 		{ NULL },

diff --git a/src/mssql12_fmt_plug.c b/src/mssql12_fmt_plug.c
@@ -119,13 +119,22 @@ static int valid(char *ciphertext, struct fmt_main *self)
 		return 0;
 	for (i = 6; i < CIPHERTEXT_LENGTH; i++) {
 		if (!((('0' <= ciphertext[i])&&(ciphertext[i] <= '9')) ||
-		      //(('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
+		      (('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ||
 		      (('A' <= ciphertext[i])&&(ciphertext[i] <= 'F'))))
 			return 0;
 	}
 	return 1;
 }
 
+static char *split(char *ciphertext, int index, struct fmt_main *self)
+{
+	static char out[CIPHERTEXT_LENGTH + 1];
+
+	strnzcpy(out, ciphertext, sizeof(out));
+	strupr(out + 6); /* Skip first 6 chars to retain lowercase 'x' */
+	return out;
+}
+
 static void set_salt(void *salt)
 {
 	memcpy(cursalt, salt, SALT_SIZE);
@@ -433,7 +442,7 @@ struct fmt_main fmt_mssql12 = {
 		SALT_ALIGN,
 		MIN_KEYS_PER_CRYPT,
 		MAX_KEYS_PER_CRYPT,
-		FMT_CASE | FMT_8_BIT | FMT_UNICODE | FMT_ENC | FMT_OMP,
+		FMT_CASE | FMT_8_BIT | FMT_SPLIT_UNIFIES_CASE | FMT_UNICODE | FMT_ENC | FMT_OMP,
 		{ NULL },
 		{ NULL },
 		tests
@@ -443,7 +452,7 @@ struct fmt_main fmt_mssql12 = {
 		fmt_default_reset,
 		fmt_default_prepare,
 		valid,
-		fmt_default_split,
+		split,
 		get_binary,
 		get_salt,
 		{ NULL },