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

2933 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 7663c35c73 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2017-03-09 10:26:16 +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
Iceman f45a6f4fb5 Update CHANGELOG.md 2017-03-07 14:41:08 +01:00
Iceman 420f5fe972 Update CHANGELOG.md 2017-03-07 14:40:27 +01:00
Iceman c9778481ff Update README.md 2017-03-07 14:39:30 +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 57e1e31dce chg: unused .. but not for long 2017-03-06 19:15:01 +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 8eeb3c6a0b CHG: And that should be everything cleaned up with unneed functions and calls. 2017-03-06 11:53:55 +01:00
iceman1001 7dfa1b021e CHG: breaking, forgot some.. 2017-03-06 11:50:26 +01:00
iceman1001 00baf27097 FIX: since the correctionNeeded logic changed, with PR #87 (https://github.com/iceman1001/proxmark3/pull/87) this is the consequence changes to it. 2017-03-06 11:27:15 +01:00
Iceman 81f9cbb188 Merge pull request #87 from timhir/master 
Improved logic for determining the correct Frame Delay Time (FDT)
 2017-03-06 11:15:25 +01:00
Timo Hirvonen 17ab9dcca0 Improved logic for determining the correct Frame Delay Time (FDT) value based on the last bit transmitted by the PCD 2017-03-06 11:39:12 +02:00
iceman1001 dfcf20d641 FIX: Coverity Scan fixes to emvcmd.c among others. 
FIX: emclearmem bug.
 2017-03-05 18:43:06 +01:00
Iceman 790bb5ae49 Merge pull request #86 from egon2/fix-85 
fixes #85  compiler warning and programflow bug.
 2017-03-05 18:22:17 +01:00
egon2 37a71c7a96 fixes #85 2017-03-05 16:19:26 +00: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 bdeac4021a CHG: @marshmellow42 's XL size, and em4x05 timmings. 2017-03-04 14:37:26 +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 91e9295761 FIX: had to make it clientside only 2017-03-03 12:27:35 +01:00
iceman1001 88e7a6bfa7 FIX: travisCI complains. dummy -> dummy_sgc. 2017-03-03 12:24:02 +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 99136c6eef CHG: finalized the merge between peter filmoores 14atagfuzz branch (emv). I seriously doubt anything works. 2017-03-01 21:51:23 +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 c24364a8a4 FIX: @marshmellow42 's ST detection fix. 
FIX: lfops.c and em4x05 command timings.
 2017-02-28 19:20:12 +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 96befa9ab1 upd text 2017-02-28 08:36:01 +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