RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 16:56:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
8993 commits 3 branches 14 tags 86 MiB
Commit graph

288 commits

Author SHA1 Message Date
merlokk cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
 2019-03-01 19:37:43 +02:00
iceman1001 2dc3bc6af3 ADD: 'lf keri' - basic commands. 2019-02-23 15:44:34 +01:00
merlokk db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk 3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
iceman1001 7934630d2b FIX: Makefile bad styled calls 2019-02-14 19:27:39 +01:00
merlokk 88d42a1af5 make 2018-12-28 13:46:52 +02:00
merlokk 1099c6923d added COSE algorithms 2018-11-26 16:12:28 +02:00
merlokk 8f1c67d512 added fidocore 2018-11-17 16:19:09 +02:00
merlokk 2d17fb172a added cbor print sketch 2018-11-16 18:33:10 +02:00
merlokk cbdb42560c added make 2018-11-16 17:06:13 +02:00
merlokk 6cd6275361 refactoring 2018-11-15 14:37:38 +02:00
merlokk 84efb3256b makefile 2018-11-14 11:41:18 +02:00
merlokk 7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
Oleg Moiseenko b7fa407830
Merge branch 'master' into fido 2018-11-12 15:06:21 +02:00
merlokk ab196ad2ee added jansson 2018-11-12 15:00:35 +02:00
merlokk 074c138de7 all works except of jansson private symbols linking 2018-11-08 19:55:51 +02:00
merlokk f03261be9a compiled. not linking.... 2018-11-08 19:14:30 +02:00
merlokk 4fed815b88 added core files. 
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
 2018-11-08 17:29:58 +02:00
merlokk ec1e04342c compiles 2018-11-07 18:31:36 +02:00
merlokk 6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
merlokk 8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk 61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
merlokk ab5233d29f now it needs to resolve issues in reveng 2018-10-11 11:48:46 +03:00
Chris 1fb121474e osx: fix annoying focus behaviour (@anticat) 
https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
 2018-10-07 09:01:24 +02:00
Chris 7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat) 
https://github.com/Proxmark/proxmark3/pull/687
 2018-10-06 13:29:20 +02:00
Chris df70619888 chg: turn off FPC specific functions (still work in progress) 2018-09-15 18:33:16 +02:00
Chris 24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
iceman1001 4d8488e14b CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi) 
CHG: textual adjustments
 2018-07-28 14:25:12 +02:00
Chris f70b8be5de add: 'sc' - smart card commad [rdv40] 
chg: test to read out firmware
 2018-07-05 10:48:24 +02:00
iceman1001 c15e755e5f add: base64 support 2018-05-23 10:37:11 +02:00
iceman1001 021c0a1349 ADD: 'mem' commands. For RDV40 devices only. 
If you don't have one,  comment out inside client/Makefile this line

CFLAGS += -DWITH_FLASH
 2018-05-03 12:15:03 +02:00
iceman1001 be4c5118b1 chg: remove obsolete data.c 2018-05-02 08:16:59 +02:00
iceman1001 71ce6e07ee CHG: moved trace commands into its own category (from hf) 
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
 2018-03-18 18:00:41 +01:00
iceman1001 ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001 c9479276dc textu 2018-02-07 22:02:04 +01:00
iceman1001 e95313cc22 fix: reveng needs a macro to compile. 2018-02-03 22:58:43 +01:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001 5dc1761943 FIX: solution one, for more avx, avx2, avx512 
ab0582d672
 2018-01-06 18:52:28 +01:00
iceman1001 1a2973a319 fix: 'hf mf hardnested' - crashes on SSE2 with mingw / windows, Huge thanks to @merlokk @pwpiwi for bug and fix! 
https://github.com/Proxmark/proxmark3/issues/404
 2018-01-05 18:01:59 +01:00
iceman1001 dc890104aa fix: spaces, and remove tabs 2017-12-24 10:56:17 +01:00
iceman1001 40b1922187 chg: added emv4 changes. 
broke out the includes into a variable instead. was getting long
 2017-12-24 10:29:50 +01:00
