RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-09-26 06:25:37 +08:00
Code Issues Projects Releases Packages Wiki Activity
2456 commits 3 branches 18 tags 91 MiB
Commit graph

1557 commits

Author SHA1 Message Date
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