uart_posix.c rework

[proxmark3-svn] / client / emv / emvcore.c
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c

index c12591148766bd4c3ffd48ac66e185339b6879ae..53c1c6115266cf2d7557a2d4a9a7b9572d29496f 100644 (file)
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -9,12 +9,30 @@
  //-----------------------------------------------------------------------------
  
  #include "emvcore.h"
  //-----------------------------------------------------------------------------
  
  #include "emvcore.h"
+
+#include <string.h>
  #include "emvjson.h"
  #include "util_posix.h"
  #include "emvjson.h"
  #include "util_posix.h"
+#include "protocols.h"
+#include "ui.h"
+#include "util.h"
+#include "emv_tags.h"
+#include "emv_pk.h"
+#include "emv_pki.h"
+#include "cmdhf14a.h"
+#include "apduinfo.h"
+#include "tlv.h"
+#include "dump.h"
+#include "dol.h"
+
+#ifdef WITH_SMARTCARD
+#include "cmdsmartcard.h"
+#endif
+
  
  // Got from here. Thanks)
  // https://eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix
  
  // Got from here. Thanks)
  // https://eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix
-static const char *PSElist [] = { 
+static const char *PSElist [] = {
         "325041592E5359532E4444463031", // 2PAY.SYS.DDF01 - Visa Proximity Payment System Environment - PPSE
         "315041592E5359532E4444463031"  // 1PAY.SYS.DDF01 - Visa Payment System Environment - PSE
  };
         "325041592E5359532E4444463031", // 2PAY.SYS.DDF01 - Visa Proximity Payment System Environment - PPSE
         "315041592E5359532E4444463031"  // 1PAY.SYS.DDF01 - Visa Payment System Environment - PSE
  };
@@ -32,40 +50,41 @@ typedef struct {
         const char* aid;
  } TAIDList;
  
         const char* aid;
  } TAIDList;
  
