Merge branch 'emv_argtable' of https://github.com/merlokk/proxmark3
authorpwpiwi <pwpiwi@users.noreply.github.com>
Fri, 28 Sep 2018 15:59:14 +0000 (17:59 +0200)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Fri, 28 Sep 2018 15:59:14 +0000 (17:59 +0200)
armsrc/fpgaloader.c
client/emv/apduinfo.c

index a132b762e406e12a2018f0279ea61cc0dba417b0..45294d6008fbf47ed628d19b6a92c25778a758b9 100644 (file)
@@ -167,7 +167,7 @@ bool FpgaSetupSscDma(uint8_t *buf, uint16_t sample_count)
        AT91C_BASE_PDC_SSC->PDC_RCR = sample_count;             // transfer this many samples
        AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) buf;          // next transfer to same memory address
        AT91C_BASE_PDC_SSC->PDC_RNCR = sample_count;            // ... with same number of samples      AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;         // go!
-
+       AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;         // go!
        return true;
 }
 
index a631c6142219ca3e9ad2f0d55bb41fbce621c053..d14e3ff6aac0ff76d78511b9cb95c8bf24d7ce58 100644 (file)
@@ -255,7 +255,7 @@ const APDUCode APDUCodeTable[] = {
        {"9F00",        APDUCODE_TYPE_NONE,             "PIN blocked and Unblock Try Counter is 3"},
        {"9F04",        APDUCODE_TYPE_NONE,             "PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
        {"9FXX",        APDUCODE_TYPE_NONE,             "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
-       {"9xXX",        APDUCODE_TYPE_NONE,             "Application related status, (ISO 7816-3)"}
+       {"9XXX",        APDUCODE_TYPE_NONE,             "Application related status, (ISO 7816-3)"}
 };
 const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode);
 
@@ -280,11 +280,10 @@ int CodeCmp(const char *code1, const char *code2) {
 const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
        char buf[5] = {0};
        int res;
-       int mineq = 100;
+       int mineq = APDUCodeTableLen;
        int mineqindx = 0;
        
-       sprintf(&buf[0], "%02X", sw1);
-       sprintf(&buf[2], "%02X", sw2);
+       sprintf(buf, "%02X%02X", sw1, sw2);
        
        for (int i = 0; i < APDUCodeTableLen; i++) {
                res = CodeCmp(APDUCodeTable[i].ID, buf);
@@ -302,7 +301,7 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
        }
 
        // if we have not equal, but with some 'X'
-       if (mineqindx < 100) {
+       if (mineqindx < APDUCodeTableLen) {
                return &APDUCodeTable[mineqindx];
        }
        
Impressum, Datenschutz