RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2900 commits 3 branches 14 tags 86 MiB
Commit graph

1839 commits

Author SHA1 Message Date
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 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 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 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 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 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 a211877853 CHG: 'script run didump' - got some remake. unfinished. 
CHG: some default keys
 2017-07-04 20:23:47 +02:00
iceman1001 3ca3d401c0 FIX: some adjustments to prng detection 2017-07-04 20:11:25 +02:00
iceman1001 fa8da9e651 some updated scripts 2017-07-04 20:05:50 +02:00
iceman1001 4d18909596 ADD: 'hf 14a read' - detection if found Mifare Classic tag has a weak or hardend PRNG. Thanks to @doegox for implementing it in nfc-tools/mfoc Its a beauty :) 2017-06-26 21:45:22 +02:00
Iceman d82de9223a Update default_pwd.dic 2017-06-21 15:24:41 +02:00
iceman1001 de048b0436 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2017-06-09 14:49:35 +02:00
BOURDY Romain bf413f1b87 Start fixing legic.lua ! Now loads dumps fine 2017-05-17 18:52:30 +02:00
iceman1001 bafb2e1455 ADD: di token list 2017-05-08 10:14:09 +02:00
BOURDY Romain d063559fc4 Add more VIGIK Keys 2017-04-29 16:50:57 +02:00
iceman1001 e093a375ef CHG: added key gen algo. removed inparameter. 2017-04-29 01:08:19 +02:00
Iceman 8c9facb7b5 Update cmdhficlass.c 
fix:  'hf iclass dump' now uses rawkey option even for credit key.
 2017-04-27 16:30:14 +02:00
Iceman 08cc2c36d8 fix: 'hf mf chk' 
Dictionary files will load wrong if they exceed 256lines.
 2017-04-26 19:52:03 +02:00
Gator96100 dccc3e2c66 When compiled with MinGW use march=x86-64 instead of march=native 2017-04-23 15:27:00 +02:00
Gator96100 aff903d99f Fix crashes when compiled with a different cpu 2017-04-22 23:36:43 +02:00
iceman1001 2d0341403e ADD: script to change uid on a UL magic tag which uses backdoor commands 2017-04-20 15:29:45 +02:00
iceman1001 8aa789b195 CHG: updated topaz imp to match PM3 Master (piwi) 2017-04-19 03:41:51 +02:00
ikarus 926ea42b76 FIX: hf legic crc data parameter 'd' was inconsistently declared. 2017-04-14 11:24:49 +02:00
Iceman d840622789 Update default_keys.dic 2017-04-05 17:28:46 +02:00
Iceman 450714d641 Update default_keys.dic 2017-04-05 17:27:09 +02:00
Iceman 4d78c76faf Update default_pwd.dic 
added a new cloner pwd
 2017-04-04 17:22:49 +02:00
n4k 94ea581d83 Fix missing null byte : my_executable_directory 2017-04-02 20:16:45 +02:00
Iceman 107b43d31c Merge pull request #92 from RobDeBagel/patch-1 
Remove unnecessary x86 SSE 4.2 popcnt GCC flag
 2017-03-29 22:48:31 +02:00
angelsl 396772c93a Fixes for compiling on Android 2017-03-30 01:41:07 +08:00
Robert Jones 9640aa75a6 Remove unnecessary x86 SSE 4.2 popcnt GCC flag 
-mpopcnt is only a valid flag for x86 platforms with SSE 4.2. Breaks on anything else, e.g. ARM
Builds/runs fine without this flag. I don't see any reference to popcnt instruction so I'm not sure what this is there for.
 2017-03-29 14:09:00 +11:00
Luca 8361ba2266 Updated clone/sim cmd help + minor text fixes 2017-03-18 15:19:51 +01:00
iceman1001 966c111e8c chg: too many \ slashes 2017-03-14 08:37:13 +01:00
iceman1001 f1202c3fa9 textual (piwi) 2017-03-14 08:30:46 +01:00
iceman1001 76a608af8e CHG: extern methods. 
ADD: BSWAP_64
 2017-03-14 08:30:17 +01:00
Iceman 33936c2155 Merge pull request #89 from angelsl/mfsetmod 
Add Mifare Classic EV1 set load modulation command
 2017-03-10 16:46:12 +01:00
iceman1001 905c55de2b ADD: analyse nuid - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1 has this option as a activation sequences. This NUID is also used for authenticate (cuid), not the block0 data. 
ref: http://www.gorferay.com/mifare-and-handling-of-uids/
 2017-03-10 09:48:36 +01:00
angelsl ece631fd06 Add Mifare Classic EV1 set load modulation command 2017-03-09 21:37:16 +08:00
iceman1001 86fdf240e0 ADD: starting merge @holiman 's graphic branch. 2017-03-09 11:21:25 +01:00
iceman1001 be67483e63 syntax sugar 2017-03-09 11:19:30 +01:00
iceman1001 b9534ca070 FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHexToAscii. Now its optional. 2017-03-09 10:26:01 +01:00
iceman1001 672d72de89 CHG: lf visa2000 demod - adding the commandcall, allowing for demods of graphbuffer. (@marshmellow42) 
CHG: `lf visa2000 read` - adapting number of samples, from 12000 -> 12500.  (@marshmellow42)
 2017-03-07 08:26:17 +01:00
