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

11056 commits

Author SHA1 Message Date
Roman D dfabad37d9 Configurable number of CPU cores. 2023-08-17 12:41:34 +02:00
coderxian 9a70bf1aec Fixes issue 2076 2023-08-15 17:17:46 -05:00
Iceman 13444d9699
Merge pull request #2079 from d18c7db/master 
Vocabulary file became appended to itself
 2023-08-15 21:11:08 +02:00
Alex 8ae97d1094 Vocabulary file became appended to itself 
Remove duplicated data
 2023-08-15 09:31:00 +02:00
Henry Gabryjelski db8f91d7e1 make logfile more unique (per client run) 2023-08-14 20:01:20 -07:00
Alex 4b1090c8c7 Rename "vocabulory" to "vocabulary" 2023-08-09 19:49:55 +02:00
Alex 6947a61d98 Whitespace 2023-08-09 14:30:07 +02:00
Alex c26583ebfd Bugfix to keyboard scrolling 
At zoom levels above x16 the left and right keys only scroll the graph buffer to the left, even if right key is pressed. Mouse wheel behaves correctly.
Enabled mouse wheel to zoom when control is pressed since that is the more standard UI convention (but left shift scrolling in place).
Minor changes to zooming, using more intuitive constants.
 2023-08-09 13:37:38 +02:00
Anton Todorov 6781dadc30
emv: display the transaction time as HH:MM:SS 
in the transaction log

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2023-08-06 14:27:58 +03:00
DidierA 22bc398b48 Bugfix: data atr -t was reading uninitialized data 2023-08-03 14:44:27 +02:00
iceman1001 eaf11127be since HF SEARCH triggers multiple swaps of FPGA image HF -> HF 15 -> HF FELICA , its better to have relevant checks when the correct fpga image is loaded 2023-08-03 12:55:06 +02:00
iceman1001 0e84860c2f less inline calls 2023-08-03 08:42:52 +02:00
iceman1001 24a138eeb1 fix some potential empty responses and too much inline calls 2023-08-03 08:41:11 +02:00
iceman1001 de98e4e161 fix conflit 2023-08-03 07:30:27 +02:00
Philippe Teuwen cb72897b17 mkversion.sh: now regenerates version_pm3.c (and consequently the binaries) only when needed 
and add --force to forcibly regenerate version_pm3.c

and small fixes:
* document mkversion.sh usage
* remove call to mkversion.sh in client/experimental_lib/CMakeLists.txt on release
* remove call to old `mkversion.pl` in bootrom/Makefile
* just in case, mkversion.sh takes care of atomic write of the file
 2023-08-03 01:03:24 +02:00
iceman1001 fd987ab8a2 fix string formatter 2023-08-02 23:47:25 +02:00
iceman1001 5b58e438b1 style 2023-08-02 22:41:35 +02:00
Iceman 44352ac586
Merge pull request #2063 from ZeroChaos-/master 
define proxguiqt.cpp depends to avoid parallel/shuffle build failure
 2023-08-02 21:50:32 +02:00
iceman1001 d6a0f8edac use string instead 2023-08-02 19:56:29 +02:00
iceman1001 1e26d79ddd added a new command to lookup ATR arrays 2023-08-02 19:50:47 +02:00
iceman1001 1c35f14c76 thanks @DidierA for the sharp eyes 2023-08-02 19:49:26 +02:00
Rick Farina (Zero_Chaos) 8f2b71ffc4
fix parallel build for proxguiqt.moc.cpp 
seed shuffle=2866679623 found that proxguiqt.moc.cpp also needs the same
header so just defining the header and defining it's needs should make
everyone happy
 2023-08-02 13:00:32 -04:00
iceman1001 2b3d339714 lto missing inits 2023-08-02 17:46:53 +02:00
iceman1001 602daa7fdd missing inits 2023-08-02 17:40:55 +02:00
iceman1001 4ee7b78a07 always make sure resp is initialized 2023-08-02 17:36:50 +02:00
Rick Farina (Zero_Chaos) 0b70a10145
proxguiqt.cpp also needs ui_image.h to build 
This fixes the next parallel build failure in the current shuffle seed.
 2023-08-02 11:30:18 -04:00
Rick Farina (Zero_Chaos) f451be5877
proxguiqt.cpp needs ui_overlays.h to build 
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2062
 2023-08-02 11:28:48 -04:00
