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

9316 commits

Author SHA1 Message Date
Philippe Teuwen 6f6a3161a9 Fix typos, applying Fix-spelling-errors.patch from Kali, thanks Sophie! 
da550dbec7 (6e9d1bb9c071feb1a5ad25ec24296a3f6751f2d1)
 2021-10-04 20:48:55 +02:00
iceman1001 f4209bd1dd remove duplicates 2021-09-29 19:20:50 +02:00
Philippe Teuwen 1850e9fa40 Fix hf mf dump/auto/csave MFC JSON dumps - save real ATQA/SAK 2021-09-25 01:48:52 +02:00
iceman1001 347b5c9614 textual 2021-09-22 22:30:25 +02:00
Philippe Teuwen b5b946edfe save and load raw NDEF in hf * ndefread and in nfc decode 2021-09-22 21:33:37 +02:00
iceman1001 b00506ed4f adapt hf 14a info to detect different types of FUDAN. see http://www.proxmark.org/forum/viewtopic.php?pid=41195#p41195 2021-09-21 19:59:09 +02:00
iceman1001 d3696ee2c3 Revert "Release v4.14434 - crimson" 
This reverts commit 2c4c676db2.
 2021-09-18 21:44:56 +02:00
iceman1001 2c4c676db2 Release v4.14434 - crimson 2021-09-18 21:44:55 +02:00
iceman1001 e498b66ace fix #1504 - header or no header i keyblock dynamic memory. And clear trace log 2021-09-18 12:06:59 +02:00
iceman1001 7510fcee4f text 2021-09-17 18:28:12 +02:00
iceman1001 3bfc17e110 textual 2021-09-17 17:57:08 +02:00
merlokk 9db39e2493 add emv part 2021-09-13 15:20:33 +03:00
merlokk 775faaffd6 check cov 2021-09-13 14:46:44 +03:00
Philippe Teuwen efbfe4884e Revert "Fixed typo in the key table function" 
Nested is using N
StatiCnested is using C

This reverts commit 40e513a3c8.
 2021-09-12 20:22:35 +02:00
micsen 40e513a3c8
Fixed typo in the key table function 
statiCnested to staticNested
 2021-09-12 13:58:44 +02:00
Philippe Teuwen d516e37ace text 2021-09-11 01:32:43 +02:00
iceman1001 af91f119d2 reversed when message is printed 2021-09-10 21:31:47 +02:00
iceman1001 36e86b1ce0 text 2021-09-10 21:02:33 +02:00
iceman1001 e930d49aa5 textual 2021-09-10 20:40:26 +02:00
iceman1001 cd4ee68cce text 2021-09-10 19:40:23 +02:00
iceman1001 7e3c13fa0d hf mf sim - textual 2021-09-10 18:12:12 +02:00
iceman1001 8fee7e914e hf mf sim - textual 2021-09-10 18:11:19 +02:00
Philippe Teuwen 904c971a7a ccache support 2021-09-08 21:56:32 +02:00
merlokk 735edf60d1 increase buffer len 2021-09-08 21:43:36 +03:00
Philippe Teuwen bac58d2a66 minor, to respect symmetry with writeblock 2021-09-07 10:18:05 +02:00
Philippe Teuwen 3e39689b6e Fix #1499 hf 15 restore and fix trace list -t 15 writeblock 2021-09-07 10:04:01 +02:00
iceman1001 c326c25905 maur keys 2021-09-06 21:13:17 +02:00
Philippe Teuwen 9f36ce1b9d cppcheck reduce variable scopes 2021-09-05 23:42:14 +02:00
Philippe Teuwen d37547917e cppcheck fix name difference declaration/definition 2021-09-05 20:35:40 +02:00
Philippe Teuwen b19c7f377e Fix experimental_lib CMakeLists 2021-09-05 20:34:46 +02:00
Philippe Teuwen 3a5680343a fix jni_tools header inclusion 2021-09-05 20:05:09 +02:00
Philippe Teuwen fbb723e500 Android cmake: remove redundant include 2021-09-05 19:51:50 +02:00
Philippe Teuwen cabb44eb7c Fix Android cmake 2021-09-05 19:51:27 +02:00
iceman1001 e854c41760 android cmake file does not match pm3 client 2021-09-05 10:44:13 +02:00
Philippe Teuwen 5ce9450c3a Show source version in the cmake logs 2021-09-05 01:30:08 +02:00
Philippe Teuwen 0ed190936d Show source version in the makefile logs 2021-09-05 01:18:42 +02:00
Philippe Teuwen 8ce20320b2 Fix segfault on 'rem <verylongline>' 2021-09-04 02:57:16 +02:00
Philippe Teuwen 5eda1ea400 Fix cppcheck dereferencing null pointer fix 2021-09-04 02:14:48 +02:00
Philippe Teuwen 1092abf12e Revert "cppcheck Passing NULL after the last typed argument to a variadic function leads to undefined behaviour" 
This reverts commit 8772edb6b8.
 2021-09-04 02:01:20 +02:00
Philippe Teuwen 7fdaac0319 fix zealous fix... 2021-09-04 01:24:08 +02:00
Philippe Teuwen b9e0b57cd8 cppcheck null pointer dereference 2021-09-04 00:54:59 +02:00
Philippe Teuwen 8772edb6b8 cppcheck Passing NULL after the last typed argument to a variadic function leads to undefined behaviour 2021-09-04 00:54:59 +02:00
Philippe Teuwen 58a963d41f cppcheck different declaration & definition arg names 2021-09-04 00:54:59 +02:00
Philippe Teuwen 3c47e78597 cppcheck remove redundant assignment 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0c810ff4fd cppcheck Returning an integer in a function with pointer return type is not portable 2021-09-04 00:54:59 +02:00
Philippe Teuwen ba6ef2a1bc cppcheck redundant assignment 2021-09-04 00:54:59 +02:00
Philippe Teuwen 971c0126de cppcheck clarify mix of boolean and bitwise ops 2021-09-04 00:54:59 +02:00
Philippe Teuwen d3c6c430a8 cppcheck avoid dereferencing potentially null pointer 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0830cfcf1c style to prevent cppcheck duplicate assignment warning 2021-09-04 00:54:59 +02:00
Philippe Teuwen 0db962640c cppcheck fix memleak 2021-09-04 00:54:59 +02:00
iceman1001 38694a3fea text 2021-09-03 21:19:12 +02:00
iceman1001 b8a04d6d69 text 2021-09-03 21:12:02 +02:00
Philippe Teuwen ce8cd5983b update emojis 2021-09-02 21:10:31 +02:00
Adam Hořčica 0d589b75d7
typo in mfu rdbl command help 2021-08-31 23:41:13 +02:00
merlokk cd4ea58449 hf mfp fix texts 2021-08-30 12:26:09 +03:00
Philippe Teuwen 8a925b496a
Merge pull request #1487 from rknoll/fix-pac-checksum 
Fix PAC/Stanley checksum calculation
 2021-08-28 19:48:19 +02:00
Philippe Teuwen f31e94e618
Merge pull request #1480 from linuxgemini/macports-support-add 
Improve MacPorts Support
 2021-08-28 19:12:26 +02:00
Richard Knoll 7a6f503161 Fix PAC/Stanley checksum calculation 
The parity bit needs to be discarded when calculating the final
checksum byte value of PAC/Stanley card IDs. Verified by scanning
a tag which is now correctly identified.
 2021-08-28 14:28:06 +01:00
merlokk d46d23d079 make style 2021-08-25 14:44:06 +03:00
Oleg Moiseenko 143d0140db
Merge pull request #1483 from merlokk/lrp_detect 
hf mfdes detect with lrp mode and hf mfdes info updates
 2021-08-25 14:24:35 +03:00
