merlokk
77499f6fb2
fix #468
2017-11-11 00:43:29 +02:00
Iceman
d940ebfbad
Merge pull request #470 from pwpiwi/mod_indent
...
add: proper indentation when printing TLV objects
2017-11-10 23:21:26 +01:00
pwpiwi
33a9982c76
dump only leaf TLV data
2017-11-10 23:09:08 +01:00
pwpiwi
43912d6349
add: proper indentation when printing TLV objects
2017-11-10 21:54:07 +01:00
pwpiwi
f5adb06fae
revert field on/off in hf 14a reader
...
fix typo
2017-11-10 20:14:00 +01:00
merlokk
9658b9e137
move include modules from h to c file
2017-11-10 09:15:56 +02:00
merlokk
86a1c1dc25
eliminate double DropField command
2017-11-09 22:01:00 +02: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
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
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
merlokk
bed3e4c20d
Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3
2017-11-01 17:13:27 +02: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
pwpiwi
3851172d81
Revert "Comms refactor (prerequisite of libproxmark work) ( #371 )" ( #450 )
...
This reverts commit afdcb8c159a73aba95a017f1cfec98e8fa2b93c1.
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
8bdb6043b0
identification fix for magic chinese cards ( #444 )
...
* fixed #411
2017-10-25 07:56:03 +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
tisf
1df4df6d8a
Fixing liblua issues
...
On MacOS might have issues with compilation. This should fix it in a case where liblua used is not the built in one.
2017-10-20 21:55:13 +07:00
Oleg Moiseenko
aa757f71d9
proxmark3 refactoring command line parameters ( #417 )
...
* add -c (execute command from command line)
* fix: sometimes proxmark executes command twice...
* fix: start proxmark from QT was in a strange way (if we issue command very fast - it hangs)
* added -l (execute lua script)
* rework help
* small memory management bugfix
* small fix in executing command files
* enable piping from STDIN
2017-10-20 06:49:53 +02:00
Oleg Moiseenko
36b1cdd1b4
fix fpga_comress sending no-error messages to stderr ( #430 )
2017-10-19 12:23:09 +02:00
Oleg Moiseenko
0c86cb0127
Check keys in hf mf nested (issue #426 )
...
* hf mf nested added 14a timeout for check keys
* hf mf nested added options s and ss
2017-10-18 21:44:59 +02: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
Iceman
77aecdd286
Merge pull request #407 from pwpiwi/no_rats
...
Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, …)
2017-10-06 02:36:06 +02:00
pwpiwi
7085af051d
fix LUA script errors
2017-10-05 18:07:26 +02:00
Oleg Moiseenko
adf023ffe3
hf mf nested add some functionality ( #403 )
...
* Added nested auto mode. it checks known keys and then launches nested
* Check if we allready have all keys after nested
2017-10-05 13:37:51 +02:00
pwpiwi
5d8f664d7a
Adjust LUA scripts to new ISO14A_NO_RATS option
2017-10-04 18:28:57 +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
Iceman
0060e3daa2
Merge pull request #402 from pwpiwi/env_flags
...
Don't ignore environment variables CFLAGS and LDFLAGS
2017-09-29 12:01:54 +02:00
pwpiwi
f53eb07de0
Don't ignore environment variables CFLAGS and LDFLAGS
...
* they are be set by some build environments to find include and lib dirs
2017-09-26 18:06:51 +02:00
Iceman
c19f26b05d
Merge pull request #393 from pwpiwi/fix_getclocktime
...
Fix clock_gettime() for Apple OSX
2017-09-26 17:08:50 +02:00
Fl0-0
a2d058f3aa
Fix typo and gcc-7 warnings ( #401 )
...
* Fix typo in hf mf csave help
* Fix gcc 7 warning: '~' on an expression of type bool [-Wbool-operation], use logical ! not instead of ~
* Fix gcc 7 warning: ‘memset’ used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size]
* Fix gcc 7 warning: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]
2017-09-26 16:36:05 +02:00
merlokk
2ce43a28f7
fixed #395
2017-09-26 14:29:08 +03:00
