[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.8,1.9

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25844

Modified Files:
	decrypt.c 
Log Message:
Fixes for key order for desx.  Still doesn't work but now keys are correct.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- decrypt.c	25 Jul 2005 23:23:48 -0000	1.8
+++ decrypt.c	26 Jul 2005 01:32:51 -0000	1.9
@@ -444,7 +444,7 @@ unsigned int decrypt_decrypt_sector(decr
 				fprintf(stderr, "gcry_error2 is %u.\n",
 						gcry_error2);
 			/* Apply in-whitening. */
-			*pos ^= dkey->desx_key[0];
+			*pos ^= dkey->desx_key[2];
 			/* Apply DES decyption. */
 			if ((gcry_error2 = gcry_cipher_decrypt(
 					dkey->gcry_cipher_hd, (u8*)pos, 8,
@@ -535,7 +535,7 @@ decrypt_key *decrypt_make_key(decrypt_se
 		fprintf(stderr, "expanded keys (hex) = 0x%llx, 0x%llx, "
 				"0x%llx\n", key->desx_key[0], key->desx_key[1],
 				key->desx_key[2]);
-		key->key_data = (u8*)&key->desx_key[2];
+		key->key_data = (u8*)&key->desx_key[0];
 		gcry_mode = GCRY_CIPHER_MODE_ECB;
 		gcry_length = 8;
 		gcry_algo = GCRY_CIPHER_DES;