RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-16 06:43:29 +08:00
Code Issues Projects Releases Packages Wiki Activity
8802 commits 3 branches 14 tags 87 MiB
Commit graph

2175 commits

Author SHA1 Message Date
Philippe Teuwen
6ba85af199 quick fix for felica, we can't leave repo broken so long... 2019-10-18 22:42:56 +02:00
Philippe Teuwen
39fd6b1910 coverity: separate crypto1 fcts ARM<>host into create/destroy and init/deinit 2019-10-18 16:58:24 +02:00
iceman1001
5fcb5f0ca5 coverity 226278 2019-10-18 12:46:20 +02:00
iceman1001
3cd053218f chg: wait until ready 2019-10-17 20:08:17 +02:00
Iceman
a5e94c5a1d
Merge pull request #443 from 7homasSutter/master 
Add reader and raw command for FeliCa standard cards
 2019-10-17 14:02:22 +02:00
Philippe Teuwen
945fb82b48 make style 2019-10-17 13:58:22 +02:00
Thomas Sutter
376e367d45 Make Style and remove some comments. 2019-10-17 13:48:34 +02:00
Thomas Sutter
4da87d3f96 Fix Client Response for RAW command. Client should receives now all response octects. 2019-10-17 11:46:59 +02:00
iceman1001
51022d4329 textual 2019-10-16 14:24:23 -04:00
Thomas Sutter
9d3331511b Fix FeliCa select_card. Selection works now for FeliCa standard cards. 
Fix SendRaw data.
Add some new unfinished cmds.
 2019-10-16 14:17:52 +02:00
Philippe Teuwen
8ea04a42a6 Use GetTickCountDelta when possible 2019-10-16 00:03:53 +02:00
Philippe Teuwen
f9157c946d SLCK detection: use more available SpinDelay 2019-10-15 18:53:29 +02:00
Philippe Teuwen
bf3ae7f007 perform startup delay also during TIA 2019-10-15 18:07:28 +02:00
Philippe Teuwen
3fce47d023 Add hw tia to trigger a new Timing Interval Acquisition 2019-10-15 15:02:34 +02:00
Philippe Teuwen
c7d84ce239 hw status: Detect slow clock drift problems 2019-10-15 14:07:20 +02:00
Philippe Teuwen
395d0f9ebf make style 2019-10-13 00:48:26 +02:00
iceman1001
76f7763893 motorola 2019-10-11 23:14:57 +02:00
iceman1001
8416bdb485 coverity 226278 2019-10-10 12:41:12 +02:00
iceman1001
9f54495412 coverity 226214 2019-10-10 11:54:23 +02:00
iceman1001
7435663ea1 coverity 226262 2019-10-10 11:36:28 +02:00
iceman1001
49caa7f962 chg cotag operates on 132kHz. textual 2019-10-10 10:34:56 +02:00
iceman1001
93b3f3e27d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-10 07:36:35 +02:00
iceman1001
f909039d01 frame 2019-10-10 07:34:30 +02:00
Philippe Teuwen
fb1e7879e1 coverity 226393 - missing break in mifaresim 2019-10-09 23:44:46 +02:00
Philippe Teuwen
2024f87ed3 coverity 226201 2019-10-09 22:48:54 +02:00
Philippe Teuwen
bc35a96690 coverity 226497 2019-10-09 21:34:41 +02:00
iceman1001
3361715121 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-09 13:11:26 +02:00
iceman1001
1ec34e00b6 coverity 226386 - fix operands dont.. 2019-10-09 13:05:23 +02:00
Philippe Teuwen
86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
iceman1001
efe5e33acb coverity 226283 - fix out-of-bounds. Maybe a bit too large buffer now. 2019-10-09 12:48:43 +02:00
Philippe Teuwen
98d641dba5 WaitUS/WaitMS: accept uint32_t 2019-10-09 12:06:45 +02:00
Philippe Teuwen
cce039554d Avoid hardcoded lf divisors 2019-10-09 12:05:13 +02:00
iceman1001
a337611708 coverity 226386, u8 can never be larger than 256 2019-10-09 10:59:10 +02:00
iceman1001
8c4a42ff36 consider null termination 2019-10-09 10:36:34 +02:00
iceman1001
fb7728974e strlen checks 2019-10-09 10:33:42 +02:00
Philippe Teuwen
b9424795ea remove unused vars 2019-10-05 20:00:33 +02:00
Philippe Teuwen
3560cf5466 bootrom: remove deprecated CMD_SETUP_WRITE 2019-10-05 19:10:40 +02:00
iceman1001
b8776b593e fix: sneaky bug in magic detection where bigbuf wasnt emptied before next run 2019-10-04 14:21:04 +02:00
iceman1001
ebb2ac6f66 adjusting check button timings 2019-10-04 10:24:04 +02:00
Philippe Teuwen
42cb2a32e8 lf config alone shows current config 2019-10-03 22:11:16 +02:00
Philippe Teuwen
df08e7970c fix divisor<>freq computations, add q to lf tune 2019-10-03 21:18:37 +02:00
Philippe Teuwen
f29ad0fba2 macros for divisors and fix lf optimal freq display 2019-10-03 18:32:27 +02:00
Philippe Teuwen
6df9eea950 voltage config divisor printing 2019-10-03 17:45:43 +02:00
iceman1001
5d3eb444fb chg 'hf mf nested' - uses NG. chg 'hw tune' - now also prints the 'lf config q' divisor voltage. 2019-10-03 16:15:47 +02:00
iceman1001
f142ad139b chg 'lf cmdread' - clientside checks, less wait times on device 2019-09-30 23:18:48 +02:00
iceman1001
fd88d7448e fix 'lf t55xx resetread' - NG and better fault handling 2019-09-30 19:47:36 +02:00
iceman1001
6a83a7dc1a fix 'lf cmdread' - correct report back on failure 2019-09-30 19:28:50 +02:00
Iceman
76b9be1a16
Merge pull request #416 from mwalker33/master 
lf config s <samples to skip> option added
 2019-09-30 13:23:29 +02:00
