VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix error when breaking a secret where all digits are 9

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@384 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-12-17 10:46:46 +00:00
parent 4ea57cde33
commit b891483a19
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
npa/src/pace-tool.c
View File

@@ -325,30 +325,34 @@ main (int argc, char **argv)
} }
if (dobreak) { if (dobreak) {
char can_ch[7]; /* The biggest buffer sprintf could write with "%llu" */
unsigned int can_nb = 0; char can_ch[strlen("18446744073709551615")+1];
unsigned long long can_nb = 0;
if (usepin) { if (usepin) {
pace_input.pin_id = PACE_PIN; pace_input.pin_id = PACE_PIN;
pace_input.pin_length = 6;
if (pin) { if (pin) {
if (sscanf(pin, "%u", &can_nb) != 1) { if (sscanf(pin, "%llu", &can_nb) != 1) {
fprintf(stderr, "PIN is not an unsigned integer.\n"); fprintf(stderr, "PIN is not an unsigned long long.\n");
exit(2); exit(2);
} }
} }
} else if (usecan) { } else if (usecan) {
pace_input.pin_id = PACE_CAN; pace_input.pin_id = PACE_CAN;
pace_input.pin_length = 6;
if (can) { if (can) {
if (sscanf(can, "%u", &can_nb) != 1) { if (sscanf(can, "%llu", &can_nb) != 1) {
fprintf(stderr, "CAN is not an unsigned integer.\n"); fprintf(stderr, "CAN is not an unsigned long long.\n");
exit(2); exit(2);
} }
} }
} else if (usepuk) { } else if (usepuk) {
pace_input.pin_id = PACE_PUK; pace_input.pin_id = PACE_PUK;
pace_input.pin_length = 10;
if (puk) { if (puk) {
if (sscanf(puk, "%u", &can_nb) != 1) { if (sscanf(puk, "%llu", &can_nb) != 1) {
fprintf(stderr, "PUK is not an unsigned integer.\n"); fprintf(stderr, "PUK is not an unsigned long long.\n");
exit(2); exit(2);
} }
} }
@@ -358,22 +362,24 @@ main (int argc, char **argv)
exit(1); exit(1);
} }
sprintf(can_ch, "%06u", can_nb);
pace_input.pin = can_ch; pace_input.pin = can_ch;
pace_input.pin_length = strlen(can_ch);
t_start = time(NULL); t_start = time(NULL);
while (0 > EstablishPACEChannel(NULL, card, pace_input, &pace_output, do {
&sctx)) { sprintf(can_ch, "%0*llu", pace_input.pin_length, can_nb);
printf("Failed trying %s=%s\n", if (strlen(can_ch) > pace_input.pin_length)
pace_secret_name(pace_input.pin_id), pace_input.pin);
can_nb++;
sprintf(can_ch, "%06u", can_nb);
if (can_nb > 999999)
break; break;
}
printf("Trying %s=%s\n",
pace_secret_name(pace_input.pin_id), pace_input.pin);
i = EstablishPACEChannel(NULL, card, pace_input, &pace_output,
&sctx);
can_nb++;
} while (0 > i);
t_end = time(NULL); t_end = time(NULL);
if (can_nb > 999999) {
if (0 > i) {
printf("Tried breaking %s for %.0fs without success.\n", printf("Tried breaking %s for %.0fs without success.\n",
pace_secret_name(pace_input.pin_id), difftime(t_end, t_start)); pace_secret_name(pace_input.pin_id), difftime(t_end, t_start));
goto err; goto err;