github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c
This commit is contained in:
iceman1001 2015-03-06 09:02:15 +01:00
commit 3ac59c7fed
23 changed files with 726 additions and 964 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/lualibs/mf_default_keys.lua
View file

@ -158,20 +158,6 @@ local _keys = {
'eff603e1efe9',
'644672bd4afe',
'b5ff67cba951',
}
--[[
Kiev metro cards
--]]
'8fe644038790',
'f14ee7cae863',
'632193be1c3c',
'569369c5a0e5',
'9de89e070277',
'eff603e1efe9',
'644672bd4afe',
'b5ff67cba951',
}