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

don't change the action_arg pointer, add to it in place instead

Browse Source 
this effectively reverses 931d224485
This commit is contained in:
Klas Lindfors
2014-10-02 13:20:34 +02:00
parent cfebc30f76
commit c8aaf1a65e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+3 -6
View File
@@ -1072,7 +1072,6 @@ out:
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
struct gengetopt_args_info args_info; struct gengetopt_args_info args_info;
struct gengetopt_args_info args_info_tmp;
ykpiv_state *state; ykpiv_state *state;
int verbosity; int verbosity;
enum enum_action action; enum enum_action action;
@@ -1083,8 +1082,6 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
args_info_tmp = args_info;
verbosity = args_info.verbose_arg + (int)args_info.verbose_given; verbosity = args_info.verbose_arg + (int)args_info.verbose_given;
if(ykpiv_init(&state, verbosity) != YKPIV_OK) { if(ykpiv_init(&state, verbosity) != YKPIV_OK) {
@@ -1097,9 +1094,9 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
for(i = 0; i < args_info_tmp.action_given; i++) { for(i = 0; i < args_info.action_given; i++) {
bool needs_auth = false; bool needs_auth = false;
action = *args_info_tmp.action_arg++; action = *(args_info.action_arg + i);
switch(action) { switch(action) {
case action_arg_generate: case action_arg_generate:
case action_arg_setMINUS_mgmMINUS_key: case action_arg_setMINUS_mgmMINUS_key:
@@ -1144,7 +1141,7 @@ int main(int argc, char *argv[]) {
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
for(i = 0; i < args_info.action_given; i++) { for(i = 0; i < args_info.action_given; i++) {
action = *args_info.action_arg++; action = *(args_info.action_arg + i);
if(verbosity) { if(verbosity) {
fprintf(stderr, "Now processing for action %d.\n", action); fprintf(stderr, "Now processing for action %d.\n", action);
} }