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

10678 commits

Author SHA1 Message Date
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
iceman1001 d99bd54662 fixed helptext sample 2023-07-09 16:45:03 +02:00
iceman1001 7a66e2389e hf search will now detect VAS 2023-07-09 15:57:35 +02:00
iceman1001 a49fdbda0d reworked the logic and params a bit 2023-07-09 15:26:05 +02:00
iceman1001 6eba6015c5 added a sample VAS private key to client/resources folder. Updated helptexts 2023-07-09 13:00:09 +02:00
iceman1001 08958d36ef moving VAS to HF command category. Added missing Makefile and CMakefile 2023-07-09 12:55:37 +02:00
Iceman a4f77e224e
Merge branch 'master' into vas 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-07-09 12:38:53 +02:00
iceman1001 d3b6fc6b5a allowing for more keys 2023-07-09 09:43:54 +02:00
Sam 889a02557b
Fix compiling on iOS 
iOS can, in fact, use the system() stdlib call

Signed-off-by: Sam <48739810+The-SamminAter@users.noreply.github.com>
 2023-07-08 23:16:30 -07:00
Grayson Martin 2dc5b6f977
Merge branch 'master' into vas 2023-07-08 18:38:58 -05:00
Grayson Martin 1e54cd661c
make style 2023-07-08 18:18:36 -05:00
Grayson Martin 70541e9450
add continuous mode 2023-07-08 18:18:35 -05:00
Grayson Martin 9dd845d859
Fix memory leak 2023-07-08 18:18:35 -05:00
Grayson Martin b30f8ae37f
Finish decryption algorithm implementation 2023-07-08 18:18:35 -05:00
Grayson Martin 945f03e646
add import, oops 2023-07-08 18:18:35 -05:00
Grayson Martin 610b8a7410
Implement ANSI X9.63 sha256 per spec 2023-07-08 18:18:34 -05:00
Grayson Martin 44f2e253d8
import mbedtls ecc point (de)compression extension and use 2023-07-08 18:18:34 -05:00
Grayson Martin 59aa95fa6e
begin implementation 2023-07-08 18:18:29 -05:00
iceman1001 e43f6804a1 style 2023-07-06 22:37:34 +02:00
Iceman 3b7f2be264
Merge pull request #2023 from wh201906/timeout 
Make communication timeout configurable
 2023-07-05 17:43:14 +02:00
wh201906 b74c5db4f9
Make communication timeout configurable 2023-07-05 22:44:59 +08:00
Iceman 81702baaf6
Merge pull request #2021 from nvx/mfc_arm_cleanup 
Cleanup arm-side reader-mode mifare classic block read/write code.
 2023-07-05 13:49:27 +02:00
wh201906 a19732bb6e
Fix timeout of TCP connections 2023-07-04 16:19:33 +08:00
nvx edd8e36d80 Cleanup arm-side reader-mode mifare classic block read/write code. 2023-07-04 00:11:01 +10:00
iceman1001 cbfab4fc20 maur keys. Ql88 sector 17 a/b, thanks to AnnPlusplus and Atlab! 2023-06-28 13:29:08 +02:00
iceman1001 ed0d18f05d QL88 tag identification. Thanks to AnnPlusPluss and Atlab for finding the key 2023-06-28 13:27:50 +02:00
iceman1001 66b3ebabb9 fix regex for extracting the description and notes.\n description now must start with a newline and go until it see the word usage:. \n\n notes now go until it sees either === or --- or \n\n\n which all would be indication that the notes section ended. 2023-06-27 15:24:25 +02:00
Self Not Found 9db65186e3
Fix note for hf fudan wrbl 2023-06-27 11:28:11 +08:00
iceman1001 adfebd6510 text 2023-06-26 15:01:08 +02:00
iceman1001 c7d004de63 Revert "Release v4.16717 - seven" 
This reverts commit bc18dbd847.
 2023-06-26 13:10:45 +02:00
iceman1001 bc18dbd847 Release v4.16717 - seven 2023-06-26 13:10:45 +02:00
iceman1001 2e311a141b misschecks 2023-06-25 22:42:29 +02:00
iceman1001 f64f538519 style 2023-06-25 22:30:58 +02:00
iceman1001 a9f81a05b4 text 2023-06-25 14:21:34 +02:00
iceman1001 9b69d7ddfa fix uikit and appkit detection in cmake 2023-06-25 13:03:12 +02:00
iceman1001 d71eed325c appkit vs uikit detection 2023-06-25 12:42:34 +02:00
iceman1001 2b3f3240c6 fix incomplete else statement in cmakelists.txt 2023-06-25 09:07:43 +02:00
iceman1001 9b8316c1dd fix cmakelists.txt for missing else 2023-06-25 09:04:45 +02:00
iceman1001 de85b3c10c remove color from GPB 2023-06-25 08:19:43 +02:00
The-SamminAter 9f87b6dd9c Add ability to compile on iOS 2023-06-24 17:19:46 -07:00
iceman1001 043ff257c4 style 2023-06-24 23:28:31 +02:00
iceman1001 0f35e89f4e data diff now prints filenames if they fit in the header. Spiff filenames and other params is untouched 2023-06-24 23:03:43 +02:00
iceman1001 85f8234201 fix wrong key file name 2023-06-24 22:24:27 +02:00
iceman1001 a43d8ea9e0 adapted viewing MFC dump files to also colorize ACL + GPB bytes 2023-06-24 22:01:10 +02:00
iceman1001 74f02fef8a style 2023-06-24 17:16:28 +02:00
iceman1001 f0a6b1bd67 "hf mf supercard --furui" - add furui supercard key covery. Thanks to Foxushka for the PoC 2023-06-24 17:14:56 +02:00
iceman1001 636e6bcc6b adapt restore 2023-06-24 17:13:23 +02:00
iceman1001 c937e3b760 fix tear off to work with topaz wrbl. fix topas wrbl to handle LOCK/OTP block 13,14, which needs write_nonerase command, fixed output for rdbl 2023-06-24 00:02:50 +02:00
iceman1001 c6e9f9781c fix char 2023-06-23 20:02:56 +02:00
iceman1001 5087581a50 fix some wrong sector comparisions. And return value for restore command when sending wrbl. 2023-06-23 19:58:33 +02:00
iceman1001 55b780074f move defines 2023-06-23 18:59:16 +02:00
iceman1001 2d70ff5085 fix compilation by adding the WIP func 2023-06-23 18:33:16 +02:00
iceman1001 3fbd53ac2f hf mf wipe - text 2023-06-23 18:27:33 +02:00
iceman1001 b8d3b281ad adapt non commit functions yet 2023-06-23 18:07:56 +02:00
iceman1001 bf8ac54c38 fix loop logic. thanks @jump 2023-06-23 17:58:22 +02:00
iceman1001 85d4e99ae9 mfp changes... 2023-06-23 17:51:39 +02:00
iceman1001 d1b62a5fc2 fix wrong sector trailer detection 2023-06-23 17:44:15 +02:00
iceman1001 25f84bcb8e fix 14b detection in hf search 2023-06-23 17:21:47 +02:00
iceman1001 8700b1e754 fix hf mf mad loading mad v2 sector 2023-06-23 17:14:58 +02:00
iceman1001 4b12d67632 text and fixes for MAD v2 2023-06-23 17:12:29 +02:00
iceman1001 a508ed7646 fix hf mf dump 2023-06-23 17:10:04 +02:00
iceman1001 88e2618131 function to support figuring out if block 0-3 , 0-15 is sectortrailer. The previous function uses 0-255.. 2023-06-23 17:08:32 +02:00
iceman1001 ed34453461 maur 2023-06-23 16:27:30 +02:00
iceman1001 419d0c1f5b adapt return codes for some mifare commands and their debug logging. this will reduce debug message on the client side 2023-06-23 16:25:43 +02:00
iceman1001 673f15c247 text 2023-06-23 14:19:50 +02:00
iceman1001 7fe02233d8 textual changes to MAD output 2023-06-23 13:56:59 +02:00
iceman1001 db4086718d kety length checks for hf mf rdbl, rdsc, wrbl, and some textual changes to hf mf mad 2023-06-23 13:37:37 +02:00
iceman1001 59a2b63d6b thanks to user Hawkeye which tested on old conference badges on a NTAG216 2023-06-23 06:56:05 +02:00
Thomas 492a09f5cc correct LEGIC 16bit CRC calculation "hf legic crc", use init_table(CRC_LEGIC_16) to be consistent with l_crc16legic in client/src/scripting.c 2023-06-22 22:51:16 +02:00
kormax 57b827613b Update aidlist.json 2023-06-22 18:30:52 +03:00
kormax 1bd389bdd0 Add annotation for AirDrop ECP frame 2023-06-22 18:06:23 +03:00
iceman1001 c7af716942 style 2023-06-21 18:49:12 +02:00
iceman1001 d3792c0853 adapt mifare plus key files to be loaded/saved in json. WIP , will need a typedef struct in order to work properly 2023-06-21 18:48:04 +02:00
iceman1001 cdb906cd23 style 2023-06-21 18:45:59 +02:00
iceman1001 681382e0cc new AID for Kiev metro card 2023-06-21 18:45:25 +02:00
iceman1001 a4a7033b23 adapt comparision of text 2023-06-21 18:43:21 +02:00
iceman1001 d65094b7e0 fixed some color to mad directory printings and fixed a sector issue in when saving keyfiles to Mifare Plus cards 2023-06-19 15:01:40 +02:00
iceman1001 2010d10f81 forgot to push function rename 2023-06-16 05:34:52 +02:00
iceman1001 28fa53170e hf mfp mad now has same checks as mf mad cmd 2023-06-16 04:34:26 +02:00
iceman1001 620e5f4951 simplify logic 2023-06-15 22:47:21 +02:00
Philippe Teuwen be507e1662 Avoid spurious 'No history will be recorded' error on fresh install 2023-06-15 16:09:15 +02:00
Jean-Michel Picod d9ed07c77c Missed one line for LegicCash uid 2023-06-14 16:41:42 +02:00
Jean-Michel Picod fdd85d7e1e Fix LegicCash segment CRC computation 2023-06-14 16:41:42 +02:00
iceman1001 6fd0d93647 fixed the trace list output when marking crcbytes in color mode. Some odd cases exists. 2023-06-14 14:24:41 +02:00
iceman1001 f370e0df71 revert 2023-06-12 21:12:24 +02:00
iceman1001 8ac04b2d21 style on hf mf rdsc , hf mf rdbl, to match the MF commands 2023-06-12 20:34:06 +02:00
iceman1001 f462e6bd02 hf mfp rdsc - style similar to MF commands 2023-06-12 20:14:12 +02:00
iceman1001 383c52c1bd added colors and show all sectors in range for hf mf chk 2023-06-12 19:54:05 +02:00
iceman1001 3de4f5225b enable fingerprint for UL-C tags too 2023-06-11 22:59:10 +02:00
iceman1001 5505096483 text 2023-06-11 22:41:52 +02:00
iceman1001 4180f6bfe2 added philips toothbrush detection in hf mfu info and generator in hf mfu pwdgen -r 2023-06-11 21:52:42 +02:00
iceman1001 d5f8202284 textual 2023-06-10 12:03:39 +02:00