Commit graph

1435 commits

Author SHA1 Message Date
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