From 8796195a631f053765dbf27833ba655f8c8071be Mon Sep 17 00:00:00 2001 From: Chris van Marle Date: Tue, 11 Oct 2022 22:13:25 +0200 Subject: [PATCH] Revert "MRTD add worker method for auhtenticated read" This reverts commit 3458ded128a3c13ddd18484c2e1be2945e951a28. --- lib/nfc/nfc_worker.c | 18 ------------------ lib/nfc/nfc_worker.h | 1 - lib/nfc/nfc_worker_i.h | 2 -- 3 files changed, 21 deletions(-) diff --git a/lib/nfc/nfc_worker.c b/lib/nfc/nfc_worker.c index deda0db2b..44ee06e19 100644 --- a/lib/nfc/nfc_worker.c +++ b/lib/nfc/nfc_worker.c @@ -91,8 +91,6 @@ int32_t nfc_worker_task(void* context) { if(nfc_worker->state == NfcWorkerStateRead) { nfc_worker_read(nfc_worker); - } else if(nfc_worker->state == NfcWorkerStateReadMrtdAuth) { - nfc_worker_read_mrtd_auth(nfc_worker); } else if(nfc_worker->state == NfcWorkerStateUidEmulate) { nfc_worker_emulate_uid(nfc_worker); } else if(nfc_worker->state == NfcWorkerStateEmulateApdu) { @@ -320,22 +318,6 @@ static bool nfc_worker_read_mrtd(NfcWorker* nfc_worker, FuriHalNfcTxRxContext* t return read_success; } -bool nfc_worker_read_mrtd_auth(NfcWorker* nfc_worker) { - MrtdData* mrtd_data = &nfc_worker->dev_data->mrtd_data; - FuriHalNfcTxRxContext tx_rx = {}; - MrtdApplication* mrtd_app = mrtd_alloc_init(&tx_rx); - - do { - if(!furi_hal_nfc_detect(&nfc_worker->dev_data->nfc_data, 300)) break; - - if(!mrtd_select_app(mrtd_app, AID.eMRTDApplication)) break; - - if(!mrtd_bac(mrtd_app, &mrtd_data->auth)) break; - } while(false); - - return false; -} - static bool nfc_worker_read_nfca(NfcWorker* nfc_worker, FuriHalNfcTxRxContext* tx_rx) { FuriHalNfcDevData* nfc_data = &nfc_worker->dev_data->nfc_data; diff --git a/lib/nfc/nfc_worker.h b/lib/nfc/nfc_worker.h index 044e30875..df0f53176 100644 --- a/lib/nfc/nfc_worker.h +++ b/lib/nfc/nfc_worker.h @@ -11,7 +11,6 @@ typedef enum { NfcWorkerStateReady, // Main worker states NfcWorkerStateRead, - NfcWorkerStateReadMrtdAuth, NfcWorkerStateUidEmulate, NfcWorkerStateMfUltralightEmulate, NfcWorkerStateMfClassicEmulate, diff --git a/lib/nfc/nfc_worker_i.h b/lib/nfc/nfc_worker_i.h index 193fc04bb..b3f11d9eb 100644 --- a/lib/nfc/nfc_worker_i.h +++ b/lib/nfc/nfc_worker_i.h @@ -36,8 +36,6 @@ int32_t nfc_worker_task(void* context); void nfc_worker_read(NfcWorker* nfc_worker); -bool nfc_worker_read_mrtd_auth(NfcWorker* nfc_worker); - void nfc_worker_emulate_uid(NfcWorker* nfc_worker); void nfc_worker_emulate_mf_ultralight(NfcWorker* nfc_worker);