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
17207 commits 3 branches 14 tags 86 MiB
Commit graph

10770 commits

Author SHA1 Message Date
Rick Farina (Zero_Chaos) d522a46fca
fix lto-type-mismatch in guidummy.cpp 
link time optimization requires all functions named the same to actually
operate the same.  I am pretty sure this fixes it without breaking
anything.
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2058

src/proxgui.h:35:6: error: type of ‘ShowPictureWindow’ does not match original declaration [-Werror=lto-type-mismatch]
   35 | void ShowPictureWindow(uint8_t *data, int len);
      |      ^
src/guidummy.cpp:33:17: note: type mismatch in parameter 2
   33 | extern "C" void ShowPictureWindow(char *fn) {
      |                 ^
src/guidummy.cpp:33:17: note: type ‘void’ should match type ‘int’
src/guidummy.cpp:33:17: note: ‘ShowPictureWindow’ was previously declared here
 2023-07-31 15:57:09 -04:00
kormax ef79fb91eb Add annotation for new DESFire command code 2023-07-31 12:48:40 +03:00
iceman1001 48b61c6438 ATR from the flipper zero seader project 2023-07-30 21:21:59 +02:00
iceman1001 9943235e31 updated atr table 2023-07-30 21:20:32 +02:00
iceman1001 708cfca850 add default marking of crc bytes for these protocols 2023-07-30 20:32:56 +02:00
iceman1001 0c98550177 dont mark crc byte everywhere in the alias list. have to set it for those commands that would benefit from it 2023-07-30 17:17:08 +02:00
iceman1001 6df79e3926 missed to remove exclamation mark 2023-07-29 12:44:32 +02:00
iceman1001 97a1f97308 style 2023-07-27 23:42:06 +02:00
iceman1001 944af6be95 fixed the missing erasing of flash memory bank. 2023-07-27 22:55:58 +02:00
iceman1001 19251645e1 shorten LEN variable to match the available space in string 2023-07-27 20:12:42 +02:00
iceman1001 a44e2fbc36 text 2023-07-27 19:47:11 +02:00
iceman1001 39eecc917e improved the messages reported when loading json files fails. Usually because we have reserved the wrong size memory 2023-07-27 19:38:51 +02:00
iceman1001 8bfb915624 adapt the leftovers 2023-07-27 19:01:46 +02:00
iceman1001 40533497d3 text 2023-07-27 18:50:41 +02:00
iceman1001 3b91c1a47f text 2023-07-27 18:50:19 +02:00
iceman1001 5faf625032 adapt name to match code style 2023-07-27 18:02:53 +02:00
iceman1001 7440e617e0 add stupid extra checks to see why this code overflows on pentoo... 2023-07-27 16:26:36 +02:00
iceman1001 795745ea32 text 2023-07-27 14:20:37 +02:00
iceman1001 dc199b62ca text 2023-07-27 12:38:40 +02:00
iceman1001 7f5590d942 checks 2023-07-27 01:15:31 +02:00
iceman1001 a57cfdde70 size? 2023-07-27 01:12:08 +02:00
iceman1001 e1e4133564 coverity string formatter 2023-07-27 01:11:47 +02:00
iceman1001 123ef14667 style 2023-07-26 23:50:12 +02:00
iceman1001 fc3a518f28 There is a race condition when we go from iclass commands to mf command. Especially noticable when eload large files where we used to spam the device with usb packages.\ntry iclass eload, then mf eload, and you see the client hang. With this change we trigger a preload of the fpga image before we start uploading to the device. Current places I could trigger this bug was in eload and gsave. With this patch only the first call takes some time if fpga image must be loaded. The following goes fast.\n\n if you find that the client hangs when going between, this could be the root cause. 2023-07-26 23:47:55 +02:00
iceman1001 b696a2036f improved the eload upload times by using large chunks. Quite much faster now.\nAddapted the dots and text for eload / sim across the client 2023-07-26 23:39:27 +02:00
iceman1001 fbdf50d756 minor text stuff 2023-07-26 17:49:14 +02:00
iceman1001 00133a04ee added the hf mfu list 2023-07-26 17:41:48 +02:00
iceman1001 282af80153 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-07-26 11:08:57 +02:00
iceman1001 9dc6ce552c I remembered not to add calls to functions inside macro calls... 2023-07-26 11:08:45 +02:00
nvx c3c08e07e4 Fix hf mf gdmsetlbk block data being accidentally prefixed with a 0x00. 
This fixes a regression caused by edd8e36 (PR #2021).

gdm auth has no concept of A or B keys, a partial cleanup in the
previous PR removed the key type from the arm code, but the
corresponding removal was missed in the client side resulting in
mismatched structs for cmd CMD_HF_MIFARE_G4_GDM_WRBL.
 2023-07-26 18:53:31 +10:00
iceman1001 30162f3d87 remove debug statement 2023-07-26 01:35:27 +02:00
iceman1001 c85258e042 zerobased index 2023-07-25 23:55:38 +02:00
iceman1001 e5b075ed3b hf mf restore got some textual updates in order to be easier to understand if keyB writes fails. We use a default ACL when wiping a card that doesnt allow key B to be used for writing. Restore command tries key B first, so there will be several failed key b attempts normally. 2023-07-25 22:42:42 +02:00
iceman1001 cb9ee94ed6 lets see if this sorts out the memory crash on pentoo 2023-07-25 12:39:22 +02:00
iceman1001 1a4df13aae fix coverity cid #416068 2023-07-24 22:18:35 +02:00
iceman1001 4179ce1e42 text 2023-07-24 21:34:01 +02:00
iceman1001 b446c36da6 style 2023-07-24 21:04:32 +02:00
iceman1001 41ff9191d6 text 2023-07-24 21:04:21 +02:00
iceman1001 1a788b1c14 make style 2023-07-24 17:42:27 +02:00
iceman1001 eaee05908c text 2023-07-24 17:01:33 +02:00
iceman1001 97ca694c10 added a view command for ISO15693 2023-07-24 16:39:48 +02:00
iceman1001 90a3b968fd coverity dont think we check if we got enough bytes to operate on. The sizeof the bmp_header_t gives a bit, we would need more ... 2023-07-24 15:24:53 +02:00
iceman1001 fb35a29ba0 coverity doesnt think we checked the bytes_read values enough. lets add a check 2023-07-24 15:18:56 +02:00
iceman1001 90d1fed1fa coverity somehow believes we read a long string from a file and the data isnt null terminated (i.e. last char is 0x00) so let see if a ugly + 1 will do the trick 2023-07-24 15:14:17 +02:00
iceman1001 fcde2978a8 coverity believes somehow the return value from mfSectorNum can be 31. And wants us to check that it is only same size as sectors allocated 2023-07-24 15:11:21 +02:00
iceman1001 72057f9b81 text 2023-07-24 13:34:24 +02:00
iceman1001 fa82c46ff7 minor text 2023-07-24 03:15:42 +02:00
iceman1001 10504ae4fd text and increasing a buffer 2023-07-24 03:15:14 +02:00
iceman1001 38034480ca text 2023-07-24 01:42:24 +02:00
iceman1001 8029e08153 cppchecker, make sure struct is initialized to zero 2023-07-24 00:54:12 +02:00
iceman1001 d19c9a262a style, same name everywhere in project 2023-07-24 00:53:35 +02:00
iceman1001 300d274d43 coverity migth consider this to be better 2023-07-24 00:14:56 +02:00
iceman1001 5013d67208 maybe coverity likes this better 2023-07-24 00:08:23 +02:00
iceman1001 d6142296f3 coverity 2023-07-23 23:23:45 +02:00
iceman1001 95e8f0693e coverity 2023-07-23 22:38:02 +02:00
iceman1001 a761c9765a style 2023-07-23 12:53:04 +02:00
iceman1001 c5c829bce2 a bunch of minor textual changes, hiding things when no compilation support for it, also fixed the loop in keyroll generation. Added the skeleton SAM command 2023-07-23 11:57:03 +02:00
iceman1001 4b64a45899 make style 2023-07-23 11:15:52 +02:00
iceman1001 c8acec7458 clean up 2023-07-22 23:30:53 +02:00
iceman1001 c6b720fdcd make data grid less verbose 2023-07-22 23:26:04 +02:00
iceman1001 2d5724f4c3 text 2023-07-22 18:19:02 +02:00
iceman1001 eaf8aac217 better smoothing in the envelope command and also allow for other raw demod to accept a larger clock as in param 2023-07-22 17:34:27 +02:00
iceman1001 ef03d0bee0 text 2023-07-22 15:51:35 +02:00
iceman1001 c6cc1b2416 fix the loadfile command and more colors 2023-07-22 14:22:39 +02:00
iceman1001 0180ca305e added verbose flag to eview/view/info command where it will print the raw hex dump. This makes it a bit cleaner output 2023-07-22 14:07:51 +02:00
iceman1001 6da1b74fa9 text 2023-07-22 13:51:28 +02:00
iceman1001 b0fd944c71 added missing value 2023-07-21 22:08:52 +02:00
iceman1001 97e61650ab added missing value 2023-07-21 22:07:16 +02:00
Philippe Teuwen 1a19640d18 make style 2023-07-21 18:22:46 +02:00
Iceman 498bfa56e9
Merge pull request #2050 from DidierA/trace_list_mfp 
MIFARE Plus traces: Adds MAC, UnMACed to annotations, and code factorisation
 2023-07-21 18:14:35 +02:00
DidierA c1416ba256 Adds MAC, UNMACed to messages, and code factorisation 2023-07-21 17:25:49 +02:00
iceman1001 b277e667c9 text 2023-07-21 17:04:21 +02:00
beckerj f54851be09
Fix typo in hf_legic_clone.lua 
variable "length" was used parameter in function, but later called as "len"

Signed-off-by: beckerj <beckerj@users.noreply.github.com>
 2023-07-21 15:07:07 +02:00
iceman1001 4d9f97954e allow for clocks larger than 255 to be used from commandline. added the new command data envelope. it creates square signal, similar to askedgedetect.\n adapted find closest clock in order to make clock /8 less prioritized if there are more found clocks. use second best match in those cases. 2023-07-21 14:35:24 +02:00
iceman1001 9324682873 fix lf search 2023-07-21 13:53:32 +02:00
iceman1001 152f1d4c6e coverity fix 2023-07-21 11:41:57 +02:00
iceman1001 b332a5bd60 added a new command data centerthreshold. It removes center values. 2023-07-21 10:58:30 +02:00
iceman1001 eb61d0f45e change param names for data detect clock to follow client overall style 2023-07-21 10:57:47 +02:00
Philippe Teuwen 78ea432b8c fix for killjoy windows 2023-07-21 09:27:12 +02:00
iceman1001 89e6f88522 add asn1 selftest batch 2023-07-21 06:40:26 +02:00
iceman1001 ba6d48dec8 include 2023-07-21 06:27:41 +02:00
iceman1001 09bd5c7bcd prep for a asn1 selftest check 2023-07-21 06:27:02 +02:00
iceman1001 154d454f23 style 2023-07-21 06:23:53 +02:00
iceman1001 a556434f3f style 2023-07-21 06:21:59 +02:00
Iceman 0e385300a7
Merge pull request #1984 from horrordash/master 
fix reading NDEF from Mifare Classic
 2023-07-21 06:19:56 +02:00
Philippe Teuwen dac7721cff hitag: coherence in hitag type options 2023-07-21 01:31:09 +02:00
Philippe Teuwen 173379b999 Rewrote completely cmds & options lf hitag read/dump/wrbl/ta 
for more coherence with other pm3 cmds.
Still there remain strange things but it should be a step in the right direction...
 2023-07-21 01:08:24 +02:00
Philippe Teuwen c5cfe593f5 fix exec mode on source file 2023-07-20 21:04:00 +02:00
Iceman aff017cce8
Merge pull request #2045 from DidierA/trace_ppss 
trace: fix PPSS and  add CID, FSDI to RATS
 2023-07-20 11:16:15 +02:00
Philippe Teuwen 89cbe3c7df should fix macos compilation error introduced by 8543db11b5 2023-07-20 10:54:37 +02:00
DidierA e056459c03 trace list: add CID info in RATS and PPSS 2023-07-20 02:24:45 +02:00
DidierA 8543db11b5 Avoid useless loop by moving check to the default case 2023-07-19 21:46:20 +02:00
DidierA b314d1ef1c Add MIFARE Plus commands in trace list 2023-07-19 21:15:07 +02:00
iceman1001 0d682da676 more fixes for hf_legic. missing zero padding, removed tab, more colors 2023-07-19 10:09:18 +02:00
iceman1001 d08c6f404b first cleanup of hf_legic lua script. All io.open calls is problematic.\nfixed some colors in the help texts. makes it a bit easier to read\nfix loading files using the searchfile call\nstill problematic with save file calls since it should honor the user defined preference paths. 2023-07-17 22:54:43 +02:00
iceman1001 60cc36b398 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-07-17 19:34:43 +02:00
iceman1001 c70e5beeac changed legic sim to have a different loop and exit message. Added some colors in output and the return codes on deviceside for legisim now uses the same PM3_E* styled 2023-07-17 19:31:37 +02:00
iceman1001 134f09be5e style 2023-07-17 17:46:27 +02:00
iceman1001 230f1c654b hf legic einfo, now accepts card size params 2023-07-17 17:43:23 +02:00
iceman1001 73eb8d0de0 fix lf cotag reader , make the grid command use the new syntax 2023-07-17 17:30:15 +02:00
iceman1001 24938e3ed5 remove some redundant code and fixed CID# 416023 with resource leak 2023-07-17 11:21:29 +02:00
Iceman 3397198127
Merge pull request #2041 from kormax/new-iso14443a-polling 
Move custom polling frames to client
 2023-07-17 09:46:38 +02:00
Philippe Teuwen 03ae05a345 cmake: allow to embed LZ4 2023-07-17 04:49:13 +02:00
Philippe Teuwen 5b656ad4b0 Add CMP0114 policy to cmake 
CMake Warning (dev) at /home/linuxbrew/.linuxbrew/Cellar/cmake/3.26.4/share/cmake/Modules/ExternalProject.cmake:2271 (message):
  Policy CMP0114 is not set: ExternalProject step targets fully adopt their
  steps.  Run "cmake --help-policy CMP0114" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.

  ExternalProject target 'bzip2' would depend on the targets for step(s)
  'configure;build;install' under policy CMP0114, but this is being left out
  for compatibility since the policy is not set.
Call Stack (most recent call first):
  CMakeLists.txt:178 (ExternalProject_Add_StepTargets)
This warning is for project developers.  Use -Wno-dev to suppress it.
 2023-07-17 03:32:15 +02:00
kormax 7f5e1c9657 Move custom polling frame generation logic to client 2023-07-16 19:27:38 +03:00
kormax a9cba02514 Move custom polling frame generation logic to client 2023-07-16 17:39:32 +03:00
iceman1001 ad5b58436f text 2023-07-16 15:22:24 +02:00
kormax 0094318515 Make ISO14443-A polling method more flexible 2023-07-16 14:46:30 +03:00
iceman1001 b36d5fa04d fix wrong memcpy offset 2023-07-16 09:45:35 +02:00
Iceman e22d8ae455
Merge pull request #2039 from RfidResearchGroup/lz4 
Bring LZ4 support for hardnested tables
 2023-07-16 09:06:11 +02:00
Philippe Teuwen 83e083100b Bring LZ4 support for hardnested tables 
Testing perfs on an old 8-core laptop:
BZ2   :   2 Mb, average decompression time: 5514 ms
LZ4 -9:   9 Mb, average decompression time:  837 ms
RAW   : 704 Mb, average decompression time:  368 ms

Other LZ4 options don't help: -1 is slower and bigger, --favor-decSpeed does not do anything

To enable:

apt install liblz4-dev
cd client/resources/hardnested_tables
for i in *bz2; do bunzip2 $i; lz4 -9 --rm ${i%.bz2}; done
 2023-07-15 22:58:00 +02:00
iceman1001 1e44a26b54 text 2023-07-15 15:26:01 +02:00
iceman1001 3190cc5a3d text 2023-07-15 14:27:44 +02:00
iceman1001 71369a3007 text style 2023-07-15 11:52:42 +02:00
iceman1001 772b9121f6 some output can be at debug logging instead 2023-07-15 11:51:47 +02:00
iceman1001 5f8cd5caca make style 2023-07-14 18:34:14 +02:00
iceman1001 b997a78bca remove debugging code 2023-07-14 18:30:50 +02:00
iceman1001 23eca8fecc remove debugging code 2023-07-14 18:29:50 +02:00
iceman1001 3c6d1c492f text 2023-07-14 18:23:36 +02:00
iceman1001 78fe406f50 changed emv reader in verbose mode to extract and print transaction logs stored on card 2023-07-14 18:16:40 +02:00
iceman1001 5022e21db5 added a iso4217 currency table. Borrowed and converted from the Cardpeek project. Thanks to them! 2023-07-14 18:13:18 +02:00
iceman1001 82d80cc250 better memory clean up, thanks @gentilkiwi 2023-07-14 11:33:47 +02:00
AloneLiberty 1292a572cb
Don't require valid key or proxmark3 for hardnested with --tests 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-07-12 23:32:35 +03:00
Iceman 1c52bd5ac3
Merge pull request #2034 from rdmitr/hardnested-no-signature-detect-when-offline 
Do not try to detect Mifare classic EV1 signature in offline mode
 2023-07-12 15:02:56 +02:00
Roman D c9c8c6b72c Do not try to detect Mifare classic EV1 signature in offline mode. 2023-07-12 15:35:29 +03:00
iceman1001 698b41eb27 code style 2023-07-12 13:59:47 +02:00
Roman D e1659da755 Remove extraneous num_CPUs() calls. 2023-07-12 13:14:59 +03:00
Roman D bce1429f60 Dynamically allocate buckets array for the hardnested bruteforce attack. 2023-07-12 13:06:07 +03:00
Iceman 7576339305
Merge pull request #2032 from rdmitr/eliminate-ncpus-calls 
Eliminate extraneous num_CPUs() calls
 2023-07-12 10:05:58 +02:00
Roman D b708332ea3 Eliminate extraneous num_CPUs() calls 2023-07-12 10:55:27 +03:00
kormax 66120ac71a Update ECP database 2023-07-12 10:45:24 +03:00
Roman D 57945c5213 Implement uncompressed hardnested tables loader 2023-07-11 19:04:15 +03:00
iceman1001 33d90993e3 more bluetooth simple pairing options. No decoder yet. 2023-07-11 14:39:13 +02:00
iceman1001 6f29aa6d8f added a track2 decoder. Seems to have odd delimiters and in hex format. Most likely to be problematic when tested against plenty different types 2023-07-11 08:56:45 +02:00
iceman1001 4ffb779b40 added a track1 decoder 2023-07-11 08:26:58 +02:00
iceman1001 503ccbe6a2 helptext 2023-07-10 20:23:04 +02:00
iceman1001 aa7a0b7edd coverty fixes.. those are not pointers to pointer.. 2023-07-10 17:22:16 +02:00
iceman1001 40534d1f07 style 2023-07-10 16:41:00 +02:00
iceman1001 46fc20165b reduce size since this wasnt the root cause 2023-07-10 16:37:30 +02:00
iceman1001 dd3e1d3730 added EMV READER command. It will try to extract information about the EMV application that is installed on the card. 2023-07-10 16:36:57 +02:00
Iceman e1343382b5
Merge pull request #2028 from kormax/vas-memory-leak 
Fix potential memory leak in VAS implementation
 2023-07-10 10:14:59 +02:00
kormax 642cdd86d3 Add missing memory free 2023-07-10 10:45:22 +03:00
kormax abd2f759ae Fix potential memory leak in VAS implementation 2023-07-10 10:34:08 +03:00
iceman1001 588dea4005 still overflows on pentoo. Lets reserve the double the max. 2023-07-10 08:44:16 +02:00
iceman1001 17be2f6c3e remember to malloc space for the defaultPaths too 2023-07-10 01:44:34 +02:00
iceman1001 7835ca0f4c fix wrong code commited 2023-07-10 00:25:37 +02:00
iceman1001 00ebea6487 autopwn now detects if someone runs it against a MF UL/NTAG based card and stops 2023-07-10 00:18:35 +02:00
kormax d5b77d2546 Add newline at the end 2023-07-09 22:36:13 +03:00
kormax faab7c5712 Fix typos 2023-07-09 22:35:15 +03:00
kormax 6d403ddfef Create a list of known ECP frames 2023-07-09 22:33:26 +03:00