mwalker33
f5d7963780 lf config s update 2019-09-30 19:41:25 +10:00
mwalker33
40b1d3bea7 samples to skip (unint32_t) 
Use unit32_t for all samples to skip
 2019-09-30 19:22:26 +10:00
mwalker33
c7b3620754 Update lfsampling.c 
Set default for samples to skip
 2019-09-29 11:10:07 +10:00
mwalker33
cf0d72e172 lf sniff offset 
Added samples to skip to lf config
 2019-09-29 10:43:01 +10:00
iceman1001
7c2231974d clean up, explain, lesser tests for buttonpress 2019-09-26 09:54:43 +02:00
iceman1001
3e22d99b03 hf mf darkside uses NG. checkbutton more seldom, shoulded interfere with syncing the prng so much 2019-09-25 10:24:34 +02:00
Philippe Teuwen
891a079989 textual 2019-09-24 14:59:05 +02:00
iceman1001
b2c24c8010 add - continuously measure LF antenna 2019-09-24 13:06:43 +02:00
iceman1001
3e0b93f199 lf hid/io/awid watch - loops 2019-09-22 18:58:49 +02:00
iceman1001
66ccca6457 fix 'lf io watch' - now loops w correct size and crc var. 'lf awid watch' - now loops w correct size 2019-09-22 18:57:52 +02:00
Philippe Teuwen
11dcc4787d mfc magic: add some defines 2019-09-21 23:50:32 +02:00
Philippe Teuwen
6422cc6d13 Fix mfc gen1b/gen1b detection 2019-09-21 23:25:21 +02:00
iceman1001
aa2f80795d mem spibaud uses NG. And a simplification of tuning 2019-09-19 12:13:39 +02:00
iceman1001
21a7de38b8 style 2019-09-19 10:54:34 +02:00
iceman1001
d3651cc075 chg 'hw status' - reply NG.... thanks @cjbrigato 2019-09-17 19:13:00 +02:00
Philippe Teuwen
abe5ca47a5 thinfilm: reduce timeout, no need to wait so long 2019-09-17 17:45:45 +02:00
iceman1001
e5c31886eb chg: 'lf io clone' - refactored, uses NG 2019-09-16 11:41:34 +02:00
iceman1001
4c08477ef7 chg: 'lf indala clone' - refactored , uses NG 2019-09-16 11:33:05 +02:00
Iceman
775394ae58
Update appmain.c 
yet again some my unreleased stuff snuck in..
 2019-09-16 10:21:18 +02:00
