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
662ce8403e
lz4 missing in some docs
2023-07-17 04:56:18 +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
Philippe Teuwen
9b2fb950ef
fix docker/homebrew
2023-07-17 03:31:11 +02:00
Philippe Teuwen
aca547aa4f
update docker stuff
2023-07-17 03:10:11 +02:00
kormax
7f5e1c9657
Move custom polling frame generation logic to client
2023-07-16 19:27:38 +03:00
Philippe Teuwen
a54097e19c
fix archlinux and fedora dockers
2023-07-16 17:25:47 +02:00
kormax
a9cba02514
Move custom polling frame generation logic to client
2023-07-16 17:39:32 +03:00
kormax
45ca9ab4d6
Reduce struct memory footprint by reducing array sizes
2023-07-16 16:56:07 +03:00
kormax
c4f1b0768d
Pass polling config via pointer instead of by-value, thus saving RAM
2023-07-16 16:49:31 +03:00
iceman1001
ba8535b26c
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
2023-07-16 15:31:45 +02:00
iceman1001
8fc05ad2a5
style
2023-07-16 15:30:43 +02:00
iceman1001
ad5b58436f
text
2023-07-16 15:22:24 +02:00
Iceman
66f2a85ae1
Merge pull request #2040 from kormax/new-iso14443a-polling
...
Make GetATQA/ISO14443-A polling method more flexible
2023-07-16 14:37:12 +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
8c4404134d
fix test and add changelog
2023-07-15 23:20:48 +02:00
Philippe Teuwen
16812fe32b
add LZ4 to the lin & win CI
2023-07-15 23:15:25 +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
6cc59848d5
fix bug in return code for hf mf writeblock where it would say it succeeded when it didnt
2023-07-15 11:51:08 +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
Iceman
fa0db30143
Merge pull request #2036 from AloneLiberty/patch-1
...
Don't require valid key or proxmark3 for hardnested with --tests
2023-07-12 22:46:26 +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
iceman1001
71023d0c6e
regenerated with the HF update
2023-07-12 16:25:14 +02:00
iceman1001
92f4ec08ab
I tend to get better Mifare functionality. tested 6,7,8 and seven gave me better results
2023-07-12 16:09:28 +02:00
Iceman
6b69c870c2
Merge pull request #2035 from nvx/bugfix/mfc_key_mixup
...
Fix regression caused by edd8e36#2021 ).
2023-07-12 15:50:35 +02:00
nvx
a9c0fd0b1c
Fix regression caused by edd8e36 (PR #2021 ).
...
Mifare Classic KeyA/B were accidentally switched in some contexts.
2023-07-12 23:04:29 +10: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
403385c56c
style
2023-07-12 14:00:19 +02:00
iceman1001
698b41eb27
code style
2023-07-12 13:59:47 +02:00
iceman1001