From 63b9adbffbbbc23ba72f3d9ee15549a8b28521ec Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 27 Apr 2021 15:15:59 +0200
Subject: [PATCH] hf iclass decrypt - add the possibility to decode as block6
 after a decryted block

---
 client/src/cmdhficlass.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index 2db1a8072..670d5be70 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -1090,6 +1090,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
         arg_str0("d", "data", "<hex>", "3DES encrypted data"),
         arg_str0("k", "key", "<hex>", "3DES transport key"),
         arg_lit0("v", "verbose", "verbose output"),
+        arg_lit0(NULL, "d6", "decode as block 6"),
         arg_param_end
     };
     CLIExecWithReturn(clictx, Cmd, argtable, false);
@@ -1112,6 +1113,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
     CLIGetHexWithReturn(clictx, 3, key, &key_len);
 
     bool verbose = arg_get_lit(clictx, 4);
+    bool use_decode6 = arg_get_lit(clictx, 5);
     CLIParserFree(clictx);
 
     // sanity checks
@@ -1212,6 +1214,9 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
             mbedtls_des3_crypt_ecb(&ctx, enc_data, dec_data);
         }
         PrintAndLogEx(SUCCESS, "Data: %s", sprint_hex(dec_data, sizeof(dec_data)));
+
+        if (use_sc && use_decode6)
+            DecodeBlock6(dec_data);
     }
 
     // decrypt dump file data