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

3919 commits

Author SHA1 Message Date
iceman1001 e3b6086941 fix data diff, where wrong length was used 2022-06-15 18:09:50 +02:00
Doridian 049e73d45e This actually is bytes 2022-06-14 23:54:43 -07:00
Doridian 824d2129a0 Fix wrong length calcuation in *_to_buffer utilities 2022-06-14 15:56:04 -07:00
iceman1001 2a25e7e1a3 missing fix 2022-06-14 23:40:03 +02:00
kormax b11b4e66af Change 'hf 14a list' to annotate more ECP frame formats 2022-06-14 21:42:50 +03:00
iceman1001 f4011f3283 fix test sequence 2022-06-13 07:27:05 +02:00
iceman1001 b841bd4f41 skip readB for staticnested and skip checkkeys 2022-06-12 14:26:55 +02:00
iceman1001 372ab2af98 style 2022-06-12 11:51:50 +02:00
Iceman 5e20905a9d
Merge pull request #1687 from Doridian/fix/use-snprintf 
Switch usage of sprintf to snprintf
 2022-06-12 11:43:31 +02:00
Doridian c24cf70a7b forgot default case 2022-06-11 16:56:45 -07:00
Doridian 6ed6571430 code scan has an issue with this i guess 2022-06-11 16:38:58 -07:00
Doridian 83943aafc8 and done 2022-06-11 16:16:56 -07:00
Doridian 1a4437550b all cmd done 2022-06-11 15:40:33 -07:00
Doridian 789f807e83 100 2022-06-11 15:32:08 -07:00
Doridian 6b951960f1 below 150 2022-06-11 12:29:27 -07:00
Doridian 2aa524be94 below 250... 2022-06-11 12:02:48 -07:00
Doridian 107bfe469a down to precisely 300 problems 2022-06-10 13:16:04 -07:00
Doridian fbed379691 snprintf in some commands 2022-06-10 13:02:23 -07:00
dx林 de0549a269 StaticNested fast decrypt(backdoor 2nt.). 2022-06-10 11:02:06 +08:00
iceman1001 1711338035 added a zero check for data save 2022-06-06 20:06:46 +02:00
iceman1001 ad64fdfeb7 adapt hf mfu eview to take prefix header lenght in consideration 2022-06-06 19:07:16 +02:00
iceman1001 c5d12bba0f adapt hw dbg to query device before setting log level 2022-06-06 18:21:28 +02:00
iceman1001 1f3ec36196 missing comma 2022-06-06 13:23:31 +02:00
iceman1001 b4255eea77 simplify save files 2022-06-06 13:20:39 +02:00
iceman1001 2c61530cba minors stuff, added some blowfish decrypt 2022-06-06 12:59:09 +02:00
iceman1001 2c06054881 text 2022-06-06 12:49:02 +02:00
iceman1001 18bcbf1894 style 2022-06-06 07:57:13 +02:00
mwalker33 f5170f1d18 Mifare Classic Value operations 
Added increment value, decrement value via the supplied commands and set value via the normal write command.  Also added "get" to read a value block and decode/display.
 2022-06-05 16:58:53 +10:00
iceman1001 4195c9d901 fix logic 2022-06-02 20:44:37 +02:00
iceman1001 f1e228e739 fix cid 393261 2022-05-31 22:30:41 +02:00
iceman1001 a5b5b2f08a fix alway defaulting to freq even if divisor was applied. Will still have issue when addressing both standard values.. 2022-05-30 22:35:33 +02:00
iceman1001 65b9a9fb76 widen mfp detection to include 0004 2022-05-21 09:28:38 +02:00
iceman1001 76da953bcb text 2022-05-16 19:46:31 +02:00
iceman1001 f38a3ad762 adapt load dump file refactoring else where 2022-05-15 23:56:35 +02:00
iceman1001 d4c3082741 refactoring loading dump files 2022-05-15 23:06:46 +02:00
iceman1001 f241bd4b4d added MAD key Sector0 detection and hf mf mad now takes a -f param for offline decoding of dump files 2022-05-15 11:37:06 +02:00
iceman1001 d7459d47b8 fix value block decoding. Its signed. Thanks @mwalker33 2022-05-14 15:26:48 +02:00
Philippe Teuwen 05e48b07cc remove gcc 12.1 warning: output may be truncated writing 21 bytes into a region of size between 15 and 24 2022-05-12 22:57:22 +02:00
Philippe Teuwen c4a8e0fa2e Remove gcc 12.1 warning: strncpy specified bound depends on the length of the source argument 2022-05-12 22:54:11 +02:00
iceman1001 fb91a1ca88 iclass print data now details legcay vs sio credential 2022-05-09 00:19:57 +02:00
mwalker33 320be614fe Update cmdhfmfdes.c 
Update format type to match supplied data type (dfnamelen)
 2022-05-08 15:54:56 +10:00
mwalker33 3098de7901 Update cmdhfmfdes.c 
Add the ability to use hex for the DFName to support non printable dfname values (e.g. as needed to NDEF AIDs)
 2022-05-08 12:09:43 +10:00
Philippe Teuwen 9880df8ca7 make style 2022-05-03 15:18:44 +02:00
Philippe Teuwen cc7054fc9b Fixed - search in inverted bitsteam as well 2022-05-03 15:18:05 +02:00
iceman1001 c78459a572 move detection outside SAK 02 check 2022-04-30 21:05:20 +02:00
iceman1001 82fba2d929 correct instructions 2022-04-30 20:52:16 +02:00
iceman1001 dd20083126 improved FUDAN identification and anti-collision select based on @lsylx issue #1599 2022-04-30 18:39:14 +02:00
Philippe Teuwen d31c9747d6 Partial fix of ioProx clone on EM4305 but EM4305 runs at RF/50 instead of the configured RF/64?? 2022-04-30 00:10:47 +02:00
Philippe Teuwen c1c093af62 Fixed support to clone Pyramic, Paradox and Awid on EM4x05 2022-04-30 00:04:49 +02:00
Philippe Teuwen cb5aacd33a make style 2022-04-29 16:44:38 +02:00
Philippe Teuwen 4d264fa63c Preparing EM4100 clone to EM4305 2022-04-29 16:44:38 +02:00
Philippe Teuwen f25c7b1179 text 2022-04-29 15:45:45 +02:00
Philippe Teuwen 7d0910a5ac fix lf cmdread help 2022-04-27 22:54:44 +02:00
iceman1001 da81c6806b style 2022-04-19 19:01:04 +02:00
iceman1001 77520ce489 fix lf sniff input values to be atleast a bit limited 2022-04-10 13:17:21 +02:00
iceman1001 159d5ffd1a fix #1661 - hf sniff shall ignore lf config settings 2022-04-09 19:04:31 +02:00
iceman1001 8d9dd8b346 make style 2022-04-09 18:48:13 +02:00
iceman1001 c5dd07fe8e make hint italic 2022-04-09 17:32:57 +02:00
Iceman c0725dcf05
Merge pull request #1659 from wh201906/plot_tip 
Show a tip in the plot window
 2022-04-09 17:21:31 +02:00
wh201906 87350205a5 Show a tip in the plot window 2022-04-08 21:15:05 +08:00
wh201906 4a8f425379
Fix a bug in "lf config" 
When executing "lf config --reset", the averaging will be 0 rather than 1(default).
This is because the config.averaging is set to 1 at first.(line 621)
Then this argument is overwritten unconditionally by
"config.averaging = (avg == 1);"(line 634)
 2022-04-08 19:50:38 +08:00
Robyn 7130d74426
Update cmdhfmfu.c 
corrected spelling of ultralight (from ultraligth) in the error message of hf mfu ndefread
 2022-04-04 00:57:22 +01:00
iceman1001 26603ad80a text 2022-04-02 15:44:55 +02:00
iceman1001 8a95a62b00 textual 2022-04-02 14:07:34 +02:00
iceman1001 fb5ba83569 added skeleton for HF NTAG424 category of commands 2022-04-02 14:06:16 +02:00
iceman1001 d4f5e729a1 make hf 14a apdufind less verbose in default output 2022-03-31 23:20:26 +02:00
Iceman 5a9432f78a
Merge pull request #1646 from lnv42/master 
Fix USB communications when receiving empty frames
 2022-03-30 18:03:20 +02:00
Yann GASCUEL 6bc37bb33d fix usb communications when receiving empty frame 
E.g. before this fix, iso15 (and probably others) raw commands
expecting results but with no answer from the tag where showing the
previously received commands instead of : "[!] /!\ command failed"
 2022-03-30 12:00:14 +02:00
Mark Dietzer ce8f89ccdb Fix --aid in examples for mfdes chk 2022-03-29 09:52:00 -07:00
Mark Dietzer 436bfff41e rename COMPILER_HAS_SIMD to COMPILER_HAS_SIMD_X86 2022-03-29 07:32:11 -07:00
Doridian 62704db5ed Add very basic feature flagging for NEON 2022-03-28 23:06:40 -07:00
iceman1001 9d1e75a9b5 --verbose now also prints the keys 2022-03-27 10:48:18 +02:00
iceman1001 b9baae4b32 --verbose flag now also prints a found value block in cyan color and the decoded value 2022-03-26 20:00:01 +01:00
iceman1001 492ea52dfa adding clone option 2022-03-25 02:24:52 +01:00
iceman1001 2cfe69d92c Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-03-24 14:24:51 +01:00
Philippe Teuwen 84e1784335 em4305 tearoff: fix displayed delays 2022-03-24 13:08:21 +01:00
iceman1001 758e7d9d2b improve hf mf wrbl with text and a new param --force to make sure user understands when writing to block 0. 2022-03-24 12:30:48 +01:00
iceman1001 cdf079a0c1 less false positives with indala. Check ratio of zeros in demod. 2022-03-23 23:03:23 +01:00
iceman1001 77e6626c9c textual 2022-03-23 22:40:53 +01:00
iceman1001 732a47944c remove verbose output. less crap on lf search 2022-03-23 22:39:36 +01:00
iceman1001 95d1631bed style 2022-03-23 18:22:03 +01:00
iceman1001 7aeb462e18 convert 15readercommand to use NG frames. Removing the confusing of status and length of received package in same return param. Now returns proper status and length is a ref param 2022-03-23 17:37:40 +01:00
Iceman 42498fd755
Merge pull request #1618 from nemanjan00/iso15693_read_multi 
Add first and last block for ISO15693_READ_MULTI_BLOCK to command list
 2022-03-22 17:59:33 +01:00
nemanjan00 5c9693529c Get output with UID 2022-03-22 00:55:37 +01:00
nemanjan00 24d3094012 Check cmd size 2022-03-21 21:34:38 +01:00
Benjamin DELPY 568236b265
Minor fix for EV2 XL Signature 2022-03-20 20:16:54 +01:00
iceman1001 f59f8dd528 hf mf restore accepts 4,7,10 hex bytes UID 2022-03-20 07:47:27 +01:00
iceman1001 507d5a43ba new param to view command to print all keys nicely and also print all found value blocks, if any 2022-03-19 20:23:11 +01:00
iceman1001 63612c9375 data diff - handle different lengths 2022-03-13 21:42:38 +01:00
iceman1001 85f16fd471 textual 2022-03-13 04:45:32 +01:00
iceman1001 15b8eb5935 coverity fixes 2022-03-13 04:27:23 +01:00
iceman1001 a45082e045 increase string line array 2022-03-13 03:57:10 +01:00
iceman1001 1953cd953b codeQL fix 2022-03-13 03:54:37 +01:00
iceman1001 a7d099bc2b remove debug statement 2022-03-13 03:08:46 +01:00
iceman1001 7fe8354b47 added ascii to diff command output 2022-03-13 03:04:04 +01:00
iceman1001 1916fa31b5 build error 2022-03-12 20:05:27 +01:00
iceman1001 1222d995ef remove c param 2022-03-12 19:21:09 +01:00
iceman1001 8a54e103cc added a new command 2022-03-12 18:57:56 +01:00
iceman1001 045f30d00d refactoring function to download file from spiffs 2022-03-12 18:57:06 +01:00
nemanjan00 e4c641b708 Add first and last block for READ_MULTI_BLOCK 2022-03-07 02:09:36 +01:00
Philippe Teuwen 355bc88827 fix typo 2022-03-03 01:11:11 +01:00
Philippe Teuwen f99704c780 Fix warnings with Apple clang 11 2022-02-28 15:18:49 +01:00
iceman1001 a699c0b5dd text 2022-02-28 05:38:11 +01:00
iceman1001 a7f69b5f13 style 2022-02-27 16:32:42 +01:00
Philippe Teuwen 7c240753a2 14a, 15, hf: Fix codeql warnings 2022-02-27 14:22:38 +01:00
Philippe Teuwen abddde7a51 felica: Fix codeql warnings 2022-02-27 14:09:26 +01:00
Philippe Teuwen 02d2fcc3e7 gallagher: Fix codeql warnings 2022-02-27 14:05:57 +01:00
Philippe Teuwen e2cc368b11 iclass: Fix codeql warnings 2022-02-27 14:04:12 +01:00
Philippe Teuwen 8ecbd88251 codeql: fix printf 2022-02-27 13:53:43 +01:00
iceman1001 9f22131dd1 alignment 2022-02-26 20:34:18 +01:00
iceman1001 b776c98422 fix copy pasta 2022-02-26 17:40:24 +01:00
iceman1001 3e543fcc65 added new public key, thanks to @anon! 2022-02-26 17:36:14 +01:00
iceman1001 652affbfb1 rework start screen to be shorter 2022-02-26 17:17:14 +01:00
iceman1001 2671795b8b textual 2022-02-26 17:15:32 +01:00
iceman1001 0d5b7864aa coverity fixes 2022-02-25 21:03:22 +01:00
iceman1001 ec3effcb30 too small array 2022-02-25 20:15:19 +01:00
Iceman 1c6abece54
Merge branch 'master' into sha 2022-02-25 11:42:20 +01:00
Philippe Teuwen 21089fc346 flasher: skip msg about --force when --force is used 2022-02-25 00:37:54 +01:00
Philippe Teuwen da908315b0 flasher: add option --force rather than interactive prompt 2022-02-25 00:35:30 +01:00
iceman1001 a932251908 text 2022-02-24 23:38:51 +01:00
iceman1001 dfcb83a154 make style 2022-02-24 19:36:26 +01:00
iceman1001 3b5a1e8de5 added some helptexts 2022-02-24 19:31:47 +01:00
iceman1001 8141752d69 texts 2022-02-24 19:19:07 +01:00
iceman1001 07855611e4 unify text 2022-02-24 18:03:19 +01:00
iceman1001 2879b23a1c unify text 2022-02-24 17:38:01 +01:00
iceman1001 bb1a51988c fixes to "hf cipurse info" 2022-02-24 17:24:42 +01:00
iceman1001 4bd6e8f61c fixes to "hf cipurse info" 2022-02-24 17:20:27 +01:00
iceman1001 c98bdfe857 fixes to "hf cipurse info" 2022-02-24 17:16:31 +01:00
Benjamin DELPY a852f88a6e
Fix support for more Mifare Desfire EV2 cards 
Was tempted to make a `major` mask with 0x0f == 1,2,3,... but...
 2022-02-23 23:37:47 +01:00
iceman1001 04b86073b2 ndef simple wifi record decoder 2022-02-21 15:56:49 +01:00
iceman1001 7310834b69 added a compact tlv decoder for ATR historical bytes in 14a info 2022-02-19 00:15:34 +01:00
iceman1001 1f470483ec make style 2022-02-18 22:31:34 +01:00
Eric Betts 85aeb9da50 typo 2022-02-17 22:00:48 -08:00
iceman1001 d00e138a31 added a mifare value block decoder 2022-02-18 06:19:44 +01:00
Philippe Teuwen 3ff4c8ac16 hf mf emrtd: clarify warning when we're voluntarily skipping dump 2022-02-17 15:15:50 +01:00
Philippe Teuwen e67215fe49 reuse MAX macro 2022-02-17 12:30:43 +01:00
Philippe Teuwen 6ead44933a Flasher: factorize and prompt also wehn we can't check the version 2022-02-17 01:43:41 +01:00
Philippe Teuwen 3cbf64c894 Flasher: display and check bootloader elf as well 2022-02-17 01:43:41 +01:00
Philippe Teuwen bfffea6e6c Flasher: show the detailed firmware version 2022-02-17 01:43:41 +01:00
Philippe Teuwen 5997f23139 flasher: ask confirmation if fw mismatch, fix segfault on abort 2022-02-17 01:43:41 +01:00
Philippe Teuwen 72f7bc762d Flasher: read the firmware file in one go 2022-02-17 01:43:41 +01:00
Philippe Teuwen 2a705d3a44 make style 2022-02-17 01:43:41 +01:00
Philippe Teuwen 0ed0735709 flasher: parse ELF to check version_information and do ELF checks before looking for a proxmark3 2022-02-17 01:43:41 +01:00
Philippe Teuwen 14f62eaa88 armsrc check: skip if no src available; postpone warning 2022-02-17 01:43:41 +01:00
Philippe Teuwen bbf49ab560 Add a fingerprint of the ARM OS source files to detect when a client expects another ARM image 2022-02-17 01:43:39 +01:00
Philippe Teuwen c2092ee2ed make style 2022-02-17 01:41:56 +01:00
Philippe Teuwen 526610b51c hf mf nested: remove option --single (becomes auto if --tblk), add same mfc type default logic as chk/fchk 
Note that hf mf nested seems currently broken on single sector mode (even before today's changes):
it doesn't find keys while the "all sectors" works...
 2022-02-17 01:41:56 +01:00
Philippe Teuwen d031f4bac5 hf mf chk: fix CodeQL warning, fix sector number in case of provided block, display one single block in such case too 2022-02-17 01:41:56 +01:00
Philippe Teuwen ee7856e9eb hf mf chk/fchk: factorize and fix key loading logic, chk: don't loop if one single block 2022-02-17 01:41:56 +01:00
Philippe Teuwen 80f768b787 hf mf: add Blk info to key tables 2022-02-17 01:41:56 +01:00
Philippe Teuwen 8fb1b7f534 hf mf: use existing mfSectorNum 2022-02-17 01:41:56 +01:00
Philippe Teuwen dc59772dba hf mf chk: change option --blk to --tblk to keep same convention as for hf mf nested 2022-02-17 01:41:56 +01:00
Philippe Teuwen 05e7eda871 Add mfSectorTrailerOfSector 2022-02-17 01:41:56 +01:00
Philippe Teuwen 72ec7bf27b fix some CodeQL warnings 2022-02-16 22:23:24 +01:00
Philippe Teuwen 623169fe02 fix some CodeQL warnings 2022-02-16 20:28:38 +01:00
Philippe Teuwen bbf8ba5a5f emrtd: fix crash on some platforms as sprint_hex_inrow outputs twice many bytes 2022-02-16 16:50:53 +01:00
Philippe Teuwen da1588f430 Do not attempt to display jpeg2000 images 
jp2 could be converted to jpg with "convert" from ImageMagick
but that would require some process spawning and fallback if ImageMagick is not installed...
 2022-02-16 16:15:13 +01:00
Philippe Teuwen 5a44172a35 Fix hf emrtd info when offline 2022-02-16 15:06:35 +01:00
Philippe Teuwen fbc60ccbbb fix commands.json generator, 608 -> 687 commands! 2022-02-16 14:53:06 +01:00
iceman1001 c5658f2a0b cppcheck 2022-02-16 00:22:48 +01:00
iceman1001 2eaa60e95e cppcheck 2022-02-16 00:20:02 +01:00
Iceman 85441aeceb
Merge pull request #1603 from c-barron/master 
Bugfix for NXP GET_SYSTEM_INFO command
 2022-02-15 20:10:55 +01:00
iceman1001 a8175a0f57 coverity #378901, #378902 fixes 2022-02-15 20:10:39 +01:00
Christine Barron b7c6d07ee1
Merge branch 'RfidResearchGroup:master' into master 2022-02-15 10:24:56 -08:00
Christine Barron e2f12b1020 Style 2022-02-15 10:17:31 -08:00
Philippe Teuwen 62e95f9220 fix some CodeQL warnings 2022-02-15 16:08:39 +01:00
Philippe Teuwen 160245e0d5 fix some CodeQL warnings 2022-02-15 16:01:23 +01:00
Christine Barron 22ea1b864f Refactored to cleaner version using bit mask 2022-02-14 23:39:32 -08:00
Christine Barron 61ece3a2a1 Sketchy way to check if card is SLIX2, will revise with bitwise operators 2022-02-14 23:29:46 -08:00
iceman1001 a4bc2c5521 make style 2022-02-14 21:44:15 +01:00
iceman1001 ecf58de32b hf legic restore/eload - now acceps bin/eml/json dump files." 2022-02-14 21:41:33 +01:00
iceman1001 6da5c9d0f4 calloc should already taken care of the zeroing 2022-02-14 09:20:14 +01:00
iceman1001 63bc9b5eb2 added legic view command, and converted OLD -> NG comms 2022-02-14 09:19:35 +01:00
Philippe Teuwen 12695a984a typo 2022-02-14 02:05:12 +01:00
Christine Barron 365ffc5f69 Bugfix updating NXP GET_SYSTEM_INFO command to 0xAB instead of 0x2B (as per section 9.5.3.18 in technical docs: https://www.nxp.com/docs/en/data-sheet/SL2S2602.pdf) 2022-02-13 13:27:31 -08:00
iceman1001 9abb026d00 cleaning out unused SendCommandOLD in lua scripting 2022-02-13 20:53:32 +01:00
iceman1001 26f88b68de daddy got a new style 2022-02-13 12:56:05 +01:00
iceman1001 60b0742941 make style 2022-02-12 17:50:44 +01:00
iceman1001 ec59acf64c style 2022-02-12 17:46:34 +01:00
iceman1001 f1d45b491c text 2022-02-12 17:42:18 +01:00
iceman1001 ba408be60b hf mfu dump - now saves EML too 2022-02-12 17:41:00 +01:00
iceman1001 e174a1e1be hf mfu restore/eload/eview/view now handles bin/eml/json. Only hf mfu dump that doesnt save EML yet 2022-02-12 17:30:30 +01:00
iceman1001 e2e06ab17a hf mfu restore now takes bin/json files. and textual adaptations 2022-02-12 12:59:42 +01:00
iceman1001 3169bf2763 hf mfu view - view binary/json mfu dump files 2022-02-12 11:26:40 +01:00
iceman1001 e6eb8cf51f change hf mfu dump text output 2022-02-12 10:00:20 +01:00
iceman1001 0811ad2468 loading header data for MFU json dump files 2022-02-12 09:58:46 +01:00
merlokk 0e5382857d added encode key 2022-02-08 01:07:03 +02:00
merlokk bc88040967 plain update key works 2022-02-08 00:25:52 +02:00
merlokk 01761cc273 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into cip_key 2022-02-07 23:52:54 +02:00
iceman1001 f4974a74e6 unify 2022-02-07 22:43:58 +01:00
iceman1001 83797db14a unify helptext 2022-02-07 22:35:00 +01:00
iceman1001 d41c025f5c helptext unify 2022-02-06 23:13:20 +01:00
iceman1001 c0ea29ab95 helptext unify 2022-02-06 21:19:28 +01:00
iceman1001 1e35567e15 extra ev2 challenges 2022-02-06 20:56:33 +01:00
iceman1001 099abfedcf reworked it to fit style 2022-02-06 05:28:59 +01:00
İlteriş Eroğlu 3284c02fe2 add silicon info logic to hf mfu info (only for nxp chips) 
Signed-off-by: İlteriş Eroğlu <ilteris@asenkron.com.tr>
 2022-02-06 02:21:40 +03:00
merlokk e8bf48c54e set key attr ok 2022-02-06 01:05:39 +02:00
merlokk 1482a9b7fc make global print sec attr 2022-02-05 23:49:44 +02:00
merlokk 90d20fd80e command sketches and low level fix 2022-02-05 17:03:08 +02:00
merlokk 689f19b33e commands 2022-02-05 16:49:25 +02:00