Commit graph

2061 commits

Author SHA1 Message Date
Iceman
f69f1de80c
Merge pull request #570 from marshmellow42/master
improve lf cmdread
2018-02-14 22:06:00 +01:00
marshmellow42
2896e490d9 update changelog
+fix a comment typo
+ move clear bigbuf after fpgadownloadandgo...
2018-02-14 15:41:39 -05:00
marshmellow42
779d9a0e90 reconfigure lf cmdread ...
to use lf config settings instead of it's own settings.  (now allows
full options of lf config...)

also it will now run `data samples` when the command completes making it
not necessary to run manually...

note: adjusted client wait message as it was confusing.
2018-02-10 17:30:32 -05:00
marshmellow42
61e96805ad add bitbang option to lf cmdread
by setting delay to 0 we can use cmd binary to bitbang the antenna.

note that the timing isn't perfect (especially on the off periods) but
is fairly close. worst i've seen it off is 8us on a large off period.
but i don't have the best test equipment...
2018-02-09 15:51:20 -05:00
Oleg Moiseenko
a37725facf add nested auth decoding to hf mf sniff 2018-02-09 15:50:55 +01:00
Iceman
9e40bad2e3
Merge pull request #569 from pwpiwi/fix_WDT_crash
fix hf mf mifare (WDT crash)
2018-02-08 19:02:16 +01:00
pwpiwi
664e132f88 hf mf mifare:
* prevent WDT crash on repeated tries
* comes with faster execution as side effect
* use uint8_t instead of byte_t
* populate ar instead of (correctly) assuming that it is zero
* remove the "will take a few seconds longer" message because it is no longer true
2018-02-08 14:51:24 +01:00
Iceman
02515642bc fix: hf mf mifare - populate keylist (#568)
This will solve the long running of the attack, since all candidate keys will be tested.
2018-02-08 04:15:42 +01:00
Iceman
2ef3a5e99c
Merge pull request #560 from pwpiwi/fix_hfmfmif
fix: prevent hf mf mifare from always running twice
2018-02-06 08:15:03 +01:00
pwpiwi
d86ee73da5 fix: prevent hf mf mifare from always running twice
(issue #510)
2018-02-03 18:26:09 +01:00
Iceman
c839fa2c25
Merge pull request #558 from pwpiwi/fix_alignment
add force_align_arg_pointer attribute to all callback functions
2018-02-01 09:49:43 +01:00
Arnie97
32e6891a05 hf mf nested: use bitwise or instead. (#556) 2018-02-01 08:09:14 +01:00
pwpiwi
f921c113c9 add force_align_arg_pointer attribute to all callback functions
* inspired by issue #404 and respective fix PR #538
* possible fix for mysterious crashes, e.g. issue #497 and http://www.proxmark.org/forum/viewtopic.php?id=5388
2018-01-31 18:31:51 +01:00
pwpiwi
298e1a2d0d
update license conditions in armsrc/optimized_cipher.[ch] (#554) 2018-01-31 08:14:56 +01:00
Iceman
365627e2f1
Merge pull request #555 from Arnie97/master
hf mf nested: transfer keys to the correct block in one sector mode.
2018-01-26 19:31:23 +01:00
Arnie97
7b7416bd3b hf mf nested: transfer keys to the correct block in one sector mode. 2018-01-27 01:55:38 +08:00
Arnie97
36545f0a56 hf mf eset: reuse mfEmlSetMem(). 2018-01-27 01:09:56 +08:00
Iceman
380e0d086c
Merge pull request #553 from Arnie97/master
Minor fixes
2018-01-25 09:50:47 +01:00
Arnie97
b5cf8b07e2 mfkeys.lua: Remove trailing whitespaces. 2018-01-25 14:52:30 +08:00
Arnie97
f88fa399bc mfkeys.lua: Align empty cells in the table. 2018-01-25 14:48:12 +08:00
Arnie97
392301aaab mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua) 2018-01-25 14:46:00 +08:00
Arnie97
4e002980af hf mf ecfill: Add the missing line break. 2018-01-25 14:39:27 +08:00
Arnie97
e98389b355 Fix typo in lua scripts: 1443a -> 14443a. 2018-01-25 13:43:01 +08:00
Iceman
fb69dd881a
Merge pull request #551 from pwpiwi/remove_reveng
Remove reveng
2018-01-24 10:47:59 +01:00
pwpiwi
757221f5d6 Remove reveng
(its license was not compatible with PM3 license, see issue #527)
2018-01-24 08:38:01 +01:00
Iceman
940b282f54
Merge pull request #550 from pwpiwi/fix_warnings
fix clang compiler warnings
2018-01-23 17:43:07 +01:00
pwpiwi
ec0872181b fix clang compiler warnings
identified in http://www.proxmark.org/forum/viewtopic.php?id=5388
2018-01-23 16:55:48 +01:00
Iceman
acaa71ffe3
Merge pull request #549 from rkblackfire/master
Debug&Improvement of HW TUNE
2018-01-22 19:33:41 +01:00
rkblackfire
f3ffd5a24f Revert "dbg: Watchdog resets while 'hw tune lf'"
This reverts commit fc175230f4.
2018-01-22 19:25:22 +01:00
rkblackfire
095173f72d chg: print only valid tuning data
only print the ranges which were tuned, thus not showing an error for
'lf antenna' when called 'hw tune hf' and vice versa
2018-01-22 18:59:48 +01:00
rkblackfire
fc175230f4 dbg: Watchdog resets while 'hw tune lf'
loop does not finish, u_int is always '>=0'
2018-01-22 18:54:29 +01:00
Iceman
30bb6d6591
Merge pull request #548 from merlokk/mfsniff_fix
`hf mf sniff` not a small fix
2018-01-17 23:16:08 +01:00
merlokk
2ba37081ec added nested authentication "not implemented" warning 2018-01-17 18:16:37 +02:00
Iceman
af1940a5d8
Merge pull request #546 from pwpiwi/fix_tune
hw tune improvements (based on issue #544)
2018-01-17 16:11:56 +01:00
merlokk
a034948363 fix eml file format 2018-01-17 16:12:50 +02:00
merlokk
f7887fa82e added magic cards 2018-01-17 16:01:56 +02:00
merlokk
3e77c7a7b4 ignore SELECT ALL 2018-01-17 15:57:24 +02:00
merlokk
543a6ed3c9 SNF_WUPREQ and SNF_SAK harmonized) 2018-01-17 15:48:01 +02:00
merlokk
968cb35498 deleted save UID from card 2018-01-17 14:14:36 +02:00
merlokk
35cc71b075 delete opposite states fix 2018-01-17 14:10:26 +02:00
merlokk
3544b99715 fixed #541 2018-01-16 17:54:54 +02:00
merlokk
feb328c90a hf mf sniff small fix 2018-01-16 14:34:04 +02:00
Iceman
138a0e7a6b
Merge pull request #503 from merlokk/travis
Travis
2018-01-15 16:06:37 +01:00
pwpiwi
d1f9ec06ae
Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547) 2018-01-15 15:29:14 +01:00
Oleg Moiseenko
8ec06f5ef3 hf mf sniff: small fixes 2018-01-12 22:37:55 +01:00
Oleg Moiseenko
078e2bd238 fix: SIMD instruction set detection on non-x86 hardware
should fix issue #542
2018-01-12 22:04:16 +01:00
pwpiwi
d040cb9024 hw tune:
* scale results to allow higher LF voltages
* remove historic comments
2018-01-12 21:48:42 +01:00
pwpiwi
9b32625c2c hw tune minor fix, comments updated 2018-01-11 08:32:01 +01:00
Iceman
2d51da38f3 HW TUNE adapting for powerful antennas. (#540)
CHG:  'hw tune'  adapting LF measuring from ( >> 8) max 65v,  to ( >>9 ) max 130v in the graph data.   Max LF voltage is 140.8v to measure.

Added a delay for antenna coil and caps to power up before measuring,
removed a variable in ReadAdc
2018-01-10 13:56:27 +01:00
merlokk
84e86ed9e3 move appveyor.yml 2018-01-07 23:23:35 +02:00