mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-22 00:06:13 +08:00
d40/enc works
This commit is contained in:
parent
a7f39a1b79
commit
bed25108f6
|
@ -117,6 +117,22 @@ static void DesfireSecureChannelDecodeD40(DesfireContext *ctx, uint8_t *srcdata,
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case DCMEncrypted:
|
case DCMEncrypted:
|
||||||
|
if (srcdatalen < desfire_get_key_block_length(ctx->keyType)) {
|
||||||
|
memcpy(dstdata, srcdata, srcdatalen);
|
||||||
|
*dstdatalen = srcdatalen;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DesfireCryptoEncDec(ctx, true, srcdata, srcdatalen, dstdata, false);
|
||||||
|
PrintAndLogEx(INFO, "decoded[%d]: %s", srcdatalen, sprint_hex(dstdata, srcdatalen));
|
||||||
|
|
||||||
|
size_t puredatalen = DesfireSearchCRCPos(dstdata, srcdatalen, respcode, 2);
|
||||||
|
if (puredatalen != 0) {
|
||||||
|
*dstdatalen = puredatalen;
|
||||||
|
} else {
|
||||||
|
PrintAndLogEx(WARNING, "CRC32 error.");
|
||||||
|
*dstdatalen = srcdatalen;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case DCMPlain:
|
case DCMPlain:
|
||||||
case DACNone:
|
case DACNone:
|
||||||
|
|
Loading…
Reference in a new issue