pwpiwi
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
pwpiwi
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
pwpiwi
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
pwpiwi
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
pwpiwi
33443e7caa
Code cleanup: deduplicate crapto1 library ( #228 )
...
- merge the existing 4 crapto1 sources into common/crapto1
2017-03-09 11:12:50 +01:00
marshmellow42
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
pwpiwi
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
pwpiwi
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
marshmellow42
e04475c421
Add @Iceman1001 s cotag read
...
also needed to include some of icemans timer additions.
2017-02-03 00:14:34 -05:00
marshmellow42
103c60ec7e
flag needed for some compile environments
...
used for 'z' and 'l' in printf commands.
2017-01-30 23:13:22 -05:00
Iceman
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
menshiyun
5bac3d9b3c
fix client/Makefile
2016-09-25 14:32:06 +08:00
menshiyun
94e27a0961
fix client/Makefile
2016-09-25 14:26:11 +08:00
menshiyun
775c4c4a28
test-pr
2016-09-24 12:56:08 +08:00
Johnny Bengtsson
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
marshmellow42
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
marshmellow42
7f0d592636
Merge remote-tracking branch 'upstream/master' into pm3+reveng
2016-02-15 14:13:49 -05:00
marshmellow42
fe876493f8
include cmdlfviking.c in makefile and cmdlf
...
fix minor typos
2015-11-26 21:05:46 -05:00
pwpiwi
8e21541e77
Merge branch 'master' into topaz
2015-08-25 07:53:00 +02:00
Craig Young
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
pwpiwi
db2b81ba11
Merge branch 'master' into topaz
...
Conflicts:
client/Makefile
client/cmdhf.c
client/cmdhf14a.c
2015-07-01 08:17:00 +02:00
marshmellow42
bf7ebb7b20
Merge remote-tracking branch 'upstream/master' into pm3+reveng
...
Conflicts:
client/Makefile
2015-06-29 00:06:59 -04:00
pwpiwi
2da2e92837
Merge pull request #109 from pwpiwi/image_shrink
...
Compress FPGA configs and initialized data
2015-06-24 07:47:45 +02:00
marshmellow42
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
marshmellow42
1c4c0b0681
add @Iceman1001 s sha1 scripting changes.
2015-05-30 21:51:15 -04:00
pwpiwi
dc20a1f639
Fix linking under linux. liblua requires libld on linux.
2015-05-29 18:18:10 +02:00
pwpiwi
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
pwpiwi
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
pwpiwi
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
pwpiwi
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
pwpiwi
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
marshmellow42
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
pwpiwi
6306ff4bac
Merge branch 'master' into topaz
...
Conflicts:
armsrc/Makefile
client/Makefile
2015-04-05 19:45:59 +02:00
pwpiwi
05ddb52c43
fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding()
...
chg: use -O2 instead of -Os when compiling ARM sources
chg: don't clear the Miller decoders input buffer on reset
chg: be more specific for the Miller decoders start bit pattern
add: new option c in hf list: mark CRC bytes (default is off)
2015-03-18 18:32:43 +01:00
marshmellow42
9f7bbd24c9
data autocorr additions
2015-03-13 12:23:26 -04:00
pwpiwi
8c04722db6
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-10 19:00:39 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Jesse Hallio
e9281ae812
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-03 23:22:39 +02:00
Martin Holst Swende
dca558bf9e
Removed last trace of crypto from makefile
2015-01-26 20:56:33 +01:00
Martin Holst Swende
afceaf4018
Removed openssl from the mfu-stuff
2015-01-22 21:02:21 +01:00
iceman1001
5ee701292f
Step 2 - Ultralight / Ultralight-C
...
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
2015-01-20 21:23:04 +01:00
iceman1001
c8b6da2295
Merge branch 'master' of https://github.com/holiman/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
2015-01-20 20:59:24 +01:00
Martin Holst Swende
1f6417a9b2
Removed dependency on openssl, added AES implementation from polarssl instead
2015-01-12 21:47:36 +01:00
iceman1001
002c1ce57a
CHG: removed leftover debugging statements proxmark3.c
...
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
2015-01-07 11:10:46 +01:00
iceman1001
9484ff3d6e
ADD: tnp3xxx identification in luascripts.
...
CHG: minor code clean up.
2015-01-06 21:20:41 +01:00
marshmellow42
eb191de615
LF Demod streamlining
...
one shared location for demoding lf for arm and client. also added a
few raw demod commands.
2014-12-28 20:33:32 -05:00
Martin Holst Swende
3ad48540d4
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
...
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
2014-06-28 20:52:37 +02:00
iZsh
7cc204bff8
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.
2014-06-20 01:02:59 +02:00
Andrew Davies
a66fca86b9
Updated proxmark research with Holiman's loclass framework
2014-05-02 11:11:54 +01:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00