Commit graph

10636 commits

Author SHA1 Message Date
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
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