b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2026-07-14 22:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support write selected blocks and fix a bug

Browse Source
This commit is contained in:
wh201906
2020-08-08 00:19:37 +08:00
parent 4dba7882e5
commit 41bbcd2c4a
5 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mifare.cpp
+24 -17
View File
@@ -273,7 +273,7 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, int w
{
QString data;
QString result;
bool isKeyBlock = (blockId < 128 && ((blockId + 1) % 4 == 0)) || ((blockId + 1) % 8 == 0);
bool isKeyBlock = (blockId < 128 && ((blockId + 1) % 4 == 0)) || ((blockId + 1) % 16 == 0);
if(!data_isKeyValid(key))
{
@@ -397,7 +397,7 @@ QStringList Mifare::_readsec(int sectorId, KeyType keyType, const QString& key,
return data;
}
void Mifare::read()
void Mifare::readOne()
{
int blockId = ui->MF_RW_blockBox->currentText().toInt();
Mifare::KeyType keyType = (Mifare::KeyType)(ui->MF_RW_keyTypeBox->currentData().toInt());
@@ -424,7 +424,7 @@ void Mifare::readSelected(const QList<int>& selectedBlocks)
}
for(int item : selectedBlocks)
{
selectedSectors[item / 4] = true;
selectedSectors[data_b2s(item)] = true;
}
for(int i = 0; i < cardType.sector_size; i++)
@@ -514,7 +514,7 @@ bool Mifare::_writeblk(int blockId, KeyType keyType, const QString& key, const Q
}
}
void Mifare::write()
void Mifare::writeOne()
{
int blockId = ui->MF_RW_blockBox->currentText().toInt();
Mifare::KeyType keyType = (Mifare::KeyType)(ui->MF_RW_keyTypeBox->currentData().toInt());
@@ -529,22 +529,19 @@ void Mifare::write()
}
}
void Mifare::writeAll()
void Mifare::writeSelected(const QList<int>& selectedBlocks)
{
for(int i = 0; i < cardType.sector_size; i++)
for(int item : selectedBlocks)
{
for(int j = 0; j < cardType.blk[i]; j++)
bool result = false;
result = _writeblk(item, KEY_A, keyAList->at(data_b2s(item)), dataList->at(item));
if(!result)
{
bool result = false;
result = _writeblk(cardType.blks[i] + j, KEY_A, keyAList->at(i), dataList->at(cardType.blks[i] + j));
if(!result)
{
result = _writeblk(cardType.blks[i] + j, KEY_B, keyBList->at(i), dataList->at(cardType.blks[i] + j));
}
if(!result)
{
result = _writeblk(cardType.blks[i] + j, KEY_A, "FFFFFFFFFFFF", dataList->at(cardType.blks[i] + j));
}
result = _writeblk(item, KEY_B, keyBList->at(data_b2s(item)), dataList->at(item));
}
if(!result)
{
result = _writeblk(item, KEY_A, "FFFFFFFFFFFF", dataList->at(item));
}
}
}
@@ -1190,6 +1187,16 @@ void Mifare::data_fillKeys()
data_syncWithKeyWidget();
}
int Mifare::data_b2s(int block)
{
if(block >= 0 && block < 128)
return block / 4;
else if(block < 256)
return (block - 128) / 16 + 32;
else
return -1;
}
QList<quint8> Mifare::data_getACBits(const QString& text) //return empty QList if the text is invalid
{
QString input = text;
module/mifare.h
+4 -3
View File
@@ -24,10 +24,10 @@ public:
void sniff();
void snoop();
void list();
void read();
void readOne();
void readSelected(const QList<int>& selectedBlocks);
void write();
void writeAll();
void writeOne();
void writeSelected(const QList<int>& selectedBlocks);
void dump();
void restore();
@@ -106,6 +106,7 @@ public:
void data_fillKeys();
static QList<quint8> data_getACBits(const QString &text);
static int data_b2s(int block);
public slots:
signals: