Skip to content

Commit ff3a43a

Browse files
wh201906wh201906
committed
V0.2.5
1 parent 5a0f0d3 commit ff3a43a

File tree

6 files changed

+170
-125
lines changed

6 files changed

+170
-125
lines changed

‎CHANGELOG.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Change Log
2+
3+
[中文](doc/CHANGELOG/CHANGELOG_zh_CN.md)
4+
5+
### V0.2.5
6+
+ Fix bug [#28](https://github.com/wh201906/Proxmark3GUI/issues/28)
7+
8+
### V0.2.4
9+
+ Clone EM410x card to T55xx card
10+
11+
### V0.2.3
12+
+ Fix bug [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
13+
+ Try to support Non-ASCII path
14+
15+
### V0.2.2
16+
+ Load command format from external json file
17+
+ 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)
18+
+ Support Iceman/RRG repo v4.13441
19+
20+
### V0.2.1
21+
+ Optimize MIFARE Classic reading logic
22+
+ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16)
23+
+ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now)
24+
25+
### V0.2
26+
+ Use Dock widget for more flexible layout
27+
+ Support basic LF commands
28+
+ Fix a bug in RawCommand tab
29+
30+
### V0.1.4
31+
+ Optimize performance
32+
+ Optimize UI
33+
+ Search available ports automatically
34+
+ Add High-DPI support
35+
+ Support configuring environment variables by script
36+
(Useful when the client requires specific environment variables)
37+
+ All functions are compatible with Iceman/RRG repo(tested on v4.9237)
38+
+ Support specifying client working directory
39+
+ Fix some bugs
40+
41+
### V0.1.3
42+
+ Fix Trailer Decoder
43+
+ Add feedback when writing selected blocks
44+
45+
### V0.1.2
46+
+ Optimize read logic
47+
+ Make UI Customizable
48+
+ Save client path automatically
49+
+ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version)
50+
+ Support read/write selected blocks
51+
+ Support a few Iceman functions
52+
+ Fix some bugs
53+
54+
### V0.1.1
55+
+ Complete Mifare module(support simulate and sniff)
56+
57+
### V0.1
58+
+ Able to deal with Mifare card and related files
59+
60+
### V0.0.1
61+
+ a dumb version with a useless GUI and a serial choose box.

‎README.md‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -68,59 +68,5 @@ Great thanks to him.
6868
[2.Edit Mifare Classic data](doc/tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data.md)(Proxmark3 hardware is not necessary)
6969
***
7070

71-
## Update Log:
72-
73-
### V0.2.4
74-
+ Clone EM410x card to T55xx card
75-
76-
### V0.2.3
77-
+ Fix bug [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
78-
+ Try to support Non-ASCII path
79-
80-
### V0.2.2
81-
+ Load command format from external json file
82-
+ 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)
83-
+ Support Iceman/RRG repo v4.13441
84-
85-
### V0.2.1
86-
+ Optimize MIFARE Classic reading logic
87-
+ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16)
88-
+ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now)
89-
90-
### V0.2
91-
+ Use Dock widget for more flexible layout
92-
+ Support basic LF commands
93-
+ Fix a bug in RawCommand tab
94-
95-
### V0.1.4
96-
+ Optimize performance
97-
+ Optimize UI
98-
+ Search available ports automatically
99-
+ Add High-DPI support
100-
+ Support configuring environment variables by script
101-
(Useful when the client requires specific environment variables)
102-
+ All functions are compatible with Iceman/RRG repo(tested on v4.9237)
103-
+ Support specifying client working directory
104-
+ Fix some bugs
105-
106-
### V0.1.3
107-
+ Fix Trailer Decoder
108-
+ Add feedback when writing selected blocks
109-
110-
### V0.1.2
111-
+ Optimize read logic
112-
+ Make UI Customizable
113-
+ Save client path automatically
114-
+ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version)
115-
+ Support read/write selected blocks
116-
+ Support a few Iceman functions
117-
+ Fix some bugs
118-
119-
### V0.1.1
120-
+ Complete Mifare module(support simulate and sniff)
121-
122-
### V0.1
123-
+ Able to deal with Mifare card and related files
124-
125-
### V0.0.1
126-
+ a dumb version with a useless GUI and a serial choose box.
71+
## Change Log
72+
[Change Log](CHANGELOG.md)