Iceman 0388682591
Merge pull request #2061 from pentoo/master 
fix -Wstringop-overread error
 2023-08-02 15:57:34 +02:00
Iceman c5dff6a55f
Merge pull request #2059 from ZeroChaos-/master 
fix lto-type-mismatch in guidummy.cpp
 2023-08-02 15:54:38 +02:00
Rick Farina (Zero_Chaos) 6b648396e7
fix -Wstringop-overread error 
We are reading this 26 bytes into a 32 byte buffer, is this even any
worse?
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2060
 2023-07-31 23:33:36 -04:00
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
Grayson Martin efea49415d
Merge branch 'master' into smartcard-relay 2023-07-13 17:14:19 -05: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
Grayson Martin 8af75cb220
make style 2023-07-11 15:42:30 -05:00
Grayson Martin 54a5e8400f
Merge branch 'master' into smartcard-relay 2023-07-11 15:27:23 -05:00
Grayson Martin dfc7104799
add additional info to smart relay cmd help text 2023-07-11 15:26:50 -05:00
Grayson Martin 8bb4949016
Finish initial implementation 2023-07-11 15:11:01 -05:00
Roman D 57945c5213 Implement uncompressed hardnested tables loader 2023-07-11 19:04:15 +03:00
Grayson Martin 7028944ee0
Begin cmd 2023-07-11 10:55:43 -05: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
Angel 2adfc928fc
Merge branch 'master' into master 
Signed-off-by: Angel <jeremy_1996@hotmail.com>
 2023-06-04 11:39:45 -04:00
Angel dc1a0936da Re-added old checksum under command parameter for demod and read. 2023-06-04 11:38:13 -04:00
iceman1001 97eb0238b1 style 2023-06-02 10:45:04 +02:00
iceman1001 1107c214c5 hf mf ndefformat now uses the binary key loading 2023-05-30 16:19:33 +02:00
iceman1001 2356dfea73 hf mf restore - now uses the binary key loading fct() 2023-05-30 14:14:21 +02:00
iceman1001 7c8e9db822 allow user abort when wiping 2023-05-30 13:46:52 +02:00
iceman1001 7368cccdf9 Disney MagicBand 2023-05-29 06:57:39 +02:00
iceman1001 f17ce1fd68 revert one debug message 2023-05-28 12:40:57 +02:00
iceman1001 2b90683aff added debug output for usart comms 2023-05-28 12:34:29 +02:00
iceman1001 6d22b606c2 adapt comparison 2023-05-28 10:26:07 +02:00
iceman1001 336bd06d88 type fix 2023-05-28 07:34:27 +02:00
iceman1001 1d0da726ec the clocks for usart rxtx wasnt enabled. 2023-05-27 21:10:11 +02:00
iceman1001 32fcf5e870 make 16 bytes default cols 2023-05-27 17:00:28 +02:00
iceman1001 0cc7373655 fix resource leaks 2023-05-27 12:10:32 +02:00
iceman1001 328e5461f8 added "--sk" param to hf mf eview and view commands. This param extracts and saves keys to binary key file 2023-05-27 10:46:42 +02:00
iceman1001 71f934dbd7 text 2023-05-27 10:28:54 +02:00
iceman1001 5c604de4c1 adapt hardnested bitflip arrays to load 2023-05-27 10:26:30 +02:00
iceman1001 231307252b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-05-27 10:05:29 +02:00
Iceman 1571f95a2a
Merge pull request #1982 from phaseloop/em4x50-bruteforce 
Bruteforce engine to crack non-random 32 bit keys
 2023-05-27 10:06:09 +02:00
