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

991 commits

Author SHA1 Message Date
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
Philippe Teuwen 6fc6517ccb LZ4: silent AddressSanitizer false positive? int8_t x = 0; <= writing 2 bytes?? 2020-10-06 18:01:05 +02:00
Philippe Teuwen 02d861d304 skip address read oob in lz4 for now 2020-10-06 17:44:44 +02:00
Philippe Teuwen b073a1df65 apply our patch on latest lz4 2020-10-06 17:43:55 +02:00
iceman1001 e9480b8e69 update lz4 from repo 2020-10-06 17:43:49 +02:00
Philippe Teuwen fdac4da302 skip address read oob in lz4 for now 2020-10-06 17:31:59 +02:00
Philippe Teuwen e90c386179 LZ4: silent AddressSanitizer false positive? int8_t x = 0; <= writing 2 bytes?? 2020-10-06 16:59:40 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
Philippe Teuwen c3c59e35cb make style 2020-09-30 14:27:19 +02:00
Philippe Teuwen 4e10c9ec0a move idteck to its own file 2020-09-28 21:09:26 +02:00
Philippe Teuwen 8ee30b785e apply our patch on latest lz4 2020-09-28 14:06:44 +02:00
iceman1001 74050af8c2 updated to latest LZ4 source 2020-09-28 10:47:13 +02:00
tharexde 037234bbbe Merge branch 'master' into dev-bruteforce_em4x50 
update
 2020-09-27 15:03:27 +02:00
tharexde d0d6317c33 added new function reflect32 2020-09-27 12:53:52 +02:00
iceman1001 c0d5b2427c fix coverity 2020-09-26 14:54:11 +02:00
iceman1001 1aa9600048 add white cloner pwdgen algo (thanks to @paleopterix!) 2020-09-19 11:08:01 +02:00
iceman1001 db9818abe4 add ref for cryptorf which uses 14b crc 2020-08-21 14:11:24 +02:00
Philippe Teuwen 8d97698bd5 remove files committed by error 2020-08-20 20:59:36 +02:00
Philippe Teuwen b134753a08 cryptorf: style 2020-08-19 22:19:46 +02:00
Philippe Teuwen 9ade745f07 rework cryptorf 2020-08-19 21:48:25 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
Philippe Teuwen e67526ee4d document tweak 2020-07-31 18:22:11 +02:00
Marlin Sööse 01dfa46e67
Update crypto1.c 
fixup for clang on aarch64
 2020-07-30 20:46:59 -06:00
Marlin Sööse de389efad2
Update crapto1.c 
fixup for clang on aarch64
 2020-07-30 20:41:37 -06:00
iceman1001 53174faaf6 adapt return value 2020-07-19 23:08:53 +02:00
iceman1001 a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001 4493153dbb verbose.. 2020-07-13 20:58:24 +02:00
iceman1001 791afef728 adapt reflect8 fct 2020-07-06 05:42:10 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
tharexde 4d292d3ca0 fixed: first bit of em4x50 word was skipped in case of a "0" -> first transition in raw Manchester decoding is now taken into account 2020-06-14 14:51:48 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen a1eb8e78b6 adapt get_lz4.sh 2020-06-08 03:11:16 +02:00
Philippe Teuwen fa0b658436 Remove zlib entirely, no need for fpga_compress anymore to compress hardnested tables, now to be compressed with bzip2 2020-06-08 02:50:43 +02:00
iceman1001 79ce948bc3 warnings protype missing 2020-06-07 19:23:48 +02:00
Philippe Teuwen b2c7ded7fc Adapt get_lz4.sh 2020-06-07 12:53:24 +02:00
Philippe Teuwen 381b47f64e lz4: add memmove to arm string.c 2020-06-07 12:46:34 +02:00
slurdge cce2e7aad3 Remove inline to save 2.5Kb of flash 2020-06-06 15:34:25 +02:00
slurdge 1a8eff5d42 add lz4 to arm side 2020-06-05 16:24:05 +02:00
slurdge 96ae026f35 import lz4 2020-06-03 16:07:23 +02:00
iceman1001 9883343ccc cppchecker 2020-06-02 13:03:11 +02:00
iceman1001 d40251ff0b Revert "Release v4.9237 - Ice Coffee ☕" 
This reverts commit 833bc4d9a3.
 2020-05-21 21:55:15 +02:00
iceman1001 833bc4d9a3 Release v4.9237 - Ice Coffee ☕ 2020-05-21 21:55:15 +02:00
Philippe Teuwen bf5c054414 Revert "Release v4.9230 - Ice Coffee ☕" 
This reverts commit db2e97c860.
 2020-05-21 12:51:35 +02:00
