github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #68 from iceman1001/feature

Browse source 
ADD: identifications.
This commit is contained in:
Martin Holst Swende 2015-02-19 10:51:10 +01:00
commit 0387cd3393
2 changed files with 50 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/cmdhf15.c
View file

@ -133,11 +133,21 @@ const productName uidmapping[] = {
{ 0xE015000000000000LL, 16, "ATMEL France" }, { 0xE015000000000000LL, 16, "ATMEL France" },
{ 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"}, { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
{ 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034? no 'read', just 'readmulti'" }, { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
{ 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" }, { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
{ 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" }, { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
{ 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233;" }, { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
{ 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" }, { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"},
{ 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
{ 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
{ 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
{ 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" },
{ 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"},
{ 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"},
{ 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF 51x64bit "},
{ 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" },
{ 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" },
{ 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" },
{ 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" }, { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
{ 0xE018000000000000LL, 16, "ZMD AG Germany" }, { 0xE018000000000000LL, 16, "ZMD AG Germany" },

17
client/lualibs/default_toys.lua
View file

@ -74,6 +74,7 @@ local _names = {
["D200"]="MAGIC TRAP", ["D200"]="MAGIC TRAP",
["D300"]="WATER TRAP", ["D300"]="WATER TRAP",
["D400"]="AIR TRAP", ["D400"]="AIR TRAP",
["D500"]="UNDEAD TRAP",
["D600"]="TECH TRAP", ["D600"]="TECH TRAP",
["D700"]="FIRE TRAP", ["D700"]="FIRE TRAP",
["D800"]="EARTH TRAP", ["D800"]="EARTH TRAP",
@ -94,11 +95,11 @@ local _names = {
--[[ --[[
EXPANSION EXPANSION
--]] --]]
["012C"]="DRAGON", ["012C"]="DRAGONS PEAK",
["012D"]="ICE", ["012D"]="EMPIRE OF ICE",
["012E"]="PIRATE", ["012E"]="PIRATE SEAS",
["012F"]="UNDEAD", ["012F"]="DARKLIGHT CRYPT",
["0130"]="PVPUNLOCK", ["0130"]="VOLCANIC VAULT",
["0131"]="MIRROR OF MYSTERY", ["0131"]="MIRROR OF MYSTERY",
["0132"]="NIGHTMARE EXPRESS", ["0132"]="NIGHTMARE EXPRESS",
["0133"]="SUNSCRAPER SPIRE", ["0133"]="SUNSCRAPER SPIRE",
@ -143,7 +144,7 @@ local _names = {
["01DB"]="TRAPTEAM TUFF LUCK", ["01DB"]="TRAPTEAM TUFF LUCK",
["01DC"]="TRAPTEAM FOOD FIGHT", ["01DC"]="TRAPTEAM FOOD FIGHT",
["01DD"]="TRAPTEAM HIGH FIVE", ["01DD"]="TRAPTEAM HIGH FIVE",
["01DE"]="TRAPTEAM KRYPTKING", ["01DE"]="TRAPTEAM NITRO KRYPT KING",
["01DF"]="TRAPTEAM SHORT CUT", ["01DF"]="TRAPTEAM SHORT CUT",
["01E0"]="TRAPTEAM BAT SPIN", ["01E0"]="TRAPTEAM BAT SPIN",
["01E1"]="TRAPTEAM FUNNY BONE", ["01E1"]="TRAPTEAM FUNNY BONE",
@ -165,8 +166,8 @@ local _names = {
["01FD"]="PET SMALL FRY", ["01FD"]="PET SMALL FRY",
["01FE"]="PET DROBIT", ["01FE"]="PET DROBIT",
["0202"]="PET GILL GRUNT", ["0202"]="PET GILL GRUNT",
["0207"]="PET TRIGGER HAPPY", ["0207"]="PET TRIGGER SNAPPY",
["020E"]="PET STEALTH ELF", ["020E"]="PET WHISPER ELF",
["021C"]="PET BARKLEY", ["021C"]="PET BARKLEY",
["021D"]="PET THUMPLING", ["021D"]="PET THUMPLING",
["021E"]="PET MINI JINI", ["021E"]="PET MINI JINI",