Commit graph

2751 commits

Author SHA1 Message Date
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
Iceman 19042d1894 Merge pull request #97 from n4k/patch-1
Fix missing null byte : my_executable_directory
2017-04-04 16:20:01 +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
Iceman 48bb16e840 Merge pull request #93 from angelsl/android
Fixes for compiling on Android

Thanks!  Great that it compiles w hardnested on Android now! Really wow!
2017-03-29 22:35:37 +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
iceman1001 f7639bc338 FIX: lf sim was broken since my little tests. Should work again. 2017-03-27 14:59:49 +02:00
iceman1001 e1778858dd FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to @Tiberius and @aczid for pointing out one of my mistakes from 2014. 2017-03-24 21:03:09 +01:00
Iceman dbb4e93ad7 Merge pull request #90 from 4m4rOk/master
Updated clone/sim cmd help + minor text fixes
2017-03-18 16:34:06 +01: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
iceman1001 14d6c4fc34 chg: cleaning out timing.
chg: makefile (piwi)
2017-03-13 09:45:46 +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 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