merlokk 13b0dc73d5 fix 2021-08-25 14:15:48 +03:00
Philippe Teuwen 2938baaed6 text 2021-08-25 12:58:00 +02:00
merlokk 81343f0ec1 fix info, add there desfire light tests 2021-08-25 13:57:35 +03:00
merlokk 4bf3c43c7f fix select command via iso channel (with wrapper) 2021-08-25 13:28:39 +03:00
Philippe Teuwen 2b3cd6e604 Remove PACKED on internal client struct containing pointers, it can break mem alignment 2021-08-25 11:02:17 +02:00
Philippe Teuwen ba7f1b93b9 Remove PACKED on internal client struct containing pointers, it breaks mem alignment on clang-13 MacOSX 2021-08-25 10:49:47 +02:00
Philippe Teuwen 3cadd2906e Fix clang-13 warnings about unused variables 2021-08-25 10:10:46 +02:00
Philippe Teuwen ce4eed2acf
Merge pull request #1484 from AxisRay/fix-dynamic-stack-buffer-overflow 
fix dynamic-stack-buffer-overflow
 2021-08-24 16:50:55 +02:00
Ray Lee 8998b0b46c fix dynamic-stack-buffer-overflow 2021-08-24 22:36:59 +08:00
merlokk fddf7cf6b8 desfire info updates 2021-08-24 13:11:52 +03:00
merlokk 46f2defcd3 add auto select channel to lrp 2021-08-24 12:47:29 +03:00
Ray Lee 3c51ee4547 make style 2021-08-24 16:22:55 +08:00
Ray Lee cc3e2cc3a9 use memcmp 2021-08-24 14:23:32 +08:00
Ray Lee 7b59029cdb maybe better 2021-08-24 13:22:50 +08:00
Ray Lee d6145d76e7 fix buffer overflow 2021-08-24 10:43:32 +08:00
Philippe Teuwen 1cdddc270f typo 2021-08-23 11:06:38 +02:00
iceman1001 8edcfb925b text 2021-08-23 07:25:25 +02:00
merlokk d716971430 detect lrp authentication 2021-08-22 23:12:16 +03:00
iceman1001 23190a0070 wrong size 2021-08-22 21:35:02 +02:00
iceman1001 8c646cf1ca Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-08-22 21:32:19 +02:00
iceman1001 e811b35a6f ntag i2c 2k - fast write 2021-08-22 21:32:14 +02:00
merlokk df0c24cfad lsfiles fix 2021-08-22 22:29:21 +03:00
iceman1001 9c2cbe9fbb ntag i2c 2k select sector annotation 2021-08-22 21:16:33 +02:00
iceman1001 edc300ea97 ntag i2c 2k - select sector annotation 2021-08-22 21:02:11 +02:00
İlteriş Eroğlu fece7df0d7
Realign import order for compiling 
This is needed for macports installations
 2021-08-22 20:46:54 +03:00
