Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-11-15 05:05:02 +08:00
Code Issues Projects Releases Packages Wiki Activity
1586 commits 3 branches 11 tags 34 MiB
Commit graph

1586 commits

This branch
This branch
All branches
Author SHA1 Message Date
Iceman
a3bd24b5dc Merge pull request #230 from zhovner/master 
Adding homebrew tap method for macOS
 2017-03-08 12:20:47 +01:00
Pavel Zhovner
45095b0178 Adding homebrew tap method for macOS 2017-03-08 14:16:33 +03:00
Iceman
6143f8ccf1 Merge pull request #229 from marshmellow42/master 
add iceman1001 s lf visa2000 commands
 2017-03-08 06:42:08 +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
300bb58ac1 Merge pull request #227 from pwpiwi/client_fixes 
Client code cleanup:
 2017-03-06 22:19:15 +01:00
pwpiwi
7cb8516cb5 Client code cleanup: 
- cleanup some header files and respective #includes
- rearrange functions (definition before first use)
- use SCNxxx instead of PRIxxx macros in scanf()
- use stdbool true/false instead of self defined TRUE/FALSE
 2017-03-06 21:03:13 +01:00
Iceman
7ea23ef5b3 Merge pull request #226 from pwpiwi/fix_defines 
Fix some #defines
 2017-03-06 20:46:09 +01:00
Iceman
571324a5c4 Merge pull request #225 from pwpiwi/armsrc_header_fixes 
Remove local armsrc/stdint.h and fix some other #includes
 2017-03-06 20:45:58 +01: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
b8e461ff61 Remove local armsrc/stdint.h and fix some other #includes 2017-03-06 19:22:35 +01:00
Iceman
8a8e7c6914 Merge pull request #223 from 4m4rOk/master 
Typo fix for CmdPing
 2017-03-04 13:54:44 +01:00
Luca
6ef3f9f219 Typo fix for CmdPing 
Ping successfull -> Ping successful
 2017-03-04 13:38:57 +01:00
pwpiwi
23bd68f944 Merge pull request #221 from jamchamb/clean-mfu-dump 
Clean mfu dump output
 2017-03-04 12:48:37 +01:00
James Chambers
d172c17ca4 make clean_ascii a util function 2017-03-03 18:04:58 -05:00
James Chambers
4bbf5ad17d clean up unprintable characters in MFU dump output 2017-03-03 17:38:51 -05:00
pwpiwi
f76d6fae10 Merge pull request #220 from marshmellow42/master 
small patches and small added features listed below:
 2017-03-01 07:08:50 +01:00
marshmellow42
ebd95febb8 update changelog 2017-02-28 17:44:19 -05:00
marshmellow42
f75b313b00 fix stt mark location bug 
add `data mtrim` to do a middle trim of the graph.
 2017-02-28 17:28:51 -05:00
marshmellow42
ab812dfae5 implement marking the second STT when detected 
on the graph window
 2017-02-28 16:35:01 -05:00
marshmellow42
f9f0e83b7c Add 2 pre-setable markers for the graph 2017-02-28 15:53:33 -05:00
marshmellow42
b1ee7eed65 fix em410x XL bug 
and make it rule out more false positives.
 2017-02-28 13:32:23 -05:00
marshmellow42
62a38cc883 adjust em4x05/em4x69 command timings to... 
better conform to datasheet.
 2017-02-28 13:18:52 -05:00
marshmellow42
dda5a928f0 fix STT bug for strong waves (or cleaned ones) 2017-02-28 11:53:55 -05:00
marshmellow42
40c6a02bc9 Add a retry loop to hf mf dump 
helps get the data dumped even if positioning isn't 100% perfect.

also switched em4x05 commands to WaitUS instead of SpinDelayUs, per
@pwpiwi 's suggestion.
 2017-02-28 11:09:42 -05:00
Iceman
38231ce012 Merge pull request #219 from marshmellow42/master 
em cleanup and fix bug in lf config [threshold] option making it not work...
 2017-02-28 08:00:00 +01:00
