update desfire dumpformat to support verison HW,SW,PROD
This commit is contained in:
1 parent
c0792409b0
commit
669319b690
3 files changed
+71
-11
No files matched your search
+39
-5
@@ -8730,9 +8730,29 @@ static int CmdHF14ADesDump(const char *Cmd) {
|
||||
|
||||
if (DesfireAnticollision(verbose) == PM3_SUCCESS) {
|
||||
|
||||
if (DesfireGetVersion(&plainctx, buf, &buflen) == PM3_SUCCESS && buflen <= sizeof(dump->version)) {
|
||||
memcpy(dump->version, buf, buflen);
|
||||
dump->versionlen = buflen;
|
||||
// GetVersion answers 7 + 7 + 14 bytes over three chained frames. Split
|
||||
// them here rather than storing one blob: the third frame is not the
|
||||
// same shape across generations, and HW major/minor is what identifies
|
||||
// which generation we are impersonating
|
||||
if (DesfireGetVersion(&plainctx, buf, &buflen) == PM3_SUCCESS) {
|
||||
|
||||
size_t off = 0;
|
||||
struct {
|
||||
uint8_t *dst;
|
||||
uint8_t *dstlen;
|
||||
size_t want;
|
||||
} part[] = {
|
||||
{ dump->versionhw, &dump->versionhwlen, sizeof(dump->versionhw) },
|
||||
{ dump->versionsw, &dump->versionswlen, sizeof(dump->versionsw) },
|
||||
{ dump->versionprod, &dump->versionprodlen, sizeof(dump->versionprod) },
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < ARRAYLEN(part) && off < buflen; i++) {
|
||||
size_t n = MIN(part[i].want, buflen - off);
|
||||
memcpy(part[i].dst, buf + off, n);
|
||||
*part[i].dstlen = n;
|
||||
off += n;
|
||||
}
|
||||
}
|
||||
|
||||
buflen = 0;
|
||||
@@ -9075,8 +9095,22 @@ static int CmdHF14ADesView(const char *Cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
if (dump->versionlen > 0) {
|
||||
PrintAndLogEx(SUCCESS, "Version.......... %s", sprint_hex_inrow(dump->version, dump->versionlen));
|
||||
if (dump->versionhwlen > 0) {
|
||||
PrintAndLogEx(SUCCESS, "Version HW....... %s", sprint_hex_inrow(dump->versionhw, dump->versionhwlen));
|
||||
if (dump->versionhwlen >= 5) {
|
||||
PrintAndLogEx(SUCCESS, " %s", mifare_prime_get_version_str(dump->versionhw[1], dump->versionhw[3], dump->versionhw[4]));
|
||||
}
|
||||
if (dump->versionhwlen >= 6) {
|
||||
PrintAndLogEx(SUCCESS, " Storage size... %s", mifare_prime_get_card_size_str(dump->versionhw[5]));
|
||||
}
|
||||
}
|
||||
|
||||
if (dump->versionswlen > 0) {
|
||||
PrintAndLogEx(SUCCESS, "Version SW....... %s", sprint_hex_inrow(dump->versionsw, dump->versionswlen));
|
||||
}
|
||||
|
||||
if (dump->versionprodlen > 0) {
|
||||
PrintAndLogEx(SUCCESS, "Production....... %s", sprint_hex_inrow(dump->versionprod, dump->versionprodlen));
|
||||
}
|
||||
|
||||
if (dump->signaturelen > 0) {
|
||||
|
||||
+20
-4
@@ -1581,8 +1581,16 @@ int prepareJSON(json_t *root, JSONFileType ftype, uint8_t *data, size_t datalen,
|
||||
}
|
||||
}
|
||||
|
||||
if (dump->versionlen > 0) {
|
||||
JsonSaveBufAsHexCompact(root, "$.Card.Version", (uint8_t *)dump->version, dump->versionlen);
|
||||
if (dump->versionhwlen > 0) {
|
||||
JsonSaveBufAsHexCompact(root, "$.Card.VersionHW", (uint8_t *)dump->versionhw, dump->versionhwlen);
|
||||
}
|
||||
|
||||
if (dump->versionswlen > 0) {
|
||||
JsonSaveBufAsHexCompact(root, "$.Card.VersionSW", (uint8_t *)dump->versionsw, dump->versionswlen);
|
||||
}
|
||||
|
||||
if (dump->versionprodlen > 0) {
|
||||
JsonSaveBufAsHexCompact(root, "$.Card.VersionProd", (uint8_t *)dump->versionprod, dump->versionprodlen);
|
||||
}
|
||||
|
||||
if (dump->signaturelen > 0) {
|
||||
@@ -3346,8 +3354,16 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
||||
dump->card_info.ats_len = len;
|
||||
|
||||
len = 0;
|
||||
JsonLoadBufAsHex(root, "$.Card.Version", dump->version, sizeof(dump->version), &len);
|
||||
dump->versionlen = len;
|
||||
JsonLoadBufAsHex(root, "$.Card.VersionHW", dump->versionhw, sizeof(dump->versionhw), &len);
|
||||
dump->versionhwlen = len;
|
||||
|
||||
len = 0;
|
||||
JsonLoadBufAsHex(root, "$.Card.VersionSW", dump->versionsw, sizeof(dump->versionsw), &len);
|
||||
dump->versionswlen = len;
|
||||
|
||||
len = 0;
|
||||
JsonLoadBufAsHex(root, "$.Card.VersionProd", dump->versionprod, sizeof(dump->versionprod), &len);
|
||||
dump->versionprodlen = len;
|
||||
|
||||
len = 0;
|
||||
JsonLoadBufAsHex(root, "$.Card.Signature", dump->signature, sizeof(dump->signature), &len);
|
||||
|
||||
+12
-2
@@ -119,8 +119,18 @@ typedef struct {
|
||||
// card identity only. Anything key related belongs to an application
|
||||
iso14a_card_select_t card_info;
|
||||
|
||||
uint8_t version[28]; // raw GetVersion answer
|
||||
uint8_t versionlen;
|
||||
// GetVersion answers in three frames and the frames are not the same shape
|
||||
// across generations -- D40 and EV1 close with UID||BatchNo[5]||CW||Year
|
||||
// while EV3 re-cuts it as UID||BatchNo[3]||TypeID[2]||CW||Year -- so each is
|
||||
// kept raw and separate rather than parsed into fields.
|
||||
// HW/SW frames 7 bytes each: vendor, type, subtype, major, minor, storage,
|
||||
// protocol. Major+minor identify the generation, see prime.c
|
||||
uint8_t versionhw[7];
|
||||
uint8_t versionhwlen;
|
||||
uint8_t versionsw[7];
|
||||
uint8_t versionswlen;
|
||||
uint8_t versionprod[14]; // UID and production details
|
||||
uint8_t versionprodlen;
|
||||
uint8_t signature[56]; // NXP originality signature
|
||||
uint8_t signaturelen;
|
||||
|
||||
|
||||
Reference in new issue
Block a user