mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-21 15:56:21 +08:00
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.
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:
parent
b89b3399dc
commit
73a5e3b23d
|
@ -2236,10 +2236,18 @@ int CmdHF14AMfELoad(const char *Cmd) {
|
|||
}
|
||||
fclose(f);
|
||||
printf("\n");
|
||||
|
||||
if ((blockNum != numBlocks)) {
|
||||
PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);
|
||||
return 4;
|
||||
|
||||
// Ultralight /Ntag
|
||||
if ( blockWidth == 8 ) {
|
||||
if ((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;
|
||||
}
|
||||
}
|
||||
PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue