Refactor(nothing changed actually)

common/pm3process.cpp

@@ -4,14 +4,14 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
 {
     moveToThread(thread);
     setProcessChannelMode(PM3Process::MergedChannels);
-    isRequiringOutput=false;
+    isRequiringOutput = false;
-    requiredOutput=new QString();
+    requiredOutput = new QString();
-    serialListener=new QTimer(); // if using new QTimer(this), the debug output will show "Cannot create children for a parent that is in a different thread."
+    serialListener = new QTimer(); // if using new QTimer(this), the debug output will show "Cannot create children for a parent that is in a different thread."
     serialListener->moveToThread(this->thread());// I've tried many ways to creat a QTimer instance, but all of the instances are in the main thread(UI thread), so I have to move it manually
     serialListener->setInterval(1000);
     serialListener->setTimerType(Qt::VeryCoarseTimer);
-    connect(serialListener,&QTimer::timeout,this,&PM3Process::onTimeout);
+    connect(serialListener, &QTimer::timeout, this, &PM3Process::onTimeout);
-    connect(this,&PM3Process::readyRead,this,&PM3Process::onReadyRead);
+    connect(this, &PM3Process::readyRead, this, &PM3Process::onReadyRead);
 }
 
 void PM3Process::connectPM3(const QString path, const QString port)
@@ -19,20 +19,20 @@ void PM3Process::connectPM3(const QString path, const QString port)
     setRequiringOutput(true);
 
     // using "-f" option to make the client output flushed after every print.
-    start(path, QStringList()<<port<<"-f",QProcess::Unbuffered|QProcess::ReadWrite);
+    start(path, QStringList() << port << "-f", QProcess::Unbuffered | QProcess::ReadWrite);
     if(waitForStarted(10000))
     {
         while(waitForReadyRead(1000))
             ;
         setRequiringOutput(false);
         QString result = *requiredOutput;
-        if(result.indexOf("os: ")!=-1)// make sure the PM3 is connected
+        if(result.indexOf("os: ") != -1) // make sure the PM3 is connected
         {
             result = result.mid(result.indexOf("os: "));
             result = result.left(result.indexOf("\r\n"));
             result = result.mid(3, result.lastIndexOf(" ") - 3);
-            emit PM3StatedChanged(true,result);
+            emit PM3StatedChanged(true, result);
-            setSerialListener(port,true);
+            setSerialListener(port, true);
         }
         else
             kill();
@@ -41,7 +41,7 @@ void PM3Process::connectPM3(const QString path, const QString port)
 
 void PM3Process::setRequiringOutput(bool st)
 {
-    isRequiringOutput=st;
+    isRequiringOutput = st;
     if(isRequiringOutput)
         requiredOutput->clear();
 }
@@ -51,13 +51,13 @@ bool PM3Process::waitForReadyRead(int msecs)
     return QProcess::waitForReadyRead(msecs);
 }
 
