b612
/
Proxmark3GUI
mirror of https://github.com/wh201906/Proxmark3GUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support read/write data in emulator

Browse Source
pull/3/head
wh201906 5 years ago
parent 5f1df6782a
commit b44488fbed
5 changed files with 318 additions and 216 deletions
Show Stats Download Patch File Download Diff File

263
module/mifare.cpp
Unescape Escape View File

@ -1,6 +1,7 @@
#include "mifare.h" #include "mifare.h"
Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QWidget *parent) : QObject(parent) Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QWidget *parent)
: QObject(parent)
{ {
this->parent = parent; this->parent = parent;
util = addr; util = addr;
@ -16,14 +17,13 @@ Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QWidget *parent) : QObject(parent
nestedKeyPattern = new QRegExp("\\|\\d{3}\\|.+\\|.+\\|.+\\|.+\\|"); nestedKeyPattern = new QRegExp("\\|\\d{3}\\|.+\\|.+\\|.+\\|.+\\|");
} }
QString Mifare::info(bool isRequiringOutput) QString Mifare::info(bool isRequiringOutput)
{ {
if (isRequiringOutput) if (isRequiringOutput)
{ {
QString result = util->execCMDWithOutput("hf 14a info", 500); QString result = util->execCMDWithOutput("hf 14a info", 500);
qDebug() << result << result.indexOf(QRegExp(ui->MF_RW_dataEdit->text()), 0); qDebug() << result
<< result.indexOf(QRegExp(ui->MF_RW_dataEdit->text()), 0);
result.replace("UID :", "|"); result.replace("UID :", "|");
result.replace("ATQA :", "|"); result.replace("ATQA :", "|");
result.replace("SAK :", "|"); result.replace("SAK :", "|");
@ -47,14 +47,17 @@ QString Mifare::info(bool isRequiringOutput)
void Mifare::chk() void Mifare::chk()
{ {
QString result = util->execCMDWithOutput("hf mf chk *" + QString::number(cardType.type) + " ?", 1000 + cardType.type * 1000); QString result = util->execCMDWithOutput(
"hf mf chk *" + QString::number(cardType.type) + " ?",
1000 + cardType.type * 1000);
qDebug() << result; qDebug() << result;
int offset = 0; int offset = 0;
QString tmp, tmp2; QString tmp, tmp2;
for (int i = 0; i < cardType.sectors; i++) for (int i = 0; i < cardType.sectors; i++)
{ {
offset = result.indexOf(*chkKeyPattern, offset); offset = chkKeyPattern->indexIn(result, offset);
// offset = result.indexOf(*chkKeyPattern, offset);
tmp = result.mid(offset, 39).toUpper(); tmp = result.mid(offset, 39).toUpper();
offset += 39; offset += 39;
qDebug() << tmp << offset; qDebug() << tmp << offset;
@ -70,13 +73,15 @@ void Mifare::chk()
void Mifare::nested() void Mifare::nested()
{ {
QString result = util->execCMDWithOutput("hf mf nested " + QString::number(cardType.type) + " *"); QString result = util->execCMDWithOutput(
"hf mf nested " + QString::number(cardType.type) + " *");
int offset = 0; int offset = 0;
QString tmp; QString tmp;
for (int i = 0; i < cardType.sectors; i++) for (int i = 0; i < cardType.sectors; i++)
{ {
offset = result.indexOf(*nestedKeyPattern, offset); offset = nestedKeyPattern->indexIn(result, offset);
// offset = result.indexOf(*nestedKeyPattern, offset);
tmp = result.mid(offset, 47).toUpper(); tmp = result.mid(offset, 47).toUpper();
offset += 47; offset += 47;
if (tmp.at(23) == '1') if (tmp.at(23) == '1')
@ -111,29 +116,29 @@ void Mifare::read()
{ {
int waitTime = 300; int waitTime = 300;
int currblk = ui->MF_RW_blockBox->currentText().toInt(); int currblk = ui->MF_RW_blockBox->currentText().toInt();
QString result = util->execCMDWithOutput("hf mf rdbl " QString result = util->execCMDWithOutput(
+ QString::number(currblk) "hf mf rdbl " + QString::number(currblk) + " " +
+ " " ui->MF_RW_keyTypeBox->currentText() + " " + ui->MF_RW_keyEdit->text(),
+ ui->MF_RW_keyTypeBox->currentText() waitTime);
+ " "
+ ui->MF_RW_keyEdit->text(), waitTime);
if (result.indexOf("isOk:01") != -1) if (result.indexOf("isOk:01") != -1)
{ {
result = result.mid(result.indexOf(*dataPattern, 0), 47).toUpper(); result = result.mid(dataPattern->indexIn(result), 47).toUpper();
if((currblk < 128 && ((currblk + 1) % 4 == 0)) || ((currblk + 1) % 8 == 0)) // process key block if ((currblk < 128 && ((currblk + 1) % 4 == 0)) ||
((currblk + 1) % 8 == 0)) // process key block
{ {
if (ui->MF_RW_keyTypeBox->currentText() == "A") if (ui->MF_RW_keyTypeBox->currentText() == "A")
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
result = result.replace(i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2)); result =
result.replace(i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2));
} }
ui->MF_RW_dataEdit->setText(result); ui->MF_RW_dataEdit->setText(result);
QString tmpKey = result.right(18).replace(" ", ""); QString tmpKey = result.right(18).replace(" ", "");
result = util->execCMDWithOutput("hf mf rdbl " result = util->execCMDWithOutput(
+ ui->MF_RW_keyTypeBox->currentText() "hf mf rdbl " + ui->MF_RW_keyTypeBox->currentText() + " B " +
+ " B " tmpKey,
+ tmpKey, waitTime); waitTime);
if (result.indexOf("isOk:01") == -1) if (result.indexOf("isOk:01") == -1)
{ {
result = ui->MF_RW_dataEdit->text(); result = ui->MF_RW_dataEdit->text();
@ -145,7 +150,8 @@ void Mifare::read()
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
result = result.replace(30 + i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2)); result = result.replace(30 + i * 3, 2,
ui->MF_RW_keyEdit->text().mid(i * 2, 2));
} }
result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? "); result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? ");
ui->MF_RW_dataEdit->setText(result); ui->MF_RW_dataEdit->setText(result);
@ -176,10 +182,9 @@ void Mifare::readAll()
// check keys and read the first block of each sector // check keys and read the first block of each sector
if (data_isKeyValid(keyAList->at(i))) if (data_isKeyValid(keyAList->at(i)))
{ {
result = util->execCMDWithOutput("hf mf rdsc " result = util->execCMDWithOutput("hf mf rdsc " + QString::number(i) +
+ QString::number(i) " A " + keyAList->at(i),
+ " A " waitTime);
+ keyAList->at(i), waitTime);
qDebug() << result; qDebug() << result;
offset = result.indexOf("isOk:01"); offset = result.indexOf("isOk:01");
if (offset != -1) if (offset != -1)
@ -187,7 +192,8 @@ void Mifare::readAll()
isKeyAValid = true; isKeyAValid = true;
for (int j = 0; j < cardType.blk[i]; j++) for (int j = 0; j < cardType.blk[i]; j++)
{ {
offset = result.indexOf(*dataPattern, offset); offset = dataPattern->indexIn(result, offset);
// offset = result.indexOf(*dataPattern, offset);
tmp = result.mid(offset, 47).toUpper(); tmp = result.mid(offset, 47).toUpper();
offset += 47; offset += 47;
qDebug() << tmp; qDebug() << tmp;
@ -199,10 +205,9 @@ void Mifare::readAll()
} }
if (data_isKeyValid(keyBList->at(i))) if (data_isKeyValid(keyBList->at(i)))
{ {
result = util->execCMDWithOutput("hf mf rdsc " result = util->execCMDWithOutput("hf mf rdsc " + QString::number(i) +
+ QString::number(i) " B " + keyBList->at(i),
+ " B " waitTime);
+ keyBList->at(i), waitTime);
qDebug() << result; qDebug() << result;
offset = result.indexOf("isOk:01"); offset = result.indexOf("isOk:01");
if (offset != -1) if (offset != -1)
@ -210,7 +215,8 @@ void Mifare::readAll()
isKeyBValid = true; isKeyBValid = true;
for (int j = 0; j < cardType.blk[i]; j++) for (int j = 0; j < cardType.blk[i]; j++)
{ {
offset = result.indexOf(*dataPattern, offset); offset = dataPattern->indexIn(result, offset);
// offset = result.indexOf(*dataPattern, offset);
tmp = result.mid(offset, 47).toUpper(); tmp = result.mid(offset, 47).toUpper();
offset += 47; offset += 47;
qDebug() << tmp; qDebug() << tmp;
@ -227,7 +233,8 @@ void Mifare::readAll()
// fill the MF_dataWidget with the known valid key // fill the MF_dataWidget with the known valid key
// //
// check whether the MF_dataWidget contains the valid key, // check whether the MF_dataWidget contains the valid key,
// and fill MF_keyWidget(when you only have KeyA but the ReadBlock output contains the KeyB) // and fill MF_keyWidget(when you only have KeyA but the ReadBlock output
// contains the KeyB)
// //
// the structure is not symmetric, since you cannot get KeyA from output // the structure is not symmetric, since you cannot get KeyA from output
// this program will only process the provided KeyA(in MF_keyWidget) // this program will only process the provided KeyA(in MF_keyWidget)
@ -250,11 +257,13 @@ void Mifare::readAll()
} }
else // now isKeyAValid == true, the output might contains the KeyB else // now isKeyAValid == true, the output might contains the KeyB
{ {
QString tmpKey = dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12); QString tmpKey =
result = util->execCMDWithOutput("hf mf rdbl " dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12);
+ QString::number(cardType.blks[i] + cardType.blk[i] - 1) result = util->execCMDWithOutput(
+ " B " "hf mf rdbl " +
+ tmpKey, waitTime); QString::number(cardType.blks[i] + cardType.blk[i] - 1) +
" B " + tmpKey,
waitTime);
if (result.indexOf("isOk:01") != -1) if (result.indexOf("isOk:01") != -1)
{ {
keyBList->replace(i, tmpKey); keyBList->replace(i, tmpKey);
@ -265,7 +274,6 @@ void Mifare::readAll()
result = dataList->at(cardType.blks[i] + cardType.blk[i] - 1); result = dataList->at(cardType.blks[i] + cardType.blk[i] - 1);
result = result.replace(20, 12, "????????????"); result = result.replace(20, 12, "????????????");
dataList->replace(cardType.blks[i] + cardType.blk[i] - 1, result); dataList->replace(cardType.blks[i] + cardType.blk[i] - 1, result);
} }
} }
data_syncWithDataWidget(false, cardType.blks[i] + cardType.blk[i] - 1); data_syncWithDataWidget(false, cardType.blks[i] + cardType.blk[i] - 1);
@ -276,14 +284,12 @@ void Mifare::readAll()
void Mifare::write() void Mifare::write()
{ {
int waitTime = 300; int waitTime = 300;
QString result = util->execCMDWithOutput("hf mf wrbl " QString result = util->execCMDWithOutput(
+ ui->MF_RW_blockBox->currentText() "hf mf wrbl " + ui->MF_RW_blockBox->currentText() + " " +
+ " " ui->MF_RW_keyTypeBox->currentText() + " " +
+ ui->MF_RW_keyTypeBox->currentText() ui->MF_RW_keyEdit->text() + " " +
+ " " ui->MF_RW_dataEdit->text().replace(" ", ""),
+ ui->MF_RW_keyEdit->text() waitTime);
+ " "
+ ui->MF_RW_dataEdit->text().replace(" ", ""), waitTime);
if (result.indexOf("isOk:01") != -1) if (result.indexOf("isOk:01") != -1)
{ {
QMessageBox::information(parent, tr("Info"), tr("Success!")); QMessageBox::information(parent, tr("Info"), tr("Success!"));
@ -302,27 +308,27 @@ void Mifare::writeAll()
{ {
for (int j = 0; j < cardType.blk[i]; j++) for (int j = 0; j < cardType.blk[i]; j++)
{ {
result = ""; // if the KeyA is invalid and the result is not empty, the KeyB will not be tested. result = ""; // if the KeyA is invalid and the result is not empty, the
if(data_isDataValid(dataList->at(cardType.blks[i] + j)) != DATA_NOSPACE || dataList->at(cardType.blks[i] + j).contains('?')) // KeyB will not be tested.
if (data_isDataValid(dataList->at(cardType.blks[i] + j)) !=
DATA_NOSPACE ||
dataList->at(cardType.blks[i] + j).contains('?'))
continue; continue;
if (data_isKeyValid(keyAList->at(i))) if (data_isKeyValid(keyAList->at(i)))
{ {
result = util->execCMDWithOutput("hf mf wrbl " result = util->execCMDWithOutput(
+ QString::number(cardType.blks[i] + j) "hf mf wrbl " + QString::number(cardType.blks[i] + j) + " A " +
+ " A " keyAList->at(i) + " " + dataList->at(cardType.blks[i] + j),
+ keyAList->at(i) waitTime);
+ " "
+ dataList->at(cardType.blks[i] + j), waitTime);
} }
qDebug() << i << j << result.indexOf("isOk:01") << data_isKeyValid(keyBList->at(i)); qDebug() << i << j << result.indexOf("isOk:01")
<< data_isKeyValid(keyBList->at(i));
if (result.indexOf("isOk:01") == -1 && data_isKeyValid(keyBList->at(i))) if (result.indexOf("isOk:01") == -1 && data_isKeyValid(keyBList->at(i)))
{ {
result = util->execCMDWithOutput("hf mf wrbl " result = util->execCMDWithOutput(
+ QString::number(cardType.blks[i] + j) "hf mf wrbl " + QString::number(cardType.blks[i] + j) + " B " +
+ " B " keyBList->at(i) + " " + dataList->at(cardType.blks[i] + j),
+ keyBList->at(i) waitTime);
+ " "
+ dataList->at(cardType.blks[i] + j), waitTime);
} }
} }
} }
@ -332,11 +338,11 @@ void Mifare::readC()
{ {
int waitTime = 300; int waitTime = 300;
int currblk = ui->MF_RW_blockBox->currentText().toInt(); int currblk = ui->MF_RW_blockBox->currentText().toInt();
QString result = util->execCMDWithOutput("hf mf cgetblk " QString result = util->execCMDWithOutput(
+ QString::number(currblk), waitTime); "hf mf cgetblk " + QString::number(currblk), waitTime);
if (result.indexOf("No chinese") == -1) if (result.indexOf("No chinese") == -1)
{ {
result = result.mid(result.indexOf(*dataPattern, 0), 47).toUpper(); result = result.mid(dataPattern->indexIn(result), 47).toUpper();
ui->MF_RW_dataEdit->setText(result); ui->MF_RW_dataEdit->setText(result);
} }
} }
@ -350,15 +356,15 @@ void Mifare::readAllC()
int offset = 0; int offset = 0;
for (int i = 0; i < cardType.sectors; i++) for (int i = 0; i < cardType.sectors; i++)
{ {
result = util->execCMDWithOutput("hf mf cgetsc " result = util->execCMDWithOutput("hf mf cgetsc " + QString::number(i), waitTime);
+ QString::number(i), waitTime);
qDebug() << result; qDebug() << result;
if (result.indexOf("No chinese") == -1) if (result.indexOf("No chinese") == -1)
{ {
offset = 0; offset = 0;
for (int j = 0; j < cardType.blk[i]; j++) for (int j = 0; j < cardType.blk[i]; j++)
{ {
offset = result.indexOf(*dataPattern, offset); offset = dataPattern->indexIn(result, offset);
// offset = result.indexOf(*dataPattern, offset);
tmp = result.mid(offset, 47).toUpper(); tmp = result.mid(offset, 47).toUpper();
offset += 47; offset += 47;
qDebug() << tmp; qDebug() << tmp;
@ -366,8 +372,10 @@ void Mifare::readAllC()
dataList->replace(cardType.blks[i] + j, tmp); dataList->replace(cardType.blks[i] + j, tmp);
data_syncWithDataWidget(false, cardType.blks[i] + j); data_syncWithDataWidget(false, cardType.blks[i] + j);
} }
keyAList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12)); keyAList->replace(
keyBList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12)); i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12));
keyBList->replace(
i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12));
data_syncWithKeyWidget(false, i, true); data_syncWithKeyWidget(false, i, true);
data_syncWithKeyWidget(false, i, false); data_syncWithKeyWidget(false, i, false);
} }
@ -377,10 +385,10 @@ void Mifare::readAllC()
void Mifare::writeC() void Mifare::writeC()
{ {
int waitTime = 150; int waitTime = 150;
QString result = util->execCMDWithOutput("hf mf csetblk " QString result = util->execCMDWithOutput(
+ ui->MF_RW_blockBox->currentText() "hf mf csetblk " + ui->MF_RW_blockBox->currentText() + " " +
+ " " ui->MF_RW_dataEdit->text().replace(" ", ""),
+ ui->MF_RW_dataEdit->text().replace(" ", ""), waitTime); waitTime);
if (result.indexOf("No chinese") == -1) if (result.indexOf("No chinese") == -1)
{ {
QMessageBox::information(parent, tr("Info"), tr("Success!")); QMessageBox::information(parent, tr("Info"), tr("Success!"));
@ -399,22 +407,21 @@ void Mifare::writeAllC()
{ {
for (int j = 0; j < cardType.blk[i]; j++) for (int j = 0; j < cardType.blk[i]; j++)
{ {
result = ""; // if the KeyA is invalid and the result is not empty, the KeyB will not be tested. result = "";
if(data_isDataValid(dataList->at(cardType.blks[i] + j)) != DATA_NOSPACE || dataList->at(cardType.blks[i] + j).contains('?')) if (data_isDataValid(dataList->at(cardType.blks[i] + j)) != DATA_NOSPACE ||
dataList->at(cardType.blks[i] + j).contains('?'))
continue; continue;
result = util->execCMDWithOutput("hf mf csetblk " result = util->execCMDWithOutput(
+ QString::number(cardType.blks[i] + j) "hf mf csetblk " + QString::number(cardType.blks[i] + j) + " " +
+ " " dataList->at(cardType.blks[i] + j),
+ dataList->at(cardType.blks[i] + j), waitTime); waitTime);
} }
} }
} }
void Mifare::wipeC() void Mifare::wipeC()
{ {
util->execCMD("hf mf cwipe " util->execCMD("hf mf cwipe " + QString::number(cardType.type) + " f");
+ QString::number(cardType.type)
+ " f");
ui->funcTab->setCurrentIndex(1); ui->funcTab->setCurrentIndex(1);
} }
@ -429,7 +436,8 @@ void Mifare::setParameterC()
lis[0].replace(" ", ""); lis[0].replace(" ", "");
lis[1].replace(" ", ""); lis[1].replace(" ", "");
lis[2].replace(" ", ""); lis[2].replace(" ", "");
MF_UID_parameterDialog dialog(lis[0].toUpper(), lis[1].toUpper(), lis[2].mid(0, 2).toUpper()); MF_UID_parameterDialog dialog(lis[0].toUpper(), lis[1].toUpper(),
lis[2].mid(0, 2).toUpper());
connect(&dialog, &MF_UID_parameterDialog::sendCMD, util, &Util::execCMD); connect(&dialog, &MF_UID_parameterDialog::sendCMD, util, &Util::execCMD);
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
ui->funcTab->setCurrentIndex(1); ui->funcTab->setCurrentIndex(1);
@ -442,10 +450,75 @@ void Mifare::lockC()
util->execCMD("hf 14a raw -pa 43"); util->execCMD("hf 14a raw -pa 43");
util->execCMD("hf 14a raw -pa E0 00 39 F7"); util->execCMD("hf 14a raw -pa E0 00 39 F7");
util->execCMD("hf 14a raw -pa E1 00 E1 EE"); util->execCMD("hf 14a raw -pa E1 00 E1 EE");
util->execCMD("hf 14a raw -pa 85 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 18 47"); util->execCMD("hf 14a raw -pa 85 00 00 00 00 00 00 00 00 00 00 00 "
" 00 00 00 08 18 47");
util->execCMD("hf 14a raw 52"); util->execCMD("hf 14a raw 52");
} }
void Mifare::writeAllE()
{
const int waitTime = 200;
QString result;
for (int i = 0; i < cardType.sectors; i++)
{
for (int j = 0; j < cardType.blk[i]; j++)
{
result = "";
if (data_isDataValid(dataList->at(cardType.blks[i] + j)) != DATA_NOSPACE || dataList->at(cardType.blks[i] + j).contains('?'))
continue;
result = util->execCMDWithOutput(
"hf mf eset " + QString::number(cardType.blks[i] + j)
+ " "
+ dataList->at(cardType.blks[i] + j),
waitTime);
}
}
util->execCMDWithOutput("hf mf eget", waitTime); // to refresh output buffer;
}
void Mifare::readAllE()
{
QString result;
const int waitTime = 200;
QString tmp;
int offset = 0;
for (int i = 0; i < cardType.sectors; i++)
{
offset = 0;
for (int j = 0; j < cardType.blk[i]; j++)
{
qDebug() << "**********" ;
result = util->execCMDWithOutput("hf mf eget " + QString::number(cardType.blks[i] + j), waitTime);
qDebug() << result ;
offset = dataPattern->indexIn(result);
// offset = result.indexOf(*dataPattern, offset); // When I find the data position in this way, the Regex might fail to match.
tmp = result.mid(offset, 47).toUpper();
qDebug() << tmp << offset;
qDebug() << "**********" ;
if(offset == -1)
continue;
tmp.replace(" ", "");
dataList->replace(cardType.blks[i] + j, tmp);
data_syncWithDataWidget(false, cardType.blks[i] + j);
}
keyAList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12));
keyBList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12));
data_syncWithKeyWidget(false, i, true);
data_syncWithKeyWidget(false, i, false);
}
}
void Mifare::wipeE()
{
util->execCMD("hf mf eclr");
}
void Mifare::dump() void Mifare::dump()
{ {
util->execCMD("hf mf dump"); util->execCMD("hf mf dump");
@ -543,7 +616,8 @@ bool Mifare::data_isKeyValid(const QString& key)
return true; return true;
} }
Mifare::DataType Mifare::data_isDataValid(QString data) // "?" will not been processd there Mifare::DataType
Mifare::data_isDataValid(QString data) // "?" will not been processd there
{ {
if (data.length() == 47) if (data.length() == 47)
{ {
@ -608,11 +682,7 @@ bool Mifare::data_loadDataFile(const QString& filename)
for (int i = 0; i < cardType.blocks * 16; i++) // Detect the file type for (int i = 0; i < cardType.blocks * 16; i++) // Detect the file type
{ {
// qDebug() << (unsigned char)buff[i]; // qDebug() << (unsigned char)buff[i];
if(!((buff[i] >= 'A' && buff[i] <= 'F') || if (!((buff[i] >= 'A' && buff[i] <= 'F') || (buff[i] >= 'a' && buff[i] <= 'f') || (buff[i] >= '0' && buff[i] <= '9') || buff[i] == '\n' || buff[i] == '\r'))
(buff[i] >= 'a' && buff[i] <= 'f') ||
(buff[i] >= '0' && buff[i] <= '9') ||
buff[i] == '\n' ||
buff[i] == '\r'))
{ {
isBin = true; isBin = true;
break; break;
@ -689,7 +759,9 @@ QString Mifare::bin2text(const QByteArray& buff, int i, int length)
{ {
QString ret = ""; QString ret = "";
char LByte, RByte; char LByte, RByte;
char map[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; char map[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
};
for (int j = 0; j < length; j++) for (int j = 0; j < length; j++)
{ {
LByte = map[(unsigned char)buff[i * length + j] >> 4]; LByte = map[(unsigned char)buff[i * length + j] >> 4];
@ -786,7 +858,6 @@ bool Mifare::data_saveKeyFile(const QString& filename, bool isBin)
} }
else else
{ {
} }
bool ret = file.write(buff) != -1; bool ret = file.write(buff) != -1;
file.close(); file.close();
@ -834,8 +905,10 @@ void Mifare::data_data2Key()
} }
else else
{ {
keyAList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12)); keyAList->replace(
keyBList->replace(i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12)); i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).left(12));
keyBList->replace(
i, dataList->at(cardType.blks[i] + cardType.blk[i] - 1).right(12));
} }
data_syncWithKeyWidget(); data_syncWithKeyWidget();
} }

3
module/mifare.h
Unescape Escape View File

@ -105,6 +105,9 @@ public:
void data_setData(int block, const QString &data); void data_setData(int block, const QString &data);
void data_setKey(int sector, bool isKeyA, const QString &key); void data_setKey(int sector, bool isKeyA, const QString &key);
void lockC(); void lockC();
void writeAllE();
void readAllE();
void wipeE();
public slots: public slots:
signals: signals:

26
ui/mainwindow.cpp
Unescape Escape View File

@ -6,10 +6,11 @@ MainWindow::MainWindow(QWidget *parent)
, ui(new Ui::MainWindow) , ui(new Ui::MainWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->MF_simGroupBox->setVisible(false); // developing... // ui->MF_simGroupBox->setVisible(false); // developing...
ui->MF_sniffGroupBox->setVisible(false); // developing... ui->MF_sniffGroupBox->setVisible(false); // developing...
myInfo = new QAction("wh201906", this); myInfo = new QAction("wh201906", this);
connect(myInfo, &QAction::triggered, [ = ]() { connect(myInfo, &QAction::triggered, [ = ]()
{
QDesktopServices::openUrl(QUrl("https://github.com/wh201906")); QDesktopServices::openUrl(QUrl("https://github.com/wh201906"));
}); });
this->addAction(myInfo); this->addAction(myInfo);
@ -473,6 +474,25 @@ void MainWindow::on_MF_UID_lockButton_clicked()
mifare->lockC(); mifare->lockC();
} }
void MainWindow::on_MF_Sim_loadDataButton_clicked()
{
setState(false);
mifare->writeAllE();
setState(true);
}
void MainWindow::on_MF_Sim_writeAllButton_clicked()
{
setState(false);
mifare->readAllE();
setState(true);
}
void MainWindow::on_MF_Sim_clearButton_clicked()
{
mifare->wipeE();
}
void MainWindow::on_MF_Sniff_sniffButton_clicked() void MainWindow::on_MF_Sniff_sniffButton_clicked()
{ {
setState(false); setState(false);
@ -651,3 +671,5 @@ void MainWindow::setState(bool st)
} }
// *********************************************** // ***********************************************

9
ui/mainwindow.h
Unescape Escape View File

@ -22,7 +22,8 @@
#include "common/util.h" #include "common/util.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui
{
class MainWindow; class MainWindow;
} }
QT_END_NAMESPACE QT_END_NAMESPACE
@ -119,6 +120,12 @@ private slots:
void on_MF_UID_lockButton_clicked(); void on_MF_UID_lockButton_clicked();
void on_MF_Sim_loadDataButton_clicked();
void on_MF_Sim_writeAllButton_clicked();
void on_MF_Sim_clearButton_clicked();
private: private:
Ui::MainWindow* ui; Ui::MainWindow* ui;
QButtonGroup* typeBtnGroup; QButtonGroup* typeBtnGroup;

3
ui/mainwindow.ui
Unescape Escape View File

@ -105,9 +105,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="mifareTab"> <widget class="QWidget" name="mifareTab">
<attribute name="title"> <attribute name="title">
<string>Mifare</string> <string>Mifare</string>

Write Preview
Loading…
Cancel
Save