- i += 2;
- continue;
- }
- if ((cmd[i] >= '0' && cmd[i] <= '9') ||
- (cmd[i] >= 'a' && cmd[i] <= 'f') ||
- (cmd[i] >= 'A' && cmd[i] <= 'F') ) {
- buf[strlen(buf) + 1] = 0x00;
- buf[strlen(buf)] = cmd[i];
- i++;
-
- if (strlen(buf) >= 2) {
- sscanf(buf, "%x", &temp);
- data[datalen] = (uint8_t)(temp & 0xff);
- *buf = 0;
- if (datalen > sizeof(data) - 2) {
- PrintAndLog("Buffer is full...");
- break;
- } else {
- datalen++;
- }
+
+ if (isxdigit(c)) {
+ switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data), &datalen)) {
+ case 1:
+ PrintAndLog("Invalid HEX value.");
+ return 1;
+ case 2:
+ PrintAndLog("APDU too large.");
+ return 1;
+ case 3:
+ PrintAndLog("Hex must have even number of digits.");
+ return 1;