RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 08:46:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
13462 commits 3 branches 14 tags 86 MiB
Commit graph

8406 commits

Author SHA1 Message Date
merlokk 1a937b33c4 auth code done. needs tests 2021-06-15 14:05:34 +03:00
merlokk 37daaa2120 GenerateK0AndCp sketch 2021-06-15 14:05:34 +03:00
merlokk fa85078822 high level of auth and some renamings 2021-06-15 14:05:34 +03:00
merlokk f17cbfe412 add some consts and kvv 2021-06-15 14:05:34 +03:00
merlokk 05c8f313dd add auth command and some command's sketches 2021-06-15 14:05:34 +03:00
merlokk 90f930659c add crypto sketch 2021-06-15 14:05:34 +03:00
merlokk ce2b22a6a7 cipurse crypto sketch 2021-06-15 14:05:33 +03:00
merlokk b309fe519b GetChallenge works 2021-06-15 14:05:33 +03:00
merlokk b1b6d3127e fix cmake 2021-06-15 14:05:33 +03:00
merlokk ae6580f65b check cipurse via hf search 2021-06-15 14:02:50 +03:00
merlokk f267df2fb7 cipurse info sketch 2021-06-15 14:02:50 +03:00
Oleg Moiseenko a30d926dab
Merge pull request #1300 from merlokk/fido_fix 
Fido commands fix
 2021-06-15 13:51:58 +03:00
Oleg Moiseenko 390cfb4594
Rename hf-fido2_defparams.json to hf_fido2_defparams.json 2021-06-15 13:46:27 +03:00
merlokk 77ee260970 typo 2021-06-15 13:46:02 +03:00
iceman1001 7bfc3d8f58 fix spiffs comms 2021-06-15 11:38:59 +02:00
iceman1001 41c755e12b some lua colors 2021-06-15 11:38:06 +02:00
iceman1001 47a851df2a maur keys 2021-06-15 11:37:32 +02:00
Philippe Teuwen 0df64d763c
Merge pull request #1306 from merlokk/add_cp 
add cipurse aid
 2021-06-15 10:20:57 +02:00
Philippe Teuwen 2b0e5c0637
Merge pull request #1312 from ah01/add_ntag210u 
Add support for NTAG 210μ
 2021-06-15 10:19:52 +02:00
ah01 451d4cf08d Add support for NTAG210u 2021-06-13 16:48:41 +02:00
Philippe Teuwen 149236d8b3 make style 2021-06-04 21:58:38 +02:00
Philippe Teuwen 1f27be076b make miscchecks 2021-06-04 21:58:38 +02:00
Philippe Teuwen af6ff40748 simplify Iso7816Connect 2021-06-04 21:58:38 +02:00
Philippe Teuwen c5ba1d7a2d Missing SetISODEPState 2021-06-04 21:58:38 +02:00
Philippe Teuwen 61d5a87c4f Use Iso7816ExchangeEx in eMRTD 2021-06-04 21:58:38 +02:00
Philippe Teuwen 56daa155b5 Iso7816Exchange: avoid sending systematically typeA APDUs firstly on typeB tags 2021-06-04 21:58:38 +02:00
Philippe Teuwen 11334f9440 Isolate ISO7816 select & exchange from EMVcore 2021-06-04 21:58:38 +02:00
Gator96100 ed69517252 Windows: fixed buffer resize causes no colors 2021-06-04 21:58:38 +02:00
samwin e92b67d148 Add code to automatically create and update command help text JSON. 2021-06-04 21:58:38 +02:00
merlokk aa407eb594 rename default fido config file 2021-06-03 18:52:14 +03:00
Philippe Teuwen 899f269a99 Fix wtf bug in t55xxAquireAndCompareBlock0 2021-06-01 22:52:55 +02:00
Philippe Teuwen c45331e1e2 fix text 2021-05-31 14:33:05 +02:00
Philippe Teuwen caf9809c0c mutualize print_type4_cc_info 2021-05-30 15:09:48 +02:00
Philippe Teuwen 4b00db8e48 st -> st25ta 2021-05-30 14:55:58 +02:00
Philippe Teuwen 4c44138557 make style 2021-05-30 14:29:05 +02:00
Philippe Teuwen 323c391f4d nfc commands 2021-05-30 14:23:13 +02:00
merlokk 690895da9e add cipurse aid 2021-05-28 18:00:23 +03:00
merlokk 4bacefeadf added fido2 aid to aidlist 2021-05-28 17:42:33 +03:00
merlokk b3a8d704c9 add some help for yubikey 2021-05-28 17:30:36 +03:00
merlokk 8cf58f2e57 fix config files 2021-05-28 15:38:59 +03:00
merlokk 49eccfdbfb fix help 2021-05-28 15:24:05 +03:00
merlokk 6ab2d98644 fido U2F auth command works 2021-05-28 15:19:49 +03:00
merlokk 08809f0c0d fix working with config files 2021-05-28 14:33:49 +03:00
merlokk c83c62855b add saveFileJSONrootEx with overwrite function 2021-05-28 14:33:22 +03:00
Philippe Teuwen 3fe6c417be text 2021-05-26 17:44:39 +02:00
Philippe Teuwen d0e0fa1a80 Fix issue 1288 2021-05-26 17:39:03 +02:00
Philippe Teuwen 2d23d1d226 ESOFT->EMALLOC 2021-05-26 17:39:03 +02:00
Philippe Teuwen 54153153b8 Fix issue #1287 2021-05-25 20:00:04 +02:00
Philippe Teuwen 95dfe54917 hf 14a ndef sanity check 2021-05-25 02:03:46 +02:00
Philippe Teuwen 42dd1e619b ndef type 4 tags: honor max rapdu and support large ndef content 2021-05-25 01:26:30 +02:00
Philippe Teuwen 643d93102e add support for older ndef type 4 tags v1.0 2021-05-24 22:57:39 +02:00
iceman1001 59b86af1a8 fix #1286 - wrong pwd/key length checks 2021-05-24 21:54:09 +02:00
iceman1001 d9f1b97752 comment out header 2021-05-24 14:02:37 +02:00
tcprst 3b4d63686a
add 14a ndef command for type 4 tags 2021-05-23 18:16:27 -04:00
Philippe Teuwen 4b80125f42 Makefile: dissociate Darwin and Brew 2021-05-23 02:42:26 +02:00
Philippe Teuwen 1e84e01738 experimental_lib/01make_lib.sh 2021-05-22 23:39:40 +02:00
Philippe Teuwen d9fb6991a0 Remove cliparser from make help 2021-05-22 22:54:31 +02:00
Philippe Teuwen 07a8369058 Support clang 12 2021-05-22 21:28:33 +02:00
iceman1001 86118525e5 style 2021-05-22 14:22:41 +02:00
iceman1001 9a9d86de95 text 2021-05-22 14:20:38 +02:00
iceman1001 326d2cf5d3 resplen is a pointer and we want its value 2021-05-22 07:36:14 +02:00
Gator96100 b2d158699e check for Windows color support each time 2021-05-21 22:52:23 +02:00
iceman1001 6a6dcd4f56 fix cppchecker 2021-05-21 21:07:38 +02:00
iceman1001 51fb73f4c8 cppchecker fixes 2021-05-21 11:49:00 +02:00
Philippe Teuwen 9a00ad0230 rename version.c into version_pm3.c to avoid clash with mbedtls and other future clashes 2021-05-21 00:15:20 +02:00
iceman1001 f63bc96980 seems cppchecker cant make up its mind 2021-05-20 11:34:56 +02:00
iceman1001 0d017908b4 style 2021-05-20 10:31:21 +02:00
iceman1001 b974a07736 text 2021-05-20 10:31:00 +02:00
iceman1001 b9bf84dbf1 desfire readdata fct, now deals with both INS cases 2021-05-20 10:15:16 +02:00
iceman1001 6447653c64 hf seos - added the skeleton for future use 2021-05-20 10:07:04 +02:00
iceman1001 d46f80e7ea new desfire ats, based on #PR138 in nfc-tools/libfreefare repository 2021-05-20 06:44:48 +02:00
iceman1001 a0efc7aa02 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-19 18:07:29 +02:00
iceman1001 8bf5a99bca codestyle prefer calloc 2021-05-19 18:07:19 +02:00
Iceman a469fdd24b
Merge pull request #1279 from mwalker33/desfire 
Update cmdhfmfdes.c
 2021-05-19 12:58:07 +02:00
mwalker33 0c71b6cc32 Update cmdhfmfdes.c 
use defines for command 0xc4
 2021-05-19 20:57:06 +10:00
mwalker33 c731c945d6 Update cmdhfmfdes.c 
Desfire
- Change Key where key to change = key used to authenticate
- Patch to stop an AES key change incorrectly reporting an issue
 2021-05-19 20:47:11 +10:00
iceman1001 27dcbb49ec hf 14a raw - now has a verbose parameter and less output normally 2021-05-19 12:18:04 +02:00
iceman1001 03a7109efd fix coverity CID 321717 2021-05-19 10:20:30 +02:00
iceman1001 3d8b165033 fix coverity CID 344398 2021-05-19 09:06:35 +02:00
Philippe Teuwen 2b4d110836 accept multiple commands on prompt 2021-05-19 01:48:43 +02:00
Philippe Teuwen 836e0fa206 accept multiple commands on stdin 2021-05-19 01:19:26 +02:00
Philippe Teuwen a592b349cb make style 2021-05-18 23:56:11 +02:00
Philippe Teuwen 76adb58feb Merge branch 'mbedtls_2.26.0' 
* mbedtls_2.26.0:
  mbedtls: disable timing, unused and needs tuning on ProxSpace
  mbedtls: remove inline on mpi fcts to avoid warning:
  mbedtls: stack warning fix, cf 17bce5fb5a
  mbedtls: memset, cf 996ed197fb
  mbedtls: add secp128r1, cf 996ed197fb
  mbedtls: port previous config
  mbedtls: make style
  mbedtls 2.26.0
 2021-05-18 23:52:55 +02:00
Iceman 592b7af837
Merge pull request #1277 from mwalker33/desfire 
Update cmdhfmfdes.c
 2021-05-18 12:19:45 +02:00
mwalker33 e0269bde74 Update cmdhfmfdes.c 
Desfire readdata patch
 2021-05-18 19:49:03 +10:00
iceman1001 03a8704e17 text 2021-05-18 09:13:00 +02:00
iceman1001 01154712a9 hf mfu info - search for NeXT implant known pwd 2021-05-17 20:36:03 +02:00
iceman1001 70694ff281 style 2021-05-17 20:35:11 +02:00
Iceman 269983db27
Merge pull request #1276 from mwalker33/desfire 
Desfire
 2021-05-17 12:10:51 +02:00
mwalker33 cfdef9e92e Update cmdhfmfdes.c 
Desfire write MAC'ed and Encrypted update
 2021-05-17 19:16:27 +10:00
iceman1001 09dc29dd9d fix cppchecker, lesser scope 2021-05-16 23:03:40 +02:00
iceman1001 16783000f0 rework some defines 2021-05-16 23:03:13 +02:00
mwalker33 af59e27643 Update cmdhfmfdes.c 
WriteData - Fixed MACed calculation.
- Tested on Plain (free and Authenticated access)
- Authenticated Plain+MAC

Bugfix for write loop for correct data offset etc.
 2021-05-16 16:52:53 +10:00
iceman1001 8fa51075fb fix cppchecker unsigned warning 2021-05-15 15:33:11 +02:00
iceman1001 5fdd9ac392 fix cppchecker warnings 2021-05-15 15:23:32 +02:00
mwalker33 929ddf0830 Update cmdhflist.c 
Display the correct Key No in Annotation
 2021-05-15 18:34:30 +10:00