Philippe Teuwen a06765e5a8 fix missing NTAG sizes 2021-08-22 17:48:05 +02:00
Philippe Teuwen fdba7c2ff8 Safe check in sprint_bytebits_bin_break 2021-08-22 17:02:44 +02:00
Philippe Teuwen 0d7f93a8e7 Fix sprint_bin usages in hf mfu and felica 2021-08-22 16:53:15 +02:00
iceman1001 3e6bad8b02 textual 2021-08-22 16:05:33 +02:00
Philippe Teuwen b63dcb707e rework desfire declarations 2021-08-22 13:56:35 +02:00
mindseyex2 4f7b8c5c05
Update cmdhfmfu.c 2021-08-21 20:32:54 -07:00
Philippe Teuwen 58dda7a809 rename static globals g_* as gs_*, keep g_ only for exported globals 2021-08-22 00:51:37 +02:00
Philippe Teuwen ab450d6f57 add --mem to hf mf nested (brought from icopyx) 2021-08-21 23:56:54 +02:00
Philippe Teuwen 0f039582b3 icopyx retval, should be more generic... 2021-08-21 23:56:03 +02:00
Philippe Teuwen e7a9ec6154 icopyx: mfu restore also pwd & pack 2021-08-21 23:55:21 +02:00
Philippe Teuwen 33edfbc0ad icopyx disable em4x50 search 2021-08-21 23:54:42 +02:00
Philippe Teuwen 0384359aa4 icopyx bootloader safeguard 2021-08-21 23:52:15 +02:00
Philippe Teuwen f6d88dced2 rename typedef structs 2021-08-21 22:09:42 +02:00
Philippe Teuwen 5fce6271ee rename typedef struct pm3_device 2021-08-21 21:41:52 +02:00
Philippe Teuwen bae5362656 rename typedef structs 2021-08-21 21:41:34 +02:00
Philippe Teuwen dd3b63ae32 rename global session 2021-08-21 20:31:05 +02:00
Philippe Teuwen 6a2f2b3979 rename global conn 2021-08-21 20:21:08 +02:00
Philippe Teuwen 8280fc3c07 rename global version_information and its struct type 2021-08-21 20:11:22 +02:00
Philippe Teuwen d88c98a786 Reduce scope of a number of globals: 
APDUInFramingEnable atsFSC uid_label_map apdu_in_framing_enable uidmapping KENC_type KMAC_type jpeg_header jpeg2k_header *card_types card_app2_limit iclass_config_types jooks jooks_figures nfc_secret desdefaultkeys aesdefaultkeys k3kdefaultkeys CardAddresses default_3des_keys default_pwd_pack UL_TYPES_ARRAY UL_MEMORY_ARRAY fdxbCountryMapping translateTable invTranslateTable preamble paradox_lut pcf7931_config config DiArray FiArray FArray crc64_table signalprop
 2021-08-21 19:56:07 +02:00
merlokk b9300e94ce make style 2021-08-21 19:14:18 +03:00
Oleg Moiseenko 6505f0cbf3
Merge pull request #1474 from merlokk/lrp_dump 
Lrp dump command
 2021-08-21 19:05:52 +03:00
merlokk efece7a753 fix print bug 2021-08-21 19:00:27 +03:00
merlokk c340e979a2 dump command works with more cases 2021-08-21 18:54:22 +03:00
Philippe Teuwen ce57637c80 rename globals GraphTraceLen OddByteParity pm3_capabilities 2021-08-21 17:53:54 +02:00
Philippe Teuwen 6e0ce662c7 reduce scope of global ice 2021-08-21 17:49:14 +02:00
Philippe Teuwen a8bb07db3a remove unused global showDemod 2021-08-21 17:42:00 +02:00
Philippe Teuwen f1f2389fb4 rename globals GraphBuffer 2021-08-21 17:39:17 +02:00
Philippe Teuwen b02fef5c70 rename globals print_lock 2021-08-21 17:18:56 +02:00
Philippe Teuwen faaa70c860 rename globals CursorCPos CursorDPos CursorScaleFactor CursorScaleFactorUnit GraphPixelsPerPoint GraphStart GraphStop GridLocked GridOffset PlotGridX PlotGridY PlotGridXdefault PlotGridYdefault 2021-08-21 17:12:50 +02:00
Philippe Teuwen e4fbfe0f40 rename globals DemodBuffer and DemodBufferLen 2021-08-21 17:12:50 +02:00
Philippe Teuwen 45d4d361e9 reduce old_action scope to static global, rename for clarity 2021-08-21 17:12:50 +02:00
Philippe Teuwen 9726db7a41 Move mbedtls objs to subdir 2021-08-21 17:12:50 +02:00
merlokk cc6837a9e4 CommitReaderID works via lrp and ev2 channel 2021-08-21 17:51:28 +03:00
merlokk a78c6a7721 print transaction counter 2021-08-21 16:57:48 +03:00
merlokk d3fbf3e596 add cmd to channel 2021-08-21 16:43:21 +03:00
merlokk f645d053b9 355638 2021-08-21 16:22:51 +03:00
merlokk 77c801da33 354821 2021-08-21 16:21:13 +03:00
Oleg Moiseenko 582c9eeb7d
Merge pull request #1471 from merlokk/lrp_value 
lrp value operations
 2021-08-21 15:51:04 +03:00
merlokk 62d98f2218 added abort transaction to the channel 2021-08-21 15:45:17 +03:00
merlokk a5668a91a2 fix setconfig 2021-08-21 15:42:28 +03:00
merlokk aac6c7dea7 fix write iso mode 2021-08-21 15:38:19 +03:00
Philippe Teuwen 6197482b77 Make sure g_trace is null when not allocated 2021-08-21 14:34:20 +02:00
merlokk 0b04e2284c fix read bug 2021-08-21 15:20:42 +03:00
merlokk 4ffddb3c6d add hints 2021-08-21 15:09:13 +03:00
merlokk 3d82da8ebe fix value operations in the encoded state 2021-08-21 14:52:45 +03:00
Philippe Teuwen 4087b5a288
Merge pull request #1469 from AxisRay/fix-double-free 
Fix double free error #1467
 2021-08-21 13:51:45 +02:00
merlokk 62a9a46cc7 make style 2021-08-21 14:28:40 +03:00
Oleg Moiseenko f6cee14f14
Merge pull request #1468 from merlokk/lrp_read 
Lrp data read/write commands
 2021-08-21 14:22:40 +03:00
merlokk db2c8776c0 clear record file works, lrp transaction check code 2021-08-21 14:12:49 +03:00
Ray Lee fd314882b2 fix double free 2021-08-21 16:59:56 +08:00
merlokk 09b4c3eed1 rename 2021-08-21 00:05:04 +03:00
merlokk 10561e9969 move transaction counter 2021-08-20 23:59:11 +03:00
merlokk f17dfa4e59 fix text. read/write/value commands works 2021-08-20 23:49:53 +03:00
merlokk 87c05faffd add link 2021-08-20 23:02:52 +03:00
merlokk 1b0ffac589 createmacfile works, print lrp transaction counter 2021-08-20 22:57:07 +03:00
merlokk 9d15190832 some help 2021-08-20 20:05:01 +03:00
merlokk b6118cbde9 add iso chaining options 2021-08-20 20:00:13 +03:00
merlokk f47b6f05d0 fix mode 2021-08-20 19:47:06 +03:00
merlokk e3a7b4ad1f fix header length behavior 2021-08-20 19:46:21 +03:00
merlokk 6516cfd665 create transaction mac file 1-byte command sketch 2021-08-20 19:25:44 +03:00
merlokk 534201b6d1 lrp delete file works. value operations in the plain mode works too 2021-08-20 18:53:56 +03:00
merlokk f3b368ebb6 value operations plain get works 2021-08-20 18:48:24 +03:00
merlokk 32ad6ef945 lrp write works 2021-08-20 18:25:15 +03:00
merlokk 9d6567edce plain read works 2021-08-20 17:36:43 +03:00
Philippe Teuwen 365adf0e77
Merge pull request #1459 from AxisRay/fix-filename-problem 
fix naming convertion messes up
 2021-08-20 09:29:52 +02:00
merlokk a7b132a620 read pm3 command 2021-08-19 20:11:10 +03:00
merlokk 88c16d2868 read2 commands 2021-08-19 20:10:50 +03:00
merlokk 35bea0fbaa make style 2021-08-19 19:55:03 +03:00
merlokk 533ee8ebd3 fix mf select if 2021-08-19 19:43:53 +03:00
merlokk 42b28500f4 fix session key print 2021-08-19 19:38:08 +03:00
merlokk a567eb9506 change key works with lrp 2021-08-19 19:32:07 +03:00
merlokk cf089b2087 coverity 2021-08-19 19:01:27 +03:00
merlokk faf4c449fc coverity 354842 355562 2021-08-19 19:00:01 +03:00
merlokk d0c69519ee add d40 mode 2021-08-19 18:54:16 +03:00
merlokk be038225e1 set configuration 2021-08-19 18:53:11 +03:00
merlokk 9b6d162f0d change file settings 2021-08-19 18:38:55 +03:00
merlokk 54aff03196 get key version 2021-08-19 17:57:18 +03:00
merlokk ac8e667c05 remove set iv 2021-08-19 17:26:00 +03:00
merlokk 035e2701a5 iso file id create application 2021-08-19 17:22:57 +03:00
merlokk bac1cfb5b5 create files iso file id byte order fix 2021-08-19 17:17:32 +03:00
merlokk 674568dfd9 lrp encode channel rx works, get uid works 2021-08-19 17:06:35 +03:00
merlokk e021870ed8 lrp maced channel fully works 2021-08-19 16:43:28 +03:00
merlokk 4ae1912772 lrp maced tx works 2021-08-19 16:38:19 +03:00
merlokk 8bd14245c6 lrp cmac protocol level 2021-08-19 16:37:55 +03:00
merlokk e55c8f969a refactoring and lsfiles 2021-08-19 16:16:18 +03:00
merlokk a9dd8aceb5 text 2021-08-19 15:26:39 +03:00
merlokk 2ee99ed1eb get file settings 2021-08-19 15:18:34 +03:00
merlokk 1677df863d get file id / iso id works 2021-08-19 15:03:19 +03:00
merlokk 6543a498b0 make style 2021-08-19 13:24:29 +03:00
merlokk 1ebeb9b151 remove debug 2021-08-19 00:44:26 +03:00
merlokk afadc088d7 non first lrp authenticate works 2021-08-19 00:40:30 +03:00
merlokk df8f5c4655 LRP auth works 2021-08-18 19:44:48 +03:00
merlokk 1c3f4d7e22 fix page 2021-08-18 19:07:22 +03:00
merlokk 10457726f1 test and remove debug 2021-08-18 19:06:41 +03:00
merlokk 67d198d946 LRPSessionKeys and TestLRPSessionKeys 2021-08-18 19:05:28 +03:00
merlokk a6a80bf952 set config text 2021-08-18 13:16:15 +03:00
merlokk 8aaeb6b542 lrp cmac 8 2021-08-18 13:15:20 +03:00
merlokk e28b6cfe83 set config works auth lrp checks 2021-08-17 23:31:42 +03:00
merlokk b2022b1721 fix auth select and iso select 2021-08-17 19:19:50 +03:00
merlokk 627d775331 info fix 2021-08-17 18:03:54 +03:00
merlokk 2f3c9969aa fix info, fix select 2021-08-17 18:00:22 +03:00
merlokk af26a397a7 add select way commands 2021-08-17 17:59:53 +03:00
merlokk b9108d5453 add iso file id to default parameters, add select/no file to iso select 2021-08-17 17:22:06 +03:00
Ray Lee 11afbdfba3 make style 2021-08-17 20:27:04 +08:00
Ray Lee d3232a5ebd rm stupid code 2021-08-17 20:23:31 +08:00
merlokk 95ed9c3543 add lrp channel 2021-08-17 15:06:04 +03:00
Ray Lee 5e22345111 work around 2021-08-17 18:15:15 +08:00
Ray Lee 0b01b060cf fix naming convertion messes up 2021-08-17 13:02:22 +08:00
merlokk 220749eebe anticollision instead of select aid=0, printfilesettings formatting fix 2021-08-16 20:22:29 +03:00
merlokk 48da8970b1 fix 14a exchange 2021-08-16 20:21:42 +03:00
merlokk c8330b13d2 cov 354842 2021-08-16 19:30:28 +03:00
merlokk 13963593a2 cov 354821 2021-08-16 19:11:14 +03:00
micsen 595f47cc7e
Added keys from norwegian building site cards 
The sectors contain Name, Birthdate, Org no, Org name. etc
 2021-08-16 16:16:52 +02:00
merlokk 7ce190593c make style 2021-08-16 17:08:33 +03:00
merlokk 9f0e973ad5 fix multi-block cmac, remove debug 2021-08-16 15:32:53 +03:00