b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-02-17 06:31:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increase read speed(replace rdbl with rdsc)

Browse Source
This commit is contained in:
wh201906 2020-04-23 23:54:51 +08:00
parent b6be875261
commit ac7f1b33dd
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
module/mifare.cpp
View File

@ -9,6 +9,7 @@ Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QObject *parent) : QObject(parent
dataList = new QStringList(); dataList = new QStringList();
data_clearKey(); // fill with blank Qstring data_clearKey(); // fill with blank Qstring
data_clearData(); // fill with blank Qstring data_clearData(); // fill with blank Qstring
dataPattern = new QRegExp("([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}");
} }
@ -83,8 +84,8 @@ void Mifare::read()
+ ui->MF_RW_keyEdit->text()); + ui->MF_RW_keyEdit->text());
if(result.indexOf("isOk:01") != -1) if(result.indexOf("isOk:01") != -1)
{ {
result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper(); result = result.mid(result.indexOf(*dataPattern, 0), 47).toUpper();
if((ui->MF_RW_blockBox->currentText().toInt() + 1) % 4 == 0) if((ui->MF_RW_blockBox->currentText().toInt() + 1) % 4 == 0) // process key block
{ {
if(ui->MF_RW_keyTypeBox->currentText() == "A") if(ui->MF_RW_keyTypeBox->currentText() == "A")
{ {
@ -125,9 +126,11 @@ void Mifare::read()
void Mifare::readAll() void Mifare::readAll()
{ {
QString result; QString result;
QString tmp;
int offset = 0;
bool isKeyAValid; bool isKeyAValid;
bool isKeyBValid; bool isKeyBValid;
const int waitTime = 300; const int waitTime = 150;
for(int i = 0; i < sectors; i++) for(int i = 0; i < sectors; i++)
{ {
result = ""; result = "";
@ -137,50 +140,51 @@ 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 rdbl " result = util->execCMDWithOutput("hf mf rdsc "
+ QString::number(4 * i) + QString::number(i)
+ " A " + " A "
+ keyAList->at(i), waitTime); + keyAList->at(i), waitTime);
if(result.indexOf("isOk:01") != -1) qDebug() << result;
offset = result.indexOf("isOk:01");
if(offset != -1)
{ {
isKeyAValid = true; isKeyAValid = true;
result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper(); for(int j = 0; j < 4; j++)
result.replace(" ", ""); {
dataList->replace(4 * i, result); tmp = result.mid(result.indexOf(*dataPattern, offset), 47).toUpper();
offset += 47;
qDebug() << tmp;
tmp.replace(" ", "");
dataList->replace(i * 4 + j, tmp);
data_syncWithDataWidget(false, i * 4 + j);
}
} }
} }
if(data_isKeyValid(keyBList->at(i))) if(data_isKeyValid(keyBList->at(i)))
{ {
result = util->execCMDWithOutput("hf mf rdbl " result = util->execCMDWithOutput("hf mf rdsc "
+ QString::number(4 * i) + QString::number(i)
+ " B " + " B "
+ keyBList->at(i), waitTime); + keyBList->at(i), waitTime);
if(result.indexOf("isOk:01") != -1) qDebug() << result;
offset = result.indexOf("isOk:01");
if(offset != -1)
{ {
isKeyBValid = true; isKeyBValid = true;
result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper(); for(int j = 0; j < 4; j++)
result.replace(" ", ""); {
dataList->replace(4 * i, result); tmp = result.mid(result.indexOf(*dataPattern, offset), 47).toUpper();
offset += 47;
qDebug() << tmp;
tmp.replace(" ", "");
dataList->replace(i * 4 + j, tmp);
data_syncWithDataWidget(false, i * 4 + j);
}
} }
} }
data_syncWithDataWidget(false, 4 * i);
// read the rest blocks of a sector
if(isKeyAValid || isKeyBValid) if(isKeyAValid || isKeyBValid)
{ {
for(int j = 1; j < 4; j++)
{
result = util->execCMDWithOutput("hf mf rdbl "
+ QString::number(4 * i + j)
+ " "
+ (isKeyAValid ? "A" : "B")
+ " "
+ (isKeyAValid ? keyAList : keyBList)->at(i), waitTime);
result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper();
result.replace(" ", "");
dataList->replace(4 * i + j, result);
data_syncWithDataWidget(false, 4 * i + j);
}
// 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,

2
module/mifare.h
View File

@ -7,6 +7,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QRegExp>
class Mifare : public QObject class Mifare : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -49,6 +50,7 @@ private:
QStringList* keyAList; QStringList* keyAList;
QStringList* keyBList; QStringList* keyBList;
QStringList* dataList; QStringList* dataList;
QRegExp* dataPattern;
int sectors = 16; int sectors = 16;
int blocks = 64; int blocks = 64;