[FL-1643] NFC emv assets (#661)
* assets: add EMV AID table for NFC app * file-worker: add searching for value by the key * nfc: add emv parser helpers * assets: add country and currency codes * nfc: add country and currency code parsing * emv_decoder: add country and currency code support * nfc: add AID. currency and country display * nfc: rework bank_card view * nfc: add currency and country save * assets: change emv chip asset * nfc: change asset in bank card * gui: add frame element to widget * nfc: add bank card frame, add documentation * rfal: fix long APDU command emulation * nfc: fix typos * Scripts ReadMe: assets delivery command Co-authored-by: あく <alleteam@gmail.com> Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
This commit is contained in:
		
							
								
								
									
										31
									
								
								applications/nfc/scenes/nfc_scene_device_info.c
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										31
									
								
								applications/nfc/scenes/nfc_scene_device_info.c
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							| @@ -1,6 +1,6 @@ | ||||
| #include "../nfc_i.h" | ||||
|  | ||||
| #define NFC_SCENE_DEVICE_INFO_TEXTBOX_CUSTOM_EVENT (0UL) | ||||
| #define NFC_SCENE_DEVICE_INFO_BACK_EVENT (0UL) | ||||
|  | ||||
| enum { | ||||
|     NfcSceneDeviceInfoUid, | ||||
| @@ -8,26 +8,27 @@ enum { | ||||
| }; | ||||
|  | ||||
| void nfc_scene_device_info_widget_callback(GuiButtonType result, void* context) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
|  | ||||
|     Nfc* nfc = context; | ||||
|     view_dispatcher_send_custom_event(nfc->view_dispatcher, result); | ||||
| } | ||||
|  | ||||
| void nfc_scene_device_info_dialog_callback(DialogExResult result, void* context) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
|  | ||||
|     Nfc* nfc = context; | ||||
|     view_dispatcher_send_custom_event(nfc->view_dispatcher, result); | ||||
| } | ||||
|  | ||||
| void nfc_scene_device_info_text_box_callback(void* context) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
|     Nfc* nfc = context; | ||||
|     view_dispatcher_send_custom_event(nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_BACK_EVENT); | ||||
| } | ||||
|  | ||||
|     view_dispatcher_send_custom_event( | ||||
|         nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_TEXTBOX_CUSTOM_EVENT); | ||||
| void nfc_scene_device_info_bank_card_callback(GuiButtonType result, void* context) { | ||||
|     Nfc* nfc = context; | ||||
|     view_dispatcher_send_custom_event(nfc->view_dispatcher, NFC_SCENE_DEVICE_INFO_BACK_EVENT); | ||||
| } | ||||
|  | ||||
| void nfc_scene_device_info_on_enter(void* context) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
|     Nfc* nfc = context; | ||||
|  | ||||
|     // Setup Custom Widget view | ||||
|     widget_add_string_element( | ||||
| @@ -107,19 +108,23 @@ void nfc_scene_device_info_on_enter(void* context) { | ||||
|         BankCard* bank_card = nfc->bank_card; | ||||
|         bank_card_set_name(bank_card, emv_data->name); | ||||
|         bank_card_set_number(bank_card, emv_data->number); | ||||
|         if(!strcmp(emv_data->name, "")) { | ||||
|             bank_card_set_cardholder_name(bank_card, emv_data->cardholder); | ||||
|         } | ||||
|         bank_card_set_back_callback(bank_card, nfc_scene_device_info_bank_card_callback, nfc); | ||||
|         if(emv_data->exp_mon) { | ||||
|             bank_card_set_exp_date(bank_card, emv_data->exp_mon, emv_data->exp_year); | ||||
|         } | ||||
|         if(emv_data->country_code) { | ||||
|             bank_card_set_country_name(bank_card, emv_data->country_code); | ||||
|         } | ||||
|         if(emv_data->currency_code) { | ||||
|             bank_card_set_currency_name(bank_card, emv_data->currency_code); | ||||
|         } | ||||
|     } | ||||
|     scene_manager_set_scene_state(nfc->scene_manager, NfcSceneDeviceInfo, NfcSceneDeviceInfoUid); | ||||
|     view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); | ||||
| } | ||||
|  | ||||
| const bool nfc_scene_device_info_on_event(void* context, SceneManagerEvent event) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
|     Nfc* nfc = context; | ||||
|     bool consumed = false; | ||||
|     uint32_t state = scene_manager_get_scene_state(nfc->scene_manager, NfcSceneDeviceInfo); | ||||
|  | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| #include "../nfc_i.h" | ||||
| #include "../helpers/nfc_emv_parser.h" | ||||
|  | ||||
| #define NFC_SCENE_READ_SUCCESS_SHIFT "              " | ||||
|  | ||||
| @@ -21,9 +22,12 @@ void nfc_scene_read_emv_app_success_on_enter(void* context) { | ||||
|     dialog_ex_set_icon(dialog_ex, 8, 13, &I_Medium_chip_22x21); | ||||
|     // Display UID and AID | ||||
|     string_t aid; | ||||
|     string_init_printf(aid, "AID:"); | ||||
|     for(uint8_t i = 0; i < emv_data->aid_len; i++) { | ||||
|         string_cat_printf(aid, " %02X", emv_data->aid[i]); | ||||
|     string_init(aid); | ||||
|     bool aid_found = nfc_emv_parser_get_aid_name(emv_data->aid, emv_data->aid_len, aid); | ||||
|     if(!aid_found) { | ||||
|         for(uint8_t i = 0; i < emv_data->aid_len; i++) { | ||||
|             string_cat_printf(aid, " %02X", emv_data->aid[i]); | ||||
|         } | ||||
|     } | ||||
|     nfc_text_store_set( | ||||
|         nfc, | ||||
|   | ||||
| @@ -16,6 +16,8 @@ const void nfc_scene_read_emv_data_on_enter(void* context) { | ||||
|     popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61); | ||||
|  | ||||
|     view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); | ||||
|     // Clear emv data | ||||
|     memset(&nfc->dev.dev_data.emv_data, 0, sizeof(nfc->dev.dev_data.emv_data)); | ||||
|     // Start worker | ||||
|     nfc_worker_start( | ||||
|         nfc->worker, | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| #include "../nfc_i.h" | ||||
| #include "../helpers/nfc_emv_parser.h" | ||||
|  | ||||
| void nfc_scene_read_emv_data_success_widget_callback(GuiButtonType result, void* context) { | ||||
|     Nfc* nfc = (Nfc*)context; | ||||
| @@ -15,6 +16,9 @@ void nfc_scene_read_emv_data_success_on_enter(void* context) { | ||||
|     nfc_device_set_name(&nfc->dev, ""); | ||||
|  | ||||
|     // Setup Custom Widget view | ||||
|     // Add frame | ||||
|     widget_add_frame_element(nfc->widget, 0, 0, 128, 64, 6); | ||||
|     // Add buttons | ||||
|     widget_add_button_element( | ||||
|         nfc->widget, | ||||
|         GuiButtonTypeLeft, | ||||
| @@ -27,8 +31,10 @@ void nfc_scene_read_emv_data_success_on_enter(void* context) { | ||||
|         "Save", | ||||
|         nfc_scene_read_emv_data_success_widget_callback, | ||||
|         nfc); | ||||
|     // Add card name | ||||
|     widget_add_string_element( | ||||
|         nfc->widget, 64, 3, AlignCenter, AlignTop, FontSecondary, nfc->dev.dev_data.emv_data.name); | ||||
|     // Add cad number | ||||
|     char pan_str[32]; | ||||
|     snprintf( | ||||
|         pan_str, | ||||
| @@ -43,9 +49,41 @@ void nfc_scene_read_emv_data_success_on_enter(void* context) { | ||||
|         emv_data->number[6], | ||||
|         emv_data->number[7]); | ||||
|     widget_add_string_element(nfc->widget, 64, 13, AlignCenter, AlignTop, FontSecondary, pan_str); | ||||
|     // Parse country code | ||||
|     string_t country_name; | ||||
|     string_init(country_name); | ||||
|     if((emv_data->country_code) && | ||||
|        nfc_emv_parser_get_country_name(emv_data->country_code, country_name)) { | ||||
|         string_t disp_country; | ||||
|         string_init_printf(disp_country, "Reg:%s", country_name); | ||||
|         widget_add_string_element( | ||||
|             nfc->widget, 7, 23, AlignLeft, AlignTop, FontSecondary, string_get_cstr(disp_country)); | ||||
|         string_clear(disp_country); | ||||
|     } | ||||
|     string_clear(country_name); | ||||
|     // Parse currency code | ||||
|     string_t currency_name; | ||||
|     string_init(currency_name); | ||||
|     if((emv_data->currency_code) && | ||||
|        nfc_emv_parser_get_currency_name(emv_data->currency_code, currency_name)) { | ||||
|         string_t disp_currency; | ||||
|         string_init_printf(disp_currency, "Cur:%s", currency_name); | ||||
|         widget_add_string_element( | ||||
|             nfc->widget, | ||||
|             121, | ||||
|             23, | ||||
|             AlignRight, | ||||
|             AlignTop, | ||||
|             FontSecondary, | ||||
|             string_get_cstr(disp_currency)); | ||||
|         string_clear(disp_currency); | ||||
|     } | ||||
|     string_clear(currency_name); | ||||
|     // Add ATQA | ||||
|     char atqa_str[16]; | ||||
|     snprintf(atqa_str, sizeof(atqa_str), "ATQA: %02X%02X", nfc_data->atqa[0], nfc_data->atqa[1]); | ||||
|     widget_add_string_element(nfc->widget, 121, 32, AlignRight, AlignTop, FontSecondary, atqa_str); | ||||
|     // Add UID | ||||
|     char uid_str[32]; | ||||
|     snprintf( | ||||
|         uid_str, | ||||
| @@ -56,9 +94,11 @@ void nfc_scene_read_emv_data_success_on_enter(void* context) { | ||||
|         nfc_data->uid[2], | ||||
|         nfc_data->uid[3]); | ||||
|     widget_add_string_element(nfc->widget, 7, 42, AlignLeft, AlignTop, FontSecondary, uid_str); | ||||
|     // Add SAK | ||||
|     char sak_str[16]; | ||||
|     snprintf(sak_str, sizeof(sak_str), "SAK: %02X", nfc_data->sak); | ||||
|     widget_add_string_element(nfc->widget, 121, 42, AlignRight, AlignTop, FontSecondary, sak_str); | ||||
|     // Add expiration date | ||||
|     if(emv_data->exp_mon) { | ||||
|         char exp_str[16]; | ||||
|         snprintf( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user