diff --git a/README.md b/README.md index cc91375..6e6477b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,35 @@ # Proxmark3GUI A GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client +[中文](README/README.zh_CN.md) + +*** + +## Features + ++ Support raw commands of Proxmark3 client ++ Have a friendly UI to test Mifare cards ++ Easy to edit Mifare data files ++ Support binary(.bin .dump) files and text(.eml) files ++ ... + +*** + +## Previews +![nested_attack](README/mf_nested_attack.gif) + +![mf_load_file](README/mf_load_file.gif) + +![mf_edit_file](README/mf_edit_file.gif) + +![raw_command](README/raw_command.gif) + *** -Update Log: +## Update Log: + +### V0.1 ++ Able to deal with Mifare card and related files -## V0.0.1 +### V0.0.1 + a dumb version with a useless GUI and a serial choose box. \ No newline at end of file diff --git a/README/README.zh_CN.md b/README/README.zh_CN.md new file mode 100644 index 0000000..9e18da8 --- /dev/null +++ b/README/README.zh_CN.md @@ -0,0 +1,35 @@ +# Proxmark3GUI +一个自制的[Proxmark3](https://github.com/Proxmark/proxmark3) GUI + +[English](../README.md) + +*** + +## 特色功能 + ++ 支持直接输入PM3命令 ++ 有针对于Mifare卡(IC卡)的图形界面 ++ 支持编辑Mifare扇区数据文件 ++ 可以打开二进制/文本格式的扇区数据文件 ++ ... + +*** + +## 预览图 +![nested_attack](mf_nested_attack.gif) + +![mf_load_file](mf_load_file.gif) + +![mf_edit_file](mf_edit_file.gif) + +![raw_command](raw_command.gif) + +*** + +## 更新日志: + +### V0.1 ++ 支持处理Mifare卡片及相关数据文件 + +### V0.0.1 ++ 一个带串口选择框的实验版本 \ No newline at end of file diff --git a/README/mf_edit_file.gif b/README/mf_edit_file.gif new file mode 100644 index 0000000..25c5de3 Binary files /dev/null and b/README/mf_edit_file.gif differ diff --git a/README/mf_load_file.gif b/README/mf_load_file.gif new file mode 100644 index 0000000..f8dc95e Binary files /dev/null and b/README/mf_load_file.gif differ diff --git a/README/mf_nested_attack.gif b/README/mf_nested_attack.gif new file mode 100644 index 0000000..0ac5bc4 Binary files /dev/null and b/README/mf_nested_attack.gif differ diff --git a/README/raw_command.gif b/README/raw_command.gif new file mode 100644 index 0000000..0a8c67b Binary files /dev/null and b/README/raw_command.gif differ diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index 042c840..600aec1 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -219,7 +219,7 @@ void MainWindow::on_MF_dataWidget_itemChanged(QTableWidgetItem *item) if(item->column() == 2) { - QString data = item->text().replace(" ", ""); + QString data = item->text().replace(" ", "").toUpper(); if(data == "" || mifare->data_isDataValid(data) == Mifare::DATA_NOSPACE) { mifare->data_setData(item->row(), data); @@ -236,7 +236,7 @@ void MainWindow::on_MF_keyWidget_itemChanged(QTableWidgetItem *item) { if(item->column() == 1) { - QString key = item->text().replace(" ", ""); + QString key = item->text().replace(" ", "").toUpper(); if(key == "" || mifare->data_isKeyValid(key)) { mifare->data_setKey(item->row(), true, key);