summaryrefslogtreecommitdiffstats
path: root/abs/core/util-linux-ng
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/util-linux-ng')
-rw-r--r--abs/core/util-linux-ng/PKGBUILD56
-rw-r--r--abs/core/util-linux-ng/cryptoloop-support.patch4649
-rw-r--r--abs/core/util-linux-ng/fix-findmnt.patch24
-rw-r--r--abs/core/util-linux-ng/util-linux-ng-2.14-20080624.diff6826
-rw-r--r--abs/core/util-linux-ng/util-linux-ng-cfdisk.patch57
-rw-r--r--abs/core/util-linux-ng/util-linux-ng-nilfs2.patch276
-rw-r--r--abs/core/util-linux-ng/util-linux-ng.install2
7 files changed, 391 insertions, 11499 deletions
diff --git a/abs/core/util-linux-ng/PKGBUILD b/abs/core/util-linux-ng/PKGBUILD
index 3d72cbc..6653137 100644
--- a/abs/core/util-linux-ng/PKGBUILD
+++ b/abs/core/util-linux-ng/PKGBUILD
@@ -1,39 +1,49 @@
-# $Id: PKGBUILD 29509 2009-03-09 17:25:09Z tpowa $
+# $Id: PKGBUILD 86506 2010-08-02 14:22:19Z tpowa $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=util-linux-ng
-pkgver=2.14.2
-_loop_date=20090214
-pkgrel=1
+pkgver=2.18
+pkgrel=3
pkgdesc="Miscellaneous system utilities for Linux"
url="http://userweb.kernel.org/~kzak/util-linux-ng/"
arch=('i686' 'x86_64')
groups=('base')
-depends=('bash' 'ncurses>=5.7' 'zlib' 'e2fsprogs')
+depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem')
replaces=('linux32' 'util-linux')
-conflicts=('linux32' 'util-linux')
+conflicts=('linux32' 'util-linux' 'e2fsprogs<1.41.8-2')
provides=('linux32' 'util-linux')
license=('GPL2')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.14/${pkgname}-${pkgver}.tar.bz2
- http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2)
+options=('!libtool')
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.18/${pkgname}-${pkgver}.tar.bz2
+ fix-findmnt.patch
+ util-linux-ng-nilfs2.patch
+ util-linux-ng-cfdisk.patch)
+optdepends=('perl: for chkdupexe support')
install=util-linux-ng.install
-md5sums=('b9d0053a22cfcbf0b9c0aa6d6eccfbc8'
- '72c5b3e961efc1bda2750dbad019e414')
+md5sums=('2f5f71e6af969d041d73ab778c141a77'
+ '7346673932b165faadde2fa2a9c1cd3a'
+ 'aa1f210aa22363605363b7b14b8f7a78'
+ 'e6d9309d44c258b25a7fb0b70f94f94e')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # cryptoloop support
- patch -Np1 -i ${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
# hardware clock
- sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
- mkdir -p ${startdir}/pkg/var/lib/hwclock
- ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev
+ sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1
+ mkdir -p "${pkgdir}/var/lib/hwclock" || return 1
+ # fix findmnt
+ patch -p1 -i "${srcdir}/fix-findmnt.patch"
+ # add nilfs2 support, included in next upstream release
+ patch -Np1 -i "${srcdir}/util-linux-ng-nilfs2.patch"
+ # fix cfdisk partition changing, included in next upstream release
+ patch -Np1 -i "${srcdir}/util-linux-ng-cfdisk.patch"
+
+ autoreconf || return 1
+ automake || return 1
+ ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev --enable-partx || return 1
make HAVE_SLN=yes ADD_RAW=yes || return 1
- make HAVE_SLN=yes ADD_RAW=yes DESTDIR=${startdir}/pkg install || return 1
+ make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" install || return 1
# remove files
- rm -f ${pkgdir}/bin/kill
- rm -f ${pkgdir}/usr/share/man/man1/kill.1
- rm -f ${pkgdir}/usr/share/man/man5/nfs.5
- rm -f ${pkgdir}/usr/share/info/dir
+ rm -f "${pkgdir}/bin/kill"
+ rm -f "${pkgdir}/usr/share/man/man1/kill.1"
+ rm -f "${pkgdir}/usr/share/man/man5/nfs.5"
+ rm -f "${pkgdir}/usr/share/info/dir"
}
-
diff --git a/abs/core/util-linux-ng/cryptoloop-support.patch b/abs/core/util-linux-ng/cryptoloop-support.patch
deleted file mode 100644
index 91aa12d..0000000
--- a/abs/core/util-linux-ng/cryptoloop-support.patch
+++ /dev/null
@@ -1,4649 +0,0 @@
-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 \
-+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)
-+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 loumount.c loop.c sha512.c rmd160.c aes.c loop.h lomount.h
- losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
-
- mount_LDADD = $(LDADD_common)
-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
-+// happy to see it used in free and open source software. If you do use
-+// it I would appreciate an acknowledgement of its origin in the code or
-+// the product that results and I would also appreciate knowing a little
-+// about the use to which it is being put. I am grateful to Frank Yellin
-+// for some ideas that are used in this implementation.
-+//
-+// Dr B. R. Gladman <brg@gladman.uk.net> 6th April 2001.
-+//
-+// This is an implementation of the AES encryption algorithm (Rijndael)
-+// designed by Joan Daemen and Vincent Rijmen. This version is designed
-+// to provide both fixed and dynamic block and key lengths and can also
-+// run with either big or little endian internal byte order (see aes.h).
-+// It inputs block and key lengths in bytes with the legal values being
-+// 16, 24 and 32.
-+
-+/*
-+ * Modified by Jari Ruusu, May 1 2001
-+ * - Fixed some compile warnings, code was ok but gcc warned anyway.
-+ * - Changed basic types: byte -> unsigned char, word -> u_int32_t
-+ * - Major name space cleanup: Names visible to outside now begin
-+ * with "aes_" or "AES_". A lot of stuff moved from aes.h to aes.c
-+ * - Removed C++ and DLL support as part of name space cleanup.
-+ * - Eliminated unnecessary recomputation of tables. (actual bug fix)
-+ * - Merged precomputed constant tables to aes.c file.
-+ * - Removed data alignment restrictions for portability reasons.
-+ * - Made block and key lengths accept bit count (128/192/256)
-+ * as well byte count (16/24/32).
-+ * - Removed all error checks. This change also eliminated the need
-+ * to preinitialize the context struct to zero.
-+ * - Removed some totally unused constants.
-+ */
-+
-+/*
-+ * Modified by Jari Ruusu, June 9 2003
-+ * - Removed all code not necessary for small size
-+ * optimized encryption using 256 bit keys.
-+ */
-+
-+#include "aes.h"
-+
-+#if AES_BLOCK_SIZE != 16
-+#error an illegal block size has been specified
-+#endif
-+
-+// upr(x,n): rotates bytes within words by n positions, moving bytes
-+// to higher index positions with wrap around into low positions
-+// bval(x,n): extracts a byte from a word
-+
-+#define upr(x,n) (((x) << 8 * (n)) | ((x) >> (32 - 8 * (n))))
-+#define bval(x,n) ((unsigned char)((x) >> 8 * (n)))
-+#define bytes2word(b0, b1, b2, b3) \
-+ ((u_int32_t)(b3) << 24 | (u_int32_t)(b2) << 16 | (u_int32_t)(b1) << 8 | (b0))
-+
-+#if defined(i386) || defined(_I386) || defined(__i386__) || defined(__i386)
-+/* little endian processor without data alignment restrictions */
-+#define word_in(x) *(u_int32_t*)(x)
-+#define word_out(x,v) *(u_int32_t*)(x) = (v)
-+#else
-+/* slower but generic big endian or with data alignment restrictions */
-+#define word_in(x) ((u_int32_t)(((unsigned char *)(x))[0])|((u_int32_t)(((unsigned char *)(x))[1])<<8)|((u_int32_t)(((unsigned char *)(x))[2])<<16)|((u_int32_t)(((unsigned char *)(x))[3])<<24))
-+#define word_out(x,v) ((unsigned char *)(x))[0]=(v),((unsigned char *)(x))[1]=((v)>>8),((unsigned char *)(x))[2]=((v)>>16),((unsigned char *)(x))[3]=((v)>>24)
-+#endif
-+
-+// the finite field modular polynomial and elements
-+
-+#define ff_poly 0x011b
-+#define ff_hi 0x80
-+
-+static int tab_gen = 0;
-+static unsigned char s_box[256]; // the S box
-+static u_int32_t rcon_tab[AES_RC_LENGTH]; // table of round constants
-+static u_int32_t ft_tab[4][256];
-+static u_int32_t fl_tab[4][256];
-+
-+// Generate the tables for the dynamic table option
-+
-+// It will generally be sensible to use tables to compute finite
-+// field multiplies and inverses but where memory is scarse this
-+// code might sometimes be better.
-+
-+// return 2 ^ (n - 1) where n is the bit number of the highest bit
-+// set in x with x in the range 1 < x < 0x00000200. This form is
-+// used so that locals within FFinv can be bytes rather than words
-+
-+static unsigned char hibit(const u_int32_t x)
-+{ unsigned char r = (unsigned char)((x >> 1) | (x >> 2));
-+
-+ r |= (r >> 2);
-+ r |= (r >> 4);
-+ return (r + 1) >> 1;
-+}
-+
-+// return the inverse of the finite field element x
-+
-+static unsigned char FFinv(const unsigned char x)
-+{ unsigned char p1 = x, p2 = 0x1b, n1 = hibit(x), n2 = 0x80, v1 = 1, v2 = 0;
-+
-+ if(x < 2) return x;
-+
-+ for(;;)
-+ {
-+ if(!n1) return v1;
-+
-+ while(n2 >= n1)
-+ {
-+ n2 /= n1; p2 ^= p1 * n2; v2 ^= v1 * n2; n2 = hibit(p2);
-+ }
-+
-+ if(!n2) return v2;
-+
-+ while(n1 >= n2)
-+ {
-+ n1 /= n2; p1 ^= p2 * n1; v1 ^= v2 * n1; n1 = hibit(p1);
-+ }
-+ }
-+}
-+
-+// define the finite field multiplies required for Rijndael
-+
-+#define FFmul02(x) ((((x) & 0x7f) << 1) ^ ((x) & 0x80 ? 0x1b : 0))
-+#define FFmul03(x) ((x) ^ FFmul02(x))
-+
-+// The forward and inverse affine transformations used in the S-box
-+
-+#define fwd_affine(x) \
-+ (w = (u_int32_t)x, w ^= (w<<1)^(w<<2)^(w<<3)^(w<<4), 0x63^(unsigned char)(w^(w>>8)))
-+
-+static void gen_tabs(void)
-+{ u_int32_t i, w;
-+
-+ for(i = 0, w = 1; i < AES_RC_LENGTH; ++i)
-+ {
-+ rcon_tab[i] = bytes2word(w, 0, 0, 0);
-+ w = (w << 1) ^ (w & ff_hi ? ff_poly : 0);
-+ }
-+
-+ for(i = 0; i < 256; ++i)
-+ { unsigned char b;
-+
-+ s_box[i] = b = fwd_affine(FFinv((unsigned char)i));
-+
-+ w = bytes2word(b, 0, 0, 0);
-+ fl_tab[0][i] = w;
-+ fl_tab[1][i] = upr(w,1);
-+ fl_tab[2][i] = upr(w,2);
-+ fl_tab[3][i] = upr(w,3);
-+ w = bytes2word(FFmul02(b), b, b, FFmul03(b));
-+ ft_tab[0][i] = w;
-+ ft_tab[1][i] = upr(w,1);
-+ ft_tab[2][i] = upr(w,2);
-+ ft_tab[3][i] = upr(w,3);
-+ }
-+}
-+
-+#define four_tables(x,tab,vf,rf,c) \
-+ ( tab[0][bval(vf(x,0,c),rf(0,c))] \
-+ ^ tab[1][bval(vf(x,1,c),rf(1,c))] \
-+ ^ tab[2][bval(vf(x,2,c),rf(2,c))] \
-+ ^ tab[3][bval(vf(x,3,c),rf(3,c))])
-+
-+#define vf1(x,r,c) (x)
-+#define rf1(r,c) (r)
-+#define rf2(r,c) ((r-c)&3)
-+
-+#define ls_box(x,c) four_tables(x,fl_tab,vf1,rf2,c)
-+
-+#define nc (AES_BLOCK_SIZE / 4)
-+
-+// Initialise the key schedule from the user supplied key.
-+// The key length is now specified in bytes, 32.
-+// This corresponds to bit length of 256 bits, and
-+// to Nk value of 8 respectively.
-+
-+void aes_set_key(aes_context *cx, const unsigned char in_key[], int n_bytes, const int f)
-+{ u_int32_t *kf, *kt, rci;
-+
-+ if(!tab_gen) { gen_tabs(); tab_gen = 1; }
-+
-+ cx->aes_Nkey = 8;
-+ cx->aes_Nrnd = (cx->aes_Nkey > nc ? cx->aes_Nkey : nc) + 6;
-+
-+ cx->aes_e_key[0] = word_in(in_key );
-+ cx->aes_e_key[1] = word_in(in_key + 4);
-+ cx->aes_e_key[2] = word_in(in_key + 8);
-+ cx->aes_e_key[3] = word_in(in_key + 12);
-+
-+ kf = cx->aes_e_key;
-+ kt = kf + nc * (cx->aes_Nrnd + 1) - cx->aes_Nkey;
-+ rci = 0;
-+
-+ switch(cx->aes_Nkey)
-+ {
-+ case 8: cx->aes_e_key[4] = word_in(in_key + 16);
-+ cx->aes_e_key[5] = word_in(in_key + 20);
-+ cx->aes_e_key[6] = word_in(in_key + 24);
-+ cx->aes_e_key[7] = word_in(in_key + 28);
-+ do
-+ { kf[ 8] = kf[0] ^ ls_box(kf[7],3) ^ rcon_tab[rci++];
-+ kf[ 9] = kf[1] ^ kf[ 8];
-+ kf[10] = kf[2] ^ kf[ 9];
-+ kf[11] = kf[3] ^ kf[10];
-+ kf[12] = kf[4] ^ ls_box(kf[11],0);
-+ kf[13] = kf[5] ^ kf[12];
-+ kf[14] = kf[6] ^ kf[13];
-+ kf[15] = kf[7] ^ kf[14];
-+ kf += 8;
-+ }
-+ while (kf < kt);
-+ break;
-+ }
-+}
-+
-+// y = output word, x = input word, r = row, c = column
-+// for r = 0, 1, 2 and 3 = column accessed for row r
-+
-+#define s(x,c) x[c]
-+
-+// I am grateful to Frank Yellin for the following constructions
-+// which, given the column (c) of the output state variable that
-+// is being computed, return the input state variables which are
-+// needed for each row (r) of the state
-+
-+// For the fixed block size options, compilers reduce these two
-+// expressions to fixed variable references. For variable block
-+// size code conditional clauses will sometimes be returned
-+
-+#define fwd_var(x,r,c) \
-+ ( r==0 ? \
-+ ( c==0 ? s(x,0) \
-+ : c==1 ? s(x,1) \
-+ : c==2 ? s(x,2) \
-+ : c==3 ? s(x,3) \
-+ : c==4 ? s(x,4) \
-+ : c==5 ? s(x,5) \
-+ : c==6 ? s(x,6) \
-+ : s(x,7)) \
-+ : r==1 ? \
-+ ( c==0 ? s(x,1) \
-+ : c==1 ? s(x,2) \
-+ : c==2 ? s(x,3) \
-+ : c==3 ? nc==4 ? s(x,0) : s(x,4) \
-+ : c==4 ? s(x,5) \
-+ : c==5 ? nc==8 ? s(x,6) : s(x,0) \
-+ : c==6 ? s(x,7) \
-+ : s(x,0)) \
-+ : r==2 ? \
-+ ( c==0 ? nc==8 ? s(x,3) : s(x,2) \
-+ : c==1 ? nc==8 ? s(x,4) : s(x,3) \
-+ : c==2 ? nc==4 ? s(x,0) : nc==8 ? s(x,5) : s(x,4) \
-+ : c==3 ? nc==4 ? s(x,1) : nc==8 ? s(x,6) : s(x,5) \
-+ : c==4 ? nc==8 ? s(x,7) : s(x,0) \
-+ : c==5 ? nc==8 ? s(x,0) : s(x,1) \
-+ : c==6 ? s(x,1) \
-+ : s(x,2)) \
-+ : \
-+ ( c==0 ? nc==8 ? s(x,4) : s(x,3) \
-+ : c==1 ? nc==4 ? s(x,0) : nc==8 ? s(x,5) : s(x,4) \
-+ : c==2 ? nc==4 ? s(x,1) : nc==8 ? s(x,6) : s(x,5) \
-+ : c==3 ? nc==4 ? s(x,2) : nc==8 ? s(x,7) : s(x,0) \
-+ : c==4 ? nc==8 ? s(x,0) : s(x,1) \
-+ : c==5 ? nc==8 ? s(x,1) : s(x,2) \
-+ : c==6 ? s(x,2) \
-+ : s(x,3)))
-+
-+#define si(y,x,k,c) s(y,c) = word_in(x + 4 * c) ^ k[c]
-+#define so(y,x,c) word_out(y + 4 * c, s(x,c))
-+
-+#define fwd_rnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,ft_tab,fwd_var,rf1,c)
-+#define fwd_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,fl_tab,fwd_var,rf1,c)
-+
-+#define locals(y,x) x[4],y[4]
-+
-+#define l_copy(y, x) s(y,0) = s(x,0); s(y,1) = s(x,1); \
-+ s(y,2) = s(x,2); s(y,3) = s(x,3);
-+#define state_in(y,x,k) si(y,x,k,0); si(y,x,k,1); si(y,x,k,2); si(y,x,k,3)
-+#define state_out(y,x) so(y,x,0); so(y,x,1); so(y,x,2); so(y,x,3)
-+#define round(rm,y,x,k) rm(y,x,k,0); rm(y,x,k,1); rm(y,x,k,2); rm(y,x,k,3)
-+
-+void aes_encrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
-+{ u_int32_t locals(b0, b1);
-+ const u_int32_t *kp = cx->aes_e_key;
-+
-+ state_in(b0, in_blk, kp); kp += nc;
-+
-+ { u_int32_t rnd;
-+
-+ for(rnd = 0; rnd < cx->aes_Nrnd - 1; ++rnd)
-+ {
-+ round(fwd_rnd, b1, b0, kp);
-+ l_copy(b0, b1); kp += nc;
-+ }
-+
-+ round(fwd_lrnd, b0, b1, kp);
-+ }
-+
-+ state_out(out_blk, b0);
-+}
-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
-+// happy to see it used in free and open source software. If you do use
-+// it I would appreciate an acknowledgement of its origin in the code or
-+// the product that results and I would also appreciate knowing a little
-+// about the use to which it is being put. I am grateful to Frank Yellin
-+// for some ideas that are used in this implementation.
-+//
-+// Dr B. R. Gladman <brg@gladman.uk.net> 6th April 2001.
-+//
-+// This is an implementation of the AES encryption algorithm (Rijndael)
-+// designed by Joan Daemen and Vincent Rijmen. This version is designed
-+// to provide both fixed and dynamic block and key lengths and can also
-+// run with either big or little endian internal byte order (see aes.h).
-+// It inputs block and key lengths in bytes with the legal values being
-+// 16, 24 and 32.
-+
-+/*
-+ * Modified by Jari Ruusu, May 1 2001
-+ * - Fixed some compile warnings, code was ok but gcc warned anyway.
-+ * - Changed basic types: byte -> unsigned char, word -> u_int32_t
-+ * - Major name space cleanup: Names visible to outside now begin
-+ * with "aes_" or "AES_". A lot of stuff moved from aes.h to aes.c
-+ * - Removed C++ and DLL support as part of name space cleanup.
-+ * - Eliminated unnecessary recomputation of tables. (actual bug fix)
-+ * - Merged precomputed constant tables to aes.c file.
-+ * - Removed data alignment restrictions for portability reasons.
-+ * - Made block and key lengths accept bit count (128/192/256)
-+ * as well byte count (16/24/32).
-+ * - Removed all error checks. This change also eliminated the need
-+ * to preinitialize the context struct to zero.
-+ * - Removed some totally unused constants.
-+ */
-+
-+#ifndef _AES_H
-+#define _AES_H
-+
-+#if defined(__linux__) && defined(__KERNEL__)
-+# include <linux/types.h>
-+#else
-+# include <sys/types.h>
-+#endif
-+
-+// CONFIGURATION OPTIONS (see also aes.c)
-+//
-+// Define AES_BLOCK_SIZE to set the cipher block size (16, 24 or 32) or
-+// leave this undefined for dynamically variable block size (this will
-+// result in much slower code).
-+// IMPORTANT NOTE: AES_BLOCK_SIZE is in BYTES (16, 24, 32 or undefined). If
-+// left undefined a slower version providing variable block length is compiled
-+
-+#define AES_BLOCK_SIZE 16
-+
-+// The number of key schedule words for different block and key lengths
-+// allowing for method of computation which requires the length to be a
-+// multiple of the key length
-+//
-+// Nk = 4 6 8
-+// -------------
-+// Nb = 4 | 60 60 64
-+// 6 | 96 90 96
-+// 8 | 120 120 120
-+
-+#if !defined(AES_BLOCK_SIZE) || (AES_BLOCK_SIZE == 32)
-+#define AES_KS_LENGTH 120
-+#define AES_RC_LENGTH 29
-+#else
-+#define AES_KS_LENGTH 4 * AES_BLOCK_SIZE
-+#define AES_RC_LENGTH (9 * AES_BLOCK_SIZE) / 8 - 8
-+#endif
-+
-+typedef struct
-+{
-+ u_int32_t aes_Nkey; // the number of words in the key input block
-+ u_int32_t aes_Nrnd; // the number of cipher rounds
-+ u_int32_t aes_e_key[AES_KS_LENGTH]; // the encryption key schedule
-+ u_int32_t aes_d_key[AES_KS_LENGTH]; // the decryption key schedule
-+#if !defined(AES_BLOCK_SIZE)
-+ u_int32_t aes_Ncol; // the number of columns in the cipher state
-+#endif
-+} aes_context;
-+
-+// THE CIPHER INTERFACE
-+
-+#if !defined(AES_BLOCK_SIZE)
-+extern void aes_set_blk(aes_context *, const int);
-+#endif
-+extern void aes_set_key(aes_context *, const unsigned char [], const int, const int);
-+extern void aes_encrypt(const aes_context *, const unsigned char [], unsigned char []);
-+extern void aes_decrypt(const aes_context *, const unsigned char [], unsigned char []);
-+
-+// The block length inputs to aes_set_block and aes_set_key are in numbers
-+// of bytes or bits. The calls to subroutines must be made in the above
-+// order but multiple calls can be made without repeating earlier calls
-+// if their parameters have not changed.
-+
-+#endif // _AES_H
-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@mrc-apu.cam.ac.uk> */
-+/* Added vfs mount options - aeb - 960223 */
-+/* Removed lomount - aeb - 960224 */
-+
-+/*
-+ * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL>
-+ * - added Native Language Support
-+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * - fixed strerr(errno) in gettext calls
-+ * 2001-04-11 Jari Ruusu
-+ * - added AES support
-+ */
-
- #define LOOPMAJOR 7
-
-@@ -13,62 +24,81 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <pwd.h>
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/sysmacros.h>
-+#include <sys/wait.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <mntent.h>
-+#include <locale.h>
-+#include <sys/time.h>
-+#include <sys/utsname.h>
-+#include <signal.h>
-
- #include "loop.h"
- #include "lomount.h"
- #include "xstrncpy.h"
- #include "nls.h"
-+#include "sha512.h"
-+#include "rmd160.h"
-+#include "aes.h"
-+
-+#if !defined(BLKGETSIZE64)
-+# define BLKGETSIZE64 _IOR(0x12,114,size_t)
-+#endif
-
- extern int verbose;
--extern char *progname;
- extern char *xstrdup (const char *s); /* not: #include "sundries.h" */
- extern void error (const char *fmt, ...); /* idem */
-+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;
-+char *passHashFuncName = (char *)0;
-+char *passIterThousands = (char *)0;
-+char *loInitValue = (char *)0;
-+char *gpgKeyFile = (char *)0;
-+char *gpgHomeDir = (char *)0;
-+char *clearTextKeyFile = (char *)0;
-+char *loopOffsetBytes = (char *)0;
-+char *loopSizeBytes = (char *)0;
-+char *loopEncryptionType = (char *)0;
-+
-+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 int
--loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
--{
-- memset(info, 0, sizeof(*info));
-- info->lo_number = info64->lo_number;
-- info->lo_device = info64->lo_device;
-- info->lo_inode = info64->lo_inode;
-- info->lo_rdevice = info64->lo_rdevice;
-- info->lo_offset = info64->lo_offset;
-- info->lo_encrypt_type = info64->lo_encrypt_type;
-- info->lo_encrypt_key_size = info64->lo_encrypt_key_size;
-- info->lo_flags = info64->lo_flags;
-- info->lo_init[0] = info64->lo_init[0];
-- info->lo_init[1] = info64->lo_init[1];
-- if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI)
-- memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE);
-- else
-- memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE);
-- memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, LO_KEY_SIZE);
--
-- /* error in case values were truncated */
-- if (info->lo_device != info64->lo_device ||
-- info->lo_rdevice != info64->lo_rdevice ||
-- 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) {
-+ *flags = loop_crypt_type_tbl[i].flags;
-+ return loop_crypt_type_tbl[i].name;
-+ }
-+ *flags = 0;
-+ if(id == 18)
-+ return "CryptoAPI";
-+ return "undefined";
- }
-
--#ifdef MAIN
--
- static int
- show_loop(char *device) {
-- 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;
-@@ -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] = '*';
-- loopinfo64.lo_file_name[LO_NAME_SIZE-1] = 0;
-- loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0;
--
-- printf("%s: [%04llx]:%llu (%s)",
-- device, loopinfo64.lo_device, loopinfo64.lo_inode,
-- loopinfo64.lo_file_name);
--
-- if (loopinfo64.lo_offset)
-- printf(_(", offset %lld"), loopinfo64.lo_offset);
--
-- if (loopinfo64.lo_sizelimit)
-- printf(_(", sizelimit %lld"), loopinfo64.lo_sizelimit);
--
-- if (loopinfo64.lo_encrypt_type ||
-- loopinfo64.lo_crypt_name[0]) {
-- char *e = loopinfo64.lo_crypt_name;
--
-- if (*e == 0 && loopinfo64.lo_encrypt_type == 1)
-- e = "XOR";
-- printf(_(", encryption %s (type %d)"),
-- e, loopinfo64.lo_encrypt_type);
-- }
-- printf("\n");
-+ if (loop_get_status64_ioctl(fd, &loopinfo) < 0) {
-+ int errsv = errno;
-+ fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
-+ device, strerror (errsv));
- close (fd);
-- return 0;
-+ return 1;
- }
--
-- if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) {
-- printf ("%s: [%04x]:%ld (%s)",
-- device, loopinfo.lo_device, loopinfo.lo_inode,
-- loopinfo.lo_name);
--
-- 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,
-+ (unsigned long long)loopinfo.lo_inode, loopinfo.lo_file_name);
-+ if (loopinfo.lo_offset) {
-+ if ((long long)loopinfo.lo_offset < 0) {
-+ printf(_(" offset=@%llu"), -((unsigned long long)loopinfo.lo_offset));
-+ } else {
-+ printf(_(" offset=%llu"), (unsigned long long)loopinfo.lo_offset);
-+ }
- }
--
-- 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(_(" encryption=%s"), s);
-+ /* type 18 == LO_CRYPT_CRYPTOAPI */
-+ if (loopinfo.lo_encrypt_type == 18) {
-+ printf("/%s", loopinfo.lo_crypt_name);
-+ } else {
-+ if(flags & 2)
-+ printf("-");
-+ if(flags & 1)
-+ printf("%u", (unsigned int)loopinfo.lo_encrypt_key_size << 3);
- }
-+ }
-+ switch(loopinfo.lo_flags & 0x180000) {
-+ case 0x180000:
-+ printf(_(" multi-key-v3"));
-+ break;
-+ case 0x100000:
-+ printf(_(" multi-key-v2"));
- 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);
-
-- if (somedev==0 && permission) {
-- error(_("%s: no permission to look at /dev/loop#"), progname);
-- return 1;
-- }
- return 0;
- }
--
--
- #endif
-
--int
--is_loop_device (const char *device) {
-- struct stat statbuf;
--
-- return (stat(device, &statbuf) == 0 &&
-- 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 +171,8 @@
- So, we just try /dev/loop[0-7]. */
- char dev[20];
- char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
-- int i, j, fd, somedev = 0, someloop = 0, permission = 0;
-+ int i, j, fd, somedev = 0, someloop = 0;
- struct stat statbuf;
-- struct loop_info loopinfo;
-
- for (j = 0; j < SIZE(loop_formats); j++) {
- for(i = 0; i < 256; i++) {
-@@ -194,16 +181,14 @@
- somedev++;
- fd = open (dev, O_RDONLY);
- if (fd >= 0) {
-- if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == 0)
-+ if (is_unused_loop_device(fd) == 0)
- someloop++; /* in use */
- else if (errno == ENXIO) {
- close (fd);
- return xstrdup(dev);/* probably free */
- }
- close (fd);
-- } else if (errno == EACCES)
-- permission++;
--
-+ }
- continue;/* continue trying as long as devices exist */
- }
- break;
-@@ -211,75 +196,626 @@
- }
-
- if (!somedev)
-- error(_("%s: could not find any device /dev/loop#"), progname);
-- else if (!someloop && permission)
-- error(_("%s: no permission to look at /dev/loop#"), progname);
-+ error(_("mount: could not find any device /dev/loop#"));
- else if (!someloop)
-- error(_(
-- "%s: Could not find any loop device. Maybe this kernel "
-- "does not know\n"
-- " about the loop device? (If so, recompile or "
-- "`modprobe loop'.)"), progname);
-+ error(_("mount: Could not find any loop device. Maybe this kernel does not know\n"
-+ " about the loop device? (If so, recompile or `modprobe loop'.)"));
- else
-- error(_("%s: could not find any free loop device"), progname);
-+ error(_("mount: could not find any free loop device"));
- return 0;
- }
-
--/*
-- * A function to read the passphrase either from the terminal or from
-- * an open file descriptor.
-- */
--static char *
--xgetpass(int pfd, const char *prompt) {
-- char *pass;
-- int buflen, i;
--
-- if (pfd < 0) /* terminal */
-- return getpass(prompt);
--
-- pass = NULL;
-- buflen = 0;
-- for (i=0; ; i++) {
-- if (i >= buflen-1) {
-- /* we're running out of space in the buffer.
-- * Make it bigger: */
-- char *tmppass = pass;
-- buflen += 128;
-- pass = realloc(tmppass, buflen);
-- if (pass == NULL) {
-- /* realloc failed. Stop reading. */
-- 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;
-+ int ret = 0;
-+ struct stat statbuf;
-+ struct loop_info64 loopinfo;
-+ if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ fd = open (dev, O_RDONLY);
-+ if (fd < 0)
-+ return 0;
-+ if ((loop_get_status64_ioctl(fd, &loopinfo) == 0)
-+ && (stat (backdev, &statbuf) == 0)
-+ && (statbuf.st_dev == loopinfo.lo_device)
-+ && (statbuf.st_ino == loopinfo.lo_inode))
-+ ret = 1; /* backing device matches */
-+ memset(&loopinfo, 0, sizeof(loopinfo));
-+ close(fd);
-+ }
-+ return ret;
-+}
-+#endif
-+
-+static int rd_wr_retry(int fd, char *buf, int cnt, int w)
-+{
-+ int x, y, z;
-+
-+ x = 0;
-+ while(x < cnt) {
-+ y = cnt - x;
-+ if(w) {
-+ z = write(fd, buf + x, y);
-+ } else {
-+ z = read(fd, buf + x, y);
-+ if (!z) return x;
-+ }
-+ if(z < 0) {
-+ if ((errno == EAGAIN) || (errno == ENOMEM) || (errno == ERESTART) || (errno == EINTR)) {
-+ continue;
-+ }
-+ return x;
-+ }
-+ x += z;
-+ }
-+ return x;
-+}
-+
-+static char *get_FD_pass(int fd)
-+{
-+ char *p = NULL, *n;
-+ int x = 0, y = 0;
-+
-+ do {
-+ if(y >= (x - 1)) {
-+ x += 128;
-+ /* Must enforce some max limit here -- this code */
-+ /* runs as part of mount, and mount is setuid root */
-+ /* and has used mlockall(MCL_CURRENT | MCL_FUTURE) */
-+ if(x > (4*1024)) return(NULL);
-+ n = malloc(x);
-+ if(!n) return(NULL);
-+ if(p) {
-+ memcpy(n, p, y);
-+ memset(p, 0, y);
-+ free(p);
-+ }
-+ p = n;
-+ }
-+ if(rd_wr_retry(fd, p + y, 1, 0) != 1) break;
-+ if((p[y] == '\n') || !p[y]) break;
-+ y++;
-+ } while(1);
-+ if(p) p[y] = 0;
-+ return p;
-+}
-+
-+static unsigned long long mystrtoull(char *s, int acceptAT)
-+{
-+ unsigned long long v = 0;
-+ int negative = 0;
-+
-+ while ((*s == ' ') || (*s == '\t'))
-+ s++;
-+ if (acceptAT && (*s == '@')) {
-+ s++;
-+ negative = 1;
-+ }
-+ if (*s == '0') {
-+ s++;
-+ if ((*s == 'x') || (*s == 'X')) {
-+ s++;
-+ sscanf(s, "%llx", &v);
-+ } else {
-+ sscanf(s, "%llo", &v);
-+ }
-+ } else {
-+ sscanf(s, "%llu", &v);
-+ }
-+ return negative ? -v : v;
-+}
-+
-+static void warnAboutBadKeyData(int x)
-+{
-+ if((x > 1) && (x != 64) && (x != 65)) {
-+ fprintf(stderr, _("Warning: Unknown key data format - using it anyway\n"));
-+ }
-+}
-+
-+static char *do_GPG_pipe(char *pass)
-+{
-+ int x, pfdi[2], pfdo[2];
-+ char str[10], *a[16], *e[2], *h;
-+ pid_t gpid;
-+ struct passwd *p;
-+ void *oldSigPipeHandler;
-+
-+ if((getuid() == 0) && gpgHomeDir && gpgHomeDir[0]) {
-+ h = gpgHomeDir;
-+ } else {
-+ if(!(p = getpwuid(getuid()))) {
-+ fprintf(stderr, _("Error: Unable to detect home directory for uid %d\n"), (int)getuid());
-+ return NULL;
-+ }
-+ h = p->pw_dir;
-+ }
-+ if(!(e[0] = malloc(strlen(h) + 6))) {
-+ nomem1:
-+ fprintf(stderr, _("Error: Unable to allocate memory\n"));
-+ return NULL;
-+ }
-+ sprintf(e[0], "HOME=%s", h);
-+ e[1] = 0;
-+
-+ if(pipe(&pfdi[0])) {
-+ nomem2:
-+ free(e[0]);
-+ goto nomem1;
-+ }
-+ if(pipe(&pfdo[0])) {
-+ close(pfdi[0]);
-+ close(pfdi[1]);
-+ goto nomem2;
-+ }
-+
-+ /*
-+ * When this code is run as part of losetup, normal read permissions
-+ * affect the open() below because losetup is not setuid-root.
-+ *
-+ * When this code is run as part of mount, only root can set
-+ * 'gpgKeyFile' and as such, only root can decide what file is opened
-+ * below. However, since mount is usually setuid-root all non-root
-+ * users can also open() the file too, but that file's contents are
-+ * only piped to gpg. This readable-for-all is intended behaviour,
-+ * and is very useful in situations where non-root users mount loop
-+ * devices with their own gpg private key, and yet don't have access
-+ * to the actual key used to encrypt loop device.
-+ */
-+ if((x = open(gpgKeyFile, O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open %s for reading\n"), gpgKeyFile);
-+ nomem3:
-+ free(e[0]);
-+ close(pfdo[0]);
-+ close(pfdo[1]);
-+ close(pfdi[0]);
-+ close(pfdi[1]);
-+ return NULL;
-+ }
-+
-+ /*
-+ * If someone puts a gpg key file at beginning of device and
-+ * puts the real file system at some offset into the device,
-+ * this code extracts that gpg key file into a temp file so gpg
-+ * won't end up reading whole device when decrypting the key file.
-+ *
-+ * Example of encrypted cdrom mount with 8192 bytes reserved for gpg key file:
-+ * mount -t iso9660 /dev/cdrom /cdrom -o loop=/dev/loop0,encryption=AES128,gpgkey=/dev/cdrom,offset=8192
-+ * ^^^^^^^^^^ ^^^^^^^^^^ ^^^^
-+ */
-+ if(loopOffsetBytes && !strcmp(loopFileName, gpgKeyFile)) {
-+ FILE *f;
-+ char b[1024];
-+ long long cnt;
-+ int cnt2, cnt3;
-+
-+ cnt = mystrtoull(loopOffsetBytes, 1);
-+ if(cnt < 0) cnt = -cnt;
-+ if(cnt > (1024 * 1024)) cnt = 1024 * 1024; /* sanity check */
-+ f = tmpfile();
-+ if(!f) {
-+ fprintf(stderr, _("Error: unable to create temp file\n"));
-+ close(x);
-+ goto nomem3;
-+ }
-+ while(cnt > 0) {
-+ cnt2 = sizeof(b);
-+ if(cnt < cnt2) cnt2 = cnt;
-+ cnt3 = rd_wr_retry(x, b, cnt2, 0);
-+ if(cnt3 && (fwrite(b, cnt3, 1, f) != 1)) {
-+ tmpWrErr:
-+ fprintf(stderr, _("Error: unable to write to temp file\n"));
-+ fclose(f);
-+ close(x);
-+ goto nomem3;
-+ }
-+ if(cnt2 != cnt3) break;
-+ cnt -= cnt3;
-+ }
-+ if(fflush(f)) goto tmpWrErr;
-+ close(x);
-+ x = dup(fileno(f));
-+ fclose(f);
-+ lseek(x, 0L, SEEK_SET);
-+ }
-+
-+ sprintf(str, "%d", pfdi[0]);
-+ if(!(gpid = fork())) {
-+ dup2(x, 0);
-+ dup2(pfdo[1], 1);
-+ close(x);
-+ close(pfdi[1]);
-+ close(pfdo[0]);
-+ close(pfdo[1]);
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ x = 0;
-+ a[x++] = "gpg";
-+ if(gpgHomeDir && gpgHomeDir[0]) {
-+ a[x++] = "--homedir";
-+ a[x++] = gpgHomeDir;
-+ }
-+ a[x++] = "--no-options";
-+ a[x++] = "--quiet";
-+ a[x++] = "--batch";
-+ a[x++] = "--no-tty";
-+ a[x++] = "--passphrase-fd";
-+ a[x++] = str;
-+ a[x++] = "--decrypt";
-+ a[x] = 0;
-+ setgid(getgid());
-+ setuid(getuid());
-+ for(x = 3; x < 1024; x++) {
-+ if(x == pfdi[0]) continue;
-+ close(x);
-+ }
-+ execve("/bin/gpg", &a[0], &e[0]);
-+ execve("/usr/bin/gpg", &a[0], &e[0]);
-+ execve("/usr/local/bin/gpg", &a[0], &e[0]);
-+ exit(1);
-+ }
-+ free(e[0]);
-+ close(x);
-+ close(pfdi[0]);
-+ close(pfdo[1]);
-+ if(gpid == -1) {
-+ close(pfdi[1]);
-+ close(pfdo[0]);
-+ goto nomem1;
-+ }
-+
-+ x = strlen(pass);
-+
-+ /* ignore possible SIGPIPE signal while writing to gpg */
-+ oldSigPipeHandler = signal(SIGPIPE, SIG_IGN);
-+ rd_wr_retry(pfdi[1], pass, x, 1);
-+ rd_wr_retry(pfdi[1], "\n", 1, 1);
-+ if(oldSigPipeHandler != SIG_ERR) signal(SIGPIPE, oldSigPipeHandler);
-+
-+ close(pfdi[1]);
-+ memset(pass, 0, x);
-+ x = 0;
-+ while(x < 66) {
-+ multiKeyPass[x] = get_FD_pass(pfdo[0]);
-+ if(!multiKeyPass[x]) {
-+ /* mem alloc failed - abort */
-+ multiKeyPass[0] = 0;
- break;
-+ }
-+ if(strlen(multiKeyPass[x]) < LOOP_PASSWORD_MIN_LENGTH) break;
-+ x++;
-+ }
-+ warnAboutBadKeyData(x);
-+ if(x >= 65)
-+ multiKeyMode = 65;
-+ if(x == 64)
-+ multiKeyMode = 64;
-+ close(pfdo[0]);
-+ waitpid(gpid, &x, 0);
-+ if(!multiKeyPass[0]) goto nomem1;
-+ return multiKeyPass[0];
-+}
-+
-+static char *sGetPass(int minLen, int warnLen)
-+{
-+ char *p, *s, *seed;
-+ int i, ask2, close_i_fd = 0;
-+
-+ if(!passFDnumber) {
-+ if(clearTextKeyFile) {
-+ if((i = open(clearTextKeyFile, O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open %s for reading\n"), clearTextKeyFile);
-+ return NULL;
-+ }
-+ close_i_fd = 1;
-+ goto contReadFrom_i;
-+ }
-+ p = getpass(_("Password: "));
-+ ask2 = passAskTwice ? 1 : 0;
-+ } else {
-+ i = atoi(passFDnumber);
-+ contReadFrom_i:
-+ if(gpgKeyFile && gpgKeyFile[0]) {
-+ p = get_FD_pass(i);
-+ if(close_i_fd) close(i);
-+ } else {
-+ int x = 0;
-+ while(x < 66) {
-+ multiKeyPass[x] = get_FD_pass(i);
-+ if(!multiKeyPass[x]) goto nomem;
-+ if(strlen(multiKeyPass[x]) < LOOP_PASSWORD_MIN_LENGTH) break;
-+ x++;
-+ }
-+ if(close_i_fd) close(i);
-+ warnAboutBadKeyData(x);
-+ if(x >= 65) {
-+ multiKeyMode = 65;
-+ return multiKeyPass[0];
-+ }
-+ if(x == 64) {
-+ multiKeyMode = 64;
-+ return multiKeyPass[0];
-+ }
-+ p = multiKeyPass[0];
-+ }
-+ ask2 = 0;
-+ }
-+ if(!p) goto nomem;
-+ if(gpgKeyFile && gpgKeyFile[0]) {
-+ if(ask2) {
-+ i = strlen(p);
-+ s = malloc(i + 1);
-+ if(!s) goto nomem;
-+ strcpy(s, p);
-+ p = getpass(_("Retype password: "));
-+ if(!p) goto nomem;
-+ if(strcmp(s, p)) goto compareErr;
-+ memset(s, 0, i);
-+ free(s);
-+ ask2 = 0;
-+ }
-+ p = do_GPG_pipe(p);
-+ if(!p) return(NULL);
-+ if(!p[0]) {
-+ fprintf(stderr, _("Error: gpg key file decryption failed\n"));
-+ return(NULL);
-+ }
-+ if(multiKeyMode) return(p);
-+ }
-+ i = strlen(p);
-+ if(i < minLen) {
-+ fprintf(stderr, _("Error: Password must be at least %d characters.\n"), minLen);
-+ return(NULL);
-+ }
-+ seed = passSeedString;
-+ if(!seed) seed = "";
-+ s = malloc(i + strlen(seed) + 1);
-+ if(!s) {
-+ nomem:
-+ fprintf(stderr, _("Error: Unable to allocate memory\n"));
-+ return(NULL);
-+ }
-+ strcpy(s, p);
-+ memset(p, 0, i);
-+ if(ask2) {
-+ p = getpass(_("Retype password: "));
-+ if(!p) goto nomem;
-+ if(strcmp(s, p)) {
-+ compareErr:
-+ fprintf(stderr, _("Error: Passwords are not identical\n"));
-+ 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);
-+ }
-+ strcat(s, seed);
-+ return(s);
-+}
-
-- 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) {
-+ y = *kp++;
-+ if(--cnt <= 0) {
-+ kp = keyStr;
-+ cnt = ile;
-+ }
-+ if((y >= '0') && (y <= '9')) y -= '0';
-+ else if((y >= 'A') && (y <= 'Z')) y -= ('A' - 10);
-+ else if((y >= 'a') && (y <= 'z')) y -= ('a' - 36);
-+ else if((y == '.') || (y == '/')) y += (62 - '.');
-+ else y &= 63;
-+ z = x >> 3;
-+ if(z < bufSize) {
-+ keyBuf[z] |= y << (x & 7);
-+ }
-+ z++;
-+ if(z < bufSize) {
-+ keyBuf[z] |= y >> (8 - (x & 7));
-+ }
-+ }
- }
-
--static int
--digits_only(const char *s) {
-- while (*s)
-- if (!isdigit(*s++))
-- return 0;
-- return 1;
-+/* this is for compatibility with mainline mount */
-+static void unhashed2_key_setup(unsigned char *keyStr, int ile, unsigned char *keyBuf, int bufSize)
-+{
-+ memset(keyBuf, 0, bufSize);
-+ strncpy((char *)keyBuf, (char *)keyStr, bufSize - 1);
-+ keyBuf[bufSize - 1] = 0;
-+}
-+
-+static void rmd160HashTwiceWithA(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ char tmpBuf[20 + 20];
-+ char pwdCopy[130];
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 40) ole = 40;
-+ rmd160_hash_buffer(&tmpBuf[0], (char *)ib, ile);
-+ pwdCopy[0] = 'A';
-+ if(ile > sizeof(pwdCopy) - 1) ile = sizeof(pwdCopy) - 1;
-+ memcpy(pwdCopy + 1, ib, ile);
-+ rmd160_hash_buffer(&tmpBuf[20], pwdCopy, ile + 1);
-+ memcpy(ob, tmpBuf, ole);
-+ memset(tmpBuf, 0, sizeof(tmpBuf));
-+ memset(pwdCopy, 0, sizeof(pwdCopy));
-+}
-+
-+extern long long llseek(int, long long, int);
-+
-+static long long xx_lseek(int fd, long long offset, int whence)
-+{
-+ if(sizeof(off_t) >= 8) {
-+ return lseek(fd, offset, whence);
-+ } else {
-+ return llseek(fd, offset, whence);
-+ }
-+}
-+
-+static int loop_create_random_keys(char *partition, long long offset, long long sizelimit, int loopro, unsigned char *k)
-+{
-+ int x, y, fd;
-+ sha512_context s;
-+ unsigned char b[4096];
-+
-+ if(loopro) {
-+ fprintf(stderr, _("Error: read-only device %s\n"), partition);
-+ return 1;
-+ }
-+
-+ /*
-+ * Compute SHA-512 over first 40 KB of old fs data. SHA-512 hash
-+ * output is then used as entropy for new fs encryption key.
-+ */
-+ if((fd = open(partition, O_RDWR)) == -1) {
-+ seekFailed:
-+ fprintf(stderr, _("Error: unable to open/seek device %s\n"), partition);
-+ return 1;
-+ }
-+ if(offset < 0) offset = -offset;
-+ if(xx_lseek(fd, offset, SEEK_SET) == -1) {
-+ close(fd);
-+ goto seekFailed;
-+ }
-+ sha512_init(&s);
-+ for(x = 1; x <= 10; x++) {
-+ if((sizelimit > 0) && ((sizeof(b) * x) > sizelimit)) break;
-+ if(rd_wr_retry(fd, &b[0], sizeof(b), 0) != sizeof(b)) break;
-+ sha512_write(&s, &b[0], sizeof(b));
-+ }
-+ sha512_final(&s);
-+
-+ /*
-+ * Overwrite 40 KB of old fs data 20 times so that recovering
-+ * SHA-512 output beyond this point is difficult and expensive.
-+ */
-+ for(y = 0; y < 20; y++) {
-+ int z;
-+ struct {
-+ struct timeval tv;
-+ unsigned char h[64];
-+ int x,y,z;
-+ } j;
-+ if(xx_lseek(fd, offset, SEEK_SET) == -1) break;
-+ memcpy(&j.h[0], &s.sha_out[0], 64);
-+ gettimeofday(&j.tv, NULL);
-+ j.y = y;
-+ for(x = 1; x <= 10; x++) {
-+ j.x = x;
-+ for(z = 0; z < sizeof(b); z += 64) {
-+ j.z = z;
-+ sha512_hash_buffer((unsigned char *)&j, sizeof(j), &b[z], 64);
-+ }
-+ if((sizelimit > 0) && ((sizeof(b) * x) > sizelimit)) break;
-+ if(rd_wr_retry(fd, &b[0], sizeof(b), 1) != sizeof(b)) break;
-+ }
-+ memset(&j, 0, sizeof(j));
-+ if(fsync(fd)) break;
-+ }
-+ close(fd);
-+
-+ /*
-+ * Use all 512 bits of hash output
-+ */
-+ memcpy(&b[0], &s.sha_out[0], 64);
-+ memset(&s, 0, sizeof(s));
-+
-+ /*
-+ * Read 32 bytes of random entropy from kernel's random
-+ * number generator. This code may be executed early on startup
-+ * scripts and amount of random entropy may be non-existent.
-+ * SHA-512 of old fs data is used as workaround for missing
-+ * entropy in kernel's random number generator.
-+ */
-+ if((fd = open("/dev/urandom", O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open /dev/urandom\n"));
-+ return 1;
-+ }
-+ rd_wr_retry(fd, &b[64], 32, 0);
-+
-+ /* generate multi-key hashes */
-+ x = 0;
-+ while(x < 65) {
-+ rd_wr_retry(fd, &b[64+32], 16, 0);
-+ sha512_hash_buffer(&b[0], 64+32+16, k, 32);
-+ k += 32;
-+ x++;
-+ }
-+
-+ close(fd);
-+ memset(&b[0], 0, sizeof(b));
-+ return 0;
-+}
-+
-+#if !defined(MAIN)
-+static int loop_fork_mkfs_command(char *device, char *fstype)
-+{
-+ int x, y = 0;
-+ char *a[10], *e[1];
-+
-+ sync();
-+ if(!(x = fork())) {
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 0);
-+ dup2(x, 1);
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ x = 0;
-+ a[x++] = "mkfs";
-+ a[x++] = "-t";
-+ a[x++] = fstype;
-+ /* mkfs.reiserfs and mkfs.xfs need -f option */
-+ if(!strcmp(fstype, "reiserfs") || !strcmp(fstype, "xfs")) {
-+ a[x++] = "-f";
-+ }
-+ a[x++] = device;
-+ a[x] = 0;
-+ e[0] = 0;
-+ setgid(getgid());
-+ setuid(getuid());
-+ for(x = 3; x < 1024; x++) {
-+ close(x);
-+ }
-+ execve("/sbin/mkfs", &a[0], &e[0]);
-+ exit(1);
-+ }
-+ if(x == -1) {
-+ fprintf(stderr, _("Error: fork failed\n"));
-+ return 1;
-+ }
-+ waitpid(x, &y, 0);
-+ sync();
-+ if(!WIFEXITED(y) || (WEXITSTATUS(y) != 0)) {
-+ fprintf(stderr, _("Error: encrypted file system mkfs failed\n"));
-+ return 1;
-+ }
-+ return 0;
- }
-+#endif
-
- int
--set_loop(const char *device, const char *file, unsigned long long offset,
-- const char *encryption, int pfd, int *loopro) {
-- struct loop_info64 loopinfo64;
-- 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, 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,180 +827,255 @@
- }
- if ((fd = open(device, mode)) < 0) {
- perror (device);
-- return 1;
-+ goto close_ffd_return1;
- }
- *loopro = (mode == O_RDONLY);
-
-- memset(&loopinfo64, 0, sizeof(loopinfo64));
--
-- xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE);
--
-- if (encryption && *encryption) {
-- if (digits_only(encryption)) {
-- loopinfo64.lo_encrypt_type = atoi(encryption);
-- } else {
-- loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI;
-- snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE,
-- "%s", encryption);
-- }
-- }
--
-- loopinfo64.lo_offset = offset;
-+ memset (&loopinfo, 0, sizeof (loopinfo));
-+ xstrncpy ((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-+ if (loopEncryptionType)
-+ loopinfo.lo_encrypt_type = loop_crypt_type (loopEncryptionType, &loopinfo.lo_encrypt_key_size, &apiName);
-+ if (loopOffsetBytes)
-+ 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(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
-
-- switch (loopinfo64.lo_encrypt_type) {
-+ switch (loopinfo.lo_encrypt_type) {
- case LO_CRYPT_NONE:
-- loopinfo64.lo_encrypt_key_size = 0;
-+ loopinfo.lo_encrypt_key_size = 0;
- break;
- case LO_CRYPT_XOR:
-- pass = getpass(_("Password: "));
-- goto gotpass;
-+ pass = sGetPass (1, 0);
-+ 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;
-+ case 3: /* LO_CRYPT_FISH2 */
-+ case 4: /* LO_CRYPT_BLOW */
-+ case 7: /* LO_CRYPT_SERPENT */
-+ case 8: /* LO_CRYPT_MARS */
-+ case 11: /* LO_CRYPT_RC6 */
-+ case 12: /* LO_CRYPT_DES_EDE3 */
-+ case 16: /* LO_CRYPT_AES */
-+ case 18: /* LO_CRYPT_CRYPTOAPI */
-+ /* set default hash function */
-+ hashFunc = sha256_hash_buffer;
-+ if(loopinfo.lo_encrypt_key_size == 24) hashFunc = sha384_hash_buffer;
-+ if(loopinfo.lo_encrypt_key_size == 32) hashFunc = sha512_hash_buffer;
-+ /* possibly override default hash function */
-+ if(passHashFuncName) {
-+ if(!strcasecmp(passHashFuncName, "sha256")) {
-+ hashFunc = sha256_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "sha384")) {
-+ hashFunc = sha384_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "sha512")) {
-+ hashFunc = sha512_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "rmd160")) {
-+ hashFunc = rmd160HashTwiceWithA;
-+ minPassLen = 1;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed1")) {
-+ hashFunc = unhashed1_key_setup;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed2")) {
-+ hashFunc = unhashed2_key_setup;
-+ minPassLen = 1;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed3") && passFDnumber && !gpgKeyFile) {
-+ /* unhashed3 hash type reads binary key from file descriptor. */
-+ /* This is not compatible with gpgkey= mount option */
-+ if(rd_wr_retry(atoi(passFDnumber), (char *)&loopinfo.lo_encrypt_key[0], LO_KEY_SIZE, 0) < 1) {
-+ fprintf(stderr, _("Error: couldn't read binary key\n"));
-+ goto close_fd_ffd_return1;
-+ }
-+ break; /* out of switch(loopinfo.lo_encrypt_type) */
-+ } else if(!strncasecmp(passHashFuncName, "random", 6) && ((passHashFuncName[6] == 0) || (passHashFuncName[6] == '/'))) {
-+ /* random hash type sets up 65 random keys */
-+ /* WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING */
-+ /* IMPORTANT DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA. */
-+ if(loop_create_random_keys((char*)file, loopinfo.lo_offset, loopinfo.lo_sizelimit, *loopro, &multiKeyBits[0][0])) {
-+ goto close_fd_ffd_return1;
-+ }
-+ memcpy(&loopinfo.lo_encrypt_key[0], &multiKeyBits[0][0], sizeof(loopinfo.lo_encrypt_key));
-+ run_mkfs_command = multiKeyMode = 1000;
-+ break; /* out of switch(loopinfo.lo_encrypt_type) */
-+ }
-+ }
-+ pass = sGetPass (minPassLen, LOOP_PASSWORD_MIN_LENGTH);
-+ if(!pass) goto close_fd_ffd_return1;
-+ i = strlen(pass);
-+ if(hashFunc == unhashed1_key_setup) {
-+ /* this is for compatibility with historic loop-AES version */
-+ loopinfo.lo_encrypt_key_size = 16; /* 128 bits */
-+ if(i >= 32) loopinfo.lo_encrypt_key_size = 24; /* 192 bits */
-+ if(i >= 43) loopinfo.lo_encrypt_key_size = 32; /* 256 bits */
-+ }
-+ (*hashFunc)((unsigned char *)pass, i, &loopinfo.lo_encrypt_key[0], sizeof(loopinfo.lo_encrypt_key));
-+ if(multiKeyMode) {
-+ int r = 0, t;
-+ while(r < multiKeyMode) {
-+ t = strlen(multiKeyPass[r]);
-+ (*hashFunc)((unsigned char *)multiKeyPass[r], t, &multiKeyBits[r][0], 32);
-+ memset(multiKeyPass[r], 0, t);
-+ /*
-+ * MultiKeyMode uses md5 IV. One key mode uses sector IV. Sector IV
-+ * and md5 IV v2 and v3 are all computed differently. This first key
-+ * byte XOR with 0x55/0xF4 is needed to cause complete decrypt failure
-+ * in cases where data is encrypted with one type of IV and decrypted
-+ * with another type IV. If identical key was used but only IV was
-+ * computed differently, only first plaintext block of 512 byte CBC
-+ * chain would decrypt incorrectly and rest would decrypt correctly.
-+ * Partially correct decryption is dangerous. Decrypting all blocks
-+ * incorrectly is safer because file system mount will simply fail.
-+ */
-+ if(multiKeyMode == 65) {
-+ multiKeyBits[r][0] ^= 0xF4; /* version 3 */
-+ } else {
-+ multiKeyBits[r][0] ^= 0x55; /* version 2 */
-+ }
-+ r++;
-+ }
-+ } else if(passIterThousands) {
-+ aes_context ctx;
-+ unsigned long iter = 0;
-+ unsigned char tempkey[32];
-+ /*
-+ * Set up AES-256 encryption key using same password and hash function
-+ * as before but with password bit 0 flipped before hashing. That key
-+ * is then used to encrypt actual loop key 'itercountk' thousand times.
-+ */
-+ pass[0] ^= 1;
-+ (*hashFunc)((unsigned char *)pass, i, &tempkey[0], 32);
-+ aes_set_key(&ctx, &tempkey[0], 32, 0);
-+ sscanf(passIterThousands, "%lu", &iter);
-+ iter *= 1000;
-+ while(iter > 0) {
-+ /* encrypt both 128bit blocks with AES-256 */
-+ aes_encrypt(&ctx, &loopinfo.lo_encrypt_key[ 0], &loopinfo.lo_encrypt_key[ 0]);
-+ aes_encrypt(&ctx, &loopinfo.lo_encrypt_key[16], &loopinfo.lo_encrypt_key[16]);
-+ /* exchange upper half of first block with lower half of second block */
-+ memcpy(&tempkey[0], &loopinfo.lo_encrypt_key[8], 8);
-+ memcpy(&loopinfo.lo_encrypt_key[8], &loopinfo.lo_encrypt_key[16], 8);
-+ memcpy(&loopinfo.lo_encrypt_key[16], &tempkey[0], 8);
-+ iter--;
-+ }
-+ memset(&ctx, 0, sizeof(ctx));
-+ memset(&tempkey[0], 0, sizeof(tempkey));
-+ }
-+ memset(pass, 0, i); /* erase original password */
-+ break;
- default:
-- pass = xgetpass(pfd, _("Password: "));
-- gotpass:
-- memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE);
-- xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
-- memset(pass, 0, strlen(pass));
-- loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
-+ fprintf (stderr, _("Error: don't know how to get key for encryption system %d\n"), loopinfo.lo_encrypt_type);
-+ goto close_fd_ffd_return1;
-+ }
-+
-+ if(loInitValue) {
-+ /* cipher modules are free to do whatever they want with this value */
-+ i = 0;
-+ sscanf(loInitValue, "%d", &i);
-+ loopinfo.lo_init[0] = i;
- }
-
- 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);
-+ return errRetVal;
- }
-- close (ffd);
-
-- i = ioctl(fd, LOOP_SET_STATUS64, &loopinfo64);
-- if (i) {
-- struct loop_info loopinfo;
-- int errsv = errno;
--
-- i = loop_info64_to_old(&loopinfo64, &loopinfo);
-- if (i) {
-- errno = errsv;
-- perror("ioctl: LOOP_SET_STATUS64");
-- } else {
-- i = ioctl(fd, LOOP_SET_STATUS, &loopinfo);
-- if (i)
-- perror("ioctl: LOOP_SET_STATUS");
-+ /* type 18 == LO_CRYPT_CRYPTOAPI */
-+ if ((loopinfo.lo_encrypt_type == 18) || (loop_set_status64_ioctl(fd, &loopinfo) < 0)) {
-+ /* direct cipher interface failed - try CryptoAPI interface now */
-+ if(!apiName || (try_cryptoapi_loop_interface(fd, &loopinfo, apiName) < 0)) {
-+ fprintf(stderr, _("ioctl: LOOP_SET_STATUS: %s, requested cipher or key length (%d bits) not supported by kernel\n"), strerror(errno), loopinfo.lo_encrypt_key_size << 3);
-+ loop_clr_fd_out:
-+ (void) ioctl (fd, LOOP_CLR_FD, 0);
-+ goto keyclean_close_fd_ffd_return1;
- }
-- memset(&loopinfo, 0, sizeof(loopinfo));
- }
-- memset(&loopinfo64, 0, sizeof(loopinfo64));
--
-- if (i) {
-- ioctl (fd, LOOP_CLR_FD, 0);
-- close (fd);
-- return 1;
-+ if(multiKeyMode >= 65) {
-+ if(ioctl(fd, LOOP_MULTI_KEY_SETUP_V3, &multiKeyBits[0][0]) < 0) {
-+ if(multiKeyMode == 1000) goto try_v2_setup;
-+ perror("ioctl: LOOP_MULTI_KEY_SETUP_V3");
-+ goto loop_clr_fd_out;
-+ }
-+ } else if(multiKeyMode == 64) {
-+ try_v2_setup:
-+ if((ioctl(fd, LOOP_MULTI_KEY_SETUP, &multiKeyBits[0][0]) < 0) && (multiKeyMode != 1000)) {
-+ perror("ioctl: LOOP_MULTI_KEY_SETUP");
-+ goto loop_clr_fd_out;
-+ }
- }
-- close (fd);
--
-- if (verbose > 1)
-- printf(_("set_loop(%s,%s,%llu): success\n"),
-- device, file, offset);
-- return 0;
--}
--
--int
--del_loop (const char *device) {
-- int fd;
-
-- if ((fd = open (device, O_RDONLY)) < 0) {
-- int errsv = errno;
-- fprintf(stderr, _("loop: can't delete device %s: %s\n"),
-- device, strerror (errsv));
-- return 1;
-- }
-- 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))) {
-+ /* !strncasecmp(passHashFuncName, "random", 6) test matched */
-+ /* This reads octal mode for newly created file system root */
-+ /* directory node from '-o phash=random/1777' mount option. */
-+ /* octal mode--^^^^ */
-+ sscanf(passHashFuncName + 6, "/%o", AutoChmodPtr);
-+ } else {
-+ if((fd = open(device, mode)) >= 0) {
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ close(fd);
-+ return 1;
-+ }
-+ }
-+ }
-+#endif
-
--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
--
- #include <getopt.h>
- #include <stdarg.h>
-
- int verbose = 0;
--char *progname;
-+static char *progname;
-
- static void
- usage(void) {
-- fprintf(stderr, _("\nUsage:\n"
-- " %1$s loop_device # give info\n"
-- " %1$s -a | --all # list all used\n"
-- " %1$s -d | --detach loop_device # delete\n"
-- " %1$s -f | --find # find unused\n"
-- " %1$s [ options ] {-f|--find|loop_device} file # setup\n"
-- "\nOptions:\n"
-- " -e | --encryption <type> enable data encryption with specified <name/num>\n"
-- " -h | --help this help\n"
-- " -o | --offset <num> start at offset <num> into file\n"
-- " -p | --pass-fd <num> read passphrase from file descriptor <num>\n"
-- " -r | --read-only setup read-only loop device\n"
-- " -s | --show print device name (with -f <file>)\n"
-- " -v | --verbose verbose mode\n\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);
- exit(1);
-- }
-+}
-
- char *
- xstrdup (const char *s) {
-@@ -493,153 +1104,252 @@
- fprintf (stderr, "\n");
- }
-
-+void
-+show_all_loops(void)
-+{
-+ char dev[20];
-+ char *lfmt[] = { "/dev/loop%d", "/dev/loop/%d" };
-+ int i, j, fd, x;
-+ struct stat statbuf;
-+
-+ for(i = 0; i < 256; i++) {
-+ for(j = (sizeof(lfmt) / sizeof(lfmt[0])) - 1; j >= 0; j--) {
-+ sprintf(dev, lfmt[j], i);
-+ if(stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ fd = open(dev, O_RDONLY);
-+ if(fd >= 0) {
-+ x = is_unused_loop_device(fd);
-+ close(fd);
-+ if(x == 0) {
-+ show_loop(dev);
-+ j = 0;
-+ }
-+ }
-+ }
-+ }
-+ }
-+}
-+
-+int
-+read_options_from_fstab(char *loopToFind, char **partitionPtr)
-+{
-+ FILE *f;
-+ struct mntent *m;
-+ int y, foundMatch = 0;
-+ char *opt, *fr1, *fr2;
-+ struct options {
-+ char *name; /* name of /etc/fstab option */
-+ char **dest; /* destination where it is written to */
-+ char *line; /* temp */
-+ };
-+ struct options tbl[] = {
-+ { "device/file name ", partitionPtr }, /* must be index 0 */
-+ { "loop=", &loopToFind }, /* must be index 1 */
-+ { "offset=", &loopOffsetBytes },
-+ { "sizelimit=", &loopSizeBytes },
-+ { "encryption=", &loopEncryptionType },
-+ { "pseed=", &passSeedString },
-+ { "phash=", &passHashFuncName },
-+ { "loinit=", &loInitValue },
-+ { "gpgkey=", &gpgKeyFile },
-+ { "gpghome=", &gpgHomeDir },
-+ { "cleartextkey=", &clearTextKeyFile },
-+ { "itercountk=", &passIterThousands },
-+ };
-+ struct options *p;
-+
-+ if (!(f = setmntent("/etc/fstab", "r"))) {
-+ fprintf(stderr, _("Error: unable to open /etc/fstab for reading\n"));
-+ return 0;
-+ }
-+ while ((m = getmntent(f)) != NULL) {
-+ tbl[0].line = fr1 = xstrdup(m->mnt_fsname);
-+ p = &tbl[1];
-+ do {
-+ p->line = NULL;
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ opt = fr2 = xstrdup(m->mnt_opts);
-+ for (opt = strtok(opt, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ p = &tbl[1];
-+ do {
-+ y = strlen(p->name);
-+ if (!strncmp(opt, p->name, y))
-+ p->line = opt + y;
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ }
-+ if (tbl[1].line && !strcmp(loopToFind, tbl[1].line)) {
-+ if (++foundMatch > 1) {
-+ fprintf(stderr, _("Error: multiple loop=%s options found in /etc/fstab\n"), loopToFind);
-+ endmntent(f);
-+ return 0;
-+ }
-+ p = &tbl[0];
-+ do {
-+ if (!*p->dest && p->line) {
-+ *p->dest = p->line;
-+ if (verbose)
-+ printf(_("using %s%s from /etc/fstab\n"), p->name, p->line);
-+ }
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ fr1 = fr2 = NULL;
-+ }
-+ if(fr1) free(fr1);
-+ if(fr2) free(fr2);
-+ }
-+ endmntent(f);
-+ if (foundMatch == 0) {
-+ fprintf(stderr, _("Error: loop=%s option not found in /etc/fstab\n"), loopToFind);
-+ }
-+ return foundMatch;
-+}
-+
-+int
-+recompute_loop_dev_size(char *device)
-+{
-+ int fd, err1 = 0, err2, err3;
-+ long long oldBytes = -1, newBytes = -1;
-+
-+ fd = open(device, O_RDONLY);
-+ if(fd < 0) {
-+ perror(device);
-+ return 1;
-+ }
-+ if(verbose) {
-+ err1 = ioctl(fd, BLKGETSIZE64, &oldBytes);
-+ }
-+ err2 = ioctl(fd, LOOP_RECOMPUTE_DEV_SIZE, 0);
-+ if(err2) {
-+ perror(device);
-+ goto done1;
-+ }
-+ if(verbose) {
-+ err3 = ioctl(fd, BLKGETSIZE64, &newBytes);
-+ if(!err1 && (oldBytes >= 0)) {
-+ printf("%s: old size %lld bytes\n", device, oldBytes);
-+ }
-+ if(!err3 && (newBytes >= 0)) {
-+ printf("%s: new size %lld bytes\n", device, newBytes);
-+ }
-+ }
-+done1:
-+ close(fd);
-+ return err2;
-+}
-
- int
- main(int argc, char **argv) {
-- char *p, *offset, *encryption, *passfd, *device, *file;
-- int delete, find, c, all;
-+ 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 ro = 0;
-- int pfd = -1;
-- unsigned long long off;
-- 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);
-
-- delete = find = all = 0;
-- off = 0;
-- offset = encryption = passfd = NULL;
--
-+ delete = 0;
- progname = argv[0];
-- 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) {
- switch (c) {
-- case 'a':
-- all = 1;
-+ case 'a': /* show status of all loops */
-+ option_a = 1;
- break;
-- case 'r':
-- ro = 1;
-+ case 'C':
-+ passIterThousands = optarg;
-+ setup_o = 1;
- break;
- case 'd':
- delete = 1;
- break;
-- case 'E':
- case 'e':
-- encryption = optarg;
-+ loopEncryptionType = optarg;
-+ setup_o = 1;
- break;
-- case 'f':
-- find = 1;
-+ case 'F': /* read loop related options from /etc/fstab */
-+ option_F = 1;
-+ setup_o = 1;
-+ break;
-+ case 'G': /* GnuPG home dir */
-+ gpgHomeDir = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'H': /* passphrase hash function name */
-+ passHashFuncName = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'I': /* lo_init[0] value (in string form) */
-+ loInitValue = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'K': /* GnuPG key file name */
-+ gpgKeyFile = optarg;
-+ setup_o = 1;
- break;
- case 'o':
-- offset = optarg;
-+ loopOffsetBytes = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'p': /* read passphrase from given fd */
-+ passFDnumber = optarg;
-+ setup_o = 1;
- break;
-- case 'p':
-- passfd = optarg;
-+ case 'P': /* read passphrase from given file */
-+ clearTextKeyFile = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'r': /* read-only */
-+ ro = 1;
-+ setup_o = 1;
-+ break;
-+ case 'R': /* recompute loop dev size */
-+ option_R = 1;
- break;
- case 's':
-- showdev = 1;
-+ loopSizeBytes = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'S': /* optional seed for passphrase */
-+ passSeedString = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'T': /* ask passphrase _twice_ */
-+ passAskTwice = "T";
-+ setup_o = 1;
- break;
- case 'v':
-- verbose = 1;
-+ verbose++;
- break;
- default:
- usage();
- }
- }
--
-- 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();
-+ res = 0;
- } else if (delete) {
-- if (argc != optind+1 || encryption || offset || find || all || showdev)
-- usage();
-- } else if (find) {
-- if (all || argc < optind || argc > optind+1)
-- usage();
-- } else if (all) {
-- if (argc > 2)
-- usage();
-- } else {
-- if (argc < optind+1 || argc > optind+2)
-- usage();
-- }
--
-- if (all)
-- return show_used_loop_devices();
-- else if (find) {
-- device = find_unused_loop_device();
-- if (device == NULL)
-- return -1;
-- if (argc == optind) {
-- if (verbose)
-- printf("Loop device is %s\n", device);
-- printf("%s\n", device);
-- return 0;
-- }
-- file = argv[optind];
-+ /* 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;
-- else
-- file = argv[optind+1];
-- }
--
-- if (delete)
-- res = del_loop(device);
-- else if (file == NULL)
-- res = show_loop(device);
-- else {
-- if (offset && sscanf(offset, "%llu", &off) != 1)
-- usage();
-- if (passfd && sscanf(passfd, "%d", &pfd) != 1)
-+ /* set up new loop */
-+ if ((argc < optind+1) || ((argc == optind+1) && !option_F) || (argc > optind+2))
- usage();
-- do {
-- res = set_loop(device, file, off, encryption, pfd, &ro);
-- if (res == 2 && find) {
-- if (verbose)
-- printf("stolen loop=%s...trying again\n",
-- device);
-- free(device);
-- if (!(device = find_unused_loop_device()))
-- return -1;
-- }
-- } while (find && res == 2);
--
-- if (verbose && res == 0)
-- printf("Loop device is %s\n", device);
--
-- if (res == 0 && showdev && find)
-- printf("%s\n", device);
-+ if (argc > optind+1)
-+ 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, 1);
- }
- return res;
- }
--
--#else /* LOOP_SET_FD not defined */
--
--int
--main(int argc, char **argv) {
-- fprintf(stderr,
-- _("No loop support was available at compile time. "
-- "Please recompile.\n"));
-- return -1;
--}
--#endif
- #endif
-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 *, int);
- extern int del_loop(const char *);
- extern int is_loop_device(const char *);
-+extern int is_loop_active(const char *, const char *);
- extern char * find_unused_loop_device(void);
-+
-+extern char *passFDnumber;
-+extern char *passAskTwice;
-+extern char *passSeedString;
-+extern char *passHashFuncName;
-+extern char *passIterThousands;
-+extern char *loInitValue;
-+extern char *gpgKeyFile;
-+extern char *gpgHomeDir;
-+extern char *clearTextKeyFile;
-+extern char *loopOffsetBytes;
-+extern char *loopSizeBytes;
-+extern char *loopEncryptionType;
-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
-+ *
-+ * Copyright 2003 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU GPL
-+ */
-+
-+/* collection of loop helper functions used by losetup, mount and swapon */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#include "loop.h"
-+
-+static void convert_info_to_info64(struct loop_info *info, struct loop_info64 *info64)
-+{
-+ memset(info64, 0, sizeof(*info64));
-+ info64->lo_number = info->lo_number;
-+ info64->lo_device = info->lo_device;
-+ info64->lo_inode = info->lo_inode;
-+ info64->lo_rdevice = info->lo_rdevice;
-+ info64->lo_offset = info->lo_offset;
-+ info64->lo_encrypt_type = info->lo_encrypt_type;
-+ info64->lo_encrypt_key_size = info->lo_encrypt_key_size;
-+ info64->lo_flags = info->lo_flags;
-+ info64->lo_init[0] = info->lo_init[0];
-+ info64->lo_init[1] = info->lo_init[1];
-+ info64->lo_sizelimit = 0;
-+ if (info->lo_encrypt_type == 18) /* LO_CRYPT_CRYPTOAPI */
-+ memcpy(info64->lo_crypt_name, info->lo_name, sizeof(info64->lo_crypt_name));
-+ else
-+ memcpy(info64->lo_file_name, info->lo_name, sizeof(info64->lo_file_name));
-+ memcpy(info64->lo_encrypt_key, info->lo_encrypt_key, sizeof(info64->lo_encrypt_key));
-+}
-+
-+static int convert_info64_to_info(struct loop_info64 *info64, struct loop_info *info)
-+{
-+ memset(info, 0, sizeof(*info));
-+ info->lo_number = info64->lo_number;
-+ info->lo_device = info64->lo_device;
-+ info->lo_inode = info64->lo_inode;
-+ info->lo_rdevice = info64->lo_rdevice;
-+ info->lo_offset = info64->lo_offset;
-+ info->lo_encrypt_type = info64->lo_encrypt_type;
-+ info->lo_encrypt_key_size = info64->lo_encrypt_key_size;
-+ info->lo_flags = info64->lo_flags;
-+ info->lo_init[0] = info64->lo_init[0];
-+ info->lo_init[1] = info64->lo_init[1];
-+ if (info->lo_encrypt_type == 18) /* LO_CRYPT_CRYPTOAPI */
-+ memcpy(info->lo_name, info64->lo_crypt_name, sizeof(info->lo_name));
-+ else
-+ memcpy(info->lo_name, info64->lo_file_name, sizeof(info->lo_name));
-+ memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, sizeof(info->lo_encrypt_key));
-+
-+ /* error in case values were truncated */
-+ if (info->lo_device != info64->lo_device ||
-+ info->lo_rdevice != info64->lo_rdevice ||
-+ info->lo_inode != info64->lo_inode ||
-+ info->lo_offset != info64->lo_offset ||
-+ info64->lo_sizelimit) {
-+ errno = EOVERFLOW;
-+ return -1;
-+ }
-+ return 0;
-+}
-+
-+int loop_set_status64_ioctl(int fd, struct loop_info64 *info64)
-+{
-+ struct loop_info info;
-+ struct loop_info64 tmp;
-+ int r;
-+
-+ /*
-+ * This ugly work around is needed because some
-+ * Red Hat kernels are using same ioctl code:
-+ * #define LOOP_CHANGE_FD 0x4C04
-+ * vs.
-+ * #define LOOP_SET_STATUS64 0x4C04
-+ * that is used by modern loop driver.
-+ *
-+ * Attempt to detect presense of LOOP_GET_STATUS64
-+ * ioctl before issuing LOOP_SET_STATUS64 ioctl.
-+ * Red Hat kernels with above LOOP_CHANGE_FD damage
-+ * should return -1 and set errno to EINVAL.
-+ */
-+ r = ioctl(fd, LOOP_GET_STATUS64, &tmp);
-+ memset(&tmp, 0, sizeof(tmp));
-+ if ((r == 0) || (errno != EINVAL)) {
-+ r = ioctl(fd, LOOP_SET_STATUS64, info64);
-+ if (!r)
-+ return 0;
-+ }
-+ r = convert_info64_to_info(info64, &info);
-+ if (!r)
-+ r = ioctl(fd, LOOP_SET_STATUS, &info);
-+
-+ /* don't leave copies of encryption key on stack */
-+ memset(&info, 0, sizeof(info));
-+ return r;
-+}
-+
-+int loop_get_status64_ioctl(int fd, struct loop_info64 *info64)
-+{
-+ struct loop_info info;
-+ int r;
-+
-+ memset(info64, 0, sizeof(*info64));
-+ r = ioctl(fd, LOOP_GET_STATUS64, info64);
-+ if (!r)
-+ return 0;
-+ r = ioctl(fd, LOOP_GET_STATUS, &info);
-+ if (!r)
-+ convert_info_to_info64(&info, info64);
-+
-+ /* don't leave copies of encryption key on stack */
-+ memset(&info, 0, sizeof(info));
-+ return r;
-+}
-+
-+/* returns: 1=unused 0=busy */
-+int is_unused_loop_device(int fd)
-+{
-+ struct loop_info64 info64;
-+ struct loop_info info;
-+ int r;
-+
-+ r = ioctl(fd, LOOP_GET_STATUS64, &info64);
-+ memset(&info64, 0, sizeof(info64));
-+ if (!r)
-+ return 0;
-+ if (errno == ENXIO)
-+ return 1;
-+
-+ r = ioctl(fd, LOOP_GET_STATUS, &info);
-+ memset(&info, 0, sizeof(info));
-+ if (!r)
-+ return 0;
-+ if (errno == ENXIO)
-+ return 1;
-+ if (errno == EOVERFLOW)
-+ return 0;
-+ return 1;
-+}
-+
-+struct loop_crypt_type_struct loop_crypt_type_tbl[] = {
-+ { 0, 0, 0, "no" },
-+ { 0, 0, 0, "none" },
-+ { 1, 0, 0, "xor" },
-+ { 3, 1, 16, "twofish" },
-+ { 4, 1, 16, "blowfish" },
-+ { 7, 1, 16, "serpent" },
-+ { 8, 1, 16, "mars" },
-+ { 11, 3, 16, "rc6" },
-+ { 12, 0, 21, "tripleDES" },
-+ { 12, 0, 24, "3des" },
-+ { 12, 0, 24, "des3_ede" },
-+ { 16, 1, 16, "AES" },
-+ { -1, 0, 0, NULL }
-+};
-+
-+static char *getApiName(char *e, int *len)
-+{
-+ int x, y, z = 1, q = -1;
-+ unsigned char *s;
-+
-+ *len = y = 0;
-+ s = (unsigned char *)strdup(e);
-+ if(!s)
-+ return "";
-+ x = strlen((char *)s);
-+ while(x > 0) {
-+ x--;
-+ if(!isdigit(s[x]))
-+ break;
-+ y += (s[x] - '0') * z;
-+ z *= 10;
-+ q = x;
-+ }
-+ while(x >= 0) {
-+ s[x] = tolower(s[x]);
-+ if(s[x] == '-')
-+ s[x] = 0;
-+ x--;
-+ }
-+ if(y >= 40) {
-+ if(q >= 0)
-+ s[q] = 0;
-+ *len = y;
-+ }
-+ return((char *)s);
-+}
-+
-+int loop_crypt_type(const char *name, u_int32_t *kbyp, char **apiName)
-+{
-+ int i, k;
-+
-+ *apiName = getApiName((char *)name, &k);
-+ if(k < 0)
-+ k = 0;
-+ if(k > 256)
-+ k = 256;
-+ for (i = 0; loop_crypt_type_tbl[i].id != -1; i++) {
-+ if (!strcasecmp (*apiName , loop_crypt_type_tbl[i].name)) {
-+ *kbyp = k ? k >> 3 : loop_crypt_type_tbl[i].keyBytes;
-+ return loop_crypt_type_tbl[i].id;
-+ }
-+ }
-+ *kbyp = 16; /* 128 bits */
-+ return 18; /* LO_CRYPT_CRYPTOAPI */
-+}
-+
-+int try_cryptoapi_loop_interface(int fd, struct loop_info64 *loopinfo, char *apiName)
-+{
-+ snprintf((char *)loopinfo->lo_crypt_name, sizeof(loopinfo->lo_crypt_name), "%s-cbc", apiName);
-+ loopinfo->lo_crypt_name[LO_NAME_SIZE - 1] = 0;
-+ loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
-+ return(loop_set_status64_ioctl(fd, loopinfo));
-+}
-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
--#define LO_CRYPT_DES 2
-+/*
-+ * loop.h
-+ *
-+ * Copyright 2003 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU GPL
-+ */
-+
-+#ifndef _LOOP_H
-+#define _LOOP_H 1
-+
-+#include <sys/types.h>
-+#include <linux/version.h>
-+#include <linux/posix_types.h>
-+
-+#define LO_CRYPT_NONE 0
-+#define LO_CRYPT_XOR 1
-+#define LO_CRYPT_DES 2
- #define LO_CRYPT_CRYPTOAPI 18
-
- #define LOOP_SET_FD 0x4C00
-@@ -9,17 +23,26 @@
- #define LOOP_GET_STATUS 0x4C03
- #define LOOP_SET_STATUS64 0x4C04
- #define LOOP_GET_STATUS64 0x4C05
-+#define LOOP_MULTI_KEY_SETUP 0x4C4D
-+#define LOOP_MULTI_KEY_SETUP_V3 0x4C4E
-+#define LOOP_RECOMPUTE_DEV_SIZE 0x4C52
-
--#define LO_NAME_SIZE 64
--#define LO_KEY_SIZE 32
--
--#include "my_dev_t.h"
-+#define LO_NAME_SIZE 64
-+#define LO_KEY_SIZE 32
-
- struct loop_info {
- int lo_number;
-- my_dev_t lo_device;
-+#if LINUX_VERSION_CODE >= 0x20600
-+ __kernel_old_dev_t lo_device;
-+#else
-+ __kernel_dev_t lo_device;
-+#endif
- unsigned long lo_inode;
-- my_dev_t lo_rdevice;
-+#if LINUX_VERSION_CODE >= 0x20600
-+ __kernel_old_dev_t lo_rdevice;
-+#else
-+ __kernel_dev_t lo_rdevice;
-+#endif
- int lo_offset;
- int lo_encrypt_type;
- int lo_encrypt_key_size;
-@@ -30,22 +53,35 @@
- char reserved[4];
- };
-
--/*
-- * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long
-- * and get punished when someone comes with 128-bit long longs.
-- */
- struct loop_info64 {
-- unsigned long long lo_device;
-- unsigned long long lo_inode;
-- unsigned long long lo_rdevice;
-- unsigned long long lo_offset;
-- unsigned long long lo_sizelimit; /* bytes, 0 == max available */
-- unsigned int lo_number;
-- unsigned int lo_encrypt_type;
-- unsigned int lo_encrypt_key_size;
-- unsigned int lo_flags;
-- unsigned char lo_file_name[LO_NAME_SIZE];
-- unsigned char lo_crypt_name[LO_NAME_SIZE];
-- unsigned char lo_encrypt_key[LO_KEY_SIZE];
-- unsigned long long lo_init[2];
-+ u_int64_t lo_device; /* ioctl r/o */
-+ u_int64_t lo_inode; /* ioctl r/o */
-+ u_int64_t lo_rdevice; /* ioctl r/o */
-+ u_int64_t lo_offset; /* bytes */
-+ u_int64_t lo_sizelimit; /* bytes, 0 == max available */
-+ u_int32_t lo_number; /* ioctl r/o */
-+ u_int32_t lo_encrypt_type;
-+ u_int32_t lo_encrypt_key_size; /* ioctl w/o */
-+ u_int32_t lo_flags; /* ioctl r/o */
-+ unsigned char lo_file_name[LO_NAME_SIZE];
-+ unsigned char lo_crypt_name[LO_NAME_SIZE];
-+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-+ u_int64_t lo_init[2];
-+};
-+
-+extern int loop_set_status64_ioctl(int, struct loop_info64 *);
-+extern int loop_get_status64_ioctl(int, struct loop_info64 *);
-+extern int is_unused_loop_device(int);
-+
-+struct loop_crypt_type_struct {
-+ short int id;
-+ unsigned char flags; /* bit0 = show keybits, bit1 = add '-' before keybits */
-+ unsigned char keyBytes;
-+ char *name;
- };
-+
-+extern struct loop_crypt_type_struct loop_crypt_type_tbl[];
-+extern int loop_crypt_type(const char *, u_int32_t *, char **);
-+extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
-+
-+#endif
-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-09-02" "Linux" "MAINTENANCE COMMANDS"
- .SH NAME
- losetup \- set up and control loop devices
- .SH SYNOPSIS
- .ad l
--Get info:
--.sp
--.in +5
- .B losetup
-+[options]
- .I loop_device
--.sp
-+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"
-+.br
-+.B losetup
-+.B \-R
- .I loop_device
--.sp
--.in -5
--Print name of first unused loop device:
--.sp
--.in +5
--.B "losetup \-f"
--.sp
--.in -5
--Setup loop device:
--.sp
--.in +5
--.B losetup
--.RB [{\-e | \-E}
--.IR encryption ]
--.RB [ \-o
--.IR offset ]
--.RB [ \-p
--.IR pfd ]
--.RB [ \-r ]
--.in +8
--.RB { \-f [ \-s ] | \fIloop_device\fP }
--.I file
--.in -13
- .ad b
- .SH DESCRIPTION
- .B losetup
-@@ -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.
--
--.SS "Encryption"
--It is possible to specify transfer functions (for encryption/decryption
--or other purposes) using one of the
--.B \-E
--and
--.B \-e
--options.
--There are two mechanisms to specify the desired encryption: by number
--and by name. If an encryption is specified by number then one
--has to make sure that the Linux kernel knows about the encryption with that
--number, probably by patching the kernel. Standard numbers that are
--always present are 0 (no encryption) and 1 (XOR encryption).
--When the cryptoloop module is loaded (or compiled in), it uses number 18.
--This cryptoloop module will take the name of an arbitrary encryption type
--and finds the module that knows how to perform that encryption.
- .SH OPTIONS
--.IP "\fB\-a, \-\-all\fP"
--show status of all loop devices
--.IP "\fB\-d, \-\-detach\fP"
--detach the file or device associated with the specified loop device
--.IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP"
--enable data encryption with specified name or number
--.IP "\fB\-f, \-\-find\fP"
--find the first unused loop device. If a
--.I file
--argument is present, use this device. Otherwise, print its name.
--.IP "\fB\-h, \-\-help\fP"
--print help
--.IP "\fB\-o, \-\-offset \fIoffset\fP"
-+.IP \fB\-a\fP
-+Show status of all loop devices.
-+.IP "\fB\-C \fIitercountk\fP"
-+Runs hashed passphrase through \fIitercountk\fP thousand iterations of AES-256
-+before using it for loop encryption. This consumes lots of CPU cycles at
-+loop setup/mount time but not thereafter. In combination with passphrase seed
-+this slows down dictionary attacks. Iteration is not done in multi-key mode.
-+.IP "\fB\-d\fP"
-+Detach the file or device associated with the specified loop device.
-+.IP "\fB\-e \fIencryption\fP"
-+.RS
-+Enable data encryption. Following encryption types are recognized:
-+.IP \fBNONE\fP
-+Use no encryption (default).
-+.PD 0
-+.IP \fBXOR\fP
-+Use a simple XOR encryption.
-+.IP "\fBAES128 AES\fP"
-+Use 128 bit AES encryption. Passphrase is hashed with SHA-256 by default.
-+.IP \fBAES192\fP
-+Use 192 bit AES encryption. Passphrase is hashed with SHA-384 by default.
-+.IP \fBAES256\fP
-+Use 256 bit AES encryption. Passphrase is hashed with SHA-512 by default.
-+
-+.IP "\fBtwofish128 twofish160 twofish192 twofish256\fP"
-+.IP "\fBblowfish128 blowfish160 blowfish192 blowfish256\fP"
-+.IP "\fBserpent128 serpent192 serpent256 mars128 mars192\fP"
-+.IP "\fBmars256 rc6-128 rc6-192 rc6-256 tripleDES\fP"
-+These encryption types are available if they are enabled in kernel
-+configuration or corresponding modules have been loaded to kernel.
-+.PD
-+.RE
-+.IP "\fB\-F\fP"
-+Reads and uses mount options from /etc/fstab that match specified loop
-+device, including offset= sizelimit= encryption= pseed= phash= loinit=
-+gpgkey= gpghome= cleartextkey= itercountk= and looped to device/file name.
-+loop= option in /etc/fstab must match specified loop device name. Command
-+line options take precedence in case of conflict.
-+.IP "\fB\-G \fIgpghome\fP"
-+Set gpg home directory to \fIgpghome\fP, so that gpg uses public/private
-+keys on \fIgpghome\fP directory. This is only used when gpgkey file needs to
-+be decrypted using public/private keys. If gpgkey file is encrypted with
-+symmetric cipher only, public/private keys are not required and this option
-+has no effect.
-+.IP "\fB\-H \fIphash\fP"
-+Uses \fIphash\fP function to hash passphrase. Available hash functions are
-+sha256, sha384, sha512 and rmd160. unhashed1, unhashed2 and unhashed3
-+functions also exist for compatibility with some obsolete implementations.
-+
-+Hash function random does not ask for passphrase but sets up random keys and
-+attempts to put loop to multi-key mode. When random/1777 hash type is used
-+as mount option for mount program, mount program will create new file system
-+on the loop device and construct initial permissions of file system root
-+directory from octal digits that follow the slash character.
-+
-+WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING IMPORTANT
-+DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA.
-+.IP "\fB\-I \fIloinit\fP"
-+Passes a numeric value of \fIloinit\fP as a parameter to cipher transfer
-+function. Cipher transfer functions are free to interpret value as they
-+want.
-+.IP "\fB\-K \fIgpgkey\fP"
-+Passphrase is piped to gpg so that gpg can decrypt file \fIgpgkey\fP which
-+contains the real keys that are used to encrypt loop device. If decryption
-+requires public/private keys and gpghome is not specified, all users use
-+their own gpg public/private keys to decrypt \fIgpgkey\fP. Decrypted
-+\fIgpgkey\fP should contain 1 or 64 or 65 keys, each key at least 20
-+characters and separated by newline. If decrypted \fIgpgkey\fP contains 64
-+or 65 keys, then loop device is put to multi-key mode. In multi-key mode
-+first key is used for first sector, second key for second sector, and so on.
-+65th key, if present, is used as additional input to MD5 IV computation.
-+.IP "\fB\-o \fIoffset\fP"
- The data start is moved \fIoffset\fP bytes into the specified file or
--device.
--.IP "\fB\-p, \-\-pass-fd \fInum\fP"
--Read the passphrase from file descriptor with number
--.I num
--instead of from the terminal
--.IP "\fB\-r, \-\-read-only\fP"
--setup read-only loop device
--.IP "\fB\-s, \-\-show\fP"
--print device name if the
--.I -f
--option and a
--.I file
--argument are present
--.IP "\fB\-v, \-\-verbose\fP"
--verbose mode
-+device. Normally offset is included in IV (initialization vector)
-+computations. If offset is prefixed with @ character, then offset is not
-+included in IV computations. @ prefix functionality may not be supported on
-+some older kernels and/or loop drivers.
-+.IP "\fB\-p \fIpasswdfd\fP"
-+Read the passphrase from file descriptor \fIpasswdfd\fP instead of the
-+terminal. If -K option is not being used (no gpg key file), then losetup
-+attempts to read 65 keys from \fIpasswdfd\fP, each key at least 20
-+characters and separated by newline. If losetup successfully reads 64 or 65
-+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
-+terminal. If -K option is not being used (no gpg key file), then losetup
-+attempts to read 65 keys from \fIcleartextkey\fP, each key at least 20
-+characters and separated by newline. If losetup successfully reads 64 or 65
-+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. If both -p and -P options are used, then -p option takes
-+precedence. These are equivalent:
-+
-+losetup -p3 -K foo.gpg -e AES128 ... 3<someFileName
-+
-+losetup -P someFileName -K foo.gpg -e AES128 ...
-+
-+In first line of above example, in addition to normal open file descriptors
-+(0==stdin 1==stdout 2==stderr), shell opens the file and passes open file
-+descriptor to started losetup program. In second line of above example,
-+losetup opens the file itself.
-+.IP "\fB\-r\fP"
-+Read-only mode.
-+.IP "\fB\-R\fP"
-+Resize existing, already set up loop device, to new changed underlying
-+device size. This option is for changing mounted live file system size on
-+LVM volume. This functionality may not be supported on some older kernels
-+and/or loop drivers.
-+.IP "\fB\-s \fIsizelimit\fP"
-+Size of loop device is limited to \fIsizelimit\fP bytes. If unspecified or
-+set to zero, loop device size is set to maximum available (file size minus
-+offset). This option may not be supported on some older kernels and/or loop
-+drivers.
-+.IP "\fB\-S \fIpseed\fP"
-+Sets encryption passphrase seed \fIpseed\fP which is appended to user supplied
-+passphrase before hashing. Using different seeds for different partitions
-+makes dictionary attacks slower but does not prevent them if user supplied
-+passphrase is guessable. Seed is not used in multi-key mode.
-+.IP "\fB\-T\fP"
-+Asks passphrase twice.
-+.IP "\fB\-v\fP"
-+Verbose mode.
- .SH RETURN VALUE
- .B losetup
- returns 0 on success, nonzero on failure. When
-@@ -105,49 +171,26 @@
-
- .SH FILES
- .nf
--/dev/loop0, /dev/loop1, ... loop devices (major=7)
-+/dev/loop0,/dev/loop1,... loop devices (major=7)
- .fi
- .SH EXAMPLE
--If you are using the loadable module you must have the module loaded
--first with the command
--.IP
--# insmod loop.o
--.LP
--Maybe also encryption modules are needed.
--.IP
--# insmod des.o
--# insmod cryptoloop.o
--.LP
- The following commands can be used as an example of using the loop device.
- .nf
--.IP
--# dd if=/dev/zero of=/file bs=1k count=100
--# losetup -e des /dev/loop0 /file
--Password:
--Init (up to 16 hex digits):
--# mkfs -t ext2 /dev/loop0 100
--# mount -t ext2 /dev/loop0 /mnt
-+
-+dd if=/dev/zero of=/file bs=1k count=500
-+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
-+mount -t ext2 /dev/loop0 /mnt
- ...
--# umount /dev/loop0
--# losetup -d /dev/loop0
--.fi
--.LP
--If you are using the loadable module you may remove the module with
--the command
--.IP
--# rmmod loop
--.LP
-+umount /dev/loop0
-+losetup -d /dev/loop0
- .fi
- .SH RESTRICTION
--DES encryption is painfully slow. On the other hand, XOR is terribly weak.
--
--Cryptoloop is deprecated in favor of dm-crypt. For more details see
--.B cryptsetup(8).
--.SH AVAILABILITY
--The losetup command is part of the util-linux-ng package and is available from
--ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
--.\" .SH AUTHORS
--.\" .nf
--.\" Original version: Theodore Ts'o <tytso@athena.mit.edu>
--.\" Original DES by: Eric Young <eay@psych.psy.uq.oz.au>
--.\" .fi
-+XOR encryption is terribly weak.
-+.SH AUTHORS
-+.nf
-+Original version: Theodore Ts'o <tytso@athena.mit.edu>
-+AES support: Jari Ruusu
-+.fi
-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
-+ *
-+ * This code was extracted to separate file from lomount.c so that umount
-+ * program doesn't have to link with all loop related setup code
-+ */
-+
-+#define LOOPMAJOR 7
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <pwd.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
-+#include <sys/sysmacros.h>
-+#include <sys/wait.h>
-+#include <fcntl.h>
-+#include <mntent.h>
-+#include <locale.h>
-+
-+#include "loop.h"
-+#include "lomount.h"
-+#include "xstrncpy.h"
-+#include "nls.h"
-+
-+int
-+is_loop_device (const char *device) {
-+ struct stat statbuf;
-+
-+ return (stat(device, &statbuf) == 0 &&
-+ S_ISBLK(statbuf.st_mode) &&
-+ major(statbuf.st_rdev) == LOOPMAJOR);
-+}
-+
-+int
-+del_loop (const char *device) {
-+ int fd;
-+
-+ if ((fd = open (device, O_RDONLY)) < 0) {
-+ int errsv = errno;
-+ fprintf(stderr, _("loop: can't delete device %s: %s\n"),
-+ device, strerror (errsv));
-+ return 1;
-+ }
-+ if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
-+ perror ("ioctl: LOOP_CLR_FD");
-+ return 1;
-+ }
-+ close (fd);
-+ if (verbose > 1)
-+ printf(_("del_loop(%s): success\n"), device);
-+ return 0;
-+}
-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
-+.B \-p "\fIpasswdfd\fP"
-+If the mount requires a passphrase to be entered, read it from file
-+descriptor \fIpasswdfd\fP instead of from the terminal. If mount uses
-+encrypted loop device and gpgkey= mount option is not being used (no gpg key
-+file), then mount attempts to read 65 keys from \fIpasswdfd\fP, each key at
-+least 20 characters and separated by newline. If mount successfully reads 64
-+or 65 keys, then loop device is put to multi-key mode. If mount encounters
-+end-of-file before 64 keys are read, then only first key is used in
-+single-key mode.
-+.TP
- .B \-a
- Mount all filesystems (of the given types) mentioned in
- .IR fstab .
-@@ -365,12 +375,6 @@
- .I /etc
- is on a read-only file system.
- .TP
--.BI \-p " num"
--In case of a loop mount with encryption, read the passphrase from
--file descriptor
--.I num
--instead of from the terminal.
--.TP
- .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 @@
- and then mount this device on
- .IR /mnt .
-
--This type of mount knows about three options, namely
--.BR loop ", " offset " and " encryption ,
-+This type of mount knows about 11 options, namely
-+.BR loop ", " offset ", " sizelimit ", " encryption ", " pseed ", " phash ", " loinit ", " gpgkey ", " gpghome ", " cleartextkey " and " itercountk
- that are really options to
- .BR \%losetup (8).
- (These options can be used in addition to those specific
- to the filesystem type.)
-
-+If the mount requires a passphrase, you will be prompted for one unless you
-+specify a file descriptor to read from instead with the
-+.BR \-p
-+command line option, or specify a file name with
-+.BR cleartextkey
-+mount option.
- If no explicit loop device is mentioned
- (but just an option `\fB\-o loop\fP' is given), then
- .B mount
-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>
- #include <stdio.h>
-+#include <locale.h>
-
- #include <pwd.h>
- #include <grp.h>
-@@ -90,9 +91,6 @@
- /* True if ruid != euid. */
- static int suid = 0;
-
--/* Contains the fd to read the passphrase from, if any. */
--static int pfd = -1;
--
- /* 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 @@
- { NULL, 0, 0, 0 }
- };
-
--static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_encryption,
-+static const char *opt_loopdev, *opt_vfstype,
- *opt_speed, *opt_comment, *opt_uhelper;
-
- static int mounted (const char *spec0, const char *node0);
-@@ -199,8 +197,16 @@
- } string_opt_map[] = {
- { "loop=", 0, &opt_loopdev },
- { "vfs=", 1, &opt_vfstype },
-- { "offset=", 0, &opt_offset },
-- { "encryption=", 0, &opt_encryption },
-+ { "pseed=", 1, (const char **)&passSeedString },
-+ { "phash=", 0, (const char **)&passHashFuncName },
-+ { "loinit=", 0, (const char **)&loInitValue },
-+ { "gpgkey=", 0, (const char **)&gpgKeyFile },
-+ { "gpghome=", 0, (const char **)&gpgHomeDir },
-+ { "cleartextkey=", 0, (const char **)&clearTextKeyFile },
-+ { "itercountk=", 1, (const char **)&passIterThousands },
-+ { "offset=", 0, (const char **)&loopOffsetBytes },
-+ { "sizelimit=", 0, (const char **)&loopSizeBytes },
-+ { "encryption=", 0, (const char **)&loopEncryptionType },
- { "speed=", 0, &opt_speed },
- { "comment=", 1, &opt_comment },
- { "uhelper=", 0, &opt_uhelper },
-@@ -826,9 +832,8 @@
-
- static int
- loop_check(const char **spec, const char **type, int *flags,
-- int *loop, const char **loopdev, const char **loopfile) {
-+ int *loop, const char **loopdev, const char **loopfile, unsigned int *AutoChmodPtr) {
- int looptype;
-- unsigned long long offset;
-
- /*
- * In the case of a loop mount, either type is of the form lo@/dev/loop5
-@@ -853,7 +858,7 @@
- *type = opt_vfstype;
- }
-
-- *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_encryption);
-+ *loop = ((*flags & MS_LOOP) || *loopdev || loopOffsetBytes || loopSizeBytes || loopEncryptionType);
- *loopfile = *spec;
-
- if (*loop) {
-@@ -861,12 +866,14 @@
- if (fake) {
- if (verbose)
- printf(_("mount: skipping the setup of a loop device\n"));
-+ } else if (*loopdev && is_loop_active(*loopdev, *loopfile)) {
-+ if (verbose)
-+ printf(_("mount: skipping the setup of a loop device\n"));
-+ *spec = *loopdev;
- } else {
- int loopro = (*flags & MS_RDONLY);
- int res;
-
-- offset = opt_offset ? strtoull(opt_offset, NULL, 0) : 0;
--
- do {
- if (!*loopdev || !**loopdev)
- *loopdev = find_unused_loop_device();
-@@ -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, !opt_loopdev ? 2 : 1))) {
- if (res == 2) {
- /* loop dev has been grabbed by some other process,
- try again, if not given explicitly */
- 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
--set_pfd(char *s) {
-- if (!isdigit(*s))
-- die(EX_USAGE,
-- _("mount: argument to -p or --pass-fd must be a number"));
-- pfd = atoi(optarg);
--}
--
--static void
- cdrom_setspeed(const char *spec) {
- #define CDROM_SELECT_SPEED 0x5322 /* Set the CD-ROM speed */
- if (opt_speed) {
-@@ -1006,6 +1004,7 @@
- const char *opts, *spec, *node, *types;
- char *user = 0;
- int loop = 0;
-+ unsigned int LoopMountAutomaticChmod = 0;
- const char *loopdev = 0, *loopfile = 0;
- struct stat statbuf;
-
-@@ -1052,7 +1051,7 @@
- * stale assignments of files to loop devices. Nasty when used for
- * encryption.
- */
-- res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile);
-+ res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile, &LoopMountAutomaticChmod);
- if (res)
- goto out;
- }
-@@ -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
-+ * was created on the loop device, initial permissions for
-+ * file system root directory need to be set here.
-+ */
-+ if(chmod(node, LoopMountAutomaticChmod)) {
-+ error (_("Error: encrypted file system chmod() failed"));
-+ }
-+ }
- if (special) {
- block_signals (SIG_UNBLOCK);
- res = status;
-@@ -1836,8 +1844,8 @@
- case 'O': /* with -t: mount only if (not) opt */
- test_opts = append_opt(test_opts, optarg, NULL);
- break;
-- case 'p': /* fd on which to read passwd */
-- set_pfd(optarg);
-+ case 'p': /* read passphrase from given fd */
-+ passFDnumber = optarg;
- break;
- case 'r': /* mount readonly */
- readonly = 1;
-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.
-+ */
-+
-+/* This file was part of GnuPG. Modified for use within the Linux
-+ * mount utility by Marc Mutz <Marc@Mutz.com>. None of this code is
-+ * by myself. I just removed everything that you don't need when all
-+ * you want to do is to use rmd160_hash_buffer().
-+ * My comments are marked with (mm). */
-+
-+/* GnuPG is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * GnuPG is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */
-+
-+#include <string.h> /* (mm) for memcpy */
-+#include <endian.h> /* (mm) for BIG_ENDIAN and BYTE_ORDER */
-+#include "rmd160.h"
-+
-+/* (mm) these are used by the original GnuPG file. In order to modify
-+ * that file not too much, we keep the notations. maybe it would be
-+ * better to include linux/types.h and typedef __u32 to u32 and __u8
-+ * to byte? */
-+typedef unsigned int u32; /* taken from e.g. util-linux's minix.h */
-+typedef unsigned char byte;
-+
-+typedef struct {
-+ u32 h0,h1,h2,h3,h4;
-+ u32 nblocks;
-+ byte buf[64];
-+ int count;
-+} RMD160_CONTEXT;
-+
-+/****************
-+ * Rotate a 32 bit integer by n bytes
-+ */
-+#if defined(__GNUC__) && defined(__i386__)
-+static inline u32
-+rol( u32 x, int n)
-+{
-+ __asm__("roll %%cl,%0"
-+ :"=r" (x)
-+ :"0" (x),"c" (n));
-+ return x;
-+}
-+#else
-+ #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-+#endif
-+
-+/*********************************
-+ * RIPEMD-160 is not patented, see (as of 25.10.97)
-+ * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
-+ * Note that the code uses Little Endian byteorder, which is good for
-+ * 386 etc, but we must add some conversion when used on a big endian box.
-+ *
-+ *
-+ * Pseudo-code for RIPEMD-160
-+ *
-+ * RIPEMD-160 is an iterative hash function that operates on 32-bit words.
-+ * The round function takes as input a 5-word chaining variable and a 16-word
-+ * message block and maps this to a new chaining variable. All operations are
-+ * defined on 32-bit words. Padding is identical to that of MD4.
-+ *
-+ *
-+ * RIPEMD-160: definitions
-+ *
-+ *
-+ * nonlinear functions at bit level: exor, mux, -, mux, -
-+ *
-+ * f(j, x, y, z) = x XOR y XOR z (0 <= j <= 15)
-+ * f(j, x, y, z) = (x AND y) OR (NOT(x) AND z) (16 <= j <= 31)
-+ * f(j, x, y, z) = (x OR NOT(y)) XOR z (32 <= j <= 47)
-+ * f(j, x, y, z) = (x AND z) OR (y AND NOT(z)) (48 <= j <= 63)
-+ * f(j, x, y, z) = x XOR (y OR NOT(z)) (64 <= j <= 79)
-+ *
-+ *
-+ * added constants (hexadecimal)
-+ *
-+ * K(j) = 0x00000000 (0 <= j <= 15)
-+ * K(j) = 0x5A827999 (16 <= j <= 31) int(2**30 x sqrt(2))
-+ * K(j) = 0x6ED9EBA1 (32 <= j <= 47) int(2**30 x sqrt(3))
-+ * K(j) = 0x8F1BBCDC (48 <= j <= 63) int(2**30 x sqrt(5))
-+ * K(j) = 0xA953FD4E (64 <= j <= 79) int(2**30 x sqrt(7))
-+ * K'(j) = 0x50A28BE6 (0 <= j <= 15) int(2**30 x cbrt(2))
-+ * K'(j) = 0x5C4DD124 (16 <= j <= 31) int(2**30 x cbrt(3))
-+ * K'(j) = 0x6D703EF3 (32 <= j <= 47) int(2**30 x cbrt(5))
-+ * K'(j) = 0x7A6D76E9 (48 <= j <= 63) int(2**30 x cbrt(7))
-+ * K'(j) = 0x00000000 (64 <= j <= 79)
-+ *
-+ *
-+ * selection of message word
-+ *
-+ * r(j) = j (0 <= j <= 15)
-+ * r(16..31) = 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8
-+ * r(32..47) = 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12
-+ * r(48..63) = 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2
-+ * r(64..79) = 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13
-+ * r0(0..15) = 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12
-+ * r0(16..31)= 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2
-+ * r0(32..47)= 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13
-+ * r0(48..63)= 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14
-+ * r0(64..79)= 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11
-+ *
-+ *
-+ * amount for rotate left (rol)
-+ *
-+ * s(0..15) = 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8
-+ * s(16..31) = 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12
-+ * s(32..47) = 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5
-+ * s(48..63) = 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12
-+ * s(64..79) = 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6
-+ * s'(0..15) = 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6
-+ * s'(16..31)= 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11
-+ * s'(32..47)= 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5
-+ * s'(48..63)= 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8
-+ * s'(64..79)= 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11
-+ *
-+ *
-+ * initial value (hexadecimal)
-+ *
-+ * h0 = 0x67452301; h1 = 0xEFCDAB89; h2 = 0x98BADCFE; h3 = 0x10325476;
-+ * h4 = 0xC3D2E1F0;
-+ *
-+ *
-+ * RIPEMD-160: pseudo-code
-+ *
-+ * It is assumed that the message after padding consists of t 16-word blocks
-+ * that will be denoted with X[i][j], with 0 <= i <= t-1 and 0 <= j <= 15.
-+ * The symbol [+] denotes addition modulo 2**32 and rol_s denotes cyclic left
-+ * shift (rotate) over s positions.
-+ *
-+ *
-+ * for i := 0 to t-1 {
-+ * A := h0; B := h1; C := h2; D = h3; E = h4;
-+ * A' := h0; B' := h1; C' := h2; D' = h3; E' = h4;
-+ * for j := 0 to 79 {
-+ * T := rol_s(j)(A [+] f(j, B, C, D) [+] X[i][r(j)] [+] K(j)) [+] E;
-+ * A := E; E := D; D := rol_10(C); C := B; B := T;
-+ * T := rol_s'(j)(A' [+] f(79-j, B', C', D') [+] X[i][r'(j)]
-+ [+] K'(j)) [+] E';
-+ * A' := E'; E' := D'; D' := rol_10(C'); C' := B'; B' := T;
-+ * }
-+ * T := h1 [+] C [+] D'; h1 := h2 [+] D [+] E'; h2 := h3 [+] E [+] A';
-+ * h3 := h4 [+] A [+] B'; h4 := h0 [+] B [+] C'; h0 := T;
-+ * }
-+ */
-+
-+/* Some examples:
-+ * "" 9c1185a5c5e9fc54612808977ee8f548b2258d31
-+ * "a" 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe
-+ * "abc" 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
-+ * "message digest" 5d0689ef49d2fae572b881b123a85ffa21595f36
-+ * "a...z" f71c27109c692c1b56bbdceb5b9d2865b3708dbc
-+ * "abcdbcde...nopq" 12a053384a9c0c88e405a06c27dcf49ada62eb2b
-+ * "A...Za...z0...9" b0e20b6e3116640286ed3a87a5713079b21f5189
-+ * 8 times "1234567890" 9b752e45573d4b39f4dbd3323cab82bf63326bfb
-+ * 1 million times "a" 52783243c1697bdbe16d37f97f68f08325dc1528
-+ */
-+
-+
-+static void
-+rmd160_init( RMD160_CONTEXT *hd )
-+{
-+ hd->h0 = 0x67452301;
-+ hd->h1 = 0xEFCDAB89;
-+ hd->h2 = 0x98BADCFE;
-+ hd->h3 = 0x10325476;
-+ hd->h4 = 0xC3D2E1F0;
-+ hd->nblocks = 0;
-+ hd->count = 0;
-+}
-+
-+
-+
-+/****************
-+ * Transform the message X which consists of 16 32-bit-words
-+ */
-+static void
-+transform( RMD160_CONTEXT *hd, byte *data )
-+{
-+ u32 a,b,c,d,e,aa,bb,cc,dd,ee,t;
-+ #if BYTE_ORDER == BIG_ENDIAN
-+ u32 x[16];
-+ { int i;
-+ byte *p2, *p1;
-+ for(i=0, p1=data, p2=(byte*)x; i < 16; i++, p2 += 4 ) {
-+ p2[3] = *p1++;
-+ p2[2] = *p1++;
-+ p2[1] = *p1++;
-+ p2[0] = *p1++;
-+ }
-+ }
-+ #else
-+ #if 0
-+ u32 *x =(u32*)data;
-+ #else
-+ /* this version is better because it is always aligned;
-+ * The performance penalty on a 586-100 is about 6% which
-+ * is acceptable - because the data is more local it might
-+ * also be possible that this is faster on some machines.
-+ * This function (when compiled with -02 on gcc 2.7.2)
-+ * executes on a 586-100 (39.73 bogomips) at about 1900kb/sec;
-+ * [measured with a 4MB data and "gpgm --print-md rmd160"] */
-+ u32 x[16];
-+ memcpy( x, data, 64 );
-+ #endif
-+ #endif
-+
-+
-+#define K0 0x00000000
-+#define K1 0x5A827999
-+#define K2 0x6ED9EBA1
-+#define K3 0x8F1BBCDC
-+#define K4 0xA953FD4E
-+#define KK0 0x50A28BE6
-+#define KK1 0x5C4DD124
-+#define KK2 0x6D703EF3
-+#define KK3 0x7A6D76E9
-+#define KK4 0x00000000
-+#define F0(x,y,z) ( (x) ^ (y) ^ (z) )
-+#define F1(x,y,z) ( ((x) & (y)) | (~(x) & (z)) )
-+#define F2(x,y,z) ( ((x) | ~(y)) ^ (z) )
-+#define F3(x,y,z) ( ((x) & (z)) | ((y) & ~(z)) )
-+#define F4(x,y,z) ( (x) ^ ((y) | ~(z)) )
-+#define R(a,b,c,d,e,f,k,r,s) do { t = a + f(b,c,d) + k + x[r]; \
-+ a = rol(t,s) + e; \
-+ c = rol(c,10); \
-+ } while(0)
-+
-+ /* left lane */
-+ a = hd->h0;
-+ b = hd->h1;
-+ c = hd->h2;
-+ d = hd->h3;
-+ e = hd->h4;
-+ R( a, b, c, d, e, F0, K0, 0, 11 );
-+ R( e, a, b, c, d, F0, K0, 1, 14 );
-+ R( d, e, a, b, c, F0, K0, 2, 15 );
-+ R( c, d, e, a, b, F0, K0, 3, 12 );
-+ R( b, c, d, e, a, F0, K0, 4, 5 );
-+ R( a, b, c, d, e, F0, K0, 5, 8 );
-+ R( e, a, b, c, d, F0, K0, 6, 7 );
-+ R( d, e, a, b, c, F0, K0, 7, 9 );
-+ R( c, d, e, a, b, F0, K0, 8, 11 );
-+ R( b, c, d, e, a, F0, K0, 9, 13 );
-+ R( a, b, c, d, e, F0, K0, 10, 14 );
-+ R( e, a, b, c, d, F0, K0, 11, 15 );
-+ R( d, e, a, b, c, F0, K0, 12, 6 );
-+ R( c, d, e, a, b, F0, K0, 13, 7 );
-+ R( b, c, d, e, a, F0, K0, 14, 9 );
-+ R( a, b, c, d, e, F0, K0, 15, 8 );
-+ R( e, a, b, c, d, F1, K1, 7, 7 );
-+ R( d, e, a, b, c, F1, K1, 4, 6 );
-+ R( c, d, e, a, b, F1, K1, 13, 8 );
-+ R( b, c, d, e, a, F1, K1, 1, 13 );
-+ R( a, b, c, d, e, F1, K1, 10, 11 );
-+ R( e, a, b, c, d, F1, K1, 6, 9 );
-+ R( d, e, a, b, c, F1, K1, 15, 7 );
-+ R( c, d, e, a, b, F1, K1, 3, 15 );
-+ R( b, c, d, e, a, F1, K1, 12, 7 );
-+ R( a, b, c, d, e, F1, K1, 0, 12 );
-+ R( e, a, b, c, d, F1, K1, 9, 15 );
-+ R( d, e, a, b, c, F1, K1, 5, 9 );
-+ R( c, d, e, a, b, F1, K1, 2, 11 );
-+ R( b, c, d, e, a, F1, K1, 14, 7 );
-+ R( a, b, c, d, e, F1, K1, 11, 13 );
-+ R( e, a, b, c, d, F1, K1, 8, 12 );
-+ R( d, e, a, b, c, F2, K2, 3, 11 );
-+ R( c, d, e, a, b, F2, K2, 10, 13 );
-+ R( b, c, d, e, a, F2, K2, 14, 6 );
-+ R( a, b, c, d, e, F2, K2, 4, 7 );
-+ R( e, a, b, c, d, F2, K2, 9, 14 );
-+ R( d, e, a, b, c, F2, K2, 15, 9 );
-+ R( c, d, e, a, b, F2, K2, 8, 13 );
-+ R( b, c, d, e, a, F2, K2, 1, 15 );
-+ R( a, b, c, d, e, F2, K2, 2, 14 );
-+ R( e, a, b, c, d, F2, K2, 7, 8 );
-+ R( d, e, a, b, c, F2, K2, 0, 13 );
-+ R( c, d, e, a, b, F2, K2, 6, 6 );
-+ R( b, c, d, e, a, F2, K2, 13, 5 );
-+ R( a, b, c, d, e, F2, K2, 11, 12 );
-+ R( e, a, b, c, d, F2, K2, 5, 7 );
-+ R( d, e, a, b, c, F2, K2, 12, 5 );
-+ R( c, d, e, a, b, F3, K3, 1, 11 );
-+ R( b, c, d, e, a, F3, K3, 9, 12 );
-+ R( a, b, c, d, e, F3, K3, 11, 14 );
-+ R( e, a, b, c, d, F3, K3, 10, 15 );
-+ R( d, e, a, b, c, F3, K3, 0, 14 );
-+ R( c, d, e, a, b, F3, K3, 8, 15 );
-+ R( b, c, d, e, a, F3, K3, 12, 9 );
-+ R( a, b, c, d, e, F3, K3, 4, 8 );
-+ R( e, a, b, c, d, F3, K3, 13, 9 );
-+ R( d, e, a, b, c, F3, K3, 3, 14 );
-+ R( c, d, e, a, b, F3, K3, 7, 5 );
-+ R( b, c, d, e, a, F3, K3, 15, 6 );
-+ R( a, b, c, d, e, F3, K3, 14, 8 );
-+ R( e, a, b, c, d, F3, K3, 5, 6 );
-+ R( d, e, a, b, c, F3, K3, 6, 5 );
-+ R( c, d, e, a, b, F3, K3, 2, 12 );
-+ R( b, c, d, e, a, F4, K4, 4, 9 );
-+ R( a, b, c, d, e, F4, K4, 0, 15 );
-+ R( e, a, b, c, d, F4, K4, 5, 5 );
-+ R( d, e, a, b, c, F4, K4, 9, 11 );
-+ R( c, d, e, a, b, F4, K4, 7, 6 );
-+ R( b, c, d, e, a, F4, K4, 12, 8 );
-+ R( a, b, c, d, e, F4, K4, 2, 13 );
-+ R( e, a, b, c, d, F4, K4, 10, 12 );
-+ R( d, e, a, b, c, F4, K4, 14, 5 );
-+ R( c, d, e, a, b, F4, K4, 1, 12 );
-+ R( b, c, d, e, a, F4, K4, 3, 13 );
-+ R( a, b, c, d, e, F4, K4, 8, 14 );
-+ R( e, a, b, c, d, F4, K4, 11, 11 );
-+ R( d, e, a, b, c, F4, K4, 6, 8 );
-+ R( c, d, e, a, b, F4, K4, 15, 5 );
-+ R( b, c, d, e, a, F4, K4, 13, 6 );
-+
-+ aa = a; bb = b; cc = c; dd = d; ee = e;
-+
-+ /* right lane */
-+ a = hd->h0;
-+ b = hd->h1;
-+ c = hd->h2;
-+ d = hd->h3;
-+ e = hd->h4;
-+ R( a, b, c, d, e, F4, KK0, 5, 8);
-+ R( e, a, b, c, d, F4, KK0, 14, 9);
-+ R( d, e, a, b, c, F4, KK0, 7, 9);
-+ R( c, d, e, a, b, F4, KK0, 0, 11);
-+ R( b, c, d, e, a, F4, KK0, 9, 13);
-+ R( a, b, c, d, e, F4, KK0, 2, 15);
-+ R( e, a, b, c, d, F4, KK0, 11, 15);
-+ R( d, e, a, b, c, F4, KK0, 4, 5);
-+ R( c, d, e, a, b, F4, KK0, 13, 7);
-+ R( b, c, d, e, a, F4, KK0, 6, 7);
-+ R( a, b, c, d, e, F4, KK0, 15, 8);
-+ R( e, a, b, c, d, F4, KK0, 8, 11);
-+ R( d, e, a, b, c, F4, KK0, 1, 14);
-+ R( c, d, e, a, b, F4, KK0, 10, 14);
-+ R( b, c, d, e, a, F4, KK0, 3, 12);
-+ R( a, b, c, d, e, F4, KK0, 12, 6);
-+ R( e, a, b, c, d, F3, KK1, 6, 9);
-+ R( d, e, a, b, c, F3, KK1, 11, 13);
-+ R( c, d, e, a, b, F3, KK1, 3, 15);
-+ R( b, c, d, e, a, F3, KK1, 7, 7);
-+ R( a, b, c, d, e, F3, KK1, 0, 12);
-+ R( e, a, b, c, d, F3, KK1, 13, 8);
-+ R( d, e, a, b, c, F3, KK1, 5, 9);
-+ R( c, d, e, a, b, F3, KK1, 10, 11);
-+ R( b, c, d, e, a, F3, KK1, 14, 7);
-+ R( a, b, c, d, e, F3, KK1, 15, 7);
-+ R( e, a, b, c, d, F3, KK1, 8, 12);
-+ R( d, e, a, b, c, F3, KK1, 12, 7);
-+ R( c, d, e, a, b, F3, KK1, 4, 6);
-+ R( b, c, d, e, a, F3, KK1, 9, 15);
-+ R( a, b, c, d, e, F3, KK1, 1, 13);
-+ R( e, a, b, c, d, F3, KK1, 2, 11);
-+ R( d, e, a, b, c, F2, KK2, 15, 9);
-+ R( c, d, e, a, b, F2, KK2, 5, 7);
-+ R( b, c, d, e, a, F2, KK2, 1, 15);
-+ R( a, b, c, d, e, F2, KK2, 3, 11);
-+ R( e, a, b, c, d, F2, KK2, 7, 8);
-+ R( d, e, a, b, c, F2, KK2, 14, 6);
-+ R( c, d, e, a, b, F2, KK2, 6, 6);
-+ R( b, c, d, e, a, F2, KK2, 9, 14);
-+ R( a, b, c, d, e, F2, KK2, 11, 12);
-+ R( e, a, b, c, d, F2, KK2, 8, 13);
-+ R( d, e, a, b, c, F2, KK2, 12, 5);
-+ R( c, d, e, a, b, F2, KK2, 2, 14);
-+ R( b, c, d, e, a, F2, KK2, 10, 13);
-+ R( a, b, c, d, e, F2, KK2, 0, 13);
-+ R( e, a, b, c, d, F2, KK2, 4, 7);
-+ R( d, e, a, b, c, F2, KK2, 13, 5);
-+ R( c, d, e, a, b, F1, KK3, 8, 15);
-+ R( b, c, d, e, a, F1, KK3, 6, 5);
-+ R( a, b, c, d, e, F1, KK3, 4, 8);
-+ R( e, a, b, c, d, F1, KK3, 1, 11);
-+ R( d, e, a, b, c, F1, KK3, 3, 14);
-+ R( c, d, e, a, b, F1, KK3, 11, 14);
-+ R( b, c, d, e, a, F1, KK3, 15, 6);
-+ R( a, b, c, d, e, F1, KK3, 0, 14);
-+ R( e, a, b, c, d, F1, KK3, 5, 6);
-+ R( d, e, a, b, c, F1, KK3, 12, 9);
-+ R( c, d, e, a, b, F1, KK3, 2, 12);
-+ R( b, c, d, e, a, F1, KK3, 13, 9);
-+ R( a, b, c, d, e, F1, KK3, 9, 12);
-+ R( e, a, b, c, d, F1, KK3, 7, 5);
-+ R( d, e, a, b, c, F1, KK3, 10, 15);
-+ R( c, d, e, a, b, F1, KK3, 14, 8);
-+ R( b, c, d, e, a, F0, KK4, 12, 8);
-+ R( a, b, c, d, e, F0, KK4, 15, 5);
-+ R( e, a, b, c, d, F0, KK4, 10, 12);
-+ R( d, e, a, b, c, F0, KK4, 4, 9);
-+ R( c, d, e, a, b, F0, KK4, 1, 12);
-+ R( b, c, d, e, a, F0, KK4, 5, 5);
-+ R( a, b, c, d, e, F0, KK4, 8, 14);
-+ R( e, a, b, c, d, F0, KK4, 7, 6);
-+ R( d, e, a, b, c, F0, KK4, 6, 8);
-+ R( c, d, e, a, b, F0, KK4, 2, 13);
-+ R( b, c, d, e, a, F0, KK4, 13, 6);
-+ R( a, b, c, d, e, F0, KK4, 14, 5);
-+ R( e, a, b, c, d, F0, KK4, 0, 15);
-+ R( d, e, a, b, c, F0, KK4, 3, 13);
-+ R( c, d, e, a, b, F0, KK4, 9, 11);
-+ R( b, c, d, e, a, F0, KK4, 11, 11);
-+
-+
-+ t = hd->h1 + d + cc;
-+ hd->h1 = hd->h2 + e + dd;
-+ hd->h2 = hd->h3 + a + ee;
-+ hd->h3 = hd->h4 + b + aa;
-+ hd->h4 = hd->h0 + c + bb;
-+ hd->h0 = t;
-+}
-+
-+
-+/* Update the message digest with the contents
-+ * of INBUF with length INLEN.
-+ */
-+static void
-+rmd160_write( RMD160_CONTEXT *hd, byte *inbuf, size_t inlen)
-+{
-+ if( hd->count == 64 ) { /* flush the buffer */
-+ transform( hd, hd->buf );
-+ hd->count = 0;
-+ hd->nblocks++;
-+ }
-+ if( !inbuf )
-+ return;
-+ if( hd->count ) {
-+ for( ; inlen && hd->count < 64; inlen-- )
-+ hd->buf[hd->count++] = *inbuf++;
-+ rmd160_write( hd, NULL, 0 );
-+ if( !inlen )
-+ return;
-+ }
-+
-+ while( inlen >= 64 ) {
-+ transform( hd, inbuf );
-+ hd->count = 0;
-+ hd->nblocks++;
-+ inlen -= 64;
-+ inbuf += 64;
-+ }
-+ for( ; inlen && hd->count < 64; inlen-- )
-+ hd->buf[hd->count++] = *inbuf++;
-+}
-+
-+/* The routine terminates the computation
-+ */
-+
-+static void
-+rmd160_final( RMD160_CONTEXT *hd )
-+{
-+ u32 t, msb, lsb;
-+ byte *p;
-+
-+ rmd160_write(hd, NULL, 0); /* flush */;
-+
-+ msb = 0;
-+ t = hd->nblocks;
-+ if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-+ msb++;
-+ msb += t >> 26;
-+ t = lsb;
-+ if( (lsb = t + hd->count) < t ) /* add the count */
-+ msb++;
-+ t = lsb;
-+ if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-+ msb++;
-+ msb += t >> 29;
-+
-+ if( hd->count < 56 ) { /* enough room */
-+ hd->buf[hd->count++] = 0x80; /* pad */
-+ while( hd->count < 56 )
-+ hd->buf[hd->count++] = 0; /* pad */
-+ }
-+ else { /* need one extra block */
-+ hd->buf[hd->count++] = 0x80; /* pad character */
-+ while( hd->count < 64 )
-+ hd->buf[hd->count++] = 0;
-+ rmd160_write(hd, NULL, 0); /* flush */;
-+ memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
-+ }
-+ /* append the 64 bit count */
-+ hd->buf[56] = lsb ;
-+ hd->buf[57] = lsb >> 8;
-+ hd->buf[58] = lsb >> 16;
-+ hd->buf[59] = lsb >> 24;
-+ hd->buf[60] = msb ;
-+ hd->buf[61] = msb >> 8;
-+ hd->buf[62] = msb >> 16;
-+ hd->buf[63] = msb >> 24;
-+ transform( hd, hd->buf );
-+
-+ p = hd->buf;
-+ #if BYTE_ORDER == BIG_ENDIAN
-+ #define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \
-+ *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0)
-+ #else /* little endian */
-+ #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0)
-+ #endif
-+ X(0);
-+ X(1);
-+ X(2);
-+ X(3);
-+ X(4);
-+ #undef X
-+}
-+
-+/****************
-+ * Shortcut functions which puts the hash value of the supplied buffer
-+ * into outbuf which must have a size of 20 bytes.
-+ */
-+void
-+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length )
-+{
-+ RMD160_CONTEXT hd;
-+
-+ rmd160_init( &hd );
-+ rmd160_write( &hd, (byte*)buffer, length );
-+ rmd160_final( &hd );
-+ memcpy( outbuf, hd.buf, 20 );
-+}
-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
-+
-+void
-+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length );
-+
-+#endif /*RMD160_H*/
-+
-+
-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
-+ *
-+ * Written by Jari Ruusu, April 16 2001
-+ *
-+ * Copyright 2001 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU Public License.
-+ */
-+
-+#include <string.h>
-+#include <sys/types.h>
-+#include "sha512.h"
-+
-+/* Define one or more of these. If none is defined, you get all of them */
-+#if !defined(SHA256_NEEDED)&&!defined(SHA512_NEEDED)&&!defined(SHA384_NEEDED)
-+# define SHA256_NEEDED 1
-+# define SHA512_NEEDED 1
-+# define SHA384_NEEDED 1
-+#endif
-+
-+#if defined(SHA256_NEEDED)
-+static const u_int32_t sha256_hashInit[8] = {
-+ 0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c,
-+ 0x1f83d9ab, 0x5be0cd19
-+};
-+static const u_int32_t sha256_K[64] = {
-+ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
-+ 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-+ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
-+ 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
-+ 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-+ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
-+ 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
-+ 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-+ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-+};
-+#endif
-+
-+#if defined(SHA512_NEEDED)
-+static const u_int64_t sha512_hashInit[8] = {
-+ 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL,
-+ 0xa54ff53a5f1d36f1ULL, 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-+ 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-+};
-+#endif
-+
-+#if defined(SHA384_NEEDED)
-+static const u_int64_t sha384_hashInit[8] = {
-+ 0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, 0x9159015a3070dd17ULL,
-+ 0x152fecd8f70e5939ULL, 0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL,
-+ 0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL
-+};
-+#endif
-+
-+#if defined(SHA512_NEEDED) || defined(SHA384_NEEDED)
-+static const u_int64_t sha512_K[80] = {
-+ 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
-+ 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
-+ 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
-+ 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-+ 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
-+ 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-+ 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
-+ 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-+ 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
-+ 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
-+ 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
-+ 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-+ 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
-+ 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
-+ 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
-+ 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-+ 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
-+ 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-+ 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
-+ 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-+ 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
-+ 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
-+ 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
-+ 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-+ 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
-+ 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
-+ 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-+};
-+#endif
-+
-+#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-+#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-+#define R(x,y) ((y) >> (x))
-+
-+#if defined(SHA256_NEEDED)
-+void sha256_init(sha256_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha256_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+
-+#define S(x,y) (((y) >> (x)) | ((y) << (32 - (x))))
-+#define uSig0(x) ((S(2,(x))) ^ (S(13,(x))) ^ (S(22,(x))))
-+#define uSig1(x) ((S(6,(x))) ^ (S(11,(x))) ^ (S(25,(x))))
-+#define lSig0(x) ((S(7,(x))) ^ (S(18,(x))) ^ (R(3,(x))))
-+#define lSig1(x) ((S(17,(x))) ^ (S(19,(x))) ^ (R(10,(x))))
-+
-+static void sha256_transform(sha256_context *ctx, unsigned char *datap)
-+{
-+ register int j;
-+ u_int32_t a, b, c, d, e, f, g, h;
-+ u_int32_t T1, T2, W[64], Wm2, Wm15;
-+
-+ /* read the data, big endian byte order */
-+ j = 0;
-+ do {
-+ W[j] = (((u_int32_t)(datap[0]))<<24) | (((u_int32_t)(datap[1]))<<16) |
-+ (((u_int32_t)(datap[2]))<<8 ) | ((u_int32_t)(datap[3]));
-+ datap += 4;
-+ } while(++j < 16);
-+
-+ /* initialize variables a...h */
-+ a = ctx->sha_H[0];
-+ b = ctx->sha_H[1];
-+ c = ctx->sha_H[2];
-+ d = ctx->sha_H[3];
-+ e = ctx->sha_H[4];
-+ f = ctx->sha_H[5];
-+ g = ctx->sha_H[6];
-+ h = ctx->sha_H[7];
-+
-+ /* apply compression function */
-+ j = 0;
-+ do {
-+ if(j >= 16) {
-+ Wm2 = W[j - 2];
-+ Wm15 = W[j - 15];
-+ W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-+ }
-+ T1 = h + uSig1(e) + Ch(e,f,g) + sha256_K[j] + W[j];
-+ T2 = uSig0(a) + Maj(a,b,c);
-+ h = g; g = f; f = e;
-+ e = d + T1;
-+ d = c; c = b; b = a;
-+ a = T1 + T2;
-+ } while(++j < 64);
-+
-+ /* compute intermediate hash value */
-+ ctx->sha_H[0] += a;
-+ ctx->sha_H[1] += b;
-+ ctx->sha_H[2] += c;
-+ ctx->sha_H[3] += d;
-+ ctx->sha_H[4] += e;
-+ ctx->sha_H[5] += f;
-+ ctx->sha_H[6] += g;
-+ ctx->sha_H[7] += h;
-+
-+ ctx->sha_blocks++;
-+}
-+
-+void sha256_write(sha256_context *ctx, unsigned char *datap, int length)
-+{
-+ while(length > 0) {
-+ if(!ctx->sha_bufCnt) {
-+ while(length >= sizeof(ctx->sha_out)) {
-+ sha256_transform(ctx, datap);
-+ datap += sizeof(ctx->sha_out);
-+ length -= sizeof(ctx->sha_out);
-+ }
-+ if(!length) return;
-+ }
-+ ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-+ length--;
-+ if(++ctx->sha_bufCnt == sizeof(ctx->sha_out)) {
-+ sha256_transform(ctx, &ctx->sha_out[0]);
-+ ctx->sha_bufCnt = 0;
-+ }
-+ }
-+}
-+
-+void sha256_final(sha256_context *ctx)
-+{
-+ register int j;
-+ u_int64_t bitLength;
-+ u_int32_t i;
-+ unsigned char padByte, *datap;
-+
-+ bitLength = (ctx->sha_blocks << 9) | (ctx->sha_bufCnt << 3);
-+ padByte = 0x80;
-+ sha256_write(ctx, &padByte, 1);
-+
-+ /* pad extra space with zeroes */
-+ padByte = 0;
-+ while(ctx->sha_bufCnt != 56) {
-+ sha256_write(ctx, &padByte, 1);
-+ }
-+
-+ /* write bit length, big endian byte order */
-+ ctx->sha_out[56] = bitLength >> 56;
-+ ctx->sha_out[57] = bitLength >> 48;
-+ ctx->sha_out[58] = bitLength >> 40;
-+ ctx->sha_out[59] = bitLength >> 32;
-+ ctx->sha_out[60] = bitLength >> 24;
-+ ctx->sha_out[61] = bitLength >> 16;
-+ ctx->sha_out[62] = bitLength >> 8;
-+ ctx->sha_out[63] = bitLength;
-+ sha256_transform(ctx, &ctx->sha_out[0]);
-+
-+ /* return results in ctx->sha_out[0...31] */
-+ datap = &ctx->sha_out[0];
-+ j = 0;
-+ do {
-+ i = ctx->sha_H[j];
-+ datap[0] = i >> 24;
-+ datap[1] = i >> 16;
-+ datap[2] = i >> 8;
-+ datap[3] = i;
-+ datap += 4;
-+ } while(++j < 8);
-+
-+ /* clear sensitive information */
-+ memset(&ctx->sha_out[32], 0, sizeof(sha256_context) - 32);
-+}
-+
-+void sha256_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha256_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 32) ole = 32;
-+ sha256_init(&ctx);
-+ sha256_write(&ctx, ib, ile);
-+ sha256_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+
-+#endif
-+
-+#if defined(SHA512_NEEDED)
-+void sha512_init(sha512_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha512_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_blocksMSB = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+#endif
-+
-+#if defined(SHA512_NEEDED) || defined(SHA384_NEEDED)
-+#undef S
-+#undef uSig0
-+#undef uSig1
-+#undef lSig0
-+#undef lSig1
-+#define S(x,y) (((y) >> (x)) | ((y) << (64 - (x))))
-+#define uSig0(x) ((S(28,(x))) ^ (S(34,(x))) ^ (S(39,(x))))
-+#define uSig1(x) ((S(14,(x))) ^ (S(18,(x))) ^ (S(41,(x))))
-+#define lSig0(x) ((S(1,(x))) ^ (S(8,(x))) ^ (R(7,(x))))
-+#define lSig1(x) ((S(19,(x))) ^ (S(61,(x))) ^ (R(6,(x))))
-+
-+static void sha512_transform(sha512_context *ctx, unsigned char *datap)
-+{
-+ register int j;
-+ u_int64_t a, b, c, d, e, f, g, h;
-+ u_int64_t T1, T2, W[80], Wm2, Wm15;
-+
-+ /* read the data, big endian byte order */
-+ j = 0;
-+ do {
-+ W[j] = (((u_int64_t)(datap[0]))<<56) | (((u_int64_t)(datap[1]))<<48) |
-+ (((u_int64_t)(datap[2]))<<40) | (((u_int64_t)(datap[3]))<<32) |
-+ (((u_int64_t)(datap[4]))<<24) | (((u_int64_t)(datap[5]))<<16) |
-+ (((u_int64_t)(datap[6]))<<8 ) | ((u_int64_t)(datap[7]));
-+ datap += 8;
-+ } while(++j < 16);
-+
-+ /* initialize variables a...h */
-+ a = ctx->sha_H[0];
-+ b = ctx->sha_H[1];
-+ c = ctx->sha_H[2];
-+ d = ctx->sha_H[3];
-+ e = ctx->sha_H[4];
-+ f = ctx->sha_H[5];
-+ g = ctx->sha_H[6];
-+ h = ctx->sha_H[7];
-+
-+ /* apply compression function */
-+ j = 0;
-+ do {
-+ if(j >= 16) {
-+ Wm2 = W[j - 2];
-+ Wm15 = W[j - 15];
-+ W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-+ }
-+ T1 = h + uSig1(e) + Ch(e,f,g) + sha512_K[j] + W[j];
-+ T2 = uSig0(a) + Maj(a,b,c);
-+ h = g; g = f; f = e;
-+ e = d + T1;
-+ d = c; c = b; b = a;
-+ a = T1 + T2;
-+ } while(++j < 80);
-+
-+ /* compute intermediate hash value */
-+ ctx->sha_H[0] += a;
-+ ctx->sha_H[1] += b;
-+ ctx->sha_H[2] += c;
-+ ctx->sha_H[3] += d;
-+ ctx->sha_H[4] += e;
-+ ctx->sha_H[5] += f;
-+ ctx->sha_H[6] += g;
-+ ctx->sha_H[7] += h;
-+
-+ ctx->sha_blocks++;
-+ if(!ctx->sha_blocks) ctx->sha_blocksMSB++;
-+}
-+
-+void sha512_write(sha512_context *ctx, unsigned char *datap, int length)
-+{
-+ while(length > 0) {
-+ if(!ctx->sha_bufCnt) {
-+ while(length >= sizeof(ctx->sha_out)) {
-+ sha512_transform(ctx, datap);
-+ datap += sizeof(ctx->sha_out);
-+ length -= sizeof(ctx->sha_out);
-+ }
-+ if(!length) return;
-+ }
-+ ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-+ length--;
-+ if(++ctx->sha_bufCnt == sizeof(ctx->sha_out)) {
-+ sha512_transform(ctx, &ctx->sha_out[0]);
-+ ctx->sha_bufCnt = 0;
-+ }
-+ }
-+}
-+
-+void sha512_final(sha512_context *ctx)
-+{
-+ register int j;
-+ u_int64_t bitLength, bitLengthMSB;
-+ u_int64_t i;
-+ unsigned char padByte, *datap;
-+
-+ bitLength = (ctx->sha_blocks << 10) | (ctx->sha_bufCnt << 3);
-+ bitLengthMSB = (ctx->sha_blocksMSB << 10) | (ctx->sha_blocks >> 54);
-+ padByte = 0x80;
-+ sha512_write(ctx, &padByte, 1);
-+
-+ /* pad extra space with zeroes */
-+ padByte = 0;
-+ while(ctx->sha_bufCnt != 112) {
-+ sha512_write(ctx, &padByte, 1);
-+ }
-+
-+ /* write bit length, big endian byte order */
-+ ctx->sha_out[112] = bitLengthMSB >> 56;
-+ ctx->sha_out[113] = bitLengthMSB >> 48;
-+ ctx->sha_out[114] = bitLengthMSB >> 40;
-+ ctx->sha_out[115] = bitLengthMSB >> 32;
-+ ctx->sha_out[116] = bitLengthMSB >> 24;
-+ ctx->sha_out[117] = bitLengthMSB >> 16;
-+ ctx->sha_out[118] = bitLengthMSB >> 8;
-+ ctx->sha_out[119] = bitLengthMSB;
-+ ctx->sha_out[120] = bitLength >> 56;
-+ ctx->sha_out[121] = bitLength >> 48;
-+ ctx->sha_out[122] = bitLength >> 40;
-+ ctx->sha_out[123] = bitLength >> 32;
-+ ctx->sha_out[124] = bitLength >> 24;
-+ ctx->sha_out[125] = bitLength >> 16;
-+ ctx->sha_out[126] = bitLength >> 8;
-+ ctx->sha_out[127] = bitLength;
-+ sha512_transform(ctx, &ctx->sha_out[0]);
-+
-+ /* return results in ctx->sha_out[0...63] */
-+ datap = &ctx->sha_out[0];
-+ j = 0;
-+ do {
-+ i = ctx->sha_H[j];
-+ datap[0] = i >> 56;
-+ datap[1] = i >> 48;
-+ datap[2] = i >> 40;
-+ datap[3] = i >> 32;
-+ datap[4] = i >> 24;
-+ datap[5] = i >> 16;
-+ datap[6] = i >> 8;
-+ datap[7] = i;
-+ datap += 8;
-+ } while(++j < 8);
-+
-+ /* clear sensitive information */
-+ memset(&ctx->sha_out[64], 0, sizeof(sha512_context) - 64);
-+}
-+
-+void sha512_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha512_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 64) ole = 64;
-+ sha512_init(&ctx);
-+ sha512_write(&ctx, ib, ile);
-+ sha512_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+#endif
-+
-+#if defined(SHA384_NEEDED)
-+void sha384_init(sha512_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha384_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_blocksMSB = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+
-+void sha384_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha512_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 48) ole = 48;
-+ sha384_init(&ctx);
-+ sha512_write(&ctx, ib, ile);
-+ sha512_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+#endif
-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
-+ *
-+ * Written by Jari Ruusu, April 16 2001
-+ *
-+ * Copyright 2001 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU Public License.
-+ */
-+
-+#include <sys/types.h>
-+
-+typedef struct {
-+ unsigned char sha_out[64]; /* results are here, bytes 0...31 */
-+ u_int32_t sha_H[8];
-+ u_int64_t sha_blocks;
-+ int sha_bufCnt;
-+} sha256_context;
-+
-+typedef struct {
-+ unsigned char sha_out[128]; /* results are here, bytes 0...63 */
-+ u_int64_t sha_H[8];
-+ u_int64_t sha_blocks;
-+ u_int64_t sha_blocksMSB;
-+ int sha_bufCnt;
-+} sha512_context;
-+
-+/* no sha384_context, use sha512_context */
-+
-+/* 256 bit hash, provides 128 bits of security against collision attacks */
-+extern void sha256_init(sha256_context *);
-+extern void sha256_write(sha256_context *, unsigned char *, int);
-+extern void sha256_final(sha256_context *);
-+extern void sha256_hash_buffer(unsigned char *, int, unsigned char *, int);
-+
-+/* 512 bit hash, provides 256 bits of security against collision attacks */
-+extern void sha512_init(sha512_context *);
-+extern void sha512_write(sha512_context *, unsigned char *, int);
-+extern void sha512_final(sha512_context *);
-+extern void sha512_hash_buffer(unsigned char *, int, unsigned char *, int);
-+
-+/* 384 bit hash, provides 192 bits of security against collision attacks */
-+extern void sha384_init(sha512_context *);
-+/* 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 -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 ).
-+.PP
-+If
-+.I loop=/dev/loop?
-+and
-+.I encryption=AES128
-+options are present in
-+.I /etc/fstab
-+then
-+.BR "swapon -a"
-+will set up loop devices using random keys, run
-+.BR "mkswap"
-+on them, and enable encrypted swap on specified loop devices. Encrypted loop
-+devices are set up with page size offset so that unencrypted swap signatures
-+on first page of swap devices are not touched.
-+.BR "swapoff -a"
-+will tear down such loop devices.
- .SH NOTE
- You should not use
- .B swapon
-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@waw.com>
-+ * - added '-s' (summary option)
-+ * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL>
-+ * - added Native Language Support
-+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * - fixed strerr(errno) in gettext calls
-+ * 2001-03-22 Erik Troan <ewt@redhat.com>
-+ * - added -e option for -a
-+ * - -a shouldn't try to add swaps that are already enabled
-+ * 2002-04-14 Jari Ruusu
-+ * - added encrypted swap support
- */
- #include <ctype.h>
- #include <stdlib.h>
-@@ -8,7 +21,14 @@
- #include <string.h>
- #include <mntent.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <sys/utsname.h>
-+#include <sys/time.h>
-+#include <asm/page.h>
- #include <unistd.h>
- #include "xmalloc.h"
- #include "swap_constants.h"
-@@ -16,6 +36,9 @@
- #include "fsprobe.h"
- #include "realpath.h"
- #include "mount_paths.h"
-+#include "loop.h"
-+#include "xstrncpy.h"
-+#include "sha512.h"
-
- #ifdef HAVE_SYS_SWAP_H
- # include <sys/swap.h>
-@@ -288,6 +311,262 @@
- }
-
- static int
-+prepare_encrypted_swap(const char *partition, char *loop, char *encryption)
-+{
-+ int x, y, fd, ffd;
-+ int page_size;
-+ sha512_context s;
-+ unsigned char b[4096], multiKeyBits[65][32];
-+ char *a[10], *apiName;
-+ struct loop_info64 loopinfo;
-+ FILE *f;
-+
-+ /*
-+ * Some sanity checks
-+ */
-+ if(strlen(partition) < 1) {
-+ fprintf(stderr, _("swapon: invalid swap device name\n"));
-+ return 0;
-+ }
-+ if(strlen(loop) < 1) {
-+ fprintf(stderr, _("swapon: invalid loop device name\n"));
-+ return 0;
-+ }
-+ if(strlen(encryption) < 1) {
-+ fprintf(stderr, _("swapon: invalid encryption type\n"));
-+ return 0;
-+ }
-+
-+ /*
-+ * Abort if loop device does not exist or is already in use
-+ */
-+ if((fd = open(loop, O_RDWR)) == -1) {
-+ fprintf(stderr, _("swapon: unable to open loop device %s\n"), loop);
-+ return 0;
-+ }
-+ if(is_unused_loop_device(fd) == 0) {
-+ fprintf(stderr, _("swapon: loop device %s already in use\n"), loop);
-+ goto errout0;
-+ }
-+
-+ /*
-+ * Compute SHA-512 over first 40 KB of old swap data. This data
-+ * is mostly unknown data encrypted using unknown key. SHA-512 hash
-+ * output is then used as entropy for new swap encryption key.
-+ */
-+ if(!(f = fopen(partition, "r+"))) {
-+ fprintf(stderr, _("swapon: unable to open swap device %s\n"), partition);
-+ goto errout0;
-+ }
-+ page_size = getpagesize();
-+ fseek(f, (long)page_size, SEEK_SET);
-+ sha512_init(&s);
-+ for(x = 0; x < 10; x++) {
-+ if(fread(&b[0], sizeof(b), 1, f) != 1) break;
-+ sha512_write(&s, &b[0], sizeof(b));
-+ }
-+ sha512_final(&s);
-+
-+ /*
-+ * Overwrite 40 KB of old swap data 20 times so that recovering
-+ * SHA-512 output beyond this point is difficult and expensive.
-+ */
-+ for(y = 0; y < 20; y++) {
-+ int z;
-+ struct {
-+ struct timeval tv;
-+ unsigned char h[64];
-+ int x,y,z;
-+ } j;
-+ if(fseek(f, (long)page_size, SEEK_SET)) break;
-+ memcpy(&j.h[0], &s.sha_out[0], 64);
-+ gettimeofday(&j.tv, NULL);
-+ j.y = y;
-+ for(x = 0; x < 10; x++) {
-+ j.x = x;
-+ for(z = 0; z < sizeof(b); z += 64) {
-+ j.z = z;
-+ sha512_hash_buffer((unsigned char *)&j, sizeof(j), &b[z], 64);
-+ }
-+ if(fwrite(&b[0], sizeof(b), 1, f) != 1) break;
-+ }
-+ memset(&j, 0, sizeof(j));
-+ if(fflush(f)) break;
-+ if(fsync(fileno(f))) break;
-+ }
-+ fclose(f);
-+
-+ /*
-+ * Use all 512 bits of hash output
-+ */
-+ memcpy(&b[0], &s.sha_out[0], 64);
-+ memset(&s, 0, sizeof(s));
-+
-+ /*
-+ * Read 32 bytes of random entropy from kernel's random
-+ * number generator. This code may be executed early on startup
-+ * scripts and amount of random entropy may be non-existent.
-+ * SHA-512 of old swap data is used as workaround for missing
-+ * entropy in kernel's random number generator.
-+ */
-+ if(!(f = fopen("/dev/urandom", "r"))) {
-+ fprintf(stderr, _("swapon: unable to open /dev/urandom\n"));
-+ goto errout0;
-+ }
-+ fread(&b[64], 32, 1, f);
-+
-+ /*
-+ * Set up struct loop_info64
-+ */
-+ if((ffd = open(partition, O_RDWR)) < 0) {
-+ fprintf(stderr, _("swapon: unable to open swap device %s\n"), partition);
-+ goto errout1;
-+ }
-+ memset(&loopinfo, 0, sizeof(loopinfo));
-+ xstrncpy((char *)loopinfo.lo_file_name, partition, LO_NAME_SIZE);
-+ loopinfo.lo_encrypt_type = loop_crypt_type(encryption, &loopinfo.lo_encrypt_key_size, &apiName);
-+ if(loopinfo.lo_encrypt_type <= 1) {
-+ fprintf(stderr, _("swapon: unsupported swap encryption type %s\n"), encryption);
-+errout2:
-+ close(ffd);
-+errout1:
-+ fclose(f);
-+errout0:
-+ close(fd);
-+ memset(&loopinfo.lo_encrypt_key[0], 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+ return 0;
-+ }
-+ loopinfo.lo_offset = page_size;
-+ /* single-key hash */
-+ sha512_hash_buffer(&b[0], 64+32, &loopinfo.lo_encrypt_key[0], sizeof(loopinfo.lo_encrypt_key));
-+ /* multi-key hash */
-+ x = 0;
-+ while(x < 65) {
-+ fread(&b[64+32], 16, 1, f);
-+ sha512_hash_buffer(&b[0], 64+32+16, &multiKeyBits[x][0], 32);
-+ x++;
-+ }
-+
-+ /*
-+ * Try to set up single-key loop
-+ */
-+ if(ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-+ fprintf(stderr, _("swapon: LOOP_SET_FD failed\n"));
-+ goto errout2;
-+ }
-+ if ((loopinfo.lo_encrypt_type == 18) || (loop_set_status64_ioctl(fd, &loopinfo) < 0)) {
-+ if(try_cryptoapi_loop_interface(fd, &loopinfo, apiName) < 0) {
-+ fprintf(stderr, _("swapon: LOOP_SET_STATUS failed\n"));
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ goto errout2;
-+ }
-+ }
-+
-+ /*
-+ * Try to put loop to multi-key v3 or v2 mode.
-+ * If this fails, then let it operate in single-key mode.
-+ */
-+ if(ioctl(fd, LOOP_MULTI_KEY_SETUP_V3, &multiKeyBits[0][0]) < 0) {
-+ ioctl(fd, LOOP_MULTI_KEY_SETUP, &multiKeyBits[0][0]);
-+ }
-+
-+ /*
-+ * Loop is now set up. Clean up the keys.
-+ */
-+ memset(&loopinfo.lo_encrypt_key[0], 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+ close(ffd);
-+ fclose(f);
-+ close(fd);
-+
-+ /*
-+ * Write 40 KB of zeroes to loop device. That same data is written
-+ * to underlying partition in encrypted form. This is done to guarantee
-+ * that next time encrypted swap is initialized, the SHA-512 hash will
-+ * be different. And, if encrypted swap data writes over this data, that's
-+ * even better.
-+ */
-+ if(!(f = fopen(loop, "r+"))) {
-+ fprintf(stderr, _("swapon: unable to open loop device %s\n"), loop);
-+ return 0;
-+ }
-+ memset(&b[0], 0, sizeof(b));
-+ for(x = 0; x < 10; x++) {
-+ if(fwrite(&b[0], sizeof(b), 1, f) != 1) break;
-+ }
-+ fflush(f);
-+ fsync(fileno(f));
-+ fclose(f);
-+ sync();
-+
-+ /*
-+ * Run mkswap on loop device so that kernel understands it as swap.
-+ * Redirect stderr to /dev/null and ignore exit value.
-+ */
-+ if(!(x = fork())) {
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ a[0] = "mkswap";
-+ a[1] = loop;
-+ a[2] = 0;
-+ execvp(a[0], &a[0]);
-+ execv("/sbin/mkswap", &a[0]);
-+ /* error to stdout, stderr is directed to /dev/null */
-+ printf(_("swapon: unable to execute mkswap\n"));
-+ exit(1);
-+ }
-+ if(x == -1) {
-+ fprintf(stderr, _("swapon: fork failed\n"));
-+ return 0;
-+ }
-+ waitpid(x, &y, 0);
-+ sync();
-+
-+ return 1;
-+}
-+
-+static void
-+shutdown_encrypted_swap(char *loop)
-+{
-+ int fd;
-+ struct stat statbuf;
-+ struct loop_info64 loopinfo;
-+ unsigned char b[32];
-+ FILE *f;
-+
-+ if(stat(loop, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ if((fd = open(loop, O_RDWR)) >= 0) {
-+ if(!loop_get_status64_ioctl(fd, &loopinfo)) {
-+ /*
-+ * Read 32 bytes of random data from kernel's random
-+ * number generator and write that to loop device.
-+ * This preserves some of kernel's random entropy
-+ * to next activation of encrypted swap on this
-+ * partition.
-+ */
-+ if((f = fopen("/dev/urandom", "r")) != NULL) {
-+ fread(&b[0], 32, 1, f);
-+ fclose(f);
-+ write(fd, &b[0], 32);
-+ fsync(fd);
-+ }
-+ }
-+ close(fd);
-+ }
-+ sync();
-+ if((fd = open(loop, O_RDONLY)) >= 0) {
-+ if(!loop_get_status64_ioctl(fd, &loopinfo)) {
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ }
-+ close(fd);
-+ }
-+ }
-+}
-+
-+static int
- swapon_all(void) {
- FILE *fp;
- struct mntent *fstab;
-@@ -307,6 +586,8 @@
- const char *special;
- int skip = 0;
- int pri = priority;
-+ char *opt, *opts;
-+ char *loop = NULL, *encryption = NULL;
-
- if (!streq(fstab->mnt_type, MNTTYPE_SWAP))
- continue;
-@@ -315,23 +596,39 @@
- if (!special)
- continue;
-
-- if (!is_in_proc_swaps(special) &&
-- (!ifexists || !access(special, R_OK))) {
-- /* parse mount options; */
-- char *opt, *opts = strdup(fstab->mnt_opts);
--
-- for (opt = strtok(opts, ","); opt != NULL;
-- opt = strtok(NULL, ",")) {
-- if (strncmp(opt, "pri=", 4) == 0)
-- pri = atoi(opt+4);
-- if (strcmp(opt, "noauto") == 0)
-- skip = 1;
-+ /* parse mount options; */
-+ opts = strdup(fstab->mnt_opts);
-+ if (!opts) {
-+ fprintf(stderr, "not enough memory");
-+ exit(1);
-+ }
-+ for (opt = strtok(opts, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ if (strncmp(opt, "pri=", 4) == 0)
-+ pri = atoi(opt+4);
-+ if (strcmp(opt, "noauto") == 0)
-+ skip = 1;
-+ if (strncmp(opt, "loop=", 5) == 0)
-+ loop = opt + 5;
-+ if (strncmp(opt, "encryption=", 11) == 0)
-+ encryption = opt + 11;
-+ }
-+ if(skip)
-+ continue;
-+ if (loop && encryption) {
-+ if(!is_in_proc_swaps(loop) && (!ifexists || !access(special, R_OK))) {
-+ if (!prepare_encrypted_swap(special, loop, encryption)) {
-+ status |= -1;
-+ 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))) {
-+ status |= do_swapon(special, pri, CANONIC);
- }
- }
-- fclose(fp);
-+ endmntent(fp);
-
- return status;
- }
-@@ -494,19 +791,51 @@
- exit(2);
- }
- while ((fstab = getmntent(fp)) != NULL) {
-+ const char *orig_special = fstab->mnt_fsname;
- const char *special;
-+ int skip = 0;
-+ char *opt, *opts;
-+ char *loop = NULL, *encryption = NULL;
-
- if (!streq(fstab->mnt_type, MNTTYPE_SWAP))
- continue;
-
-- special = fsprobe_get_devname(fstab->mnt_fsname);
-+ special = fsprobe_get_devname(orig_special);
- if (!special)
- continue;
-
-- if (!is_in_proc_swaps(special))
-+ /* parse mount options; */
-+ opts = strdup(fstab->mnt_opts);
-+ if (!opts) {
-+ fprintf(stderr, "not enough memory");
-+ exit(1);
-+ }
-+ for (opt = strtok(opts, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ if (strcmp(opt, "noauto") == 0)
-+ skip = 1;
-+ if (strncmp(opt, "loop=", 5) == 0)
-+ loop = opt + 5;
-+ if (strncmp(opt, "encryption=", 11) == 0)
-+ encryption = opt + 11;
-+ }
-+ if (loop && encryption) {
-+ if (!is_in_proc_swaps(loop)) {
-+ if(skip)
-+ continue;
-+ do_swapoff(loop, QUIET, CANONIC);
-+ }
-+ shutdown_encrypted_swap(loop);
-+ continue;
-+ }
-+ if(skip)
-+ continue;
-+ if (!is_in_proc_swaps(special)) {
- do_swapoff(special, QUIET, CANONIC);
-+ }
-+
-+
- }
-- fclose(fp);
-+ endmntent(fp);
- }
-
- return status;
diff --git a/abs/core/util-linux-ng/fix-findmnt.patch b/abs/core/util-linux-ng/fix-findmnt.patch
new file mode 100644
index 0000000..bf6574c
--- /dev/null
+++ b/abs/core/util-linux-ng/fix-findmnt.patch
@@ -0,0 +1,24 @@
+commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
+Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
+Date: Sun Jul 4 20:02:57 2010 +0200
+
+ libmount: fix merge_optstr (do not truncate 3 trailing characters)
+
+ I believe this is the correct fix.
+
+ Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
+
+diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
+index 5dbcfa6..680e1fc 100644
+--- a/shlibs/mount/src/tab_parse.c
++++ b/shlibs/mount/src/tab_parse.c
+@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
+ if (!strcmp(vfs, fs))
+ return strdup(vfs); /* e.g. "aaa" and "aaa" */
+
+- sz = strlen(vfs) + strlen(fs) + 2;
++ /* leave space for leading "r[ow],", "," and trailing zero */
++ sz = strlen(vfs) + strlen(fs) + 5;
+ res = malloc(sz);
+ if (!res)
+ return NULL;
diff --git a/abs/core/util-linux-ng/util-linux-ng-2.14-20080624.diff b/abs/core/util-linux-ng/util-linux-ng-2.14-20080624.diff
deleted file mode 100644
index 305d257..0000000
--- a/abs/core/util-linux-ng/util-linux-ng-2.14-20080624.diff
+++ /dev/null
@@ -1,6826 +0,0 @@
-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.14/mount/Makefile.am util-linux-ng-2.14-AES/mount/Makefile.am
---- util-linux-ng-2.14/mount/Makefile.am 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/Makefile.am 2008-06-24 16:55:12.000000000 +0300
-@@ -12,21 +12,21 @@
- 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 ../lib/linux_version.c \
- ../lib/blkdev.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)
-+swapon_SOURCES = swapon.c loop.c sha512.c swap_constants.h $(utils_common)
-
--losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
-+losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c sundries.c xmalloc.c \
- loop.h lomount.h xmalloc.h sundries.h realpath.h
- losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
-
-diff -urN util-linux-ng-2.14/mount/Makefile.in util-linux-ng-2.14-AES/mount/Makefile.in
---- util-linux-ng-2.14/mount/Makefile.in 2008-06-09 15:02:13.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/Makefile.in 2008-06-24 16:55:12.000000000 +0300
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in 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.
-@@ -15,11 +15,15 @@
- @SET_MAKE@
-
-
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -75,28 +79,32 @@
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
- am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) \
-- losetup-sundries.$(OBJEXT) losetup-xmalloc.$(OBJEXT) \
-- losetup-realpath.$(OBJEXT)
-+ losetup-loumount.$(OBJEXT) losetup-loop.$(OBJEXT) \
-+ losetup-sha512.$(OBJEXT) losetup-rmd160.$(OBJEXT) \
-+ losetup-aes.$(OBJEXT) losetup-sundries.$(OBJEXT) \
-+ losetup-xmalloc.$(OBJEXT)
- losetup_OBJECTS = $(am_losetup_OBJECTS)
- losetup_LDADD = $(LDADD)
--am__losetup_static_SOURCES_DIST = lomount.c sundries.c xmalloc.c \
-- realpath.c loop.h lomount.h xmalloc.h sundries.h realpath.h
-+am__losetup_static_SOURCES_DIST = lomount.c loumount.c loop.c sha512.c \
-+ rmd160.c aes.c sundries.c xmalloc.c loop.h lomount.h xmalloc.h \
-+ sundries.h realpath.h
- am__objects_1 = losetup_static-lomount.$(OBJEXT) \
-+ losetup_static-loumount.$(OBJEXT) \
-+ losetup_static-loop.$(OBJEXT) losetup_static-sha512.$(OBJEXT) \
-+ losetup_static-rmd160.$(OBJEXT) losetup_static-aes.$(OBJEXT) \
- losetup_static-sundries.$(OBJEXT) \
-- losetup_static-xmalloc.$(OBJEXT) \
-- losetup_static-realpath.$(OBJEXT)
-+ losetup_static-xmalloc.$(OBJEXT)
- @HAVE_STATIC_LOSETUP_TRUE@am_losetup_static_OBJECTS = \
- @HAVE_STATIC_LOSETUP_TRUE@ $(am__objects_1)
- losetup_static_OBJECTS = $(am_losetup_static_OBJECTS)
- losetup_static_LDADD = $(LDADD)
--losetup_static_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(losetup_static_LDFLAGS) $(LDFLAGS) -o $@
--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 mount_mntent.h \
-- mount_constants.h lomount.h fsprobe.h realpath.h xmalloc.h \
-- getusername.h loop.h sundries.h ../lib/env.c \
-- ../lib/linux_version.c ../lib/blkdev.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 mount_mntent.h mount_constants.h \
-+ lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \
-+ sundries.h ../lib/env.c ../lib/linux_version.c ../lib/blkdev.c \
-+ ../lib/setproctitle.c
- @HAVE_BLKID_TRUE@am__objects_2 = mount-fsprobe_blkid.$(OBJEXT)
- @HAVE_VOLUME_ID_TRUE@am__objects_3 = mount-fsprobe_volumeid.$(OBJEXT)
- am__objects_4 = mount-sundries.$(OBJEXT) mount-xmalloc.$(OBJEXT) \
-@@ -104,10 +112,13 @@
- $(am__objects_2) $(am__objects_3)
- am__objects_5 =
- am__objects_6 = mount-fstab.$(OBJEXT) mount-mount_mntent.$(OBJEXT) \
-- mount-getusername.$(OBJEXT) mount-lomount.$(OBJEXT) \
-- $(am__objects_4) $(am__objects_5) mount-env.$(OBJEXT) \
-- mount-linux_version.$(OBJEXT) mount-blkdev.$(OBJEXT)
--am_mount_OBJECTS = mount-mount.$(OBJEXT) $(am__objects_6) \
-+ mount-getusername.$(OBJEXT) $(am__objects_4) $(am__objects_5) \
-+ mount-env.$(OBJEXT) mount-linux_version.$(OBJEXT) \
-+ mount-blkdev.$(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_6) \
- mount-setproctitle.$(OBJEXT)
- mount_OBJECTS = $(am_mount_OBJECTS)
- am__DEPENDENCIES_1 =
-@@ -116,14 +127,12 @@
- am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
- @HAVE_SELINUX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
- mount_DEPENDENCIES = $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
--mount_LINK = $(CCLD) $(mount_CFLAGS) $(CFLAGS) $(mount_LDFLAGS) \
-- $(LDFLAGS) -o $@
--am__mount_static_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 \
-- mount_mntent.h mount_constants.h lomount.h fsprobe.h \
-- realpath.h xmalloc.h getusername.h loop.h sundries.h \
-- ../lib/env.c ../lib/linux_version.c ../lib/blkdev.c \
-+am__mount_static_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 mount_mntent.h mount_constants.h \
-+ lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \
-+ sundries.h ../lib/env.c ../lib/linux_version.c ../lib/blkdev.c \
- ../lib/setproctitle.c
- @HAVE_BLKID_TRUE@am__objects_7 = fsprobe_blkid.$(OBJEXT)
- @HAVE_VOLUME_ID_TRUE@am__objects_8 = fsprobe_volumeid.$(OBJEXT)
-@@ -131,17 +140,15 @@
- realpath.$(OBJEXT) fsprobe.$(OBJEXT) $(am__objects_7) \
- $(am__objects_8)
- am__objects_10 = fstab.$(OBJEXT) mount_mntent.$(OBJEXT) \
-- getusername.$(OBJEXT) lomount.$(OBJEXT) $(am__objects_9) \
-- $(am__objects_5) env.$(OBJEXT) linux_version.$(OBJEXT) \
-- blkdev.$(OBJEXT)
--am__objects_11 = mount.$(OBJEXT) $(am__objects_10) \
-- setproctitle.$(OBJEXT)
-+ getusername.$(OBJEXT) $(am__objects_9) $(am__objects_5) \
-+ env.$(OBJEXT) linux_version.$(OBJEXT) blkdev.$(OBJEXT)
-+am__objects_11 = mount.$(OBJEXT) lomount.$(OBJEXT) loumount.$(OBJEXT) \
-+ loop.$(OBJEXT) sha512.$(OBJEXT) rmd160.$(OBJEXT) aes.$(OBJEXT) \
-+ $(am__objects_10) setproctitle.$(OBJEXT)
- @HAVE_STATIC_MOUNT_TRUE@am_mount_static_OBJECTS = $(am__objects_11)
- mount_static_OBJECTS = $(am_mount_static_OBJECTS)
- @HAVE_SELINUX_FALSE@@HAVE_STATIC_MOUNT_TRUE@mount_static_DEPENDENCIES = $(am__DEPENDENCIES_4)
- @HAVE_SELINUX_TRUE@mount_static_DEPENDENCIES = $(am__DEPENDENCIES_1)
--mount_static_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(mount_static_LDFLAGS) $(LDFLAGS) -o $@
- am_mtab_lock_test_OBJECTS = mtab_lock_test-fstab.$(OBJEXT) \
- mtab_lock_test-sundries.$(OBJEXT) \
- mtab_lock_test-xmalloc.$(OBJEXT) $(am__objects_5)
-@@ -150,21 +157,21 @@
- 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 ../lib/linux_version.c ../lib/blkdev.c
- @HAVE_VOLUME_ID_TRUE@am__objects_12 = linux_version.$(OBJEXT) \
- @HAVE_VOLUME_ID_TRUE@ blkdev.$(OBJEXT)
--am_swapon_OBJECTS = swapon.$(OBJEXT) $(am__objects_9) \
-- $(am__objects_12)
-+am_swapon_OBJECTS = swapon.$(OBJEXT) loop.$(OBJEXT) sha512.$(OBJEXT) \
-+ $(am__objects_9) $(am__objects_12)
- swapon_OBJECTS = $(am_swapon_OBJECTS)
- swapon_DEPENDENCIES = $(am__DEPENDENCIES_4)
--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 \
-- mount_mntent.h mount_constants.h lomount.h fsprobe.h \
-- realpath.h xmalloc.h getusername.h loop.h sundries.h \
-- ../lib/env.c ../lib/linux_version.c ../lib/blkdev.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 mount_mntent.h \
-+ mount_constants.h lomount.h fsprobe.h realpath.h xmalloc.h \
-+ getusername.h loop.h sundries.h ../lib/env.c \
-+ ../lib/linux_version.c ../lib/blkdev.c
- @HAVE_BLKID_TRUE@am__objects_13 = umount-fsprobe_blkid.$(OBJEXT)
- @HAVE_VOLUME_ID_TRUE@am__objects_14 = \
- @HAVE_VOLUME_ID_TRUE@ umount-fsprobe_volumeid.$(OBJEXT)
-@@ -172,28 +179,25 @@
- umount-realpath.$(OBJEXT) umount-fsprobe.$(OBJEXT) \
- $(am__objects_13) $(am__objects_14)
- am__objects_16 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \
-- umount-getusername.$(OBJEXT) umount-lomount.$(OBJEXT) \
-- $(am__objects_15) $(am__objects_5) umount-env.$(OBJEXT) \
-+ umount-getusername.$(OBJEXT) $(am__objects_15) \
-+ $(am__objects_5) umount-env.$(OBJEXT) \
- umount-linux_version.$(OBJEXT) umount-blkdev.$(OBJEXT)
--am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_16)
-+am_umount_OBJECTS = umount-umount.$(OBJEXT) umount-loumount.$(OBJEXT) \
-+ $(am__objects_16)
- umount_OBJECTS = $(am_umount_OBJECTS)
- umount_DEPENDENCIES = $(am__DEPENDENCIES_4)
--umount_LINK = $(CCLD) $(umount_CFLAGS) $(CFLAGS) $(umount_LDFLAGS) \
-- $(LDFLAGS) -o $@
--am__umount_static_SOURCES_DIST = umount.c fstab.c mount_mntent.c \
-- getusername.c lomount.c sundries.c xmalloc.c realpath.c \
-+am__umount_static_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 \
- mount_mntent.h mount_constants.h lomount.h fsprobe.h \
- realpath.h xmalloc.h getusername.h loop.h sundries.h \
- ../lib/env.c ../lib/linux_version.c ../lib/blkdev.c
--am__objects_17 = umount.$(OBJEXT) $(am__objects_10)
-+am__objects_17 = umount.$(OBJEXT) loumount.$(OBJEXT) $(am__objects_10)
- @HAVE_STATIC_UMOUNT_TRUE@am_umount_static_OBJECTS = $(am__objects_17)
- umount_static_OBJECTS = $(am_umount_static_OBJECTS)
- @HAVE_STATIC_UMOUNT_TRUE@umount_static_DEPENDENCIES = \
- @HAVE_STATIC_UMOUNT_TRUE@ $(am__DEPENDENCIES_4)
--umount_static_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(umount_static_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -220,7 +224,27 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
-+ARCH_86_64_FALSE = @ARCH_86_64_FALSE@
-+ARCH_86_64_TRUE = @ARCH_86_64_TRUE@
-+ARCH_HPPA_FALSE = @ARCH_HPPA_FALSE@
-+ARCH_HPPA_TRUE = @ARCH_HPPA_TRUE@
-+ARCH_I86_FALSE = @ARCH_I86_FALSE@
-+ARCH_I86_TRUE = @ARCH_I86_TRUE@
-+ARCH_IA64_FALSE = @ARCH_IA64_FALSE@
-+ARCH_IA64_TRUE = @ARCH_IA64_TRUE@
-+ARCH_M68K_FALSE = @ARCH_M68K_FALSE@
-+ARCH_M68K_TRUE = @ARCH_M68K_TRUE@
-+ARCH_MIPS_FALSE = @ARCH_MIPS_FALSE@
-+ARCH_MIPS_TRUE = @ARCH_MIPS_TRUE@
-+ARCH_PPC_FALSE = @ARCH_PPC_FALSE@
-+ARCH_PPC_TRUE = @ARCH_PPC_TRUE@
-+ARCH_S390_FALSE = @ARCH_S390_FALSE@
-+ARCH_S390_TRUE = @ARCH_S390_TRUE@
-+ARCH_SPARC_FALSE = @ARCH_SPARC_FALSE@
-+ARCH_SPARC_TRUE = @ARCH_SPARC_TRUE@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-@@ -228,6 +252,40 @@
- BLKID = @BLKID@
- BLKID_LIBS = @BLKID_LIBS@
- BLKID_LIBS_STATIC = @BLKID_LIBS_STATIC@
-+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
-+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
-+BUILD_ARCH_FALSE = @BUILD_ARCH_FALSE@
-+BUILD_ARCH_TRUE = @BUILD_ARCH_TRUE@
-+BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@
-+BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@
-+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
-+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
-+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
-+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
-+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
-+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
-+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
-+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
-+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
-+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
-+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
-+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
-+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
-+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
-+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
-+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
-+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
-+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
-+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
-+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
-+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
-+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
-+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
-+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
-+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
-+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
-+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
-+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
-@@ -243,7 +301,46 @@
- EXEEXT = @EXEEXT@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
--INSTALL = @INSTALL@
-+HAVE_AUDIT_FALSE = @HAVE_AUDIT_FALSE@
-+HAVE_AUDIT_TRUE = @HAVE_AUDIT_TRUE@
-+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
-+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
-+HAVE_IOPRIO_GET_FALSE = @HAVE_IOPRIO_GET_FALSE@
-+HAVE_IOPRIO_GET_TRUE = @HAVE_IOPRIO_GET_TRUE@
-+HAVE_IOPRIO_SET_FALSE = @HAVE_IOPRIO_SET_FALSE@
-+HAVE_IOPRIO_SET_TRUE = @HAVE_IOPRIO_SET_TRUE@
-+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
-+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
-+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
-+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
-+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
-+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
-+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
-+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
-+HAVE_SCHED_GETAFFINITY_FALSE = @HAVE_SCHED_GETAFFINITY_FALSE@
-+HAVE_SCHED_GETAFFINITY_TRUE = @HAVE_SCHED_GETAFFINITY_TRUE@
-+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
-+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
-+HAVE_STATIC_FDISK_FALSE = @HAVE_STATIC_FDISK_FALSE@
-+HAVE_STATIC_FDISK_TRUE = @HAVE_STATIC_FDISK_TRUE@
-+HAVE_STATIC_LOSETUP_FALSE = @HAVE_STATIC_LOSETUP_FALSE@
-+HAVE_STATIC_LOSETUP_TRUE = @HAVE_STATIC_LOSETUP_TRUE@
-+HAVE_STATIC_MOUNT_FALSE = @HAVE_STATIC_MOUNT_FALSE@
-+HAVE_STATIC_MOUNT_TRUE = @HAVE_STATIC_MOUNT_TRUE@
-+HAVE_STATIC_SFDISK_FALSE = @HAVE_STATIC_SFDISK_FALSE@
-+HAVE_STATIC_SFDISK_TRUE = @HAVE_STATIC_SFDISK_TRUE@
-+HAVE_STATIC_UMOUNT_FALSE = @HAVE_STATIC_UMOUNT_FALSE@
-+HAVE_STATIC_UMOUNT_TRUE = @HAVE_STATIC_UMOUNT_TRUE@
-+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
-+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
-+HAVE_TINFO_FALSE = @HAVE_TINFO_FALSE@
-+HAVE_TINFO_TRUE = @HAVE_TINFO_TRUE@
-+HAVE_UTIL_FALSE = @HAVE_UTIL_FALSE@
-+HAVE_UTIL_TRUE = @HAVE_UTIL_TRUE@
-+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
-+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
-+HAVE_VOLUME_ID_FALSE = @HAVE_VOLUME_ID_FALSE@
-+HAVE_VOLUME_ID_TRUE = @HAVE_VOLUME_ID_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -255,15 +352,20 @@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LINUX_FALSE = @LINUX_FALSE@
-+LINUX_TRUE = @LINUX_TRUE@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
-+MAKEINSTALL_DO_CHOWN_FALSE = @MAKEINSTALL_DO_CHOWN_FALSE@
-+MAKEINSTALL_DO_CHOWN_TRUE = @MAKEINSTALL_DO_CHOWN_TRUE@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
- NCURSES_LIBS = @NCURSES_LIBS@
-+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
-+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -282,16 +384,18 @@
- SUID_CFLAGS = @SUID_CFLAGS@
- SUID_LDFLAGS = @SUID_LDFLAGS@
- USE_NLS = @USE_NLS@
-+USE_SLANG_FALSE = @USE_SLANG_FALSE@
-+USE_SLANG_TRUE = @USE_SLANG_TRUE@
-+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
-+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
- VERSION = @VERSION@
- VOLID = @VOLID@
- VOLUMEID_LIBS = @VOLUMEID_LIBS@
- VOLUMEID_LIBS_STATIC = @VOLUMEID_LIBS_STATIC@
- XGETTEXT = @XGETTEXT@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -303,7 +407,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -331,11 +434,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
-
- # The original default vaues of bindir and sbindir:
- usrbinexecdir = ${exec_prefix}/bin
-@@ -359,19 +459,19 @@
- 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 ../lib/linux_version.c \
- ../lib/blkdev.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) \
-- $(am__append_9)
--losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
-+swapon_SOURCES = swapon.c loop.c sha512.c swap_constants.h \
-+ $(utils_common) $(am__append_9)
-+losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c sundries.c xmalloc.c \
- loop.h lomount.h xmalloc.h sundries.h realpath.h
-
- losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
-@@ -427,7 +527,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
-@@ -453,7 +553,7 @@
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
-+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
-@@ -476,31 +576,31 @@
- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
- losetup$(EXEEXT): $(losetup_OBJECTS) $(losetup_DEPENDENCIES)
- @rm -f losetup$(EXEEXT)
-- $(LINK) $(losetup_OBJECTS) $(losetup_LDADD) $(LIBS)
-+ $(LINK) $(losetup_LDFLAGS) $(losetup_OBJECTS) $(losetup_LDADD) $(LIBS)
- losetup.static$(EXEEXT): $(losetup_static_OBJECTS) $(losetup_static_DEPENDENCIES)
- @rm -f losetup.static$(EXEEXT)
-- $(losetup_static_LINK) $(losetup_static_OBJECTS) $(losetup_static_LDADD) $(LIBS)
-+ $(LINK) $(losetup_static_LDFLAGS) $(losetup_static_OBJECTS) $(losetup_static_LDADD) $(LIBS)
- mount$(EXEEXT): $(mount_OBJECTS) $(mount_DEPENDENCIES)
- @rm -f mount$(EXEEXT)
-- $(mount_LINK) $(mount_OBJECTS) $(mount_LDADD) $(LIBS)
-+ $(LINK) $(mount_LDFLAGS) $(mount_OBJECTS) $(mount_LDADD) $(LIBS)
- mount.static$(EXEEXT): $(mount_static_OBJECTS) $(mount_static_DEPENDENCIES)
- @rm -f mount.static$(EXEEXT)
-- $(mount_static_LINK) $(mount_static_OBJECTS) $(mount_static_LDADD) $(LIBS)
-+ $(LINK) $(mount_static_LDFLAGS) $(mount_static_OBJECTS) $(mount_static_LDADD) $(LIBS)
- mtab_lock_test$(EXEEXT): $(mtab_lock_test_OBJECTS) $(mtab_lock_test_DEPENDENCIES)
- @rm -f mtab_lock_test$(EXEEXT)
-- $(LINK) $(mtab_lock_test_OBJECTS) $(mtab_lock_test_LDADD) $(LIBS)
-+ $(LINK) $(mtab_lock_test_LDFLAGS) $(mtab_lock_test_OBJECTS) $(mtab_lock_test_LDADD) $(LIBS)
- pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES)
- @rm -f pivot_root$(EXEEXT)
-- $(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
-+ $(LINK) $(pivot_root_LDFLAGS) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
- swapon$(EXEEXT): $(swapon_OBJECTS) $(swapon_DEPENDENCIES)
- @rm -f swapon$(EXEEXT)
-- $(LINK) $(swapon_OBJECTS) $(swapon_LDADD) $(LIBS)
-+ $(LINK) $(swapon_LDFLAGS) $(swapon_OBJECTS) $(swapon_LDADD) $(LIBS)
- umount$(EXEEXT): $(umount_OBJECTS) $(umount_DEPENDENCIES)
- @rm -f umount$(EXEEXT)
-- $(umount_LINK) $(umount_OBJECTS) $(umount_LDADD) $(LIBS)
-+ $(LINK) $(umount_LDFLAGS) $(umount_OBJECTS) $(umount_LDADD) $(LIBS)
- umount.static$(EXEEXT): $(umount_static_OBJECTS) $(umount_static_DEPENDENCIES)
- @rm -f umount.static$(EXEEXT)
-- $(umount_static_LINK) $(umount_static_OBJECTS) $(umount_static_LDADD) $(LIBS)
-+ $(LINK) $(umount_static_LDFLAGS) $(umount_static_OBJECTS) $(umount_static_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -508,6 +608,7 @@
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aes.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blkdev.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsprobe.Po@am__quote@
-@@ -517,14 +618,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getusername.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux_version.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lomount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loop.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-aes.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-lomount.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-realpath.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-loop.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-loumount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-rmd160.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-sha512.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-sundries.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-xmalloc.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-aes.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-lomount.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-realpath.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-loop.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-loumount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-rmd160.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-sha512.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-sundries.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-xmalloc.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loumount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-aes.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-blkdev.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-env.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-fsprobe.Po@am__quote@
-@@ -534,10 +646,14 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-getusername.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-linux_version.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-lomount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-loop.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-loumount.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount_mntent.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-realpath.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-rmd160.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-setproctitle.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-sha512.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-sundries.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-xmalloc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount.Po@am__quote@
-@@ -547,7 +663,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-xmalloc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realpath.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmd160.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sundries.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swapon.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-blkdev.Po@am__quote@
-@@ -558,7 +676,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-fstab.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-getusername.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-linux_version.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-lomount.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-loumount.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-mount_mntent.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-realpath.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-sundries.Po@am__quote@
-@@ -568,637 +686,820 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
-
- .c.o:
--@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
--@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- losetup-lomount.o: lomount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.o -MD -MP -MF $(DEPDIR)/losetup-lomount.Tpo -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.o -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='losetup-lomount.o' libtool=no @AMDEPBACKSLASH@
- @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.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-
- losetup-lomount.obj: lomount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.obj -MD -MP -MF $(DEPDIR)/losetup-lomount.Tpo -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.obj -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='losetup-lomount.obj' libtool=no @AMDEPBACKSLASH@
- @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
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loumount.Tpo" "$(DEPDIR)/losetup-loumount.Po"; else rm -f "$(DEPDIR)/losetup-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup-loumount.o' libtool=no @AMDEPBACKSLASH@
-+@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-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
-+
-+losetup-loumount.obj: loumount.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loumount.Tpo" "$(DEPDIR)/losetup-loumount.Po"; else rm -f "$(DEPDIR)/losetup-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup-loumount.obj' libtool=no @AMDEPBACKSLASH@
-+@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-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
-+
-+losetup-loop.o: loop.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loop.Tpo" "$(DEPDIR)/losetup-loop.Po"; else rm -f "$(DEPDIR)/losetup-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup-loop.o' libtool=no @AMDEPBACKSLASH@
-+@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-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c
-+
-+losetup-loop.obj: loop.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-loop.Tpo" "$(DEPDIR)/losetup-loop.Po"; else rm -f "$(DEPDIR)/losetup-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup-loop.obj' libtool=no @AMDEPBACKSLASH@
-+@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-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`
-+
-+losetup-sha512.o: sha512.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sha512.Tpo" "$(DEPDIR)/losetup-sha512.Po"; else rm -f "$(DEPDIR)/losetup-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup-sha512.o' libtool=no @AMDEPBACKSLASH@
-+@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-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c
-+
-+losetup-sha512.obj: sha512.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sha512.Tpo" "$(DEPDIR)/losetup-sha512.Po"; else rm -f "$(DEPDIR)/losetup-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup-sha512.obj' libtool=no @AMDEPBACKSLASH@
-+@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-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`
-+
-+losetup-rmd160.o: rmd160.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-rmd160.Tpo" "$(DEPDIR)/losetup-rmd160.Po"; else rm -f "$(DEPDIR)/losetup-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.o' libtool=no @AMDEPBACKSLASH@
-+@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-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
-+
-+losetup-rmd160.obj: rmd160.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-rmd160.Tpo" "$(DEPDIR)/losetup-rmd160.Po"; else rm -f "$(DEPDIR)/losetup-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.obj' libtool=no @AMDEPBACKSLASH@
-+@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-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
-+
-+losetup-aes.o: aes.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-aes.Tpo" "$(DEPDIR)/losetup-aes.Po"; else rm -f "$(DEPDIR)/losetup-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup-aes.o' libtool=no @AMDEPBACKSLASH@
-+@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-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c
-+
-+losetup-aes.obj: aes.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-aes.Tpo" "$(DEPDIR)/losetup-aes.Po"; else rm -f "$(DEPDIR)/losetup-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup-aes.obj' libtool=no @AMDEPBACKSLASH@
-+@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-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`
-+
- losetup-sundries.o: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.o -MD -MP -MF $(DEPDIR)/losetup-sundries.Tpo -c -o losetup-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.o -MD -MP -MF "$(DEPDIR)/losetup-sundries.Tpo" -c -o losetup-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sundries.Tpo" "$(DEPDIR)/losetup-sundries.Po"; else rm -f "$(DEPDIR)/losetup-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='losetup-sundries.o' libtool=no @AMDEPBACKSLASH@
- @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-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-
- losetup-sundries.obj: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.obj -MD -MP -MF $(DEPDIR)/losetup-sundries.Tpo -c -o losetup-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.obj -MD -MP -MF "$(DEPDIR)/losetup-sundries.Tpo" -c -o losetup-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-sundries.Tpo" "$(DEPDIR)/losetup-sundries.Po"; else rm -f "$(DEPDIR)/losetup-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='losetup-sundries.obj' libtool=no @AMDEPBACKSLASH@
- @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-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-
- losetup-xmalloc.o: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.o -MD -MP -MF $(DEPDIR)/losetup-xmalloc.Tpo -c -o losetup-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.o -MD -MP -MF "$(DEPDIR)/losetup-xmalloc.Tpo" -c -o losetup-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-xmalloc.Tpo" "$(DEPDIR)/losetup-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='losetup-xmalloc.o' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-
- losetup-xmalloc.obj: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.obj -MD -MP -MF $(DEPDIR)/losetup-xmalloc.Tpo -c -o losetup-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.obj -MD -MP -MF "$(DEPDIR)/losetup-xmalloc.Tpo" -c -o losetup-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup-xmalloc.Tpo" "$(DEPDIR)/losetup-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='losetup-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-
--losetup-realpath.o: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-realpath.o -MD -MP -MF $(DEPDIR)/losetup-realpath.Tpo -c -o losetup-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-realpath.Tpo $(DEPDIR)/losetup-realpath.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='losetup-realpath.o' libtool=no @AMDEPBACKSLASH@
--@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-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--
--losetup-realpath.obj: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-realpath.obj -MD -MP -MF $(DEPDIR)/losetup-realpath.Tpo -c -o losetup-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-realpath.Tpo $(DEPDIR)/losetup-realpath.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='losetup-realpath.obj' libtool=no @AMDEPBACKSLASH@
--@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-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--
- losetup_static-lomount.o: lomount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.o -MD -MP -MF $(DEPDIR)/losetup_static-lomount.Tpo -c -o losetup_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.o -MD -MP -MF "$(DEPDIR)/losetup_static-lomount.Tpo" -c -o losetup_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-lomount.Tpo" "$(DEPDIR)/losetup_static-lomount.Po"; else rm -f "$(DEPDIR)/losetup_static-lomount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='losetup_static-lomount.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-
- losetup_static-lomount.obj: lomount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.obj -MD -MP -MF $(DEPDIR)/losetup_static-lomount.Tpo -c -o losetup_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.obj -MD -MP -MF "$(DEPDIR)/losetup_static-lomount.Tpo" -c -o losetup_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-lomount.Tpo" "$(DEPDIR)/losetup_static-lomount.Po"; else rm -f "$(DEPDIR)/losetup_static-lomount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='losetup_static-lomount.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-
-+losetup_static-loumount.o: loumount.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-loumount.o -MD -MP -MF "$(DEPDIR)/losetup_static-loumount.Tpo" -c -o losetup_static-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-loumount.Tpo" "$(DEPDIR)/losetup_static-loumount.Po"; else rm -f "$(DEPDIR)/losetup_static-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup_static-loumount.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
-+
-+losetup_static-loumount.obj: loumount.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-loumount.obj -MD -MP -MF "$(DEPDIR)/losetup_static-loumount.Tpo" -c -o losetup_static-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-loumount.Tpo" "$(DEPDIR)/losetup_static-loumount.Po"; else rm -f "$(DEPDIR)/losetup_static-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='losetup_static-loumount.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
-+
-+losetup_static-loop.o: loop.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-loop.o -MD -MP -MF "$(DEPDIR)/losetup_static-loop.Tpo" -c -o losetup_static-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-loop.Tpo" "$(DEPDIR)/losetup_static-loop.Po"; else rm -f "$(DEPDIR)/losetup_static-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup_static-loop.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c
-+
-+losetup_static-loop.obj: loop.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-loop.obj -MD -MP -MF "$(DEPDIR)/losetup_static-loop.Tpo" -c -o losetup_static-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-loop.Tpo" "$(DEPDIR)/losetup_static-loop.Po"; else rm -f "$(DEPDIR)/losetup_static-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='losetup_static-loop.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`
-+
-+losetup_static-sha512.o: sha512.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sha512.o -MD -MP -MF "$(DEPDIR)/losetup_static-sha512.Tpo" -c -o losetup_static-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-sha512.Tpo" "$(DEPDIR)/losetup_static-sha512.Po"; else rm -f "$(DEPDIR)/losetup_static-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup_static-sha512.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c
-+
-+losetup_static-sha512.obj: sha512.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sha512.obj -MD -MP -MF "$(DEPDIR)/losetup_static-sha512.Tpo" -c -o losetup_static-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-sha512.Tpo" "$(DEPDIR)/losetup_static-sha512.Po"; else rm -f "$(DEPDIR)/losetup_static-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='losetup_static-sha512.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`
-+
-+losetup_static-rmd160.o: rmd160.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-rmd160.o -MD -MP -MF "$(DEPDIR)/losetup_static-rmd160.Tpo" -c -o losetup_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-rmd160.Tpo" "$(DEPDIR)/losetup_static-rmd160.Po"; else rm -f "$(DEPDIR)/losetup_static-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup_static-rmd160.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
-+
-+losetup_static-rmd160.obj: rmd160.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-rmd160.obj -MD -MP -MF "$(DEPDIR)/losetup_static-rmd160.Tpo" -c -o losetup_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-rmd160.Tpo" "$(DEPDIR)/losetup_static-rmd160.Po"; else rm -f "$(DEPDIR)/losetup_static-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup_static-rmd160.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
-+
-+losetup_static-aes.o: aes.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-aes.o -MD -MP -MF "$(DEPDIR)/losetup_static-aes.Tpo" -c -o losetup_static-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-aes.Tpo" "$(DEPDIR)/losetup_static-aes.Po"; else rm -f "$(DEPDIR)/losetup_static-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup_static-aes.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c
-+
-+losetup_static-aes.obj: aes.c
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-aes.obj -MD -MP -MF "$(DEPDIR)/losetup_static-aes.Tpo" -c -o losetup_static-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-aes.Tpo" "$(DEPDIR)/losetup_static-aes.Po"; else rm -f "$(DEPDIR)/losetup_static-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='losetup_static-aes.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-aes.obj `if test -f 'aes.c'; then $(CYGPATH_W) 'aes.c'; else $(CYGPATH_W) '$(srcdir)/aes.c'; fi`
-+
- losetup_static-sundries.o: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.o -MD -MP -MF $(DEPDIR)/losetup_static-sundries.Tpo -c -o losetup_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.o -MD -MP -MF "$(DEPDIR)/losetup_static-sundries.Tpo" -c -o losetup_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-sundries.Tpo" "$(DEPDIR)/losetup_static-sundries.Po"; else rm -f "$(DEPDIR)/losetup_static-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='losetup_static-sundries.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-
- losetup_static-sundries.obj: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.obj -MD -MP -MF $(DEPDIR)/losetup_static-sundries.Tpo -c -o losetup_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.obj -MD -MP -MF "$(DEPDIR)/losetup_static-sundries.Tpo" -c -o losetup_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-sundries.Tpo" "$(DEPDIR)/losetup_static-sundries.Po"; else rm -f "$(DEPDIR)/losetup_static-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='losetup_static-sundries.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-
- losetup_static-xmalloc.o: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.o -MD -MP -MF $(DEPDIR)/losetup_static-xmalloc.Tpo -c -o losetup_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.o -MD -MP -MF "$(DEPDIR)/losetup_static-xmalloc.Tpo" -c -o losetup_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-xmalloc.Tpo" "$(DEPDIR)/losetup_static-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup_static-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='losetup_static-xmalloc.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-
- losetup_static-xmalloc.obj: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.obj -MD -MP -MF $(DEPDIR)/losetup_static-xmalloc.Tpo -c -o losetup_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.obj -MD -MP -MF "$(DEPDIR)/losetup_static-xmalloc.Tpo" -c -o losetup_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/losetup_static-xmalloc.Tpo" "$(DEPDIR)/losetup_static-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup_static-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='losetup_static-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-
--losetup_static-realpath.o: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-realpath.o -MD -MP -MF $(DEPDIR)/losetup_static-realpath.Tpo -c -o losetup_static-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-realpath.Tpo $(DEPDIR)/losetup_static-realpath.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='losetup_static-realpath.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--
--losetup_static-realpath.obj: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-realpath.obj -MD -MP -MF $(DEPDIR)/losetup_static-realpath.Tpo -c -o losetup_static-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup_static-realpath.Tpo $(DEPDIR)/losetup_static-realpath.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='losetup_static-realpath.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--
- mount-mount.o: mount.c
--@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
-+@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
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount.c' object='mount-mount.o' libtool=no @AMDEPBACKSLASH@
- @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.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
-
- mount-mount.obj: mount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.obj -MD -MP -MF $(DEPDIR)/mount-mount.Tpo -c -o mount-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.obj -MD -MP -MF "$(DEPDIR)/mount-mount.Tpo" -c -o mount-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-mount.Tpo" "$(DEPDIR)/mount-mount.Po"; else rm -f "$(DEPDIR)/mount-mount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount.c' object='mount-mount.obj' libtool=no @AMDEPBACKSLASH@
- @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
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.o' libtool=no @AMDEPBACKSLASH@
-+@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-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-+
-+mount-lomount.obj: lomount.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-lomount.Tpo" "$(DEPDIR)/mount-lomount.Po"; else rm -f "$(DEPDIR)/mount-lomount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.obj' libtool=no @AMDEPBACKSLASH@
-+@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-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-+
-+mount-loumount.o: loumount.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loumount.Tpo" "$(DEPDIR)/mount-loumount.Po"; else rm -f "$(DEPDIR)/mount-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='mount-loumount.o' libtool=no @AMDEPBACKSLASH@
-+@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-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
-+
-+mount-loumount.obj: loumount.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loumount.Tpo" "$(DEPDIR)/mount-loumount.Po"; else rm -f "$(DEPDIR)/mount-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='mount-loumount.obj' libtool=no @AMDEPBACKSLASH@
-+@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-loumount.obj `if test -f 'loumount.c'; then $(CYGPATH_W) 'loumount.c'; else $(CYGPATH_W) '$(srcdir)/loumount.c'; fi`
-+
-+mount-loop.o: loop.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loop.Tpo" "$(DEPDIR)/mount-loop.Po"; else rm -f "$(DEPDIR)/mount-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='mount-loop.o' libtool=no @AMDEPBACKSLASH@
-+@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-loop.o `test -f 'loop.c' || echo '$(srcdir)/'`loop.c
-+
-+mount-loop.obj: loop.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-loop.Tpo" "$(DEPDIR)/mount-loop.Po"; else rm -f "$(DEPDIR)/mount-loop.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loop.c' object='mount-loop.obj' libtool=no @AMDEPBACKSLASH@
-+@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-loop.obj `if test -f 'loop.c'; then $(CYGPATH_W) 'loop.c'; else $(CYGPATH_W) '$(srcdir)/loop.c'; fi`
-+
-+mount-sha512.o: sha512.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sha512.Tpo" "$(DEPDIR)/mount-sha512.Po"; else rm -f "$(DEPDIR)/mount-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='mount-sha512.o' libtool=no @AMDEPBACKSLASH@
-+@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-sha512.o `test -f 'sha512.c' || echo '$(srcdir)/'`sha512.c
-+
-+mount-sha512.obj: sha512.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sha512.Tpo" "$(DEPDIR)/mount-sha512.Po"; else rm -f "$(DEPDIR)/mount-sha512.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha512.c' object='mount-sha512.obj' libtool=no @AMDEPBACKSLASH@
-+@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-sha512.obj `if test -f 'sha512.c'; then $(CYGPATH_W) 'sha512.c'; else $(CYGPATH_W) '$(srcdir)/sha512.c'; fi`
-+
-+mount-rmd160.o: rmd160.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-rmd160.Tpo" "$(DEPDIR)/mount-rmd160.Po"; else rm -f "$(DEPDIR)/mount-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.o' libtool=no @AMDEPBACKSLASH@
-+@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-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
-+
-+mount-rmd160.obj: rmd160.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-rmd160.Tpo" "$(DEPDIR)/mount-rmd160.Po"; else rm -f "$(DEPDIR)/mount-rmd160.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.obj' libtool=no @AMDEPBACKSLASH@
-+@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-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
-+
-+mount-aes.o: aes.c
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-aes.Tpo" "$(DEPDIR)/mount-aes.Po"; else rm -f "$(DEPDIR)/mount-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='mount-aes.o' libtool=no @AMDEPBACKSLASH@
-+@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-aes.o `test -f 'aes.c' || echo '$(srcdir)/'`aes.c
-+
-+mount-aes.obj: aes.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-aes.Tpo" "$(DEPDIR)/mount-aes.Po"; else rm -f "$(DEPDIR)/mount-aes.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='aes.c' object='mount-aes.obj' libtool=no @AMDEPBACKSLASH@
-+@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-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@ $(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@ mv -f $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
-+@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
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='mount-fstab.o' libtool=no @AMDEPBACKSLASH@
- @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-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-
- mount-fstab.obj: fstab.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.obj -MD -MP -MF $(DEPDIR)/mount-fstab.Tpo -c -o mount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.obj -MD -MP -MF "$(DEPDIR)/mount-fstab.Tpo" -c -o mount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fstab.Tpo" "$(DEPDIR)/mount-fstab.Po"; else rm -f "$(DEPDIR)/mount-fstab.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='mount-fstab.obj' libtool=no @AMDEPBACKSLASH@
- @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-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-
- mount-mount_mntent.o: mount_mntent.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.o -MD -MP -MF $(DEPDIR)/mount-mount_mntent.Tpo -c -o mount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.o -MD -MP -MF "$(DEPDIR)/mount-mount_mntent.Tpo" -c -o mount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-mount_mntent.Tpo" "$(DEPDIR)/mount-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount-mount_mntent.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_mntent.c' object='mount-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
- @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_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-
- mount-mount_mntent.obj: mount_mntent.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.obj -MD -MP -MF $(DEPDIR)/mount-mount_mntent.Tpo -c -o mount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/mount-mount_mntent.Tpo" -c -o mount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-mount_mntent.Tpo" "$(DEPDIR)/mount-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount-mount_mntent.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_mntent.c' object='mount-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
- @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_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-
- mount-getusername.o: getusername.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.o -MD -MP -MF $(DEPDIR)/mount-getusername.Tpo -c -o mount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.o -MD -MP -MF "$(DEPDIR)/mount-getusername.Tpo" -c -o mount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-getusername.Tpo" "$(DEPDIR)/mount-getusername.Po"; else rm -f "$(DEPDIR)/mount-getusername.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getusername.c' object='mount-getusername.o' libtool=no @AMDEPBACKSLASH@
- @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.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-
- mount-getusername.obj: getusername.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.obj -MD -MP -MF $(DEPDIR)/mount-getusername.Tpo -c -o mount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.obj -MD -MP -MF "$(DEPDIR)/mount-getusername.Tpo" -c -o mount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-getusername.Tpo" "$(DEPDIR)/mount-getusername.Po"; else rm -f "$(DEPDIR)/mount-getusername.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getusername.c' object='mount-getusername.obj' libtool=no @AMDEPBACKSLASH@
- @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
--@am__fastdepCC_TRUE@ $(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
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.o' libtool=no @AMDEPBACKSLASH@
--@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-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
--
--mount-lomount.obj: lomount.c
--@am__fastdepCC_TRUE@ $(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`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='mount-lomount.obj' libtool=no @AMDEPBACKSLASH@
--@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-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@ $(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@ mv -f $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
-+@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
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='mount-sundries.o' libtool=no @AMDEPBACKSLASH@
- @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-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-
- mount-sundries.obj: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.obj -MD -MP -MF $(DEPDIR)/mount-sundries.Tpo -c -o mount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.obj -MD -MP -MF "$(DEPDIR)/mount-sundries.Tpo" -c -o mount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-sundries.Tpo" "$(DEPDIR)/mount-sundries.Po"; else rm -f "$(DEPDIR)/mount-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='mount-sundries.obj' libtool=no @AMDEPBACKSLASH@
- @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-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-
- mount-xmalloc.o: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.o -MD -MP -MF $(DEPDIR)/mount-xmalloc.Tpo -c -o mount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.o -MD -MP -MF "$(DEPDIR)/mount-xmalloc.Tpo" -c -o mount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-xmalloc.Tpo" "$(DEPDIR)/mount-xmalloc.Po"; else rm -f "$(DEPDIR)/mount-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mount-xmalloc.o' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-
- mount-xmalloc.obj: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.obj -MD -MP -MF $(DEPDIR)/mount-xmalloc.Tpo -c -o mount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.obj -MD -MP -MF "$(DEPDIR)/mount-xmalloc.Tpo" -c -o mount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-xmalloc.Tpo" "$(DEPDIR)/mount-xmalloc.Po"; else rm -f "$(DEPDIR)/mount-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mount-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-
- mount-realpath.o: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-realpath.o -MD -MP -MF $(DEPDIR)/mount-realpath.Tpo -c -o mount-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-realpath.Tpo $(DEPDIR)/mount-realpath.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-realpath.o -MD -MP -MF "$(DEPDIR)/mount-realpath.Tpo" -c -o mount-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-realpath.Tpo" "$(DEPDIR)/mount-realpath.Po"; else rm -f "$(DEPDIR)/mount-realpath.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='mount-realpath.o' libtool=no @AMDEPBACKSLASH@
- @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-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
-
- mount-realpath.obj: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-realpath.obj -MD -MP -MF $(DEPDIR)/mount-realpath.Tpo -c -o mount-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-realpath.Tpo $(DEPDIR)/mount-realpath.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-realpath.obj -MD -MP -MF "$(DEPDIR)/mount-realpath.Tpo" -c -o mount-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-realpath.Tpo" "$(DEPDIR)/mount-realpath.Po"; else rm -f "$(DEPDIR)/mount-realpath.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='mount-realpath.obj' libtool=no @AMDEPBACKSLASH@
- @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-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
-
- mount-fsprobe.o: fsprobe.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.o -MD -MP -MF $(DEPDIR)/mount-fsprobe.Tpo -c -o mount-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.o -MD -MP -MF "$(DEPDIR)/mount-fsprobe.Tpo" -c -o mount-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe.Tpo" "$(DEPDIR)/mount-fsprobe.Po"; else rm -f "$(DEPDIR)/mount-fsprobe.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe.c' object='mount-fsprobe.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c
-
- mount-fsprobe.obj: fsprobe.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.obj -MD -MP -MF $(DEPDIR)/mount-fsprobe.Tpo -c -o mount-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.obj -MD -MP -MF "$(DEPDIR)/mount-fsprobe.Tpo" -c -o mount-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe.Tpo" "$(DEPDIR)/mount-fsprobe.Po"; else rm -f "$(DEPDIR)/mount-fsprobe.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe.c' object='mount-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`
-
- mount-fsprobe_blkid.o: fsprobe_blkid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_blkid.o -MD -MP -MF $(DEPDIR)/mount-fsprobe_blkid.Tpo -c -o mount-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe_blkid.Tpo $(DEPDIR)/mount-fsprobe_blkid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_blkid.o -MD -MP -MF "$(DEPDIR)/mount-fsprobe_blkid.Tpo" -c -o mount-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe_blkid.Tpo" "$(DEPDIR)/mount-fsprobe_blkid.Po"; else rm -f "$(DEPDIR)/mount-fsprobe_blkid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_blkid.c' object='mount-fsprobe_blkid.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c
-
- mount-fsprobe_blkid.obj: fsprobe_blkid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_blkid.obj -MD -MP -MF $(DEPDIR)/mount-fsprobe_blkid.Tpo -c -o mount-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe_blkid.Tpo $(DEPDIR)/mount-fsprobe_blkid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_blkid.obj -MD -MP -MF "$(DEPDIR)/mount-fsprobe_blkid.Tpo" -c -o mount-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe_blkid.Tpo" "$(DEPDIR)/mount-fsprobe_blkid.Po"; else rm -f "$(DEPDIR)/mount-fsprobe_blkid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_blkid.c' object='mount-fsprobe_blkid.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`
-
- mount-fsprobe_volumeid.o: fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_volumeid.o -MD -MP -MF $(DEPDIR)/mount-fsprobe_volumeid.Tpo -c -o mount-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe_volumeid.Tpo $(DEPDIR)/mount-fsprobe_volumeid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_volumeid.o -MD -MP -MF "$(DEPDIR)/mount-fsprobe_volumeid.Tpo" -c -o mount-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe_volumeid.Tpo" "$(DEPDIR)/mount-fsprobe_volumeid.Po"; else rm -f "$(DEPDIR)/mount-fsprobe_volumeid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_volumeid.c' object='mount-fsprobe_volumeid.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c
-
- mount-fsprobe_volumeid.obj: fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_volumeid.obj -MD -MP -MF $(DEPDIR)/mount-fsprobe_volumeid.Tpo -c -o mount-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-fsprobe_volumeid.Tpo $(DEPDIR)/mount-fsprobe_volumeid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe_volumeid.obj -MD -MP -MF "$(DEPDIR)/mount-fsprobe_volumeid.Tpo" -c -o mount-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-fsprobe_volumeid.Tpo" "$(DEPDIR)/mount-fsprobe_volumeid.Po"; else rm -f "$(DEPDIR)/mount-fsprobe_volumeid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_volumeid.c' object='mount-fsprobe_volumeid.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`
-
- mount-env.o: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.o -MD -MP -MF $(DEPDIR)/mount-env.Tpo -c -o mount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.o -MD -MP -MF "$(DEPDIR)/mount-env.Tpo" -c -o mount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-env.Tpo" "$(DEPDIR)/mount-env.Po"; else rm -f "$(DEPDIR)/mount-env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='mount-env.o' libtool=no @AMDEPBACKSLASH@
- @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-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-
- mount-env.obj: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.obj -MD -MP -MF $(DEPDIR)/mount-env.Tpo -c -o mount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.obj -MD -MP -MF "$(DEPDIR)/mount-env.Tpo" -c -o mount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-env.Tpo" "$(DEPDIR)/mount-env.Po"; else rm -f "$(DEPDIR)/mount-env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='mount-env.obj' libtool=no @AMDEPBACKSLASH@
- @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-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-
- mount-linux_version.o: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.o -MD -MP -MF $(DEPDIR)/mount-linux_version.Tpo -c -o mount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.o -MD -MP -MF "$(DEPDIR)/mount-linux_version.Tpo" -c -o mount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-linux_version.Tpo" "$(DEPDIR)/mount-linux_version.Po"; else rm -f "$(DEPDIR)/mount-linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='mount-linux_version.o' libtool=no @AMDEPBACKSLASH@
- @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-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-
- mount-linux_version.obj: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.obj -MD -MP -MF $(DEPDIR)/mount-linux_version.Tpo -c -o mount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.obj -MD -MP -MF "$(DEPDIR)/mount-linux_version.Tpo" -c -o mount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-linux_version.Tpo" "$(DEPDIR)/mount-linux_version.Po"; else rm -f "$(DEPDIR)/mount-linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='mount-linux_version.obj' libtool=no @AMDEPBACKSLASH@
- @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-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-
- mount-blkdev.o: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.o -MD -MP -MF $(DEPDIR)/mount-blkdev.Tpo -c -o mount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.o -MD -MP -MF "$(DEPDIR)/mount-blkdev.Tpo" -c -o mount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-blkdev.Tpo" "$(DEPDIR)/mount-blkdev.Po"; else rm -f "$(DEPDIR)/mount-blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='mount-blkdev.o' libtool=no @AMDEPBACKSLASH@
- @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-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-
- mount-blkdev.obj: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.obj -MD -MP -MF $(DEPDIR)/mount-blkdev.Tpo -c -o mount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.obj -MD -MP -MF "$(DEPDIR)/mount-blkdev.Tpo" -c -o mount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-blkdev.Tpo" "$(DEPDIR)/mount-blkdev.Po"; else rm -f "$(DEPDIR)/mount-blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='mount-blkdev.obj' libtool=no @AMDEPBACKSLASH@
- @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-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-
- mount-setproctitle.o: ../lib/setproctitle.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.o -MD -MP -MF $(DEPDIR)/mount-setproctitle.Tpo -c -o mount-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.o -MD -MP -MF "$(DEPDIR)/mount-setproctitle.Tpo" -c -o mount-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-setproctitle.Tpo" "$(DEPDIR)/mount-setproctitle.Po"; else rm -f "$(DEPDIR)/mount-setproctitle.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/setproctitle.c' object='mount-setproctitle.o' libtool=no @AMDEPBACKSLASH@
- @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-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
-
- mount-setproctitle.obj: ../lib/setproctitle.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.obj -MD -MP -MF $(DEPDIR)/mount-setproctitle.Tpo -c -o mount-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.obj -MD -MP -MF "$(DEPDIR)/mount-setproctitle.Tpo" -c -o mount-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mount-setproctitle.Tpo" "$(DEPDIR)/mount-setproctitle.Po"; else rm -f "$(DEPDIR)/mount-setproctitle.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/setproctitle.c' object='mount-setproctitle.obj' libtool=no @AMDEPBACKSLASH@
- @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-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
-
- env.o: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT env.o -MD -MP -MF $(DEPDIR)/env.Tpo -c -o env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/env.Tpo $(DEPDIR)/env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT env.o -MD -MP -MF "$(DEPDIR)/env.Tpo" -c -o env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/env.Tpo" "$(DEPDIR)/env.Po"; else rm -f "$(DEPDIR)/env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='env.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-
- env.obj: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT env.obj -MD -MP -MF $(DEPDIR)/env.Tpo -c -o env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/env.Tpo $(DEPDIR)/env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT env.obj -MD -MP -MF "$(DEPDIR)/env.Tpo" -c -o env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/env.Tpo" "$(DEPDIR)/env.Po"; else rm -f "$(DEPDIR)/env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='env.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-
- linux_version.o: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_version.o -MD -MP -MF $(DEPDIR)/linux_version.Tpo -c -o linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/linux_version.Tpo $(DEPDIR)/linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_version.o -MD -MP -MF "$(DEPDIR)/linux_version.Tpo" -c -o linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/linux_version.Tpo" "$(DEPDIR)/linux_version.Po"; else rm -f "$(DEPDIR)/linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='linux_version.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-
- linux_version.obj: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_version.obj -MD -MP -MF $(DEPDIR)/linux_version.Tpo -c -o linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/linux_version.Tpo $(DEPDIR)/linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_version.obj -MD -MP -MF "$(DEPDIR)/linux_version.Tpo" -c -o linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/linux_version.Tpo" "$(DEPDIR)/linux_version.Po"; else rm -f "$(DEPDIR)/linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='linux_version.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-
- blkdev.o: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blkdev.o -MD -MP -MF $(DEPDIR)/blkdev.Tpo -c -o blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/blkdev.Tpo $(DEPDIR)/blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blkdev.o -MD -MP -MF "$(DEPDIR)/blkdev.Tpo" -c -o blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/blkdev.Tpo" "$(DEPDIR)/blkdev.Po"; else rm -f "$(DEPDIR)/blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='blkdev.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-
- blkdev.obj: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blkdev.obj -MD -MP -MF $(DEPDIR)/blkdev.Tpo -c -o blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/blkdev.Tpo $(DEPDIR)/blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blkdev.obj -MD -MP -MF "$(DEPDIR)/blkdev.Tpo" -c -o blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/blkdev.Tpo" "$(DEPDIR)/blkdev.Po"; else rm -f "$(DEPDIR)/blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='blkdev.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-
- setproctitle.o: ../lib/setproctitle.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setproctitle.o -MD -MP -MF $(DEPDIR)/setproctitle.Tpo -c -o setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/setproctitle.Tpo $(DEPDIR)/setproctitle.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setproctitle.o -MD -MP -MF "$(DEPDIR)/setproctitle.Tpo" -c -o setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/setproctitle.Tpo" "$(DEPDIR)/setproctitle.Po"; else rm -f "$(DEPDIR)/setproctitle.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/setproctitle.c' object='setproctitle.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
-
- setproctitle.obj: ../lib/setproctitle.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setproctitle.obj -MD -MP -MF $(DEPDIR)/setproctitle.Tpo -c -o setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/setproctitle.Tpo $(DEPDIR)/setproctitle.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setproctitle.obj -MD -MP -MF "$(DEPDIR)/setproctitle.Tpo" -c -o setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/setproctitle.Tpo" "$(DEPDIR)/setproctitle.Po"; else rm -f "$(DEPDIR)/setproctitle.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/setproctitle.c' object='setproctitle.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
-
- mtab_lock_test-fstab.o: fstab.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-fstab.Tpo -c -o mtab_lock_test-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-fstab.Tpo" -c -o mtab_lock_test-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo" "$(DEPDIR)/mtab_lock_test-fstab.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='mtab_lock_test-fstab.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-
- mtab_lock_test-fstab.obj: fstab.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-fstab.Tpo -c -o mtab_lock_test-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-fstab.Tpo" -c -o mtab_lock_test-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo" "$(DEPDIR)/mtab_lock_test-fstab.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='mtab_lock_test-fstab.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-
- mtab_lock_test-sundries.o: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-sundries.Tpo -c -o mtab_lock_test-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-sundries.Tpo" -c -o mtab_lock_test-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo" "$(DEPDIR)/mtab_lock_test-sundries.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='mtab_lock_test-sundries.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-
- mtab_lock_test-sundries.obj: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-sundries.Tpo -c -o mtab_lock_test-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-sundries.Tpo" -c -o mtab_lock_test-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo" "$(DEPDIR)/mtab_lock_test-sundries.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='mtab_lock_test-sundries.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-
- mtab_lock_test-xmalloc.o: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-xmalloc.Tpo -c -o mtab_lock_test-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" -c -o mtab_lock_test-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" "$(DEPDIR)/mtab_lock_test-xmalloc.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mtab_lock_test-xmalloc.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-
- mtab_lock_test-xmalloc.obj: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-xmalloc.Tpo -c -o mtab_lock_test-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" -c -o mtab_lock_test-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" "$(DEPDIR)/mtab_lock_test-xmalloc.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mtab_lock_test-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-
- umount-umount.o: umount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.o -MD -MP -MF $(DEPDIR)/umount-umount.Tpo -c -o umount-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.o -MD -MP -MF "$(DEPDIR)/umount-umount.Tpo" -c -o umount-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-umount.Tpo" "$(DEPDIR)/umount-umount.Po"; else rm -f "$(DEPDIR)/umount-umount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='umount.c' object='umount-umount.o' libtool=no @AMDEPBACKSLASH@
- @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.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c
-
- umount-umount.obj: umount.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.obj -MD -MP -MF $(DEPDIR)/umount-umount.Tpo -c -o umount-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.obj -MD -MP -MF "$(DEPDIR)/umount-umount.Tpo" -c -o umount-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-umount.Tpo" "$(DEPDIR)/umount-umount.Po"; else rm -f "$(DEPDIR)/umount-umount.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='umount.c' object='umount-umount.obj' libtool=no @AMDEPBACKSLASH@
- @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
-+@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; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-loumount.Tpo" "$(DEPDIR)/umount-loumount.Po"; else rm -f "$(DEPDIR)/umount-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='umount-loumount.o' libtool=no @AMDEPBACKSLASH@
-+@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-loumount.o `test -f 'loumount.c' || echo '$(srcdir)/'`loumount.c
-+
-+umount-loumount.obj: loumount.c
-+@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`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-loumount.Tpo" "$(DEPDIR)/umount-loumount.Po"; else rm -f "$(DEPDIR)/umount-loumount.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loumount.c' object='umount-loumount.obj' libtool=no @AMDEPBACKSLASH@
-+@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-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@ $(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@ mv -f $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
-+@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
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='umount-fstab.o' libtool=no @AMDEPBACKSLASH@
- @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-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-
- umount-fstab.obj: fstab.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.obj -MD -MP -MF $(DEPDIR)/umount-fstab.Tpo -c -o umount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.obj -MD -MP -MF "$(DEPDIR)/umount-fstab.Tpo" -c -o umount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fstab.Tpo" "$(DEPDIR)/umount-fstab.Po"; else rm -f "$(DEPDIR)/umount-fstab.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstab.c' object='umount-fstab.obj' libtool=no @AMDEPBACKSLASH@
- @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-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-
- umount-mount_mntent.o: mount_mntent.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.o -MD -MP -MF $(DEPDIR)/umount-mount_mntent.Tpo -c -o umount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.o -MD -MP -MF "$(DEPDIR)/umount-mount_mntent.Tpo" -c -o umount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-mount_mntent.Tpo" "$(DEPDIR)/umount-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount-mount_mntent.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_mntent.c' object='umount-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
- @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-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-
- umount-mount_mntent.obj: mount_mntent.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.obj -MD -MP -MF $(DEPDIR)/umount-mount_mntent.Tpo -c -o umount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/umount-mount_mntent.Tpo" -c -o umount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-mount_mntent.Tpo" "$(DEPDIR)/umount-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount-mount_mntent.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_mntent.c' object='umount-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
- @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-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-
- umount-getusername.o: getusername.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.o -MD -MP -MF $(DEPDIR)/umount-getusername.Tpo -c -o umount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.o -MD -MP -MF "$(DEPDIR)/umount-getusername.Tpo" -c -o umount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-getusername.Tpo" "$(DEPDIR)/umount-getusername.Po"; else rm -f "$(DEPDIR)/umount-getusername.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getusername.c' object='umount-getusername.o' libtool=no @AMDEPBACKSLASH@
- @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.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-
- umount-getusername.obj: getusername.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.obj -MD -MP -MF $(DEPDIR)/umount-getusername.Tpo -c -o umount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.obj -MD -MP -MF "$(DEPDIR)/umount-getusername.Tpo" -c -o umount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-getusername.Tpo" "$(DEPDIR)/umount-getusername.Po"; else rm -f "$(DEPDIR)/umount-getusername.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getusername.c' object='umount-getusername.obj' libtool=no @AMDEPBACKSLASH@
- @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
--@am__fastdepCC_TRUE@ $(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
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='umount-lomount.o' libtool=no @AMDEPBACKSLASH@
--@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-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
--
--umount-lomount.obj: lomount.c
--@am__fastdepCC_TRUE@ $(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`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lomount.c' object='umount-lomount.obj' libtool=no @AMDEPBACKSLASH@
--@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-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@ $(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@ mv -f $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
-+@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
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='umount-sundries.o' libtool=no @AMDEPBACKSLASH@
- @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-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-
- umount-sundries.obj: sundries.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.obj -MD -MP -MF $(DEPDIR)/umount-sundries.Tpo -c -o umount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.obj -MD -MP -MF "$(DEPDIR)/umount-sundries.Tpo" -c -o umount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-sundries.Tpo" "$(DEPDIR)/umount-sundries.Po"; else rm -f "$(DEPDIR)/umount-sundries.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sundries.c' object='umount-sundries.obj' libtool=no @AMDEPBACKSLASH@
- @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-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-
- umount-xmalloc.o: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.o -MD -MP -MF $(DEPDIR)/umount-xmalloc.Tpo -c -o umount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.o -MD -MP -MF "$(DEPDIR)/umount-xmalloc.Tpo" -c -o umount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-xmalloc.Tpo" "$(DEPDIR)/umount-xmalloc.Po"; else rm -f "$(DEPDIR)/umount-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='umount-xmalloc.o' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-
- umount-xmalloc.obj: xmalloc.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.obj -MD -MP -MF $(DEPDIR)/umount-xmalloc.Tpo -c -o umount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.obj -MD -MP -MF "$(DEPDIR)/umount-xmalloc.Tpo" -c -o umount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-xmalloc.Tpo" "$(DEPDIR)/umount-xmalloc.Po"; else rm -f "$(DEPDIR)/umount-xmalloc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='umount-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
- @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-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-
- umount-realpath.o: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-realpath.o -MD -MP -MF $(DEPDIR)/umount-realpath.Tpo -c -o umount-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-realpath.Tpo $(DEPDIR)/umount-realpath.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-realpath.o -MD -MP -MF "$(DEPDIR)/umount-realpath.Tpo" -c -o umount-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-realpath.Tpo" "$(DEPDIR)/umount-realpath.Po"; else rm -f "$(DEPDIR)/umount-realpath.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='umount-realpath.o' libtool=no @AMDEPBACKSLASH@
- @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-realpath.o `test -f 'realpath.c' || echo '$(srcdir)/'`realpath.c
-
- umount-realpath.obj: realpath.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-realpath.obj -MD -MP -MF $(DEPDIR)/umount-realpath.Tpo -c -o umount-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-realpath.Tpo $(DEPDIR)/umount-realpath.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-realpath.obj -MD -MP -MF "$(DEPDIR)/umount-realpath.Tpo" -c -o umount-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-realpath.Tpo" "$(DEPDIR)/umount-realpath.Po"; else rm -f "$(DEPDIR)/umount-realpath.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='realpath.c' object='umount-realpath.obj' libtool=no @AMDEPBACKSLASH@
- @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-realpath.obj `if test -f 'realpath.c'; then $(CYGPATH_W) 'realpath.c'; else $(CYGPATH_W) '$(srcdir)/realpath.c'; fi`
-
- umount-fsprobe.o: fsprobe.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.o -MD -MP -MF $(DEPDIR)/umount-fsprobe.Tpo -c -o umount-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.o -MD -MP -MF "$(DEPDIR)/umount-fsprobe.Tpo" -c -o umount-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe.Tpo" "$(DEPDIR)/umount-fsprobe.Po"; else rm -f "$(DEPDIR)/umount-fsprobe.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe.c' object='umount-fsprobe.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe.o `test -f 'fsprobe.c' || echo '$(srcdir)/'`fsprobe.c
-
- umount-fsprobe.obj: fsprobe.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.obj -MD -MP -MF $(DEPDIR)/umount-fsprobe.Tpo -c -o umount-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.obj -MD -MP -MF "$(DEPDIR)/umount-fsprobe.Tpo" -c -o umount-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe.Tpo" "$(DEPDIR)/umount-fsprobe.Po"; else rm -f "$(DEPDIR)/umount-fsprobe.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe.c' object='umount-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe.obj `if test -f 'fsprobe.c'; then $(CYGPATH_W) 'fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe.c'; fi`
-
- umount-fsprobe_blkid.o: fsprobe_blkid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_blkid.o -MD -MP -MF $(DEPDIR)/umount-fsprobe_blkid.Tpo -c -o umount-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe_blkid.Tpo $(DEPDIR)/umount-fsprobe_blkid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_blkid.o -MD -MP -MF "$(DEPDIR)/umount-fsprobe_blkid.Tpo" -c -o umount-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe_blkid.Tpo" "$(DEPDIR)/umount-fsprobe_blkid.Po"; else rm -f "$(DEPDIR)/umount-fsprobe_blkid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_blkid.c' object='umount-fsprobe_blkid.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_blkid.o `test -f 'fsprobe_blkid.c' || echo '$(srcdir)/'`fsprobe_blkid.c
-
- umount-fsprobe_blkid.obj: fsprobe_blkid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_blkid.obj -MD -MP -MF $(DEPDIR)/umount-fsprobe_blkid.Tpo -c -o umount-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe_blkid.Tpo $(DEPDIR)/umount-fsprobe_blkid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_blkid.obj -MD -MP -MF "$(DEPDIR)/umount-fsprobe_blkid.Tpo" -c -o umount-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe_blkid.Tpo" "$(DEPDIR)/umount-fsprobe_blkid.Po"; else rm -f "$(DEPDIR)/umount-fsprobe_blkid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_blkid.c' object='umount-fsprobe_blkid.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_blkid.obj `if test -f 'fsprobe_blkid.c'; then $(CYGPATH_W) 'fsprobe_blkid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_blkid.c'; fi`
-
- umount-fsprobe_volumeid.o: fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_volumeid.o -MD -MP -MF $(DEPDIR)/umount-fsprobe_volumeid.Tpo -c -o umount-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe_volumeid.Tpo $(DEPDIR)/umount-fsprobe_volumeid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_volumeid.o -MD -MP -MF "$(DEPDIR)/umount-fsprobe_volumeid.Tpo" -c -o umount-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe_volumeid.Tpo" "$(DEPDIR)/umount-fsprobe_volumeid.Po"; else rm -f "$(DEPDIR)/umount-fsprobe_volumeid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_volumeid.c' object='umount-fsprobe_volumeid.o' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_volumeid.o `test -f 'fsprobe_volumeid.c' || echo '$(srcdir)/'`fsprobe_volumeid.c
-
- umount-fsprobe_volumeid.obj: fsprobe_volumeid.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_volumeid.obj -MD -MP -MF $(DEPDIR)/umount-fsprobe_volumeid.Tpo -c -o umount-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-fsprobe_volumeid.Tpo $(DEPDIR)/umount-fsprobe_volumeid.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe_volumeid.obj -MD -MP -MF "$(DEPDIR)/umount-fsprobe_volumeid.Tpo" -c -o umount-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-fsprobe_volumeid.Tpo" "$(DEPDIR)/umount-fsprobe_volumeid.Po"; else rm -f "$(DEPDIR)/umount-fsprobe_volumeid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsprobe_volumeid.c' object='umount-fsprobe_volumeid.obj' libtool=no @AMDEPBACKSLASH@
- @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-fsprobe_volumeid.obj `if test -f 'fsprobe_volumeid.c'; then $(CYGPATH_W) 'fsprobe_volumeid.c'; else $(CYGPATH_W) '$(srcdir)/fsprobe_volumeid.c'; fi`
-
- umount-env.o: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.o -MD -MP -MF $(DEPDIR)/umount-env.Tpo -c -o umount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.o -MD -MP -MF "$(DEPDIR)/umount-env.Tpo" -c -o umount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-env.Tpo" "$(DEPDIR)/umount-env.Po"; else rm -f "$(DEPDIR)/umount-env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='umount-env.o' libtool=no @AMDEPBACKSLASH@
- @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-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-
- umount-env.obj: ../lib/env.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.obj -MD -MP -MF $(DEPDIR)/umount-env.Tpo -c -o umount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.obj -MD -MP -MF "$(DEPDIR)/umount-env.Tpo" -c -o umount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-env.Tpo" "$(DEPDIR)/umount-env.Po"; else rm -f "$(DEPDIR)/umount-env.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/env.c' object='umount-env.obj' libtool=no @AMDEPBACKSLASH@
- @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-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-
- umount-linux_version.o: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.o -MD -MP -MF $(DEPDIR)/umount-linux_version.Tpo -c -o umount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.o -MD -MP -MF "$(DEPDIR)/umount-linux_version.Tpo" -c -o umount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-linux_version.Tpo" "$(DEPDIR)/umount-linux_version.Po"; else rm -f "$(DEPDIR)/umount-linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='umount-linux_version.o' libtool=no @AMDEPBACKSLASH@
- @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-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-
- umount-linux_version.obj: ../lib/linux_version.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.obj -MD -MP -MF $(DEPDIR)/umount-linux_version.Tpo -c -o umount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.obj -MD -MP -MF "$(DEPDIR)/umount-linux_version.Tpo" -c -o umount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-linux_version.Tpo" "$(DEPDIR)/umount-linux_version.Po"; else rm -f "$(DEPDIR)/umount-linux_version.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/linux_version.c' object='umount-linux_version.obj' libtool=no @AMDEPBACKSLASH@
- @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-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-
- umount-blkdev.o: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.o -MD -MP -MF $(DEPDIR)/umount-blkdev.Tpo -c -o umount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.o -MD -MP -MF "$(DEPDIR)/umount-blkdev.Tpo" -c -o umount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-blkdev.Tpo" "$(DEPDIR)/umount-blkdev.Po"; else rm -f "$(DEPDIR)/umount-blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='umount-blkdev.o' libtool=no @AMDEPBACKSLASH@
- @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-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-
- umount-blkdev.obj: ../lib/blkdev.c
--@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.obj -MD -MP -MF $(DEPDIR)/umount-blkdev.Tpo -c -o umount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
-+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.obj -MD -MP -MF "$(DEPDIR)/umount-blkdev.Tpo" -c -o umount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/umount-blkdev.Tpo" "$(DEPDIR)/umount-blkdev.Po"; else rm -f "$(DEPDIR)/umount-blkdev.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../lib/blkdev.c' object='umount-blkdev.obj' libtool=no @AMDEPBACKSLASH@
- @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-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -1243,7 +1544,7 @@
- done
- install-man8: $(man8_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -1336,21 +1637,23 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-- list='$(DISTFILES)'; \
-- dist_files=`for file in $$list; do echo $$file; done | \
-- sed -e "s|^$$srcdirstrip/||;t" \
-- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-- case $$dist_files in \
-- */*) $(MKDIR_P) `echo "$$dist_files" | \
-- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-- sort -u` ;; \
-- esac; \
-- for file in $$dist_files; do \
-+ $(mkdir_p) $(distdir)/../config
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
- if test -d $$d/$$file; then \
-- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -1366,7 +1669,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
-- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -1415,22 +1718,14 @@
-
- install-data-am: install-man
-
--install-dvi: install-dvi-am
--
- install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
--install-html: install-html-am
--
- install-info: install-info-am
-
- install-man: install-man5 install-man8
-
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -1450,28 +1745,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-binPROGRAMS uninstall-man \
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
- uninstall-sbinPROGRAMS
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-exec-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-noinstPROGRAMS clean-sbinPROGRAMS ctags \
- distclean distclean-compile distclean-generic distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-binPROGRAMS install-data install-data-am \
-- install-dvi install-dvi-am install-exec install-exec-am \
-- install-exec-hook install-html install-html-am install-info \
-+ install-exec install-exec-am install-exec-hook install-info \
- install-info-am install-man install-man5 install-man8 \
-- install-pdf install-pdf-am install-ps install-ps-am \
- install-sbinPROGRAMS install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-- uninstall-am uninstall-binPROGRAMS uninstall-man \
-- uninstall-man5 uninstall-man8 uninstall-sbinPROGRAMS
-+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-+ uninstall-man uninstall-man5 uninstall-man8 \
-+ uninstall-sbinPROGRAMS
-
-
- install-exec-hook:
-diff -urN util-linux-ng-2.14/mount/aes.c util-linux-ng-2.14-AES/mount/aes.c
---- util-linux-ng-2.14/mount/aes.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/aes.c 2008-06-24 16:55:13.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
-+// happy to see it used in free and open source software. If you do use
-+// it I would appreciate an acknowledgement of its origin in the code or
-+// the product that results and I would also appreciate knowing a little
-+// about the use to which it is being put. I am grateful to Frank Yellin
-+// for some ideas that are used in this implementation.
-+//
-+// Dr B. R. Gladman <brg@gladman.uk.net> 6th April 2001.
-+//
-+// This is an implementation of the AES encryption algorithm (Rijndael)
-+// designed by Joan Daemen and Vincent Rijmen. This version is designed
-+// to provide both fixed and dynamic block and key lengths and can also
-+// run with either big or little endian internal byte order (see aes.h).
-+// It inputs block and key lengths in bytes with the legal values being
-+// 16, 24 and 32.
-+
-+/*
-+ * Modified by Jari Ruusu, May 1 2001
-+ * - Fixed some compile warnings, code was ok but gcc warned anyway.
-+ * - Changed basic types: byte -> unsigned char, word -> u_int32_t
-+ * - Major name space cleanup: Names visible to outside now begin
-+ * with "aes_" or "AES_". A lot of stuff moved from aes.h to aes.c
-+ * - Removed C++ and DLL support as part of name space cleanup.
-+ * - Eliminated unnecessary recomputation of tables. (actual bug fix)
-+ * - Merged precomputed constant tables to aes.c file.
-+ * - Removed data alignment restrictions for portability reasons.
-+ * - Made block and key lengths accept bit count (128/192/256)
-+ * as well byte count (16/24/32).
-+ * - Removed all error checks. This change also eliminated the need
-+ * to preinitialize the context struct to zero.
-+ * - Removed some totally unused constants.
-+ */
-+
-+/*
-+ * Modified by Jari Ruusu, June 9 2003
-+ * - Removed all code not necessary for small size
-+ * optimized encryption using 256 bit keys.
-+ */
-+
-+#include "aes.h"
-+
-+#if AES_BLOCK_SIZE != 16
-+#error an illegal block size has been specified
-+#endif
-+
-+// upr(x,n): rotates bytes within words by n positions, moving bytes
-+// to higher index positions with wrap around into low positions
-+// bval(x,n): extracts a byte from a word
-+
-+#define upr(x,n) (((x) << 8 * (n)) | ((x) >> (32 - 8 * (n))))
-+#define bval(x,n) ((unsigned char)((x) >> 8 * (n)))
-+#define bytes2word(b0, b1, b2, b3) \
-+ ((u_int32_t)(b3) << 24 | (u_int32_t)(b2) << 16 | (u_int32_t)(b1) << 8 | (b0))
-+
-+#if defined(i386) || defined(_I386) || defined(__i386__) || defined(__i386)
-+/* little endian processor without data alignment restrictions */
-+#define word_in(x) *(u_int32_t*)(x)
-+#define word_out(x,v) *(u_int32_t*)(x) = (v)
-+#else
-+/* slower but generic big endian or with data alignment restrictions */
-+#define word_in(x) ((u_int32_t)(((unsigned char *)(x))[0])|((u_int32_t)(((unsigned char *)(x))[1])<<8)|((u_int32_t)(((unsigned char *)(x))[2])<<16)|((u_int32_t)(((unsigned char *)(x))[3])<<24))
-+#define word_out(x,v) ((unsigned char *)(x))[0]=(v),((unsigned char *)(x))[1]=((v)>>8),((unsigned char *)(x))[2]=((v)>>16),((unsigned char *)(x))[3]=((v)>>24)
-+#endif
-+
-+// the finite field modular polynomial and elements
-+
-+#define ff_poly 0x011b
-+#define ff_hi 0x80
-+
-+static int tab_gen = 0;
-+static unsigned char s_box[256]; // the S box
-+static u_int32_t rcon_tab[AES_RC_LENGTH]; // table of round constants
-+static u_int32_t ft_tab[4][256];
-+static u_int32_t fl_tab[4][256];
-+
-+// Generate the tables for the dynamic table option
-+
-+// It will generally be sensible to use tables to compute finite
-+// field multiplies and inverses but where memory is scarse this
-+// code might sometimes be better.
-+
-+// return 2 ^ (n - 1) where n is the bit number of the highest bit
-+// set in x with x in the range 1 < x < 0x00000200. This form is
-+// used so that locals within FFinv can be bytes rather than words
-+
-+static unsigned char hibit(const u_int32_t x)
-+{ unsigned char r = (unsigned char)((x >> 1) | (x >> 2));
-+
-+ r |= (r >> 2);
-+ r |= (r >> 4);
-+ return (r + 1) >> 1;
-+}
-+
-+// return the inverse of the finite field element x
-+
-+static unsigned char FFinv(const unsigned char x)
-+{ unsigned char p1 = x, p2 = 0x1b, n1 = hibit(x), n2 = 0x80, v1 = 1, v2 = 0;
-+
-+ if(x < 2) return x;
-+
-+ for(;;)
-+ {
-+ if(!n1) return v1;
-+
-+ while(n2 >= n1)
-+ {
-+ n2 /= n1; p2 ^= p1 * n2; v2 ^= v1 * n2; n2 = hibit(p2);
-+ }
-+
-+ if(!n2) return v2;
-+
-+ while(n1 >= n2)
-+ {
-+ n1 /= n2; p1 ^= p2 * n1; v1 ^= v2 * n1; n1 = hibit(p1);
-+ }
-+ }
-+}
-+
-+// define the finite field multiplies required for Rijndael
-+
-+#define FFmul02(x) ((((x) & 0x7f) << 1) ^ ((x) & 0x80 ? 0x1b : 0))
-+#define FFmul03(x) ((x) ^ FFmul02(x))
-+
-+// The forward and inverse affine transformations used in the S-box
-+
-+#define fwd_affine(x) \
-+ (w = (u_int32_t)x, w ^= (w<<1)^(w<<2)^(w<<3)^(w<<4), 0x63^(unsigned char)(w^(w>>8)))
-+
-+static void gen_tabs(void)
-+{ u_int32_t i, w;
-+
-+ for(i = 0, w = 1; i < AES_RC_LENGTH; ++i)
-+ {
-+ rcon_tab[i] = bytes2word(w, 0, 0, 0);
-+ w = (w << 1) ^ (w & ff_hi ? ff_poly : 0);
-+ }
-+
-+ for(i = 0; i < 256; ++i)
-+ { unsigned char b;
-+
-+ s_box[i] = b = fwd_affine(FFinv((unsigned char)i));
-+
-+ w = bytes2word(b, 0, 0, 0);
-+ fl_tab[0][i] = w;
-+ fl_tab[1][i] = upr(w,1);
-+ fl_tab[2][i] = upr(w,2);
-+ fl_tab[3][i] = upr(w,3);
-+ w = bytes2word(FFmul02(b), b, b, FFmul03(b));
-+ ft_tab[0][i] = w;
-+ ft_tab[1][i] = upr(w,1);
-+ ft_tab[2][i] = upr(w,2);
-+ ft_tab[3][i] = upr(w,3);
-+ }
-+}
-+
-+#define four_tables(x,tab,vf,rf,c) \
-+ ( tab[0][bval(vf(x,0,c),rf(0,c))] \
-+ ^ tab[1][bval(vf(x,1,c),rf(1,c))] \
-+ ^ tab[2][bval(vf(x,2,c),rf(2,c))] \
-+ ^ tab[3][bval(vf(x,3,c),rf(3,c))])
-+
-+#define vf1(x,r,c) (x)
-+#define rf1(r,c) (r)
-+#define rf2(r,c) ((r-c)&3)
-+
-+#define ls_box(x,c) four_tables(x,fl_tab,vf1,rf2,c)
-+
-+#define nc (AES_BLOCK_SIZE / 4)
-+
-+// Initialise the key schedule from the user supplied key.
-+// The key length is now specified in bytes, 32.
-+// This corresponds to bit length of 256 bits, and
-+// to Nk value of 8 respectively.
-+
-+void aes_set_key(aes_context *cx, const unsigned char in_key[], int n_bytes, const int f)
-+{ u_int32_t *kf, *kt, rci;
-+
-+ if(!tab_gen) { gen_tabs(); tab_gen = 1; }
-+
-+ cx->aes_Nkey = 8;
-+ cx->aes_Nrnd = (cx->aes_Nkey > nc ? cx->aes_Nkey : nc) + 6;
-+
-+ cx->aes_e_key[0] = word_in(in_key );
-+ cx->aes_e_key[1] = word_in(in_key + 4);
-+ cx->aes_e_key[2] = word_in(in_key + 8);
-+ cx->aes_e_key[3] = word_in(in_key + 12);
-+
-+ kf = cx->aes_e_key;
-+ kt = kf + nc * (cx->aes_Nrnd + 1) - cx->aes_Nkey;
-+ rci = 0;
-+
-+ switch(cx->aes_Nkey)
-+ {
-+ case 8: cx->aes_e_key[4] = word_in(in_key + 16);
-+ cx->aes_e_key[5] = word_in(in_key + 20);
-+ cx->aes_e_key[6] = word_in(in_key + 24);
-+ cx->aes_e_key[7] = word_in(in_key + 28);
-+ do
-+ { kf[ 8] = kf[0] ^ ls_box(kf[7],3) ^ rcon_tab[rci++];
-+ kf[ 9] = kf[1] ^ kf[ 8];
-+ kf[10] = kf[2] ^ kf[ 9];
-+ kf[11] = kf[3] ^ kf[10];
-+ kf[12] = kf[4] ^ ls_box(kf[11],0);
-+ kf[13] = kf[5] ^ kf[12];
-+ kf[14] = kf[6] ^ kf[13];
-+ kf[15] = kf[7] ^ kf[14];
-+ kf += 8;
-+ }
-+ while (kf < kt);
-+ break;
-+ }
-+}
-+
-+// y = output word, x = input word, r = row, c = column
-+// for r = 0, 1, 2 and 3 = column accessed for row r
-+
-+#define s(x,c) x[c]
-+
-+// I am grateful to Frank Yellin for the following constructions
-+// which, given the column (c) of the output state variable that
-+// is being computed, return the input state variables which are
-+// needed for each row (r) of the state
-+
-+// For the fixed block size options, compilers reduce these two
-+// expressions to fixed variable references. For variable block
-+// size code conditional clauses will sometimes be returned
-+
-+#define fwd_var(x,r,c) \
-+ ( r==0 ? \
-+ ( c==0 ? s(x,0) \
-+ : c==1 ? s(x,1) \
-+ : c==2 ? s(x,2) \
-+ : c==3 ? s(x,3) \
-+ : c==4 ? s(x,4) \
-+ : c==5 ? s(x,5) \
-+ : c==6 ? s(x,6) \
-+ : s(x,7)) \
-+ : r==1 ? \
-+ ( c==0 ? s(x,1) \
-+ : c==1 ? s(x,2) \
-+ : c==2 ? s(x,3) \
-+ : c==3 ? nc==4 ? s(x,0) : s(x,4) \
-+ : c==4 ? s(x,5) \
-+ : c==5 ? nc==8 ? s(x,6) : s(x,0) \
-+ : c==6 ? s(x,7) \
-+ : s(x,0)) \
-+ : r==2 ? \
-+ ( c==0 ? nc==8 ? s(x,3) : s(x,2) \
-+ : c==1 ? nc==8 ? s(x,4) : s(x,3) \
-+ : c==2 ? nc==4 ? s(x,0) : nc==8 ? s(x,5) : s(x,4) \
-+ : c==3 ? nc==4 ? s(x,1) : nc==8 ? s(x,6) : s(x,5) \
-+ : c==4 ? nc==8 ? s(x,7) : s(x,0) \
-+ : c==5 ? nc==8 ? s(x,0) : s(x,1) \
-+ : c==6 ? s(x,1) \
-+ : s(x,2)) \
-+ : \
-+ ( c==0 ? nc==8 ? s(x,4) : s(x,3) \
-+ : c==1 ? nc==4 ? s(x,0) : nc==8 ? s(x,5) : s(x,4) \
-+ : c==2 ? nc==4 ? s(x,1) : nc==8 ? s(x,6) : s(x,5) \
-+ : c==3 ? nc==4 ? s(x,2) : nc==8 ? s(x,7) : s(x,0) \
-+ : c==4 ? nc==8 ? s(x,0) : s(x,1) \
-+ : c==5 ? nc==8 ? s(x,1) : s(x,2) \
-+ : c==6 ? s(x,2) \
-+ : s(x,3)))
-+
-+#define si(y,x,k,c) s(y,c) = word_in(x + 4 * c) ^ k[c]
-+#define so(y,x,c) word_out(y + 4 * c, s(x,c))
-+
-+#define fwd_rnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,ft_tab,fwd_var,rf1,c)
-+#define fwd_lrnd(y,x,k,c) s(y,c)= (k)[c] ^ four_tables(x,fl_tab,fwd_var,rf1,c)
-+
-+#define locals(y,x) x[4],y[4]
-+
-+#define l_copy(y, x) s(y,0) = s(x,0); s(y,1) = s(x,1); \
-+ s(y,2) = s(x,2); s(y,3) = s(x,3);
-+#define state_in(y,x,k) si(y,x,k,0); si(y,x,k,1); si(y,x,k,2); si(y,x,k,3)
-+#define state_out(y,x) so(y,x,0); so(y,x,1); so(y,x,2); so(y,x,3)
-+#define round(rm,y,x,k) rm(y,x,k,0); rm(y,x,k,1); rm(y,x,k,2); rm(y,x,k,3)
-+
-+void aes_encrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
-+{ u_int32_t locals(b0, b1);
-+ const u_int32_t *kp = cx->aes_e_key;
-+
-+ state_in(b0, in_blk, kp); kp += nc;
-+
-+ { u_int32_t rnd;
-+
-+ for(rnd = 0; rnd < cx->aes_Nrnd - 1; ++rnd)
-+ {
-+ round(fwd_rnd, b1, b0, kp);
-+ l_copy(b0, b1); kp += nc;
-+ }
-+
-+ round(fwd_lrnd, b0, b1, kp);
-+ }
-+
-+ state_out(out_blk, b0);
-+}
-diff -urN util-linux-ng-2.14/mount/aes.h util-linux-ng-2.14-AES/mount/aes.h
---- util-linux-ng-2.14/mount/aes.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/aes.h 2008-06-24 16:55:13.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
-+// happy to see it used in free and open source software. If you do use
-+// it I would appreciate an acknowledgement of its origin in the code or
-+// the product that results and I would also appreciate knowing a little
-+// about the use to which it is being put. I am grateful to Frank Yellin
-+// for some ideas that are used in this implementation.
-+//
-+// Dr B. R. Gladman <brg@gladman.uk.net> 6th April 2001.
-+//
-+// This is an implementation of the AES encryption algorithm (Rijndael)
-+// designed by Joan Daemen and Vincent Rijmen. This version is designed
-+// to provide both fixed and dynamic block and key lengths and can also
-+// run with either big or little endian internal byte order (see aes.h).
-+// It inputs block and key lengths in bytes with the legal values being
-+// 16, 24 and 32.
-+
-+/*
-+ * Modified by Jari Ruusu, May 1 2001
-+ * - Fixed some compile warnings, code was ok but gcc warned anyway.
-+ * - Changed basic types: byte -> unsigned char, word -> u_int32_t
-+ * - Major name space cleanup: Names visible to outside now begin
-+ * with "aes_" or "AES_". A lot of stuff moved from aes.h to aes.c
-+ * - Removed C++ and DLL support as part of name space cleanup.
-+ * - Eliminated unnecessary recomputation of tables. (actual bug fix)
-+ * - Merged precomputed constant tables to aes.c file.
-+ * - Removed data alignment restrictions for portability reasons.
-+ * - Made block and key lengths accept bit count (128/192/256)
-+ * as well byte count (16/24/32).
-+ * - Removed all error checks. This change also eliminated the need
-+ * to preinitialize the context struct to zero.
-+ * - Removed some totally unused constants.
-+ */
-+
-+#ifndef _AES_H
-+#define _AES_H
-+
-+#if defined(__linux__) && defined(__KERNEL__)
-+# include <linux/types.h>
-+#else
-+# include <sys/types.h>
-+#endif
-+
-+// CONFIGURATION OPTIONS (see also aes.c)
-+//
-+// Define AES_BLOCK_SIZE to set the cipher block size (16, 24 or 32) or
-+// leave this undefined for dynamically variable block size (this will
-+// result in much slower code).
-+// IMPORTANT NOTE: AES_BLOCK_SIZE is in BYTES (16, 24, 32 or undefined). If
-+// left undefined a slower version providing variable block length is compiled
-+
-+#define AES_BLOCK_SIZE 16
-+
-+// The number of key schedule words for different block and key lengths
-+// allowing for method of computation which requires the length to be a
-+// multiple of the key length
-+//
-+// Nk = 4 6 8
-+// -------------
-+// Nb = 4 | 60 60 64
-+// 6 | 96 90 96
-+// 8 | 120 120 120
-+
-+#if !defined(AES_BLOCK_SIZE) || (AES_BLOCK_SIZE == 32)
-+#define AES_KS_LENGTH 120
-+#define AES_RC_LENGTH 29
-+#else
-+#define AES_KS_LENGTH 4 * AES_BLOCK_SIZE
-+#define AES_RC_LENGTH (9 * AES_BLOCK_SIZE) / 8 - 8
-+#endif
-+
-+typedef struct
-+{
-+ u_int32_t aes_Nkey; // the number of words in the key input block
-+ u_int32_t aes_Nrnd; // the number of cipher rounds
-+ u_int32_t aes_e_key[AES_KS_LENGTH]; // the encryption key schedule
-+ u_int32_t aes_d_key[AES_KS_LENGTH]; // the decryption key schedule
-+#if !defined(AES_BLOCK_SIZE)
-+ u_int32_t aes_Ncol; // the number of columns in the cipher state
-+#endif
-+} aes_context;
-+
-+// THE CIPHER INTERFACE
-+
-+#if !defined(AES_BLOCK_SIZE)
-+extern void aes_set_blk(aes_context *, const int);
-+#endif
-+extern void aes_set_key(aes_context *, const unsigned char [], const int, const int);
-+extern void aes_encrypt(const aes_context *, const unsigned char [], unsigned char []);
-+extern void aes_decrypt(const aes_context *, const unsigned char [], unsigned char []);
-+
-+// The block length inputs to aes_set_block and aes_set_key are in numbers
-+// of bytes or bits. The calls to subroutines must be made in the above
-+// order but multiple calls can be made without repeating earlier calls
-+// if their parameters have not changed.
-+
-+#endif // _AES_H
-diff -urN util-linux-ng-2.14/mount/lomount.c util-linux-ng-2.14-AES/mount/lomount.c
---- util-linux-ng-2.14/mount/lomount.c 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/lomount.c 2008-06-24 16:55:13.000000000 +0300
-@@ -1,4 +1,18 @@
--/* Originally from Ted's losetup.c */
-+/* Taken from Ted's losetup.c - Mitch <m.dsouza@mrc-apu.cam.ac.uk> */
-+/* Added vfs mount options - aeb - 960223 */
-+/* Removed lomount - aeb - 960224 */
-+
-+/*
-+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-+ * - added Native Language Support
-+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * - fixed strerr(errno) in gettext calls
-+ * 2001-04-11 Jari Ruusu
-+ * - added AES support
-+ */
-+
-+#define LOOPMAJOR 7
-+
- /*
- * losetup.c - setup and control loop devices
- */
-@@ -10,1010 +24,1318 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <pwd.h>
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/sysmacros.h>
--#include <inttypes.h>
--#include <dirent.h>
-+#include <sys/wait.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <mntent.h>
-+#include <locale.h>
-+#include <sys/time.h>
-+#include <sys/utsname.h>
-+#include <signal.h>
-
- #include "loop.h"
- #include "lomount.h"
- #include "xstrncpy.h"
- #include "nls.h"
--#include "sundries.h"
--#include "xmalloc.h"
--#include "realpath.h"
-+#include "sha512.h"
-+#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
-
--#ifdef LOOP_SET_FD
-+extern int verbose;
-+extern char *xstrdup (const char *s); /* not: #include "sundries.h" */
-+extern void error (const char *fmt, ...); /* idem */
-+extern void show_all_loops(void);
-+extern int read_options_from_fstab(char *, char **);
-+extern int recompute_loop_dev_size(char *);
-
--static int is_associated(int dev, struct stat *file, unsigned long long offset, int isoff);
-+#if !defined(LOOP_PASSWORD_MIN_LENGTH)
-+# define LOOP_PASSWORD_MIN_LENGTH 20
-+#endif
-
--static int
--loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
--{
-- memset(info, 0, sizeof(*info));
-- info->lo_number = info64->lo_number;
-- info->lo_device = info64->lo_device;
-- info->lo_inode = info64->lo_inode;
-- info->lo_rdevice = info64->lo_rdevice;
-- info->lo_offset = info64->lo_offset;
-- info->lo_encrypt_type = info64->lo_encrypt_type;
-- info->lo_encrypt_key_size = info64->lo_encrypt_key_size;
-- info->lo_flags = info64->lo_flags;
-- info->lo_init[0] = info64->lo_init[0];
-- info->lo_init[1] = info64->lo_init[1];
-- if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI)
-- memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE);
-- else
-- memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE);
-- memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, LO_KEY_SIZE);
--
-- /* error in case values were truncated */
-- if (info->lo_device != info64->lo_device ||
-- info->lo_rdevice != info64->lo_rdevice ||
-- info->lo_inode != info64->lo_inode ||
-- info->lo_offset != info64->lo_offset)
-- return -EOVERFLOW;
--
-- return 0;
--}
--
--#define DEV_LOOP_PATH "/dev/loop"
--#define DEV_PATH "/dev"
--#define SYSFS_BLOCK_PATH "/sys/block"
--#define LOOPMAJOR 7
--#define NLOOPS_DEFAULT 8 /* /dev/loop[0-7] */
--
--struct looplist {
-- int flag; /* scanning options */
-- int ndef; /* number of tested default devices */
-- struct dirent **names; /* scandir-like list of loop devices */
-- int nnames; /* number of items in names */
-- int ncur; /* current possition in direcotry */
-- char name[32]; /* device name */
-- int ct_perm; /* count permission problems */
-- int ct_succ; /* count number of successfully
-- detected devices */
--};
--
--#define LLFLG_USEDONLY (1 << 1) /* return used devices only */
--#define LLFLG_FREEONLY (1 << 2) /* return non-used devices */
--#define LLFLG_DONE (1 << 3) /* all is done */
--#define LLFLG_SYSFS (1 << 4) /* try to use /sys/block */
--#define LLFLG_SUBDIR (1 << 5) /* /dev/loop/N */
--#define LLFLG_DFLT (1 << 6) /* directly try to check default loops */
-+char *passFDnumber = (char *)0;
-+char *passAskTwice = (char *)0;
-+char *passSeedString = (char *)0;
-+char *passHashFuncName = (char *)0;
-+char *passIterThousands = (char *)0;
-+char *loInitValue = (char *)0;
-+char *gpgKeyFile = (char *)0;
-+char *gpgHomeDir = (char *)0;
-+char *clearTextKeyFile = (char *)0;
-+char *loopOffsetBytes = (char *)0;
-+char *loopSizeBytes = (char *)0;
-+char *loopEncryptionType = (char *)0;
-+
-+static int multiKeyMode = 0; /* 0=single-key 64=multi-key-v2 65=multi-key-v3 1000=any */
-+static char *multiKeyPass[66];
-+static char *loopFileName;
-
--int
--is_loop_device (const char *device) {
-- struct stat st;
-+#ifdef MAIN
-+static char *
-+crypt_name (int id, int *flags) {
-+ int i;
-
-- return (stat(device, &st) == 0 &&
-- S_ISBLK(st.st_mode) &&
-- major(st.st_rdev) == LOOPMAJOR);
-+ for (i = 0; loop_crypt_type_tbl[i].id != -1; i++)
-+ if(id == loop_crypt_type_tbl[i].id) {
-+ *flags = loop_crypt_type_tbl[i].flags;
-+ return loop_crypt_type_tbl[i].name;
-+ }
-+ *flags = 0;
-+ if(id == 18)
-+ return "CryptoAPI";
-+ return "undefined";
- }
-
- static int
--is_loop_used(int fd)
--{
-- struct loop_info li;
-- return ioctl (fd, LOOP_GET_STATUS, &li) == 0;
--}
-+show_loop(char *device) {
-+ struct loop_info64 loopinfo;
-+ int fd;
-
--static char *
--looplist_mk_devname(struct looplist *ll, int num)
--{
-- if (ll->flag & LLFLG_SUBDIR)
-- snprintf(ll->name, sizeof(ll->name),
-- DEV_LOOP_PATH "/%d", num);
-- else
-- snprintf(ll->name, sizeof(ll->name),
-- DEV_PATH "/loop%d", num);
-+ if ((fd = open(device, O_RDONLY)) < 0) {
-+ int errsv = errno;
-+ fprintf(stderr, _("loop: can't open device %s: %s\n"),
-+ device, strerror (errsv));
-+ return 2;
-+ }
-+ if (loop_get_status64_ioctl(fd, &loopinfo) < 0) {
-+ int errsv = errno;
-+ fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
-+ device, strerror (errsv));
-+ close (fd);
-+ return 1;
-+ }
-+ 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,
-+ (unsigned long long)loopinfo.lo_inode, loopinfo.lo_file_name);
-+ if (loopinfo.lo_offset) {
-+ if ((long long)loopinfo.lo_offset < 0) {
-+ printf(_(" offset=@%llu"), -((unsigned long long)loopinfo.lo_offset));
-+ } else {
-+ printf(_(" offset=%llu"), (unsigned long long)loopinfo.lo_offset);
-+ }
-+ }
-+ 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(_(" encryption=%s"), s);
-+ /* type 18 == LO_CRYPT_CRYPTOAPI */
-+ if (loopinfo.lo_encrypt_type == 18) {
-+ printf("/%s", loopinfo.lo_crypt_name);
-+ } else {
-+ if(flags & 2)
-+ printf("-");
-+ if(flags & 1)
-+ printf("%u", (unsigned int)loopinfo.lo_encrypt_key_size << 3);
-+ }
-+ }
-+ switch(loopinfo.lo_flags & 0x180000) {
-+ case 0x180000:
-+ printf(_(" multi-key-v3"));
-+ break;
-+ case 0x100000:
-+ printf(_(" multi-key-v2"));
-+ 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 is_loop_device(ll->name) ? ll->name : NULL;
-+ return 0;
- }
-+#endif
-
--/* ignores all non-loop devices, default loop devices */
--static int
--filter_loop(const struct dirent *d)
--{
-- return strncmp(d->d_name, "loop", 4) == 0;
--}
-+#define SIZE(a) (sizeof(a)/sizeof(a[0]))
-
--/* all loops exclude default loops */
--static int
--filter_loop_ndflt(const struct dirent *d)
--{
-- int mn;
-+#if !defined(MAIN)
-+char *
-+find_unused_loop_device (void) {
-+ /* Just creating a device, say in /tmp, is probably a bad idea -
-+ people might have problems with backup or so.
-+ So, we just try /dev/loop[0-7]. */
-+ char dev[20];
-+ char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
-+ int i, j, fd, somedev = 0, someloop = 0;
-+ struct stat statbuf;
-
-- if (strncmp(d->d_name, "loop", 4) == 0 &&
-- sscanf(d->d_name, "loop%d", &mn) == 1 &&
-- mn >= NLOOPS_DEFAULT)
-- return 1;
-+ 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)) {
-+ somedev++;
-+ fd = open (dev, O_RDONLY);
-+ if (fd >= 0) {
-+ if (is_unused_loop_device(fd) == 0)
-+ someloop++; /* in use */
-+ else if (errno == ENXIO) {
-+ close (fd);
-+ return xstrdup(dev);/* probably free */
-+ }
-+ close (fd);
-+ }
-+ continue;/* continue trying as long as devices exist */
-+ }
-+ break;
-+ }
-+ }
-+
-+ if (!somedev)
-+ error(_("mount: could not find any device /dev/loop#"));
-+ else if (!someloop)
-+ error(_("mount: Could not find any loop device. Maybe this kernel does not know\n"
-+ " about the loop device? (If so, recompile or `modprobe loop'.)"));
-+ else
-+ error(_("mount: could not find any free loop device"));
- return 0;
- }
-
--static int
--filter_loop_num(const struct dirent *d)
-+int is_loop_active(const char *dev, const char *backdev)
- {
-- char *end = NULL;
-- int mn = strtol(d->d_name, &end, 10);
--
-- if (mn >= NLOOPS_DEFAULT && end && *end == '\0')
-- return 1;
-- return 0;
-+ int fd;
-+ int ret = 0;
-+ struct stat statbuf;
-+ struct loop_info64 loopinfo;
-+ if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ fd = open (dev, O_RDONLY);
-+ if (fd < 0)
-+ return 0;
-+ if ((loop_get_status64_ioctl(fd, &loopinfo) == 0)
-+ && (stat (backdev, &statbuf) == 0)
-+ && (statbuf.st_dev == loopinfo.lo_device)
-+ && (statbuf.st_ino == loopinfo.lo_inode))
-+ ret = 1; /* backing device matches */
-+ memset(&loopinfo, 0, sizeof(loopinfo));
-+ close(fd);
-+ }
-+ return ret;
- }
-+#endif
-
--static int
--looplist_open(struct looplist *ll, int flag)
-+static int rd_wr_retry(int fd, char *buf, int cnt, int w)
- {
-- struct stat st;
-+ int x, y, z;
-
-- memset(ll, 0, sizeof(*ll));
-- ll->flag = flag;
-- ll->ndef = -1;
-- ll->ncur = -1;
-+ x = 0;
-+ while(x < cnt) {
-+ y = cnt - x;
-+ if(w) {
-+ z = write(fd, buf + x, y);
-+ } else {
-+ z = read(fd, buf + x, y);
-+ if (!z) return x;
-+ }
-+ if(z < 0) {
-+ if ((errno == EAGAIN) || (errno == ENOMEM) || (errno == ERESTART) || (errno == EINTR)) {
-+ continue;
-+ }
-+ return x;
-+ }
-+ x += z;
-+ }
-+ return x;
-+}
-
-- if (stat(DEV_PATH, &st) == -1 || (!S_ISDIR(st.st_mode)))
-- return -1; /* /dev doesn't exist */
-+static char *get_FD_pass(int fd)
-+{
-+ char *p = NULL, *n;
-+ int x = 0, y = 0;
-
-- if (stat(DEV_LOOP_PATH, &st) == 0 && S_ISDIR(st.st_mode))
-- ll->flag |= LLFLG_SUBDIR; /* /dev/loop/ exists */
-+ do {
-+ if(y >= (x - 1)) {
-+ x += 128;
-+ /* Must enforce some max limit here -- this code */
-+ /* runs as part of mount, and mount is setuid root */
-+ /* and has used mlockall(MCL_CURRENT | MCL_FUTURE) */
-+ if(x > (4*1024)) return(NULL);
-+ n = malloc(x);
-+ if(!n) return(NULL);
-+ if(p) {
-+ memcpy(n, p, y);
-+ memset(p, 0, y);
-+ free(p);
-+ }
-+ p = n;
-+ }
-+ if(rd_wr_retry(fd, p + y, 1, 0) != 1) break;
-+ if((p[y] == '\n') || !p[y]) break;
-+ y++;
-+ } while(1);
-+ if(p) p[y] = 0;
-+ return p;
-+}
-
-- if ((ll->flag & LLFLG_USEDONLY) &&
-- stat(SYSFS_BLOCK_PATH, &st) == 0 &&
-- S_ISDIR(st.st_mode))
-- ll->flag |= LLFLG_SYSFS; /* try to use /sys/block/loopN */
-+static unsigned long long mystrtoull(char *s, int acceptAT)
-+{
-+ unsigned long long v = 0;
-+ int negative = 0;
-
-- ll->flag |= LLFLG_DFLT; /* required! */
-- return 0;
-+ while ((*s == ' ') || (*s == '\t'))
-+ s++;
-+ if (acceptAT && (*s == '@')) {
-+ s++;
-+ negative = 1;
-+ }
-+ if (*s == '0') {
-+ s++;
-+ if ((*s == 'x') || (*s == 'X')) {
-+ s++;
-+ sscanf(s, "%llx", &v);
-+ } else {
-+ sscanf(s, "%llo", &v);
-+ }
-+ } else {
-+ sscanf(s, "%llu", &v);
-+ }
-+ return negative ? -v : v;
- }
-
--static void
--looplist_close(struct looplist *ll)
-+static void warnAboutBadKeyData(int x)
- {
-- if (ll->names) {
-- for(++ll->ncur; ll->ncur < ll->nnames; ll->ncur++)
-- free(ll->names[ll->ncur]);
--
-- free(ll->names);
-- ll->names = NULL;
-- ll->nnames = 0;
-+ if((x > 1) && (x != 64) && (x != 65)) {
-+ fprintf(stderr, _("Warning: Unknown key data format - using it anyway\n"));
- }
-- ll->ncur = -1;
-- ll->flag |= LLFLG_DONE;
- }
-
--static int
--looplist_is_wanted(struct looplist *ll, int fd)
-+static int are_these_files_same(const char *name1, const char *name2)
- {
-- int ret;
--
-- if (!(ll->flag & (LLFLG_USEDONLY | LLFLG_FREEONLY)))
-- return 1;
-- ret = is_loop_used(fd);
-+ struct stat statbuf1;
-+ struct stat statbuf2;
-
-- if ((ll->flag & LLFLG_USEDONLY) && ret == 0)
-- return 0;
-- if ((ll->flag & LLFLG_FREEONLY) && ret == 1)
-- return 0;
--
-- return 1;
-+ if(!name1 || !*name1 || !name2 || !*name2) return 0;
-+ if(stat(name1, &statbuf1)) return 0;
-+ if(stat(name2, &statbuf2)) return 0;
-+ if(statbuf1.st_dev != statbuf2.st_dev) return 0;
-+ if(statbuf1.st_ino != statbuf2.st_ino) return 0;
-+ return 1; /* are same */
- }
-
--static int
--looplist_next(struct looplist *ll)
-+static char *do_GPG_pipe(char *pass)
- {
-- int fd;
-- int ret;
-- char *dirname, *dev;
--
-- if (ll->flag & LLFLG_DONE)
-- return -1;
-+ int x, pfdi[2], pfdo[2];
-+ char str[10], *a[16], *e[2], *h;
-+ pid_t gpid;
-+ struct passwd *p;
-+ void *oldSigPipeHandler;
-
-- /* A) try to use /sys/block/loopN devices (for losetup -a only)
-- */
-- if (ll->flag & LLFLG_SYSFS) {
-- int mn;
--
-- if (!ll->nnames) {
-- ll->nnames = scandir(SYSFS_BLOCK_PATH, &ll->names,
-- filter_loop, versionsort);
-- ll->ncur = -1;
-- }
-- for(++ll->ncur; ll->ncur < ll->nnames; ll->ncur++) {
-- ret = sscanf(ll->names[ll->ncur]->d_name, "loop%d", &mn);
-- free(ll->names[ll->ncur]);
-- if (ret != 1)
-- continue;
-- dev = looplist_mk_devname(ll, mn);
-- if (dev) {
-- ll->ct_succ++;
-- if ((fd = open(dev, O_RDONLY)) > -1) {
-- if (looplist_is_wanted(ll, fd))
-- return fd;
-- close(fd);
-- } else if (errno == EACCES)
-- ll->ct_perm++;
-- }
-+ if((getuid() == 0) && gpgHomeDir && gpgHomeDir[0]) {
-+ h = gpgHomeDir;
-+ } else {
-+ if(!(p = getpwuid(getuid()))) {
-+ fprintf(stderr, _("Error: Unable to detect home directory for uid %d\n"), (int)getuid());
-+ return NULL;
- }
-- if (ll->nnames)
-- free(ll->names);
-- ll->names = NULL;
-- ll->ncur = -1;
-- ll->nnames = 0;
-- ll->flag &= ~LLFLG_SYSFS;
-- goto done;
-+ h = p->pw_dir;
- }
--
-- /* B) Classic way, try first eight loop devices (default number
-- * of loop devices). This is enough for 99% of all cases.
-- */
-- if (ll->flag & LLFLG_DFLT) {
-- for (++ll->ncur; ll->ncur < NLOOPS_DEFAULT; ll->ncur++) {
-- dev = looplist_mk_devname(ll, ll->ncur);
-- if (dev) {
-- ll->ct_succ++;
-- if ((fd = open(dev, O_RDONLY)) > -1) {
-- if (looplist_is_wanted(ll, fd))
-- return fd;
-- close(fd);
-- } else if (errno == EACCES)
-- ll->ct_perm++;
-- }
-- }
-- ll->flag &= ~LLFLG_DFLT;
-- ll->ncur = -1;
-+ if(!(e[0] = malloc(strlen(h) + 6))) {
-+ nomem1:
-+ fprintf(stderr, _("Error: Unable to allocate memory\n"));
-+ return NULL;
- }
-+ sprintf(e[0], "HOME=%s", h);
-+ e[1] = 0;
-
-+ if(pipe(&pfdi[0])) {
-+ nomem2:
-+ free(e[0]);
-+ goto nomem1;
-+ }
-+ if(pipe(&pfdo[0])) {
-+ close(pfdi[0]);
-+ close(pfdi[1]);
-+ goto nomem2;
-+ }
-
-- /* C) the worst posibility, scan all /dev or /dev/loop
-+ /*
-+ * When this code is run as part of losetup, normal read permissions
-+ * affect the open() below because losetup is not setuid-root.
-+ *
-+ * When this code is run as part of mount, only root can set
-+ * 'gpgKeyFile' and as such, only root can decide what file is opened
-+ * below. However, since mount is usually setuid-root all non-root
-+ * users can also open() the file too, but that file's contents are
-+ * only piped to gpg. This readable-for-all is intended behaviour,
-+ * and is very useful in situations where non-root users mount loop
-+ * devices with their own gpg private key, and yet don't have access
-+ * to the actual key used to encrypt loop device.
- */
-- dirname = ll->flag & LLFLG_SUBDIR ? DEV_LOOP_PATH : DEV_PATH;
-+ if((x = open(gpgKeyFile, O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open %s for reading\n"), gpgKeyFile);
-+ nomem3:
-+ free(e[0]);
-+ close(pfdo[0]);
-+ close(pfdo[1]);
-+ close(pfdi[0]);
-+ close(pfdi[1]);
-+ return NULL;
-+ }
-
-- if (!ll->nnames) {
-- ll->nnames = scandir(dirname, &ll->names,
-- ll->flag & LLFLG_SUBDIR ?
-- filter_loop_num : filter_loop_ndflt,
-- versionsort);
-- ll->ncur = -1;
-- }
--
-- for(++ll->ncur; ll->ncur < ll->nnames; ll->ncur++) {
-- struct stat st;
--
-- snprintf(ll->name, sizeof(ll->name),
-- "%s/%s", dirname, ll->names[ll->ncur]->d_name);
-- free(ll->names[ll->ncur]);
-- ret = stat(ll->name, &st);
--
-- if (ret == 0 && S_ISBLK(st.st_mode) &&
-- major(st.st_rdev) == LOOPMAJOR &&
-- minor(st.st_rdev) >= NLOOPS_DEFAULT) {
-- ll->ct_succ++;
-- fd = open(ll->name, O_RDONLY);
--
-- if (fd != -1) {
-- if (looplist_is_wanted(ll, fd))
-- return fd;
-- close(fd);
-- } else if (errno == EACCES)
-- ll->ct_perm++;
-+ /*
-+ * If someone puts a gpg key file at beginning of device and
-+ * puts the real file system at some offset into the device,
-+ * this code extracts that gpg key file into a temp file so gpg
-+ * won't end up reading whole device when decrypting the key file.
-+ *
-+ * Example of encrypted cdrom mount with 8192 bytes reserved for gpg key file:
-+ * mount -t iso9660 /dev/cdrom /cdrom -o loop=/dev/loop0,encryption=AES128,gpgkey=/dev/cdrom,offset=8192
-+ * ^^^^^^^^^^ ^^^^^^^^^^ ^^^^
-+ */
-+ if(loopOffsetBytes && are_these_files_same(loopFileName, gpgKeyFile)) {
-+ FILE *f;
-+ char b[1024];
-+ long long cnt;
-+ int cnt2, cnt3;
-+
-+ cnt = mystrtoull(loopOffsetBytes, 1);
-+ if(cnt < 0) cnt = -cnt;
-+ if(cnt > (1024 * 1024)) cnt = 1024 * 1024; /* sanity check */
-+ f = tmpfile();
-+ if(!f) {
-+ fprintf(stderr, _("Error: unable to create temp file\n"));
-+ close(x);
-+ goto nomem3;
-+ }
-+ while(cnt > 0) {
-+ cnt2 = sizeof(b);
-+ if(cnt < cnt2) cnt2 = cnt;
-+ cnt3 = rd_wr_retry(x, b, cnt2, 0);
-+ if(cnt3 && (fwrite(b, cnt3, 1, f) != 1)) {
-+ tmpWrErr:
-+ fprintf(stderr, _("Error: unable to write to temp file\n"));
-+ fclose(f);
-+ close(x);
-+ goto nomem3;
-+ }
-+ if(cnt2 != cnt3) break;
-+ cnt -= cnt3;
-+ }
-+ if(fflush(f)) goto tmpWrErr;
-+ close(x);
-+ x = dup(fileno(f));
-+ fclose(f);
-+ lseek(x, 0L, SEEK_SET);
-+ }
-+
-+ sprintf(str, "%d", pfdi[0]);
-+ if(!(gpid = fork())) {
-+ dup2(x, 0);
-+ dup2(pfdo[1], 1);
-+ close(x);
-+ close(pfdi[1]);
-+ close(pfdo[0]);
-+ close(pfdo[1]);
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ x = 0;
-+ a[x++] = "gpg";
-+ if(gpgHomeDir && gpgHomeDir[0]) {
-+ a[x++] = "--homedir";
-+ a[x++] = gpgHomeDir;
-+ }
-+ a[x++] = "--no-options";
-+ a[x++] = "--quiet";
-+ a[x++] = "--batch";
-+ a[x++] = "--no-tty";
-+ a[x++] = "--passphrase-fd";
-+ a[x++] = str;
-+ a[x++] = "--decrypt";
-+ a[x] = 0;
-+ if(setgid(getgid())) exit(1);
-+ if(setuid(getuid())) exit(1);
-+ for(x = 3; x < 1024; x++) {
-+ if(x == pfdi[0]) continue;
-+ close(x);
-+ }
-+ execve("/bin/gpg", &a[0], &e[0]);
-+ execve("/usr/bin/gpg", &a[0], &e[0]);
-+ execve("/usr/local/bin/gpg", &a[0], &e[0]);
-+ exit(1);
-+ }
-+ free(e[0]);
-+ close(x);
-+ close(pfdi[0]);
-+ close(pfdo[1]);
-+ if(gpid == -1) {
-+ close(pfdi[1]);
-+ close(pfdo[0]);
-+ goto nomem1;
-+ }
-+
-+ x = strlen(pass);
-+
-+ /* ignore possible SIGPIPE signal while writing to gpg */
-+ oldSigPipeHandler = signal(SIGPIPE, SIG_IGN);
-+ rd_wr_retry(pfdi[1], pass, x, 1);
-+ rd_wr_retry(pfdi[1], "\n", 1, 1);
-+ if(oldSigPipeHandler != SIG_ERR) signal(SIGPIPE, oldSigPipeHandler);
-+
-+ close(pfdi[1]);
-+ memset(pass, 0, x);
-+ x = 0;
-+ while(x < 66) {
-+ multiKeyPass[x] = get_FD_pass(pfdo[0]);
-+ if(!multiKeyPass[x]) {
-+ /* mem alloc failed - abort */
-+ multiKeyPass[0] = 0;
-+ break;
- }
-+ if(strlen(multiKeyPass[x]) < LOOP_PASSWORD_MIN_LENGTH) break;
-+ x++;
- }
--done:
-- looplist_close(ll);
-- return -1;
-+ warnAboutBadKeyData(x);
-+ if(x >= 65)
-+ multiKeyMode = 65;
-+ if(x == 64)
-+ multiKeyMode = 64;
-+ close(pfdo[0]);
-+ waitpid(gpid, &x, 0);
-+ if(!multiKeyPass[0]) goto nomem1;
-+ return multiKeyPass[0];
- }
-
--#ifdef MAIN
--
--static int
--show_loop_fd(int fd, char *device) {
-- struct loop_info loopinfo;
-- struct loop_info64 loopinfo64;
-- int errsv;
--
-- if (ioctl(fd, LOOP_GET_STATUS64, &loopinfo64) == 0) {
--
-- loopinfo64.lo_file_name[LO_NAME_SIZE-2] = '*';
-- loopinfo64.lo_file_name[LO_NAME_SIZE-1] = 0;
-- loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0;
--
-- printf("%s: [%04" PRIx64 "]:%" PRIu64 " (%s)",
-- device, loopinfo64.lo_device, loopinfo64.lo_inode,
-- loopinfo64.lo_file_name);
--
-- if (loopinfo64.lo_offset)
-- printf(_(", offset %" PRIu64 ), loopinfo64.lo_offset);
--
-- if (loopinfo64.lo_sizelimit)
-- printf(_(", sizelimit %" PRIu64 ), loopinfo64.lo_sizelimit);
--
-- if (loopinfo64.lo_encrypt_type ||
-- loopinfo64.lo_crypt_name[0]) {
-- char *e = (char *)loopinfo64.lo_crypt_name;
-+static char *sGetPass(int minLen, int warnLen)
-+{
-+ char *p, *s, *seed;
-+ int i, ask2, close_i_fd = 0;
-
-- if (*e == 0 && loopinfo64.lo_encrypt_type == 1)
-- e = "XOR";
-- printf(_(", encryption %s (type %" PRIu32 ")"),
-- e, loopinfo64.lo_encrypt_type);
-+ if(!passFDnumber) {
-+ if(clearTextKeyFile) {
-+ if((i = open(clearTextKeyFile, O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open %s for reading\n"), clearTextKeyFile);
-+ return NULL;
-+ }
-+ close_i_fd = 1;
-+ goto contReadFrom_i;
- }
-- printf("\n");
-- return 0;
-+ p = getpass(_("Password: "));
-+ ask2 = passAskTwice ? 1 : 0;
-+ } else {
-+ i = atoi(passFDnumber);
-+ contReadFrom_i:
-+ if(gpgKeyFile && gpgKeyFile[0]) {
-+ p = get_FD_pass(i);
-+ if(close_i_fd) close(i);
-+ } else {
-+ int x = 0;
-+ while(x < 66) {
-+ multiKeyPass[x] = get_FD_pass(i);
-+ if(!multiKeyPass[x]) goto nomem;
-+ if(strlen(multiKeyPass[x]) < LOOP_PASSWORD_MIN_LENGTH) break;
-+ x++;
-+ }
-+ if(close_i_fd) close(i);
-+ warnAboutBadKeyData(x);
-+ if(x >= 65) {
-+ multiKeyMode = 65;
-+ return multiKeyPass[0];
-+ }
-+ if(x == 64) {
-+ multiKeyMode = 64;
-+ return multiKeyPass[0];
-+ }
-+ p = multiKeyPass[0];
-+ }
-+ ask2 = 0;
- }
--
-- if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) {
-- printf ("%s: [%04x]:%ld (%s)",
-- device, (unsigned int)loopinfo.lo_device, loopinfo.lo_inode,
-- loopinfo.lo_name);
--
-- 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");
-- return 0;
-+ if(!p) goto nomem;
-+ if(gpgKeyFile && gpgKeyFile[0]) {
-+ if(ask2) {
-+ i = strlen(p);
-+ s = malloc(i + 1);
-+ if(!s) goto nomem;
-+ strcpy(s, p);
-+ p = getpass(_("Retype password: "));
-+ if(!p) goto nomem;
-+ if(strcmp(s, p)) goto compareErr;
-+ memset(s, 0, i);
-+ free(s);
-+ ask2 = 0;
-+ }
-+ p = do_GPG_pipe(p);
-+ if(!p) return(NULL);
-+ if(!p[0]) {
-+ fprintf(stderr, _("Error: gpg key file decryption failed\n"));
-+ return(NULL);
-+ }
-+ if(multiKeyMode) return(p);
- }
--
-- errsv = errno;
-- fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
-- device, strerror (errsv));
-- return 1;
-+ i = strlen(p);
-+ if(i < minLen) {
-+ fprintf(stderr, _("Error: Password must be at least %d characters.\n"), minLen);
-+ return(NULL);
-+ }
-+ seed = passSeedString;
-+ if(!seed) seed = "";
-+ s = malloc(i + strlen(seed) + 1);
-+ if(!s) {
-+ nomem:
-+ fprintf(stderr, _("Error: Unable to allocate memory\n"));
-+ return(NULL);
-+ }
-+ strcpy(s, p);
-+ memset(p, 0, i);
-+ if(ask2) {
-+ p = getpass(_("Retype password: "));
-+ if(!p) goto nomem;
-+ if(strcmp(s, p)) {
-+ compareErr:
-+ fprintf(stderr, _("Error: Passwords are not identical\n"));
-+ 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);
-+ }
-+ strcat(s, seed);
-+ return(s);
- }
-
--static int
--show_loop(char *device) {
-- int ret, fd;
-+/* 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;
-
-- if ((fd = open(device, O_RDONLY)) < 0) {
-- int errsv = errno;
-- fprintf(stderr, _("loop: can't open device %s: %s\n"),
-- device, strerror (errsv));
-- return 2;
-+ memset(keyBuf, 0, bufSize);
-+ kp = keyStr;
-+ for(x = 0; x < (bufSize * 8); x += 6) {
-+ y = *kp++;
-+ if(--cnt <= 0) {
-+ kp = keyStr;
-+ cnt = ile;
-+ }
-+ if((y >= '0') && (y <= '9')) y -= '0';
-+ else if((y >= 'A') && (y <= 'Z')) y -= ('A' - 10);
-+ else if((y >= 'a') && (y <= 'z')) y -= ('a' - 36);
-+ else if((y == '.') || (y == '/')) y += (62 - '.');
-+ else y &= 63;
-+ z = x >> 3;
-+ if(z < bufSize) {
-+ keyBuf[z] |= y << (x & 7);
-+ }
-+ z++;
-+ if(z < bufSize) {
-+ keyBuf[z] |= y >> (8 - (x & 7));
-+ }
- }
-- ret = show_loop_fd(fd, device);
-- close(fd);
-- return ret;
- }
-
-+/* this is for compatibility with mainline mount */
-+static void unhashed2_key_setup(unsigned char *keyStr, int ile, unsigned char *keyBuf, int bufSize)
-+{
-+ memset(keyBuf, 0, bufSize);
-+ strncpy((char *)keyBuf, (char *)keyStr, bufSize - 1);
-+ keyBuf[bufSize - 1] = 0;
-+}
-
--static int
--show_used_loop_devices (void) {
-- struct looplist ll;
-- int fd;
-+static void rmd160HashTwiceWithA(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ char tmpBuf[20 + 20];
-+ char pwdCopy[130];
-
-- if (looplist_open(&ll, LLFLG_USEDONLY) == -1) {
-- error(_("%s: /dev directory does not exist."), progname);
-- return 1;
-- }
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 40) ole = 40;
-+ rmd160_hash_buffer(&tmpBuf[0], (char *)ib, ile);
-+ pwdCopy[0] = 'A';
-+ if(ile > sizeof(pwdCopy) - 1) ile = sizeof(pwdCopy) - 1;
-+ memcpy(pwdCopy + 1, ib, ile);
-+ rmd160_hash_buffer(&tmpBuf[20], pwdCopy, ile + 1);
-+ memcpy(ob, tmpBuf, ole);
-+ memset(tmpBuf, 0, sizeof(tmpBuf));
-+ memset(pwdCopy, 0, sizeof(pwdCopy));
-+}
-
-- while((fd = looplist_next(&ll)) != -1) {
-- show_loop_fd(fd, ll.name);
-- close(fd);
-- }
-- looplist_close(&ll);
-+extern long long llseek(int, long long, int);
-
-- if (ll.ct_succ && ll.ct_perm) {
-- error(_("%s: no permission to look at /dev/loop#"), progname);
-- return 1;
-+static long long xx_lseek(int fd, long long offset, int whence)
-+{
-+ if(sizeof(off_t) >= 8) {
-+ return lseek(fd, offset, whence);
-+ } else {
-+ return llseek(fd, offset, whence);
- }
-- return 0;
- }
-
--/* list all associated loop devices */
--static int
--show_associated_loop_devices(char *filename, unsigned long long offset, int isoff)
-+static int loop_create_random_keys(char *partition, long long offset, long long sizelimit, int loopro, unsigned char *k)
- {
-- struct looplist ll;
-- struct stat filestat;
-- int fd;
-+ int x, y, fd;
-+ sha512_context s;
-+ unsigned char b[4096];
-
-- if (stat(filename, &filestat) == -1) {
-- perror(filename);
-+ if(loopro) {
-+ fprintf(stderr, _("Error: read-only device %s\n"), partition);
- return 1;
- }
-
-- if (looplist_open(&ll, LLFLG_USEDONLY) == -1) {
-- error(_("%s: /dev directory does not exist."), progname);
-+ /*
-+ * Compute SHA-512 over first 40 KB of old fs data. SHA-512 hash
-+ * output is then used as entropy for new fs encryption key.
-+ */
-+ if((fd = open(partition, O_RDWR)) == -1) {
-+ seekFailed:
-+ fprintf(stderr, _("Error: unable to open/seek device %s\n"), partition);
- return 1;
- }
--
-- while((fd = looplist_next(&ll)) != -1) {
-- if (is_associated(fd, &filestat, offset, isoff) == 1)
-- show_loop_fd(fd, ll.name);
-+ if(offset < 0) offset = -offset;
-+ if(xx_lseek(fd, offset, SEEK_SET) == -1) {
- close(fd);
-+ goto seekFailed;
- }
-- looplist_close(&ll);
--
-- return 0;
--}
--
--#endif /* MAIN */
--
--/* check if the loopfile is already associated with the same given
-- * parameters.
-- *
-- * returns: -1 error
-- * 0 unused
-- * 1 loop device already used
-- */
--static int
--is_associated(int dev, struct stat *file, unsigned long long offset, int isoff)
--{
-- struct loop_info64 linfo64;
-- struct loop_info64 linfo;
-- int ret = 0;
--
-- if (ioctl(dev, LOOP_GET_STATUS64, &linfo64) == 0) {
-- if (file->st_dev == linfo64.lo_device &&
-- file->st_ino == linfo64.lo_inode &&
-- (isoff == 0 || offset == linfo64.lo_offset))
-- ret = 1;
-- return ret;
-- }
-- if (ioctl(dev, LOOP_GET_STATUS, &linfo) == 0) {
-- if (file->st_dev == linfo.lo_device &&
-- file->st_ino == linfo.lo_inode &&
-- (isoff == 0 || offset == linfo.lo_offset))
-- ret = 1;
-- return ret;
-- }
--
-- return errno == ENXIO ? 0 : -1;
--}
--
--/* check if the loop file is already used with the same given
-- * parameters. We check for device no, inode and offset.
-- * returns: associated devname or NULL
-- */
--char *
--loopfile_used (const char *filename, unsigned long long offset) {
-- struct looplist ll;
-- char *devname = NULL;
-- struct stat filestat;
-- int fd;
--
-- if (stat(filename, &filestat) == -1) {
-- perror(filename);
-- return NULL;
-+ sha512_init(&s);
-+ for(x = 1; x <= 10; x++) {
-+ if((sizelimit > 0) && ((sizeof(b) * x) > sizelimit)) break;
-+ if(rd_wr_retry(fd, &b[0], sizeof(b), 0) != sizeof(b)) break;
-+ sha512_write(&s, &b[0], sizeof(b));
- }
-+ sha512_final(&s);
-
-- if (looplist_open(&ll, LLFLG_USEDONLY) == -1) {
-- error(_("%s: /dev directory does not exist."), progname);
-- return NULL;
-- }
--
-- while((fd = looplist_next(&ll)) != -1) {
-- int res = is_associated(fd, &filestat, offset, 1);
-- close(fd);
-- if (res == 1) {
-- devname = xstrdup(ll.name);
-- break;
-+ /*
-+ * Overwrite 40 KB of old fs data 20 times so that recovering
-+ * SHA-512 output beyond this point is difficult and expensive.
-+ */
-+ for(y = 0; y < 20; y++) {
-+ int z;
-+ struct {
-+ struct timeval tv;
-+ unsigned char h[64];
-+ int x,y,z;
-+ } j;
-+ if(xx_lseek(fd, offset, SEEK_SET) == -1) break;
-+ memcpy(&j.h[0], &s.sha_out[0], 64);
-+ gettimeofday(&j.tv, NULL);
-+ j.y = y;
-+ for(x = 1; x <= 10; x++) {
-+ j.x = x;
-+ for(z = 0; z < sizeof(b); z += 64) {
-+ j.z = z;
-+ sha512_hash_buffer((unsigned char *)&j, sizeof(j), &b[z], 64);
-+ }
-+ if((sizelimit > 0) && ((sizeof(b) * x) > sizelimit)) break;
-+ if(rd_wr_retry(fd, &b[0], sizeof(b), 1) != sizeof(b)) break;
- }
-+ memset(&j, 0, sizeof(j));
-+ if(fsync(fd)) break;
- }
-- looplist_close(&ll);
--
-- return devname;
--}
--
--int
--loopfile_used_with(char *devname, const char *filename, unsigned long long offset)
--{
-- struct stat statbuf;
-- int fd, ret;
-+ close(fd);
-
-- if (!is_loop_device(devname))
-- return 0;
-+ /*
-+ * Use all 512 bits of hash output
-+ */
-+ memcpy(&b[0], &s.sha_out[0], 64);
-+ memset(&s, 0, sizeof(s));
-
-- if (stat(filename, &statbuf) == -1) {
-- perror(filename);
-- return -1;
-+ /*
-+ * Read 32 bytes of random entropy from kernel's random
-+ * number generator. This code may be executed early on startup
-+ * scripts and amount of random entropy may be non-existent.
-+ * SHA-512 of old fs data is used as workaround for missing
-+ * entropy in kernel's random number generator.
-+ */
-+ if((fd = open("/dev/urandom", O_RDONLY)) == -1) {
-+ fprintf(stderr, _("Error: unable to open /dev/urandom\n"));
-+ return 1;
- }
-+ rd_wr_retry(fd, &b[64], 32, 0);
-
-- fd = open(devname, O_RDONLY);
-- if (fd == -1) {
-- perror(devname);
-- return -1;
-+ /* generate multi-key hashes */
-+ x = 0;
-+ while(x < 65) {
-+ rd_wr_retry(fd, &b[64+32], 16, 0);
-+ sha512_hash_buffer(&b[0], 64+32+16, k, 32);
-+ k += 32;
-+ x++;
- }
-- ret = is_associated(fd, &statbuf, offset, 1);
-
- close(fd);
-- return ret;
-+ memset(&b[0], 0, sizeof(b));
-+ return 0;
- }
-
--char *
--find_unused_loop_device (void) {
-- struct looplist ll;
-- char *devname = NULL;
-- int fd;
-+#if !defined(MAIN)
-+static int loop_fork_mkfs_command(char *device, char *fstype)
-+{
-+ int x, y = 0;
-+ char *a[10], *e[1];
-
-- if (looplist_open(&ll, LLFLG_FREEONLY) == -1) {
-- error(_("%s: /dev directory does not exist."), progname);
-- return NULL;
-+ sync();
-+ if(!(x = fork())) {
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 0);
-+ dup2(x, 1);
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ x = 0;
-+ a[x++] = "mkfs";
-+ a[x++] = "-t";
-+ a[x++] = fstype;
-+ /* mkfs.reiserfs and mkfs.xfs need -f option */
-+ if(!strcmp(fstype, "reiserfs") || !strcmp(fstype, "xfs")) {
-+ a[x++] = "-f";
-+ }
-+ a[x++] = device;
-+ a[x] = 0;
-+ e[0] = 0;
-+ if(setgid(getgid())) exit(1);
-+ if(setuid(getuid())) exit(1);
-+ for(x = 3; x < 1024; x++) {
-+ close(x);
-+ }
-+ execve("/sbin/mkfs", &a[0], &e[0]);
-+ exit(1);
- }
--
-- if ((fd = looplist_next(&ll)) != -1) {
-- close(fd);
-- devname = xstrdup(ll.name);
-+ if(x == -1) {
-+ fprintf(stderr, _("Error: fork failed\n"));
-+ return 1;
- }
-- looplist_close(&ll);
-- if (devname)
-- return devname;
--
-- if (ll.ct_succ && ll.ct_perm)
-- error(_("%s: no permission to look at /dev/loop#"), progname);
-- else if (ll.ct_succ)
-- error(_("%s: could not find any free loop device"), progname);
-- else
-- error(_(
-- "%s: Could not find any loop device. Maybe this kernel "
-- "does not know\n"
-- " about the loop device? (If so, recompile or "
-- "`modprobe loop'.)"), progname);
-- return NULL;
--}
--
--/*
-- * A function to read the passphrase either from the terminal or from
-- * an open file descriptor.
-- */
--static char *
--xgetpass(int pfd, const char *prompt) {
-- char *pass;
-- int buflen, i;
--
-- if (pfd < 0) /* terminal */
-- return getpass(prompt);
--
-- pass = NULL;
-- buflen = 0;
-- for (i=0; ; i++) {
-- if (i >= buflen-1) {
-- /* we're running out of space in the buffer.
-- * Make it bigger: */
-- char *tmppass = pass;
-- buflen += 128;
-- pass = realloc(tmppass, buflen);
-- if (pass == NULL) {
-- /* realloc failed. Stop reading. */
-- 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)
-- break;
-+ waitpid(x, &y, 0);
-+ sync();
-+ if(!WIFEXITED(y) || (WEXITSTATUS(y) != 0)) {
-+ fprintf(stderr, _("Error: encrypted file system mkfs failed\n"));
-+ return 1;
- }
--
-- if (pass == NULL)
-- return "";
--
-- pass[i] = 0;
-- return pass;
--}
--
--static int
--digits_only(const char *s) {
-- while (*s)
-- if (!isdigit(*s++))
-- return 0;
-- return 1;
-+ return 0;
- }
-+#endif
-
- int
--set_loop(const char *device, const char *file, unsigned long long offset,
-- unsigned long long sizelimit, const char *encryption, int pfd, int *options) {
-- struct loop_info64 loopinfo64;
-- int fd, ffd, mode, i;
-- char *pass;
-- char *filename;
--
-- if (verbose) {
-- char *xdev = loopfile_used(file, offset);
--
-- if (xdev) {
-- printf(_("warning: %s is already associated with %s\n"),
-- file, xdev);
-- free(xdev);
-- }
-- }
--
-- mode = (*options & SETLOOP_RDONLY) ? O_RDONLY : O_RDWR;
-+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, 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 (!(*options & SETLOOP_RDONLY) && errno == EROFS)
-+ if (!*loopro && errno == EROFS)
- ffd = open(file, mode = O_RDONLY);
- if (ffd < 0) {
- perror(file);
- return 1;
- }
-- *options |= SETLOOP_RDONLY;
- }
- if ((fd = open(device, mode)) < 0) {
- perror (device);
-- close(ffd);
-- return 1;
-+ goto close_ffd_return1;
- }
-- memset(&loopinfo64, 0, sizeof(loopinfo64));
-+ *loopro = (mode == O_RDONLY);
-
-- if (!(filename = canonicalize(file)))
-- filename = (char *) file;
-- xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE);
--
-- if (encryption && *encryption) {
-- if (digits_only(encryption)) {
-- loopinfo64.lo_encrypt_type = atoi(encryption);
-- } else {
-- loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI;
-- snprintf((char *)loopinfo64.lo_crypt_name, LO_NAME_SIZE,
-- "%s", encryption);
-- }
-+ if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-+ if(errno == EBUSY)
-+ errRetVal = busyRetVal;
-+ if((errRetVal != 2) || verbose)
-+ perror("ioctl: LOOP_SET_FD");
-+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);
-+close_ffd_return1:
-+ close (ffd);
-+ return errRetVal;
- }
-
-- loopinfo64.lo_offset = offset;
-- loopinfo64.lo_sizelimit = sizelimit;
-+ memset (&loopinfo, 0, sizeof (loopinfo));
-+ xstrncpy ((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-+ if (loopEncryptionType)
-+ loopinfo.lo_encrypt_type = loop_crypt_type (loopEncryptionType, &loopinfo.lo_encrypt_key_size, &apiName);
-+ if (loopOffsetBytes)
-+ 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(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-- perror("memlock");
-- fprintf(stderr, _("Couldn't lock into memory, exiting.\n"));
-- exit(1);
-- }
-+
-+ if(loopinfo.lo_encrypt_type && mlockall(MCL_CURRENT | MCL_FUTURE)) {
-+ perror("memlock");
-+ ioctl (fd, LOOP_CLR_FD, 0);
-+ fprintf(stderr, _("Couldn't lock into memory, exiting.\n"));
-+ exit(1);
- }
- #endif
-
-- switch (loopinfo64.lo_encrypt_type) {
-+ switch (loopinfo.lo_encrypt_type) {
- case LO_CRYPT_NONE:
-- loopinfo64.lo_encrypt_key_size = 0;
-+ loopinfo.lo_encrypt_key_size = 0;
- break;
- case LO_CRYPT_XOR:
-- pass = getpass(_("Password: "));
-- goto gotpass;
-+ pass = sGetPass (1, 0);
-+ if(!pass) goto loop_clr_fd_out;
-+ xstrncpy ((char *)loopinfo.lo_encrypt_key, pass, LO_KEY_SIZE);
-+ loopinfo.lo_encrypt_key_size = strlen((char*)loopinfo.lo_encrypt_key);
-+ break;
-+ case 3: /* LO_CRYPT_FISH2 */
-+ case 4: /* LO_CRYPT_BLOW */
-+ case 7: /* LO_CRYPT_SERPENT */
-+ case 8: /* LO_CRYPT_MARS */
-+ case 11: /* LO_CRYPT_RC6 */
-+ case 12: /* LO_CRYPT_DES_EDE3 */
-+ case 16: /* LO_CRYPT_AES */
-+ case 18: /* LO_CRYPT_CRYPTOAPI */
-+ /* set default hash function */
-+ hashFunc = sha256_hash_buffer;
-+ if(loopinfo.lo_encrypt_key_size == 24) hashFunc = sha384_hash_buffer;
-+ if(loopinfo.lo_encrypt_key_size == 32) hashFunc = sha512_hash_buffer;
-+ /* possibly override default hash function */
-+ if(passHashFuncName) {
-+ if(!strcasecmp(passHashFuncName, "sha256")) {
-+ hashFunc = sha256_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "sha384")) {
-+ hashFunc = sha384_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "sha512")) {
-+ hashFunc = sha512_hash_buffer;
-+ } else if(!strcasecmp(passHashFuncName, "rmd160")) {
-+ hashFunc = rmd160HashTwiceWithA;
-+ minPassLen = 1;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed1")) {
-+ hashFunc = unhashed1_key_setup;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed2")) {
-+ hashFunc = unhashed2_key_setup;
-+ minPassLen = 1;
-+ } else if(!strcasecmp(passHashFuncName, "unhashed3") && passFDnumber && !gpgKeyFile) {
-+ /* unhashed3 hash type reads binary key from file descriptor. */
-+ /* This is not compatible with gpgkey= mount option */
-+ if(rd_wr_retry(atoi(passFDnumber), (char *)&loopinfo.lo_encrypt_key[0], LO_KEY_SIZE, 0) < 1) {
-+ fprintf(stderr, _("Error: couldn't read binary key\n"));
-+ goto loop_clr_fd_out;
-+ }
-+ break; /* out of switch(loopinfo.lo_encrypt_type) */
-+ } else if(!strncasecmp(passHashFuncName, "random", 6) && ((passHashFuncName[6] == 0) || (passHashFuncName[6] == '/'))) {
-+ /* random hash type sets up 65 random keys */
-+ /* WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING */
-+ /* IMPORTANT DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA. */
-+ if(loop_create_random_keys((char*)file, loopinfo.lo_offset, loopinfo.lo_sizelimit, *loopro, &multiKeyBits[0][0])) {
-+ goto loop_clr_fd_out;
-+ }
-+ memcpy(&loopinfo.lo_encrypt_key[0], &multiKeyBits[0][0], sizeof(loopinfo.lo_encrypt_key));
-+ run_mkfs_command = multiKeyMode = 1000;
-+ break; /* out of switch(loopinfo.lo_encrypt_type) */
-+ }
-+ }
-+ pass = sGetPass (minPassLen, LOOP_PASSWORD_MIN_LENGTH);
-+ if(!pass) goto loop_clr_fd_out;
-+ i = strlen(pass);
-+ if(hashFunc == unhashed1_key_setup) {
-+ /* this is for compatibility with historic loop-AES version */
-+ loopinfo.lo_encrypt_key_size = 16; /* 128 bits */
-+ if(i >= 32) loopinfo.lo_encrypt_key_size = 24; /* 192 bits */
-+ if(i >= 43) loopinfo.lo_encrypt_key_size = 32; /* 256 bits */
-+ }
-+ (*hashFunc)((unsigned char *)pass, i, &loopinfo.lo_encrypt_key[0], sizeof(loopinfo.lo_encrypt_key));
-+ if(multiKeyMode) {
-+ int r = 0, t;
-+ while(r < multiKeyMode) {
-+ t = strlen(multiKeyPass[r]);
-+ (*hashFunc)((unsigned char *)multiKeyPass[r], t, &multiKeyBits[r][0], 32);
-+ memset(multiKeyPass[r], 0, t);
-+ /*
-+ * MultiKeyMode uses md5 IV. One key mode uses sector IV. Sector IV
-+ * and md5 IV v2 and v3 are all computed differently. This first key
-+ * byte XOR with 0x55/0xF4 is needed to cause complete decrypt failure
-+ * in cases where data is encrypted with one type of IV and decrypted
-+ * with another type IV. If identical key was used but only IV was
-+ * computed differently, only first plaintext block of 512 byte CBC
-+ * chain would decrypt incorrectly and rest would decrypt correctly.
-+ * Partially correct decryption is dangerous. Decrypting all blocks
-+ * incorrectly is safer because file system mount will simply fail.
-+ */
-+ if(multiKeyMode == 65) {
-+ multiKeyBits[r][0] ^= 0xF4; /* version 3 */
-+ } else {
-+ multiKeyBits[r][0] ^= 0x55; /* version 2 */
-+ }
-+ r++;
-+ }
-+ } else if(passIterThousands) {
-+ aes_context ctx;
-+ unsigned long iter = 0;
-+ unsigned char tempkey[32];
-+ /*
-+ * Set up AES-256 encryption key using same password and hash function
-+ * as before but with password bit 0 flipped before hashing. That key
-+ * is then used to encrypt actual loop key 'itercountk' thousand times.
-+ */
-+ pass[0] ^= 1;
-+ (*hashFunc)((unsigned char *)pass, i, &tempkey[0], 32);
-+ aes_set_key(&ctx, &tempkey[0], 32, 0);
-+ sscanf(passIterThousands, "%lu", &iter);
-+ iter *= 1000;
-+ while(iter > 0) {
-+ /* encrypt both 128bit blocks with AES-256 */
-+ aes_encrypt(&ctx, &loopinfo.lo_encrypt_key[ 0], &loopinfo.lo_encrypt_key[ 0]);
-+ aes_encrypt(&ctx, &loopinfo.lo_encrypt_key[16], &loopinfo.lo_encrypt_key[16]);
-+ /* exchange upper half of first block with lower half of second block */
-+ memcpy(&tempkey[0], &loopinfo.lo_encrypt_key[8], 8);
-+ memcpy(&loopinfo.lo_encrypt_key[8], &loopinfo.lo_encrypt_key[16], 8);
-+ memcpy(&loopinfo.lo_encrypt_key[16], &tempkey[0], 8);
-+ iter--;
-+ }
-+ memset(&ctx, 0, sizeof(ctx));
-+ memset(&tempkey[0], 0, sizeof(tempkey));
-+ }
-+ memset(pass, 0, i); /* erase original password */
-+ break;
- default:
-- pass = xgetpass(pfd, _("Password: "));
-- gotpass:
-- memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE);
-- xstrncpy((char *)loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
-- memset(pass, 0, strlen(pass));
-- loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
-+ fprintf (stderr, _("Error: don't know how to get key for encryption system %d\n"), loopinfo.lo_encrypt_type);
-+ goto loop_clr_fd_out;
- }
-
-- if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-- int rc = 1;
--
-- if (errno == EBUSY) {
-- if (verbose)
-- printf(_("ioctl LOOP_SET_FD failed: %s\n"),
-- strerror(errno));
-- rc = 2;
-- } else
-- perror("ioctl: LOOP_SET_FD");
--
-- close(fd);
-- close(ffd);
-- if (file != filename)
-- free(filename);
-- return rc;
-+ if(loInitValue) {
-+ /* cipher modules are free to do whatever they want with this value */
-+ i = 0;
-+ sscanf(loInitValue, "%d", &i);
-+ loopinfo.lo_init[0] = i;
-+ }
-+
-+ /* type 18 == LO_CRYPT_CRYPTOAPI */
-+ if ((loopinfo.lo_encrypt_type == 18) || (loop_set_status64_ioctl(fd, &loopinfo) < 0)) {
-+ /* direct cipher interface failed - try CryptoAPI interface now */
-+ if(!apiName || (try_cryptoapi_loop_interface(fd, &loopinfo, apiName) < 0)) {
-+ fprintf(stderr, _("ioctl: LOOP_SET_STATUS: %s, requested cipher or key length (%d bits) not supported by kernel\n"), strerror(errno), loopinfo.lo_encrypt_key_size << 3);
-+ loop_clr_fd_out:
-+ (void) ioctl (fd, LOOP_CLR_FD, 0);
-+ goto keyclean_close_fd_ffd_return1;
-+ }
-+ }
-+ if(multiKeyMode >= 65) {
-+ if(ioctl(fd, LOOP_MULTI_KEY_SETUP_V3, &multiKeyBits[0][0]) < 0) {
-+ if(multiKeyMode == 1000) goto try_v2_setup;
-+ perror("ioctl: LOOP_MULTI_KEY_SETUP_V3");
-+ goto loop_clr_fd_out;
-+ }
-+ } else if(multiKeyMode == 64) {
-+ try_v2_setup:
-+ if((ioctl(fd, LOOP_MULTI_KEY_SETUP, &multiKeyBits[0][0]) < 0) && (multiKeyMode != 1000)) {
-+ perror("ioctl: LOOP_MULTI_KEY_SETUP");
-+ goto loop_clr_fd_out;
-+ }
- }
-- close (ffd);
--
-- if (*options & SETLOOP_AUTOCLEAR)
-- loopinfo64.lo_flags = LO_FLAGS_AUTOCLEAR;
-
-- i = ioctl(fd, LOOP_SET_STATUS64, &loopinfo64);
-- if (i) {
-- struct loop_info loopinfo;
-- int errsv = errno;
-+ memset(loopinfo.lo_encrypt_key, 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+ close (fd);
-+ close (ffd);
-
-- i = loop_info64_to_old(&loopinfo64, &loopinfo);
-- if (i) {
-- errno = errsv;
-- *options &= ~SETLOOP_AUTOCLEAR;
-- perror("ioctl: LOOP_SET_STATUS64");
-+#if !defined(MAIN)
-+ if(run_mkfs_command && fstype && *fstype && **fstype && (getuid() == 0)) {
-+ if(!loop_fork_mkfs_command((char *)device, (char *)(*fstype))) {
-+ /* !strncasecmp(passHashFuncName, "random", 6) test matched */
-+ /* This reads octal mode for newly created file system root */
-+ /* directory node from '-o phash=random/1777' mount option. */
-+ /* octal mode--^^^^ */
-+ sscanf(passHashFuncName + 6, "/%o", AutoChmodPtr);
- } else {
-- i = ioctl(fd, LOOP_SET_STATUS, &loopinfo);
-- if (i)
-- perror("ioctl: LOOP_SET_STATUS");
-- else if (*options & SETLOOP_AUTOCLEAR)
-- {
-- i = ioctl(fd, LOOP_GET_STATUS, &loopinfo);
-- if (i || !(loopinfo.lo_flags & LO_FLAGS_AUTOCLEAR))
-- *options &= ~SETLOOP_AUTOCLEAR;
-+ if((fd = open(device, mode)) >= 0) {
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ close(fd);
-+ return 1;
- }
- }
-- memset(&loopinfo, 0, sizeof(loopinfo));
-- }
-- else if (*options & SETLOOP_AUTOCLEAR)
-- {
-- i = ioctl(fd, LOOP_GET_STATUS64, &loopinfo64);
-- if (i || !(loopinfo64.lo_flags & LO_FLAGS_AUTOCLEAR))
-- *options &= ~SETLOOP_AUTOCLEAR;
- }
-- memset(&loopinfo64, 0, sizeof(loopinfo64));
--
--
-- if (i) {
-- ioctl (fd, LOOP_CLR_FD, 0);
-- close (fd);
-- if (file != filename)
-- free(filename);
-- return 1;
-- }
--
-- /*
-- * HACK: here we're leeking a file descriptor,
-- * but mount is a short-lived process anyway.
-- */
-- if (!(*options & SETLOOP_AUTOCLEAR))
-- close (fd);
-+#endif
-
- if (verbose > 1)
-- printf(_("set_loop(%s,%s,%llu,%llu): success\n"),
-- device, filename, offset, sizelimit);
-- if (file != filename)
-- free(filename);
-+ printf(_("set_loop(%s,%s): success\n"), device, file);
- return 0;
- }
-
--int
--del_loop (const char *device) {
-- int fd;
-+#ifdef MAIN
-
-- if ((fd = open (device, O_RDONLY)) < 0) {
-- int errsv = errno;
-- fprintf(stderr, _("loop: can't delete device %s: %s\n"),
-- device, strerror (errsv));
-- return 1;
-- }
-- if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
-- perror ("ioctl: LOOP_CLR_FD");
-- close(fd);
-- return 1;
-- }
-- close (fd);
-- if (verbose > 1)
-- printf(_("del_loop(%s): success\n"), device);
-- return 0;
--}
-+#include <getopt.h>
-+#include <stdarg.h>
-+
-+int verbose = 0;
-+static char *progname;
-
--#else /* no LOOP_SET_FD defined */
- static void
--mutter(void) {
-- fprintf(stderr,
-- _("This mount was compiled without loop support. "
-- "Please recompile.\n"));
-+usage(void) {
-+ 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);
-+ exit(1);
- }
-
--int
--set_loop(const char *device, const char *file, unsigned long long offset,
-- unsigned long long sizelimit, const char *encryption, int pfd, int *loopro,
-- int keysz, int hash_pass) {
-- mutter();
-- return 1;
-+void
-+show_all_loops(void)
-+{
-+ char dev[20];
-+ char *lfmt[] = { "/dev/loop%d", "/dev/loop/%d" };
-+ int i, j, fd, x;
-+ struct stat statbuf;
-+
-+ for(i = 0; i < 256; i++) {
-+ for(j = (sizeof(lfmt) / sizeof(lfmt[0])) - 1; j >= 0; j--) {
-+ sprintf(dev, lfmt[j], i);
-+ if(stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ fd = open(dev, O_RDONLY);
-+ if(fd >= 0) {
-+ x = is_unused_loop_device(fd);
-+ close(fd);
-+ if(x == 0) {
-+ show_loop(dev);
-+ j = 0;
-+ }
-+ }
-+ }
-+ }
-+ }
- }
-
- int
--del_loop (const char *device) {
-- mutter();
-- return 1;
--}
-+read_options_from_fstab(char *loopToFind, char **partitionPtr)
-+{
-+ FILE *f;
-+ struct mntent *m;
-+ int y, foundMatch = 0;
-+ char *opt, *fr1, *fr2;
-+ struct options {
-+ char *name; /* name of /etc/fstab option */
-+ char **dest; /* destination where it is written to */
-+ char *line; /* temp */
-+ };
-+ struct options tbl[] = {
-+ { "device/file name ", partitionPtr }, /* must be index 0 */
-+ { "loop=", &loopToFind }, /* must be index 1 */
-+ { "offset=", &loopOffsetBytes },
-+ { "sizelimit=", &loopSizeBytes },
-+ { "encryption=", &loopEncryptionType },
-+ { "pseed=", &passSeedString },
-+ { "phash=", &passHashFuncName },
-+ { "loinit=", &loInitValue },
-+ { "gpgkey=", &gpgKeyFile },
-+ { "gpghome=", &gpgHomeDir },
-+ { "cleartextkey=", &clearTextKeyFile },
-+ { "itercountk=", &passIterThousands },
-+ };
-+ struct options *p;
-
--char *
--find_unused_loop_device (void) {
-- mutter();
-- return 0;
-+ if (!(f = setmntent("/etc/fstab", "r"))) {
-+ fprintf(stderr, _("Error: unable to open /etc/fstab for reading\n"));
-+ return 0;
-+ }
-+ while ((m = getmntent(f)) != NULL) {
-+ tbl[0].line = fr1 = xstrdup(m->mnt_fsname);
-+ p = &tbl[1];
-+ do {
-+ p->line = NULL;
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ opt = fr2 = xstrdup(m->mnt_opts);
-+ for (opt = strtok(opt, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ p = &tbl[1];
-+ do {
-+ y = strlen(p->name);
-+ if (!strncmp(opt, p->name, y))
-+ p->line = opt + y;
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ }
-+ if (tbl[1].line && !strcmp(loopToFind, tbl[1].line)) {
-+ if (++foundMatch > 1) {
-+ fprintf(stderr, _("Error: multiple loop=%s options found in /etc/fstab\n"), loopToFind);
-+ endmntent(f);
-+ return 0;
-+ }
-+ p = &tbl[0];
-+ do {
-+ if (!*p->dest && p->line) {
-+ *p->dest = p->line;
-+ if (verbose)
-+ printf(_("using %s%s from /etc/fstab\n"), p->name, p->line);
-+ }
-+ } while (++p < &tbl[sizeof(tbl) / sizeof(struct options)]);
-+ fr1 = fr2 = NULL;
-+ }
-+ if(fr1) free(fr1);
-+ if(fr2) free(fr2);
-+ }
-+ endmntent(f);
-+ if (foundMatch == 0) {
-+ fprintf(stderr, _("Error: loop=%s option not found in /etc/fstab\n"), loopToFind);
-+ }
-+ return foundMatch;
- }
-
--#endif /* !LOOP_SET_FD */
--
--#ifdef MAIN
--
--#ifdef LOOP_SET_FD
--
--#include <getopt.h>
--#include <stdarg.h>
-+int
-+recompute_loop_dev_size(char *device)
-+{
-+ int fd, err1 = 0, err2, err3;
-+ long long oldBytes = -1, newBytes = -1;
-
--static void
--usage(void) {
-- fprintf(stderr, _("\nUsage:\n"
-- " %1$s loop_device give info\n"
-- " %1$s -a | --all list all used\n"
-- " %1$s -d | --detach <loopdev> delete\n"
-- " %1$s -f | --find find unused\n"
-- " %1$s -j | --associated <file> [-o <num>] list all associated with <file>\n"
-- " %1$s [ options ] {-f|--find|loopdev} <file> setup\n"),
-- progname);
--
-- fprintf(stderr, _("\nOptions:\n"
-- " -e | --encryption <type> enable data encryption with specified <name/num>\n"
-- " -h | --help this help\n"
-- " -o | --offset <num> start at offset <num> into file\n"
-- " --sizelimit <num> loop limited to only <num> bytes of the file\n"
-- " -p | --pass-fd <num> read passphrase from file descriptor <num>\n"
-- " -r | --read-only setup read-only loop device\n"
-- " --show print device name (with -f <file>)\n"
-- " -v | --verbose verbose mode\n\n"));
-- exit(1);
-- }
-+ fd = open(device, O_RDONLY);
-+ if(fd < 0) {
-+ perror(device);
-+ return 1;
-+ }
-+ if(verbose) {
-+ err1 = ioctl(fd, BLKGETSIZE64, &oldBytes);
-+ }
-+ err2 = ioctl(fd, LOOP_RECOMPUTE_DEV_SIZE, 0);
-+ if(err2) {
-+ perror(device);
-+ goto done1;
-+ }
-+ if(verbose) {
-+ err3 = ioctl(fd, BLKGETSIZE64, &newBytes);
-+ if(!err1 && (oldBytes >= 0)) {
-+ printf("%s: old size %lld bytes\n", device, oldBytes);
-+ }
-+ if(!err3 && (newBytes >= 0)) {
-+ printf("%s: new size %lld bytes\n", device, newBytes);
-+ }
-+ }
-+done1:
-+ close(fd);
-+ return err2;
-+}
-
- int
- main(int argc, char **argv) {
-- char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
-- int delete, find, c, all;
-+ 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 ro = 0;
-- int pfd = -1;
-- unsigned long long off, slimit;
-- struct option longopts[] = {
-- { "all", 0, 0, 'a' },
-- { "detach", 0, 0, 'd' },
-- { "encryption", 1, 0, 'e' },
-- { "find", 0, 0, 'f' },
-- { "help", 0, 0, 'h' },
-- { "associated", 1, 0, 'j' },
-- { "offset", 1, 0, 'o' },
-- { "sizelimit", 1, 0, 128 },
-- { "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);
-
-- delete = find = all = 0;
-- off = 0;
-- slimit = 0;
-- assoc = offset = sizelimit = encryption = passfd = NULL;
--
-+ delete = 0;
- progname = argv[0];
-- if ((p = strrchr(progname, '/')) != NULL)
-- progname = p+1;
--
-- while ((c = getopt_long(argc, argv, "ade:E:fhj:o:p:rsv",
-- longopts, NULL)) != -1) {
-+ while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:P:rRs:S:Tv")) != -1) {
- switch (c) {
-- case 'a':
-- all = 1;
-+ case 'a': /* show status of all loops */
-+ option_a = 1;
- break;
-- case 'r':
-- ro = 1;
-+ case 'C':
-+ passIterThousands = optarg;
-+ setup_o = 1;
- break;
- case 'd':
- delete = 1;
- break;
-- case 'E':
- case 'e':
-- encryption = optarg;
-+ loopEncryptionType = optarg;
-+ setup_o = 1;
- break;
-- case 'f':
-- find = 1;
-+ case 'F': /* read loop related options from /etc/fstab */
-+ option_F = 1;
-+ setup_o = 1;
- break;
-- case 'j':
-- assoc = optarg;
-+ case 'G': /* GnuPG home dir */
-+ gpgHomeDir = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'H': /* passphrase hash function name */
-+ passHashFuncName = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'I': /* lo_init[0] value (in string form) */
-+ loInitValue = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'K': /* GnuPG key file name */
-+ gpgKeyFile = optarg;
-+ setup_o = 1;
- break;
- case 'o':
-- offset = optarg;
-+ loopOffsetBytes = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'p': /* read passphrase from given fd */
-+ passFDnumber = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'P': /* read passphrase from given file */
-+ clearTextKeyFile = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'r': /* read-only */
-+ ro = 1;
-+ setup_o = 1;
- break;
-- case 'p':
-- passfd = optarg;
-+ case 'R': /* recompute loop dev size */
-+ option_R = 1;
- break;
- case 's':
-- showdev = 1;
-+ loopSizeBytes = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'S': /* optional seed for passphrase */
-+ passSeedString = optarg;
-+ setup_o = 1;
-+ break;
-+ case 'T': /* ask passphrase _twice_ */
-+ passAskTwice = "T";
-+ setup_o = 1;
- break;
- case 'v':
-- verbose = 1;
-+ verbose++;
- break;
--
-- case 128: /* --sizelimit */
-- sizelimit = optarg;
-- break;
--
- default:
- usage();
- }
- }
--
-- 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();
-+ res = 0;
- } else if (delete) {
-- if (argc != optind+1 || encryption || offset || sizelimit ||
-- find || all || showdev || assoc || ro)
-- usage();
-- } else if (find) {
-- if (all || assoc || argc < optind || argc > optind+1)
-- usage();
-- } else if (all) {
-- if (argc > 2)
-- usage();
-- } else if (assoc) {
-- if (encryption || showdev || passfd || ro)
-- 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 {
-- if (argc < optind+1 || argc > optind+2)
-+ /* set up new loop */
-+ if ((argc < optind+1) || ((argc == optind+1) && !option_F) || (argc > optind+2))
- usage();
-- }
--
-- if (offset && sscanf(offset, "%llu", &off) != 1)
-- usage();
--
-- if (sizelimit && sscanf(sizelimit, "%llu", &slimit) != 1)
-- usage();
--
-- if (all)
-- return show_used_loop_devices();
-- else if (assoc)
-- return show_associated_loop_devices(assoc, off, offset ? 1 : 0);
-- else if (find) {
-- device = find_unused_loop_device();
-- if (device == NULL)
-- return -1;
-- if (argc == optind) {
-- if (verbose)
-- printf("Loop device is %s\n", device);
-- printf("%s\n", device);
-- return 0;
-- }
-- file = argv[optind];
-- } else {
-- device = argv[optind];
-- if (argc == optind+1)
-- file = NULL;
-- else
-- file = argv[optind+1];
-- }
--
-- if (delete)
-- res = del_loop(device);
-- else if (file == NULL)
-- res = show_loop(device);
-- else {
-- if (passfd && sscanf(passfd, "%d", &pfd) != 1)
-- usage();
-- do {
-- res = set_loop(device, file, off, slimit, encryption, pfd, &ro);
-- if (res == 2 && find) {
-- if (verbose)
-- printf("stolen loop=%s...trying again\n",
-- device);
-- free(device);
-- if (!(device = find_unused_loop_device()))
-- return -1;
-- }
-- } while (find && res == 2);
--
-- if (verbose && res == 0)
-- printf("Loop device is %s\n", device);
--
-- if (res == 0 && showdev && find)
-- printf("%s\n", device);
-+ if (argc > optind+1)
-+ 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, 1);
- }
- return res;
- }
--
--#else /* LOOP_SET_FD not defined */
--
--int
--main(int argc, char **argv) {
-- fprintf(stderr,
-- _("No loop support was available at compile time. "
-- "Please recompile.\n"));
-- return -1;
--}
--#endif /* !LOOP_SET_FD*/
--#endif /* MAIN */
-+#endif
-diff -urN util-linux-ng-2.14/mount/lomount.h util-linux-ng-2.14-AES/mount/lomount.h
---- util-linux-ng-2.14/mount/lomount.h 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/lomount.h 2008-06-24 16:55:13.000000000 +0300
-@@ -1,11 +1,19 @@
--extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
-- const char *, int, int *);
-+extern int verbose;
-+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 *);
- extern char * find_unused_loop_device(void);
-
--extern int loopfile_used_with(char *devname, const char *filename, unsigned long long offset);
--extern char *loopfile_used (const char *filename, unsigned long long offset);
--
--#define SETLOOP_RDONLY (1<<0) /* Open loop read-only */
--#define SETLOOP_AUTOCLEAR (1<<1) /* Automatically detach loop on close (2.6.25?) */
-+extern char *passFDnumber;
-+extern char *passAskTwice;
-+extern char *passSeedString;
-+extern char *passHashFuncName;
-+extern char *passIterThousands;
-+extern char *loInitValue;
-+extern char *gpgKeyFile;
-+extern char *gpgHomeDir;
-+extern char *clearTextKeyFile;
-+extern char *loopOffsetBytes;
-+extern char *loopSizeBytes;
-+extern char *loopEncryptionType;
-diff -urN util-linux-ng-2.14/mount/loop.c util-linux-ng-2.14-AES/mount/loop.c
---- util-linux-ng-2.14/mount/loop.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/loop.c 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,221 @@
-+/*
-+ * loop.c
-+ *
-+ * Copyright 2003 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU GPL
-+ */
-+
-+/* collection of loop helper functions used by losetup, mount and swapon */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#include "loop.h"
-+
-+static void convert_info_to_info64(struct loop_info *info, struct loop_info64 *info64)
-+{
-+ memset(info64, 0, sizeof(*info64));
-+ info64->lo_number = info->lo_number;
-+ info64->lo_device = info->lo_device;
-+ info64->lo_inode = info->lo_inode;
-+ info64->lo_rdevice = info->lo_rdevice;
-+ info64->lo_offset = info->lo_offset;
-+ info64->lo_encrypt_type = info->lo_encrypt_type;
-+ info64->lo_encrypt_key_size = info->lo_encrypt_key_size;
-+ info64->lo_flags = info->lo_flags;
-+ info64->lo_init[0] = info->lo_init[0];
-+ info64->lo_init[1] = info->lo_init[1];
-+ info64->lo_sizelimit = 0;
-+ if (info->lo_encrypt_type == 18) /* LO_CRYPT_CRYPTOAPI */
-+ memcpy(info64->lo_crypt_name, info->lo_name, sizeof(info64->lo_crypt_name));
-+ else
-+ memcpy(info64->lo_file_name, info->lo_name, sizeof(info64->lo_file_name));
-+ memcpy(info64->lo_encrypt_key, info->lo_encrypt_key, sizeof(info64->lo_encrypt_key));
-+}
-+
-+static int convert_info64_to_info(struct loop_info64 *info64, struct loop_info *info)
-+{
-+ memset(info, 0, sizeof(*info));
-+ info->lo_number = info64->lo_number;
-+ info->lo_device = info64->lo_device;
-+ info->lo_inode = info64->lo_inode;
-+ info->lo_rdevice = info64->lo_rdevice;
-+ info->lo_offset = info64->lo_offset;
-+ info->lo_encrypt_type = info64->lo_encrypt_type;
-+ info->lo_encrypt_key_size = info64->lo_encrypt_key_size;
-+ info->lo_flags = info64->lo_flags;
-+ info->lo_init[0] = info64->lo_init[0];
-+ info->lo_init[1] = info64->lo_init[1];
-+ if (info->lo_encrypt_type == 18) /* LO_CRYPT_CRYPTOAPI */
-+ memcpy(info->lo_name, info64->lo_crypt_name, sizeof(info->lo_name));
-+ else
-+ memcpy(info->lo_name, info64->lo_file_name, sizeof(info->lo_name));
-+ memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, sizeof(info->lo_encrypt_key));
-+
-+ /* error in case values were truncated */
-+ if (info->lo_device != info64->lo_device ||
-+ info->lo_rdevice != info64->lo_rdevice ||
-+ info->lo_inode != info64->lo_inode ||
-+ info->lo_offset != info64->lo_offset ||
-+ info64->lo_sizelimit) {
-+ errno = EOVERFLOW;
-+ return -1;
-+ }
-+ return 0;
-+}
-+
-+int loop_set_status64_ioctl(int fd, struct loop_info64 *info64)
-+{
-+ struct loop_info info;
-+ struct loop_info64 tmp;
-+ int r;
-+
-+ /*
-+ * This ugly work around is needed because some
-+ * Red Hat kernels are using same ioctl code:
-+ * #define LOOP_CHANGE_FD 0x4C04
-+ * vs.
-+ * #define LOOP_SET_STATUS64 0x4C04
-+ * that is used by modern loop driver.
-+ *
-+ * Attempt to detect presense of LOOP_GET_STATUS64
-+ * ioctl before issuing LOOP_SET_STATUS64 ioctl.
-+ * Red Hat kernels with above LOOP_CHANGE_FD damage
-+ * should return -1 and set errno to EINVAL.
-+ */
-+ r = ioctl(fd, LOOP_GET_STATUS64, &tmp);
-+ memset(&tmp, 0, sizeof(tmp));
-+ if ((r == 0) || (errno != EINVAL)) {
-+ r = ioctl(fd, LOOP_SET_STATUS64, info64);
-+ if (!r)
-+ return 0;
-+ }
-+ r = convert_info64_to_info(info64, &info);
-+ if (!r)
-+ r = ioctl(fd, LOOP_SET_STATUS, &info);
-+
-+ /* don't leave copies of encryption key on stack */
-+ memset(&info, 0, sizeof(info));
-+ return r;
-+}
-+
-+int loop_get_status64_ioctl(int fd, struct loop_info64 *info64)
-+{
-+ struct loop_info info;
-+ int r;
-+
-+ memset(info64, 0, sizeof(*info64));
-+ r = ioctl(fd, LOOP_GET_STATUS64, info64);
-+ if (!r)
-+ return 0;
-+ r = ioctl(fd, LOOP_GET_STATUS, &info);
-+ if (!r)
-+ convert_info_to_info64(&info, info64);
-+
-+ /* don't leave copies of encryption key on stack */
-+ memset(&info, 0, sizeof(info));
-+ return r;
-+}
-+
-+/* returns: 1=unused 0=busy */
-+int is_unused_loop_device(int fd)
-+{
-+ struct loop_info64 info64;
-+ struct loop_info info;
-+ int r;
-+
-+ r = ioctl(fd, LOOP_GET_STATUS64, &info64);
-+ memset(&info64, 0, sizeof(info64));
-+ if (!r)
-+ return 0;
-+ if (errno == ENXIO)
-+ return 1;
-+
-+ r = ioctl(fd, LOOP_GET_STATUS, &info);
-+ memset(&info, 0, sizeof(info));
-+ if (!r)
-+ return 0;
-+ if (errno == ENXIO)
-+ return 1;
-+ if (errno == EOVERFLOW)
-+ return 0;
-+ return 1;
-+}
-+
-+struct loop_crypt_type_struct loop_crypt_type_tbl[] = {
-+ { 0, 0, 0, "no" },
-+ { 0, 0, 0, "none" },
-+ { 1, 0, 0, "xor" },
-+ { 3, 1, 16, "twofish" },
-+ { 4, 1, 16, "blowfish" },
-+ { 7, 1, 16, "serpent" },
-+ { 8, 1, 16, "mars" },
-+ { 11, 3, 16, "rc6" },
-+ { 12, 0, 21, "tripleDES" },
-+ { 12, 0, 24, "3des" },
-+ { 12, 0, 24, "des3_ede" },
-+ { 16, 1, 16, "AES" },
-+ { -1, 0, 0, NULL }
-+};
-+
-+static char *getApiName(char *e, int *len)
-+{
-+ int x, y, z = 1, q = -1;
-+ unsigned char *s;
-+
-+ *len = y = 0;
-+ s = (unsigned char *)strdup(e);
-+ if(!s)
-+ return "";
-+ x = strlen((char *)s);
-+ while(x > 0) {
-+ x--;
-+ if(!isdigit(s[x]))
-+ break;
-+ y += (s[x] - '0') * z;
-+ z *= 10;
-+ q = x;
-+ }
-+ while(x >= 0) {
-+ s[x] = tolower(s[x]);
-+ if(s[x] == '-')
-+ s[x] = 0;
-+ x--;
-+ }
-+ if(y >= 40) {
-+ if(q >= 0)
-+ s[q] = 0;
-+ *len = y;
-+ }
-+ return((char *)s);
-+}
-+
-+int loop_crypt_type(const char *name, u_int32_t *kbyp, char **apiName)
-+{
-+ int i, k;
-+
-+ *apiName = getApiName((char *)name, &k);
-+ if(k < 0)
-+ k = 0;
-+ if(k > 256)
-+ k = 256;
-+ for (i = 0; loop_crypt_type_tbl[i].id != -1; i++) {
-+ if (!strcasecmp (*apiName , loop_crypt_type_tbl[i].name)) {
-+ *kbyp = k ? k >> 3 : loop_crypt_type_tbl[i].keyBytes;
-+ return loop_crypt_type_tbl[i].id;
-+ }
-+ }
-+ *kbyp = 16; /* 128 bits */
-+ return 18; /* LO_CRYPT_CRYPTOAPI */
-+}
-+
-+int try_cryptoapi_loop_interface(int fd, struct loop_info64 *loopinfo, char *apiName)
-+{
-+ snprintf((char *)loopinfo->lo_crypt_name, sizeof(loopinfo->lo_crypt_name), "%s-cbc", apiName);
-+ loopinfo->lo_crypt_name[LO_NAME_SIZE - 1] = 0;
-+ loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
-+ return(loop_set_status64_ioctl(fd, loopinfo));
-+}
-diff -urN util-linux-ng-2.14/mount/loop.h util-linux-ng-2.14-AES/mount/loop.h
---- util-linux-ng-2.14/mount/loop.h 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/loop.h 2008-06-24 16:55:13.000000000 +0300
-@@ -1,19 +1,20 @@
--#ifndef MNT_LOOP_H
--#define MNT_LOOP_H
-+/*
-+ * loop.h
-+ *
-+ * Copyright 2003 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU GPL
-+ */
-
--#include <linux/posix_types.h>
--#include <stdint.h>
--#include "linux_version.h"
-+#ifndef _LOOP_H
-+#define _LOOP_H 1
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68)
--#define my_dev_t __kernel_dev_t
--#else
--#define my_dev_t __kernel_old_dev_t
--#endif
-+#include <sys/types.h>
-+#include <linux/version.h>
-+#include <linux/posix_types.h>
-
--#define LO_CRYPT_NONE 0
--#define LO_CRYPT_XOR 1
--#define LO_CRYPT_DES 2
-+#define LO_CRYPT_NONE 0
-+#define LO_CRYPT_XOR 1
-+#define LO_CRYPT_DES 2
- #define LO_CRYPT_CRYPTOAPI 18
-
- #define LOOP_SET_FD 0x4C00
-@@ -22,22 +23,26 @@
- #define LOOP_GET_STATUS 0x4C03
- #define LOOP_SET_STATUS64 0x4C04
- #define LOOP_GET_STATUS64 0x4C05
-+#define LOOP_MULTI_KEY_SETUP 0x4C4D
-+#define LOOP_MULTI_KEY_SETUP_V3 0x4C4E
-+#define LOOP_RECOMPUTE_DEV_SIZE 0x4C52
-
--/* Flags for loop_into{64,}->lo_flags */
--enum {
-- LO_FLAGS_READ_ONLY = 1,
-- LO_FLAGS_USE_AOPS = 2,
-- LO_FLAGS_AUTOCLEAR = 4, /* New in 2.6.25 */
--};
--
--#define LO_NAME_SIZE 64
--#define LO_KEY_SIZE 32
-+#define LO_NAME_SIZE 64
-+#define LO_KEY_SIZE 32
-
- struct loop_info {
- int lo_number;
-- my_dev_t lo_device;
-+#if LINUX_VERSION_CODE >= 0x20600
-+ __kernel_old_dev_t lo_device;
-+#else
-+ __kernel_dev_t lo_device;
-+#endif
- unsigned long lo_inode;
-- my_dev_t lo_rdevice;
-+#if LINUX_VERSION_CODE >= 0x20600
-+ __kernel_old_dev_t lo_rdevice;
-+#else
-+ __kernel_dev_t lo_rdevice;
-+#endif
- int lo_offset;
- int lo_encrypt_type;
- int lo_encrypt_key_size;
-@@ -49,19 +54,34 @@
- };
-
- struct loop_info64 {
-- uint64_t lo_device;
-- uint64_t lo_inode;
-- uint64_t lo_rdevice;
-- uint64_t lo_offset;
-- uint64_t lo_sizelimit; /* bytes, 0 == max available */
-- uint32_t lo_number;
-- uint32_t lo_encrypt_type;
-- uint32_t lo_encrypt_key_size;
-- uint32_t lo_flags;
-- uint8_t lo_file_name[LO_NAME_SIZE];
-- uint8_t lo_crypt_name[LO_NAME_SIZE];
-- uint8_t lo_encrypt_key[LO_KEY_SIZE];
-- uint64_t lo_init[2];
-+ u_int64_t lo_device; /* ioctl r/o */
-+ u_int64_t lo_inode; /* ioctl r/o */
-+ u_int64_t lo_rdevice; /* ioctl r/o */
-+ u_int64_t lo_offset; /* bytes */
-+ u_int64_t lo_sizelimit; /* bytes, 0 == max available */
-+ u_int32_t lo_number; /* ioctl r/o */
-+ u_int32_t lo_encrypt_type;
-+ u_int32_t lo_encrypt_key_size; /* ioctl w/o */
-+ u_int32_t lo_flags; /* ioctl r/o */
-+ unsigned char lo_file_name[LO_NAME_SIZE];
-+ unsigned char lo_crypt_name[LO_NAME_SIZE];
-+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-+ u_int64_t lo_init[2];
- };
-
--#endif /* MNT_LOOP_H */
-+extern int loop_set_status64_ioctl(int, struct loop_info64 *);
-+extern int loop_get_status64_ioctl(int, struct loop_info64 *);
-+extern int is_unused_loop_device(int);
-+
-+struct loop_crypt_type_struct {
-+ short int id;
-+ unsigned char flags; /* bit0 = show keybits, bit1 = add '-' before keybits */
-+ unsigned char keyBytes;
-+ char *name;
-+};
-+
-+extern struct loop_crypt_type_struct loop_crypt_type_tbl[];
-+extern int loop_crypt_type(const char *, u_int32_t *, char **);
-+extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
-+
-+#endif
-diff -urN util-linux-ng-2.14/mount/losetup.8 util-linux-ng-2.14-AES/mount/losetup.8
---- util-linux-ng-2.14/mount/losetup.8 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/losetup.8 2008-06-24 16:55:13.000000000 +0300
-@@ -1,49 +1,29 @@
--.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
-+.TH LOSETUP 8 "2007-09-02" "Linux" "MAINTENANCE COMMANDS"
- .SH NAME
- losetup \- set up and control loop devices
- .SH SYNOPSIS
- .ad l
--Get info:
--.sp
--.in +5
- .B losetup
-+[options]
- .I loop_device
--.sp
-+file
-+.br
-+.B losetup -F
-+[options]
-+.I loop_device
-+[file]
-+.br
-+.B losetup
-+[
-+.B \-d
-+]
-+.I loop_device
-+.br
- .B losetup -a
--.sp
--.B losetup -j <file> [-o offset]
--.sp
--.in -5
--Delete loop:
--.sp
--.in +5
--.B "losetup \-d"
-+.br
-+.B losetup
-+.B \-R
- .I loop_device
--.sp
--.in -5
--Print name of first unused loop device:
--.sp
--.in +5
--.B "losetup \-f"
--.sp
--.in -5
--Setup loop device:
--.sp
--.in +5
--.B losetup
--.RB [{\-e | \-E}
--.IR encryption ]
--.RB [ \-o
--.IR offset ]
--.RB [ \-\-sizelimit
--.IR limit ]
--.RB [ \-p
--.IR pfd ]
--.RB [ \-r ]
--.in +8
--.RB { \-f [ \-\-show ] | \fIloop_device\fP }
--.I file
--.in -13
- .ad b
- .SH DESCRIPTION
- .B losetup
-@@ -51,62 +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.
--
--.SS "Encryption"
--It is possible to specify transfer functions (for encryption/decryption
--or other purposes) using one of the
--.B \-E
--and
--.B \-e
--options.
--There are two mechanisms to specify the desired encryption: by number
--and by name. If an encryption is specified by number then one
--has to make sure that the Linux kernel knows about the encryption with that
--number, probably by patching the kernel. Standard numbers that are
--always present are 0 (no encryption) and 1 (XOR encryption).
--When the cryptoloop module is loaded (or compiled in), it uses number 18.
--This cryptoloop module will take the name of an arbitrary encryption type
--and finds the module that knows how to perform that encryption.
- .SH OPTIONS
--.IP "\fB\-a, \-\-all\fP"
--show status of all loop devices
--.IP "\fB\-d, \-\-detach\fP"
--detach the file or device associated with the specified loop device
--.IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP"
--enable data encryption with specified name or number
--.IP "\fB\-f, \-\-find\fP"
--find the first unused loop device. If a
--.I file
--argument is present, use this device. Otherwise, print its name
--.IP "\fB\-h, \-\-help\fP"
--print help
--.IP "\fB\-j, \-\-associated \fIfile\fP"
--show status of all loop devices associated with given
--.I file
--.IP "\fB\-o, \-\-offset \fIoffset\fP"
--the data start is moved \fIoffset\fP bytes into the specified file or
--device
--.IP "\fB\-\-sizelimit \fIlimit\fP"
--the data end is set to no more than \fIsizelimit\fP bytes after the data start
--.IP "\fB\-p, \-\-pass-fd \fInum\fP"
--read the passphrase from file descriptor with number
--.I num
--instead of from the terminal
--.IP "\fB\-r, \-\-read-only\fP"
--setup read-only loop device
--.IP "\fB\-\-show\fP"
--print device name if the
--.I -f
--option and a
--.I file
--argument are present.
--
--The short form of this option (\fB\-s\fP) is deprecated. This short form could
--be in collision with Loop-AES implementation where the same option is used for
--\fB\-\-sizelimit\fP.
--.IP "\fB\-v, \-\-verbose\fP"
--verbose mode
-+.IP \fB\-a\fP
-+Show status of all loop devices.
-+.IP "\fB\-C \fIitercountk\fP"
-+Runs hashed passphrase through \fIitercountk\fP thousand iterations of AES-256
-+before using it for loop encryption. This consumes lots of CPU cycles at
-+loop setup/mount time but not thereafter. In combination with passphrase seed
-+this slows down dictionary attacks. Iteration is not done in multi-key mode.
-+.IP "\fB\-d\fP"
-+Detach the file or device associated with the specified loop device.
-+.IP "\fB\-e \fIencryption\fP"
-+.RS
-+Enable data encryption. Following encryption types are recognized:
-+.IP \fBNONE\fP
-+Use no encryption (default).
-+.PD 0
-+.IP \fBXOR\fP
-+Use a simple XOR encryption.
-+.IP "\fBAES128 AES\fP"
-+Use 128 bit AES encryption. Passphrase is hashed with SHA-256 by default.
-+.IP \fBAES192\fP
-+Use 192 bit AES encryption. Passphrase is hashed with SHA-384 by default.
-+.IP \fBAES256\fP
-+Use 256 bit AES encryption. Passphrase is hashed with SHA-512 by default.
-+
-+.IP "\fBtwofish128 twofish160 twofish192 twofish256\fP"
-+.IP "\fBblowfish128 blowfish160 blowfish192 blowfish256\fP"
-+.IP "\fBserpent128 serpent192 serpent256 mars128 mars192\fP"
-+.IP "\fBmars256 rc6-128 rc6-192 rc6-256 tripleDES\fP"
-+These encryption types are available if they are enabled in kernel
-+configuration or corresponding modules have been loaded to kernel.
-+.PD
-+.RE
-+.IP "\fB\-F\fP"
-+Reads and uses mount options from /etc/fstab that match specified loop
-+device, including offset= sizelimit= encryption= pseed= phash= loinit=
-+gpgkey= gpghome= cleartextkey= itercountk= and looped to device/file name.
-+loop= option in /etc/fstab must match specified loop device name. Command
-+line options take precedence in case of conflict.
-+.IP "\fB\-G \fIgpghome\fP"
-+Set gpg home directory to \fIgpghome\fP, so that gpg uses public/private
-+keys on \fIgpghome\fP directory. This is only used when gpgkey file needs to
-+be decrypted using public/private keys. If gpgkey file is encrypted with
-+symmetric cipher only, public/private keys are not required and this option
-+has no effect.
-+.IP "\fB\-H \fIphash\fP"
-+Uses \fIphash\fP function to hash passphrase. Available hash functions are
-+sha256, sha384, sha512 and rmd160. unhashed1, unhashed2 and unhashed3
-+functions also exist for compatibility with some obsolete implementations.
-+
-+Hash function random does not ask for passphrase but sets up random keys and
-+attempts to put loop to multi-key mode. When random/1777 hash type is used
-+as mount option for mount program, mount program will create new file system
-+on the loop device and construct initial permissions of file system root
-+directory from octal digits that follow the slash character.
-+
-+WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING IMPORTANT
-+DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA.
-+.IP "\fB\-I \fIloinit\fP"
-+Passes a numeric value of \fIloinit\fP as a parameter to cipher transfer
-+function. Cipher transfer functions are free to interpret value as they
-+want.
-+.IP "\fB\-K \fIgpgkey\fP"
-+Passphrase is piped to gpg so that gpg can decrypt file \fIgpgkey\fP which
-+contains the real keys that are used to encrypt loop device. If decryption
-+requires public/private keys and gpghome is not specified, all users use
-+their own gpg public/private keys to decrypt \fIgpgkey\fP. Decrypted
-+\fIgpgkey\fP should contain 1 or 64 or 65 keys, each key at least 20
-+characters and separated by newline. If decrypted \fIgpgkey\fP contains 64
-+or 65 keys, then loop device is put to multi-key mode. In multi-key mode
-+first key is used for first sector, second key for second sector, and so on.
-+65th key, if present, is used as additional input to MD5 IV computation.
-+.IP "\fB\-o \fIoffset\fP"
-+The data start is moved \fIoffset\fP bytes into the specified file or
-+device. Normally offset is included in IV (initialization vector)
-+computations. If offset is prefixed with @ character, then offset is not
-+included in IV computations. @ prefix functionality may not be supported on
-+some older kernels and/or loop drivers.
-+.IP "\fB\-p \fIpasswdfd\fP"
-+Read the passphrase from file descriptor \fIpasswdfd\fP instead of the
-+terminal. If -K option is not being used (no gpg key file), then losetup
-+attempts to read 65 keys from \fIpasswdfd\fP, each key at least 20
-+characters and separated by newline. If losetup successfully reads 64 or 65
-+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
-+terminal. If -K option is not being used (no gpg key file), then losetup
-+attempts to read 65 keys from \fIcleartextkey\fP, each key at least 20
-+characters and separated by newline. If losetup successfully reads 64 or 65
-+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. If both -p and -P options are used, then -p option takes
-+precedence. These are equivalent:
-+
-+losetup -p3 -K foo.gpg -e AES128 ... 3<someFileName
-+
-+losetup -P someFileName -K foo.gpg -e AES128 ...
-+
-+In first line of above example, in addition to normal open file descriptors
-+(0==stdin 1==stdout 2==stderr), shell opens the file and passes open file
-+descriptor to started losetup program. In second line of above example,
-+losetup opens the file itself.
-+.IP "\fB\-r\fP"
-+Read-only mode.
-+.IP "\fB\-R\fP"
-+Resize existing, already set up loop device, to new changed underlying
-+device size. This option is for changing mounted live file system size on
-+LVM volume. This functionality may not be supported on some older kernels
-+and/or loop drivers.
-+.IP "\fB\-s \fIsizelimit\fP"
-+Size of loop device is limited to \fIsizelimit\fP bytes. If unspecified or
-+set to zero, loop device size is set to maximum available (file size minus
-+offset). This option may not be supported on some older kernels and/or loop
-+drivers.
-+.IP "\fB\-S \fIpseed\fP"
-+Sets encryption passphrase seed \fIpseed\fP which is appended to user supplied
-+passphrase before hashing. Using different seeds for different partitions
-+makes dictionary attacks slower but does not prevent them if user supplied
-+passphrase is guessable. Seed is not used in multi-key mode.
-+.IP "\fB\-T\fP"
-+Asks passphrase twice.
-+.IP "\fB\-v\fP"
-+Verbose mode.
- .SH RETURN VALUE
- .B losetup
- returns 0 on success, nonzero on failure. When
-@@ -118,49 +171,26 @@
-
- .SH FILES
- .nf
--/dev/loop0, /dev/loop1, ... loop devices (major=7)
-+/dev/loop0,/dev/loop1,... loop devices (major=7)
- .fi
- .SH EXAMPLE
--If you are using the loadable module you must have the module loaded
--first with the command
--.IP
--# insmod loop.o
--.LP
--Maybe also encryption modules are needed.
--.IP
--# insmod des.o
--# insmod cryptoloop.o
--.LP
- The following commands can be used as an example of using the loop device.
- .nf
--.IP
--# dd if=/dev/zero of=/file bs=1k count=100
--# losetup -e des /dev/loop0 /file
--Password:
--Init (up to 16 hex digits):
--# mkfs -t ext2 /dev/loop0 100
--# mount -t ext2 /dev/loop0 /mnt
-+
-+dd if=/dev/zero of=/file bs=1k count=500
-+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
-+mount -t ext2 /dev/loop0 /mnt
- ...
--# umount /dev/loop0
--# losetup -d /dev/loop0
--.fi
--.LP
--If you are using the loadable module you may remove the module with
--the command
--.IP
--# rmmod loop
--.LP
-+umount /dev/loop0
-+losetup -d /dev/loop0
- .fi
- .SH RESTRICTION
--DES encryption is painfully slow. On the other hand, XOR is terribly weak.
--
--Cryptoloop is deprecated in favor of dm-crypt. For more details see
--.B cryptsetup(8).
--.SH AVAILABILITY
--The losetup command is part of the util-linux-ng package and is available from
--ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
--.\" .SH AUTHORS
--.\" .nf
--.\" Original version: Theodore Ts'o <tytso@athena.mit.edu>
--.\" Original DES by: Eric Young <eay@psych.psy.uq.oz.au>
--.\" .fi
-+XOR encryption is terribly weak.
-+.SH AUTHORS
-+.nf
-+Original version: Theodore Ts'o <tytso@athena.mit.edu>
-+AES support: Jari Ruusu
-+.fi
-diff -urN util-linux-ng-2.14/mount/loumount.c util-linux-ng-2.14-AES/mount/loumount.c
---- util-linux-ng-2.14/mount/loumount.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/loumount.c 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,60 @@
-+/*
-+ * loumount.c
-+ *
-+ * This code was extracted to separate file from lomount.c so that umount
-+ * program doesn't have to link with all loop related setup code
-+ */
-+
-+#define LOOPMAJOR 7
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <pwd.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
-+#include <sys/sysmacros.h>
-+#include <sys/wait.h>
-+#include <fcntl.h>
-+#include <mntent.h>
-+#include <locale.h>
-+
-+#include "loop.h"
-+#include "lomount.h"
-+#include "xstrncpy.h"
-+#include "nls.h"
-+
-+int
-+is_loop_device (const char *device) {
-+ struct stat statbuf;
-+
-+ return (stat(device, &statbuf) == 0 &&
-+ S_ISBLK(statbuf.st_mode) &&
-+ major(statbuf.st_rdev) == LOOPMAJOR);
-+}
-+
-+int
-+del_loop (const char *device) {
-+ int fd;
-+
-+ if ((fd = open (device, O_RDONLY)) < 0) {
-+ int errsv = errno;
-+ fprintf(stderr, _("loop: can't delete device %s: %s\n"),
-+ device, strerror (errsv));
-+ return 1;
-+ }
-+ if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
-+ perror ("ioctl: LOOP_CLR_FD");
-+ return 1;
-+ }
-+ close (fd);
-+ if (verbose > 1)
-+ printf(_("del_loop(%s): success\n"), device);
-+ return 0;
-+}
-diff -urN util-linux-ng-2.14/mount/mount.8 util-linux-ng-2.14-AES/mount/mount.8
---- util-linux-ng-2.14/mount/mount.8 2008-06-09 12:28:17.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/mount.8 2008-06-24 16:55:13.000000000 +0300
-@@ -321,6 +321,16 @@
- .B \-v
- Verbose mode.
- .TP
-+.B \-p "\fIpasswdfd\fP"
-+If the mount requires a passphrase to be entered, read it from file
-+descriptor \fIpasswdfd\fP instead of from the terminal. If mount uses
-+encrypted loop device and gpgkey= mount option is not being used (no gpg key
-+file), then mount attempts to read 65 keys from \fIpasswdfd\fP, each key at
-+least 20 characters and separated by newline. If mount successfully reads 64
-+or 65 keys, then loop device is put to multi-key mode. If mount encounters
-+end-of-file before 64 keys are read, then only first key is used in
-+single-key mode.
-+.TP
- .B \-a
- Mount all filesystems (of the given types) mentioned in
- .IR fstab .
-@@ -370,12 +380,6 @@
- .I /etc
- is on a read-only file system.
- .TP
--.BI \-p " num"
--In case of a loop mount with encryption, read the passphrase from
--file descriptor
--.I num
--instead of from the terminal.
--.TP
- .B \-s
- Tolerate sloppy mount options rather than failing. This will ignore
- mount options not supported by a filesystem type. Not all filesystems
-@@ -2028,13 +2032,19 @@
- and then mount this device on
- .IR /mnt .
-
--This type of mount knows about four options, namely
--.BR loop ", " offset ", " sizelimit " and " encryption ,
-+This type of mount knows about 11 options, namely
-+.BR loop ", " offset ", " sizelimit ", " encryption ", " pseed ", " phash ", " loinit ", " gpgkey ", " gpghome ", " cleartextkey " and " itercountk
- that are really options to
- .BR \%losetup (8).
- (These options can be used in addition to those specific
- to the filesystem type.)
-
-+If the mount requires a passphrase, you will be prompted for one unless you
-+specify a file descriptor to read from instead with the
-+.BR \-p
-+command line option, or specify a file name with
-+.BR cleartextkey
-+mount option.
- If no explicit loop device is mentioned
- (but just an option `\fB\-o loop\fP' is given), then
- .B mount
-diff -urN util-linux-ng-2.14/mount/mount.c util-linux-ng-2.14-AES/mount/mount.c
---- util-linux-ng-2.14/mount/mount.c 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/mount.c 2008-06-24 16:55:13.000000000 +0300
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <stdio.h>
-+#include <locale.h>
-
- #include <pwd.h>
- #include <grp.h>
-@@ -84,9 +85,6 @@
- /* True if ruid != euid. */
- static int suid = 0;
-
--/* Contains the fd to read the passphrase from, if any. */
--static int pfd = -1;
--
- /* Map from -o and fstab option strings to the flag argument to mount(2). */
- struct opt_map {
- const char *opt; /* option name */
-@@ -182,8 +180,8 @@
-
- static int opt_nofail = 0;
-
--static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
-- *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
-+static const char *opt_loopdev, *opt_vfstype,
-+ *opt_speed, *opt_comment, *opt_uhelper;
-
- static int mounted (const char *spec0, const char *node0);
- static int check_special_mountprog(const char *spec, const char *node,
-@@ -196,9 +194,16 @@
- } string_opt_map[] = {
- { "loop=", 0, &opt_loopdev },
- { "vfs=", 1, &opt_vfstype },
-- { "offset=", 0, &opt_offset },
-- { "sizelimit=", 0, &opt_sizelimit },
-- { "encryption=", 0, &opt_encryption },
-+ { "pseed=", 1, (const char **)&passSeedString },
-+ { "phash=", 0, (const char **)&passHashFuncName },
-+ { "loinit=", 0, (const char **)&loInitValue },
-+ { "gpgkey=", 0, (const char **)&gpgKeyFile },
-+ { "gpghome=", 0, (const char **)&gpgHomeDir },
-+ { "cleartextkey=", 0, (const char **)&clearTextKeyFile },
-+ { "itercountk=", 1, (const char **)&passIterThousands },
-+ { "offset=", 0, (const char **)&loopOffsetBytes },
-+ { "sizelimit=", 0, (const char **)&loopSizeBytes },
-+ { "encryption=", 0, (const char **)&loopEncryptionType },
- { "speed=", 0, &opt_speed },
- { "comment=", 1, &opt_comment },
- { "uhelper=", 0, &opt_uhelper },
-@@ -827,6 +832,9 @@
- *flags &= ~(MS_OWNER | MS_GROUP);
- }
-
-+/* if loop is already set up, following test is unnecessary */
-+/* because loop set up will fail if it is done again */
-+#if 0
- /* Check, if there already exists a mounted loop device on the mountpoint node
- * with the same parameters.
- */
-@@ -867,13 +875,12 @@
- free(node);
- return res;
- }
-+#endif
-
- static int
- loop_check(const char **spec, const char **type, int *flags,
-- int *loop, const char **loopdev, const char **loopfile,
-- const char *node) {
-+ int *loop, const char **loopdev, const char **loopfile, const char *node, unsigned int *AutoChmodPtr) {
- int looptype;
-- unsigned long long offset, sizelimit;
-
- /*
- * In the case of a loop mount, either type is of the form lo@/dev/loop5
-@@ -898,7 +905,7 @@
- *type = opt_vfstype;
- }
-
-- *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_sizelimit || opt_encryption);
-+ *loop = ((*flags & MS_LOOP) || *loopdev || loopOffsetBytes || loopSizeBytes || loopEncryptionType);
- *loopfile = *spec;
-
- if (*loop) {
-@@ -906,20 +913,22 @@
- if (fake) {
- if (verbose)
- printf(_("mount: skipping the setup of a loop device\n"));
-+ } else if (*loopdev && is_loop_active(*loopdev, *loopfile)) {
-+ if (verbose)
-+ printf(_("mount: skipping the setup of a loop device\n"));
-+ *spec = *loopdev;
- } else {
-- int loop_opts = SETLOOP_AUTOCLEAR; /* always attempt autoclear */
-+ int loopro = (*flags & MS_RDONLY);
- int res;
-
-- if (*flags & MS_RDONLY)
-- loop_opts |= SETLOOP_RDONLY;
--
-- offset = opt_offset ? strtoull(opt_offset, NULL, 0) : 0;
-- sizelimit = opt_sizelimit ? strtoull(opt_sizelimit, NULL, 0) : 0;
--
-+/* if loop is already set up, following test is unnecessary */
-+/* because loop set up will fail if it is done again */
-+#if 0
- if (is_mounted_same_loopfile(node, *loopfile, offset)) {
- error(_("mount: according to mtab %s is already mounted on %s as loop"), *loopfile, node);
- return EX_FAIL;
- }
-+#endif
-
- do {
- if (!*loopdev || !**loopdev)
-@@ -929,21 +938,13 @@
- if (verbose)
- printf(_("mount: going to use the loop device %s\n"), *loopdev);
-
-- if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit,
-- opt_encryption, pfd, &loop_opts))) {
-- if (res == 2) {
-- /* loop dev has been grabbed by some other process,
-- try again, if not given explicitly */
-- if (!opt_loopdev) {
-- if (verbose)
-- printf(_("mount: stolen loop=%s ...trying again\n"), *loopdev);
-- my_free(*loopdev);
-- *loopdev = NULL;
-- continue;
-- }
-- error(_("mount: stolen loop=%s"), *loopdev);
-- return EX_FAIL;
--
-+ if ((res = set_loop(*loopdev, *loopfile, &loopro, type, AutoChmodPtr, !opt_loopdev ? 2 : 1))) {
-+ if ((res == 2) && !opt_loopdev) {
-+ /* loop dev has been grabbed by some other process, try again */
-+ if (verbose)
-+ printf(_("mount: loop=%s not available ...trying again\n"), *loopdev);
-+ my_free(*loopdev);
-+ *loopdev = NULL;
- } else {
- if (verbose)
- printf(_("mount: failed setting up loop device\n"));
-@@ -959,13 +960,8 @@
- if (verbose > 1)
- printf(_("mount: setup loop device successfully\n"));
- *spec = *loopdev;
--
-- if (loop_opts & SETLOOP_RDONLY)
-+ if (loopro)
- *flags |= MS_RDONLY;
--
-- if (loop_opts & SETLOOP_AUTOCLEAR)
-- /* Prevent recording loop dev in mtab for cleanup on umount */
-- *loop = 0;
- }
- }
-
-@@ -1026,14 +1022,6 @@
- }
-
- static void
--set_pfd(char *s) {
-- if (!isdigit(*s))
-- die(EX_USAGE,
-- _("mount: argument to -p or --pass-fd must be a number"));
-- pfd = atoi(optarg);
--}
--
--static void
- cdrom_setspeed(const char *spec) {
- #define CDROM_SELECT_SPEED 0x5322 /* Set the CD-ROM speed */
- if (opt_speed) {
-@@ -1070,6 +1058,7 @@
- const char *opts, *spec, *node, *types;
- char *user = 0;
- int loop = 0;
-+ unsigned int LoopMountAutomaticChmod = 0;
- const char *loopdev = 0, *loopfile = 0;
- struct stat statbuf;
-
-@@ -1116,7 +1105,7 @@
- * stale assignments of files to loop devices. Nasty when used for
- * encryption.
- */
-- res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile, node);
-+ res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile, node, &LoopMountAutomaticChmod);
- if (res)
- goto out;
- }
-@@ -1139,7 +1128,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
-+ * was created on the loop device, initial permissions for
-+ * file system root directory need to be set here.
-+ */
-+ if(chmod(node, LoopMountAutomaticChmod)) {
-+ error (_("Error: encrypted file system chmod() failed"));
-+ }
-+ }
- if (special) {
- block_signals (SIG_UNBLOCK);
- res = status;
-@@ -1874,8 +1872,8 @@
- case 'O': /* with -t: mount only if (not) opt */
- test_opts = append_opt(test_opts, optarg, NULL);
- break;
-- case 'p': /* fd on which to read passwd */
-- set_pfd(optarg);
-+ case 'p': /* read passphrase from given fd */
-+ passFDnumber = optarg;
- break;
- case 'r': /* mount readonly */
- readonly = 1;
-diff -urN util-linux-ng-2.14/mount/rmd160.c util-linux-ng-2.14-AES/mount/rmd160.c
---- util-linux-ng-2.14/mount/rmd160.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/rmd160.c 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,532 @@
-+/* rmd160.c - RIPE-MD160
-+ * Copyright (C) 1998 Free Software Foundation, Inc.
-+ */
-+
-+/* This file was part of GnuPG. Modified for use within the Linux
-+ * mount utility by Marc Mutz <Marc@Mutz.com>. None of this code is
-+ * by myself. I just removed everything that you don't need when all
-+ * you want to do is to use rmd160_hash_buffer().
-+ * My comments are marked with (mm). */
-+
-+/* GnuPG is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * GnuPG is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */
-+
-+#include <string.h> /* (mm) for memcpy */
-+#include <endian.h> /* (mm) for BIG_ENDIAN and BYTE_ORDER */
-+#include "rmd160.h"
-+
-+/* (mm) these are used by the original GnuPG file. In order to modify
-+ * that file not too much, we keep the notations. maybe it would be
-+ * better to include linux/types.h and typedef __u32 to u32 and __u8
-+ * to byte? */
-+typedef unsigned int u32; /* taken from e.g. util-linux's minix.h */
-+typedef unsigned char byte;
-+
-+typedef struct {
-+ u32 h0,h1,h2,h3,h4;
-+ u32 nblocks;
-+ byte buf[64];
-+ int count;
-+} RMD160_CONTEXT;
-+
-+/****************
-+ * Rotate a 32 bit integer by n bytes
-+ */
-+#if defined(__GNUC__) && defined(__i386__)
-+static inline u32
-+rol( u32 x, int n)
-+{
-+ __asm__("roll %%cl,%0"
-+ :"=r" (x)
-+ :"0" (x),"c" (n));
-+ return x;
-+}
-+#else
-+ #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-+#endif
-+
-+/*********************************
-+ * RIPEMD-160 is not patented, see (as of 25.10.97)
-+ * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
-+ * Note that the code uses Little Endian byteorder, which is good for
-+ * 386 etc, but we must add some conversion when used on a big endian box.
-+ *
-+ *
-+ * Pseudo-code for RIPEMD-160
-+ *
-+ * RIPEMD-160 is an iterative hash function that operates on 32-bit words.
-+ * The round function takes as input a 5-word chaining variable and a 16-word
-+ * message block and maps this to a new chaining variable. All operations are
-+ * defined on 32-bit words. Padding is identical to that of MD4.
-+ *
-+ *
-+ * RIPEMD-160: definitions
-+ *
-+ *
-+ * nonlinear functions at bit level: exor, mux, -, mux, -
-+ *
-+ * f(j, x, y, z) = x XOR y XOR z (0 <= j <= 15)
-+ * f(j, x, y, z) = (x AND y) OR (NOT(x) AND z) (16 <= j <= 31)
-+ * f(j, x, y, z) = (x OR NOT(y)) XOR z (32 <= j <= 47)
-+ * f(j, x, y, z) = (x AND z) OR (y AND NOT(z)) (48 <= j <= 63)
-+ * f(j, x, y, z) = x XOR (y OR NOT(z)) (64 <= j <= 79)
-+ *
-+ *
-+ * added constants (hexadecimal)
-+ *
-+ * K(j) = 0x00000000 (0 <= j <= 15)
-+ * K(j) = 0x5A827999 (16 <= j <= 31) int(2**30 x sqrt(2))
-+ * K(j) = 0x6ED9EBA1 (32 <= j <= 47) int(2**30 x sqrt(3))
-+ * K(j) = 0x8F1BBCDC (48 <= j <= 63) int(2**30 x sqrt(5))
-+ * K(j) = 0xA953FD4E (64 <= j <= 79) int(2**30 x sqrt(7))
-+ * K'(j) = 0x50A28BE6 (0 <= j <= 15) int(2**30 x cbrt(2))
-+ * K'(j) = 0x5C4DD124 (16 <= j <= 31) int(2**30 x cbrt(3))
-+ * K'(j) = 0x6D703EF3 (32 <= j <= 47) int(2**30 x cbrt(5))
-+ * K'(j) = 0x7A6D76E9 (48 <= j <= 63) int(2**30 x cbrt(7))
-+ * K'(j) = 0x00000000 (64 <= j <= 79)
-+ *
-+ *
-+ * selection of message word
-+ *
-+ * r(j) = j (0 <= j <= 15)
-+ * r(16..31) = 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8
-+ * r(32..47) = 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12
-+ * r(48..63) = 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2
-+ * r(64..79) = 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13
-+ * r0(0..15) = 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12
-+ * r0(16..31)= 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2
-+ * r0(32..47)= 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13
-+ * r0(48..63)= 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14
-+ * r0(64..79)= 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11
-+ *
-+ *
-+ * amount for rotate left (rol)
-+ *
-+ * s(0..15) = 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8
-+ * s(16..31) = 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12
-+ * s(32..47) = 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5
-+ * s(48..63) = 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12
-+ * s(64..79) = 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6
-+ * s'(0..15) = 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6
-+ * s'(16..31)= 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11
-+ * s'(32..47)= 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5
-+ * s'(48..63)= 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8
-+ * s'(64..79)= 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11
-+ *
-+ *
-+ * initial value (hexadecimal)
-+ *
-+ * h0 = 0x67452301; h1 = 0xEFCDAB89; h2 = 0x98BADCFE; h3 = 0x10325476;
-+ * h4 = 0xC3D2E1F0;
-+ *
-+ *
-+ * RIPEMD-160: pseudo-code
-+ *
-+ * It is assumed that the message after padding consists of t 16-word blocks
-+ * that will be denoted with X[i][j], with 0 <= i <= t-1 and 0 <= j <= 15.
-+ * The symbol [+] denotes addition modulo 2**32 and rol_s denotes cyclic left
-+ * shift (rotate) over s positions.
-+ *
-+ *
-+ * for i := 0 to t-1 {
-+ * A := h0; B := h1; C := h2; D = h3; E = h4;
-+ * A' := h0; B' := h1; C' := h2; D' = h3; E' = h4;
-+ * for j := 0 to 79 {
-+ * T := rol_s(j)(A [+] f(j, B, C, D) [+] X[i][r(j)] [+] K(j)) [+] E;
-+ * A := E; E := D; D := rol_10(C); C := B; B := T;
-+ * T := rol_s'(j)(A' [+] f(79-j, B', C', D') [+] X[i][r'(j)]
-+ [+] K'(j)) [+] E';
-+ * A' := E'; E' := D'; D' := rol_10(C'); C' := B'; B' := T;
-+ * }
-+ * T := h1 [+] C [+] D'; h1 := h2 [+] D [+] E'; h2 := h3 [+] E [+] A';
-+ * h3 := h4 [+] A [+] B'; h4 := h0 [+] B [+] C'; h0 := T;
-+ * }
-+ */
-+
-+/* Some examples:
-+ * "" 9c1185a5c5e9fc54612808977ee8f548b2258d31
-+ * "a" 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe
-+ * "abc" 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
-+ * "message digest" 5d0689ef49d2fae572b881b123a85ffa21595f36
-+ * "a...z" f71c27109c692c1b56bbdceb5b9d2865b3708dbc
-+ * "abcdbcde...nopq" 12a053384a9c0c88e405a06c27dcf49ada62eb2b
-+ * "A...Za...z0...9" b0e20b6e3116640286ed3a87a5713079b21f5189
-+ * 8 times "1234567890" 9b752e45573d4b39f4dbd3323cab82bf63326bfb
-+ * 1 million times "a" 52783243c1697bdbe16d37f97f68f08325dc1528
-+ */
-+
-+
-+static void
-+rmd160_init( RMD160_CONTEXT *hd )
-+{
-+ hd->h0 = 0x67452301;
-+ hd->h1 = 0xEFCDAB89;
-+ hd->h2 = 0x98BADCFE;
-+ hd->h3 = 0x10325476;
-+ hd->h4 = 0xC3D2E1F0;
-+ hd->nblocks = 0;
-+ hd->count = 0;
-+}
-+
-+
-+
-+/****************
-+ * Transform the message X which consists of 16 32-bit-words
-+ */
-+static void
-+transform( RMD160_CONTEXT *hd, byte *data )
-+{
-+ u32 a,b,c,d,e,aa,bb,cc,dd,ee,t;
-+ #if BYTE_ORDER == BIG_ENDIAN
-+ u32 x[16];
-+ { int i;
-+ byte *p2, *p1;
-+ for(i=0, p1=data, p2=(byte*)x; i < 16; i++, p2 += 4 ) {
-+ p2[3] = *p1++;
-+ p2[2] = *p1++;
-+ p2[1] = *p1++;
-+ p2[0] = *p1++;
-+ }
-+ }
-+ #else
-+ #if 0
-+ u32 *x =(u32*)data;
-+ #else
-+ /* this version is better because it is always aligned;
-+ * The performance penalty on a 586-100 is about 6% which
-+ * is acceptable - because the data is more local it might
-+ * also be possible that this is faster on some machines.
-+ * This function (when compiled with -02 on gcc 2.7.2)
-+ * executes on a 586-100 (39.73 bogomips) at about 1900kb/sec;
-+ * [measured with a 4MB data and "gpgm --print-md rmd160"] */
-+ u32 x[16];
-+ memcpy( x, data, 64 );
-+ #endif
-+ #endif
-+
-+
-+#define K0 0x00000000
-+#define K1 0x5A827999
-+#define K2 0x6ED9EBA1
-+#define K3 0x8F1BBCDC
-+#define K4 0xA953FD4E
-+#define KK0 0x50A28BE6
-+#define KK1 0x5C4DD124
-+#define KK2 0x6D703EF3
-+#define KK3 0x7A6D76E9
-+#define KK4 0x00000000
-+#define F0(x,y,z) ( (x) ^ (y) ^ (z) )
-+#define F1(x,y,z) ( ((x) & (y)) | (~(x) & (z)) )
-+#define F2(x,y,z) ( ((x) | ~(y)) ^ (z) )
-+#define F3(x,y,z) ( ((x) & (z)) | ((y) & ~(z)) )
-+#define F4(x,y,z) ( (x) ^ ((y) | ~(z)) )
-+#define R(a,b,c,d,e,f,k,r,s) do { t = a + f(b,c,d) + k + x[r]; \
-+ a = rol(t,s) + e; \
-+ c = rol(c,10); \
-+ } while(0)
-+
-+ /* left lane */
-+ a = hd->h0;
-+ b = hd->h1;
-+ c = hd->h2;
-+ d = hd->h3;
-+ e = hd->h4;
-+ R( a, b, c, d, e, F0, K0, 0, 11 );
-+ R( e, a, b, c, d, F0, K0, 1, 14 );
-+ R( d, e, a, b, c, F0, K0, 2, 15 );
-+ R( c, d, e, a, b, F0, K0, 3, 12 );
-+ R( b, c, d, e, a, F0, K0, 4, 5 );
-+ R( a, b, c, d, e, F0, K0, 5, 8 );
-+ R( e, a, b, c, d, F0, K0, 6, 7 );
-+ R( d, e, a, b, c, F0, K0, 7, 9 );
-+ R( c, d, e, a, b, F0, K0, 8, 11 );
-+ R( b, c, d, e, a, F0, K0, 9, 13 );
-+ R( a, b, c, d, e, F0, K0, 10, 14 );
-+ R( e, a, b, c, d, F0, K0, 11, 15 );
-+ R( d, e, a, b, c, F0, K0, 12, 6 );
-+ R( c, d, e, a, b, F0, K0, 13, 7 );
-+ R( b, c, d, e, a, F0, K0, 14, 9 );
-+ R( a, b, c, d, e, F0, K0, 15, 8 );
-+ R( e, a, b, c, d, F1, K1, 7, 7 );
-+ R( d, e, a, b, c, F1, K1, 4, 6 );
-+ R( c, d, e, a, b, F1, K1, 13, 8 );
-+ R( b, c, d, e, a, F1, K1, 1, 13 );
-+ R( a, b, c, d, e, F1, K1, 10, 11 );
-+ R( e, a, b, c, d, F1, K1, 6, 9 );
-+ R( d, e, a, b, c, F1, K1, 15, 7 );
-+ R( c, d, e, a, b, F1, K1, 3, 15 );
-+ R( b, c, d, e, a, F1, K1, 12, 7 );
-+ R( a, b, c, d, e, F1, K1, 0, 12 );
-+ R( e, a, b, c, d, F1, K1, 9, 15 );
-+ R( d, e, a, b, c, F1, K1, 5, 9 );
-+ R( c, d, e, a, b, F1, K1, 2, 11 );
-+ R( b, c, d, e, a, F1, K1, 14, 7 );
-+ R( a, b, c, d, e, F1, K1, 11, 13 );
-+ R( e, a, b, c, d, F1, K1, 8, 12 );
-+ R( d, e, a, b, c, F2, K2, 3, 11 );
-+ R( c, d, e, a, b, F2, K2, 10, 13 );
-+ R( b, c, d, e, a, F2, K2, 14, 6 );
-+ R( a, b, c, d, e, F2, K2, 4, 7 );
-+ R( e, a, b, c, d, F2, K2, 9, 14 );
-+ R( d, e, a, b, c, F2, K2, 15, 9 );
-+ R( c, d, e, a, b, F2, K2, 8, 13 );
-+ R( b, c, d, e, a, F2, K2, 1, 15 );
-+ R( a, b, c, d, e, F2, K2, 2, 14 );
-+ R( e, a, b, c, d, F2, K2, 7, 8 );
-+ R( d, e, a, b, c, F2, K2, 0, 13 );
-+ R( c, d, e, a, b, F2, K2, 6, 6 );
-+ R( b, c, d, e, a, F2, K2, 13, 5 );
-+ R( a, b, c, d, e, F2, K2, 11, 12 );
-+ R( e, a, b, c, d, F2, K2, 5, 7 );
-+ R( d, e, a, b, c, F2, K2, 12, 5 );
-+ R( c, d, e, a, b, F3, K3, 1, 11 );
-+ R( b, c, d, e, a, F3, K3, 9, 12 );
-+ R( a, b, c, d, e, F3, K3, 11, 14 );
-+ R( e, a, b, c, d, F3, K3, 10, 15 );
-+ R( d, e, a, b, c, F3, K3, 0, 14 );
-+ R( c, d, e, a, b, F3, K3, 8, 15 );
-+ R( b, c, d, e, a, F3, K3, 12, 9 );
-+ R( a, b, c, d, e, F3, K3, 4, 8 );
-+ R( e, a, b, c, d, F3, K3, 13, 9 );
-+ R( d, e, a, b, c, F3, K3, 3, 14 );
-+ R( c, d, e, a, b, F3, K3, 7, 5 );
-+ R( b, c, d, e, a, F3, K3, 15, 6 );
-+ R( a, b, c, d, e, F3, K3, 14, 8 );
-+ R( e, a, b, c, d, F3, K3, 5, 6 );
-+ R( d, e, a, b, c, F3, K3, 6, 5 );
-+ R( c, d, e, a, b, F3, K3, 2, 12 );
-+ R( b, c, d, e, a, F4, K4, 4, 9 );
-+ R( a, b, c, d, e, F4, K4, 0, 15 );
-+ R( e, a, b, c, d, F4, K4, 5, 5 );
-+ R( d, e, a, b, c, F4, K4, 9, 11 );
-+ R( c, d, e, a, b, F4, K4, 7, 6 );
-+ R( b, c, d, e, a, F4, K4, 12, 8 );
-+ R( a, b, c, d, e, F4, K4, 2, 13 );
-+ R( e, a, b, c, d, F4, K4, 10, 12 );
-+ R( d, e, a, b, c, F4, K4, 14, 5 );
-+ R( c, d, e, a, b, F4, K4, 1, 12 );
-+ R( b, c, d, e, a, F4, K4, 3, 13 );
-+ R( a, b, c, d, e, F4, K4, 8, 14 );
-+ R( e, a, b, c, d, F4, K4, 11, 11 );
-+ R( d, e, a, b, c, F4, K4, 6, 8 );
-+ R( c, d, e, a, b, F4, K4, 15, 5 );
-+ R( b, c, d, e, a, F4, K4, 13, 6 );
-+
-+ aa = a; bb = b; cc = c; dd = d; ee = e;
-+
-+ /* right lane */
-+ a = hd->h0;
-+ b = hd->h1;
-+ c = hd->h2;
-+ d = hd->h3;
-+ e = hd->h4;
-+ R( a, b, c, d, e, F4, KK0, 5, 8);
-+ R( e, a, b, c, d, F4, KK0, 14, 9);
-+ R( d, e, a, b, c, F4, KK0, 7, 9);
-+ R( c, d, e, a, b, F4, KK0, 0, 11);
-+ R( b, c, d, e, a, F4, KK0, 9, 13);
-+ R( a, b, c, d, e, F4, KK0, 2, 15);
-+ R( e, a, b, c, d, F4, KK0, 11, 15);
-+ R( d, e, a, b, c, F4, KK0, 4, 5);
-+ R( c, d, e, a, b, F4, KK0, 13, 7);
-+ R( b, c, d, e, a, F4, KK0, 6, 7);
-+ R( a, b, c, d, e, F4, KK0, 15, 8);
-+ R( e, a, b, c, d, F4, KK0, 8, 11);
-+ R( d, e, a, b, c, F4, KK0, 1, 14);
-+ R( c, d, e, a, b, F4, KK0, 10, 14);
-+ R( b, c, d, e, a, F4, KK0, 3, 12);
-+ R( a, b, c, d, e, F4, KK0, 12, 6);
-+ R( e, a, b, c, d, F3, KK1, 6, 9);
-+ R( d, e, a, b, c, F3, KK1, 11, 13);
-+ R( c, d, e, a, b, F3, KK1, 3, 15);
-+ R( b, c, d, e, a, F3, KK1, 7, 7);
-+ R( a, b, c, d, e, F3, KK1, 0, 12);
-+ R( e, a, b, c, d, F3, KK1, 13, 8);
-+ R( d, e, a, b, c, F3, KK1, 5, 9);
-+ R( c, d, e, a, b, F3, KK1, 10, 11);
-+ R( b, c, d, e, a, F3, KK1, 14, 7);
-+ R( a, b, c, d, e, F3, KK1, 15, 7);
-+ R( e, a, b, c, d, F3, KK1, 8, 12);
-+ R( d, e, a, b, c, F3, KK1, 12, 7);
-+ R( c, d, e, a, b, F3, KK1, 4, 6);
-+ R( b, c, d, e, a, F3, KK1, 9, 15);
-+ R( a, b, c, d, e, F3, KK1, 1, 13);
-+ R( e, a, b, c, d, F3, KK1, 2, 11);
-+ R( d, e, a, b, c, F2, KK2, 15, 9);
-+ R( c, d, e, a, b, F2, KK2, 5, 7);
-+ R( b, c, d, e, a, F2, KK2, 1, 15);
-+ R( a, b, c, d, e, F2, KK2, 3, 11);
-+ R( e, a, b, c, d, F2, KK2, 7, 8);
-+ R( d, e, a, b, c, F2, KK2, 14, 6);
-+ R( c, d, e, a, b, F2, KK2, 6, 6);
-+ R( b, c, d, e, a, F2, KK2, 9, 14);
-+ R( a, b, c, d, e, F2, KK2, 11, 12);
-+ R( e, a, b, c, d, F2, KK2, 8, 13);
-+ R( d, e, a, b, c, F2, KK2, 12, 5);
-+ R( c, d, e, a, b, F2, KK2, 2, 14);
-+ R( b, c, d, e, a, F2, KK2, 10, 13);
-+ R( a, b, c, d, e, F2, KK2, 0, 13);
-+ R( e, a, b, c, d, F2, KK2, 4, 7);
-+ R( d, e, a, b, c, F2, KK2, 13, 5);
-+ R( c, d, e, a, b, F1, KK3, 8, 15);
-+ R( b, c, d, e, a, F1, KK3, 6, 5);
-+ R( a, b, c, d, e, F1, KK3, 4, 8);
-+ R( e, a, b, c, d, F1, KK3, 1, 11);
-+ R( d, e, a, b, c, F1, KK3, 3, 14);
-+ R( c, d, e, a, b, F1, KK3, 11, 14);
-+ R( b, c, d, e, a, F1, KK3, 15, 6);
-+ R( a, b, c, d, e, F1, KK3, 0, 14);
-+ R( e, a, b, c, d, F1, KK3, 5, 6);
-+ R( d, e, a, b, c, F1, KK3, 12, 9);
-+ R( c, d, e, a, b, F1, KK3, 2, 12);
-+ R( b, c, d, e, a, F1, KK3, 13, 9);
-+ R( a, b, c, d, e, F1, KK3, 9, 12);
-+ R( e, a, b, c, d, F1, KK3, 7, 5);
-+ R( d, e, a, b, c, F1, KK3, 10, 15);
-+ R( c, d, e, a, b, F1, KK3, 14, 8);
-+ R( b, c, d, e, a, F0, KK4, 12, 8);
-+ R( a, b, c, d, e, F0, KK4, 15, 5);
-+ R( e, a, b, c, d, F0, KK4, 10, 12);
-+ R( d, e, a, b, c, F0, KK4, 4, 9);
-+ R( c, d, e, a, b, F0, KK4, 1, 12);
-+ R( b, c, d, e, a, F0, KK4, 5, 5);
-+ R( a, b, c, d, e, F0, KK4, 8, 14);
-+ R( e, a, b, c, d, F0, KK4, 7, 6);
-+ R( d, e, a, b, c, F0, KK4, 6, 8);
-+ R( c, d, e, a, b, F0, KK4, 2, 13);
-+ R( b, c, d, e, a, F0, KK4, 13, 6);
-+ R( a, b, c, d, e, F0, KK4, 14, 5);
-+ R( e, a, b, c, d, F0, KK4, 0, 15);
-+ R( d, e, a, b, c, F0, KK4, 3, 13);
-+ R( c, d, e, a, b, F0, KK4, 9, 11);
-+ R( b, c, d, e, a, F0, KK4, 11, 11);
-+
-+
-+ t = hd->h1 + d + cc;
-+ hd->h1 = hd->h2 + e + dd;
-+ hd->h2 = hd->h3 + a + ee;
-+ hd->h3 = hd->h4 + b + aa;
-+ hd->h4 = hd->h0 + c + bb;
-+ hd->h0 = t;
-+}
-+
-+
-+/* Update the message digest with the contents
-+ * of INBUF with length INLEN.
-+ */
-+static void
-+rmd160_write( RMD160_CONTEXT *hd, byte *inbuf, size_t inlen)
-+{
-+ if( hd->count == 64 ) { /* flush the buffer */
-+ transform( hd, hd->buf );
-+ hd->count = 0;
-+ hd->nblocks++;
-+ }
-+ if( !inbuf )
-+ return;
-+ if( hd->count ) {
-+ for( ; inlen && hd->count < 64; inlen-- )
-+ hd->buf[hd->count++] = *inbuf++;
-+ rmd160_write( hd, NULL, 0 );
-+ if( !inlen )
-+ return;
-+ }
-+
-+ while( inlen >= 64 ) {
-+ transform( hd, inbuf );
-+ hd->count = 0;
-+ hd->nblocks++;
-+ inlen -= 64;
-+ inbuf += 64;
-+ }
-+ for( ; inlen && hd->count < 64; inlen-- )
-+ hd->buf[hd->count++] = *inbuf++;
-+}
-+
-+/* The routine terminates the computation
-+ */
-+
-+static void
-+rmd160_final( RMD160_CONTEXT *hd )
-+{
-+ u32 t, msb, lsb;
-+ byte *p;
-+
-+ rmd160_write(hd, NULL, 0); /* flush */;
-+
-+ msb = 0;
-+ t = hd->nblocks;
-+ if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
-+ msb++;
-+ msb += t >> 26;
-+ t = lsb;
-+ if( (lsb = t + hd->count) < t ) /* add the count */
-+ msb++;
-+ t = lsb;
-+ if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
-+ msb++;
-+ msb += t >> 29;
-+
-+ if( hd->count < 56 ) { /* enough room */
-+ hd->buf[hd->count++] = 0x80; /* pad */
-+ while( hd->count < 56 )
-+ hd->buf[hd->count++] = 0; /* pad */
-+ }
-+ else { /* need one extra block */
-+ hd->buf[hd->count++] = 0x80; /* pad character */
-+ while( hd->count < 64 )
-+ hd->buf[hd->count++] = 0;
-+ rmd160_write(hd, NULL, 0); /* flush */;
-+ memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
-+ }
-+ /* append the 64 bit count */
-+ hd->buf[56] = lsb ;
-+ hd->buf[57] = lsb >> 8;
-+ hd->buf[58] = lsb >> 16;
-+ hd->buf[59] = lsb >> 24;
-+ hd->buf[60] = msb ;
-+ hd->buf[61] = msb >> 8;
-+ hd->buf[62] = msb >> 16;
-+ hd->buf[63] = msb >> 24;
-+ transform( hd, hd->buf );
-+
-+ p = hd->buf;
-+ #if BYTE_ORDER == BIG_ENDIAN
-+ #define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \
-+ *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0)
-+ #else /* little endian */
-+ #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0)
-+ #endif
-+ X(0);
-+ X(1);
-+ X(2);
-+ X(3);
-+ X(4);
-+ #undef X
-+}
-+
-+/****************
-+ * Shortcut functions which puts the hash value of the supplied buffer
-+ * into outbuf which must have a size of 20 bytes.
-+ */
-+void
-+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length )
-+{
-+ RMD160_CONTEXT hd;
-+
-+ rmd160_init( &hd );
-+ rmd160_write( &hd, (byte*)buffer, length );
-+ rmd160_final( &hd );
-+ memcpy( outbuf, hd.buf, 20 );
-+}
-diff -urN util-linux-ng-2.14/mount/rmd160.h util-linux-ng-2.14-AES/mount/rmd160.h
---- util-linux-ng-2.14/mount/rmd160.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/rmd160.h 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,9 @@
-+#ifndef RMD160_H
-+#define RMD160_H
-+
-+void
-+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length );
-+
-+#endif /*RMD160_H*/
-+
-+
-diff -urN util-linux-ng-2.14/mount/sha512.c util-linux-ng-2.14-AES/mount/sha512.c
---- util-linux-ng-2.14/mount/sha512.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/sha512.c 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,432 @@
-+/*
-+ * sha512.c
-+ *
-+ * Written by Jari Ruusu, April 16 2001
-+ *
-+ * Copyright 2001 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU Public License.
-+ */
-+
-+#include <string.h>
-+#include <sys/types.h>
-+#include "sha512.h"
-+
-+/* Define one or more of these. If none is defined, you get all of them */
-+#if !defined(SHA256_NEEDED)&&!defined(SHA512_NEEDED)&&!defined(SHA384_NEEDED)
-+# define SHA256_NEEDED 1
-+# define SHA512_NEEDED 1
-+# define SHA384_NEEDED 1
-+#endif
-+
-+#if defined(SHA256_NEEDED)
-+static const u_int32_t sha256_hashInit[8] = {
-+ 0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c,
-+ 0x1f83d9ab, 0x5be0cd19
-+};
-+static const u_int32_t sha256_K[64] = {
-+ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
-+ 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-+ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
-+ 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
-+ 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-+ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
-+ 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
-+ 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-+ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-+};
-+#endif
-+
-+#if defined(SHA512_NEEDED)
-+static const u_int64_t sha512_hashInit[8] = {
-+ 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL,
-+ 0xa54ff53a5f1d36f1ULL, 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-+ 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-+};
-+#endif
-+
-+#if defined(SHA384_NEEDED)
-+static const u_int64_t sha384_hashInit[8] = {
-+ 0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, 0x9159015a3070dd17ULL,
-+ 0x152fecd8f70e5939ULL, 0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL,
-+ 0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL
-+};
-+#endif
-+
-+#if defined(SHA512_NEEDED) || defined(SHA384_NEEDED)
-+static const u_int64_t sha512_K[80] = {
-+ 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
-+ 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
-+ 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
-+ 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-+ 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
-+ 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-+ 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
-+ 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-+ 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
-+ 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
-+ 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
-+ 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-+ 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
-+ 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
-+ 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
-+ 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-+ 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
-+ 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-+ 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
-+ 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-+ 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
-+ 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
-+ 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
-+ 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-+ 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
-+ 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
-+ 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-+};
-+#endif
-+
-+#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-+#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-+#define R(x,y) ((y) >> (x))
-+
-+#if defined(SHA256_NEEDED)
-+void sha256_init(sha256_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha256_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+
-+#define S(x,y) (((y) >> (x)) | ((y) << (32 - (x))))
-+#define uSig0(x) ((S(2,(x))) ^ (S(13,(x))) ^ (S(22,(x))))
-+#define uSig1(x) ((S(6,(x))) ^ (S(11,(x))) ^ (S(25,(x))))
-+#define lSig0(x) ((S(7,(x))) ^ (S(18,(x))) ^ (R(3,(x))))
-+#define lSig1(x) ((S(17,(x))) ^ (S(19,(x))) ^ (R(10,(x))))
-+
-+static void sha256_transform(sha256_context *ctx, unsigned char *datap)
-+{
-+ register int j;
-+ u_int32_t a, b, c, d, e, f, g, h;
-+ u_int32_t T1, T2, W[64], Wm2, Wm15;
-+
-+ /* read the data, big endian byte order */
-+ j = 0;
-+ do {
-+ W[j] = (((u_int32_t)(datap[0]))<<24) | (((u_int32_t)(datap[1]))<<16) |
-+ (((u_int32_t)(datap[2]))<<8 ) | ((u_int32_t)(datap[3]));
-+ datap += 4;
-+ } while(++j < 16);
-+
-+ /* initialize variables a...h */
-+ a = ctx->sha_H[0];
-+ b = ctx->sha_H[1];
-+ c = ctx->sha_H[2];
-+ d = ctx->sha_H[3];
-+ e = ctx->sha_H[4];
-+ f = ctx->sha_H[5];
-+ g = ctx->sha_H[6];
-+ h = ctx->sha_H[7];
-+
-+ /* apply compression function */
-+ j = 0;
-+ do {
-+ if(j >= 16) {
-+ Wm2 = W[j - 2];
-+ Wm15 = W[j - 15];
-+ W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-+ }
-+ T1 = h + uSig1(e) + Ch(e,f,g) + sha256_K[j] + W[j];
-+ T2 = uSig0(a) + Maj(a,b,c);
-+ h = g; g = f; f = e;
-+ e = d + T1;
-+ d = c; c = b; b = a;
-+ a = T1 + T2;
-+ } while(++j < 64);
-+
-+ /* compute intermediate hash value */
-+ ctx->sha_H[0] += a;
-+ ctx->sha_H[1] += b;
-+ ctx->sha_H[2] += c;
-+ ctx->sha_H[3] += d;
-+ ctx->sha_H[4] += e;
-+ ctx->sha_H[5] += f;
-+ ctx->sha_H[6] += g;
-+ ctx->sha_H[7] += h;
-+
-+ ctx->sha_blocks++;
-+}
-+
-+void sha256_write(sha256_context *ctx, unsigned char *datap, int length)
-+{
-+ while(length > 0) {
-+ if(!ctx->sha_bufCnt) {
-+ while(length >= sizeof(ctx->sha_out)) {
-+ sha256_transform(ctx, datap);
-+ datap += sizeof(ctx->sha_out);
-+ length -= sizeof(ctx->sha_out);
-+ }
-+ if(!length) return;
-+ }
-+ ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-+ length--;
-+ if(++ctx->sha_bufCnt == sizeof(ctx->sha_out)) {
-+ sha256_transform(ctx, &ctx->sha_out[0]);
-+ ctx->sha_bufCnt = 0;
-+ }
-+ }
-+}
-+
-+void sha256_final(sha256_context *ctx)
-+{
-+ register int j;
-+ u_int64_t bitLength;
-+ u_int32_t i;
-+ unsigned char padByte, *datap;
-+
-+ bitLength = (ctx->sha_blocks << 9) | (ctx->sha_bufCnt << 3);
-+ padByte = 0x80;
-+ sha256_write(ctx, &padByte, 1);
-+
-+ /* pad extra space with zeroes */
-+ padByte = 0;
-+ while(ctx->sha_bufCnt != 56) {
-+ sha256_write(ctx, &padByte, 1);
-+ }
-+
-+ /* write bit length, big endian byte order */
-+ ctx->sha_out[56] = bitLength >> 56;
-+ ctx->sha_out[57] = bitLength >> 48;
-+ ctx->sha_out[58] = bitLength >> 40;
-+ ctx->sha_out[59] = bitLength >> 32;
-+ ctx->sha_out[60] = bitLength >> 24;
-+ ctx->sha_out[61] = bitLength >> 16;
-+ ctx->sha_out[62] = bitLength >> 8;
-+ ctx->sha_out[63] = bitLength;
-+ sha256_transform(ctx, &ctx->sha_out[0]);
-+
-+ /* return results in ctx->sha_out[0...31] */
-+ datap = &ctx->sha_out[0];
-+ j = 0;
-+ do {
-+ i = ctx->sha_H[j];
-+ datap[0] = i >> 24;
-+ datap[1] = i >> 16;
-+ datap[2] = i >> 8;
-+ datap[3] = i;
-+ datap += 4;
-+ } while(++j < 8);
-+
-+ /* clear sensitive information */
-+ memset(&ctx->sha_out[32], 0, sizeof(sha256_context) - 32);
-+}
-+
-+void sha256_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha256_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 32) ole = 32;
-+ sha256_init(&ctx);
-+ sha256_write(&ctx, ib, ile);
-+ sha256_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+
-+#endif
-+
-+#if defined(SHA512_NEEDED)
-+void sha512_init(sha512_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha512_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_blocksMSB = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+#endif
-+
-+#if defined(SHA512_NEEDED) || defined(SHA384_NEEDED)
-+#undef S
-+#undef uSig0
-+#undef uSig1
-+#undef lSig0
-+#undef lSig1
-+#define S(x,y) (((y) >> (x)) | ((y) << (64 - (x))))
-+#define uSig0(x) ((S(28,(x))) ^ (S(34,(x))) ^ (S(39,(x))))
-+#define uSig1(x) ((S(14,(x))) ^ (S(18,(x))) ^ (S(41,(x))))
-+#define lSig0(x) ((S(1,(x))) ^ (S(8,(x))) ^ (R(7,(x))))
-+#define lSig1(x) ((S(19,(x))) ^ (S(61,(x))) ^ (R(6,(x))))
-+
-+static void sha512_transform(sha512_context *ctx, unsigned char *datap)
-+{
-+ register int j;
-+ u_int64_t a, b, c, d, e, f, g, h;
-+ u_int64_t T1, T2, W[80], Wm2, Wm15;
-+
-+ /* read the data, big endian byte order */
-+ j = 0;
-+ do {
-+ W[j] = (((u_int64_t)(datap[0]))<<56) | (((u_int64_t)(datap[1]))<<48) |
-+ (((u_int64_t)(datap[2]))<<40) | (((u_int64_t)(datap[3]))<<32) |
-+ (((u_int64_t)(datap[4]))<<24) | (((u_int64_t)(datap[5]))<<16) |
-+ (((u_int64_t)(datap[6]))<<8 ) | ((u_int64_t)(datap[7]));
-+ datap += 8;
-+ } while(++j < 16);
-+
-+ /* initialize variables a...h */
-+ a = ctx->sha_H[0];
-+ b = ctx->sha_H[1];
-+ c = ctx->sha_H[2];
-+ d = ctx->sha_H[3];
-+ e = ctx->sha_H[4];
-+ f = ctx->sha_H[5];
-+ g = ctx->sha_H[6];
-+ h = ctx->sha_H[7];
-+
-+ /* apply compression function */
-+ j = 0;
-+ do {
-+ if(j >= 16) {
-+ Wm2 = W[j - 2];
-+ Wm15 = W[j - 15];
-+ W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-+ }
-+ T1 = h + uSig1(e) + Ch(e,f,g) + sha512_K[j] + W[j];
-+ T2 = uSig0(a) + Maj(a,b,c);
-+ h = g; g = f; f = e;
-+ e = d + T1;
-+ d = c; c = b; b = a;
-+ a = T1 + T2;
-+ } while(++j < 80);
-+
-+ /* compute intermediate hash value */
-+ ctx->sha_H[0] += a;
-+ ctx->sha_H[1] += b;
-+ ctx->sha_H[2] += c;
-+ ctx->sha_H[3] += d;
-+ ctx->sha_H[4] += e;
-+ ctx->sha_H[5] += f;
-+ ctx->sha_H[6] += g;
-+ ctx->sha_H[7] += h;
-+
-+ ctx->sha_blocks++;
-+ if(!ctx->sha_blocks) ctx->sha_blocksMSB++;
-+}
-+
-+void sha512_write(sha512_context *ctx, unsigned char *datap, int length)
-+{
-+ while(length > 0) {
-+ if(!ctx->sha_bufCnt) {
-+ while(length >= sizeof(ctx->sha_out)) {
-+ sha512_transform(ctx, datap);
-+ datap += sizeof(ctx->sha_out);
-+ length -= sizeof(ctx->sha_out);
-+ }
-+ if(!length) return;
-+ }
-+ ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-+ length--;
-+ if(++ctx->sha_bufCnt == sizeof(ctx->sha_out)) {
-+ sha512_transform(ctx, &ctx->sha_out[0]);
-+ ctx->sha_bufCnt = 0;
-+ }
-+ }
-+}
-+
-+void sha512_final(sha512_context *ctx)
-+{
-+ register int j;
-+ u_int64_t bitLength, bitLengthMSB;
-+ u_int64_t i;
-+ unsigned char padByte, *datap;
-+
-+ bitLength = (ctx->sha_blocks << 10) | (ctx->sha_bufCnt << 3);
-+ bitLengthMSB = (ctx->sha_blocksMSB << 10) | (ctx->sha_blocks >> 54);
-+ padByte = 0x80;
-+ sha512_write(ctx, &padByte, 1);
-+
-+ /* pad extra space with zeroes */
-+ padByte = 0;
-+ while(ctx->sha_bufCnt != 112) {
-+ sha512_write(ctx, &padByte, 1);
-+ }
-+
-+ /* write bit length, big endian byte order */
-+ ctx->sha_out[112] = bitLengthMSB >> 56;
-+ ctx->sha_out[113] = bitLengthMSB >> 48;
-+ ctx->sha_out[114] = bitLengthMSB >> 40;
-+ ctx->sha_out[115] = bitLengthMSB >> 32;
-+ ctx->sha_out[116] = bitLengthMSB >> 24;
-+ ctx->sha_out[117] = bitLengthMSB >> 16;
-+ ctx->sha_out[118] = bitLengthMSB >> 8;
-+ ctx->sha_out[119] = bitLengthMSB;
-+ ctx->sha_out[120] = bitLength >> 56;
-+ ctx->sha_out[121] = bitLength >> 48;
-+ ctx->sha_out[122] = bitLength >> 40;
-+ ctx->sha_out[123] = bitLength >> 32;
-+ ctx->sha_out[124] = bitLength >> 24;
-+ ctx->sha_out[125] = bitLength >> 16;
-+ ctx->sha_out[126] = bitLength >> 8;
-+ ctx->sha_out[127] = bitLength;
-+ sha512_transform(ctx, &ctx->sha_out[0]);
-+
-+ /* return results in ctx->sha_out[0...63] */
-+ datap = &ctx->sha_out[0];
-+ j = 0;
-+ do {
-+ i = ctx->sha_H[j];
-+ datap[0] = i >> 56;
-+ datap[1] = i >> 48;
-+ datap[2] = i >> 40;
-+ datap[3] = i >> 32;
-+ datap[4] = i >> 24;
-+ datap[5] = i >> 16;
-+ datap[6] = i >> 8;
-+ datap[7] = i;
-+ datap += 8;
-+ } while(++j < 8);
-+
-+ /* clear sensitive information */
-+ memset(&ctx->sha_out[64], 0, sizeof(sha512_context) - 64);
-+}
-+
-+void sha512_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha512_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 64) ole = 64;
-+ sha512_init(&ctx);
-+ sha512_write(&ctx, ib, ile);
-+ sha512_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+#endif
-+
-+#if defined(SHA384_NEEDED)
-+void sha384_init(sha512_context *ctx)
-+{
-+ memcpy(&ctx->sha_H[0], &sha384_hashInit[0], sizeof(ctx->sha_H));
-+ ctx->sha_blocks = 0;
-+ ctx->sha_blocksMSB = 0;
-+ ctx->sha_bufCnt = 0;
-+}
-+
-+void sha384_hash_buffer(unsigned char *ib, int ile, unsigned char *ob, int ole)
-+{
-+ sha512_context ctx;
-+
-+ if(ole < 1) return;
-+ memset(ob, 0, ole);
-+ if(ole > 48) ole = 48;
-+ sha384_init(&ctx);
-+ sha512_write(&ctx, ib, ile);
-+ sha512_final(&ctx);
-+ memcpy(ob, &ctx.sha_out[0], ole);
-+ memset(&ctx, 0, sizeof(ctx));
-+}
-+#endif
-diff -urN util-linux-ng-2.14/mount/sha512.h util-linux-ng-2.14-AES/mount/sha512.h
---- util-linux-ng-2.14/mount/sha512.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.14-AES/mount/sha512.h 2008-06-24 16:55:13.000000000 +0300
-@@ -0,0 +1,45 @@
-+/*
-+ * sha512.h
-+ *
-+ * Written by Jari Ruusu, April 16 2001
-+ *
-+ * Copyright 2001 by Jari Ruusu.
-+ * Redistribution of this file is permitted under the GNU Public License.
-+ */
-+
-+#include <sys/types.h>
-+
-+typedef struct {
-+ unsigned char sha_out[64]; /* results are here, bytes 0...31 */
-+ u_int32_t sha_H[8];
-+ u_int64_t sha_blocks;
-+ int sha_bufCnt;
-+} sha256_context;
-+
-+typedef struct {
-+ unsigned char sha_out[128]; /* results are here, bytes 0...63 */
-+ u_int64_t sha_H[8];
-+ u_int64_t sha_blocks;
-+ u_int64_t sha_blocksMSB;
-+ int sha_bufCnt;
-+} sha512_context;
-+
-+/* no sha384_context, use sha512_context */
-+
-+/* 256 bit hash, provides 128 bits of security against collision attacks */
-+extern void sha256_init(sha256_context *);
-+extern void sha256_write(sha256_context *, unsigned char *, int);
-+extern void sha256_final(sha256_context *);
-+extern void sha256_hash_buffer(unsigned char *, int, unsigned char *, int);
-+
-+/* 512 bit hash, provides 256 bits of security against collision attacks */
-+extern void sha512_init(sha512_context *);
-+extern void sha512_write(sha512_context *, unsigned char *, int);
-+extern void sha512_final(sha512_context *);
-+extern void sha512_hash_buffer(unsigned char *, int, unsigned char *, int);
-+
-+/* 384 bit hash, provides 192 bits of security against collision attacks */
-+extern void sha384_init(sha512_context *);
-+/* 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 -urN util-linux-ng-2.14/mount/swapon.8 util-linux-ng-2.14-AES/mount/swapon.8
---- util-linux-ng-2.14/mount/swapon.8 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/swapon.8 2008-06-24 16:55:13.000000000 +0300
-@@ -136,6 +136,22 @@
- .I /proc/swaps
- or
- .IR /etc/fstab ).
-+.PP
-+If
-+.I loop=/dev/loop?
-+and
-+.I encryption=AES128
-+options are present in
-+.I /etc/fstab
-+then
-+.BR "swapon -a"
-+will set up loop devices using random keys, run
-+.BR "mkswap"
-+on them, and enable encrypted swap on specified loop devices. Encrypted loop
-+devices are set up with page size offset so that unencrypted swap signatures
-+on first page of swap devices are not touched.
-+.BR "swapoff -a"
-+will tear down such loop devices.
- .SH NOTE
- You should not use
- .B swapon
-diff -urN util-linux-ng-2.14/mount/swapon.c util-linux-ng-2.14-AES/mount/swapon.c
---- util-linux-ng-2.14/mount/swapon.c 2008-05-29 02:01:02.000000000 +0300
-+++ util-linux-ng-2.14-AES/mount/swapon.c 2008-06-24 16:55:13.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@waw.com>
-+ * - added '-s' (summary option)
-+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-+ * - added Native Language Support
-+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * - fixed strerr(errno) in gettext calls
-+ * 2001-03-22 Erik Troan <ewt@redhat.com>
-+ * - added -e option for -a
-+ * - -a shouldn't try to add swaps that are already enabled
-+ * 2002-04-14 Jari Ruusu
-+ * - added encrypted swap support
- */
- #include <ctype.h>
- #include <stdlib.h>
-@@ -9,6 +22,9 @@
- #include <mntent.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
-+#include <sys/utsname.h>
-+#include <sys/time.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -20,6 +36,9 @@
- #include "realpath.h"
- #include "pathnames.h"
- #include "sundries.h"
-+#include "loop.h"
-+#include "xstrncpy.h"
-+#include "sha512.h"
-
- #define PATH_MKSWAP "/sbin/mkswap"
-
-@@ -381,6 +400,262 @@
- }
-
- static int
-+prepare_encrypted_swap(const char *partition, char *loop, char *encryption)
-+{
-+ int x, y, fd, ffd;
-+ int page_size;
-+ sha512_context s;
-+ unsigned char b[4096], multiKeyBits[65][32];
-+ char *a[10], *apiName;
-+ struct loop_info64 loopinfo;
-+ FILE *f;
-+
-+ /*
-+ * Some sanity checks
-+ */
-+ if(strlen(partition) < 1) {
-+ fprintf(stderr, _("swapon: invalid swap device name\n"));
-+ return 0;
-+ }
-+ if(strlen(loop) < 1) {
-+ fprintf(stderr, _("swapon: invalid loop device name\n"));
-+ return 0;
-+ }
-+ if(strlen(encryption) < 1) {
-+ fprintf(stderr, _("swapon: invalid encryption type\n"));
-+ return 0;
-+ }
-+
-+ /*
-+ * Abort if loop device does not exist or is already in use
-+ */
-+ if((fd = open(loop, O_RDWR)) == -1) {
-+ fprintf(stderr, _("swapon: unable to open loop device %s\n"), loop);
-+ return 0;
-+ }
-+ if(is_unused_loop_device(fd) == 0) {
-+ fprintf(stderr, _("swapon: loop device %s already in use\n"), loop);
-+ goto errout0;
-+ }
-+
-+ /*
-+ * Compute SHA-512 over first 40 KB of old swap data. This data
-+ * is mostly unknown data encrypted using unknown key. SHA-512 hash
-+ * output is then used as entropy for new swap encryption key.
-+ */
-+ if(!(f = fopen(partition, "r+"))) {
-+ fprintf(stderr, _("swapon: unable to open swap device %s\n"), partition);
-+ goto errout0;
-+ }
-+ page_size = getpagesize();
-+ fseek(f, (long)page_size, SEEK_SET);
-+ sha512_init(&s);
-+ for(x = 0; x < 10; x++) {
-+ if(fread(&b[0], sizeof(b), 1, f) != 1) break;
-+ sha512_write(&s, &b[0], sizeof(b));
-+ }
-+ sha512_final(&s);
-+
-+ /*
-+ * Overwrite 40 KB of old swap data 20 times so that recovering
-+ * SHA-512 output beyond this point is difficult and expensive.
-+ */
-+ for(y = 0; y < 20; y++) {
-+ int z;
-+ struct {
-+ struct timeval tv;
-+ unsigned char h[64];
-+ int x,y,z;
-+ } j;
-+ if(fseek(f, (long)page_size, SEEK_SET)) break;
-+ memcpy(&j.h[0], &s.sha_out[0], 64);
-+ gettimeofday(&j.tv, NULL);
-+ j.y = y;
-+ for(x = 0; x < 10; x++) {
-+ j.x = x;
-+ for(z = 0; z < sizeof(b); z += 64) {
-+ j.z = z;
-+ sha512_hash_buffer((unsigned char *)&j, sizeof(j), &b[z], 64);
-+ }
-+ if(fwrite(&b[0], sizeof(b), 1, f) != 1) break;
-+ }
-+ memset(&j, 0, sizeof(j));
-+ if(fflush(f)) break;
-+ if(fsync(fileno(f))) break;
-+ }
-+ fclose(f);
-+
-+ /*
-+ * Use all 512 bits of hash output
-+ */
-+ memcpy(&b[0], &s.sha_out[0], 64);
-+ memset(&s, 0, sizeof(s));
-+
-+ /*
-+ * Read 32 bytes of random entropy from kernel's random
-+ * number generator. This code may be executed early on startup
-+ * scripts and amount of random entropy may be non-existent.
-+ * SHA-512 of old swap data is used as workaround for missing
-+ * entropy in kernel's random number generator.
-+ */
-+ if(!(f = fopen("/dev/urandom", "r"))) {
-+ fprintf(stderr, _("swapon: unable to open /dev/urandom\n"));
-+ goto errout0;
-+ }
-+ fread(&b[64], 32, 1, f);
-+
-+ /*
-+ * Set up struct loop_info64
-+ */
-+ if((ffd = open(partition, O_RDWR)) < 0) {
-+ fprintf(stderr, _("swapon: unable to open swap device %s\n"), partition);
-+ goto errout1;
-+ }
-+ memset(&loopinfo, 0, sizeof(loopinfo));
-+ xstrncpy((char *)loopinfo.lo_file_name, partition, LO_NAME_SIZE);
-+ loopinfo.lo_encrypt_type = loop_crypt_type(encryption, &loopinfo.lo_encrypt_key_size, &apiName);
-+ if(loopinfo.lo_encrypt_type <= 1) {
-+ fprintf(stderr, _("swapon: unsupported swap encryption type %s\n"), encryption);
-+errout2:
-+ close(ffd);
-+errout1:
-+ fclose(f);
-+errout0:
-+ close(fd);
-+ memset(&loopinfo.lo_encrypt_key[0], 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+ return 0;
-+ }
-+ loopinfo.lo_offset = page_size;
-+ /* single-key hash */
-+ sha512_hash_buffer(&b[0], 64+32, &loopinfo.lo_encrypt_key[0], sizeof(loopinfo.lo_encrypt_key));
-+ /* multi-key hash */
-+ x = 0;
-+ while(x < 65) {
-+ fread(&b[64+32], 16, 1, f);
-+ sha512_hash_buffer(&b[0], 64+32+16, &multiKeyBits[x][0], 32);
-+ x++;
-+ }
-+
-+ /*
-+ * Try to set up single-key loop
-+ */
-+ if(ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-+ fprintf(stderr, _("swapon: LOOP_SET_FD failed\n"));
-+ goto errout2;
-+ }
-+ if ((loopinfo.lo_encrypt_type == 18) || (loop_set_status64_ioctl(fd, &loopinfo) < 0)) {
-+ if(try_cryptoapi_loop_interface(fd, &loopinfo, apiName) < 0) {
-+ fprintf(stderr, _("swapon: LOOP_SET_STATUS failed\n"));
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ goto errout2;
-+ }
-+ }
-+
-+ /*
-+ * Try to put loop to multi-key v3 or v2 mode.
-+ * If this fails, then let it operate in single-key mode.
-+ */
-+ if(ioctl(fd, LOOP_MULTI_KEY_SETUP_V3, &multiKeyBits[0][0]) < 0) {
-+ ioctl(fd, LOOP_MULTI_KEY_SETUP, &multiKeyBits[0][0]);
-+ }
-+
-+ /*
-+ * Loop is now set up. Clean up the keys.
-+ */
-+ memset(&loopinfo.lo_encrypt_key[0], 0, sizeof(loopinfo.lo_encrypt_key));
-+ memset(&multiKeyBits[0][0], 0, sizeof(multiKeyBits));
-+ close(ffd);
-+ fclose(f);
-+ close(fd);
-+
-+ /*
-+ * Write 40 KB of zeroes to loop device. That same data is written
-+ * to underlying partition in encrypted form. This is done to guarantee
-+ * that next time encrypted swap is initialized, the SHA-512 hash will
-+ * be different. And, if encrypted swap data writes over this data, that's
-+ * even better.
-+ */
-+ if(!(f = fopen(loop, "r+"))) {
-+ fprintf(stderr, _("swapon: unable to open loop device %s\n"), loop);
-+ return 0;
-+ }
-+ memset(&b[0], 0, sizeof(b));
-+ for(x = 0; x < 10; x++) {
-+ if(fwrite(&b[0], sizeof(b), 1, f) != 1) break;
-+ }
-+ fflush(f);
-+ fsync(fileno(f));
-+ fclose(f);
-+ sync();
-+
-+ /*
-+ * Run mkswap on loop device so that kernel understands it as swap.
-+ * Redirect stderr to /dev/null and ignore exit value.
-+ */
-+ if(!(x = fork())) {
-+ if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+ dup2(x, 2);
-+ close(x);
-+ }
-+ a[0] = "mkswap";
-+ a[1] = loop;
-+ a[2] = 0;
-+ execvp(a[0], &a[0]);
-+ execv("/sbin/mkswap", &a[0]);
-+ /* error to stdout, stderr is directed to /dev/null */
-+ printf(_("swapon: unable to execute mkswap\n"));
-+ exit(1);
-+ }
-+ if(x == -1) {
-+ fprintf(stderr, _("swapon: fork failed\n"));
-+ return 0;
-+ }
-+ waitpid(x, &y, 0);
-+ sync();
-+
-+ return 1;
-+}
-+
-+static void
-+shutdown_encrypted_swap(char *loop)
-+{
-+ int fd;
-+ struct stat statbuf;
-+ struct loop_info64 loopinfo;
-+ unsigned char b[32];
-+ FILE *f;
-+
-+ if(stat(loop, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
-+ if((fd = open(loop, O_RDWR)) >= 0) {
-+ if(!loop_get_status64_ioctl(fd, &loopinfo)) {
-+ /*
-+ * Read 32 bytes of random data from kernel's random
-+ * number generator and write that to loop device.
-+ * This preserves some of kernel's random entropy
-+ * to next activation of encrypted swap on this
-+ * partition.
-+ */
-+ if((f = fopen("/dev/urandom", "r")) != NULL) {
-+ fread(&b[0], 32, 1, f);
-+ fclose(f);
-+ write(fd, &b[0], 32);
-+ fsync(fd);
-+ }
-+ }
-+ close(fd);
-+ }
-+ sync();
-+ if((fd = open(loop, O_RDONLY)) >= 0) {
-+ if(!loop_get_status64_ioctl(fd, &loopinfo)) {
-+ ioctl(fd, LOOP_CLR_FD, 0);
-+ }
-+ close(fd);
-+ }
-+ }
-+}
-+
-+static int
- swapon_all(void) {
- FILE *fp;
- struct mntent *fstab;
-@@ -400,6 +675,8 @@
- const char *special;
- int skip = 0;
- int pri = priority;
-+ char *opt, *opts;
-+ char *loop = NULL, *encryption = NULL;
-
- if (!streq(fstab->mnt_type, MNTTYPE_SWAP))
- continue;
-@@ -408,23 +685,39 @@
- if (!special)
- continue;
-
-- if (!is_in_proc_swaps(special) &&
-- (!ifexists || !access(special, R_OK))) {
-- /* parse mount options; */
-- char *opt, *opts = strdup(fstab->mnt_opts);
--
-- for (opt = strtok(opts, ","); opt != NULL;
-- opt = strtok(NULL, ",")) {
-- if (strncmp(opt, "pri=", 4) == 0)
-- pri = atoi(opt+4);
-- if (strcmp(opt, "noauto") == 0)
-- skip = 1;
-+ /* parse mount options; */
-+ opts = strdup(fstab->mnt_opts);
-+ if (!opts) {
-+ fprintf(stderr, "not enough memory");
-+ exit(1);
-+ }
-+ for (opt = strtok(opts, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ if (strncmp(opt, "pri=", 4) == 0)
-+ pri = atoi(opt+4);
-+ if (strcmp(opt, "noauto") == 0)
-+ skip = 1;
-+ if (strncmp(opt, "loop=", 5) == 0)
-+ loop = opt + 5;
-+ if (strncmp(opt, "encryption=", 11) == 0)
-+ encryption = opt + 11;
-+ }
-+ if(skip)
-+ continue;
-+ if (loop && encryption) {
-+ if(!is_in_proc_swaps(loop) && (!ifexists || !access(special, R_OK))) {
-+ if (!prepare_encrypted_swap(special, loop, encryption)) {
-+ status |= -1;
-+ 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))) {
-+ status |= do_swapon(special, pri, CANONIC);
- }
- }
-- fclose(fp);
-+ endmntent(fp);
-
- return status;
- }
-@@ -587,19 +880,51 @@
- exit(2);
- }
- while ((fstab = getmntent(fp)) != NULL) {
-+ const char *orig_special = fstab->mnt_fsname;
- const char *special;
-+ int skip = 0;
-+ char *opt, *opts;
-+ char *loop = NULL, *encryption = NULL;
-
- if (!streq(fstab->mnt_type, MNTTYPE_SWAP))
- continue;
-
-- special = fsprobe_get_devname(fstab->mnt_fsname);
-+ special = fsprobe_get_devname(orig_special);
- if (!special)
- continue;
-
-- if (!is_in_proc_swaps(special))
-+ /* parse mount options; */
-+ opts = strdup(fstab->mnt_opts);
-+ if (!opts) {
-+ fprintf(stderr, "not enough memory");
-+ exit(1);
-+ }
-+ for (opt = strtok(opts, ","); opt != NULL; opt = strtok(NULL, ",")) {
-+ if (strcmp(opt, "noauto") == 0)
-+ skip = 1;
-+ if (strncmp(opt, "loop=", 5) == 0)
-+ loop = opt + 5;
-+ if (strncmp(opt, "encryption=", 11) == 0)
-+ encryption = opt + 11;
-+ }
-+ if (loop && encryption) {
-+ if (!is_in_proc_swaps(loop)) {
-+ if(skip)
-+ continue;
-+ do_swapoff(loop, QUIET, CANONIC);
-+ }
-+ shutdown_encrypted_swap(loop);
-+ continue;
-+ }
-+ if(skip)
-+ continue;
-+ if (!is_in_proc_swaps(special)) {
- do_swapoff(special, QUIET, CANONIC);
-+ }
-+
-+
- }
-- fclose(fp);
-+ endmntent(fp);
- }
-
- return status;
diff --git a/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch b/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch
new file mode 100644
index 0000000..bc60e43
--- /dev/null
+++ b/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch
@@ -0,0 +1,57 @@
+From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 19 Jul 2010 22:52:58 +0200
+Subject: [PATCH] cfdisk: get_string not calculating correct limits
+
+Reported-by: James L. Hammons <jlhamm@acm.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ fdisk/cfdisk.c | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
+index 7fa0b19..e7955fe 100644
+--- a/fdisk/cfdisk.c
++++ b/fdisk/cfdisk.c
+@@ -421,6 +421,11 @@ fdexit(int ret) {
+ exit(ret);
+ }
+
++/*
++ * Note that @len is size of @str buffer.
++ *
++ * Returns number of read bytes (without \0).
++ */
+ static int
+ get_string(char *str, int len, char *def) {
+ size_t cells = 0, i = 0;
+@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) {
+ break;
+ default:
+ #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
+- if (i < len && iswprint(c)) {
++ if (i + 1 < len && iswprint(c)) {
+ wchar_t wc = (wchar_t) c;
+ char s[MB_CUR_MAX + 1];
+ int sz = wctomb(s, wc);
+@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) {
+ putchar(BELL);
+ }
+ #else
+- if (i < len && isprint(c)) {
++ if (i + 1 < len && isprint(c)) {
+ mvaddch(y, x + cells, c);
+ if (use_def) {
+ clrtoeol();
+@@ -2405,7 +2410,7 @@ change_id(int i) {
+
+ sprintf(def, "%02X", new_id);
+ mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
+- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
++ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
+ return;
+
+ if (len != GS_DEFAULT) {
+--
+1.7.2.1
+
diff --git a/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch b/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch
new file mode 100644
index 0000000..3ac215b
--- /dev/null
+++ b/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch
@@ -0,0 +1,276 @@
+From b44b8600d4096de8203c1fb0702bbc95ee51017f Mon Sep 17 00:00:00 2001
+From: Jiro SEKIBA <jir@unicus.jp>
+Date: Tue, 13 Jul 2010 09:12:56 +0200
+Subject: [PATCH] libblkid: add nilfs2 filesystem superblock probe
+
+This patch implements nilfs2_idinfo to proble nilfs2 partition.
+The patch probes uuid, label, version and verify crc check sum of
+superblock.
+
+Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ shlibs/blkid/src/superblocks/Makefile.am | 1 +
+ shlibs/blkid/src/superblocks/nilfs.c | 120 ++++++++++++++++++++++++++++
+ shlibs/blkid/src/superblocks/superblocks.c | 1 +
+ shlibs/blkid/src/superblocks/superblocks.h | 1 +
+ 4 files changed, 123 insertions(+), 0 deletions(-)
+ create mode 100644 shlibs/blkid/src/superblocks/nilfs.c
+
+diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am
+index 39b074b..1501fab 100644
+--- a/shlibs/blkid/src/superblocks/Makefile.am
++++ b/shlibs/blkid/src/superblocks/Makefile.am
+@@ -47,4 +47,5 @@ libblkid_superblocks_la_SOURCES = \
+ drbd.c \
+ vmfs.c \
+ befs.c \
++ nilfs.c \
+ exfat.c
+diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c
+new file mode 100644
+index 0000000..c7aba35
+--- /dev/null
++++ b/shlibs/blkid/src/superblocks/nilfs.c
+@@ -0,0 +1,120 @@
++/*
++ * Copyright (C) 2010 by Jiro SEKIBA <jir@unicus.jp>
++ *
++ * This file may be redistributed under the terms of the
++ * GNU Lesser General Public License
++ */
++#include <stddef.h>
++#include <string.h>
++
++#include "superblocks.h"
++#include "crc32.h"
++
++struct nilfs_super_block {
++ uint32_t s_rev_level;
++ uint16_t s_minor_rev_level;
++ uint16_t s_magic;
++
++ uint16_t s_bytes;
++
++ uint16_t s_flags;
++ uint32_t s_crc_seed;
++ uint32_t s_sum;
++
++ uint32_t s_log_block_size;
++
++ uint64_t s_nsegments;
++ uint64_t s_dev_size;
++ uint64_t s_first_data_block;
++ uint32_t s_blocks_per_segment;
++ uint32_t s_r_segments_percentage;
++
++ uint64_t s_last_cno;
++ uint64_t s_last_pseg;
++ uint64_t s_last_seq;
++ uint64_t s_free_blocks_count;
++
++ uint64_t s_ctime;
++
++ uint64_t s_mtime;
++ uint64_t s_wtime;
++ uint16_t s_mnt_count;
++ uint16_t s_max_mnt_count;
++ uint16_t s_state;
++ uint16_t s_errors;
++ uint64_t s_lastcheck;
++
++ uint32_t s_checkinterval;
++ uint32_t s_creator_os;
++ uint16_t s_def_resuid;
++ uint16_t s_def_resgid;
++ uint32_t s_first_ino;
++
++ uint16_t s_inode_size;
++ uint16_t s_dat_entry_size;
++ uint16_t s_checkpoint_size;
++ uint16_t s_segment_usage_size;
++
++ uint8_t s_uuid[16];
++ char s_volume_name[80];
++
++ uint32_t s_c_interval;
++ uint32_t s_c_block_max;
++ uint32_t s_reserved[192];
++};
++
++/* nilfs2 magic string */
++#define NILFS_SB_MAGIC "\x34\x34"
++/* nilfs2 super block offset */
++#define NILFS_SB_OFF 0x400
++/* nilfs2 super block offset in kB */
++#define NILFS_SB_KBOFF (NILFS_SB_OFF >> 10)
++/* nilfs2 magic string offset within super block */
++#define NILFS_MAG_OFF 6
++
++static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag)
++{
++ struct nilfs_super_block *sb;
++ static unsigned char sum[4];
++ const int sumoff = offsetof(struct nilfs_super_block, s_sum);
++ size_t bytes;
++ uint32_t crc;
++
++ sb = blkid_probe_get_sb(pr, mag, struct nilfs_super_block);
++ if (!sb)
++ return -1;
++
++ bytes = le32_to_cpu(sb->s_bytes);
++ crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff);
++ crc = crc32(crc, sum, 4);
++ crc = crc32(crc, (unsigned char *)sb + sumoff + 4, bytes - sumoff - 4);
++
++ if (crc != le32_to_cpu(sb->s_sum))
++ return -1;
++
++ if (strlen(sb->s_volume_name))
++ blkid_probe_set_label(pr, (unsigned char *) sb->s_volume_name,
++ sizeof(sb->s_volume_name));
++
++ blkid_probe_set_uuid(pr, sb->s_uuid);
++ blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(sb->s_rev_level));
++
++ return 0;
++}
++
++const struct blkid_idinfo nilfs2_idinfo =
++{
++ .name = "nilfs",
++ .usage = BLKID_USAGE_FILESYSTEM,
++ .probefunc = probe_nilfs2,
++ .magics =
++ {
++ {
++ .magic = NILFS_SB_MAGIC,
++ .len = 2,
++ .kboff = NILFS_SB_KBOFF,
++ .sboff = NILFS_MAG_OFF
++ },
++ { NULL }
++ }
++};
+diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c
+index b80c10b..3d66d98 100644
+--- a/shlibs/blkid/src/superblocks/superblocks.c
++++ b/shlibs/blkid/src/superblocks/superblocks.c
+@@ -140,6 +140,7 @@ static const struct blkid_idinfo *idinfos[] =
+ &bfs_idinfo,
+ &vmfs_fs_idinfo,
+ &befs_idinfo,
++ &nilfs2_idinfo,
+ &exfat_idinfo
+ };
+
+diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h
+index 74cb974..a79d7cb 100644
+--- a/shlibs/blkid/src/superblocks/superblocks.h
++++ b/shlibs/blkid/src/superblocks/superblocks.h
+@@ -65,6 +65,7 @@ extern const struct blkid_idinfo vmfs_volume_idinfo;
+ extern const struct blkid_idinfo vmfs_fs_idinfo;
+ extern const struct blkid_idinfo drbd_idinfo;
+ extern const struct blkid_idinfo befs_idinfo;
++extern const struct blkid_idinfo nilfs2_idinfo;
+ extern const struct blkid_idinfo exfat_idinfo;
+
+ /*
+--
+1.7.2.1
+From 67bb0074eec2b154d15bd3dd77b482c3d6125761 Mon Sep 17 00:00:00 2001
+From: Jiro SEKIBA <jir@unicus.jp>
+Date: Tue, 13 Jul 2010 09:14:08 +0200
+Subject: [PATCH] tests: add nilfs2 test for libblkid
+
+Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ tests/expected/blkid/low-probe-nilfs2 | 7 +++++++
+ tests/ts/blkid/images-fs/nilfs2.img.bz2 | Bin 0 -> 795 bytes
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+ create mode 100644 tests/expected/blkid/low-probe-nilfs2
+ create mode 100644 tests/ts/blkid/images-fs/nilfs2.img.bz2
+
+diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2
+new file mode 100644
+index 0000000..bfd8fcd
+--- /dev/null
++++ b/tests/expected/blkid/low-probe-nilfs2
+@@ -0,0 +1,7 @@
++ID_FS_LABEL=test-nilfs2
++ID_FS_LABEL_ENC=test-nilfs2
++ID_FS_TYPE=nilfs
++ID_FS_USAGE=filesystem
++ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806
++ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806
++ID_FS_VERSION=2
+diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2
+new file mode 100644
+index 0000000000000000000000000000000000000000..a9762eb1ace9f1999aaad3c40f1d836668d856ac
+GIT binary patch
+literal 795
+zcmZ>Y%CIzaj8qGbG`Ml9n}H$iKM?$BcJi+ANKl`nz?|O0@_@lbK*y;^z=e@R;iM8v
+z^#R6D2YV7HdVE!LUvc5DPv^n~3?@drY>Er`xpEzs%?rp}D3rOt`HEDABm)D32?GP;
+z0!EREipv^IOn^)V240{j^Q<Hzqs++;Mp8zSMhpyWZZoCW1WqjeK1)#Iz#6seeHv~(
+zmxJ_T@69=2^IA3QjKnD|>vorkjN+>MH*4-%s37X<)*F#v)Rf{P;KEe-N=h(9AxK5r
+zNaB>=<>ixS2R?swwRU~FskVY@0E2@ILyiK&T}MB??Mn}*D~htZ3cdTZRH0!*OIOhp
+zuF1Yi0SZB_TmsB4k61&aUN!_Ugm_J068*5`gF*w#0teARmnpo_kuT2~GOf!|DtB62
+z!)T++5$eFKB*GXf;<I9F!NQM?v;8`}*7b6px{&k4S4E)bP}5GYFDbo;*GrVLFkN9@
+z@@Z9sSb~JGco?eycMA(Q^Ph&Ju|ft>1p%^G=UuLqkPtM9ycck)X|u7g*QFMo>QK!;
+zURQKH*iWxuZsIwzh@rOT!@1{s7L*D22$pQI7i2k@S1M-~SA2Zm@7XFsJ@fXR;7eg<
+zQ4&<W_Vc7f@7p(fvkiM$nYo*^O$-78_-wK~RVMkbV1D8JQ`OC<q49;V$o`^l=O3L4
+zcH6Z3#E!YsGG`s)RMF~EOO1d3>aY{zarw_8qLWfhCp?&^`$6=_69yh&WHm7`bFf@V
+z(PE04u!6IgDET?h6*ny4n=k(V{?{W7DhkUTSQr9X7>p_oxG=CVFtI2!vN$jZD6(v3
+z;O=l+m1w{)gHeLB;X+0N+bk2QBw&h}z@#bCHj{nH7h4xLj+2u!PE3DPVsFhCSH8Sp
+zT}DV?fa{Ns2bOWHVhs!t%xc}wps|W$-`>x&rn$fKjBA>})U}{HMs?HV9M&t-a)KVS
+zYg}FWIQh_-FYD!hutchUy`86XxmogM<nBjObNPCsG{5_M%3n}$Xkh3NkUdt<dS{}a
+Lh>ElVLy7|cD)2Ck
+
+literal 0
+HcmV?d00001
+
+--
+1.7.2.1
+From 1326e1dfa5c1d06ff7521b8c8162452799164239 Mon Sep 17 00:00:00 2001
+From: Jiro SEKIBA <jir@unicus.jp>
+Date: Thu, 15 Jul 2010 13:40:27 +0900
+Subject: [PATCH] libblkid: fix typo filesystem name nilfs to nilfs2
+
+The correct filesystem name is nilfs2, not nilfs.
+
+Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
+---
+ shlibs/blkid/src/superblocks/nilfs.c | 2 +-
+ tests/expected/blkid/low-probe-nilfs2 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c
+index c7aba35..bf16918 100644
+--- a/shlibs/blkid/src/superblocks/nilfs.c
++++ b/shlibs/blkid/src/superblocks/nilfs.c
+@@ -104,7 +104,7 @@ static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag)
+
+ const struct blkid_idinfo nilfs2_idinfo =
+ {
+- .name = "nilfs",
++ .name = "nilfs2",
+ .usage = BLKID_USAGE_FILESYSTEM,
+ .probefunc = probe_nilfs2,
+ .magics =
+diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2
+index bfd8fcd..c6c9cab 100644
+--- a/tests/expected/blkid/low-probe-nilfs2
++++ b/tests/expected/blkid/low-probe-nilfs2
+@@ -1,6 +1,6 @@
+ ID_FS_LABEL=test-nilfs2
+ ID_FS_LABEL_ENC=test-nilfs2
+-ID_FS_TYPE=nilfs
++ID_FS_TYPE=nilfs2
+ ID_FS_USAGE=filesystem
+ ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806
+ ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806
+--
+1.7.2.1
+
diff --git a/abs/core/util-linux-ng/util-linux-ng.install b/abs/core/util-linux-ng/util-linux-ng.install
index 22d38db..b057db9 100644
--- a/abs/core/util-linux-ng/util-linux-ng.install
+++ b/abs/core/util-linux-ng/util-linux-ng.install
@@ -1,5 +1,5 @@
infodir=/usr/share/info
-filelist=(ipc.info)
+filelist=(ipc.info.gz)
post_install() {
[ -x usr/bin/install-info ] || return 0