-void PM3Process::setSerialListener(const QString& name,bool state)
+void PM3Process::setSerialListener(const QString& name, bool state)
 {
     if(state)
     {
-        portInfo=new QSerialPortInfo(name);
+        portInfo = new QSerialPortInfo(name);
         serialListener->start();
-        qDebug()<<serialListener->thread();
+        qDebug() << serialListener->thread();
     }
     else
     {
@@ -68,18 +68,18 @@ void PM3Process::setSerialListener(const QString& name,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);
 {
-    qDebug()<<portInfo->isBusy();
+//    qDebug()<<portInfo->isBusy();
     if(!portInfo->isBusy())
     {
         kill();
         emit PM3StatedChanged(false);
-        setSerialListener("",false);
+        setSerialListener("", false);
     }
 }
 
 void PM3Process::testThread()
 {
-    qDebug()<<"PM3:"<<QThread::currentThread();
+    qDebug() << "PM3:" << QThread::currentThread();
 }
 
 
@@ -95,7 +95,7 @@ void PM3Process::onReadyRead()
         requiredOutput->append(out);
     if(out != "")
     {
-        qDebug()<<"PM3Process::onReadyRead:" << out;
+        qDebug() << "PM3Process::onReadyRead:" << out;
         emit newOutput(out);
 
     }

common/pm3process.h

@@ -13,7 +13,7 @@ class PM3Process : public QProcess
 {
     Q_OBJECT
 public:
-    explicit PM3Process(QThread* thread, QObject* parent=nullptr);
+    explicit PM3Process(QThread* thread, QObject* parent = nullptr);
     bool waitForReadyRead(int msecs = 2000);
 
     void testThread();
@@ -32,7 +32,7 @@ private:
     QTimer* serialListener;
     QSerialPortInfo* portInfo;
 signals:
-    void PM3StatedChanged(bool st, QString info="");
+    void PM3StatedChanged(bool st, QString info = "");
     void newOutput(QString output);
 };
 

common/util.cpp

@@ -2,18 +2,18 @@
 
 Util::Util(QObject *parent) : QObject(parent)
 {
-    isRequiringOutput=false;
+    isRequiringOutput = false;
-    requiredOutput=new QString();
+    requiredOutput = new QString();
-    timeStamp=QTime::currentTime();
+    timeStamp = QTime::currentTime();
 }
 
 void Util::processOutput(QString output)
 {
-    qDebug()<<"Util::processOutput:" << output;
+    qDebug() << "Util::processOutput:" << output;
     if(isRequiringOutput)
     {
         requiredOutput->append(output);
-        timeStamp=QTime::currentTime();
+        timeStamp = QTime::currentTime();
     }
     emit refreshOutput(output);
 }
@@ -26,21 +26,21 @@ void Util::execCMD(QString cmd)
 
 QString Util::execCMDWithOutput(QString cmd, unsigned long timeout)
 {
-    QTime currTime=QTime::currentTime();
+    QTime currTime = QTime::currentTime();
     QTime targetTime = QTime::currentTime().addMSecs(timeout);
-    isRequiringOutput=true;
+    isRequiringOutput = true;
     requiredOutput->clear();
     execCMD(cmd);
     while( QTime::currentTime() < targetTime)
     {
         QApplication::processEvents();
-        if(timeStamp>currTime)
+        if(timeStamp > currTime)
         {
-            currTime=timeStamp;
+            currTime = timeStamp;
-            targetTime=timeStamp.addMSecs(timeout);
+            targetTime = timeStamp.addMSecs(timeout);
         }
     }
-    isRequiringOutput=false;
+    isRequiringOutput = false;
     return *requiredOutput;
 }
 

common/util.h

@@ -16,7 +16,7 @@ public:
     explicit Util(QObject *parent = nullptr);
 
     void execCMD(QString cmd);
-    QString execCMDWithOutput(QString cmd, unsigned long timeout=2000);
+    QString execCMDWithOutput(QString cmd, unsigned long timeout = 2000);
     void delay(unsigned int msec);
 public slots:
     void processOutput(QString output);

module/mifare.cpp

@@ -1,60 +1,273 @@
 #include "mifare.h"
 
-Mifare::Mifare(Util *addr,QObject *parent) : QObject(parent)
+Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QObject *parent) : QObject(parent)
 {
-    util=addr;
+    util = addr;
-    isProcessingData=false;
+    this->ui = ui;
-    isProcessingKey=false;
 }
 
-void Mifare::processData(const QString str)
+
+bool Mifare::isKeyValid(const QString key)
 {
-    if(isProcessingData)
+    if(key.length() != 12)
+        return false;
+    for(int i = 0; i < 12; i++)
     {
-        if(inputType==FROM_RDBL)
+        if(!((key[i] >= '0' && key[i] <= '9') || (key[i] >= 'A' && key[i] <= 'F')))
-        {
+            return false;
-
-        }
     }
+    return true;
 }
-void Mifare::processKey(const QString str)
+
+void Mifare::info()
 {
-    if(isProcessingKey)
+    util->execCMD("hf 14a info");
-    {
+    ui->funcTab->setCurrentIndex(1);
+}
 
+void Mifare::chk()
+{
+    QString result = util->execCMDWithOutput("hf mf chk *1 ?");
+    result = result.mid(result.indexOf("|---|----------------|----------------|"));
+    QStringList keys = result.split("\r\n");
+    for(int i = 0; i < 16; i++)
+    {
+        ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
+        ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(24, 12).trimmed().toUpper()));
     }
+    qDebug() << "***********\n" << keys << "***********\n";
 }
-void Mifare::setProcessingState(ProcessingState st)
+
+void Mifare::nested()
 {
-    if(st==Mifare::NONE)
+    QString result = util->execCMDWithOutput("hf mf nested 1 *");
+    result = result.mid(result.indexOf("|---|----------------|---|----------------|---|"));
+    QStringList keys = result.split("\r\n");
+    for(int i = 0; i < 16; i++)
     {
-        isProcessingKey=false;
+        if(keys[i + 3].at(23) == '1')
-        isProcessingData=false;
+            ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
+        if(keys[i + 3].at(44) == '1')
+            ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(28, 12).trimmed().toUpper()));
     }