-static const TAIDList AIDlist [] = { 
+static const TAIDList AIDlist [] = {
         // Visa International
         // Visa International
-       { CV_VISA,      "A00000000305076010"},                  // VISA ELO Credit      
-       { CV_VISA,      "A0000000031010" },                             // VISA Debit/Credit (Classic)  
-       { CV_VISA,      "A000000003101001" },                   // VISA Credit  
-       { CV_VISA,      "A000000003101002" },                   // VISA Debit   
-       { CV_VISA,      "A0000000032010" },                             // VISA Electron
-       { CV_VISA,      "A0000000032020" },                             // VISA 
-       { CV_VISA,      "A0000000033010" },                             // VISA Interlink       
-       { CV_VISA,      "A0000000034010" },                             // VISA Specific        
-       { CV_VISA,      "A0000000035010" },                             // VISA Specific        
-       { CV_VISA,      "A0000000036010" },                             // Domestic Visa Cash Stored Value      
-       { CV_VISA,      "A0000000036020" },                             // International Visa Cash Stored Value 
-       { CV_VISA,      "A0000000038002" },                             // VISA Auth, VisaRemAuthen EMV-CAP (DPA)       
-       { CV_VISA,      "A0000000038010" },                             // VISA Plus    
-       { CV_VISA,      "A0000000039010" },                             // VISA Loyalty 
-       { CV_VISA,      "A000000003999910" },                   // VISA Proprietary ATM 
+       { CV_VISA,  "A00000000305076010"},          // VISA ELO Credit
+       { CV_VISA,  "A0000000031010" },             // VISA Debit/Credit (Classic)
+       { CV_VISA,  "A000000003101001" },           // VISA Credit
+       { CV_VISA,  "A000000003101002" },           // VISA Debit
+       { CV_VISA,  "A0000000032010" },             // VISA Electron
+       { CV_VISA,  "A0000000032020" },             // VISA
+       { CV_VISA,  "A0000000033010" },             // VISA Interlink
+       { CV_VISA,  "A0000000034010" },             // VISA Specific
+       { CV_VISA,  "A0000000035010" },             // VISA Specific
+       { CV_VISA,  "A0000000036010" },             // Domestic Visa Cash Stored Value
+       { CV_VISA,  "A0000000036020" },             // International Visa Cash Stored Value
+       { CV_VISA,  "A0000000038002" },             // VISA Auth, VisaRemAuthen EMV-CAP (DPA)
+       { CV_VISA,  "A0000000038010" },             // VISA Plus
+       { CV_VISA,  "A0000000039010" },             // VISA Loyalty
+       { CV_VISA,  "A000000003999910" },           // VISA Proprietary ATM
         // Visa USA
         // Visa USA
-       { CV_VISA,      "A000000098" },                                 // Debit Card
-       { CV_VISA,      "A0000000980848" },                             // Debit Card
+       { CV_VISA,  "A000000098" },                 // Debit Card
+       { CV_VISA,  "A0000000980848" },             // Debit Card
         // Mastercard International
         // Mastercard International
-       { CV_MASTERCARD, "A00000000401" },                      // MasterCard PayPass   
-       { CV_MASTERCARD, "A0000000041010" },            // MasterCard Credit
-       { CV_MASTERCARD, "A00000000410101213" },        // MasterCard Credit
-       { CV_MASTERCARD, "A00000000410101215" },        // MasterCard Credit
-       { CV_MASTERCARD, "A0000000042010" },            // MasterCard Specific
-       { CV_MASTERCARD, "A0000000043010" },            // MasterCard Specific
-       { CV_MASTERCARD, "A0000000043060" },            // Maestro (Debit)
-       { CV_MASTERCARD, "A000000004306001" },          // Maestro (Debit)
-       { CV_MASTERCARD, "A0000000044010" },            // MasterCard Specific
-       { CV_MASTERCARD, "A0000000045010" },            // MasterCard Specific
-       { CV_MASTERCARD, "A0000000046000" },            // Cirrus
-       { CV_MASTERCARD, "A0000000048002" },            // SecureCode Auth EMV-CAP
-       { CV_MASTERCARD, "A0000000049999" },            // MasterCard PayPass   
+       { CV_MASTERCARD, "A00000000401" },          // MasterCard PayPass
+       { CV_MASTERCARD, "A0000000041010" },        // MasterCard Credit
+       { CV_MASTERCARD, "A00000000410101213" },    // MasterCard Credit
+       { CV_MASTERCARD, "A00000000410101215" },    // MasterCard Credit
+       { CV_MASTERCARD, "A0000000042010" },        // MasterCard Specific
+       { CV_MASTERCARD, "A0000000043010" },        // MasterCard Specific
+       { CV_MASTERCARD, "A0000000043060" },        // Maestro (Debit)
+       { CV_MASTERCARD, "A000000004306001" },      // Maestro (Debit)
+       { CV_MASTERCARD, "A0000000044010" },        // MasterCard Specific
+       { CV_MASTERCARD, "A0000000045010" },        // MasterCard Specific
+       { CV_MASTERCARD, "A0000000046000" },        // Cirrus
+       { CV_MASTERCARD, "A0000000048002" },        // SecureCode Auth EMV-CAP
+       { CV_MASTERCARD, "A0000000049999" },        // MasterCard PayPass
+       { CV_MASTERCARD, "B012345678" },            // Maestro TEST Used for development
         // American Express
         { CV_AMERICANEXPRESS, "A000000025" },
         { CV_AMERICANEXPRESS, "A0000000250000" },
         // American Express
         { CV_AMERICANEXPRESS, "A000000025" },
         { CV_AMERICANEXPRESS, "A0000000250000" },
@@ -74,19 +93,48 @@ static const TAIDList AIDlist [] = {
         { CV_AMERICANEXPRESS, "A000000025010701" },
         { CV_AMERICANEXPRESS, "A000000025010801" },
         // Groupement des Cartes Bancaires "CB"
         { CV_AMERICANEXPRESS, "A000000025010701" },
         { CV_AMERICANEXPRESS, "A000000025010801" },
         // Groupement des Cartes Bancaires "CB"
-       { CV_CB, "A0000000421010" },                            // Cartes Bancaire EMV Card     
-       { CV_CB, "A0000000422010" },            
-       { CV_CB, "A0000000423010" },            
-       { CV_CB, "A0000000424010" },            
-       { CV_CB, "A0000000425010" },            
+       { CV_CB, "A0000000421010" },                // Cartes Bancaire EMV Card
+       { CV_CB, "A0000000422010" },
+       { CV_CB, "A0000000423010" },
+       { CV_CB, "A0000000424010" },
+       { CV_CB, "A0000000425010" },
         // JCB CO., LTD.
         // JCB CO., LTD.
-       { CV_JCB, "A00000006510" },                                     // JCB  
-       { CV_JCB, "A0000000651010" },                           // JCB J Smart Credit   
+       { CV_JCB, "A00000006510" },                 // JCB
+       { CV_JCB, "A0000000651010" },               // JCB J Smart Credit
+       // Switch Card Services Ltd.
+       { CV_SWITCH, "A0000000050001" },            // Maestro UK
+       { CV_SWITCH, "A0000000050002" },            // Solo
+       // Diners Club International Ltd.
+       { CV_DINERS, "A0000001523010" },            // Discover, Pulse D Pas Discover Card
+       { CV_DINERS, "A0000001524010" },            // Discover, Discover Debit Common Card
         // Other
         // Other
-       { CV_OTHER, "A0000001544442" },                         // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
-       { CV_OTHER, "F0000000030001" },                         // BRADESCO
-       { CV_OTHER, "A0000005241010" },                         // RuPay - RuPay
-       { CV_OTHER, "D5780000021010" }                          // Bankaxept - Bankaxept
+       { CV_OTHER, "A00000002401" },               // Midland Bank Plc - Self Service
+       { CV_OTHER, "A0000000291010" },             // LINK Interchange Network Ltd - Link / American Express
+       { CV_OTHER, "A00000006900" },               // Société Européenne de Monnaie Electronique SEME - Moneo
+       { CV_OTHER, "A000000077010000021000000000003B" },  // Oberthur Technologies France - Visa AEPN
+       { CV_OTHER, "A0000001211010" },             // PBS Danmark A/S - Denmark - Dankort (VISA GEM Vision) - Danish domestic debit card
+       { CV_OTHER, "A0000001410001" },             // Associazione Bancaria Italiana - Italy - PagoBANCOMAT - CoGeBan Consorzio BANCOMAT (Italian domestic debit card)
+       { CV_OTHER, "A0000001544442" },             // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
+       { CV_OTHER, "A000000172950001" },           // Financial Information Service Co. Ltd. - Taiwan - BAROC Financial Application Taiwan- The Bankers Association of the Republic of China
+       { CV_OTHER, "A0000001850002" },             // Post Office Limited - United Kingdom - UK Post Office Account card
+       { CV_OTHER, "A0000002281010" },             // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (M/Chip) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+       { CV_OTHER, "A0000002282010" },             // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (VIS) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+       { CV_OTHER, "A0000002771010" },             // Interac Association - Canada - INTERAC - Canadian domestic credit/debit card
+       { CV_OTHER, "A00000031510100528" },         // Currence Holding/PIN BV - The Netherlands- Currence PuC
+       { CV_OTHER, "A0000003156020" },             // Currence Holding/PIN BV - The Netherlands - Chipknip
+       { CV_OTHER, "A0000003591010028001" },       // Euro Alliance of Payment Schemes s.c.r.l. (EAPS) - Belgium - Girocard EAPS - ZKA (Germany)
+       { CV_OTHER, "A0000003710001" },             // Verve - Nigeria - InterSwitch Verve Card - Nigerian local switch company
+       { CV_OTHER, "A0000004540010" },             // eTranzact - Nigeria - Etranzact Genesis Card - Nigerian local switch company
+       { CV_OTHER, "A0000004540011" },             // eTranzact - Nigeria - Etranzact Genesis Card 2 - Nigerian local switch company
+       { CV_OTHER, "A0000004766C" },               // Google - United States - GOOGLE_PAYMENT_AID
+       { CV_OTHER, "A0000005241010" },             // RuPay - India - RuPay - RuPay (India)
+       { CV_OTHER, "A0000006723010" },             // TROY - Turkey - TROY chip credit card - Turkey's Payment Method
+       { CV_OTHER, "A0000006723020" },             // TROY - Turkey - TROY chip debit card - Turkey's Payment Method
+       { CV_OTHER, "A0000007705850" },             // Indian Oil Corporation Limited - India - XTRAPOWER Fleet Card Program - Indian Oil’s Pre Paid Program
+       { CV_OTHER, "D27600002545500100" },         // ZKA - Germany - Girocard - ZKA Girocard (Geldkarte) (Germany)
+       { CV_OTHER, "D5280050218002" },             // The Netherlands - ? - (Netherlands)
+       { CV_OTHER, "D5780000021010" },             // Bankaxept    Norway  Bankaxept   Norwegian domestic debit card
+       { CV_OTHER, "F0000000030001" },             // BRADESCO - Brazilian Bank Banco Bradesco
  };
  static const size_t AIDlistLen = sizeof(AIDlist)/sizeof(TAIDList);
  
  };
  static const size_t AIDlistLen = sizeof(AIDlist)/sizeof(TAIDList);
  
@@ -95,6 +143,12 @@ void SetAPDULogging(bool logging) {
         APDULogging = logging;
  }
  
         APDULogging = logging;
  }
  
+void DropFieldEx(EMVCommandChannel channel) {
+       if (channel == ECC_CONTACTLESS) {
+               DropField();
+       }
+}
+
  enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
         char buf[100] = {0};
         if (AIDlen < 1)
  enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
         char buf[100] = {0};
         if (AIDlen < 1)
@@ -106,8 +160,8 @@ enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
                 if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
                         return AIDlist[i].vendor;
                 }
                 if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
                         return AIDlist[i].vendor;
                 }
-       }       
-       
+       }
+
         return CV_NA;
  }
  
         return CV_NA;
  }
  
@@ -120,23 +174,25 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
         return true;
  }
  
         return true;
  }
  
-void TLVPrintFromBuffer(uint8_t *data, int datalen) {
+bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
         struct tlvdb *t = NULL;
         t = tlvdb_parse_multi(data, datalen);
         if (t) {
         struct tlvdb *t = NULL;
         t = tlvdb_parse_multi(data, datalen);
         if (t) {
-               PrintAndLog("-------------------- TLV decoded --------------------");
-               
+               PrintAndLogEx(NORMAL, "-------------------- TLV decoded --------------------");
+
                 tlvdb_visit(t, print_cb, NULL, 0);
                 tlvdb_free(t);
                 tlvdb_visit(t, print_cb, NULL, 0);
                 tlvdb_free(t);
+               return true;
         } else {
         } else {
-               PrintAndLog("TLV ERROR: Can't parse response as TLV tree.");
+               PrintAndLogEx(WARNING, "TLV ERROR: Can't parse response as TLV tree.");
         }
         }
+       return false;
  }
  
  void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
  }
  
  void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
