From 54b65e2b3cb7011f8082456d144bfc8365c009b3 Mon Sep 17 00:00:00 2001 From: antona Date: Tue, 26 Jul 2005 01:32:51 +0000 Subject: [PATCH] Fixes for key order for desx. Still doesn't work but now keys are correct. --- ntfsprogs/decrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntfsprogs/decrypt.c b/ntfsprogs/decrypt.c index 18d5e71a..a812043a 100644 --- a/ntfsprogs/decrypt.c +++ b/ntfsprogs/decrypt.c @@ -444,7 +444,7 @@ unsigned int decrypt_decrypt_sector(decrypt_key *key, void *data, 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_session *session __attribute__((unused)), 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;