Merge branch 'master' into master

[proxmark3-svn] / client / lualibs / mf_default_keys.lua

diff --git a/client/lualibs/mf_default_keys.lua b/client/lualibs/mf_default_keys.lua
index 757112c671f0169fc26ea53f76326bd0db073f77..4dee8b4d05d4773c45b76cb3a5a1ee74deed8b2f 100644 (file)
--- a/client/lualibs/mf_default_keys.lua
+++ b/client/lualibs/mf_default_keys.lua
@@ -2,6 +2,7 @@
     
 local _keys = {
 
     
 local _keys = {
 

+

     --[[
 
     These keys are from the pm3 c-codebase. 
     --[[
 
     These keys are from the pm3 c-codebase. 


@@ -105,7 +106,7 @@ local _keys = {
     '776974687573', -- RKF ÖstgötaTrafiken Key B
 
     --[[
     '776974687573', -- RKF ÖstgötaTrafiken Key B
 
     --[[

-    The keys below are taken from from https://code.google.com/p/mifare-key-cracker/downloads/list
+    The keys below are taken from https://code.google.com/p/mifare-key-cracker/downloads/list

     --]]
 
     'bd493a3962b6',
     --]]
 
     'bd493a3962b6',


@@ -128,7 +129,7 @@ local _keys = {
     '123456789abc',
        
        --[[
     '123456789abc',
        
        --[[

-    The keys below are taken from from https://github.com/4ZM/mfterm/blob/master/dictionary.txt
+    The keys below are taken from https://github.com/4ZM/mfterm/blob/master/dictionary.txt

     --]]
        
        'abcdef123456', -- Key from ladyada.net
     --]]
        
        'abcdef123456', -- Key from ladyada.net


@@ -157,9 +158,30 @@ local _keys = {
        '9de89e070277',
        'eff603e1efe9',
        '644672bd4afe',
        '9de89e070277',
        'eff603e1efe9',
        '644672bd4afe',

-

        'b5ff67cba951',
        'b5ff67cba951',

-  }
+       
+       --[[
+    hotel system cards,
+       http://www.proxmark.org/forum/viewtopic.php?id=2430
+    --]]       
+         '44ab09010845',
+      '85fed980ea5a',
+         
+        --[[
+        VIGIK1
+        --]]
+        '314B49474956',
+        '564c505f4d41',
+        
+        --[[
+        BCARD keyB
+        --]]
+        'f4a9ef2afc6d',
+        
+        --[[    
+        --]]
+        'a9f953def0a3',
+}

 
 ---
 --    The keys above have just been pasted in, for completeness sake. They contain duplicates. 
 
 ---
 --    The keys above have just been pasted in, for completeness sake. They contain duplicates. 


@@ -177,7 +199,7 @@ local function uniq(list)
             table.insert(foobar, value);
         end
     end
             table.insert(foobar, value);
         end
     end

-    --print("final list length length ", #foobar)
+    --print("final list length ", #foobar)

     return foobar
 end
 
     return foobar
 end