-       if (!tlv) 
+       if (!tlv)
                 return;
                 return;
-       
+
         tlvdb_visit(tlv, print_cb, NULL, level);
  }
  
         tlvdb_visit(tlv, print_cb, NULL, level);
  }
  
@@ -145,29 +201,29 @@ void TLVPrintFromTLV(struct tlvdb *tlv) {
  }
  
  void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
  }
  
  void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
-       PrintAndLog("|------------------|--------|-------------------------|");
-       PrintAndLog("|    AID           |Priority| Name                    |");
-       PrintAndLog("|------------------|--------|-------------------------|");
+       PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
+       PrintAndLogEx(NORMAL, "|    AID           |Priority| Name                    |");
+       PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
  
         struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
         if (!ttmp)
  
         struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
         if (!ttmp)
-               PrintAndLog("|                         none                        |");
-               
+               PrintAndLogEx(NORMAL, "|                         none                        |");
+
         while (ttmp) {
                 const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
                 const struct tlv *tgName = tlvdb_get_inchild(ttmp, 0x50, NULL);
                 const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
                 if (!tgAID)
                         break;
         while (ttmp) {
                 const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
                 const struct tlv *tgName = tlvdb_get_inchild(ttmp, 0x50, NULL);
                 const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
                 if (!tgAID)
                         break;
-               PrintAndLog("|%s|   %s  |%s|", 
-                       sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18), 
-                       (tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ", 
+               PrintAndLogEx(NORMAL, "|%s|   %s  |%s|",
+                       sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
+                       (tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
                         (tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
                         (tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
-               
+
                 ttmp = tlvdb_find_next(ttmp, 0x6f);
         }
  
                 ttmp = tlvdb_find_next(ttmp, 0x6f);
         }
  
-       PrintAndLog("|------------------|--------|-------------------------|");
+       PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
  }
  
  struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
  }
  
  struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
@@ -181,19 +237,19 @@ struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
  
         for (int i = 0; i < track2->len; ++i, tmp += 2)
                 sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
  
         for (int i = 0; i < track2->len; ++i, tmp += 2)
                 sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
-       
+
         int posD = strchr(track2Hex, 'd') - track2Hex;
         if (posD < 1)
                 return NULL;
         int posD = strchr(track2Hex, 'd') - track2Hex;
         if (posD < 1)
                 return NULL;
-       
+
         track2Hex[posD] = 0;
         if (strlen(track2Hex) % 2) {
                 track2Hex[posD] = 'F';
                 track2Hex[posD + 1] = '\0';
         }
         track2Hex[posD] = 0;
         if (strlen(track2Hex) % 2) {
                 track2Hex[posD] = 'F';
                 track2Hex[posD + 1] = '\0';
         }
-       
+
         param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
         param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
-       
+
    return tlvdb_fixed(0x5a, PANlen, PAN);
  }
  
    return tlvdb_fixed(0x5a, PANlen, PAN);
  }
  
@@ -204,13 +260,13 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
         int dCVVlen = 0;
         const int PINlen = 5; // must calculated from 9F67 MSD Offset but i have not seen this tag)
         char *tmp = track2Hex;
         int dCVVlen = 0;
         const int PINlen = 5; // must calculated from 9F67 MSD Offset but i have not seen this tag)
         char *tmp = track2Hex;
-       
+
         if (!track2)
                 return NULL;
         if (!track2)
                 return NULL;
-       
+
         for (int i = 0; i < track2->len; ++i, tmp += 2)
                 sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
         for (int i = 0; i < track2->len; ++i, tmp += 2)
                 sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
-       
+
         int posD = strchr(track2Hex, 'd') - track2Hex;
         if (posD < 1)
                 return NULL;
         int posD = strchr(track2Hex, 'd') - track2Hex;
         if (posD < 1)
                 return NULL;
@@ -224,55 +280,73 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
         memcpy(dCVVHex + 9, track2Hex + posD + 1, 4);
         // service code
         memcpy(dCVVHex + 13, track2Hex + posD + 5, 3);
         memcpy(dCVVHex + 9, track2Hex + posD + 1, 4);
         // service code
         memcpy(dCVVHex + 13, track2Hex + posD + 5, 3);
-       
+
         param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
         param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
-       
+
    return tlvdb_fixed(0x02, dCVVlen, dCVV);
  }
  
    return tlvdb_fixed(0x02, dCVVlen, dCVV);
  }
  
-int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       uint8_t data[APDU_RES_LEN] = {0};
  
  
+int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *apdu, int apdu_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
         *ResultLen = 0;
         *ResultLen = 0;
-       if (sw) *sw = 0;
+       if (sw) *sw = 0;
         uint16_t isw = 0;
         uint16_t isw = 0;
-       
-       if (ActivateField){
-               DropField();
+       int res = 0;
+
+       if (ActivateField) {
+               DropFieldEx( channel );
                 msleep(50);
         }
                 msleep(50);
         }
-       
-       // COMPUTE APDU
-       memcpy(data, &apdu, 5);
-       if (apdu.data)
-               memcpy(&data[5], apdu.data, apdu.Lc);
-       
+
         if (APDULogging)
         if (APDULogging)