PhaseLoop 0f4b787df1 replace bzero with memset 2023-05-27 07:18:59 +00:00
iceman1001 d1783ce2a4 text 2023-05-27 08:49:18 +02:00
iceman1001 94e4afaa03 fix signature key bug and simplify logic 2023-05-26 05:36:07 +02:00
iceman1001 01333c7a27 simplify logic 2023-05-26 05:22:04 +02:00
iceman1001 c35749dd13 adapting to the new return value from hardnested 2023-05-26 05:20:29 +02:00
iceman1001 71ae06cf8b style 2023-05-26 05:12:01 +02:00
iceman1001 15c751231f adapting default keys array 2023-05-26 05:11:17 +02:00
iceman1001 a62811ae69 hf mf hardnested, now indicates if it failed when recovering key 2023-05-26 05:10:37 +02:00
berlin4apk c13632a980 New keys 2023-05-25 20:19:59 +02:00
iceman1001 7b92c00827 hide false positive in CMAKE on MINGW 2023-05-25 07:58:43 +02:00
iceman1001 9ee7bd2936 adjust potential type conversion 2023-05-25 07:15:43 +02:00
Angel 4dc8d5316a Make Style 2023-05-24 21:54:42 -04:00
Angel ef74541b28
Merge branch 'RfidResearchGroup:master' into master 2023-05-24 21:47:02 -04:00
Angel 832afcd0d4 Fix help menu format 2023-05-24 20:45:51 -04:00
iceman1001 1b67921086 renaming and making sure N never is a strange number 2023-05-24 17:19:34 +02:00
iceman1001 37e5540aab fixed a logic error. param N is used as total number of blocks. I is using it as zero based index... 2023-05-24 15:43:44 +02:00
iceman1001 5e3710c232 rearranged for easier testing 2023-05-24 14:02:54 +02:00
iceman1001 2103d695f8 maur keys 2023-05-24 09:13:01 +02:00
iceman1001 e3f4012d78 maybe proxspace gets happier 2023-05-24 08:07:35 +02:00
iceman1001 74bb64f316 formatting 2023-05-24 07:01:33 +02:00
Óscar Alfonso Díaz 6a8bb34eac
Merge branch 'master' into master 
Signed-off-by: Óscar Alfonso Díaz <oscar.alfonso.diaz@gmail.com>
 2023-05-23 13:11:37 +02:00
iceman1001 03e1b23fb0 fixes #1986. spelling 2023-05-23 13:05:29 +02:00
Iceman 3c3de8d0c4
Merge pull request #1992 from wh201906/restore 
Auth both key A and key B with default password in `hf mf restore`
 2023-05-23 12:41:42 +02:00
Iceman 5f424a9afc
Merge pull request #1989 from corysolovewicz/patch-2 
Create update_amiibo_tools_lua.py
 2023-05-23 12:39:09 +02:00
Self Not Found ca6e9e4ba9
Auth both key A and key B in hf mf restore 2023-05-21 10:07:17 +08:00
OscarAkaElvis f9deb75b3d
Add python3 script to convert amiibo nfc Flipper Zero files to eml files to be used with Proxmark3 2023-05-20 00:00:55 +02:00
Cory Solovewicz 3939bcb541
Create update_amiibo_tools_lua.py 
This is a python script to automate what the updating of the amiibo_tools.lua
file which holds a lua table of all known amiibos. Previously updating the 
amiibo_tools.lua was a very manual process and prone to errors. This simplifies the process. 

Signed-off-by: Cory Solovewicz <cory@solovewicz.com>
 2023-05-18 09:35:09 -07:00
Cory Solovewicz eae5da6b22
Update amiibo_tools.lua 
Update Lua Table with new entries. 

Signed-off-by: Cory Solovewicz <cory@solovewicz.com>
 2023-05-18 00:15:55 -07:00
dash cb0a3257be fix reading NDEF from Mifare Classic 2023-05-10 00:33:15 +03:00
iceman1001 fcc922259f fix output when printing 0,1 numbers like in nested, view commands. Bonus, added NDEF key detection to give hint 2023-05-08 20:36:23 +02:00
PhaseLoop 19d7851c73 run "make style" 2023-05-08 17:08:24 +00:00
phaseloop f09a8cfa28 add bruteforce parameters to command line 2023-05-06 14:47:45 +00:00
phaseloop 85f1785ccb initial bruteforce module 2023-05-06 14:47:31 +00:00
iceman1001 149cc025ce style 2023-05-06 14:38:14 +02:00
iceman1001 d91b576034 style 2023-05-06 14:37:47 +02:00
iceman1001 0224816208 refactoring the return value of function 2023-05-06 14:31:19 +02:00
iceman1001 a3fa6c3df5 fixed ACL when recoving keys from SIM 2023-05-06 14:13:44 +02:00
iceman1001 31b01fff5a clearning variable before each call to hardnested 2023-05-06 06:55:10 +02:00
iceman1001 27576be5c2 trying to extract ndef data from dumps by looking at MAD 2023-05-05 22:26:44 +02:00
iceman1001 cb0a447600 bt handover req/select and reverse BT MAC 2023-05-05 22:24:53 +02:00
iceman1001 3b68acd286 comment out duplicate but kept it since documentation 2023-05-05 19:37:35 +02:00
Iceman 5eda7c3252
Merge pull request #1966 from colonelborkmundus/master 
Add new mfc keys
 2023-05-05 19:39:11 +02:00
