1
0

patch-lib_setup_c 741 B

1234567891011121314151617
  1. already added in svn upstream
  2. --- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200
  3. +++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200
  4. @@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
  5. start:
  6. mk=NULL;
  7. - if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
  8. + if(options->passphrase) {
  9. + passwordLen = strlen(options->passphrase);
  10. + password = safe_alloc(passwordLen + 1);
  11. + strncpy(password, options->passphrase, passwordLen + 1);
  12. + tries = 0;
  13. + } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
  14. tries--;
  15. else
  16. tries = 0;