iceman1001 6795b3da93 CHG: compiler warning about not using fscanf return value. 2017-03-06 19:24:50 +01:00
iceman1001 57778a4630 CHG: renamed struct sector -> sector_t 
CHG: defines on armside
CHG: #define WIN32 ->  _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
 2017-03-06 19:11:08 +01:00
iceman1001 318bae20de removed some duplicates. 2017-03-06 14:47:24 +01:00
iceman1001 dc873169cf FIX: lf visa2000 actually the parity is on the whole id. 2017-03-05 17:13:43 +01:00
iceman1001 fb26bb5436 FIX: lf visa2000 - identified unknown nibble in checksum. Is not checksum, but the even parity of the last 2bytes in ID. 2017-03-05 16:56:24 +01:00
iceman1001 e0a241f76e CHG: plotting of clock 2017-03-04 14:36:09 +01:00
iceman1001 5b8cc7cf26 textual change @4m4rOk 2017-03-04 14:35:39 +01:00
iceman1001 2ec645e9d7 chg: more keys. 2017-03-04 14:34:08 +01:00
iceman1001 9833360b25 chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex. 2017-03-03 11:36:07 +01:00
iceman1001 1ec412d97d FIX: moved from lfdemod.c -> graph.c SetGraphClock. 2017-03-02 21:15:01 +01:00
iceman1001 aa9b584f5c FIX: removing nonexistent include file. 2017-03-02 21:10:35 +01:00
iceman1001 c6e5c7ea46 CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better. 
Still problem with finding the startindex...
 2017-03-02 21:00:51 +01:00
iceman1001 a47ded5b54 ADD: data detectclock - added clock blocks in plot window. Its a draft. Not working for all clocks. 
ADD: STT is now marked as a block in plot window,  instead of Marshmellow42 's two lines.
 2017-03-02 14:53:50 +01:00
iceman1001 a9eeb57698 CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220 2017-03-01 20:14:46 +01:00
iceman1001 4eabb8ad38 CHG: minor LF adjustments. 
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
 2017-02-28 16:55:16 +01:00
iceman1001 a8fd088d8b FIX: lf search - em410x demod was a bit greedy. 2017-02-28 14:47:25 +01:00
iceman1001 026ac759a5 help text 2017-02-28 14:09:10 +01:00
iceman1001 62cdba0568 CHG: hf em commands. Client side now has same commands as Peter Fillmores 14atagfuzz repo. OBS: not all exists on deviceside yet! 2017-02-28 14:08:15 +01:00
iceman1001 f24edfec54 CHG: hf 14a read - started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client. 
FIX:  `lf read` - ophs..  it works again.
ADD: `lf em 4x05--`  - added a chipset definition
CHG: better kali fix - from @pwpivi
 2017-02-28 08:16:02 +01:00
iceman1001 8db18d2f15 ADD: hf 14a read - now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer. 2017-02-27 19:18:38 +01:00
iceman1001 41611deef9 CHG: some of @marshmellow42 's ref: 2b11c7c750 
CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it.
 2017-02-27 14:04:50 +01:00
iceman1001 c3a15ba92f FIX: should be defined earlier. 2017-02-26 22:01:38 +01:00
iceman1001 d216a5711b CHG: one step closer to finish merging @marshmellow42 's 4x05 changes. 2017-02-26 21:32:51 +01:00
iceman1001 b87ad7964e FIX: some compiler problems caused by PM3 master commit 4197a3f6ff for Kali users. 
discussed about in isssue ref: https://github.com/Proxmark/proxmark3/issues/218

*untested on icemanfork*
 2017-02-26 21:30:47 +01:00
iceman1001 1b6cc9746e FIX: removing compiler warning about double const. 
thanks to @spaceteddy  ref: https://github.com/iceman1001/proxmark3/issues/83
 2017-02-26 21:28:06 +01:00
iceman1001 d32691f1da FIX: hf mf sim - authentication works again. 
CHG: `lf em`- renamed.
CHG: removed functionality in whereami.c, not needed.
 2017-02-25 23:00:20 +01:00
iceman1001 6ac2301423 CHG: forgot some changes to previous commit. 2017-02-24 15:00:49 +01:00
iceman1001 b804b9cdb8 ADD: @pivipw 's changes "making lua paths". 
ref:: 4197a3f6ff

This contains a ugly hardcoded hack to solve the issue: https://github.com/Proxmark/proxmark3/issues/217
where GetModuleHandleEx doesn't exist in mingw (old proxspace 2013 environment).

Use the docker container or linux...
 2017-02-24 14:59:38 +01:00
iceman1001 01f082a60f CHG: lf read - forgot a var 2017-02-24 14:17:36 +01:00
iceman1001 165b92dc35 CHG: lf read - optional timeout, to be used when configured a threshold limit. 2017-02-24 14:15:36 +01:00
iceman1001 5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 2017-02-24 01:14:47 +01:00