iceman1001 78f097cb55 the nfc decode now handling MFC dump files, it detects the MAD key and if so removes all sector trailers. this means a lot of zeros in the end might be there. And ndef prints a bunch of empty records. Better than before atleast 2023-05-05 13:20:52 +02:00
iceman1001 ed555be180 fix wrong copying when skipping sector trailers 2023-05-05 13:18:53 +02:00
iceman1001 3e293b4bc8 changed nfc decode to handle external records and if the record happens to be estonian ekaart also ASN1 decode it 2023-05-05 12:33:14 +02:00
iceman1001 52981476e2 fixed ndef parsing of signature version 1 records 2023-05-05 10:47:02 +02:00
Iceman bf897786f2
Merge pull request #1976 from natmchugh/master 
Add paxton id to hitag2 info
 2023-05-04 07:59:47 +02:00
Nat McHugh f1aedc6bce Add paxton id to hitg2 info 2023-05-03 13:17:20 +01:00
Maksym f9ea12b98d
Update aidlist.json 
Replace "rid" with prefix as it is more correct this way
 2023-05-03 00:48:21 +03:00
kormax 2678c8e1a4 Add more AID entries 2023-05-02 22:04:40 +03:00
Mistial Developer 9eca7fce83
Add text explaining that the format is H10301 for binary, and specifying it for non-binary 2023-04-28 00:09:24 -05:00
iceman1001 d480cbd1d0 hf 14b dump now supports the no save parameter 2023-04-26 00:10:15 +02:00
iceman1001 94b0bcc758 changed the key table output. In some cases it didnt print non found keys red 2023-04-26 00:08:01 +02:00
iceman1001 6fe3263576 hf mfu dump now supports the --ns param to not save the memory dump to file 2023-04-26 00:06:55 +02:00
iceman1001 e252668866 style 2023-04-23 11:32:59 +02:00
iceman1001 fe31bd4064 cleaning out memory unsafe functions for loading files. Also made the loading of files to honor the preference dump/trace settings. Experimental support, which will need more love. I have been using it for some months now but there are still other save/load file operations scattered in the PM3 client which will not benefit from this yet. They need to be adapted too 2023-04-23 11:32:32 +02:00
iceman1001 039937e28a added the possibility to load .MCT dump files in the client. MCT format is a textual one like EML but with extra descriptive lines of text before each sector 2023-04-23 11:27:12 +02:00
Philippe Teuwen 3bc472c9bb hf mf cwipe: use same default ACL as for hf mf wipe 2023-04-17 23:22:48 +02:00
iceman1001 1a3a6e5f19 added no save to t55xx dump. and some minor text output style 2023-04-17 20:12:03 +02:00
Angel 207e5bbc53 Final cleanup 2023-04-16 14:29:58 -04:00
iceman1001 03070778a2 mfp chk - allow for breaking out at every attempt 2023-04-16 05:58:34 +02:00
Angel 98438c8dd7 Remove redundant comment. 2023-04-15 23:26:34 -04:00
Angel 5192c5f5d5 Added ability to emulate paradox tag. 2023-04-15 23:20:48 -04:00
Angel 8841991b29 Add check for max fc and cn, changed types to match rest of file 2023-04-15 22:42:03 -04:00
Angel 76e3f38772 Add check to make sure user did not specify Raw and cn/fc 2023-04-15 22:26:09 -04:00
Angel ab460c4a22 Extract bitstream creation to function. 2023-04-15 22:25:20 -04:00
Angel 0a66f809a6 Removed deprecated CRC calculation 2023-04-15 22:23:06 -04:00
Self Not Found ba3d5c32ae
Fix logic 2023-04-16 09:51:07 +08:00
iceman1001 1bb78e02a4 fix MFP check with defines and easier logic 2023-04-15 20:44:52 +02:00
Iceman 1f1c1d1458
Merge pull request #1961 from team-orangeBlue/master 
Add some magic cards notes, fix `hf mfp chk`
 2023-04-15 20:38:13 +02:00
