upd passy

Author: xMasterX

non_catalog_apps/passy/README.md

@@ -44,6 +44,7 @@
 🇨🇷
 🇹🇷
 🇲🇽
+🇷🇸
 
 *If it works for yours, submit a PR to add your country flag!*
 

non_catalog_apps/passy/application.fam

@@ -8,7 +8,7 @@ App(
     stack_size=2 * 1024,
     fap_category="NFC",
     # Optional values
-    fap_version="1.4",
+    fap_version="1.5",
     fap_icon="passy.png",  # 10x10 1-bit PNG
     fap_description="eMRTD Reader",
     fap_author="bettse",

non_catalog_apps/passy/passy_reader.c

@@ -154,7 +154,8 @@ NfcCommand passy_reader_send(PassyReader* passy_reader) {
     }
 
     if(use_secure_messaging) {
-        passy_secure_messaging_unwrap_rapdu(passy_reader->secure_messaging, passy_reader->rx_buffer);
+        passy_secure_messaging_unwrap_rapdu(
+            passy_reader->secure_messaging, passy_reader->rx_buffer);
     }
 
     return ret;
@@ -474,6 +475,59 @@ NfcCommand passy_reader_read_dg2_or_dg7(PassyReader* passy_reader) {
     return ret;
 }
 
+NfcCommand passy_reader_read_dg_generic(PassyReader* passy_reader) {
+    NfcCommand ret = NfcCommandContinue;
+    Passy* passy = passy_reader->passy;
+
+    uint8_t header[4];
+    ret = passy_reader_read_binary(passy_reader, 0x00, sizeof(header), header);
+    if(ret != NfcCommandContinue) {
+        view_dispatcher_send_custom_event(passy->view_dispatcher, PassyCustomEventReaderError);
+        return ret;
+    }
+
+    view_dispatcher_send_custom_event(passy->view_dispatcher, PassyCustomEventReaderReading);
+
+    size_t body_size = 1 + passy_asn1_length_length(header + 1) + passy_asn1_length(header + 1);
+    int dg_number = passy->read_type & 0xFF;
+    FURI_LOG_I(TAG, "DG%d length: %d", dg_number, body_size);
+
+    FuriString* path = furi_string_alloc();
+    furi_string_printf(
+        path, "%s/%s-DG%d.bin", STORAGE_APP_DATA_PATH_PREFIX, passy->passport_number, dg_number);
+    passy_furi_string_filename_safe(path);
+    FURI_LOG_I(TAG, "Writing to %s", furi_string_get_cstr(path));
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    Stream* stream = file_stream_alloc(storage);
+    file_stream_open(stream, furi_string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_ALWAYS);
+
+    stream_write(stream, header, sizeof(header));
+
+    uint8_t chunk[PASSY_READER_DG1_CHUNK_SIZE];
+    passy->offset = sizeof(header);
+    passy->bytes_total = body_size;
+    do {
+        memset(chunk, 0, sizeof(chunk));
+        uint8_t Le = MIN(sizeof(chunk), (size_t)(body_size - passy->offset));
+
+        ret = passy_reader_read_binary(passy_reader, passy->offset, Le, chunk);
+        if(ret != NfcCommandContinue) {
+            view_dispatcher_send_custom_event(passy->view_dispatcher, PassyCustomEventReaderError);
+            break;
+        }
+        passy->offset += Le;
+        stream_write(stream, chunk, Le);
+        view_dispatcher_send_custom_event(passy->view_dispatcher, PassyCustomEventReaderReading);
+    } while(passy->offset < body_size);
+
+    file_stream_close(stream);
+    furi_record_close(RECORD_STORAGE);
+    furi_string_free(path);
+
+    return ret;
+}
+
 NfcCommand passy_reader_state_machine(PassyReader* passy_reader) {
     furi_assert(passy_reader);
     Passy* passy = passy_reader->passy;
@@ -522,17 +576,9 @@ NfcCommand passy_reader_state_machine(PassyReader* passy_reader) {
             ret = passy_reader_read_dg2_or_dg7(passy_reader);
             print_logs = true;
         } else {
-            // Until file specific handling is implemented, we just read the header
-            bit_buffer_reset(passy_reader->dg_header);
-            uint8_t header[4];
-            ret = passy_reader_read_binary(passy_reader, 0x00, sizeof(header), header);
-            if(ret != NfcCommandContinue) {
-                view_dispatcher_send_custom_event(
-                    passy->view_dispatcher, PassyCustomEventReaderError);
-
-                break;
-            }
-            bit_buffer_append_bytes(passy_reader->dg_header, header, sizeof(header));
+            print_logs = false;
+            ret = passy_reader_read_dg_generic(passy_reader);
+            print_logs = true;
         }
 
         // Everything done

non_catalog_apps/passy/scenes/passy_scene_advanced_menu.c

@@ -77,7 +77,8 @@ void passy_scene_advanced_menu_on_enter(void* context) {
 
         char payloadDebug[384] = {0};
         memset(payloadDebug, 0, sizeof(payloadDebug));
-        (&asn_DEF_COM)->op->print_struct(&asn_DEF_COM, com, 1, passy_print_struct_callback, payloadDebug);
+        (&asn_DEF_COM)
+            ->op->print_struct(&asn_DEF_COM, com, 1, passy_print_struct_callback, payloadDebug);
         if(strlen(payloadDebug) > 0) {
             FURI_LOG_D(TAG, "COM: %s", payloadDebug);
         } else {

non_catalog_apps/passy/scenes/passy_scene_read_success.c

@@ -33,7 +33,8 @@ void passy_scene_read_success_on_enter(void* context) {
             char payloadDebug[384] = {0};
             memset(payloadDebug, 0, sizeof(payloadDebug));
             (&asn_DEF_DG1)
-                ->op->print_struct(&asn_DEF_DG1, dg1, 1, passy_print_struct_callback, payloadDebug);
+                ->op->print_struct(
+                    &asn_DEF_DG1, dg1, 1, passy_print_struct_callback, payloadDebug);
             if(strlen(payloadDebug) > 0) {
                 FURI_LOG_D(TAG, "DG1: %s", payloadDebug);
             } else {
@@ -125,19 +126,13 @@ void passy_scene_read_success_on_enter(void* context) {
         dg1 = 0;
 
     } else if(passy->read_type == PassyReadDG2 || passy->read_type == PassyReadDG7) {
-        furi_string_cat_printf(str, "Saved to disk in apps_data/passy/...\n");
+        const char* dg_type = passy->read_type == PassyReadDG2 ? "DG2" : "DG7";
+        furi_string_cat_printf(
+            str, "Saved to apps_data/passy/%s-%s.*\n", passy->passport_number, dg_type);
     } else {
-        char display[9]; // 4 byte header in hex + NULL
-        memset(display, 0, sizeof(display));
-        for(size_t i = 0; i < bit_buffer_get_size_bytes(passy->dg_header); i++) {
-            snprintf(
-                display + (i * 2),
-                sizeof(display),
-                "%02X",
-                bit_buffer_get_data(passy->dg_header)[i]);
-        }
-        furi_string_cat_printf(str, "Unparsed file\n");
-        furi_string_cat_printf(str, "File header: %s\n", display);
+        int dg_number = passy->read_type & 0xFF;
+        furi_string_cat_printf(
+            str, "Saved to apps_data/passy/%s-DG%d.bin\n", passy->passport_number, dg_number);
     }
     text_box_set_font(passy->text_box, TextBoxFontText);
     text_box_set_text(passy->text_box, furi_string_get_cstr(passy->text_box_store));

non_catalog_apps/passy/secure_messaging.c

@@ -17,7 +17,10 @@ void passy_secure_messaging_adjust_parity(uint8_t key[16]) {
     }
 }
 
-void passy_secure_messaging_key_diversification(uint8_t input[20], size_t input_len, uint8_t* output) {
+void passy_secure_messaging_key_diversification(
+    uint8_t input[20],
+    size_t input_len,
+    uint8_t* output) {
     uint8_t sha[20];
     mbedtls_sha1_context ctx;
     mbedtls_sha1_init(&ctx);