Commit graph

17598 commits

Author SHA1 Message Date
iceman1001 d230b770b3 text 2023-12-06 22:18:47 +01:00
iceman1001 fdc1c9d864 text 2023-12-06 22:16:53 +01:00
Iceman 88e84f57bc
Merge pull request #2198 from datatags/interactive-mfc-sim-return
Fix Mifare Classic sim with interactive and reader attack mode never returning console
2023-12-06 21:42:26 +01:00
datatags e2f144c6dd
Update changelog 2023-12-06 12:19:25 -08:00
datatags cc73449c40
Interactive reader attack sim now returns 2023-12-06 10:19:22 -08:00
Iceman 75ba439f25
Merge pull request #2196 from hazardousvoltage/unisniff
cmdtrace.c: fix segfault in 'trace list' after failed load
2023-12-06 11:45:16 +01:00
Anonymous 6b8a269671 cmdtrace.c: fix segfault when trying to list trace after loading fails, part deux 2023-12-06 02:52:15 -05:00
Anonymous 8345aa5ad5 Merge branch 'unisniff' of https://github.com/hazardousvoltage/proxmark3 into unisniff 2023-12-06 02:37:45 -05:00
Anonymous 7ef5fe14bb cmdtrace.c: fix segfault when trying to list trace after loading fails 2023-12-06 02:36:14 -05:00
iceman1001 75d0601318 fix decrypted output 2023-12-05 12:08:09 +01:00
Iceman 8f4b42e78d
Merge pull request #2195 from hazardousvoltage/unisniff
hf_unisniff: rename 'ASK' to 'USER' to avoid confusion
2023-12-03 16:32:35 +01:00
Anonymous 3d984559a1 CHANGELOG.md: add standalone hf_unisniff 2023-12-03 08:52:47 -05:00
Anonymous cdafe764f1 Merge branch 'unisniff' of https://github.com/hazardousvoltage/proxmark3 into unisniff 2023-12-03 08:46:26 -05:00
Anonymous 9b752c6ecb hf_unisniff: rename "ask" to "user" to avoid confusion with "ASK" sniffing 2023-12-03 08:44:06 -05:00
Iceman 44cd34d2e8
Merge pull request #2194 from team-orangeBlue/PlusPlus
Expand the abilities of `hf mfp`
2023-12-03 10:45:54 +01:00
team-orangeBlue b82857f892
Compilation workaround
May be reverted if fails

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 12:05:15 +03:00
team-orangeBlue 3523c3df62
Added plus code
Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 11:38:09 +03:00
team-orangeBlue da984783a8
Merge branch 'RfidResearchGroup:master' into PlusPlus 2023-12-03 11:28:48 +03:00
team-orangeBlue 8300ab9232
2 new commands
We're done for now

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 11:28:23 +03:00
team-orangeBlue 29773e92ca
Fix typo, correct data
2 new keys (SL3 sector switch; SL1SL3Mix sector switch).
"instead of than" - removed the than.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 11:24:38 +03:00
team-orangeBlue 192ccf7c36
New mifare plus data
2 new commands
Some argument names updated

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 11:22:47 +03:00
team-orangeBlue 046237500b
Proper block data for Mifare Plus
All blocks are NOT data blocks
Some are now config/management keys/sector keys/...

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-03 10:28:32 +03:00
Iceman 56d957a689
Merge pull request #2192 from hazardousvoltage/unisniff
Implement hf_unisniff, 14a/14b/15 sniffer with runtime selection and more save options
2023-12-03 07:10:06 +01:00
Iceman ca3a5a0121
Merge pull request #2193 from wh201906/realtime_less_wait
Fix corrupted data caused by CMD_WTX
2023-12-02 17:36:03 +01:00
wh201906 bb529a9077
Fix corrupted data caused by CMD_WTX
No need to wait for 2.5s (1s + FPGA_LOAD_WAIT_TIME) if the real-time
sampling stops.
Make sure the LF bitstream is loaded before real-time sampling so the
response of CMD_WTX won't appear.
2023-12-02 17:04:03 +08:00
Anonymous 322411c44f Implement hf_unisniff, 14a/14b/15 sniffer with runtime selection and more save options 2023-12-01 22:39:46 -05:00
team-orangeBlue ce99e86997
New arguments
Won't compile otherwise

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-01 23:49:19 +03:00
team-orangeBlue 91f574ab19
More arguments
Add support for writing special blocks
Add custom command bytes

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-01 23:48:45 +03:00
team-orangeBlue a523c1e062
New crypto
Add encryption
Add key updating
Add config updating

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-12-01 23:47:45 +03:00
iceman1001 f3a9629895 style 2023-12-01 15:25:09 +01:00
Iceman cdc7955821
Merge pull request #2191 from wh201906/changelog
Add some CHANGELOG items
2023-12-01 15:22:33 +01:00
wh201906 b6fa1eb6e3
Add some CHANGELOG items 2023-12-01 22:18:05 +08:00
Iceman 7895b322a1
Merge pull request #2190 from wh201906/lf_stuff
Use real-time sampling with high sample size
2023-12-01 14:19:36 +01:00
wh201906 f8605311f7
Use real-time sampling with high sample size 2023-12-01 19:58:00 +08:00
iceman1001 a913b2c662 style 2023-12-01 10:59:18 +01:00
iceman1001 bcbe76064d Changed modulation max bit length from 512 to 4096, since we now can get much longer traces 2023-12-01 10:58:33 +01:00
Iceman 17a93a3b1b
Merge pull request #2173 from wh201906/lf_sniff_clean
Real-time LF sampling
2023-12-01 10:54:10 +01:00
Iceman aa313cad51
Merge pull request #2189 from evildaemond/patch-2
Create hf_mf_uid_downgrade.lua
2023-11-30 14:45:07 +01:00
Adam Jon Foster 8dea0d3203
Create hf_mf_uid_downgrade.lua
Adding hf_mf_uid_downgrade, which allows you to add a fc and cn to a UID of a Mifare Classic. 

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2023-11-30 21:40:14 +08:00
wh201906 45df618b7c
Fix segmentation fault 2023-11-30 18:42:30 +08:00
iceman1001 e026c712c1 hf 14a info now tries to read QL88 sigantures and verify them 2023-11-28 11:08:17 +01:00
iceman1001 fbdb268445 QL88 signature Public Key was identified as Manufacture Mifare Classic before. Now added tests and checks.\nnext step is to use the S17/B key to read the signature 2023-11-28 11:00:48 +01:00
Iceman d8da2902fb
Merge pull request #2178 from hamptonmoore/avigilon-56
Implement Avigilon 56bit format
2023-11-27 14:55:33 +01:00
Iceman 7d9326c60d
Merge pull request #2176 from phreakmonkey/mfkey-pthreads
Fix pthreads on older gcc
2023-11-27 14:54:46 +01:00
Iceman f73d4a07e0
Merge pull request #2188 from nvx/iclass_aa2_dump_fix
Fix iClass dump truncating the AA2 area and improve dump reliability by fixing cmd retry delays.
2023-11-27 14:54:02 +01:00
nvx 33ec6f43fc Update changelog 2023-11-26 19:17:57 +10:00
nvx 7b0ca43695 Fix iClass dump truncating the AA2 area and improve dump reliability by fixing cmd retry delays. 2023-11-26 19:04:54 +10:00
Hampton Moore 345303de37 Implement Avigilon 56 format 2023-11-25 21:48:33 -05:00
Iceman 9a705f15f6
Merge pull request #2187 from wh201906/return
Use defined return value
2023-11-25 04:20:31 +01:00
wh201906 10ab013f5b
Use defined return value 2023-11-25 11:09:16 +08:00