-               PrintAndLog(">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
+               PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(apdu, apdu_len));
+
+#ifdef WITH_SMARTCARD
+       switch(channel) {
+               case ECC_CONTACTLESS:
+                       // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
+                       res = ExchangeAPDU14a(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+                       break;
+               case ECC_CONTACT:
+                       res = ExchangeAPDUSC(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+                       break;
+       }
+#else
+       res = ExchangeAPDU14a(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+#endif
  
  
-       // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
-       int res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-       
         if (res) {
                 return res;
         }
  
         if (APDULogging)
         if (res) {
                 return res;
         }
  
         if (APDULogging)
-               PrintAndLog("<<<< %s", sprint_hex(Result, *ResultLen));
+               PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
+
+       if (*ResultLen < 2) {
+               return 200;
+       }
+
+       if (Result[*ResultLen-2] == 0x61) {
+               uint8_t La = Result[*ResultLen-1];
+               uint8_t get_response[5] = {apdu[0], ISO7816_GET_RESPONSE, 0x00, 0x00, La};
+               size_t oldlen = *ResultLen;
+               res = EMVExchangeEx(channel, false, LeaveFieldON, get_response, sizeof(get_response), &Result[oldlen-2], MaxResultLen-oldlen+2, ResultLen, sw, tlv);
+               *ResultLen += oldlen;
+       }
+
+       if (res) return res;
  
         *ResultLen -= 2;
  
         *ResultLen -= 2;
+
         isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
         if (sw)
                 *sw = isw;
  
         if (isw != 0x9000) {
                 if (APDULogging) {
         isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
         if (sw)
                 *sw = isw;
  
         if (isw != 0x9000) {
                 if (APDULogging) {
-                       if (*sw >> 8 == 0x61) {
-                               PrintAndLog("APDU chaining len:%02x -->", *sw & 0xff);
-                       } else {
-                               PrintAndLog("APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
-                               return 5;
-                       }
+                       PrintAndLogEx(ERR, "APDU(%02x%02x) ERROR: [%4X] %s", apdu[0], apdu[1], isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
+                       return 5;
                 }
         }
  
                 }
         }
  
@@ -281,20 +355,40 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
                 struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
                 tlvdb_add(tlv, t);
         }
                 struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
                 tlvdb_add(tlv, t);
         }
-       
+
         return 0;
  }
  
         return 0;
  }
  
-int EMVExchange(bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchangeEx(false, LeaveFieldON, apdu, true, Result, MaxResultLen, ResultLen, sw, tlv);
+static int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *apdu, int apdu_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t APDU[APDU_COMMAND_LEN];
+       memcpy(APDU, apdu, apdu_len);
+       APDU[apdu_len] = 0x00;
+       if (channel == ECC_CONTACTLESS) {
+               if (apdu_len == 5) {
+                       // there is no Lc but an Le already
+               } else if (apdu_len > 5 && apdu_len == 5 + apdu[4] + 1) {
+                       // there is Lc, data and Le
+               } else {
+                       apdu_len++; // no Le, add Le = 0x00 because some vendors require it for contactless
+               }
+       }
+       return EMVExchangeEx(channel, false, LeaveFieldON, APDU, apdu_len, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchangeEx(ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, true, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t Select_APDU[APDU_COMMAND_LEN] = {0x00, ISO7816_SELECT_FILE, 0x04, 0x00, AIDLen, 0x00};
+       memcpy(Select_APDU + 5, AID, AIDLen);
+       int apdulen = 5 + AIDLen;
+       if (channel == ECC_CONTACTLESS) {
+               apdulen++;  // some vendors require Le = 0x00 for contactless operations
+       }
+       return EMVExchangeEx(channel, ActivateField, LeaveFieldON, Select_APDU, apdulen, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-       uint8_t buf[APDU_AID_LEN] = {0};
+int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+       uint8_t buf[APDU_DATA_LEN] = {0};
         *ResultLen = 0;
         int len = 0;
         int res = 0;
         *ResultLen = 0;
         int len = 0;
         int res = 0;
@@ -303,150 +397,249 @@ int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t
                         param_gethex_to_eol(PSElist[1], 0, buf, sizeof(buf), &len);
                         break;
                 case 2:
                         param_gethex_to_eol(PSElist[1], 0, buf, sizeof(buf), &len);
                         break;
                 case 2:
+
                         param_gethex_to_eol(PSElist[0], 0, buf, sizeof(buf), &len);
                         break;
                 default:
                         return -1;
         }
                         param_gethex_to_eol(PSElist[0], 0, buf, sizeof(buf), &len);
                         break;
                 default:
                         return -1;
         }
-       
+
         // select
         // select
-       res = EMVSelect(ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
+       res = EMVSelect(channel, ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
+
+       return res;
+}
+
+
+int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+       int retrycnt = 0;
+       int res = 0;
+       do {
+               res = EMVSelect(channel, false, true, AID, AIDLen, Result, MaxResultLen, ResultLen, sw, tlv);
+
+               // retry if error and not returned sw error
+               if (res && res != 5) {
+                       if (++retrycnt < 3){
+                               continue;
+                       } else {
+                               // card select error, proxmark error
+                               if (res == 1) {
+                                       PrintAndLogEx(WARNING, "Exit...");
+                                       return 1;
+                               }
+
+                               retrycnt = 0;
+                               PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
+                               return res;
+                       }
+               }
+       } while (res && res != 5);
+
+       return res;
+}
+
+
+int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv){
+       uint8_t data[APDU_RESPONSE_LEN] = {0};
+       size_t datalen = 0;
+       int res = 0;
+       uint16_t sw = 0;
  
  
+       while (tlvdbelm) {
+               const struct tlv *tgAID = tlvdb_get_inchild(tlvdbelm, 0x4f, NULL);
+               if (tgAID) {
+                       res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
+
+                       // if returned sw error
+                       if (res == 5) {
+                               // next element
+                               tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+                               continue;
+                       }
+
+                       if (res)
+                               break;
+
+                       // all is ok
+                       if (decodeTLV){
+                               PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
+                               TLVPrintFromBuffer(data, datalen);
+                       }
+               }
+               tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+       }
         return res;
  }
  
         return res;
  }
  
-int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
-       uint8_t data[APDU_RES_LEN] = {0};
+
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
+       uint8_t data[APDU_RESPONSE_LEN] = {0};
         size_t datalen = 0;
         size_t datalen = 0;
+       uint8_t sfidata[0x11][APDU_RESPONSE_LEN] = {0};
+       size_t sfidatalen[0x11] = {0};
         uint16_t sw = 0;
         int res;
         uint16_t sw = 0;
         int res;
+       bool fileFound = false;
+
+       char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
  
         // select PPSE
  
         // select PPSE
-       res = EMVSelectPSE(ActivateField, true, 2, data, sizeof(data), &datalen, &sw);
+       res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
  
         if (!res){
  
         if (!res){
+               if (sw != 0x9000) {
+                       PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
+                       return 1;
+               }
+
                 struct tlvdb *t = NULL;
                 t = tlvdb_parse_multi(data, datalen);
                 if (t) {
                 struct tlvdb *t = NULL;
                 t = tlvdb_parse_multi(data, datalen);
                 if (t) {
-                       int retrycnt = 0;
-                       struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
-                       if (!ttmp)
-                               PrintAndLog("PPSE don't have records.");
-                       
-                       while (ttmp) {
-                               const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x4f, NULL);
-                               if (tgAID) {
-                                       res = EMVSelect(false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
-
-                                       // retry if error and not returned sw error
-                                       if (res && res != 5) {
-                                               if (++retrycnt < 3){
-                                                       continue;
-                                               } else {
-                                                       // card select error, proxmark error
-                                                       if (res == 1) {
-                                                               PrintAndLog("Exit...");
-                                                               return 1;
-                                                       }
-                                                       
-                                                       retrycnt = 0;
-                                                       PrintAndLog("Retry failed [%s]. Skiped...", sprint_hex_inrow(tgAID->value, tgAID->len));
-                                               }
-                                               
-                                               // next element
-                                               ttmp = tlvdb_find_next(ttmp, 0x61);
-                                               continue;
+                       // PSE/PPSE with SFI
+                       struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
+                       if (tsfi) {
+                               uint8_t sfin = 0;
+                               tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
+                               PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
+
+                               for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+                                       PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
+                                       res = EMVReadRecord(channel, true, sfin, ui, sfidata[ui], APDU_RESPONSE_LEN, &sfidatalen[ui], &sw, NULL);
+
+                                       // end of records
+                                       if (sw == 0x6a83) {
+                                               sfidatalen[ui] = 0;
+                                               PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
+                                               break;
+                                       }
+
+                                       // error catch!
+                                       if (sw != 0x9000) {
+                                               sfidatalen[ui] = 0;
+                                               PrintAndLogEx(FAILED, "PPSE get Error. APDU error: %04x.", sw);
+                                               break;
                                         }
                                         }
-                                       retrycnt = 0;
  
  
-                                       // all is ok
                                         if (decodeTLV){
                                         if (decodeTLV){
-                                               PrintAndLog("%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
-                                               TLVPrintFromBuffer(data, datalen);
+                                               TLVPrintFromBuffer(sfidata[ui], sfidatalen[ui]);
+                                       }
+                               }
+
+                               for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+                                       if (sfidatalen[ui]) {
+                                               struct tlvdb *tsfi = NULL;
+                                               tsfi = tlvdb_parse_multi(sfidata[ui], sfidatalen[ui]);
+                                               if (tsfi) {
+                                                       struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]){0x70, 0x61, 0x00});
+                                                       if (!tsfitmp) {
+                                                               PrintAndLogEx(FAILED, "SFI 0x%02d doesn't have any records.", sfidatalen[ui]);
+                                                               continue;
+                                                       }
+                                                       res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
+                                                       fileFound = true;
+                                               }
+                                               tlvdb_free(tsfi);
                                         }
                                 }
                                         }
                                 }
-                               
-                               ttmp = tlvdb_find_next(ttmp, 0x61);
                         }
  
                         }
  
+
+                       // PSE/PPSE plain (wo SFI)
+                       struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
+                       if (ttmp) {
+                               res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
+                               fileFound = true;
+                       }
+
+                       if (!fileFound)
+                               PrintAndLogEx(FAILED, "PPSE doesn't have any records.");
+
                         tlvdb_free(t);
                 } else {
                         tlvdb_free(t);
                 } else {
-                       PrintAndLog("PPSE ERROR: Can't get TLV from response.");
-               }               
+                       PrintAndLogEx(WARNING, "%s ERROR: Can't get TLV from response.", PSE_or_PPSE);
+               }
         } else {
         } else {
-               PrintAndLog("PPSE ERROR: Can't select PPSE AID. Error: %d", res);
+               PrintAndLogEx(WARNING, "%s ERROR: Can't select PPSE AID. Error: %d", PSE_or_PPSE, res);
         }
         }
