From bed25108f6c52b3895794b77b5356a75ad1ccf41 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 9 Jul 2021 13:14:42 +0300
Subject: [PATCH] d40/enc works

---
 client/src/mifare/desfiresecurechan.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/src/mifare/desfiresecurechan.c b/client/src/mifare/desfiresecurechan.c
index b62a0a056..dd66b9e54 100644
--- a/client/src/mifare/desfiresecurechan.c
+++ b/client/src/mifare/desfiresecurechan.c
@@ -117,6 +117,22 @@ static void DesfireSecureChannelDecodeD40(DesfireContext *ctx, uint8_t *srcdata,
 
             break;
         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;
         case DCMPlain:
         case DACNone: