Refactor(nothing changed actually)

common/pm3process.cpp

@@ -68,7 +68,7 @@ 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();

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;
-    isProcessingData=false;
-    isProcessingKey=false;
+    this->ui = ui;
 }
 
-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::info()
 {
+    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::nested()
+{
+    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++)
+    {
+        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()));
     }
-void Mifare::processKey(const QString str)
+    qDebug() << "***********\n" << keys << "***********\n";
+}
+
+void Mifare::hardnested()
 {
-    if(isProcessingKey)
+    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)
+    {
+        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));
                 }
-void Mifare::setProcessingState(ProcessingState st)
+                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)
                 {
-    if(st==Mifare::NONE)
+                    result = ui->MF_RW_dataEdit->text();
+                    result = result.replace(30, 17, "?? ?? ?? ?? ?? ??");
+                    ui->MF_RW_dataEdit->setText(result);
+                }
+            }
+            else
             {
-        isProcessingKey=false;
-        isProcessingData=false;
+                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 if(st==Mifare::KEY)
+        }
+        else
         {
-        isProcessingKey=true;
-        isProcessingData=false;
+            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;
-        isProcessingData=true;
+        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 && 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()));
             }
         }
-void Mifare::setInputType(InputType tp)
+        QApplication::processEvents();
+        if(ui->MF_keyWidget->item(i, 2) != nullptr && isKeyValid(ui->MF_keyWidget->item(i, 2)->text()))
         {
-    inputType=tp;
+            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()));
+            }
         }
 
-bool Mifare::isKeyValid(const QString key)
+        // read the rest blocks of a sector
+        if(isKeyAValid || isKeyBValid)
         {
-    if(key.length() != 12)
-        return false;
-    for(int i = 0; i < 12; i++)
+            for(int j = 1; j < 4; j++)
             {
-        if(!((key[i] >= '0' && key[i] <= '9') || (key[i] >= 'A' && key[i] <= 'F')))
-            return false;
+                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::write()
+{
+    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)
+    {
+
+    }
+}
+
+void Mifare::writeAll()
+{
+    QString result;
+    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(" ", ""));
+            }
+        }
     }
-    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);
-    enum ProcessingState
-    {
-        NONE,
-        DATA,
-        KEY,
-    };
-    enum InputType
-    {
-        FROM_RDBL,
-        FROM_RDSC,
-        FROM_CHK,
-        FROM_NESTED,
-    };
+    explicit Mifare(Ui::MainWindow *ui, Util *addr, QObject *parent = nullptr);
 
-    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

@@ -15,7 +15,7 @@ MainWindow::MainWindow(QWidget *parent)
     pm3state = false;
 
     util = new Util(this);
-    mifare = new Mifare(util,this);
+    mifare = new Mifare(ui, util, this);
 
 
     uiInit();
@@ -91,6 +91,20 @@ void MainWindow::on_PM3_disconnectButton_clicked()
     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);
+}
+
 // *********************************************************
 
 // ******************** raw command ********************
@@ -138,253 +152,52 @@ void MainWindow::on_Raw_CMDHistoryWidget_itemDoubleClicked(QListWidgetItem *item
 
 void MainWindow::on_MF_Attack_infoButton_clicked()
 {
-    util->execCMD("hf 14a info");
-    ui->funcTab->setCurrentIndex(1);
+    mifare->info();
 }
 
 void MainWindow::on_MF_Attack_chkButton_clicked()
 {
-    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";
+    mifare->chk();
 }
 
 void MainWindow::on_MF_Attack_nestedButton_clicked()
 {
-    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++)
-    {
-        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";
+    mifare->nested();
 }
 
 void MainWindow::on_MF_Attack_hardnestedButton_clicked()
 {
-    MF_Attack_hardnestedDialog dialog;
-    connect(&dialog, &MF_Attack_hardnestedDialog::sendCMD, util, &Util::execCMD);
-    if(dialog.exec()==QDialog::Accepted)
-        ui->funcTab->setCurrentIndex(1);
+    mifare->hardnested();
 }
 
 void MainWindow::on_MF_Attack_sniffButton_clicked()
 {
-    util->execCMD("hf mf sniff");
-    ui->funcTab->setCurrentIndex(1);
+    mifare->sniff();
 }
 
 void MainWindow::on_MF_Attack_listButton_clicked()
 {
-    util->execCMD("hf list mf");
-    ui->funcTab->setCurrentIndex(1);
+    mifare->list();
 }
 
 void MainWindow::on_MF_RW_readAllButton_clicked()
 {
-    QString result;
-    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));
-                }
-            }
-        }
-    }
-
+    mifare->readAll();
 }
 
 void MainWindow::on_MF_RW_readBlockButton_clicked()
 {
-    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)
-    {
-        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);
-            }
-        }
-
-    }
+    mifare->read();
 }
 
 void MainWindow::on_MF_RW_writeBlockButton_clicked()
 {
-    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)
-    {
-
-    }
+    mifare->write();
 }
 
 void MainWindow::on_MF_RW_writeAllButton_clicked()
 {
-    QString result;
-    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(" ", ""));
-            }
-        }
-    }
+    mifare->writeAll();
 }
 
 // ************************************************
@@ -392,21 +205,7 @@ void MainWindow::on_MF_RW_writeAllButton_clicked()
 
 // ******************** other ********************
 
-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);
-}
-
-void MainWindow::sendMSG()
+void MainWindow::sendMSG() // send command when pressing Enter
 {
     if(ui->Raw_CMDEdit->hasFocus())
         on_Raw_sendCMDButton_clicked();

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