Revert "Merge branch 'master' into hf_mf_sim"

This reverts commit cbea5d9d02, reversing changes made to b66152feb2.
2019-03-15 21:45:00 +01:00
parent cbea5d9d02
commit cfe2b2797e
161 changed files with 1465 additions and 2004 deletions
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -100,4 +100,4 @@ extern int detect_classic_prng(void);
 extern int detect_classic_nackbug(bool verbose);
 extern void detect_classic_magic(void);
 extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
-#endif
+#endif