-    else if(st==Mifare::KEY)
+    qDebug() << "***********\n" << keys << "***********\n";
+}
+
+void Mifare::hardnested()
+{
+    MF_Attack_hardnestedDialog dialog;
+    connect(&dialog, &MF_Attack_hardnestedDialog::sendCMD, util, &Util::execCMD);
+    if(dialog.exec() == QDialog::Accepted)
+        ui->funcTab->setCurrentIndex(1);
+}
+
+void Mifare::sniff()
+{
+    util->execCMD("hf mf sniff");
+    ui->funcTab->setCurrentIndex(1);
+}
+
+void Mifare::list()
+{
+    util->execCMD("hf list mf");
+    ui->funcTab->setCurrentIndex(1);
+}
+
+void Mifare::read()
+{
+    QString result = util->execCMDWithOutput("hf mf rdbl "
+                     + ui->MF_RW_blockBox->currentText()
+                     + " "
+                     + ui->MF_RW_keyTypeBox->currentText()
+                     + " "
+                     + ui->MF_RW_keyEdit->text());
+    if(result.indexOf("isOk:01") != -1)
     {
-        isProcessingKey=true;
+        result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper();
-        isProcessingData=false;
+        if((ui->MF_RW_blockBox->currentText().toInt() + 1) % 4 == 0)
+        {
+            if(ui->MF_RW_keyTypeBox->currentText() == "A")
+            {
+                for(int i = 0; i < 6; i++)
+                {
+                    result = result.replace(i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2));
+                }
+                ui->MF_RW_dataEdit->setText(result);
+                QString tmpKey = result.right(18).replace(" ", "");
+                result = util->execCMDWithOutput("hf mf rdbl "
+                                                 + ui->MF_RW_keyTypeBox->currentText()
+                                                 + " B "
+                                                 + tmpKey);
+                if(result.indexOf("isOk:01") == -1)
+                {
+                    result = ui->MF_RW_dataEdit->text();
+                    result = result.replace(30, 17, "?? ?? ?? ?? ?? ??");
+                    ui->MF_RW_dataEdit->setText(result);
+                }
+            }
+            else
+            {
+                for(int i = 0; i < 6; i++)
+                {
+                    result = result.replace(30 + i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2));
+                }
+                result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? ");
+                ui->MF_RW_dataEdit->setText(result);
+            }
+        }
+        else
+        {
+            ui->MF_RW_dataEdit->setText(result);
+        }
     }
-    else if(st==Mifare::DATA)
+}
+
+void Mifare::readAll()
+{
+    QString result;
+    bool isKeyAValid;
+    bool isKeyBValid;
+    const int waitTime = 300;
+    for(int i = 0; i < 16; i++)
     {
-        isProcessingKey=false;
+        QApplication::processEvents();
-        isProcessingData=true;
+        result = "";
+        isKeyAValid = false;
+        isKeyBValid = false;
+
+        // check keys and read the first block of each sector
+        if(ui->MF_keyWidget->item(i, 1) != nullptr && isKeyValid(ui->MF_keyWidget->item(i, 1)->text()))
+        {
+            result = util->execCMDWithOutput("hf mf rdbl "
+                                             + QString::number(4 * i)
+                                             + " A "
+                                             + ui->MF_keyWidget->item(i, 1)->text(), waitTime);
+            if(result.indexOf("isOk:01") != -1)
+            {
+                isKeyAValid = true;
+                ui->MF_dataWidget->setItem(4 * i, 2, new QTableWidgetItem(result.mid(result.indexOf("isOk:01") + 13, 47).toUpper()));
+            }
+        }
+        QApplication::processEvents();
+        if(ui->MF_keyWidget->item(i, 2) != nullptr && isKeyValid(ui->MF_keyWidget->item(i, 2)->text()))
+        {
+            result = util->execCMDWithOutput("hf mf rdbl "
+                                             + QString::number(4 * i)
+                                             + " B "
+                                             + ui->MF_keyWidget->item(i, 2)->text(), waitTime);
+            if(result.indexOf("isOk:01") != -1)
+            {
+                isKeyBValid = true;
+                ui->MF_dataWidget->setItem(4 * i, 2, new QTableWidgetItem(result.mid(result.indexOf("isOk:01") + 13, 47).toUpper()));
+            }
+        }
+
+        // read the rest blocks of a sector
+        if(isKeyAValid || isKeyBValid)
+        {
+            for(int j = 1; j < 4; j++)
+            {
+                QApplication::processEvents();
+                result = util->execCMDWithOutput("hf mf rdbl "
+                                                 + QString::number(4 * i + j)
+                                                 + " "
+                                                 + (isKeyAValid ? "A" : "B")
+                                                 + " "
+                                                 + ui->MF_keyWidget->item(i, (isKeyAValid ? 1 : 2))->text(), waitTime);
+                result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper();
+                ui->MF_dataWidget->setItem(4 * i + j, 2, new QTableWidgetItem(result));
+            }
+
+            QApplication::processEvents();
+            // fill the MF_dataWidget with the known valid key
+            //
+            // check whether the MF_dataWidget contains the valid key,
+            // and fill MF_keyWidget(when you only have KeyA but the ReadBlock output contains the KeyB)
+            //
+            // the structure is not symmetric, since you cannot get KeyA from output
+            // this program will only process the provided KeyA(in MF_keyWidget)
+            result = ui->MF_dataWidget->item(4 * i + 3, 2)->text();
+            if(isKeyAValid)
+            {
+                for(int j = 0; j < 6; j++)
+                {
+                    result = result.replace(j * 3, 2, ui->MF_keyWidget->item(i, 1)->text().mid(j * 2, 2));
+                }
+            }
+            else
+            {
+                result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? ");
+            }
+            ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
+
+            if(isKeyBValid)
+            {
+                for(int j = 0; j < 6; j++)
+                {
+                    result = result.replace(30 + j * 3, 2, ui->MF_keyWidget->item(i, 2)->text().mid(j * 2, 2));
+                    ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
+                }
+            }
+            else
+            {
+                QString tmpKey = result.right(18).replace(" ", "");
+                result = util->execCMDWithOutput("hf mf rdbl "
+                                                 + QString::number(4 * i + 3)
+                                                 + " B "
+                                                 + tmpKey, waitTime);
+                if(result.indexOf("isOk:01") != -1)
+                {
+                    ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(tmpKey));
+                }
+                else
+                {
+                    result = ui->MF_dataWidget->item(4 * i + 3, 2)->text();
+                    result = result.replace(30, 17, "?? ?? ?? ?? ?? ??");
+                    ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
+                }
+            }
+        }
     }
 }
