Iceman
c5dff6a55f
Merge pull request #2059 from ZeroChaos-/master
...
fix lto-type-mismatch in guidummy.cpp
2023-08-02 15:54:38 +02:00
Iceman
37882ed680
Merge pull request #2057 from kormax/master
...
Add new DESFire command code and annotation
2023-08-02 15:53:44 +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
kormax
d9d03aaf1f
Add new DESFire command code
...
Update file formatting
2023-07-31 12:48:40 +03:00
iceman1001
9e8adce7a9
updated ATR list
2023-07-30 21:22:52 +02: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
d9e867fa28
string formatters
2023-07-27 22:56:41 +02:00
iceman1001
944af6be95
fixed the missing erasing of flash memory bank.
2023-07-27 22:55:58 +02:00
iceman1001
4e6962864a
fix loading mifare keys to flash memory, forgot to wipe the new area which we extended to
2023-07-27 22:53:01 +02:00
iceman1001
58f9ba0abf
ugly hack to load the signature data if we are on a MFC Ev1 card. First we dont want to trigger the partial read unnecessary and secondly we dont save signature data in our MFC dump file. Need to adapt the JSON format for this
2023-07-27 22:23:33 +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
64ea48e7d0
remove fct in header file.\nreverted this decline
2023-07-27 18:57:11 +02:00
iceman1001
8ef1cdbd75
inceased waiting time..
2023-07-27 18:56:11 +02:00
iceman1001
6ba002725f
rmeoved some fct devices side regarding eml get/ set
2023-07-27 18:55:41 +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
d9f2d5287e
maybe the return codes are wrong in legic sim now
2023-07-27 16:46:52 +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
42700d3c51
skip sector 16 at all since it seems to always be locked down even if the keys authenticate. MFC Ev1 related and less errrors in autopwn when running against a MFC Ev1 in the dumping phase
2023-07-27 12:40:04 +02:00
iceman1001
dc199b62ca
text
2023-07-27 12:38:40 +02:00
iceman1001
96944aec69
reinstate less checks of data_available
2023-07-27 12:37:42 +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
8793f1c9c5
color
2023-07-26 23:33:05 +02:00
iceman1001
538ac4b191
added a bunch of empty dump files and key files in order to easily simulate a empty tag. Just eload it and sim.
2023-07-26 17:51:35 +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
Iceman
06f32f938f
Merge pull request #2054 from nvx/bugfix/gdmsetblk
...
Fix hf mf gdmsetlbk block data being accidentally prefixed with a 0x00
2023-07-26 11:06:09 +02:00
nvx
c3c08e07e4
Fix hf mf gdmsetlbk block data being accidentally prefixed with a 0x00.
...
This fixes a regression caused by edd8e36#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
