eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-16 05:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support --tries option even for TCRYPT devices in cryptsetup.

Browse Source
This commit is contained in:
Milan Broz
2014-01-12 11:37:21 +01:00
parent bec86e3d5a
commit 7f93a49cc3
1 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/cryptsetup.c
View File

@@ -209,6 +209,50 @@ out:
return r; return r;
} }
static int tcrypt_load(struct crypt_device *cd, struct crypt_params_tcrypt *params)
{
int r, tries = opt_tries, eperm = 0;
do {
/* TCRYPT header is encrypted, get passphrase now */
r = tools_get_key(_("Enter passphrase: "),
CONST_CAST(char**)&params->passphrase,
&params->passphrase_size, 0, 0, NULL, opt_timeout,
_verify_passphrase(0), 0, cd);
if (r < 0)
continue;
if (opt_tcrypt_hidden)
params->flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
if (opt_tcrypt_system)
params->flags |= CRYPT_TCRYPT_SYSTEM_HEADER;
if (opt_tcrypt_backup)
params->flags |= CRYPT_TCRYPT_BACKUP_HEADER;
r = crypt_load(cd, CRYPT_TCRYPT, params);
if (r == -EPERM) {
log_err(_("No device header detected with this passphrase.\n"));
eperm = 1;
}
if (r < 0) {
crypt_safe_free(CONST_CAST(char*)params->passphrase);
params->passphrase = NULL;
params->passphrase_size = 0;
}
check_signal(&r);
} while (r == -EPERM && (--tries > 0));
/* Report wrong passphrase if at least one try failed */
if (eperm && r == -EPIPE)
r = -EPERM;
return r;
}
static int action_open_tcrypt(void) static int action_open_tcrypt(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
@@ -226,25 +270,7 @@ static int action_open_tcrypt(void)
if ((r = crypt_init(&cd, action_argv[0]))) if ((r = crypt_init(&cd, action_argv[0])))
goto out; goto out;
/* TCRYPT header is encrypted, get passphrase now */ r = tcrypt_load(cd, &params);
r = tools_get_key(_("Enter passphrase: "),
CONST_CAST(char**)&params.passphrase,
&params.passphrase_size, 0, 0, NULL, opt_timeout,
_verify_passphrase(0), 0, cd);
if (r < 0)
goto out;
if (opt_tcrypt_hidden)
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
if (opt_tcrypt_system)
params.flags |= CRYPT_TCRYPT_SYSTEM_HEADER;
if (opt_tcrypt_backup)
params.flags |= CRYPT_TCRYPT_BACKUP_HEADER;
r = crypt_load(cd, CRYPT_TCRYPT, &params);
check_signal(&r);
if (r < 0) if (r < 0)
goto out; goto out;
@@ -257,8 +283,6 @@ static int action_open_tcrypt(void)
if (activated_name) if (activated_name)
r = crypt_activate_by_volume_key(cd, activated_name, NULL, 0, flags); r = crypt_activate_by_volume_key(cd, activated_name, NULL, 0, flags);
out: out:
if (r == -EPERM)
log_err(_("No device header detected with this passphrase.\n"));
crypt_free(cd); crypt_free(cd);
crypt_safe_free(CONST_CAST(char*)params.passphrase); crypt_safe_free(CONST_CAST(char*)params.passphrase);
return r; return r;
@@ -319,25 +343,7 @@ static int action_tcryptDump(void)
if ((r = crypt_init(&cd, action_argv[0]))) if ((r = crypt_init(&cd, action_argv[0])))
goto out; goto out;
/* TCRYPT header is encrypted, get passphrase now */ r = tcrypt_load(cd, &params);
r = tools_get_key(_("Enter passphrase: "),
CONST_CAST(char**)&params.passphrase,
&params.passphrase_size, 0, 0, NULL, opt_timeout,
_verify_passphrase(0), 0, cd);
if (r < 0)
goto out;
if (opt_tcrypt_hidden)
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
if (opt_tcrypt_system)
params.flags |= CRYPT_TCRYPT_SYSTEM_HEADER;
if (opt_tcrypt_backup)
params.flags |= CRYPT_TCRYPT_BACKUP_HEADER;
r = crypt_load(cd, CRYPT_TCRYPT, &params);
check_signal(&r);
if (r < 0) if (r < 0)
goto out; goto out;
@@ -346,8 +352,6 @@ static int action_tcryptDump(void)
else else
r = crypt_dump(cd); r = crypt_dump(cd);
out: out:
if (r == -EPERM)
log_err(_("No device header detected with this passphrase.\n"));
crypt_free(cd); crypt_free(cd);
crypt_safe_free(CONST_CAST(char*)params.passphrase); crypt_safe_free(CONST_CAST(char*)params.passphrase);
return r; return r;