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

8392 commits

Author SHA1 Message Date
merlokk b92ebfa4a4 added hf search -v and reworked fast aid search output 2021-06-18 11:59:48 +03:00
merlokk c5f24a24a4 make style and small fix 2021-06-17 13:44:14 +03:00
merlokk da8c33f4c0 small fix 2021-06-17 13:32:38 +03:00
merlokk 0cc310df62 fixed cipurse hf search behavior and add some aid search to link to commands 2021-06-17 13:24:16 +03:00
Matthias Deeg 6348ad308c
add Lua script for RFID-based TOTP token Protectimus SLIM NFC 2021-06-16 11:10:37 +02:00
Philippe Teuwen 10f65df350 add keys 2021-06-16 02:43:57 +02:00
merlokk c8c3c279eb small fix 2021-06-15 15:44:04 +03:00
merlokk cbb484588c add some info 2021-06-15 15:36:50 +03:00
merlokk a5b5a147c9 fix libs 2021-06-15 14:06:43 +03:00
merlokk f3f3a5a270 make style 2021-06-15 14:06:43 +03:00
merlokk f0367ad2f7 help changes and add delete command 2021-06-15 14:06:43 +03:00
merlokk 6f334ed968 add create file command 2021-06-15 14:06:43 +03:00
merlokk 2f83e87222 some refactorings 2021-06-15 14:06:43 +03:00
merlokk c5c15de700 read file attributes 2021-06-15 14:06:43 +03:00
merlokk 012b7e5701 write file works 2021-06-15 14:06:42 +03:00
merlokk f682a184b8 set channel security levels from command line 2021-06-15 14:06:42 +03:00
merlokk e5fe614a4f added no-authenticate option to read file 2021-06-15 14:06:42 +03:00
merlokk 737ff2d465 encoding works 2021-06-15 14:06:42 +03:00
merlokk a206dcc9b2 clear security state when card returns error 2021-06-15 14:06:42 +03:00
merlokk 9cfa638e4d encrypted resp works 2021-06-15 14:06:42 +03:00
merlokk 6875ad1b81 mic calculation ok 2021-06-15 14:06:42 +03:00
merlokk eaf623af94 MAC works 2021-06-15 14:06:41 +03:00
merlokk 5caca153a5 TX mac ok 2021-06-15 14:06:41 +03:00
merlokk e8c6964bdf fix small bug 2021-06-15 14:06:41 +03:00
merlokk 98060cf748 some additional info 2021-06-15 14:06:41 +03:00
merlokk 09f33a45c7 get additional info 2021-06-15 14:06:41 +03:00
merlokk 84ada9cc14 read file works 2021-06-15 14:06:40 +03:00
merlokk 99c4a3a9c0 fix warning 2021-06-15 14:06:40 +03:00
merlokk 9857094274 security level logic 2021-06-15 14:06:40 +03:00
merlokk 54e7713a9a auth refactoring 2021-06-15 14:06:40 +03:00
merlokk b4ecbdb5f6 text fix 2021-06-15 14:06:40 +03:00
merlokk 283f065bc8 add mac/encrypt primitives 2021-06-15 14:06:40 +03:00
merlokk 413c5ec340 add mac sketch 2021-06-15 14:06:40 +03:00
merlokk da2a1f3c62 add MAC sketch 2021-06-15 14:06:40 +03:00
merlokk 80e8e1f8f9 add file to cmake 2021-06-15 14:06:39 +03:00
merlokk 1ba9606011 authentication works 2021-06-15 14:05:34 +03:00
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