19 Commits

Author SHA1 Message Date
wh201906 f285f76a20 V0.2.2 2021-09-20 19:07:36 +08:00
wh201906 24adc08d84 LF config file 2021-09-20 15:32:00 +08:00
wh201906 d56c5f8dc7 Merge branch 'master' into dev 2021-09-20 00:01:57 +08:00
wh201906 222f271a31 Choose config file path 2021-09-19 23:59:55 +08:00
wh201906 0c339e91af Revert part of the commit 12a0837
I forgot I have designed "Keep the client active" for issue #22
isBusy() is deprecated for blocking the port, but it doesn't matter.
2021-09-19 21:33:53 +08:00
wh201906 85ea3fd744 Config file
_readsec(), hardnested(), _writeblk(), lockC(), setParameterC()
2021-09-19 21:00:23 +08:00
wh201906 d0bc6808d0 Config file for official client
Unfinished
Refactor darkside() _readblk(), loadSniff(), saveSniff()
Add extra waiting time when handling temp file of load/saveSniff()
2021-09-19 01:10:12 +08:00
wh201906 03d9c601fc Config fiie for official client
Unfinished
Refactor nested(), info(), chk()
2021-09-18 02:03:05 +08:00
wh201906 5a8ab42281 External command config file 2021-09-17 15:25:03 +08:00
wh201906 12a0837c50 Fix a bug
Trying to fix #22
Open client with QProcess::Text for proper newline character(s)
On Raspbian, the isBusy() function will always return false, even the serial port is actually connected.
2021-09-05 21:35:03 +08:00
wh201906 d6f02e7a69 Update building instructions 2021-08-14 17:05:13 +08:00
wh201906 02a8fe03e3 Fix a bug
#21
2021-08-07 11:21:19 +08:00
wh201906 3523c1eace Fix a bug
#20
I got a wrong tutorial saying that I should use xxx.ts on Linux
2021-08-05 11:57:35 +08:00
wh201906 bac6207634 V0.2.1 2021-03-16 11:23:01 +08:00
wh201906 ccb07651cc Mifare: Optimize read logic
Fix bug #16 mentioned in http://www.proxmark.org/forum/viewtopic.php?pid=42123 (see the 17th post)
This is caused by the output change in RRG repo
Optimize _readsec() logic
Implement getTrailerBlockId()
2021-03-16 11:06:26 +08:00
wh201906 f706d59c48 Update UI 2021-03-15 11:29:17 +08:00
wh201906 9e31496131 Fail to support non-ASCII chars in path
Using "chcp" seems to have no effect there
I fix a small bug then
2021-03-12 11:59:51 +08:00
wh201906 a232e4ec83 Fix #15 partially
The path of the start script or the client can contain spaces now(on Windows)
TODO:
Test the issue on Linux and implement the fix if it's needed
Support non-ASCII chars in the path
2021-03-11 00:46:56 +08:00
wh201906 1bec73d1ad T55xx: Add some useless UI 2021-03-08 23:02:16 +08:00
24 changed files with 2734 additions and 1209 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
VERSION = 0.2.0 VERSION = 0.2.2
QMAKE_TARGET_PRODUCT = "Proxmark3GUI" QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI" QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
QMAKE_TARGET_COMPANY = "wh201906" QMAKE_TARGET_COMPANY = "wh201906"
+16 -3
View File
@@ -34,8 +34,8 @@ A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) clie
## About Iceman fork/repo ## About Iceman fork/repo
The [Iceman fork/repo](https://github.com/RfidResearchGroup/proxmark3) has more powerful functions like offline sniff. These guys even developed a new hardware called Proxmark3 RDV4 with smart card support. But the official repo and the Iceman repo is not fully compatible. The [Iceman fork/repo](https://github.com/RfidResearchGroup/proxmark3) has more powerful functions. These guys even developed a new hardware called Proxmark3 RDV4 with smart card support. But the official repo and the Iceman repo is not fully compatible.
This GUI is compatible with Iceman/RRG repo(tested on v4.9237) This GUI is compatible with Iceman/RRG repo(tested on v4.13441)
*** ***
@@ -51,7 +51,9 @@ Great thanks to him.
## Build on Linux ## Build on Linux
cd ~ cd ~
git clone https://github.com/wh201906/Proxmark3GUI.git sudo apt-get update
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
cd Proxmark3GUI cd Proxmark3GUI
mkdir build mkdir build
cd build cd build
@@ -59,12 +61,23 @@ Great thanks to him.
make make
make clean make clean
cp -r ../lang ./ cp -r ../lang ./
cp -r ../config ./
./Proxmark3GUI ./Proxmark3GUI
*** ***
## Update Log: ## Update Log:
### V0.2.2
+ Load command format from external json file
+ Fix bug [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)
+ Support Iceman/RRG repo v4.13441
### V0.2.1
+ Optimize MIFARE Classic reading logic
+ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16)
+ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now)
### V0.2 ### V0.2
+ Use Dock widget for more flexible layout + Use Dock widget for more flexible layout
+ Support basic LF commands + Support basic LF commands
+15 -2
View File
@@ -34,7 +34,7 @@
## 关于冰人版 ## 关于冰人版
[冰人版](https://github.com/RfidResearchGroup/proxmark3)(Iceman/RRG)的客户端和固件更新更为激进,相比官方版具有更多的功能 [冰人版](https://github.com/RfidResearchGroup/proxmark3)(Iceman/RRG)的客户端和固件更新更为激进,相比官方版具有更多的功能
此GUI所有功能均兼容冰人版(在v4.9237上测试通过) 此GUI所有功能均兼容冰人版(在v4.13441上测试通过)
*** ***
@@ -50,7 +50,9 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
## 在Linux系统下编译 ## 在Linux系统下编译
cd ~ cd ~
git clone https://github.com/wh201906/Proxmark3GUI.git sudo apt-get update
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
cd Proxmark3GUI cd Proxmark3GUI
mkdir build mkdir build
cd build cd build
@@ -58,12 +60,23 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
make make
make clean make clean
cp -r ../lang ./ cp -r ../lang ./
cp -r ../config ./
./Proxmark3GUI ./Proxmark3GUI
*** ***
## 更新日志: ## 更新日志:
### V0.2.2
+ 从外部文件加载客户端命令格式
+ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)
+ 兼容冰人版客户端 v4.13441
### V0.2.1
+ 优化MIFARE Classic读卡逻辑
+ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) (配合新版RRG固件时无法读取扇区数据)
+ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) (路径中支持空格)
### V0.2 ### V0.2
+ 使用浮动窗口,界面配置更加灵活 + 使用浮动窗口,界面配置更加灵活
+ 支持部分低频命令 + 支持部分低频命令
+11 -5
View File
@@ -26,7 +26,7 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
currArgs = args; currArgs = args;
// using "-f" option to make the client output flushed after every print. // using "-f" option to make the client output flushed after every print.
start(path, args, QProcess::Unbuffered | QProcess::ReadWrite); start(path, args, QProcess::Unbuffered | QProcess::ReadWrite | QProcess::Text);
if(waitForStarted(10000)) if(waitForStarted(10000))
{ {
waitForReadyRead(10000); waitForReadyRead(10000);
@@ -36,11 +36,13 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{ {
clientType = Util::CLIENTTYPE_ICEMAN; clientType = Util::CLIENTTYPE_ICEMAN;
setRequiringOutput(true); setRequiringOutput(true);
write("hw version\r\n"); write("hw version\n");
for(int i = 0; i < 10; i++) for(int i = 0; i < 50; i++)
{ {
waitForReadyRead(200); waitForReadyRead(200);
result += *requiredOutput; result += *requiredOutput;
if(result.indexOf("os: ") != -1)
break;
} }
setRequiringOutput(false); setRequiringOutput(false);
} }
@@ -52,8 +54,8 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
{ {
emit changeClientType(clientType); emit changeClientType(clientType);
result = result.mid(result.indexOf("os: ")); result = result.mid(result.indexOf("os: "));
result = result.left(result.indexOf("\r\n")); result = result.left(result.indexOf("\n"));
result = result.mid(3, result.lastIndexOf(" ") - 3); result = result.mid(4, result.indexOf(" ", 4) - 4);
emit PM3StatedChanged(true, result); emit PM3StatedChanged(true, result);
} }
else else
@@ -105,6 +107,10 @@ void PM3Process::setSerialListener(bool state)
void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly terminated or the PM3 hardware is removed, the isBusy() will return false(only tested on Windows); void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly terminated or the PM3 hardware is removed, the isBusy() will return false(only tested on Windows);
{ {
// isBusy() is a deprecated function because it will block the serial port when the port is not in use.
// However, the PM3 client is supposed to use the target serial port exclusively, so it should be fine
// isBusy() will always return false on Raspbian, in this case, check "Keep the client active" in the Settings panel.
//
// qDebug()<<portInfo->isBusy(); // qDebug()<<portInfo->isBusy();
if(!portInfo->isBusy()) if(!portInfo->isBusy())
{ {
+3 -3
View File
@@ -31,10 +31,10 @@ void Util::execCMD(const QString& cmd)
{ {
qDebug() << "executing: " << cmd; qDebug() << "executing: " << cmd;
if(isRunning) if(isRunning)
emit write(cmd + "\r\n"); emit write(cmd + "\n");
} }
QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger) QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger, bool rawOutput)
{ {
// if the trigger is empty, this function will wait trigger.waitTime then return all outputs during the wait time. // if the trigger is empty, this function will wait trigger.waitTime then return all outputs during the wait time.
// otherwise, this function will return empty string if no trigger is detected, or return outputs if any trigger is detected. // otherwise, this function will return empty string if no trigger is detected, or return outputs if any trigger is detected.
@@ -78,7 +78,7 @@ QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger)
} }
} }
isRequiringOutput = false; isRequiringOutput = false;
return (isResultFound || trigger.expectedOutputs.isEmpty() ? *requiredOutput : ""); return (isResultFound || trigger.expectedOutputs.isEmpty() || rawOutput ? *requiredOutput : "");
} }
void Util::delay(unsigned int msec) void Util::delay(unsigned int msec)
+1 -1
View File
@@ -53,7 +53,7 @@ public:
explicit Util(QObject *parent = nullptr); explicit Util(QObject *parent = nullptr);
void execCMD(const QString& cmd); void execCMD(const QString& cmd);
QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000); QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000, bool rawOutput = false);
void delay(unsigned int msec); void delay(unsigned int msec);
static ClientType getClientType(); static ClientType getClientType();
static int rawTabIndex; static int rawTabIndex;
+195
View File
@@ -0,0 +1,195 @@
{
"//": "Based on Proxmark3 official repo v3.1.0, commit 6116334",
"//": "You can change this file if the command format of client changes",
"mifare classic": {
"nested": {
"cmd": "hf mf nested <card type> *",
"card type": {
"mini": "0",
"1k": "1",
"2k": "2",
"4k": "4"
},
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
"key A index": 2,
"key B index": 4
},
"check": {
"cmd": "hf mf chk *<card type> ?",
"card type": {
"mini": "0",
"1k": "1",
"2k": "2",
"4k": "4"
},
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
"key A index": 2,
"key B index": 3
},
"info": {
"cmd": "hf 14a info"
},
"sniff": {
"cmd": "hf mf sniff"
},
"sniff 14a": {
"cmd": "hf 14a snoop"
},
"list": {
"cmd": "hf list mf"
},
"dump": {
"cmd": "hf mf dump"
},
"restore": {
"cmd": "hf mf restore"
},
"emulator wipe": {
"cmd": "hf mf eclr"
},
"Magic Card wipe": {
"cmd": "hf mf cwipe <card type> f",
"card type": {
"mini": "0",
"1k": "1",
"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>"
},
"hardnested": {
"cmd": "hf mf hardnested <known key block> <known key type> <known key> <target key block> <target key type>",
"known key type": {
"A": "A",
"B": "B"
},
"target key type": {
"A": "A",
"B": "B"
}
},
"normal read sector": {
"cmd": "hf mf rdsc <sector> <key type> <key>",
"key type": {
"A": "A",
"B": "B"
},
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"Magic Card read sector": {
"cmd": "hf mf cgetsc <sector>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"//": "When writing a block, if the result is not empty and doesn't contain the failed flag, the function will return true",
"normal write block": {
"cmd": "hf mf wrbl <block> <key type> <key> <data>",
"key type": {
"A": "A",
"B": "B"
},
"failed flag": [
"isOk:00"
]
},
"Magic Card write block": {
"cmd": "hf mf csetblk <block> <data>",
"failed flag": [
"No chinese magic"
]
},
"emulator write block": {
"cmd": "hf mf eset <block> <data>"
},
"Magic Card lock": {
"cmd": "hf 14a raw ",
"sequence": [
"-pa -b7 40",
"-pa 43",
"-pa E0 00 39 F7",
"-pa E1 00 E1 EE",
"-pa 85 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 18 47",
"-a 52"
]
},
"Magic Card set parameter": {
"cmd": "hf mf csetuid <uid> <atqa> <sak>"
}
},
"lf": {
"read": {
"cmd": "lf read",
"show cmd": "data plot"
},
"sniff": {
"cmd": "lf snoop",
"show cmd": "data plot"
},
"search": {
"cmd": "lf search u"
},
"tune": {
"cmd": "hw tune l"
},
"get config": {
"cmd": "hw status",
"field start": "LF Sampling config:",
"field end": "USB Speed:",
"divisor": {
"flag": "divisor:",
"pattern": "\\d+"
},
"bits per sample": {
"flag": "bps:",
"pattern": "\\d+"
},
"decimation": {
"flag": "decimation:",
"pattern": "\\d+"
},
"averaging": {
"flag": "averaging:",
"pattern": "\\d+"
},
"trigger threshold": {
"flag": "trigger threshold:",
"pattern": "\\d+"
},
"samples to skip": {
"flag": "samples to skip:",
"pattern": "\\d+"
},
"//": "execute 'cmd' then find parameters between 'field stard' and 'field end'",
"//": "for each line, if the line doesn't have any flag, skip",
"//": "otherwise, delete characters before 'flag' and 'flag' itself, then use 'pattern' to get the parameter",
"//": "If 'replace' dict exists, replace all keys with respective values before getting parameters"
},
"set config": {
"cmd": "lf config q <divisor> b <bits per sample> d <decimation> a <averaging> t <trigger threshold> s <samples to skip>",
"divisor cmd": "hw setlfdivisor <divisor>"
}
}
}
+203
View File
@@ -0,0 +1,203 @@
{
"//": "Based on Proxmark3 rrg repo v4.13441, commit 35ddebc",
"//": "You can change this file if the command format of client changes",
"mifare classic": {
"nested": {
"cmd": "hf mf nested --<card type> --blk <block> -<key type> -k <key>",
"static cmd": "hf mf staticnested --<card type> --blk <block> -<key type> -k <key>",
"card type": {
"mini": "mini",
"1k": "1k",
"2k": "2k",
"4k": "4k"
},
"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
},
"check": {
"cmd": "hf mf chk --<card type>",
"card type": {
"mini": "mini",
"1k": "1k",
"2k": "2k",
"4k": "4k"
},
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
"key A index": 2,
"key B index": 4
},
"info": {
"cmd": "hf 14a info"
},
"sniff": {
"cmd": "hf sniff"
},
"sniff 14a": {
"cmd": "hf 14a sniff"
},
"list": {
"cmd": "trace list -t mf"
},
"dump": {
"cmd": "hf mf dump"
},
"restore": {
"cmd": "hf mf restore"
},
"emulator wipe": {
"cmd": "hf mf eclr"
},
"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"
},
"hardnested": {
"cmd": "hf mf hardnested --blk <known key block> -<known key type> -k <known key> --tblk <target key block> --t<target key type>",
"known key type": {
"A": "a",
"B": "b"
},
"target key type": {
"A": "a",
"B": "b"
}
},
"normal read sector": {
"cmd": "hf mf rdsc --sec <sector> -<key type> -k <key>",
"key type": {
"A": "a",
"B": "b"
},
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"Magic Card read sector": {
"cmd": "hf mf cgetsc --sec <sector>",
"data pattern": "([0-9a-fA-F]{2} ){15}[0-9a-fA-F]{2}"
},
"//": "When writing a block, if the result is not empty and doesn't contain the failed flag, the function will return true",
"normal write block": {
"cmd": "hf mf wrbl --blk <block> -<key type> -k <key> -d <data>",
"key type": {
"A": "a",
"B": "b"
},
"failed flag": [
"fail",
"error"
]
},
"Magic Card write block": {
"cmd": "hf mf csetblk --blk <block> -d <data>",
"failed flag": [
"fail",
"error"
]
},
"emulator write block": {
"cmd": "hf mf esetblk --blk <block> -d <data>"
},
"Magic Card lock": {
"cmd": "hf 14a raw ",
"sequence": [
"-ak -b 7 40",
"-ak 43",
"-ak E0 00 39 F7",
"-ak E1 00 E1 EE",
"-ak 85 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 18 47",
"-a 52"
]
},
"Magic Card set parameter": {
"cmd": "hf mf csetuid --uid <uid> --atqa <atqa> --sak <sak>"
}
},
"lf": {
"read": {
"cmd": "lf read -v",
"show cmd": "data plot"
},
"sniff": {
"cmd": "lf sniff -v",
"show cmd": "data plot"
},
"search": {
"cmd": "lf search -u"
},
"tune": {
"cmd": "lf tune --divisor <divisor>"
},
"get config": {
"cmd": "hw status",
"field start": "LF Sampling config",
"field end": "LF Sampling Stack",
"divisor": {
"flag": "divisor",
"pattern": "\\d+"
},
"bits per sample": {
"flag": "bits per sample",
"pattern": "\\d+"
},
"decimation": {
"flag": "decimation",
"pattern": "\\d+"
},
"averaging": {
"flag": "averaging",
"pattern": "\\d+",
"replace": {
"yes": "1",
"no": "0",
"Yes": "1",
"No": "0"
}
},
"trigger threshold": {
"flag": "trigger threshold",
"pattern": "\\d+"
},
"samples to skip": {
"flag": "samples to skip",
"pattern": "\\d+"
},
"//": "execute 'cmd' then find parameters between 'field stard' and 'field end'",
"//": "for each line, if the line doesn't have any flag, skip",
"//": "otherwise, delete characters before 'flag' and 'flag' itself, then use 'pattern' to get the parameter",
"//": "If 'replace' dict exists, replace all keys with respective values before getting parameters"
},
"set config": {
"cmd": "lf config --divisor <divisor> --bps <bits per sample> --dec <decimation> --avg <averaging> --trig <trigger threshold> --skip <samples to skip>",
"divisor cmd": "hw setlfdivisor -d <divisor>"
}
}
}
+443 -238
View File
File diff suppressed because it is too large Load Diff
BIN
View File
Binary file not shown.
+448 -249
View File
File diff suppressed because it is too large Load Diff
+5 -6
View File
@@ -5,11 +5,13 @@
#include <QTranslator> #include <QTranslator>
#include <QMessageBox> #include <QMessageBox>
#include <QTextCodec> #include <QTextCodec>
#include <QDir>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
QDir *langPath = new QDir();
QApplication a(argc, argv); QApplication a(argc, argv);
MainWindow w; MainWindow w;
@@ -29,14 +31,10 @@ int main(int argc, char *argv[])
else else
currLang = "en_US"; currLang = "en_US";
} }
currLang = "lang/" + currLang;
#ifdef Q_OS_WIN
currLang += ".qm"; currLang += ".qm";
#else langPath->cd("lang");
currLang += ".ts";;
#endif
QTranslator* translator = new QTranslator(&w); QTranslator* translator = new QTranslator(&w);
if(translator->load(currLang)) if(translator->load(currLang, langPath->absolutePath()))
{ {
a.installTranslator(translator); a.installTranslator(translator);
} }
@@ -45,6 +43,7 @@ int main(int argc, char *argv[])
QMessageBox::information(&w, "Error", "Can't load " + currLang + " as translation file."); QMessageBox::information(&w, "Error", "Can't load " + currLang + " as translation file.");
} }
delete settings; delete settings;
delete langPath;
w.initUI(); w.initUI();
w.show(); w.show();
return a.exec(); return a.exec();
+95 -108
View File
@@ -1,6 +1,7 @@
#include "lf.h" #include "lf.h"
#include <QJsonArray>
const LF::Config LF::defaultConfig; const LF::LFConfig LF::defaultLFConfig;
LF::LF(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent) LF::LF(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
{ {
@@ -8,142 +9,122 @@ LF::LF(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
util = addr; util = addr;
this->ui = ui; this->ui = ui;
configPattern = new QRegularExpression("(\\d+)|Yes|No"); LFconfigPattern = new QRegularExpression("(\\d+)|Yes|No");
currConfig = defaultConfig; currLFConfig = defaultLFConfig;
} }
void LF::read() void LF::read()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QVariantMap config = configMap["read"].toMap();
util->execCMD("lf read"); util->execCMD(config["cmd"].toString());
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
util->execCMD("lf read -v");
Util::gotoRawTab(); Util::gotoRawTab();
util->execCMD("data plot"); util->execCMD(config["show cmd"].toString());
} }
void LF::sniff() void LF::sniff()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QVariantMap config = configMap["sniff"].toMap();
util->execCMD("lf snoop"); util->execCMD(config["cmd"].toString());
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
util->execCMD("lf sniff -v");
Util::gotoRawTab(); Util::gotoRawTab();
util->execCMD("data plot"); util->execCMD(config["show cmd"].toString());
} }
void LF::search() void LF::search()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QVariantMap config = configMap["search"].toMap();
util->execCMD("lf search u"); util->execCMD(config["cmd"].toString());
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
util->execCMD("lf search -u");
Util::gotoRawTab(); Util::gotoRawTab();
} }
void LF::tune() void LF::tune()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QVariantMap config = configMap["tune"].toMap();
util->execCMD("hw tune l"); QString cmd = config["cmd"].toString();
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN) cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
util->execCMD("lf tune --divisor " + QString::number(currConfig.divisor)); util->execCMD(cmd);
Util::gotoRawTab(); Util::gotoRawTab();
} }
void LF::getConfig() bool LF::getLFConfig_helper(const QVariantMap& map, QString& str, int* result)
{ {
int len;
QString flag = map["flag"].toString();
QRegularExpressionMatch reMatch;
if(!str.contains(flag))
return false;
len = str.length() - (str.indexOf(flag) + flag.length());
str = str.right(len);
if(map.contains("replace"))
{
QVariantMap table = map["replace"].toMap();
for(auto it = table.begin(); it != table.end(); it++)
{
str.replace(it.key(), it.value().toString());
}
}
reMatch = QRegularExpression(map["pattern"].toString()).match(str);
if(!reMatch.hasMatch())
return false;
*result = reMatch.captured().toInt();
qDebug() << *result;
return true;
}
void LF::getLFConfig()
{
QRegularExpressionMatch reMatch; QRegularExpressionMatch reMatch;
QString result; QString result;
QStringList resultList; QStringList resultList;
QStringList symbolList = int start, end, temp;
QVariantMap config = configMap["get config"].toMap();
QString cmd = config["cmd"].toString();
result = util->execCMDWithOutput(cmd, 400);
start = result.indexOf(config["field start"].toString());
end = result.indexOf(config["field end"].toString());
result = result.mid(start, end - start);
resultList = result.split("\n", Qt::SkipEmptyParts);
qDebug() << "LF CONFIG GET\n" << resultList;
for(auto it = resultList.begin(); it != resultList.end(); it++)
{ {
"divisor", if(getLFConfig_helper(config["divisor"].toMap(), *it, &temp))
"bps", currLFConfig.divisor = temp;
"bits per sample", else if(getLFConfig_helper(config["bits per sample"].toMap(), *it, &temp))
"decimation", currLFConfig.bitsPerSample = temp;
"averaging", else if(getLFConfig_helper(config["decimation"].toMap(), *it, &temp))
"trigger threshold", currLFConfig.decimation = temp;
"samples to skip" else if(getLFConfig_helper(config["averaging"].toMap(), *it, &temp))
}; currLFConfig.averaging = (bool)temp;
int offset; else if(getLFConfig_helper(config["trigger threshold"].toMap(), *it, &temp))
QStringList configList = {"", "", "", "", "", "", ""}; currLFConfig.triggerThreshold = temp;
result = util->execCMDWithOutput("hw status", 400); // not all output from "hw status will be processed". else if(getLFConfig_helper(config["samples to skip"].toMap(), *it, &temp))
result = result.right(result.length() - result.indexOf("LF Sampling config")); currLFConfig.samplesToSkip = temp;
offset = result.indexOf("samples to skip");
offset = result.indexOf("\r\n", offset);
result = result.mid(0, offset + 2);
qDebug() << "LF CONFIG GET\n" << result;
resultList = result.split("\r\n");
for(int i = 0; i < resultList.length(); i++)
{
for(int j = 0; j < symbolList.length(); j++)
{
if(!configList[j].isEmpty())
continue;
offset = resultList[i].indexOf(symbolList[j]);
if(offset != -1)
{
reMatch = configPattern->match(resultList[i]);
qDebug() << "finded: " << resultList[i];
if(!reMatch.hasMatch())
continue;
qDebug() << "captured: " << reMatch.captured();
configList[j] = reMatch.captured();
break;
}
}
}
qDebug() << "configList: " << configList;
currConfig.divisor = configList[0].toUInt();
currConfig.decimation = configList[3].toUInt();
currConfig.triggerThreshold = configList[5].toUInt();
currConfig.samplesToSkip = configList[6].toUInt();
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL)
{
currConfig.bitPerSample = configList[1].toUInt();
currConfig.averaging = (configList[4] == "1");
}
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
{
currConfig.bitPerSample = configList[2].toUInt();
currConfig.averaging = (configList[4] == "Yes");
} }
syncWithUI(); syncWithUI();
} }
void LF::setConfig(LF::Config config) void LF::setLFConfig(LF::LFConfig lfconfig)
{ {
currConfig = config; currLFConfig = lfconfig;
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QVariantMap config = configMap["set config"].toMap();
{ QString cmd = config["cmd"].toString();
util->execCMDWithOutput(QString("lf config") cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
+ " q " + QString::number(currConfig.divisor) cmd.replace("<bits per sample>", QString::number(currLFConfig.bitsPerSample));
+ " b " + QString::number(currConfig.bitPerSample) cmd.replace("<decimation>", QString::number(currLFConfig.decimation));
+ " d " + QString::number(currConfig.decimation) cmd.replace("<averaging>", currLFConfig.averaging ? "1" : "0");
+ " a " + QString(currConfig.averaging ? "1" : "0") cmd.replace("<trigger threshold>", QString::number(currLFConfig.triggerThreshold));
+ " t " + QString::number(currConfig.triggerThreshold) cmd.replace("<samples to skip>", QString::number(currLFConfig.samplesToSkip));
+ " s " + QString::number(currConfig.samplesToSkip), util->execCMDWithOutput(cmd, 500);
500); cmd = config["divisor cmd"].toString();
util->execCMDWithOutput("hw setlfdivisor " + QString::number(currConfig.divisor), 500); cmd.replace("<divisor>", QString::number(currLFConfig.divisor));
} util->execCMDWithOutput(cmd, 500);
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN)
{
util->execCMDWithOutput(QString("lf config")
+ " -a " + QString(currConfig.averaging ? "1" : "0")
+ " -b " + QString::number(currConfig.bitPerSample)
+ " --dec " + QString::number(currConfig.decimation)
+ " --divisor " + QString::number(currConfig.divisor)
+ " -s " + QString::number(currConfig.samplesToSkip)
+ " -t " + QString::number(currConfig.triggerThreshold),
500);
util->execCMDWithOutput("hw setlfdivisor -d " + QString::number(currConfig.divisor), 500);
}
} }
void LF::resetConfig() void LF::resetLFConfig()
{ {
setConfig(defaultConfig); setLFConfig(defaultLFConfig);
getConfig(); getLFConfig();
} }
float LF::divisor2Freq(uint8_t divisor) float LF::divisor2Freq(uint8_t divisor)
@@ -158,10 +139,16 @@ uint8_t LF::freq2Divisor(float freq)
void LF::syncWithUI() void LF::syncWithUI()
{ {
ui->LF_Conf_freqDivisorBox->setValue(currConfig.divisor); // will trigger valueChanged() ui->LF_LFConf_freqDivisorBox->setValue(currLFConfig.divisor); // will trigger valueChanged()
ui->LF_Conf_bitPerSampleBox->setValue(currConfig.bitPerSample); ui->LF_LFConf_bitsPerSampleBox->setValue(currLFConfig.bitsPerSample);
ui->LF_Conf_decimationBox->setValue(currConfig.decimation); ui->LF_LFConf_decimationBox->setValue(currLFConfig.decimation);
ui->LF_Conf_averagingBox->setChecked(currConfig.averaging); ui->LF_LFConf_averagingBox->setChecked(currLFConfig.averaging);
ui->LF_Conf_thresholdBox->setValue(currConfig.triggerThreshold); ui->LF_LFConf_thresholdBox->setValue(currLFConfig.triggerThreshold);
ui->LF_Conf_skipsBox->setValue(currConfig.samplesToSkip); ui->LF_LFConf_skipsBox->setValue(currLFConfig.samplesToSkip);
}
void LF::setConfigMap(const QVariantMap& configMap)
{
this->configMap = configMap;
qDebug() << configMap;
} }
+11 -8
View File
@@ -12,17 +12,17 @@ class LF : public QObject
public: public:
explicit LF(Ui::MainWindow *ui, Util *addr, QWidget *parent = nullptr); explicit LF(Ui::MainWindow *ui, Util *addr, QWidget *parent = nullptr);
struct Config struct LFConfig
{ {
uint8_t divisor; uint8_t divisor;
uint8_t bitPerSample; uint8_t bitsPerSample;
uint8_t decimation; uint8_t decimation;
bool averaging; bool averaging;
uint8_t triggerThreshold; uint8_t triggerThreshold;
uint16_t samplesToSkip; uint16_t samplesToSkip;
}; };
static constexpr Config defaultConfig = static constexpr LFConfig defaultLFConfig =
{ {
95, 95,
8, 8,
@@ -36,19 +36,22 @@ public:
void sniff(); void sniff();
void search(); void search();
void tune(); void tune();
void getConfig(); void getLFConfig();
void setConfig(LF::Config config); void setLFConfig(LF::LFConfig lfconfig);
void resetConfig(); void resetLFConfig();
static float divisor2Freq(uint8_t divisor); static float divisor2Freq(uint8_t divisor);
static uint8_t freq2Divisor(float freq); static uint8_t freq2Divisor(float freq);
void setConfigMap(const QVariantMap &configMap);
private: private:
QWidget* parent; QWidget* parent;
Ui::MainWindow *ui; Ui::MainWindow *ui;
Util* util; Util* util;
Config currConfig; LFConfig currLFConfig;
QRegularExpression* configPattern; QRegularExpression* LFconfigPattern;
QVariantMap configMap;
void syncWithUI(); void syncWithUI();
bool getLFConfig_helper(const QVariantMap& map, QString& str, int* result);
signals: signals:
}; };
+433 -430
View File
File diff suppressed because it is too large Load Diff
+7 -2
View File
@@ -11,6 +11,7 @@
#include <QStringList> #include <QStringList>
#include <QRegularExpression> #include <QRegularExpression>
#include <QMessageBox> #include <QMessageBox>
#include <QJsonObject>
class Mifare : public QObject class Mifare : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -64,9 +65,9 @@ public:
static const AccessType trailerReadCondition[8][3]; static const AccessType trailerReadCondition[8][3];
static const AccessType trailerWriteCondition[8][3]; static const AccessType trailerWriteCondition[8][3];
QString info(bool isRequiringOutput = false); QMap<QString, QString> info(bool isRequiringOutput = false);
void chk(); void chk();
void nested(); void nested(bool isStaticNested = false);
void darkside(); void darkside();
void hardnested(); void hardnested();
void sniff(); void sniff();
@@ -112,6 +113,8 @@ public:
static int data_b2s(int block); static int data_b2s(int block);
static bool data_isACBitsValid(const QString& text, QList<quint8> *returnHalfBytes = nullptr); static bool data_isACBitsValid(const QString& text, QList<quint8> *returnHalfBytes = nullptr);
QString data_getUID(); QString data_getUID();
quint16 getTrailerBlockId(quint8 sectorId, qint8 cardTypeId = -1); // -1: use current cardtype
void setConfigMap(const QVariantMap& configMap);
public slots: public slots:
signals: signals:
@@ -120,6 +123,8 @@ private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
Util* util; Util* util;
QVariantMap configMap;
QStringList* keyAList; QStringList* keyAList;
QStringList* keyBList; QStringList* keyBList;
QStringList* dataList; QStringList* dataList;
+86 -46
View File
@@ -1,6 +1,8 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QJsonDocument>
MainWindow::MainWindow(QWidget *parent): MainWindow::MainWindow(QWidget *parent):
QMainWindow(parent) QMainWindow(parent)
, ui(new Ui::MainWindow) , ui(new Ui::MainWindow)
@@ -70,6 +72,22 @@ MainWindow::~MainWindow()
delete pm3Thread; delete pm3Thread;
} }
void MainWindow::loadConfig()
{
QFile configList(ui->Set_Client_configPathEdit->text());
if(!configList.open(QFile::ReadOnly | QFile::Text))
{
QMessageBox::information(this, tr("Info"), tr("Failed to load config file"));
return;
}
QByteArray configData = configList.readAll();
QJsonDocument configJson(QJsonDocument::fromJson(configData));
mifare->setConfigMap(configJson.object()["mifare classic"].toObject().toVariantMap());
lf->setConfigMap(configJson.object()["lf"].toObject().toVariantMap());
}
void MainWindow::initUI() // will be called by main.app void MainWindow::initUI() // will be called by main.app
{ {
ui->retranslateUi(this); ui->retranslateUi(this);
@@ -108,7 +126,7 @@ void MainWindow::on_PM3_connectButton_clicked()
// on RRG repo, if no port is specified, the client will search the available port // on RRG repo, if no port is specified, the client will search the available port
if(port == "" && startArgs.contains("<port>")) // has <port>, no port if(port == "" && startArgs.contains("<port>")) // has <port>, no port
{ {
QMessageBox::information(NULL, tr("Info"), tr("Plz choose a port first"), QMessageBox::Ok); QMessageBox::information(this, tr("Info"), tr("Plz choose a port first"), QMessageBox::Ok);
return; return;
} }
@@ -123,20 +141,32 @@ void MainWindow::on_PM3_connectButton_clicked()
if(envScriptPath.exists()) if(envScriptPath.exists())
{ {
qDebug() << envScriptPath.absoluteFilePath(); qDebug() << envScriptPath.absoluteFilePath();
// use the shell session to keep the environment then read it
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// cmd /c "<path>">>nul && set // cmd /c "<path>">>nul && set
envSetProcess.start("cmd /c \"" + envScriptPath.absoluteFilePath() + "\">>nul && set"); envSetProcess.start("cmd", {}, QProcess::Unbuffered | QProcess::ReadWrite | QProcess::Text);
envSetProcess.write(QString("\"" + envScriptPath.absoluteFilePath() + "\">>nul\n").toLatin1());
envSetProcess.waitForReadyRead(10000);
envSetProcess.readAll();
envSetProcess.write("set\n");
#else #else
// need implementation(or test if space works)
// sh -c '. "<path>">>/dev/null && env' // sh -c '. "<path>">>/dev/null && env'
envSetProcess.start("sh -c \' . \"" + envScriptPath.absoluteFilePath() + "\">>/dev/null && env"); envSetProcess.start("sh -c \' . \"" + envScriptPath.absoluteFilePath() + "\">>/dev/null && env");
#endif #endif
envSetProcess.waitForReadyRead(10000); envSetProcess.waitForReadyRead(10000);
clientEnv = QString(envSetProcess.readAll()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); QString envSetResult = QString(envSetProcess.readAll());
clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
{
clientEnv.removeFirst();
clientEnv.removeLast();
emit setProcEnv(&clientEnv);
}
// qDebug() << "Get Env List" << clientEnv; // qDebug() << "Get Env List" << clientEnv;
} }
else else
clientEnv.clear(); clientEnv.clear();
emit setProcEnv(&clientEnv);
clientWorkingDir->setPath(QApplication::applicationDirPath()); clientWorkingDir->setPath(QApplication::applicationDirPath());
qDebug() << clientWorkingDir->absolutePath(); qDebug() << clientWorkingDir->absolutePath();
@@ -146,13 +176,14 @@ void MainWindow::on_PM3_connectButton_clicked()
qDebug() << clientWorkingDir->absolutePath(); qDebug() << clientWorkingDir->absolutePath();
emit setWorkingDir(clientWorkingDir->absolutePath()); emit setWorkingDir(clientWorkingDir->absolutePath());
loadConfig();
emit connectPM3(ui->PM3_pathEdit->text(), args); emit connectPM3(ui->PM3_pathEdit->text(), args);
if(port != "" && !keepClientActive) if(port != "" && !keepClientActive)
emit setSerialListener(port, true); emit setSerialListener(port, true);
else if(!keepClientActive) else if(!keepClientActive)
emit setSerialListener(false); emit setSerialListener(false);
envSetProcess.kill();
} }
void MainWindow::onPM3StateChanged(bool st, const QString& info) void MainWindow::onPM3StateChanged(bool st, const QString& info)
@@ -842,15 +873,16 @@ void MainWindow::on_MF_Sniff_loadButton_clicked() // use a tmp file to support c
QString filename = ""; QString filename = "";
title = tr("Plz select the trace file:"); 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; qDebug() << filename;
if(filename != "") if(filename != "")
{ {
QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc"; 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); mifare->loadSniff(tmpFile);
QFile::remove("./" + tmpFile); util->delay(3000);
QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
} }
else else
{ {
@@ -865,17 +897,23 @@ void MainWindow::on_MF_Sniff_saveButton_clicked()
QString filename = ""; QString filename = "";
title = tr("Plz select the location to save trace file:"); 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; qDebug() << filename;
if(filename != "") if(filename != "")
{ {
QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc"; QString tmpFile = "tmp" + QString::number(QDateTime::currentDateTime().toTime_t()) + ".trc";
mifare->saveSniff(tmpFile); 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); QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
} }
QFile::remove("./" + tmpFile); QFile::remove(clientWorkingDir->absolutePath() + "/" + tmpFile);
} }
} }
@@ -967,17 +1005,9 @@ void MainWindow::uiInit()
ui->statusbar->addPermanentWidget(programStatusBar, 1); ui->statusbar->addPermanentWidget(programStatusBar, 1);
ui->statusbar->addPermanentWidget(stopButton); ui->statusbar->addPermanentWidget(stopButton);
ui->MF_dataWidget->setColumnCount(3);
ui->MF_dataWidget->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Sec")));
ui->MF_dataWidget->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Blk")));
ui->MF_dataWidget->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Data")));
ui->MF_dataWidget->setColumnWidth(0, 55); ui->MF_dataWidget->setColumnWidth(0, 55);
ui->MF_dataWidget->setColumnWidth(1, 55); ui->MF_dataWidget->setColumnWidth(1, 55);
ui->MF_keyWidget->setColumnCount(3);
ui->MF_keyWidget->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Sec")));
ui->MF_keyWidget->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("KeyA")));
ui->MF_keyWidget->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("KeyB")));
ui->MF_keyWidget->setColumnWidth(0, 45); ui->MF_keyWidget->setColumnWidth(0, 45);
MF_widgetReset(); MF_widgetReset();
@@ -1034,6 +1064,7 @@ void MainWindow::uiInit()
settings->beginGroup("Client_Env"); settings->beginGroup("Client_Env");
ui->Set_Client_envScriptEdit->setText(settings->value("scriptPath").toString()); ui->Set_Client_envScriptEdit->setText(settings->value("scriptPath").toString());
ui->Set_Client_workingDirEdit->setText(settings->value("workingDir", "../data").toString()); ui->Set_Client_workingDirEdit->setText(settings->value("workingDir", "../data").toString());
ui->Set_Client_configPathEdit->setText(settings->value("configPath", "config.json").toString());
settings->endGroup(); settings->endGroup();
ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A); ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A);
@@ -1152,7 +1183,7 @@ void MainWindow::setButtonsEnabled(bool st)
ui->MF_sniffGroupBox->setEnabled(st); ui->MF_sniffGroupBox->setEnabled(st);
ui->Raw_CMDEdit->setEnabled(st); ui->Raw_CMDEdit->setEnabled(st);
ui->Raw_sendCMDButton->setEnabled(st); ui->Raw_sendCMDButton->setEnabled(st);
ui->LF_configGroupBox->setEnabled(st); ui->LF_LFconfigGroupBox->setEnabled(st);
ui->LF_operationGroupBox->setEnabled(st); ui->LF_operationGroupBox->setEnabled(st);
} }
@@ -1225,13 +1256,21 @@ void MainWindow::on_Set_Client_envScriptEdit_editingFinished()
settings->endGroup(); settings->endGroup();
} }
void MainWindow::on_Set_Client_saveWorkingDirButton_clicked() void MainWindow::on_Set_Client_workingDirEdit_editingFinished()
{ {
settings->beginGroup("Client_Env"); settings->beginGroup("Client_Env");
settings->setValue("workingDir", ui->Set_Client_workingDirEdit->text()); settings->setValue("workingDir", ui->Set_Client_workingDirEdit->text());
settings->endGroup(); settings->endGroup();
} }
void MainWindow::on_Set_Client_configPathEdit_editingFinished()
{
settings->beginGroup("Client_Env");
settings->setValue("configPath", ui->Set_Client_configPathEdit->text());
settings->endGroup();
}
void MainWindow::on_Set_Client_keepClientActiveBox_stateChanged(int arg1) void MainWindow::on_Set_Client_keepClientActiveBox_stateChanged(int arg1)
{ {
settings->beginGroup("Client_keepClientActive"); settings->beginGroup("Client_keepClientActive");
@@ -1241,37 +1280,37 @@ void MainWindow::on_Set_Client_keepClientActiveBox_stateChanged(int arg1)
emit setSerialListener(!keepClientActive); emit setSerialListener(!keepClientActive);
} }
void MainWindow::on_LF_Conf_freqSlider_valueChanged(int value) void MainWindow::on_LF_LFConf_freqSlider_valueChanged(int value)
{ {
onLFfreqConfChanged(value, true); onLFfreqConfChanged(value, true);
} }
void MainWindow::onLFfreqConfChanged(int value, bool isCustomized) void MainWindow::onLFfreqConfChanged(int value, bool isCustomized)
{ {
ui->LF_Conf_freqDivisorBox->blockSignals(true); ui->LF_LFConf_freqDivisorBox->blockSignals(true);
ui->LF_Conf_freqSlider->blockSignals(true); ui->LF_LFConf_freqSlider->blockSignals(true);
if(isCustomized) if(isCustomized)
ui->LF_Conf_freqOtherButton->setChecked(true); ui->LF_LFConf_freqOtherButton->setChecked(true);
ui->LF_Conf_freqLabel->setText(tr("Actural Freq: ") + QString("%1kHz").arg(LF::divisor2Freq(value), 0, 'f', 3)); ui->LF_LFConf_freqLabel->setText(tr("Actural Freq: ") + QString("%1kHz").arg(LF::divisor2Freq(value), 0, 'f', 3));
ui->LF_Conf_freqDivisorBox->setValue(value); ui->LF_LFConf_freqDivisorBox->setValue(value);
ui->LF_Conf_freqSlider->setValue(value); ui->LF_LFConf_freqSlider->setValue(value);
ui->LF_Conf_freqDivisorBox->blockSignals(false); ui->LF_LFConf_freqDivisorBox->blockSignals(false);
ui->LF_Conf_freqSlider->blockSignals(false); ui->LF_LFConf_freqSlider->blockSignals(false);
} }
void MainWindow::on_LF_Conf_freqDivisorBox_valueChanged(int arg1) void MainWindow::on_LF_LFConf_freqDivisorBox_valueChanged(int arg1)
{ {
onLFfreqConfChanged(arg1, true); onLFfreqConfChanged(arg1, true);
} }
void MainWindow::on_LF_Conf_freq125kButton_clicked() void MainWindow::on_LF_LFConf_freq125kButton_clicked()
{ {
onLFfreqConfChanged(95, false); onLFfreqConfChanged(95, false);
} }
void MainWindow::on_LF_Conf_freq134kButton_clicked() void MainWindow::on_LF_LFConf_freq134kButton_clicked()
{ {
onLFfreqConfChanged(88, false); onLFfreqConfChanged(88, false);
} }
@@ -1337,31 +1376,32 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
contextMenu->exec(event->globalPos()); contextMenu->exec(event->globalPos());
} }
void MainWindow::on_LF_Conf_getButton_clicked() void MainWindow::on_LF_LFConf_getButton_clicked()
{ {
setState(false); setState(false);
lf->getConfig(); lf->getLFConfig();
setState(true); setState(true);
} }
void MainWindow::on_LF_Conf_setButton_clicked() void MainWindow::on_LF_LFConf_setButton_clicked()
{ {
LF::Config config; LF::LFConfig config;
setState(false); setState(false);
config.divisor = ui->LF_Conf_freqDivisorBox->value(); config.divisor = ui->LF_LFConf_freqDivisorBox->value();
config.bitPerSample = ui->LF_Conf_bitPerSampleBox->value(); config.bitsPerSample = ui->LF_LFConf_bitsPerSampleBox->value();
config.decimation = ui->LF_Conf_decimationBox->value(); config.decimation = ui->LF_LFConf_decimationBox->value();
config.averaging = ui->LF_Conf_averagingBox->isChecked(); config.averaging = ui->LF_LFConf_averagingBox->isChecked();
config.triggerThreshold = ui->LF_Conf_thresholdBox->value(); config.triggerThreshold = ui->LF_LFConf_thresholdBox->value();
config.samplesToSkip = ui->LF_Conf_skipsBox->value(); config.samplesToSkip = ui->LF_LFConf_skipsBox->value();
lf->setConfig(config); lf->setLFConfig(config);
Util::gotoRawTab(); Util::gotoRawTab();
setState(true); setState(true);
} }
void MainWindow::on_LF_Conf_resetButton_clicked() void MainWindow::on_LF_LFConf_resetButton_clicked()
{ {
setState(false); setState(false);
lf->resetConfig(); lf->resetLFConfig();
setState(true); setState(true);
} }
+12 -9
View File
@@ -177,17 +177,15 @@ private slots:
void on_Set_Client_envScriptEdit_editingFinished(); void on_Set_Client_envScriptEdit_editingFinished();
void on_Set_Client_saveWorkingDirButton_clicked();
void on_Set_Client_keepClientActiveBox_stateChanged(int arg1); void on_Set_Client_keepClientActiveBox_stateChanged(int arg1);
void on_LF_Conf_freqSlider_valueChanged(int value); void on_LF_LFConf_freqSlider_valueChanged(int value);
void on_LF_Conf_freqDivisorBox_valueChanged(int arg1); void on_LF_LFConf_freqDivisorBox_valueChanged(int arg1);
void on_LF_Conf_freq125kButton_clicked(); void on_LF_LFConf_freq125kButton_clicked();
void on_LF_Conf_freq134kButton_clicked(); void on_LF_LFConf_freq134kButton_clicked();
void on_LF_Op_searchButton_clicked(); void on_LF_Op_searchButton_clicked();
@@ -197,11 +195,15 @@ private slots:
void on_LF_Op_sniffButton_clicked(); void on_LF_Op_sniffButton_clicked();
void on_LF_Conf_getButton_clicked(); void on_LF_LFConf_getButton_clicked();
void on_LF_Conf_setButton_clicked(); void on_LF_LFConf_setButton_clicked();
void on_LF_Conf_resetButton_clicked(); void on_LF_LFConf_resetButton_clicked();
void on_Set_Client_workingDirEdit_editingFinished();
void on_Set_Client_configPathEdit_editingFinished();
private: private:
Ui::MainWindow* ui; Ui::MainWindow* ui;
@@ -249,6 +251,7 @@ private:
void saveClientPath(const QString& path); void saveClientPath(const QString& path);
void onLFfreqConfChanged(int value, bool isCustomized); void onLFfreqConfChanged(int value, bool isCustomized);
void dockInit(); void dockInit();
void loadConfig();
protected: protected:
void contextMenuEvent(QContextMenuEvent *event) override; void contextMenuEvent(QContextMenuEvent *event) override;
signals: signals:
+725 -54
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1050</width> <width>1050</width>
<height>700</height> <height>750</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -198,6 +198,21 @@
<attribute name="verticalHeaderDefaultSectionSize"> <attribute name="verticalHeaderDefaultSectionSize">
<number>20</number> <number>20</number>
</attribute> </attribute>
<column>
<property name="text">
<string>Sec</string>
</property>
</column>
<column>
<property name="text">
<string>Blk</string>
</property>
</column>
<column>
<property name="text">
<string>Data</string>
</property>
</column>
</widget> </widget>
</item> </item>
<item> <item>
@@ -360,6 +375,21 @@
<attribute name="verticalHeaderDefaultSectionSize"> <attribute name="verticalHeaderDefaultSectionSize">
<number>20</number> <number>20</number>
</attribute> </attribute>
<column>
<property name="text">
<string>Sec</string>
</property>
</column>
<column>
<property name="text">
<string>KeyA</string>
</property>
</column>
<column>
<property name="text">
<string>KeyB</string>
</property>
</column>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -1217,7 +1247,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_14"> <layout class="QVBoxLayout" name="verticalLayout_14">
<item> <item>
<widget class="QGroupBox" name="LF_configGroupBox"> <widget class="QGroupBox" name="LF_LFconfigGroupBox">
<property name="title"> <property name="title">
<string>LF Config</string> <string>LF Config</string>
</property> </property>
@@ -1238,7 +1268,7 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="LF_Conf_freqGroupBox"> <widget class="QGroupBox" name="LF_LFConf_freqGroupBox">
<property name="title"> <property name="title">
<string>Frequency</string> <string>Frequency</string>
</property> </property>
@@ -1261,7 +1291,7 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_13"> <layout class="QHBoxLayout" name="horizontalLayout_13">
<item> <item>
<widget class="QRadioButton" name="LF_Conf_freq125kButton"> <widget class="QRadioButton" name="LF_LFConf_freq125kButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -1277,7 +1307,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="LF_Conf_freq134kButton"> <widget class="QRadioButton" name="LF_LFConf_freq134kButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -1290,7 +1320,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="LF_Conf_freqOtherButton"> <widget class="QRadioButton" name="LF_LFConf_freqOtherButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -1310,7 +1340,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSpinBox" name="LF_Conf_freqDivisorBox"> <widget class="QSpinBox" name="LF_LFConf_freqDivisorBox">
<property name="minimum"> <property name="minimum">
<number>19</number> <number>19</number>
</property> </property>
@@ -1323,7 +1353,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="LF_Conf_freqLabel"> <widget class="QLabel" name="LF_LFConf_freqLabel">
<property name="text"> <property name="text">
<string>Actural Freq: 125.000kHz</string> <string>Actural Freq: 125.000kHz</string>
</property> </property>
@@ -1345,7 +1375,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QSlider" name="LF_Conf_freqSlider"> <widget class="QSlider" name="LF_LFConf_freqSlider">
<property name="minimum"> <property name="minimum">
<number>19</number> <number>19</number>
</property> </property>
@@ -1363,8 +1393,7 @@
<item> <item>
<widget class="QLabel" name="label_22"> <widget class="QLabel" name="label_22">
<property name="text"> <property name="text">
<string>Note: <string>You might need a modified LF antenna if the freq is not 125k/134k.
You might need a modified LF antenna if the freq is not 125k/134k.
When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</string> When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
@@ -1395,7 +1424,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Bit per sample:</string> <string>Bits per sample:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -1407,7 +1436,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="LF_Conf_decimationBox"> <widget class="QSpinBox" name="LF_LFConf_decimationBox">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -1424,7 +1453,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="LF_Conf_averagingBox"> <widget class="QCheckBox" name="LF_LFConf_averagingBox">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@@ -1438,7 +1467,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="LF_Conf_thresholdBox"> <widget class="QSpinBox" name="LF_LFConf_thresholdBox">
<property name="maximum"> <property name="maximum">
<number>128</number> <number>128</number>
</property> </property>
@@ -1452,14 +1481,14 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QSpinBox" name="LF_Conf_skipsBox"> <widget class="QSpinBox" name="LF_LFConf_skipsBox">
<property name="maximum"> <property name="maximum">
<number>65535</number> <number>65535</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="LF_Conf_bitPerSampleBox"> <widget class="QSpinBox" name="LF_LFConf_bitsPerSampleBox">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -1504,7 +1533,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="LF_Conf_getButton"> <widget class="QPushButton" name="LF_LFConf_getButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -1523,7 +1552,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="LF_Conf_setButton"> <widget class="QPushButton" name="LF_LFConf_setButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -1542,7 +1571,7 @@ When setting the freq, the &quot;hw setlfdivisor&quot; will also be called.</str
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="LF_Conf_resetButton"> <widget class="QPushButton" name="LF_LFConf_resetButton">
<property name="text"> <property name="text">
<string>Reset</string> <string>Reset</string>
</property> </property>
@@ -1853,15 +1882,640 @@ or the communication between a tag and a reader.</string>
<attribute name="title"> <attribute name="title">
<string>T55xx</string> <string>T55xx</string>
</attribute> </attribute>
<widget class="QTableWidget" name="T55_dataWidget"> <widget class="QGroupBox" name="groupBox">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>360</x>
<y>10</y> <y>20</y>
<width>256</width> <width>281</width>
<height>192</height> <height>511</height>
</rect> </rect>
</property> </property>
<property name="title">
<string>Basic Configuration(Page 0 Block 0)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
<property name="leftMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<item>
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_43">
<property name="text">
<string>Hex:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_44">
<property name="text">
<string>Bin:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>4</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_23">
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Get from Data</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Set to Data</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<property name="horizontalSpacing">
<number>5</number>
</property>
<property name="verticalSpacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Locked:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Master Key:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_30">
<property name="text">
<string>Data Bit Rate:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>eXtended Mode:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Modulation:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>PSK Clock Freq:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Answer on Request:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="checkBox_2"/>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBox_2"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>One Time Pad:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_36">
<property name="text">
<string>Max Block:</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_37">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
<string>Seq. Terminator:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_39">
<property name="text">
<string>Seq. Start Marker:</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_40">
<property name="text">
<string>Fast Downlink:</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_41">
<property name="text">
<string>Inverse Data:</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_42">
<property name="text">
<string>Init-Delay:</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QCheckBox" name="checkBox_3"/>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="checkBox_4"/>
</item>
<item row="12" column="1">
<widget class="QCheckBox" name="checkBox_5"/>
</item>
<item row="11" column="1">
<widget class="QCheckBox" name="checkBox_6"/>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="checkBox_7"/>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="checkBox_8"/>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBox"/>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="comboBox_3"/>
</item>
<item row="6" column="1">
<widget class="QCheckBox" name="checkBox_9"/>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="checkBox_10"/>
</item>
<item row="8" column="1">
<widget class="QSpinBox" name="spinBox_2"/>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox_3">
<property name="geometry">
<rect>
<x>670</x>
<y>20</y>
<width>311</width>
<height>511</height>
</rect>
</property>
<property name="title">
<string>Analog Front-End Option(Page 1 Block 3)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
<property name="leftMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<item>
<layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="label_45">
<property name="text">
<string>Hex:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_46">
<property name="text">
<string>Bin:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>4</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<spacer name="horizontalSpacer_16">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Get from Data</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="text">
<string>Set to Data</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_6">
<property name="rowWrapPolicy">
<enum>QFormLayout::WrapLongRows</enum>
</property>
<property name="horizontalSpacing">
<number>5</number>
</property>
<property name="verticalSpacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_47">
<property name="text">
<string>Locked:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_11"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_48">
<property name="text">
<string>Option Key:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBox_3"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>Soft Modulation:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_4"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_50">
<property name="text">
<string>Clamp Voltage:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_7"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_51">
<property name="text">
<string>Modulation Voltage:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBox_5"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_52">
<property name="text">
<string>Clock Detection Threshold:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="comboBox_6"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_53">
<property name="text">
<string>Gap Detection Threshold:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QComboBox" name="comboBox_8"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_54">
<property name="text">
<string>Write Dampling:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_55">
<property name="text">
<string>Demod Delay:</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_56">
<property name="text">
<string>Downlink Protocol:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QComboBox" name="comboBox_9"/>
</item>
<item row="8" column="1">
<widget class="QComboBox" name="comboBox_10"/>
</item>
<item row="9" column="1">
<widget class="QComboBox" name="comboBox_11"/>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_11">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>50</x>
<y>150</y>
<width>221</width>
<height>201</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
<item>
<widget class="QLabel" name="label_57">
<property name="text">
<string>Data:</string>
</property>
</widget>
</item>
<item>
<widget class="QTableWidget" name="T55_dataWidget"/>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox_4">
<property name="geometry">
<rect>
<x>50</x>
<y>370</y>
<width>194</width>
<height>231</height>
</rect>
</property>
<property name="title">
<string>T55xx Read Config</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_20">
<item>
<layout class="QFormLayout" name="formLayout_7">
<item row="0" column="0">
<widget class="QLabel" name="label_58">
<property name="text">
<string>Modulation:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_59">
<property name="text">
<string>Bit Rate:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_60">
<property name="text">
<string>Seq. Term.</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_61">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_62">
<property name="text">
<string>Inverted:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_12"/>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_13"/>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox_12">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="spinBox_4"/>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="checkBox_13">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_28">
<item>
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>T5577</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2">
<property name="text">
<string>T5555</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_12">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="rawTab"> <widget class="QWidget" name="rawTab">
@@ -1995,7 +2649,7 @@ or the communication between a tag and a reader.</string>
<item> <item>
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Preload script path:</string> <string>Preload script path(Reconnect to apply):</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -2009,9 +2663,7 @@ or the communication between a tag and a reader.</string>
<item> <item>
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
<string>Note: <string>If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them, then put the path of the script there.</string>
If the client requires some enviroment variables, you can make a script file(*.bat on Windows or *.sh on Linux) to configure them,
then put the path of the script there</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@@ -2028,33 +2680,21 @@ then put the path of the script there</string>
<item> <item>
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="text"> <property name="text">
<string>Client working directory:</string> <string>Client working directory(Reconnect to apply):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_15"> <widget class="QLineEdit" name="Set_Client_workingDirEdit">
<item> <property name="text">
<widget class="QLineEdit" name="Set_Client_workingDirEdit"> <string>../data</string>
<property name="text"> </property>
<string>../data</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="Set_Client_saveWorkingDirButton">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_20"> <widget class="QLabel" name="label_20">
<property name="text"> <property name="text">
<string>Note: <string>On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file.</string>
On Windows, the client working directory should not be identical to the path of GUI, otherwise the client will use the wrong .dll file.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@@ -2071,7 +2711,7 @@ On Windows, the client working directory should not be identical to the path of
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>Start arguments</string> <string>Start arguments(Reconnect to apply):</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -2085,10 +2725,7 @@ On Windows, the client working directory should not be identical to the path of
<item> <item>
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>Note: <string>-f is necessary because the GUI need to handle the output in time. In some cases, the arguments should be set to &quot;-p /dev/&lt;port&gt; -f&quot; or &quot;-p &lt;port&gt; -f&quot;.</string>
-f is necessary because the GUI need to handle the output in time
In some cases the arguments should be set to &quot;-p /dev/&lt;port&gt; -f&quot;
or &quot;-p &lt;port&gt; -f&quot;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@@ -2102,6 +2739,37 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_63">
<property name="text">
<string>Config file path(Reconnect to apply):</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="Set_Client_configPathEdit">
<property name="text">
<string>config.json</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_64">
<property name="text">
<string>Different clients require different config files. You can change the content of config file if the command format changes.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_16"> <layout class="QHBoxLayout" name="horizontalLayout_16">
<item> <item>
@@ -2178,7 +2846,7 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Keep te client active even the PM3 hardware is disconnected.(Experimental)</string> <string>Keep the client active even the PM3 hardware is disconnected.(Experimental)</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@@ -2257,6 +2925,9 @@ or &quot;-p &lt;port&gt; -f&quot;</string>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
+11 -25
View File
@@ -1,16 +1,17 @@
#include "mf_attack_hardnesteddialog.h" #include "mf_attack_hardnesteddialog.h"
#include "ui_mf_attack_hardnesteddialog.h" #include "ui_mf_attack_hardnesteddialog.h"
MF_Attack_hardnestedDialog::MF_Attack_hardnestedDialog(int blocks, QWidget *parent) : MF_Attack_hardnestedDialog::MF_Attack_hardnestedDialog(int blocks, const QVariantMap& config, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::MF_Attack_hardnestedDialog) ui(new Ui::MF_Attack_hardnestedDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
for(int i = 0; i < blocks; i++) for(int i = 0; i < blocks; i++)
{ {
ui->knownKeySectorBox->addItem(QString::number(i)); ui->knownKeyBlockBox->addItem(QString::number(i));
ui->targetKeySectorBox->addItem(QString::number(i)); ui->targetKeyBlockBox->addItem(QString::number(i));
} }
this->config = config;
} }
@@ -21,26 +22,11 @@ MF_Attack_hardnestedDialog::~MF_Attack_hardnestedDialog()
void MF_Attack_hardnestedDialog::on_buttonBox_accepted() void MF_Attack_hardnestedDialog::on_buttonBox_accepted()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QString cmd = config["cmd"].toString();
emit sendCMD("hf mf hardnested " cmd.replace("<known key block>", ui->knownKeyBlockBox->currentText());
+ ui->knownKeySectorBox->currentText() cmd.replace("<known key type>", config["known key type"].toMap()[ui->knownKeyTypeBox->currentText()].toString());
+ " " cmd.replace("<known key>", ui->knownKeyBox->text());
+ ui->knownKeyTypeBox->currentText() cmd.replace("<target key block>", ui->targetKeyBlockBox->currentText());
+ " " cmd.replace("<target key type>", config["target key type"].toMap()[ui->targetKeyTypeBox->currentText()].toString());
+ ui->knownKeyBox->text() emit sendCMD(cmd);
+ " "
+ ui->targetKeySectorBox->currentText()
+ " "
+ ui->targetKeyTypeBox->currentText());
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN) // same format in v4.9237
emit sendCMD("hf mf hardnested "
+ ui->knownKeySectorBox->currentText()
+ " "
+ ui->knownKeyTypeBox->currentText()
+ " "
+ ui->knownKeyBox->text()
+ " "
+ ui->targetKeySectorBox->currentText()
+ " "
+ ui->targetKeyTypeBox->currentText());
} }
+2 -1
View File
@@ -14,12 +14,13 @@ class MF_Attack_hardnestedDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit MF_Attack_hardnestedDialog(int blocks, QWidget *parent = nullptr); explicit MF_Attack_hardnestedDialog(int blocks, const QVariantMap& config, QWidget *parent = nullptr);
~MF_Attack_hardnestedDialog(); ~MF_Attack_hardnestedDialog();
private: private:
Ui::MF_Attack_hardnestedDialog *ui; Ui::MF_Attack_hardnestedDialog *ui;
QVariantMap config;
signals: signals:
void sendCMD(const QString& cmd); void sendCMD(const QString& cmd);
private slots: private slots:
+2 -2
View File
@@ -31,7 +31,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="knownKeySectorBox"> <widget class="QComboBox" name="knownKeyBlockBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
@@ -106,7 +106,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="targetKeySectorBox"> <widget class="QComboBox" name="targetKeyBlockBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
+7 -15
View File
@@ -1,7 +1,7 @@
#include "mf_uid_parameterdialog.h" #include "mf_uid_parameterdialog.h"
#include "ui_mf_uid_parameterdialog.h" #include "ui_mf_uid_parameterdialog.h"
MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, QWidget *parent) : MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, const QVariantMap& config, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::MF_UID_parameterDialog) ui(new Ui::MF_UID_parameterDialog)
{ {
@@ -9,6 +9,7 @@ MF_UID_parameterDialog::MF_UID_parameterDialog(const QString& uid, const QString
ui->UIDLineEdit->setText(uid); ui->UIDLineEdit->setText(uid);
ui->ATQALineEdit->setText(atqa); ui->ATQALineEdit->setText(atqa);
ui->SAKLineEdit->setText(sak); ui->SAKLineEdit->setText(sak);
this->config = config;
} }
MF_UID_parameterDialog::~MF_UID_parameterDialog() MF_UID_parameterDialog::~MF_UID_parameterDialog()
@@ -18,18 +19,9 @@ MF_UID_parameterDialog::~MF_UID_parameterDialog()
void MF_UID_parameterDialog::on_buttonBox_accepted() void MF_UID_parameterDialog::on_buttonBox_accepted()
{ {
if(Util::getClientType() == Util::CLIENTTYPE_OFFICIAL) QString cmd = config["cmd"].toString();
emit sendCMD("hf mf csetuid " cmd.replace("<uid>", ui->UIDLineEdit->text());
+ ui->UIDLineEdit->text() cmd.replace("<atqa>", ui->ATQALineEdit->text());
+ " " cmd.replace("<sak>", ui->SAKLineEdit->text());
+ ui->ATQALineEdit->text() emit sendCMD(cmd);
+ " "
+ ui->SAKLineEdit->text());
else if(Util::getClientType() == Util::CLIENTTYPE_ICEMAN) // same format in v4.9237
emit sendCMD("hf mf csetuid "
+ ui->UIDLineEdit->text()
+ " "
+ ui->ATQALineEdit->text()
+ " "
+ ui->SAKLineEdit->text());
} }
+2 -1
View File
@@ -14,11 +14,12 @@ class MF_UID_parameterDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, QWidget *parent = nullptr); explicit MF_UID_parameterDialog(const QString& uid, const QString& atqa, const QString& sak, const QVariantMap& config, QWidget *parent = nullptr);
~MF_UID_parameterDialog(); ~MF_UID_parameterDialog();
private: private:
Ui::MF_UID_parameterDialog *ui; Ui::MF_UID_parameterDialog *ui;
QVariantMap config;
signals: signals:
void sendCMD(const QString& cmd); void sendCMD(const QString& cmd);
private slots: private slots: