From cd21765acc045175cda637227c201df8dc597726 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Fri, 18 Dec 2020 04:28:14 +0300
Subject: [PATCH] emrtd: Move EF_CardAccess dump to before auth to ensure that
 it is dumped even without auth

---
 client/src/cmdhfemrtd.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/src/cmdhfemrtd.c b/client/src/cmdhfemrtd.c
index 15983b2f9..3dc567d6c 100644
--- a/client/src/cmdhfemrtd.c
+++ b/client/src/cmdhfemrtd.c
@@ -988,6 +988,12 @@ int dumpHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab
         return PM3_ESOFT;
     }
 
+    // Dump EF_CardAccess (if available)
+    if (!emrtd_dump_file(ks_enc, ks_mac, ssc, EMRTD_EF_CARDACCESS, "EF_CardAccess", BAC, use_14b)) {
+        PrintAndLogEx(INFO, "Couldn't dump EF_CardAccess, card does not support PACE.");
+        PrintAndLogEx(HINT, "This is expected behavior for cards without PACE, and isn't something to be worried about.");
+    }
+
     // Authenticate with the eMRTD
     if (!emrtd_do_auth(documentnumber, dob, expiry, BAC_available, &BAC, ssc, ks_enc, ks_mac, &use_14b)) {
         DropField();
@@ -1027,12 +1033,8 @@ int dumpHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab
         emrtd_dump_file(ks_enc, ks_mac, ssc, file_id, file_name, BAC, use_14b);
     }
 
-    // Dump EF_SOD and EF_CardAccess (if available)
+    // Dump EF_SOD
     emrtd_dump_file(ks_enc, ks_mac, ssc, EMRTD_EF_SOD, "EF_SOD", BAC, use_14b);
-    if (!emrtd_dump_file(ks_enc, ks_mac, ssc, EMRTD_EF_CARDACCESS, "EF_CardAccess", BAC, use_14b)) {
-        PrintAndLogEx(INFO, "Couldn't dump EF_CardAccess, card does not support PACE.");
-        PrintAndLogEx(HINT, "This is expected behavior for cards without PACE, and isn't something to be worried about.");
-    }
 
     DropField();
     return PM3_SUCCESS;