2009-08-17 Milan Broz <mbroz@redhat.com>
- * Fix PBKDF2 speed calculation for large passhrases
+ * Fix PBKDF2 speed calculation for large passhrases.
+ * Allow using passphrase provided in options struct for LuksOpen.
2009-07-30 Milan Broz <mbroz@redhat.com>
* Fix errors when compiled with LUKS_DEBUG.
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;