astrid rowland 17aa99b0c7 added new keys from The Horde, badges 76-94 2023-04-13 17:44:55 -05:00
astrid rowland f022a8f96e added new keys from The Horde 2023-04-13 14:44:03 -05:00
PiervitoCreanza 62fb634fdb
Fix wrong variable assignment 2023-04-13 20:29:15 +02:00
Anže Jenšterle a78cc42230
Added Siemens Default key 
Signed-off-by: Anže Jenšterle <anze@anze.dev>
 2023-04-12 13:31:54 +02:00
team-orangeBlue 022c06c596
Fix a bug 
I can't code

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-04-11 19:14:55 +03:00
team-orangeBlue 364c047503
Merge branch 'RfidResearchGroup:master' into master 2023-04-11 17:49:32 +03:00
iceman1001 05a0fa7f3f added some keys from discord 2023-04-10 20:04:31 +02:00
Iceman 1897701918
Merge pull request #1950 from orensbruli/patch-1 
New keys added to mfc default
 2023-04-10 19:57:56 +02:00
Iceman f12f5da44b
Merge pull request #1958 from Alejandro12120/gen4-update 
`hf_mf_ultimatecard.lua` now supports 10 bytes uid + documentation fixes
 2023-04-09 19:19:11 +02:00
Alejandro be7ab51df5
update documentation x2 2023-04-09 19:04:36 +02:00
iceman1001 e68123a15a remove dups 2023-04-09 18:47:12 +02:00
iceman1001 5b93326683 remove dups 2023-04-09 18:36:45 +02:00
Alejandro c9cab37766
Updated hf_ultimatecard.lua 2023-04-09 15:13:12 +02:00
iceman1001 ee7c68dc41 remove duplicates 2023-04-09 12:30:05 +02:00
team-orangeBlue fd9c8f4f7e
Small corrections to MF+ commands 
Add -k argument to rdbl, fix chk command

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-04-09 08:52:52 +03:00
Esteban Martinena Guerrero 7ebc1c85f1
No new line at the end 2023-04-08 18:16:33 +02:00
Esteban Martinena Guerrero e4cf3aa7f9
Fixinf dups 2023-04-08 18:15:11 +02:00
iceman1001 f65d7cbed9 added some more color to the key table output. Should be clear which keys failed now 2023-04-08 11:15:19 +02:00
iceman1001 d9035737af style.. 2023-04-08 11:03:11 +02:00
iceman1001 04f9850b1b added the possibility to abort the dumping of mifare card clientside 2023-04-08 09:52:17 +02:00
iceman1001 7b6ca6d50f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-04-08 09:05:13 +02:00
iceman1001 52f432a967 fix memory alloc in hf mf rdsc, when sector was larger than 32 2023-04-08 09:03:32 +02:00
Esteban Martinena Guerrero 1683fc53ee
Merge branch 'master' into patch-1 
Signed-off-by: Esteban Martinena Guerrero <orensbruli@gmail.com>
 2023-04-07 11:20:30 +02:00
Iceman dc24c4b6ac
Merge pull request #1956 from wh201906/unit 
Fix units
 2023-04-07 10:56:02 +02:00
iceman1001 82fe8dbe36 fix some coverity findings 2023-04-06 19:32:07 +02:00
Self Not Found d33fbf1347
Fix units 2023-04-06 20:54:00 +08:00
AloneLiberty 2b248e03e8
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-04-03 21:45:32 +00:00
Iceman 83cab74f24
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-04-01 21:34:20 +02:00
AloneLiberty 3524306bf4 Implement transfer to other block in hf mf value 2023-04-01 20:49:15 +03:00
AloneLiberty ac5dd0ffa8
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-04-01 16:42:02 +00:00
iceman1001 222ef4e084 addded static encrypted nonce checks to nested 2023-04-01 12:24:32 +02:00
iceman1001 4d28c852ac extracted load keys and mfc tag memory based on @didierA and @alejandro12120 PR. 2023-03-30 22:40:26 +02:00
iceman1001 dab3171ba6 added loadbinarykeys fct which takes fn and loads binary MFC keys into two arrays KeyA, KeyB. 2023-03-30 22:38:03 +02:00
GuruSteve ee79e5acb7 Added default iClass credit key to table; reorganized key order 2023-03-29 15:44:52 -06:00