Commit graph

9 commits

Author SHA1 Message Date
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 b67f7ec359 Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode 2015-02-18 20:02:44 +01:00
Martin Holst Swende d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +01:00
iceman1001 10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
2015-01-06 11:17:02 +01:00
Martin Holst Swende 6f101995b6 Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests 2015-01-05 09:16:06 +01:00
iceman1001 d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001 2ae8a312e0 Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
Something about speed,  the clock detection is not so good.  should be 64,  usually 67..
2014-10-27 19:46:21 +01:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02: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