-       
-       if(!LeaveFieldON)
-               DropField();
-       
+
+       if (!LeaveFieldON)
+               DropFieldEx( channel );
+
         return res;
  }
  
         return res;
  }
  
-int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
-       uint8_t aidbuf[APDU_AID_LEN] = {0};
+int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
+       uint8_t aidbuf[APDU_DATA_LEN] = {0};
         int aidlen = 0;
         int aidlen = 0;
-       uint8_t data[APDU_RES_LEN] = {0};
+       uint8_t data[APDU_RESPONSE_LEN] = {0};
         size_t datalen = 0;
         uint16_t sw = 0;
         size_t datalen = 0;
         uint16_t sw = 0;
-       
+
         int res = 0;
         int retrycnt = 0;
         for(int i = 0; i < AIDlistLen; i ++) {
                 param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
         int res = 0;
         int retrycnt = 0;
         for(int i = 0; i < AIDlistLen; i ++) {
                 param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
-               res = EMVSelect((i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
+               res = EMVSelect(channel, (i == 0) ? ActivateField : false, true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
                 // retry if error and not returned sw error
                 if (res && res != 5) {
                         if (++retrycnt < 3){
                                 i--;
                         } else {
                 // retry if error and not returned sw error
                 if (res && res != 5) {
                         if (++retrycnt < 3){
                                 i--;
                         } else {
-                               // card select error, proxmark error
-                               if (res == 1) {
-                                       PrintAndLog("Exit...");
+                               // (1) - card select error, (4) reply timeout, (200) - result length = 0
+                               if (res == 1 || res == 4 || res == 200) {
+                                       if (!LeaveFieldON)
+                                               DropFieldEx(channel);
+                                       PrintAndLogEx(WARNING, "Exit...");
                                         return 1;
                                 }
                                         return 1;
                                 }
-                               
+
                                 retrycnt = 0;
                                 retrycnt = 0;
-                               PrintAndLog("Retry failed [%s]. Skiped...", AIDlist[i].aid);
+                               PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
                         }
                         continue;
                 }
                 retrycnt = 0;
                         }
                         continue;
                 }
                 retrycnt = 0;
-               
+
                 if (res)
                         continue;
                 if (res)
                         continue;
-               
-               if (decodeTLV){
-                       PrintAndLog("%s:", AIDlist[i].aid);
+
+               if (!datalen)
+                       continue;
+
+               if (decodeTLV) {
+                       PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
                         TLVPrintFromBuffer(data, datalen);
                 }
         }
  
                         TLVPrintFromBuffer(data, datalen);
                 }
         }
  
+       if (!LeaveFieldON)
+               DropFieldEx(channel);
+
         return 0;
  }
  
  int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
         // check priority. 0x00 - highest
         int prio = 0xffff;
         return 0;
  }
  
  int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
         // check priority. 0x00 - highest
         int prio = 0xffff;
-       
+
         *AIDlen = 0;
  
         struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
         if (!ttmp)
                 return 1;
         *AIDlen = 0;
  
         struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
         if (!ttmp)
                 return 1;
-               
+
         while (ttmp) {
                 const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
                 const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
         while (ttmp) {
                 const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
                 const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
-               
+
                 if (!tgAID)
                         break;
  
                 if (tgPrio) {
                 if (!tgAID)
                         break;
  
                 if (tgPrio) {
-                       int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2); 
+                       int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
                         if (pt < prio) {
                                 prio = pt;
                         if (pt < prio) {
                                 prio = pt;
-                               
+
                                 memcpy(AID, tgAID->value, tgAID->len);
                                 *AIDlen = tgAID->len;
                         }
                                 memcpy(AID, tgAID->value, tgAID->len);
                                 *AIDlen = tgAID->len;
                         }
@@ -454,59 +647,84 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
                         // takes the first application from list wo priority
                         if (!*AIDlen) {
                         memcpy(AID, tgAID->value, tgAID->len);
                         // takes the first application from list wo priority
                         if (!*AIDlen) {
                         memcpy(AID, tgAID->value, tgAID->len);
-                       *AIDlen = tgAID->len;                           
+                       *AIDlen = tgAID->len;
                         }
                 }
                         }
                 }
-               
+
                 ttmp = tlvdb_find_next(ttmp, 0x6f);
         }
                 ttmp = tlvdb_find_next(ttmp, 0x6f);
         }
-       
+
         return 0;
  }
  
         return 0;
  }
  
