linux-ntfs-cvs Mailing List for Linux NTFS file system support (Page 48)

Development moved to https://sourceforge.net/projects/ntfs-3g/

Brought to you by: antona, cha0smaster

linux-ntfs-cvs — List for CVS checkins and comments.

You can subscribe to this list here.

2001	_Jan (38)	_Feb (25)	_Mar (37)	_Apr (50)	_May	_Jun (156)	_Jul (174)	_Aug (94)	_Sep (107)	_Oct (18)	_Nov (153)	_Dec (91)
2002	_Jan (79)	_Feb (117)	_Mar (39)	_Apr (164)	_May (12)	_Jun (64)	_Jul (138)	_Aug (43)	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb	_Mar	_Apr (1)	_May (17)	_Jun (100)	_Jul (210)	_Aug (127)	_Sep (89)	_Oct (214)	_Nov (176)	_Dec (20)
2006	_Jan (29)	_Feb (85)	_Mar (45)	_Apr (54)	_May (9)	_Jun (7)	_Jul (28)	_Aug (65)	_Sep (3)	_Oct (62)	_Nov (68)	_Dec (52)
2007	_Jan (6)	_Feb	_Mar (8)	_Apr	_May	_Jun (2)	_Jul (4)	_Aug	_Sep	_Oct (2)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 46 47 48 49 50 .. 124 > >> (Page 48 of 124)

[Linux-NTFS-cvs] CVS: ntfsprogs/include .cvsignore,1.1,1.2 Makefile.in,1.41,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:10:31

Changes by: antona

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

Modified Files:
	.cvsignore 
Removed Files:
	Makefile.in 
Log Message:
Remove all Makefile.in files and add them all to all .cvsignores.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Jun 2005 09:05:30 -0000	1.1
+++ .cvsignore	29 Jul 2005 15:10:20 -0000	1.2
@@ -1 +1,2 @@
 Makefile
+Makefile.in

--- Makefile.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs .cvsignore,1.4,1.5 Makefile.in,1.84,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:10:30

Changes by: antona

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

Modified Files:
	.cvsignore 
Removed Files:
	Makefile.in 
Log Message:
Remove all Makefile.in files and add them all to all .cvsignores.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Jul 2005 18:19:17 -0000	1.4
+++ .cvsignore	29 Jul 2005 15:10:20 -0000	1.5
@@ -1,6 +1,7 @@
 .deps
 .libs
 Makefile
+Makefile.in
 mkntfs
 ntfscat
 ntfsclone

--- Makefile.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs .cvsignore,1.1,1.2 Makefile.in,1.32,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:10:30

Changes by: antona

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

Modified Files:
	.cvsignore 
Removed Files:
	Makefile.in 
Log Message:
Remove all Makefile.in files and add them all to all .cvsignores.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Jun 2005 09:05:30 -0000	1.1
+++ .cvsignore	29 Jul 2005 15:10:20 -0000	1.2
@@ -1 +1,2 @@
 Makefile
+Makefile.in

--- Makefile.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/doc .cvsignore,1.1,1.2 Makefile.in,1.35,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:10:30

Changes by: antona

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

Modified Files:
	.cvsignore 
Removed Files:
	Makefile.in 
Log Message:
Remove all Makefile.in files and add them all to all .cvsignores.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Jun 2005 09:05:30 -0000	1.1
+++ .cvsignore	29 Jul 2005 15:10:19 -0000	1.2
@@ -1 +1,2 @@
 Makefile
+Makefile.in

--- Makefile.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs .cvsignore,1.2,1.3 Makefile.in,1.56,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:10:30

Changes by: antona

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

Modified Files:
	.cvsignore 
Removed Files:
	Makefile.in 
Log Message:
Remove all Makefile.in files and add them all to all .cvsignores.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2005 13:20:41 -0000	1.2
+++ .cvsignore	29 Jul 2005 15:10:20 -0000	1.3
@@ -1,6 +1,7 @@
 .deps
 .libs
 Makefile
+Makefile.in
 libntfs-gnomevfs.8
 libntfs-gnomevfs.la
 libntfs.conf

--- Makefile.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.in,1.83,1.84

From: Anton A. <an...@us...> - 2005-07-29 15:05:44

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- Makefile.in	28 Jul 2005 16:24:27 -0000	1.83
+++ Makefile.in	29 Jul 2005 15:05:32 -0000	1.84
@@ -223,6 +223,9 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -373,7 +376,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -398,9 +401,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 mkntfs.8: $(top_builddir)/config.status $(srcdir)/mkntfs.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.in,1.55,1.56

From: Anton A. <an...@us...> - 2005-07-29 15:05:42

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- Makefile.in	21 Jul 2005 12:12:48 -0000	1.55
+++ Makefile.in	29 Jul 2005 15:05:32 -0000	1.56
@@ -171,6 +171,9 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -284,7 +287,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -309,9 +312,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 libntfs.conf: $(top_builddir)/config.status $(srcdir)/libntfs.conf.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

[Linux-NTFS-cvs] CVS: ntfsprogs/doc Makefile.in,1.34,1.35

From: Anton A. <an...@us...> - 2005-07-29 15:05:40

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- Makefile.in	21 Jul 2005 12:12:47 -0000	1.34
+++ Makefile.in	29 Jul 2005 15:05:31 -0000	1.35
@@ -96,6 +96,9 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -176,7 +179,7 @@ EXTRA_DIST = \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -201,9 +204,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:

[Linux-NTFS-cvs] CVS: ntfsprogs .cvsignore,1.1,1.2 aclocal.m4,1.34,1.35 configure.ac,1.67,1.68 Makefile.in,1.41,NONE configure,1.94,NONE

From: Anton A. <an...@us...> - 2005-07-29 15:05:40

Changes by: antona

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

Modified Files:
	.cvsignore aclocal.m4 configure.ac 
Removed Files:
	Makefile.in configure 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Jun 2005 09:29:34 -0000	1.1
+++ .cvsignore	29 Jul 2005 15:04:57 -0000	1.2
@@ -1,8 +1,10 @@
 Makefile
+Makefile.in
 autom4te.cache
 config.h
 config.log
 config.status
+configure
 libtool
 ntfsprogs.spec
 stamp-h1

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- aclocal.m4	21 Jul 2005 12:12:37 -0000	1.34
+++ aclocal.m4	29 Jul 2005 15:04:57 -0000	1.35
@@ -6578,6 +6578,35 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- configure.ac	20 Jul 2005 19:06:40 -0000	1.67
+++ configure.ac	29 Jul 2005 15:05:30 -0000	1.68
@@ -28,6 +28,7 @@ AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
 AM_ENABLE_SHARED
 AM_ENABLE_STATIC
 

--- Makefile.in DELETED ---

--- configure DELETED ---

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs Makefile.in,1.31,1.32

From: Anton A. <an...@us...> - 2005-07-29 15:05:40

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Makefile.in	21 Jul 2005 12:12:48 -0000	1.31
+++ Makefile.in	29 Jul 2005 15:05:31 -0000	1.32
@@ -109,6 +109,9 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -210,7 +213,7 @@ linux_ntfsinclude_HEADERS = \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -235,9 +238,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:

[Linux-NTFS-cvs] CVS: ntfsprogs/include Makefile.in,1.40,1.41

