merged emvcore

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 5c737b056a0543d6a05b95eb01ade1caa6c60319..825e9bf949d138efd447387ef872b5412574bcf1 100644 (file)
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -12,75 +12,96 @@
 
 // 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

-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
 };

-const size_t PSElistLen = sizeof(PSElist)/sizeof(char*);
+static const size_t PSElistLen = sizeof(PSElist)/sizeof(char*);

 
 

-const char *AIDlist [] = { 
+typedef struct {
+       enum CardPSVendor vendor;
+       const char* aid;
+} TAIDList;
+
+static const TAIDList AIDlist [] = { 

        // Visa International
        // Visa International

-       "A00000000305076010",   // VISA ELO Credit      
-       "A0000000031010",               // VISA Debit/Credit (Classic)  
-       "A0000000031010",               // ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd    
-       "A000000003101001",             // VISA Credit  
-       "A000000003101002",             // VISA Debit   
-       "A0000000032010",               // VISA Electron
-       "A0000000032020",               // VISA 
-       "A0000000033010",               // VISA Interlink       
-       "A0000000034010",               // VISA Specific        
-       "A0000000035010",               // VISA Specific        
-       "A0000000036010",               // Domestic Visa Cash Stored Value      
-       "A0000000036020",               // International Visa Cash Stored Value 
-       "A0000000038002",               // VISA Auth, VisaRemAuthen EMV-CAP (DPA)       
-       "A0000000038010",               // VISA Plus    
-       "A0000000039010",               // VISA Loyalty 
-       "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

-       "A000000098",                   // Debit Card
-       "A0000000980848",               // Debit Card
+       { CV_VISA,      "A000000098" },                                 // Debit Card
+       { CV_VISA,      "A0000000980848" },                             // Debit Card

        // Mastercard International
        // Mastercard International

-       "A00000000401",                 // MasterCard PayPass   
-       "A0000000041010",               // MasterCard Credit
-       "A00000000410101213",   // MasterCard Credit
-       "A00000000410101215",   // MasterCard Credit
-       "A0000000042010",               // MasterCard Specific
-       "A0000000043010",               // MasterCard Specific
-       "A0000000043060",               // Maestro (Debit)
-       "A000000004306001",             // Maestro (Debit)
-       "A0000000044010",               // MasterCard Specific
-       "A0000000045010",               // MasterCard Specific
-       "A0000000046000",               // Cirrus
-       "A0000000048002",               // SecureCode Auth EMV-CAP
-       "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   

        // American Express
        // American Express

-       "A000000025",
-       "A0000000250000",
-       "A00000002501",
-       "A000000025010402",
-       "A000000025010701",
-       "A000000025010801",
+       { CV_AMERICANEXPRESS, "A000000025" },
+       { CV_AMERICANEXPRESS, "A0000000250000" },
+       { CV_AMERICANEXPRESS, "A00000002501" },
+       { CV_AMERICANEXPRESS, "A000000025010402" },
+       { CV_AMERICANEXPRESS, "A000000025010701" },
+       { CV_AMERICANEXPRESS, "A000000025010801" },

        // Groupement des Cartes Bancaires "CB"
        // Groupement des Cartes Bancaires "CB"

-       "A0000000421010",               // Cartes Bancaire EMV Card     
-       "A0000000422010",               
-       "A0000000423010",               
-       "A0000000424010",               
-       "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.

-       "A00000006510",                 // JCB  
-       "A0000000651010",               // JCB J Smart Credit   
-       "A0000001544442",               // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
-       "F0000000030001",               // BRADESCO
-       "A0000005241010",               // RuPay - RuPay
-       "D5780000021010"                // Bankaxept - Bankaxept        
+       { CV_JCB, "A00000006510" },                                     // JCB  
+       { CV_JCB, "A0000000651010" },                           // JCB J Smart Credit   
+       // 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

 };
 };

-const size_t AIDlistLen = sizeof(AIDlist)/sizeof(char*);
+static const size_t AIDlistLen = sizeof(AIDlist)/sizeof(TAIDList);

 
 static bool APDULogging = false;
 void SetAPDULogging(bool logging) {
        APDULogging = logging;
 }
 
 
 static bool APDULogging = false;
 void SetAPDULogging(bool logging) {
        APDULogging = logging;
 }
 

+enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
+       char buf[100] = {0};
+       if (AIDlen < 1)
+               return CV_NA;
+
+       hex_to_buffer((uint8_t *)buf, AID, AIDlen, sizeof(buf) - 1, 0, 0, true);
+
+       for(int i = 0; i < AIDlistLen; i ++) {
+               if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
+                       return AIDlist[i].vendor;
+               }
+       }       
+       
+       return CV_NA;
+}
+

 static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
        emv_tag_dump(tlv, stdout, level);
        if (is_leaf) {
 static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
        emv_tag_dump(tlv, stdout, level);
        if (is_leaf) {


@@ -103,11 +124,15 @@ void TLVPrintFromBuffer(uint8_t *data, int datalen) {
        }
 }
 
        }
 }
 

-void TLVPrintFromTLV(struct tlvdb *tlv) {
+void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {

        if (!tlv) 
                return;
        
        if (!tlv) 
                return;
        

-       tlvdb_visit(tlv, print_cb, NULL, 0);
+       tlvdb_visit(tlv, print_cb, NULL, level);
+}
+
+void TLVPrintFromTLV(struct tlvdb *tlv) {
+       TLVPrintFromTLVLev(tlv, 0);

 }
 
 void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
 }
 
 void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {


@@ -136,28 +161,86 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
        PrintAndLog("|------------------|--------|-------------------------|");
 }
 
        PrintAndLog("|------------------|--------|-------------------------|");
 }
 

+struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
+       char track2Hex[200] = {0};
+       uint8_t PAN[100] = {0};
+       int PANlen = 0;
+       char *tmp = track2Hex;

 
 

-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) {
+       if (!track2)
+               return NULL;
+
+       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;
+       
+       track2Hex[posD] = 0;
+       if (strlen(track2Hex) % 2) {
+               track2Hex[posD] = 'F';
+               track2Hex[posD + 1] = '\0';
+       }
+       
+       param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
+       
+  return tlvdb_fixed(0x5a, PANlen, PAN);
+}
+
+struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
+       char track2Hex[200] = {0};
+       char dCVVHex[100] = {0};
+       uint8_t dCVV[100] = {0};
+       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;
+       
+       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;
+
+       memset(dCVVHex, '0', 32);
+       // ATC
+       memcpy(dCVVHex + 0, track2Hex + posD + PINlen + 11, 4);
+       // PAN 5 hex
+       memcpy(dCVVHex + 4, track2Hex, 5);
+       // expire date
+       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);
+       
+  return tlvdb_fixed(0x02, dCVVlen, dCVV);
+}
+
+int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {

        uint8_t data[APDU_RES_LEN] = {0};
        uint8_t data[APDU_RES_LEN] = {0};

+

        *ResultLen = 0;
        if (sw) *sw = 0;
        uint16_t isw = 0;
        
        *ResultLen = 0;
        if (sw) *sw = 0;
        uint16_t isw = 0;
        

-       // select APDU
-       data[0] = 0x00;
-       data[1] = 0xA4;
-       data[2] = 0x04;
-       data[3] = 0x00;
-       data[4] = AIDLen;
-       memcpy(&data[5], AID, AIDLen);
-       

        if (ActivateField)
                DropField();
        
        if (ActivateField)
                DropField();
        

+       // 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, AIDLen + 6));
+               PrintAndLog(">>>> %s", sprint_hex(data, 6 + apdu.Lc));

 
 

-       int res = ExchangeAPDU14a(data, AIDLen + 6, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+       // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le
+       int res = ExchangeAPDU14a(data, 6 + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);

        
        if (APDULogging)
                PrintAndLog("<<<< %s", sprint_hex(Result, *ResultLen));
        
        if (APDULogging)
                PrintAndLog("<<<< %s", sprint_hex(Result, *ResultLen));


@@ -165,12 +248,7 @@ int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen
        if (res) {
                return res;
        }
        if (res) {
                return res;
        }

-       
-       if (*ResultLen < 2) {
-               PrintAndLog("SELECT ERROR: returned %d bytes", *ResultLen);
-               return 5;
-       }
-       
+

        *ResultLen -= 2;
        isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
        if (sw)
        *ResultLen -= 2;
        isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
        if (sw)


@@ -178,7 +256,7 @@ int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen
 
        if (isw != 0x9000) {
                if (APDULogging)
 
        if (isw != 0x9000) {
                if (APDULogging)

-                       PrintAndLog("SELECT ERROR: [%4X] %s", isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
+                       PrintAndLog("APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));

                return 5;
        }
 
                return 5;
        }
 


@@ -191,6 +269,14 @@ int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen
        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, 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}, 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};
        *ResultLen = 0;
 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};
        *ResultLen = 0;


@@ -291,7 +377,7 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
        int res = 0;
        int retrycnt = 0;
        for(int i = 0; i < AIDlistLen; i ++) {
        int res = 0;
        int retrycnt = 0;
        for(int i = 0; i < AIDlistLen; i ++) {

-               param_gethex_to_eol(AIDlist[i], 0, aidbuf, sizeof(aidbuf), &aidlen);
+               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);
                // retry if error and not returned sw error
                if (res && res != 5) {
                res = EMVSelect((i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
                // retry if error and not returned sw error
                if (res && res != 5) {


@@ -305,7 +391,7 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
                                }
                                
                                retrycnt = 0;
                                }
                                
                                retrycnt = 0;

-                               PrintAndLog("Retry failed [%s]. Skiped...", AIDlist[i]);
+                               PrintAndLog("Retry failed [%s]. Skiped...", AIDlist[i].aid);

                        }
                        continue;
                }
                        }
                        continue;
                }


@@ -315,7 +401,7 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
                        continue;
                
                if (decodeTLV){
                        continue;
                
                if (decodeTLV){

-                       PrintAndLog("%s:", AIDlist[i]);
+                       PrintAndLog("%s:", AIDlist[i].aid);

                        TLVPrintFromBuffer(data, datalen);
                }
        }
                        TLVPrintFromBuffer(data, datalen);
                }
        }


@@ -324,7 +410,7 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
 }
 
 int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 }
 
 int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {

-       // needs to check priority. 0x00 - highest
+       // check priority. 0x00 - highest

        int prio = 0xffff;
        
        *AIDlen = 0;
        int prio = 0xffff;
        
        *AIDlen = 0;


@@ -363,101 +449,21 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 }
 
 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) {
 }
 
 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) {

-       uint8_t data[APDU_RES_LEN] = {0};
-       *ResultLen = 0;
-       if (sw) *sw = 0;
-       uint16_t isw = 0;
-       
-       // GPO APDU
-       data[0] = 0x80;
-       data[1] = 0xA8;
-       data[2] = 0x00;
-       data[3] = 0x00;
-       data[4] = PDOLLen;
-       if (PDOL)
-               memcpy(&data[5], PDOL, PDOLLen);
-       
-       
-       if (APDULogging)
-               PrintAndLog(">>>> %s", sprint_hex(data, PDOLLen + 5));
-
-       int res = ExchangeAPDU14a(data, PDOLLen + 5, false, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-       
-       if (APDULogging)
-               PrintAndLog("<<<< %s", sprint_hex(Result, *ResultLen));
-       
-       if (res) {
-               return res;
-       }
-       
-       if (*ResultLen < 2) {
-               PrintAndLog("GPO ERROR: returned %d bytes", *ResultLen);
-               return 5;
-       }
-       
-       *ResultLen -= 2;
-       isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
-       if (sw)
-               *sw = isw;
-
-       if (isw != 0x9000) {
-               if (APDULogging)
-                       PrintAndLog("GPO ERROR: [%4X] %s", isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
-               return 5;
-       }
-
-       // add to tlv tree
-       if (tlv) {
-               struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
-               tlvdb_add(tlv, t);
-       }
-       
-       return 0;
+       return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, 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 EMVReadRecord(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 data[10] = {0};
-       *ResultLen = 0;
-       if (sw) *sw = 0;
-       uint16_t isw = 0;
-       
-       // read record APDU
-       data[0] = 0x00;
-       data[1] = 0xb2;
-       data[2] = SFIrec;
-       data[3] = (SFI << 3) | 0x04;
-       data[4] = 0;
-       
-       if (APDULogging)
-               PrintAndLog(">>>> %s", sprint_hex(data, 5));
-
-       int res = ExchangeAPDU14a(data, 5, false, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-       
-       if (APDULogging)
-               PrintAndLog("<<<< %s", sprint_hex(Result, *ResultLen));
-       
-       if (res) {
-               return res;
-       }
-
-       *ResultLen -= 2;
-       isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
-       if (sw)
-               *sw = isw;
-
-       if (isw != 0x9000) {
-               if (APDULogging)
-                       PrintAndLog("Read record ERROR: [%4X] %s", isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
-               return 5;
-       }
+       return EMVExchange(LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+}

 
 

-       // add to tlv tree
-       if (tlv) {
-               struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
-               tlvdb_add(tlv, t);
-       }
-       
-       return 0;
+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 EMVGenerateChallenge(bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+       return EMVExchange(LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, 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);
+}