james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move up validation of pin-retries parameters

Browse Source
This commit is contained in:
Klas Lindfors
2015-03-19 14:54:23 +01:00
parent c85fd4eaa8
commit da1f61f23a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+5 -5
View File
@@ -1417,6 +1417,11 @@ int main(int argc, char *argv[]) {
}
break;
case action_arg_pinMINUS_retries:
if(!args_info.pin_retries_arg || !args_info.puk_retries_arg) {
fprintf(stderr, "The '%s' action needs both --pin-retries and --puk-retries arguments.\n",
cmdline_parser_action_values[action]);
return EXIT_FAILURE;
break;
case action_arg_setMINUS_chuid:
case action_arg_version:
case action_arg_reset:
@@ -1536,17 +1541,12 @@ int main(int argc, char *argv[]) {
}
break;
case action_arg_pinMINUS_retries:
if(args_info.pin_retries_arg && args_info.puk_retries_arg) {
if(set_pin_retries(state, args_info.pin_retries_arg, args_info.puk_retries_arg, verbosity) == false) {
ret = EXIT_FAILURE;
} else {
fprintf(stderr, "Successfully changed pin retries to %d and puk retries to %d, both codes have been reset to default now.\n",
args_info.pin_retries_arg, args_info.puk_retries_arg);
}
} else {
fprintf(stderr, "The 'pin-retries' action needs both --pin-retries and --puk-retries arguments.\n");
ret = EXIT_FAILURE;
}
break;
case action_arg_importMINUS_key:
if(import_key(state, args_info.key_format_arg, args_info.input_arg, args_info.slot_orig, args_info.password_arg) == false) {