iceman1001 1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001 0a1a48df01 chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like 
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox   Thanks!
 2017-12-05 23:34:52 +01:00
iceman1001 c0f91ddd09 revert... 2017-12-05 18:42:57 +01:00
iceman1001 c8a9813261 fix: better avr512 detection (@pwpiwi) https://github.com/Proxmark/proxmark3/pull/507 2017-12-05 18:28:29 +01:00
Iceman 66e0e18a35
Update Makefile 
Remove all subversionings like  
7.1.1-3   becomes  7.1.1
 2017-12-05 07:29:53 +01:00
iceman1001 e8e3256f7e add: compilation order 2017-11-25 08:03:53 +01:00
iceman1001 8b83db2c1b ADD: 'hf 14a apdu' @merlokk 2017-11-10 20:47:31 +01:00
iceman1001 8136decadd ADD: hooking up the new felica commands 2017-10-10 14:59:58 +02:00
iceman1001 a68887ce2d FIX: #402 https://github.com/Proxmark/proxmark3/pull/402 (piwi) 2017-09-28 22:31:20 +02:00
iceman1001 14550557be CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation. 
* client/Makefile
 * common/Makefile.common
 2017-09-18 22:33:22 +02:00
iceman1001 28f1f23d48 chg: easy printing of MAKE variables 
Usage::
  make print-FLASHTOOL
  cd bootrom; make print-APP_CFLAGS
  cd client; make print-GCC_VERSION
 2017-09-18 18:59:51 +02:00
iceman1001 179748a5df add: Fix detection of AVX512 support for Apple clang compiler #392 (piwi) 
de1e68d34b
 2017-09-12 21:45:37 +02:00
iceman1001 6d98779ff8 chg: 'hf 15 read' - nice output and with lock info 
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
 2017-09-06 22:04:00 +02:00
iceman1001 dc202ee498 FIX: fixes some off missing chars, now the @GCC_GTEQ_490 contains a 1 or 0. 
ADD:  makefile,   print-%,   added an easy way to output Makefile variables,   you call make with the var you want to print like this::      make print-GCC_GTEQ_490
 2017-08-23 08:12:07 +02:00
iceman1001 2c198f75f5 FIX: gcc version | gcc -dumpversion only exists on later gcc versions. This fix address this problem by using gcc -version instead. Thanks to @winguru 
https://github.com/iceman1001/proxmark3/issues/123
 2017-08-23 07:37:49 +02:00
iceman1001 1d6b0c0c6a fix: compilation error on nethunter (piwi) 2017-08-16 14:15:16 +02:00
iceman1001 6ad546fa13 chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c 2017-08-11 11:40:25 +02:00
iceman1001 f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001 830796cbef chg: the lualib file mf_default_keys.lua is now automatically created with "make clean && make all". 2017-07-28 02:45:58 +02:00
iceman1001 30b70bb388 adjusted to remove the usb_cmd.lua.. 2017-07-28 02:05:03 +02:00
iceman1001 70b58e46b1 sleep in the makefile , 2017-07-27 21:23:58 +02:00
iceman1001 475a19b937 part of monstermerge. 2017-07-27 20:59:54 +02:00
iceman1001 d2f79fa83f ADD 'lf nexawatch' by marshmellow42 
ADD 'lf securakey'  by marshmellow42
ADD 'lf pac'  by marshmellow42
chg: parity.h got some love from pm3 master.
 2017-07-14 15:51:12 +02:00
Gator96100 dccc3e2c66 When compiled with MinGW use march=x86-64 instead of march=native 2017-04-23 15:27:00 +02:00
Gator96100 aff903d99f Fix crashes when compiled with a different cpu 2017-04-22 23:36:43 +02: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 b804b9cdb8 ADD: @pivipw 's changes "making lua paths". 
ref:: 4197a3f6ff

This contains a ugly hardcoded hack to solve the issue: https://github.com/Proxmark/proxmark3/issues/217
where GetModuleHandleEx doesn't exist in mingw (old proxspace 2013 environment).

Use the docker container or linux...
 2017-02-24 14:59:38 +01:00
iceman1001 19d9376c16 CHG: added some comments when changing the HAS_512_FLASH macro directive. 
CHG: 'make cli'  -  needs lualibs to compile.  well,  and more stuff ofcourse.
 2017-02-20 11:47:10 +01:00
iceman1001 573e8d72c7 FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct. 
- armsrc/Makefile          when commenting out functionality,  move it below the comment otherwise APPS_CFLAG breaks to early.  See WITH_LCD
  - common/Makefile.common   enable / disable EMV,  uncomment two lines.  then make clean && make all.  flash,   MIGHT NOT work on 256kb devices

FIX: missing break in appmain.c made it go to iclass function..
 2017-02-13 15:32:48 +01:00
iceman1001 4c8fe2e976 CHG: some minor adjustments. 2017-02-13 11:06:30 +01:00
iceman1001 2e8d938bef ADD: 'hf emv' - from @peterfillmore emv fork. A bit cleaned up and moved around. Should compile 2017-02-05 21:56:47 +01:00
iceman1001 71aa1ff824 FIX: fixes warning for "%zu" string formatspecifier on MINGW systems. (Thanks to @marshmellow42 for this one) 2017-01-31 05:33:24 +01:00
iceman1001 4653da4331 ADD: lf cotag - added first try at basic functionality to read samples from Cotag. In lfops.c is the startup sequence that needs to be tested out. 2017-01-27 10:49:34 +01:00
iceman1001 bdebc8dbab CHG: removed a -L path for OSX 2017-01-26 23:49:05 +01:00
iceman1001 c48211f7ed ADD: 'lf animal' commands. CLONE/SIM/READ/DEMOD of FXD-B animal tags. Still some work left. 2017-01-05 01:51:47 +01:00
iceman1001 22eece1e2d ADD: 'LF NORALSY' clone/sim/read commands. Partly done. some crc works, but whole format in not mapped yet. 
ADD: 'LF SEARCH'  added noralsy detection
 2016-12-15 18:04:30 +01:00
iceman1001 eb911aa8d6 ADD: 'lf visa2000' commands. (SIM/CLONE/READ) almost finished. 
CHG: 'lf xxxxx'  reduced number of samples from 30000 -> 20000 in "lf xxxxxx read" commands.
CHG: 'data samples'  - didn't honor the silent parameter. It now output less for the 'lf xxxxxx read' commands.
 2016-12-14 23:23:16 +01:00
iceman1001 f72669f366 ADD: since the client now calls legic prng, this is needed here too. 
CHG:  the OS X  QT4 vs QT5 detection.  NOT fixed yet.
 2016-09-09 11:58:53 +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 91d4cda48b CHG: removed the linking to radixsort.c 2016-07-28 20:42:46 +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
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 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 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 df82844c05 FIX: more paths for readline and Mac Os X 2016-05-06 19:52:04 +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 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 2813c42f98 CHG: moved some params. 2016-04-23 13:02:51 +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 4534ec060a CHG: and the Makefile needs also to be updated 2016-04-05 03:35:47 +02: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 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 71cb7328e3 ADD: added some pyramid commands. //not finished. 2016-02-25 17:49:48 +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 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 b0c2f708bc CHG: -O4 changed into -O3 to remove some compiler warnings clang, on mac .. 2016-02-15 22:06:17 +01:00
iceman1001 5a6e19e614 ADD: Started to add a Presco LF clone functionality. Can calc Wiegand from printed number. 2016-02-13 20:53:06 +01:00
iceman1001 089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001 a0f33b6682 CHG: started to clean up the crapto1 imp in client/nonce2key/ folder. 2016-01-19 17:22:18 +01:00
iceman1001 f4d0ffd1b9 CHG: some textual change to README.txt 
ADD: a prng.c to collect some different PRNG's i've ran into
ADD: some changes the tea implementation
ADD: a enhanced version - SwapEndian64ex
 2015-12-21 19:48:00 +01:00
iceman1001 f8ada309e9 ADD: @pwpiwi 's latest code from his 'hardnested' branch. 2015-12-15 08:51:29 +01:00
iceman1001 0a886a1d1b ADD: a TEA crypto algorithm implemention. 2015-12-09 14:57:16 +01:00
iceman1001 c188b1b9b2 ADD: @go_tus simple bruteforce for t55xx, refactored a bit. 
ADD: @pwpiwi 's implementation of Hardnested
 2015-11-27 16:24:00 +01:00
