Oleg Moiseenko
aadc6bf1e1
combine all auth data to single struct and fill it
2018-02-10 19:03:29 +02: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
merlokk
fb30f5a101
added check reader/tag
2018-02-09 19:40:39 +02:00
merlokk
6c30a244eb
added some get auth data
2018-02-09 19:32:17 +02:00
merlokk
6612a5a201
moved some functions and added auth sequence annotation
2018-02-09 18:23:04 +02:00
merlokk
4f131b53ea
added cmdhflist file
2018-02-09 17:37:31 +02: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
Proxcloud
f3dc6d59f4
make product string even length
2018-02-08 22:32:08 +08: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
Proxcloud
d03a573eee
change product desc to 9 and add extra null byte
2018-02-08 20:40:57 +08:00
Proxcloud
13c25f892e
remove debug change
2018-02-08 19:43:03 +08:00
Proxcloud
c179e7b1f8
remove old Manufacturer description code. fix Product description length
2018-02-08 19:37:55 +08:00
Proxcloud
8b9de94afe
Remove BOS descriptor, leave just manufacturer descriptor for Android
2018-02-08 17:47:40 +08: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
Proxcloud
948b49c407
Add BOS USB descriptor. This allows non-root access on Android devices
2018-02-07 01:07:48 +08: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
