iceman1001 3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 ...

Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c

2015-03-06 09:02:15 +01:00

..

crapto1.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-03-06 09:02:15 +01:00

crapto1.h

Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK.

2013-09-29 11:44:07 +00:00

crypto1.c

Fixed issue #36 & improved file consistency.

2015-03-04 11:00:39 +01:00

nonce2key.c

Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times

2013-10-07 10:10:34 +00:00

nonce2key.h

2013-07-08 17:56:05 +00:00