EMV Poller fix

Leptopt1los · Jan 12, 2024 · e8b468b · e8b468b
1 parent e9454b6
commit e8b468b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/lib/nfc/protocols/emv/emv.c b/lib/nfc/protocols/emv/emv.c
@@ -4,6 +4,7 @@
 #include "protocols/emv/emv.h"
 #include <furi.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define EMV_PROTOCOL_NAME "EMV"
 

diff --git a/lib/nfc/protocols/emv/emv.h b/lib/nfc/protocols/emv/emv.h
@@ -93,7 +93,7 @@ Iso14443_4aData* emv_get_base_data(const EmvData* data);
 
 // Getters and tests
 
-const EmvApplication* emv_get_application(const EmvData* data);
+//const EmvApplication* emv_get_application(const EmvData* data);
 
 #ifdef __cplusplus
 }

diff --git a/lib/nfc/protocols/emv/emv_poller.h b/lib/nfc/protocols/emv/emv_poller.h
@@ -48,4 +48,8 @@ EmvError emv_poller_read_sfi_record(EmvPoller* instance, uint8_t sfi, uint8_t re
 
 EmvError emv_poller_read_files(EmvPoller* instance);
 
-EmvError emv_poller_read(EmvPoller* instance);
+EmvError emv_poller_read(EmvPoller* instance);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/nfc/protocols/nfc_device_defs.c b/lib/nfc/protocols/nfc_device_defs.c
@@ -21,6 +21,7 @@
 #include <nfc/protocols/mf_ultralight/mf_ultralight.h>
 #include <nfc/protocols/mf_classic/mf_classic.h>
 #include <nfc/protocols/mf_desfire/mf_desfire.h>
+#include <nfc/protocols/emv/emv.h>
 #include <nfc/protocols/slix/slix_device_defs.h>
 #include <nfc/protocols/st25tb/st25tb.h>
 
@@ -40,6 +41,7 @@ const NfcDeviceBase* nfc_devices[NfcProtocolNum] = {
     [NfcProtocolMfUltralight] = &nfc_device_mf_ultralight,
     [NfcProtocolMfClassic] = &nfc_device_mf_classic,
     [NfcProtocolMfDesfire] = &nfc_device_mf_desfire,
+    [NfcProtocolEmv] = &nfc_device_emv,
     [NfcProtocolSlix] = &nfc_device_slix,
     [NfcProtocolSt25tb] = &nfc_device_st25tb,
     /* Add new protocols here */

diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,v,50.2,,
+Version,+,50.2,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -120,8 +120,8 @@ Header,+,lib/nfc/nfc_device.h,,
 Header,+,lib/nfc/nfc_listener.h,,
 Header,+,lib/nfc/nfc_poller.h,,
 Header,+,lib/nfc/nfc_scanner.h,,
-Header,?,lib/nfc/protocols/emv/emv.h,,
-Header,?,lib/nfc/protocols/emv/emv_poller.h,,
+Header,+,lib/nfc/protocols/emv/emv.h,,
+Header,+,lib/nfc/protocols/emv/emv_poller.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_listener.h,,
 Header,+,lib/nfc/protocols/iso14443_3a/iso14443_3a_poller.h,,
@@ -879,25 +879,24 @@ Function,+,elf_symbolname_hash,uint32_t,const char*
 Function,+,empty_screen_alloc,EmptyScreen*,
 Function,+,empty_screen_free,void,EmptyScreen*
 Function,+,empty_screen_get_view,View*,EmptyScreen*
-Function,?,emv_alloc,EmvData*,
-Function,?,emv_copy,void,"EmvData*, const EmvData*"
-Function,?,emv_free,void,EmvData*
-Function,?,emv_get_application,const EmvApplication*,const EmvData*
-Function,?,emv_get_base_data,Iso14443_4aData*,const EmvData*
-Function,?,emv_get_device_name,const char*,"const EmvData*, NfcDeviceNameType"
-Function,?,emv_get_uid,const uint8_t*,"const EmvData*, size_t*"
-Function,?,emv_is_equal,_Bool,"const EmvData*, const EmvData*"
-Function,?,emv_load,_Bool,"EmvData*, FlipperFormat*, uint32_t"
-Function,?,emv_poller_get_processing_options,EmvError,EmvPoller*
-Function,?,emv_poller_read,EmvError,EmvPoller*
-Function,?,emv_poller_read_files,EmvError,EmvPoller*
-Function,?,emv_poller_read_sfi_record,EmvError,"EmvPoller*, uint8_t, uint8_t"
-Function,?,emv_poller_select_application,EmvError,EmvPoller*
-Function,?,emv_poller_select_ppse,EmvError,EmvPoller*
-Function,?,emv_reset,void,EmvData*
-Function,?,emv_save,_Bool,"const EmvData*, FlipperFormat*"
-Function,?,emv_set_uid,_Bool,"EmvData*, const uint8_t*, size_t"
-Function,?,emv_verify,_Bool,"EmvData*, const FuriString*"
+Function,+,emv_alloc,EmvData*,
+Function,+,emv_copy,void,"EmvData*, const EmvData*"
+Function,+,emv_free,void,EmvData*
+Function,+,emv_get_base_data,Iso14443_4aData*,const EmvData*
+Function,+,emv_get_device_name,const char*,"const EmvData*, NfcDeviceNameType"
+Function,+,emv_get_uid,const uint8_t*,"const EmvData*, size_t*"
+Function,+,emv_is_equal,_Bool,"const EmvData*, const EmvData*"
+Function,+,emv_load,_Bool,"EmvData*, FlipperFormat*, uint32_t"
+Function,+,emv_poller_get_processing_options,EmvError,EmvPoller*
+Function,+,emv_poller_read,EmvError,EmvPoller*
+Function,+,emv_poller_read_files,EmvError,EmvPoller*
+Function,+,emv_poller_read_sfi_record,EmvError,"EmvPoller*, uint8_t, uint8_t"
+Function,+,emv_poller_select_application,EmvError,EmvPoller*
+Function,+,emv_poller_select_ppse,EmvError,EmvPoller*
+Function,+,emv_reset,void,EmvData*
+Function,+,emv_save,_Bool,"const EmvData*, FlipperFormat*"
+Function,+,emv_set_uid,_Bool,"EmvData*, const uint8_t*, size_t"
+Function,+,emv_verify,_Bool,"EmvData*, const FuriString*"
 Function,-,erand48,double,unsigned short[3]
 Function,-,erf,double,double
 Function,-,erfc,double,double
@@ -3640,7 +3639,7 @@ Variable,+,message_red_255,const NotificationMessage,
 Variable,+,message_sound_off,const NotificationMessage,
 Variable,+,message_vibro_off,const NotificationMessage,
 Variable,+,message_vibro_on,const NotificationMessage,
-Variable,?,nfc_device_emv,const NfcDeviceBase,
+Variable,-,nfc_device_emv,const NfcDeviceBase,
 Variable,-,nfc_device_mf_classic,const NfcDeviceBase,
 Variable,-,nfc_device_mf_desfire,const NfcDeviceBase,
 Variable,-,nfc_device_mf_ultralight,const NfcDeviceBase,