-void Mifare::setInputType(InputType tp)
+
+void Mifare::write()
 {
-    inputType=tp;
+    QString result = util->execCMDWithOutput("hf mf wrbl "
+                     + ui->MF_RW_blockBox->currentText()
+                     + " "
+                     + ui->MF_RW_keyTypeBox->currentText()
+                     + " "
+                     + ui->MF_RW_keyEdit->text()
+                     + " "
+                     + ui->MF_RW_dataEdit->text().replace(" ", ""));
+    if(result.indexOf("isOk:01") != -1)
+    {
+
+    }
 }
 
-bool Mifare::isKeyValid(const QString key)
+void Mifare::writeAll()
 {
-    if(key.length() != 12)
+    QString result;
-        return false;
+    for(int i = 0; i < 16; i++)
-    for(int i = 0; i < 12; i++)
     {
-        if(!((key[i] >= '0' && key[i] <= '9') || (key[i] >= 'A' && key[i] <= 'F')))
+        for(int j = 0; j < 4; j++)
-            return false;
+        {
+            result = util->execCMDWithOutput("hf mf wrbl "
+                                             + QString::number(i * 4 + j)
+                                             + " A "
+                                             + ui->MF_keyWidget->item(i, 1)->text()
+                                             + " "
+                                             + ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
+            if(result.indexOf("isOk:01") == -1)
+            {
+                result = util->execCMDWithOutput("hf mf wrbl "
+                                                 + QString::number(i * 4 + j)
+                                                 + " B "
+                                                 + ui->MF_keyWidget->item(i, 2)->text()
+                                                 + " "
+                                                 + ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
+            }
+        }
     }
-    return true;
 }

module/mifare.h

@@ -2,6 +2,8 @@
 #define MIFARE_H
 
 #include "common/util.h"
+#include "ui_mainwindow.h"
+#include "ui/mf_attack_hardnesteddialog.h"
 #include <QObject>
 #include <QString>
 
@@ -9,36 +11,25 @@ class Mifare : public QObject
 {
     Q_OBJECT
 public:
-    explicit Mifare(Util *addr,QObject *parent = nullptr);
+    explicit Mifare(Ui::MainWindow *ui, Util *addr, QObject *parent = nullptr);
-    enum ProcessingState
-    {
-        NONE,
-        DATA,
-        KEY,
-    };
-    enum InputType
-    {
-        FROM_RDBL,
-        FROM_RDSC,
-        FROM_CHK,
-        FROM_NESTED,
-    };
 
-    void setProcessingState(ProcessingState st);
-    void setInputType(InputType tp);
     bool isKeyValid(const QString key);
+    void info();
+    void chk();
+    void nested();
+    void hardnested();
+    void sniff();
+    void list();
+    void read();
+    void readAll();
+    void write();
+    void writeAll();
 public slots:
-    void processData(const QString str);
-    void processKey(const QString str);
 signals:
 
 private:
+    Ui::MainWindow *ui;
     Util* util;
-    bool isProcessingData=false;
-    bool isProcessingKey=false;
-    InputType inputType;
-    QStringList dataList;
-    QStringList keyList[2];
 };
 
 #endif // MIFARE_H

ui/mainwindow.cpp

@@ -7,15 +7,15 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
 
-    pm3Thread=new QThread(this);
+    pm3Thread = new QThread(this);
     pm3 = new PM3Process(pm3Thread);
 //    pm3->moveToThread(pm3Thread);
 //    pm3->init();
     pm3Thread->start();
-    pm3state=false;
+    pm3state = false;
 
     util = new Util(this);
-    mifare = new Mifare(util,this);
+    mifare = new Mifare(ui, util, this);
 
 
     uiInit();
@@ -42,12 +42,12 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
     QStringList serialList;
     foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
     {
-        qDebug()<<info.isBusy()<<info.isNull()<<info.portName();
+        qDebug() << info.isBusy() << info.isNull() << info.portName();
         serial.setPort(info);
 
         if(serial.open(QIODevice::ReadWrite))
         {
-            serialList<<info.portName();
+            serialList << info.portName();
             serial.close();
         }
     }
@@ -59,7 +59,7 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
 
 void MainWindow::on_PM3_connectButton_clicked()
 {
-    qDebug()<<"Main:"<<QThread::currentThread();
+    qDebug() << "Main:" << QThread::currentThread();
     QString port = ui->PM3_portBox->currentText();
     if(port == "")
         QMessageBox::information(NULL, "Info", "Plz choose a port first", QMessageBox::Ok);
@@ -71,24 +71,38 @@ void MainWindow::on_PM3_connectButton_clicked()
 
 void MainWindow::onPM3StateChanged(bool st, QString info)
 {
-    pm3state=st;
+    pm3state = st;
-    if(st==true)
+    if(st == true)
     {
-        setStatusBar(PM3VersionBar,info);
+        setStatusBar(PM3VersionBar, info);
-        setStatusBar(connectStatusBar,"Connected");
+        setStatusBar(connectStatusBar, "Connected");
     }
     else
     {
-        setStatusBar(connectStatusBar,"Not Connected");
+        setStatusBar(connectStatusBar, "Not Connected");
     }
 }
 
 void MainWindow::on_PM3_disconnectButton_clicked()
 {
-    pm3state=false;
+    pm3state = false;
     emit killPM3();
     emit setSerialListener("", false);
-    setStatusBar(connectStatusBar,"Not Connected");
+    setStatusBar(connectStatusBar, "Not Connected");
+}
+
+void MainWindow::refreshOutput(const QString& output)
+{
+    qDebug() << "MainWindow::refresh:" << output;
+    ui->Raw_outputEdit->insertPlainText(output);
+    ui->Raw_outputEdit->moveCursor(QTextCursor::End);
+}
+
+void MainWindow::refreshCMD(const QString& cmd)
+{
+    ui->Raw_CMDEdit->setText(cmd);
+    if(cmd != "" && (ui->Raw_CMDHistoryWidget->count() == 0 || ui->Raw_CMDHistoryWidget->item(ui->Raw_CMDHistoryWidget->count() - 1)->text() != cmd))
+        ui->Raw_CMDHistoryWidget->addItem(cmd);
 }
 
 // *********************************************************
@@ -107,7 +121,7 @@ void MainWindow::on_Raw_clearOutputButton_clicked()
 
 void MainWindow::on_Raw_CMDHistoryBox_stateChanged(int arg1)
 {
-    if(arg1==Qt::Checked)
+    if(arg1 == Qt::Checked)
     {
         ui->Raw_CMDHistoryWidget->setVisible(true);
         ui->Raw_clearHistoryButton->setVisible(true);
@@ -138,253 +152,52 @@ void MainWindow::on_Raw_CMDHistoryWidget_itemDoubleClicked(QListWidgetItem *item
 
 void MainWindow::on_MF_Attack_infoButton_clicked()
 {
-    util->execCMD("hf 14a info");
+    mifare->info();
-    ui->funcTab->setCurrentIndex(1);
 }
 
 void MainWindow::on_MF_Attack_chkButton_clicked()
 {
-    QString result = util->execCMDWithOutput("hf mf chk *1 ?");
+    mifare->chk();
-    result = result.mid(result.indexOf("|---|----------------|----------------|"));
-    QStringList keys = result.split("\r\n");
-    for(int i = 0; i < 16; i++)
-    {
-        ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
-        ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(24, 12).trimmed().toUpper()));
-    }
-    qDebug() << "***********\n" << keys << "***********\n";
 }
 
 void MainWindow::on_MF_Attack_nestedButton_clicked()
 {
-    QString result = util->execCMDWithOutput("hf mf nested 1 *");
+    mifare->nested();
-    result = result.mid(result.indexOf("|---|----------------|---|----------------|---|"));
-    QStringList keys = result.split("\r\n");
-    for(int i = 0; i < 16; i++)
-    {
-        if(keys[i + 3].at(23) == '1')
-            ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
-        if(keys[i + 3].at(44) == '1')
-            ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(28, 12).trimmed().toUpper()));
-    }
-    qDebug() << "***********\n" << keys << "***********\n";
 }
 
 void MainWindow::on_MF_Attack_hardnestedButton_clicked()
 {
-    MF_Attack_hardnestedDialog dialog;
+    mifare->hardnested();
-    connect(&dialog, &MF_Attack_hardnestedDialog::sendCMD, util, &Util::execCMD);
-    if(dialog.exec()==QDialog::Accepted)
-        ui->funcTab->setCurrentIndex(1);
 }
 
 void MainWindow::on_MF_Attack_sniffButton_clicked()
 {
-    util->execCMD("hf mf sniff");
+    mifare->sniff();
-    ui->funcTab->setCurrentIndex(1);
 }
 
 void MainWindow::on_MF_Attack_listButton_clicked()
 {
-    util->execCMD("hf list mf");
+    mifare->list();
-    ui->funcTab->setCurrentIndex(1);
 }
 
 void MainWindow::on_MF_RW_readAllButton_clicked()
 {
-    QString result;
+    mifare->readAll();
-    bool isKeyAValid;
-    bool isKeyBValid;
-    const int waitTime = 300;
-    for(int i = 0; i < 16; i++)
-    {
-        QApplication::processEvents();
-        result = "";
-        isKeyAValid = false;
-        isKeyBValid = false;
-
-        // check keys and read the first block of each sector
-        if(ui->MF_keyWidget->item(i, 1) != nullptr && mifare->isKeyValid(ui->MF_keyWidget->item(i, 1)->text()))
-        {
-            result = util->execCMDWithOutput("hf mf rdbl "
-                                       + QString::number(4 * i)
-                                       + " A "
-                                       + ui->MF_keyWidget->item(i, 1)->text(), waitTime);
-            if(result.indexOf("isOk:01") != -1)
-            {
-                isKeyAValid = true;
-                ui->MF_dataWidget->setItem(4 * i, 2, new QTableWidgetItem(result.mid(result.indexOf("isOk:01") + 13, 47).toUpper()));
-            }
-        }
-        QApplication::processEvents();
-        if(ui->MF_keyWidget->item(i, 2) != nullptr && mifare->isKeyValid(ui->MF_keyWidget->item(i, 2)->text()))
-        {
-            result = util->execCMDWithOutput("hf mf rdbl "
-                                       + QString::number(4 * i)
-                                       + " B "
-                                       + ui->MF_keyWidget->item(i, 2)->text(), waitTime);
-            if(result.indexOf("isOk:01") != -1)
-            {
-                isKeyBValid = true;
-                ui->MF_dataWidget->setItem(4 * i, 2, new QTableWidgetItem(result.mid(result.indexOf("isOk:01") + 13, 47).toUpper()));
-            }
-        }
-
-        // read the rest blocks of a sector
-        if(isKeyAValid || isKeyBValid)
-        {
-            for(int j = 1; j < 4; j++)
-            {
-                QApplication::processEvents();
-                result = util->execCMDWithOutput("hf mf rdbl "
-                                           + QString::number(4 * i + j)
-                                           + " "
-                                           + (isKeyAValid ? "A" : "B")
-                                           + " "
-                                           + ui->MF_keyWidget->item(i, (isKeyAValid ? 1 : 2))->text(), waitTime);
-                result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper();
-                ui->MF_dataWidget->setItem(4 * i + j, 2, new QTableWidgetItem(result));
-            }
-
-            QApplication::processEvents();
-            // fill the MF_dataWidget with the known valid key
-            //
-            // check whether the MF_dataWidget contains the valid key,
-            // and fill MF_keyWidget(when you only have KeyA but the ReadBlock output contains the KeyB)
-            //
-            // the structure is not symmetric, since you cannot get KeyA from output
-            // this program will only process the provided KeyA(in MF_keyWidget)
-            result = ui->MF_dataWidget->item(4 * i + 3, 2)->text();
-            if(isKeyAValid)
-            {
-                for(int j = 0; j < 6; j++)
-                {
-                    result = result.replace(j * 3, 2, ui->MF_keyWidget->item(i, 1)->text().mid(j * 2, 2));
-                }
-            }
-            else
-            {
-                result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? ");
-            }
-            ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
-
-            if(isKeyBValid)
-            {
-                for(int j = 0; j < 6; j++)
-                {
-                    result = result.replace(30 + j * 3, 2, ui->MF_keyWidget->item(i, 2)->text().mid(j * 2, 2));
-                    ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
-                }
-            }
-            else
-            {
-                QString tmpKey = result.right(18).replace(" ", "");
-                result = util->execCMDWithOutput("hf mf rdbl "
-                                           + QString::number(4 * i + 3)
-                                           + " B "
-                                           + tmpKey, waitTime);
-                if(result.indexOf("isOk:01") != -1)
-                {
-                    ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(tmpKey));
-                }
-                else
-                {
-                    result = ui->MF_dataWidget->item(4 * i + 3, 2)->text();
-                    result = result.replace(30, 17, "?? ?? ?? ?? ?? ??");
-                    ui->MF_dataWidget->setItem(4 * i + 3, 2, new QTableWidgetItem(result));
-                }
-            }
-        }
-    }
-
 }
 
 void MainWindow::on_MF_RW_readBlockButton_clicked()
 {
-    QString result = util->execCMDWithOutput("hf mf rdbl "
+    mifare->read();
-                                       + ui->MF_RW_blockBox->currentText()
-                                       + " "
-                                       + ui->MF_RW_keyTypeBox->currentText()
-                                       + " "
-                                       + ui->MF_RW_keyEdit->text());
-    if(result.indexOf("isOk:01") != -1)
-    {
-        result = result.mid(result.indexOf("isOk:01") + 13, 47).toUpper();
-        if((ui->MF_RW_blockBox->currentText().toInt() + 1) % 4 == 0)
-        {
-            if(ui->MF_RW_keyTypeBox->currentText() == "A")
-            {
-                for(int i = 0; i < 6; i++)
-                {
-                    result = result.replace(i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2));
-                }
-                ui->MF_RW_dataEdit->setText(result);
-                QString tmpKey = result.right(18).replace(" ", "");
-                result = util->execCMDWithOutput("hf mf rdbl "
-                                           + ui->MF_RW_keyTypeBox->currentText()
-                                           + " B "
-                                           + tmpKey);
-                if(result.indexOf("isOk:01") == -1)
-                {
-                    result = ui->MF_RW_dataEdit->text();
-                    result = result.replace(30, 17, "?? ?? ?? ?? ?? ??");
-                    ui->MF_RW_dataEdit->setText(result);
-                }
-            }
-            else
-            {
-                for(int i = 0; i < 6; i++)
-                {
-                    result = result.replace(30 + i * 3, 2, ui->MF_RW_keyEdit->text().mid(i * 2, 2));
-                }
-                result = result.replace(0, 18, "?? ?? ?? ?? ?? ?? ");
-                ui->MF_RW_dataEdit->setText(result);
-            }
-        }
-
-    }
 }
 
 void MainWindow::on_MF_RW_writeBlockButton_clicked()
 {
-    QString result = util->execCMDWithOutput("hf mf wrbl "
+    mifare->write();
-                                       + ui->MF_RW_blockBox->currentText()
-                                       + " "
-                                       + ui->MF_RW_keyTypeBox->currentText()
-                                       + " "
-                                       + ui->MF_RW_keyEdit->text()
-                                       + " "
-                                       + ui->MF_RW_dataEdit->text().replace(" ", ""));
-    if(result.indexOf("isOk:01") != -1)
-    {
-
-    }
 }
 
 void MainWindow::on_MF_RW_writeAllButton_clicked()
 {
-    QString result;
+    mifare->writeAll();
-    for(int i = 0; i < 16; i++)
-    {
-        for(int j = 0; j < 4; j++)
-        {
-            result = util->execCMDWithOutput("hf mf wrbl "
-                                       + QString::number(i * 4 + j)
-                                       + " A "
-                                       + ui->MF_keyWidget->item(i, 1)->text()
-                                       + " "
-                                       + ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
-            if(result.indexOf("isOk:01") == -1)
-            {
-                result = util->execCMDWithOutput("hf mf wrbl "
-                                           + QString::number(i * 4 + j)
-                                           + " B "
-                                           + ui->MF_keyWidget->item(i, 2)->text()
-                                           + " "
-                                           + ui->MF_dataWidget->item(2, i * 4 + j)->text().replace(" ", ""));
-            }
-        }
-    }
 }
 
 // ************************************************
@@ -392,21 +205,7 @@ void MainWindow::on_MF_RW_writeAllButton_clicked()
 
 // ******************** other ********************
 
-void MainWindow::refreshOutput(const QString& output)
+void MainWindow::sendMSG() // send command when pressing Enter
-{
-    qDebug()<<"MainWindow::refresh:" << output;
-    ui->Raw_outputEdit->insertPlainText(output);
-    ui->Raw_outputEdit->moveCursor(QTextCursor::End);
-}
-
-void MainWindow::refreshCMD(const QString& cmd)
-{
-    ui->Raw_CMDEdit->setText(cmd);
-    if(cmd!=""&&(ui->Raw_CMDHistoryWidget->count() == 0 || ui->Raw_CMDHistoryWidget->item(ui->Raw_CMDHistoryWidget->count() - 1)->text() != cmd))
-        ui->Raw_CMDHistoryWidget->addItem(cmd);
-}
-
-void MainWindow::sendMSG()
 {
     if(ui->Raw_CMDEdit->hasFocus())
         on_Raw_sendCMDButton_clicked();
@@ -465,13 +264,13 @@ void MainWindow::uiInit()
 void MainWindow::signalInit()
 {
     connect(pm3, &PM3Process::newOutput, util, &Util::processOutput);
-    connect(util,&Util::refreshOutput,this,&MainWindow::refreshOutput);
+    connect(util, &Util::refreshOutput, this, &MainWindow::refreshOutput);
 
-    connect(this,&MainWindow::connectPM3,pm3,&PM3Process::connectPM3);
+    connect(this, &MainWindow::connectPM3, pm3, &PM3Process::connectPM3);
     connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
-    connect(this,&MainWindow::killPM3,pm3,&PM3Process::kill);
+    connect(this, &MainWindow::killPM3, pm3, &PM3Process::kill);
 
-    connect(util,&Util::write,pm3,&PM3Process::write);
+    connect(util, &Util::write, pm3, &PM3Process::write);
 }
 
 void MainWindow::setStatusBar(QLabel* target, const QString & text)

ui/mainwindow.h

@@ -13,10 +13,11 @@
 #include "common/pm3process.h"
 #include "module/mifare.h"
 #include "common/util.h"
-#include "ui/mf_attack_hardnesteddialog.h"
 
 QT_BEGIN_NAMESPACE
-namespace Ui { class MainWindow; }
+namespace Ui {
+class MainWindow;
+}
 QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
@@ -31,7 +32,7 @@ public:
 public slots:
     void refreshOutput(const QString &output);
     void refreshCMD(const QString &cmd);
-    void setStatusBar(QLabel* target,const QString & text);
+    void setStatusBar(QLabel* target, const QString & text);
     void onPM3StateChanged(bool st, QString info);
 private slots:
 

ui/mf_attack_hardnesteddialog.cpp

@@ -6,7 +6,7 @@ MF_Attack_hardnestedDialog::MF_Attack_hardnestedDialog(QWidget *parent) :
     ui(new Ui::MF_Attack_hardnestedDialog)
 {
     ui->setupUi(this);
-    for(int i=0;i<64;i++)
+    for(int i = 0; i < 64; i++)
     {
         ui->knownKeySectorBox->addItem(QString::number(i));
         ui->targetKeySectorBox->addItem(QString::number(i));
@@ -22,13 +22,13 @@ MF_Attack_hardnestedDialog::~MF_Attack_hardnestedDialog()
 void MF_Attack_hardnestedDialog::on_buttonBox_accepted()
 {
     emit sendCMD("hf mf hardnested "
-                 +ui->knownKeySectorBox->currentText()
+                 + ui->knownKeySectorBox->currentText()
-                 +" "
+                 + " "
-                 +ui->knownKeyTypeBox->currentText()
+                 + ui->knownKeyTypeBox->currentText()
-                 +" "
+                 + " "
-                 +ui->knownKeyBox->text()
+                 + ui->knownKeyBox->text()
-                 +" "
+                 + " "
-                 +ui->targetKeySectorBox->currentText()
+                 + ui->targetKeySectorBox->currentText()
-                 +" "
+                 + " "
-                 +ui->targetKeyTypeBox->currentText());
+                 + ui->targetKeyTypeBox->currentText());
 }