summaryrefslogtreecommitdiff
path: root/package/cryptsetup/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-08 17:26:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-08 17:26:57 +0200
commit643800cee0ad5b853f06056ff90d24efa670f68c (patch)
treed873494ef64659d0cd0a836d2e2dd380d585e5c7 /package/cryptsetup/patches
parent3c70077f308437281c72431223b532f6f427e1d0 (diff)
parent081830a11721ddc097fd2272d4e7ebd47cb7f8dd (diff)
Merge remote branch 'phil/auto-config-in'
Conflicts: Config.in package/dropbear/Makefile package/iptables/Makefile package/kismet/Makefile package/nfs-utils/Makefile package/ntpclient/Makefile package/openvpn/Makefile package/pkgmaker package/rxvt-unicode/Makefile package/vgp/Makefile package/wpa_supplicant/Makefile package/xf86-input-keyboard/Makefile package/xf86-input-mouse/Makefile
Diffstat (limited to 'package/cryptsetup/patches')
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
1 files changed, 0 insertions, 17 deletions
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
deleted file mode 100644
index 97b356f68..000000000
--- a/package/cryptsetup/patches/patch-lib_setup_c
+++ /dev/null
@@ -1,17 +0,0 @@
-already added in svn upstream
---- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200
-+++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200
-@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
- start:
- mk=NULL;
-
-- if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
-+ if(options->passphrase) {
-+ passwordLen = strlen(options->passphrase);
-+ password = safe_alloc(passwordLen + 1);
-+ strncpy(password, options->passphrase, passwordLen + 1);
-+ tries = 0;
-+ } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
- tries--;
- else
- tries = 0;