RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-21 22:54:40 +08:00
Code Issues Projects Releases Packages Wiki Activity
1520 commits 3 branches 15 tags 88 MiB
Commit graph

1520 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
d0f3338e0c ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121 
FIX:  some missing usb_commands for EPA.
 2015-06-23 22:30:18 +02:00
iceman1001
24344f28ad FIX: ref 2ec8773314 
@marshmellow42 's fixes for pskdemod and mfu.
 2015-06-23 19:22:40 +02:00
iceman1001
ce3d6bd25a FIX: fastread dont do multiplication by zero, thanks @marshmellow42 
ADD: "hf 14a sim t 7" now implements a simple incr_counter command. it sends ACK to all requests.
ADD: "hf 14a sim t 7" now prints the password when a "0x1B" (Authenticate) command is received.
 2015-06-22 09:49:12 +02:00
iceman1001
5e42846302 CHG: "hf 14 sim t 7" ie NTAG simulation, now reads the emulator memory for read commands. this means you need to load the emulatormemory before... if you want it answer more correct.. 2015-06-21 21:57:52 +02:00
iceman1001
36f84d4748 ADD: @pwpivi latest fixes. 
ADD: @marshmellows fixes.
 2015-06-21 21:56:44 +02:00
iceman1001
c9216a92aa FIX: "hf 14a sim" fixes to CRC calc. 
ADD: added CHECK_TEARING command support in "hf 14a sim" (EV1/NTAG216 command)
BUGS:  the read range probably will could currupt memory..ref:: http://www.proxmark.org/forum/viewtopic.php?pid=16611#p16611
 2015-06-21 11:09:54 +02:00
iceman1001
22e2470051 ADD: @marshmellow42 fudan detection in hf mfu 
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
 2015-06-21 11:07:05 +02:00
iceman1001
569009f3f7 ADD: @pwpiwi 's fix 50365fedcb 2015-06-18 13:51:00 +02:00
iceman1001
abb215301c add: @pwpipi 's fixes to 14B 2015-06-18 09:52:53 +02:00
iceman1001
02984d683c ADD: @marshmellow42 's help text changes to the reveng 2015-06-18 09:52:25 +02:00
iceman1001
b69adb7945 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iso14443a.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/Makefile
	client/cmddata.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/lualibs/utils.lua
	client/scripting.c
	client/scripts/didump.lua
	client/util.c
	client/util.h
	common/crc16.c
	common/lfdemod.c
	common/sha1.c
 2015-06-18 09:51:30 +02:00
iceman1001
553e868f25 CHG: just made sure it uses a default file name now. 2015-06-15 21:02:17 +02:00
iceman1001
d71d59dbd1 ADD: @marshmellow42 's 14b changes. 2015-06-15 20:59:01 +02:00
iceman1001
839a53ae4c ADD: added support for commands. READ_SIGNATURE 0x3C, READ_COUNTER 0x39 for NTAGs in "hf 14a sim" 
the ECC signature is taken from a NTAG 215 tag. Might work.
      Counters always returns 0,  :)
 2015-06-15 14:01:34 +02:00
iceman1001
ffaa0ff334 FIX: removed width in cmdcrc.c , to get rid of the compiler warning. 2015-06-15 13:59:33 +02:00
iceman1001
96e41bfcec add: a .gitignore to be able to add the folder client/obj/reveng. 2015-06-14 23:32:20 +02:00
iceman1001
d7f3f65361 add: a .gitignore to be able to add the folder client/platforms. 2015-06-14 23:31:52 +02:00
iceman1001
2495281d14 fix; stupid fixes for some compiler warnings messages of unused variables.. 2015-06-14 23:31:05 +02:00
iceman1001
0ad1a1d492 FIX: minor variable fixes when compiling on linux. 
cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
  sscanf(Cmd, "%i %i", &invert, &maxErr);
  ^

cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
  sprintf(id, "%010llx",lo);
  ^
 2015-06-14 23:02:52 +02:00
iceman1001
32719adfa1 ADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side. 
0x1B (authenticate)
          0x3a (fast read)
          0x60 (get_version)

       This is used in a new mode on client,  "hf 14a sim t 7"
 2015-06-14 22:40:18 +02:00