iceman1001 925e672e54 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-05-15 09:24:48 +02:00
mwalker33 2e347393e1 option rename 
renamed option to --gap
extended option to em410x reader brute
updated change log
 2021-05-15 15:59:43 +10:00
mwalker33 a99eb7bf5b Update cmdlfem410x.c 
Draft EM4100 sim fix
 2021-05-15 15:31:36 +10:00
iceman1001 e45924b450 moar format, WIP, need more samples 2021-05-14 22:45:57 +02:00
iceman1001 3a920f4e0c unsigned shift 2021-05-14 22:43:08 +02:00
Philippe Teuwen eee13d9eb0 mbedtls: disable timing, unused and needs tuning on ProxSpace 2021-05-14 14:07:59 +02:00
Philippe Teuwen 6324e2e746 mbedtls 2.26.0 2021-05-14 14:07:59 +02:00
iceman1001 37e0ed59f2 fix coverity CID 322673, 322660 2021-05-14 09:02:05 +02:00
iceman1001 752a41e423 coverity CID 286923 2021-05-14 08:10:54 +02:00
iceman1001 28032cd3be coverity CID 322662 2021-05-14 08:08:56 +02:00
iceman1001 3a54bc35fb coverity CID 322665 2021-05-14 08:06:01 +02:00
iceman1001 67bdc1f775 coverity CID 322669 2021-05-14 08:03:22 +02:00
iceman1001 70be8d774d coverity CID 322672 2021-05-14 07:44:25 +02:00
Philippe Teuwen 13a9afa36d Uniformize source code ref and fix gcc 11.1 warning 
Using "extern char linker_symbol[]" notation
cf https://sourceware.org/binutils/docs/ld/Source-Code-Reference.html
 2021-05-13 23:12:15 +02:00
iceman1001 5cc79c7dfd fix cppchecker 2021-05-13 22:40:13 +02:00
iceman1001 03e535ac67 fix cppchecker 2021-05-13 22:38:01 +02:00
iceman1001 6db2a84499 fix cppchecker - 2021-05-13 21:21:33 +02:00
iceman1001 ec46f55821 fix cppchecker, bad boolean compare and unused value 2021-05-13 21:19:16 +02:00
iceman1001 ed87304ca6 fix gcc11.1 warnings, it was a bug. Where the special block was added to 0xFF instead of direct after reserved blocks. 2021-05-13 21:14:56 +02:00
iceman1001 4e48b10ab9 cppchecker fixes 2021-05-13 20:21:06 +02:00
iceman1001 56499a8821 fix compiler warning 2021-05-13 19:54:31 +02:00
iceman1001 841c91a662 should be 8bytes 2021-05-13 19:52:59 +02:00
iceman1001 f6d75ccb5b text 2021-05-13 18:03:27 +02:00
iceman1001 5c64cc6adb fix coverity CID 322519 2021-05-13 17:00:37 +02:00
iceman1001 1ff1fa7385 style 2021-05-11 15:43:12 +02:00
iceman1001 f83fa37b86 fix so authenticated session works with reading a file 2021-05-11 15:37:05 +02:00
iceman1001 4853704920 text 2021-05-11 15:36:27 +02:00
merlokk 4ec8278c89 fix auth command 
fast fix reg command
 2021-05-10 16:13:56 +03:00
merlokk bd6d0869d8 textual 2021-05-10 16:03:28 +03:00
merlokk 577e4e3b30 fix fido u2f auth command 2021-05-10 15:59:20 +03:00
merlokk 28da6f60f6 fix chaining 2021-05-10 15:26:39 +03:00
merlokk 0944ec1fee fix plain parameter (now dirty) 2021-05-10 15:02:23 +03:00
iceman1001 9498a07262 fix coverity CID 322227 2021-05-10 11:43:20 +02:00
iceman1001 089ec732a7 fix buffer overflow 2021-05-10 10:08:38 +02:00
Philippe Teuwen 75328a34b6 arraylen 2021-05-09 23:37:45 +02:00
iceman1001 615ca521c0 fix newline for hf search 2021-05-09 20:39:43 +02:00
tharexde b708ca143d added newline in help text 2021-05-08 22:28:11 +02:00
iceman1001 358bdb7022 dynamic loading and freeing 2021-05-08 19:49:14 +02:00
iceman1001 cbf045dddb refactor fido2 commands to use load and save fcts from fileutils.c. They will now load from /client/resources and save a new file in working dir 2021-05-08 14:59:40 +02:00
iceman1001 25cdc321cd renamed default json 2021-05-08 10:50:00 +02:00
iceman1001 52494a6456 added a load json root fct 2021-05-08 10:47:59 +02:00
iceman1001 d4fe2d775c renamed 2021-05-08 10:47:22 +02:00
iceman1001 8ca410b19f text 2021-05-07 21:21:42 +02:00
Philippe Teuwen 2af0537bc0 bibtex 2021-05-07 21:01:23 +02:00
iceman1001 da3dbd9f82 fix too small arr 2021-05-07 20:40:39 +02:00
iceman1001 578fc70499 text 2021-05-07 19:58:47 +02:00
iceman1001 bb722fa1f8 lf nexwatch - unknown credential identified with a new magic value 2021-05-07 19:57:51 +02:00
iceman1001 3f6c914b99 cppchecker, text 2021-05-07 12:04:50 +02:00
iceman1001 3418d747d9 fix cppchecker 2021-05-07 11:58:39 +02:00
iceman1001 49b19376fa fix cppchecker knownconditiontrueorfalse 2021-05-07 10:19:00 +02:00
iceman1001 656231acba fix cppchecker knownconditiontrueorfalse 2021-05-07 10:16:29 +02:00
iceman1001 e2e6541932 fix cppchecker scope 2021-05-07 10:12:38 +02:00
iceman1001 46782ed308 fix cppchecker redundantcondition 2021-05-07 10:10:19 +02:00
iceman1001 deb08c0e66 fix cppchecker redundantcondition 2021-05-07 10:09:13 +02:00
iceman1001 9d23550424 fix wrong return type 2021-05-07 10:07:01 +02:00
iceman1001 3a5c74d84c remove compiler warnings 2021-05-07 09:14:49 +02:00
iceman1001 9127306c15 style 2021-05-07 08:10:19 +02:00
Iceman cb8cc92337
Merge pull request #1264 from tharexde/4x50_client_bugfix 
em4x50: fixed bug in eload and restore
 2021-05-07 08:08:29 +02:00
tharexde d0175c1fda fixed comparison 0 == 0 2021-05-06 22:54:16 +02:00
iceman1001 5ef0061e31 style 2021-05-06 22:08:18 +02:00
iceman1001 06a3f4c1bb hf lto info - now decodes a bit more information 2021-05-06 19:12:36 +02:00
iceman1001 9588ff7804 OLD -> MIX 2021-05-06 19:12:12 +02:00
iceman1001 c279c5e643 old to mix 2021-05-05 21:37:32 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 0dd73df088 hf mf wipe - now support enforcing sector 0 / block 0 writes 2021-05-05 19:33:15 +02:00
iceman1001 ea416c3694 fixing textual output of ASN1 printing 2021-05-05 12:07:36 +02:00
iceman1001 e6e58227cb text 2021-05-05 12:06:20 +02:00
iceman1001 967550d828 fix compiler warnings 2021-05-05 12:05:56 +02:00
iceman1001 6630f3724b asn1 decoder got some colors 2021-05-04 16:45:50 +02:00
iceman1001 9028c05539 style 2021-05-04 16:45:25 +02:00
iceman1001 997cd7577f added 'data asn1' - decodes asn1 byte arrays 2021-05-04 15:59:21 +02:00
iceman1001 8b100bf173 ..break it... 2021-05-04 09:46:58 +02:00
iceman1001 6d71b9327e ISO15693 SLIX modifications found in @g3gg0 's offical pm3 fork, looks like WIP, with more focus on a standalone mode. I took the base fcts 2021-05-04 09:40:30 +02:00
iceman1001 e14ef1abe4 add old lua script for identify t55xx json dump files 2021-05-03 22:14:09 +02:00
iceman1001 9533671616 hf iclass chk, lookup - solving some concurrensy issues 2021-05-03 20:33:51 +02:00
iceman1001 cd9090b6c8 hf iclass chk - now uses NG 2021-05-03 20:01:12 +02:00
iceman1001 305903c513 rework ISO15693 defines, removing duplicates 2021-05-03 09:35:38 +02:00
iceman1001 49ec0b4040 maur default.. DT 2021-05-03 09:32:18 +02:00
iceman1001 80817cea00 hf iclass chk - rework OLD -> NG. And textual 2021-05-03 09:31:51 +02:00
iceman1001 f50691e3de hf iclass eload - now uses NG 2021-05-02 18:41:43 +02:00
iceman1001 afa3093482 DT default pwd 2021-05-02 06:54:57 +02:00
iceman1001 788876538d convert from OLD to NG 2021-05-01 19:01:15 +02:00
iceman1001 1cc9d9e988 add parity check to N10002 2021-04-30 11:21:40 +02:00
iceman1001 bff70c09ea style 2021-04-30 11:20:03 +02:00
iceman1001 2aec706328 fix: memory leak when reconnecting to device, reuse old struct 2021-04-30 11:19:27 +02:00
iceman1001 0d1f8ca957 making a 14a select fct reachable, in order to do a test in desfire code without repeating same ftc 2021-04-30 11:18:14 +02:00
iceman1001 8243ac9749 fix a sanity memory leak with reserving memory used only for json file loading.. 2021-04-30 11:16:57 +02:00
iceman1001 550fa5aa8f 14a exchange apdu now uses defined return codes 2021-04-30 08:51:38 +02:00
iceman1001 3c072721bf trace list -t mfdes - updated EV2, EV3 annotations 2021-04-30 08:14:11 +02:00
Anže Jenšterle 5093e7357e
Update aid_desfire.json 2021-04-29 18:58:16 +02:00
iceman1001 79bf10dc30 text 2021-04-27 19:35:52 +02:00
iceman1001 82e71d7815 lf hid clone - only print the selected format 2021-04-27 19:16:06 +02:00
iceman1001 7b2adb1305 lf search - textual 2021-04-27 15:20:04 +02:00
iceman1001 10c9ea5f84 more wiegand formats, and if binary is user supplied use that length, and ignore parity faults is removed since we wanna see all decodings anyway 2021-04-27 15:19:34 +02:00
iceman1001 bbdb2d7c95 hf iclass lookup - fix wrong arg order 2021-04-27 15:16:27 +02:00
iceman1001 63b9adbffb hf iclass decrypt - add the possibility to decode as block6 after a decryted block 2021-04-27 15:15:59 +02:00
iceman1001 792b59997e change hf legic dump, restore, to abort if xoring of data failed 2021-04-26 14:29:28 +02:00
Iceman 5cf6798b70
Merge pull request #1258 from aveao/emrtd 
emrtd: Fix file reading and parsing
 2021-04-26 11:41:57 +02:00
iceman1001 c3f1edf73a added indala26,27,27asc, 29 bit formats 2021-04-26 11:37:58 +02:00
Ave but on a massive iMac a20f3afad2 emrtd: Fix problem with certain reads being incorrect 2021-04-26 12:02:50 +03:00
Ave but on a massive iMac 20ca241816 emrtd: Fix bug with certain file reads 2021-04-26 11:04:33 +03:00
iceman1001 c1339a4473 added some 38bit formats 2021-04-26 08:54:43 +02:00
iceman1001 62d84dd734 text 2021-04-25 11:57:28 +02:00
iceman1001 08f567a227 added 'lf idteck sim' 2021-04-25 11:57:03 +02:00