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

Config file for official client

Browse Source 
Unfinished
Refactor darkside() _readblk(), loadSniff(), saveSniff()
Add extra waiting time when handling temp file of load/saveSniff()
pull/33/head
wh201906 3 years ago
parent 03d9c601fc
commit d0bc6808d0
5 changed files with 141 additions and 99 deletions
Show Stats Download Patch File Download Diff File

35
configs_official.json
Unescape Escape View File

@ -8,15 +8,11 @@
"2k": "2",
"4k": "4"
},
"key type": {
"A": "A",
"B": "B"
},
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
"key A index": 2,
"key B index": 4
},
"chk": {
"check": {
"cmd": "hf mf chk *<card type> ?",
"card type": {
"mini": "0",
@ -46,10 +42,10 @@
"restore": {
"cmd": "hf mf restore"
},
"wipe emulator": {
"emulator wipe": {
"cmd": "hf mf eclr"
},
"wipe Magic Card": {
"Magic Card wipe": {
"cmd": "hf mf cwipe <card type> f",
"card type": {
"mini": "0",
@ -57,6 +53,31 @@
"2k": "2",
"4k": "4"
}
},
"emulator read block": {
"cmd": "hf mf eget <block>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"Magic Card read block": {
"cmd": "hf mf cgetblk <block>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"normal read block": {
"cmd": "hf mf rdbl <block> <key type> <key>",
"key type": {
"A": "A",
"B": "B"
},
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"darkside": {
"cmd": "hf mf mifare"
},
"save sniff": {
"cmd": "hf list mf -s <filename>"
},
"load sniff": {
"cmd": "hf list mf -l <filename>"
}
}
}

32
configs_rrgv4.13.json
Unescape Escape View File

@ -17,7 +17,7 @@
"key A index": 2,
"key B index": 4
},
"chk": {
"check": {
"cmd": "hf mf chk --<card type>",
"card type": {
"mini": "mini",
@ -47,11 +47,37 @@
"restore": {
"cmd": "hf mf restore"
},
"wipe emulator": {
"emulator wipe": {
"cmd": "hf mf eclr"
},
"wipe Magic Card": {
"Magic Card wipe": {
"cmd": "hf mf cwipe"
},
"emulator read block": {
"cmd": "hf mf egetblk --blk <block>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"Magic Card read block": {
"cmd": "hf mf cgetblk --blk <block>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"normal read block": {
"cmd": "hf mf rdbl --blk <block> -<key type> -k <key>",
"key type": {
"A": "a",
"B": "b"
},
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"darkside": {
"cmd": "hf mf darkside"
},
"save sniff": {
"cmd": "trace save -f <filename>"
},
"load sniff": {
"cmd": "trace load -f <filename>",
"show cmd": "trace list --buffer -t mf"
}
}
}

98
module/mifare.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ void Mifare::chk()
QString result;
int offset = 0;
QString data;
QVariantMap config = configMap["chk"].toMap();
QVariantMap config = configMap["check"].toMap();
QString cmd = config["cmd"].toString();
int keyAindex = config["key A index"].toInt();
int keyBindex = config["key B index"].toInt();
@ -254,10 +254,8 @@ void Mifare::hardnested()
void Mifare::darkside()
{
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
util->execCMD("hf mf mifare");
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
util->execCMD("hf mf darkside");
QVariantMap config = configMap["darkside"].toMap();
util->execCMD(config["cmd"].toString());
Util::gotoRawTab();
}
@ -280,7 +278,7 @@ void Mifare::sniff14a()
void Mifare::list()
{
QVariantMap config = configMap["sniff 14a"].toMap();
QVariantMap config = configMap["list"].toMap();
util->execCMD(config["cmd"].toString());
Util::gotoRawTab();
@ -293,24 +291,22 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
QRegularExpressionMatch currMatch;
bool isTrailerBlock = (blockId < 128 && ((blockId + 1) % 4 == 0)) || ((blockId + 1) % 16 == 0);
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL || Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
{
if(targetType == TARGET_MIFARE)
{
if(!data_isKeyValid(key))
{
return "";
}
QVariantMap config = configMap["normal read block"].toMap();
QString cmd = config["cmd"].toString();
QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
cmd.replace("<block>", QString::number(blockId));
cmd.replace("<key type>", config["key type"].toMap()[QString((char)keyType)].toString());
cmd.replace("<key>", key);
// use the given key type to read the target block
result = util->execCMDWithOutput(
"hf mf rdbl "
+ QString::number(blockId)
+ " "
+ (char)keyType
+ " "
+ key,
waitTime);
currMatch = dataPattern->match(result);
result = util->execCMDWithOutput(cmd, waitTime);
currMatch = dataPattern.match(result);
if(currMatch.hasMatch())
{
data = currMatch.captured().toUpper();
@ -337,11 +333,12 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
}
else if(targetType == TARGET_UID)
{
result = util->execCMDWithOutput(
"hf mf cgetblk "
+ QString::number(blockId),
waitTime);
currMatch = dataPattern->match(result);
QVariantMap config = configMap["Magic Card read block"].toMap();
QString cmd = config["cmd"].toString();
QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
cmd.replace("<block>", QString::number(blockId));
result = util->execCMDWithOutput(cmd, waitTime);
currMatch = dataPattern.match(result);
if(currMatch.hasMatch())
{
data = currMatch.captured().toUpper();
@ -350,31 +347,17 @@ QString Mifare::_readblk(int blockId, KeyType keyType, const QString& key, Targe
else
data = "";
}
}
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
{
if(targetType == TARGET_EMULATOR)
{
result = util->execCMDWithOutput(
"hf mf eget "
+ QString::number(blockId),
150);
data = dataPattern->match(result).captured().toUpper();
data.remove(" ");
}
}
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
{
if(targetType == TARGET_EMULATOR)
else if(targetType == TARGET_EMULATOR)
{
result = util->execCMDWithOutput(
"hf mf egetblk "
+ QString::number(blockId),
150);
data = dataPattern->match(result).captured().toUpper();
QVariantMap config = configMap["emulator read block"].toMap();
QString cmd = config["cmd"].toString();
QRegularExpression dataPattern = QRegularExpression(config["data pattern"].toString());
cmd.replace("<block>", QString::number(blockId));
result = util->execCMDWithOutput(cmd, 150);
data = dataPattern.match(result).captured().toUpper();
data.remove(" ");
}
}
return data;
}
@ -761,7 +744,7 @@ void Mifare::restore()
void Mifare::wipeC()
{
QVariantMap config = configMap["wipe Magic Card"].toMap();
QVariantMap config = configMap["Magic Card wipe"].toMap();
QString cmd = config["cmd"].toString();
if(cmd.contains("<card type>"))
cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
@ -810,7 +793,7 @@ void Mifare::lockC()
void Mifare::wipeE()
{
QVariantMap config = configMap["wipe emulator"].toMap();
QVariantMap config = configMap["emulator wipe"].toMap();
util->execCMD(config["cmd"].toString());
}
@ -824,12 +807,17 @@ void Mifare::simulate()
void Mifare::loadSniff(const QString& file)
{
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
util->execCMD("hf list mf -l " + file);
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
QVariantMap config = configMap["load sniff"].toMap();
QString cmd = config["cmd"].toString();
cmd.replace("<filename>", file);
if(config.contains("show cmd"))
{
if(util->execCMDWithOutput("trace load -f " + file, Util::ReturnTrigger({"loaded"})) != "")
util->execCMD("trace list -t mf");
if(util->execCMDWithOutput(cmd, Util::ReturnTrigger({"loaded"})) != "")
util->execCMD(config["show cmd"].toString());
}
else
{
util->execCMD(cmd);
}
Util::gotoRawTab();
@ -837,10 +825,10 @@ void Mifare::loadSniff(const QString& file)
void Mifare::saveSniff(const QString& file)
{
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
util->execCMD("hf list mf -s " + file);
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
util->execCMD("trace save -f " + file);
QVariantMap config = configMap["save sniff"].toMap();
QString cmd = config["cmd"].toString();
cmd.replace("<filename>", file);
util->execCMD(cmd);
Util::gotoRawTab();
}

19
ui/mainwindow.cpp
Unescape Escape View File

@ -866,15 +866,16 @@ void MainWindow::on_MF_Sniff_loadButton_clicked() // use a tmp file to support c
QString filename = "";
title = tr("Plz select the trace file:");
filename = QFileDialog::getOpenFileName(this, title, "./", tr("Trace Files(*.trc);;All Files(*.*)"));
filename = QFileDialog::getOpenFileName(this, title, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc);;All Files(*.*)"));
qDebug() << filename;
if(filename != "")
{
QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc";
if(QFile::copy(filename, "./" + tmpFile))
if(QFile::copy(filename, clientWorkingDir->absolutePath() + "/" + tmpFile))
{
mifare->loadSniff(tmpFile);
QFile::remove("./" + tmpFile);
util->delay(3000);
QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
}
else
{
@ -889,17 +890,23 @@ void MainWindow::on_MF_Sniff_saveButton_clicked()
QString filename = "";
title = tr("Plz select the location to save trace file:");
filename = QFileDialog::getSaveFileName(this, title, "./", tr("Trace Files(*.trc)"));
filename = QFileDialog::getSaveFileName(this, title, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc)"));
qDebug() << filename;
if(filename != "")
{
QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc";
mifare->saveSniff(tmpFile);
if(!QFile::copy("./" + tmpFile, filename))
for(int i = 0; i < 100; i++)
{
util->delay(100);
if(QFile::exists(clientWorkingDir->absolutePath() + "/" + tmpFile))
break;
}
if(!QFile::copy(clientWorkingDir->absolutePath() + "/" + tmpFile, filename))
{
QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
}
QFile::remove("./" + tmpFile);
QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
}
}

2
ui/mainwindow.ui
Unescape Escape View File

@ -136,7 +136,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="mifareTab">
<attribute name="title">

Write Preview
Loading…
Cancel
Save