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 editing data and key manually

Browse Source
This commit is contained in:
wh201906
2020-04-28 19:54:05 +08:00
parent c74cdee924
commit 383eaff2a5
5 changed files with 122 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mifare.cpp
+35 -15
View File
@@ -417,28 +417,35 @@ void Mifare::restore()
void Mifare::data_syncWithDataWidget(bool syncAll, int block)
{
QString tmp = "";
QString tmp;
if(syncAll)
{
for(int i = 0; i < cardType.blocks; i++)
{
tmp = "";
tmp += dataList->at(i).mid(0, 2);
for(int j = 1; j < 16; j++)
if(dataList->at(i) != "")
{
tmp += " ";
tmp += dataList->at(i).mid(j * 2, 2);
tmp += dataList->at(i).mid(0, 2);
for(int j = 1; j < 16; j++)
{
tmp += " ";
tmp += dataList->at(i).mid(j * 2, 2);
}
}
ui->MF_dataWidget->item(i, 2)->setText(tmp);
}
}
else
{
tmp += dataList->at(block).mid(0, 2);
for(int j = 1; j < 16; j++)
tmp = "";
if(dataList->at(block) != "")
{
tmp += " ";
tmp += dataList->at(block).mid(j * 2, 2);
tmp += dataList->at(block).mid(0, 2);
for(int j = 1; j < 16; j++)
{
tmp += " ";
tmp += dataList->at(block).mid(j * 2, 2);
}
}
ui->MF_dataWidget->item(block, 2)->setText(tmp);
}
@@ -659,13 +666,13 @@ bool Mifare::data_saveDataFile(const QString& filename, bool isBin)
unsigned char Byt[2];
for(int k = 0; k < 2; k++)
{
tmp = dataList->at(i).at(j*2+k).toUpper();
tmp = dataList->at(i).at(j * 2 + k).toUpper();
if(tmp >= '0' && tmp <= '9')
Byt[k] = tmp.toLatin1() - '0';
else if(tmp >= 'A' && tmp <= 'F')
Byt[k] = tmp.toLatin1() - 'A' + 10;
}
buff += (Byt[0] << 4)|Byt[1];
buff += (Byt[0] << 4) | Byt[1];
}
}
}
@@ -703,26 +710,26 @@ bool Mifare::data_saveKeyFile(const QString& filename, bool isBin)
unsigned char Byt[2];
for(int k = 0; k < 2; k++)
{
tmp = keyAList->at(i).at(j*2+k).toUpper();
tmp = keyAList->at(i).at(j * 2 + k).toUpper();
if(tmp >= '0' && tmp <= '9')
Byt[k] = tmp.toLatin1() - '0';
else if(tmp >= 'A' && tmp <= 'F')
Byt[k] = tmp.toLatin1() - 'A' + 10;
}
buff += (Byt[0] << 4)|Byt[1];
buff += (Byt[0] << 4) | Byt[1];
}
for(int j = 0; j < 6; j++)
{
unsigned char Byt[2];
for(int k = 0; k < 2; k++)
{
tmp = keyBList->at(i).at(j*2+k).toUpper();
tmp = keyBList->at(i).at(j * 2 + k).toUpper();
if(tmp >= '0' && tmp <= '9')
Byt[k] = tmp.toLatin1() - '0';
else if(tmp >= 'A' && tmp <= 'F')
Byt[k] = tmp.toLatin1() - 'A' + 10;
}
buff += (Byt[0] << 4)|Byt[1];
buff += (Byt[0] << 4) | Byt[1];
}
}
}
@@ -782,3 +789,16 @@ void Mifare::data_data2Key()
data_syncWithKeyWidget();
}
}
void Mifare::data_setData(int block, const QString& data)
{
dataList->replace(block, data);
}
void Mifare::data_setKey(int sector, bool isKeyA, const QString& key)
{
if(isKeyA)
keyAList->replace(sector, key);
else
keyBList->replace(sector, key);
}
module/mifare.h
+2
View File
@@ -101,6 +101,8 @@ public:
void data_key2Data();
void data_data2Key();
void data_setData(int block, const QString &data);
void data_setKey(int sector, bool isKeyA, const QString &key);
public slots:
signals: