iceman1001
9f52c9db28
FIX: removed a compiler warning, the stringlen is not used anymore.
2016-07-31 22:03:46 +02:00
iceman1001
af4308b97b
CHG: Moved some includes, defines, structs from .c into header file.
2016-07-31 22:00:49 +02:00
iceman1001
cc4c8fd6cf
FIX: getting rid of a compiler warning message.
2016-07-31 21:59:29 +02:00
Alexis Green
415e9f00d5
Adding a 'recoverpw' command for T55xx to try to recover corrupt password written by a handheld cloner by fiddling with bits in the expected password.
2016-07-31 12:33:03 -07:00
iceman1001
a0c7eea77a
CHG: moved out some help-texts into its own usage-functions.
2016-07-31 11:37:19 +02:00
iceman1001
00abc7c1ab
CHG: Moved a 'include' statement to header file
2016-07-30 19:37:15 +02:00
iceman1001
955228691e
REM: cleaning up some commented code.
2016-07-30 19:36:48 +02:00
iceman1001
d0724780ab
FIX: Found a minor bug in 'LF CMDREAD' where it on device side didn't compare with the right char 'h' instead of 'H'. Re-wrote that whole part anyway, I changed periods to be max 0xFFFF in length, doubtful that a zero or one delay will be bigger than 65535...
2016-07-30 19:30:53 +02:00
iceman1001
dc6c90c376
CHG: The jablotron demod now deals with the strangeness of hex symbols A-F in cardid the same way a reader prints it.
2016-07-29 23:30:40 +02:00
iceman1001
dae31af21e
ADD: Binary Encoded Digit -> Decimal
...
ADD: Decimal -> Binary Encoded Digit
Ie
decimal 2345 becomes 0x2345
and
hex 0x2345 becomes decimal 2345
2016-07-29 23:29:37 +02:00
iceman1001
514ddaa2ff
CHG: help text changes in cmdlfjablotron.c
...
CHG: increase byte size to uint16_t in crc.c CRC16Legic
2016-07-29 20:58:52 +02:00
iceman1001
f5538c1c4e
chg: textual change.
2016-07-29 20:53:56 +02:00
iceman1001
ddbe76d3c6
CHG: redundant 'return' statement removed
2016-07-29 14:32:13 +02:00
iceman1001
29ce214c65
CHG: better printing output of card ID
...
CHG: better detecting in preambl. 16bits with 1, and a zero bit. Also cleared this topbit when cloneing and simulating.
2016-07-29 14:31:39 +02:00
iceman1001
8ae9b358f8
CHG: textual changes to help text.
...
CHG: removed the 'd' as input, the clone/sim commands is simpler.
CHG: printing of card ID is now zero padded.
2016-07-29 13:46:05 +02:00
iceman1001
6c28395106
ADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH.
...
CHG: removed no-existing crc8ja code
FIX: a check in ASKbiphaseDemod to make sure graphbuff is not empty.
2016-07-29 11:04:12 +02:00
iceman1001
e92948c60c
FIX: that OEM variable that is unused.
2016-07-28 22:22:34 +02:00
iceman1001
ba4ad25b37
FIX: Fixed some warnings I didn't take notice off.
...
- memcpy should have been "memset"
- forgot to add function declaration into header file.
2016-07-28 22:17:44 +02:00
iceman1001
758f5ee3e5
CHG: removed the wiegand converting, since I'm not happy with how its implemented. This is rework in progress.
2016-07-28 21:50:54 +02:00
iceman1001
1e2bb9c9f4
CHG: trying to figure out why I can't get the seconds out..
2016-07-28 21:48:53 +02:00
iceman1001
53b3c3e816
ADD: Added some new analyse functions like CHKSUM ADD/SUBTRACKT with one's complement
2016-07-28 21:47:52 +02:00
iceman1001
c827ffb098
spacing..
2016-07-28 21:46:27 +02:00
iceman1001
3e134b4c20
CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED*
...
CHG: changed the CRC implementations.
2016-07-28 21:41:44 +02:00
iceman1001
83dad64b91
ADD: some new usb commmands from EMV, and for LEGIC.
2016-07-28 21:16:02 +02:00
iceman1001
91d4cda48b
CHG: removed the linking to radixsort.c
2016-07-28 20:42:46 +02:00
iceman1001
4ccdc189bd
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-07-28 20:41:54 +02:00
iceman1001
1f1d974f02
CHG: added a comment
2016-07-23 18:33:30 +02:00
iceman1001
2de9622f0e
CHG: some clearing of memory
2016-07-23 18:31:20 +02:00
k02a
39814f19ab
Addition of depending library flags...
...
Inclusion of termcap library or ncurses library solves the compilation errors on some Linux distributions, for example a currently updated Slackware Linux 14.2 x86_64 vanilla distribution (which I run).
Output:
bash-4.3# make -C proxmark3
[...]
g++ -DQT_SHARED -I/usr/lib64/qt/include/QtGui -I/usr/lib64/qt/include/QtCore -Wall -O3 obj/proxmark3.o obj/uart.o obj/util.o obj/sleep.o obj/nonce2key/crapto1.o obj/nonce2key/crypto1.o obj/nonce2key/nonce2key.o obj/nonce2key/crypto1_bs.o obj/loclass/cipher.o obj/loclass/cipherutils.o obj/loclass/des.o obj/loclass/ikeys.o obj/loclass/elite_crack.o obj/loclass/fileutils.o obj/mifarehost.o obj/parity.o obj/crc.o obj/crc16.o obj/crc64.o obj/iso14443crc.o obj/iso15693tools.o obj/data.o obj/graph.o obj/ui.o obj/cmddata.o obj/lfdemod.o obj/cmdanalyse.o obj/cmdhf.o obj/cmdhf14a.o obj/cmdhf14b.o obj/cmdhf15.o obj/cmdhfepa.o obj/cmdhflegic.o obj/cmdhficlass.o obj/cmdhfmf.o obj/cmdhfmfu.o obj/cmdhfmfhard.o obj/cmdhfmfdes.o obj/cmdhftopaz.o obj/cmdhw.o obj/cmdlf.o obj/cmdlfio.o obj/cmdlfhid.o obj/cmdlfawid.o obj/cmdlfem4x.o obj/cmdlfhitag.o obj/cmdlfti.o obj/cmdparser.o obj/cmdmain.o obj/cmdlft55xx.o obj/cmdlfpcf7931.o obj/cmdlfviking.o obj/cmdlfpresco.o obj/cmdlfpyramid.o obj/cmdlfguard.o obj/cmdlfnedap.o obj/pm3_binlib.o obj/scripting.o obj/cmdscript.o obj/pm3_bitlib.o obj/aes.o obj/protocols.o obj/sha1.o obj/sha256.o obj/cmdcrc.o obj/reveng/preset.o obj/reveng/reveng.o obj/reveng/cli.o obj/reveng/bmpbit.o obj/reveng/model.o obj/reveng/poly.o obj/reveng/getopt.o obj/tea.o obj/prng.o obj/radixsort.o obj/bucketsort.o obj/proxgui.o obj/proxguiqt.o obj/proxguiqt.moc.o -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm ../liblua/liblua.a -ldl -L/usr/lib64/qt/lib -lQtGui -lQtCore -o proxmark3
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetstr'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tputs'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `BC'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetent'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetflag'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgoto'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `UP'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetnum'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:172: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/iceman1001/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/iceman1001/proxmark3"
2016-07-22 13:52:12 +02:00
k02a
e13ccb6b3f
Inclusion of unused oem variable
...
When compilation of the current source code, I am getting the warning of setting the unused variable "oem". I have included this, along with minor spelling corrections/language updates in the menu system.
gcc -std=c99 -O3 -mpopcnt -march=native -g -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED -c -o obj/cmdlfhid.o cmdlfhid.c
cmdlfhid.c: I funktion "CmdHIDWiegand":
cmdlfhid.c:292:11: varning: variabeln "oem" sätts men används inte [-Wunused-but-set-variable]
uint32_t oem;
^
Before:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | FC: 101 CN: 2001 | Wiegand Code: 0000002004CA0FA2
[...]
HID 40 bit | FC: 101 CN: 2001 | Wiegand Code: 0000000000000FA2
After:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000002004CA0FA2
[...]
HID 40 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000000000000FA2
2016-07-22 09:49:02 +02:00
iceman1001
36e78d669c
CHG: added some includes / libarys for HomeBrew AND QT5 compiling on MAC OSX. They are commented away, but if you need it replace the other two lines and uncomment.
...
All credit to @koalazak [ref] ed1525805c
2016-07-21 17:26:17 +02:00
iceman1001
81ba7ee837
CHG: minor changes to code, mostly newlines, change a value to #DEFINE END_OF_LIST_MARKER
...
CHG: GOOD_BYTES_REQUIRED changed from 28 > 13, makes it nonce collecting part faster, but the fail rate goes also up. its a value to fiddle with.
2016-07-20 12:02:08 +02:00
iceman1001
9d7e9935af
syntax suger
2016-07-07 02:10:09 +02:00
iceman1001
2d1885f1d1
CHG: Now it prints the correct UID bytes etc.
2016-07-07 02:09:16 +02:00
iceman1001
e0530dbcec
Applied @icsom 's fixes from: b577582490
2016-06-22 09:33:21 +02:00
iceman1001
ac36c57789
FIX: this should fix the compilation error for MAC users.
2016-06-20 13:32:22 +02:00
iceman1001
3c61ee4338
chg: added to print the author.
2016-06-20 13:31:51 +02:00
iceman1001
180ec86ef0
@marshmellow42 's fix the AskEdgeDetect cleaning tool. de53156e1e
2016-06-20 13:26:45 +02:00
iceman1001
f3cbb7bc7b
CHG: wrong minor version value. 0x1 -> 0x0 for desfire ev1 detection
2016-06-15 09:22:55 +02:00
iceman1001
d118e70f5d
CHG: Thanks to @Mackwa for looking up the expected Desfire EV2 major version byte.
2016-06-14 10:21:52 +02:00
iceman1001
5558d935bd
ADD: added the skeleton for analysing dates in a given byte array.
2016-06-13 21:55:52 +02:00
iceman1001
288c6845a7
ADD: added some identification on between old Desfire, Desfire EV1 and Desfire EV2
...
DEL: removed two old des-commands files which wasn't used.
2016-06-13 19:05:50 +02:00
iceman1001
ddaecc0826
FIX: this corrects the bug when running "hardnested" serveral times a faulty wrongsized key is returned. Just needed to clear the variable every run.
2016-05-31 13:11:04 +02:00
Pavel Zhovner
57eba86be6
Typo in hf 14a sim help
2016-05-26 20:10:03 +03:00
Iceman
26922aefd7
Update cmdlfawid.c
...
FIX: when writing the timeout was triggered, Increased it to make the writing part stable.
2016-05-21 09:42:41 +02:00
iceman1001
2fdc489bb4
CHG: printing of progress dots is better now.
2016-05-19 12:47:23 +02:00
iceman1001
890ae3dd43
ADD: added a comment about the Q5, which I think is wrong in these commands. Needs to be tested.
2016-05-16 21:40:19 +02:00
iceman1001
a45882e20a
ADD: added 'lf io sim <version> <facility.code> <cardnumber>' to the sim command
...
ADD: added 'lf io clone <version> <facility.code> <cardnumber>' to the clone command
2016-05-16 21:39:40 +02:00
iceman1001
6648776f2a
CHG: added the possibility to "remagic" the new found Mifare Ultralight tags, which answers to chinese backdoor commands for uid change.
...
The script now deals with to different kind of tags. Mifare Classic 1k gen1 and Mifare Ultralight gen1 (7bytes uid)
-Classic will get UID: 01 02 03 04
-Ultralight will get UID: 53 80 71 02 00 D9 80
2016-05-15 19:27:04 +02:00
iceman1001
8fd9bfb0e3
ADD: added the possiblity to use AWID formatlength of 26 and 50.
...
'LF AWID SIM'
'LF AWID CLONE'
'LF AWID BRUTE'
2016-05-14 22:40:04 +02:00
iceman1001
6a4271d186
CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it.
2016-05-14 14:34:35 +02:00
iceman1001
204b708424
ADD: AWID 50bit demod, thanks to @FrancoisM and @ntk
2016-05-13 22:34:49 +02:00
iceman1001
812513bf90
ADD: Added a new main command group "analyse", first one is the find the missing XOR in a LCR, it was a python script under /tools/xorfind.py
2016-05-10 15:30:46 +02:00
iceman1001
8085377413
CHG: output when finding key it the same as from the client.
2016-05-10 07:51:05 +02:00
iceman1001
fed1227777
CHG: just made the autopwn script main loop a bit more verbal
2016-05-10 07:40:27 +02:00
iceman1001
df82844c05
FIX: more paths for readline and Mac Os X
2016-05-06 19:52:04 +02:00
iceman1001
b01e7d206d
FIX: a define which was wrong
2016-05-06 19:30:43 +02:00
iceman1001
9d590832a1
FIX: This tries to fix the memalign issued on MAC OS X, which it doesn't have. However its standard Malloc is already 16byte memaligned.
...
ref: http://stackoverflow.com/questions/196329/osx-lacks-memalign
2016-05-06 19:09:29 +02:00
iceman1001
0fa87186cf
CHG: hardnested needs malloc.h, which on Darvin (Mac OS X) needs a path to.
2016-05-06 19:01:33 +02:00
iceman1001
e75bc417f1
ADD: added a lua script which calculates mifare keys based on a uid diversification
2016-05-06 10:19:15 +02:00
iceman1001
04da5cd92b
FIX: it seem the fcntl returns -1,.. which made the flasher fail.
2016-05-05 21:13:12 +02:00
iceman1001
532bcd7145
CHG: Nedap demod, now verifes with first parity.
2016-05-04 10:34:16 +02:00
iceman1001
b85385a058
CHG: removed a warning about unused variable. Lets see if perror works.
2016-05-03 09:16:05 +02:00
iceman1001
c71f4da9bc
CHG: increased the preamble
...
CHG: from inverted to non-inverted. 2 of the forum samples is non-inverted.
Block 0: 00150080
2016-05-02 21:21:43 +02:00
iceman1001
d34a0b0cc7
FIX: dual definitions of variable size
2016-05-02 15:15:06 +02:00
iceman1001
96faed2124
CHG: added the ASK/Biphase demod of signal for NEDAP demod.
...
ADD: 'LF SEARCH' now also checks for NEDAP.
2016-05-02 14:06:08 +02:00
iceman1001
56bbb25a41
ADD: started with a NEDAP demod, read, clone and sim functionality.
...
The encrypted part is not solveabled today.
2016-05-02 13:42:06 +02:00
iceman1001
ea1ee62e55
CHG: better helptext
2016-04-29 22:24:08 +02:00
iceman1001
ffeb77fdc6
CHG: the 14b is getting better, since I added the fpga waiting signaling I found in "14a emgetcmd" etc.
2016-04-29 22:23:32 +02:00
iceman1001
7bcddfabde
FIX: mental note to self, don't forget to adjust messages to new logic
2016-04-27 20:03:54 +02:00
iceman1001
a644fef0bb
FIX: Mental note to self, bitnumber 4 is used, not the value 4 which would be bitnumber 3... when deciding if request is REQB or WUPB
2016-04-27 19:54:29 +02:00
iceman1001
45c0c48c49
CHG: Just changed the order of printing, so the messagde FoundKey is printed last.
2016-04-27 11:22:17 +02:00
iceman1001
dccddaef77
CHG: "hf 14b sim" - Added the possibility to call it with a PUPI/UID. Sample: "hf 14b sim u 11223344"
2016-04-27 11:21:29 +02:00
iceman1001
fd3be901ea
removed commented code
2016-04-26 21:30:54 +02:00
iceman1001
c98ab35140
textual change.
2016-04-26 21:30:04 +02:00
iceman1001
a420e5c163
chg; no more crash when getting partial usb packages.
2016-04-25 23:15:12 +02:00
iceman1001
ed69e099a1
FIX: @Aczid suggested this to fix a Coverity scan warning.
2016-04-25 14:30:13 +02:00
iceman1001
18b90cce48
CHG: this fixes an annoying fault of not running CONNECT in raw command...
2016-04-24 21:44:19 +02:00
iceman1001
222bdb1cb3
Syntax suger
2016-04-24 21:43:38 +02:00
iceman1001
9965e0d1f8
CHG: this should remove a Coverity Scan warning.
2016-04-24 21:42:42 +02:00
iceman1001
c0afa86f75
FIX: this commit solves a sneaky bug in 'LF VIKING' commands. The getVikingBits dropped the highest byte in the uid while creating the datablocks for the clone.
...
ADD: added some extra message in debugmode when looking at viking tags.
2016-04-24 21:41:45 +02:00
iceman1001
21d359f68f
CHG: we don't want to assert inside the pm3 client.
...
CHG: better message when failed to find the key.
CHG: revert nonces check, 12 -> 100
2016-04-23 19:09:07 +02:00
iceman1001
1c38049bcb
CHG: commented away some of the debug printf statements in hardnested.
2016-04-23 18:33:27 +02:00
iceman1001
cd777a0545
FIX: Some Coverity Scan warnings. fread, not initialised etc etc
2016-04-23 18:23:46 +02:00
iceman1001
b9fc3e8eb7
RM: removed some old reference inside some old proggies...
2016-04-23 13:03:27 +02:00
iceman1001
2813c42f98
CHG: moved some params.
2016-04-23 13:02:51 +02:00
iceman1001
be6e909c5b
FIX: time printing, like difftime in MINGW enviroments needs to use 32b time.
2016-04-23 13:02:20 +02:00
iceman1001
9ea10847ea
CHG: timeing in chk keys,
2016-04-23 12:26:29 +02:00
iceman1001
fa0e0b109f
CHG: moved out some usage_methods for help texts.
...
CHG: added some time in the darkside, nested, hardnested, chk commands.
2016-04-23 12:18:34 +02:00
iceman1001
5dc8b8fe27
CHG: unified some text messaged.
2016-04-23 11:43:02 +02:00
iceman1001
d948e0d140
CHG: 'hf mf chk' now correctly tests to read key B, when we specify target keytype B or ?.
...
CHG: 'hf mf chk' now correctly init all sector keys to 0xFFFFFFFFFFFF, so it looks unified.
2016-04-23 11:32:37 +02:00
iceman1001
2e350b19f7
FIX: there were no "memfree" call, there were only "free"
2016-04-21 12:15:36 +02:00
iceman1001
3130ba4b21
ADD: added @azcid 's bitsliced BF solver for @piwi 's hardnested command. Awsume work! The original patch demanded some tweaking to work in mingw.
...
This is not tested for other systems so far.
2016-04-21 10:26:00 +02:00
iceman1001
f7c1a934d0
CHG: "hf 14a sim" now uses mfkey32 and mfkey32_moebius as methods to retrive the key in attack_mode.
2016-04-18 13:20:17 +02:00
iceman1001
6c84c90017
FIX: this fixes the "hf mf sniff l d f" command, which has been broken for a while. The cuid is correct used for decrypting.
...
FIX: The flushing of logentries.
ADD: "hf mf sniff" - added the sniffing of UID's with a uidlen of 10.
Whats left? The key is not always found even if we use the "mfkey64" approach.
ADD: added the parity_zero attack in "hf mf mifare". Still not working since piwi's changes to the iso14443a.c, maybe needs a param to tell it to collect nonces for this special attack.
CHG: extracted some help-texts into usage_* methods. Changed some text as well
FIX: "hf mf sim" command now uses both mfkey32 and mfkey32_moebius version to find the key in attack mode.
CHG: "hf mf sim" also now defaults to emul_memory to read a 4 byte UID.
2016-04-18 13:18:02 +02:00
iceman1001
cd91e41cb5
FIX: this fixes the mftry32, mftry32moebius and trymf64 implementations. Which is used in the "hf mf sim x" and "hf 14a sim x" built in attacks.
...
ADD: added the nonce2key version which should be able to find the key when the collected PARITIES is ZERO.
2016-04-18 13:08:18 +02:00
iceman1001
c805748f34
ADD: added a method for le32toh. Converting bytes to uint32_t .
...
CHG: correct use of FILE_PATH_SIZE in the tracelogging functions.
2016-04-18 13:05:35 +02:00
iceman1001
ce211cef39
FIX: corrected the FLAG_NR_AR_ATTACK
2016-04-18 13:02:36 +02:00
iceman1001
40f6f2ff50
ADD: started to add a BUTTERWORTH filter, not working yet.
2016-04-14 11:37:17 +02:00
iceman1001
0e32bf46e7
CHG: added the ascii output for the pwd.
2016-04-14 11:32:43 +02:00
iceman1001
0194ce8fc8
ADD: simulating can now handle triplesized UID (10b)
...
CHG: moved some mifare #DEFINES into protocols.h (ACK,NACK..)
2016-04-14 11:09:17 +02:00
iceman1001
7ee74a8ebd
CHG: Swapped to using the DEFINES.
2016-04-14 11:05:27 +02:00
iceman1001
01c78dabc3
CHG: syntax suger
2016-04-11 15:26:55 +02:00
iceman1001
2daa0d0b1e
CHG: doesnt flush the printf() calls
2016-04-10 13:34:27 +02:00
iceman1001
cbdcc89ae7
CHG: free the malloc:d memory in the crc8 function.
...
CHG: use the new GetEMLfrombigbuff method.
ADD: added a usage_legic_read
2016-04-10 13:18:11 +02:00
iceman1001
407697dfe3
ADD: more keys
2016-04-09 19:46:57 +02:00
iceman1001
bae363d860
ADD: more keys..
2016-04-09 19:45:28 +02:00
iceman1001
9e43f09ade
removed some old code,
...
rename a function, that tries to add IIRfilter Butterworth on a signal. Lets see if I can get it to work on Graphbuffer data one of these days.
2016-04-05 04:51:06 +02:00
iceman1001
5774b2b44d
ADD: added a WIN sample.
2016-04-05 04:48:05 +02:00
iceman1001
d40d64ef0d
CHG: old code calls outdated command. Even if it works in my fork, it doesnt work in PM3 master.
2016-04-05 04:47:42 +02:00
iceman1001
12b998cbd8
ADD; Some 7816 error codes
2016-04-05 04:46:25 +02:00
iceman1001
13629a71d3
minor adjustements, found some comments.
2016-04-05 04:45:07 +02:00
iceman1001
ef085a5948
CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0
2016-04-05 04:43:54 +02:00
iceman1001
4534ec060a
CHG: and the Makefile needs also to be updated
2016-04-05 03:35:47 +02:00
iceman1001
ca98f30c53
CHG: forgot one file for the RevEng update
2016-04-05 03:35:12 +02:00
iceman1001
0a25987730
Add; some keys
2016-04-05 03:34:46 +02:00
iceman1001
a78a3d9dc3
CHG: Updated RevEng1.31 to 1.40
...
--snipped changelog
1.4.0 24 February 2016
* Added 11 new algorithms, CRC-4/INTERLAKEN, CRC-7/UMTS,
CRC-8/LTE, CRC-8/SAE-J1850, CRC-11/UMTS, CRC-16/LJ1200,
CRC-24/BLE, CRC-24/INTERLAKEN, CRC-24/LTE-A, CRC-24/LTE-B,
CRC-30/CDMA, and 4 new aliases, CRC-12/UMTS, CRC-16/LTE,
CRC-16/UMTS, CRC-32/INTERLAKEN, from the CRC Catalogue.
* Eliminated string comparison when testing if a model name is
an alias.
* Split off presets into preset.c.
* Eliminated bogus calls to bsearch() in preset.c.
2016-04-05 03:34:03 +02:00
iceman1001
c3559d162a
textual changes
2016-03-23 14:04:10 +01:00
iceman1001
b9e66427b7
Forgot some breaks, and a faulty comparision of a set bit.
2016-03-23 14:03:41 +01:00
iceman1001
186ad6037c
ADD: added the ETU and Frame wait time based on the Frame wait integer value.
2016-03-23 14:02:50 +01:00
iceman1001
06eb3b1a8c
coverity fixes for my latest changes.
...
Forgot some breaks in 7816 annotation, and presco used an uninitalized char array.
2016-03-22 08:40:20 +01:00
iceman1001
774560e39e
CHG: no parity tests for ISO_7816_4 annotation
2016-03-21 22:07:55 +01:00
iceman1001
5de71ee6bf
CHG: enter a define for TIMEOUT
2016-03-21 22:07:23 +01:00
iceman1001
ab6d8a4c47
CHG: fixed the commands, its now valid calypso 7816 commands.
2016-03-21 22:06:51 +01:00
iceman1001
0fcfad0ee6
CHG: testing for windows clients to get a higher baudrate. Was 9600, testing 115200 as for non_win.
...
CHG: testing to set USB 2.0 standard, instead of USB1.1 ...
2016-03-21 22:05:59 +01:00
iceman1001
4bf0f73d76
increased a number of calypso commands for selecting files and trying to read them
2016-03-20 21:30:40 +01:00
iceman1001
452aab1e59
ADD; first try at reading calypso tags
2016-03-20 20:22:35 +01:00
iceman1001
7fa7e812fc
ADD: added @marshmellow42 's changes to "lfdemod"
2016-03-20 19:39:06 +01:00
iceman1001
f400ff6519
CHG: not sure if this clearCommandBuffer helps when sending usbpackages from lua scripts. Having trouble with these usbpackages in 14B code.
2016-03-20 19:35:43 +01:00
iceman1001
a930542b0a
FIX: the lua script hf_reader.lua now works with 14B tags.
2016-03-20 19:34:34 +01:00
iceman1001
eb7eab8570
code cleanup.
2016-03-20 19:33:59 +01:00
iceman1001
6fc68747f6
ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side.
...
I also made the SRi read functions better by combining them. The demodulation / uart code should be the same as last summers changes. The device side code can now be even smaller.
2016-03-20 19:33:07 +01:00
iceman1001
790e8eae09
ADD: @icsom changes and additions to lua scripts for LEGIC
2016-03-20 19:25:48 +01:00
iceman1001
e3f9c50d81
ADD: changed the annotation for 14b, it now shows WUPB/REQB and number of slots we used.
2016-03-20 19:24:14 +01:00
iceman1001
77d1a423d5
CHG: minor changes to this lua script. One case it returns NIL, which makes it behave better.
2016-03-13 07:17:26 +01:00
iceman1001
aaa1a9a2dc
CHG: Added calling clear bigbuff to zero out it also, instead of just "free" it.
...
ADD: downloading the EML part from BigBuffer specially.
2016-03-12 09:03:28 +01:00
iceman1001
6c68b84a6e
@Marshmellow42 additions:
...
ADD: Q5 to 'LF PYRAMID'
ADD: ST sim addition to SIM ask.
REF: 29ada8fc08
2016-03-07 18:53:02 +01:00
iceman1001
4e8fa8b448
ADD: get a updated script from @icsom
2016-03-06 13:26:13 +01:00
iceman1001
1f3d5401a6
FIX: adding a silent mode for Topaz detection.
...
FIX: adding a silent mode for 14B detection.
2016-03-06 13:21:42 +01:00
iceman1001
3607b5a96a
ADD: Added the autodetection of Topaz to "HF SEARCH"
...
FIX: Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
2016-03-06 12:40:04 +01:00
iceman1001
38e4191705
CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now.
2016-03-06 10:35:25 +01:00
iceman1001
eb891c385e
ADD; added Marshmellow42 's fixes for indala and stuff.
...
CHG: updated the CHANGELOG.md
2016-03-06 07:56:44 +01:00
iceman1001
0db11b71ef
ADD: Added the HitagS from @spenneb ref: https://events.ccc.de/congress/2015/Fahrplan/events/7166.html
...
PM3 Master PR: https://github.com/Proxmark/proxmark3/pull/167
Adjusted the ENUM names to fit in my fork. We need a better namestandard for it.
2016-03-04 19:06:47 +01:00
iceman1001
7f0cb92e0d
CHG: Added @icsom 's changes to his legic.lua script.
2016-03-01 07:07:56 +01:00
iceman1001
ff3e074478
CHG: some minor changes to the 14b, the read 14b lua,
2016-03-01 07:03:00 +01:00
iceman1001
c728b2b4cf
FIX: Added @marshmellow42 's fix for ASK/Biphase simulation on deviceside.
...
CHG: Added @marshmellow42 's refactoring of "gprox-II" demod.
2016-03-01 06:57:02 +01:00
iceman1001
07291f87d8
ADD: finished of the "LF GUARD SIM" command. needs testing.
2016-02-28 23:28:38 +01:00
iceman1001
0d2c590974
ADD: num_to_bytebitsLSBF function.
...
ADD: lf guard clone - works... needs some checking.
ADD: added a option to "addparity" to set zero on fixed pos.
2016-02-28 22:43:21 +01:00
iceman1001
733eb42022
ADD: Added three legic luascript from @iscom (Mosic) Great work!
2016-02-28 14:50:49 +01:00
iceman1001
2453ca6529
CHG: better not to show the unfinished commands..
2016-02-27 19:48:19 +01:00
iceman1001
50564be0f8
ADD: Started to add a "LF GUARD CLONE/SIM" functionality. *not working* all thats needed now is fixing the transformation from FacilityCode/CardNumber -> raw data for t55x7.
2016-02-27 19:47:10 +01:00
iceman1001
98c799ba49
BUG: smash stack in addParity call. Didn't take in consideration that it adds bits per parity to the array..
2016-02-27 19:21:49 +01:00
iceman1001
90639dd1cc
FIX: lets see if this fixes the pyramid clone crash on OSX
2016-02-27 18:57:49 +01:00
iceman1001
69c4516d32
chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits.
2016-02-27 12:12:05 +01:00
iceman1001
220d638d92
ADD: started to add a lua script for reading 14b tags, will help when making scripts against iso 14443b tags.
2016-02-27 09:24:40 +01:00
iceman1001
4b3655e7f4
FIX: spelling misstakes.
...
FIX: output of block number should be two digits for nicer layout
FIX: strange branching in the pyramid demod in cmddata.c, it will now always print the unknown length message
FIX: another go at the coverity scan bug in proxmark3.c. (resource leak for cmd)
2016-02-27 09:21:19 +01:00
iceman1001
ce9a7cbf33
ADD: "LF PYRAMID SIM"
2016-02-26 22:40:13 +01:00
iceman1001
581b31fb8a
FIX: "LF PYRAMID CLONE" now works.
2016-02-26 22:10:27 +01:00
iceman1001
f087591d59
FIX: calcs wiegand correct, adds wiegand parity correct, adds checksum correct, add even parity to blocks correct.
...
- when ran it clones nice, the "lf search" finds a pyramid och checksom is ok. However, the wiegand decode is wrong.
Something about where in bitarray to put the startformat bit and wiegand bits...
2016-02-26 21:11:56 +01:00
iceman1001
f6af1cf0ad
FIX: the 14b crc was called wrong in LUA. You enter a hexstring already, and get a hexstring back.
2016-02-25 17:51:02 +01:00
iceman1001
71cb7328e3
ADD: added some pyramid commands. //not finished.
2016-02-25 17:49:48 +01:00
iceman1001
683180cb60
ADD: added a simple test of known pwd algos based on uid.
2016-02-24 08:31:46 +01:00
iceman1001
b9411ebac8
ADD: added a simple sleep function. Thanks to Mosci
2016-02-23 08:24:01 +01:00
iceman1001
a75d63f19b
ADD: added the crc8legic to Lua. call it with core.crc8legic
...
also a helper function to take a hexstring and calc the crc on it, was added inside utils.lua
Call it inside a lua-script like this:
local utils = require('utils')
local data = '01020304'
local crc = utils.Crc8Legic(data)
print (uid, ('%02x'):format(crc))
2016-02-22 17:50:32 +01:00
iceman1001
c0f15a05b3
ADD: Marshmellows fixes for "lf t55xx" and "lf cmdread" ref: https://github.com/Proxmark/proxmark3/pull/166/files
2016-02-21 17:44:25 +01:00
iceman1001
b03006794f
CHG: removing some time-debug statements.
...
CHG: increased the time-out message 2sec, in proxmark, to make "hf mf chk" work better.
CHG: still trying to solve the "hf mf mifare" WDT_HIT bug.
With these changes, the "hf mf chk" / "Hf mf nested" looks similar and should be a bit faster.
2016-02-19 22:34:39 +01:00
iceman1001
e66ff99cc9
CHG: revert old fiddeling, I should not touch the HIDflasher.
2016-02-19 22:32:38 +01:00
iceman1001
95215e873f
FIX: this free call still annoys Coverity Scan.
2016-02-19 22:31:35 +01:00
iceman1001
0516439959
ADD: Added @marshmellow42 's new ST (sequence terminator detection)
2016-02-19 22:30:19 +01:00
iceman1001
25606bd724
FIX: For ld (linker) there is no "-=", so lets try re-assign ldlibs instead
2016-02-18 23:01:12 +01:00
iceman1001
28d47dc9b4
CHG: textual change in README.md
...
FIX: Mac OSX ld (linker) warning for -L/usr/local/lib, testing to remove it for mac builds.
2016-02-18 21:08:47 +01:00
iceman1001
75cf8623d6
FIX: Undo one of my fixes.. *sigh* need to be more specific when / where to call free.
2016-02-18 20:48:24 +01:00
iceman1001
eb5206bd20
FIX: resource leak, forgot a free
2016-02-18 20:39:41 +01:00
iceman1001
1abd86f17a
CHG: CHange the definition of MAX_GRAPH_TRACE_LEN to match eachother.
...
REM: removed a include header to graph.h in ui.h.
2016-02-18 20:19:33 +01:00
iceman1001
dfc5ee8893
FIX: Removed a double const
2016-02-18 20:08:55 +01:00
iceman1001
45293f1096
FIX: the #define M_PI is now optional. Moved a bunch of header invocations into the ui.h
2016-02-18 20:08:34 +01:00
iceman1001
02ac2ed464
FIX: 256 is too big for uint8_t
2016-02-18 20:07:50 +01:00
iceman1001
805cd07e25
CHG: this makefile should compile on Ubuntu 1404 without problems. The QT4-5 detection is inside MINQW detection part.
2016-02-18 18:55:44 +01:00
iceman1001
fd9552568d
CHG: First step to make my makefile better for other dev.env's These changes makes it look more like PM3 master version. The extra libs are added when MINGW is detected.
2016-02-18 18:43:20 +01:00
iceman1001
6cf8fcb002
FIX: corrected one of my own bugs which made the calccrc8 not accept the input hexstring.
2016-02-18 17:46:11 +01:00
iceman1001
838c15a643
ADD: added some time debug statements to be able to measure execution time.
...
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
2016-02-17 17:30:37 +01:00
iceman1001
aacb96d7ed
FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C.
2016-02-17 10:46:08 +01:00
iceman1001
b882b54314
FIX: introduced a bug in a loop by uint8_t inside crapto1.c
...
CHG: textual helptext change in "hf mf nested"
CHG: loop inside "nested". Still not fast enough. I wonder if qsort can be exchanged for radixsort or bucket sort?
2016-02-16 23:46:34 +01:00
iceman1001
7504dc50d5
Merge branch 'master' of https://github.com/iceman1001/proxmark3
...
Conflicts:
armsrc/crypto1.c
2016-02-16 21:43:45 +01:00
iceman1001
a1689f417f
CHG: print_hex_break now prints rownumber instead of byte position
2016-02-16 21:39:25 +01:00
iceman1001
c2a714e3ce
ADD: forgot to add the bruteforce command to the commandtable. *experimental, its a simple bruteforce* *not tested*
...
CHG: some textual changes to helptext.
2016-02-16 21:11:17 +01:00
iceman1001
1fe0992d06
FIX: marshmellow42 's fix using memcpy instead of re-assign pointer.
...
Ref: 38b3509542
2016-02-16 18:15:18 +01:00
iceman1001
f7f844d0ba
CHG: added timeouts for downloading values from device, to make the client more responsive.
...
CHG: still curious for the printf_hex_breaks method, why it behavies strange.
2016-02-16 10:54:41 +01:00
iceman1001
98b2a3a1e9
FIX: the port error 10 on Mac, is fixed by @marshmellow42 , a wrong string format specifier was the root cause.
...
ADD: some other adjustments from @marshmellow42 to the fsk demod identifier string.
2016-02-16 09:24:45 +01:00
iceman1001
b0c2f708bc
CHG: -O4 changed into -O3 to remove some compiler warnings clang, on mac ..
2016-02-15 22:06:17 +01:00
iceman1001
a182a680b0
ADD: a print_hex_break function,
...
CHG: "hf legic decode" looks better.
2016-02-15 22:05:26 +01:00
iceman1001
9827020ac5
CHG: "hf legic decode" now prints nicely. Still a strange bug for first row..
2016-02-15 19:56:08 +01:00
iceman1001
d7fd908447
FIX: change the "hf legid load", to use the WaitForResponseTimeout, instead of locking the client if device doesn't answer.
...
CHG: starting to fix the "hf legic decode" and printing the user segements. *WORK IN PROGRESS*
2016-02-15 15:03:07 +01:00
iceman
5fdf867253
CHG: some timing
2016-02-15 02:49:04 +01:00
iceman
e7902ca0a5
chg: removed testmessage
2016-02-15 02:45:43 +01:00
iceman1001
60bb5ef73b
FIX: "hf legic decode" the stamp_len variable was int, but its used as a uint8_t.
...
FIX: cmdlfem4x.c needed ref to cmdmain.h for clearCommandBuffer
2016-02-14 15:30:26 +01:00
iceman1001
4c36581b96
CHG: clearCommandBuffer(); before calling cmdparser.
2016-02-14 15:24:11 +01:00
iceman1001
c6e0a2ebeb
FIX: Faster data load.
2016-02-14 13:29:20 +01:00
iceman1001
e579e76873
FIX: The "hf legic load" had an bug where it send the read byte as uint32_t to the device.
2016-02-14 12:36:42 +01:00
iceman1001
4469412e88
ADD: adding a presco demod, given 0x10D as preamble, .. *work in progress*
2016-02-14 11:58:25 +01:00