‎deploy/deploy.py‎

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from json import load
44
from re import fullmatch, IGNORECASE
55

6+
compressDirList = []
7+
68

79
def getPEVersion(fname):
810
try:
@@ -66,6 +68,7 @@ def getPEVersion(fname):
6668
print(configPath, "exists, replacing...")
6769
shutil.rmtree(configPath)
6870
shutil.copytree("../config", configPath)
71+
compressDirList.append(dst32Dir)
6972

7073
if os.path.exists(dst64Dir) and os.path.exists(dst64Path):
7174
print(dst64Path, "exists, replacing...")
@@ -79,20 +82,47 @@ def getPEVersion(fname):
7982
print(configPath, "exists, replacing...")
8083
shutil.rmtree(configPath)
8184
shutil.copytree("../config", configPath)
85+
compressDirList.append(dst64Dir)
8286

8387
# TODO: GUI+client
88+
clientList = [
89+
"official-v3.1.0", "rrg_other-v4.13441", "rrg_other-v4.14434",
90+
"rrg_other-v4.14831"
91+
]
92+
93+
94+
def generateClient(clientName):
95+
global compressDirList
96+
clientSrcDir = "./client/" + clientName
97+
clientDstDir = "./" + ver64 + "-win64-" + clientName
98+
clientDstGUIDir = clientDstDir + "/GUI"
99+
100+
if os.path.exists(clientDstDir) and os.path.exists(clientDstGUIDir):
101+
print(clientDstGUIDir, "exists, replacing...")
102+
shutil.rmtree(clientDstGUIDir)
103+
elif not os.path.exists(clientDstDir):
104+
print(clientDstDir, "doesn't exist, creating...")
105+
shutil.copytree(clientSrcDir, clientDstDir)
106+
shutil.copytree(dst64Dir, clientDstGUIDir)
107+
if "official" in clientName:
108+
shutil.copyfile("./client/GUIsettings_Official.ini",
109+
clientDstGUIDir + "/GUIsettings.ini")
110+
elif "rrg" in clientName:
111+
shutil.copyfile("./client/GUIsettings_RRG.ini",
112+
clientDstGUIDir + "/GUIsettings.ini")
113+
compressDirList.append(clientDstDir)
114+
115+
116+
for cl in clientList:
117+
generateClient(cl)
84118

85119
use7z = input("Compress?(y/N)")
86120
if fullmatch("yes|y", use7z, IGNORECASE):
87-
archive32Path = dst32Dir + ".7z"
88-
archive64Path = dst64Dir + ".7z"
89-
90-
if os.path.exists(archive32Path):
91-
print(archive32Path, "exists, replacing...")
92-
os.remove(archive32Path)
93-
os.system("7z a -t7z -mmt8 -mx9 " + archive32Path + " " + dst32Dir)
94-
95-
if os.path.exists(archive64Path):
96-
print(archive64Path, "exists, replacing...")
97-
os.remove(archive64Path)
98-
os.system("7z a -t7z -mmt8 -mx9 " + archive64Path + " " + dst64Dir)
121+
print(compressDirList)
122+
for it in compressDirList:
123+
archivePath = it + ".7z"
124+
125+
if os.path.exists(archivePath):
126+
print(archivePath, "exists, replacing...")
127+
os.remove(archivePath)
128+
os.system("7z a -t7z -mmt8 -mx9 " + archivePath + " " + it)