Martin Holst Swende
26fbe1fbd9 Merge pull request #117 from marshmellow42/master 
askbiphase bug fix
 2015-06-14 19:32:36 +02:00
iceman1001
c043981c04 chg: added some more outputs to the reveng-crc script e.lua ... now shows -b -B -l -L also in columns. You'll need to read the reveng -h helptext to understand. 2015-06-14 17:19:41 +02:00
iceman1001
b4c1f167da FIX: old bug back, and now fixed again. @marshmellow42 2015-06-14 17:18:22 +02:00
marshmellow42
fd227f4e7d add comment 2015-06-14 11:11:00 -04:00
marshmellow42
c7d6721290 bug fix. askdemod edits invert pointer, cannot be 0 2015-06-14 10:54:55 -04:00
iceman1001
1299c798fc ADD: @marshmellow42 's 14b reader changes. 
FIX: @marshmellow42 's ASKbiphaseDemod fixes.
CHG: added a check in ASKbiphaseDemod to make a compiler warning message go away.
 2015-06-14 14:39:50 +02:00
Martin Holst Swende
0f5b97d92c Merge pull request #115 from marshmellow42/master 
add-ons and bug fixes
 2015-06-14 09:02:13 +02:00
iceman1001
1417a7f9d0 minor textual changes from @marshmellow42 2015-06-13 12:14:38 +02:00
iceman1001
550a929a69 FIX: Reverting the t55x7 timings. (@marshmellow42 's fix) 2015-06-13 12:13:21 +02:00
iceman1001
99789601dc ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great* 
ADD: fixes in the reveng calling methods
 2015-06-10 08:46:16 +02:00
iceman1001
68ff832584 fix: nice output.. 2015-06-09 21:46:22 +02:00
iceman1001
dd1df4901d @marshmellows memory fixes for reveng1.30 in client.. 2015-06-09 21:32:22 +02:00
iceman1001
817d709615 @marshmellows memory fix 2015-06-09 21:29:24 +02:00
iceman1001
d352146782 CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30) 2015-06-09 21:28:06 +02:00
iceman1001
60e8657796 CHG: all @marshmellow42 's changes to make the reveng work. 
ADD: lua script test for using the reveng inside lua.  *prove of concept*
      it implements -h help
                    -d  data in a hexstring
                    -w  width of the crc family. (ie 16 gives all CRC-16 calculations.
     it iterates thru all found crc presets in a crc family based on the width of crc.  It calcs crc and the reverse crc.
 2015-06-09 13:31:53 +02:00
iceman1001
a71ece51e4 ADD: iso11784/85 FDX-B 
ADD: the source from RevEng 1.30, got into the PM3 client.
 2015-06-07 11:35:49 +02:00
marshmellow42
8e2e6c8eb0 add clock to ask rawdemod outputs 
fix biphase invert bug (correctly)
 2015-06-07 00:42:57 -04:00
marshmellow42
07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42
c2c7f6c271 fdx-b clean up 2015-06-04 13:10:33 -04:00
marshmellow42
6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04:00
iceman1001
ad6219fc91 ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B 
ADD: crc16_ccitt_rev  (reverse version of crc16_ccitt 0x0000)
 2015-06-04 10:33:55 +02:00
marshmellow42
cf4d3e21b0 add fdx-b to cmddata.h 2015-06-04 00:05:37 -04:00
marshmellow42
ecfcb34cc5 add fdx-b to lf search 2015-06-04 00:04:49 -04:00
marshmellow42
b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42
fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42
04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
iceman1001
22a6a62fbb ADD: removed the paritythingy, I missunderstood its purpose. 2015-06-03 22:38:59 +02:00
iceman1001
7f96433c8a CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod 2015-06-03 22:19:32 +02:00
iceman1001
0df669a298 ADD: next step ISO11784/85 2015-06-03 21:35:03 +02:00
iceman1001
47286d89e4 ADD @pwpiwi 's fixes for "HF 14B" commands. 2015-06-03 21:12:55 +02:00