marshmellow42
fac69c3d76 Adjust global variable name 2017-02-27 23:03:55 -05:00
pwpiwi
a9d08ed0d5 fix for Kali Linux users (Issue #218) 2017-02-27 19:09:09 +01:00
marshmellow42
2b11c7c750 adjust timeouts on lf read/lf search to no timeout if threshold was set. 
NOTE: lf snoop already doesn't have a timeout...
also adjusted PRIx64 to SCNx64 in em410xwrite
 2017-02-26 21:44:40 -05:00
pwpiwi
5a6a7affc5 Fix issues with commit 4197a3f on some linux distributions and old mingw environments (issue #217) 2017-02-24 16:19:35 +01:00
marshmellow42
c85189135e the timeout on lf read makes the threshold ... 
option not work as expected..  need to find a more robust option...

+ added iceman's lf_em410x_sim help text..
 2017-02-24 01:02:25 -05:00
Jeff Morsch
e88c04f924 Merge remote-tracking branch 'upstream/master' 2017-02-24 00:45:57 -05:00
marshmellow42
4913be92ac Merge remote-tracking branch 'upstream/master' 
Merge Head
 2017-02-23 14:08:41 -05:00
marshmellow42
e88096ba25 cleanup 
combine preamble searches (thanks @iceman1001)
simplify Em410xDecode
fix bug in removeParity (I made recently)
move Unique TAG ID printout to avoid confusion
 2017-02-23 13:53:40 -05: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
pwpiwi
4c16ae80f0 Code cleanup: 
- correctly using stdtypes.h printf and scanf format string macros (PRIx64 et al)
- coverity fixes to client/cmdhfmf.c
- fix linker warning re missing entry point when linking fullimage.elf
 2017-02-23 18:29:03 +01:00
pwpiwi
43534cbad2 Code cleanup: 
- correctly use inttypes.h scanf and printf macros (PRIx64 et al)
- fix indendation warnings
 2017-02-22 22:45:00 +01:00
pwpiwi
2d0717853d Merge pull request #216 from marshmellow42/master 
EM4x05/EM4x69 command rewrite and improvements
 2017-02-22 17:38:56 +01:00
marshmellow42
33a1fe9636 small text adjustments plus... 
small improvement to fsk clock detect + fixed a bug where it would
default to rf/16 when it couldn't find a valid one...
 2017-02-22 10:41:40 -05:00
marshmellow42
34ff898553 fix false positive psk demod with fsk wave 
also break out new find start of modulation routine.
 2017-02-21 23:00:43 -05:00
marshmellow42
b7fc61f0c9 update changelog 2017-02-21 16:57:32 -05:00
Iceman
bc1c9c5588 Merge pull request #215 from AdamLaurie/master 
buspirate config for debricking.
 2017-02-21 19:53:52 +01:00
Adam Laurie
a386043fa9 buspirate config for debricking 2017-02-21 17:53:56 +00:00
marshmellow42
73a2a84f75 simplified lf em command structure 
WARNING changes command calling!
 2017-02-21 12:00:09 -05:00
marshmellow42
d0b0586411 cleanup cmdlfem4x.h - add chip detection to ... 
... lf search
 2017-02-21 11:46:13 -05:00
marshmellow42
0a85edf471 add em4x05 config printout 2017-02-21 11:06:19 -05:00
marshmellow42
a37228c8c2 shorten em4x05 capture samples 
add cap option for 4469
add sample size option for  DoAcquisition so i can limit how many
samples i want to collect.
use with DoPartialAcquisition
 2017-02-20 17:39:39 -05:00
marshmellow42
893534d3b5 speed up the em4x05 cmds by only getting 6k... 
samples back
 2017-02-20 15:06:22 -05:00
Iceman
086583f6d1 Merge pull request #214 from jamchamb/fix-hf-reader 
Fix recvLen variable name in hf_reader
 2017-02-20 21:05:35 +01:00
James Chambers
4b12061bee fix recvLen variable name in hf_reader 2017-02-20 14:31:21 -05:00
marshmellow42
fa1e00cfbb add em4x05 info command 
plus some minor adjustments
and added a quick em4x05 test:
bool EM4x05Block0Test(uint32_t *wordData)
if successful very likely the tag is an em4x05 or compatible...
 2017-02-20 09:50:00 -05:00