Colin J. Brigato
2fc26fbf35
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back from flash
...
* Simulation was broke by the 4/7/10 UID lenght pseudo-support (which, in regard of the whole, will never be of any use unless complete reimplementaiton). Kept this part as respect, but enforced UID_IN_EMUL, since it will _ALWAYS_ be the case, be it direct simulation after tag breaking or from reading back tag.
* Writing tag was broken when flashmem driver had SPI settings changed, enforcing 48MHz speed as necessity for some work (like in hf_bog), so now it is
* Reading back, however, should absolutely be done at 24Mhz to avoid those unecessary and unstable [On this chip] FAST_READS.
Should worsk flawlessly now.
If one has spare time, handling getting new keys or defining whole Schemes in Flashmem would be perfect. Just has to be a conditional and a 8/16key ordered answer.
2019-07-14 13:29:40 +02:00
Philippe Teuwen
b0dbbd3683
make style
2019-07-13 00:38:30 +02:00
slurdge
996ed197fb
Remove aes.c in favor of mbedtls implementation.
...
Changelog
2019-07-12 23:48:54 +02:00
Victor
cb45313981
Add hitag2 write password auth
2019-07-09 23:00:57 +01:00
Philippe Teuwen
aab0558a58
minor txt alignments
2019-07-09 22:49:57 +02:00
slurdge
71b70f4ffb
Add compiler info for proxmark3 armsrc
2019-07-09 22:35:23 +02:00
Victor
6646c20ef3
Fix clock deadlock in hitag sniff
2019-07-04 11:28:43 +01:00
iceman1001
17f97abfcb
fix: spurious chars because strlen doesnt count ending zero
2019-06-30 04:18:03 -04:00
Iceman
ca9ed6f691
Update readme.md
2019-06-17 09:38:50 +02:00
iceman1001
283cc8d12a
convert NG
2019-06-13 12:28:30 -04:00
iceman1001
a48f2e232f
convert NG
2019-06-13 12:23:25 -04:00
Philippe Teuwen
1ebfa897c8
remove some cppcheck warnings
2019-06-12 06:41:23 -07:00
iceman1001
8eb90d0cb9
more delays
2019-06-09 09:32:34 -04:00
iceman1001
32f5ba8520
fix: drifting
2019-06-09 08:15:31 -04:00
Philippe Teuwen
a55e597e36
make style
2019-06-07 21:40:33 +02:00
Philippe Teuwen
5eeb356418
appmain switch unified style, avoid few shadowed vars as well
2019-06-07 21:39:45 +02:00
Philippe Teuwen
f7dfd2a1f2
Fix arg names mismatches between decl & def
2019-06-07 21:26:03 +02:00
Philippe Teuwen
732bc766f9
Reduce some var scopes
2019-06-07 18:41:39 +02:00
Philippe Teuwen
1a39ec3026
hf mf/mfu dbg => hw dbg
2019-06-06 11:31:47 +02:00
Philippe Teuwen
4761ea13f7
MF_DBGLEVEL => DBGLEVEL (pm3 side)
2019-06-06 10:05:09 +02:00
Philippe Teuwen
3b12ba2e93
replace usb_poll_validate_length() by data_available() that supports USART too
2019-06-03 00:01:08 +02:00
Philippe Teuwen
d7614684f8
Make sure standalone modes can be launched when connected on USB without client
2019-06-02 23:20:02 +02:00
Philippe Teuwen
27493a7b90
makefile: silent fpga_compressor stdout by default
2019-06-02 16:23:57 +02:00
Philippe Teuwen
fe9e1dc733
remap LEDs
2019-06-02 11:47:10 +02:00
Philippe Teuwen
8c0cd4cfa2
Cleaner makefile execution, use 'make Q=' if you want to see full lines
2019-06-02 00:25:25 +02:00
Philippe Teuwen
3bf26f2808
simplify makefile
2019-06-01 22:49:28 +02:00
iceman1001
5a80490d43
fix: skeleton compiles
2019-06-01 09:36:15 -04:00
Philippe Teuwen
355319e36a
Automate make clean when platform definitions are changed
2019-06-01 01:37:02 +02:00
Philippe Teuwen
e98c4e246d
rework standalone makefile
2019-06-01 00:23:38 +02:00
iceman1001
d87daf8b76
fix: 'mem load' - wrong offsets erased for dictionaries (MF/ICLASS)
2019-05-31 17:15:54 +02:00
iceman1001
d5c45a7368
fix: 'mem load' - erased wrong offsets for dictionaries MF/ICLASS.
2019-05-31 17:14:57 +02:00
iceman1001
cee2fc7a34
hf mf rdbl - uses NG
2019-05-28 13:20:56 -04:00
iceman1001
74fb740c21
fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG
2019-05-28 05:15:12 -04:00
iceman1001
53f2058c7a
chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG
2019-05-27 07:46:27 -04:00
iceman1001
58bed70ad0
chg: hf 14a sim - uses NG
2019-05-26 15:00:49 -04:00
iceman1001
b05796c7c4
chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG
2019-05-26 13:42:27 -04:00
iceman1001
0d1438d156
chg: lf psksim - uses NG
2019-05-24 09:11:30 -04:00
iceman1001
e727fe5818
chf: lf asksim - uses NG
2019-05-24 07:06:08 -04:00
iceman1001
ed9a5e6d6f
chg: textual
2019-05-23 18:31:56 -04:00
iceman1001
c13e2f09a1
chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG
2019-05-23 17:07:12 -04:00
Philippe Teuwen
270afb89aa
Trying C99 dyn structs as suggested by @iceman
2019-05-23 20:43:42 +02:00
iceman1001
263d662783
chg: lf fsksim - uses NG
2019-05-23 13:16:06 -04:00
iceman1001
0564931450
fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field
2019-05-23 10:51:19 -04:00
iceman1001
33c10f260d
chg: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff)
2019-05-23 10:29:33 -04:00
iceman1001
f8dbf6138a
fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data
2019-05-23 06:12:20 -04:00
iceman1001
cd9092c58a
fix: VIGIKPWN - use 10/7/4 uid (@McEloff)
2019-05-23 03:44:06 -04:00
iceman1001
bb45aad212
fix: mattyrun - use 10/7/4 uid (@McEloff)
2019-05-23 03:40:01 -04:00
iceman1001
2988249fe7
style
2019-05-23 03:11:35 -04:00
iceman1001
4b89938dcd
fix: standalone mode VIGIKPWN now compiles
2019-05-23 03:11:05 -04:00
iceman1001
e5a9e31b9f
fix: standalone mode VIGIKPWN now compiles
2019-05-23 03:11:01 -04:00
iceman1001
81053d8c42
fix: standalone mode mattyrun now compiles
2019-05-23 03:03:24 -04:00
Philippe Teuwen
62b0732a8c
Merge pull request #201 from McEloff/hf_14a_sim_comp_write
...
fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command,
2019-05-23 00:42:12 +02:00
Philippe Teuwen
e7a464f5e7
hf_colin: fix colors compilation
2019-05-23 00:40:23 +02:00
Philippe Teuwen
522297896c
Use GetTickCountDelta everywhere
2019-05-23 00:39:50 +02:00
Eloff
0ec9323df0
PACK-response to EV1 PASSWORD request no more used as precompiled sequense
2019-05-23 01:30:23 +03:00
Eloff
49de1a1655
fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command,
...
chg: 'hf 14a sim' incoming commands length checks, reorder block conditions
2019-05-23 00:59:35 +03:00
Philippe Teuwen
e0c9e2b0d1
rework usart RX timings
2019-05-22 23:30:52 +02:00
iceman1001
794d109f30
chg: lf t55 - fixes / read block uses NG
2019-05-22 11:59:39 -04:00
iceman1001
ad394a2d6b
chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data.
2019-05-22 08:32:30 -04:00
iceman1001
9448755240
chg: not fatal
2019-05-22 05:58:48 -04:00
iceman1001
178c922218
chg: lf read - now uses NG
2019-05-20 10:48:51 -04:00
iceman1001
d7f1ab2175
chg: lf cmdread - now uses NG
2019-05-20 09:15:45 -04:00
iceman1001
983e63d82f
hw commands - uses NG
2019-05-20 04:28:34 -04:00
iceman1001
a4f4104075
textual
2019-05-18 17:53:08 +02:00
iceman1001
d4c3d07701
fix: failed compilation without btaddon option (@merlokk)
2019-05-15 16:56:54 +02:00
iceman1001
088d34eb3e
chg: hf mf nack - keep sync if started without card over antenna
2019-05-15 08:20:04 -04:00
iceman1001
bfe2cff383
chg: hf mf nack - now uses NG
2019-05-15 07:47:46 -04:00
iceman1001
50c59fb6b2
chg: cident - uses NG
2019-05-15 07:03:19 -04:00
iceman1001
65ff4f0e92
chg: hf mf setmod - uses NG
2019-05-15 06:52:22 -04:00
iceman1001
41acc98d87
mix
2019-05-15 12:03:00 +02:00
iceman1001
fae572a569
mix
2019-05-15 04:31:52 -04:00
iceman1001
46f6548d1f
to send MIX,..
2019-05-15 10:24:25 +02:00
Philippe Teuwen
8401eb4e14
Add usart btfactory
2019-05-15 02:15:19 +02:00
iceman1001
63cf6be691
guarded
2019-05-14 16:20:34 -04:00
iceman1001
a988c8ffef
chg: hw status - now prints number of dictionary keys loaded. Dont print if zero/default empty 0xffff
2019-05-14 14:57:56 -04:00
Philippe Teuwen
1147c9faf8
Use ARRAYLEN
2019-05-14 12:51:45 +02:00
Philippe Teuwen
42d025d01a
Slight rework of hw tune
2019-05-14 08:29:24 +02:00
Philippe Teuwen
c281f71f59
hf tune: group commands
2019-05-14 08:25:26 +02:00
Philippe Teuwen
7ed7a9de40
Rework hf tune to make it synchronous (needed for rdv4)
2019-05-14 00:37:03 +02:00
iceman1001
26f2fbfdbd
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-05-13 13:37:21 +02:00
iceman1001
801cb95967
fix: 'lf t55xx write' - wrong bitshift
2019-05-13 13:36:54 +02:00
Philippe Teuwen
1e345b1356
remove unused arg from MifareAcquireNonces
2019-05-13 13:31:24 +02:00
iceman1001
d2a4ade2af
chg: lf t55xx write - now uses NG frames.
2019-05-13 13:23:53 +02:00
Philippe Teuwen
09afadc965
Remove unused args in some MF cmds
2019-05-13 12:49:41 +02:00
Philippe Teuwen
1edf4e1ef2
remove unused args in MifareEMemClr
2019-05-13 12:30:27 +02:00
Philippe Teuwen
f85420d6f3
Remove unused oldarg in SniffHitag
2019-05-13 12:27:00 +02:00
Philippe Teuwen
20f7b2f3ec
Remove support for old in MifareChkKeys, not needed anymore
2019-05-13 12:25:11 +02:00
iceman1001
afabd59995
FIX: leftover residue from sending different packages OLD/MIX/NG, is now cleaned before.
2019-05-13 09:39:43 +02:00
Philippe Teuwen
3412e9d8c5
Capabilities versionning, would also detect platform struct pack issues
2019-05-10 19:00:18 +02:00
Philippe Teuwen
107b3873fb
fix 14a sniff timings by moving away debug msg
2019-05-09 15:24:41 +02:00
Philippe Teuwen
84f696451d
units
2019-05-09 01:07:34 +02:00
Philippe Teuwen
2c10482279
all LF sim: client waits till button pressed
2019-05-09 00:08:59 +02:00
Philippe Teuwen
68e5b3c355
style
2019-05-08 01:35:51 +02:00
Philippe Teuwen
6401452eb6
remove hw_available_fpc_usart_btaddon
2019-05-08 00:06:12 +02:00
Philippe Teuwen
02ea378e38
Wow, two improbable bugs were cancelling each other
2019-05-08 00:02:08 +02:00
Philippe Teuwen
2f1061f95b
rework ping
2019-05-07 23:35:09 +02:00
iceman1001
f60977695a
cleaning up
2019-05-07 14:41:20 +02:00
iceman1001
86aa593b1b
chg: use dynamic arrays.
2019-05-07 09:37:43 +02:00
Philippe Teuwen
c6b8c0c472
manual Makefile style (as some tabs need to be preserved)
2019-05-06 20:45:59 +02:00
Philippe Teuwen
43833cc9ac
faster connection speed test and rename USB->Conn
2019-05-05 00:02:33 +02:00
Philippe Teuwen
6b5a0f8319
Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF
2019-05-04 23:56:59 +02:00
Philippe Teuwen
2497ec2eec
More USB_CMD -> PM3_CMD
2019-05-04 11:36:35 +02:00
Philippe Teuwen
3176684f4a
Add usart dev cmds & dynamic flash support capability
2019-05-03 22:30:17 +02:00
Gtpy
584a346587
Missing Rename USB -> PM3
...
Missing Rename USB -> PM3 to avoid misleading interpretations 27f7057
2019-05-03 16:57:56 +02:00
Philippe Teuwen
b723126deb
Make smartcard support detection dynamic
2019-05-03 09:04:28 +02:00
Philippe Teuwen
f33d0bf206
hw tune: block client till button pressed
2019-05-03 08:40:21 +02:00
Philippe Teuwen
f217b47cbd
style
2019-05-02 00:18:20 +02:00
Philippe Teuwen
d1c6f12aff
protect CMD_UPLOAD_SIM_SAMPLES_125K by WITH_LF
2019-05-02 00:06:10 +02:00
Philippe Teuwen
bc6d9f4074
pm3 report compiled capabilities
2019-05-01 17:19:37 +02:00
Philippe Teuwen
9d261adfb1
Reduce BUSY_TIMEOUT and handles FPC/FLASH FW more gracefully on non-RDV4 pm3
2019-05-01 16:48:04 +02:00
Philippe Teuwen
13b2e6eed7
Fix hf mf chk
2019-05-01 12:19:51 +02:00
Philippe Teuwen
63cd4a9fbb
Merge branch 'better_color_handling'
...
* better_color_handling:
Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
Use PrintAndLogEx in flasher
Simplify color & banner logic
Smart color handling:
2019-04-30 21:37:19 +02:00
Philippe Teuwen
27f7057961
Rename few USB -> PM3 to avoid misleading interpretations
2019-04-30 21:10:11 +02:00
Philippe Teuwen
0a4b90ac20
Simplify color & banner logic
2019-04-30 13:02:27 +02:00
Philippe Teuwen
a91d0a7b19
Smart color handling:
...
* if on Windows, no color, as usual
* if on Linux, color only on real term
* no color when > foo
* no color in the logfile
2019-04-30 00:41:52 +02:00
Iceman
bdf7746105
Merge pull request #175 from McEloff/hf14a
...
'hf 14a sim' more flexible init responses method
2019-04-29 22:52:05 +02:00
Philippe Teuwen
56f92348ea
style
2019-04-29 22:41:28 +02:00
iceman1001
03d6454d95
chg: 'script run mfkeys' : uses NG
...
chg: 'hf mf chk' : uses old/mix
2019-04-29 12:12:14 +02:00
iceman1001
7454a4dcf2
chg: 'hf mf chkkeys' - now uses NG
2019-04-29 02:07:40 +02:00
Philippe Teuwen
f0c0b854ac
Fix mifare_ultra_readblockEx, copy full 16b of mful block (was 14)
2019-04-29 01:08:59 +02:00
iceman1001
a5ba5a99e8
forgot FLAGS...
2019-04-28 18:48:59 +02:00
iceman1001
ab6870c573
style
2019-04-28 11:08:41 +02:00
iceman1001
d47efa8547
fix uninitialized
2019-04-27 12:01:22 +02:00
iceman1001
5f831ee776
chg: 'hw detectreader' - clean up
2019-04-27 11:09:20 +02:00
Philippe Teuwen
e2e0b704c5
Several changes in the initial connection, see details:
...
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
2019-04-27 02:46:20 +02:00
Philippe Teuwen
e9bfc3eb7a
Merge branch 'master' into experimental_varlen
...
* master:
rename usb_present
TestProxmark only if OpenProxmark returned pm3 present
Trying original SPI mode for 24MHz flash mem
text
2019-04-26 23:30:30 +02:00
Philippe Teuwen
a1bb2ec106
Trying original SPI mode for 24MHz flash mem
2019-04-26 22:17:26 +02:00
iceman1001
87eee0cf5c
text
2019-04-26 13:07:45 +02:00
Eloff
b2d0bea05f
'hf 14a sim' more flexible init responses method
2019-04-26 13:22:57 +03:00
Philippe Teuwen
1c136c8fc6
Merge branch 'master' into experimental_varlen
...
* master:
rework Dbprintf & add color support
use color macros
doc magic
archive and fix hid-flasher
update standalone readme
2019-04-26 10:48:28 +02:00
Philippe Teuwen
cb452c98ba
rework Dbprintf & add color support
2019-04-26 10:36:06 +02:00
Philippe Teuwen
9e39d6ffc3
new light scheme for detectreader
2019-04-26 01:37:17 +02:00
Philippe Teuwen
9a6ad6597f
update standalone readme
2019-04-25 23:40:51 +02:00
Philippe Teuwen
c22da12502
Merge branch 'master' into experimental_varlen
...
* master:
Update readme.md
Update readme.md
Update readme.md
remove redundant def
2019-04-25 23:33:52 +02:00
Iceman
839a0ef9fb
Update readme.md
2019-04-25 23:23:44 +02:00
Iceman
1e797e1720
Update readme.md
2019-04-25 23:20:54 +02:00
Iceman
f90b04d4cf
Update readme.md
2019-04-25 23:20:33 +02:00
Philippe Teuwen
540fecb760
Merge branch 'master' into experimental_varlen
...
* master:
adjust standalone doc
Use placeholder for standalone mode if needed
Move compile options to Makefile.hal
textual
chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 23:01:49 +02:00
Philippe Teuwen
423e6bfb32
adjust standalone doc
2019-04-25 22:43:08 +02:00
Philippe Teuwen
c616f47d6b
Use placeholder for standalone mode if needed
2019-04-25 22:40:46 +02:00
Philippe Teuwen
5d6f2c641b
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
textual
chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 22:25:10 +02:00
Philippe Teuwen
f3b3508d3e
Move compile options to Makefile.hal
2019-04-25 22:15:16 +02:00
iceman1001
505506c5dd
textual
2019-04-25 21:50:55 +02:00
iceman1001
7220653ccd
chg: refactor standalone mode info string
...
add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 21:44:34 +02:00
Philippe Teuwen
e7e07d9096
Merge branch 'master' into experimental_varlen
...
* master:
fix: spellingmistake
REM: removed unused define
2019-04-25 21:26:51 +02:00
iceman1001
a59f7a50ce
fix: spellingmistake
2019-04-25 21:21:53 +02:00
iceman1001
d913cacdca
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 21:16:39 +02:00
iceman1001
176645b9fc
REM: removed unused define
2019-04-25 21:16:11 +02:00
Philippe Teuwen
0fc79824dd
Merge branch 'master' into experimental_varlen
...
* master:
remove redundant def
chg: forgot to readd hitag support :)
Guard Hitag code
2019-04-25 20:59:27 +02:00
Philippe Teuwen
27e94f5669
remove redundant def
2019-04-25 20:59:11 +02:00
iceman1001
a6278ff8cd
chg: forgot to readd hitag support :)
2019-04-25 20:51:20 +02:00
Philippe Teuwen
eababdd3ef
Merge branch 'master' into experimental_varlen
...
* master:
chg: 'hf mf sim' - textual
fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine.
fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code, return 1. Will only impact the speed of hardnested execution.
fix again OSX
fix https://github.com/RfidResearchGroup/proxmark3/issues/173
used predefined constants, common types moved to common header files
backward compatibility, on load converter for old mfu dump format
loops for counters output
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 20:05:04 +02:00
iceman1001
df96b58fcc
style
2019-04-25 17:06:40 +02:00
Iceman
f227041932
Merge pull request #172 from McEloff/hfmfu
...
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 16:10:03 +02:00
Philippe Teuwen
4b5800d78f
remove name
2019-04-24 15:57:24 +02:00
Philippe Teuwen
79d7fb65b5
Merge branch 'master' into experimental_varlen
...
* master:
Fix segfault when loading a file
Revert c7a4d7af
, remove redundant include
2019-04-24 00:59:57 +02:00
Eloff
66ee8dc09e
used predefined constants, common types moved to common header files
2019-04-23 21:14:20 +03:00
Eloff
a8c1fa7a3b
backward compatibility, on load converter for old mfu dump format
2019-04-23 17:07:20 +03:00
Philippe Teuwen
b0eef756c1
return PM3_SUCCESS on usart_writebuffer_sync, usb_write
2019-04-22 23:03:01 +02:00
Eloff
8793a9e596
Merge commit 'e171010d' into hfmfu
...
# Conflicts:
# CHANGELOG.md
2019-04-22 23:26:20 +03:00
Philippe Teuwen
127f5ed192
Revert c7a4d7af
, remove redundant include
2019-04-22 22:11:57 +02:00
Philippe Teuwen
9602e641e2
Merge branch 'master' into experimental_varlen
...
* master:
translation
document offsets
textual
textual
typo
'hf mf sim' full-byte anti-collision frame support
2019-04-22 21:39:38 +02:00
Iceman
e171010d32
Merge pull request #170 from McEloff/temp
...
'hf mf sim' full-byte anti-collision frame support
2019-04-22 19:14:34 +02:00
Philippe Teuwen
f29facd15a
Harmonize usb_write & usart_writebuffer_sync return values
2019-04-22 02:28:58 +02:00
Philippe Teuwen
a9bb465271
reply_xx return val is int16_t, not bool
2019-04-22 02:10:31 +02:00
Philippe Teuwen
eebea8c088
DbpStringEx using reply_ng
2019-04-22 01:33:32 +02:00
Philippe Teuwen
cdd4177968
usart_writebuffer_sync simplified as we're always sending in blocking mode anyway
2019-04-22 00:30:01 +02:00
Philippe Teuwen
81780e5c98
DbpStringEx using now reply_mix. hw status at 9600: from 26.5s to 7s
2019-04-21 23:58:53 +02:00
Philippe Teuwen
a2e55be468
new format doc
2019-04-21 17:34:56 +02:00
Eloff
db3103b531
UL/NTAG new dump file format. Added counters support, simulation
2019-04-21 03:18:00 +03:00
Philippe Teuwen
6e744043f5
usart working... when debugged...
2019-04-21 00:44:19 +02:00
Philippe Teuwen
7ca1e98776
Protect SetAdcMuxFor with FPC
2019-04-20 11:17:14 +02:00
Philippe Teuwen
e4006a7563
doc errors
2019-04-20 10:34:54 +02:00
Philippe Teuwen
a7773b3395
Introduce reply_mix, to still get some varlen on old API
2019-04-20 03:17:19 +02:00
Philippe Teuwen
a45238236d
armsrc: put new frame parsing in common for usart (still usart_read_ng to do)
2019-04-20 01:47:50 +02:00
Philippe Teuwen
7331b7d6d2
Merge branch 'master' into experimental_varlen
...
* master:
Add ref to new mifaresim.h in standalone modes
fix: Standalone/hf_colin now compiles
Update readme.md
chg: hitag compile flag optional
fix: standalonemode matty_run now compiles
typo
smallfix
chg: fpga lf simulation
chg: 'fpga lf sim' - 25% both on sides.
2019-04-19 23:17:36 +02:00
Philippe Teuwen
c7a4d7af3a
Add ref to new mifaresim.h in standalone modes
2019-04-19 23:15:02 +02:00
Philippe Teuwen
c4766b2649
Semi-Automated SendCommand -> SendCommandOLD
2019-04-19 23:01:13 +02:00
iceman1001
a82fd7da34
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-19 10:00:09 +02:00
iceman1001
b495f4bc44
fix: Standalone/hf_colin now compiles
2019-04-19 09:59:34 +02:00
Iceman
05674dc559
Update readme.md
2019-04-19 09:29:50 +02:00
iceman1001
b29b07c8ad
chg: hitag compile flag optional
2019-04-19 09:23:24 +02:00
iceman1001
9c776c8935
fix: standalonemode matty_run now compiles
2019-04-19 09:23:02 +02:00
Philippe Teuwen
9b4896225c
SendCommandOLD for hf_young
2019-04-19 01:14:33 +02:00
Philippe Teuwen
8c89b35f1e
style
2019-04-18 21:41:48 +02:00
Philippe Teuwen
9ff841efb2
CRC optional, replaced by magic on USB
2019-04-18 21:39:35 +02:00
Eloff
960b21793c
'hf mf sim' full-byte anti-collision frame support
2019-04-18 21:02:48 +03:00
Philippe Teuwen
482db05741
Rename few stuff for consistency
2019-04-18 12:49:51 +02:00
Philippe Teuwen
15558070ad
Fix receive_ng returned val test
2019-04-18 10:41:11 +02:00
Philippe Teuwen
cb411ffab4
receive_ng in common/
2019-04-18 00:50:31 +02:00
Philippe Teuwen
4e31c6110b
Better Command structs
2019-04-18 00:12:52 +02:00
Philippe Teuwen
533667ea6d
Better Reply structs
2019-04-17 23:44:48 +02:00
Philippe Teuwen
64eb93c9c4
style
2019-04-17 22:08:10 +02:00
Philippe Teuwen
7cbcf8163c
Merge branch 'master' into experimental_varlen
...
* master: (27 commits)
textual
style redundant assignment
timeout fix
small fix
add termcap
add readline and small fix
rdp
textual
null term?
fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
add dlls to release
style
style
test fix
test fixes
another fix
fix memleak
fix
textual
use printandlogex
...
2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec
Viva la revolucion
2019-04-17 21:30:01 +02:00
iceman1001
1ee3679a98
style
2019-04-17 14:54:42 +02:00
Philippe Teuwen
8bfc5c1b47
New reply frames reception
2019-04-17 01:06:26 +02:00
Philippe Teuwen
96843c3f47
New reply frames transmission (reception still to be done)
2019-04-16 23:15:23 +02:00
Philippe Teuwen
4eaa2fc5aa
move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files
2019-04-16 23:02:40 +02:00
Eloff
63f9f11066
'hf mf sim' bugs fix, RATS support, etc
2019-04-16 23:52:05 +03:00
Philippe Teuwen
8b99df9074
Merge branch 'master' into experimental_varlen2
...
* master: (33 commits)
unified Proxmark3 text
removed
more colors
rearranged banner output and messages
textual
revert
revert
revert
style spaces
fix fake com port
style
style
styles
not null?
style
style
style
style
style
style
...
2019-04-16 20:58:58 +02:00
Philippe Teuwen
83571f02a0
style
2019-04-16 20:49:32 +02:00
Philippe Teuwen
44bbb7d2c7
new frame format, smaller and with crc. Some code simplified
2019-04-16 20:00:17 +02:00
iceman1001
e04e2d6fa7
revert
2019-04-16 17:02:21 +02:00
iceman1001
597019b98a
revert
2019-04-16 17:01:00 +02:00
iceman1001
64c7ee117e
revert
2019-04-16 17:00:18 +02:00
iceman1001
aaedeafbb1
style spaces
2019-04-16 16:56:56 +02:00
iceman1001
75524b72d1
style
2019-04-16 15:10:55 +02:00
iceman1001
144237abfd
style
2019-04-16 15:09:57 +02:00
iceman1001
e5928424b6
style
2019-04-16 15:08:51 +02:00
iceman1001
00f3c281bb
style
2019-04-16 15:06:14 +02:00
iceman1001
9a5b23428d
style
2019-04-16 15:05:01 +02:00
iceman1001
ac7bd3532f
style
2019-04-16 15:02:44 +02:00
Philippe Teuwen
34467b7550
Variable length frames, part1: USB Host -> Pm3
2019-04-16 10:01:08 +02:00
Philippe Teuwen
04c0384d3e
Testing pm3 communication
2019-04-14 17:25:17 +02:00
Philippe Teuwen
9676d788e0
style
2019-04-14 13:37:53 +02:00
iceman1001
d28fac3ef0
style
2019-04-14 11:43:05 +02:00
iceman1001
664434dfba
Fix: USART calls rx/tx
2019-04-14 11:10:16 +02:00
iceman1001
e44fcb52d6
fix: usart needs those pins. (@ryan)
2019-04-14 11:07:35 +02:00
iceman1001
4ab2212346
style
2019-04-13 08:50:05 +02:00
iceman1001
6803e6d1c0
style
2019-04-13 01:43:22 +02:00
Eloff
15f2fb4010
duplicate method
2019-04-12 00:35:02 +03:00
Eloff
172748a82c
BugFix.'mifaresim.c' used wrong Uart reference
2019-04-12 00:10:52 +03:00
osboxes.org
ffd2c92584
style
2019-04-10 09:46:01 +02:00
osboxes.org
260ad9b7ae
style
2019-04-10 09:32:55 +02:00
osboxes.org
05648163c1
style
2019-04-10 09:32:49 +02:00
osboxes.org
98b1172098
style
2019-04-10 09:32:40 +02:00
osboxes.org
e8b75582be
style
2019-04-10 09:32:07 +02:00
iceman1001
6c1b8f809e
chg: update armside debug to fit with offical repo.
2019-04-10 08:42:00 +02:00
Eloff
249352a1e7
'hf mf sim' + 'hf 14a sim' now back to stable
2019-04-09 23:57:10 +03:00
iceman1001
8c4f8eaeca
unused
2019-04-09 20:43:09 +02:00
iceman1001
9c634ce605
unused
2019-04-09 20:41:01 +02:00
iceman1001
4d99bf7fab
unused
2019-04-09 20:39:38 +02:00
iceman1001
1c9507b6d8
unused
2019-04-09 20:37:35 +02:00
iceman1001
6bba17b1e7
unused
2019-04-09 20:36:06 +02:00
iceman1001
247245121c
unused
2019-04-09 18:13:51 +02:00
iceman1001
5cc7f4eb86
unused
2019-04-09 18:10:24 +02:00
iceman1001
e6041f48ce
unused
2019-04-09 18:07:47 +02:00
iceman1001
af54eb5138
unused
2019-04-09 18:06:19 +02:00
iceman1001
ac88c435f6
remove old iso14443crc.c, fully replaced by crc16.c functions.
2019-04-09 10:12:15 +02:00
Iceman
9e1a84c7ab
Merge pull request #151 from McEloff/temp
...
'hf mf sim' nested authentication
2019-04-09 09:27:33 +02:00
vratiskol
a2a1bbb7a1
Add message about debug message
2019-04-09 00:07:06 +02:00
vratiskol
1fc5fea623
Debug level => MF_DBG_EXTENDED
...
- Add comment
- Debug level MF_DBG_EXTENDED
2019-04-08 23:48:27 +02:00
Eloff
f13f7f4cbb
Pull request #145 . Next part of changes
2019-04-08 19:15:15 +03:00
Iceman
b0b996a67c
Merge pull request #145 from McEloff/temp
...
'hf mf sim' - bugs fix, refactoring
2019-04-08 14:18:06 +02:00
iceman1001
5585290981
fix: dereference
2019-04-08 11:40:52 +02:00
iceman1001
4b12b2cdf3
unshadow
2019-04-08 09:47:20 +02:00
iceman1001
1833ad5616
unshadow
2019-04-08 09:46:12 +02:00
McEloff
4588384587
Merge branch 'master' into temp
2019-04-08 10:26:30 +03:00
iceman1001
a89ae9cb35
check return value from zlib inflateInit2...
2019-04-08 08:08:47 +02:00
iceman1001
ef610f373a
style
2019-04-07 16:21:27 +02:00
Philippe Teuwen
8c359921e9
keybytes for MifareUC_Auth
2019-04-07 12:30:49 +02:00
Philippe Teuwen
7485c5ed2e
armsrc BitStream -> bits
2019-04-07 12:23:34 +02:00
Philippe Teuwen
9c3a520300
iso14443a_select_card resp_data -> p_card
2019-04-07 12:18:20 +02:00
iceman1001
6cc62b7985
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-07 12:11:08 +02:00
iceman1001
7eee2acfbf
more crc overshadow
2019-04-07 12:10:52 +02:00
Philippe Teuwen
a7448f802f
make style: don't indent preprocessor directives
2019-04-07 12:10:51 +02:00
iceman1001
c4920d7179
fix crc overshadowing
2019-04-07 12:07:50 +02:00
iceman1001
91897f1f2e
copy bytes
2019-04-07 12:06:48 +02:00
iceman1001
1e35130fbe
missing include
2019-04-07 11:41:43 +02:00
iceman1001
4856252912
styles
2019-04-07 11:39:49 +02:00
iceman1001
49a0fda10b
styles
2019-04-07 11:36:24 +02:00
iceman1001
c9b3dd32d1
remove random
2019-04-07 11:00:28 +02:00
iceman1001
ff74d56741
remove unused
2019-04-07 10:58:50 +02:00
iceman1001
593202867a
remove include
2019-04-07 10:56:35 +02:00
iceman1001
3ab9dbe4c6
fix styles
2019-04-07 10:52:52 +02:00
iceman1001
8e6920cd95
fix styles and warnings
2019-04-07 10:40:59 +02:00
iceman1001
db78d26b9f
styles
2019-04-07 10:33:34 +02:00
iceman1001
da7dc2353c
style and warnings
2019-04-07 10:30:52 +02:00
iceman1001
aea6c6d3c5
fixes, shadow
2019-04-07 10:17:43 +02:00
Philippe Teuwen
ebdfba033d
arg names
2019-04-06 20:35:58 +02:00
Philippe Teuwen
a52a0bf537
args names
2019-04-06 20:21:03 +02:00
Philippe Teuwen
a27d549a60
WritePageHitagS: why on earth page <> page_
2019-04-06 19:48:20 +02:00
Philippe Teuwen
1b9914288d
remove extern
2019-04-06 19:10:34 +02:00
Philippe Teuwen
41f36ca20b
make style
2019-04-06 19:09:01 +02:00
Philippe Teuwen
2603c8d0d1
Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim
...
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
Astyle
Verbose mode
ReSync file
Add Encrypted data test
Mifare 10B UID
cardAUTHKEY log
Remove FLAG_RANDOM_NONCE
Mifare Sim
LogTrace
Log Level
Use Variable
Add Variable for MAX_MIFARE_FRAME_SIZE
Add Data Block debug
Correct flags & test
Correct return
Revert "Merge branch 'master' into hf_mf_sim"
Sync from Upstream
Astyle update
hf mf sim
2019-04-06 19:06:16 +02:00
iceman1001
127dc74674
chg: only english
2019-04-06 15:50:45 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim
2019-04-06 01:22:15 +02:00
Philippe Teuwen
26eb54b965
style
2019-04-06 01:00:54 +02:00
vratiskol
567ceb017b
Astyle
2019-04-06 00:39:27 +02:00
vratiskol
2278d3372e
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-04-06 00:33:10 +02:00
vratiskol
e24a0cfe17
Verbose mode
2019-04-06 00:32:11 +02:00
iceman1001
1773cfcf39
style
2019-04-05 18:51:19 +02:00
vratiskol
bc11ff88ea
Add Encrypted data test
2019-04-05 03:58:15 +02:00
vratiskol
0578e19fba
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-04-05 03:48:25 +02:00
Eloff
791ff18381
'hf mf sim' - bugs fix, refactoring
2019-04-05 00:15:55 +03:00
Eloff
19cf50a6ff
Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support
2019-04-03 22:26:18 +03:00
vratiskol
1c77185fb9
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-04-03 01:48:46 +02:00
Philippe Teuwen
07cc0d0a29
make style helped revealing my bug :)
2019-04-02 22:34:00 +02:00
Philippe Teuwen
64ce30c06c
make style
2019-04-02 22:32:45 +02:00
Philippe Teuwen
21be6d4400
FPC: got RX working, got client over usart somehow working..., see detailed commit msg
...
* using WITH_FPC:
* activate basic usart
* no double buffer for now, no interrupt
* usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
* pm3 client over USB, minicom over usart
* analyse a d 414243
* using WITH_FPC_HOST:
* it implies WITH_FPC as it's based on it
* control pm3 with client over usart
* EXPERIMENTAL! still some frame desync issues
* you can connect both from usart & USB with two pm3 clients
* actually you *have* to connect USB for the moment because
it's used to send debug messages about buggy usart... See Dbprintf_usb below
* "sessions": msgs are directed to the latest client to have sent a cmd
* Dbprintf_usb macro to send msgs to USB client to help debugging usart...
* We now have an option to run client at different speed as usart is 115200:
client/proxmark3 /dev/ttyUSB0 -b 115200
* Consequently, argc,argv handling is a bit revamped, it was so messy...
* USB and flashing are still at 460800, don't try flashing over usart yet ^^
2019-04-02 22:06:10 +02:00
Philippe Teuwen
7bd95dd5c3
FPC experiments: got so far TX_only, usart=115200 + usb=460800, see full commit msg
...
* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
2019-04-02 01:06:03 +02:00
Philippe Teuwen
21b063da93
t55xx readblock: don't delay acquisition too much else we're sometimes off by one (observed when reading P1B1 on several cards)
2019-03-31 03:02:09 +02:00
Philippe Teuwen
4b00dd1053
lf write: leds
2019-03-31 01:14:20 +01:00
Philippe Teuwen
032062cfe9
Indala 64 on T55x7: use PSK1
2019-03-30 23:01:22 +01:00
vratiskol
4bef914653
Mifare 10B UID
2019-03-28 15:18:53 +01:00
Philippe Teuwen
db4aa08b78
make style
2019-03-28 14:19:41 +01:00
vratiskol
edfce24cad
cardAUTHKEY log
...
Add key type as A or B
2019-03-28 00:37:48 +01:00
vratiskol
8f11fcc193
Remove FLAG_RANDOM_NONCE
2019-03-27 22:35:11 +01:00
iceman1001
459835b5ca
fix: 'hf mf sim' - Mifare simulation now works against Android etc. Thanks to @eloff
2019-03-27 15:29:45 +01:00
vratiskol
a068f7c2bc
Mifare Sim
...
Compilation OK
Emulation 1k OK with android
2019-03-27 14:18:26 +01:00
vratiskol
60ac8b8934
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-26 10:08:49 +01:00
iceman1001
52be3f4fe5
chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID.
...
chg: 'lf indala demod' - tries to descramble parts, and detection is changed. Still issues with PSK2..
2019-03-26 09:09:43 +01:00
vratiskol
04c14d1931
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-25 15:51:21 +01:00
iceman1001
c939d99884
chg: remove LDC mod be default
2019-03-25 15:11:38 +01:00
vratiskol
3b06c9d8ee
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-21 20:46:56 +01:00
iceman1001
ca9061bd32
changed byte_t -> uint8_t
2019-03-21 15:19:18 +01:00
vratiskol
e26677f841
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-21 14:45:08 +01:00
iceman1001
ffdd91cab6
add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this.
2019-03-21 12:53:05 +01:00
vratiskol
c8a805c99c
LogTrace
2019-03-19 17:09:16 +01:00
vratiskol
49f0b35ffd
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-19 16:48:45 +01:00
iceman1001
a41d6fbfb2
style
2019-03-19 10:26:52 +01:00
iceman1001
42bbf6a761
style
2019-03-19 10:26:36 +01:00
vratiskol
c08c14656b
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-18 22:26:57 +01:00
iceman1001
433f84ca0d
style
2019-03-18 22:25:21 +01:00
vratiskol
c2c4aac7ff
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-18 21:51:29 +01:00
iceman1001
aa28143e16
style
2019-03-18 20:16:04 +01:00
iceman1001
4706d27903
reassigned
2019-03-18 20:11:19 +01:00
iceman1001
0ed99ce0c4
unsigned variables cant be negative
2019-03-18 17:16:27 +01:00
iceman1001
03f89d2f3f
chg: details
2019-03-18 13:44:51 +01:00
iceman1001
f24416a71e
clean
2019-03-18 13:42:17 +01:00
iceman1001
dcec5627d1
chg: unsigned byte can't be less than zero.
2019-03-18 13:41:59 +01:00
vratiskol
86955c1de2
Log Level
2019-03-18 13:36:36 +01:00
iceman1001
e925dc9f7a
clean
2019-03-17 21:53:26 +01:00
iceman1001
ca24b7ae74
chg: 'hf 14a sim' - send 4bit ACK/NACK responses
2019-03-17 21:52:14 +01:00
vratiskol
619ef2ba37
Use Variable
2019-03-16 03:46:36 +01:00
vratiskol
a3e0e90bf3
Add Variable for MAX_MIFARE_FRAME_SIZE
2019-03-16 03:01:03 +01:00
vratiskol
0a648e3807
Add Data Block debug
2019-03-16 01:25:10 +01:00
vratiskol
ac575cf3ce
Correct flags & test
2019-03-16 00:17:13 +01:00
vratiskol
77ebf1ddbf
Correct return
2019-03-15 23:14:19 +01:00
vratiskol
cfe2b2797e
Revert "Merge branch 'master' into hf_mf_sim"
...
This reverts commit cbea5d9d02
, reversing
changes made to b66152feb2
.
2019-03-15 21:45:00 +01:00
vratiskol
cbea5d9d02
Merge branch 'master' into hf_mf_sim
2019-03-15 21:17:44 +01:00
vratiskol
6a52b6074f
Sync from Upstream
2019-03-15 21:17:07 +01:00
vratiskol
b66152feb2
Astyle update
2019-03-15 21:07:15 +01:00
vratiskol
64c3ae8b34
hf mf sim
2019-03-15 21:04:25 +01:00
iceman1001
248135682c
mix in proxmark code..
2019-03-15 00:40:29 +01:00
osboxes.org
9c2736d1eb
spaces
2019-03-14 12:30:32 +01:00
iceman1001
5608df9771
chg: refactored away hitag logtrace.
2019-03-13 22:48:51 +01:00
iceman1001
b35ea2e352
chg: 'lf hitag writer' - refactored with timeouts etc.
...
chg: 'lf hitag' test without toggle mode enabled
2019-03-13 16:44:32 +01:00
Philippe Teuwen
a95ff04392
Fix mem leak in flash mem read
2019-03-13 12:46:03 +01:00
iceman1001
a117f06380
chg: refactoring of hitag (@piwi)
...
chg: refactoring of hitagS (@iceman)
2019-03-13 12:18:37 +01:00
iceman1001
c01497b8af
FIX: 'lf hitag' - init of TC0 missing (@piwi)
...
CHG: 'lf hitag' - factoring code (@iceman)
2019-03-13 10:16:12 +01:00
iceman1001
2563fa0472
moved some macro
2019-03-13 09:10:52 +01:00
Philippe Teuwen
92d94390ac
MifareChkKeys_fast: fix always false cond
2019-03-13 00:30:11 +01:00
Philippe Teuwen
091ddb26f0
lfops fcAll: avoid division by zero
2019-03-13 00:27:03 +01:00
Philippe Teuwen
d9308d912d
fix: shifting signed 32-bit value by 31 bits is undefined behaviour
2019-03-13 00:07:40 +01:00
Philippe Teuwen
4aeff95259
T55xx_ChkPwds: fix always false cond
2019-03-12 23:53:39 +01:00
Philippe Teuwen
61905d2b19
lfops: add ledcontrol in API
2019-03-12 23:51:30 +01:00
Philippe Teuwen
ebeab59bc4
lfops: remove always true conds
2019-03-12 23:50:43 +01:00
Philippe Teuwen
3807848171
fix DetectNACKbug: sync_cycles is signed
2019-03-12 23:37:53 +01:00
Philippe Teuwen
fb07fd92f3
epa: check EPA_PACE_MSE_Set_AT return value
2019-03-12 23:14:19 +01:00
Philippe Teuwen
2c41a61ee3
remove always true cond
2019-03-12 22:52:15 +01:00
Philippe Teuwen
d50de828a1
flash write: check first page write
2019-03-12 22:50:29 +01:00
Philippe Teuwen
049f41a22f
iso15693: fix strncat usage (one must specify available room, not total dest buffer size)
2019-03-12 21:55:36 +01:00
Philippe Teuwen
cdf0a56fad
iso15693: check memcpy and fix BuildInventoryResponse
...
BuildInventoryResponse was copying 5 bytes instead of 12 bytes in the cmd buffer
2019-03-12 21:55:36 +01:00
iceman1001
1d63258388
add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125
2019-03-12 14:41:23 +01:00
iceman1001
35bc4a975e
rename SNOOP -> SNIFF
2019-03-12 13:15:39 +01:00
Philippe Teuwen
1b2601a48a
Add missing EOF LF
2019-03-12 00:12:26 +01:00
Philippe Teuwen
346af6e3d1
make style
2019-03-11 23:12:31 +01:00
iceman1001
ea53e1f981
clean up
2019-03-11 19:31:18 +01:00
iceman1001
780424fe11
chg: hitag2, some clean up, also testing to remove relay_off, since its never relay_on anywhere.
2019-03-11 14:56:03 +01:00
Philippe Teuwen
119e3f0ed9
Makefile: allow alternative platforms, try make PLATFORM=foo
2019-03-11 00:44:34 +01:00
iceman1001
b26e60dae9
turn off fpc default
2019-03-10 14:40:41 +01:00
iceman1001
40ccdb0e73
clean up
2019-03-10 14:39:46 +01:00
Philippe Teuwen
7d25c72e40
Makefile: recompile arm only when needed
2019-03-10 12:55:17 +01:00
Philippe Teuwen
2f12e57408
Makefiles: remove spurious spaces/tabs
2019-03-10 11:35:03 +01:00
Philippe Teuwen
961d929f4d
changing {} style to match majority of previous style
2019-03-10 11:20:22 +01:00
Philippe Teuwen
0373696662
make style
2019-03-10 00:00:59 +01:00
Philippe Teuwen
8a7c6825b5
armsrc: fix mix of spaces & tabs
2019-03-09 20:34:41 +01:00
iceman1001
a819d522c1
textual
2019-03-09 11:51:46 +01:00
iceman1001
f4409ab375
chg: revert it
2019-03-09 11:51:18 +01:00
Philippe Teuwen
957464ca88
armsrc Standalone: fix mix of spaces & tabs
2019-03-09 11:19:45 +01:00
Philippe Teuwen
60f292b18e
remove spurious spaces & tabs at end of lines
2019-03-09 08:59:13 +01:00
Philippe Teuwen
edc19f202a
Convert the few files with still Windows carriage returns
2019-03-09 08:49:41 +01:00
Philippe Teuwen
4160e32b0a
Replace isNoise by computeSignalProperties and removeSignalOffset
2019-03-08 19:06:55 +01:00
Philippe Teuwen
4ffeebc193
Fix return code check for iso14443b_select_card in hf epa
2019-03-05 16:39:26 +01:00
vratiskol
99dc51e005
Mem Leak
2019-02-24 22:02:09 +01:00
iceman1001
4ea05fc026
Fix: 'hf mf fchk' - now reports back correct found keys.
2019-02-17 15:56:45 +01:00
iceman1001
7934630d2b
FIX: Makefile bad styled calls
2019-02-14 19:27:39 +01:00
merlokk
69f3e65dd0
fix memmove if len=0
2019-02-05 18:39:03 +02:00
merlokk
0e5d896893
fix endless loop
2019-02-05 18:27:48 +02:00
bogiton
75aeec6507
Add led blink on successful flash write
2019-02-04 17:44:29 +00:00
merlokk
cf21f046d8
arm side
2019-01-30 18:15:47 +02:00
merlokk
1b3d96ab2d
add apdu chaining to arm side
2019-01-29 19:30:15 +02:00
iceman1001
8991fa172d
FIX: wrong define
2019-01-29 15:47:44 +01:00
iceman1001
730a7e8044
FIX: 'hf legic sim' - needed even more timeout.
...
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 13:48:53 +01:00
iceman1001
803aab7431
FIX: 'hf legic sim' - longer timeout for writes? (@drandreas)
...
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 11:58:00 +01:00
iceman1001
0bec6038b7
CHG: adjusted compiling for older devices
2019-01-23 10:57:49 +01:00
iceman1001
20c3cd5ce3
chg: adjusting license according to earlier commits to pm3 offical repo.
2019-01-14 12:02:26 +01:00
iceman1001
a5833fe390
CHG: remove strange thr 0x43 in LF sampling
...
CHG: refactor cotag init
2019-01-12 12:10:31 +01:00
iceman1001
f215ebef80
Refactored 'lf t55xx brute', split it up into two commands.
...
- lf t55xx brute (tries bruteforcing a range of pwds
- lf t55xx chk (uses dictionary file or RDV4 flashmem)
FIX: adjust lf sim (@marshmellow42) see 7008cf9c15
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.
ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit (6178b085a0
)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value. I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with trymodulation like before.
This seems to work good on t55xx card which has a ASK configuration.
WORK-IN-PROGRESS
2019-01-11 14:46:27 +01:00
iceman1001
8a514ea8f1
REM: remove unused files
2019-01-09 16:28:06 +01:00
iceman1001
e276bf1ce3
FIX: gcc8.1 warnings
2019-01-09 16:25:49 +01:00
iceman1001
6743e45386
CHG: name changes
2019-01-09 12:05:29 +01:00
iceman1001
2612cd006a
CHG: bigbuf adaptations
2019-01-09 12:00:06 +01:00
iceman1001
3ae871f534
CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS -
2019-01-07 09:32:16 +01:00
iceman1001
c1237cfa26
FIX: 'lg pcf7931' - improved read code (@sguerrini97)
2019-01-06 21:05:29 +01:00
iceman1001
c37cc81c00
CHG: FeliCa more details
2019-01-06 20:42:51 +01:00
iceman1001
0dee369a58
FIX: 'hf tune' - now works...
2019-01-06 20:28:23 +01:00
iceman1001
38853b111f
FIX: adding directives to reduce size on systems like Gentoo Hardned (see https://github.com/iceman1001/proxmark3/issues/268 )
2019-01-05 20:59:00 +01:00
iceman1001
6e281a08ed
CHG: 'hf mf fchk' - speed improvments by tweaking implementation.
...
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
2019-01-02 11:52:13 +01:00
iceman1001
0fb0c35308
CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device.
...
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.
How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t
How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
2019-01-01 18:01:40 +01:00
Chris
f8c33af1da
CHG: FPC connector tests. Device -> Client communications works.
...
Adjust armsrc/Makefile and client/Makefile to include the -DWITH_FPC flag to compile with FPC enabled.
2018-11-20 10:58:32 +01:00
Chris
aa3b322d0f
chg: 'analyze a' - some fpc test changes.
2018-11-16 23:59:14 +01:00
Chris
faef1a0938
chg: lf simulation - trying the new clock for better timings.
2018-11-16 23:57:55 +01:00
Chris
fd1c0cac79
FIX: 'standalone mode MattyRun' - compiles and should even work
...
CHG: 'standalone mode' - generic banner for each mode. Updated the ledshow to @cjbrigato
2018-11-16 02:52:42 +01:00
Chris
9bff2ab74f
CHG: cleaning up
2018-11-14 15:06:28 +01:00
Chris
bac3ad077e
FIX: 'standalone mode colinrun' - buffer overrun (thanks @angelsl)
...
1aa974fc70
2018-11-14 09:05:08 +01:00
merlokk
1f1d8bfc0b
fixed armside epa.c
2018-11-08 20:29:29 +02:00
merlokk
0cfa47e628
merged iso14 arm side
2018-11-08 20:29:08 +02:00
RFID Research Group
ce30c29f47
Merge branch 'master' into master
2018-11-07 12:12:47 +01:00
Chris
078196773c
CHG: 'standalone bogitorun' - adapted some ledshow from Kigiv mode and increased time for user to stop pressing button after triggering the mode..
2018-11-06 22:20:55 +01:00
Chris
5a03ea7135
chg: 'standalone mode BogRun' - cleaning
2018-11-06 19:14:19 +01:00
Chris
4d124c46f2
chg: 'standlone mode colinrun aka KIGIV' - made it smaller to fit a normal compilation of fullimage
2018-11-06 19:13:06 +01:00
bogiton
d6d96eb7fe
Fixed offset bug (thanks iceman)
2018-11-06 13:36:00 +00:00
Chris
98e24013cf
chg: 'hf mf chk' - since the function ends with droping the field, lets just make sure the field is off to start with.
2018-11-05 22:34:46 +01:00
Chris
4da4b33d8d
fix: 'lf t55xx deviceconfig' - bug that failed to load default values if wiped flashmem.
2018-11-01 19:51:45 +01:00
RFID Research Group
8759c0a9f7
Merge pull request #44 from bogiton/master
...
Standalone HF Sniff (and ULC/NTAG/ULEV1 pwd storing)
2018-10-28 15:31:50 +01:00
bogiton
2718e783dc
Added small description
2018-10-28 13:54:38 +00:00
bogiton
43f90181b3
Update hf_bog.c
2018-10-28 13:34:42 +00:00
bogiton
9bd7770dfe
Revert to default standalone mode
2018-10-28 12:04:44 +00:00
bogiton
785ab8f73e
Baudrate and optimization (removed counter)
2018-10-28 12:01:36 +00:00
bogiton
34775c81f5
Added BogitoRun identification
2018-10-21 18:29:49 +00:00
Chris
22fb92f9c8
sugar
2018-10-21 19:51:22 +02:00
bogiton
1c2af2a5ed
Added hf_bog standalone
2018-10-16 19:50:18 +00:00
bogiton
8079613b37
Add check for the HF_BOG directive for RunMod
2018-10-16 19:41:05 +00:00
bogiton
34c1da7ad4
Include the HF_BOG standalone mode
2018-10-16 19:39:29 +00:00
Chris
dc67b5d7c9
chg: revert fpga_major mode in LF.
...
chg: 'lf t55xx deviceconfig' - persistence to flashmem is now option with param P
2018-09-23 05:29:55 +02:00
Chris
d596343438
chg: 'lf t55xx deviceconfig' - assume total time, and writeenable when writting...
2018-09-16 20:48:39 +02:00
Chris
02cc278e19
chg: remove warnings on coverity
...
chg: encapsule flasmem function calls
2018-09-16 20:47:23 +02:00
TomHarkness
3e9397e337
Fix syntax
2018-09-15 16:20:44 +10:00
Chris
43c399876f
chg: helptext
2018-09-12 07:59:43 +02:00
Chris
ba2543b627
ADD: 'lf t55xx deviceconfig' - command that allows for setting t55xx timings via the client. If run on a RDV40, it also saves the config to flashmemory. This gives you option to have custom timings for your custom antenna in order for your RDV40 to work optimal against a t55xx tag and with your custom antenna. (@iceman)
2018-09-11 18:35:07 +02:00
Chris
9ee550af45
FIX: lf t55xx detect works better with adjusted timings
...
CHG: applied fpga_off patch.
2018-09-10 21:45:00 +02:00
Chris
90f29bf430
chg: call specific noise function
2018-09-09 11:29:37 +02:00
Chris
ba9de80eeb
chg: 'hf legic sim' break sim by sending another cmd
2018-09-09 11:29:11 +02:00
Chris
79afc031fc
FIX: LF antenna discharge after interfer timings. As suggested by @ts And thanks to @drandreas who patiently explains fpga verilog code to me.
...
This introduces a new majoe mode, FPGA_MAJOR_MODE_OFF_LF, which should ONLY be used in sending loops for LF. Basically the PWR_LO is set HIGH in order to discharge voltage faster.
Once sending is over, the normal FPGA_MAJOR_MODE_OFF SHALL be used.
2018-09-08 14:11:51 +02:00
Chris
e5e8c0b5d8
not needed anymore
2018-09-07 23:45:08 +02:00
Chris
24eaac8681
CHG: the thread comms refactoring from offical pm3 repo
...
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
2018-09-06 21:43:20 +02:00
RFID Research Group
eb0b5116a2
Merge pull request #25 from drandreas/rdv4-legic
...
Legic Tag Simulator
2018-09-06 20:26:39 +02:00
Colin J. Brigato
7e12fc0ceb
Pass 2; commit 3/3;
2018-09-06 05:34:48 +02:00
Colin J. Brigato
368fe11df0
Second Pass rewrite of flashmem. added command 'mem spibaud' to switch between 24/48Mhz operation. All is more consistant, less messy. All logic rewrittent avoiding multiple flashinit/flashstop. busywait is now at it's lowest possible. Beware : 48Mhz is VERY buggy cause of sillicon bug (see source for more info), and doesn't give much more than 24Mhz for now since we doubled nearly every operation speed here.
2018-09-06 05:15:52 +02:00
AntiCat
e1fa1e659a
Legic: Implemented write command for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
2981fe7ce8
Legic: Implemented read command for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
cd78b00815
Legic: Implemented setup phase for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
2c6c4e5bc6
Legic: Implemented trace log
2018-09-05 23:03:05 +02:00
AntiCat
fe91a3f52f
Legic: Implemented RX and TX for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
61e4eac2b2
Legic: Moved card simulator into separate file & cleaned interface.
...
Reader and card simulation have almost no common code. Moreover the sim
uses an SSP Clock at 212kHz for all timings to prevent any drifting from
the PRNG. This clock speed is not available in reader simulation mode (SSP
runs at up to 3.4MHz, and changes speed between TX and RX). For these
reasons having the code in separate files makes it significantly cleaner.
2018-09-05 23:03:04 +02:00
Colin J. Brigato
76e2d7502a
Merge remote-tracking branch 'upstream/master'
2018-09-05 20:39:56 +02:00
Colin J. Brigato
2263c826db
Restore Makefile, temporiraly provide Makefile.Colin
2018-09-05 20:34:28 +02:00
Chris
4c72acaf63
FIX: cleanup code, sync of output texts.
2018-09-05 18:58:58 +02:00
Chris
4c37126baf
cleanup
2018-09-05 18:58:04 +02:00
def
b7bdc69e5a
lfops.c CmdEM410xdemod empty TAG ID fix.
2018-09-05 17:50:31 +03:00
Chris
307063474d
CHG: cleanup
2018-09-04 20:36:25 +02:00
Chris
ac6bd61544
FIX: longer t55xx timings to compensate for delay of field damping, and minor adjustments.
2018-09-04 20:35:29 +02:00
Chris
e12d22b6d9
FIX: 'LF Standalone modes' - Ensure that noise check is performed for any device-side processing otherwise device-side processing will see all LF signals as noise.
...
From: 8bddce8096
2018-09-04 20:32:52 +02:00
Chris
27a036b087
FIX: logic behind compiler directive is now correct
2018-09-04 20:31:12 +02:00
Iceman
701b96d7fe
Update readme.md
2018-09-03 22:45:01 +02:00
Chris
76e7603ef1
textual
2018-09-03 22:36:43 +02:00
Chris
0e3ba1c058
CHG: easier to configure compilation of standalone mode. Just swap -D directive once your new standalone mode is ready and you added your code for it
...
based on a modification by @marshmellow42
2018-09-03 22:27:18 +02:00
Colin J. Brigato
8d673fa1bf
First pass rewrite of flashmem driver for optimization. Lot of changes here. Provides PoC of saving and recalling a tag in Standalone mode. Added some printing passthrough to client to azccomodate for vt100 eye-candyness. FastREAD mode implemented for flashmem, testable from client. Beta but functionnal. Reading the whole flash with 1Kb to 32kb buffers was ~730ms, now 380ms Max (even at 24Mhz spi baudrate)
2018-09-03 00:02:44 +02:00
Chris
f1d0e9db4d
fix: revert back
2018-08-29 19:42:46 +02:00
Chris
42e883f67b
FIX: print_result - now prints correct len.
...
FIX: DOWNLOAD_BUFFER - now with correct result logic
2018-08-28 21:15:28 +02:00
Chris
ca5b476730
FIX: 'standanlonemode colin' - mifare1ksim called with correct params (@cjbrigato)
2018-08-26 08:19:59 +02:00
Chris
2eab02e3ba
CHG: 'standalone mode MattyRun' - added some comments and suggestion
2018-08-25 23:26:04 +02:00
Chris
fe332a1f2b
removed unneeded ramfunc attribute
2018-08-13 23:50:17 +02:00
Chris
91dea8d694
code clean.
2018-08-13 23:49:33 +02:00
Chris
5f77121694
initial commit to be in sync the-soon-defunct repo pm3rdv40.
2018-08-12 21:54:31 +02:00
Andreas Dröscher
9ba20b590a
change: reduced demodulator to bare minimum
...
The initial code added complexity without improving reading distance.
Thankfully the peak detection signal path has a low noise floor.
2018-08-12 12:51:45 +02:00
Andreas Dröscher
0d0b651246
change: re-added trace log
2018-08-12 12:51:45 +02:00
Andreas Dröscher
ff5b046903
change: re-added status LEDs
...
- LED_A: FPGA and 13.56MHz carrier is active
- LED_B: Reading Byte
- LED_C: Writing Byte
2018-08-12 12:41:45 +02:00
Andreas Dröscher
e052fbc433
change: re-added legic write support
2018-08-12 12:41:45 +02:00
Andreas Dröscher
9d330dde87
fix: 32bit tick timer based on TC0 and TC1
...
TC1 counts the number of TC0 overflows (carry bits).
In random conditions TC1 would return or stay at zero,
instead of counting up. This due to the behavior of the
reset signal.
SAM7S Series Datasheet, 33.5.6 Trigger:
Regardless of the trigger used, it will be taken into account
at the following active edge of the selected clock. This means
that the counter value can be read differently from zero just
after a trigger, especially when a low frequency signal is
selected as the clock.
The new code first prepares TC1 and asserts TC1 trigger and
then prepares TC0 and asserts TC0 trigger. The TC0 start-up
will reset TC1.
2018-08-12 12:41:11 +02:00
Andreas Dröscher
c06f0af7f3
change: switched from timestamps (us) to ticks
...
GetCountUS() has a jitter of +/- 7us this is not precise
enough to keep the PRNG in sync. 1.5 * GET_TICKS on the
other hand is spot on.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
e0adc976e0
change: added rx/tx coordination timestamp
2018-08-12 09:59:48 +02:00
Andreas Dröscher
7244f5825d
change: legic reader tx back to bigbang
...
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
3029223158
change: legic reader now uses xcorrelation and ssc based io
...
- Even tough legic tags transmit just AM using xcorrelation
results in a significantly better signal quality.
- Switching from bit bang to a hardware based ssc frees
up CPU time for other tasks e.g. demodulation
2018-08-12 09:59:48 +02:00
Andreas Dröscher
c59150657c
add: xcorr 211.875 kHz option
...
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
db70ab8f7d
change: remove broken legic simulator
...
It will be rewritten in a later commit
2018-08-12 09:59:48 +02:00
Andreas Dröscher
8a53137ab0
change: remove dead legic code
...
This code was either disabled or never reached.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
e779f06c5e
change: clean up Legic interface
...
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
2018-08-12 09:59:48 +02:00
Iceman
c339035ec5
Revert "WIP: Clean Legic Reader"
2018-08-06 15:05:36 +02:00
Andreas Dröscher
058426fa17
change: added rx/tx coordination timestamp
2018-08-05 00:57:20 +02:00
Andreas Dröscher
8f797d1388
change: legic reader tx back to bigbang
...
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
2018-08-05 00:57:20 +02:00
Andreas Dröscher
78d5188922
change: legic reader now uses xcorrelation and ssc based io
...
- Even tough legic tags transmit just AM using xcorrelation
results in a significantly better signal quality.
- Switching from bit bang to a hardware based ssc frees
up CPU time for other tasks e.g. demodulation
2018-08-04 23:13:17 +02:00
Andreas Dröscher
d7c57dbc08
add: xcorr 211.875 kHz option
...
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
2018-08-04 23:13:17 +02:00
Andreas Dröscher
1adff322b1
change: remove broken legic simulator
...
It will be rewritten in a later commit
2018-08-04 23:13:17 +02:00
Andreas Dröscher
33eb2f5fa0
change: remove dead legic code
...
This code was either disabled or never reached.
2018-08-04 23:13:17 +02:00
Andreas Dröscher
37867fbf3b
change: clean up Legic interface
...
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
2018-08-04 23:13:17 +02:00
Chris
bacf8aff0f
add: FPC connector skeleton usart. Not working but if will be a starting point for those who might want to help out with it.
2018-07-30 09:54:44 +02:00
iceman1001
08d9d9daf9
cleaning
2018-07-29 18:20:56 +02:00
iceman1001
c082531110
fix: potential implicit type cast issue (Thanks to @drandreas for pointing it out)
2018-07-29 18:20:39 +02:00
iceman1001
506da3ff4c
textual
2018-07-29 16:30:36 +02:00
iceman1001
4172ea6c19
cleanup
2018-07-28 14:26:37 +02:00
iceman1001
4d8488e14b
CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi)
...
CHG: textual adjustments
2018-07-28 14:25:12 +02:00
Chris
afeb0d0cd7
fix: removes unneeded floating point lib inclusion (@piwi)
2018-07-23 21:02:13 +02:00
Chris
fff2f51cfb
chg: testing to switch from WaitXX calls to SpinDelay, they seem to mess up
2018-07-06 09:10:13 +02:00
Chris
79158c7360
chg; preparing for more cmds.
2018-07-06 00:24:04 +02:00
Chris
36d774506c
chg: 'sm raw' - implemented 'r' don't read reply
2018-07-05 21:10:21 +02:00
Chris
2ccbde8110
chg: 'flashmem' - adjust debugstatemnts
2018-07-05 20:29:16 +02:00
Chris
fca841122f
chg: 'sc reader' - hooked up atr.
2018-07-05 16:32:10 +02:00
Chris
ee006c6a7b
add: sc upgrade - beta test
2018-07-05 14:38:31 +02:00
Chris
e7342e7402
chg: 'sc upgr' shouldnt print too much
2018-07-05 11:37:04 +02:00
Chris
f70b8be5de
add: 'sc' - smart card commad [rdv40]
...
chg: test to read out firmware
2018-07-05 10:48:24 +02:00
Chris
3ecff83de2
chg: clean up
2018-07-04 15:29:27 +02:00
Chris
9571cf1d13
chg: and wrap FPC code with defines..
2018-07-04 13:05:23 +02:00
Chris
a32052b5e6
chg: and remove link to FPC code
2018-07-04 13:01:53 +02:00
Chris
392161e20e
chg: don't compile FPC yet
2018-07-04 12:58:28 +02:00
Chris
8f06f85cc4
DEL: removed old smartcard files
2018-07-04 12:22:12 +02:00
Chris
49735b62f1
syntax sugar
2018-07-04 12:20:08 +02:00
Chris
adb9e94487
chg: OR values
2018-07-04 12:19:29 +02:00
Chris
e09f9cbb32
add: RDV40 smart card module comms ( Thanks to @Willok! ) bitbanging i2c with it
2018-07-04 12:19:04 +02:00
Chris
ed5367a124
chg: adjusting 14b demod to increase reading distance
2018-06-30 22:48:59 +02:00
Chris
2b294912ee
chg: 'hf iclass chk' - enabled credit/debit key selction
...
chg: 'hf iclass lookup' - enabled credit/debit key selction
fix: first item in dictionary file now correct identified
chg: code cleanup
2018-06-30 22:47:07 +02:00
Chris
abdd51b6b3
chg: 'hf mf sim' led
2018-06-23 06:31:42 +02:00
Chris
4633e2083a
debug
2018-06-23 06:30:47 +02:00
Chris
28a4260ee9
chg: 14b fixes
2018-06-19 12:57:27 +02:00
Chris
d9e8b63363
chg: setting pins
2018-06-13 14:38:46 +02:00
iceman1001
bd857b263f
syntax
2018-05-22 12:10:02 +02:00
iceman1001
501c29f76d
add: support for reading flashmem
2018-05-22 12:09:17 +02:00
iceman1001
6b7819276d
add: 'mem info' - rudamentary support for new command.
2018-05-06 09:26:06 +02:00
iceman1001
110a7b28cb
chg: 'hf 14a sim' - possibility to simulate FM11RF005SH (@maozhenyu123)
...
chg: 'hf 14a info' - tag identification for FM11RF005SH (@maozhenyu123)
Fudan FM11RF005SH , has 512bit mem, 16blocks w 4bytes / block.
Support REQA, READ, WRITE, AUTH. Unknown how the auth is done.
The ATQA/SAK , or a trace from one of these tags would be intersting to look at.
2018-05-06 09:24:28 +02:00
iceman1001
3e7576c86d
fix: 'hf mfu rdbl'
...
fix: 'hf mfu dump' - bad exit strategy
2018-05-03 22:41:28 +02:00
iceman1001
4cd72b95c5
fix: coverty scan #277726 , unsigned value comparision always true.
2018-05-03 20:36:01 +02:00
iceman1001
989b80007c
chg: removed debugstatements
2018-05-03 16:20:46 +02:00
iceman1001
e50fef6607
fix: 'mem load' - wrong offset when uploading
2018-05-03 16:10:38 +02:00
iceman1001
021c0a1349
ADD: 'mem' commands. For RDV40 devices only.
...
If you don't have one, comment out inside client/Makefile this line
CFLAGS += -DWITH_FLASH
2018-05-03 12:15:03 +02:00
iceman1001
207fa2b574
add: potential fix for OSX uses, by @piwi
...
chg: adapting fix to support iceman forks extended commands.
2018-05-02 08:11:29 +02:00
iceman1001
98f0e9a284
fix: print.c on device doesn't have support for formatter %f
2018-04-27 12:16:35 +02:00
iceman1001
271cb3e1cc
chg: \r didn't work well with printandlogex
...
chg: spaces
chg: cleaning
2018-04-27 12:15:26 +02:00
iceman1001
2017f321b7
fix: memory issue, took all bigbuff
2018-04-25 01:33:25 +02:00
iceman1001
695d4cbb51
chg: fix coverity scan bug, variable is treated like a array
2018-04-20 20:07:41 +02:00
iceman1001
6ab1b285a0
chg.
2018-04-20 19:50:56 +02:00
iceman1001
f5718fb448
chg: wiping / reading / writing flashmem
2018-04-20 16:11:10 +02:00
iceman1001
a746699f5f
chg: reading / writing flashmem works better now.
2018-04-19 00:27:44 +02:00
iceman1001
42569a6f13
chg: adjusting for DEFINE usages.
2018-04-18 16:17:49 +02:00
iceman1001
0492df266c
chg: only print if compiled with smartcard flag
2018-04-18 12:41:03 +02:00
iceman1001
d4c0de0c3c
chg: turn off led A
2018-04-16 20:19:44 +02:00
iceman1001
a615fd6a9e
chg: smartcard , testing to use pwm clock instead of timer clock.
...
chg: added some comments
2018-04-16 19:58:49 +02:00
iceman1001
192aa9abd7
CHG: renamed iso7816 files
...
ADD: smartcard functionality (big thanks to Chris Nocker!)
2018-04-08 10:51:19 +02:00
iceman1001
726edb87cb
chg: flashmem unique id is 64bit
2018-04-08 10:24:24 +02:00
iceman1001
3f5aab8f05
chg: preparing for iso7816 module statuses
2018-04-03 11:45:20 +02:00
iceman1001
141cde93dd
add: buzzer code from elechouse repo
2018-03-31 10:44:44 +02:00
iceman1001
a37518b1c3
chg: renamed smartcard.c -> iso7816.c
...
chg: default standalone mode is LF_SAMY.. The HF_COLIN takes a lot of space
2018-03-31 10:43:09 +02:00
iceman1001
836d7370c3
spaces
2018-03-31 10:36:39 +02:00
iceman1001
3d956e686b
chg: flashmem adaptions
2018-03-31 10:35:40 +02:00
angelsl
1aa974fc70
Fix buffer overrun in hf_colin
2018-03-25 21:16:23 +08:00
iceman1001
fd1b86d607
ADD: flashmemory functionality for RDV40 Huge thanks to @willok !
2018-03-19 15:58:50 +01:00
iceman1001
0eca7e3977
chg: #define rename
2018-03-16 08:58:07 +01:00
iceman1001
3438d016c7
idea based on @jamchamb PR in official pm3 https://github.com/Proxmark/proxmark3/pull/584
2018-03-15 20:06:12 +01:00
iceman1001
ce418fb720
chg: 'hf mfu read'
...
chg: 'hf mfu dump' - 5 retries if failed readblock. Loop for CRC error or incomplete reads.
This will make reading / dumping more stable.
2018-03-15 19:59:33 +01:00
iceman1001
5690c0f5bc
chg: 'hw detectreader' - kind of useless previous change, measuring from two different readers, the max was 18.8v and 20.1v Not even close to 36v the standard ADC is configured
2018-03-15 10:48:57 +01:00
iceman1001
c3ba3f306f
chg: 'hw detectreader' - RDV40 adjustment
2018-03-15 09:25:22 +01:00
iceman1001
62814fd352
fix: 'hw detectreader' - adapted to PM3 RDV40 for HF measures.
2018-03-15 09:20:21 +01:00
iceman1001
7e0455aa0c
ADD: 'MattyRun' standalone - added the MattyRun standalone mode. *untested compilation*
2018-03-12 12:27:43 +01:00
Colin J. Brigato
9147698e97
UPDATES HF_COLIN to current
2018-03-10 13:13:21 +01:00
iceman1001
7fb6aa21ab
chg: skeleton files for smartcard / flashmem
2018-03-05 20:08:28 +01:00
iceman1001
857bc8ab66
ADD: SmartCard skeleton
2018-03-04 14:14:08 +01:00
iceman1001
802994d30a
add: 'hf 14 antifuzz' - the outline for the new functionality which fuzzes the anticollision phase ISO 14443a.
2018-02-28 13:21:47 +01:00
iceman1001
8083bfec32
add: marshmellow42 's fix for cotag endless loops
2018-02-28 08:08:07 +01:00
iceman1001
8eb0a42b5a
chg: adjustments
2018-02-28 08:04:53 +01:00
iceman1001
535c92fee5
FIX: added @marshmellow42 's fix for #514 (offical repo) lf search hang with no tag on antenna.
2018-02-28 07:59:41 +01:00
iceman1001
567a312cf4
chg: textual
2018-02-25 16:04:55 +01:00
iceman1001
7b9ba2de8e
chg: standalone modes - adapted for HF_COLIN aswell, for easier compilation
2018-02-25 16:04:24 +01:00
iceman1001
23ecd4154a
FIX: standalone mode HF_COLIN - it now compiles.
2018-02-25 08:15:38 +01:00
iceman1001
22715e7a99
minor adjustements
2018-02-22 15:13:43 +01:00
iceman1001
87b3df94c1
chg: minor syntax
2018-02-22 15:04:49 +01:00
iceman1001
1c37981430
fix: StandAloneMode proxbrute - missing variable and missing define. ZERO = 0.
2018-02-22 15:03:20 +01:00
iceman1001
92a42c2189
fix: wrong define
2018-02-21 09:03:02 +01:00
iceman1001
ab77b8a3d9
chg: ..oring..
2018-02-21 08:30:47 +01:00
iceman1001
cfff094bc3
SPI comments
2018-02-20 12:06:03 +01:00
iceman1001
d54c4d3e05
chg: SPI tests for flashmem on PA10. (aka pm3 evo) Peripheral B, fixed.
2018-02-20 12:03:11 +01:00
iceman1001
6c6aad6196
chg: SPI configuration. adjustments with defines, makes easier to understand
2018-02-20 12:01:22 +01:00
iceman1001
229ce1a156
chg: 'lf cmdread' - lowered the waiting times for antenna to power down / up
2018-02-18 10:37:13 +01:00
iceman1001
a21ab49f14
chg: moved flash mem config for spi into flashmem.c
...
chg: fpgasendcommand, now waits until command has been sent to fpga.
2018-02-18 10:35:36 +01:00
iceman1001
35bdf6a58d
FIX: Accourding to errata, a SPI reset should be executed twice.
2018-02-17 17:35:54 +01:00
iceman1001
b0d3362eef
chg: adjusted to macros
2018-02-16 20:45:13 +01:00
iceman1001
103e0b5191
chg: more tests
2018-02-15 09:19:13 +01:00
iceman1001
d20b11a288
chg: chips select
2018-02-15 09:18:31 +01:00
iceman1001
18aa477a55
chg: 'lf cmdread' -adjustments, @marshmellow42
2018-02-14 21:45:36 +01:00
iceman1001
b2a3b0f72a
chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570
...
chg: and some adaptations..
2018-02-14 21:40:52 +01:00
Federico Cerutti
2dbe5ad720
Fix for uneven octet error when no data is received
2018-02-14 15:48:28 +01:00
iceman1001
d0da96bf8a
remove warning "missleading-indentation"
...
flashmen spi 9bits?
2018-02-13 16:13:37 +01:00
iceman1001
46d540490f
chg: add response ack.
2018-02-13 15:45:15 +01:00
iceman1001
1709c1ce1a
chg: flash_mem - hooked up client - device comms
2018-02-13 15:36:20 +01:00
iceman1001
0495e93b6d
add: flash memory support
2018-02-13 14:12:28 +01:00
iceman1001
ad73af95c2
ADD: beginning to add SPI to access flash memory.
2018-02-13 11:41:23 +01:00
iceman1001
85b2533435
chg: 'hw tune' device side should be unsigned and only 1024 (10b ADC)
2018-02-13 11:40:05 +01:00
iceman1001
dc66765306
chg: 'lf cmdread' - adjusting loop
2018-02-09 00:27:02 +01:00
iceman1001
5adb9af78f
chg: 'hw tune' - compensating the 3% error marginal.
2018-02-09 00:25:45 +01:00
iceman1001
fe34cac012
FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi)
...
https://github.com/Proxmark/proxmark3/pull/569
2018-02-08 19:11:35 +01:00
iceman1001
de631c32ac
textual
2018-02-08 10:31:23 +01:00
iceman1001
ff07af84bf
fix: StandAloneMode samyrun, proxbrute, - id values are unsigned
2018-02-08 09:55:23 +01:00
iceman1001
374571046d
remove debug..
2018-02-07 20:12:16 +01:00
iceman1001
aee5fcb24a
debugs
2018-02-07 17:22:23 +01:00
iceman1001
094b5db9c5
fix: configure mux at startup
2018-02-07 17:21:51 +01:00
iceman1001
a2ac368fdb
fix.. wrong switch
2018-02-07 13:14:04 +01:00
iceman1001
75d04307a1
chg: adapting some HF voltage readings.
2018-02-07 13:11:10 +01:00
iceman1001
3d2fd2e3a1
FIX: start up,MUXSEL_HIPKD(PA19),MUXSEL_LOPKD(PA20) are floating state. Should adapt FPGA image aswell.
2018-02-07 12:08:50 +01:00
iceman1001
13bb29a386
fix: 'hf mf fchk' - releasing memory when finished is a good thing
2018-02-05 22:59:49 +01:00
iceman1001
3464fbe1df
fix 'hf mf darkside' - adapted solution from @pwpivi
2018-02-05 20:46:14 +01:00
iceman1001
fca1c9b7cf
chg: 'hf mf mifare' - (deviceside) reset cycles when negative or too large
2018-02-05 16:47:10 +01:00
Jean-Pierre Clair
847656c613
spelling error authetication instead of authentication
2018-02-05 14:09:38 +01:00
iceman1001
6605d92fbb
chg: tried making the reselect more stable.
...
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
all commands now has 'v' verbose parameter for more detailed output.
2018-02-04 12:25:55 +01:00
iceman1001
6a9ddf6e69
chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable.
2018-02-04 10:20:38 +01:00
iceman1001
dc25f9212f
FIX: 'hf iclass sim 2'
...
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.
I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
2018-02-04 00:52:29 +01:00
iceman1001
856e2770a6
chg: 'hf iclass sim' different output
2018-02-01 17:44:27 +01:00
iceman1001
e0373212a3
chg: 'hf iclass sim' - sim2, 4 get less default output, set DBG 4 for verbose
2018-02-01 16:10:24 +01:00
iceman1001
fa5b550fa8
chg: should be a define.
2018-02-01 15:35:00 +01:00
iceman1001
145bccdea8
chg: wrong type
2018-02-01 15:33:10 +01:00
iceman1001
519cc72966
chg: crc change
2018-02-01 15:22:01 +01:00
iceman1001
52d69ed4ee
CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all.
2018-02-01 15:19:47 +01:00
iceman1001
721ba5d287
fix: 'hf iclass sim' - too small buffers caused sim to fail
2018-02-01 09:31:30 +01:00
iceman1001
c6207d09e1
chg: 'hf felica reader' is better, almost working good
2018-01-30 03:29:37 +01:00
iceman1001
50743b7e88
rem: 'hf iclass' blocknum LUT is gone. Removed also functionality for it.
2018-01-29 16:44:49 +01:00
iceman1001
5c380767e8
chg: 'hf iclass' removed a blocknum LUT implementation. My guess is the new crc16_iclass will do fine.
2018-01-29 16:38:03 +01:00
iceman1001
b39332e938
REM: 'hf 15 debug' removed command, unified with mf_debuglevel instead. The idea is to have ONE debug flag on deviceside.
2018-01-29 15:58:00 +01:00
iceman1001
787d87e0e6
testing to make dma buffer larger.
2018-01-29 13:42:42 +01:00
iceman1001
c04ac4f9ac
ADD: 'hf felica reader' - added pm3 as FeliCa reader
...
ADD: raw commands - added the basis for sending RAW commands to FeliCa.
CHG: CRC16 rework, uses table based implementation. This will change more functions as I go on.
2018-01-29 13:42:02 +01:00
iceman1001
fd854a9308
chg: added Abrasive's uart implementation, its simpler to understand but the downside it doesn't do both speeds. (1/4 , 1/2556).
...
ref 2b8bff7dae
2018-01-28 12:36:41 +01:00
iceman1001
57df6a1a7e
revert: add reflect function since its used in crc.c
2018-01-28 10:49:57 +01:00
iceman1001
cf44d04be1
add: reflect16
...
rem: swapbits, reflect
2018-01-28 10:46:46 +01:00
iceman1001
e76b4f93b8
notes
2018-01-27 23:15:08 +01:00
iceman1001
ede55a1498
add: fast 8bit reversal.
2018-01-27 22:20:56 +01:00
iceman1001
60afef3938
FIX: 'hf snoop' - forcing function to clean up AT91C_BASE_SSC->SSC_RFMR into default setup values.
...
FIX: 'lf ti' - forcing to cleaning up of SSC when finished.
2018-01-27 20:30:50 +01:00
iceman1001
a6c50d7de2
chg: 'hf 14b' removed a delay loop when transmit as reader
2018-01-25 18:44:25 +01:00
iceman1001
5939164635
FIX: 'hf 15' timouts bugs when wait is set == 0...
...
thanks @lnv42 for fix 84cb4f6bbf
2018-01-21 18:34:29 +01:00
iceman1001
be82f9f018
DEL: 'hf mf sniff' - since it is very similar to 'hf 14a sniff' , I removed this command. The desired functionality will become a new 'hf list mf' option in the future.
2018-01-18 14:11:22 +01:00
iceman1001
b4afc8cdc4
fix: 'hf mf sniff' - @merlokk 's adjustments
2018-01-17 00:28:40 +01:00
iceman1001
de983252eb
chg: dma macros instead
2018-01-17 00:27:13 +01:00
iceman1001
93ecfddb88
CHG: iso15 from b8f35947f2
@lnv42
2018-01-16 21:07:58 +01:00
iceman1001
466bbe1733
fix: 'hf mf hardnested' - too fast timeouts. https://github.com/Proxmark/proxmark3/issues/518
2018-01-15 14:22:46 +01:00
iceman1001
5ee4eeb84b
chg: 'hf mf sim' wrong debuglevel for message
2018-01-11 22:08:02 +01:00
iceman1001
5ea8f73547
FIX: cmd_send has wrong varible definitions, leading to loss of values.
2018-01-11 21:47:27 +01:00
iceman1001
eed271af5c
CHG: 'hw tune' tuning antenna now can handle bigger antennas than 65v, with shifting 9, it can measure up to 130v.
...
CHG: 'hw tune' - command output and layout changes. I think this is easier to read.
2018-01-09 14:53:17 +01:00
iceman1001
b578e55d17
chg: 'hf 14b snoop' renamed 'hf 14b sniff'...
...
In order to use one command for SNIFFING.. All snoop names will be renamed.
2018-01-06 21:12:28 +01:00
iceman1001
647d275d18
chg: 'hf felica litedump' - now turns off device when aborted via keyboard, or buttonpress
2018-01-05 17:57:50 +01:00
iceman1001
05b62d0b3d
syntax sugar
2018-01-05 17:40:07 +01:00
iceman1001
82dbfba827
chg: 'hf felica litedump' - more stable impl. Will not break when run twice in a row. Still device can be in a loop if 100sec timeout occures. :(
2018-01-05 17:39:04 +01:00
iceman1001
6e93ed80a3
chg: 'hf iclass sniff' - still problems with the dmabuffer
2018-01-02 19:10:55 +01:00
iceman1001
fe9416db23
chg: 'hf iclass' - work in progress. running default_iclass_keys.dic against reader (pm3 as simulation)
2018-01-02 11:17:31 +01:00
iceman1001
036d050384
chg: syntax sugar
2018-01-02 11:15:23 +01:00
iceman1001
186de6e1ae
chg: adapting to new paths
2017-12-24 10:30:29 +01:00
iceman1001
231b0df578
CHG: 'hf iclass reader' - the select / which blocks to read / before saying it succeded was corrupt
2017-12-21 13:48:06 +01:00
iceman1001
3634327bef
chg: code cleaning.
2017-12-21 12:42:32 +01:00
iceman1001
5eafdbf872
ADD: 'hf iclass check' - increased speed in check keys with new algo.
...
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
2017-12-21 10:13:40 +01:00
iceman1001
154c30d0e5
fix: 'hf iclass reader' - do not always turn off device ..
2017-12-17 08:06:12 +01:00
iceman1001
594e4fe169
fix: (@pwpivi) fa85b08504
2017-12-12 15:49:43 +01:00
iceman1001
439c875905
chg: 'hf mf fchk' - need to reset the block number after a scan
2017-12-11 22:54:14 +01:00
iceman1001
bf74302679
chg: 'hf mf fchk' - reversing assumption. This really helped :)
2017-12-11 22:49:44 +01:00
iceman1001
033bc12933
chg: 'hf mf fchk' - adapttions to depth first exits
2017-12-11 22:33:50 +01:00
iceman1001
dd024b5300
chg: 'hf mf fchk' - depth first search
2017-12-11 21:43:29 +01:00
iceman1001
da57e74140
CHG: 'hf mf fchk' - two strategys. depth first for sector 1, AB. and width first with all sectors.
...
first run strategy 1. then 2.
2017-12-11 01:44:55 +01:00
iceman1001
9665bd526a
chg; less debug
2017-12-11 01:19:58 +01:00
iceman1001
26353cfd78
chg: 'hf mf fchk' - testing new strategy, Depth first for sector0.
2017-12-10 23:59:19 +01:00
iceman1001
f9e73b9c61
chg: adjusting debug levels
2017-12-10 23:23:08 +01:00
iceman1001
bf2b2afeeb
cleaning up.
...
chg: swapped random gen for mifare classic auth to known weak prng.
2017-12-10 23:09:53 +01:00
iceman1001
cb92ed9ec0
fix
2017-12-10 20:09:16 +01:00
iceman1001
0e96c72476
fix: wupe timing (@pwpiwi) 7c7327e7c8
2017-12-10 20:02:51 +01:00
iceman1001
71fa461403
fix: timeout issues with checkkeys etc
2017-12-10 11:38:26 +01:00
iceman1001
dfdf4e701f
chg: testing to reinstate the auth-timeout
2017-12-10 11:18:44 +01:00
iceman1001
19fe01128c
chg: 'hf mf chk' - reinstate the debuglevel
2017-12-10 11:11:23 +01:00
iceman1001
2d6fead9de
fix...
2017-12-10 10:06:27 +01:00
iceman1001
a27a29c0c6
chg: use defines instead.
2017-12-10 09:52:26 +01:00
iceman1001
0e9f234f11
CHG: lessend the default debug level to MF_DBG_ERROR.
2017-12-09 08:27:56 +01:00
iceman1001
0430b84f65
CHG: 'hf 14a sim', 'hf mf sim' - now uses weak PRNG from Crypto1 as nonce generation.
2017-12-07 15:21:06 +01:00
iceman1001
44280abf62
chg: reverting back to more or less offical pm3 version.
2017-12-07 15:02:15 +01:00
iceman1001
e94ceecb79
chg: 'hf mf mifare' - my darkside attack has been buggy last months. This reverts back to offical pm3.
2017-12-06 21:53:11 +01:00
iceman1001
2e35725f2f
chg: 'hf mf mifare' - the darkside attack works bad...
2017-12-06 01:09:12 +01:00
iceman1001
56dbf3ea15
chg: 'hf mf nack' - adjustments in return values..
...
add: 'hf 14a info -n' added new parameter, to enable test for nack bug.
2017-12-06 00:34:57 +01:00
iceman1001
e5f92935a1
chg: more adjustments
2017-12-06 00:17:49 +01:00
iceman1001
0c0e20eb06
chg: adjustments
2017-12-06 00:12:15 +01:00
iceman1001
6a028bdd18
fix: 'hf mf nack' - now does it better..
2017-12-06 00:03:34 +01:00
iceman1001
0a1a48df01
chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like
...
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox Thanks!
2017-12-05 23:34:52 +01:00
iceman1001
db82738527
chg: 'hf mf mifare' - warning if select card failed but continue searching
...
chg: 'hf mf nack' - warning if select card failed but continue searching
2017-12-05 18:18:20 +01:00
iceman1001
8b3ff03599
chg: 'hf mf nack' - cleaning up
2017-12-05 18:14:19 +01:00
iceman1001
a43f156370
chg: 'hf mf nack' - minor
2017-12-05 18:04:21 +01:00
iceman1001
6e5038f224
chg: 'hf mf nack' - only test all 256 parities for one nonce when synced.
...
0 nack = has not bug.
1 nack == has bug
x nacks == most likely a clone card which answers nack to all requests.
2017-12-05 17:57:44 +01:00
iceman1001
ba4df1b9fc
chg: 'hf mf nack' - trace on.
2017-12-05 13:25:16 +01:00
iceman1001
08193fd2e5
chg: getting crazy out of sync when running against magic cards.
2017-12-05 12:30:40 +01:00
iceman1001
984a26370d
chg: 'hf mf nack' better output
2017-12-05 11:53:42 +01:00
iceman1001
4289846383
chg
2017-12-05 11:39:31 +01:00
iceman1001
a2ba749a04
chg...
2017-12-05 11:37:10 +01:00
iceman1001
0e9a0d4b71
chg: remove unused vars
2017-12-05 11:35:07 +01:00
iceman1001
4f3e9f0f1f
chg: 'hf mf nack' - loop three times. change nonce
2017-12-05 11:33:32 +01:00
iceman1001
355572826a
chg: this debug statement interups with all other printouts.
2017-12-05 11:01:05 +01:00
iceman1001
ea6136456c
chg: 'hf mf nack' - use faster iso select
2017-12-05 10:52:53 +01:00
iceman1001
e02e145fae
draft for a Mifare classic NACK bug detection.
...
the idea is to have a statistically solid conclusion if tag does or does not have the NACK bug.
-in short, ref https://github.com/iceman1001/proxmark3/issues/141
NACK bug; when a tag responds with a NACK to a 8 byte nonce exchange during authentication when the bytes are wrong but the parity bits are correct.
This is a strong oracle which is used in the darkside attack.
2017-12-04 19:36:26 +01:00
iceman1001
5614066a4e
fix: no more powered antenna when swapping fpga images.
2017-11-30 10:28:59 +01:00
iceman1001
430c6b4b79
It seems a call to FpgaDownloadAndGo() powers the antenna.
...
Solution: Turn off antenna afterwards
2017-11-30 08:27:31 +01:00
iceman1001
efb0580199
fix: file doesnt exits
2017-11-25 10:24:15 +01:00
iceman1001
2c7930d178
fix: missing.
2017-11-25 10:22:47 +01:00
iceman1001
c5ee621160
rem: EMV on armside is cleaned out.
2017-11-25 10:20:52 +01:00
iceman1001
fcbb559b63
rem: remove emv implementations from peter fillmore. There is a better one on client side.
2017-11-25 10:14:13 +01:00
iceman1001
9d4d8b6e2c
chg: iso14443a timeouts, (@pwpiwi)
...
chg: apdu prolonged timeout (@merlokk)
2017-11-25 10:11:37 +01:00
ikarus
3ecc3b231a
fix: misleading indentation
2017-11-22 23:08:50 +01:00
iceman1001
f906cb7f89
chg: 'hf mf sim' @piwi's changes part 1
2017-11-11 22:41:52 +01:00
iceman1001
92f37c4c22
chg: 'apdu' @merlokk changes
...
chg: @piwi's changes to timing
chg: @piwi's changes to rats.
2017-11-11 22:39:13 +01:00
iceman1001
a4069fe2aa
chg: code cleaning
2017-11-11 22:34:34 +01:00
iceman1001
c74360a629
chg: 'hf 14b' deviceside cleaning
2017-11-11 01:32:58 +01:00
iceman1001
8f4c96cc81
chg: 'lf hitag' - don't send garbage (@marshmellow42)
2017-11-11 01:31:45 +01:00
iceman1001
c3403da76c
chg: 'hf felica' adjustments
2017-11-11 01:26:53 +01:00
iceman1001
b01f3d2352
syntaxt sugar
2017-10-30 22:20:41 +01:00
iceman1001
db56ca11a3
FIX: detect noise signal by measuring amplitude of signal.
2017-10-30 19:18:30 +01:00
iceman1001
05991cdffb
sloppy
2017-10-30 15:12:03 +01:00
iceman1001
deeb56f09c
fix: 'hf mf hardnested' : without sending dummy answer, the can't select tag comes..
2017-10-30 15:02:44 +01:00
iceman1001
0520d42f3d
revert back..
2017-10-30 12:22:02 +01:00
iceman1001
6e46822c4c
CHG: mcIdent now turn on/off readerfield.
2017-10-30 12:05:14 +01:00
iceman1001
0ea06dbe9b
CHG: spelling misstake
...
CHG: code cleanup. unused function.
2017-10-30 12:02:57 +01:00
iceman1001
f805fe995b
fix.. don't ask..
2017-10-29 11:23:26 +01:00
iceman1001
bc131dd105
fix: high and low variable should now contain raw hex.
2017-10-29 11:20:10 +01:00
iceman1001
0ef6e190e7
fix. missing variable and semicolon
2017-10-29 10:40:39 +01:00
iceman1001
6aec2f5951
FIX: spelled wrong. downside with working in notepad++
2017-10-29 10:38:49 +01:00
iceman1001
573a312130
fix: removed a refence to missing file
2017-10-29 03:53:09 +01:00
iceman1001
2e32fd289c
ADD: StandAloneMode LF Proxbrute by @brad-anton
...
https://github.com/brad-anton/proxbrute
--adjusted to fit iceman fork and latest enhancements to LF
(untested)
2017-10-29 03:51:07 +01:00
iceman1001
c1f742dfe5
CHG: updade some define and helptext
2017-10-29 03:47:00 +01:00
iceman1001
fab1b64760
ADD: standalone mode : LF HID corporate 1000 bruteforce by @federicodotta et al.
...
https://github.com/federicodotta/proxmark3
--adjusted to fit iceman fork and latest enhancements to LF
(untested)
FIX: some calls to deviceside demods, use 0 instead of reference.
ADD: timeout after n cycles of simulating
2017-10-29 03:26:46 +01:00
57ca2b96b7444cb986b2d6cf51d25ffd86c57743
34b076f7af
Enclosed naked statements with braces to avoid C compliler misleading-indentation 'guard' warning.
2017-10-23 17:37:29 -04:00
iceman1001
9e527537c6
fix: remove compile warnings (@winguru)
2017-10-23 21:19:46 +02:00
iceman1001
4bfc3ca8c9
CHG: part of @piwi changes
2017-10-23 21:17:59 +02:00
Iceman
b6d68ec0aa
Update readme.md
2017-10-22 17:00:53 +02:00
iceman1001
55e87490cf
fix: remove all traces of fpga_nfc...
2017-10-20 22:01:10 +02:00
iceman1001
4b48e63ccc
ADD: missing felica.c
2017-10-20 20:30:17 +02:00
iceman1001
4b63f940f1
CHG: FeliCa implemenation by @satsuoni
2017-10-20 20:27:44 +02:00
iceman1001
3108293c1f
ADD: New standalone mode by (@cjbrigato) Excellent work!
2017-10-20 15:29:33 +02:00
iceman1001
a9bf084916
chg: Shortend a wait. Not sure why we wait here.
2017-10-20 14:51:12 +02:00
iceman1001
dc7473135c
syntax cleaning
2017-10-17 22:05:52 +02:00
iceman1001
d46955e309
FIX: bootrom - flashmode should also not assume sizeof(usbcommand) 544 bytes
2017-10-17 21:14:36 +02:00
iceman1001
16028f7d33
CHG: appmain now calls cmd_recieve as it should
...
CHG: flasher - removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client, wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes. usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
2017-10-17 20:58:17 +02:00
iceman1001
71a500d824
CHG: 'hf mf fchk' - no need to send dummy coomand to trigger timeout.
...
CHG: 'hf mf fchk' - added some debugstatements. These will become optional later.
CHG: 'hf mf fchk' - lower re-try from 10 to 5
2017-10-12 15:17:10 +02:00
iceman1001
2fc88b924d
CHG: increased time to powerup tag
2017-10-12 15:14:41 +02:00
iceman1001
a41cdf803a
ADD: add the fpga part to arm.. (@satsuoni)
2017-10-11 12:48:37 +02:00
iceman1001
1cca109429
chg: validating we got a full usbcommand (512b)
2017-10-11 12:48:04 +02:00
iceman1001
ce5525bc16
chg: 'hf iclass simulate' adjustements
2017-10-08 15:11:38 +02:00
iceman1001
674db8d5ac
fix: 'hf snoop' - buffer overflow (@satuoni)
2017-10-08 14:56:04 +02:00
iceman1001
2ca0ea8cb4
ADD: 'hf mf fastchk' - new command, improved check keys functionality. It uses a bunch of techniques to get a speedup.
...
Using a dictionary file with 421keys,
Current implementation of checkkeys takes 300 sec.
This implementation of checkkeys takes 250 sec.
I implemented it as a separate command so it will be easier to compare between the old and new checkkeys.
Its also doing much on deviceside, which is a step to much funnier standalone modes :))
2017-10-05 16:00:56 +02:00
iceman1001
a4b4a1a9a2
FIX: iso-14443a RATS optional (piwi)
2017-10-01 22:06:06 +02:00
iceman1001
d412a8aa2c
FIX: one dot wrong
2017-09-28 22:33:26 +02:00
iceman1001
4dccc340ae
correcting the standalone addons pathing.
...
adding some comments on standalone problematics
2017-09-28 22:33:03 +02:00
iceman1001
1285f5a32c
minor adjustments. return instead of goto
2017-09-28 22:30:33 +02:00
iceman1001
2d283c42a6
FIX: ISO15, increased reading distance by letting tag some time to powerup.
2017-09-27 12:12:43 +02:00
iceman1001
834a80dcc1
chg: 'hf iclass sim' even with sim2, the card should answer to reads of block0,1,2 and 5
2017-09-26 17:06:13 +02:00
iceman1001
b0bf1faa3d
CHG: 'EMV' , at least it compiles, however working that is a completely different issue..
2017-09-19 19:49:47 +02:00
iceman1001
14550557be
CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation.
...
* client/Makefile
* common/Makefile.common
2017-09-18 22:33:22 +02:00
iceman1001
28f1f23d48
chg: easy printing of MAKE variables
...
Usage::
make print-FLASHTOOL
cd bootrom; make print-APP_CFLAGS
cd client; make print-GCC_VERSION
2017-09-18 18:59:51 +02:00
iceman1001
3839ce006d
fix: added missing emv function. WITH_EMV compiles now.
2017-09-18 18:38:54 +02:00
iceman1001
f96afe0ce7
chg: emv compilation, will it work better on OSX?
2017-09-17 19:24:04 +02:00
iceman1001
b439c76c6e
CHG: changed name on define. Its now called CMD_UPLOAD_SIM_SAMPLES_125K .. Since we upload to device.
2017-09-14 11:13:10 +02:00
iceman1001
635636a267
chg: 'hf 15 sim' - made debugstatements optional (follows DEBUG flag now)
2017-09-14 11:09:21 +02:00
iceman1001
0c2c6f3fd7
CHG: 'hf mfdes info' : Now checks for 7b uid's. This will remove some faulty claims of tagidentifications.
2017-09-14 11:06:49 +02:00
iceman1001
98bc685632
add: 'hf iclass sim 4' - new mode, to adapt sim 2 to readers in keyroll mode.
2017-09-12 08:45:38 +02:00
iceman1001
e042ba5432
fix: BUTTON_PRESS needs...
2017-09-05 10:36:25 +02:00
iceman1001
2c1e2a9f3a
CHG: 'hf 15 findafi' - added the possibility to cancel loop with buttonpress
2017-09-05 10:31:27 +02:00
iceman1001
e69d070596
fix: 'hf 15 findafi' switch off antenna afterwards
2017-09-05 10:16:37 +02:00
iceman1001
f21555b1b2
fix: stack corruptions. keep it simple. (coverty scan 170498, 170497, 170496)
2017-09-05 10:10:24 +02:00
iceman1001
85b1c6bdfb
add: 'hf 15 list' is now possible, since I like to be able to call both "hf list 15" and "hf 15 list"...
...
chg: 'hf list 15' better annotations, the flags doens't define the command anymore
chg: device side, iso15, experimenting with different settings.
The tag still doesn't answer to 0x002B not 0x202B---uid--- commands.
2017-09-04 22:48:35 +02:00
iceman1001
ec07e2e006
FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start.
...
sample:
hf 15 reader
hf list raw
2017-09-04 13:56:57 +02:00
iceman1001
eec5780b62
chg: minor clean up in iso15693 commands.
2017-08-31 13:24:12 +02:00
iceman1001
4d354f75fe
upd - CHANGELOG.md
...
chg 'hf iclass sniff' more debugstatements
2017-08-30 22:35:35 +02:00
iceman1001
a971c03877
chg: the version text layout
2017-08-29 08:46:26 +02:00
iceman1001
292a4ca602
'hf 14b sniff' - removed stuff which wasn't very useful. cleaner now. Not sure if it works :(
...
'hf iclass sniff' - playing with this one. Don't expect it to work yet :(
- increase dma_buffer_size to 256
- moved initialization to a own function. Just looks cleaner :)
- change the debug output to follow MF_DBGLEVEL
'hf mf sniff' - unnecessary cast removed
2017-08-27 19:41:24 +02:00
iceman1001
8581fec47c
...added the standalone folder..
2017-08-26 13:01:35 +02:00
iceman1001
fda4a25f51
and some more adjustments..
2017-08-26 12:59:10 +02:00
iceman1001
94f70caa7a
when you need to add too much changes at the same time...
...
fix: 'hf mf hardnested' test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside, a more unified way, so we don't forget to turn of the antenna ...
chg: renamed 'hf iclass snoop' into 'hf iclass sniff' in an attempt to make all sniff/snoop commands only SNIFF
chg: 'standalone' -> starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
2017-08-26 12:57:18 +02:00
iceman1001
7810dac62d
CHG: not using the parity values for logging. Saves some few ticks :)
2017-08-21 23:34:11 +02:00
iceman1001
a7441c4bf6
CHG: added some more debugstatements,
...
CHG: 'hf iclass sim 2' use another e-purse value {0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff}
CHG: testing to see if we can skip the parity array when logging, we don't seem to use that information anywere anyway.
CHG: no need to check tracing global var, it is done inside of LogTrace function anyway
2017-08-21 17:22:22 +02:00
iceman1001
269b89373d
chg: testing another loop style
2017-08-21 17:18:24 +02:00
iceman1001
a8334d6ab3
chg: added some WDT_HIT calls
2017-08-21 17:17:43 +02:00
iceman1001
4eda2828c8
fix fiddling, it seemed most iclass commands never shut down the antenna after they were finished. I may have missed something.
2017-08-19 19:50:55 +02:00
iceman1001
823a814cf6
FIX: some possible null - ref bugs in 'iclass' , 'iso15693' deviceside.
...
FIX: 0 is not a reference.
FIX: iso15693 - wait wasn't implemented
chg: 'hf 15' getTagInfo_15 renamned.
chg: 'hf iclass loclass' some output got newline
2017-08-19 09:49:41 +02:00
iceman1001
db515ba6c4
chg: 'hf iclass sim' - turning of antenna after simulation is done.
...
chg: 'hf iclass sim' - use @holiman 's 8 csn instead of the original @carl55 (15), and a new first entry csn, to see if the old one got blacklisted.
2017-08-18 10:23:46 +02:00
iceman1001
eae8c2f7be
chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same.
2017-08-11 20:48:54 +02:00
iceman1001
6ad546fa13
chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c
2017-08-11 11:40:25 +02:00
iceman1001
bd4d1ec74e
Fixes: lf simpsk - make sure Carrier input is ok.
...
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim' - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim' - Helptext
lfdemod.C got some reworked loops, still some debug messages to be ...
2017-08-10 14:19:57 +02:00
iceman1001
f56d00bf1d
chg: 'lf sim' on deviceside, removed the usb_poll in one loop. Will look into @marshmellow42 limit also
2017-08-09 09:28:54 +02:00
iceman1001
9d8cfd13a7
NEW: cleaning up in the StandAloneMode mods.
...
'hw version' - added a function to print out which mods is installed on the firmware (deviceside)
New compiler flags are:
# -DWITH_ICEMAN
# -DWITH_LF_SAMYRUN
# -DWITH_LF_PROXBRUTE
# -DWITH_LF_HIDCORP
# -DWITH_HF_YOUNG
# -DWITH_HF_MATTYRUN
The code behind them are NOT in this commit. They will come in there own files later on.
2017-08-06 16:29:29 +02:00
iceman1001
722d8b2cdb
chg: more adjustments to iso15 sim
2017-07-31 18:24:53 +02:00
iceman1001
479a288543
chg: 'hf 15 sim' - now it loops until buttonpress or usb_received.
2017-07-31 17:55:21 +02:00
iceman1001
0a58e8f0fe
CHG: macro T5555_SET_BITRATE is used for clearity
2017-07-31 16:05:33 +02:00
iceman1001
91898babc0
FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples.
...
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read' now read does the same as all other LF, and demod too...
2017-07-30 21:21:02 +02:00
iceman1001
bf5b7e2d91
coverity scan, uninitialized vars.
...
removed crapto1.
2017-07-30 10:33:40 +02:00
iceman1001
b3f787a64f
fixes: armside
2017-07-30 10:01:30 +02:00
iceman1001
f28da2da6e
monster merge...
...
all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
iceman1001
208550823d
FIX: 'lf simulate' - wrong fix, the simulation doesn't work very well, but now it looks better...
2017-07-29 00:34:21 +02:00
iceman1001
9ca75c1cfd
disable some debug output
2017-07-28 03:00:28 +02:00
iceman1001
46a0ec7130
CHG: removed old TRUE/FALSE defines... some left still..
2017-07-27 09:28:43 +02:00
iceman1001
24d332fac7
fixes..
2017-07-11 18:27:59 +02:00
iceman1001
cdc0f15104
FIX: playing with some delays.
2017-07-11 17:40:29 +02:00
iceman1001
8bc17414fd
new coverity scan complains..
...
fix 'lf hitag' bit comparisions wrong
fix 'standalone mode' logically dead code
2017-07-07 15:45:40 +02:00
iceman1001
4406f4ee2a
CHG: removed some #DEFINE TRUE/FALSE
2017-07-07 12:52:51 +02:00
iceman1001
5f18400cbe
FIX: 'hf iclass reader' marshmellows fixes.
...
CHG: removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001
77c98eb2d7
FIX: 'hf standalone mode' - had some printing issues when printing a Uin64_t.
2017-07-07 12:34:57 +02:00
iceman1001
ce56dd32e3
FIX: 'hf mf c*' works both with 1a/1b generation of tags.
2017-07-07 12:34:20 +02:00
iceman1001
3ca3d401c0
FIX: some adjustments to prng detection
2017-07-04 20:11:25 +02:00
iceman1001
a7e677061a
FIX: 'hf 14a sim' - mifare ul-ev1 simulation didn't follow protocol, (thanks to @Vyacheslav for pointing it out)
...
ref: https://github.com/iceman1001/proxmark3/issues/110
FIX: 'hf 14a raw' - zero lenth commands and AppendCrc14443a doesn't work well together.
FIX: 'hf 14a raw' - made clear comments and making params comparing as it should be.
FIX: 'hf 14a raw' - when selecting tag, and it failed, the PM3 device was left with antenna on. This has now been fixed as it turns off antenna and leds.
2017-06-26 21:36:56 +02:00
akileos
1c1926a42c
Merge pull request #1 from iceman1001/master
...
Merge latest changes
2017-06-03 11:35:30 +02:00
Iceman
9f3d7bbe29
Update hfsnoop.c
...
Fix increment on bool variable (#294 ) (thanks to @ikarus23)
c87c452120
2017-05-29 09:49:02 +02:00
BOURDY Romain
7b8cbd38a8
Appveyor - Add strawberryperl / readline / libusb
2017-05-01 09:16:22 +02:00
iceman1001
f7639bc338
FIX: lf sim
was broken since my little tests. Should work again.
2017-03-27 14:59:49 +02:00
iceman1001
e1778858dd
FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to @Tiberius and @aczid for pointing out one of my mistakes from 2014.
2017-03-24 21:03:09 +01:00
angelsl
ece631fd06
Add Mifare Classic EV1 set load modulation command
2017-03-09 21:37:16 +08:00
iceman1001
57e1e31dce
chg: unused .. but not for long
2017-03-06 19:15:01 +01:00
iceman1001
57778a4630
CHG: renamed struct sector -> sector_t
...
CHG: defines on armside
CHG: #define WIN32 -> _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
2017-03-06 19:11:08 +01:00
iceman1001
8eeb3c6a0b
CHG: And that should be everything cleaned up with unneed functions and calls.
2017-03-06 11:53:55 +01:00
iceman1001
7dfa1b021e
CHG: breaking, forgot some..
2017-03-06 11:50:26 +01:00
iceman1001
00baf27097
FIX: since the correctionNeeded logic changed, with PR #87 ( https://github.com/iceman1001/proxmark3/pull/87 ) this is the consequence changes to it.
2017-03-06 11:27:15 +01:00
Timo Hirvonen
17ab9dcca0
Improved logic for determining the correct Frame Delay Time (FDT) value based on the last bit transmitted by the PCD
2017-03-06 11:39:12 +02:00
iceman1001
dfcf20d641
FIX: Coverity Scan fixes to emvcmd.c among others.
...
FIX: emclearmem bug.
2017-03-05 18:43:06 +01:00
iceman1001
bdeac4021a
CHG: @marshmellow42 's XL size, and em4x05 timmings.
2017-03-04 14:37:26 +01:00
iceman1001
99136c6eef
CHG: finalized the merge between peter filmoores 14atagfuzz branch (emv). I seriously doubt anything works.
2017-03-01 21:51:23 +01:00
iceman1001
c24364a8a4
FIX: @marshmellow42 's ST detection fix.
...
FIX: lfops.c and em4x05 command timings.
2017-02-28 19:20:12 +01:00
iceman1001
f24edfec54
CHG: hf 14a read
- started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client.
...
FIX: `lf read` - ophs.. it works again.
ADD: `lf em 4x05--` - added a chipset definition
CHG: better kali fix - from @pwpivi
2017-02-28 08:16:02 +01:00
iceman1001
8db18d2f15
ADD: hf 14a read
- now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer.
2017-02-27 19:18:38 +01:00
iceman1001
aa5cba4ca3
CHG: coverity scan cpmplains..
2017-02-26 00:40:19 +01:00
iceman1001
d24026ade8
BUG: forgot to remove
2017-02-25 23:14:55 +01:00
iceman1001
d32691f1da
FIX: hf mf sim
- authentication works again.
...
CHG: `lf em`- renamed.
CHG: removed functionality in whereami.c, not needed.
2017-02-25 23:00:20 +01:00
iceman1001
17556415a9
CHG: @marshmellow42 's changes to lfops.c /lfsampling.c
...
CHG: updated CHANGELOG.md
2017-02-24 15:45:24 +01:00
iceman1001
5215a87442
CHG: @Marshmellow42 's fixes. ref: e88096ba25
2017-02-24 01:14:47 +01:00
iceman1001
07bc72b880
CHG: continue code cleanup.
...
REM: removed stdint.h , since we are using c99 when compiling.
2017-02-23 00:32:14 +01:00
iceman1001
9c624f67b3
chg: @piwi's code cleanup and some more.
...
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
4ac9f07840
CHG: lf em
- added @marshmellow42 's changes
2017-02-19 00:12:35 +01:00
iceman1001
c930078036
FIX: wrong variable name.
2017-02-15 02:46:09 +01:00
iceman1001
1bfbe92a53
FIX: coverity scan found some bugs in EMV code. These are the fixes to:
...
-CID 141293 - missing va_end call
-CID 141290 - return var not always given a value
-CID 141289 - array out of bounds write. off by one.
-CID 141288 - dead code because of CID 141287
-CID 141287 - wrong mask
-CID 141286 - wrong mask value
2017-02-15 02:44:34 +01:00
iceman1001
573e8d72c7
FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct.
...
- armsrc/Makefile when commenting out functionality, move it below the comment otherwise APPS_CFLAG breaks to early. See WITH_LCD
- common/Makefile.common enable / disable EMV, uncomment two lines. then make clean && make all. flash, MIGHT NOT work on 256kb devices
FIX: missing break in appmain.c made it go to iclass function..
2017-02-13 15:32:48 +01:00
iceman1001
4c8fe2e976
CHG: some minor adjustments.
2017-02-13 11:06:30 +01:00
iceman1001
ff9c043da2
FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands. (RF-2/2) ie: ((64-2)>>1)
...
ADD: Marshmellow42 's timing fixes for em4305.
2017-02-13 10:58:28 +01:00
iceman1001
cb1ba30a5e
FIX: first attempt to clean up EM4x50 commands.
...
- `lf em4x readwordPWD` merged into `lf em4x readword` See help text
- `lf em4x writewordPWD` merged into `lf em4x writeword` See help text
- `lf em4x readword` now download the collected signal data after command.
On device side the lfops.c has gotten some love. Code cleaner, increased EM_START_GAP from 55 FC to 56 FC, because of how our microsecond(us) clock works with 21.3us increments.
TODO: `lf em4x em4x50read` needs to be factored to use @marshmellow42 's ASKdemod instead of trying to do itself.
2017-02-07 22:26:06 +01:00
iceman1001
5ed5e418c9
CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate. For Linux/Win. Works great in my environments.
2017-02-06 02:33:08 +01:00
iceman1001
1903696e2a
chg: uncomment -DWITH EMV to compile for EMV.
2017-02-06 00:57:31 +01:00
iceman1001
60ca588725
syntax sugar
2017-02-06 00:51:06 +01:00
iceman1001
d627a2fd8c
FIX: commented code screws up notepad++ groupings.
2017-02-06 00:50:37 +01:00
iceman1001
a32e8034e0
FIX: get rid of de-referecing pointer warnings.
2017-02-06 00:49:32 +01:00
iceman1001
6a1687cc3e
ADD: 'hf emv' - forgot to add some file
2017-02-05 22:16:50 +01:00
iceman1001
3e83ff2159
CHG: '-DWITH_EMV' - fixing some compilation errors when compiling with peter fillmore's emv code. Warning a 256kb Proxmark3 device will only have 7% memory left if you enable this
2017-02-05 21:09:36 +01:00
iceman1001
a330987de1
CHG: 'lf cotag demod' - now finds FC/CN Thanks to @marshmellow42
...
CHG: 'lf search' - now detects COTAG
2017-02-02 19:15:36 +01:00
iceman1001
5f5b83b743
ADD: 'lf cotag read' - COTAG can be read now.
2017-02-02 15:32:21 +01:00
iceman1001
4401050bcc
ADD: 'hf standalone 14a mode", added "mifare 4k" detection.
...
ADD: 'hf 14a sim' - added mifare 4k simulation.
2017-02-01 14:41:06 +01:00
iceman1001
507afbf3e6
CHG: 'lf cotag read' - it now follows "lf config" settings when collecting signaldata.
2017-02-01 14:11:11 +01:00
iceman1001
d760c7b3d9
FIX: 'standalone_14a mode' - cleaned up the standalone14a mode code. It now detects and simulates 4,7byte uids, like it should. code refactored to be easier to understand.
2017-02-01 14:09:26 +01:00
iceman1001
16cfceb689
CHG: rename a local scope variable "data"->"cmd"
...
CHG: call params to selectcard too few
CHG: 'standalone HF mode' - when copying second UID onto data array, it should append after first one, not over the first one.
ref: https://github.com/iceman1001/proxmark3/issues/77 Lets see if this fixes the HF part of this issue
2017-02-01 12:50:54 +01:00
iceman1001
b828a4e168
CHG: 'lf snoop' - now automatically downloads samples after finished. (annoying step to do over and over)
...
FIX: 'lf snoop' - now turns of LF antenna after snoop.
FIX: 'lf cotag read' - now waits until the ACK cmd arrives before downloading samples.
2017-01-31 16:11:57 +01:00
iceman1001
84bdbc1917
FIX: 'hf 14a sim x' - adjusted and shows messages when verbose.
...
FIX: 'hf mf sim x i' - same as above.
In general we only use Moebius attack for "sim x", that means a clean up on device side code. simpler to understand. It still tries to gather 8 different collections of nonces combo. When one is complete, it get sent to client which runs moebius direct.
2017-01-29 23:09:23 +01:00
iceman1001
7e735c1398
FIX: 'hf 14a sim x' - this fixes the error with using moebius attack and sim. Updating the nonce variable doesn't change the premodulated response. And it should update everytime it gets a command. One concering issue is that this takes time. Successfully works with two PM3. One acting reader, another sim.
2017-01-29 11:29:15 +01:00
iceman1001
e99acd00cc
CHG: the mifare Auth command can make use of a random nonce aswell.
...
CHG: since sim commands are timing critical, I'm testing a smaller prand prng function from Intel
2017-01-29 10:41:48 +01:00
iceman1001
4653da4331
ADD: lf cotag
- added first try at basic functionality to read samples from Cotag. In lfops.c is the startup sequence that needs to be tested out.
2017-01-27 10:49:34 +01:00
iceman1001
74dde713b1
CHG: should remove the OSX linker warning: ld: warning: directory not found for option '-L/opt/local/lib'
2017-01-26 21:13:17 +01:00
iceman1001
2d3f8e5fa7
ADD: some defines to make headerfiles behave better.
...
CHG: syntax sugar
2017-01-26 14:23:05 +01:00
iceman1001
bf5d7992ce
ADD: @micolous random nonce, adjusted to fit in. Icemanfork only uses Moebius attack, so no need for an extra parameter in client.
...
ref: https://github.com/Proxmark/proxmark3/pull/209
2017-01-26 14:21:51 +01:00
iceman1001
de39bf505a
CHG: moved some from THUMB to ARM.. Looks like usb communication became bad.
2017-01-25 13:00:49 +01:00
iceman1001
0ccf8adac4
CHG: moved to header file
2017-01-25 00:34:00 +01:00
iceman1001
53d5dc643f
CHG: fiddled with the headerfiles... and makefile... Tried to make them behave nice. So it isnt a hell to add new functions from third-party (like des, aes etc)
...
Added a lot of #ifndef , extern C,
Move inside from ARMSRC -> THUMBS, which made the compiled image smaller.. I don't know if it broke anything.
Moved MF_DBGLEVEL definitions into common.h
Moved print_result from util.c into appmain.c
Also split up some struct typedef into header files so they could be reused in other code places.
''' danger ''' this might have broken stuff...
2017-01-25 00:33:03 +01:00
iceman1001
0de81725ed
syntax sugar
2017-01-21 11:34:33 +01:00
iceman1001
0f7279b22d
syntax sugar
2017-01-21 11:33:14 +01:00
iceman1001
7dcd37fc2e
chg: moved to header file
2017-01-21 11:29:16 +01:00
iceman1001
0062cc1ca1
removed unneeded include
2017-01-21 11:21:05 +01:00
iceman1001
5b749dcb0e
CHG: moved to header file
2017-01-21 11:20:26 +01:00
iceman1001
8be98f12e9
syntax sugar
2017-01-21 11:07:44 +01:00
iceman1001
897a14c36f
CHG: moved to header file. common.h has RAMFUNC definition
2017-01-21 11:06:48 +01:00
iceman1001
3c345a41b2
chg: moved to header file
2017-01-21 10:35:59 +01:00
iceman1001
8ce95353de
CHG: moved to header file
2017-01-21 10:34:00 +01:00
iceman1001
405944a0ac
CHG: moved to header file
2017-01-21 10:31:54 +01:00
iceman1001
5e1de05ab0
chg: moved to header file
2017-01-21 10:29:49 +01:00
iceman1001
0eea62d4c3
CHG: moved to header file
2017-01-21 10:29:21 +01:00
iceman1001
15d4bf3e78
CHG: moved to header file
2017-01-21 10:28:14 +01:00
iceman1001
e04f23fabf
CHG: moved to header filer
2017-01-21 10:27:06 +01:00
iceman1001
995c94dc03
CHG: moved to header file
2017-01-21 10:25:29 +01:00
iceman1001
00e524aaf5
CHG: moved to header file
2017-01-21 10:24:06 +01:00
iceman1001
69784c3801
ADD: 'lf search' - added @marshmellow42 's hitag2 identification
2017-01-20 10:09:06 +01:00
iceman1001
9aeda6cbfb
FIX: coverity scan error CID 121781, unused value. error 0x88 will be overritten by 0x00 directly. Don't know if this 0x88 will bug stuff out.... *wildside commit*
2017-01-19 20:21:21 +01:00
iceman1001
10493a0f19
CHG: fix covertyscan error CID 133851, Cardstate can't not be SIM_NOFIELD when it arrives to that switch statement.
2017-01-19 20:18:21 +01:00
iceman1001
42c235e7ef
ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves the same.
...
CHG: removed some "DONE!" device prints..
CHG: unified some "clone" commands output.
2017-01-18 22:54:27 +01:00
iceman1001
1c07ca92c3
CHG: removed a delay in readblock
2017-01-16 22:38:31 +01:00
iceman1001
81b7e89434
CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679
...
CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.
2017-01-16 21:06:51 +01:00
iceman1001
aed36ae5bd
ADD: 'install.sh' blacklist rules installed aswell. run as root to install.
2017-01-16 15:02:10 +01:00
iceman1001
f133389866
CHG: download data from device to client, make a debugstatment when send command failed.
2017-01-16 14:48:26 +01:00
iceman1001
701ad7cb3a
chg: syntax sugar
2017-01-11 23:11:55 +01:00
iceman1001
dd83c4572b
CHG: coverity complains about not reading the value from mifare_send_short
...
CHG: ubuntu 14.04 gcc4.8.4 complains about mem_avail still. Don't know why.
2017-01-09 22:15:36 +01:00
Iceman
6fe5fe8d52
LF sim
...
`lf sim` - use config values for setting the frequency.
2016-12-25 15:25:33 +01:00
iceman1001
55db344f97
CHG: used @marshmellow42 's version to fix lf continuous demod problems.
2016-12-19 16:04:27 +01:00
iceman1001
e4b65f5bc1
CHG: mental note to self, capslock is bad.
2016-12-19 12:53:38 +01:00
iceman1001
61d36d3695
FIX: 'LF IO FSKDEMOD' - no call to turn of the antenna when exit
...
Thanks to @samyk
https://github.com/Proxmark/proxmark3/issues/203
2016-12-19 12:51:21 +01:00
iceman1001
501c666b10
FIX: 'lf hid fskdemod' - no turning of the antenna afterwards.
...
FIX: 'CMD_AWID_DEMOD
Thanks to @samyk
ref: https://github.com/Proxmark/proxmark3/issues/203
2016-12-19 12:48:27 +01:00
iceman1001
f7e98f1fb6
FIX: 'iclass write'
2016-12-07 17:43:13 +01:00
iceman1001
5b8167fb97
FIX: 'iclass write'
...
thanks to prof_abrasive && go_tus
ref: http://www.proxmark.org/forum/viewtopic.php?id=4033
2016-12-07 17:07:23 +01:00
iceman1001
77f3f9ff5c
CHG: "hf mf hardnested" device side should empty bigbuff?
2016-11-16 17:44:08 +01:00
iceman1001
5fba8581f4
CHG: the reset of pcb_num should be before untraditional tags return.
2016-11-16 17:43:08 +01:00
iceman1001
0b53530a10
CHG: "hf mf hardnested" disabled the tracelogging on deviceside during nonce acquiring.
2016-11-07 22:42:57 +01:00
iceman1001
325f26e25d
CHG: removed unused variable
2016-11-03 15:15:25 +01:00
iceman1001
3a051ec10b
CHG: don't consider the respons at all when sending the HALT command.
2016-11-03 15:00:17 +01:00
iceman1001
d209443322
CHG: 'HF MF C*' (chinese backdoor commands) According to douniwan5788 some magic/clone tags answers to the halt cmd and some not. I think I captured his ideas.
...
ref: 13b71e58fd
2016-10-28 20:43:07 +02:00
iceman1001
30daf914ce
FIX: looping logic error, doesn't need to increase with 1, if we do 8 checks every turn...
2016-10-28 13:06:34 +02:00
Michael Farrell
b6e05350b2
hf mf sim: Multiple fixes (iceman1001/proxmark3 #45 )
...
- Fix `hf mf sim` to use nonce_t structures, so key recovery works
- Increases verbosity on the key recovery functionality
- Fix use-after-free for k_sector
- Add help info on `e` option to `hf mf sim`
2016-10-22 21:53:53 +11:00
iceman1001
2dcf60f3df
CHG: "hf mf hardnested" - less printing
...
CHG: some filehandles = NULL.
2016-10-21 16:06:53 +02:00
iceman1001
67cd89033c
CHG: experimenting with 'lf sim' It does send a signal now but...
2016-10-20 17:31:58 +02:00
iceman1001
c528cf3989
TEST: see if the readerfield is needed.
2016-10-20 01:52:26 +02:00
iceman1001
c50259b36a
CHG: added a quitting message
2016-10-20 01:13:18 +02:00
iceman1001
8fd25db30c
CHG: move the call to fpga_bitstream_lf, in order to save the uploaded data from the client. Changing bitstream wipes bigbuffer.
2016-10-20 01:06:17 +02:00
iceman1001
3b5aab1875
CHG: updated some comments. I still think I don't understand this code
2016-10-20 00:42:17 +02:00
iceman1001
f4d7d1fed1
CHG: removed CLOCK2, since its not used in the code.
2016-10-20 00:40:56 +02:00
iceman1001
f0a96745d0
CHG: the AT91C_BASE_PMC->PMC_PCER has a tendecy to be clear when set with "=", but my tickstimer also needs it, so I made it optional now.
2016-10-20 00:40:24 +02:00
iceman1001
49065576ad
FIX: lf sim, seems like "lf sim" call SimulateTagLowFrequency direct from appmain.c and I removed the LF bitstream call thinking SimulateTagLowFrequency was only called from the sub FSK;ASK;PSK commands.
2016-10-20 00:39:15 +02:00
iceman1001
8fd0a564e5
CHG: removed unused clocks,
...
CHG: now uses the DEFINEs instead. a bit clear
CHG: xor in the clocks, should allow for co-exist with SSP clock.
2016-10-19 21:26:29 +02:00
iceman1001
8255e1a685
CHG: just changed the comment.
2016-10-19 21:25:04 +02:00
iceman1001
29ff374e5d
CHG: TI code did have the tickstimer started.
2016-10-19 21:24:20 +02:00
iceman1001
c3fc86d9af
CHG: Xoring in the value allows for the ticks timers to co-exist. Or that is the idea.
2016-10-19 21:23:03 +02:00
iceman1001
4460be68c3
FIX: "lf sim" after changes to ticks timers on device side, there was a "starticks" call missing, which lead to not having any timers which is a problem for the WaitUS call.
2016-10-19 19:59:58 +02:00
iceman1001
b069fb8bba
syntax suger
...
and forgot to add method declaration to headerfile
2016-10-14 15:47:40 +02:00
iceman1001
c7b4bcc4ab
CHG: syntax suger
2016-10-10 21:53:44 +02:00
iceman1001
f8ff1483eb
CHG: "hf legic sim" old imp, uses two timers, we have one. I'm seriously starting on thinking about a UART instead, to read the dmabuffer. If only I knew howto.
2016-10-10 21:52:58 +02:00
iceman1001
c2723575de
CHG; added an option wither or not to clear emulator mem on init
2016-10-09 18:24:51 +02:00
iceman1001
539fd59ebe
CHG: "hf legic write" - now writes on the limits better.
...
CHG: "hf legic restore" - now restors :)
CHG: "hf legic rdmem" - now has a nice offset row above the read data. try: 'hf legic rdmem 0 100'
2016-10-09 15:41:31 +02:00
iceman1001
cd79d97223
CHG: syntax suger
2016-10-08 19:14:35 +02:00
iceman1001
8ddfbc34dc
CHG: the call to TurnReadLFOn has a delay / number as parameter. Seems to be gone.
...
FIX: fixes to EM4050 code since when I changed the timer. It should work nice now.
2016-10-08 19:12:51 +02:00
iceman1001
7e7d3de5fa
FIX: looks like "hf legic write" works again!
2016-10-07 23:07:59 +02:00
iceman1001
4409bf6ef3
CHG: "hf legic write" with these I managed to get one byte written. Its a start.
2016-10-07 22:16:38 +02:00
iceman1001
715bed5023
CHG: adjustments to 3.6ms
2016-10-07 21:28:09 +02:00
iceman1001
c2ab5e8c4e
FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command
2016-10-07 20:23:57 +02:00
iceman1001
e4d57949df
FIX: wrong log bytes...
2016-10-07 19:15:08 +02:00
iceman1001
b816886806
FIX: one send command bug fixed. Turns out that uint16_t is too small for 21/23bits size. Who figured?
2016-10-07 19:11:38 +02:00
iceman1001
27c4a862f6
FIX: unused variable removed.
...
CHG: start remaking the used timers in "Hf legic write"
2016-10-07 12:23:07 +02:00
iceman1001
f0fa663814
CHG: "hf legic write" got a make over in how its called. Now called with 'offset' and 'data'
...
'hf legic write o 10 d 11223344' - this will write 4 bytes (0x11,0x22,0x33,0x44) to tag from offset 10 (0x0A)
2016-10-07 11:58:14 +02:00
iceman1001
e4a8d1e2ac
CHG: started the process of fixing "hf legic write" and "hf legic sim" commands.
2016-10-07 00:15:47 +02:00
iceman1001
d41efbf21b
ADD: added a StopTicks functions, to disable the timer used for ticks (TC0, TC1)
2016-10-07 00:13:09 +02:00
iceman1001
0e8cabed8d
ADD: "hf legic eload" - Load binary file to emulator memory. Use "h" for help text
...
ADD: "hf legic esave" - Save emulator memory to binary file. Use "h" for help text
2016-10-06 19:13:23 +02:00
iceman1001
9015ae0f5d
CHG: "hf legic dump" now automatically detects tagtype and dumps accordingly.
...
CHG: still #define codestyle should it be with or without semicolons?
2016-10-05 22:58:06 +02:00
iceman1001
b1cd7d5ca6
FIX: one too many semicolons for #defines
2016-10-05 22:18:26 +02:00
iceman1001
00271f774a
FIX: undeclared var on deviceside,
...
FIX: "hf legic dump" is almost there.
2016-10-05 22:07:32 +02:00
iceman1001
633d068682
CHG: command name changes..
...
old "hf legic info" is now "hf legic reader"
old "hf legic read" is now "hf legic rdmem"
old "hf legic decode" is now "hf legic info"
ADD: new command "hf legic dump", which will autodetect tagtype and dump all mem to a binary file.
2016-10-05 21:42:13 +02:00
iceman1001
635d6e9bef
CHG: code clean up
2016-10-05 17:10:29 +02:00
iceman1001
c15e07f11d
CHG: making timings a bit tighter == faster read of tag. Like 1ms for whole tag.
...
FIX: off-by-one bug in read-byte-loop.
2016-10-04 23:08:39 +02:00
iceman1001
7a8db2f678
CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes a bit of time
2016-10-04 21:26:19 +02:00
iceman1001
86087eba00
Textual changes in helptext. Still no clear.
2016-10-04 18:43:11 +02:00
iceman1001
7bc3c99e7e
CHG: "hf legic write" started to change this command to the updated code
2016-10-04 18:05:55 +02:00
iceman1001
77a689dbeb
CHG: revert legiccrc8 to old algo.
...
CHG: "hf legic decode" now loads EML memory
CHG: legic timings is better.
2016-10-04 00:07:07 +02:00
iceman1001
0b0b182fe2
CHG: changed to use BigBuff_Eml memory instead of big_buff_malloc.
...
CHG: downloading eml memory from device should use uint's
CHG: "hf legic read" has a different printing. It now prints 32bytes / row
2016-10-03 23:24:59 +02:00
iceman1001
c649c43389
CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.
2016-09-29 21:36:43 +02:00
iceman1001
fabef615ec
CHG: added addresize to legic select struct.
...
CHG: TIMER, it turns out the TC0, TC1 and TC2 is only 16bit. So adjust to use two clocks to get a 32bit timer.
CHG: code clean up in legic device side. consistency with variable names..
2016-09-29 17:43:39 +02:00
iceman1001
cb7902cdcd
CHG: removed some debug data
...
CHG: reverted back to old crc imp.
2016-09-29 14:46:12 +02:00
iceman1001
a39944216d
CHG: a select_legic function with structs and stuff and
2016-09-29 12:23:09 +02:00
iceman1001
d7e24e7c5f
CHG: 'hf list legic' doesn't print the parity now.
...
CHG: 'hf legic read' the device side timings is starting to look much better. HUGE Thanks to @will-rbnt for endless checks and logic analyser feedback. Without his effort this would not work. What does work? We can now use ANY IV in legic. The PM3 Master version is flawed, will only work with IV=0x55.
---still broke--- my crc implementation.. I know I'm about to look into it.
2016-09-28 21:37:08 +02:00
iceman1001
584e28e54b
CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too long.
2016-09-26 21:40:05 +02:00
iceman1001
62577a62ae
FIX: Much of my added extra legic code is commented away now.
...
FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env..
2016-09-26 20:21:31 +02:00
iceman1001
3e750be37c
ADD: started to add a legic detection to "HF SEARCH"
2016-09-26 20:01:23 +02:00
iceman1001
faabfafe30
CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less.
2016-09-26 12:26:37 +02:00
iceman1001
e1deabc0eb
CHG: fixes a "indent" warning
2016-09-26 11:04:04 +02:00
iceman1001
25d52dd261
CHG: according to measureement by @wilrn the actual timing for receiving tag data, is 90us (ONE) and 100us (ZERO) which is not mentioned anywhere before. What a find!
2016-09-24 15:15:24 +02:00
iceman1001
d5bded10e2
CHG: lowered the timout again, but re-added the spindelay since 14a requires 5ms powerup before entering the idle-state where tag starts to listen.
...
CHG: fix the ticks compare xx > 1 into xx >= 1
2016-09-23 23:23:17 +02:00
iceman1001
f885043422
FIX: "hf 14a read" / "hf mf *" / "hf mfdes info" and failure when calling these commands serveral times in row.
...
For long transactions the sspclock compare with >1 instead of >=1 .. Now the timer resets properly.
CHG: use some #define constants for iso-commands.
2016-09-23 21:28:07 +02:00
iceman1001
24c49d36ba
FIX: This commit fixes the broken LF since I change the spindelay calls. The original problem is that spindelayus calls is incremented with21.3us each step, making it very hard to find exact timings found in the datasheets for T55x7, HID etcetc. When @marshmellow and I looked into this 2014, I had this on my back of my mind but forgot it since I didn't know how the source code / pm3 worked. This behavior in spindelayus has given the bit-period for ON/OFF measured in (us) very hard to find. Its kind of magic that it worked so far so good. Well until I started to look into the "hf legic" bitbanging ASK ON/OFF keying and that one needs a much more precis timer. Same goes for the PCF7931 code.
...
I've added a precise timer in the new files ticks.c and moved some older stuff from util.c to have a solid base for this.
UNTESTED, and the timings measured for t55x7 in lfops.c and other parts has not been adjusted to this "correct" timer.
2016-09-23 16:35:26 +02:00
iceman1001
22f4dca88c
CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c
2016-09-21 19:03:32 +02:00
iceman1001
87342aadbc
CHG: adjusted timing according to @sentinel 's traces
2016-09-14 16:18:04 +02:00
René Werner
1cb9b2a3cf
used tabs instead of spaces
2016-09-13 21:04:13 +02:00
René Werner
78f59945a7
fixed indentation to get rid of warnings
...
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
2016-09-13 20:57:25 +02:00
iceman1001
111c6934d4
CHG: Small steps, the waiting time between frames was unclear. At least now the tags answers to a readbyte command after the setup phase.
2016-09-12 09:19:49 +02:00
iceman1001
76471e5d17
CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks)
...
like it was before. ie: 80us = 80*1.5 = 120ticks.
2016-09-11 11:14:12 +02:00
iceman1001
db44e049b0
CHG: this timing should be quite good. needs to be verified.
2016-09-10 22:47:11 +02:00
iceman1001
b4a6775b5e
CHG: a better micro second (us) spindely function. At average it has 8-10us delay, but its linear. Making error less when you want to wait longer..
...
SpinDelayCountUs(20) gives a delay of 28us.
SpinDelayCountUs(100) gives a delay of 110us.
SpinDelayCountUs(500) gives a delay of 508us.
2016-09-10 21:43:08 +02:00
iceman1001
5d15891e2b
FIX: Even the US clock had the issues with not resetting properly. Now its always ZERO when you call StartCountUS.
2016-09-09 11:57:31 +02:00
iceman1001
ad5bc8cc8c
In my attempts to make the LEGIC code better, its not working now. Timings if off.
...
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
2016-09-09 11:56:20 +02:00
iceman1001
f7b4257301
FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN1024 tag accordingly.
2016-09-03 12:18:02 +02:00
iceman1001
c71c5ee156
ADD: started to add tracelog in legic
...
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
2016-09-02 16:25:54 +02:00
iceman1001
ab1112796e
CHG: removed call to bigbuff free.
2016-09-01 20:31:22 +02:00
iceman1001
2deea574d3
CHG: reverting use of bigbuff, because I forgot that every switch between LF/HF images destroys BigBuff.
2016-09-01 00:52:54 +02:00
iceman1001
05aff802ae
CHG: removed a redundant include to strings.h, which made compilation errors on OS X
2016-08-31 22:10:06 +02:00
iceman1001
cc70dd6b60
FIX: should fix the typedefintion error for OS X regarding bool cmd_send
2016-08-31 21:11:57 +02:00
iceman1001
153a4a78fe
CHG: the loop in main, for usb_poll_validate_length, shouldn't do anything, it should be done inside the next call to usb_read...
2016-08-31 19:22:52 +02:00
iceman1001
8d61d9b114
CHG: this timeout doesn't influence the bad performance with my older pm3 device (green pcb). I think its too slow.
2016-08-31 19:18:48 +02:00
iceman1001
be818b1417
FIX: Forget that the prng was 0x8000 length and not 0xFFFF. Sorry. Also returned to the decomposed loop. Don't know if this armsrc optimises this at compilation time. Does someone know?
...
CHG: returned the iso14443a_setup order, it might influence my older PM3 device.
*Note* my Elechouse revisions PM3 works great with this but my older xpfga (green pcb) is hopeless. It can't fix onto the nonces in 'hf mf mifare' I think its too slow.
2016-08-31 19:17:39 +02:00
iceman1001
cc70889743
FIX: fixes the broken build,...
...
FIX: increased the timeout, to make 'hf mf chk' work better.
2016-08-26 17:17:40 +02:00
iceman1001
f121b478a1
FIX: 'lf awid bruteforce' cleaning up all debug messages
2016-08-26 16:35:30 +02:00
iceman1001
ed8c2aeb63
CHG: forgot a semicolon...
2016-08-24 15:05:10 +02:00
iceman1001
bcacb3168b
CHG: removed some extra time to sync,
...
CHG: first_try , it must recalibrate all the times when it comes from the client.
2016-08-24 15:01:36 +02:00
iceman1001
63a1d80130
FIX: the underlaying bug on deviceside code. The SSPCLOCK wasn't reset to zero sometimes. More specific, TC2 wasn't reset cause all sorts of timing issues for the device side randomly. Like 'hf mf mifare', like iclass, like 'hf mf sim' etc etc.
2016-08-24 12:37:31 +02:00
iceman1001
f38cfd6693
CHG: fixed the collapsing comments when opening this file in notepad++ Need spaces between // text or /* ...
2016-08-24 12:34:34 +02:00
iceman1001
4c44d88500
REM: removed an test function
2016-08-24 12:32:43 +02:00
iceman1001
6067df30c5
FIX: at least now the special zero parity attack, repeats and doesn't crash. However it doesn't find the key either :(
2016-08-10 10:55:29 +02:00
iceman1001
86db8973b0
CHG; still looking at 14b, this time started to look at the tracelog times not working.
2016-08-09 23:13:18 +02:00
iceman1001
c2df2883f8
fix: forgot something small.. sloppy.
2016-08-07 22:15:35 +02:00
iceman1001
29f8c2cc15
ADD: added the 'max frame size' parameter set, valid sizes: 16|24|32|40|48|64|96|128|256
...
it can be verified by setting debuglevel to 3 or more.
2016-08-07 22:05:10 +02:00
iceman1001
d8b7a5f294
CHG: applied some of the changes unto "hf 14b snoop" *untested* Hard to test without a proper reader/tag to snoop
2016-08-07 18:49:36 +02:00
iceman1001
b86225188e
CHG: iso14443b.c got some more love. using the "hf 14b raw" command gives now a much stabil read from more distances than before.
2016-08-07 17:49:33 +02:00
iceman1001
df007486f5
ADD: @donwan581 select keytype for the darkside attack.
2016-08-04 21:51:26 +02:00
iceman1001
6b23be6b7e
CHG: cleaning up.
2016-08-04 21:37:43 +02:00
iceman1001
0f6e6b9acb
FIX: coverity scan 133859 structually dead code, looks like this is a rest from and old loop. I just removed it.
2016-08-03 10:53:26 +02:00
iceman1001
c23d2618ba
FIX: mental note to self, don't code when tried. "size" should have been "sizeof". I need to fix my build for armsrc again.
2016-08-03 00:51:26 +02:00
iceman1001
65cdf0e3f9
FIX: Coverity scan 1333852, Make sure (card) is not null before accessing it.
2016-08-03 00:39:02 +02:00
iceman1001
c3e8413c2b
CHG: Some testing of timings on 14443b,
...
FIX: CoverityScan 133854 , out-of-bounds read, when calculating crc.
2016-08-03 00:35:14 +02:00
iceman1001
3e82f956d8
FIX: COverityScan 133865, out-of-bounds access, Forgot that bits is not used in Logtrace but bytes.
2016-08-03 00:25:53 +02:00
iceman1001
bf2cd64406
fix: CoverityScan 133855 -out-of-bounds bits was used as index to cmd array.
2016-08-02 16:04:03 +02:00
iceman1001
955228691e
REM: cleaning up some commented code.
2016-07-30 19:36:48 +02:00
iceman1001
d0724780ab
FIX: Found a minor bug in 'LF CMDREAD' where it on device side didn't compare with the right char 'h' instead of 'H'. Re-wrote that whole part anyway, I changed periods to be max 0xFFFF in length, doubtful that a zero or one delay will be bigger than 65535...
2016-07-30 19:30:53 +02:00
iceman1001
ab3af4fe85
CHG: forgot to add the reflect function
2016-07-28 21:45:00 +02:00
iceman1001
3e134b4c20
CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED*
...
CHG: changed the CRC implementations.
2016-07-28 21:41:44 +02:00
iceman1001
b9b480d081
chg: name error?
2016-07-07 10:01:50 +02:00
iceman1001
a8ee668770
CHG: moved includes into header file where it belong
2016-07-07 02:15:40 +02:00
iceman1001
0a856e292a
CHG: adjusted the debug message to the correct mfkey32v2 with right number of parameters.
2016-06-22 09:35:18 +02:00
iceman1001
118bf0c203
ADD: added a comment about Q5 settings. needs to be verified
2016-05-16 21:41:19 +02:00
iceman1001
6a4271d186
CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it.
2016-05-14 14:34:35 +02:00
iceman1001
c5e8b91696
ADD: AWID 50bit demod
2016-05-13 22:52:25 +02:00
iceman1001
60e26e50c5
FIX: changed from ssized_t -> size_t
...
FIX: changed off_t -> size_t
2016-05-09 08:27:55 +02:00