SOURCES: util-linux-dm_crypt.patch - CRYPT_FLAG_VERIFY != CRYPT_FL...

[sls]

Author: sls                          Date: Mon Apr  2 21:55:27 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- CRYPT_FLAG_VERIFY != CRYPT_FLAG_PASSPHRASE (fixed commit 1.2 -> 1.3)
  CRYPT_FLAG_PASSPHRASE is redundant (I hope) to options.key_file

---- Files affected:
SOURCES:
   util-linux-dm_crypt.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/util-linux-dm_crypt.patch
diff -u SOURCES/util-linux-dm_crypt.patch:1.4 SOURCES/util-linux-dm_crypt.patch:1.5
--- SOURCES/util-linux-dm_crypt.patch:1.4	Fri Mar 23 00:23:29 2007
+++ SOURCES/util-linux-dm_crypt.patch	Mon Apr  2 23:55:21 2007
@@ -1,7 +1,7 @@
 diff -urN util-linux-2.12q.org/mount/cryptsetup.c util-linux-2.12q/mount/cryptsetup.c
 --- util-linux-2.12q.org/mount/cryptsetup.c	1970-01-01 01:00:00.000000000 +0100
 +++ util-linux-2.12q/mount/cryptsetup.c	2005-02-27 19:26:34.000000000 +0100
-@@ -0,0 +1,216 @@
+@@ -0,0 +1,214 @@
 +/*
 + * cryptsetup.c - setup and control encrypted devices
 + */
@@ -112,8 +112,6 @@
 +		options.key_file = NULL;
 +	options.passphrase_fd = (pfd >= 0) ? pfd : 0;
 +	options.flags = 0;
-+	if (!options.key_file)
-+		options.flags |= CRYPT_FLAG_VERIFY;
 +	if (*cryptro)
 +		options.flags |= CRYPT_FLAG_READONLY;
 +	options.offset = offset;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/util-linux-dm_crypt.patch?r1=1.4&r2=1.5&f=u