From: Anton A. <an...@us...> - 2005-07-29 15:05:40

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Start the build system cleanup.  Add AM_MAINTAINER_MODE to configure.ac and
remove configure and Makefile.in.  Also add Makefile.in to .cvsignore.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/Makefile.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- Makefile.in	21 Jul 2005 12:12:47 -0000	1.40
+++ Makefile.in	29 Jul 2005 15:05:31 -0000	1.41
@@ -105,6 +105,9 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -175,7 +178,7 @@ SUBDIRS = ntfs
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -200,9 +203,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.47,1.48

From: Szakacsits S. <sz...@si...> - 2005-07-29 14:58:37

On Fri, 29 Jul 2005, Yura Pakhuchiy wrote:

> -	if (ntfs_check_logfile(na) && ntfs_is_logfile_clean(na))
> -		ret = 0;
> -	else {
> -		ret = -1;
> -		err = EIO;
> -	}
> +	if (!ntfs_check_logfile(na) || !ntfs_is_logfile_clean(na))
> +		err = EOPNOTSUPP;

I don't like this very much. Now users would get the message that mounting
NTFS is not supported and that's pretty bogus. EIO covered the issue much
more better.

The change also "breaks" ntfsresize. Currently users get this message for 
EIO:

"Apparently you have a corrupted NTFS. Please run the filesystem checker\n"
"on Windows by invoking chkdsk /f. Don't forget the /f (force) parameter,\n"
"it's important! You probably also need to reboot Windows to take effect.\n"
"Then you can try ntfsresize again. No modification was made to your NTFS.\n";

This always helped in the past. Now they would get only the "not supported
message". It would be too confusing.

	Szaka

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs utils.c,1.38,1.39

From: Yura P. <cha...@us...> - 2005-07-29 14:44:33

Changes by: cha0smaster

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

Modified Files:
	utils.c 
