fix travis

This commit is contained in:
iceman1001 2019-12-02 10:20:07 +01:00
parent 3b01177e5f
commit a0f0345169

View file

@ -354,17 +354,16 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
case jsfT5555: case jsfT5555:
case jsfMfPlusKeys: case jsfMfPlusKeys:
JsonSaveStr(root, "FileType", "mfp"); JsonSaveStr(root, "FileType", "mfp");
JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7); JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7);
JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[10], 1); JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[10], 1);
JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[11], 2); JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[11], 2);
uint8_t atslen = data[13]; uint8_t atslen = data[13];
if (atslen > 0) if (atslen > 0)
JsonSaveBufAsHexCompact(root, "$.Card.ATS", &data[14], atslen); JsonSaveBufAsHexCompact(root, "$.Card.ATS", &data[14], atslen);
uint8_t vdata[2][64][16 + 1] = {0}; uint8_t vdata[2][64][16 + 1] = {{{0}}};
memcpy(vdata, &data[14 + atslen], 2 * 64 * 17); memcpy(vdata, &data[14 + atslen], 2 * 64 * 17);
for (size_t i = 0; i < datalen; i++) { for (size_t i = 0; i < datalen; i++) {
char path[PATH_MAX_LENGTH] = {0}; char path[PATH_MAX_LENGTH] = {0};
@ -379,7 +378,6 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i)); sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
JsonSaveBufAsHexCompact(root, path, &vdata[1][i][1], 16); JsonSaveBufAsHexCompact(root, path, &vdata[1][i][1], 16);
} }
} }
break; break;
default: default: