Commit graph

9291 commits

Author SHA1 Message Date
Philippe Teuwen 232843477c typos 2021-10-16 23:44:53 +02:00
Philippe Teuwen 30d71a60ff Set history_path = NULL after free, hope it will fix history with spurious filenames 2021-10-16 12:26:26 +02:00
Sebastien Dudek 22ea2785d5 Adding iCS tags default key from ICopy-X 2021-10-15 13:41:07 +02:00
Philippe Teuwen e5d7ce61e6 MFULC trace: detect when known key is used during auth 2021-10-15 01:31:24 +02:00
Philippe Teuwen eeb3a4eebf Fix hf mfu cauth: option -k was both for key and keep 2021-10-14 19:23:04 +02:00
Philippe Teuwen c0444d4352 fix hf mf restore help text 2021-10-13 23:25:12 +02:00
Philippe Teuwen 0749117f0b Allow hw version in offline mode, to display client info 2021-10-11 22:15:50 +02:00
Philippe Teuwen 5f6c9d8c08 client: display compilation info 2021-10-11 20:56:15 +02:00
Philippe Teuwen d240367c2a Print client info also when offline 2021-10-11 20:29:17 +02:00
Philippe Teuwen 9bb66bf037 Add dummy cmdscripts/example.cmd for tests 2021-10-11 20:28:39 +02:00
Philippe Teuwen 7240f133e5 remove comment as there is no such issue with new atr list 2021-10-11 12:17:26 +02:00
Philippe Teuwen 11d38f26d1 Replace ATR list by Ludovic Rousseau list 2021-10-10 21:31:49 +02:00
iceman1001 2c72763a5a fix resource leak 2021-10-10 19:01:49 +02:00
Colin O'Flynn 719f4bfcde Fix MF-DESFIRE decoding when not using wrapped cmds 2021-10-10 12:38:27 -03:00
iceman1001 d733a66c7b smart info, smart reader, now have ATR fingerprinting 2021-10-10 16:15:29 +02:00
iceman1001 2dadba9cee null checks 2021-10-10 15:33:39 +02:00
iceman1001 67632fdc24 remove special chars... 2021-10-10 15:33:23 +02:00
iceman1001 1ab9d24b5c calloc and check. remove add char. 2021-10-10 14:26:00 +02:00
Philippe Teuwen 2d38d721a3 malloc check 2021-10-10 12:36:41 +02:00
Philippe Teuwen 1139650948 atr_scrap_eftlab.py producing atrs.h compatible with make style 2021-10-10 12:31:03 +02:00
Philippe Teuwen b7ea848f7f getAtrInfo without regex engine 2021-10-10 12:26:47 +02:00
iceman1001 7dd5943d32 lc resonate calculator stuff 2021-10-10 11:48:21 +02:00
iceman1001 c93dfb712f atr fixes and regex test 2021-10-10 11:45:43 +02:00
iceman1001 dd391cda01 first draft at having a ATR lookup list available in project 2021-10-10 09:37:39 +02:00
Philippe Teuwen 88308ea727 typos 2021-10-10 01:35:45 +02:00
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