small refactoring

[proxmark3-svn] / client / emv / apduinfo.c

diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index d73c24fc1aca38f676118d3365b90bc41eb7c763..ec7a64a199ef1a35b1a89df959846c0210c9e969 100644 (file)
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -278,17 +278,34 @@ int CodeCmp(const char *code1, const char *code2) {
 }
 
 const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
 }
 
 const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {

-       char buf[4] = {0};
+       char buf[5] = {0};
+       int res;
+       int mineq = 100;
+       int mineqindx = 0;

        
        

-       sprintf(&buf[0], "%02X ", sw1);
-       sprintf(&buf[2], "%02X ", sw2);
+       sprintf(&buf[0], "%02X", sw1);
+       sprintf(&buf[2], "%02X", sw2);

        
        for (int i = 0; i < APDUCodeTableLen; i++) {
        
        for (int i = 0; i < APDUCodeTableLen; i++) {

-               if (CodeCmp(APDUCodeTable[i].ID, buf) == 0) { // TODO make not so equal comparation... XXXX - not works...
+               res = CodeCmp(APDUCodeTable[i].ID, buf);
+               
+               // equal
+               if (res == 0) { 

                        return &APDUCodeTable[i];
                }
                        return &APDUCodeTable[i];
                }

+               
+               // with some  'X'
+               if (res > 0 && mineq > res) {
+                       mineq = res;
+                       mineqindx = i;
+               }

        }
 
        }
 

+       // if we have not equal, but with some 'X'
+       if (mineqindx < 100) {
+               return &APDUCodeTable[mineqindx];
+       }
+       

        return NULL;
 }
 
        return NULL;
 }