-int EMVGPO(bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t GPO_APDU[APDU_COMMAND_LEN] = {0x80, ISO7816_GET_PROCESSING_OPTIONS, 0x00, 0x00, PDOLLen, 0x00};
+       memcpy(GPO_APDU + 5, PDOL, PDOLLen);
+       int apdulen = 5 + PDOLLen;
+
+       return EMVExchange(channel, LeaveFieldON, GPO_APDU, apdulen, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-int EMVReadRecord(bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       int res = EMVExchange(LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t read_APDU[5] = {0x00, ISO7816_READ_RECORDS, SFIrec, (SFI << 3) | 0x04, 0x00};
+       int res = EMVExchange(channel, LeaveFieldON, read_APDU, sizeof(read_APDU), Result, MaxResultLen, ResultLen, sw, tlv);
         if (*sw == 0x6700) {
         if (*sw == 0x6700) {
-               PrintAndLog(">>> trying to reissue command withouth Le...");
-               res = EMVExchangeEx(false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+               PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
+               res = EMVExchangeEx(channel, false, LeaveFieldON, read_APDU, sizeof(read_APDU), Result, MaxResultLen, ResultLen, sw, tlv);
         }
         return res;
  }
  
         }
         return res;
  }
  
-int EMVAC(bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t CDOL_APDU[APDU_COMMAND_LEN] = {0x80, 0xae, RefControl, 0x00, CDOLLen, 0x00};
+       memcpy(CDOL_APDU + 5, CDOL, CDOLLen);
+       int apdulen = 5 + CDOLLen;
+
+       return EMVExchange(channel, LeaveFieldON, CDOL_APDU, apdulen, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-int EMVGenerateChallenge(bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       int res = EMVExchange(LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t get_challenge_APDU[APDU_COMMAND_LEN] = {0x00, ISO7816_GET_CHALLENGE, 0x00, 0x00};
+
+       int res = EMVExchange(channel, LeaveFieldON, get_challenge_APDU, 4, Result, MaxResultLen, ResultLen, sw, tlv);
         if (*sw == 0x6700) {
         if (*sw == 0x6700) {
-               PrintAndLog(">>> trying to reissue command withouth Le...");
-               res = EMVExchangeEx(false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+               PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
+               res = EMVExchangeEx(channel, false, LeaveFieldON, get_challenge_APDU, 4, Result, MaxResultLen, ResultLen, sw, tlv);
         }
         return res;
  }
  
         }
         return res;
  }
  
-int EMVInternalAuthenticate(bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchange(LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t authenticate_APDU[APDU_COMMAND_LEN] = {0x00, ISO7816_INTERNAL_AUTHENTICATE, 0x00, 0x00, DDOLLen, 0x00};
+       memcpy(authenticate_APDU + 5, DDOL, DDOLLen);
+       int apdulen = 5 + DDOLLen;
+
+       return EMVExchange(channel, LeaveFieldON, authenticate_APDU, apdulen, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-int MSCComputeCryptoChecksum(bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-       return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+       uint8_t checksum_APDU[APDU_COMMAND_LEN] = {0x80, 0x2a, 0x8e, 0x80, UDOLlen, 0x00};
+       memcpy(checksum_APDU + 5, UDOL, UDOLlen);
+       int apdulen = 5 + UDOLlen;
+
+       return EMVExchange(channel, LeaveFieldON, checksum_APDU, apdulen, Result, MaxResultLen, ResultLen, sw, tlv);
  }
  
  }
  
-// Authentication 
-static struct emv_pk *get_ca_pk(struct tlvdb *db) {
+// Authentication
+struct emv_pk *get_ca_pk(struct tlvdb *db) {
         const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
         const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
  
         if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1)
                 return NULL;
  
         const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
         const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
  
         if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1)
                 return NULL;
  
-       PrintAndLog("CA public key index 0x%0x", caidx_tlv->value[0]);
+       PrintAndLogEx(NORMAL, "CA Public Key index 0x%0x", caidx_tlv->value[0]);
         return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
  }
  
         return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
  }
  
@@ -514,18 +732,18 @@ int trSDA(struct tlvdb *tlv) {
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
-               PrintAndLog("ERROR: Key not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
                 return 2;
         }
                 return 2;
         }
-       
+
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
                 emv_pk_free(pk);
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
                 emv_pk_free(pk);
-               PrintAndLog("ERROR: Issuer certificate not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
                 return 2;
         }
  
                 return 2;
         }
  
-       PrintAndLog("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+       PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
                 issuer_pk->rid[0],
                 issuer_pk->rid[1],
                 issuer_pk->rid[2],
                 issuer_pk->rid[0],
                 issuer_pk->rid[1],
                 issuer_pk->rid[2],
@@ -541,22 +759,22 @@ int trSDA(struct tlvdb *tlv) {
         if (!sda_tlv || sda_tlv->len < 1) {
                 emv_pk_free(issuer_pk);
                 emv_pk_free(pk);
         if (!sda_tlv || sda_tlv->len < 1) {
                 emv_pk_free(issuer_pk);
                 emv_pk_free(pk);
-               PrintAndLog("ERROR: Can't find input list for Offline Data Authentication. Exit.");
+               PrintAndLogEx(WARNING, "Can't find input list for Offline Data Authentication. Exit.");
                 return 3;
         }
                 return 3;
         }
-       
+
         struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
         if (dac_db) {
                 const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
         struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
         if (dac_db) {
                 const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-               PrintAndLog("SDA verified OK. (%02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+               PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
                 tlvdb_add(tlv, dac_db);
         } else {
                 emv_pk_free(issuer_pk);
                 emv_pk_free(pk);
                 tlvdb_add(tlv, dac_db);
         } else {
                 emv_pk_free(issuer_pk);
                 emv_pk_free(pk);
-               PrintAndLog("ERROR: SSAD verify error");
+               PrintAndLogEx(WARNING, "SSAD verify error");
                 return 4;
         }
                 return 4;
         }
-       
+
         emv_pk_free(issuer_pk);
         emv_pk_free(pk);
         return 0;
         emv_pk_free(issuer_pk);
         emv_pk_free(pk);
         return 0;
@@ -565,31 +783,31 @@ int trSDA(struct tlvdb *tlv) {
  static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
  static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
  
  static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
  static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
  
-int trDDA(bool decodeTLV, struct tlvdb *tlv) {
-       uint8_t buf[APDU_RES_LEN] = {0};
+int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
+       uint8_t buf[APDU_RESPONSE_LEN] = {0};
         size_t len = 0;
         uint16_t sw = 0;
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
         size_t len = 0;
         uint16_t sw = 0;
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
-               PrintAndLog("ERROR: Key not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
                 return 2;
         }
  
         const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
                 return 2;
         }
  
         const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-       if (!sda_tlv || sda_tlv->len < 1) {
+/*  if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
                 emv_pk_free(pk);
                 emv_pk_free(pk);
-               PrintAndLog("ERROR: Can't find input list for Offline Data Authentication. Exit.");
+               PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
                 return 3;
         }
                 return 3;
         }
-
+*/
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
                 emv_pk_free(pk);
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
                 emv_pk_free(pk);
-               PrintAndLog("ERROR: Issuer certificate not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
                 return 2;
         }
                 return 2;
         }
-       printf("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+       PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
@@ -600,15 +818,15 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                         issuer_pk->serial[1],
                         issuer_pk->serial[2]
                         );
                         issuer_pk->serial[1],
                         issuer_pk->serial[2]
                         );
-                               
+
         struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
         if (!icc_pk) {
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
         struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
         if (!icc_pk) {
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
-               PrintAndLog("ERROR: ICC setrificate not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
                 return 2;
         }
                 return 2;
         }
-       printf("ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+       PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
@@ -620,21 +838,25 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                         icc_pk->serial[2]
                         );
  
                         icc_pk->serial[2]
                         );
  
-       struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
-       if (!icc_pe_pk) {
-               PrintAndLog("WARNING: ICC PE PK recover error. ");
+       if (tlvdb_get(tlv, 0x9f2d, NULL)) {
+               struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
+               if (!icc_pe_pk) {
+                       PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
+               } else {
+                       PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+                                       icc_pe_pk->rid[0],
+                                       icc_pe_pk->rid[1],
+                                       icc_pe_pk->rid[2],
+                                       icc_pe_pk->rid[3],
+                                       icc_pe_pk->rid[4],
+                                       icc_pe_pk->index,
+                                       icc_pe_pk->serial[0],
+                                       icc_pe_pk->serial[1],
+                                       icc_pe_pk->serial[2]
+                                       );
+               }
         } else {
         } else {
-               printf("ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-                               icc_pe_pk->rid[0],
-                               icc_pe_pk->rid[1],
-                               icc_pe_pk->rid[2],
-                               icc_pe_pk->rid[3],
-                               icc_pe_pk->rid[4],
-                               icc_pe_pk->index,
-                               icc_pe_pk->serial[0],
-                               icc_pe_pk->serial[1],
-                               icc_pe_pk->serial[2]
-                               );
+               PrintAndLogEx(INFO, "ICC PE PK (PIN Encipherment Public Key Certificate) not found.\n");
         }
  
         // 9F4B: Signed Dynamic Application Data
         }
  
         // 9F4B: Signed Dynamic Application Data
@@ -642,11 +864,11 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
         // DDA with internal authenticate OR fDDA with filled 0x9F4B tag (GPO result)
         // EMV kernel3 v2.4, contactless book C-3, C.1., page 147
         if (sdad_tlv) {
         // DDA with internal authenticate OR fDDA with filled 0x9F4B tag (GPO result)
         // EMV kernel3 v2.4, contactless book C-3, C.1., page 147
         if (sdad_tlv) {
-               PrintAndLog("\n* * Got Signed Dynamic Application Data (9F4B) form GPO. Maybe fDDA...");
+               PrintAndLogEx(NORMAL, "\n* * Got Signed Dynamic Application Data (9F4B) form GPO. Maybe fDDA...");
  
                 const struct tlvdb *atc_db = emv_pki_recover_atc_ex(icc_pk, tlv, true);
                 if (!atc_db) {
  
                 const struct tlvdb *atc_db = emv_pki_recover_atc_ex(icc_pk, tlv, true);
                 if (!atc_db) {
-                       PrintAndLog("ERROR: Can't recover IDN (ICC Dynamic Number)");
+                       PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
@@ -656,17 +878,17 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                 // 9f36 Application Transaction Counter (ATC)
                 const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
                 if(atc_tlv) {
                 // 9f36 Application Transaction Counter (ATC)
                 const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
                 if(atc_tlv) {
-                       PrintAndLog("\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
-                       
+                       PrintAndLogEx(NORMAL, "\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
+
                         const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
                         if(tlv_equal(core_atc_tlv, atc_tlv)) {
                         const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
                         if(tlv_equal(core_atc_tlv, atc_tlv)) {
-                               PrintAndLog("ATC check OK.");
-                               PrintAndLog("fDDA (fast DDA) verified OK.");
+                               PrintAndLogEx(SUCCESS, "ATC check OK.");
+                               PrintAndLogEx(SUCCESS, "fDDA (fast DDA) verified OK.");
                         } else {
                         } else {
-                               PrintAndLog("ERROR: fDDA verified, but ATC in the certificate and ATC in the record not the same.");
+                               PrintAndLogEx(WARNING, "Error: fDDA verified, but ATC in the certificate and ATC in the record not the same.");
                         }
                 } else {
                         }
                 } else {
-                       PrintAndLog("\nERROR: fDDA (fast DDA) verify error");
+                       PrintAndLogEx(NORMAL, "\nERROR: fDDA (fast DDA) verify error");
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
@@ -676,38 +898,38 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                 struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
                 if (dac_db) {
                         const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
                 struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
                 if (dac_db) {
                         const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-                       printf("SDA verified OK. (%02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+                       PrintAndLogEx(NORMAL, "SDAD verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
                         tlvdb_add(tlv, dac_db);
                 } else {
                         tlvdb_add(tlv, dac_db);
                 } else {
-                       PrintAndLog("ERROR: SSAD verify error");
+                       PrintAndLogEx(WARNING, "Error: SSAD verify error");
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         return 4;
                 }
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         return 4;
                 }
-               
-               PrintAndLog("\n* Calc DDOL");
+
+               PrintAndLogEx(NORMAL, "\n* Calc DDOL");
                 const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
                 if (!ddol_tlv) {
                         ddol_tlv = &default_ddol_tlv;
                 const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
                 if (!ddol_tlv) {
                         ddol_tlv = &default_ddol_tlv;
-                       PrintAndLog("DDOL [9f49] not found. Using default DDOL");
+                       PrintAndLogEx(NORMAL, "DDOL [9f49] not found. Using default DDOL");
                 }
  
                 struct tlv *ddol_data_tlv = dol_process(ddol_tlv, tlv, 0);
                 if (!ddol_data_tlv) {
                 }
  
                 struct tlv *ddol_data_tlv = dol_process(ddol_tlv, tlv, 0);
                 if (!ddol_data_tlv) {
-                       PrintAndLog("ERROR: Can't create DDOL TLV");
+                       PrintAndLogEx(WARNING, "Error: Can't create DDOL TLV");
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         return 5;
                 }
  
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         emv_pk_free(icc_pk);
                         return 5;
                 }
  
-               PrintAndLog("DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
+               PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
  
  
-               PrintAndLog("\n* Internal Authenticate");
-               int res = EMVInternalAuthenticate(true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
-               if (res) {      
-                       PrintAndLog("Internal Authenticate error(%d): %4x. Exit...", res, sw);
+               PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
+               int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
+               if (res) {
+                       PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
                         free(ddol_data_tlv);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         free(ddol_data_tlv);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
@@ -718,20 +940,27 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                 struct tlvdb *dda_db = NULL;
                 if (buf[0] == 0x80) {
                         if (len < 3 ) {
                 struct tlvdb *dda_db = NULL;
                 if (buf[0] == 0x80) {
                         if (len < 3 ) {
-                               PrintAndLog("ERROR: Internal Authenticate format1 parsing error. length=%d", len);
+                               PrintAndLogEx(WARNING, "Error: Internal Authenticate format1 parsing error. length=%d", len);
                         } else {
                         } else {
+                               // parse response 0x80
+                               struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
+                               const struct tlv * t80tlv = tlvdb_get_tlv(t80);
+
                                 // 9f4b Signed Dynamic Application Data
                                 // 9f4b Signed Dynamic Application Data
-                               dda_db = tlvdb_fixed(0x9f4b, len - 2, buf + 2);
+                               dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
                                 tlvdb_add(tlv, dda_db);
                                 tlvdb_add(tlv, dda_db);
+
+                               tlvdb_free(t80);
+
                                 if (decodeTLV){
                                 if (decodeTLV){
-                                       PrintAndLog("* * Decode response format 1:");
+                                       PrintAndLogEx(NORMAL, "* * Decode response format 1:");
                                         TLVPrintFromTLV(dda_db);
                                 }
                         }
                 } else {
                         dda_db = tlvdb_parse_multi(buf, len);
                         if(!dda_db) {
                                         TLVPrintFromTLV(dda_db);
                                 }
                         }
                 } else {
                         dda_db = tlvdb_parse_multi(buf, len);
                         if(!dda_db) {
-                               PrintAndLog("ERROR: Can't parse Internal Authenticate result as TLV");
+                               PrintAndLogEx(WARNING, "Error: Can't parse Internal Authenticate result as TLV");
                                 free(ddol_data_tlv);
                                 emv_pk_free(pk);
                                 emv_pk_free(issuer_pk);
                                 free(ddol_data_tlv);
                                 emv_pk_free(pk);
                                 emv_pk_free(issuer_pk);
@@ -739,7 +968,7 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                                 return 7;
                         }
                         tlvdb_add(tlv, dda_db);
                                 return 7;
                         }
                         tlvdb_add(tlv, dda_db);
-                       
+
                         if (decodeTLV)
                                 TLVPrintFromTLV(dda_db);
                 }
                         if (decodeTLV)
                                 TLVPrintFromTLV(dda_db);
                 }
@@ -747,7 +976,7 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                 struct tlvdb *idn_db = emv_pki_recover_idn_ex(icc_pk, dda_db, ddol_data_tlv, true);
                 free(ddol_data_tlv);
                 if (!idn_db) {
                 struct tlvdb *idn_db = emv_pki_recover_idn_ex(icc_pk, dda_db, ddol_data_tlv, true);
                 free(ddol_data_tlv);
                 if (!idn_db) {
-                       PrintAndLog("ERROR: Can't recover IDN (ICC Dynamic Number)");
+                       PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
                         tlvdb_free(dda_db);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
                         tlvdb_free(dda_db);
                         emv_pk_free(pk);
                         emv_pk_free(issuer_pk);
@@ -759,12 +988,12 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                 // 9f4c ICC Dynamic Number
                 const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
                 if(idn_tlv) {
                 // 9f4c ICC Dynamic Number
                 const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
                 if(idn_tlv) {
-                       PrintAndLog("\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
-                       PrintAndLog("DDA verified OK.");
+                       PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
+                       PrintAndLogEx(NORMAL, "DDA verified OK.");
                         tlvdb_add(tlv, idn_db);
                         tlvdb_free(idn_db);
                 } else {
                         tlvdb_add(tlv, idn_db);
                         tlvdb_free(idn_db);
                 } else {
-                       PrintAndLog("\nERROR: DDA verify error");
+                       PrintAndLogEx(NORMAL, "\nERROR: DDA verify error");
                         tlvdb_free(idn_db);
  
                         emv_pk_free(pk);
                         tlvdb_free(idn_db);
  
                         emv_pk_free(pk);
@@ -773,7 +1002,7 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
                         return 9;
                 }
         }
                         return 9;
                 }
         }
-       
+
         emv_pk_free(pk);
         emv_pk_free(issuer_pk);
         emv_pk_free(icc_pk);
         emv_pk_free(pk);
         emv_pk_free(issuer_pk);
         emv_pk_free(icc_pk);
@@ -784,24 +1013,24 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
  
         struct emv_pk *pk = get_ca_pk(tlv);
         if (!pk) {
-               PrintAndLog("ERROR: Key not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
                 return 2;
         }
  
         const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
         if (!sda_tlv || sda_tlv->len < 1) {
                 return 2;
         }
  
         const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
         if (!sda_tlv || sda_tlv->len < 1) {
-               PrintAndLog("ERROR: Can't find input list for Offline Data Authentication. Exit.");
+               PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
                 emv_pk_free(pk);
                 return 3;
         }
  
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
                 emv_pk_free(pk);
                 return 3;
         }
  
         struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
         if (!issuer_pk) {
-               PrintAndLog("ERROR: Issuer certificate not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
                 emv_pk_free(pk);
                 return 2;
         }
                 emv_pk_free(pk);
                 return 2;
         }
-       printf("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+       PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
@@ -812,15 +1041,15 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
                         issuer_pk->serial[1],
                         issuer_pk->serial[2]
                         );
                         issuer_pk->serial[1],
                         issuer_pk->serial[2]
                         );
-                               
+
         struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
         if (!icc_pk) {
         struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
         if (!icc_pk) {
-               PrintAndLog("ERROR: ICC setrificate not found. Exit.");
+               PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
                 return 2;
         }
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
                 return 2;
         }
-       printf("ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+       PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
@@ -835,29 +1064,29 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
         struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
         if (dac_db) {
                 const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
         struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
         if (dac_db) {
                 const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-               PrintAndLog("SSAD verified OK. (%02hhx:%02hhx)", dac_tlv->value[0], dac_tlv->value[1]);
+               PrintAndLogEx(NORMAL, "SSAD verified OK. (%02hhx:%02hhx)", dac_tlv->value[0], dac_tlv->value[1]);
                 tlvdb_add(tlv, dac_db);
         } else {
                 tlvdb_add(tlv, dac_db);
         } else {
-               PrintAndLog("ERROR: SSAD verify error");
+               PrintAndLogEx(WARNING, "Error: SSAD verify error");
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
                 emv_pk_free(icc_pk);
                 return 4;
         }
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
                 emv_pk_free(icc_pk);
                 return 4;
         }
-       
-       PrintAndLog("\n* * Check Signed Dynamic Application Data (SDAD)");
+
+       PrintAndLogEx(NORMAL, "\n* * Check Signed Dynamic Application Data (SDAD)");
         struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
                         pdol_data_tlv, // pdol
                         ac_data_tlv,   // cdol1
         struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
                         pdol_data_tlv, // pdol
                         ac_data_tlv,   // cdol1
-                       NULL,          // cdol2 
+                       NULL,          // cdol2
                         true);
         if (idn_db) {
                 const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
                         true);
         if (idn_db) {
                 const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
-               PrintAndLog("\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
-               PrintAndLog("CDA verified OK.");
+               PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
+               PrintAndLogEx(NORMAL, "CDA verified OK.");
                 tlvdb_add(tlv, idn_db);
         } else {
                 tlvdb_add(tlv, idn_db);
         } else {
-               PrintAndLog("\nERROR: CDA verify error");
+               PrintAndLogEx(NORMAL, "\nERROR: CDA verify error");
         }
  
         emv_pk_free(pk);
         }
  
         emv_pk_free(pk);
@@ -867,7 +1096,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
  }
  
  int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
  }
  
  int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
-       
+
         struct emv_pk *pk = get_ca_pk(tlvRoot);
         if (!pk) {
                 PrintAndLog("ERROR: Key not found. Exit.");
         struct emv_pk *pk = get_ca_pk(tlvRoot);
         if (!pk) {
                 PrintAndLog("ERROR: Key not found. Exit.");
@@ -880,7 +1109,7 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
                 PrintAndLog("WARNING: Issuer certificate not found. Exit.");
                 return 2;
         }
                 PrintAndLog("WARNING: Issuer certificate not found. Exit.");
                 return 2;
         }
-       PrintAndLog("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+       PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
                         issuer_pk->rid[0],
                         issuer_pk->rid[1],
                         issuer_pk->rid[2],
@@ -903,10 +1132,10 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
         if (!icc_pk) {
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
         if (!icc_pk) {
                 emv_pk_free(pk);
                 emv_pk_free(issuer_pk);
-               PrintAndLog("WARNING: ICC certificate not found. Exit.");
+               PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
                 return 2;
         }
                 return 2;
         }
-       printf("ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+       PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
                         icc_pk->rid[0],
                         icc_pk->rid[1],
                         icc_pk->rid[2],
@@ -917,11 +1146,11 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
                         icc_pk->serial[1],
                         icc_pk->serial[2]
                         );
                         icc_pk->serial[1],
                         icc_pk->serial[2]
                         );
-       
+
         char *icc_pk_c = emv_pk_dump_pk(icc_pk);
         JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
         JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
         free(issuer_pk_c);
         char *icc_pk_c = emv_pk_dump_pk(icc_pk);
         JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
         JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
         free(issuer_pk_c);
-       
+
         return 0;
  }
         return 0;
  }