From 829be1b746ee48722d09e8e31b4b19c7f88745ba Mon Sep 17 00:00:00 2001
From: magnum <magnum>
Date: Sat, 16 Jul 2011 17:17:25 +0200
Subject: [PATCH 3/3] unified get_key() for mssql-old

---
 src/mssql-old_fmt_plug.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/src/mssql-old_fmt_plug.c b/src/mssql-old_fmt_plug.c
index 6062ccb..e417365 100644
--- a/src/mssql-old_fmt_plug.c
+++ b/src/mssql-old_fmt_plug.c
@@ -137,7 +137,6 @@ static void * mssql_get_salt(char * ciphertext)
 }
 
 static void mssql_set_key_utf8(char *_key, int index);
-static char *mssql_get_key_utf8(int index);
 extern struct fmt_main fmt_mssql;
 
 static void mssql_init(struct fmt_main *pFmt)
@@ -149,7 +148,6 @@ static void mssql_init(struct fmt_main *pFmt)
 #endif
 	if (options.flags & FLG_UTF8) {
 		fmt_mssql.methods.set_key = mssql_set_key_utf8;
-		fmt_mssql.methods.get_key = mssql_get_key_utf8;
 		fmt_mssql.params.plaintext_length = PLAINTEXT_LENGTH * 3;
 	}
 }
@@ -252,30 +250,6 @@ static char *mssql_get_key(int index) {
 #ifdef MMX_COEF
 	int key_length = (total_len >> ((32/MMX_COEF)*index)) & 0xFF;
 	key_length >>= 1;
-	for(i=0;i<key_length;i++)
-		key[i] = saved_key[GETPOS(i<<1, index)];
-#else
-	for(i = 0; i < key_length; i++)
-		key[i] = saved_key[i<<1];
-#endif
-	key[i]=0;
-	utf16toplain(key8,PLAINTEXT_LENGTH*3,key);
-
-#ifdef MSSQL_DEBUG
-	dump_stuff_msg("saved_key ", saved_key, key_length<<1);
-	dump_stuff_msg("key8      ", key8, strlen(key8));
-#endif
-
-	return (char*)key8;
-}
-
-static char *mssql_get_key_utf8(int index) {
-	UTF16 key[PLAINTEXT_LENGTH + 1];
-	static UTF8 key8[PLAINTEXT_LENGTH*3 + 1];
-	int i;
-#ifdef MMX_COEF
-	int key_length = (total_len >> ((32/MMX_COEF)*index)) & 0xFF;
-	key_length >>= 1;
 	for(i=0;i<key_length;i++) {
 		unsigned char *uc = (unsigned char*)(&key[i]);
 		uc[0] = saved_key[GETPOS((i<<1), index)];
-- 
1.7.4.1