Allow using passphrase provided in options struct for LuksOpen (thanks to Waldemar Brodkorb).

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@85 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2009-08-17 11:03:29 +00:00
parent a0d1056e0f
commit 02707608db
2 changed files with 8 additions and 2 deletions

View File

@@ -555,7 +555,12 @@ static int __crypt_luks_open(int arg, struct setup_backend *backend, struct cryp
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;