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
parent f4a57e861d 7843130a58
commit 3ac59c7fed
23 changed files with 726 additions and 964 deletions
--- a/client/lualibs/mf_default_keys.lua
+++ b/client/lualibs/mf_default_keys.lua
@@ -158,20 +158,6 @@ local _keys = {
 	'eff603e1efe9',
 	'644672bd4afe',

-	'b5ff67cba951',
-  }
-
-	--[[
-    Kiev metro cards
-    --]]	
-	'8fe644038790',
-	'f14ee7cae863',
-	'632193be1c3c',
-	'569369c5a0e5',
-	'9de89e070277',
-	'eff603e1efe9',
-	'644672bd4afe',
-
 	'b5ff67cba951',
 }