‎doc/CHANGELOG/CHANGELOG_zh_CN.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# 更新日志
2+
3+
[English](../../CHANGELOG.md)
4+
5+
### V0.2.5
6+
+ 修复 [#28](https://github.com/wh201906/Proxmark3GUI/issues/28)
7+
8+
### V0.2.4
9+
+ 复制EM410x卡（一种常见的低频ID卡）
10+
11+
### V0.2.3
12+
+ 修复 [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
13+
+ 尝试支持中文启动路径
14+
15+
### V0.2.2
16+
+ 从外部文件加载客户端命令格式
17+
+ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)
18+
+ 兼容冰人版客户端 v4.13441
19+
20+
### V0.2.1
21+
+ 优化MIFARE Classic读卡逻辑
22+
+ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) （配合新版RRG固件时无法读取扇区数据）
23+
+ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) （路径中支持空格）
24+
25+
### V0.2
26+
+ 使用浮动窗口，界面配置更加灵活
27+
+ 支持部分低频命令
28+
+ 修复原始命令选项卡中的一个Bug
29+
30+
### V0.1.4
31+
+ 优化性能
32+
+ 优化用户界面
33+
+ 自动搜索可用端口
34+
+ 支持高分屏
35+
+ 可通过外部脚本配置环境变量
36+
(在客户端需要配置环境变量时很有用)
37+
+ 全功能兼容冰人版（在v4.9237上测试通过）
38+
+ 支持指定客户端工作路径
39+
+ 修复部分bug
40+
41+
### V0.1.3
42+
+ 修复访问控制位解码器
43+
+ 写多个块时显示写入结果
44+
45+
### V0.1.2
46+
+ 优化读卡逻辑
47+
+ UI自定义
48+
+ 自动保存客户端路径
49+
+ 添加访问控制位解码器（也可用于自己构造访问控制位）（有bug，请使用V0.1.3或更高版本）
50+
+ 支持仅读写选中块
51+
+ 支持部分冰人功能
52+
+ 修复部分bug
53+
54+
### V0.1.1
55+
+ 完成整个Mifare模块（支持模拟卡和嗅探功能）
56+
57+
### V0.1
58+
+ 支持处理Mifare卡片及相关数据文件
59+
60+
### V0.0.1
61+
+ 一个带串口选择框的实验版本

‎doc/README/README_zh_CN.md‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -65,59 +65,6 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
6565
[1.快速上手](../tutorial/Quickstart/quickstart_zh_CN.md)
6666
[2.编辑Mifare(IC)卡数据](../tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data_zh_CN.md)（无需PM3硬件）
6767
***
68-
## 更新日志:
69-
70-
### V0.2.4
71-
+ 复制EM410x卡（一种常见的低频ID卡）
72-
73-
### V0.2.3
74-
+ 修复 [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
75-
+ 尝试支持中文启动路径
76-
77-
### V0.2.2
78-
+ 从外部文件加载客户端命令格式
79-
+ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22)
80-
+ 兼容冰人版客户端 v4.13441
81-
82-
### V0.2.1
83-
+ 优化MIFARE Classic读卡逻辑
84-
+ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) （配合新版RRG固件时无法读取扇区数据）
85-
+ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) （路径中支持空格）
86-
87-
### V0.2
88-
+ 使用浮动窗口，界面配置更加灵活
89-
+ 支持部分低频命令
90-
+ 修复原始命令选项卡中的一个Bug
91-
92-
### V0.1.4
93-
+ 优化性能
94-
+ 优化用户界面
95-
+ 自动搜索可用端口
96-
+ 支持高分屏
97-
+ 可通过外部脚本配置环境变量
98-
(在客户端需要配置环境变量时很有用)
99-
+ 全功能兼容冰人版（在v4.9237上测试通过）
100-
+ 支持指定客户端工作路径
101-
+ 修复部分bug
102-
103-
### V0.1.3
104-
+ 修复访问控制位解码器
105-
+ 写多个块时显示写入结果
106-
107-
### V0.1.2
108-
+ 优化读卡逻辑
109-
+ UI自定义
110-
+ 自动保存客户端路径
111-
+ 添加访问控制位解码器（也可用于自己构造访问控制位）（有bug，请使用V0.1.3或更高版本）
112-
+ 支持仅读写选中块
113-
+ 支持部分冰人功能
114-
+ 修复部分bug
115-
116-
### V0.1.1
117-
+ 完成整个Mifare模块（支持模拟卡和嗅探功能）
118-
119-
### V0.1
120-
+ 支持处理Mifare卡片及相关数据文件
121-
122-
### V0.0.1
123-
+ 一个带串口选择框的实验版本
68+
69+
## 更新日志
70+
[更新日志](../CHANGELOG/CHANGELOG_zh_CN.md)

‎src/Proxmark3GUI.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
5959
else: unix:!android: target.path = /opt/$${TARGET}/bin
6060
!isEmpty(target.path): INSTALLS += target
6161

62-
VERSION = 0.2.4
62+
VERSION = 0.2.5
6363
QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
6464
QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
6565
QMAKE_TARGET_COMPANY = "wh201906"

0 commit comments

Comments
 (0)