github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix was attempting to credential file when --noappcreate was passed

Browse source
This commit is contained in:
Matt Moran 2022-01-13 21:06:21 +13:00
commit aa6b74a08d
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/src/cmdhfgallagher.c
View file

@ -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) { static uint32_t find_available_gallagher_aid(DesfireContext_t *ctx, bool verbose) {
// Select PICC // Select PICC
select_aid(ctx, 0x000000, verbose); select_aid(ctx, 0x000000, verbose);
// Retrieve the AID list // Retrieve the AID list
uint8_t aid_buf[0xFF] = {0}; uint8_t aid_buf[0xFF] = {0};
size_t aid_buf_len = 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) if (!aid_exists)
return aid; return aid;
} }
// Failed to find an available AID. This shouldn't be possible since // 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"); HFGAL_RET_ERR(PM3_EFATAL, "Could not find an available AID, please specify with --aid");
if (verbose) if (verbose)
PrintAndLogEx(INFO, "Using available AID: %06X", aid); 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 // Update Card Application Directory
if (!no_cad_update) { if (!no_cad_update) {
@ -969,12 +968,12 @@ static int CmdGallagherClone(const char *cmd) {
res = hfgal_create_creds_app(&dctx, site_key, aid, verbose); res = hfgal_create_creds_app(&dctx, site_key, aid, verbose);
HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher application"); HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher application");
}
// Create credential files // Create credential files
// Don't need to set keys here, they're generated automatically // Don't need to set keys here, they're generated automatically
res = hfgal_create_creds_file(&dctx, site_key, aid, &creds, verbose); res = hfgal_create_creds_file(&dctx, site_key, aid, &creds, verbose);
HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher credential file"); HFGAL_RET_IF_ERR_WITH_MSG(res, "Failed creating Gallagher credential file");
}
PrintAndLogEx(SUCCESS, "Done"); PrintAndLogEx(SUCCESS, "Done");
PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf gallagher reader`") " to verify"); PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf gallagher reader`") " to verify");