From aa6b74a08d60959c2743778e490b5bdbe1b4c648 Mon Sep 17 00:00:00 2001
From: Matt Moran <mattmoran2000@gmail.com>
Date: Thu, 13 Jan 2022 21:06:21 +1300
Subject: [PATCH] Fix was attempting to credential file when --noappcreate was
 passed

---
 client/src/cmdhfgallagher.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/client/src/cmdhfgallagher.c b/client/src/cmdhfgallagher.c
index 5e653708b..40d95db81 100644
--- a/client/src/cmdhfgallagher.c
+++ b/client/src/cmdhfgallagher.c
@@ -209,7 +209,7 @@ static bool aid_exists(DesfireContext_t *ctx, uint32_t aid, bool verbose) {
 static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose) {
     // Select PICC
     select_aid(ctx, 0x000000, verbose);
-    
+
     // Retrieve the AID list
     uint8_t aid_buf[0xFF] = {0};
     size_t aid_buf_len = 0;
@@ -241,7 +241,7 @@ static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose
             }
         }
         if (!aid_exists)
-            return aid; 
+            return aid;
     }
 
     // Failed to find an available AID. This shouldn't be possible since
@@ -941,11 +941,10 @@ static int CmdGallagherClone(const char *cmd) {
             HFGAL_RET_ERR(PM3_EFATAL, "Could not find an available AID, please specify with --aid");
         if (verbose)
             PrintAndLogEx(INFO, "Using available AID: %06X", aid);
-    } else {
-        // Check that AID is available
-        if (aid_exists(&dctx, aid, verbose))
-            HFGAL_RET_ERR(PM3_EINVARG, "AID already exists: %06X", aid);
     }
+    // Check that AID is available
+    else if (!no_app_create && aid_exists(&dctx, aid, verbose))
+        HFGAL_RET_ERR(PM3_EINVARG, "AID already exists: %06X", aid);
 
     // Update Card Application Directory
     if (!no_cad_update) {
@@ -969,12 +968,12 @@ static int CmdGallagherClone(const char *cmd) {
 
         res = hfgal_create_creds_app(&dctx, site_key, aid, verbose);
         HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher application");
-    }
 
-    // Create credential files
-    // Don't need to set keys here, they're generated automatically
-    res = hfgal_create_creds_file(&dctx, site_key, aid, &creds, verbose);
-    HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher credential file");
+        // Create credential files
+        // Don't need to set keys here, they're generated automatically
+        res = hfgal_create_creds_file(&dctx, site_key, aid, &creds, verbose);
+        HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher credential file");
+    }
 
     PrintAndLogEx(SUCCESS, "Done");
     PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf gallagher reader`") " to verify");