Log Message:
Change errno and print more verbose message in case if logfile check failed. 


Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- utils.c	20 Jul 2005 19:06:51 -0000	1.38
+++ utils.c	29 Jul 2005 14:44:24 -0000	1.39
@@ -154,7 +154,14 @@ ntfs_volume * utils_mount_volume (const 
 
 	vol = ntfs_mount (device, flags);
 	if (!vol) {
-		Eprintf ("Couldn't mount device '%s': %s\n", device, strerror (errno));
+		int err;
+
+		err = errno;
+		Eprintf("Couldn't mount device '%s': %s\n", device,
+				strerror(err));
+		if (err == EOPNOTSUPP)
+			Eprintf("It's seems that logfile check failed. "
+					"Try to mount volume in windows.\n");
 		return NULL;
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.47,1.48

From: Yura P. <cha...@us...> - 2005-07-29 14:44:32

Changes by: cha0smaster

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

Modified Files:
	volume.c 
Log Message:
Change errno and print more verbose message in case if logfile check failed. 


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- volume.c	18 Jul 2005 02:09:43 -0000	1.47
+++ volume.c	29 Jul 2005 14:44:24 -0000	1.48
@@ -562,7 +562,7 @@ static int ntfs_volume_check_logfile(ntf
 {
 	ntfs_inode *ni;
 	ntfs_attr *na = NULL;
-	int ret, err = 0;
+	int err = 0;
 
 	if ((ni = ntfs_inode_open(vol, FILE_LogFile)) == NULL) {
 		Dprintf("Failed to open inode FILE_LogFile.\n");
@@ -571,23 +571,20 @@ static int ntfs_volume_check_logfile(ntf
 	}
 	if ((na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0)) == NULL) {
 		Dprintf("Failed to open $FILE_LogFile/$DATA\n");
-		ret = -1;
 		err = EIO;
 		goto exit;
 	}
-	if (ntfs_check_logfile(na) && ntfs_is_logfile_clean(na))
-		ret = 0;
-	else {
-		ret = -1;
-		err = EIO;
-	}
+	if (!ntfs_check_logfile(na) || !ntfs_is_logfile_clean(na))
+		err = EOPNOTSUPP;
 exit:
 	if (na)
 		ntfs_attr_close(na);
 	ntfs_inode_close(ni);
-	if (ret)
+	if (err) {
 		errno = err;
-	return ret;
+		return -1;
+	}
+	return 0;
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.253,1.254

From: Yura P. <cha...@us...> - 2005-07-29 14:44:32

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Change errno and print more verbose message in case if logfile check failed. 


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- ChangeLog	28 Jul 2005 21:20:23 -0000	1.253
+++ ChangeLog	29 Jul 2005 14:44:23 -0000	1.254
@@ -16,6 +16,8 @@ xx/xx/xxxx - 1.12.0-WIP
 	- ntfscp: fix attribute name parsing bug introduced in 1.10.0.  (Yura)
 	- ntfsinfo: dump more information for indexes.  (Yura)
 	- Fix unistr.c::ntfs_mbstoucs on systems with utf8 locale.  (Yura)
+	- Change errno and print more verbose message in case if logfile check
+	  failed.  (Yura)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.24,1.25

From: Anton A. <an...@us...> - 2005-07-29 09:54:13

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Update some efs info (the 16byte fields in the header are md5 hashes of the
decrypted fek, ddfs, and drfs.  windows uses them as a sanity check and a check
that the efs attribute has not been tampered with.)


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- layout.h	28 Jul 2005 10:36:32 -0000	1.24
+++ layout.h	29 Jul 2005 09:54:02 -0000	1.25
@@ -2392,9 +2392,9 @@ typedef struct {
 	u32 unknown1;		/* always 0? */
 	u32 unknown2;		/* number of DDFs? */
 	u32 unknown3;		/* number of DRFs? */
-/* 16*/	u8 unknown4[16];	/* MD5 hash related to DDFs? */
-/* 32*/	u8 unknown5[16];	/* MD5 hash related to DRFs? */
-/* 48*/	u8 unknown6[16];	/* always 0? */
+/* 16*/	u8 unknown4[16];	/* MD5 hash of decrypted FEK? */
+/* 32*/	u8 unknown5[16];	/* MD5 hash of DDFs? */
+/* 48*/	u8 unknown6[16];	/* MD5 hash of DRFs? */
 /* 64*/	u32 offset_to_ddf_array;/* Offset in bytes to the array of data
 				   decryption fields (DDF), see below.  Zero if
 				   no DDFs are present. */

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.252,1.253

From: Yura P. <cha...@us...> - 2005-07-28 21:20:32

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Fix unistr.c::ntfs_mbstoucs on systems with utf8 locale.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- ChangeLog	25 Jul 2005 22:08:42 -0000	1.252
+++ ChangeLog	28 Jul 2005 21:20:23 -0000	1.253
@@ -15,6 +15,7 @@ xx/xx/xxxx - 1.12.0-WIP
 	  extent. (Szaka)
 	- ntfscp: fix attribute name parsing bug introduced in 1.10.0.  (Yura)
 	- ntfsinfo: dump more information for indexes.  (Yura)
+	- Fix unistr.c::ntfs_mbstoucs on systems with utf8 locale.  (Yura)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs unistr.c,1.20,1.21

From: Yura P. <cha...@us...> - 2005-07-28 21:20:32

Changes by: cha0smaster

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

Modified Files:
	unistr.c 
Log Message:
Fix unistr.c::ntfs_mbstoucs on systems with utf8 locale.


Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- unistr.c	6 Jul 2005 22:47:18 -0000	1.20
+++ unistr.c	28 Jul 2005 21:20:23 -0000	1.21
@@ -467,7 +467,7 @@ int ntfs_mbstoucs(const char *ins, ntfsc
 	ntfschar *ucs;
 	const char *s;
 	wchar_t wc;
-	int i, o, cnt, ins_len, ucs_len;
+	int i, o, cnt, ins_len, ucs_len, ins_size;
 #ifdef HAVE_MBSINIT
 	mbstate_t mbstate;
 #endif
@@ -482,6 +482,8 @@ int ntfs_mbstoucs(const char *ins, ntfsc
 		errno = ENAMETOOLONG;
 		return -1;
 	}
+	/* Determine the size of the multi-byte string in bytes. */
+	ins_size = strlen(ins);
 	/* Determine the length of the multi-byte string. */
 	s = ins;
 #if defined(HAVE_MBSINIT)
@@ -543,9 +545,9 @@ int ntfs_mbstoucs(const char *ins, ntfsc
 		}
 		/* Convert the multibyte character to a wide character. */
 #ifdef HAVE_MBSINIT
-		cnt = mbrtowc(&wc, ins + i, ins_len - i, &mbstate);
+		cnt = mbrtowc(&wc, ins + i, ins_size - i, &mbstate);
 #else
-		cnt = mbtowc(&wc, ins + i, ins_len - i);
+		cnt = mbtowc(&wc, ins + i, ins_size - i);
 #endif
 		if (!cnt)
 			break;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.39,1.40 Makefile.in,1.82,1.83

From: Anton A. <an...@us...> - 2005-07-28 16:24:36

Changes by: antona

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

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Remove Openssl linking in for decrypt.c from Makefile.am and update build
system.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- Makefile.am	21 Jul 2005 12:12:48 -0000	1.39
+++ Makefile.am	28 Jul 2005 16:24:27 -0000	1.40
@@ -87,9 +87,9 @@ endif
 
 # We don't distribute these
 
-ntfsdecrypt_SOURCES		= ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h
-ntfsdecrypt_LDADD		= $(AM_LIBS)
-ntfsdecrypt_LDFLAGS		= $(AM_LFLAGS) -lgcrypt -lcrypto
+ntfsdecrypt_SOURCES	= ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h
+ntfsdecrypt_LDADD	= $(AM_LIBS)
+ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) -lgcrypt
 
 ntfsrm_SOURCES		= ntfsrm.c ntfsrm.h utils.c utils.h
 ntfsrm_LDADD		= $(AM_LIBS)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- Makefile.in	21 Jul 2005 12:12:48 -0000	1.82
+++ Makefile.in	28 Jul 2005 16:24:27 -0000	1.83
@@ -350,7 +350,7 @@ ntfscp_LDFLAGS = $(AM_LFLAGS)
 # We don't distribute these
 ntfsdecrypt_SOURCES = ntfsdecrypt.c decrypt.c decrypt.h utils.c utils.h
 ntfsdecrypt_LDADD = $(AM_LIBS)
-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) -lgcrypt -lcrypto
+ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) -lgcrypt
 ntfsrm_SOURCES = ntfsrm.c ntfsrm.h utils.c utils.h
 ntfsrm_LDADD = $(AM_LIBS)
 ntfsrm_LDFLAGS = $(AM_LFLAGS)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.19,1.20

From: Anton A. <an...@us...> - 2005-07-28 16:18:28

Changes by: antona

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

Modified Files:
	decrypt.c 
Log Message:
Use libgcrypt instead of openssl for desx_key_expand's MD5 hashing.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- decrypt.c	28 Jul 2005 15:14:40 -0000	1.19
+++ decrypt.c	28 Jul 2005 16:18:20 -0000	1.20
@@ -145,11 +145,6 @@ static int cryptoAPI_init_imports(void)
 }
 #endif /* defined(__CYGWIN__) */
 
-static void ntfs_desx_key_expand(const u8 *src, u32 *des_key,
-		u64 *out_whitening, u64 *in_whitening);
-static BOOL ntfs_desx_key_expand_test(void);
-static BOOL ntfs_des_test(void);
-
 ntfs_decrypt_user_key_session *ntfs_decrypt_user_key_session_open(void)
 {
 	ntfs_decrypt_user_key_session *session;
@@ -177,11 +172,6 @@ ntfs_decrypt_user_key_session *ntfs_decr
 	((NTFS_DECRYPT_USER_KEY_SESSION*)session)->hSystemStore = hSystemStore;
 #endif /* defined(__CYGWIN__) */
 	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
-	if (!ntfs_desx_key_expand_test() || !ntfs_des_test()) {
-		free(session);
-		errno = EINVAL;
-		return NULL;
-	}
 	return session;
 }
 
@@ -410,6 +400,8 @@ unsigned ntfs_decrypt_user_key_decrypt(n
 	return size - padding_length;
 }
 
+#if 0
+// This is the old code based on OpenSSL.  Please do not remove it.  AIA
 /**
  * ntfs_desx_key_expand - expand a 128-bit desx key to the needed 192-bit key
  * @src:	source buffer containing 128-bit key
@@ -444,6 +436,53 @@ static void ntfs_desx_key_expand(const u
 	*out_whitening = *(u64*)md;
 	*in_whitening = *(u64*)(md + 2);
 }
+#endif
+
+/**
+ * ntfs_desx_key_expand - expand a 128-bit desx key to the needed 192-bit key
+ * @src:	source buffer containing 128-bit key
+ *
+ * Expands the on-disk 128-bit desx key to the needed des key, the in-, and the
+ * out-whitening keys required to perform desx {de,en}cryption.
+ */
+static gcry_error_t ntfs_desx_key_expand(const u8 *src, u32 *des_key,
+		u64 *out_whitening, u64 *in_whitening)
+{
+	static const u8 *salt1 = "Dan Simon  ";
+	static const u8 *salt2 = "Scott Field";
+	static const int salt_len = 12;
+	gcry_md_hd_t hd1, hd2;
+	u32 *md;
+	gcry_error_t err;
+
+	err = gcry_md_open(&hd1, GCRY_MD_MD5, 0);
+	if (err != GPG_ERR_NO_ERROR) {
+		fprintf(stderr, "Failed to open MD5 digest.\n");
+		return err;
+	}
+	/* Hash the on-disk key. */
+	gcry_md_write(hd1, src, 128 / 8);
+	/* Copy the current hash for efficiency. */
+	err = gcry_md_copy(&hd2, hd1);
+	if (err != GPG_ERR_NO_ERROR) {
+		fprintf(stderr, "Failed to copy MD5 digest object.\n");
+		goto out;
+	}
+	/* Hash with the first salt and store the result. */
+	gcry_md_write(hd1, salt1, salt_len);
+	md = (u32*)gcry_md_read(hd1, 0);
+	des_key[0] = md[0] ^ md[1];
+	des_key[1] = md[2] ^ md[3];
+	/* Hash with the second salt and store the result. */
+	gcry_md_write(hd2, salt2, salt_len);
+	md = (u32*)gcry_md_read(hd2, 0);
+	*out_whitening = *(u64*)md;
+	*in_whitening = *(u64*)(md + 2);
+	gcry_md_close(hd2);
+out:
+	gcry_md_close(hd1);
+	return err;
+}
 
 /**
  * ntfs_desx_setkey - libgcrypt set_key implementation for DES-X-MS128
@@ -471,11 +510,17 @@ static gcry_err_code_t ntfs_desx_setkey(
 				err);
 		return err;
 	}
-	ntfs_desx_key_expand(key, (u32*)des_key, &ctx->out_whitening,
+	err = ntfs_desx_key_expand(key, (u32*)des_key, &ctx->out_whitening,
 			&ctx->in_whitening);
+	if (err != GPG_ERR_NO_ERROR) {
+		fprintf(stderr, "Failed to expand desx key (error 0x%x).\n",
+				err);
+		gcry_cipher_close(ctx->gcry_cipher_hd);
+		return err;
+	}
 	err = gcry_cipher_setkey(ctx->gcry_cipher_hd, des_key, sizeof(des_key));
 	if (err != GPG_ERR_NO_ERROR) {
-		fprintf(stderr, "Failed to set des key (error 0x%x.\n", err);
+		fprintf(stderr, "Failed to set des key (error 0x%x).\n", err);
 		gcry_cipher_close(ctx->gcry_cipher_hd);
 		return err;
 	}
@@ -513,7 +558,7 @@ static gcry_cipher_spec_t ntfs_desx_ciph
 	.decrypt = ntfs_desx_decrypt,
 };
 
-#define DO_CRYPTO_TESTS 1
+//#define DO_CRYPTO_TESTS 1
 
 #ifdef DO_CRYPTO_TESTS
 
@@ -538,13 +583,19 @@ static BOOL ntfs_desx_key_expand_test(vo
 		u64 u64;
 		u32 u32[2];
 	} test_des_key;
+	gcry_error_t err;
 	BOOL res;
 
-	ntfs_desx_key_expand(known_desx_on_disk_key, test_des_key.u32,
+	err = ntfs_desx_key_expand(known_desx_on_disk_key, test_des_key.u32,
 			&test_out_whitening, &test_in_whitening);
-	res = test_des_key.u64 == *(u64*)known_des_key &&
-			test_out_whitening == *(u64*)known_out_whitening &&
-			test_in_whitening == *(u64*)known_in_whitening;
+	if (err != GPG_ERR_NO_ERROR)
+		res = FALSE;
+	else
+		res = test_des_key.u64 == *(u64*)known_des_key &&
+				test_out_whitening ==
+				*(u64*)known_out_whitening &&
+				test_in_whitening ==
+				*(u64*)known_in_whitening;
 	fprintf(stderr, "Testing whether ntfs_desx_key_expand() works: %s\n",
 			res ? "SUCCESS" : "FAILED");
 	return res;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.18,1.19 ntfsdecrypt.c,1.7,1.8

From: Anton A. <an...@us...> - 2005-07-28 15:15:06

Changes by: antona

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

Modified Files:
	decrypt.c ntfsdecrypt.c 
Log Message:
Fix a core dump.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- decrypt.c	28 Jul 2005 11:27:31 -0000	1.18
+++ decrypt.c	28 Jul 2005 15:14:40 -0000	1.19
@@ -145,6 +145,11 @@ static int cryptoAPI_init_imports(void)
 }
 #endif /* defined(__CYGWIN__) */
 
+static void ntfs_desx_key_expand(const u8 *src, u32 *des_key,
+		u64 *out_whitening, u64 *in_whitening);
+static BOOL ntfs_desx_key_expand_test(void);
+static BOOL ntfs_des_test(void);
+
 ntfs_decrypt_user_key_session *ntfs_decrypt_user_key_session_open(void)
 {
 	ntfs_decrypt_user_key_session *session;
@@ -172,6 +177,11 @@ ntfs_decrypt_user_key_session *ntfs_decr
 	((NTFS_DECRYPT_USER_KEY_SESSION*)session)->hSystemStore = hSystemStore;
 #endif /* defined(__CYGWIN__) */
 	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	if (!ntfs_desx_key_expand_test() || !ntfs_des_test()) {
+		free(session);
+		errno = EINVAL;
+		return NULL;
+	}
 	return session;
 }
 
@@ -503,11 +513,12 @@ static gcry_cipher_spec_t ntfs_desx_ciph
 	.decrypt = ntfs_desx_decrypt,
 };
 
-//#define DO_CRYPTO_TESTS 1
+#define DO_CRYPTO_TESTS 1
 
 #ifdef DO_CRYPTO_TESTS
+
 /* Do not remove this test code from this file! AIA */
-static BOOL desx_key_expand_test(void)
+static BOOL ntfs_desx_key_expand_test(void)
 {
 	const u8 known_desx_on_disk_key[16] = {
 		0xa1, 0xf9, 0xe0, 0xb2, 0x53, 0x23, 0x9e, 0x8f,
@@ -522,14 +533,18 @@ static BOOL desx_key_expand_test(void)
 	const u8 known_in_whitening[8] = {
 		0x75, 0xf6, 0xa0, 0x1a, 0xc0, 0xca, 0x28, 0x1e
 	};
-	u64 test_des_key, test_out_whitening, test_in_whitening;
+	u64 test_out_whitening, test_in_whitening;
+	union {
+		u64 u64;
+		u32 u32[2];
+	} test_des_key;
 	BOOL res;
 
-	desx_key_expand(known_desx_on_disk_key, (u32*)test_des_key,
-			(u64*)test_out_whitening, (u64*)test_in_whitening);
-	res = test_des_key != *(u64*)known_des_key ||
-			test_out_whitening != *(u64*)known_out_whitening ||
-			test_in_whitening != *(u64*)known_in_whitening;
+	ntfs_desx_key_expand(known_desx_on_disk_key, test_des_key.u32,
+			&test_out_whitening, &test_in_whitening);
+	res = test_des_key.u64 == *(u64*)known_des_key &&
+			test_out_whitening == *(u64*)known_out_whitening &&
+			test_in_whitening == *(u64*)known_in_whitening;
 	fprintf(stderr, "Testing whether ntfs_desx_key_expand() works: %s\n",
 			res ? "SUCCESS" : "FAILED");
 	return res;
@@ -586,12 +601,12 @@ static BOOL ntfs_des_test(void)
 
 #else /* !defined(DO_CRYPTO_TESTS) */
 
-static inline BOOL desx_key_expand_test(void)
+static inline BOOL ntfs_desx_key_expand_test(void)
 {
 	return TRUE;
 }
 
-static inline BOOL des_test(void)
+static inline BOOL ntfs_des_test(void)
 {
 	return TRUE;
 }
@@ -623,7 +638,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 	case CALG_DESX:
 		/* FIXME: This really needs locking so it is safe from races. */
 		if (!ntfs_desx_module_count++) {
-			if (!desx_key_expand_test() || !des_test()) {
+			if (!ntfs_desx_key_expand_test() || !ntfs_des_test()) {
 				errno = EINVAL;
 				return NULL;
 			}
@@ -713,10 +728,12 @@ unsigned ntfs_decrypt_data_key_decrypt_s
 	err = gcry_cipher_reset(dkey->gcry_cipher_hd);
 	if (err != GPG_ERR_NO_ERROR)
 		fprintf(stderr, "Failed to reset cipher (error 0x%x).\n", err);
-	// FIXME: Why are we not calling gcry_cipher_setiv() here instead of
-	// doing it by hand after the decryption?
-	// It wants iv length 8 but we give it 16 for AES256 so it does not
-	// like it...
+	/*
+	 * Note: You may wonder why are we not calling gcry_cipher_setiv() here
+	 * instead of doing it by hand after the decryption.  The answer is
+	 * that gcry_cipher_setiv() wants an iv of length 8 bytes but we give
+	 * it a length of 16 for AES256 so it does not like it.
+	 */
 	if ((err = gcry_cipher_decrypt(dkey->gcry_cipher_hd, data, 512, NULL,
 			0)))
 		fprintf(stderr, "Decryption failed (error 0x%x).\n", err);

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ntfsdecrypt.c	28 Jul 2005 10:36:32 -0000	1.7
+++ ntfsdecrypt.c	28 Jul 2005 15:14:55 -0000	1.8
@@ -274,30 +274,30 @@ static int cat_decrypt(ntfs_inode *inode
 
 static ntfs_decrypt_data_key *get_fek_from_df_array(
 		ntfs_decrypt_user_key_session *session,
-		EFS_DF_ARRAY_HEADER *efs_df_array)
+		EFS_DF_ARRAY_HEADER *df_array)
 {
-	u32 ddf_count, hash_size, fek_size;
-	EFS_DF_CREDENTIAL_HEADER *efs_df_cred;
-	EFS_DF_CERTIFICATE_HEADER *efs_df_cert;
-	EFS_DF_HEADER *efs_df_header;
+	u32 df_count, hash_size, fek_size;
+	EFS_DF_CREDENTIAL_HEADER *df_cred;
+	EFS_DF_CERTIFICATE_HEADER *df_cert;
+	EFS_DF_HEADER *df_header;
 	ntfs_decrypt_user_key *key;
 	u8 *hash_data, *fek_buf;
 	unsigned i;
 
-	efs_df_header = (EFS_DF_HEADER*)(efs_df_array + 1);
-	ddf_count = le32_to_cpu(efs_df_array->df_count);
-	for (i = 0; i < ddf_count; i++) {
-		//Eprintf("ddf #%u.\n", i);
-		efs_df_cred = (EFS_DF_CREDENTIAL_HEADER*)((u8*)efs_df_header +
-				le32_to_cpu(efs_df_header->cred_header_offset));
-		efs_df_cert = (EFS_DF_CERTIFICATE_HEADER*)((u8*)efs_df_cred +
-				le32_to_cpu(efs_df_cred->cert_header_offset));
-		hash_size = le32_to_cpu(efs_df_cert->thumbprint_size);
-		hash_data = (u8*)efs_df_cert +
-				le32_to_cpu(efs_df_cert->thumbprint_offset);
-		fek_size = le32_to_cpu(efs_df_header->fek_size);
-		fek_buf = (u8*)efs_df_header +
-				le32_to_cpu(efs_df_header->fek_offset);
+	df_header = (EFS_DF_HEADER*)(df_array + 1);
+	df_count = le32_to_cpu(df_array->df_count);
+	//Eprintf("df_count 0x%x\n", df_count);
+	for (i = 0; i < df_count; i++) {
+		//Eprintf("ddf 0x%x\n", i);
+		df_cred = (EFS_DF_CREDENTIAL_HEADER*)((u8*)df_header +
+				le32_to_cpu(df_header->cred_header_offset));
+		df_cert = (EFS_DF_CERTIFICATE_HEADER*)((u8*)df_cred +
+				le32_to_cpu(df_cred->cert_header_offset));
+		hash_size = le32_to_cpu(df_cert->thumbprint_size);
+		hash_data = (u8*)df_cert +
+				le32_to_cpu(df_cert->thumbprint_offset);
+		fek_size = le32_to_cpu(df_header->fek_size);
+		fek_buf = (u8*)df_header + le32_to_cpu(df_header->fek_offset);
 		if ((key = ntfs_decrypt_user_key_open(session, hash_data,
 				hash_size))) {
 			fek_size = ntfs_decrypt_user_key_decrypt(key, fek_buf,
@@ -309,8 +309,8 @@ static ntfs_decrypt_data_key *get_fek_fr
 			fprintf(stderr, "Failed to decrypt the FEK.\n");
 		} else
 			perror("Failed to open user key");
-		efs_df_header = (EFS_DF_HEADER*)((u8*)efs_df_header +
-				le32_to_cpu(efs_df_header->df_length));
+		df_header = (EFS_DF_HEADER*)((u8*)df_header +
+				le32_to_cpu(df_header->df_length));
 	}
 	return NULL;
 }
@@ -357,10 +357,13 @@ static ntfs_decrypt_data_key *get_fek(nt
 	}
 	/* Iterate through the DDFs & DRFs until we obtain a key. */
 	efs_attr = (EFS_ATTR_HEADER*)efs_buffer;
-	efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer +
+	fek = NULL;
+	if (efs_attr->offset_to_ddf_array) {
+		efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer +
 				le32_to_cpu(efs_attr->offset_to_ddf_array));
-	fek = get_fek_from_df_array(session, efs_df_array);
-	if (!fek) {
+		fek = get_fek_from_df_array(session, efs_df_array);
+	}
+	if (!fek && efs_attr->offset_to_drf_array) {
 		efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer +
 				le32_to_cpu(efs_attr->offset_to_drf_array));
 		fek = get_fek_from_df_array(session, efs_df_array);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.17,1.18

From: Anton A. <an...@us...> - 2005-07-28 11:27:42

Changes by: antona

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

Modified Files:
	decrypt.c 
Log Message:
Use double indirection in case libgcrypt clones the key for you hack for
closing the des cipher.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- decrypt.c	28 Jul 2005 10:36:32 -0000	1.17
+++ decrypt.c	28 Jul 2005 11:27:31 -0000	1.18
@@ -473,7 +473,8 @@ static gcry_err_code_t ntfs_desx_setkey(
 	 * Take a note of the ctx->gcry_cipher_hd since we need to close it at
 	 * ntfs_decrypt_data_key_close() time.
 	 */
-	*(gcry_cipher_hd_t*)(key + ((keylen + 7) & ~7)) = ctx->gcry_cipher_hd;
+	**(gcry_cipher_hd_t***)(key + ((keylen + 7) & ~7)) =
+			&ctx->gcry_cipher_hd;
 	return GPG_ERR_NO_ERROR;
 }
 
@@ -614,9 +615,9 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 	key->alg_id = *(u32*)(data + 8);
 	key->key_data = (u8*)key + ((sizeof(*key) + 7) & ~7);
 	memcpy(key->key_data, data + 16, key_size);
-	key->des_gcry_cipher_hd_ptr = (gcry_cipher_hd_t*)(key->key_data +
-			((key_size + 7) & ~7));
-	*key->des_gcry_cipher_hd_ptr = NULL;
+	key->des_gcry_cipher_hd_ptr = NULL;
+	*(gcry_cipher_hd_t***)(key->key_data + ((key_size + 7) & ~7)) =
+			&key->des_gcry_cipher_hd_ptr;
 	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 	switch (key->alg_id) {
 	case CALG_DESX:
@@ -691,7 +692,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 void ntfs_decrypt_data_key_close(ntfs_decrypt_data_key *key)
 {
 	NTFS_DECRYPT_DATA_KEY *dkey = (NTFS_DECRYPT_DATA_KEY*)key;
-	if (*dkey->des_gcry_cipher_hd_ptr)
+	if (dkey->des_gcry_cipher_hd_ptr)
 		gcry_cipher_close(*dkey->des_gcry_cipher_hd_ptr);
 	gcry_cipher_close(dkey->gcry_cipher_hd);
 	free(key);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.16,1.17 ntfsdecrypt.c,1.6,1.7

From: Anton A. <an...@us...> - 2005-07-28 10:36:41

Changes by: antona

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

Modified Files:
	decrypt.c ntfsdecrypt.c 
Log Message:
Add EFS structure definitions to layout.h and adapt ntfsdecrypt for it.
More fixes/cleanups to decrypt.c.
This was all Yuval's work but I did some renaming afterwards and some
whitespace cleanups.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- decrypt.c	27 Jul 2005 21:33:00 -0000	1.16
+++ decrypt.c	28 Jul 2005 10:36:32 -0000	1.17
@@ -161,8 +161,7 @@ ntfs_decrypt_user_key_session *ntfs_decr
 		return NULL;
 	}
 	if (!(hSystemStore = fnCertOpenStore(((LPCSTR)CERT_STORE_PROV_SYSTEM),
-			0, (HCRYPTPROV)NULL, CERT_SYSTEM_STORE_CURRENT_USER,
-			L"MY"))) {
+			0, 0, CERT_SYSTEM_STORE_CURRENT_USER, L"MY"))) {
 		fprintf(stderr, "Could not open system store.\n");
 		errno = EINVAL;
 		return NULL;
@@ -195,6 +194,13 @@ void ntfs_decrypt_user_key_session_close
 	free(session);
 }
 
+/**
+ * reverse_buffer -
+ *
+ * This is a utility function for reversing the order of a buffer in place.
+ * Users of this function should be very careful not to sweep byte order
+ * problems under the rug.
+ */
 static inline void reverse_buffer(unsigned char *buf, unsigned buf_size)
 {
 	unsigned char t;
@@ -256,14 +262,14 @@ ntfs_decrypt_user_key *ntfs_decrypt_user
 			&key_size)) {
 		fprintf(stderr, "Could not export key: Error 0x%x\n",
 				(unsigned)GetLastError());
-		errno = -1;
+		errno = EINVAL;
 		return NULL;
 	}
 	CryptDestroyKey(hCryptKey);
 	rsa_pub_key = (RSAPUBKEY*)(key_blob + sizeof(PUBLICKEYSTRUC));
 	if ((err = gcry_ac_open(&gcry_handle, GCRY_AC_RSA, 0))) {
 		fprintf(stderr, "Could not init gcrypt handle\n");
-		errno = -1;
+		errno = EINVAL;
 		return NULL;
 	}
 	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
@@ -302,8 +308,8 @@ ntfs_decrypt_user_key *ntfs_decrypt_user
 		errno = EINVAL;
 		return NULL;
 	}
-	if ((key = (ntfs_decrypt_user_key*)malloc(
-			sizeof(NTFS_DECRYPT_USER_KEY))))
+	if ((key = (ntfs_decrypt_user_key*)
+			malloc(sizeof(NTFS_DECRYPT_USER_KEY))))
 		((NTFS_DECRYPT_USER_KEY*)key)->sexp_key = sexp_key;
 	// todo: release all
 	return key;
@@ -312,8 +318,10 @@ decrypt_key_open_err: 
 		CryptDestroyKey(hCryptKey);
 	if (pCert)
 		fnCertFreeCertificateContext(pCert);
-#endif /* defined(__CYGWIN__) */
+	errno = EINVAL;
+#else /* !defined(__CYGWIN__) */
 	errno = ENOTSUP;
+#endif /* !defined(__CYGWIN__) */
 	return NULL;
 }
 
@@ -427,6 +435,14 @@ static void ntfs_desx_key_expand(const u
 	*in_whitening = *(u64*)(md + 2);
 }
 
+/**
+ * ntfs_desx_setkey - libgcrypt set_key implementation for DES-X-MS128
+ * @context:	pointer to a variable of type ntfs_desx_ctx
+ * @key:	the 128 bit DES-X-MS128 key, concated with the DES handle
+ * @keylen:	must always be 16
+ * 
+ * This is the libgcrypt set_key implementation for DES-X-MS128.
+ */
 static gcry_err_code_t ntfs_desx_setkey(void *context, const u8 *key,
 		unsigned keylen)
 {
@@ -606,8 +622,6 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 	case CALG_DESX:
 		/* FIXME: This really needs locking so it is safe from races. */
 		if (!ntfs_desx_module_count++) {
-			gcry_error_t err;
-
 			if (!desx_key_expand_test() || !des_test()) {
 				errno = EINVAL;
 				return NULL;

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ntfsdecrypt.c	27 Jul 2005 15:55:42 -0000	1.6
+++ ntfsdecrypt.c	28 Jul 2005 10:36:32 -0000	1.7
@@ -272,17 +272,60 @@ static int cat_decrypt(ntfs_inode *inode
 	return 0;
 }
 
+static ntfs_decrypt_data_key *get_fek_from_df_array(
+		ntfs_decrypt_user_key_session *session,
+		EFS_DF_ARRAY_HEADER *efs_df_array)
+{
+	u32 ddf_count, hash_size, fek_size;
+	EFS_DF_CREDENTIAL_HEADER *efs_df_cred;
+	EFS_DF_CERTIFICATE_HEADER *efs_df_cert;
+	EFS_DF_HEADER *efs_df_header;
+	ntfs_decrypt_user_key *key;
+	u8 *hash_data, *fek_buf;
+	unsigned i;
+
+	efs_df_header = (EFS_DF_HEADER*)(efs_df_array + 1);
+	ddf_count = le32_to_cpu(efs_df_array->df_count);
+	for (i = 0; i < ddf_count; i++) {
+		//Eprintf("ddf #%u.\n", i);
+		efs_df_cred = (EFS_DF_CREDENTIAL_HEADER*)((u8*)efs_df_header +
+				le32_to_cpu(efs_df_header->cred_header_offset));
+		efs_df_cert = (EFS_DF_CERTIFICATE_HEADER*)((u8*)efs_df_cred +
+				le32_to_cpu(efs_df_cred->cert_header_offset));
+		hash_size = le32_to_cpu(efs_df_cert->thumbprint_size);
+		hash_data = (u8*)efs_df_cert +
+				le32_to_cpu(efs_df_cert->thumbprint_offset);
+		fek_size = le32_to_cpu(efs_df_header->fek_size);
+		fek_buf = (u8*)efs_df_header +
+				le32_to_cpu(efs_df_header->fek_offset);
+		if ((key = ntfs_decrypt_user_key_open(session, hash_data,
+				hash_size))) {
+			fek_size = ntfs_decrypt_user_key_decrypt(key, fek_buf,
+					fek_size);
+			ntfs_decrypt_user_key_close(key);
+			if (fek_size)
+				return ntfs_decrypt_data_key_open(fek_buf,
+						fek_size);
+			fprintf(stderr, "Failed to decrypt the FEK.\n");
+		} else
+			perror("Failed to open user key");
+		efs_df_header = (EFS_DF_HEADER*)((u8*)efs_df_header +
+				le32_to_cpu(efs_df_header->df_length));
+	}
+	return NULL;
+}
+
 /**
  * get_fek
  */
 static ntfs_decrypt_data_key *get_fek(ntfs_inode *inode)
 {
-	ntfs_attr *na;
-	unsigned char *efs_buffer, *ddf, *certificate, *hash_data, *fek_buf;
-	u32 ddf_count, hash_size, fek_size;
-	unsigned i;
 	ntfs_decrypt_user_key_session *session;
-	ntfs_decrypt_user_key *key;
+	EFS_DF_ARRAY_HEADER *efs_df_array;
+	ntfs_decrypt_data_key *fek;
+	EFS_ATTR_HEADER *efs_attr;
+	u8 *efs_buffer;
+	ntfs_attr *na;
 
 	/* Obtain the $EFS contents. */
 	na = ntfs_attr_open(inode, AT_LOGGED_UTILITY_STREAM,
@@ -313,44 +356,19 @@ static ntfs_decrypt_data_key *get_fek(nt
 		return NULL;
 	}
 	/* Iterate through the DDFs & DRFs until we obtain a key. */
-	ddf = efs_buffer + le32_to_cpu(*(u32*)(efs_buffer + 0x40));
-	ddf_count = le32_to_cpu(*(u32*)ddf);
-
-	ddf = ddf + 0x04;
-	for (i = 0; i < ddf_count; i++) {
-		//Eprintf("ddf #%u.\n", i);
-		if (*(u32*)(ddf + 0x18))
-			certificate = (ddf + 0x30 +
-					le32_to_cpu(*(u32*)(ddf + 0x18)));
-		else
-			certificate = (ddf + 0x30);
-		hash_size = (unsigned)le32_to_cpu(*(u32*)certificate);
-		hash_data = certificate + (unsigned)
-				le32_to_cpu(*(u32*)(certificate + 0x04));
-		fek_size = (unsigned)le32_to_cpu(*(u32*)(ddf + 0x08));
-		fek_buf = ddf + (unsigned)le32_to_cpu(*(u32*)(ddf + 0x0c));
-		if ((key = ntfs_decrypt_user_key_open(session, hash_data,
-				hash_size))) {
-			fek_size = ntfs_decrypt_user_key_decrypt(key, fek_buf,
-					fek_size);
-			ntfs_decrypt_user_key_close(key);
-			if (fek_size) {
-				ntfs_decrypt_data_key *fek;
-
-				ntfs_decrypt_user_key_session_close(session);
-				fek = ntfs_decrypt_data_key_open(fek_buf,
-						fek_size);
-				free(efs_buffer);
-				return fek;
-			}
-			fprintf(stderr, "Failed to decrypt the FEK.\n");
-		} else
-			perror("Failed to open user key");
-		ddf = ddf + le32_to_cpu(*(u32*)(ddf + 0x08)) +
-				le32_to_cpu(*(u32*)(ddf + 0x0c));
+	efs_attr = (EFS_ATTR_HEADER*)efs_buffer;
+	efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer +
+				le32_to_cpu(efs_attr->offset_to_ddf_array));
+	fek = get_fek_from_df_array(session, efs_df_array);
+	if (!fek) {
+		efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer +
+				le32_to_cpu(efs_attr->offset_to_drf_array));
+		fek = get_fek_from_df_array(session, efs_df_array);
 	}
+	/* Close all and return. */
 	ntfs_decrypt_user_key_session_close(session);
-	return NULL;
+	free(efs_buffer);
+	return fek;
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.19,1.20 layout.h,1.23,1.24

From: Anton A. <an...@us...> - 2005-07-28 10:36:40

Changes by: antona

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

Modified Files:
	attrib.h layout.h 
Log Message:
Add EFS structure definitions to layout.h and adapt ntfsdecrypt for it.
More fixes/cleanups to decrypt.c.
This was all Yuval's work but I did some renaming afterwards and some
whitespace cleanups.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- attrib.h	6 Jul 2005 22:47:01 -0000	1.19
+++ attrib.h	28 Jul 2005 10:36:31 -0000	1.20
@@ -251,7 +251,7 @@ typedef union {
 	EA_ATTR ea;
 	PROPERTY_SET property_set;
 	LOGGED_UTILITY_STREAM logged_util_stream;
-	EFS_ATTR efs;
+	EFS_ATTR_HEADER efs;
 } attr_val;
 
 extern void ntfs_attr_init(ntfs_attr *na, const BOOL non_resident,

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- layout.h	25 Jul 2005 22:05:27 -0000	1.23
+++ layout.h	28 Jul 2005 10:36:32 -0000	1.24
@@ -1,8 +1,9 @@
 /*
  * layout.h - Ntfs on-disk layout structures.  Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c) 2000-2005 Anton Altaparmakov
  * Copyright (c)      2005 Yura Pakhuchiy
+ * Copyright (c)      2005 Yuval Fledel
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -2354,14 +2355,97 @@ typedef struct {
  * Operations on this attribute are logged to the journal ($LogFile) like
  * normal metadata changes.
  *
- * Used by the Encrypting File System (EFS). All encrypted files have this
- * attribute with the name $EFS.
+ * Used by the Encrypting File System (EFS).  All encrypted files have this
+ * attribute with the name $EFS.  See below for the relevant structures.
  */
 typedef struct {
 	/* Can be anything the creator chooses. */
-	/* EFS uses it as follows: */
-	// FIXME: Type this info, verifying it along the way. (AIA)
-} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
+} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM;
 
-#endif /* defined _NTFS_LAYOUT_H */
+/*
+ * $EFS Data Structure:
+ *
+ * The following information is about the data structures that are contained
+ * inside a logged utility stream (0x100) with a name of "$EFS".
+ *
+ * The stream starts with an instance of EFS_ATTR_HEADER.
+ *
+ * Next, at offsets offset_to_ddf_array and offset_to_drf_array (unless any of
+ * them is 0) there is a EFS_DF_ARRAY_HEADER immediately followed by a sequence
+ * of multiple data decryption/recovery fields.
+ *
+ * Each data decryption/recovery field starts with a EFS_DF_HEADER and the next
+ * one (if it exists) can be found by adding EFS_DF_HEADER->df_length bytes to
+ * the offset of the beginning of the current EFS_DF_HEADER.
+ *
+ * The data decryption/recovery field contains an EFS_DF_CERTIFICATE_HEADER, a
+ * SID, an optional GUID, an optional container name, a non-optional user name,
+ * and the encrypted FEK.
+ *
+ * Note all the below are best guesses so may have mistakes/inaccuracies.
+ * Corrections/clarifications/additions are always welcome!
+ */
+
+/* The header of the 0x100 attribute named "$EFS". */
+typedef struct {
+/*  0*/	u32 efs_length;		/* Length of attribute in bytes. */
+	u32 unknown1;		/* always 0? */
+	u32 unknown2;		/* number of DDFs? */
+	u32 unknown3;		/* number of DRFs? */
+/* 16*/	u8 unknown4[16];	/* MD5 hash related to DDFs? */
+/* 32*/	u8 unknown5[16];	/* MD5 hash related to DRFs? */
+/* 48*/	u8 unknown6[16];	/* always 0? */
+/* 64*/	u32 offset_to_ddf_array;/* Offset in bytes to the array of data
+				   decryption fields (DDF), see below.  Zero if
+				   no DDFs are present. */
+	u32 offset_to_drf_array;/* Offset in bytes to the array of data
+				   recovery fields (DRF), see below.  Zero if
+				   no DRFs are present. */
+} __attribute__ ((__packed__)) EFS_ATTR_HEADER;
+
+typedef struct {
+	u32 df_count;		/* Number of data decryption/recovery fields in
+				   the array. */
+} __attribute__ ((__packed__)) EFS_DF_ARRAY_HEADER;
+
+typedef struct {
+/*  0*/	u32 df_length;		/* Length of this data decryption/recovery
+				   field in bytes. */
+	u32 cred_header_offset;	/* Offset in bytes to the credential header. */
+	u32 fek_size;		/* Size in bytes of the encrypted file
+				   encryption key (FEK). */
+	u32 fek_offset;		/* Offset in bytes to the FEK from the start of
+				   the data decryption/recovery field. */
+/* 16*/	u32 unknown1;		/* always 0? */
+} __attribute__ ((__packed__)) EFS_DF_HEADER;
+
+typedef struct {
+/*  0*/	u32 cred_length;	/* Length of this credential in bytes. */
+	u32 sid_offset;		/* Offset in bytes to the user's sid from start
+				   of this structure. */
+	u32 cred_version;	/* always 3? */
+	u32 cert_header_size;	/* Size in bytes of the certificate header. */
+/* 16*/	u32 cert_header_offset;	/* Offset in bytes to the certificate header
+				   from start of this structure. */
+	u32 unknown1;		/* always 0? */
+	u32 unknown2;		/* always 0? */
+} __attribute__ ((__packed__)) EFS_DF_CREDENTIAL_HEADER;
+
+typedef EFS_DF_CREDENTIAL_HEADER EFS_DF_CRED_HEADER;
+
+typedef struct {
+/*  0*/	u32 thumbprint_offset;		/* Offset in bytes to the thumbprint. */
+	u32 thumbprint_size;		/* Size of thumbprint in bytes. */
+/*  8*/	u32 guid_offset;		/* Offset in bytes to GUID from start
+					   if this structure or 0 if no GUID
+					   present. */
+	u32 container_name_offset;	/* Offset in bytes to the name of the
+					   container from start of this
+					   structure or 0 if no name present. */
+/* 16*/	u32 user_name_offset;		/* Offset in bytes to the user name
+					   from start of this structure. */
+} __attribute__ ((__packed__)) EFS_DF_CERTIFICATE_HEADER;
 
+typedef EFS_DF_CERTIFICATE_HEADER EFS_DF_CERT_HEADER;
+	
+#endif /* defined _NTFS_LAYOUT_H */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.15,1.16

From: Anton A. <an...@us...> - 2005-07-27 21:33:08

Changes by: antona

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

Modified Files:
	decrypt.c 
Log Message:
Fix some stupid mistakes from the cleanup.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- decrypt.c	27 Jul 2005 18:17:31 -0000	1.15
+++ decrypt.c	27 Jul 2005 21:33:00 -0000	1.16
@@ -172,6 +172,7 @@ ntfs_decrypt_user_key_session *ntfs_decr
 #ifdef __CYGWIN__
 	((NTFS_DECRYPT_USER_KEY_SESSION*)session)->hSystemStore = hSystemStore;
 #endif /* defined(__CYGWIN__) */
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 	return session;
 }
 
@@ -265,6 +266,7 @@ ntfs_decrypt_user_key *ntfs_decrypt_user
 		errno = -1;
 		return NULL;
 	}
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 	e = gcry_mpi_set_ui(NULL, rsa_pub_key->pubexp);
 	mpi_data = (key_blob + 0x14);
 	size = rsa_pub_key->bitlen / 8;
@@ -464,6 +466,10 @@ static void ntfs_desx_decrypt(void *cont
 	ntfs_desx_ctx *ctx = context;
 	gcry_error_t err;
 
+	err = gcry_cipher_reset(ctx->gcry_cipher_hd);
+	if (err != GPG_ERR_NO_ERROR)
+		fprintf(stderr, "Failed to reset des cipher (error 0x%x).\n",
+				err);
 	*(u64*)outbuf = *(const u64*)inbuf ^ ctx->out_whitening;
 	err = gcry_cipher_encrypt(ctx->gcry_cipher_hd, outbuf, 8, NULL, 0);
 	if (err != GPG_ERR_NO_ERROR)
@@ -595,6 +601,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 	key->des_gcry_cipher_hd_ptr = (gcry_cipher_hd_t*)(key->key_data +
 			((key_size + 7) & ~7));
 	*key->des_gcry_cipher_hd_ptr = NULL;
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 	switch (key->alg_id) {
 	case CALG_DESX:
 		/* FIXME: This really needs locking so it is safe from races. */
@@ -614,7 +621,6 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 				errno = EINVAL;
 				return NULL;
 			}
-			gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 		}
 		wanted_key_size = 16;
 		gcry_algo = ntfs_desx_algorithm_id;
@@ -689,13 +695,16 @@ unsigned ntfs_decrypt_data_key_decrypt_s
 	NTFS_DECRYPT_DATA_KEY *dkey = (NTFS_DECRYPT_DATA_KEY*)key;
 	gcry_error_t err;
 
+	err = gcry_cipher_reset(dkey->gcry_cipher_hd);
+	if (err != GPG_ERR_NO_ERROR)
+		fprintf(stderr, "Failed to reset cipher (error 0x%x).\n", err);
 	// FIXME: Why are we not calling gcry_cipher_setiv() here instead of
 	// doing it by hand after the decryption?
 	// It wants iv length 8 but we give it 16 for AES256 so it does not
 	// like it...
 	if ((err = gcry_cipher_decrypt(dkey->gcry_cipher_hd, data, 512, NULL,
 			0)))
-		fprintf(stderr, "sector_decrypt: error is %u.\n", err);
+		fprintf(stderr, "Decryption failed (error 0x%x).\n", err);
 	/* Apply the IV. */
 	if (dkey->alg_id == CALG_AES_256) {
 		((u64*)data)[0] ^= 0x5816657be9161312LL + offset;

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 46 47 48 49 50 .. 124 > >> (Page 48 of 124)

2001	Jan (38)	Feb (25)	Mar (37)	Apr (50)	May	Jun (156)	Jul (174)	Aug (94)	Sep (107)	Oct (18)	Nov (153)	Dec (91)
2002	Jan (79)	Feb (117)	Mar (39)	Apr (164)	May (12)	Jun (64)	Jul (138)	Aug (43)	Sep	Oct	Nov	Dec
2005	Jan	Feb	Mar	Apr (1)	May (17)	Jun (100)	Jul (210)	Aug (127)	Sep (89)	Oct (214)	Nov (176)	Dec (20)
2006	Jan (29)	Feb (85)	Mar (45)	Apr (54)	May (9)	Jun (7)	Jul (28)	Aug (65)	Sep (3)	Oct (62)	Nov (68)	Dec (52)
2007	Jan (6)	Feb	Mar (8)	Apr	May	Jun (2)	Jul (4)	Aug	Sep	Oct (2)	Nov	Dec