Philippe Teuwen db2e97c860 Release v4.9230 - Ice Coffee ☕ 2020-05-21 12:51:35 +02:00
Philippe Teuwen e2a20631c7 remove section version_information for client 2020-05-20 21:11:45 +02:00
Philippe Teuwen ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001 b770cfd51c le24toh is uint32_t 2020-05-20 19:22:17 +02:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
iceman1001 cb56ca37ff make cppchecker happier 2020-05-13 17:31:50 +02:00
Philippe Teuwen 605a754b20 old-style-definition warnings 2020-05-11 23:57:32 +02:00
Philippe Teuwen b46a99d7d7 remove switch-enum warnings 2020-05-11 23:50:14 +02:00
Philippe Teuwen 838d345918 resolve inline warnings 2020-05-11 13:48:57 +02:00
iceman1001 1efda3aa84 fix: zlib compilation on mingw / ps, (@doegox) 2020-05-08 13:55:24 +02:00
Philippe Teuwen eafeb47126 make style 2020-05-06 13:38:51 +02:00
Philippe Teuwen 9847b77c83 fix cast align warning 2020-05-04 23:32:04 +02:00
Philippe Teuwen f0811de70d silent zlib warning under AppVeyor 2020-05-04 02:17:47 +02:00
Philippe Teuwen c94eae0046 fix warning about cast realignment, WIP 2020-05-03 17:34:01 +02:00
Philippe Teuwen 19be62f7e6 stricter warnings: Wredundant-decls 2020-05-03 12:38:34 +02:00
Philippe Teuwen 9358554884 stricter warnings, wip 2020-05-03 00:33:28 +02:00
Philippe Teuwen 0e39cb8e34 stricter warnings, wip 2020-05-02 23:54:27 +02:00
iceman1001 b86d9f2b96 cppcheck fix 2020-04-28 22:36:57 +02:00
iceman1001 39fd06f947 cppchecker fix - conditionknown 2020-04-28 22:29:22 +02:00
iceman1001 31125b9d34 cppchecker fix - conditionknown 2020-04-28 22:27:50 +02:00
Philippe Teuwen fbe4e20326 remove c99 and c++11 restrictions 2020-04-24 16:43:21 +02:00
Philippe Teuwen 25c1f31222 fix includes 2020-04-22 14:14:13 +02:00
Philippe Teuwen 94192d0976 make style 2020-04-16 09:01:14 +02:00
iceman1001 34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
iceman1001 eab2ebafae added pwdgen test 2020-03-17 17:12:27 +01:00
iceman1001 f761874347 cppcheck macro sizeof 2020-03-13 14:13:59 +01:00
iceman1001 08f40ef310 fix: hf mfu pwdgen - xyz 2020-03-13 12:09:11 +01:00
iceman1001 dfd408db8d cardhelper 2020-03-11 21:00:19 +01:00
iceman1001 cef1f21a34 style 2020-03-09 17:09:41 +01:00
iceman1001 9a921d6944 style 2020-03-09 17:09:07 +01:00
iceman1001 9c9906c823 fix coverity 267213 2020-03-01 16:46:31 +01:00
iceman1001 2886a99350 add: cryptohelper support 2020-02-27 16:35:17 +01:00
iceman1001 0be6737ad9 debug state 2020-02-04 17:38:02 +01:00
iceman1001 5ef1f001dd extra check if malloc failed 2020-02-03 22:44:46 +01:00
iceman1001 8696b521ef protect debug messages 2020-02-03 21:38:42 +01:00
iceman1001 ed67936892 style 2020-01-12 17:28:12 +01:00
iceman1001 a459d15093 fix: osx doesnt need own bswap.. 2020-01-09 23:33:23 +01:00
iceman1001 57f026312b Chg: generators from luascripts into client 2020-01-09 22:58:12 +01:00
iceman1001 2a0d1557e1 style 2020-01-07 22:18:27 +01:00
iceman1001 47eab16881 style 2020-01-07 22:14:01 +01:00
iceman1001 01f215a924 Chg: hooked up generator 2020-01-02 15:29:15 +01:00
iceman1001 1c98888ee5 Chg: key gen algo refactoring. This will help in next step when implementing new json key template formats 2020-01-02 11:42:57 +01:00
osboxes.org eb1596dc9f style 2019-12-31 22:22:03 +01:00
osboxes.org 26fa587dbf style 2019-12-31 22:20:27 +01:00
osboxes.org 911cfb9d3f style 2019-12-31 22:19:28 +01:00
iceman1001 88237e60c1 cppcheck 2019-12-30 16:41:13 +01:00
iceman1001 50d1dfea77 add cardx crc skeleton, will need to adapt 2019-12-16 13:26:13 +01:00
unknown 1b6566cd5c Added support for some ISO15693 custom NXP commands 2019-11-22 13:55:09 +02:00
iceman1001 01b149efa5 fix: fdx crc calc 2019-10-30 15:44:57 +01:00
Philippe Teuwen c084862e07 crc16: all enumerates in switch 2019-10-26 19:41:30 +02:00
Philippe Teuwen d5a68ac292 check_crc: add CRC_KERMIT 2019-10-26 19:37:36 +02:00
Philippe Teuwen a869ae9687 zlib: unused parameter warning 2019-10-26 18:34:25 +02:00
Philippe Teuwen c523980d99 zlib: enumeration values not explicitly handled in switch warning 2019-10-26 18:34:04 +02:00
Philippe Teuwen 30da3cfd42 coverity 263769 dereference before null check 2019-10-24 01:32:44 +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 0ffb748f5e fix: hi/low should not be same 2019-10-14 21:17:41 +02:00
Philippe Teuwen 395d0f9ebf make style 2019-10-13 00:48:26 +02:00
Philippe Teuwen e4ad1a7471 coverity 227889 227898 - division by zero 2019-10-09 23:01:07 +02:00
Philippe Teuwen 9fac99025b fix bunch of printf api warnings in common/lfdemod.c 2019-10-09 16:40:01 +02:00
iceman1001 1e5e930bf0 clean 2019-10-08 22:04:15 +02:00
iceman1001 9a0ca9c4cd better median for clietside 10%-90% only. thanks for the suggestion @doegox!. Device side still uses old algo 2019-09-22 19:00:11 +02:00
Philippe Teuwen a3232e6ef5 zlib: protect CLEAR_HASH macro 
Fix compilation warning (and probably bug):
  deflate.c l608
  some parts of macro expansion are not guarded by this ‘else’ clause
 2019-09-22 18:22:04 +02:00
