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
merlokk
1d6f7bc8ac
added changelog
2017-11-02 14:28:05 +02:00
Oleg Moiseenko
378d3406ca
Merge branch 'master' into 14a_rework3
2017-11-02 14:14:55 +02:00
merlokk
23207d748f
tlv decoder works.
2017-11-02 14:11:42 +02:00
Oleg Moiseenko
75e42ef5df
added changelog ( #460 )
2017-11-01 20:37:18 +01:00
Oleg Moiseenko
fe6bf3c58c
improve hf 14a info ( #457 )
...
* added validate_prng_nonce from iceman1001 fork
* added DetectClassicPrng from iceman1001 fork
2017-11-01 17:48:59 +01: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
marshmellow42
9d139870cb
Merge pull request #456 from merlokk/hfreaderfix
...
fixed bug with `hf search 14a`
2017-11-01 07:57:30 -04:00
merlokk
fe842bed9c
fixed bug with hf search 14a
2017-11-01 13:54:03 +02:00
merlokk
a2bb2735d5
TLV decoding works
2017-11-01 13:38:29 +02:00
Oleg Moiseenko
7dac1034e5
Add hf mf info, change hf mf reader ( #452 )
...
* copy functionality from `hf 14a reader` to `hf 14a info`
* added command `hf 14a reader` with simple anticollision-select procedure.
* add parameters to `hf 14a reader`. may start and end acting as reader
2017-11-01 08:51:05 +01:00
merlokk
78a94ff902
improved GetAPDUCode()
2017-10-31 19:19:49 +02:00
merlokk
5bcb3496fa
small refactoring
2017-10-31 19:11:23 +02:00
merlokk
fe346768b3
added showing apdu response codes
2017-10-31 18:14:32 +02:00
merlokk
a23f000182
move strucrture to .h file
2017-10-31 16:25:42 +02:00
merlokk
6fc6cd0f57
export apdu function
2017-10-31 16:20:23 +02:00
merlokk
d1300b47ae
apdu sending refactoring
2017-10-31 16:08:58 +02:00
merlokk
8019540b19
param parsing convert to procedures
2017-10-31 15:15:57 +02:00
merlokk
f2b0169cc6
apdu works.
2017-10-31 13:28:16 +02:00
merlokk
f1a983a330
fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway...
2017-10-30 17:58:43 +02:00
merlokk
980417eacd
iso14_apdu works via logical channel. not as it needs. it needs to change to raw(
2017-10-30 17:29:03 +02:00
Oleg Moiseenko
618c220c38
small fixes in ReaderIso14443a() ( #446 )
2017-10-29 16:34:51 +01:00
merlokk
1208cdcb45
added sketch for command hf 14a apdu
2017-10-27 19:02:45 +03:00
merlokk
7710983be3
added hf 14a apdu command.
2017-10-27 18:45:42 +03:00
Oleg Moiseenko
fefb7f5376
appveyor.yml. display return values ( #451 )
...
* display return values from commands and compare them with value. as promised in #440
2017-10-27 16:58:24 +02:00
pwpiwi
3851172d81
Revert "Comms refactor (prerequisite of libproxmark work) ( #371 )" ( #450 )
...
This reverts commit afdcb8c159
2017-10-27 09:56:46 +02:00
Michael Farrell
afdcb8c159
Comms refactor (prerequisite of libproxmark work) ( #371 )
...
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
2017-10-26 21:54:27 +02:00
Oleg Moiseenko
e17660d5f7
code cleaning ( #445 )
2017-10-26 19:09:53 +02:00
Oleg Moiseenko
5d7d0c3af9
small improvement in tests (test result in green or red) ( #448 )
2017-10-26 18:32:18 +02:00
Iceman
8dd0118673
Merge pull request #440 from merlokk/c3
...
improve appveyor.yml
2017-10-26 11:46:20 +02:00
Oleg Moiseenko
8bdb6043b0
identification fix for magic chinese cards ( #444 )
...
* fixed #411
2017-10-25 07:56:03 +02:00
Iceman
5cc1ff44b4
Merge pull request #443 from doegox/flush
...
Flush stdout when waiting for /dev/ttyACM0
2017-10-24 14:28:16 +02:00
Philippe Teuwen
8a50d60617
Flush stdout when waiting for /dev/ttyACM0
2017-10-24 14:10:52 +02:00
pwpiwi
23af9327a5
fix hw status (and USB comm in general) ( #434 )
...
* don't ignore ReadLine() errors (Windows)
* lock CmdBuffer with Mutex
* refactor WaitForResponseTimeoutW
2017-10-24 07:48:38 +02:00
Iceman
a6d4e93cb5
Merge pull request #438 from pwpiwi/fpga_14b
...
FPGA changes ISO14443B:
2017-10-23 15:05:07 +02:00
merlokk
b5381d70dc
added write-host for tests
2017-10-23 13:43:46 +03:00
Michael Farrell
05b6b11785
Multiple USB-CDC changes (attempt 6) ( #439 )
...
- Fix reporting of string descriptors.
- Add note about ModemManager matching on the manufacturer string.
2017-10-23 09:04:06 +02:00
merlokk
9764d3ea0e
normally show powershell scripts
...
it needs to have no spaces at the end of lines and no `;`
2017-10-22 22:20:44 +03:00
merlokk
da36bed90d
added testing timeout 40 sec to avoid hang VM
2017-10-22 21:47:19 +03:00
pwpiwi
d372569b45
FPGA changes ISO14443B:
...
* slightly increase reader field strength
* increase sensitivity when reading, allowing increased reading distance
2017-10-21 10:36:01 +02:00
pwpiwi
bb04ef216d
small fix: make iso14a_set_timeout() external
2017-10-20 20:20:07 +02:00
Oleg Moiseenko
ef9746cb2f
added CI appveyor.com ( #436 )
2017-10-20 19:11:02 +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
