[Pkg-loop-aes-commits] r1456 - in /trunk/loop-aes-utils: ./ debian/changelog debian/patches/00list debian/patches/20loop-AES.dpatch debian/patches/30_automake.dpatch
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Wed Sep 5 21:28:35 UTC 2007
Author: xam
Date: Wed Sep 5 21:28:34 2007
New Revision: 1456
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1456
Log:
* Update loop-AES patch to upstream 2.13
Removed:
trunk/loop-aes-utils/debian/patches/30_automake.dpatch
Modified:
trunk/loop-aes-utils/ (props changed)
trunk/loop-aes-utils/debian/changelog
trunk/loop-aes-utils/debian/patches/00list
trunk/loop-aes-utils/debian/patches/20loop-AES.dpatch
Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Sep 5 21:28:34 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11146
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11147
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338
Modified: trunk/loop-aes-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1456&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Wed Sep 5 21:28:34 2007
@@ -1,6 +1,7 @@
loop-aes-utils (2.13-1) UNRELEASED; urgency=low
* New upstream release
+ * Update loop-AES patch to upstream 2.13
-- Max Vozeler <xam at debian.org> Wed, 05 Sep 2007 23:15:31 +0200
Modified: trunk/loop-aes-utils/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/00list?rev=1456&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/00list (original)
+++ trunk/loop-aes-utils/debian/patches/00list Wed Sep 5 21:28:34 2007
@@ -1,2 +1,1 @@
20loop-AES
-30_automake
Modified: trunk/loop-aes-utils/debian/patches/20loop-AES.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/20loop-AES.dpatch?rev=1456&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/20loop-AES.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/20loop-AES.dpatch Wed Sep 5 21:28:34 2007
@@ -7,35 +7,457 @@
## DP: util-linux-ng 2.13-pre3 by Max Vozeler.
@DPATCH@
-diff --git a/mount/Makefile.am b/mount/Makefile.am
-index f40bdd7..2688a6b 100644
---- a/mount/Makefile.am
-+++ b/mount/Makefile.am
-@@ -13,6 +13,7 @@ headers_common = fstab.h linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h
+If this patch does not apply cleanly to newer version of util-linux-ng, try
+replacing original lomount.c lomount.h loop.h losetup.8 files in mount
+subdirectory with versions from util-linux-ng that the patch is for. And
+then apply this patch.
+
+mount/Makefile.in is a generated file. You can ignore patch failures on that
+file if you generate it again by running the ./autogen.sh script. That
+./autogen.sh script needs recent versions of autohell tools.
+
+diff -urN util-linux-ng-2.13/mount/Makefile.am util-linux-ng-2.13-AES/mount/Makefile.am
+--- util-linux-ng-2.13/mount/Makefile.am 2007-05-23 01:05:21.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/Makefile.am 2007-09-02 18:05:41.000000000 +0300
+@@ -12,20 +12,20 @@
+ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
getusername.h loop.h sundries.h
- mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
-+ loumount.c loop.c sha512.c rmd160.c aes.c \
+-mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
++mount_common = fstab.c mount_mntent.c getusername.c \
$(utils_common) $(headers_common) ../lib/env.c
- mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
-@@ -23,9 +24,9 @@ umount_SOURCES = umount.c $(mount_common)
+-mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
++mount_SOURCES = mount.c lomount.c loumount.c loop.c sha512.c rmd160.c aes.c $(mount_common) ../lib/setproctitle.c
+ mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
+ mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+
+-umount_SOURCES = umount.c $(mount_common)
++umount_SOURCES = umount.c loumount.c $(mount_common)
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
-+swapon_SOURCES = swapon.c swap_constants.h $(utils_common) loop.c sha512.c
++swapon_SOURCES = swapon.c loop.c sha512.c swap_constants.h $(utils_common)
-losetup_SOURCES = lomount.c loop.h lomount.h
-+losetup_SOURCES = lomount.c loop.h lomount.h loumount.c loop.c sha512.c rmd160.c aes.c
++losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c loop.h lomount.h
losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
mount_LDADD = $(LDADD_common)
-diff --git a/mount/aes.c b/mount/aes.c
-new file mode 100644
-index 0000000..c81099a
---- /dev/null
-+++ b/mount/aes.c
+diff -urN util-linux-ng-2.13/mount/Makefile.in util-linux-ng-2.13-AES/mount/Makefile.in
+--- util-linux-ng-2.13/mount/Makefile.in 2007-08-28 01:42:17.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/Makefile.in 2007-09-02 18:05:41.000000000 +0300
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -15,6 +15,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(losetup_SOURCES) $(mount_SOURCES) $(mtab_lock_test_SOURCES) pivot_root.c $(swapon_SOURCES) $(umount_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,15 +69,19 @@
+ @HAVE_PIVOT_ROOT_TRUE at am__EXEEXT_1 = pivot_root$(EXEEXT)
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+-am_losetup_OBJECTS = losetup-lomount.$(OBJEXT)
++am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) \
++ losetup-loumount.$(OBJEXT) losetup-loop.$(OBJEXT) \
++ losetup-sha512.$(OBJEXT) losetup-rmd160.$(OBJEXT) \
++ losetup-aes.$(OBJEXT)
+ losetup_OBJECTS = $(am_losetup_OBJECTS)
+ losetup_LDADD = $(LDADD)
+-am__mount_SOURCES_DIST = mount.c fstab.c mount_mntent.c getusername.c \
+- lomount.c sundries.c xmalloc.c realpath.c fsprobe.c \
+- fsprobe_blkid.c fsprobe_volumeid.c fstab.h linux_fs.h \
+- mount_mntent.h mount_constants.h my_dev_t.h mount_paths.h \
+- lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \
+- sundries.h ../lib/env.c ../lib/setproctitle.c
++am__mount_SOURCES_DIST = mount.c lomount.c loumount.c loop.c sha512.c \
++ rmd160.c aes.c fstab.c mount_mntent.c getusername.c sundries.c \
++ xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \
++ fsprobe_volumeid.c fstab.h linux_fs.h mount_mntent.h \
++ mount_constants.h my_dev_t.h mount_paths.h lomount.h fsprobe.h \
++ realpath.h xmalloc.h getusername.h loop.h sundries.h \
++ ../lib/env.c ../lib/setproctitle.c
+ @HAVE_BLKID_TRUE at am__objects_1 = mount-fsprobe_blkid.$(OBJEXT)
+ @HAVE_VOLUME_ID_TRUE at am__objects_2 = mount-fsprobe_volumeid.$(OBJEXT)
+ am__objects_3 = mount-sundries.$(OBJEXT) mount-xmalloc.$(OBJEXT) \
+@@ -83,9 +89,12 @@
+ $(am__objects_1) $(am__objects_2)
+ am__objects_4 =
+ am__objects_5 = mount-fstab.$(OBJEXT) mount-mount_mntent.$(OBJEXT) \
+- mount-getusername.$(OBJEXT) mount-lomount.$(OBJEXT) \
+- $(am__objects_3) $(am__objects_4) mount-env.$(OBJEXT)
+-am_mount_OBJECTS = mount-mount.$(OBJEXT) $(am__objects_5) \
++ mount-getusername.$(OBJEXT) $(am__objects_3) $(am__objects_4) \
++ mount-env.$(OBJEXT)
++am_mount_OBJECTS = mount-mount.$(OBJEXT) mount-lomount.$(OBJEXT) \
++ mount-loumount.$(OBJEXT) mount-loop.$(OBJEXT) \
++ mount-sha512.$(OBJEXT) mount-rmd160.$(OBJEXT) \
++ mount-aes.$(OBJEXT) $(am__objects_5) \
+ mount-setproctitle.$(OBJEXT)
+ mount_OBJECTS = $(am_mount_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -99,23 +108,24 @@
+ pivot_root_SOURCES = pivot_root.c
+ pivot_root_OBJECTS = pivot_root.$(OBJEXT)
+ pivot_root_LDADD = $(LDADD)
+-am__swapon_SOURCES_DIST = swapon.c swap_constants.h sundries.c \
+- xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \
++am__swapon_SOURCES_DIST = swapon.c loop.c sha512.c swap_constants.h \
++ sundries.c xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \
+ fsprobe_volumeid.c
+ @HAVE_BLKID_TRUE at am__objects_6 = fsprobe_blkid.$(OBJEXT)
+ @HAVE_VOLUME_ID_TRUE at am__objects_7 = fsprobe_volumeid.$(OBJEXT)
+ am__objects_8 = sundries.$(OBJEXT) xmalloc.$(OBJEXT) \
+ realpath.$(OBJEXT) fsprobe.$(OBJEXT) $(am__objects_6) \
+ $(am__objects_7)
+-am_swapon_OBJECTS = swapon.$(OBJEXT) $(am__objects_8)
++am_swapon_OBJECTS = swapon.$(OBJEXT) loop.$(OBJEXT) sha512.$(OBJEXT) \
++ $(am__objects_8)
+ swapon_OBJECTS = $(am_swapon_OBJECTS)
+ swapon_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am__umount_SOURCES_DIST = umount.c fstab.c mount_mntent.c \
+- getusername.c lomount.c sundries.c xmalloc.c realpath.c \
+- fsprobe.c fsprobe_blkid.c fsprobe_volumeid.c fstab.h \
+- linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \
+- mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
+- getusername.h loop.h sundries.h ../lib/env.c
++am__umount_SOURCES_DIST = umount.c loumount.c fstab.c mount_mntent.c \
++ getusername.c sundries.c xmalloc.c realpath.c fsprobe.c \
++ fsprobe_blkid.c fsprobe_volumeid.c fstab.h linux_fs.h \
++ mount_mntent.h mount_constants.h my_dev_t.h mount_paths.h \
++ lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \
++ sundries.h ../lib/env.c
+ @HAVE_BLKID_TRUE at am__objects_9 = umount-fsprobe_blkid.$(OBJEXT)
+ @HAVE_VOLUME_ID_TRUE at am__objects_10 = \
+ @HAVE_VOLUME_ID_TRUE@ umount-fsprobe_volumeid.$(OBJEXT)
+@@ -123,9 +133,10 @@
+ umount-realpath.$(OBJEXT) umount-fsprobe.$(OBJEXT) \
+ $(am__objects_9) $(am__objects_10)
+ am__objects_12 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \
+- umount-getusername.$(OBJEXT) umount-lomount.$(OBJEXT) \
+- $(am__objects_11) $(am__objects_4) umount-env.$(OBJEXT)
+-am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_12)
++ umount-getusername.$(OBJEXT) $(am__objects_11) \
++ $(am__objects_4) umount-env.$(OBJEXT)
++am_umount_OBJECTS = umount-umount.$(OBJEXT) umount-loumount.$(OBJEXT) \
++ $(am__objects_12)
+ umount_OBJECTS = $(am_umount_OBJECTS)
+ umount_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -356,17 +367,17 @@
+ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
+ getusername.h loop.h sundries.h
+
+-mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
++mount_common = fstab.c mount_mntent.c getusername.c \
+ $(utils_common) $(headers_common) ../lib/env.c
+
+-mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
++mount_SOURCES = mount.c lomount.c loumount.c loop.c sha512.c rmd160.c aes.c $(mount_common) ../lib/setproctitle.c
+ mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
+ mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+-umount_SOURCES = umount.c $(mount_common)
++umount_SOURCES = umount.c loumount.c $(mount_common)
+ umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
+ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+-swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
+-losetup_SOURCES = lomount.c loop.h lomount.h
++swapon_SOURCES = swapon.c loop.c sha512.c swap_constants.h $(utils_common)
++losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c loop.h lomount.h
+ losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
+ mount_LDADD = $(LDADD_common) $(am__append_3)
+ umount_LDADD = $(LDADD_common)
+@@ -484,7 +495,14 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsprobe.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsprobe_blkid.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsprobe_volumeid.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/loop.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-aes.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-lomount.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-loop.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-loumount.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-rmd160.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losetup-sha512.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-aes.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-env.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-fsprobe.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-fsprobe_blkid.Po at am__quote@
+@@ -492,10 +510,14 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-fstab.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-getusername.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-lomount.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-loop.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-loumount.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-mount.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-mount_mntent.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-realpath.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-rmd160.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-setproctitle.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-sha512.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-sundries.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-xmalloc.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mtab_lock_test-fstab.Po at am__quote@
+@@ -503,6 +525,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mtab_lock_test-xmalloc.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pivot_root.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/realpath.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha512.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sundries.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/swapon.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-env.Po at am__quote@
+@@ -511,7 +534,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-fsprobe_volumeid.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-fstab.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-getusername.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-lomount.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-loumount.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-mount_mntent.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-realpath.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-sundries.Po at am__quote@
+@@ -547,6 +570,76 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
+
++losetup-loumount.o: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-loumount.o -MD -MP -MF "$(DEPDIR)/losetup-loumount.Tpo" -c -o losetup-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loumount.Tpo" "$(DEPDIR)/losetup-loumount.Po"; else rm -f "$(DEPDIR)/losetup-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup-loumount.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
++
++losetup-loumount.obj: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-loumount.obj -MD -MP -MF "$(DEPDIR)/losetup-loumount.Tpo" -c -o losetup-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loumount.Tpo" "$(DEPDIR)/losetup-loumount.Po"; else rm -f "$(DEPDIR)/losetup-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup-loumount.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
++
++losetup-loop.o: loop.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-loop.o -MD -MP -MF "$(DEPDIR)/losetup-loop.Tpo" -c -o losetup-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loop.Tpo" "$(DEPDIR)/losetup-loop.Po"; else rm -f "$(DEPDIR)/losetup-loop.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup-loop.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c
++
++losetup-loop.obj: loop.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-loop.obj -MD -MP -MF "$(DEPDIR)/losetup-loop.Tpo" -c -o losetup-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loop.Tpo" "$(DEPDIR)/losetup-loop.Po"; else rm -f "$(DEPDIR)/losetup-loop.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup-loop.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`
++
++losetup-sha512.o: sha512.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sha512.o -MD -MP -MF "$(DEPDIR)/losetup-sha512.Tpo" -c -o losetup-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sha512.Tpo" "$(DEPDIR)/losetup-sha512.Po"; else rm -f "$(DEPDIR)/losetup-sha512.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup-sha512.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c
++
++losetup-sha512.obj: sha512.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sha512.obj -MD -MP -MF "$(DEPDIR)/losetup-sha512.Tpo" -c -o losetup-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sha512.Tpo" "$(DEPDIR)/losetup-sha512.Po"; else rm -f "$(DEPDIR)/losetup-sha512.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup-sha512.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`
++
++losetup-rmd160.o: rmd160.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.o -MD -MP -MF "$(DEPDIR)/losetup-rmd160.Tpo" -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-rmd160.Tpo" "$(DEPDIR)/losetup-rmd160.Po"; else rm -f "$(DEPDIR)/losetup-rmd160.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
++
++losetup-rmd160.obj: rmd160.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.obj -MD -MP -MF "$(DEPDIR)/losetup-rmd160.Tpo" -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-rmd160.Tpo" "$(DEPDIR)/losetup-rmd160.Po"; else rm -f "$(DEPDIR)/losetup-rmd160.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
++
++losetup-aes.o: aes.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-aes.o -MD -MP -MF "$(DEPDIR)/losetup-aes.Tpo" -c -o losetup-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-aes.Tpo" "$(DEPDIR)/losetup-aes.Po"; else rm -f "$(DEPDIR)/losetup-aes.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup-aes.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c
++
++losetup-aes.obj: aes.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-aes.obj -MD -MP -MF "$(DEPDIR)/losetup-aes.Tpo" -c -o losetup-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-aes.Tpo" "$(DEPDIR)/losetup-aes.Po"; else rm -f "$(DEPDIR)/losetup-aes.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup-aes.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`
++
+ mount-mount.o: mount.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.o -MD -MP -MF "$(DEPDIR)/mount-mount.Tpo" -c -o mount-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-mount.Tpo" "$(DEPDIR)/mount-mount.Po"; else rm -f "$(DEPDIR)/mount-mount.Tpo"; exit 1; fi
+@@ -561,6 +654,90 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
+
++mount-lomount.o: lomount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.o -MD -MP -MF "$(DEPDIR)/mount-lomount.Tpo" -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
++
++mount-lomount.obj: lomount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.obj -MD -MP -MF "$(DEPDIR)/mount-lomount.Tpo" -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
++
++mount-loumount.o: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-loumount.o -MD -MP -MF "$(DEPDIR)/mount-loumount.Tpo" -c -o mount-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loumount.Tpo" "$(DEPDIR)/mount-loumount.Po"; else rm -f "$(DEPDIR)/mount-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='mount-loumount.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
++
++mount-loumount.obj: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-loumount.obj -MD -MP -MF "$(DEPDIR)/mount-loumount.Tpo" -c -o mount-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loumount.Tpo" "$(DEPDIR)/mount-loumount.Po"; else rm -f "$(DEPDIR)/mount-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='mount-loumount.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
++
++mount-loop.o: loop.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-loop.o -MD -MP -MF "$(DEPDIR)/mount-loop.Tpo" -c -o mount-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loop.Tpo" "$(DEPDIR)/mount-loop.Po"; else rm -f "$(DEPDIR)/mount-loop.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='mount-loop.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c
++
++mount-loop.obj: loop.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-loop.obj -MD -MP -MF "$(DEPDIR)/mount-loop.Tpo" -c -o mount-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loop.Tpo" "$(DEPDIR)/mount-loop.Po"; else rm -f "$(DEPDIR)/mount-loop.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='mount-loop.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`
++
++mount-sha512.o: sha512.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sha512.o -MD -MP -MF "$(DEPDIR)/mount-sha512.Tpo" -c -o mount-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sha512.Tpo" "$(DEPDIR)/mount-sha512.Po"; else rm -f "$(DEPDIR)/mount-sha512.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='mount-sha512.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c
++
++mount-sha512.obj: sha512.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sha512.obj -MD -MP -MF "$(DEPDIR)/mount-sha512.Tpo" -c -o mount-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sha512.Tpo" "$(DEPDIR)/mount-sha512.Po"; else rm -f "$(DEPDIR)/mount-sha512.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='mount-sha512.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`
++
++mount-rmd160.o: rmd160.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.o -MD -MP -MF "$(DEPDIR)/mount-rmd160.Tpo" -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-rmd160.Tpo" "$(DEPDIR)/mount-rmd160.Po"; else rm -f "$(DEPDIR)/mount-rmd160.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
++
++mount-rmd160.obj: rmd160.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.obj -MD -MP -MF "$(DEPDIR)/mount-rmd160.Tpo" -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-rmd160.Tpo" "$(DEPDIR)/mount-rmd160.Po"; else rm -f "$(DEPDIR)/mount-rmd160.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
++
++mount-aes.o: aes.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-aes.o -MD -MP -MF "$(DEPDIR)/mount-aes.Tpo" -c -o mount-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-aes.Tpo" "$(DEPDIR)/mount-aes.Po"; else rm -f "$(DEPDIR)/mount-aes.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='mount-aes.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c
++
++mount-aes.obj: aes.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-aes.obj -MD -MP -MF "$(DEPDIR)/mount-aes.Tpo" -c -o mount-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-aes.Tpo" "$(DEPDIR)/mount-aes.Po"; else rm -f "$(DEPDIR)/mount-aes.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='mount-aes.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`
++
+ mount-fstab.o: fstab.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.o -MD -MP -MF "$(DEPDIR)/mount-fstab.Tpo" -c -o mount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fstab.Tpo" "$(DEPDIR)/mount-fstab.Po"; else rm -f "$(DEPDIR)/mount-fstab.Tpo"; exit 1; fi
+@@ -603,20 +780,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
+
+-mount-lomount.o: lomount.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.o -MD -MP -MF "$(DEPDIR)/mount-lomount.Tpo" -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
+-
+-mount-lomount.obj: lomount.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.obj -MD -MP -MF "$(DEPDIR)/mount-lomount.Tpo" -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
+-
+ mount-sundries.o: sundries.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.o -MD -MP -MF "$(DEPDIR)/mount-sundries.Tpo" -c -o mount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sundries.Tpo" "$(DEPDIR)/mount-sundries.Po"; else rm -f "$(DEPDIR)/mount-sundries.Tpo"; exit 1; fi
+@@ -785,6 +948,20 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`
+
++umount-loumount.o: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-loumount.o -MD -MP -MF "$(DEPDIR)/umount-loumount.Tpo" -c -o umount-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-loumount.Tpo" "$(DEPDIR)/umount-loumount.Po"; else rm -f "$(DEPDIR)/umount-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='umount-loumount.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
++
++umount-loumount.obj: loumount.c
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-loumount.obj -MD -MP -MF "$(DEPDIR)/umount-loumount.Tpo" -c -o umount-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-loumount.Tpo" "$(DEPDIR)/umount-loumount.Po"; else rm -f "$(DEPDIR)/umount-loumount.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='umount-loumount.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
++
+ umount-fstab.o: fstab.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.o -MD -MP -MF "$(DEPDIR)/umount-fstab.Tpo" -c -o umount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fstab.Tpo" "$(DEPDIR)/umount-fstab.Po"; else rm -f "$(DEPDIR)/umount-fstab.Tpo"; exit 1; fi
+@@ -827,20 +1004,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
+
+-umount-lomount.o: lomount.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-lomount.o -MD -MP -MF "$(DEPDIR)/umount-lomount.Tpo" -c -o umount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-lomount.Tpo" "$(DEPDIR)/umount-lomount.Po"; else rm -f "$(DEPDIR)/umount-lomount.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='umount-lomount.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
+-
+-umount-lomount.obj: lomount.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-lomount.obj -MD -MP -MF "$(DEPDIR)/umount-lomount.Tpo" -c -o umount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-lomount.Tpo" "$(DEPDIR)/umount-lomount.Po"; else rm -f "$(DEPDIR)/umount-lomount.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='umount-lomount.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
+-
+ umount-sundries.o: sundries.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.o -MD -MP -MF "$(DEPDIR)/umount-sundries.Tpo" -c -o umount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-sundries.Tpo" "$(DEPDIR)/umount-sundries.Po"; else rm -f "$(DEPDIR)/umount-sundries.Tpo"; exit 1; fi
+diff -urN util-linux-ng-2.13/mount/aes.c util-linux-ng-2.13-AES/mount/aes.c
+--- util-linux-ng-2.13/mount/aes.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/aes.c 2007-09-02 18:05:41.000000000 +0300
@@ -0,0 +1,299 @@
+// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially
@@ -336,11 +758,9 @@
+
+ state_out(out_blk, b0);
+}
-diff --git a/mount/aes.h b/mount/aes.h
-new file mode 100644
-index 0000000..4f1e3b3
---- /dev/null
-+++ b/mount/aes.h
+diff -urN util-linux-ng-2.13/mount/aes.h util-linux-ng-2.13-AES/mount/aes.h
+--- util-linux-ng-2.13/mount/aes.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/aes.h 2007-09-02 18:05:41.000000000 +0300
@@ -0,0 +1,97 @@
+// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially
@@ -439,10 +859,9 @@
+// if their parameters have not changed.
+
+#endif // _AES_H
-diff --git a/mount/lomount.c b/mount/lomount.c
-index ae9eb36..432610f 100644
---- a/mount/lomount.c
-+++ b/mount/lomount.c
+diff -urN util-linux-ng-2.13/mount/lomount.c util-linux-ng-2.13-AES/mount/lomount.c
+--- util-linux-ng-2.13/mount/lomount.c 2007-08-27 16:00:34.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/lomount.c 2007-09-02 18:05:41.000000000 +0300
@@ -1,4 +1,15 @@
-/* Originally from Ted's losetup.c */
+/* Taken from Ted's losetup.c - Mitch <m.dsouza at mrc-apu.cam.ac.uk> */
@@ -460,7 +879,7 @@
#define LOOPMAJOR 7
-@@ -13,63 +24,85 @@
+@@ -13,62 +24,81 @@
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
@@ -487,8 +906,6 @@
+#include "rmd160.h"
+#include "aes.h"
+
-+#define SIZE(a) (sizeof(a)/sizeof(a[0]))
-+
+#if !defined(BLKGETSIZE64)
+# define BLKGETSIZE64 _IOR(0x12,114,size_t)
+#endif
@@ -500,11 +917,13 @@
+extern void show_all_loops(void);
+extern int read_options_from_fstab(char *, char **);
+extern int recompute_loop_dev_size(char *);
-+
+
+-#define SIZE(a) (sizeof(a)/sizeof(a[0]))
+#if !defined(LOOP_PASSWORD_MIN_LENGTH)
+# define LOOP_PASSWORD_MIN_LENGTH 20
+#endif
-+
+
+-#ifdef LOOP_SET_FD
+char *passFDnumber = (char *)0;
+char *passAskTwice = (char *)0;
+char *passSeedString = (char *)0;
@@ -521,15 +940,6 @@
+static int multiKeyMode = 0; /* 0=single-key 64=multi-key-v2 65=multi-key-v3 1000=any */
+static char *multiKeyPass[66];
+static char *loopFileName;
-+static char *progname;
-
--#define SIZE(a) (sizeof(a)/sizeof(a[0]))
--
--#ifdef LOOP_SET_FD
-+#ifdef MAIN
-+static char *
-+crypt_name (int id, int *flags) {
-+ int i;
-static int
-loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
@@ -557,7 +967,11 @@
- info->lo_inode != info64->lo_inode ||
- info->lo_offset != info64->lo_offset)
- return -EOVERFLOW;
--
++#ifdef MAIN
++static char *
++crypt_name (int id, int *flags) {
++ int i;
+
- return 0;
+ for (i = 0; loop_crypt_type_tbl[i].id != -1; i++)
+ if(id == loop_crypt_type_tbl[i].id) {
@@ -577,17 +991,16 @@
- struct loop_info loopinfo;
- struct loop_info64 loopinfo64;
- int fd, errsv;
--
+ struct loop_info64 loopinfo;
+ int fd;
-+
+
if ((fd = open(device, O_RDONLY)) < 0) {
int errsv = errno;
- fprintf(stderr, _("loop: can't open device %s: %s\n"),
-@@ -77,58 +110,60 @@ show_loop(char *device) {
+@@ -76,106 +106,64 @@
+ device, strerror (errsv));
return 2;
}
-
+-
- if (ioctl(fd, LOOP_GET_STATUS64, &loopinfo64) == 0) {
-
- loopinfo64.lo_file_name[LO_NAME_SIZE-2] = '*';
@@ -622,7 +1035,7 @@
- return 0;
+ return 1;
}
-
+-
- if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) {
- printf ("%s: [%04x]:%ld (%s)",
- device, loopinfo.lo_device, loopinfo.lo_inode,
@@ -630,6 +1043,14 @@
-
- if (loopinfo.lo_offset)
- printf(_(", offset %d"), loopinfo.lo_offset);
+-
+- if (loopinfo.lo_encrypt_type)
+- printf(_(", encryption type %d\n"),
+- loopinfo.lo_encrypt_type);
+-
+- printf("\n");
+- close (fd);
+- return 0;
+ loopinfo.lo_file_name[LO_NAME_SIZE-1] = 0;
+ loopinfo.lo_crypt_name[LO_NAME_SIZE-1] = 0;
+ printf("%s: [%04llx]:%llu (%s)", device, (unsigned long long)loopinfo.lo_device,
@@ -640,20 +1061,42 @@
+ } else {
+ printf(_(" offset=%llu"), (unsigned long long)loopinfo.lo_offset);
+ }
-+ }
-
-- if (loopinfo.lo_encrypt_type)
-- printf(_(", encryption type %d\n"),
-- loopinfo.lo_encrypt_type);
+ }
+-
+- errsv = errno;
+- fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
+- device, strerror (errsv));
+- close (fd);
+- return 1;
+-}
+-
+-static int
+-show_used_loop_devices (void) {
+- char dev[20];
+- char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
+- int i, j, fd, permission = 0, somedev = 0;
+- struct stat statbuf;
+- struct loop_info loopinfo;
+-
+- for (j = 0; j < SIZE(loop_formats); j++) {
+- for(i = 0; i < 256; i++) {
+- sprintf(dev, loop_formats[j], i);
+- if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
+- fd = open (dev, O_RDONLY);
+- if (fd >= 0) {
+- if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == 0)
+- show_loop(dev);
+- close (fd);
+- somedev++;
+- } else if (errno == EACCES)
+- permission++;
+- continue; /* continue trying as long as devices exist */
+ if (loopinfo.lo_sizelimit)
+ printf(_(" sizelimit=%llu"), (unsigned long long)loopinfo.lo_sizelimit);
+ if (loopinfo.lo_encrypt_type) {
+ int flags;
+ char *s = crypt_name (loopinfo.lo_encrypt_type, &flags);
-
-- printf("\n");
-- close (fd);
-- return 0;
++
+ printf(_(" encryption=%s"), s);
+ /* type 18 == LO_CRYPT_CRYPTOAPI */
+ if (loopinfo.lo_encrypt_type == 18) {
@@ -663,35 +1106,33 @@
+ printf("-");
+ if(flags & 1)
+ printf("%u", (unsigned int)loopinfo.lo_encrypt_key_size << 3);
-+ }
- }
--
-- errsv = errno;
-- fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
-- device, strerror (errsv));
+ }
++ }
+ switch(loopinfo.lo_flags & 0x180000) {
+ case 0x180000:
+ printf(_(" multi-key-v3"));
+ break;
+ case 0x100000:
+ printf(_(" multi-key-v2"));
-+ break;
-+ }
+ break;
+- }
+ }
+ /* type 2 == LO_CRYPT_DES */
+ if (loopinfo.lo_init[0] && (loopinfo.lo_encrypt_type != 2))
+ printf(_(" loinit=%llu"), (unsigned long long)loopinfo.lo_init[0]);
+ if (loopinfo.lo_flags & 0x200000)
+ printf(_(" read-only"));
+ printf("\n");
- close (fd);
-- return 1;
-+
-+ return 0;
++ close (fd);
+
+- if (somedev==0 && permission) {
+- error(_("%s: no permission to look at /dev/loop#"), progname);
+- return 1;
+- }
+ return 0;
}
-
- static int
-@@ -167,15 +202,6 @@ show_used_loop_devices (void) {
-
+-
+-
#endif
-int
@@ -702,11 +1143,13 @@
- S_ISBLK(statbuf.st_mode) &&
- major(statbuf.st_rdev) == LOOPMAJOR);
-}
--
++#define SIZE(a) (sizeof(a)/sizeof(a[0]))
+
++#if !defined(MAIN)
char *
find_unused_loop_device (void) {
/* Just creating a device, say in /tmp, is probably a bad idea -
-@@ -183,9 +209,8 @@ find_unused_loop_device (void) {
+@@ -183,9 +171,8 @@
So, we just try /dev/loop[0-7]. */
char dev[20];
char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
@@ -717,7 +1160,7 @@
for (j = 0; j < SIZE(loop_formats); j++) {
for(i = 0; i < 256; i++) {
-@@ -194,16 +219,14 @@ find_unused_loop_device (void) {
+@@ -194,16 +181,14 @@
somedev++;
fd = open (dev, O_RDONLY);
if (fd >= 0) {
@@ -736,7 +1179,7 @@
continue;/* continue trying as long as devices exist */
}
break;
-@@ -211,75 +234,625 @@ find_unused_loop_device (void) {
+@@ -211,75 +196,626 @@
}
if (!somedev)
@@ -784,6 +1227,10 @@
- error("Out of memory while reading passphrase");
- pass = tmppass; /* the old buffer hasn't changed */
- break;
+- }
+- }
+- if (read(pfd, pass+i, 1) != 1 ||
+- pass[i] == '\n' || pass[i] == 0)
+int is_loop_active(const char *dev, const char *backdev)
+{
+ int fd;
@@ -804,6 +1251,7 @@
+ }
+ return ret;
+}
++#endif
+
+static int rd_wr_retry(int fd, char *buf, int cnt, int w)
+{
@@ -985,12 +1433,10 @@
+ fclose(f);
+ close(x);
+ goto nomem3;
- }
++ }
+ if(cnt2 != cnt3) break;
+ cnt -= cnt3;
- }
-- if (read(pfd, pass+i, 1) != 1 ||
-- pass[i] == '\n' || pass[i] == 0)
++ }
+ if(fflush(f)) goto tmpWrErr;
+ close(x);
+ x = dup(fileno(f));
@@ -1065,7 +1511,7 @@
+ }
+ if(strlen(multiKeyPass[x]) < LOOP_PASSWORD_MIN_LENGTH) break;
+ x++;
- }
++ }
+ warnAboutBadKeyData(x);
+ if(x >= 65)
+ multiKeyMode = 65;
@@ -1076,9 +1522,7 @@
+ if(!multiKeyPass[0]) goto nomem1;
+ return multiKeyPass[0];
+}
-
-- if (pass == NULL)
-- return "";
++
+static char *sGetPass(int minLen, int warnLen)
+{
+ char *p, *s, *seed;
@@ -1169,7 +1613,7 @@
+ return(NULL);
+ }
+ memset(p, 0, i);
-+ }
+ }
+ if(i < warnLen) {
+ fprintf(stderr, _("WARNING - Please use longer password (%d or more characters)\n"), LOOP_PASSWORD_MIN_LENGTH);
+ }
@@ -1177,14 +1621,16 @@
+ return(s);
+}
-- pass[i] = 0;
-- return pass;
+- if (pass == NULL)
+- return "";
+/* this is for compatibility with historic loop-AES version */
+static void unhashed1_key_setup(unsigned char *keyStr, int ile, unsigned char *keyBuf, int bufSize)
+{
+ register int x, y, z, cnt = ile;
+ unsigned char *kp;
-+
+
+- pass[i] = 0;
+- return pass;
+ memset(keyBuf, 0, bufSize);
+ kp = keyStr;
+ for(x = 0; x < (bufSize * 8); x += 6) {
@@ -1398,28 +1844,28 @@
-set_loop(const char *device, const char *file, unsigned long long offset,
- const char *encryption, int pfd, int *loopro) {
- struct loop_info64 loopinfo64;
-+set_loop(const char *device, const char *file, int *loopro, const char **fstype, unsigned int *AutoChmodPtr) {
+- int fd, ffd, mode, i;
+- char *pass;
++set_loop(const char *device, const char *file, int *loopro, const char **fstype, unsigned int *AutoChmodPtr, int busyRetVal) {
+ struct loop_info64 loopinfo;
- int fd, ffd, mode, i;
-- char *pass;
--
++ int fd, ffd, mode, i, errRetVal = 1;
+ char *pass, *apiName = NULL;
+ void (*hashFunc)(unsigned char *, int, unsigned char *, int);
+ unsigned char multiKeyBits[65][32];
+ int minPassLen = LOOP_PASSWORD_MIN_LENGTH;
+ int run_mkfs_command = 0;
-+
+
+ loopFileName = (char *)file;
+ multiKeyMode = 0;
mode = (*loopro ? O_RDONLY : O_RDWR);
if ((ffd = open(file, mode)) < 0) {
if (!*loopro && errno == EROFS)
-@@ -291,32 +864,26 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+@@ -291,180 +827,255 @@
}
if ((fd = open(device, mode)) < 0) {
perror (device);
-+ close(ffd);
- return 1;
+- return 1;
++ goto close_ffd_return1;
}
*loopro = (mode == O_RDONLY);
@@ -1438,7 +1884,6 @@
- }
-
- loopinfo64.lo_offset = offset;
--
+ memset (&loopinfo, 0, sizeof (loopinfo));
+ xstrncpy ((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
+ if (loopEncryptionType)
@@ -1447,18 +1892,23 @@
+ loopinfo.lo_offset = mystrtoull(loopOffsetBytes, 1);
+ if (loopSizeBytes)
+ loopinfo.lo_sizelimit = mystrtoull(loopSizeBytes, 0);
-+
+
#ifdef MCL_FUTURE
/*
* Oh-oh, sensitive data coming up. Better lock into memory to prevent
* passwd etc being swapped out and left somewhere on disk.
*/
- if (loopinfo64.lo_encrypt_type != LO_CRYPT_NONE) {
-+ if (loopinfo.lo_encrypt_type != LO_CRYPT_NONE) {
- if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
- perror("memlock");
- fprintf(stderr, _("Couldn't lock into memory, exiting.\n"));
-@@ -325,25 +892,152 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+- if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
+- perror("memlock");
+- fprintf(stderr, _("Couldn't lock into memory, exiting.\n"));
+- exit(1);
+- }
++
++ if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
++ perror("memlock");
++ fprintf(stderr, _("Couldn't lock into memory, exiting.\n"));
++ exit(1);
}
#endif
@@ -1472,15 +1922,7 @@
- pass = getpass(_("Password: "));
- goto gotpass;
+ pass = sGetPass (1, 0);
-+ if(!pass) {
-+keyclean_close_fd_ffd_return1:
-+ memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+close_fd_ffd_return1:
-+ close(fd);
-+ close(ffd);
-+ return 1;
-+ }
++ if(!pass) goto close_fd_ffd_return1;
+ xstrncpy ((char *)loopinfo.lo_encrypt_key, pass, LO_KEY_SIZE);
+ loopinfo.lo_encrypt_key_size = strlen((char*)loopinfo.lo_encrypt_key);
+ break;
@@ -1616,16 +2058,25 @@
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
- close(fd);
- close(ffd);
+- if (errno == EBUSY) {
+- if (verbose)
+- printf(_("ioctl LOOP_SET_FD failed: %s\n"), strerror(errno));
+- return 2;
+- } else {
++ if(errno == EBUSY)
++ errRetVal = busyRetVal;
++ if((errRetVal != 2) || verbose)
+ perror("ioctl: LOOP_SET_FD");
+- return 1;
+- }
++keyclean_close_fd_ffd_return1:
+ memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key));
+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
++close_fd_ffd_return1:
+ close (fd);
++close_ffd_return1:
+ close (ffd);
- if (errno == EBUSY) {
- if (verbose)
- printf(_("ioctl LOOP_SET_FD failed: %s\n"), strerror(errno));
-@@ -353,117 +1047,84 @@ set_loop(const char *device, const char *file, unsigned long long offset,
- return 1;
- }
++ return errRetVal;
}
- close (ffd);
@@ -1654,7 +2105,7 @@
- memset(&loopinfo, 0, sizeof(loopinfo));
}
- memset(&loopinfo64, 0, sizeof(loopinfo64));
-
+-
- if (i) {
- ioctl (fd, LOOP_CLR_FD, 0);
- close (fd);
@@ -1673,20 +2124,16 @@
+ }
}
- close (fd);
-
+-
- if (verbose > 1)
- printf(_("set_loop(%s,%s,%llu): success\n"),
- device, file, offset);
- return 0;
-}
-+ memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-
+-
-int
-del_loop (const char *device) {
- int fd;
-+ close (fd);
-+ close (ffd);
- if ((fd = open (device, O_RDONLY)) < 0) {
- int errsv = errno;
@@ -1696,7 +2143,38 @@
- }
- if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
- perror ("ioctl: LOOP_CLR_FD");
+- close(fd);
- return 1;
+- }
++ memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key));
++ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
+ close (fd);
+- if (verbose > 1)
+- printf(_("del_loop(%s): success\n"), device);
+- return 0;
+-}
+-
+-#else /* no LOOP_SET_FD defined */
+-static void
+-mutter(void) {
+- fprintf(stderr,
+- _("This mount was compiled without loop support. "
+- "Please recompile.\n"));
+-}
+-
+-int
+-set_loop (const char *device, const char *file, unsigned long long offset,
+- const char *encryption, int *loopro) {
+- mutter();
+- return 1;
+-}
++ close (ffd);
+
+-int
+-del_loop (const char *device) {
+- mutter();
+- return 1;
+-}
+#if !defined(MAIN)
+ if(run_mkfs_command && fstype && *fstype && **fstype && (getuid() == 0)) {
+ if(!loop_fork_mkfs_command((char *)device, (char *)(*fstype))) {
@@ -1712,46 +2190,19 @@
+ return 1;
+ }
+ }
- }
-- close (fd);
++ }
+#endif
-+
- if (verbose > 1)
-- printf(_("del_loop(%s): success\n"), device);
-- return 0;
--}
--
--#else /* no LOOP_SET_FD defined */
--static void
--mutter(void) {
-- fprintf(stderr,
-- _("This mount was compiled without loop support. "
-- "Please recompile.\n"));
--}
--
--int
--set_loop (const char *device, const char *file, unsigned long long offset,
-- const char *encryption, int *loopro) {
-- mutter();
-- return 1;
--}
--
--int
--del_loop (const char *device) {
-- mutter();
-- return 1;
--}
--
+
-char *
-find_unused_loop_device (void) {
- mutter();
++ if (verbose > 1)
+ printf(_("set_loop(%s,%s): success\n"), device, file);
return 0;
}
--
+
-#endif
-
-+
#ifdef MAIN
-#ifdef LOOP_SET_FD
@@ -1779,24 +2230,25 @@
- " -r | --read-only setup read-only loop device\n"
- " -s | --show print device name (with -f <file>)\n"
- " -v | --verbose verbose mode\n\n"),
-+ fprintf(stderr, _("\nUsage:\n\
-+ %1$s [options] loop_device file # setup\n\
-+ %1$s -F [options] loop_device [file] # setup, read /etc/fstab\n\
-+ %1$s loop_device # give info\n\
-+ %1$s -a # give info of all loops\n\
-+ %1$s -d loop_device # delete\n\
-+ %1$s -R loop_device # resize\n\
+- progname);
++ fprintf(stderr, _("usage:\n\
++ %s [options] loop_device file # setup\n\
++ %s -F [options] loop_device [file] # setup, read /etc/fstab\n\
++ %s loop_device # give info\n\
++ %s -a # give info of all loops\n\
++ %s -d loop_device # delete\n\
++ %s -R loop_device # resize\n\
+options: -e encryption -o offset -s sizelimit -p passwdfd -T -S pseed\n\
+ -H phash -I loinit -K gpgkey -G gpghome -C itercountk -v -r\n\
+ -P cleartextkey\n"),
- progname);
++ progname, progname, progname, progname, progname, progname);
exit(1);
- }
+}
char *
xstrdup (const char *s) {
-@@ -492,16 +1153,147 @@ error (const char *fmt, ...) {
+@@ -493,153 +1104,252 @@
fprintf (stderr, "\n");
}
@@ -1931,7 +2383,6 @@
+ close(fd);
+ return err2;
+}
-+
int
main(int argc, char **argv) {
@@ -1940,15 +2391,25 @@
+ char *partitionName = NULL;
+ int delete,c,option_a=0,option_F=0,option_R=0,setup_o=0;
int res = 0;
- int showdev = 0;
+- int showdev = 0;
int ro = 0;
- int pfd = -1;
- unsigned long long off;
-+ char *p;
- struct option longopts[] = {
- { "all", 0, 0, 'a' },
- { "detach", 0, 0, 'd' },
-@@ -520,44 +1312,79 @@ main(int argc, char **argv) {
+- struct option longopts[] = {
+- { "all", 0, 0, 'a' },
+- { "detach", 0, 0, 'd' },
+- { "encryption", 1, 0, 'e' },
+- { "find", 0, 0, 'f' },
+- { "help", 0, 0, 'h' },
+- { "offset", 1, 0, 'o' },
+- { "pass-fd", 1, 0, 'p' },
+- { "read-only", 0, 0, 'r' },
+- { "show", 0, 0, 's' },
+- { "verbose", 0, 0, 'v' },
+- { NULL, 0, 0, 0 }
+- };
+
+ setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -1958,9 +2419,9 @@
-
+ delete = 0;
progname = argv[0];
- if ((p = strrchr(progname, '/')) != NULL)
- progname = p+1;
-
+- if ((p = strrchr(progname, '/')) != NULL)
+- progname = p+1;
+-
- while ((c = getopt_long(argc, argv, "ade:E:fho:p:rsv",
- longopts, NULL)) != -1) {
+ while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:rRs:S:Tv")) != -1) {
@@ -1984,17 +2445,17 @@
- encryption = optarg;
+ loopEncryptionType = optarg;
+ setup_o = 1;
-+ break;
+ break;
+- case 'f':
+- find = 1;
+ case 'F': /* read loop related options from /etc/fstab */
+ option_F = 1;
+ setup_o = 1;
- break;
-- case 'f':
-- find = 1;
++ break;
+ case 'G': /* GnuPG home dir */
+ gpgHomeDir = optarg;
+ setup_o = 1;
- break;
++ break;
+ case 'H': /* passphrase hash function name */
+ passHashFuncName = optarg;
+ setup_o = 1;
@@ -2006,7 +2467,7 @@
+ case 'K': /* GnuPG key file name */
+ gpgKeyFile = optarg;
+ setup_o = 1;
-+ break;
+ break;
case 'o':
- offset = optarg;
+ loopOffsetBytes = optarg;
@@ -2033,7 +2494,7 @@
- showdev = 1;
+ loopSizeBytes = optarg;
+ setup_o = 1;
- break;
++ break;
+ case 'S': /* optional seed for passphrase */
+ passSeedString = optarg;
+ setup_o = 1;
@@ -2041,19 +2502,20 @@
+ case 'T': /* ask passphrase _twice_ */
+ passAskTwice = "T";
+ setup_o = 1;
+ break;
case 'v':
- verbose = 1;
+ verbose++;
break;
default:
usage();
-@@ -566,79 +1393,35 @@ main(int argc, char **argv) {
-
- if (argc == 1) {
- usage();
-+ } else if (option_a + delete + option_R + setup_o > 1) {
-+ usage();
-+ } else if (option_a) {
+ }
+ }
+-
+- if (argc == 1) {
+- usage();
++ if (option_a + delete + option_R + setup_o > 1) usage();
++ if (option_a) {
+ /* show all loops */
+ if (argc != optind) usage();
+ show_all_loops();
@@ -2067,17 +2529,7 @@
- } else if (all) {
- if (argc > 2)
- usage();
-+ /* delete loop */
-+ if (argc != optind+1) usage();
-+ res = del_loop(argv[optind]);
-+ } else if (option_R) {
-+ /* resize existing loop */
-+ if (argc != optind+1) usage();
-+ res = recompute_loop_dev_size(argv[optind]);
-+ } else if ((argc == optind+1) && !setup_o) {
-+ /* show one loop */
-+ res = show_loop(argv[optind]);
- } else {
+- } else {
- if (argc < optind+1 || argc > optind+2)
- usage();
- }
@@ -2095,7 +2547,17 @@
- return 0;
- }
- file = argv[optind];
-- } else {
++ /* delete loop */
++ if (argc != optind+1) usage();
++ res = del_loop(argv[optind]);
++ } else if (option_R) {
++ /* resize existing loop */
++ if (argc != optind+1) usage();
++ res = recompute_loop_dev_size(argv[optind]);
++ } else if ((argc == optind+1) && !setup_o) {
++ /* show one loop */
++ res = show_loop(argv[optind]);
+ } else {
- device = argv[optind];
- if (argc == optind+1)
- file = NULL;
@@ -2135,11 +2597,11 @@
+ partitionName = argv[optind+1];
+ if (option_F && (read_options_from_fstab(argv[optind], &partitionName) != 1))
+ exit(1);
-+ res = set_loop(argv[optind],partitionName,&ro,(const char**)0,(unsigned int *)0);
++ res = set_loop(argv[optind],partitionName,&ro,(const char**)0,(unsigned int *)0, 1);
}
return res;
}
-
+-
-#else /* LOOP_SET_FD not defined */
-
-int
@@ -2151,15 +2613,14 @@
-}
-#endif
#endif
-diff --git a/mount/lomount.h b/mount/lomount.h
-index 89695cd..7748cf5 100644
---- a/mount/lomount.h
-+++ b/mount/lomount.h
+diff -urN util-linux-ng-2.13/mount/lomount.h util-linux-ng-2.13-AES/mount/lomount.h
+--- util-linux-ng-2.13/mount/lomount.h 2007-04-25 15:43:38.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/lomount.h 2007-09-02 18:05:41.000000000 +0300
@@ -1,6 +1,19 @@
extern int verbose;
-extern int set_loop(const char *, const char *, unsigned long long,
- const char *, int, int *);
-+extern int set_loop(const char *, const char *, int *, const char **, unsigned int *);
++extern int set_loop(const char *, const char *, int *, const char **, unsigned int *, int);
extern int del_loop(const char *);
extern int is_loop_device(const char *);
+extern int is_loop_active(const char *, const char *);
@@ -2177,11 +2638,9 @@
+extern char *loopOffsetBytes;
+extern char *loopSizeBytes;
+extern char *loopEncryptionType;
-diff --git a/mount/loop.c b/mount/loop.c
-new file mode 100644
-index 0000000..1e95d42
---- /dev/null
-+++ b/mount/loop.c
+diff -urN util-linux-ng-2.13/mount/loop.c util-linux-ng-2.13-AES/mount/loop.c
+--- util-linux-ng-2.13/mount/loop.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/loop.c 2007-09-02 18:05:41.000000000 +0300
@@ -0,0 +1,221 @@
+/*
+ * loop.c
@@ -2404,10 +2863,9 @@
+ loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
+ return(loop_set_status64_ioctl(fd, loopinfo));
+}
-diff --git a/mount/loop.h b/mount/loop.h
-index 951a5d1..cc9097b 100644
---- a/mount/loop.h
-+++ b/mount/loop.h
+diff -urN util-linux-ng-2.13/mount/loop.h util-linux-ng-2.13-AES/mount/loop.h
+--- util-linux-ng-2.13/mount/loop.h 2007-04-25 15:43:38.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/loop.h 2007-09-02 18:05:41.000000000 +0300
@@ -1,6 +1,20 @@
-#define LO_CRYPT_NONE 0
-#define LO_CRYPT_XOR 1
@@ -2465,7 +2923,7 @@
int lo_offset;
int lo_encrypt_type;
int lo_encrypt_key_size;
-@@ -30,22 +53,35 @@ struct loop_info {
+@@ -30,22 +53,35 @@
char reserved[4];
};
@@ -2518,13 +2976,12 @@
+extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
+
+#endif
-diff --git a/mount/losetup.8 b/mount/losetup.8
-index db2929f..5260436 100644
---- a/mount/losetup.8
-+++ b/mount/losetup.8
+diff -urN util-linux-ng-2.13/mount/losetup.8 util-linux-ng-2.13-AES/mount/losetup.8
+--- util-linux-ng-2.13/mount/losetup.8 2007-08-13 13:39:46.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/losetup.8 2007-09-02 18:05:41.000000000 +0300
@@ -1,45 +1,29 @@
-.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
-+.TH LOSETUP 8 "2007-02-17" "Linux" "MAINTENANCE COMMANDS"
++.TH LOSETUP 8 "2007-09-02" "Linux" "MAINTENANCE COMMANDS"
.SH NAME
losetup \- set up and control loop devices
.SH SYNOPSIS
@@ -2536,17 +2993,29 @@
+[options]
.I loop_device
-.sp
--.B losetup -a
++file
++.br
++.B losetup -F
++[options]
++.I loop_device
++[file]
++.br
++.B losetup
++[
++.B \-d
++]
++.I loop_device
++.br
+ .B losetup -a
-.sp
-.in -5
-Delete loop:
-.sp
-.in +5
-.B "losetup \-d"
-+file
+.br
-+.B losetup -F
-+[options]
++.B losetup
++.B \-R
.I loop_device
-.sp
-.in -5
@@ -2559,9 +3028,7 @@
-Setup loop device:
-.sp
-.in +5
-+[file]
-+.br
- .B losetup
+-.B losetup
-.RB [{\-e | \-E}
-.IR encryption ]
-.RB [ \-o
@@ -2573,20 +3040,10 @@
-.RB { \-f [ \-s ] | \fIloop_device\fP }
-.I file
-.in -13
-+[
-+.B \-d
-+]
-+.I loop_device
-+.br
-+.B losetup -a
-+.br
-+.B losetup
-+.B \-R
-+.I loop_device
.ad b
.SH DESCRIPTION
.B losetup
-@@ -47,53 +31,135 @@ is used to associate loop devices with regular files or block devices,
+@@ -47,53 +31,135 @@
to detach loop devices and to query the status of a loop device. If only the
\fIloop_device\fP argument is given, the status of the corresponding loop
device is shown.
@@ -2720,9 +3177,9 @@
+keys, then loop device is put to multi-key mode. If losetup encounters
+end-of-file before 64 keys are read, then only first key is used in
+single-key mode.
-
++
+echo SecretPassphraseHere | losetup -p0 -K foo.gpg -e AES128 ...
-+
+
+In above example, losetup reads passphrase from file descriptor 0 (stdin).
+.IP "\fB\-P \fIcleartextkey\fP"
+Read the passphrase from file \fIcleartextkey\fP instead of the
@@ -2766,7 +3223,7 @@
.SH RETURN VALUE
.B losetup
returns 0 on success, nonzero on failure. When
-@@ -105,49 +171,26 @@ from determining the status of the device.
+@@ -105,49 +171,26 @@
.SH FILES
.nf
@@ -2795,7 +3252,7 @@
-# mount -t ext2 /dev/loop0 /mnt
+
+dd if=/dev/zero of=/file bs=1k count=500
-+head -c 2925 /dev/random | uuencode -m - | head -n 66 \\
++head -c 3705 /dev/random | uuencode -m - | head -n 66 \\
+ | tail -n 65 | gpg --symmetric -a >/etc/fskey9.gpg
+losetup -e AES128 -K /etc/fskey9.gpg /dev/loop0 /file
+mkfs -t ext2 /dev/loop0
@@ -2832,11 +3289,9 @@
+Original version: Theodore Ts'o <tytso at athena.mit.edu>
+AES support: Jari Ruusu
+.fi
-diff --git a/mount/loumount.c b/mount/loumount.c
-new file mode 100644
-index 0000000..3301ce2
---- /dev/null
-+++ b/mount/loumount.c
+diff -urN util-linux-ng-2.13/mount/loumount.c util-linux-ng-2.13-AES/mount/loumount.c
+--- util-linux-ng-2.13/mount/loumount.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/loumount.c 2007-09-02 18:05:42.000000000 +0300
@@ -0,0 +1,60 @@
+/*
+ * loumount.c
@@ -2898,11 +3353,10 @@
+ printf(_("del_loop(%s): success\n"), device);
+ return 0;
+}
-diff --git a/mount/mount.8 b/mount/mount.8
-index 01001ad..4d8b2a5 100644
---- a/mount/mount.8
-+++ b/mount/mount.8
-@@ -316,6 +316,16 @@ Print a help message.
+diff -urN util-linux-ng-2.13/mount/mount.8 util-linux-ng-2.13-AES/mount/mount.8
+--- util-linux-ng-2.13/mount/mount.8 2007-08-27 16:00:34.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/mount.8 2007-09-02 18:05:42.000000000 +0300
+@@ -316,6 +316,16 @@
.B \-v
Verbose mode.
.TP
@@ -2919,7 +3373,7 @@
.B \-a
Mount all filesystems (of the given types) mentioned in
.IR fstab .
-@@ -365,12 +375,6 @@ This is necessary for example when
+@@ -365,12 +375,6 @@
.I /etc
is on a read-only file system.
.TP
@@ -2932,7 +3386,7 @@
.B \-s
Tolerate sloppy mount options rather than failing. This will ignore
mount options not supported by a filesystem type. Not all filesystems
-@@ -1999,13 +2003,19 @@ to correspond to the file
+@@ -1999,13 +2003,19 @@
and then mount this device on
.IR /mnt .
@@ -2954,10 +3408,9 @@
If no explicit loop device is mentioned
(but just an option `\fB\-o loop\fP' is given), then
.B mount
-diff --git a/mount/mount.c b/mount/mount.c
-index d09fd5e..bd01f43 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
+diff -urN util-linux-ng-2.13/mount/mount.c util-linux-ng-2.13-AES/mount/mount.c
+--- util-linux-ng-2.13/mount/mount.c 2007-08-27 16:00:34.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/mount.c 2007-09-02 18:05:42.000000000 +0300
@@ -11,6 +11,7 @@
#include <string.h>
#include <getopt.h>
@@ -2966,7 +3419,7 @@
#include <pwd.h>
#include <grp.h>
-@@ -90,9 +91,6 @@ static int mounttype = 0;
+@@ -90,9 +91,6 @@
/* True if ruid != euid. */
static int suid = 0;
@@ -2976,7 +3429,7 @@
/* Map from -o and fstab option strings to the flag argument to mount(2). */
struct opt_map {
const char *opt; /* option name */
-@@ -185,7 +183,7 @@ static const struct opt_map opt_map[] = {
+@@ -185,7 +183,7 @@
{ NULL, 0, 0, 0 }
};
@@ -2985,7 +3438,7 @@
*opt_speed, *opt_comment, *opt_uhelper;
static int mounted (const char *spec0, const char *node0);
-@@ -199,8 +197,16 @@ static struct string_opt_map {
+@@ -199,8 +197,16 @@
} string_opt_map[] = {
{ "loop=", 0, &opt_loopdev },
{ "vfs=", 1, &opt_vfstype },
@@ -3004,7 +3457,7 @@
{ "speed=", 0, &opt_speed },
{ "comment=", 1, &opt_comment },
{ "uhelper=", 0, &opt_uhelper },
-@@ -826,9 +832,8 @@ suid_check(const char *spec, const char *node, int *flags, char **user) {
+@@ -826,9 +832,8 @@
static int
loop_check(const char **spec, const char **type, int *flags,
@@ -3015,7 +3468,7 @@
/*
* In the case of a loop mount, either type is of the form lo@/dev/loop5
-@@ -853,7 +858,7 @@ loop_check(const char **spec, const char **type, int *flags,
+@@ -853,7 +858,7 @@
*type = opt_vfstype;
}
@@ -3024,7 +3477,7 @@
*loopfile = *spec;
if (*loop) {
-@@ -861,12 +866,14 @@ loop_check(const char **spec, const char **type, int *flags,
+@@ -861,12 +866,14 @@
if (fake) {
if (verbose)
printf(_("mount: skipping the setup of a loop device\n"));
@@ -3041,17 +3494,30 @@
do {
if (!*loopdev || !**loopdev)
*loopdev = find_unused_loop_device();
-@@ -875,8 +882,7 @@ loop_check(const char **spec, const char **type, int *flags,
+@@ -875,19 +882,18 @@
if (verbose)
printf(_("mount: going to use the loop device %s\n"), *loopdev);
- if ((res = set_loop(*loopdev, *loopfile, offset,
- opt_encryption, pfd, &loopro))) {
-+ if ((res = set_loop(*loopdev, *loopfile, &loopro, type, AutoChmodPtr))) {
++ if ((res = set_loop(*loopdev, *loopfile, &loopro, type, AutoChmodPtr, !opt_loopdev ? 2 : 1))) {
if (res == 2) {
/* loop dev has been grabbed by some other process,
try again, if not given explicitly */
-@@ -960,14 +966,6 @@ update_mtab_entry(const char *spec, const char *node, const char *type,
+ if (!opt_loopdev) {
+ if (verbose)
+- printf(_("mount: stolen loop=%s ...trying again\n"), *loopdev);
++ printf(_("mount: loop=%s not available ...trying again\n"), *loopdev);
+ my_free(*loopdev);
+ *loopdev = NULL;
+ continue;
+ }
+- error(_("mount: stolen loop=%s"), *loopdev);
++ error(_("mount: loop=%s not available"), *loopdev);
+ return EX_FAIL;
+
+ } else {
+@@ -960,14 +966,6 @@
}
static void
@@ -3066,7 +3532,7 @@
cdrom_setspeed(const char *spec) {
#define CDROM_SELECT_SPEED 0x5322 /* Set the CD-ROM speed */
if (opt_speed) {
-@@ -1006,6 +1004,7 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
+@@ -1006,6 +1004,7 @@
const char *opts, *spec, *node, *types;
char *user = 0;
int loop = 0;
@@ -3074,7 +3540,7 @@
const char *loopdev = 0, *loopfile = 0;
struct stat statbuf;
-@@ -1052,7 +1051,7 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
+@@ -1052,7 +1051,7 @@
* stale assignments of files to loop devices. Nasty when used for
* encryption.
*/
@@ -3083,10 +3549,11 @@
if (res)
goto out;
}
-@@ -1076,6 +1075,16 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
+@@ -1075,7 +1074,16 @@
+ if (!fake) {
mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS,
mount_opts, &special, &status);
-
+-
+ if(!mnt5_res && LoopMountAutomaticChmod && (getuid() == 0)) {
+ /*
+ * If loop was set up using random keys and new file system
@@ -3100,7 +3567,7 @@
if (special) {
block_signals (SIG_UNBLOCK);
res = status;
-@@ -1836,8 +1845,8 @@ main(int argc, char *argv[]) {
+@@ -1836,8 +1844,8 @@
case 'O': /* with -t: mount only if (not) opt */
test_opts = append_opt(test_opts, optarg, NULL);
break;
@@ -3111,11 +3578,9 @@
break;
case 'r': /* mount readonly */
readonly = 1;
-diff --git a/mount/rmd160.c b/mount/rmd160.c
-new file mode 100644
-index 0000000..930e61e
---- /dev/null
-+++ b/mount/rmd160.c
+diff -urN util-linux-ng-2.13/mount/rmd160.c util-linux-ng-2.13-AES/mount/rmd160.c
+--- util-linux-ng-2.13/mount/rmd160.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/rmd160.c 2007-09-02 18:05:42.000000000 +0300
@@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc.
@@ -3649,11 +4114,9 @@
+ rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 );
+}
-diff --git a/mount/rmd160.h b/mount/rmd160.h
-new file mode 100644
-index 0000000..dab329e
---- /dev/null
-+++ b/mount/rmd160.h
+diff -urN util-linux-ng-2.13/mount/rmd160.h util-linux-ng-2.13-AES/mount/rmd160.h
+--- util-linux-ng-2.13/mount/rmd160.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/rmd160.h 2007-09-02 18:05:42.000000000 +0300
@@ -0,0 +1,9 @@
+#ifndef RMD160_H
+#define RMD160_H
@@ -3664,11 +4127,9 @@
+#endif /*RMD160_H*/
+
+
-diff --git a/mount/sha512.c b/mount/sha512.c
-new file mode 100644
-index 0000000..a795228
---- /dev/null
-+++ b/mount/sha512.c
+diff -urN util-linux-ng-2.13/mount/sha512.c util-linux-ng-2.13-AES/mount/sha512.c
+--- util-linux-ng-2.13/mount/sha512.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/sha512.c 2007-09-02 18:05:42.000000000 +0300
@@ -0,0 +1,432 @@
+/*
+ * sha512.c
@@ -4102,11 +4563,9 @@
+ memset(&ctx, 0, sizeof(ctx));
+}
+#endif
-diff --git a/mount/sha512.h b/mount/sha512.h
-new file mode 100644
-index 0000000..817dc26
---- /dev/null
-+++ b/mount/sha512.h
+diff -urN util-linux-ng-2.13/mount/sha512.h util-linux-ng-2.13-AES/mount/sha512.h
+--- util-linux-ng-2.13/mount/sha512.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.13-AES/mount/sha512.h 2007-09-02 18:05:42.000000000 +0300
@@ -0,0 +1,45 @@
+/*
+ * sha512.h
@@ -4153,11 +4612,10 @@
+/* no sha384_write(), use sha512_write() */
+/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */
+extern void sha384_hash_buffer(unsigned char *, int, unsigned char *, int);
-diff --git a/mount/swapon.8 b/mount/swapon.8
-index 138b819..6f3b652 100644
---- a/mount/swapon.8
-+++ b/mount/swapon.8
-@@ -142,6 +142,22 @@ flag is given, swapping is disabled on all known swap devices and files
+diff -urN util-linux-ng-2.13/mount/swapon.8 util-linux-ng-2.13-AES/mount/swapon.8
+--- util-linux-ng-2.13/mount/swapon.8 2007-08-13 13:49:22.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/swapon.8 2007-09-02 18:05:42.000000000 +0300
+@@ -142,6 +142,22 @@
.I /proc/swaps
or
.IR /etc/fstab ).
@@ -4180,17 +4638,17 @@
.SH NOTE
You should not use
.B swapon
-diff --git a/mount/swapon.c b/mount/swapon.c
-index ed91afc..8155b60 100644
---- a/mount/swapon.c
-+++ b/mount/swapon.c
-@@ -1,18 +1,41 @@
+diff -urN util-linux-ng-2.13/mount/swapon.c util-linux-ng-2.13-AES/mount/swapon.c
+--- util-linux-ng-2.13/mount/swapon.c 2007-08-27 16:00:34.000000000 +0300
++++ util-linux-ng-2.13-AES/mount/swapon.c 2007-09-02 18:05:42.000000000 +0300
+@@ -1,5 +1,18 @@
/*
* A swapon(8)/swapoff(8) for Linux 0.99.
++ * swapon.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
+ *
+ * 1997-02-xx <Vincent.Renardias at waw.com>
+ * - added '-s' (summary option)
-+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek at pld.ORG.PL>
++ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek at pld.ORG.PL>
+ * - added Native Language Support
+ * 1999-03-21 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
+ * - fixed strerr(errno) in gettext calls
@@ -4202,9 +4660,7 @@
*/
#include <ctype.h>
#include <stdlib.h>
- #include <stdio.h>
-+#include <unistd.h>
- #include <getopt.h>
+@@ -8,7 +21,14 @@
#include <string.h>
#include <mntent.h>
#include <errno.h>
@@ -4219,14 +4675,17 @@
#include <unistd.h>
#include "xmalloc.h"
#include "swap_constants.h"
- #include "nls.h"
+@@ -16,6 +36,9 @@
+ #include "fsprobe.h"
+ #include "realpath.h"
+ #include "mount_paths.h"
+#include "loop.h"
+#include "xstrncpy.h"
+#include "sha512.h"
- #include "fsprobe.h"
- #include "realpath.h"
- #include "mount_paths.h"
-@@ -288,6 +311,262 @@ swapoff_by_uuid(const char *uuid, int quiet) {
+
+ #ifdef HAVE_SYS_SWAP_H
+ # include <sys/swap.h>
+@@ -288,6 +311,262 @@
}
static int
@@ -4489,7 +4948,7 @@
swapon_all(void) {
FILE *fp;
struct mntent *fstab;
-@@ -307,6 +586,8 @@ swapon_all(void) {
+@@ -307,6 +586,8 @@
const char *special;
int skip = 0;
int pri = priority;
@@ -4498,7 +4957,7 @@
if (!streq(fstab->mnt_type, MNTTYPE_SWAP))
continue;
-@@ -315,23 +596,39 @@ swapon_all(void) {
+@@ -315,23 +596,39 @@
if (!special)
continue;
@@ -4513,9 +4972,6 @@
- pri = atoi(opt+4);
- if (strcmp(opt, "noauto") == 0)
- skip = 1;
-- }
-- if (!skip)
-- status |= do_swapon(special, pri, CANONIC);
+ /* parse mount options; */
+ opts = strdup(fstab->mnt_opts);
+ if (!opts) {
@@ -4541,7 +4997,9 @@
+ continue;
+ }
+ status |= do_swapon(loop, pri, CANONIC);
-+ }
+ }
+- if (!skip)
+- status |= do_swapon(special, pri, CANONIC);
+ continue;
+ }
+ if (!is_in_proc_swaps(special) && (!ifexists || !access(special, R_OK))) {
@@ -4553,7 +5011,7 @@
return status;
}
-@@ -494,19 +791,49 @@ main_swapoff(int argc, char *argv[]) {
+@@ -494,19 +791,51 @@
exit(2);
}
while ((fstab = getmntent(fp)) != NULL) {
@@ -4587,7 +5045,7 @@
+ encryption = opt + 11;
+ }
+ if (loop && encryption) {
-+ if (!is_in_proc_swaps(loop)) {
++ if (!is_in_proc_swaps(loop)) {
+ if(skip)
+ continue;
+ do_swapoff(loop, QUIET, CANONIC);
@@ -4600,6 +5058,8 @@
+ if (!is_in_proc_swaps(special)) {
do_swapoff(special, QUIET, CANONIC);
+ }
++
++
}
- fclose(fp);
+ endmntent(fp);
More information about the Pkg-loop-aes-commits
mailing list