Commit graph

3896 commits

Author SHA1 Message Date
iceman1001 6ca92fa4ed and the QT part of monstermerge.. 2017-07-27 21:32:15 +02:00
iceman1001 70b58e46b1 sleep in the makefile , 2017-07-27 21:23:58 +02:00
iceman1001 234acf74ff forgot the sleep... 2017-07-27 21:22:05 +02:00
iceman1001 5222785d69 some dummy files in order to keep folder structure ok when compiling..
removed some comments
2017-07-27 21:19:39 +02:00
iceman1001 475a19b937 part of monstermerge. 2017-07-27 20:59:54 +02:00
iceman1001 a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001 6519ae6f88 part of monstermerge... 2017-07-27 20:48:49 +02:00
iceman1001 8f262aa1bf ADD: num_CPUs(void) method from pm3 master
CHG: clean up in util.c
ADD: seems like mingw doesn't have scandir. Had to add one. *untested*
2017-07-27 09:36:16 +02:00
iceman1001 f942e1ed05 ADD: CRC8Mad() should be used to calc the crc-8 byte for Mifare MAD config block. Doesn't work of course...
CHG: some T/F defines..
2017-07-27 09:31:23 +02:00
iceman1001 46a0ec7130 CHG: removed old TRUE/FALSE defines... some left still.. 2017-07-27 09:28:43 +02:00
iceman1001 86bbd8f563 ADD: param_getlength , gets the string length of one parameter 2017-07-26 18:17:20 +02:00
iceman1001 ca0174e89b chg; switch fork to clone. 2017-07-26 10:41:32 +02:00
iceman1001 e4ae456772 FIX: 'lf hid sim' - it now prints the id correct
ref  https://github.com/Proxmark/proxmark3/issues/364
2017-07-26 09:41:09 +02:00
iceman1001 b149fdc67b FIX: 'script run mifare_autopwn' some print statements
FIX: 'script run mfkeys'  correct author,  added copyright
2017-07-24 13:00:40 +02:00
iceman1001 6c4d1560e9 ADD: 'script list' - now sorts the scripts in alphabetic order. It needs the extra define, in order to scandir and alphasort to work.
and this made our own version of le32toh function complain.  So this is removed from util.c and where it was used a new define replaced it (LE32TOH)
2017-07-23 10:24:30 +02:00
iceman1001 db34c61aa0 add: a script needed for new way of compiling the proxmark3 project 2017-07-22 14:04:18 +02:00
iceman1001 c4c3bedb8a FIX: 'script run mfkeys' Script was mistakingly only checked first testkeys block with 85 keys. Since the selection in testkeys list was not taking lua way of ranges, it only sent zeros. 2017-07-22 14:02:51 +02:00
iceman1001 72f6ed45eb FIX: 'script run formatMifare' https://github.com/Proxmark/proxmark3/pull/362 bad comparision value 2017-07-22 14:00:54 +02:00
iceman1001 478b9c7270 chg: some reorder, renaming 2017-07-17 14:28:57 +02:00
iceman1001 124df841d6 chg: some extern definitions on functions in the header file 2017-07-17 14:28:13 +02:00
iceman1001 d2f19521a7 fix: 'hf mfu restore r' it now uses the newly written pwd for all further authentications needed.
- it also tries to save the special blocks, and configurationblocks in a certain order.
2017-07-17 14:27:11 +02:00
iceman1001 fe5c33092d ADD: 'hf 14a reader' - added Mifare Classic Ev1 1k/4k identification. 2017-07-16 10:18:19 +02:00
iceman1001 da32472099 chg: 'hf mfu restore' added the parameter 'r', to read the password from the dump file and write to a magic ntag 21* , to be used together with the parameter 'e' 2017-07-15 14:03:11 +02:00
iceman1001 1b6176995f chg: 'hf mfu restore' swapped some parts so to write special areas first and configblocks last. 2017-07-14 21:24:36 +02:00
iceman1001 195102e9ae fixes 2017-07-14 21:22:03 +02:00
iceman1001 e8015142cd fix: TRUE/FALSE -> bools
fix: 'iclass'  filepath 255, to use FILE_PATH_SIZE
fix: unified params test
2017-07-14 20:54:11 +02:00
iceman1001 ec16d16d05 fixes: removal of TRUE/FALSE defines into bools 2017-07-14 16:20:34 +02:00
iceman1001 d2f79fa83f ADD 'lf nexawatch' by marshmellow42
ADD 'lf securakey'  by marshmellow42
ADD 'lf pac'  by marshmellow42
chg: parity.h got some love from pm3 master.
2017-07-14 15:51:12 +02:00
iceman1001 c5e04ba927 fixes: removed bad references.
chg: 'hf mfu restore e' added the special block writes options
2017-07-14 08:47:23 +02:00
iceman1001 b99fa57e42 fix: wrong variable 2017-07-13 23:37:09 +02:00
iceman1001 7cf0bf19e5 FIX: 'mfu authentication' bug where the pack-length was wrong
ADD: 'hf mfu restore'  - added a restore from file command, see helptext for instructions
CHG: some help-text updates and refactored to functions
CHG: 'hf mfu gen'  - added the possibility to read uid from card as input
CHG: 'hf mfu dump' - refactored out the dump-printing
2017-07-13 13:10:46 +02:00
iceman1001 de97a6f1b0 fix: removed on warning of unused variable. 2017-07-11 19:38:36 +02:00
iceman1001 ed54dc8e17 FIX: 'dumptoemul.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' doesn't add the last newline in generated eml file.
FIX:  'dumptoemul-mfu.lua' correctly gets the UID from bin file,  previously took wrong data.
2017-07-11 19:37:59 +02:00
iceman1001 8980e0ab66 some more keys 2017-07-11 18:31:53 +02:00
iceman1001 310d0da9a4 fixes.. to bool 2017-07-11 18:31:10 +02:00
iceman1001 24d332fac7 fixes.. 2017-07-11 18:27:59 +02:00
iceman1001 17a8e69e90 ADD: 'hf mfu info' type detection now support NTAG_I2C_1K_PLUS, NTAG_I2C_2K_PLUS
ADD: 'hf mfu info'  ul-ev1 pwd tests are now correct
ADD: 'ul ev1 authentication' now deals with magic tags and NACK messages correct.
ADD: 'hf mfu pwdgen'  added the option 'r' to read uid from tag instead.
2017-07-11 17:52:01 +02:00
iceman1001 1f9534e2cc CHG: broke out some help texts and improved them.
CHG: 'hf mf csave' now save mini,1k,2k,4k and to both a bin and eml file.
2017-07-11 17:45:23 +02:00
iceman1001 cdc0f15104 FIX: playing with some delays. 2017-07-11 17:40:29 +02:00
iceman1001 011a793eae UPD: updates of the coverity scan scripts, to make the release 2017.07 of coverity build tools
UPD: install.sh now downloads the repo and make a clean build
2017-07-11 13:33:42 +02:00
iceman1001 8bc17414fd new coverity scan complains..
fix 'lf hitag'  bit comparisions wrong
fix 'standalone mode'  logically dead code
2017-07-07 15:45:40 +02:00
iceman1001 4406f4ee2a CHG: removed some #DEFINE TRUE/FALSE 2017-07-07 12:52:51 +02:00
iceman1001 5f18400cbe FIX: 'hf iclass reader' marshmellows fixes.
CHG:  removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001 77c98eb2d7 FIX: 'hf standalone mode' - had some printing issues when printing a Uin64_t. 2017-07-07 12:34:57 +02:00
iceman1001 ce56dd32e3 FIX: 'hf mf c*' works both with 1a/1b generation of tags. 2017-07-07 12:34:20 +02:00
iceman1001 1ef14f2d9d fix: the updated fpga_hf.bit file, where iso15693 should work. 2017-07-07 09:20:23 +02:00
iceman1001 dd98b934bc CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key.
CHG: 'hf iclass reader' -  two rules according to datasheet
  if app_limit is less than 0x6,  app_limit should be 0x6
  if app_limit is bigger than 31/0x1F on 2kb picopass,  the app_limit should be 26/0x1A
2017-07-05 12:05:53 +02:00
iceman1001 213883a931 FIX: 'hf iclass reader' - now correctly identifes crypt-fuses configuration
ADD: 'hf iclass reader' - now prints OTP value
2017-07-05 11:21:38 +02:00
iceman1001 9fc59afdfd test of appveyor.yml 2017-07-05 08:32:52 +02:00
iceman1001 a211877853 CHG: 'script run didump' - got some remake. unfinished.
CHG: some default keys
2017-07-04 20:23:47 +02:00