Philippe Teuwen 26ccdf5ce2 Update zlib to 1.2.11 2019-09-22 18:16:45 +02:00
Philippe Teuwen b6d074cc9f zlib: minimize diffs with upstream to prepare zlib upgrade 2019-09-22 17:24:29 +02:00
Philippe Teuwen 960d8c4db3 add helper fct manchesterEncodeUint32 2019-09-15 02:09:40 +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
Philippe Teuwen 8ebad97c3d rework mbedtls Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03: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
Philippe Teuwen 7722f3af99 Guard Makefile.hal against Make trying to remake it 2019-08-09 16:05:31 +02:00
Philippe Teuwen 1354aec556 typos 2019-08-06 13:51:10 +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 b43ea3be32 chg: xmodem 2019-08-04 20:05:30 +02:00
iceman1001 2fecbb6141 chg: return values. 2019-08-04 19:26:53 +02:00
Philippe Teuwen 4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Philippe Teuwen 3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001 9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001 f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
Philippe Teuwen 4abb4b939f Proper Makefile halting when using incompatible Standalone mode and Platform 2019-07-24 13:37:56 +02:00
Colin J. Brigato 2ad63c07ff
FIX: Get a usable AES implementation again 
see #258 for more information.
 2019-07-17 03:16:13 +02:00
Philippe Teuwen 710b38f209 Move Makefile standalone stuff to armsrc/Standalone for easier access 2019-07-16 19:18:54 +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 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
Gabriele Gristina 563050c8ba Fix compilation under MacOSX 2019-07-10 18:43:19 +02:00
iceman1001 283cc8d12a convert NG 2019-06-13 12:28:30 -04:00
Philippe Teuwen 04f8c27feb clarify usart baudrates 2019-06-12 14:59:00 -07:00
iceman1001 34d794d9fd debug output 2019-06-08 10:16:15 -04:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +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 4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +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 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 7e31e7f930 say when no extra is selected 2019-06-02 15:51:17 +02:00
Philippe Teuwen eb9495aa37 default standalone mode 2019-06-02 10:17:52 +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
Philippe Teuwen 355319e36a Automate make clean when platform definitions are changed 2019-06-01 01:37:02 +02:00
Philippe Teuwen 940cb1f64f standalone doc 2019-06-01 00:39:03 +02:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00
Fl0-0 9dc658b45e Spelling & default LF_SAMYRUN example 2019-05-31 20:09:01 +02:00
Fl0-0 53e48d70cd Makefile platform option for standalone mode 
Signed-off-by: Fl0-0 <tonymontana277@hotmail.fr>
 2019-05-31 14:44:32 +02:00
iceman1001 d1ae9dc76e cleanup 2019-05-28 05:24:36 -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 37c30c0395 fix: askdemod - enhances which solves some viking demod errors 2019-05-25 13:27:43 -04:00
iceman1001 a1db12bcae chg: info 2019-05-22 06:01:27 -04:00
Philippe Teuwen b17da830ed Compute fp on the fly 2019-05-18 22:20:47 +02:00
iceman1001 ec796f4d81 chg: add fractional for 921600, 1382400 baudrate 2019-05-18 21:40:45 +02:00
iceman1001 d3d98282ac comments about Fractional parts in the baudrate generator 2019-05-18 17:57:30 +02:00
iceman1001 fb7ac7b0ea baudrate 230400 works good on PM3 device communicating with BT add-on (Blue Shark) 2019-05-18 17:56:46 +02:00
Philippe Teuwen e9eb764358 Fix MCK in usart, our MCK is 16*12/2/2 2019-05-16 20:12:00 +02:00
iceman1001 d4c3d07701 fix: failed compilation without btaddon option (@merlokk) 2019-05-15 16:56:54 +02:00
Philippe Teuwen 8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
iceman1001 fba239b3e2 color 2019-05-07 09:39:23 +02:00
iceman1001 2fca0d80b3 cleaning 2019-05-07 09:39:02 +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 3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
Philippe Teuwen 35a738f962 Forgot debug string 2019-05-03 09:06:47 +02:00
Philippe Teuwen b723126deb Make smartcard support detection dynamic 2019-05-03 09:04:28 +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 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
Philippe Teuwen 5bc9118a19 baudrate only for physical uart 2019-04-28 22:51:40 +02:00
iceman1001 9779868753 style 2019-04-28 11:09:46 +02:00
Philippe Teuwen a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02: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
iceman1001 4494c3dc61 text 2019-04-26 10:46:00 +02:00
iceman1001 cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001 de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +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
Philippe Teuwen 3e641e217d remove redundant def 2019-04-25 23:09:06 +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
iceman1001 5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +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 b173f73c81 style 2019-04-25 17:11:40 +02:00
Philippe Teuwen e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Philippe Teuwen dda63f9556 usart_fill_rxfifo: fetch no more than available room in FIFO 2019-04-23 00:25:14 +02:00
Philippe Teuwen b0eef756c1 return PM3_SUCCESS on usart_writebuffer_sync, usb_write 2019-04-22 23:03:01 +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
iceman1001 04536a3564 translation 2019-04-22 19:31:22 +02:00
iceman1001 3bd145652b document offsets 2019-04-22 19:29:45 +02:00
Philippe Teuwen f29facd15a Harmonize usb_write & usart_writebuffer_sync return values 2019-04-22 02:28:58 +02:00
Philippe Teuwen cf68c972f0 forgot usart.h 2019-04-22 00:30:39 +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 3dd1f1c78c make style (hmm not perfect, we'll have to live with it I guess) 2019-04-21 14:10:31 +02:00
Philippe Teuwen e0cd5850f9 usart: clean, doc, now uart_posix 60ms 2019-04-21 12:02:36 +02:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +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 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +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 b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00
Philippe Teuwen 9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen cb411ffab4 receive_ng in common/ 2019-04-18 00:50:31 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +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
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 7bc3bea230 style 2019-04-16 15:32:37 +02:00
iceman1001 e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001 87a74e98b8 style 2019-04-16 15:19:53 +02:00
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
Philippe Teuwen e0b7f22db1 Comment debug msg 2019-04-14 18:45:53 +02:00
Philippe Teuwen 3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen 85f67006e4 Remove redundant define 2019-04-14 14:35:42 +02:00
iceman1001 d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001 b50fe594da chg: moved include.. 2019-04-14 11:17:59 +02:00
iceman1001 fc0a62de18 Fix: USART - better RX/TX with one dma bank and wait loops (@ryan) 2019-04-14 11:08:44 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001 4ab2212346 style 2019-04-13 08:50:05 +02:00
Philippe Teuwen 4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen 35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen c10e47f8a9 More void, fixing "function declaration is not a prototype" [-Wstrict-prototypes] 2019-04-10 10:35:03 +02:00
osboxes.org ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001 39827a6d5d unused 2019-04-09 21:35:06 +02:00
iceman1001 28021ec17b chg: optimizations for ask/bi. 2019-04-09 16:23:55 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
iceman1001 daa7313095 unshadow 2019-04-08 08:36:07 +02:00
iceman1001 5ea649e59d style 2019-04-07 15:18:02 +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 a78af2bb06 rename crc -> crc_ctx. triggers overshadowing 2019-04-07 11:51:12 +02:00
iceman1001 ff74d56741 remove unused 2019-04-07 10:58:50 +02:00
Philippe Teuwen 51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +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 2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00