Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce973fda96 | |||
| 2704b7cfc2 | |||
| 2b5c94974d | |||
| d8d9178ce8 | |||
| 9c89df4519 | |||
| 757fdcfc21 | |||
| a9b19f92d6 | |||
| b2cb1ea8e7 | |||
| da2f6ead6e | |||
| ef9972d24a | |||
| 9dcd291894 | |||
| ff3a43a4a6 | |||
| 5a0f0d3e3e | |||
| d60f636881 | |||
| ae932778ce | |||
| 1e728c891c | |||
| f86cba8d56 | |||
| b319f9fbe1 | |||
| c0afa6bb32 | |||
| 17c40fe941 | |||
| 60f965bfe7 | |||
| 36307dcda0 | |||
| dcc17963b6 | |||
| d4519f8667 | |||
| c2514602e8 | |||
| c277844cf4 |
@@ -1,72 +1,2 @@
|
|||||||
# This file is used to ignore files which are generated
|
/build*
|
||||||
# ----------------------------------------------------------------------------
|
/data
|
||||||
|
|
||||||
*~
|
|
||||||
*.autosave
|
|
||||||
*.a
|
|
||||||
*.core
|
|
||||||
*.moc
|
|
||||||
*.o
|
|
||||||
*.obj
|
|
||||||
*.orig
|
|
||||||
*.rej
|
|
||||||
*.so
|
|
||||||
*.so.*
|
|
||||||
*_pch.h.cpp
|
|
||||||
*_resource.rc
|
|
||||||
.#*
|
|
||||||
*.*#
|
|
||||||
core
|
|
||||||
!core/
|
|
||||||
tags
|
|
||||||
.DS_Store
|
|
||||||
.directory
|
|
||||||
*.debug
|
|
||||||
Makefile*
|
|
||||||
*.prl
|
|
||||||
*.app
|
|
||||||
moc_*.cpp
|
|
||||||
ui_*.h
|
|
||||||
qrc_*.cpp
|
|
||||||
Thumbs.db
|
|
||||||
*.res
|
|
||||||
*.rc
|
|
||||||
/.qmake.cache
|
|
||||||
/.qmake.stash
|
|
||||||
|
|
||||||
# qtcreator generated files
|
|
||||||
*.pro.user*
|
|
||||||
|
|
||||||
# xemacs temporary files
|
|
||||||
*.flc
|
|
||||||
|
|
||||||
# Vim temporary files
|
|
||||||
.*.swp
|
|
||||||
|
|
||||||
# Visual Studio generated files
|
|
||||||
*.ib_pdb_index
|
|
||||||
*.idb
|
|
||||||
*.ilk
|
|
||||||
*.pdb
|
|
||||||
*.sln
|
|
||||||
*.suo
|
|
||||||
*.vcproj
|
|
||||||
*vcproj.*.*.user
|
|
||||||
*.ncb
|
|
||||||
*.sdf
|
|
||||||
*.opensdf
|
|
||||||
*.vcxproj
|
|
||||||
*vcxproj.*
|
|
||||||
|
|
||||||
# MinGW generated files
|
|
||||||
*.Debug
|
|
||||||
*.Release
|
|
||||||
|
|
||||||
# Python byte code
|
|
||||||
*.pyc
|
|
||||||
|
|
||||||
# Binaries
|
|
||||||
# --------
|
|
||||||
*.dll
|
|
||||||
*.exe
|
|
||||||
|
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
# Change Log
|
||||||
|
|
||||||
|
[中文](doc/CHANGELOG/CHANGELOG_zh_CN.md)
|
||||||
|
|
||||||
|
### V0.2.6
|
||||||
|
+ Add support for Iceman/RRG repo v4.15864 [#37](https://github.com/wh201906/Proxmark3GUI/issues/37)
|
||||||
|
+ Optimize mifare classic block writing logic
|
||||||
|
+ Fix the default lf config
|
||||||
|
+ Add feedback for the GUI failing to start the client
|
||||||
|
+ Add feedback for the client failing to connect to PM3 hardware
|
||||||
|
+ Detect PM3 hardware when searching serial ports
|
||||||
|
+ Remove extra empty lines in raw command output
|
||||||
|
+ Use embedded config files
|
||||||
|
+ Remove the wait time between performing nested attack then switching to staticnested attack
|
||||||
|
|
||||||
|
### V0.2.5
|
||||||
|
+ Fix bug [#28](https://github.com/wh201906/Proxmark3GUI/issues/28)
|
||||||
|
|
||||||
|
### V0.2.4
|
||||||
|
+ Clone EM410x card to T55xx card
|
||||||
|
|
||||||
|
### V0.2.3
|
||||||
|
+ Fix bug [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
|
||||||
|
+ Try to support Non-ASCII path
|
||||||
|
|
||||||
|
### 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
|
||||||
|
+ Use Dock widget for more flexible layout
|
||||||
|
+ Support basic LF commands
|
||||||
|
+ Fix a bug in RawCommand tab
|
||||||
|
|
||||||
|
### V0.1.4
|
||||||
|
+ Optimize performance
|
||||||
|
+ Optimize UI
|
||||||
|
+ Search available ports automatically
|
||||||
|
+ Add High-DPI support
|
||||||
|
+ Support configuring environment variables by script
|
||||||
|
(Useful when the client requires specific environment variables)
|
||||||
|
+ All functions are compatible with Iceman/RRG repo(tested on v4.9237)
|
||||||
|
+ Support specifying client working directory
|
||||||
|
+ Fix some bugs
|
||||||
|
|
||||||
|
### V0.1.3
|
||||||
|
+ Fix Trailer Decoder
|
||||||
|
+ Add feedback when writing selected blocks
|
||||||
|
|
||||||
|
### V0.1.2
|
||||||
|
+ Optimize read logic
|
||||||
|
+ Make UI Customizable
|
||||||
|
+ Save client path automatically
|
||||||
|
+ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version)
|
||||||
|
+ Support read/write selected blocks
|
||||||
|
+ Support a few Iceman functions
|
||||||
|
+ Fix some bugs
|
||||||
|
|
||||||
|
### V0.1.1
|
||||||
|
+ Complete Mifare module(support simulate and sniff)
|
||||||
|
|
||||||
|
### V0.1
|
||||||
|
+ Able to deal with Mifare card and related files
|
||||||
|
|
||||||
|
### V0.0.1
|
||||||
|
+ a dumb version with a useless GUI and a serial choose box.
|
||||||
@@ -1,21 +1,504 @@
|
|||||||
MIT License
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 2.1, February 1999
|
||||||
|
|
||||||
Copyright (c) 2020 wh201906
|
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
[This is the first released version of the Lesser GPL. It also counts
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
as the successor of the GNU Library Public License, version 2, hence
|
||||||
in the Software without restriction, including without limitation the rights
|
the version number 2.1.]
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
Preamble
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
The licenses for most software are designed to take away your
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
free software--to make sure the software is free for all its users.
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
This license, the Lesser General Public License, applies to some
|
||||||
SOFTWARE.
|
specially designated software packages--typically libraries--of the
|
||||||
|
Free Software Foundation and other authors who decide to use it. You
|
||||||
|
can use it too, but we suggest you first think carefully about whether
|
||||||
|
this license or the ordinary General Public License is the better
|
||||||
|
strategy to use in any particular case, based on the explanations below.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom of use,
|
||||||
|
not price. Our General Public Licenses are designed to make sure that
|
||||||
|
you have the freedom to distribute copies of free software (and charge
|
||||||
|
for this service if you wish); that you receive source code or can get
|
||||||
|
it if you want it; that you can change the software and use pieces of
|
||||||
|
it in new free programs; and that you are informed that you can do
|
||||||
|
these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
distributors to deny you these rights or to ask you to surrender these
|
||||||
|
rights. These restrictions translate to certain responsibilities for
|
||||||
|
you if you distribute copies of the library or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of the library, whether gratis
|
||||||
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
|
you. You must make sure that they, too, receive or can get the source
|
||||||
|
code. If you link other code with the library, you must provide
|
||||||
|
complete object files to the recipients, so that they can relink them
|
||||||
|
with the library after making changes to the library and recompiling
|
||||||
|
it. And you must show them these terms so they know their rights.
|
||||||
|
|
||||||
|
We protect your rights with a two-step method: (1) we copyright the
|
||||||
|
library, and (2) we offer you this license, which gives you legal
|
||||||
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
|
To protect each distributor, we want to make it very clear that
|
||||||
|
there is no warranty for the free library. Also, if the library is
|
||||||
|
modified by someone else and passed on, the recipients should know
|
||||||
|
that what they have is not the original version, so that the original
|
||||||
|
author's reputation will not be affected by problems that might be
|
||||||
|
introduced by others.
|
||||||
|
|
||||||
|
Finally, software patents pose a constant threat to the existence of
|
||||||
|
any free program. We wish to make sure that a company cannot
|
||||||
|
effectively restrict the users of a free program by obtaining a
|
||||||
|
restrictive license from a patent holder. Therefore, we insist that
|
||||||
|
any patent license obtained for a version of the library must be
|
||||||
|
consistent with the full freedom of use specified in this license.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the
|
||||||
|
ordinary GNU General Public License. This license, the GNU Lesser
|
||||||
|
General Public License, applies to certain designated libraries, and
|
||||||
|
is quite different from the ordinary General Public License. We use
|
||||||
|
this license for certain libraries in order to permit linking those
|
||||||
|
libraries into non-free programs.
|
||||||
|
|
||||||
|
When a program is linked with a library, whether statically or using
|
||||||
|
a shared library, the combination of the two is legally speaking a
|
||||||
|
combined work, a derivative of the original library. The ordinary
|
||||||
|
General Public License therefore permits such linking only if the
|
||||||
|
entire combination fits its criteria of freedom. The Lesser General
|
||||||
|
Public License permits more lax criteria for linking other code with
|
||||||
|
the library.
|
||||||
|
|
||||||
|
We call this license the "Lesser" General Public License because it
|
||||||
|
does Less to protect the user's freedom than the ordinary General
|
||||||
|
Public License. It also provides other free software developers Less
|
||||||
|
of an advantage over competing non-free programs. These disadvantages
|
||||||
|
are the reason we use the ordinary General Public License for many
|
||||||
|
libraries. However, the Lesser license provides advantages in certain
|
||||||
|
special circumstances.
|
||||||
|
|
||||||
|
For example, on rare occasions, there may be a special need to
|
||||||
|
encourage the widest possible use of a certain library, so that it becomes
|
||||||
|
a de-facto standard. To achieve this, non-free programs must be
|
||||||
|
allowed to use the library. A more frequent case is that a free
|
||||||
|
library does the same job as widely used non-free libraries. In this
|
||||||
|
case, there is little to gain by limiting the free library to free
|
||||||
|
software only, so we use the Lesser General Public License.
|
||||||
|
|
||||||
|
In other cases, permission to use a particular library in non-free
|
||||||
|
programs enables a greater number of people to use a large body of
|
||||||
|
free software. For example, permission to use the GNU C Library in
|
||||||
|
non-free programs enables many more people to use the whole GNU
|
||||||
|
operating system, as well as its variant, the GNU/Linux operating
|
||||||
|
system.
|
||||||
|
|
||||||
|
Although the Lesser General Public License is Less protective of the
|
||||||
|
users' freedom, it does ensure that the user of a program that is
|
||||||
|
linked with the Library has the freedom and the wherewithal to run
|
||||||
|
that program using a modified version of the Library.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow. Pay close attention to the difference between a
|
||||||
|
"work based on the library" and a "work that uses the library". The
|
||||||
|
former contains code derived from the library, whereas the latter must
|
||||||
|
be combined with the library in order to run.
|
||||||
|
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License Agreement applies to any software library or other
|
||||||
|
program which contains a notice placed by the copyright holder or
|
||||||
|
other authorized party saying it may be distributed under the terms of
|
||||||
|
this Lesser General Public License (also called "this License").
|
||||||
|
Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
A "library" means a collection of software functions and/or data
|
||||||
|
prepared so as to be conveniently linked with application programs
|
||||||
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
|
The "Library", below, refers to any such software library or work
|
||||||
|
which has been distributed under these terms. A "work based on the
|
||||||
|
Library" means either the Library or any derivative work under
|
||||||
|
copyright law: that is to say, a work containing the Library or a
|
||||||
|
portion of it, either verbatim or with modifications and/or translated
|
||||||
|
straightforwardly into another language. (Hereinafter, translation is
|
||||||
|
included without limitation in the term "modification".)
|
||||||
|
|
||||||
|
"Source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For a library, complete source code means
|
||||||
|
all the source code for all modules it contains, plus any associated
|
||||||
|
interface definition files, plus the scripts used to control compilation
|
||||||
|
and installation of the library.
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running a program using the Library is not restricted, and output from
|
||||||
|
such a program is covered only if its contents constitute a work based
|
||||||
|
on the Library (independent of the use of the Library in a tool for
|
||||||
|
writing it). Whether that is true depends on what the Library does
|
||||||
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
|
complete source code as you receive it, in any medium, provided that
|
||||||
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
|
all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and distribute a copy of this License along with the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Library or any portion
|
||||||
|
of it, thus forming a work based on the Library, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The modified work must itself be a software library.
|
||||||
|
|
||||||
|
b) You must cause the files modified to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
c) You must cause the whole of the work to be licensed at no
|
||||||
|
charge to all third parties under the terms of this License.
|
||||||
|
|
||||||
|
d) If a facility in the modified Library refers to a function or a
|
||||||
|
table of data to be supplied by an application program that uses
|
||||||
|
the facility, other than as an argument passed when the facility
|
||||||
|
is invoked, then you must make a good faith effort to ensure that,
|
||||||
|
in the event an application does not supply such function or
|
||||||
|
table, the facility still operates, and performs whatever part of
|
||||||
|
its purpose remains meaningful.
|
||||||
|
|
||||||
|
(For example, a function in a library to compute square roots has
|
||||||
|
a purpose that is entirely well-defined independent of the
|
||||||
|
application. Therefore, Subsection 2d requires that any
|
||||||
|
application-supplied function or table used by this function must
|
||||||
|
be optional: if the application does not supply it, the square
|
||||||
|
root function must still compute square roots.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Library,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote
|
||||||
|
it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Library.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Library
|
||||||
|
with the Library (or with a work based on the Library) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
|
License instead of this License to a given copy of the Library. To do
|
||||||
|
this, you must alter all the notices that refer to this License, so
|
||||||
|
that they refer to the ordinary GNU General Public License, version 2,
|
||||||
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
|
|
||||||
|
Once this change is made in a given copy, it is irreversible for
|
||||||
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
|
subsequent copies and derivative works made from that copy.
|
||||||
|
|
||||||
|
This option is useful when you wish to copy part of the code of
|
||||||
|
the Library into a program that is not a library.
|
||||||
|
|
||||||
|
4. You may copy and distribute the Library (or a portion or
|
||||||
|
derivative of it, under Section 2) in object code or executable form
|
||||||
|
under the terms of Sections 1 and 2 above provided that you accompany
|
||||||
|
it with the complete corresponding machine-readable source code, which
|
||||||
|
must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
|
medium customarily used for software interchange.
|
||||||
|
|
||||||
|
If distribution of object code is made by offering access to copy
|
||||||
|
from a designated place, then offering equivalent access to copy the
|
||||||
|
source code from the same place satisfies the requirement to
|
||||||
|
distribute the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
5. A program that contains no derivative of any portion of the
|
||||||
|
Library, but is designed to work with the Library by being compiled or
|
||||||
|
linked with it, is called a "work that uses the Library". Such a
|
||||||
|
work, in isolation, is not a derivative work of the Library, and
|
||||||
|
therefore falls outside the scope of this License.
|
||||||
|
|
||||||
|
However, linking a "work that uses the Library" with the Library
|
||||||
|
creates an executable that is a derivative of the Library (because it
|
||||||
|
contains portions of the Library), rather than a "work that uses the
|
||||||
|
library". The executable is therefore covered by this License.
|
||||||
|
Section 6 states terms for distribution of such executables.
|
||||||
|
|
||||||
|
When a "work that uses the Library" uses material from a header file
|
||||||
|
that is part of the Library, the object code for the work may be a
|
||||||
|
derivative work of the Library even though the source code is not.
|
||||||
|
Whether this is true is especially significant if the work can be
|
||||||
|
linked without the Library, or if the work is itself a library. The
|
||||||
|
threshold for this to be true is not precisely defined by law.
|
||||||
|
|
||||||
|
If such an object file uses only numerical parameters, data
|
||||||
|
structure layouts and accessors, and small macros and small inline
|
||||||
|
functions (ten lines or less in length), then the use of the object
|
||||||
|
file is unrestricted, regardless of whether it is legally a derivative
|
||||||
|
work. (Executables containing this object code plus portions of the
|
||||||
|
Library will still fall under Section 6.)
|
||||||
|
|
||||||
|
Otherwise, if the work is a derivative of the Library, you may
|
||||||
|
distribute the object code for the work under the terms of Section 6.
|
||||||
|
Any executables containing that work also fall under Section 6,
|
||||||
|
whether or not they are linked directly with the Library itself.
|
||||||
|
|
||||||
|
6. As an exception to the Sections above, you may also combine or
|
||||||
|
link a "work that uses the Library" with the Library to produce a
|
||||||
|
work containing portions of the Library, and distribute that work
|
||||||
|
under terms of your choice, provided that the terms permit
|
||||||
|
modification of the work for the customer's own use and reverse
|
||||||
|
engineering for debugging such modifications.
|
||||||
|
|
||||||
|
You must give prominent notice with each copy of the work that the
|
||||||
|
Library is used in it and that the Library and its use are covered by
|
||||||
|
this License. You must supply a copy of this License. If the work
|
||||||
|
during execution displays copyright notices, you must include the
|
||||||
|
copyright notice for the Library among them, as well as a reference
|
||||||
|
directing the user to the copy of this License. Also, you must do one
|
||||||
|
of these things:
|
||||||
|
|
||||||
|
a) Accompany the work with the complete corresponding
|
||||||
|
machine-readable source code for the Library including whatever
|
||||||
|
changes were used in the work (which must be distributed under
|
||||||
|
Sections 1 and 2 above); and, if the work is an executable linked
|
||||||
|
with the Library, with the complete machine-readable "work that
|
||||||
|
uses the Library", as object code and/or source code, so that the
|
||||||
|
user can modify the Library and then relink to produce a modified
|
||||||
|
executable containing the modified Library. (It is understood
|
||||||
|
that the user who changes the contents of definitions files in the
|
||||||
|
Library will not necessarily be able to recompile the application
|
||||||
|
to use the modified definitions.)
|
||||||
|
|
||||||
|
b) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (1) uses at run time a
|
||||||
|
copy of the library already present on the user's computer system,
|
||||||
|
rather than copying library functions into the executable, and (2)
|
||||||
|
will operate properly with a modified version of the library, if
|
||||||
|
the user installs one, as long as the modified version is
|
||||||
|
interface-compatible with the version that the work was made with.
|
||||||
|
|
||||||
|
c) Accompany the work with a written offer, valid for at
|
||||||
|
least three years, to give the same user the materials
|
||||||
|
specified in Subsection 6a, above, for a charge no more
|
||||||
|
than the cost of performing this distribution.
|
||||||
|
|
||||||
|
d) If distribution of the work is made by offering access to copy
|
||||||
|
from a designated place, offer equivalent access to copy the above
|
||||||
|
specified materials from the same place.
|
||||||
|
|
||||||
|
e) Verify that the user has already received a copy of these
|
||||||
|
materials or that you have already sent this user a copy.
|
||||||
|
|
||||||
|
For an executable, the required form of the "work that uses the
|
||||||
|
Library" must include any data and utility programs needed for
|
||||||
|
reproducing the executable from it. However, as a special exception,
|
||||||
|
the materials to be distributed need not include anything that is
|
||||||
|
normally distributed (in either source or binary form) with the major
|
||||||
|
components (compiler, kernel, and so on) of the operating system on
|
||||||
|
which the executable runs, unless that component itself accompanies
|
||||||
|
the executable.
|
||||||
|
|
||||||
|
It may happen that this requirement contradicts the license
|
||||||
|
restrictions of other proprietary libraries that do not normally
|
||||||
|
accompany the operating system. Such a contradiction means you cannot
|
||||||
|
use both them and the Library together in an executable that you
|
||||||
|
distribute.
|
||||||
|
|
||||||
|
7. You may place library facilities that are a work based on the
|
||||||
|
Library side-by-side in a single library together with other library
|
||||||
|
facilities not covered by this License, and distribute such a combined
|
||||||
|
library, provided that the separate distribution of the work based on
|
||||||
|
the Library and of the other library facilities is otherwise
|
||||||
|
permitted, and provided that you do these two things:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work
|
||||||
|
based on the Library, uncombined with any other library
|
||||||
|
facilities. This must be distributed under the terms of the
|
||||||
|
Sections above.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library of the fact
|
||||||
|
that part of it is a work based on the Library, and explaining
|
||||||
|
where to find the accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
8. You may not copy, modify, sublicense, link with, or distribute
|
||||||
|
the Library except as expressly provided under this License. Any
|
||||||
|
attempt otherwise to copy, modify, sublicense, link with, or
|
||||||
|
distribute the Library is void, and will automatically terminate your
|
||||||
|
rights under this License. However, parties who have received copies,
|
||||||
|
or rights, from you under this License will not have their licenses
|
||||||
|
terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
|
9. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Library or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Library (or any work based on the
|
||||||
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Library or works based on it.
|
||||||
|
|
||||||
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
|
Library), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
|
subject to these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties with
|
||||||
|
this License.
|
||||||
|
|
||||||
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Library at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Library by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Library under this License may add
|
||||||
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
|
versions of the Lesser General Public License from time to time.
|
||||||
|
Such new versions will be similar in spirit to the present version,
|
||||||
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Library
|
||||||
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published by
|
||||||
|
the Free Software Foundation. If the Library does not specify a
|
||||||
|
license version number, you may choose any version ever published by
|
||||||
|
the Free Software Foundation.
|
||||||
|
|
||||||
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
|
programs whose distribution conditions are incompatible with these,
|
||||||
|
write to the author to ask for permission. For software which is
|
||||||
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
|
decision will be guided by the two goals of preserving the free status
|
||||||
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Libraries
|
||||||
|
|
||||||
|
If you develop a new library, and you want it to be of the greatest
|
||||||
|
possible use to the public, we recommend making it free software that
|
||||||
|
everyone can redistribute and change. You can do so by permitting
|
||||||
|
redistribution under these terms (or, alternatively, under the terms of the
|
||||||
|
ordinary General Public License).
|
||||||
|
|
||||||
|
To apply these terms, attach the following notices to the library. It is
|
||||||
|
safest to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the library's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
|
||||||
|
USA
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||||
|
library `Frob' (a library for tweaking knobs) written by James Random
|
||||||
|
Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1990
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
That's all there is to it!
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client
|
A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) client
|
||||||
|
|
||||||
[中文介绍](README/doc/README_zh_CN.md)
|
[中文介绍](doc/README/README_zh_CN.md)
|
||||||
|
|
||||||
***
|
***
|
||||||
|
|
||||||
@@ -26,9 +26,9 @@ A cross-platform GUI for [Proxmark3](https://github.com/Proxmark/proxmark3) clie
|
|||||||
***
|
***
|
||||||
|
|
||||||
## Preview
|
## Preview
|
||||||

|

|
||||||
|
|
||||||
[more previews](README/doc/previews.md)
|
[more previews](doc/preview/previews.md)
|
||||||
|
|
||||||
***
|
***
|
||||||
|
|
||||||
@@ -55,63 +55,17 @@ Great thanks to him.
|
|||||||
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
|
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
|
||||||
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
|
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
|
||||||
cd Proxmark3GUI
|
cd Proxmark3GUI
|
||||||
mkdir build
|
mkdir build && cd build
|
||||||
cd build
|
qmake ../src
|
||||||
qmake ../
|
make -j4 && make clean
|
||||||
make
|
|
||||||
make clean
|
|
||||||
cp -r ../lang ./
|
|
||||||
cp -r ../config ./
|
|
||||||
./Proxmark3GUI
|
./Proxmark3GUI
|
||||||
|
|
||||||
***
|
***
|
||||||
|
## Tutorial
|
||||||
|
|
||||||
## Update Log:
|
[1.Quickstart](doc/tutorial/Quickstart/quickstart.md)
|
||||||
|
[2.Edit Mifare Classic data](doc/tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data.md)(Proxmark3 hardware is not necessary)
|
||||||
|
***
|
||||||
|
|
||||||
### V0.2.2
|
## Change Log
|
||||||
+ Load command format from external json file
|
[Change Log](CHANGELOG.md)
|
||||||
+ 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
|
|
||||||
+ Use Dock widget for more flexible layout
|
|
||||||
+ Support basic LF commands
|
|
||||||
+ Fix a bug in RawCommand tab
|
|
||||||
|
|
||||||
### V0.1.4
|
|
||||||
+ Optimize performance
|
|
||||||
+ Optimize UI
|
|
||||||
+ Search available ports automatically
|
|
||||||
+ Add High-DPI support
|
|
||||||
+ Support configuring environment variables by script
|
|
||||||
(Useful when the client requires specific environment variables)
|
|
||||||
+ All functions are compatible with Iceman/RRG repo(tested on v4.9237)
|
|
||||||
+ Support specifying client working directory
|
|
||||||
+ Fix some bugs
|
|
||||||
|
|
||||||
### V0.1.3
|
|
||||||
+ Fix Trailer Decoder
|
|
||||||
+ Add feedback when writing selected blocks
|
|
||||||
|
|
||||||
### V0.1.2
|
|
||||||
+ Optimize read logic
|
|
||||||
+ Make UI Customizable
|
|
||||||
+ Save client path automatically
|
|
||||||
+ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version)
|
|
||||||
+ Support read/write selected blocks
|
|
||||||
+ Support a few Iceman functions
|
|
||||||
+ Fix some bugs
|
|
||||||
|
|
||||||
### V0.1.1
|
|
||||||
+ Complete Mifare module(support simulate and sniff)
|
|
||||||
|
|
||||||
### V0.1
|
|
||||||
+ Able to deal with Mifare card and related files
|
|
||||||
|
|
||||||
### V0.0.1
|
|
||||||
+ a dumb version with a useless GUI and a serial choose box.
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
## Previews
|
|
||||||
|
|
||||||
Raw Command:
|
|
||||||

|
|
||||||
|
|
||||||
Mifare Nested Attack:
|
|
||||||

|
|
||||||
|
|
||||||
Mifare Load File:
|
|
||||||

|
|
||||||
|
|
||||||
Mifare Edit File:
|
|
||||||

|
|
||||||
|
|
||||||
Mifare Trailer Decoder:
|
|
||||||

|
|
||||||
|
|
||||||
Dock Widget:
|
|
||||||

|
|
||||||

|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<RCC>
|
||||||
|
<qresource prefix="/config">
|
||||||
|
<file>config_official.json</file>
|
||||||
|
<file>config_rrgv4.13441.json</file>
|
||||||
|
<file>config_rrgv4.15864.json</file>
|
||||||
|
</qresource>
|
||||||
|
</RCC>
|
||||||
@@ -10,6 +10,13 @@
|
|||||||
"2k": "2",
|
"2k": "2",
|
||||||
"4k": "4"
|
"4k": "4"
|
||||||
},
|
},
|
||||||
|
"//": "|---|----------------|---|----------------|---| ",
|
||||||
|
"//": "|sec|key A |res|key B |res| ",
|
||||||
|
"//": "|---|----------------|---|----------------|---| ",
|
||||||
|
"//": "|000| ffffffffffff | 1 | ffffffffffff | 1 | ",
|
||||||
|
"//": "......",
|
||||||
|
"//": "|---|----------------|---|----------------|---| ",
|
||||||
|
"//": "",
|
||||||
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
||||||
"key A index": 2,
|
"key A index": 2,
|
||||||
"key B index": 4
|
"key B index": 4
|
||||||
@@ -22,6 +29,15 @@
|
|||||||
"2k": "2",
|
"2k": "2",
|
||||||
"4k": "4"
|
"4k": "4"
|
||||||
},
|
},
|
||||||
|
"//": "|---|----------------|----------------| ",
|
||||||
|
"//": "|sec|key A |key B | ",
|
||||||
|
"//": "|---|----------------|----------------| ",
|
||||||
|
"//": "|000| ffffffffffff | ffffffffffff | ",
|
||||||
|
"//": "......",
|
||||||
|
"//": "|004| ? | ? | ",
|
||||||
|
"//": "......",
|
||||||
|
"//": "|---|----------------|----------------| ",
|
||||||
|
"//": " ",
|
||||||
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
||||||
"key A index": 2,
|
"key A index": 2,
|
||||||
"key B index": 3
|
"key B index": 3
|
||||||
@@ -39,10 +55,22 @@
|
|||||||
"cmd": "hf list mf"
|
"cmd": "hf list mf"
|
||||||
},
|
},
|
||||||
"dump": {
|
"dump": {
|
||||||
"cmd": "hf mf dump"
|
"cmd": "hf mf dump <card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "0",
|
||||||
|
"1k": "1",
|
||||||
|
"2k": "2",
|
||||||
|
"4k": "4"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"restore": {
|
"restore": {
|
||||||
"cmd": "hf mf restore"
|
"cmd": "hf mf restore <card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "0",
|
||||||
|
"1k": "1",
|
||||||
|
"2k": "2",
|
||||||
|
"4k": "4"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"emulator wipe": {
|
"emulator wipe": {
|
||||||
"cmd": "hf mf eclr"
|
"cmd": "hf mf eclr"
|
||||||
@@ -191,5 +219,15 @@
|
|||||||
"cmd": "lf config q <divisor> b <bits per sample> d <decimation> a <averaging> t <trigger threshold> s <samples to skip>",
|
"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>"
|
"divisor cmd": "hw setlfdivisor <divisor>"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"t55xx": {
|
||||||
|
"clone em410x": {
|
||||||
|
"read": "lf search",
|
||||||
|
"successful read flag": "Valid EM410x ID",
|
||||||
|
"pattern": "EM TAG ID\\s*:\\s\\K[0-9a-fA-F]{10}",
|
||||||
|
"clone cmd": "lf em 410xwrite <id> <type>",
|
||||||
|
"t5555 flag": "0",
|
||||||
|
"t55x7 flag": "1"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -15,6 +15,13 @@
|
|||||||
"A": "a",
|
"A": "a",
|
||||||
"B": "b"
|
"B": "b"
|
||||||
},
|
},
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] | Sec | key A |res| key B |res|",
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] | 000 | ffffffffffff | 1 | ffffffffffff | 1 |",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] ( 0:Failed / 1:Success )",
|
||||||
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
||||||
"key A index": 2,
|
"key A index": 2,
|
||||||
"key B index": 4
|
"key B index": 4
|
||||||
@@ -27,6 +34,15 @@
|
|||||||
"2k": "2k",
|
"2k": "2k",
|
||||||
"4k": "4k"
|
"4k": "4k"
|
||||||
},
|
},
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] | Sec | key A |res| key B |res|",
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] | 000 | ffffffffffff | 1 | ffffffffffff | 1 |",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] | 004 | ------------ | 0 | ------------ | 0 |",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] |-----|----------------|---|----------------|---|",
|
||||||
|
"//": "[+] ( 0:Failed / 1:Success )",
|
||||||
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
"key pattern": "\\|\\s*\\d{3}\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|\\s*.+?\\s*\\|",
|
||||||
"key A index": 2,
|
"key A index": 2,
|
||||||
"key B index": 4
|
"key B index": 4
|
||||||
@@ -44,10 +60,22 @@
|
|||||||
"cmd": "trace list -t mf"
|
"cmd": "trace list -t mf"
|
||||||
},
|
},
|
||||||
"dump": {
|
"dump": {
|
||||||
"cmd": "hf mf dump"
|
"cmd": "hf mf dump --<card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "mini",
|
||||||
|
"1k": "1k",
|
||||||
|
"2k": "2k",
|
||||||
|
"4k": "4k"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"restore": {
|
"restore": {
|
||||||
"cmd": "hf mf restore"
|
"cmd": "hf mf restore --<card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "mini",
|
||||||
|
"1k": "1k",
|
||||||
|
"2k": "2k",
|
||||||
|
"4k": "4k"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"emulator wipe": {
|
"emulator wipe": {
|
||||||
"cmd": "hf mf eclr"
|
"cmd": "hf mf eclr"
|
||||||
@@ -199,5 +227,15 @@
|
|||||||
"cmd": "lf config --divisor <divisor> --bps <bits per sample> --dec <decimation> --avg <averaging> --trig <trigger threshold> --skip <samples to skip>",
|
"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>"
|
"divisor cmd": "hw setlfdivisor -d <divisor>"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"t55xx": {
|
||||||
|
"clone em410x": {
|
||||||
|
"read": "lf em 410x reader",
|
||||||
|
"successful read flag": "EM 410x ID",
|
||||||
|
"pattern": "EM 410x ID\\s*\\K[0-9a-fA-F]{10}",
|
||||||
|
"clone cmd": "lf em 410x clone --id <id> <type>",
|
||||||
|
"t5555 flag": "--q5",
|
||||||
|
"t55x7 flag": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
{
|
||||||
|
"//": "Based on Proxmark3 rrg repo v4.15864, commit 1f75adc",
|
||||||
|
"//": "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"
|
||||||
|
},
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] Sec | Blk | key A |res| key B |res",
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] 000 | 003 | FFFFFFFFFFFF | 1 | FFFFFFFFFFFF | 1",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] ( 0:Failed / 1:Success )",
|
||||||
|
"key pattern": "\\s*\\d{3}\\s*\\|\\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"
|
||||||
|
},
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] Sec | Blk | key A |res| key B |res",
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] 000 | 003 | FFFFFFFFFFFF | 1 | FFFFFFFFFFFF | 1",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] 004 | 019 | ------------ | 0 | ------------ | 0",
|
||||||
|
"//": "......",
|
||||||
|
"//": "[+] -----+-----+--------------+---+--------------+----",
|
||||||
|
"//": "[+] ( 0:Failed / 1:Success )",
|
||||||
|
"key pattern": "\\s*\\d{3}\\s*\\|\\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 --<card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "mini",
|
||||||
|
"1k": "1k",
|
||||||
|
"2k": "2k",
|
||||||
|
"4k": "4k"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"restore": {
|
||||||
|
"cmd": "hf mf restore --<card type>",
|
||||||
|
"card type": {
|
||||||
|
"mini": "mini",
|
||||||
|
"1k": "1k",
|
||||||
|
"2k": "2k",
|
||||||
|
"4k": "4k"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"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": "\\[#\\] \\S",
|
||||||
|
"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>"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"t55xx": {
|
||||||
|
"clone em410x": {
|
||||||
|
"read": "lf em 410x reader",
|
||||||
|
"successful read flag": "EM 410x ID",
|
||||||
|
"pattern": "EM 410x ID\\s*\\K[0-9a-fA-F]{10}",
|
||||||
|
"clone cmd": "lf em 410x clone --id <id> <type>",
|
||||||
|
"t5555 flag": "--q5",
|
||||||
|
"t55x7 flag": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/V*-*
|
||||||
|
/V*-*/
|
||||||
|
/32/
|
||||||
|
/64/
|
||||||
|
/client/
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# Deploy helper
|
||||||
|
Just for generating Github release
|
||||||
|
Useless for general users
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
import os, sys, shutil
|
||||||
|
from win32api import GetFileVersionInfo
|
||||||
|
from json import load
|
||||||
|
from re import fullmatch, sub, IGNORECASE
|
||||||
|
|
||||||
|
compressDirList = []
|
||||||
|
|
||||||
|
|
||||||
|
def getPEVersion(fname):
|
||||||
|
try:
|
||||||
|
fileInfo = GetFileVersionInfo(fname, "\\")
|
||||||
|
version = "V%d.%d.%d" % (
|
||||||
|
fileInfo["FileVersionMS"] / 65536,
|
||||||
|
fileInfo["FileVersionMS"] % 65536,
|
||||||
|
fileInfo["FileVersionLS"] / 65536,
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
print("Cannot get version number of", fname)
|
||||||
|
return version
|
||||||
|
|
||||||
|
|
||||||
|
os.chdir(sys.path[0])
|
||||||
|
print("Current Directory:", os.getcwd())
|
||||||
|
targetName = os.path.abspath(os.getcwd()).split("\\")[-2]
|
||||||
|
print("Target Name", targetName)
|
||||||
|
|
||||||
|
src32Dir = ""
|
||||||
|
src64Dir = ""
|
||||||
|
dirList = os.listdir("../")
|
||||||
|
|
||||||
|
for i in dirList:
|
||||||
|
if not os.path.isdir("../" + i):
|
||||||
|
continue
|
||||||
|
if not i.startswith("build"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if i.endswith("32_bit-Release"):
|
||||||
|
src32Dir = "../" + i
|
||||||
|
elif i.endswith("64_bit-Release"):
|
||||||
|
src64Dir = "../" + i
|
||||||
|
|
||||||
|
src32Path = src32Dir + "/release/" + targetName + ".exe"
|
||||||
|
src64Path = src64Dir + "/release/" + targetName + ".exe"
|
||||||
|
print("Target Files:")
|
||||||
|
print(src32Path)
|
||||||
|
print(src64Path)
|
||||||
|
|
||||||
|
ver32 = getPEVersion(src32Path)
|
||||||
|
ver64 = getPEVersion(src64Path)
|
||||||
|
print("Versions:")
|
||||||
|
print("win32:", ver32)
|
||||||
|
print("win64:", ver64)
|
||||||
|
if ver32 != ver64:
|
||||||
|
print("WARNING!")
|
||||||
|
print("Version names are not the same!")
|
||||||
|
dst32Dir = "./" + ver32 + "-win32"
|
||||||
|
dst64Dir = "./" + ver64 + "-win64"
|
||||||
|
dst32Path = dst32Dir + "/" + targetName + ".exe"
|
||||||
|
dst64Path = dst64Dir + "/" + targetName + ".exe"
|
||||||
|
|
||||||
|
if os.path.exists(dst32Dir) and os.path.exists(dst32Path):
|
||||||
|
print(dst32Path, "exists, replacing...")
|
||||||
|
os.remove(dst32Path)
|
||||||
|
elif not os.path.exists(dst32Dir):
|
||||||
|
print(dst32Dir, "doesn't exist, creating...")
|
||||||
|
shutil.copytree("./32", dst32Dir)
|
||||||
|
shutil.copyfile(src32Path, dst32Path)
|
||||||
|
compressDirList.append(dst32Dir)
|
||||||
|
|
||||||
|
if os.path.exists(dst64Dir) and os.path.exists(dst64Path):
|
||||||
|
print(dst64Path, "exists, replacing...")
|
||||||
|
os.remove(dst64Path)
|
||||||
|
elif not os.path.exists(dst64Dir):
|
||||||
|
print(dst64Dir, "doesn't exist, creating...")
|
||||||
|
shutil.copytree("./64", dst64Dir)
|
||||||
|
shutil.copyfile(src64Path, dst64Path)
|
||||||
|
compressDirList.append(dst64Dir)
|
||||||
|
|
||||||
|
# TODO: GUI+client
|
||||||
|
clientList = [
|
||||||
|
"official-v3.1.0",
|
||||||
|
"rrg_other-v4.13441",
|
||||||
|
"rrg_other-v4.14434",
|
||||||
|
"rrg_other-v4.14831",
|
||||||
|
"rrg_other-v4.15864",
|
||||||
|
]
|
||||||
|
|
||||||
|
configList = []
|
||||||
|
for config in os.listdir("../config"):
|
||||||
|
configPath = os.path.join("../config", config)
|
||||||
|
if os.path.isfile(configPath) and config.endswith(".json"):
|
||||||
|
configList.append(config)
|
||||||
|
|
||||||
|
|
||||||
|
def generateClient(clientName):
|
||||||
|
global compressDirList
|
||||||
|
clientSrcDir = "./client/" + clientName
|
||||||
|
clientDstDir = "./" + ver64 + "-win64-" + clientName
|
||||||
|
clientDstGUIDir = clientDstDir + "/GUI"
|
||||||
|
|
||||||
|
if os.path.exists(clientDstDir) and os.path.exists(clientDstGUIDir):
|
||||||
|
print(clientDstGUIDir, "exists, replacing...")
|
||||||
|
shutil.rmtree(clientDstGUIDir)
|
||||||
|
elif not os.path.exists(clientDstDir):
|
||||||
|
print(clientDstDir, "doesn't exist, creating...")
|
||||||
|
shutil.copytree(clientSrcDir, clientDstDir)
|
||||||
|
shutil.copytree(dst64Dir, clientDstGUIDir)
|
||||||
|
if "official" in clientName:
|
||||||
|
shutil.copyfile(
|
||||||
|
"./client/GUIsettings_Official.ini", clientDstGUIDir + "/GUIsettings.ini"
|
||||||
|
)
|
||||||
|
elif "rrg" in clientName:
|
||||||
|
shutil.copyfile(
|
||||||
|
"./client/GUIsettings_RRG.ini", clientDstGUIDir + "/GUIsettings.ini"
|
||||||
|
)
|
||||||
|
# Use exactly matched configFile if possible
|
||||||
|
version = clientName[clientName.find("v") :]
|
||||||
|
for config in configList:
|
||||||
|
if version in config:
|
||||||
|
print("Find matched config file", config)
|
||||||
|
with open(
|
||||||
|
clientDstGUIDir + "/GUIsettings.ini", "r", encoding="utf-8"
|
||||||
|
) as f:
|
||||||
|
data = f.read()
|
||||||
|
data = sub(
|
||||||
|
"configFile=:/config/.+\\.json",
|
||||||
|
"configFile=:/config/" + config,
|
||||||
|
data,
|
||||||
|
)
|
||||||
|
with open(
|
||||||
|
clientDstGUIDir + "/GUIsettings.ini", "w", encoding="utf-8"
|
||||||
|
) as f:
|
||||||
|
f.write(data)
|
||||||
|
|
||||||
|
compressDirList.append(clientDstDir)
|
||||||
|
return clientDstDir
|
||||||
|
|
||||||
|
|
||||||
|
for cl in clientList:
|
||||||
|
generateClient(cl)
|
||||||
|
|
||||||
|
use7z = input("Compress?(y/N)")
|
||||||
|
if fullmatch("yes|y", use7z, IGNORECASE):
|
||||||
|
print(compressDirList)
|
||||||
|
for it in compressDirList:
|
||||||
|
archivePath = it + ".7z"
|
||||||
|
|
||||||
|
if os.path.exists(archivePath):
|
||||||
|
print(archivePath, "exists, replacing...")
|
||||||
|
os.remove(archivePath)
|
||||||
|
os.system("7z a -t7z -mmt8 -mx9 " + archivePath + " " + it)
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
# 更新日志
|
||||||
|
|
||||||
|
[English](../../CHANGELOG.md)
|
||||||
|
|
||||||
|
### V0.2.6
|
||||||
|
+ 支持冰人版客户端 v4.15864 [#37](https://github.com/wh201906/Proxmark3GUI/issues/37)
|
||||||
|
+ 优化Mifare Classic卡写卡逻辑
|
||||||
|
+ 修复lf config默认配置
|
||||||
|
+ 添加客户端无法启动的提示
|
||||||
|
+ 添加PM3硬件连接失败的提示
|
||||||
|
+ 为PM3对应串口添加提示,并自动选中
|
||||||
|
+ 修复原始指令框中有多余空行的问题
|
||||||
|
+ 内嵌不同客户端的配置文件
|
||||||
|
+ 去除从nested attack切换到staticnested attack的等待时间
|
||||||
|
|
||||||
|
### V0.2.5
|
||||||
|
+ 修复 [#28](https://github.com/wh201906/Proxmark3GUI/issues/28)
|
||||||
|
|
||||||
|
### V0.2.4
|
||||||
|
+ 复制EM410x卡(一种常见的低频ID卡)
|
||||||
|
|
||||||
|
### V0.2.3
|
||||||
|
+ 修复 [#27](https://github.com/wh201906/Proxmark3GUI/issues/27)
|
||||||
|
+ 尝试支持中文启动路径
|
||||||
|
|
||||||
|
### 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
|
||||||
|
+ 使用浮动窗口,界面配置更加灵活
|
||||||
|
+ 支持部分低频命令
|
||||||
|
+ 修复原始命令选项卡中的一个Bug
|
||||||
|
|
||||||
|
### V0.1.4
|
||||||
|
+ 优化性能
|
||||||
|
+ 优化用户界面
|
||||||
|
+ 自动搜索可用端口
|
||||||
|
+ 支持高分屏
|
||||||
|
+ 可通过外部脚本配置环境变量
|
||||||
|
(在客户端需要配置环境变量时很有用)
|
||||||
|
+ 全功能兼容冰人版(在v4.9237上测试通过)
|
||||||
|
+ 支持指定客户端工作路径
|
||||||
|
+ 修复部分bug
|
||||||
|
|
||||||
|
### V0.1.3
|
||||||
|
+ 修复访问控制位解码器
|
||||||
|
+ 写多个块时显示写入结果
|
||||||
|
|
||||||
|
### V0.1.2
|
||||||
|
+ 优化读卡逻辑
|
||||||
|
+ UI自定义
|
||||||
|
+ 自动保存客户端路径
|
||||||
|
+ 添加访问控制位解码器(也可用于自己构造访问控制位)(有bug,请使用V0.1.3或更高版本)
|
||||||
|
+ 支持仅读写选中块
|
||||||
|
+ 支持部分冰人功能
|
||||||
|
+ 修复部分bug
|
||||||
|
|
||||||
|
### V0.1.1
|
||||||
|
+ 完成整个Mifare模块(支持模拟卡和嗅探功能)
|
||||||
|
|
||||||
|
### V0.1
|
||||||
|
+ 支持处理Mifare卡片及相关数据文件
|
||||||
|
|
||||||
|
### V0.0.1
|
||||||
|
+ 一个带串口选择框的实验版本
|
||||||
@@ -26,9 +26,9 @@
|
|||||||
***
|
***
|
||||||
|
|
||||||
## 预览图
|
## 预览图
|
||||||

|

|
||||||
|
|
||||||
[更多预览](../doc/previews.md)
|
[更多预览](../preview/previews.md)
|
||||||
|
|
||||||
***
|
***
|
||||||
|
|
||||||
@@ -54,63 +54,16 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客
|
|||||||
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
|
sudo apt-get install qt5-default libqt5serialport5 libqt5serialport5-dev
|
||||||
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
|
git clone https://github.com/wh201906/Proxmark3GUI.git --depth=1
|
||||||
cd Proxmark3GUI
|
cd Proxmark3GUI
|
||||||
mkdir build
|
mkdir build && cd build
|
||||||
cd build
|
qmake ../src
|
||||||
qmake ../
|
make -j4 && make clean
|
||||||
make
|
|
||||||
make clean
|
|
||||||
cp -r ../lang ./
|
|
||||||
cp -r ../config ./
|
|
||||||
./Proxmark3GUI
|
./Proxmark3GUI
|
||||||
|
|
||||||
***
|
***
|
||||||
|
## 教程
|
||||||
|
[1.快速上手](../tutorial/Quickstart/quickstart_zh_CN.md)
|
||||||
|
[2.编辑Mifare(IC)卡数据](../tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data_zh_CN.md)(无需PM3硬件)
|
||||||
|
***
|
||||||
|
|
||||||
## 更新日志:
|
## 更新日志
|
||||||
|
[更新日志](../CHANGELOG/CHANGELOG_zh_CN.md)
|
||||||
### 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
|
|
||||||
+ 使用浮动窗口,界面配置更加灵活
|
|
||||||
+ 支持部分低频命令
|
|
||||||
+ 修复原始命令选项卡中的一个Bug
|
|
||||||
|
|
||||||
### V0.1.4
|
|
||||||
+ 优化性能
|
|
||||||
+ 优化用户界面
|
|
||||||
+ 自动搜索可用端口
|
|
||||||
+ 支持高分屏
|
|
||||||
+ 可通过外部脚本配置环境变量
|
|
||||||
(在客户端需要配置环境变量时很有用)
|
|
||||||
+ 全功能兼容冰人版(在v4.9237上测试通过)
|
|
||||||
+ 支持指定客户端工作路径
|
|
||||||
+ 修复部分bug
|
|
||||||
|
|
||||||
### V0.1.3
|
|
||||||
+ 修复访问控制位解码器
|
|
||||||
+ 写多个块时显示写入结果
|
|
||||||
|
|
||||||
### V0.1.2
|
|
||||||
+ 优化读卡逻辑
|
|
||||||
+ UI自定义
|
|
||||||
+ 自动保存客户端路径
|
|
||||||
+ 添加访问控制位解码器(也可用于自己构造访问控制位)(有bug,请使用V0.1.3或更高版本)
|
|
||||||
+ 支持仅读写选中块
|
|
||||||
+ 支持部分冰人功能
|
|
||||||
+ 修复部分bug
|
|
||||||
|
|
||||||
### V0.1.1
|
|
||||||
+ 完成整个Mifare模块(支持模拟卡和嗅探功能)
|
|
||||||
|
|
||||||
### V0.1
|
|
||||||
+ 支持处理Mifare卡片及相关数据文件
|
|
||||||
|
|
||||||
### V0.0.1
|
|
||||||
+ 一个带串口选择框的实验版本
|
|
||||||
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 797 KiB After Width: | Height: | Size: 797 KiB |
|
Before Width: | Height: | Size: 438 KiB After Width: | Height: | Size: 438 KiB |
|
Before Width: | Height: | Size: 468 KiB After Width: | Height: | Size: 468 KiB |
@@ -0,0 +1,20 @@
|
|||||||
|
## Previews
|
||||||
|
|
||||||
|
Raw Command:
|
||||||
|

|
||||||
|
|
||||||
|
Mifare Nested Attack:
|
||||||
|

|
||||||
|
|
||||||
|
Mifare Load File:
|
||||||
|

|
||||||
|
|
||||||
|
Mifare Edit File:
|
||||||
|

|
||||||
|
|
||||||
|
Mifare Trailer Decoder:
|
||||||
|

|
||||||
|
|
||||||
|
Dock Widget:
|
||||||
|

|
||||||
|

|
||||||
|
Before Width: | Height: | Size: 345 KiB After Width: | Height: | Size: 345 KiB |
@@ -0,0 +1,50 @@
|
|||||||
|
# Edit Mifare Classic data
|
||||||
|
|
||||||
|
[中文教程](Edit_Mifare_Classic_data_zh_CN.md)
|
||||||
|
This function is useful even if you don't use Proxmark3.
|
||||||
|
|
||||||
|
## About card type
|
||||||
|
There are four sizes of Mifare Classic card
|
||||||
|
+ 320Byte, also known as MINI, S20
|
||||||
|
+ 1kB, also known as S50
|
||||||
|
+ 2kB
|
||||||
|
+ 4kB, alsow known as S70
|
||||||
|
|
||||||
|
Before any operation, you need to choose the right card type.
|
||||||
|
If you don't know your card type, you can try 1K first. Mifare Classic S50(1K) is the most common type.
|
||||||
|

|
||||||
|
|
||||||
|
## About file format
|
||||||
|
This program supports binary data file and text data file.
|
||||||
|
Binary data files have the same size of chosen card type.(e.g, type 1K->1024KB data file).
|
||||||
|
The file extensions of them are always .dump or .bin.
|
||||||
|
You can edit them by hex editor or this program.
|
||||||
|

|
||||||
|
Text data files can be open by any text editors.
|
||||||
|
The file extensions of them are always .eml or .txt.
|
||||||
|

|
||||||
|
|
||||||
|
## Load
|
||||||
|
Go to "Mifare"->"File"->, choose "data" on the left and click "Load", then choose the file you want to load. The program will detect the file type by context.
|
||||||
|

|
||||||
|

|
||||||
|
Also, you can drag the file into data widget to load the data file.
|
||||||
|

|
||||||
|
|
||||||
|
## Edit
|
||||||
|
Double click any data row to start edit
|
||||||
|

|
||||||
|
You don't need to fill the space between every byte.
|
||||||
|

|
||||||
|
|
||||||
|
## Save
|
||||||
|
Go to "Mifare"->"File"->, choose "data" on the left and click "Save", then choose the path you want to save and the file format.
|
||||||
|

|
||||||
|
|
||||||
|
## File format convert
|
||||||
|
If you got a binary data file and you want to edit with notepad, here are the steps.
|
||||||
|
+ Load the orignal binary file
|
||||||
|
+ Save it as a text file
|
||||||
|
+ Edit the new file with whatever you want then save it
|
||||||
|
+ Load the edited file
|
||||||
|
+ Save it as binary file
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
# 编辑Mifare(IC)卡数据
|
||||||
|
|
||||||
|
[English](Edit_Mifare_Classic_data.md)
|
||||||
|
此功能对没有PM3硬件的用户也很有用。
|
||||||
|
|
||||||
|
## 关于卡类型
|
||||||
|
Mifare Classic卡有四种不同的容量
|
||||||
|
+ 320字节,也被称作MINI卡,S20卡
|
||||||
|
+ 1k字节,也被称为S50卡,最常见的型号
|
||||||
|
+ 2k字节
|
||||||
|
+ 4k字节,也被称为S70卡
|
||||||
|
|
||||||
|
在操作前,请先选择卡类型。
|
||||||
|
如果自己不清楚卡类型,可尝试选择1k卡,这是最常见的型号。
|
||||||
|

|
||||||
|
|
||||||
|
## 关于文件格式
|
||||||
|
此程序支持二进制文件格式和文本文件格式。
|
||||||
|
二进制文件的大小和所选卡类型的大小完全相等,文件中的每一个字节对应卡片数据中的一个字节。
|
||||||
|
二进制文件的后缀名一般是.dump或.bin。
|
||||||
|
此类文件需要使用16进制编辑器或者此程序来编辑。
|
||||||
|

|
||||||
|
文本文件可被任意文本编辑器打开。
|
||||||
|
此类文件的后缀名一般是.eml或.txt。
|
||||||
|

|
||||||
|
|
||||||
|
## 加载文件
|
||||||
|
在“Mifare”选项卡->“文件”框中勾选“数据”,点击“加载”按钮载入文件。
|
||||||
|
此程序会根据文件内容判断待加载的文件格式。
|
||||||
|

|
||||||
|

|
||||||
|
程序还支持拖拽加载。你可以直接把文件拖入左边数据显示器中。
|
||||||
|

|
||||||
|
|
||||||
|
## 编辑数据
|
||||||
|
双击数据行即可开始编辑。
|
||||||
|

|
||||||
|
编辑过程中无需手动补全字节间空格。
|
||||||
|

|
||||||
|
|
||||||
|
## 保存文件
|
||||||
|
在“Mifare”选项卡->“文件”框中勾选“数据”,点击“保存”按钮,选择保存的路径和文件格式即可保存文件。
|
||||||
|

|
||||||
|
|
||||||
|
## 文件格式转换
|
||||||
|
如果你想用其它文本编辑器编辑二进制文件,可以参考以下步骤
|
||||||
|
+ 加载原始二进制文件
|
||||||
|
+ 保存为文本文件
|
||||||
|
+ 用自己喜欢的文本编辑器编辑后保存
|
||||||
|
+ 加载编辑后的文件
|
||||||
|
+ 保存为二进制文件
|
||||||
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 4.0 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
@@ -0,0 +1,45 @@
|
|||||||
|
# Quickstart
|
||||||
|
|
||||||
|
[中文教程](quickstart_zh_CN.md)
|
||||||
|
***
|
||||||
|
**On Windows**
|
||||||
|
***
|
||||||
|
## Use GUI with included client
|
||||||
|
(1) Download the GUI with included client on [release](https://github.com/wh201906/Proxmark3GUI/releases) page
|
||||||
|

|
||||||
|
|
||||||
|
(2) Extract the .7z file to a path. The target path should not contain non-ASCII characters
|
||||||
|

|
||||||
|
|
||||||
|
(3) Open Proxmark3GUI.exe in the GUI folder, then select the language and click "OK". Now you can use it
|
||||||
|

|
||||||
|

|
||||||
|
|
||||||
|
## Use the GUI with your own client
|
||||||
|
(1) Download the standalone GUI on [release](https://github.com/wh201906/Proxmark3GUI/releases) page
|
||||||
|

|
||||||
|
|
||||||
|
(2) Extract the .7z file to a path. The target path should not contain non-ASCII characters. Make sure the client path and the GUI path are different.
|
||||||
|
|
||||||
|
(3) Open the GUI. Input the client path in the "Client Path" editbox on the top of the main window.
|
||||||
|

|
||||||
|
|
||||||
|
(4) Go to "Settings" panel. Input the config file path which matching the client you use.
|
||||||
|

|
||||||
|
|
||||||
|
(5) If setup.bat is required, input the script path in the "Preload script path" editbox.
|
||||||
|

|
||||||
|
|
||||||
|
(6) If using RRG/Iceman repo, input "-p \<port\> -f" in the "Start arguments" editbox.
|
||||||
|

|
||||||
|
|
||||||
|
***
|
||||||
|
**On Linux**
|
||||||
|
***
|
||||||
|
(1) Build the GUI by following the instructions on [README](../../../README.md)
|
||||||
|
(2) Config the GUI with the same steps of "On Windows"->"Use the GUI with your own client"
|
||||||
|
(3) You might need to change "\<port\>" to "/dev/\<port\>" in "Settings"->"Start arguments" editbox
|
||||||
|

|
||||||
|
|
||||||
|
(4) If you are using Raspbian(Raspberry OS), you might need to check "Keep the client active even the PM3 hardware is disconnected." in the "Steeings" panel
|
||||||
|

|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
# 快速上手
|
||||||
|
|
||||||
|
[English](quickstart.md)
|
||||||
|
***
|
||||||
|
**Windows用户**
|
||||||
|
***
|
||||||
|
## 使用包含客户端的版本
|
||||||
|
(1) 直接下载[release](https://github.com/wh201906/Proxmark3GUI/releases)当中包含客户端的版本即可
|
||||||
|

|
||||||
|
(例如Vx.x.x-win-Officialclient.7z或Vx.x.x-win-RRGclient.7z,前者为官方客户端,后者为冰人版/RRG客户端)
|
||||||
|
|
||||||
|
(2) 下载完成后将压缩包内所有内容解压到不含中文的路径当中
|
||||||
|

|
||||||
|
|
||||||
|
(3) 双击GUI目录下的Proxmark3GUI.exe,选择语言,点击OK,即可正常运行
|
||||||
|

|
||||||
|

|
||||||
|
***
|
||||||
|
|
||||||
|
## 使用现有客户端
|
||||||
|
(1) 下载[release](https://github.com/wh201906/Proxmark3GUI/releases)当中不包含客户端的版本
|
||||||
|

|
||||||
|
|
||||||
|
(2) 解压到不含中文的路径当中
|
||||||
|
(注意,GUI所在目录和PM3客户端所在目录不能相同)
|
||||||
|
|
||||||
|
(3) 双击打开,选择语言,在顶端“客户端路径”当中填入proxmark3.exe的路径
|
||||||
|

|
||||||
|
|
||||||
|
(4) 进入“设置”面板,根据自己使用的客户端类型(官方版/冰人版)选择正确的配置文件
|
||||||
|
(./config/config_official.json或./config/config_rrgv4.13.json)
|
||||||
|

|
||||||
|
|
||||||
|
(5) 若客户端启动时需要双击setup.bat启动,而setup.bat内会设置客户端运行时的环境变量,则需要在“预加载脚本路径”当中填入setup.bat的路径
|
||||||
|

|
||||||
|
|
||||||
|
(6) 若使用的是冰人固件,则可能需要在“启动参数”当中填入“-p \<port\> -f”
|
||||||
|

|
||||||
|
|
||||||
|
***
|
||||||
|
**Linux用户**
|
||||||
|
***
|
||||||
|
(1) 参考[README](../../README/README_zh_CN.md)当中的编译步骤手动编译Proxmark3GUI
|
||||||
|
(2) 参考“Windows用户”->“使用现有客户端”的(2)~(6)步进行配置
|
||||||
|
(3) “设置”->“启动参数”当中可能需要将“\<port\>”改为“/dev/\<port\>”
|
||||||
|

|
||||||
|
|
||||||
|
(4) 若使用树莓派Raspbian系统且连接成功若干秒后PM3会自动断开,则需要在“设置”面板中勾选“在PM3断开后保持客户端运行”
|
||||||
|

|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<RCC>
|
||||||
|
<qresource prefix="/i18n">
|
||||||
|
<file>en_US.qm</file>
|
||||||
|
<file>languages.ini</file>
|
||||||
|
<file>zh_CN.qm</file>
|
||||||
|
</qresource>
|
||||||
|
</RCC>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
[Languages]
|
||||||
|
en_US=English
|
||||||
|
zh_CN=简体中文
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
[Languages]
|
|
||||||
en_US=English
|
|
||||||
zh_CN=简体中文
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
#include "ui/mainwindow.h"
|
|
||||||
|
|
||||||
#include <QApplication>
|
|
||||||
#include <QSettings>
|
|
||||||
#include <QTranslator>
|
|
||||||
#include <QMessageBox>
|
|
||||||
#include <QTextCodec>
|
|
||||||
#include <QDir>
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
|
||||||
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
|
|
||||||
QDir *langPath = new QDir();
|
|
||||||
QApplication a(argc, argv);
|
|
||||||
MainWindow w;
|
|
||||||
|
|
||||||
QSettings* settings = new QSettings("GUIsettings.ini", QSettings::IniFormat);
|
|
||||||
settings->setIniCodec("UTF-8");
|
|
||||||
settings->beginGroup("lang");
|
|
||||||
QString currLang = settings->value("language", "").toString();
|
|
||||||
settings->endGroup();
|
|
||||||
if(currLang == "")
|
|
||||||
{
|
|
||||||
if(Util::chooseLanguage(settings, &w))
|
|
||||||
{
|
|
||||||
settings->beginGroup("lang");
|
|
||||||
currLang = settings->value("language", "").toString();
|
|
||||||
settings->endGroup();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
currLang = "en_US";
|
|
||||||
}
|
|
||||||
currLang += ".qm";
|
|
||||||
langPath->cd("lang");
|
|
||||||
QTranslator* translator = new QTranslator(&w);
|
|
||||||
if(translator->load(currLang, langPath->absolutePath()))
|
|
||||||
{
|
|
||||||
a.installTranslator(translator);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
QMessageBox::information(&w, "Error", "Can't load " + currLang + " as translation file.");
|
|
||||||
}
|
|
||||||
delete settings;
|
|
||||||
delete langPath;
|
|
||||||
w.initUI();
|
|
||||||
w.show();
|
|
||||||
return a.exec();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
# This file is used to ignore files which are generated
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
*~
|
||||||
|
*.autosave
|
||||||
|
*.a
|
||||||
|
*.core
|
||||||
|
*.moc
|
||||||
|
*.o
|
||||||
|
*.obj
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
*_pch.h.cpp
|
||||||
|
*_resource.rc
|
||||||
|
.#*
|
||||||
|
*.*#
|
||||||
|
core
|
||||||
|
!core/
|
||||||
|
tags
|
||||||
|
.DS_Store
|
||||||
|
.directory
|
||||||
|
*.debug
|
||||||
|
Makefile*
|
||||||
|
*.prl
|
||||||
|
*.app
|
||||||
|
moc_*.cpp
|
||||||
|
ui_*.h
|
||||||
|
qrc_*.cpp
|
||||||
|
Thumbs.db
|
||||||
|
*.res
|
||||||
|
*.rc
|
||||||
|
/.qmake.cache
|
||||||
|
/.qmake.stash
|
||||||
|
|
||||||
|
# qtcreator generated files
|
||||||
|
*.pro.user*
|
||||||
|
|
||||||
|
# xemacs temporary files
|
||||||
|
*.flc
|
||||||
|
|
||||||
|
# Vim temporary files
|
||||||
|
.*.swp
|
||||||
|
|
||||||
|
# Visual Studio generated files
|
||||||
|
*.ib_pdb_index
|
||||||
|
*.idb
|
||||||
|
*.ilk
|
||||||
|
*.pdb
|
||||||
|
*.sln
|
||||||
|
*.suo
|
||||||
|
*.vcproj
|
||||||
|
*vcproj.*.*.user
|
||||||
|
*.ncb
|
||||||
|
*.sdf
|
||||||
|
*.opensdf
|
||||||
|
*.vcxproj
|
||||||
|
*vcxproj.*
|
||||||
|
|
||||||
|
# MinGW generated files
|
||||||
|
*.Debug
|
||||||
|
*.Release
|
||||||
|
|
||||||
|
# Python byte code
|
||||||
|
*.pyc
|
||||||
|
|
||||||
|
# Binaries
|
||||||
|
# --------
|
||||||
|
*.dll
|
||||||
|
*.exe
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ SOURCES += \
|
|||||||
common/util.cpp \
|
common/util.cpp \
|
||||||
module/lf.cpp \
|
module/lf.cpp \
|
||||||
module/mifare.cpp \
|
module/mifare.cpp \
|
||||||
|
module/t55xxtab.cpp \
|
||||||
ui/mf_trailerdecoderdialog.cpp \
|
ui/mf_trailerdecoderdialog.cpp \
|
||||||
ui/mf_sim_simdialog.cpp \
|
ui/mf_sim_simdialog.cpp \
|
||||||
ui/mf_uid_parameterdialog.cpp \
|
ui/mf_uid_parameterdialog.cpp \
|
||||||
@@ -34,6 +35,7 @@ HEADERS += \
|
|||||||
common/util.h \
|
common/util.h \
|
||||||
module/lf.h \
|
module/lf.h \
|
||||||
module/mifare.h \
|
module/mifare.h \
|
||||||
|
module/t55xxtab.h \
|
||||||
ui/mf_trailerdecoderdialog.h \
|
ui/mf_trailerdecoderdialog.h \
|
||||||
ui/mf_sim_simdialog.h \
|
ui/mf_sim_simdialog.h \
|
||||||
ui/mf_uid_parameterdialog.h \
|
ui/mf_uid_parameterdialog.h \
|
||||||
@@ -41,6 +43,7 @@ HEADERS += \
|
|||||||
ui/mf_attack_hardnesteddialog.h \
|
ui/mf_attack_hardnesteddialog.h \
|
||||||
|
|
||||||
FORMS += \
|
FORMS += \
|
||||||
|
ui/t55xxtab.ui \
|
||||||
ui/mf_trailerdecoderdialog.ui \
|
ui/mf_trailerdecoderdialog.ui \
|
||||||
ui/mf_sim_simdialog.ui \
|
ui/mf_sim_simdialog.ui \
|
||||||
ui/mf_uid_parameterdialog.ui \
|
ui/mf_uid_parameterdialog.ui \
|
||||||
@@ -48,15 +51,19 @@ FORMS += \
|
|||||||
ui/mf_attack_hardnesteddialog.ui
|
ui/mf_attack_hardnesteddialog.ui
|
||||||
|
|
||||||
TRANSLATIONS += \
|
TRANSLATIONS += \
|
||||||
lang/zh_CN.ts \
|
../i18n/zh_CN.ts \
|
||||||
lang/en_US.ts
|
../i18n/en_US.ts
|
||||||
|
|
||||||
# Default rules for deployment.
|
# Default rules for deployment.
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
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.2
|
VERSION = 0.2.6
|
||||||
QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
|
QMAKE_TARGET_PRODUCT = "Proxmark3GUI"
|
||||||
QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
|
QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI"
|
||||||
QMAKE_TARGET_COMPANY = "wh201906"
|
QMAKE_TARGET_COMPANY = "wh201906"
|
||||||
|
|
||||||
|
RESOURCES += \
|
||||||
|
../i18n/language.qrc \
|
||||||
|
../config/config.qrc
|
||||||
@@ -13,6 +13,8 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
|
|||||||
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);
|
||||||
portInfo = nullptr;
|
portInfo = nullptr;
|
||||||
|
|
||||||
|
qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
|
||||||
}
|
}
|
||||||
|
|
||||||
void PM3Process::connectPM3(const QString& path, const QStringList args)
|
void PM3Process::connectPM3(const QString& path, const QStringList args)
|
||||||
@@ -26,7 +28,8 @@ 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 | QProcess::Text);
|
// single '\r' might appear. Don't use QProcess::Text there or '\r' is ignored.
|
||||||
|
start(path, args, QProcess::Unbuffered | QProcess::ReadWrite);
|
||||||
if(waitForStarted(10000))
|
if(waitForStarted(10000))
|
||||||
{
|
{
|
||||||
waitForReadyRead(10000);
|
waitForReadyRead(10000);
|
||||||
@@ -59,8 +62,13 @@ void PM3Process::connectPM3(const QString& path, const QStringList args)
|
|||||||
emit PM3StatedChanged(true, result);
|
emit PM3StatedChanged(true, result);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
emit HWConnectFailed();
|
||||||
kill();
|
kill();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setRequiringOutput(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PM3Process::reconnectPM3()
|
void PM3Process::reconnectPM3()
|
||||||
@@ -48,6 +48,7 @@ signals:
|
|||||||
void PM3StatedChanged(bool st, const QString& info = "");
|
void PM3StatedChanged(bool st, const QString& info = "");
|
||||||
void newOutput(const QString& output);
|
void newOutput(const QString& output);
|
||||||
void changeClientType(Util::ClientType);
|
void changeClientType(Util::ClientType);
|
||||||
|
void HWConnectFailed();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PM3PROCESS_H
|
#endif // PM3PROCESS_H
|
||||||
@@ -78,7 +78,13 @@ QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger, bool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
isRequiringOutput = false;
|
isRequiringOutput = false;
|
||||||
return (isResultFound || trigger.expectedOutputs.isEmpty() || rawOutput ? *requiredOutput : "");
|
|
||||||
|
// For functions without expected outputs in the return trigger, the result is the raw output.
|
||||||
|
// For functions with expected outputs in the return trigger,
|
||||||
|
// if rawOutput=true, the result is the raw output,
|
||||||
|
// otherwise, if the raw output contains one of the expected outputs, the result is the raw output,
|
||||||
|
// otherwise, the result is empty(as a failed flag).
|
||||||
|
return (trigger.expectedOutputs.isEmpty() || isResultFound || rawOutput ? *requiredOutput : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
void Util::delay(unsigned int msec)
|
void Util::delay(unsigned int msec)
|
||||||
@@ -106,24 +112,36 @@ void Util::setRunningState(bool st)
|
|||||||
bool Util::chooseLanguage(QSettings* guiSettings, QMainWindow* window)
|
bool Util::chooseLanguage(QSettings* guiSettings, QMainWindow* window)
|
||||||
{
|
{
|
||||||
// make sure the GUISettings is not in any group
|
// make sure the GUISettings is not in any group
|
||||||
QSettings* langSettings = new QSettings("lang/languages.ini", QSettings::IniFormat);
|
QSettings* langSettings = new QSettings(":/i18n/languages.ini", QSettings::IniFormat);
|
||||||
QMap<QString, QString> langMap;
|
QMap<QString, QString> langMap;
|
||||||
langSettings->setIniCodec("UTF-8");
|
langSettings->setIniCodec("UTF-8");
|
||||||
langSettings->beginGroup("Languages");
|
langSettings->beginGroup("Languages");
|
||||||
QStringList langList = langSettings->allKeys();
|
QStringList langList = langSettings->allKeys();
|
||||||
for(int i = 0; i < langList.size(); i++)
|
for(int i = 0; i < langList.size(); i++)
|
||||||
langMap.insert(langSettings->value(langList[i]).toString(), langList[i]);
|
langMap.insert(langSettings->value(langList[i]).toString(), langList[i]);
|
||||||
|
langMap.insert(tr("Load from external file"), "(ext)");
|
||||||
langSettings->endGroup();
|
langSettings->endGroup();
|
||||||
delete langSettings;
|
delete langSettings;
|
||||||
bool isOk = false;
|
bool isOk = false;
|
||||||
QString selectedText = QInputDialog::getItem(window, "", "Choose a language:", langMap.keys(), 0, false, &isOk);
|
QString selectedText = QInputDialog::getItem(window, "", tr("Choose a language:"), langMap.keys(), 0, false, &isOk);
|
||||||
if(isOk)
|
if(!isOk)
|
||||||
|
return false;
|
||||||
|
if(langMap[selectedText] == "(ext)")
|
||||||
{
|
{
|
||||||
guiSettings->beginGroup("lang");
|
QString extPath = QFileDialog::getOpenFileName(nullptr, tr("Select the translation file:"));
|
||||||
guiSettings->setValue("language", langMap[selectedText]);
|
if(extPath.isEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
guiSettings->beginGroup("language");
|
||||||
|
guiSettings->setValue("extPath", extPath);
|
||||||
guiSettings->endGroup();
|
guiSettings->endGroup();
|
||||||
guiSettings->sync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
guiSettings->beginGroup("language");
|
||||||
|
guiSettings->setValue("name", langMap[selectedText]);
|
||||||
|
guiSettings->endGroup();
|
||||||
|
guiSettings->sync();
|
||||||
|
|
||||||
return isOk;
|
return isOk;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
|
#include <QFileDialog>
|
||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
|
|
||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
#include "ui/mainwindow.h"
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QTranslator>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QTextCodec>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
// A trick to handle non-ascii path
|
||||||
|
// The application cannot find the plugins when the path contains non ascii characters.
|
||||||
|
// However, the plugins will be load after creating MainWindow(or QApplication?).
|
||||||
|
// QDir will handle the path correctly.
|
||||||
|
QDir* pluginDir = new QDir;
|
||||||
|
if(pluginDir->cd("plugins")) // has plugins folder
|
||||||
|
{
|
||||||
|
qputenv("QT_PLUGIN_PATH", pluginDir->absolutePath().toLocal8Bit());
|
||||||
|
}
|
||||||
|
delete pluginDir;
|
||||||
|
|
||||||
|
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
|
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
|
||||||
|
QApplication a(argc, argv);
|
||||||
|
MainWindow w;
|
||||||
|
|
||||||
|
QSettings* settings = new QSettings("GUIsettings.ini", QSettings::IniFormat);
|
||||||
|
settings->setIniCodec("UTF-8");
|
||||||
|
settings->beginGroup("language");
|
||||||
|
QString languageFile = settings->value("extPath").toString();
|
||||||
|
QString languageName = settings->value("name").toString();
|
||||||
|
settings->endGroup();
|
||||||
|
if(languageName == "")
|
||||||
|
{
|
||||||
|
if(Util::chooseLanguage(settings, &w))
|
||||||
|
{
|
||||||
|
settings->beginGroup("language");
|
||||||
|
languageName = settings->value("name").toString();
|
||||||
|
settings->endGroup();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
languageName = "en_US";
|
||||||
|
}
|
||||||
|
if(languageName == "(ext)")
|
||||||
|
{
|
||||||
|
settings->beginGroup("language");
|
||||||
|
languageFile = settings->value("extPath").toString();
|
||||||
|
settings->endGroup();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
languageFile = ":/i18n/" + languageName + ".qm";
|
||||||
|
QTranslator* translator = new QTranslator(&w);
|
||||||
|
if(translator->load(languageFile))
|
||||||
|
a.installTranslator(translator);
|
||||||
|
else
|
||||||
|
QMessageBox::information(&w, "Error", "Can't load " + languageFile + " as translation file.");
|
||||||
|
delete settings;
|
||||||
|
w.initUI();
|
||||||
|
w.show();
|
||||||
|
return a.exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -81,10 +81,16 @@ void LF::getLFConfig()
|
|||||||
QVariantMap config = configMap["get config"].toMap();
|
QVariantMap config = configMap["get config"].toMap();
|
||||||
QString cmd = config["cmd"].toString();
|
QString cmd = config["cmd"].toString();
|
||||||
result = util->execCMDWithOutput(cmd, 400);
|
result = util->execCMDWithOutput(cmd, 400);
|
||||||
start = result.indexOf(config["field start"].toString());
|
reMatch = QRegularExpression(config["field start"].toString(), QRegularExpression::MultilineOption).match(result);
|
||||||
end = result.indexOf(config["field end"].toString());
|
start = reMatch.hasMatch() ? reMatch.capturedEnd() : 0;
|
||||||
|
reMatch = QRegularExpression(config["field end"].toString(), QRegularExpression::MultilineOption).match(result, start);
|
||||||
|
end = reMatch.hasMatch() ? reMatch.capturedStart() : result.length();
|
||||||
result = result.mid(start, end - start);
|
result = result.mid(start, end - start);
|
||||||
|
#if (QT_VERSION <= QT_VERSION_CHECK(5,14,0))
|
||||||
|
resultList = result.split("\n", QString::SkipEmptyParts);
|
||||||
|
#else
|
||||||
resultList = result.split("\n", Qt::SkipEmptyParts);
|
resultList = result.split("\n", Qt::SkipEmptyParts);
|
||||||
|
#endif
|
||||||
qDebug() << "LF CONFIG GET\n" << resultList;
|
qDebug() << "LF CONFIG GET\n" << resultList;
|
||||||
for(auto it = resultList.begin(); it != resultList.end(); it++)
|
for(auto it = resultList.begin(); it != resultList.end(); it++)
|
||||||
{
|
{
|
||||||
@@ -150,5 +156,4 @@ void LF::syncWithUI()
|
|||||||
void LF::setConfigMap(const QVariantMap& configMap)
|
void LF::setConfigMap(const QVariantMap& configMap)
|
||||||
{
|
{
|
||||||
this->configMap = configMap;
|
this->configMap = configMap;
|
||||||
qDebug() << configMap;
|
|
||||||
}
|
}
|
||||||
@@ -91,7 +91,6 @@ Mifare::Mifare(Ui::MainWindow *ui, Util *addr, QWidget *parent): QObject(parent)
|
|||||||
void Mifare::setConfigMap(const QVariantMap& configMap)
|
void Mifare::setConfigMap(const QVariantMap& configMap)
|
||||||
{
|
{
|
||||||
this->configMap = configMap;
|
this->configMap = configMap;
|
||||||
qDebug() << configMap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QMap<QString, QString> Mifare::info(bool isRequiringOutput)
|
QMap<QString, QString> Mifare::info(bool isRequiringOutput)
|
||||||
@@ -131,7 +130,7 @@ void Mifare::chk()
|
|||||||
QString cmd = config["cmd"].toString();
|
QString cmd = config["cmd"].toString();
|
||||||
int keyAindex = config["key A index"].toInt();
|
int keyAindex = config["key A index"].toInt();
|
||||||
int keyBindex = config["key B index"].toInt();
|
int keyBindex = config["key B index"].toInt();
|
||||||
QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString());
|
QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString(), QRegularExpression::MultilineOption);
|
||||||
cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
|
cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
|
||||||
|
|
||||||
result = util->execCMDWithOutput(
|
result = util->execCMDWithOutput(
|
||||||
@@ -170,7 +169,7 @@ void Mifare::nested(bool isStaticNested)
|
|||||||
cmd = config["cmd"].toString();
|
cmd = config["cmd"].toString();
|
||||||
int keyAindex = config["key A index"].toInt();
|
int keyAindex = config["key A index"].toInt();
|
||||||
int keyBindex = config["key B index"].toInt();
|
int keyBindex = config["key B index"].toInt();
|
||||||
QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString());
|
QRegularExpression keyPattern = QRegularExpression(config["key pattern"].toString(), QRegularExpression::MultilineOption);
|
||||||
QRegularExpressionMatch reMatch;
|
QRegularExpressionMatch reMatch;
|
||||||
QString result;
|
QString result;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
@@ -213,7 +212,7 @@ void Mifare::nested(bool isStaticNested)
|
|||||||
}
|
}
|
||||||
result = util->execCMDWithOutput(
|
result = util->execCMDWithOutput(
|
||||||
cmd,
|
cmd,
|
||||||
Util::ReturnTrigger(15000, {"Can't found", "Can't authenticate", keyPattern_res->pattern()}),
|
Util::ReturnTrigger(15000, {"Quit", "Can't found", "Can't authenticate", keyPattern_res->pattern()}),
|
||||||
true);
|
true);
|
||||||
|
|
||||||
if(result.contains("static") && !isStaticNested)
|
if(result.contains("static") && !isStaticNested)
|
||||||
@@ -692,10 +691,14 @@ void Mifare::writeSelected(TargetType targetType)
|
|||||||
{
|
{
|
||||||
result = _writeblk(item, KEY_B, keyBList->at(data_b2s(item)), dataList->at(item), TARGET_MIFARE);
|
result = _writeblk(item, KEY_B, keyBList->at(data_b2s(item)), dataList->at(item), TARGET_MIFARE);
|
||||||
}
|
}
|
||||||
if(!result)
|
if(!result && keyAList->at(data_b2s(item)) != "FFFFFFFFFFFF")
|
||||||
{
|
{
|
||||||
result = _writeblk(item, KEY_A, "FFFFFFFFFFFF", dataList->at(item), TARGET_MIFARE);
|
result = _writeblk(item, KEY_A, "FFFFFFFFFFFF", dataList->at(item), TARGET_MIFARE);
|
||||||
}
|
}
|
||||||
|
if(!result && keyBList->at(data_b2s(item)) != "FFFFFFFFFFFF") // for access bits like "80 f7 87", the block can only be written with keyB
|
||||||
|
{
|
||||||
|
result = _writeblk(item, KEY_B, "FFFFFFFFFFFF", dataList->at(item), TARGET_MIFARE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else // key doesn't matter when writing to Chinese Magic Card and Emulator Memory
|
else // key doesn't matter when writing to Chinese Magic Card and Emulator Memory
|
||||||
{
|
{
|
||||||
@@ -744,14 +747,20 @@ void Mifare::writeSelected(TargetType targetType)
|
|||||||
void Mifare::dump()
|
void Mifare::dump()
|
||||||
{
|
{
|
||||||
QVariantMap config = configMap["dump"].toMap();
|
QVariantMap config = configMap["dump"].toMap();
|
||||||
util->execCMD(config["cmd"].toString());
|
QString cmd = config["cmd"].toString();
|
||||||
|
if(cmd.contains("<card type>"))
|
||||||
|
cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
|
||||||
|
util->execCMD(cmd);
|
||||||
Util::gotoRawTab();
|
Util::gotoRawTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mifare::restore()
|
void Mifare::restore()
|
||||||
{
|
{
|
||||||
QVariantMap config = configMap["restore"].toMap();
|
QVariantMap config = configMap["restore"].toMap();
|
||||||
util->execCMD(config["cmd"].toString());
|
QString cmd = config["cmd"].toString();
|
||||||
|
if(cmd.contains("<card type>"))
|
||||||
|
cmd.replace("<card type>", config["card type"].toMap()[cardType.typeText].toString());
|
||||||
|
util->execCMD(cmd);
|
||||||
Util::gotoRawTab();
|
Util::gotoRawTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
#include "t55xxtab.h"
|
||||||
|
#include "ui_t55xxtab.h"
|
||||||
|
|
||||||
|
T55xxTab::T55xxTab(Util *addr, QWidget *parent) :
|
||||||
|
QWidget(parent),
|
||||||
|
ui(new Ui::T55xxTab)
|
||||||
|
{
|
||||||
|
ui->setupUi(this);
|
||||||
|
util = addr;
|
||||||
|
}
|
||||||
|
|
||||||
|
T55xxTab::~T55xxTab()
|
||||||
|
{
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
void T55xxTab::setConfigMap(const QVariantMap &configMap)
|
||||||
|
{
|
||||||
|
this->configMap = configMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
void T55xxTab::setGUIState(bool st)
|
||||||
|
{
|
||||||
|
ui->cloneGroupBox->setEnabled(st);
|
||||||
|
emit setParentGUIState(st);
|
||||||
|
}
|
||||||
|
|
||||||
|
void T55xxTab::on_Clone_EM410xReadButton_clicked()
|
||||||
|
{
|
||||||
|
setGUIState(false);
|
||||||
|
|
||||||
|
QVariantMap config = configMap["clone em410x"].toMap();
|
||||||
|
QString result;
|
||||||
|
QRegularExpressionMatch reMatch;
|
||||||
|
|
||||||
|
result = util->execCMDWithOutput(
|
||||||
|
config["read"].toString(),
|
||||||
|
Util::ReturnTrigger(6000, {config["successful read flag"].toString()}));
|
||||||
|
if(result.isEmpty())
|
||||||
|
{
|
||||||
|
setGUIState(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
reMatch = QRegularExpression(config["pattern"].toString()).match(result);
|
||||||
|
ui->Clone_EM410xIDEdit->setText(reMatch.captured());
|
||||||
|
|
||||||
|
setGUIState(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void T55xxTab::on_Clone_EM410xCloneButton_clicked()
|
||||||
|
{
|
||||||
|
if(ui->Clone_EM410xIDEdit->text().isEmpty())
|
||||||
|
return;
|
||||||
|
setGUIState(false);
|
||||||
|
|
||||||
|
QVariantMap config = configMap["clone em410x"].toMap();
|
||||||
|
QString cmd = config["clone cmd"].toString();
|
||||||
|
cmd.replace("<id>", ui->Clone_EM410xIDEdit->text());
|
||||||
|
if(ui->Clone_T5555Button->isChecked())
|
||||||
|
cmd.replace("<type>", config["t5555 flag"].toString());
|
||||||
|
else
|
||||||
|
cmd.replace("<type>", config["t55x7 flag"].toString());
|
||||||
|
util->execCMD(cmd);
|
||||||
|
Util::gotoRawTab();
|
||||||
|
|
||||||
|
setGUIState(true);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
#ifndef T55XXTAB_H
|
||||||
|
#define T55XXTAB_H
|
||||||
|
|
||||||
|
#include "common/util.h"
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
namespace Ui
|
||||||
|
{
|
||||||
|
class T55xxTab;
|
||||||
|
}
|
||||||
|
|
||||||
|
class T55xxTab : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit T55xxTab(Util *addr, QWidget *parent = nullptr);
|
||||||
|
~T55xxTab();
|
||||||
|
|
||||||
|
void setConfigMap(const QVariantMap& configMap);
|
||||||
|
private slots:
|
||||||
|
void on_Clone_EM410xReadButton_clicked();
|
||||||
|
|
||||||
|
void on_Clone_EM410xCloneButton_clicked();
|
||||||
|
|
||||||
|
private:
|
||||||
|
Ui::T55xxTab *ui;
|
||||||
|
Util* util;
|
||||||
|
QVariantMap configMap;
|
||||||
|
|
||||||
|
void setGUIState(bool st);
|
||||||
|
signals:
|
||||||
|
void setParentGUIState(bool st);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // T55XXTAB_H
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
|
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
#include <QDirIterator>
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent):
|
MainWindow::MainWindow(QWidget *parent):
|
||||||
QMainWindow(parent)
|
QMainWindow(parent)
|
||||||
@@ -30,7 +31,9 @@ MainWindow::MainWindow(QWidget *parent):
|
|||||||
settings->setIniCodec("UTF-8");
|
settings->setIniCodec("UTF-8");
|
||||||
|
|
||||||
pm3Thread = new QThread(this);
|
pm3Thread = new QThread(this);
|
||||||
|
connect(QApplication::instance(), &QApplication::aboutToQuit, pm3Thread, &QThread::quit);
|
||||||
pm3 = new PM3Process(pm3Thread);
|
pm3 = new PM3Process(pm3Thread);
|
||||||
|
connect(pm3Thread, &QThread::finished, pm3, &PM3Process::deleteLater);
|
||||||
pm3Thread->start();
|
pm3Thread->start();
|
||||||
pm3state = false;
|
pm3state = false;
|
||||||
clientWorkingDir = new QDir;
|
clientWorkingDir = new QDir;
|
||||||
@@ -39,13 +42,16 @@ MainWindow::MainWindow(QWidget *parent):
|
|||||||
Util::setUI(ui);
|
Util::setUI(ui);
|
||||||
mifare = new Mifare(ui, util, this);
|
mifare = new Mifare(ui, util, this);
|
||||||
lf = new LF(ui, util, this);
|
lf = new LF(ui, util, this);
|
||||||
|
t55xxTab = new T55xxTab(util);
|
||||||
|
connect(t55xxTab, &T55xxTab::setParentGUIState, this, &MainWindow::setState);
|
||||||
|
ui->funcTab->insertTab(2, t55xxTab, tr("T55xx"));
|
||||||
|
|
||||||
keyEventFilter = new MyEventFilter(QEvent::KeyPress);
|
keyEventFilter = new MyEventFilter(QEvent::KeyPress);
|
||||||
resizeEventFilter = new MyEventFilter(QEvent::Resize);
|
resizeEventFilter = new MyEventFilter(QEvent::Resize);
|
||||||
|
|
||||||
// hide unused tabs
|
// hide unused tabs
|
||||||
// ui->funcTab->removeTab(1);
|
// ui->funcTab->removeTab(1);
|
||||||
ui->funcTab->removeTab(2);
|
ui->funcTab->removeTab(3);
|
||||||
|
|
||||||
portSearchTimer = new QTimer(this);
|
portSearchTimer = new QTimer(this);
|
||||||
portSearchTimer->setInterval(2000);
|
portSearchTimer->setInterval(2000);
|
||||||
@@ -74,7 +80,11 @@ MainWindow::~MainWindow()
|
|||||||
|
|
||||||
void MainWindow::loadConfig()
|
void MainWindow::loadConfig()
|
||||||
{
|
{
|
||||||
QFile configList(ui->Set_Client_configPathEdit->text());
|
QString filename = ui->Set_Client_configFileBox->currentData().toString();
|
||||||
|
if(filename == "(ext)")
|
||||||
|
filename = ui->Set_Client_configPathEdit->text();
|
||||||
|
qDebug() << "config file:" << filename;
|
||||||
|
QFile configList(filename);
|
||||||
if(!configList.open(QFile::ReadOnly | QFile::Text))
|
if(!configList.open(QFile::ReadOnly | QFile::Text))
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("Info"), tr("Failed to load config file"));
|
QMessageBox::information(this, tr("Info"), tr("Failed to load config file"));
|
||||||
@@ -85,7 +95,7 @@ void MainWindow::loadConfig()
|
|||||||
QJsonDocument configJson(QJsonDocument::fromJson(configData));
|
QJsonDocument configJson(QJsonDocument::fromJson(configData));
|
||||||
mifare->setConfigMap(configJson.object()["mifare classic"].toObject().toVariantMap());
|
mifare->setConfigMap(configJson.object()["mifare classic"].toObject().toVariantMap());
|
||||||
lf->setConfigMap(configJson.object()["lf"].toObject().toVariantMap());
|
lf->setConfigMap(configJson.object()["lf"].toObject().toVariantMap());
|
||||||
|
t55xxTab->setConfigMap(configJson.object()["t55xx"].toObject().toVariantMap());
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::initUI() // will be called by main.app
|
void MainWindow::initUI() // will be called by main.app
|
||||||
@@ -101,18 +111,46 @@ void MainWindow::initUI() // will be called by main.app
|
|||||||
|
|
||||||
void MainWindow::on_portSearchTimer_timeout()
|
void MainWindow::on_portSearchTimer_timeout()
|
||||||
{
|
{
|
||||||
QStringList newPortList;
|
QStringList newPortList; // for actural port name
|
||||||
|
QStringList newPortNameList; // for display name
|
||||||
|
const QString hint = " *";
|
||||||
|
|
||||||
foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
|
foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
|
||||||
{
|
{
|
||||||
// qDebug() << info.isBusy() << info.isNull() << info.portName() << info.description();
|
// qDebug() << info.isNull() << info.portName() << info.description() << info.serialNumber() << info.manufacturer();
|
||||||
if(!info.isNull())
|
if(!info.isNull())
|
||||||
newPortList << info.portName();
|
{
|
||||||
|
QString idString = (info.description() + info.serialNumber() + info.manufacturer()).toLower();
|
||||||
|
QString portName = info.portName();
|
||||||
|
|
||||||
|
newPortList << portName;
|
||||||
|
if(info.hasVendorIdentifier() && info.hasProductIdentifier())
|
||||||
|
{
|
||||||
|
quint16 vid = info.vendorIdentifier();
|
||||||
|
quint16 pid = info.productIdentifier();
|
||||||
|
if(vid == 0x9AC4 && pid == 0x4B8F)
|
||||||
|
portName += hint;
|
||||||
|
else if(vid == 0x2D2D && pid == 0x504D)
|
||||||
|
portName += hint;
|
||||||
|
}
|
||||||
|
else if(idString.contains("proxmark") || idString.contains("iceman"))
|
||||||
|
portName += hint;
|
||||||
|
newPortNameList << portName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(newPortList != portList) // update PM3_portBox when available ports changed
|
if(newPortList != portList) // update PM3_portBox when available ports changed
|
||||||
{
|
{
|
||||||
portList = newPortList;
|
portList = newPortList;
|
||||||
ui->PM3_portBox->clear();
|
ui->PM3_portBox->clear();
|
||||||
ui->PM3_portBox->addItems(portList);
|
int selectId = -1;
|
||||||
|
for(int i = 0; i < portList.size(); i++)
|
||||||
|
{
|
||||||
|
ui->PM3_portBox->addItem(newPortNameList[i], newPortList[i]);
|
||||||
|
if(selectId == -1 && newPortNameList[i].endsWith(hint))
|
||||||
|
selectId = i;
|
||||||
|
}
|
||||||
|
if(selectId != -1)
|
||||||
|
ui->PM3_portBox->setCurrentIndex(selectId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +158,7 @@ void MainWindow::on_PM3_connectButton_clicked()
|
|||||||
{
|
{
|
||||||
qDebug() << "Main:" << QThread::currentThread();
|
qDebug() << "Main:" << QThread::currentThread();
|
||||||
|
|
||||||
QString port = ui->PM3_portBox->currentText();
|
QString port = ui->PM3_portBox->currentData().toString();
|
||||||
QString startArgs = ui->Set_Client_startArgsEdit->text();
|
QString startArgs = ui->Set_Client_startArgsEdit->text();
|
||||||
|
|
||||||
// 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
|
||||||
@@ -156,7 +194,11 @@ void MainWindow::on_PM3_connectButton_clicked()
|
|||||||
#endif
|
#endif
|
||||||
envSetProcess.waitForReadyRead(10000);
|
envSetProcess.waitForReadyRead(10000);
|
||||||
QString envSetResult = QString(envSetProcess.readAll());
|
QString envSetResult = QString(envSetProcess.readAll());
|
||||||
|
#if (QT_VERSION <= QT_VERSION_CHECK(5,14,0))
|
||||||
clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
|
clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
|
||||||
|
#else
|
||||||
|
clientEnv = envSetResult.split("\n", Qt::SkipEmptyParts);
|
||||||
|
#endif
|
||||||
if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
|
if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
|
||||||
{
|
{
|
||||||
clientEnv.removeFirst();
|
clientEnv.removeFirst();
|
||||||
@@ -186,6 +228,18 @@ void MainWindow::on_PM3_connectButton_clicked()
|
|||||||
envSetProcess.kill();
|
envSetProcess.kill();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::onPM3ErrorOccurred(QProcess::ProcessError error)
|
||||||
|
{
|
||||||
|
qDebug() << "PM3 Error:" << error << pm3->errorString();
|
||||||
|
if(error == QProcess::FailedToStart)
|
||||||
|
QMessageBox::information(this, tr("Info"), tr("Failed to start the client"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onPM3HWConnectFailed()
|
||||||
|
{
|
||||||
|
QMessageBox::information(this, tr("Info"), tr("Failed to connect to the hardware"));
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::onPM3StateChanged(bool st, const QString& info)
|
void MainWindow::onPM3StateChanged(bool st, const QString& info)
|
||||||
{
|
{
|
||||||
pm3state = st;
|
pm3state = st;
|
||||||
@@ -213,7 +267,8 @@ void MainWindow::on_PM3_disconnectButton_clicked()
|
|||||||
void MainWindow::refreshOutput(const QString& output)
|
void MainWindow::refreshOutput(const QString& output)
|
||||||
{
|
{
|
||||||
// qDebug() << "MainWindow::refresh:" << output;
|
// qDebug() << "MainWindow::refresh:" << output;
|
||||||
ui->Raw_outputEdit->appendPlainText(output);
|
ui->Raw_outputEdit->moveCursor(QTextCursor::End);
|
||||||
|
ui->Raw_outputEdit->insertPlainText(output);
|
||||||
ui->Raw_outputEdit->moveCursor(QTextCursor::End);
|
ui->Raw_outputEdit->moveCursor(QTextCursor::End);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -632,10 +687,10 @@ void MainWindow::on_MF_File_loadButton_clicked()
|
|||||||
{
|
{
|
||||||
QString title = "";
|
QString title = "";
|
||||||
QString filename = "";
|
QString filename = "";
|
||||||
if(ui->MF_File_dataBox->isChecked())
|
if(ui->MF_File_dataButton->isChecked())
|
||||||
{
|
{
|
||||||
title = tr("Plz select the data file:");
|
title = tr("Plz select the data file:");
|
||||||
filename = QFileDialog::getOpenFileName(this, title, "./", tr("Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml);;All Files(*.*)"));
|
filename = QFileDialog::getOpenFileName(this, title, "./", tr("Binary Data Files(*.bin *.dump)") + ";;" + tr("Text Data Files(*.txt *.eml)") + ";;" + tr("All Files(*.*)"));
|
||||||
qDebug() << filename;
|
qDebug() << filename;
|
||||||
if(filename != "")
|
if(filename != "")
|
||||||
{
|
{
|
||||||
@@ -645,10 +700,10 @@ void MainWindow::on_MF_File_loadButton_clicked()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(ui->MF_File_keyBox->isChecked())
|
else if(ui->MF_File_keyButton->isChecked())
|
||||||
{
|
{
|
||||||
title = tr("Plz select the key file:");
|
title = tr("Plz select the key file:");
|
||||||
filename = QFileDialog::getOpenFileName(this, title, "./", tr("Binary Key Files(*.bin *.dump);;Binary Data Files(*.bin *.dump);;All Files(*.*)"));
|
filename = QFileDialog::getOpenFileName(this, title, "./", tr("Binary Key Files(*.bin *.dump)") + ";;" + tr("All Files(*.*)"));
|
||||||
qDebug() << filename;
|
qDebug() << filename;
|
||||||
if(filename != "")
|
if(filename != "")
|
||||||
{
|
{
|
||||||
@@ -672,27 +727,27 @@ void MainWindow::on_MF_File_saveButton_clicked()
|
|||||||
defaultName += "_";
|
defaultName += "_";
|
||||||
defaultName += QDateTime::currentDateTime().toString("yyyy-MM-dd-hh-mm-ss");
|
defaultName += QDateTime::currentDateTime().toString("yyyy-MM-dd-hh-mm-ss");
|
||||||
|
|
||||||
if(ui->MF_File_dataBox->isChecked())
|
if(ui->MF_File_dataButton->isChecked())
|
||||||
{
|
{
|
||||||
title = tr("Plz select the location to save data file:");
|
title = tr("Plz select the location to save data file:");
|
||||||
filename = QFileDialog::getSaveFileName(this, title, "./data_" + defaultName, tr("Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml)"), &selectedType);
|
filename = QFileDialog::getSaveFileName(this, title, "./data_" + defaultName, tr("Binary Data Files(*.bin *.dump)") + ";;" + tr("Text Data Files(*.txt *.eml)"), &selectedType);
|
||||||
qDebug() << filename;
|
qDebug() << filename;
|
||||||
if(filename != "")
|
if(filename != "")
|
||||||
{
|
{
|
||||||
if(!mifare->data_saveDataFile(filename, selectedType == "Binary Data Files(*.bin *.dump)"))
|
if(!mifare->data_saveDataFile(filename, selectedType == tr("Binary Data Files(*.bin *.dump)")))
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
|
QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(ui->MF_File_keyBox->isChecked())
|
else if(ui->MF_File_keyButton->isChecked())
|
||||||
{
|
{
|
||||||
title = tr("Plz select the location to save key file:");
|
title = tr("Plz select the location to save key file:");
|
||||||
filename = QFileDialog::getSaveFileName(this, title, "./key_" + defaultName, tr("Binary Key Files(*.bin *.dump)"), &selectedType);
|
filename = QFileDialog::getSaveFileName(this, title, "./key_" + defaultName, tr("Binary Key Files(*.bin *.dump)"), &selectedType);
|
||||||
qDebug() << filename;
|
qDebug() << filename;
|
||||||
if(filename != "")
|
if(filename != "")
|
||||||
{
|
{
|
||||||
if(!mifare->data_saveKeyFile(filename, selectedType == "Binary Key Files(*.bin *.dump)"))
|
if(!mifare->data_saveKeyFile(filename, selectedType == tr("Binary Key Files(*.bin *.dump)")))
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
|
QMessageBox::information(this, tr("Info"), tr("Failed to save to") + "\n" + filename);
|
||||||
}
|
}
|
||||||
@@ -703,12 +758,12 @@ void MainWindow::on_MF_File_saveButton_clicked()
|
|||||||
|
|
||||||
void MainWindow::on_MF_File_clearButton_clicked()
|
void MainWindow::on_MF_File_clearButton_clicked()
|
||||||
{
|
{
|
||||||
if(ui->MF_File_keyBox->isChecked())
|
if(ui->MF_File_keyButton->isChecked())
|
||||||
{
|
{
|
||||||
mifare->data_clearKey();
|
mifare->data_clearKey();
|
||||||
mifare->data_syncWithKeyWidget();
|
mifare->data_syncWithKeyWidget();
|
||||||
}
|
}
|
||||||
else if(ui->MF_File_dataBox->isChecked())
|
else if(ui->MF_File_dataButton->isChecked())
|
||||||
{
|
{
|
||||||
mifare->data_clearData();
|
mifare->data_clearData();
|
||||||
mifare->data_syncWithDataWidget();
|
mifare->data_syncWithDataWidget();
|
||||||
@@ -873,7 +928,7 @@ 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, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc);;All Files(*.*)"));
|
filename = QFileDialog::getOpenFileName(this, title, clientWorkingDir->absolutePath(), tr("Trace Files(*.trc)") + ";;" + tr("All Files(*.*)"));
|
||||||
qDebug() << filename;
|
qDebug() << filename;
|
||||||
if(filename != "")
|
if(filename != "")
|
||||||
{
|
{
|
||||||
@@ -1047,6 +1102,8 @@ void MainWindow::uiInit()
|
|||||||
ui->PM3_pathEdit->setText(settings->value("path", "proxmark3").toString());
|
ui->PM3_pathEdit->setText(settings->value("path", "proxmark3").toString());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
|
ui->Set_Client_GUIWorkingDirLabel->setText(QDir::currentPath());
|
||||||
|
|
||||||
settings->beginGroup("Client_Args");
|
settings->beginGroup("Client_Args");
|
||||||
ui->Set_Client_startArgsEdit->setText(settings->value("args", "<port> -f").toString());
|
ui->Set_Client_startArgsEdit->setText(settings->value("args", "<port> -f").toString());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
@@ -1061,11 +1118,27 @@ void MainWindow::uiInit()
|
|||||||
ui->Set_Client_keepClientActiveBox->setChecked(keepClientActive);
|
ui->Set_Client_keepClientActiveBox->setChecked(keepClientActive);
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
|
QDirIterator configFiles(":/config/");
|
||||||
|
ui->Set_Client_configFileBox->blockSignals(true);
|
||||||
|
while(configFiles.hasNext())
|
||||||
|
{
|
||||||
|
configFiles.next();
|
||||||
|
ui->Set_Client_configFileBox->addItem(configFiles.fileName(), configFiles.filePath());
|
||||||
|
}
|
||||||
|
ui->Set_Client_configFileBox->addItem(tr("External file"), "(ext)");
|
||||||
|
|
||||||
|
int configId = -1;
|
||||||
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());
|
configId = ui->Set_Client_configFileBox->findData(settings->value("configFile"));
|
||||||
|
ui->Set_Client_configPathEdit->setText(settings->value("extConfigFilePath", "config.json").toString());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
if(configId != -1)
|
||||||
|
ui->Set_Client_configFileBox->setCurrentIndex(configId);
|
||||||
|
ui->Set_Client_configFileBox->blockSignals(false);
|
||||||
|
on_Set_Client_configFileBox_currentIndexChanged(ui->Set_Client_configFileBox->currentIndex());
|
||||||
|
|
||||||
|
|
||||||
ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A);
|
ui->MF_RW_keyTypeBox->addItem("A", Mifare::KEY_A);
|
||||||
ui->MF_RW_keyTypeBox->addItem("B", Mifare::KEY_B);
|
ui->MF_RW_keyTypeBox->addItem("B", Mifare::KEY_B);
|
||||||
@@ -1084,6 +1157,8 @@ void MainWindow::signalInit()
|
|||||||
connect(this, &MainWindow::reconnectPM3, pm3, &PM3Process::reconnectPM3);
|
connect(this, &MainWindow::reconnectPM3, pm3, &PM3Process::reconnectPM3);
|
||||||
connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
|
connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
|
||||||
connect(pm3, &PM3Process::PM3StatedChanged, util, &Util::setRunningState);
|
connect(pm3, &PM3Process::PM3StatedChanged, util, &Util::setRunningState);
|
||||||
|
connect(pm3, &PM3Process::errorOccurred, this, &MainWindow::onPM3ErrorOccurred);
|
||||||
|
connect(pm3, &PM3Process::HWConnectFailed, this, &MainWindow::onPM3HWConnectFailed);
|
||||||
connect(this, &MainWindow::killPM3, pm3, &PM3Process::killPM3);
|
connect(this, &MainWindow::killPM3, pm3, &PM3Process::killPM3);
|
||||||
connect(this, &MainWindow::setProcEnv, pm3, &PM3Process::setProcEnv);
|
connect(this, &MainWindow::setProcEnv, pm3, &PM3Process::setProcEnv);
|
||||||
connect(this, &MainWindow::setWorkingDir, pm3, &PM3Process::setWorkingDir);
|
connect(this, &MainWindow::setWorkingDir, pm3, &PM3Process::setWorkingDir);
|
||||||
@@ -1267,7 +1342,7 @@ void MainWindow::on_Set_Client_workingDirEdit_editingFinished()
|
|||||||
void MainWindow::on_Set_Client_configPathEdit_editingFinished()
|
void MainWindow::on_Set_Client_configPathEdit_editingFinished()
|
||||||
{
|
{
|
||||||
settings->beginGroup("Client_Env");
|
settings->beginGroup("Client_Env");
|
||||||
settings->setValue("configPath", ui->Set_Client_configPathEdit->text());
|
settings->setValue("extConfigFilePath", ui->Set_Client_configPathEdit->text());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1405,3 +1480,11 @@ void MainWindow::on_LF_LFConf_resetButton_clicked()
|
|||||||
setState(true);
|
setState(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::on_Set_Client_configFileBox_currentIndexChanged(int index)
|
||||||
|
{
|
||||||
|
ui->Set_Client_configPathEdit->setVisible(ui->Set_Client_configFileBox->itemData(index).toString() == "(ext)");
|
||||||
|
settings->beginGroup("Client_Env");
|
||||||
|
settings->setValue("configFile", ui->Set_Client_configFileBox->currentData());
|
||||||
|
settings->endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
#include "common/pm3process.h"
|
#include "common/pm3process.h"
|
||||||
#include "module/mifare.h"
|
#include "module/mifare.h"
|
||||||
#include "module/lf.h"
|
#include "module/lf.h"
|
||||||
|
#include "module/t55xxtab.h"
|
||||||
#include "common/util.h"
|
#include "common/util.h"
|
||||||
#include "ui/mf_trailerdecoderdialog.h"
|
#include "ui/mf_trailerdecoderdialog.h"
|
||||||
|
|
||||||
@@ -50,7 +51,7 @@ public:
|
|||||||
~MainWindow();
|
~MainWindow();
|
||||||
|
|
||||||
void initUI();
|
void initUI();
|
||||||
bool eventFilter(QObject *watched, QEvent *event);
|
bool eventFilter(QObject *watched, QEvent *event) override;
|
||||||
public slots:
|
public slots:
|
||||||
void refreshOutput(const QString& output);
|
void refreshOutput(const QString& output);
|
||||||
void refreshCMD(const QString& cmd);
|
void refreshCMD(const QString& cmd);
|
||||||
@@ -59,6 +60,8 @@ public slots:
|
|||||||
void MF_onMFCardTypeChanged(int id, bool st);
|
void MF_onMFCardTypeChanged(int id, bool st);
|
||||||
void on_Raw_keyPressed(QObject *obj_addr, QEvent &event);
|
void on_Raw_keyPressed(QObject *obj_addr, QEvent &event);
|
||||||
void on_MF_keyWidget_resized(QObject *obj_addr, QEvent &event);
|
void on_MF_keyWidget_resized(QObject *obj_addr, QEvent &event);
|
||||||
|
void onPM3ErrorOccurred(QProcess::ProcessError error);
|
||||||
|
void onPM3HWConnectFailed();
|
||||||
private slots:
|
private slots:
|
||||||
|
|
||||||
void on_PM3_connectButton_clicked();
|
void on_PM3_connectButton_clicked();
|
||||||
@@ -205,6 +208,10 @@ private slots:
|
|||||||
|
|
||||||
void on_Set_Client_configPathEdit_editingFinished();
|
void on_Set_Client_configPathEdit_editingFinished();
|
||||||
|
|
||||||
|
void setState(bool st);
|
||||||
|
|
||||||
|
void on_Set_Client_configFileBox_currentIndexChanged(int index);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow* ui;
|
Ui::MainWindow* ui;
|
||||||
QButtonGroup* MFCardTypeBtnGroup;
|
QButtonGroup* MFCardTypeBtnGroup;
|
||||||
@@ -235,6 +242,7 @@ private:
|
|||||||
QStringList clientEnv;
|
QStringList clientEnv;
|
||||||
QDir* clientWorkingDir;
|
QDir* clientWorkingDir;
|
||||||
|
|
||||||
|
T55xxTab* t55xxTab;
|
||||||
Mifare* mifare;
|
Mifare* mifare;
|
||||||
LF* lf;
|
LF* lf;
|
||||||
Util* util;
|
Util* util;
|
||||||
@@ -247,7 +255,6 @@ private:
|
|||||||
void signalInit();
|
void signalInit();
|
||||||
void MF_widgetReset();
|
void MF_widgetReset();
|
||||||
void setTableItem(QTableWidget *widget, int row, int column, const QString& text);
|
void setTableItem(QTableWidget *widget, int row, int column, const QString& text);
|
||||||
void setState(bool st);
|
|
||||||
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();
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
@@ -524,7 +524,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="MF_File_dataBox">
|
<widget class="QRadioButton" name="MF_File_dataButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Data</string>
|
<string>Data</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -534,7 +534,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="MF_File_keyBox">
|
<widget class="QRadioButton" name="MF_File_keyButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Key</string>
|
<string>Key</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -1454,8 +1454,8 @@ When setting the freq, the "hw setlfdivisor" will also be called.</str
|
|||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="2" column="1">
|
||||||
<widget class="QCheckBox" name="LF_LFConf_averagingBox">
|
<widget class="QCheckBox" name="LF_LFConf_averagingBox">
|
||||||
<property name="text">
|
<property name="checked">
|
||||||
<string/>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -2613,7 +2613,11 @@ or the communication between a tag and a reader.</string>
|
|||||||
<enum>QLayout::SetMaximumSize</enum>
|
<enum>QLayout::SetMaximumSize</enum>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="Raw_CMDEdit"/>
|
<widget class="QLineEdit" name="Raw_CMDEdit">
|
||||||
|
<property name="clearButtonEnabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="Raw_sendCMDButton">
|
<widget class="QPushButton" name="Raw_sendCMDButton">
|
||||||
@@ -2646,6 +2650,23 @@ or the communication between a tag and a reader.</string>
|
|||||||
<string>Client</string>
|
<string>Client</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_65">
|
||||||
|
<property name="text">
|
||||||
|
<string>GUI working directory:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="Set_Client_GUIWorkingDirLabel"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="Line" name="line_9">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_11">
|
<widget class="QLabel" name="label_11">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -2742,10 +2763,34 @@ or the communication between a tag and a reader.</string>
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_63">
|
<widget class="QLabel" name="label_63">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Config file path(Reconnect to apply):</string>
|
<string>Config file(Reconnect to apply):</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="Set_Client_configFileBox">
|
||||||
|
<property name="sizeAdjustPolicy">
|
||||||
|
<enum>QComboBox::AdjustToContents</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_13">
|
||||||
|
<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>
|
<item>
|
||||||
<widget class="QLineEdit" name="Set_Client_configPathEdit">
|
<widget class="QLineEdit" name="Set_Client_configPathEdit">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -85,15 +85,15 @@ void MF_trailerDecoderDialog::on_blockSizeChanged(int id, bool st)
|
|||||||
{
|
{
|
||||||
if(id == 4)
|
if(id == 4)
|
||||||
{
|
{
|
||||||
ui->dataBlockWidget->verticalHeaderItem(0)->setText("Block0");
|
ui->dataBlockWidget->verticalHeaderItem(0)->setText(tr("Block") + "0");
|
||||||
ui->dataBlockWidget->verticalHeaderItem(1)->setText("Block1");
|
ui->dataBlockWidget->verticalHeaderItem(1)->setText(tr("Block") + "1");
|
||||||
ui->dataBlockWidget->verticalHeaderItem(2)->setText("Block2");
|
ui->dataBlockWidget->verticalHeaderItem(2)->setText(tr("Block") + "2");
|
||||||
}
|
}
|
||||||
else if(id == 16)
|
else if(id == 16)
|
||||||
{
|
{
|
||||||
ui->dataBlockWidget->verticalHeaderItem(0)->setText("Block0~4");
|
ui->dataBlockWidget->verticalHeaderItem(0)->setText(tr("Block") + "0~4");
|
||||||
ui->dataBlockWidget->verticalHeaderItem(1)->setText("Block5~9");
|
ui->dataBlockWidget->verticalHeaderItem(1)->setText(tr("Block") + "5~9");
|
||||||
ui->dataBlockWidget->verticalHeaderItem(2)->setText("Block10~14");
|
ui->dataBlockWidget->verticalHeaderItem(2)->setText(tr("Block") + "10~14");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -110,15 +110,15 @@ void MF_trailerDecoderDialog::setTableItem(QTableWidget* widget, int row, int co
|
|||||||
}
|
}
|
||||||
else if(accessType == Mifare::ACC_KEY_A)
|
else if(accessType == Mifare::ACC_KEY_A)
|
||||||
{
|
{
|
||||||
text = "KeyA";
|
text = tr("KeyA");
|
||||||
}
|
}
|
||||||
else if(accessType == Mifare::ACC_KEY_B)
|
else if(accessType == Mifare::ACC_KEY_B)
|
||||||
{
|
{
|
||||||
text = "KeyB";
|
text = tr("KeyB");
|
||||||
}
|
}
|
||||||
else if(accessType == Mifare::ACC_KEY_AB)
|
else if(accessType == Mifare::ACC_KEY_AB)
|
||||||
{
|
{
|
||||||
text = "KeyA+B";
|
text = tr("KeyA+B");
|
||||||
}
|
}
|
||||||
widget->item(row, column)->setText(text);
|
widget->item(row, column)->setText(text);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>T55xxTab</class>
|
||||||
|
<widget class="QWidget" name="T55xxTab">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>400</width>
|
||||||
|
<height>300</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="cloneGroupBox">
|
||||||
|
<property name="title">
|
||||||
|
<string>Clone to T55xx</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Target Type:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QRadioButton" name="Clone_T5555Button">
|
||||||
|
<property name="text">
|
||||||
|
<string>T5555</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QRadioButton" name="Clone_T55x7Button">
|
||||||
|
<property name="text">
|
||||||
|
<string>T55x7</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<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>
|
||||||
|
<widget class="QGroupBox" name="Clone_EM410xGroupBox">
|
||||||
|
<property name="title">
|
||||||
|
<string>EM410x</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="Clone_EM410xReadButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Read</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="Clone_EM410xIDEdit"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="Clone_EM410xCloneButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Clone</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<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>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
||||||