Merge pull request #34 from marshmellow42/master

[proxmark3-svn] / armsrc / epa.c

diff --git a/armsrc/epa.c b/armsrc/epa.c
index b1f0a187478a4a97018be70dbe02e53578c49858..fb19656d1dd1d345a8c72f016415691a47e8c9a3 100644 (file)
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -108,9 +108,9 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
                if (data[index] == 0x31 || data[index] == 0x30) {
                        // enter the set (skip tag + length)
                        index += 2;
                if (data[index] == 0x31 || data[index] == 0x30) {
                        // enter the set (skip tag + length)
                        index += 2;

-                       // extended length
+                       // check for extended length

                        if ((data[index - 1] & 0x80) != 0) {
                        if ((data[index - 1] & 0x80) != 0) {

-                               index += (data[index] & 0x7F);
+                               index += (data[index-1] & 0x7F);

                        }
                }
                // OID
                        }
                }
                // OID


@@ -434,7 +434,8 @@ int EPA_Setup()
        // send the PPS request
        ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
        uint8_t pps_response[3];
        // send the PPS request
        ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
        uint8_t pps_response[3];

-       return_code = ReaderReceive(pps_response);
+       uint8_t pps_response_par[1];
+       return_code = ReaderReceive(pps_response, pps_response_par);

        if (return_code != 3 || pps_response[0] != 0xD0) {
                return return_code == 0 ? 2 : return_code;
        }
        if (return_code != 3 || pps_response[0] != 0xD0) {
                return return_code == 0 ? 2 : return_code;
        }