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