RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-24 17:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
7146 commits 3 branches 14 tags 85 MiB
Commit graph

7146 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Teuwen 47bcee05ad Missing platform in fpga_compress Makefile 2019-08-11 22:30:04 +02:00
Philippe Teuwen 2154b4c3eb
Merge pull request #312 from RfidResearchGroup/summer_restructuring 
summer restructuring:
 2019-08-11 22:04:03 +02:00
Philippe Teuwen 8b0a80ec98 add missing include for whereami.c in android 2019-08-11 21:42:01 +02:00
Philippe Teuwen 3e96c27c18 remove clang warning 2019-08-11 21:42:01 +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 a36b784ecd chg: help text commands now green 2019-08-10 18:34:02 +02:00
Iceman a78b8a406c fix: hf iclass sim 3 - reading now works... 2019-08-10 18:33:06 +02:00
Iceman 3f9613b87f chg: script run dumptoemul - better fail messages 2019-08-10 18:20:20 +02:00
Iceman b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help 
Rework hitag2 read/write help
 2019-08-09 22:16:21 +02:00
Philippe Teuwen 02ae09ee2e
Merge pull request #311 from ViRb3/termux-guide 
Update Android Termux guide
 2019-08-09 22:14:32 +02:00
netvader f02a02cb14
Update bt_manual_v10.md 
I've tried to write a blueshark tutorial for android, I hope that's fine?
 2019-08-09 16:55:33 +02:00
Philippe Teuwen 7722f3af99 Guard Makefile.hal against Make trying to remake it 2019-08-09 16:05:31 +02:00
Philippe Teuwen 5051ea429d typo 2019-08-09 13:02:10 +02:00
Philippe Teuwen 92122877d0 fix nonce2key typo 2019-08-09 12:12:22 +02:00
Philippe Teuwen c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen d84a316b4c fix MCK, maths... facepalm 2019-08-07 14:55:29 +02:00
Philippe Teuwen 5a6c9e7863 hf tune: mask 32b dword to 16b 2019-08-07 13:04:36 +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 e057fa6fa0 Add time measurements of recv packets on client side 2019-08-07 13:04:31 +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
Victor d158ffebfd Note that hitag1 read/write not yet implemented 2019-08-06 19:13:38 +01:00
Victor f913f7156a Update CHANGELOG 2019-08-06 19:08:51 +01:00
Victor 67887a83d3 Rework hitag2 read/write help 2019-08-06 19:08:51 +01: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
Victor ab856ab73d Update Android Termux guide 2019-08-06 02:03:28 +01:00
iceman1001 25748b0746 style 2019-08-05 12:01:11 -04:00
iceman1001 be6e46e4ea textual 2019-08-05 17:45:20 +02:00
iceman1001 f317e3247a chg: 'lf nedap' - decoding / encoding of Nedap. (anon) 2019-08-05 17:43:53 +02:00
Philippe Teuwen 6f47e12797
Merge pull request #308 from cjbrigato/patch-1 
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
 2019-08-05 00:41:20 +02:00
Philippe Teuwen 7a620ddaa7 remove redundant conditions 2019-08-05 00:31:51 +02:00
Colin J. Brigato 38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way 
sysconf() is  part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4. 
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣)
 2019-08-05 00:27:15 +02: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 b43ea3be32 chg: xmodem 2019-08-04 20:05:30 +02:00
iceman1001 2fecbb6141 chg: return values. 2019-08-04 19:26:53 +02:00
iceman1001 18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +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