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

chg: 'hf mfu eload' - instead of showing a error, it now tells a warning that we only loaded N blocks of data to emulator memory.

Browse source 
It always loads the existing blocks into emulator memory.

The previous message made users belive a error had occured when it actually did load.
This commit is contained in:
iceman1001 2017-12-03 15:23:24 +01:00
commit 73a5e3b23d
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/cmdhfmf.c
View file

@ -2237,10 +2237,18 @@ int CmdHF14AMfELoad(const char *Cmd) {
fclose(f); fclose(f);
printf("\n"); printf("\n");
// Ultralight /Ntag
if ( blockWidth == 8 ) {
if ((blockNum != numBlocks)) { if ((blockNum != numBlocks)) {
PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks); PrintAndLog("Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
return 0;
}
} else {
if ((blockNum != numBlocks)) {
PrintAndLog("Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
return 4; return 4;
} }
}
PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename); PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
return 0; return 0;
} }