Philippe Teuwen
960d8c4db3 add helper fct manchesterEncodeUint32 2019-09-15 02:09:40 +02:00
Philippe Teuwen
359399b2e6 fix hid sim long id length 2019-09-15 02:01:53 +02:00
Philippe Teuwen
59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +02:00
Philippe Teuwen
61098c7716 lf hid sim: use generic FSK sim 2019-09-14 22:44:15 +02:00
iceman1001
2bec009778 chg: 'lf viking clone' - now uses NG 2019-09-14 19:58:17 +02:00
Ludovic Rousseau
f961c1c551 Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
 2019-09-14 17:53:24 +02:00
Ludovic Rousseau
a1852eaa4b Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
 2019-09-14 17:44:58 +02:00
iceman1001
f5bff0d4e5 style 2019-09-13 16:27:25 +02:00
iceman1001
49cd525cf1 style 2019-09-13 16:26:17 +02:00
iceman1001
ffa3e2a0f8 style 2019-09-13 16:25:33 +02:00
iceman1001
1c4c21513b chg samyrun, all leds flash 5times when exiting standalone mode 2019-09-13 14:12:12 +02:00
iceman1001
871445212e chg 'lf proxebrute standalone' - simplified it. No need for clone, or multiple slots, LED A = read / record, flashing LED A 12 times, failed reader and next click try again, LED C == proxbrute, all leds flash when exiting standalone mode 2019-09-13 14:10:08 +02:00
Philippe Teuwen
3dc4774f20 simplify fcAll 2019-09-13 10:35:17 +02:00
iceman1001
3a776ecf3a chg samyrun - dual leds flash after state changes 2019-09-13 10:17:58 +02:00
iceman1001
cb23de9694 chg: feedback after successful operation. led flashes twice. and whitespace removed 2019-09-13 10:04:59 +02:00
iceman1001
a4421dfc37 fix wrong spelling 2019-09-13 07:38:07 +02:00
Philippe Teuwen
59ea79b583 CmdFSKsimTAG: swap fcH/fcL back, fix lf io/awid/pyramid sim 2019-09-13 00:39:19 +02:00
Philippe Teuwen
64d2e43592 CmdFSKsimTAG: avoid padding with very short cycles, this confused lf io sim 2019-09-13 00:39:19 +02:00
iceman1001
3821a03a40 chg: 'lf t55xx wipe p' - now takes a password for wipe 
chg: 'lf t55xx wakeup' - uses NG
 2019-09-12 21:20:40 +02:00
Philippe Teuwen
da68369e02 fix issue #397 2019-09-12 19:50:34 +02:00
iceman1001
74cd1bee35 minor 2019-09-12 17:39:12 +02:00
iceman1001
75f4a6123c textual 2019-09-12 17:38:13 +02:00
iceman1001
4eab354f44 chg: 'lf samyrun' standalone - rework of LED messages. 
A = bank A reading
B = bank B reading
A,C = bank A simulating
A,D = bank A cloning
B,C = bank B simulating
B,D = bank B cloning

One button press to go between steps.   Maybe practice with the proxmark3 device connected with usb-cable to see the new steps.
 2019-09-12 17:37:36 +02:00
