iceman1001
7cec258349
minor adjustments to texts
2023-10-09 20:09:22 +02:00
iceman1001
6229021f07
use the ISO7816 defines we already have
2023-10-09 15:24:57 +02:00
iceman1001
7b3e84c0d6
better fix for the PAGEMAP issue
2023-10-09 15:14:53 +02:00
iceman1001
d41f0c394e
hf iclass wrbl - the pagemap bit maps isnt the best to handle all four cases. This atleast fixes one issue with them
2023-10-09 15:04:49 +02:00
iceman1001
3d9d8253a6
maur
2023-10-07 12:20:51 +02:00
Adam Jon Foster
3243414c20
Update mfc_default_keys.dic
...
Added Keys found on old cards plus notes on another key sighting
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2023-10-05 17:37:29 +08:00
nvx
c1c512f325
Changed hf iclass view/decrypt
to detect SIO lengths better and show if legacy credentials are encrypted
2023-10-04 18:40:58 +10:00
iceman1001
4f96d3eb46
style
2023-10-03 17:10:39 +02:00
iceman1001
dee03b414c
fix some coverity
2023-10-02 21:47:35 +02:00
iceman1001
010668ebb1
clean up
2023-10-02 21:39:15 +02:00
iceman1001
e94a653038
missing return
2023-10-02 21:04:21 +02:00
iceman1001
115e85e5d4
missing defines
2023-10-02 21:01:08 +02:00
iceman1001
89db5d3875
text
2023-10-02 20:59:01 +02:00
iceman1001
fb23d2047f
reworked the JSON format for 14a, 14b, 15, cryptorf, lto, NDEF.\nDeprecated EML format. Pm3 client do not save EML files any more.nPm3 client will continue to load EML files.
2023-10-02 20:11:23 +02:00
iceman1001
bb5d61dca7
added some helper functions
2023-10-01 13:05:08 +02:00
iceman1001
7320f0dd16
thanks @gentilkiwi for pointing it out
2023-09-29 21:41:27 +02:00
iceman1001
278a179308
fixed sim fw
2023-09-29 20:50:39 +02:00
iceman1001
59d67b3606
fix newline in output
2023-09-28 08:54:32 +02:00
iceman1001
1234b08132
adapt to new sim module firmware version
2023-09-28 08:46:04 +02:00
iceman1001
f9f42337c3
Sim Module FW4.42 build from GentilKiwis C impl.
2023-09-28 08:35:48 +02:00
iceman1001
44fe3ec38f
smart raw --timeout parameter
2023-09-27 22:09:01 +02:00
iceman1001
b0ec0ee60b
maur
2023-09-19 16:36:39 +02:00
iceman1001
b6e1344e1c
added a custom timeout parameter to the smart raw command
2023-09-16 18:38:53 +02:00
iceman1001
3ff659fd98
fix newline issue
2023-09-16 09:31:42 +02:00
iceman1001
ec0d27685c
adapt script to handle SE SAM again
2023-09-16 09:22:45 +02:00
iceman1001
d7f306084a
colors for kiwi
2023-09-15 21:48:57 +02:00
iceman1001
ce76e4e351
update ATR list
2023-09-15 21:44:02 +02:00
iceman1001
25ab507137
length var is set in the preamble check...
2023-09-14 05:15:38 +02:00
iceman1001
ddfbd7f549
allow for t55xx detection to search for 0xE039 (Silicon Craft technology)
2023-09-13 21:12:09 +02:00
Grayson Martin
7f91da8a9a
Merge branch 'master' into smartcard-relay
2023-09-12 22:30:59 -05:00
spandox2
5baba1fd43
Update cmdhfmf.c
...
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 13:48:09 -04:00
spandox2
7a832e175e
Update cmdhfmf.c
...
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 13:43:41 -04:00
spandox2
b9efd8ce48
Update cmdhfmf.c
...
text change
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 13:24:54 -04:00
spandox2
67bfddde57
Update cmdhfmf.c
...
Changed ERR to HINT
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 13:18:56 -04:00
spandox2
5584410bbc
Update cmdhfmf.c
...
Problem: "hf mf autopwn" gave no response if no card was detected, leaving user confused.
Solution: Change a DEBUG message to an ERR and give a hint that the card may be poorly positioned.
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 11:56:45 -04:00
spandox2
cf92d8edc0
Update cmdhfmf.c
...
Changed line 2510 to change DEBUG to ERR
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
2023-09-11 11:43:04 -04:00
iceman1001
4632e15dab
maur...
2023-09-10 19:51:21 +02:00
Iceman
b9bb72ce8e
Merge pull request #2107 from Antiklesys/master
...
Update hf_mf_ultimatecard.lua
2023-09-10 17:14:52 +02:00
Antiklesys
77258365d4
Update hf_mf_ultimatecard.lua
...
Fixed bug, should be 13 instead of 12 as there are two 12 otherwise and this is referring to the 128b one instead
2023-09-10 23:03:53 +08:00
Iceman
9a5c262ccf
Merge pull request #2106 from nvx/feature/iclass_epurse_credit
...
Add `hf iclass creditepurse` command to allow crediting the epurse debit value
2023-09-10 15:20:11 +02:00
nvx
186308cb4a
Add hf iclass creditepurse
command to allow crediting the epurse debit value.
2023-09-10 23:00:23 +10:00
Antiklesys
2fb281bdc1
Update iclass_default_keys.dic
2023-09-10 19:11:21 +08:00
Antiklesys
b57f90b524
Update hf_mf_uidbruteforce.lua
...
Fixed issue with how the command is run, old version is invalid as it is missing the -t
2023-09-10 19:09:18 +08:00
Antiklesys
f29c409275
Merge branch 'master' of https://github.com/Antiklesys/proxmark3
2023-09-10 19:07:38 +08:00
iceman1001
b59fad842b
reworked the decimal to hexadecimal converter. It now works. Thanks to @ATK for pointing out it was broken
2023-09-10 10:25:51 +02:00
iceman1001
f9877f79de
Revert "Release v4.17140 - Raccoon"
...
This reverts commit 6ca0ce704a
.
2023-09-09 11:00:00 +02:00
iceman1001
6ca0ce704a
Release v4.17140 - Raccoon
2023-09-09 11:00:00 +02:00
Philippe Teuwen
cf16e71244
Fix cmake, stringop-overflow false positives are not specific to MINGW
2023-09-07 23:44:31 +02:00
Philippe Teuwen
3aeb5c493f
fix a few cppcheck warnings
2023-09-07 22:28:37 +02:00
Philippe Teuwen
d97f417ee6
Fix clang warnings on increasing alignment requirements
2023-09-07 21:00:07 +02:00
Philippe Teuwen
d74e264250
style
2023-09-07 20:13:18 +02:00
iceman1001
9ddbdad8cb
added keys from #2019 unknown if they are static
2023-09-06 10:59:21 +02:00
Iceman
3141c6a249
Merge pull request #2102 from ernestask/wip/ernestask/vilniečio-kertelė
...
dictionaries: Add keys for Vilnius public transit card
2023-09-06 10:53:18 +02:00
Ernestas Kulik
cc846216d2
dictionaries: Add keys for Vilnius public transit card
2023-09-06 09:41:34 +03:00
Harry Sintonen
e5941bcf3a
fix crc render position when data len is multiple of 16
2023-09-05 16:38:33 +03:00
iceman1001
32f892e512
fix 14b dump
2023-08-29 22:37:56 +02:00
iceman1001
0cbc0c2f8b
fix CID #416734
2023-08-29 21:45:15 +02:00
iceman1001
4e411bec22
fixing false positives
2023-08-29 10:57:05 +02:00
iceman1001
0810f07a41
improving false positive for 14b SR tags
2023-08-28 18:00:32 +02:00
iceman1001
71961501d4
text
2023-08-28 15:36:01 +02:00
Iceman
eaef707fb0
Merge pull request #2094 from kormax/master
...
Remove duplicate MFP definitions. Update AIDlist
2023-08-24 20:49:30 +02:00
kormax
15ee28c7be
Add SEOS AIDs
2023-08-24 21:39:59 +03:00
Iceman
aa0bd3ea17
Merge pull request #2093 from d18c7db/master
...
Merged hi_reader and hi_reader_15 into one file, some minor tidy up in files
2023-08-24 20:38:09 +02:00
Alex
f47e4ed115
Move hardcoded value where it belongs
...
Keep FPGA parameters together in the same place
2023-08-24 18:22:50 +02:00
Anže Jenšterle
62da4017a0
Add Slovenian Mercator Pika keys
...
Signed-off-by: Anže Jenšterle <anze@anze.dev>
2023-08-24 15:26:48 +02:00
iceman1001
279d6486c1
stylish
2023-08-24 10:22:18 +02:00
iceman1001
9659bc85fe
maur keys
2023-08-24 10:20:28 +02:00
iceman1001
424e68dff6
fixing the wrong calculations
2023-08-24 10:20:01 +02:00
nvx
8dd963d305
make style
2023-08-24 16:34:33 +10:00
nvx
42330fc5ed
Misc tidyups replacing magic numbers with defines,
...
better help text, and some added comments
2023-08-24 15:08:11 +10:00
nvx
a2a3142355
Improve iClass SIO and legacy credential detection to improve
...
reliability. Now relies on the legacy config block for SR detection
and the end-of-SIO detection no longer partially cuts off the SIO
for any dumps I have.
2023-08-23 09:27:05 +10:00
Iceman
4547a1beba
Merge pull request #2086 from nvx/feature/cmd_iclass_esetblk
...
Adds `hf iclass esetblk`, equivalent to `hf mf esetblk`
2023-08-22 19:22:35 +02:00
nvx
bc87615008
Fix help text for hf iclass esetblk
2023-08-23 02:45:05 +10:00
Iceman
4b9b545bbf
Merge pull request #2082 from rdmitr/configure-num-cores
...
Configurable number of CPU cores.
2023-08-22 07:35:18 +02:00
nvx
210d2847ae
Adds hf iclass esetblk
, equivalent to hf mf esetblk
...
Also some minor tweaks to make commands.json and commands.md
properly on Windows.
2023-08-22 07:45:05 +10:00
Roman D
908b8ca0b3
Limit configurable CPU count to the number of detected CPU cores.
2023-08-21 22:24:13 +02:00
Iceman
e602287839
Merge pull request #2081 from rdmitr/fix-macports-makefile
...
Fix macports Makefile configuration.
2023-08-21 07:06:47 +02:00
Adam Jon Foster
44888f6015
Update mfc_default_keys.dic
...
Added 4 keys extracted from old dumps on Edith Cowan University Smart rider cards
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2023-08-18 12:55:56 +08:00
Roman D
20f8901368
Fix macports Makefile configuration.
2023-08-17 12:43:08 +02:00
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