dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-04-02 01:15:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,612 Commits 3 Branches 19 Tags
c72d4a188ded464283df4fe94de78ee222da0de8
Commit Graph

11022 Commits

Author SHA1 Message Date
iceman1001
c72d4a188d fix string formatter 2023-12-09 11:21:42 +01:00
iceman1001
9075984c7f modified lf fdx demod, different text style and raw now shows all bytes not just crc bytes 2023-12-09 10:18:44 +01:00
iceman1001
8419b9c690 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-12-08 19:34:14 +01:00
iceman1001
bf1160988c style 2023-12-08 19:34:06 +01:00
iceman1001
62c926e0dd style 2023-12-08 19:29:55 +01:00
iceman1001
843fa33d09 modified to print number of samples. Also added a isnoise check, in order to fast get feedback instead of forcing user to look at the plot window 2023-12-08 19:20:39 +01:00
iceman1001
367ff755a2 move lock 2023-12-07 19:57:18 +01:00
iceman1001
3c6734c63b style 2023-12-07 19:56:41 +01:00
iceman1001
97e2d7f026 changed "data num" to accept -r -i parameters where it will reverse or inverse the values.\nrenamed some util functions 2023-12-07 16:44:31 +01:00
iceman1001
7c749267e6 maur 2023-12-07 12:15:35 +01:00
iceman1001
89bcdcddbc style 2023-12-06 22:42:16 +01:00
iceman1001
d230b770b3 text 2023-12-06 22:18:47 +01:00
iceman1001
fdc1c9d864 text 2023-12-06 22:16:53 +01:00
datatags
cc73449c40 Interactive reader attack sim now returns 2023-12-06 10:19:22 -08: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
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
da984783a8 Merge branch 'RfidResearchGroup:master' into PlusPlus 2023-12-03 11:28:48 +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
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
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
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
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
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
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
wh201906
10ab013f5b Use defined return value 2023-11-25 11:09:16 +08:00
Iceman
56b5bde713 Merge pull request #2186 from wh201906/fix_emv_reader 
Fix `ExchangeAPDUSC()` in `cmdsmartcard.c`
 2023-11-25 03:34:15 +01:00
wh201906
493383c995 Fix ExchangeAPDUSC() in cmdsmartcard.c 
It doesn't return 1 if the retry fails, which is different from the
behavior of the first try.
 2023-11-24 22:20:26 +08:00
wh201906
ee64e71f69 Fix client build with Python 3.12 
Caused by upstream bug
https://github.com/python/cpython/issues/106560
The fix is like this
bbdf6d4653
 2023-11-24 13:12:07 +08:00
wh201906
e82fb8b67f Use calloc() instead of malloc() 
Suggested by @iceman1001
Mainly for 8b6a274e28
Replaced the malloc() in getSamplesFromBufEx()
Added memory allocation result check for getSamplesFromBufEx(),
lf_read_internal(), and lf_sniff()
 2023-11-17 12:38:20 +08:00
Iceman
7fb5a5a743 Merge pull request #2179 from JohnELester/patch-1 
Update mfc_default_keys.dic
 2023-11-17 04:31:18 +01:00
wh201906
0b9f11a249 Add a slider in the plot window for navigation 2023-11-17 10:59:14 +08:00
Pathfinder
cee46928ca Update mfc_default_keys.dic 
Signed-off-by: Pathfinder <john.e.lester@gmail.com>
 2023-11-16 09:37:38 -05:00
wh201906
3ee13c9ba6 Apply suggestions from @henrygab 
Check if memory allocation fails
Fix memory leak
Initialize struct in declaration
Add/Fix some notes
Remove unlikely() in favor of readability
Remove a hard-coded magic number
 2023-11-15 18:04:52 +08:00
wh201906
835b7a9150 Add support for trigger threshold 2023-11-14 13:12:35 +08:00
wh201906
ab9f49f86e Some minor fixes 
Use longer timeout in WaitForRawDataTimeout() to handle CMD_WTX
Fix a wrong type
Apply changes to other similar part
Remove unused instructions
 2023-11-14 10:46:45 +08:00
wh201906
8b6a274e28 Bigger graph buffer 
1280000 samples -> 10.24s for 125kHz 8bit sampling

Allocate graph related memory on heap
 2023-11-14 10:05:13 +08:00