Fix CMD_PCF7931_BRUTEFORCE duplicate case value (#750)

[proxmark3-svn] / armsrc / epa.c

diff --git a/armsrc/epa.c b/armsrc/epa.c
index 50c7d87804dbcd2fc9bc846387ef46ec613bdf05..01aff30235bf3d2d02e5d231244e47378d5abba0 100644 (file)
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -11,10 +11,14 @@
 // functions, You need to do the setup before calling them!
 //-----------------------------------------------------------------------------
 
 // functions, You need to do the setup before calling them!
 //-----------------------------------------------------------------------------
 

+#include "apps.h"

 #include "iso14443a.h"
 #include "iso14443b.h"
 #include "epa.h"
 #include "cmd.h"
 #include "iso14443a.h"
 #include "iso14443b.h"
 #include "epa.h"
 #include "cmd.h"

+#include "fpgaloader.h"
+#include "string.h"
+#include "util.h"

 
 // Protocol and Parameter Selection Request for ISO 14443 type A cards
 // use regular (1x) speed in both directions
 
 // Protocol and Parameter Selection Request for ISO 14443 type A cards
 // use regular (1x) speed in both directions


@@ -112,7 +116,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
        switch(iso_type)
        {
                case 'a':
        switch(iso_type)
        {
                case 'a':

-                       return iso14_apdu(apdu, (uint16_t) length, response);
+                       return iso14_apdu(apdu, (uint16_t) length, response, NULL);

                        break;
                case 'b':
                        return iso14443b_apdu(apdu, length, response);
                        break;
                case 'b':
                        return iso14443b_apdu(apdu, length, response);


@@ -526,7 +530,7 @@ int EPA_Setup()
        // power up the field
        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
        // select the card
        // power up the field
        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
        // select the card

-       return_code = iso14443a_select_card(uid, &card_select_info, NULL);
+       return_code = iso14443a_select_card(uid, &card_select_info, NULL, true, 0, false);

        if (return_code == 1) {
                // send the PPS request
                ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
        if (return_code == 1) {
                // send the PPS request
                ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);