iceman1001 0de8e3874d A lot of changes... 
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities,   (not a proper DEMOD, but a start)
.. GetCountUS  better precision from @pwpivi
.. bin2hex,  hex2bin  from @holiman

...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler,   nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block...  See Issue #136  https://github.com/Proxmark/proxmark3/issues/136    Not solved yet.

...
Started add SHA256..   not working yet..
 2015-10-04 18:01:33 +02:00
Gil Cohen 8fac5452b8 updated makefile, readme 2015-08-03 23:07:57 -05:00
iceman1001 db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c 
ADD: @VERTCraig's AVID commands.

TEST: testing some changes to iso14443 demod.
 2015-07-18 20:43:14 +02:00
iceman1001 9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +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
iceman1001 ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +02:00
iceman1001 9962091e29 ADD: experimantal test of adding "reveng 1.30" source code into the PM3 Client. 2015-05-16 15:36:40 +02:00
iceman1001 0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
marshmellow42 9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
iceman1001 108262a145 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-13 09:22:12 +01:00
iceman1001 3d83b58b50 ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c 2015-03-12 10:10:22 +01:00
iceman1001 3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +01:00
pwpiwi 8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +01:00
iceman1001 f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
 2015-02-19 11:32:11 +01:00
Martin Holst Swende 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
iceman1001 31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/epa.c
 2015-02-12 09:54:21 +01:00
iceman1001 2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58:14 +01:00
Jesse Hallio e9281ae812 Add flasher from SVN r623 for HID bootprom and current Mac OS X kext 2015-02-03 23:22:39 +02:00
iceman1001 e58c712c9e ADD: a switch to detect if Qt4 or Qt5 is used. 2015-01-30 15:23:01 +01:00
Martin Holst Swende dca558bf9e Removed last trace of crypto from makefile 2015-01-26 20:56:33 +01:00
Martin Holst Swende afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
iceman1001 5ee701292f Step 2 - Ultralight / Ultralight-C 
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
 2015-01-20 21:23:04 +01:00
iceman1001 c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
 2015-01-20 20:59:24 +01:00
Martin Holst Swende 1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead 2015-01-12 21:47:36 +01:00
iceman1001 002c1ce57a CHG: removed leftover debugging statements proxmark3.c 
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
 2015-01-07 11:10:46 +01:00
iceman1001 9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
marshmellow42 eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
Andrew Davies a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00
penturalabs a1f3bb120f Added Kantech ioProx Support 2014-03-18 20:52:48 +00:00
martin.holst@gmail.com 77cd612f15 Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation 2013-11-06 18:34:10 +00:00
roel@libnfc.org b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +00:00
douniwan5788@gmail.com b19bd5d689 Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK. 
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
 2013-09-29 11:44:07 +00:00
martin.holst@gmail.com 427cdbe2cd Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others... 2013-09-20 10:11:17 +00:00
martin.holst@gmail.com eaea9de900 Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw) 2013-09-19 19:33:56 +00:00
martin.holst@gmail.com 500c972914 Fixed some kind of of linking error 2013-09-01 20:22:22 +00:00
martin.holst@gmail.com cda2a4c0a5 Merged latest trunk changes into scripting-branch 2013-09-01 20:00:56 +00:00
martin.holst@gmail.com a763eb2126 Added a comment 2013-09-01 18:40:08 +00:00
martin.holst@gmail.com 3a4c72fe59 Added lua-mac building, added cleaning of lua files 2013-06-26 11:02:37 +00:00
martin.holst@gmail.com 30a46ed86a Attempt to make the makefile generic, so lua compilation works well also under windows 2013-06-25 20:25:18 +00:00
martin.holst@gmail.com f057bddb70 Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack 2013-05-26 20:05:13 +00:00
martin.holst@gmail.com a0655c45bd Added 'core'-api, also added some error handling in scripts 2013-05-24 21:05:45 +00:00