Commit graph

2343 commits

Author SHA1 Message Date
pwpiwi a39af1cb9c
Add: new option 'd' in 'hf mf ekeyprn' to create dumpkeys.bin from emulator memory (#822)
(and whitespace fixes)
2019-05-22 19:02:58 +02:00
Iceman 9ebbfd898c
Update README.md 2019-04-22 18:25:52 +02:00
marshmellow42 905d2975dc
Merge pull request #817 from Fl0-0/Fix_typo_cmdlf
Fix typo lf config usage
2019-04-19 07:31:54 -04:00
Fl0-0 131c44883c
Fix typo lf config usage 2019-04-19 13:14:41 +02:00
pwpiwi a8561e356b
fix hf mf sim (#812)
* fix parity encryption (thanks to Eloff, http://www.proxmark.org/forum/viewtopic.php?id=6347)
* add support to simulate Mifare Mini, Mifare 2K and Mifare 4K
* change to standard LED handling (A: PM is working, B: reader is sending, C: tag is responding, D: HF field is on)
* NAK on unknown commands
* allow unencrypted HALT
* don't display messages during simulation (or we will miss next reader command)
* use DMA to receive reader command
* switch earlier from send to listen mode
* move ADC initializer to iso14443_setup
* remove remainders of incomplete Mifare 10Byte UID simulation
* show 'short' bytes (7Bits or 8Bits without parity) in 'hf list mf' and 'hf list 14a'
* whitespace
2019-04-19 10:22:10 +02:00
András Veres-Szentkirályi bad582468f Added support for Legic tags to hf search command (#815)
* hf legic: use CMD_ACK instead of Dbprintf
* hf search: add support for Legic tags
2019-04-12 08:52:18 +02:00
marshmellow42 1f61f19767
Merge pull request #808 from MalteHillmann/master
Fixed bugs for FDX-B demod
2019-03-28 19:15:44 -04:00
Malte F. Hillmann 3f306c6ded Bugfixes for LF FDX
Changed CmdBiphaseDecodeRaw to allow 7 digits
Changed CmdFdxRead to read 39999 samples instead of 10000 to improve reading from small tags
2019-03-28 22:40:29 +01:00
Malte F. Hillmann 4306de8277 fixed bug in CmdFdxDemod 2019-03-27 14:36:39 +01:00
Malte F. Hillmann 7361a18f7a fixed bug in ASKbiphaseDemod() 2019-03-27 14:34:42 +01:00
Malte F. Hillmann 9c1d59ce69 fixed bug in CmdBiphaseDecodeRaw() 2019-03-27 14:04:01 +01:00
pwpiwi ba778bc3c4
fix FpgaSetupSsc() (#807)
* ouch! Be aware that same major modes are used in LF and HF!
2019-03-26 21:50:41 +01:00
pwpiwi 5ea2a24839
FPGA changes (#803)
* merge hf_rx_xcorr and hf_tx modes into one module with common ssp_clk and ssp_frame
* get rid of most of the warnings when compiling the HF verilog sources
* refactoring the constants in Verilog sources
2019-03-24 18:11:41 +01:00
pwpiwi ca8a3478d9
iso14443b modifications (#804)
* LED handling
* improve 'hf plot' support
2019-03-24 18:04:42 +01:00
Oleg Moiseenko fdd9395d1a Ndef and MAD (#801)
* move mifare stuff to separate folder
* add mad and ndef
2019-03-19 07:51:10 +01:00
Samson Gama 3d057cfb91 Added some LED utility functions (#802) 2019-03-15 07:41:07 +01:00
pwpiwi 5866c187ef
fix hitag functions (issue #798) (#800)
* ... and whitespace formating
2019-03-13 10:53:40 +01:00
pwpiwi 1523527f94
fix LED signalling in hf 15 snoop and hf 14a snoop (#797)
* LED_A (yellow): PM3 is active (snooping)
* LED_B (green): reader is sending a command
* LED_C (red): tag is sending a reply
2019-03-12 07:49:23 +01:00
pwpiwi 189b817740
add 14a apdu send framing (based on RRG repo PR86 by Merlokk) (#795) 2019-03-12 07:46:49 +01:00
pwpiwi 1338d245c2
chip manufacturer and type identification: (#796)
* add more manufacturers
* refactor chipID decoding
* move to separate file taginfo.[ch]
2019-03-03 11:59:38 +01:00
pwpiwi b6851c194e
fix ATR length (#790)
* TS, T0, T[A-D][1-4], max. 15 HB, TCK = 34 Bytes
2019-02-26 19:48:25 +01:00
Oleg Moiseenko 0b6efd01ec Emv scan via contact interface (#789)
* share getATR from smartcard.h/c
* remove duplicates in tlv.h and add get_uint_8
* check ATS/ATR length
2019-02-21 22:02:22 +01:00
pwpiwi fc52fbd42f
Add raw HF signal plotting (#786)
* Add raw HF signal plotting
* new fpga module hi_get_trace.v - store A/D converter output to circular buffer on FPGA
* new command 'hf plot' - pull data from FPGA and display it in Graph Window
2019-02-20 19:18:12 +01:00
Oleg Moiseenko 7527c2bdd8 fix rare bug in tlv.c (#788) 2019-02-20 18:35:39 +01:00
Fl0-0 7afa751a96 Fix for USB uart slowness since PR #720 (#787) 2019-02-17 14:43:40 +01:00
pwpiwi 53fb848a0a
add tracing functions (#784)
* add trace buffer for PCSC smartcard readers
* new option 'p' in 'hf list' to select PCSC trace buffer
* 'sc list' now supports PCSC smartcard readers
* add 'hf list 14-4' for ISO 14443-4 protocol
2019-02-16 17:51:04 +01:00
pwpiwi 3783c45af1
fix emv roca hash error (#781)
* fix ICC Public Key Hash calculation
* add -a option to 'emv roca'
* replace print() by PrintAndLogEx() in emv_pki.c
2019-02-12 09:06:30 +01:00
Oleg Moiseenko c719d385ef fix endless loop (#782) 2019-02-09 22:38:09 +01:00
pwpiwi 41bdfce385
emv/sc fixes and modifications: (#780)
* print selected Smartcard Reader in PrintChannel()
* implement 'sc sel <readername>'. Readername can include wildcards * and ?
* fixing EMV APDU exchange (again)
* use EMVExchangeEx() instead of EMVExchange() in fidocore.c
2019-02-09 15:15:17 +01:00
pwpiwi fbf77474f5
Update list of Certificate Authorities Public Keys (source: https://www.eftlab.co.uk/index.php/site-map/knowledge-base/243-ca-public-keys) (#777)
* allow tabs in client/emv/capk.txt
* fix issue with printing RID and CSN of certificates
2019-02-06 07:51:49 +01:00
pwpiwi 4cdd63b245
EVM fixes and additions (RRG repository PRs 78-82 by @merlokk) (#776) 2019-02-06 07:50:57 +01:00
Oleg Moiseenko fb27c73313 added SoloKey certificate (#778) 2019-02-04 19:53:04 +01:00
Oleg Moiseenko 3962dce565 fido fix (#775) 2019-02-04 08:03:44 +01:00
pwpiwi 97096af62b
Update list of known EMV AIDs. Source: https://www.eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix (#770) 2019-02-01 21:13:00 +01:00
pwpiwi 6b5105bea9
Adding support for standard USB Smartcard Readers (#769)
* add PCSC reader support to 'sc raw' and all 'emv' commands
* move all APDU -> TPDU mapping to ExchangeAPDUSC()
* print "PSE" instead of "PPSE" when using contact interface
* fix some #defines in protocols.h
* DropField only when using contactless
* some refactoring
2019-02-01 21:12:20 +01:00
AntiCat 437035a75b Legic TagSim: increased reader timeout (#771)
Bug reports from @raphCode and @uhei over at the
RfidResearchGroup have shown that the tag to rwd
timeout is too short.
2019-01-30 22:20:57 +01:00
pwpiwi a9104f7e31
Add support for standard USB Smartcard Readers (#765)
* add PCSC interface (pcsc.c and pcsc.h)
* new command 'sc select' to choose an USB Smartcard Reader
* updated CI/.travis.yml accordingly
* remove TCK CRC check in i2c.c It is done in PrintATR() anyway
* Fix TCK CRC check in PrintATR()
* Add PCSC reader support to 'sc info'
2019-01-28 21:54:34 +01:00
pwpiwi 1511ea28a8
Add ROCA vulnerability test (RRG repository PR 76 by @merlokk) (#762) 2019-01-21 19:26:54 +01:00
Fl0-0 d3c606574f restore #755 reverted after #757 (#761) 2019-01-17 09:13:38 +01:00
pwpiwi 151a33c027
Add smartcard protocol T=0 (RRG repository PRs 71,72,74,75 by @merlokk) (#757) 2019-01-17 07:50:01 +01:00
pwpiwi 0d2624a0cc
Add hf list 15 (#754)
and refactoring: move all of hf list code to cmdhflist.c
2019-01-16 09:54:19 +01:00
Fl0-0 c0e7527ddd Increase threshold to 160, fix for issue 756 (#760) 2019-01-16 09:52:20 +01:00
Michael Farrell 4309ef8fee Allow skipping or trying different keys in hf mf dump (#759) 2019-01-16 09:51:55 +01:00
pwpiwi d04516a652
adjust CI testscript for new emv commands (#758) 2019-01-16 09:40:35 +01:00
Fl0-0 e59481c119 Fix CmdSmartUpgrade GCC8 strncpy specified bound depends on the length of the source argument warning (#755) 2019-01-13 16:53:09 +01:00
pwpiwi d9de20fa4b
Fix 15 snoop (#752)
* fixing hf 15: implement hf 15 snoop
* rename hf 15 record to hf 15 snoop
* speedup sampling / decoding:
*   new FPGA mode FPGA_HF_READER_RX_XCORR_AMPLITUDE implements amplitude(ci, cq) on FPGA
*   inlining the decoders in iso15693.c
*   inlining memcpy/memset in LogTrace()
*   giving up the moving correlator for SOF in Handle15693SamplesFromTag
* decode more of EOF in Handle15693SamplesFromTag()
* some refactoring
2019-01-12 13:28:26 +01:00
pwpiwi 9f596ec7ac
RDV4.0 Smartcard Slot Firmware Upgrade (#751)
* RDV4.0 Smartcard Slot Firmware Upgrade
* new firmware in client/sc_upgrade_firmware directory
* improved sc upgrade:
   * check SHA-512 of firmware file
   * search and find firmware file in predefined directory
   * more sanity checks
* fixed offline indicators of sc commands
2019-01-12 13:26:53 +01:00
pwpiwi 6b6c3be6b9
Added ATR decoding (RfidResearchGroup PRs 67/68 by @merlokk) (#749)
... and fixed merge errors in cmdsmartcard.c
2019-01-12 13:24:22 +01:00
Fl0-0 786ad91c85 Fix CMD_PCF7931_BRUTEFORCE duplicate case value (#750) 2019-01-07 08:55:04 +01:00
Samuele 818e15b0c8 PCF7931: improved read code and implemented a simple password bruteforce (#745)
* Improved PCF 7931 read code and implemented a simple PCF7931 password bruteforce
* Warning on the PCF7931 bruteforce command
2019-01-06 18:33:06 +01:00