cjbrigato
719c7fe314
HF_BOG make style
2019-07-24 00:21:35 +02:00
cjbrigato
6614995256
HF_BOG make style
2019-07-24 00:20:00 +02:00
mwalker33
b16f2fdaba
Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg
2019-07-24 08:15:38 +10:00
mwalker33
cdc3787008
clean
2019-07-24 08:12:25 +10:00
Philippe Teuwen
ac233a346a
make style
2019-07-23 23:43:30 +02:00
Colin J. Brigato
e59e0f6194
Typo
2019-07-23 23:42:48 +02:00
cjbrigato
d3633b719f
FIX: Patch HF_BOG standalone for new SPIFFS compatibility
2019-07-23 23:27:35 +02:00
cjbrigato
aeed5e3c26
FIX: Patch HF_BOG standalone for new SPIFFS compatibility
2019-07-23 23:26:26 +02:00
Philippe Teuwen
11e5131604
Merge pull request #284 from mwalker33/master
...
T55x7 Downlink mode support added
2019-07-23 22:42:47 +02:00
Philippe Teuwen
7f57879e45
typo
2019-07-23 21:48:09 +02:00
Philippe Teuwen
544fb30ce6
typos
2019-07-23 21:40:01 +02:00
Philippe Teuwen
9beabaabf5
make style
2019-07-23 21:33:52 +02:00
mwalker33
5de04f84e9
Restored * 8
...
Revert back to store and use the full value (*8) for the timing.
2019-07-23 20:12:05 +10:00
mwalker33
4e0e69ed63
Added T55 downlink mode support
2019-07-23 09:50:28 +10:00
cjbrigato
5c3676ad81
ADD: Early SPIFFS implementation see #257 , UPDATE HF_COLIN accordingly
2019-07-22 22:56:06 +02:00
McEloff
0189bb70d7
Merge branch 'master' into mf_sim_ac_fix
2019-07-19 16:32:45 +03:00
Eloff
0b38c23ed3
'hf mf sim' - wrong access rights to write key B in trailer; typo; simple code optimization
2019-07-19 16:27:08 +03:00
Philippe Teuwen
8e6258936c
make style
2019-07-19 13:18:35 +02:00
merlokk
6e15d6521d
Merge branch 'master' of github.com:merlokk/proxmark3i into apdu_armside
2019-07-18 17:44:50 +03:00
merlokk
e87abc9681
small fix apdu leds
2019-07-18 17:32:56 +03:00
merlokk
1e0433c1d7
now code can't use uninitialized fpga link and encoders/decoders
2019-07-18 17:11:04 +03:00
merlokk
87e183e664
small fix
2019-07-17 16:26:10 +03:00
merlokk
81fa3f20df
speed optimization
2019-07-17 16:22:14 +03:00
merlokk
67ad6298cd
added 14a send/receive arm timeout
2019-07-17 15:54:22 +03:00
Philippe Teuwen
8281d3a384
Fix hf_mattyrun bug introduced in 732bc766f9
2019-07-16 22:47:34 +02:00
Philippe Teuwen
48279e85d9
Fix hf_colin standalone broken by recent include files reorganization
2019-07-16 19:31:59 +02:00
Philippe Teuwen
710b38f209
Move Makefile standalone stuff to armsrc/Standalone for easier access
2019-07-16 19:18:54 +02:00
merlokk
bd8824a2f3
make style
2019-07-16 16:10:11 +03:00
Philippe Teuwen
ed4289d462
Merge pull request #251 from merlokk/reorg_includes
...
added PACKED attribute for structures and reorganize include folder
2019-07-16 14:52:14 +02:00
merlokk
20d13d5509
added PACKED attribute for structures and reorganize include folder
2019-07-16 14:50:38 +03:00
Philippe Teuwen
d8763509de
Add 'hw standalone' to jump to standalone mode from command line or script
2019-07-15 22:31:19 +02:00
Philippe Teuwen
b845404f39
Remove misplaced comment
2019-07-15 22:28:18 +02:00
Philippe Teuwen
0ea7fa7784
buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too
2019-07-15 12:57:20 +02:00
Iceman
23160f20cb
Merge pull request #244 from cjbrigato/patch-1
...
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back…
2019-07-15 11:40:24 +02:00
Iceman
7aabab2462
Merge pull request #242 from slurdge/remove_aes_c
...
Remove aes.c in favor of mbedtls implementation.
2019-07-15 09:02:07 +02:00
Philippe Teuwen
2209a0c00d
BUSY_TIMEOUT for mem wipe was too short, thanks @cjbrigato
2019-07-15 01:13:11 +02:00
Iceman
9196bdc670
Merge pull request #245 from McEloff/hf_mf_sim_auth_nack
...
hf_mf_sim. Really tags not respond NACK on invalid authentication
2019-07-14 22:48:04 +02:00
Eloff
a28e359095
Fix. More flexible anti-collision frame check
2019-07-14 23:18:07 +03:00
Eloff
f6f7e7a9f6
hf_mf_sim. Really tags not respond NACK on invalid authentication
2019-07-14 23:12:39 +03:00
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