iceman1001
d3b2f1f6d0 fix leds. dbg msg 2019-09-12 10:39:10 +02:00
iceman1001
3587aeff2a fix: LED is used as a flag, 1,2,4,8 not 1,2,3,4.. 2019-09-12 09:58:05 +02:00
iceman1001
1ad66c917f fixin... 2019-09-11 22:51:13 +02:00
iceman1001
236175a688 fix 'hf iclass chk' - timings and fixing the parity / kc / kd ... 2019-09-11 21:14:46 +02:00
iceman1001
f4ff22a5bc revert back timeout values 2019-09-11 20:40:59 +02:00
iceman1001
6090a66f34 ... 2019-09-11 16:37:10 +02:00
iceman1001
ab0d81d01a ..adapt parity to cmds, prolong button loop test 2019-09-11 16:24:16 +02:00
iceman1001
105665ed0a chg: iclass.. cleaning out test/unused code.\n 'hf iclass sim' - Try LUT table 2019-09-11 15:18:40 +02:00
iceman1001
ff66ea896b ssp clock delta 2019-09-11 15:16:20 +02:00
iceman1001
df2c294cac chg - cleaning out testcode... 2019-09-11 15:15:13 +02:00
Iceman
341703d9a7 chg: 'hf iclass sim' - better iClass protocol implementation 2019-09-11 13:09:08 +02:00
iceman1001
9a2a0116e4 fix: 'hf iclass clone' - last block write fails, see (https://github.com/RfidResearchGroup/proxmark3/issues/183) 
chg: 'hf iclass clone' - now tries ten times,  behavies better, obey verbose nicer, drop field constant. Uses NG.
chg: 'hf iclass dump' - now tries ten times,
in general nice outputs..
 2019-09-08 23:19:06 +02:00
iceman1001
d8217a13d9 chg: 'hf iclass rdbl' 
'hf iclass wrbl'  - both commands now tries tens times. Both honor verbose param,  both has gotten some love with regards to timing on device side,  and they also turn off the field more consistent.
 2019-09-08 21:21:30 +02:00
iceman1001
305c54f3cf chg: 'hf iclass rdbl' - now retries 10 ten times and uses NG 2019-09-08 17:37:14 +02:00
Philippe Teuwen
9cf2cd7ca9 remove leading/tailing "/" from installation RELPATHs 2019-09-05 23:20:46 +02:00
Philippe Teuwen
6949a780fc Add possibility to make install more firmware variants 2019-08-31 00:26:35 +02:00
Philippe Teuwen
4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen
b5f5b9276f make install skeleton 2019-08-30 21:44:40 +02:00
Philippe Teuwen
2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen
8987e956ac POSIX sh version of mkversion 
Most targeted platforms have "sh" and don't need Perl as requirement.
Still Perl script is present as fallback.
 2019-08-29 23:23:53 +02:00
Iceman
3408d75ac9
Update Makefile.hal 
fix https://github.com/RfidResearchGroup/proxmark3/issues/375
 2019-08-29 21:25:06 +02:00
iceman1001
03867018f1 chg: iclass fixes. better timings, to get 280us vs 330us (default) time before card response. 2019-08-28 21:29:08 +02:00
iceman1001
501182ca06 chg: ecload NG, fchk use ecfill trick 2019-08-28 21:23:31 +02:00
iceman1001
28d703d6df chg: eload NG 2019-08-28 21:21:52 +02:00
Philippe Teuwen
a64aa99b74 remove tabs 2019-08-27 21:19:44 +02:00
Philippe Teuwen
d88b76beda partial make style 2019-08-27 17:28:08 +02:00
iceman1001
48d3802d35 chg: optimization of iclass mac calculations on deviceside (@pwpiwi) see https://github.com/Proxmark/proxmark3/pull/861 
chg: some textual
 2019-08-27 10:51:52 +02:00
Philippe Teuwen
16a7cfd7b2 make style (excepted cmdhficlass...) 2019-08-26 22:28:39 +02:00
Iceman
fea5d88278 add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554 2019-08-20 14:53:52 +02:00
sguerrini97
a6e5f9922f PCF7931: Print found single/consecutive block(s), fixes to block 1 check and some comments 
Printing blocks makes it easier to manually reorder blocks when block 0 and 1 are not transmitted
 2019-08-19 17:10:25 +02:00
iceman1001
6f9ec6dd24 FIX: 'spiffs : fixes the device going rouge with bad memory reading' Thanks @megabug 2019-08-19 15:18:17 +02:00
Philippe Teuwen
3771c150f0 make style 2019-08-13 17:42:03 +02:00
Philippe Teuwen
763c94334b add missing includes and fix mf1ksim usage in hf_colin standalone mode 2019-08-13 17:39:48 +02:00
Philippe Teuwen
0ace6bffb8 missing includes for spiffs 2019-08-13 17:39:48 +02:00
cjbrigato
961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
iceman1001
5acc77bc95 chg: mem spiffs info - text output 2019-08-12 16:33:27 -04:00
Philippe Teuwen
47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen
80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen
d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Iceman
b7d412d27b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-10 21:04:25 +02:00
Iceman
a78b8a406c fix: hf iclass sim 3 - reading now works... 2019-08-10 18:33:06 +02:00
Philippe Teuwen
c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen
bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen
9b44590f8d make style 2019-08-07 13:04:26 +02:00
Philippe Teuwen
12d38bb6ac fix standalones after Mifare1ksim changes 2019-08-07 11:57:26 +02:00
Philippe Teuwen
12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen
4615354864 mf sim: respect DBG_NONE and explicit ATQA/SAK usage 2019-08-07 00:47:32 +02:00
Philippe Teuwen
80941ed9e1 Remove comments 2019-08-07 00:02:00 +02:00
Philippe Teuwen
9f8e63a7c8 print errors only if dbg level allows errors 2019-08-06 23:19:59 +02:00
Philippe Teuwen
650dd5855f ok it seems PMW CNTR is not reset as promised in the datasheet, let's fix this for now... 2019-08-06 23:10:02 +02:00
Philippe Teuwen
0f9880b18f cleaning 2019-08-06 13:52:03 +02:00
Philippe Teuwen
1354aec556 typos 2019-08-06 13:51:10 +02:00
Philippe Teuwen
c74028fa10 show slow clock in hw status 2019-08-06 13:42:17 +02:00
Philippe Teuwen
8b3159c83d Use more defines when using main clock or master clock 2019-08-06 13:40:08 +02:00
Philippe Teuwen
2cbe43f269 clarifications and minor changes in slow clock related operations: 
* SpinDelay and SpinDelayUs: now rounding applies instead of truncating
* Document maximum duration of SpinDelay/SpinDelayUs/BUTTON_CLICK/BUTTON_HELD
* Add argument check against max duration in SpinDelay/BUTTON_CLICK/BUTTON_HELD
* Document why these functions don't need to take wrapping into acount as in GetTickCountDelta
* Use >= in the spinning loops
* Clarify StartTickCount calibration operations and use masks AT91C_CKGR_MAINRDY and AT91C_RTTC_RTPRES
 2019-08-06 13:09:48 +02:00
iceman1001
25748b0746 style 2019-08-05 12:01:11 -04:00
Philippe Teuwen
225d406d21 cppcheck fix: Checking if unsigned variable 'len_to_read' is less than zero. 2019-08-05 00:12:35 +02:00
Philippe Teuwen
45c27573b3 ARM Makefile: softer dependency on fpga_compress 2019-08-04 21:33:57 +02:00
iceman1001
2cc24c8714 chg: 'hf iclass' generically, check button press fewer times to not interupt time critical parts too much 2019-08-04 18:31:52 +02:00
iceman1001
7cb696c5bc chg: 'hf iclass sim 3' - now supports READ4 cmd. 2019-08-04 18:16:16 +02:00
iceman1001
a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen
60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen
61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen
3dae748314 thinfilm is ok with thumb 2019-08-03 22:28:58 +02:00
Philippe Teuwen
25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen
4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Philippe Teuwen
517f0886ba make style 2019-08-03 20:20:08 +02:00
Iceman
f08649ac0e
Merge pull request #304 from ViRb3/format-and-docs 
Format and docs
 2019-08-03 19:53:49 +02:00
Philippe Teuwen
a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Victor
5913ee670a Add auth comments 2019-08-03 18:36:47 +01:00
Victor
835a8a3b03 Add state comments 2019-08-03 18:36:47 +01:00
Victor
4bd03bb920 Fix more comment alignment 2019-08-03 18:36:47 +01:00
Victor
868469db0d Fix comment alignment 2019-08-03 18:36:47 +01:00
Iceman
87e300588b
Merge pull request #303 from ViRb3/fix-pass-write 
Fix password write offset by 1
 2019-08-03 19:34:10 +02:00
Victor
714280fad2 Fix password write offset by 1 2019-08-03 17:57:39 +01:00
iceman1001
65feeeafc8 chg: 'lf t55xx deviceconfig - a compact output' 2019-08-03 18:48:08 +02:00
iceman1001
0320455090 chg 'lf t55xx deviceconfig - color adaptations 2019-08-03 09:53:08 -04:00
iceman1001
f643a7a5a4 chg: 'lf t55xx deviceconfig' - matrix styled output 2019-08-03 15:26:46 +02:00
Philippe Teuwen
5061869efd help iceman reverting last 2019-08-03 10:57:59 +02:00
iceman1001
bf2dc0304b revert last 2019-08-03 04:43:01 -04:00
Philippe Teuwen
96ed907605 Fix momentarily flash read/write of dicts 2019-08-02 20:48:44 +02:00
Philippe Teuwen
865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen
85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001
2400418067 style 2019-08-01 11:15:39 -04:00
Philippe Teuwen
118c8478f0 fix ManchesterDecoding_Thinfilm (msb was always forced to 0) 2019-08-01 16:55:20 +02:00
Iceman
759ba4056e
Merge pull request #299 from cjbrigato/master 
HF_COLIN 2/3 : Now able to read Known  key schemes from SPIFFS JSON Config File
 2019-08-01 15:47:29 +02:00
iceman1001
fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
iceman1001
f6befc235f chg: macro SRC_SPIFFS is dependent of WITH_FLASH 2019-08-01 00:51:53 -04:00
Colin J. Brigato
b4e004abc2
Off by one in GetTickCountDelta (FIXes #301) 
FIXes #301 and prevent a `-1`aka`UINT_MAX` delta.
 2019-08-01 01:56:30 +02:00
Philippe Teuwen
733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen
f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
cjbrigato
902f520bce HF_COLIN: Now works with shemas.json, an array of schemes, dynamically loaded at runtime 2019-07-31 08:12:49 +02:00
cjbrigato
23e9a3af34 HF_COLIN: Add example json scheme file 2019-07-31 01:36:58 +02:00
cjbrigato
3878f62168 HF_COLIN : Now able to read Known Mifare 1K key schemes from JSON Conf file from SPIFFS. BEWARE : DO NOT USE : Very Messy and early implementation 2019-07-31 01:32:16 +02:00
Philippe Teuwen
c83ff9da0f make style 2019-07-28 19:24:00 +02:00
iceman1001
9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001
283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001
c951e54ff2 chg: 'lf t55xx deviceconfig' - change text when not configured 2019-07-27 10:06:38 +02:00
iceman1001
548c2ed998 make style 2019-07-27 03:54:01 -04:00
iceman1001
b4eb41ee66 chg: 't55' more style 2019-07-27 09:50:24 +02:00
iceman1001
a597382530 chg: 't55' - adapting to codestyle, added some colors to message outputs, change comments 2019-07-27 09:36:16 +02:00
Philippe Teuwen
f44343aa20
Merge pull request #288 from mwalker33/master 
Bug Fix : T55x7 timings save to flash
 2019-07-25 13:25:14 +02:00
mwalker33
9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33
3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
Philippe Teuwen
6c1ff4cef7 minor alignment 2019-07-25 12:22:24 +02:00
mwalker33
b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33
77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen
1229b358aa clarify standalone table 2019-07-24 19:32:06 +02:00
Philippe Teuwen
7093fdaa5d
Merge pull request #287 from cjbrigato/master 
HF_COLIN : Makes Known Schemes in Struct form
 2019-07-24 13:41:10 +02:00
Philippe Teuwen
4abb4b939f Proper Makefile halting when using incompatible Standalone mode and Platform 2019-07-24 13:37:56 +02:00
cjbrigato
e20d1ab7d2 HF_COLIN : Known Schemes now are in Struct form. This is 1/2 Pass for having Schemes dynamicly read from SPIFFS as json. 2019-07-24 01:42:33 +02:00
Philippe Teuwen
7d51f9f266 fix hf_bog standalone mode compilation 2019-07-24 01:04:06 +02:00
Philippe Teuwen
a92560ff13
Merge pull request #286 from cjbrigato/master 
HF_BOG fixes for spiffs
 2019-07-24 00:59:49 +02:00
Philippe Teuwen
c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
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