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

Use new API for luksUUID, luksDump.

Browse Source 
Use default log callback.
Check for keyslot #

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@358 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-11-05 11:27:27 +00:00
parent 791481b9e9
commit 988b1f95fd
1 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/cryptsetup.c
View File

@@ -178,6 +178,16 @@ static int _yesDialog(const char *msg, void *usrptr)
/* End ICBs */
static int check_slot(int key_slot)
{
/* FIXME: use per format define here */
if (key_slot != CRYPT_ANY_SLOT && (key_slot < 0 || key_slot > 8))
return 0;
return 1;
}
static void show_status(int errcode)
{
char error[256], *error_;
@@ -366,8 +376,6 @@ static int action_luksFormat(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
keysize = (opt_key_size ?: DEFAULT_LUKS1_KEYBITS) / 8;
crypt_set_password_verify(cd, 1);
@@ -421,8 +429,6 @@ static int action_luksOpen(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
@@ -461,7 +467,7 @@ static int action_luksKillSlot(int arg)
{
struct crypt_options options = {
.device = action_argv[0],
.key_slot = atoi(action_argv[1]),
.key_slot = opt_key_slot,
.key_file = opt_key_file,
.timeout = opt_timeout,
.flags = !opt_batch_mode?CRYPT_FLAG_VERIFY_ON_DELKEY : 0,
@@ -495,7 +501,6 @@ static int action_luksAddKey(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
crypt_set_confirm_callback(cd, _yesDialog, NULL);
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
@@ -530,12 +535,16 @@ out:
static int action_isLuks(int arg)
{
struct crypt_options options = {
.device = action_argv[0],
.icb = &cmd_icb,
};
struct crypt_device *cd = NULL;
int r;
return crypt_isLuks(&options);
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
r = crypt_load(cd, CRYPT_LUKS1, NULL);
out:
crypt_free(cd);
return r;
}
static int action_luksUUID(int arg)
@@ -547,7 +556,6 @@ static int action_luksUUID(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
crypt_set_confirm_callback(cd, _yesDialog, NULL);
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
@@ -568,12 +576,19 @@ out:
static int action_luksDump(int arg)
{
struct crypt_options options = {
.device = action_argv[0],
.icb = &cmd_icb,
};
struct crypt_device *cd = NULL;
int r;
return crypt_luksDump(&options);
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
r = crypt_dump(cd);
out:
crypt_free(cd);
return r;
}
static int action_luksSuspend(int arg)
@@ -624,7 +639,6 @@ static int action_luksBackup(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
crypt_set_confirm_callback(cd, _yesDialog, NULL);
r = crypt_header_backup(cd, CRYPT_LUKS1, opt_header_backup_file);
@@ -646,7 +660,6 @@ static int action_luksRestore(int arg)
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_log_callback(cd, _log, NULL);
crypt_set_confirm_callback(cd, _yesDialog, NULL);
r = crypt_header_restore(cd, CRYPT_LUKS1, opt_header_backup_file);
out:
@@ -716,6 +729,9 @@ static int run_action(struct action_type *action)
{
int r;
/* set default log */
crypt_set_log_callback(NULL, _log, NULL);
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
@@ -827,6 +843,25 @@ int main(int argc, char **argv)
usage(popt_context, 1, _("Unknown action."),
poptGetInvocationName(popt_context));
action_argc = 0;
action_argv = poptGetArgs(popt_context);
/* Make return values of poptGetArgs more consistent in case of remaining argc = 0 */
if(!action_argv)
action_argv = null_action_argv;
/* Count args, somewhat unnice, change? */
while(action_argv[action_argc] != NULL)
action_argc++;
if(action_argc < action->required_action_argc) {
char buf[128];
snprintf(buf, 128,_("%s: requires %s as arguments"), action->type, action->arg_desc);
usage(popt_context, 1, buf,
poptGetInvocationName(popt_context));
}
/* FIXME: rewrite this from scratch */
if (opt_key_size &&
strcmp(aname, "luksFormat") &&
strcmp(aname, "create")) {
@@ -841,12 +876,11 @@ int main(int argc, char **argv)
_("Key size must be a multiple of 8 bits"),
poptGetInvocationName(popt_context));
/* FIXME: use per format define here */
if (opt_key_slot != CRYPT_ANY_SLOT &&
(opt_key_slot < 0 || opt_key_slot > 8)) {
if (!strcmp(aname, "luksKillSlot"))
opt_key_slot = atoi(action_argv[1]);
if (!check_slot(opt_key_slot))
usage(popt_context, 1, _("Key slot is invalid."),
poptGetInvocationName(popt_context));
}
if (opt_random && opt_urandom)
usage(popt_context, 1, _("Only one of --use-[u]random options is allowed."),
@@ -863,23 +897,6 @@ int main(int argc, char **argv)
usage(popt_context, 1, _("Options --offset and --skip are supported only for create command.\n"),
poptGetInvocationName(popt_context));
action_argc = 0;
action_argv = poptGetArgs(popt_context);
/* Make return values of poptGetArgs more consistent in case of remaining argc = 0 */
if(!action_argv)
action_argv = null_action_argv;
/* Count args, somewhat unnice, change? */
while(action_argv[action_argc] != NULL)
action_argc++;
if(action_argc < action->required_action_argc) {
char buf[128];
snprintf(buf, 128,_("%s: requires %s as arguments"), action->type, action->arg_desc);
usage(popt_context, 1, buf,
poptGetInvocationName(popt_context));
}
if (opt_debug) {
opt_verbose = 1;
crypt_set_debug_level(-1);