From cc3883a770c9597e155dd80a64a06820727f9534 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Sun, 11 Jul 2021 18:27:29 +0300 Subject: [PATCH] ev1/enc tx side works --- client/src/mifare/desfiresecurechan.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/mifare/desfiresecurechan.c b/client/src/mifare/desfiresecurechan.c index 4104b32ef..a56af3493 100644 --- a/client/src/mifare/desfiresecurechan.c +++ b/client/src/mifare/desfiresecurechan.c @@ -118,10 +118,11 @@ static void DesfireSecureChannelEncodeEV1(DesfireContext *ctx, uint8_t cmd, uint } } else if (ctx->commMode == DCMEncrypted) { rlen = padded_data_length(srcdatalen + 4, desfire_get_key_block_length(ctx->keyType)); - memcpy(data, srcdata, srcdatalen); - desfire_crc32_append(data, srcdatalen); - PrintAndLogEx(INFO, "decoded[%d]: %s", rlen, sprint_hex(data, rlen)); - DesfireCryptoEncDec(ctx, true, data, rlen, dstdata, true); + data[0] = cmd; + memcpy(&data[1], srcdata, srcdatalen); + desfire_crc32_append(data, srcdatalen + 1); + + DesfireCryptoEncDec(ctx, true, &data[1], rlen, dstdata, true); *dstdatalen = rlen; } else {