diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
| commit | 7de93724af9791bad0a8e887d02bf7a3a872305c (patch) | |
| tree | c4de7f2ecaa01cc7cf371eb3b771a6b8a8f9a9de /package/cryptsetup/patches/patch-lib_setup_c | |
| parent | bd1730cdff6b88d54d5fdb3d63d5733ca33abe59 (diff) | |
| parent | 254ae86e16cddf282b36c0593148e24151ce1f96 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cryptsetup/patches/patch-lib_setup_c')
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_setup_c | 17 |
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; |