fix LED signalling in hf 15 snoop and hf 14a snoop (#797)

[proxmark3-svn] / client / emv / emvcore.h

diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 5d6f398419a39de67fc83640b5413f7b7eb8c78d..19f26028ae9ce97850108afbddb98374a1aaacb9 100644 (file)
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -11,23 +11,10 @@
 #ifndef EMVCORE_H__
 #define EMVCORE_H__
 
 #ifndef EMVCORE_H__
 #define EMVCORE_H__
 

-#include <stdio.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-#include <jansson.h>
-#include "util.h"
-#include "common.h"
-#include "ui.h"
-#include "cmdhf14a.h"
-#include "apduinfo.h"
+#include <stdbool.h>

 #include "tlv.h"
 #include "tlv.h"

-#include "dol.h"
-#include "dump.h"
-#include "emv_tags.h"
-#include "emv_pk.h"
-#include "emv_pki.h"
+#include "jansson.h"

 
 // maximum APDU lengths. Long APDUs not yet supported/needed
 #define APDU_DATA_LEN      255
 
 // maximum APDU lengths. Long APDUs not yet supported/needed
 #define APDU_DATA_LEN      255


@@ -54,10 +41,14 @@ enum CardPSVendor {
        CV_AMERICANEXPRESS,
        CV_JCB,
        CV_CB,
        CV_AMERICANEXPRESS,
        CV_JCB,
        CV_CB,

+       CV_SWITCH,
+       CV_DINERS,

        CV_OTHER,
 };
 extern enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen);
 
        CV_OTHER,
 };
 extern enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen);
 

+extern void DropFieldEx(EMVCommandChannel channel);
+

 extern bool TLVPrintFromBuffer(uint8_t *data, int datalen);
 extern void TLVPrintFromTLV(struct tlvdb *tlv);
 extern void TLVPrintFromTLVLev(struct tlvdb *tlv, int level);
 extern bool TLVPrintFromBuffer(uint8_t *data, int datalen);
 extern void TLVPrintFromTLV(struct tlvdb *tlv);
 extern void TLVPrintFromTLVLev(struct tlvdb *tlv, int level);


@@ -69,7 +60,7 @@ extern struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2);
 extern void SetAPDULogging(bool logging);
 
 // exchange
 extern void SetAPDULogging(bool logging);
 
 // exchange

-extern int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *APDU, int APDU_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *apdu, int apdu_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);

 
 // search application
 extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv);
 
 // search application
 extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv);