3fc4596f2c
fix makefile to allow make of overlays.ui
...
to ui_overlays.h
add ui_overlays.h to .gitignore
should now compile to whatever qt version you have. (as long as it is
compatible with the overlays.ui file...)
2017-04-18 23:41:38 -04:00
b760f0ffd8
cannot seem to get uic to work for ...
...
... different qt versions in the make file correctly...
so, make the ui_overlays.h file version generic. maybe...
2017-04-15 13:40:49 -04:00
27882d378b
add uic make ui_overlays.h
...
to makefile
2017-04-14 10:31:00 -04:00
8aee1b8418
avoid vast number of warnings with clang compiler
2017-04-11 07:05:22 +02:00
3472ebe528
Compatibility fixes for Qt5 ( #271 )
...
* Compatibility fixes for Qt5
- make Qt detection in client/Makefile independent of OS
- added -std=c++11 and -fPIC as compiler options (required by some Qt versions, breaks compiling with old ProxSpace environment)
2017-04-11 06:58:20 +02:00
fb9acd4588
Update/cleanup Makefiles ( #265 )
...
- add new target "make mfkey" to build mfkey32 and mfkey64
- include above when "make all"
- fix Qt detection for Kali Linux
- create and use dependency files when building client
- create client/lualibs/usb_cmd.lua from include/usb_cmd.h when building client
- add Windows *.exe files with "make tarbin"
- For the time being don't include Makefile.common in Makefile and client/Makefile
- set com3 as default flashing port for Windows (including mingw)
- remove static targets snooper and cli. Remove their sources as well.
2017-03-31 16:04:04 +02:00
c3caf0409c
add lf securakey
...
still unknown - checksum and how FC relates to printed FC/Code
also removed noralsy extra ST check (i was tired...)
2017-03-29 00:37:16 -04:00
a9968da347
add jablotron+noralsy lf tag definitions/cmds
...
Thanks to @iceman1001 for most of the code.
Jablotron is complete
noralsy is mostly known - a few bits are still unknown.
2017-03-28 18:01:45 -04:00
5bce72d5e3
split lf paradox/nexwatch into own files
...
see changelog.md for cli changes!
2017-03-27 18:04:20 -04:00
d95878f802
Merge pull request #251 from marshmellow42/master
...
split fdx-b demod to its own file
2017-03-26 14:35:42 +02:00
4db6f3bbb9
split fdx-b demod to its own file
...
added @iceman1001 s read/sim/clone commands for fdx--b
check changelog.md for cli changes!
2017-03-26 08:09:40 -04:00
1ee7925609
Merge pull request #249 from pwpiwi/parity
...
Refactor parity functions
2017-03-26 08:28:43 +02:00
fecfd86d3d
Merge pull request #248 from marshmellow42/master
...
Split data askgproxiidemod to own file
2017-03-26 08:26:30 +02:00
1f065e1dad
Refactor parity functions
...
- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory
2017-03-25 22:03:17 +01:00
946a84c35b
Split data askgproxiidemod to own file
...
added lf gproxii read (from antenna)
fixed a few copy paste issues in the comments of some lf files
2017-03-25 15:51:31 -04:00
edf751bb62
Merge pull request #245 from marshmellow42/master
...
split lf indala[cmd] to lf indala [cmd]
2017-03-25 07:28:53 +01:00
0fb65a262b
split lf indala[cmd] to lf indala [cmd]
...
see changelog.md for cli changes!
2017-03-24 19:18:33 -04:00
4cb4b588c2
Deduplicate mfkey32 and mfkey64
...
- rename client/nonce2key.[ch] to mfkey.[ch]
- leave only main() wrapper in tools/mfkey
- add mfkey32 and mfkey64 to .gitignore
2017-03-23 18:38:17 +01:00
7779d73c71
Code cleanup: Refactoring nonce2key
...
- include nonce2key() in mifarehost.c
- remove tools/nonce2key
- simplify mifare_autopwn.lua
2017-03-20 21:16:57 +01:00
acf0582d53
Provide msclock() as Milliseconds timer for performance measures ( #231 )
...
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
2017-03-12 15:06:27 +01:00
0ca9bc0e99
Upgrade crapto1 library to v3.3 ( #232 )
...
- fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library
- fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c
- allow crapto1.c to compile on ARM hosts
- add @iceman1001's readme.txt to tools/mfkey
2017-03-12 15:05:54 +01:00
33443e7caa
Code cleanup: deduplicate crapto1 library ( #228 )
...
- merge the existing 4 crapto1 sources into common/crapto1
2017-03-09 11:12:50 +01:00
8b6abef506
add iceman1001 s lf visa2000 commands
...
-reset my fork due to corruption - now add back in the lf visa
commands...
also adjusts lfdemod all detect clock functions to always return a
starting point of the clock detected ( for graphing purposes)
2017-03-07 08:48:16 -05:00
c44c2f04d9
Fix some #defines
...
- Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1
- WIN32 is deprecated. Use _WIN32 instead
2017-03-06 19:55:23 +01:00
4197a3f6ff
Make LUA scripting work even if proxmark3 is called from arbitrary working directory
...
- add @gpakosz whereami library (https://github.com/gpakosz/whereami ) in order to ...
- determine and set absolute paths for LUA scripts and LUA libraries
2017-02-23 18:37:34 +01:00
e04475c421
Add @Iceman1001 s cotag read
...
also needed to include some of icemans timer additions.
2017-02-03 00:14:34 -05:00
103c60ec7e
flag needed for some compile environments
...
used for 'z' and 'l' in printf commands.
2017-01-30 23:13:22 -05:00
d1057e7a21
Merge pull request #119 from marshmellow42/pm3+reveng
...
add reveng 1.30 source to PM3 for CRC calculations & searches
2016-10-08 19:18:14 +02:00
5bac3d9b3c
fix client/Makefile
2016-09-25 14:32:06 +08:00
94e27a0961
fix client/Makefile
2016-09-25 14:26:11 +08:00
775c4c4a28
test-pr
2016-09-24 12:56:08 +08:00
887f6ab4b3
Better Linux compilation compability
...
Addition of the termcap and ncurses libraries fixes the compilation issue on Slackware Linux 14.2.
/usr/lib64/gcc/x86_64-slackware-linux/5.4.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:132: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/proxmark3/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/proxmark3/proxmark3"
2016-09-12 16:03:46 +02:00
6923d3f14f
Add @iceman1001 s presco and pyramid functions +
...
plus comment some includes.
fix indala error checking bugs
cmddata.h previously relied on several headers being included prior to
cmddata.h, now self contained.
2016-03-05 23:45:28 -05:00
7f0d592636
Merge remote-tracking branch 'upstream/master' into pm3+reveng
2016-02-15 14:13:49 -05:00
fe876493f8
include cmdlfviking.c in makefile and cmdlf
...
fix minor typos
2015-11-26 21:05:46 -05:00
8e21541e77
Merge branch 'master' into topaz
2015-08-25 07:53:00 +02:00
dbf6e824f9
Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number
2015-07-13 15:45:28 -04:00
db2b81ba11
Merge branch 'master' into topaz
...
Conflicts:
client/Makefile
client/cmdhf.c
client/cmdhf14a.c
2015-07-01 08:17:00 +02:00
bf7ebb7b20
Merge remote-tracking branch 'upstream/master' into pm3+reveng
...
Conflicts:
client/Makefile
2015-06-29 00:06:59 -04:00
2da2e92837
Merge pull request #109 from pwpiwi/image_shrink
...
Compress FPGA configs and initialized data
2015-06-24 07:47:45 +02:00
fe81b47811
add reveng-1.30
...
new command menu:
crc help
crc calc
crc calc -h for help on command set
2015-06-06 01:09:54 -04:00
1c4c0b0681
add @Iceman1001 s sha1 scripting changes.
2015-05-30 21:51:15 -04:00
dc20a1f639
Fix linking under linux. liblua requires libld on linux.
2015-05-29 18:18:10 +02:00
8e074056ac
also delete *.bin and fpga_compressor when "make clean".
...
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
2015-05-26 18:12:40 +02:00
4b3f6d79ea
Add option -d (decompress) to fpga_compress. Allows testing.
...
Improve zlib deflate (note: no change required to inflate).
2015-05-26 08:31:35 +02:00
0fa01ec7da
Compress the .data section as well (saves another 4KBytes and comes for free)
...
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
2015-05-26 08:31:32 +02:00
f39198789b
replaced gzip with an own compressor tool (fpga_compress.c, based on zlib)
...
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
2015-05-26 08:31:26 +02:00
e61530408c
add: hw ver: show FPGA versions for both HF and LF FPGA configs
...
add: hw ver: show used and free flash memory
chg: prepare fpgaloader for compressed FPGA configs
2015-05-26 08:31:19 +02:00
d730878d8c
scripting updates from @iceman1001
...
it compiles but i'm not sure how to fully test it...
:)
2015-05-13 21:14:35 -04:00
6306ff4bac
Merge branch 'master' into topaz
...
Conflicts:
armsrc/Makefile
client/Makefile
2015-04-05 19:45:59 +02:00
marshmellow42
pwpiwi
Iceman
menshiyun
Johnny Bengtsson
Craig Young