diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 16:07:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 16:07:18 +0200 |
| commit | 8bee65a9cbd1905e356ff468a48e90608a08a8e6 (patch) | |
| tree | afdb76c6fa9e0e91482680497f0f5c27c56a9d4b /package/cryptsetup/patches/patch-lib_setup_c | |
| parent | 98c4842cbff9e4802092c5011feb0ecbb8e4881d (diff) | |
| parent | bf5f8fc2eaded785753175367f7f1a52192c2d62 (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, 17 insertions, 0 deletions
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c new file mode 100644 index 000000000..97b356f68 --- /dev/null +++ b/package/cryptsetup/patches/patch-lib_setup_c @@ -0,0 +1,17 @@ +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; |