Commit graph

738 commits

Author SHA1 Message Date
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
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
pwpiwi
298e1a2d0d
update license conditions in armsrc/optimized_cipher.[ch] (#554) 2018-01-31 08:14:56 +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
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
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
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
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
Iceman
6469d5503a
Update lfsampling.c
@marshmellow42 's fix for #514
2017-12-21 07:55:51 +01:00
pwpiwi
fa85b08504 fix iso14a_set_timeout() adjustment 2017-12-11 20:40:09 +01:00
pwpiwi
7c7327e7c8 fix: hf mf hardnested failed with new WUPA timing
* allow additional 2 ssp_frame cycles to detect SOF
* use only respective functions to get/set iso14a_timeout
* remove waiting time in MifareAcquireEncryptedNonces(). This is covered by GetATQA() now.
2017-12-10 19:27:46 +01:00
Iceman
dc93020701 Update fpgaloader.c (#500)
This address part1 in issue https://github.com/Proxmark/proxmark3/issues/499

Device power out 13.56Mhz when started (initialised). This output is not stopped until arbitary command is sent.
2017-11-30 12:46:40 +01:00
pwpiwi
47b78133a0 minor iso14443a timing fixes to avoid select errors:
* take setup frame guard time (SFGT) into account
* adjust iso14a_timeout by FPGA delays
* don't give up on first WUPA. Retry several times
2017-11-22 19:43:12 +01:00
pwpiwi
4058a2d7df
fix: avoid SspClk overflow due to incomplete reset
* should fix watchdog reset during hf mf mifare. Thanks @iceman1001 for the hint.
2017-11-21 07:31:42 +01:00
pwpiwi
db68bcdb06
Complete WTX handling 2017-11-15 07:47:18 +01:00
merlokk
ba4f95b4af added some info from @peterfillmore fork 2017-11-11 23:05:08 +02:00
merlokk
a63505c953 Added work with S-Block WTX in 14a apdu on arm side 2017-11-11 22:56:50 +02:00
marshmellow42
cb593491df fix incorrect variable name
that is what i get for going back over my code and trying to mimic the
naming style used previously...
2017-11-10 16:03:55 -05:00
marshmellow42
217cfb6b29 fix lf search bugs when no tag is on antenna
cotag read could enter endless loop, now cancels if the next bit doesn't
appear

em4x05 detection would loop due to a threshold never being met, now has
a dump out after 1000 samples tested.

fixed some indenting in hitag2 while i was reviewing that code for
potential endless loops...
2017-11-10 15:57:55 -05:00
Iceman
e464f62258
Merge pull request #462 from pwpiwi/fix_hfmfsim
Fix hf mf sim (issue #412)
2017-11-10 18:07:25 +01:00
merlokk
b7d3e89923 changed iso14aapdu arm side and client 2017-11-09 16:39:40 +02:00
merlokk
eb6e8de45d moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443 stream 2017-11-03 13:42:38 +02:00
pwpiwi
82f4955245 Merge branch 'master' into fix_hfmfsim 2017-11-02 21:37:42 +01:00
pwpiwi
b35e04a7c6 fix hf mf sim:
* more timing fixes
* correctly determine correction bit (taken from iceman's fork)
* add checking of Access Conditions for Read command
* never allow reading KeyA
2017-11-02 21:29:08 +01:00
Oleg Moiseenko
378d3406ca
Merge branch 'master' into 14a_rework3 2017-11-02 14:14:55 +02:00
Oleg Moiseenko
83df98d691 change comment in iso14443a.c (#459) 2017-11-01 17:44:43 +01:00
merlokk
499df9088d fix behavier reading iso14443-3 and iso14443-4 cards 2017-11-01 18:34:15 +02:00
merlokk
7376da5c44 revert SAK check 2017-11-01 18:22:03 +02:00
merlokk
bed3e4c20d Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3 2017-11-01 17:13:27 +02:00
merlokk
89ec86abd2 now SAK check is OK 2017-11-01 17:02:35 +02:00
merlokk
c5e9a0212e deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88 2017-11-01 16:55:12 +02:00
merlokk
f1a983a330 fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway... 2017-10-30 17:58:43 +02:00
Oleg Moiseenko
618c220c38 small fixes in ReaderIso14443a() (#446) 2017-10-29 16:34:51 +01:00
Oleg Moiseenko
e17660d5f7 code cleaning (#445) 2017-10-26 19:09:53 +02:00
Oleg Moiseenko
8bdb6043b0 identification fix for magic chinese cards (#444)
* fixed #411
2017-10-25 07:56:03 +02:00
pwpiwi
bb04ef216d small fix: make iso14a_set_timeout() external 2017-10-20 20:20:07 +02:00
pwpiwi
6e49717b5e fix hf mf sim (issue #412) (#419)
* move to separate files mifaresim.[ch]
* check CRC of commands
* don't execute commands without successfull authentication
* ensure correct timing of REQA, WUPA, ANTICOL and SELECT responses
* trace reader commands immediately, only fix start time after tag response. Decreases time to be ready for next reader command.
* remove iso14443-4 remnants
* trace raw reader commands instead of decrypted ones
* some refactoring

* fix hf mf sim
* timing: decrease time to get ready for new reader commands
2017-10-20 17:55:13 +02:00
merlokk
73d7bf75c8 small fix #416 2017-10-16 11:33:17 +03:00
Oleg Moiseenko
275d9e61c2 Check keys in hf mf nested and hf mf chk (#414)
Improve hf mf chk and hf mf nested
* hf mf chk. added interrupt of procedure by usb
* extract mifare default keys into separate module
* arm side multisector `hf mf chk`
* hf mf nested. change key search procedure
* hf mf nested. added key check after we have found a key.
* small fix hf list f
* hf mf chk. add timeout (arm side) and some tweaks.
2017-10-15 21:19:34 +02:00