[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.43,1.44 ntfsdecrypt.c,1.8,1.9 decrypt.c,1.23,NONE decrypt.h,1.4,NONE

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

Changes by: antona

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

Modified Files:
	Makefile.am ntfsdecrypt.c 
Removed Files:
	decrypt.c decrypt.h 
Log Message:
Finish next stage in ntfsdecrypt evolution.  It is now almost finished in that
it fully works to decrypt any ntfs enecrypted file both from Linux and Windows.
All you need to supply is your private key in form of a .prx file as exported
for example by the cypher command in XP SP2 or otherwise as exported by the
management console's certificate manager plugin.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- Makefile.am	4 Aug 2005 13:12:41 -0000	1.43
+++ Makefile.am	5 Aug 2005 23:41:52 -0000	1.44
@@ -118,9 +118,9 @@ ntfsdump_logfile_LDADD	= $(AM_LIBS)
 ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS)
 
 if ENABLE_CRYPTO
-ntfsdecrypt_SOURCES	= ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h
+ntfsdecrypt_SOURCES	= ntfsdecrypt.c utils.c utils.h
 ntfsdecrypt_LDADD	= $(AM_LIBS)
-ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) -lgcrypt
+ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) -lgcrypt -lgnutls
 endif
 
 # Extra targets

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ntfsdecrypt.c	28 Jul 2005 15:14:55 -0000	1.8
+++ ntfsdecrypt.c	5 Aug 2005 23:41:52 -0000	1.9
@@ -1,10 +1,11 @@
 /**
- * ntfsdecrypt - Part of the Linux-NTFS project.
+ * ntfsdecrypt - Decrypt ntfs encrypted files.  Part of the Linux-NTFS project.
  *
  * Copyright (c) 2005 Yuval Fledel
  * Copyright (c) 2005 Anton Altaparmakov
  *
- * This utility will decrypt files and print on the standard output.
+ * This utility will decrypt files and print the decrypted data on the standard
+ * output.
  *
[...1141 lines suppressed...]
+	fek = ntfs_inode_fek_get(inode, rsa_key);
+	ntfs_rsa_private_key_release(rsa_key);
 	if (fek) {
-		result = cat_decrypt(inode, fek);
-		ntfs_decrypt_data_key_close(fek);
+		res = ntfs_cat_decrypt(inode, fek);
+		ntfs_fek_release(fek);
 	} else {
-		Eprintf("Could not obtain FEK.\n");
-		result = 1;
+		fprintf(stderr, "Failed to obtain file encryption key.  "
+				"Aborting.\n");
+		res = 1;
 	}
 	ntfs_inode_close(inode);
 	ntfs_umount(vol, FALSE);
-	return result;
+	ntfs_crypto_deinit();
+	return res;
 }

--- decrypt.c DELETED ---

--- decrypt.h DELETED ---