Commit graph

616 commits

Author SHA1 Message Date
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
pwpiwi c04a4b60ce Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, ...) 2017-10-01 17:52:10 +02:00
Oleg Moiseenko 3a05a1e739 reworking magic cheneese card wipe (#365)
Implement hf mf cwipe. Remove wipe parameter from hf mf csetuid.
2017-09-22 19:40:42 +02:00
marshmellow42 8c8317a5e9 fix lf sim fpga download overwrites sim buffer (#391)
* adjust LFSim to download lf fpga prior to setting emulation buffer to prevent buffer overwrite condition if you are coming from HF fpga.
* fix lf sim big buff overwrite with fpga download. Move fix to the buffer download cmd.
2017-09-11 19:18:32 +02:00
marshmellow42 1dae9811f2 Indala fixes - set accurate preamble and start of.. (#385)
.. data for both format types (64 bit and 224 bit)
also adjust 224 bit demod and clone to output and input in PSK2 instead
of PSK1 as this appears to be most common for this format.
2017-08-27 12:10:28 +02:00
pwpiwi 930763e86d Use PolarSSL DES implementation (GPL 2 or later) for both client and firmware (#378)
to prevent licensing issues with ARM-Crypto-Lib (GPL 3 or later)
2017-08-22 10:04:47 +02:00
marshmellow42 fe087813f6 Merge pull request #356 from pwpiwi/low_frequencies
revert removal of quarter frequency support for hi_read_rx_xcorr.v
2017-08-21 15:29:56 -04:00
etmatrix 4efdfbe638 Fixes 2 bugs in mifare simulate (#380)
- Check button press when there is NOFIELD, so we can exit also without FIELD
- struct nonces_t is moved to include/mifare.h so client and arm has the same definition
2017-08-17 16:59:48 +02:00
marshmellow42 f2081c4356 adjust lf simulation - fix one bug + attempt... (#369)
... to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 1000th loop
iteration.
some users were experiencing modulating reactions to be too slow.
2017-08-08 21:08:59 +02:00
pwpiwi 3f7aaf24fb revert removal of quarter frequency support for hi_read_rx_xcorr.v 2017-07-13 08:48:27 +02:00
Fl0-0 7906cb41ff Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility (#349)
* Improve 'Magic' Mifare tags detection

* Magic Mifare tags detection and version printing

* Magic s50/1k tag halt error correction for cload and csave

* hf mf c* commands for gen1b

* Use |= for bitwise operation

* gen1b: don't issue wipe command and don't expect response from WUPC1 magic command after a SELECT_UID: old UID display works in hf mf csetuid

* hf mf cgetsc compatibility for 4k

* hf mf csave compatibility for 4k

* hf mf cload compatibility for 4k, suppress halt errors messages for debug level 2

* Revert to MF_DBG_ERROR level in mifare_classic_halt() and don't issue the halt command for gen1b

* Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility
2017-07-12 15:58:32 +02:00
Henrik Johansson 52244230d3 hitag2 write (#310)
Usage is similar to hitagS write: lf hitag write 24 KEY pagenumber 32bitvalue
* added changlelog entry
2017-07-05 20:16:54 +02:00
marshmellow42 979c76556a fix some iclass reader bugs (#350)
endless loop in reader if no tag was found
button press on pm3 did not cancel.
led_b was left on in some cases
also moved 14b detection to last in hf search to help speed up the
command for the other tags.  14b is slow (does multiple tests)
Thanks to @Fl0-0 and @pwpiwi for their idenfication of some of the
issues.
2017-07-05 18:11:48 +02:00
Iceman 6100040454 Update hfsnoop.c (#338)
fix:  missed a include for usb_poll_validate_length
2017-06-26 08:37:32 +02:00
pwpiwi 893d0fcc49 Merge pull request #337 from Proxmark/iceman1001-patch-4
Iceman1001 patch 4
2017-06-26 07:50:57 +02:00
Iceman d8e61a3004 Update aes.c (#336)
FIX:  coverity scan - improper use of sizeof
2017-06-26 00:52:09 +02:00
Iceman 06ed826c01 Update hfsnoop.c
chg:  enabled snooping function to break on receiving a usbpackage.
2017-06-25 19:39:45 +02:00
Iceman e7fd9f5ff4 Update BigBuf.h
added the header definition
2017-06-25 19:35:59 +02:00
Iceman f4329b1732 Update BigBuf.c
chg:  change from defines to booleans.
add: bigbuf_clear_em(),  empties the reserved emulator part only
2017-06-25 19:35:03 +02:00
Iceman e702439e00 Update fpgaloader.c
CHG:  just making sure the bigbuff is cleared after the zlib played.  So we don't get the random noice that ppl are posting thinking they got a signal.
2017-06-25 19:30:07 +02:00
marshmellow42 34e2af02a4 bug fix for hf iclass reader and iclass detection
memory locations in code are now accurate and the CC output is not
corrupted by the config's crc.

also the looping and flags for what to read are now correctly
implemented in the code.
2017-06-23 13:50:25 -04:00
marshmellow42 3d542a3dfa coverity scan bug fixes
mfu keyNo buffer overflow
mf reader attack key count reduced to not overrun c.d.asBytes buffer.
2017-06-06 12:12:18 -04:00
Iceman c7b2751136 Merge pull request #297 from pwpiwi/hardnested
Implement hf mf hardnested
2017-06-01 14:34:43 +02:00