From 1a02152d03a86baec0e0ad8b33a968880207a9aa Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 10 Feb 2024 14:46:46 +0300
Subject: [PATCH] Update ndef parser, apply mf classic dict changes

by @Willy-JL

https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/plugins/supported_cards/ndef.c
https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
---
 .../main/nfc/plugins/supported_cards/ndef.c   |   30 +-
 .../resources/nfc/assets/mf_classic_dict.nfc  | 1617 +++++++++++------
 2 files changed, 1066 insertions(+), 581 deletions(-)

diff --git a/applications/main/nfc/plugins/supported_cards/ndef.c b/applications/main/nfc/plugins/supported_cards/ndef.c
index a40f59a16..1a2497f2c 100644
--- a/applications/main/nfc/plugins/supported_cards/ndef.c
+++ b/applications/main/nfc/plugins/supported_cards/ndef.c
@@ -362,20 +362,26 @@ static bool ndef_parse(const NfcDevice* device, FuriString* parsed_data) {
         // Memory layout documentation:
         // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrfxlib/nfc/doc/type_2_tag.html#id2
 
-        // Double check static values layout
-        // First 4 static reserved pages for UID, internal and lock bytes
-        // (Not sure if NDEF cata can be found in cards with different layout)
-        if(data->page[0].data[0] != 0x04) break;
-        if(data->page[2].data[1] != 0x48) break; // Internal
-        if(data->page[2].data[2] != 0x00) break; // Lock bytes
-        if(data->page[2].data[3] != 0x00) break; // ...
-        if(data->page[3].data[0] != 0xE1) break; // Capability container
-        if(data->page[3].data[1] != 0x10) break; // ...
+        // Check card type can contain NDEF
+        if(data->type != MfUltralightTypeNTAG203 && data->type != MfUltralightTypeNTAG213 &&
+           data->type != MfUltralightTypeNTAG215 && data->type != MfUltralightTypeNTAG216 &&
+           data->type != MfUltralightTypeNTAGI2C1K && data->type != MfUltralightTypeNTAGI2C2K) {
+            break;
+        }
 
-        // Data content starts here at 5th page
+        // Double check Capability Container (CC) and find data area bounds
+        struct {
+            uint8_t nfc_magic_number;
+            uint8_t document_version_number;
+            uint8_t data_area_size;
+            uint8_t read_write_access;
+        }* cc = (void*)&data->page[3].data[0];
+        if(cc->nfc_magic_number != 0xE1) break;
+        if(cc->document_version_number != 0x10) break;
         const uint8_t* cur = &data->page[4].data[0];
-        const uint8_t* end = &data->page[0].data[0] +
-                             (mf_ultralight_get_pages_total(data->type) * MF_ULTRALIGHT_PAGE_SIZE);
+        const uint8_t* end = cur + (cc->data_area_size * 2 * MF_ULTRALIGHT_PAGE_SIZE);
+        size_t max_size = mf_ultralight_get_pages_total(data->type) * MF_ULTRALIGHT_PAGE_SIZE;
+        end = MIN(end, &data->page[0].data[0] + max_size);
         size_t message_num = 0;
 
         // Parse as TLV (see docs above)
diff --git a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
index 9453b8a3f..609b48c09 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -1,90 +1,145 @@
 ###########################
 #  Do not edit, this file will be overwritten after firmware update
 #  Use the user_dict file for user keys
-# Last update 19th October, 2022
-# -------------------------
-# MIFARE DEFAULT KEYS
-#   -- ICEMAN FORK VERSION --
-#   -- CONTRIBUTE TO THIS LIST, SHARING IS CARING --
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
-# DEFAULTKEY(FIRSTKEYUSEDBYPROGRAMIFNOUSERDEFINEDKEY)
+# Last updated 17 December 2023
+###########################
+# +-----------------------------------------------------------------------------------------------------+
+# | https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic |
+# +-----------------------------------------------------------------------------------------------------+
+# Mifare Default Keys
+#   -- iceman fork version --
+#   -- contribute to this list, sharing is caring --
+# Default key
 FFFFFFFFFFFF
-# BLANKKEY
+# Blank key
 000000000000
-# NFC FORUM MADKEY
-# MAD ACCESS KEY A (REVERSED)
+# NFC Forum MADkey
+A0A1A2A3A4A5
+# MAD access key A (reversed)
 A5A4A3A2A1A0
-# MAD ACCESS KEY B
+# MAD access key B
 89ECA97F8C2A
-# KEY A WIEN
-# KEY B WIEN
-# ICOPY-X
+# Mifare 1k EV1 (S50) hidden blocks, Signature data
+# 16 A
+5C8FF9990DA2
+# 17 A
+75CCB59C9BED
+# 16 B
+D01AFEEB890A
+# 17 B
+4B791BEA7BCC
+# QL88 keys
+# 17 A/B
+2612C6DE84CA
+707B11FC1481
+# QL88 diversifed
+03F9067646AE
+2352C5B56D85
+B0B1B2B3B4B5
+C0C1C2C3C4C5
+D0D1D2D3D4D5
+AABBCCDDEEFF
+4D3A99C351DD
+1A982C7E459A
+# key A Wien
+D3F7D3F7D3F7
+# key B Wien
+5A1B85FCE20A
+714C5C886E97
+587EE5F9350F
+A0478CC39091
+533CB6C723F6
+8FD0A4F256E9
+# iCopy-X
 E00000000000
 E7D6064C5860
 B27CCAB30DBD
-# LIB / NAT BIEB
+# lib / Nat Bieb
 D2ECE8B9395E
-# NSCP DEFAULT KEY
+# NSCP default key
 1494E81663D7
-# KIEV KEYS
+# NFC tools
+7C9FB8474242
+# Kiev keys
 569369C5A0E5
 632193BE1C3C
 644672BD4AFE
 8FE644038790
 9DE89E070277
+B5FF67CBA951
 EFF603E1EFE9
 F14EE7CAE863
-# KIEV / OV-CHIPKAART
-B5FF67CBA951
+# ICT S14 A/B
+9C28A60F7249
+C9826AF02794
 # RKF
-# VÄSTTRAFIKEN KEYA, RKF ÖSTGÖTATRAFIKEN KEYA
+# Vasttrafiken KeyA, RKF OstgotaTrafiken KeyA
 FC00018778F7
+# Vasttrafiken KeyA
 0297927C0F77
 54726176656C
-# VÄSTTRAFIKEN KEYB
+# Vasttrafiken KeyB
 00000FFE2488
 776974687573
 EE0042F88840
-# RKF SLKEYA
+# RKF SLKeyA
 26940B21FF5D
 A64598A77478
-# RKF SLKEYB
+# RKF SLKeyB
 5C598C9C58B5
 E4D2770A89BE
-# RKF REJSKORTDANMARK KEYA
+# RKF Rejskort Danmark KeyA
 722BFCC5375F
+# RKF Rejskort Danmark KeyB
 F1D83F964314
-# RKF JOJOPRIVAKEYA
+# RKF JOJOPRIVA KeyA
 505249564141
-# RKF JOJOPRIVAKEYB
+# RKF JOJOPRIVA KeyB
 505249564142
-# RKF JOJOGROUPKEYA
+# RKF JOJOGROUP KeyA
 47524F555041
-# RKF JOJOGROUPKEYB
-47524F555042
 434F4D4D4F41
+# RKF JOJOGROUP KeyB
+47524F555042
 434F4D4D4F42
+# TNP3xxx
 4B0B20107CCB
-# TNP3XXX
-# ACCESS CONTROL SYSTEM
+# Access control system
 605F5E5D5C5B
-# MORE KEYS FROM MFC_DEFAULT_KEYS.LUA
+# NSP Global keys A and B (uk housing access control)
+199404281970
+199404281998
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=25925#p25925
+# Tengo Cards Key A
+FFF011223358
+FF9F11223358
+# Elevator system Kherson, Ukraine
+AC37E76385F5
+576DCFFF2F25
+# Car wash system
+1EE38419EF39
+26578719DCD9
+# more Keys from mfc_default_keys.lua
 000000000001
 000000000002
 00000000000A
 00000000000B
+010203040506
 0123456789AB
 100000000000
 111111111111
+123456789ABC
 12F2EE3478C1
 14D446E33363
 1999A3554A55
 200000000000
 222222222222
 27DD91F1FCF1
-# DIRECTORYANDEVENTLOGKEYB
+# Hotel system
+505209016A1F
+# Directory and eventlog KeyB
 2BA9621E0A36
-# DIRECTORYANDEVENTLOGKEYA
+# Directory and eventlog KeyA
 4AF9D7ADEBE4
 333333333333
 33F974B42769
@@ -104,7 +159,8 @@ A00000000000
 A053A292A4AF
 A94133013401
 AAAAAAAAAAAA
-# KEYFROMLADYADA.NET
+# Key from ladyada.net
+ABCDEF123456
 B00000000000
 B127C6F41436
 BBBBBBBBBBBB
@@ -113,25 +169,24 @@ C934FE34D934
 CCCCCCCCCCCC
 DDDDDDDDDDDD
 EEEEEEEEEEEE
-# ELEVATOR
-# DATA FROM FORUM
+# elevator
+# data from forum
 FFFFFF545846
 F1A97341A9FC
-# HOTEL SYSTEM
+# hotel system
 44AB09010845
 85FED980EA5A
-# ARD (FR) KEY A
+# ARD (fr) key A
 43454952534E
-# ARD (FR) KEY B
+# ARD (fr) key B
 4A2B29111213
 4143414F5250
-# TEHRAN RAILWAY
+# Tehran Railway
 A9B43414F585
 1FB235AC1388
-# DATA FROM HTTP://IRQ5.IO/2013/04/13/DECODING-BCARD-CONFERENCE-BADGES/
-# BCARD KEYB
+# Data from http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
+# BCARD KeyB
 F4A9EF2AFC6D
-# DATA FROM ...
 # S0 B
 89EAC97F8C2A
 # S4 A
@@ -141,12 +196,13 @@ F4A9EF2AFC6D
 # S6 B
 FB0B20DF1F34
 A9F953DEF0A3
+# Data from forum
 74A386AD0A6D
 3F7A5C2DBD81
 21EDF95E7433
 C121FF19F681
 3D5D9996359A
-# HERE BE BIP KEYS...
+# Here be BIP keys...
 3A42F33AF429
 1FC235AC1309
 6338A371C0ED
@@ -179,32 +235,46 @@ D49E2826664F
 51284C3686A6
 3DF14C8000A1
 6A470D54127C
-# DATA FROM HTTP://PASTEBIN.COM/AK9BFTPW
-# LÄNSTRAFIKEN I VÄSTERBOTTEN
+# Data from http://pastebin.com/AK9Bftpw
+# Lanstrafiken i Vasterbotten
 48FFE71294A0
 E3429281EFC1
 16F21A82EC84
 460722122510
-# 3DPRINTER
-# EPI ENVISIONTE 3DPRINTER
+# 3dprinter
+# EPI Envisionte
 AAFB06045877
-# GYM
-# FYSIKEN A
+# gym
+# Fysiken A
 3E65E4FB65B3
-# FYSIKEN B
+# Fysiken B
 25094DF6F148
-# CLEVERFIT
+# https://mattionline.de/fitnessstudio-armband-reverse-engineering/
+# https://mattionline.de/milazycracker/
+# gym wistband A, same as Fysiken A
+# gym wistband B
+81CC25EBBB6A
+195DC63DB3A3
+# CleverFit
 A05DBD98E0FC
-# HOTEL KEYCARD
+# GoFit
+AA4DDA458EBB
+EAB8066C7479
+# Nordic Wellness A, same as Fysiken A
+# Nordic Wellness B
+E5519E1CC92B
+# Hotel KeyCard
 D3B595E9DD63
 AFBECD121004
-# SIMONSVOSS
+# SimonsVoss
 6471A5EF2D1A
 # ID06
 4E3552426B32
 22BDACF5A33F
 6E7747394E63
 763958704B78
+# Onity  S1 A/B
+8A19D40CF2B5
 # 24-7
 D21762B2DE3B
 0E83A374B513
@@ -218,9 +288,9 @@ F101622750B7
 710732200D34
 7C335FB121B5
 B39AE17435DC
-# KEY A
+# key A
 454841585443
-# DATA FROM HTTP://PASTEBIN.COM/GQ6NK38G
+# Data from http://pastebin.com/gQ6nk38G
 D39BB83F5297
 85675B200017
 528C9DFFE28C
@@ -245,12 +315,10 @@ FEE470A4CB58
 75EDE6A84460
 DF27A8F1CB8E
 B0C9DD55DD4D
-# DATA FROM HTTP://BIT.LY/1BDSBJL
+# Data from http://bit.ly/1bdSbJl
 A0B0C0D0E0F0
 A1B1C1D1E1F1
-# DATA FROM MSK SOCIAL
-A229E68AD9E5
-49C2B5296EF4
+# Data from msk social
 2735FC181807
 2ABA9519F574
 84FD7F7A12B6
@@ -274,7 +342,9 @@ C7C0ADB3284F
 D8A274B2E026
 B20B83CB145C
 9AFA6CB4FC3D
-# DATA FROM HTTP://PASTEBIN.COM/RRJUEDCM
+A229E68AD9E5
+49C2B5296EF4
+# Data from http://pastebin.com/RRJUEDCM
 0D258FE90296
 E55A3CA71826
 A4F204203F56
@@ -287,17 +357,17 @@ EEB420209D0C
 1ACC3189578C
 C2B7EC7D4EB1
 369A4663ACD2
-# DATA FROM HTTPS://GITHUB.COM/ZHANGJINGYE03/ZXCARDUMPER
-# ZXCARD KEY A/B
+# Data from https://github.com/zhangjingye03/zxcardumper
+# zxcard Key A/B
 668770666644
 003003003003
-# DATA FROM HTTP://PHREAKERCLUB.COM/FORUM/SHOWTHREAD.PHP?P=41266
+# Data from http://phreakerclub.com/forum/showthread.php?p=41266
 26973EA74321
 71F3A315AD26
 51044EFB5AAB
 AC70CA327A04
 EB0A8FF88ADE
-# TRANSPORT SYSTEM METROMONEY
+# Transport system Metromoney
 2803BCB0C7E1
 9C616585E26D
 4FA9EB49F75E
@@ -305,7 +375,7 @@ EB0A8FF88ADE
 A160FCD5EC4C
 112233445566
 361A62F35BC9
-# TRANSPORT SYSTEM SPAIN
+# Transport system Spain
 83F3CB98C258
 070D486BC555
 A9B018868CC1
@@ -338,15 +408,89 @@ C52876869800
 5145C34DBA19
 25352912CD8D
 81B20C274C3F
-# DATA FROM MALL
-# PLAYLAND BALIKESIR
+00B70875AF1D
+04B787B2F3A5
+05412723F1B6
+05C301C8795A
+066F5AF3CCEE
+0A1B6C50E04E
+0AD0956DF6EE
+0AD6B7E37183
+0F3A4D48757B
+1417E5671417
+18AB07270506
+18E887D625B4
+1ABC15934F5A
+1AF66F83F5BE
+260480290483
+2900AAC52BC3
+2910AFE15C99
+374521A38BCC
+3A4C47757B07
+3A524B7A7B37
+3C4ABB877EAF
+3F3A534B7B7B
+4B787B273A50
+4B92DF1BF25D
+4F0E4AE8051A
+514B797B2F3A
+529CF51F05C5
+52B26C199862
+57A18BFEC381
+5A7D87876EA8
+64CBADC7A313
+65B6C3200736
+67B1B3A4E497
+6B0454D5D3C3
+6B3B7AF45777
+6C273F431564
+702C1BF025DD
+738385948494
+76E450094393
+777B1F3A4F4A
+7B173A4E4976
+81504133B13C
+826576A1AB68
+8A55194F6587
+8DFACF11E778
+8FD6D76742DC
+9AFEE1F65742
+9D56D83658AC
+9FAC23197904
+A1AB3A08712C
+A514B797B373
+A58AB5619631
+A5BB18152EF1
+A777B233A4F4
+AB19BC885A29
+AB91BDA25F00
+AE98BA1E6F2C
+B133A4D48757
+B3A4C47757B0
+B6803136F5AF
+B793ADA6DB0C
+B95BFDEBA7E4
+C0AA2BBD27CD
+C27F5C1A9C2B
+C9BE49675FE4
+CCCE24102003
+CDE668FDCDBA
+D23A31A4AAB9
+DEDD7688BC38
+E9AE90885C39
+F0A3C5182007
+F3A524B7A7B3
+# Data from mall
+# playland balikesir
 ABBA1234FCB0
-# A TRIO BOWLING BAHCELIEVLER
+# A trio bowling bahcelievler
 314F495254FF
 4152414B4E41
-# KARINCA PARK NIGDE
+# karinca park nigde
 4E474434FFFF
-# DATA FROM HTTPS://GITHUB.COM/RADIOWAR/NFCGUI
+# hotel system
+537930363139
+# Data from https://github.com/RadioWar/NFCGUI
 44DD5A385AAF
 21A600056CB0
 B1ACA33180A5
@@ -383,11 +527,13 @@ CBA6AE869AD5
 A7ABBC77CC9E
 F792C4C76A5C
 BFB6796A11DB
-# DATA FROM SALTO A/B
+# Data from Salto A/B
 6A1987C40A21
 7F33625BC129
+6BE9314930D8
+# Data from forum
 2338B4913111
-# DATA FROM STOYE
+# Data from stoye
 CB779C50E1BD
 A27D3804C259
 003CC420001A
@@ -414,37 +560,34 @@ D9A37831DCE5
 C5CFE06D9EA3
 C0DECE673829
 A56C2DF9A26D
-# DATA FROM HTTPS://PASTEBIN.COM/VBWAST74
+# Data from https://pastebin.com/vbwast74
 68D3F7307C89
-# SMART RIDER. WESTERN AUSTRALIAN PUBLIC TRANSPORT CARDS
+# Smart Rider. Western Australian Public Transport Cards
 568C9083F71C
-# BANGKOK METRO KEY
+117E5C165B10
+24BB421C7973
+3E3A546650EA
+41F262D3AB66
+514956AB3142
+863933AE8388
+# Bangkok metro key
 97F5DA640B18
-# METRO VALENCIA KEY
+# Metro Valencia key
 A8844B0BCA06
-# HTC EINDHOVEN KEY
+# HTC Eindhoven key
 857464D3AAD1
-# VIGIK KEYS
-# VARIOUS SOURCES :
-# * HTTPS://GITHUB.COM/DUMPDOS/VIGIK
-# * HTTP://NEWFFR.COM/VIEWTOPIC.PHP?&FORUM=235&TOPIC=11559
-# * OWN DUMPS
-# FRENCH VIGIK
+# Vigik Keys
+# Various sources :
+# * https://github.com/DumpDos/Vigik
+# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
+# * Own dumps
+# French VIGIK
 # VIGIK1 A
 314B49474956
 # VIGIK1 B
 564C505F4D41
 BA5B895DA162
-# VIGIK MYSTERY KEYS MIFARE 1K EV1 (S50)
-# 16 A
-5C8FF9990DA2
-# 17 A
-75CCB59C9BED
-# 16 B
-D01AFEEB890A
-# 17 B
-4B791BEA7BCC
-# BTCINO UNDETERMINED SPREAKD 0X01->0X13 KEY
+# BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
 021209197591
 2EF720F2AF76
 414C41524F4E
@@ -452,8 +595,8 @@ D01AFEEB890A
 4A6352684677
 BF1F4424AF76
 536653644C65
-# INTRATONE COGELEC
-# DATA FROM HTTP://BOUZDECK.COM/RFID/32-CLONING-A-MIFARE-CLASSIC-1K-TAG.HTML
+# Intratone Cogelec
+# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
 484558414354
 A22AE129C013
 49FAE4E3849F
@@ -470,7 +613,7 @@ E64A986A5D94
 66D2B7DC39EF
 6BC1E1AE547D
 22729A9BD40F
-# DATA FROM HTTPS://DFIR.LU/BLOG/CLONING-A-MIFARE-CLASSIC-1K-TAG.HTML
+# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
 925B158F796F
 FAD63ECB5891
 BBA840BA1C57
@@ -485,9 +628,9 @@ CC6B3B3CD263
 703140FD6D86
 157C9A513FA5
 E2A5DC8E066F
-# DATA FROM FORUM,  SCHLAGE 9691T FOB
+# Data from forum,  schlage 9691T fob
 EF1232AB18A0
-# DATA FROM A OYSTER CARD
+# Data from a oyster card
 374BF468607F
 BFC8E353AF63
 15CAFD6159F6
@@ -517,9 +660,9 @@ A2ABB693CE34
 91F93A5564C9
 E10623E7A016
 B725F9CBF183
-# DATA FROM FDI TAG
+# Data from FDi tag
 8829DA9DAF76
-# DATA FROM GITHUB ISSUE
+# Data from GitHub issue
 0A7932DC7E65
 11428B5BCE06
 11428B5BCE07
@@ -529,7 +672,6 @@ B725F9CBF183
 11428B5BCE0F
 18971D893494
 25D60050BF6E
-3FA7217EC575
 44F0B5FBE344
 7B296F353C6B
 8553263F4FF0
@@ -543,15 +685,18 @@ D4FE03CE5B09
 D4FE03CE5B0A
 D4FE03CE5B0F
 E241E8AFCBAF
-# DATA FROM FORUM POST
+# Transport system Argentina - SUBE
+# Shared key - sec 3 blk 15
+3FA7217EC575
+# Data from forum post
 123F8888F322
 050908080008
-# DATA FROM HOIST
+# Data from hoist
 4F9F59C9C875
-# DATA FROM PASTEBIN
+# Data from pastebin
 66F3ED00FED7
 F7A39753D018
-# DATA FROM HTTPS://PASTEBIN.COM/Z7PEEZIF
+# Data from https://pastebin.com/Z7pEeZif
 386B4D634A65
 666E564F4A44
 564777315276
@@ -582,24 +727,24 @@ F7A39753D018
 6F506F493353
 31646241686C
 77646B633657
-# DATA FROM TRANSPERT
+# Data from TransPert
 2031D1E57A3B
 53C11F90822A
 9189449EA24E
-# DATA FROM GITHUB
+# data from Github
 410B9B40B872
 2CB1A90071C8
-# DATA FROM
 8697389ACA26
 1AB23CD45EF6
 013889343891
 0000000018DE
 16DDCB6B3F24
-# DATA FROM HTTPS://PASTEBIN.COM/VWDRZW7D
-# VINGCARD MIFARE 4K STAFF CARD
+# Data from https://pastebin.com/vwDRZW7d
+# Vingcard Mifare 4k Staff card
 EC0A9B1A9E06
 6C94E1CED026
 0F230695923F
+0000014B5C31
 BEDB604CC9D1
 B8A1F613CF3D
 B578F38A5C61
@@ -608,34 +753,36 @@ B66AC040203A
 2E641D99AD5B
 AD4FB33388BF
 69FB7B7CD8EE
-# HOTEL
+# Hotel
 2A6D9205E7CA
+13B91C226E56
+# KABA Hotel Locks
 2A2C13CC242A
 27FBC86A00D0
 01FA3FC68349
+# Smart Rider. Western Australian Public Transport Cards
 6D44B5AAF464
 1717E34A7A8A
-# RFIDEAS
+# RFIDeas
 6B6579737472
-# HID MIFARE CLASSIC 1K KEY
+# HID MIFARE Classic 1k Key
 484944204953
 204752454154
 # HID MIFARE SO
 3B7E4FD575AD
 11496F97752A
-# LUXEO/AZTEK CASHLESS VENDING
+# Luxeo/Aztek cashless vending
 415A54454B4D
 # BQT
 321958042333
-# APERIO KEY_A SECTOR 1, 12, 13, 14, 15 DATA START 0 LENGTH 48
+# Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
 160A91D29A9C
-# GALLAGHER
+# Gallagher
 B7BF0C13066E
-# PIK COMFORT MOSCOW KEYS (ISBC MIFARE PLUS SE 1K)
+# PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
 009FB42D98ED
 002E626E2820
-# BOSTON, MA, USA TRANSIT - MBTA CHARLIE CARD
-# CHARLIE
+# Boston, MA, USA Transit - MBTA Charlie Card
 3060206F5B0A
 5EC39B022F2B
 3A09594C8587
@@ -670,13 +817,14 @@ D80511FC2AB4
 BB467463ACD6
 E67C8010502D
 FF58BA1B4478
-# DATA FROM HTTPS://PASTEBIN.COM/KZ8XP4EV
+# Data from https://pastebin.com/Kz8xp4ev
 FBF225DC5D58
-# DATA  HTTPS://PASTEBIN.COM/BEM6BDAE
-# VINGCARD.TXT
+# Data  https://pastebin.com/BEm6bdAE
+# vingcard.txt
+# Note: most likely diversified
+96A301BCE267
 4708111C8604
 3D50D902EA48
-96A301BCE267
 6700F10FEC09
 7A09CC1DB70A
 560F7CFF2D81
@@ -688,17 +836,18 @@ FBF225DC5D58
 D9BCDE7FC489
 0C03A720F208
 6018522FAC02
-# DATA FROM HTTPS://PASTEBIN.COM/4T2YFMGT
-# MIFARE TECHNISCHE UNIVERSITÄT GRAZ TUG
+# Data from https://pastebin.com/4t2yFMgt
+# Mifare technische Universitat Graz TUG
 D58660D1ACDE
 50A11381502C
 C01FC822C6E5
 0854BF31111E
-# MORE KEYS:
-8A19D40CF2B5
+# More keys - Found 8A at Sebel Hotel in Canberra, Australia
 AE8587108640
+# SafLock standalone door locks
 135B88A94B8B
-# RUSSIAN TROIKA CARD
+# Russian Troika card
+EC29806D9738
 08B386463229
 0E8F64340BA4
 0F1C63013DBA
@@ -753,7 +902,10 @@ EAAC88E5DC99
 F8493407799D
 6B8BD9860763
 D3A297DC2698
-# KEYS FROM MIFARECLASSICTOOL PROJECT
+# Data from reddit
+34635A313344
+593367486137
+# Keys from Mifare Classic Tool project
 044CE1872BC3
 045CECA15535
 0BE5FAC8B06A
@@ -808,15 +960,81 @@ FD8705E721B0
 00ADA2CD516D
 237A4D0D9119
 0ED7846C2BC9
-# HOTEL ADINA
+FFFFD06F83E3
+FFFFAE82366C
+F89C86B2A961
+F83466888612
+ED3A7EFBFF56
+E96246531342
+E1DD284379D4
+DFED39FFBB76
+DB5181C92CBE
+CFC738403AB0
+BCFE01BCFE01
+BA28CFD15EE8
+B0699AD03D17
+AABBCC660429
+A4EF6C3BB692
+A2B2C9D187FB
+9B1DD7C030A1
+9AEDF9931EC1
+8F9B229047AC
+872B71F9D15A
+833FBD3CFE51
+5D293AFC8D7E
+5554AAA96321
+474249437569
+435330666666
+1A2B3C4D5E6F
+123456ABCDEF
+83BAB5ACAD62
+64E2283FCF5E
+64A2EE93B12B
+46868F6D5677
+40E5EA1EFC00
+37D4DCA92451
+2012053082AD
+2011092119F1
+200306202033
+1795902DBAF9
+17505586EF02
+022FE48B3072
+013940233313
+# Hotel Adina
 9EBC3EB37130
-# MOST LIKELY DIVERSED INDIVIDUAL KEYS.
-# DATA FROM HTTPS://GITHUB.COM/KORSEHINDI/PROXMARK3/COMMIT/24FDBFA9A1D5C996AAA5C192BC07E4AB28DB4C5C
+# Misc. keys from hotels & library cards in Germany
+914F57280CE3
+324A82200018
+370AEE95CD69
+2E032AD6850D
+1FEDA39D38EC
+288B7A34DBF8
+0965E3193497
+18C628493F7F
+064D9423938A
+995FD2A2351E
+7C7D672BC62E
+217250FB7014
+AE7478CCAEE7
+ABBF6D116EAF
+05862C58EDFB
+E43B7F185460
+6A59AA9A959B
+B79E5B175227
+7BC9EBB8274B
+B2AFBF2331D4
+223E5847DD79
+640524D2A39B
+AEE297CB2FD6
+3DA5DFA54604
+0CF1A2AA1F8D
+# most likely diversifed individual keys.
+# data from https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
 491CDC863104
 A2F63A485632
 98631ED2B229
 19F1FFE02563
-# ARGENTINA
+# Argentina
 563A22C01FC8
 43CA22C13091
 25094DF2C1BD
@@ -888,7 +1106,7 @@ AE43F36C1A9A
 BE7C4F6C7A9A
 5EC7938F140A
 82D58AA49CCB
-# MELONCARD
+# MELON CARD
 323334353637
 CEE3632EEFF5
 827ED62B31A7
@@ -904,7 +1122,7 @@ A7FB4824ACBF
 00F0BD116D70
 4CFF128FA3EF
 10F3BEBC01DF
-# TRANSPORTES INSULAR LA PALMA
+# Transportes Insular La Palma
 0172066B2F03
 0000085F0000
 1A80B93F7107
@@ -937,7 +1155,7 @@ B1A862985913
 3B0172066B2F
 3F1A87298691
 F3F0172066B2
-# TEHRAN EZPAY
+# Tehran ezpay
 38A88AEC1C43
 CBD2568BC7C6
 7BCB4774EC8F
@@ -953,11 +1171,11 @@ D3B1C7EA5C53
 604AC8D87C7E
 8E7B29460F12
 BB3D7B11D224
-# CHACO
+# Chaco
 B210CFA436D2
 B8B1CFA646A8
 A9F95891F0A4
-# KEYS FROM APK APPLICATION "SCAN BADGE"
+# Keys from APK application "Scan Badge"
 4A4C474F524D
 444156494442
 434143445649
@@ -976,7 +1194,7 @@ A0004A000036
 DFE73BE48AC6
 B069D0D03D17
 000131B93F28
-# FROM THE DFW AREA, TX, USA
+# From the DFW Area, TX, USA
 A506370E7C0F
 26396F2042E7
 70758FDD31E0
@@ -992,7 +1210,7 @@ EF4C5A7AC6FC
 B47058139187
 8268046CD154
 67CC03B7D577
-# FROM THE HTL MÖDLING, NÖ, AT
+# From the HTL Modling, NO, AT
 A5524645CD91
 D964406E67B4
 99858A49C119
@@ -1006,27 +1224,28 @@ C27D999912EA
 E45230E7A9E8
 535F47D35E39
 FB6C88B7E279
-# METRO CARD, AT
+# Metro Card, AT
 223C3427108A
-# UNKNOWN, AT
+# Unknown, AT
 23D4CDFF8DA3
 E6849FCC324B
 12FD3A94DF0E
+# Unknown, AT
 0B83797A9C64
 39AD2963D3D1
-# HOTEL BERLIN CLASSIC ROOM A KEY
+# Hotel Berlin Classic room A KEY
 34B16CD59FF8
-# HOTEL BERLIN CLASSIC ROOM B KEY
+# Hotel Berlin Classic room B KEY
 BB2C0007D022
-# COINMATIC LAUNDRY SMART CARD
-# DATA FROM: HTTPS://PASTEBIN.COM/XZQILTUF
+# Coinmatic laundry Smart card
+# data from: https://pastebin.com/XZQiLtUf
 0734BFB93DAB
 85A438F72A8A
-# DATA FROM FORUM, CHINESE HOTEL
+# Data from forum, Chinese hotel
 58AC17BF3629
 B62307B62307
 A2A3CCA2A3CC
-# GRANADA, ES TRANSPORT CARD
+# Granada, ES Transport Card
 000000270000
 0F385FFB6529
 29173860FC76
@@ -1043,14 +1262,14 @@ B385EFA64290
 C9739233861F
 F3864FCCA693
 FC9839273862
-# VARIOUS HOTEL KEYS
+# various hotel keys
 34D3C568B348
 91FF18E63887
 4D8B8B95FDEE
 354A787087F1
 4A306E62E9B6
 B9C874AE63D0
-# DATA FROM OFFICIAL REPO
+# Data from official repo
 F00DFEEDD0D0
 0BB31DC123E5
 7578BF2C66A9
@@ -1067,19 +1286,20 @@ B8937130B6BA
 D7744A1A0C44
 82908B57EF4F
 FE04ECFE5577
-# COMFORT INN HOTEL
+# comfort inn hotel
 4D57414C5648
 4D48414C5648
-# UNKNOWN HOTEL KEY
+# unknown hotel key
 6D9B485A4845
-# BOSCH SOLUTION 6000
-# FOUND IN TAGINFO APP
-# RATB KEY
+# Bosch Solution 6000
+5A7A52D5E20D
+# Found in TagInfo app
+# RATB key
 C1E51C63B8F5
 1DB710648A65
-# E-GO CARD KEY
+# E-GO card key
 18F34C92A56E
-# LIBRARY CARD MFP - SL1
+# Library Card MFP - SL1
 4A832584637D
 CA679D6291B0
 30D9690FC5BC
@@ -1094,7 +1314,7 @@ AADE86B1F9C1
 C67BEB41FFBF
 B84D52971107
 52B0D3F6116E
-# DATA FROM HTTPS://PASTEBIN.COM/CLSQQ9XN
+# Data from https://pastebin.com/cLSQQ9xN
 CA3A24669D45
 4087C6A75A96
 403F09848B87
@@ -1102,28 +1322,28 @@ D73438698EEA
 5F31F6FCD3A0
 A0974382C4C5
 A82045A10949
-# DATA FROM HTTPS://PASTEBIN.COM/2IV8H93H
-# FUNNIVARIUM
-# FORUM ANKARA
+# Data from https://pastebin.com/2iV8h93h
+# funnivarium
+# forum ankara
 2602FFFFFFFF
-# MACERA ADASI
-# ANKARA KENTPARK
+# macera adasi
+# ankara kentpark
 # INACTIVE
 0A4600FF00FF
 DFF293979FA7
 4D6F62692E45
 4118D7EF0902
-# PETROL OFISI
-# POSITIVE CARD
-# ODE-GEC
+# petrol ofisi
+# positive card
+# ode-gec
 0406080A0C0E
-# KONYA ELKART
+# konya elkart
 988ACDECDFB0
 120D00FFFFFF
-# BOWLINGO
-# SERDIVAN AVYM
+# bowlingo
+# serdivan avym
 4AE23A562A80
-#  KART54
+#  kart 54
 2AFFD6F88B97
 A9F3F289B70C
 DB6819558A25
@@ -1131,28 +1351,28 @@ DB6819558A25
 B16B2E573235
 42EF7BF572AB
 274E6101FC5E
-# CRAZY PARK
-# KIZILAY AVM
+# crazy park
+# kizilay avm
 00DD300F4F10
-# KARTSISTEM B
+# kartsistem B
 FEE2A3FBC5B6
-# TORU ENT
-# TAURUS AVM
+# toru ent
+# taurus avm
 005078565703
-# VING?
+# Ving?
 0602721E8F06
 FC0B50AF8700
 F7BA51A9434E
-# ESKART
-# ESKISEHIR TRANSPORT CARD
+# eskart
+# eskisehir transport card
 E902395C1744
 4051A85E7F2D
 7357EBD483CC
 D8BA1AA9ABA0
 76939DDD9E97
 3BF391815A8D
-# MUZEKART
-# MUSEUM CARD FOR TURKEY
+# muzekart
+# museum card for turkey
 7C87013A648A
 E8794FB14C63
 9F97C182585B
@@ -1182,8 +1402,8 @@ D0DDDF2933EC
 240F0BB84681
 9E7168064993
 2F8A867B06B4
-# BURSAKART
-# BURSA TRANSPORT CARD
+# bursakart
+# bursa transport card
 755D49191A78
 DAC7E0CBA8FD
 68D3263A8CD6
@@ -1191,20 +1411,20 @@ DAC7E0CBA8FD
 0860318A3A89
 1927A45A83D3
 B2FE3B2875A6
-# PLAYLAND
-# MALTEPE PARK
+# playland
+# maltepe park
 ABCC1276FCB0
 AABAFFCC7612
-# LUNASAN
-# KOCAELI FAIR
+# lunasan
+# kocaeli fair
 26107E7006A0
-# GAMEFACTORY
-# OZDILEK
+# gamefactory
+# ozdilek
 17D071403C20
 534F4C415249
 534F4C303232
-# NESPRESSO, SMART CARD
-# KEY-GEN ALGO, THESE KEYS ARE FOR ONE CARD
+# Nespresso, smart card
+# key-gen algo, these keys are for one card (keys diversified)
 FF9A84635BD2
 6F30126EE7E4
 6039ABB101BB
@@ -1281,17 +1501,19 @@ AE76242931F1
 124578ABFEDC
 ABFEDC124578
 4578ABFEDC12
-# PREMIER INN HOTEL CHAIN
+# Data from
+# premier inn hotel chain
 5E594208EF02
 AF9E38D36582
-# NORWEGIAN BUILDING SITE IDENTICATION CARD. (HMS KORT)
+# Norwegian building site identication card. (HMS KORT)
+# Key a
 10DF4D1859C8
-# KEY B
+# Key B
 B5244E79B0C8
-# UKRAINE HOTEL
+# Ukraine hotel
 F5C1C4C5DE34
-# DATA FROM MIFARE CLASSIC TOOL REPO
-# ROTTERDAM UNIVERSITY OF APPLIED SCIENCES CAMPUS CARD
+# Data from Mifare Classic Tool repo
+# Rotterdam University of applied sciences campus card
 BB7923232725
 A95BD5BB4FC5
 B099335628DF
@@ -1314,7 +1536,8 @@ B5ADEFCA46C4
 BF3FE47637EC
 B290401B0CAD
 AD11006B0601
-# ARMENIAN METRO
+# Data from Mifare Classic Tool repo
+# Armenian Metro
 E4410EF8ED2D
 6A68A7D83E11
 0D6057E8133B
@@ -1323,7 +1546,7 @@ D3F3B958B8A3
 2196FAD8115B
 7C469FE86855
 CE99FBC8BD26
-# KEYS FROM EUROTHERMES GROUP (SWITZERLAND)
+# keys from Eurothermes group (Switzerland)
 D66D91829013
 75B691829013
 83E391829013
@@ -1338,18 +1561,134 @@ FED791829013
 29A791829013
 668091829013
 00008627C10A
-# KEYS FROM NSP MANCHESTER UNIVERSITY UK ACCOMODATION STAFF AND STUDENTS
-199404281970
-199404281998
-# EASYCARD
+# easycard
 310D51E539CA
 2CCDA1358323
 03E0094CEDFE
 562E6EF73DB6
 F53E9F4114A9
 AD38C17DE7D2
-# SOME KEYS OF HTTPS://W3BSIT3-DNS.COM AND HTTPS://IKEY.RU
-# STRELKA EXTENSION
+# SUBE cards keys (new)
+2DEB57A3EA8F
+32C1BB023F87
+70E3AD3F2D29
+202ECDCCC642
+3686192D813F
+24501C422387
+2C7813A721C3
+FFE04BE3D995
+D28F090677A1
+DE2D83E2DCCC
+A66A478712EA
+643232ADB2D5
+C7F4A4478415
+95C013B70D99
+3C383889362A
+3C6D9C4A90FA
+51BEDBA005E5
+74BF7363F354
+53B09DB89111
+E98075318085
+2F904641D75F
+7F60AEF68136
+F5C1B3F62FDA
+3E6E5713BA10
+8B75A29D4AB2
+7E6545076619
+# SUBE cards keys (old)
+4C5A766DFE3A
+32C6768847F5
+F68930789631
+8B42B6D64B02
+B627A3CB13F8
+562A4FB8260B
+88DDC24E1671
+91CB7802A559
+7A3E0F5B63FC
+8CA2C9DC8292
+5CCC6D50EAAC
+DE4F5AA9A7F3
+52D0145E1AF5
+C10F92A4E57E
+7D6E7AF43C97
+DE1E7D5F6DF1
+F4CB751B031A
+C54474936B59
+2A1F900D4533
+6303CDCBB233
+F115E91357B3
+BFE25035B0C8
+62FF943EB069
+7C82EF592001
+D5C172325DD3
+992B152E834A
+CE75D7EADEAF
+# Russian Podorozhnik card (Saint-Petersburg transport)
+# may be combined with Troika
+038B5F9B5A2A
+04DC35277635
+0C420A20E056
+152FD0C420A7
+296FC317A513
+29C35FA068FB
+31BEC3D9E510
+462225CD34CF
+4B7CB25354D3
+5583698DF085
+578A9ADA41E3
+6F95887A4FD3
+7600E889ADF9
+86120E488ABF
+8818A9C5D406
+8C90C70CFF4A
+8E65B3AF7D22
+9764FEC3154A
+9BA241DB3F56
+AD2BDC097023
+B0A2AAF3A1BA
+B69D40D1A439
+C956C3B80DA3
+CA96A487DE0B
+D0A4131FB290
+D27058C6E2C7
+E19504C39461
+FA1FBB3F0F1F
+FF16014FEFC7
+# Food GEM
+6686FADE5566
+# Samsung Data Systems (SDS) - Electronic Locks
+# Gen 1 S10 KA/KB is FFFFFFFFFFFF, incompatible with Gen 2 locks
+# SDS Gen 2 S10 KB
+C22E04247D9A
+# Data from Discord, French pool
+# SDS Gen 2 S10 KA
+9B7C25052FC3
+494446555455
+# Data from Discord, seems to be related to ASSA
+427553754D47
+# Keys found on Edith Cowan University Smart Riders
+9A677289564D
+186C59E6AFC9
+DDDAA35A9749
+9D0D0A829F49
+# Mercator Pika Card, Slovenia
+97D77FAE77D3
+5AF445D2B87A
+# Vilniecio/JUDU kortele, Lithuania
+# A
+16901CB400BC
+F0FE56621A42
+8C187E78EE9C
+FE2A42E85CA8
+# B
+6A6C80423226
+F4CE4AF888AE
+307448829EBC
+C2A0105EB028
+# Keys from Flipper Zero Community
+# Last update: Aug 13, 2022
+# unknown if keys are diversified or static default
+# Strelka Extension
 5C83859F2224
 66B504430416
 70D1CF2C6843
@@ -1358,7 +1697,7 @@ C4D3911AD1B3
 CAD7D4A6A996
 DA898ACBB854
 FEA1295774F9
-# MOSCOW PUBLIC TOILETS CARD
+# Moscow Public Toilets Card
 807119F81418
 22C8BCD10AAA
 0AAABA420191
@@ -1367,7 +1706,7 @@ DBF9F79AB7A2
 34EDE51B4C22
 C8BCD10AAABA
 BCD10AAABA42
-# MOSCOW SOCIAL CARD
+# Moscow Social Card
 2F87F74090D1
 E53EAEFE478F
 CE2797E73070
@@ -1409,11 +1748,7 @@ F750C0095199
 82DA4B93DB1C
 9CF46DB5FD46
 93EB64ACF43D
-# KEYS FROM RFIDRESEARCHGROUP PROXMARK3 PROJECT
-# HTTPS://GITHUB.COM/RFIDRESEARCHGROUP/PROXMARK3/BLOB/MASTER/CLIENT/DICTIONARIES/MFC_DEFAULT_KEYS.DIC
-13B91C226E56
-5A7A52D5E20D
-# IRON LOGIC
+# Iron Logic RU
 A3A26EF4C6B0
 2C3FEAAE99FC
 E85B73382E1F
@@ -1431,10 +1766,354 @@ DEC0CEB0CE24
 413BED2AE45B
 D6261A9A4B3F
 CB9D507CE56D
-# MORE KEYS FROM THE PM3 REPO
-# KEYS OF ARMENIAN UNDERGROUND TICKET
+# Armenian Underground Ticket
 A0A1A2A8A4A5
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_bmp_sorted.dic
+# Badge Maker Leaked from https://github.com/UberGuidoZ
+1A1B1C1D1E1F
+1665FE2AE945
+158B51947A8E
+E167EC67C7FF
+D537320FF90E
+5E56BFA9E2C9
+F81CED821B63
+C81584EF5EDF
+9551F8F9259D
+36E1765CE3E8
+509052C8E42E
+776C9B03BE71
+C608E13ADD50
+BEE8B345B949
+ED0EC56EEFDD
+9716D5241E28
+05D1FC14DC31
+3321FB75A356
+F22A78E29880
+EC211D12C98D
+8CCA8F62A551
+B637E46AD674
+39605B3C8917
+3882719778A1
+9F27D36C4230
+DB32A6811327
+8AA8544A2207
+8C5819E780A4
+7549E90353A2
+2E52ABE0CE95
+E46210ED98AB
+61D030C0D7A8
+18E20102821E
+DA59354DFB88
+040047C12B75
+D10008074A6F
+686E736F6E20
+446176696453
+6F6674776172
+6520446F7665
+# Apartment keyfobs (USA) (Corvette830)
+E60F8387F0B9
+FFD46FF6C5EE
+4F9661ED2E70
+576A798C9904
+1C5179C4A8A1
+16CA203B811B
+11AC8C8F3AF2
+# The Westin Jakarta Indonesia (D4DB0D)
+# Peppers Hotel Unknown location (D4D0D)
+6E0DD4136B0A
+141940E9B71B
+3B1D3AAC866E
+95E9EE4CCF8F
+FEA6B332F04A
+BE0EC5155806
+0500D6BFCC4F
+FC5AC7678BE3
+F09BB8DD142D
+B4B3FFEDBE0A
+540E0D2D1D08
+# Schlage 9691T Keyfob (seasnaill)
+7579B671051A
+4F4553746B41
+# Vigik ScanBadge App (fr.badgevigik.scanbadge)
+# Website https://badge-vigik.fr/  (Alex)
+0000A2B3C86F
+021200C20307
+021209197507
+1E34B127AF9C
+303041534956
+4143532D494E
+41454E521985
+43412D627400
+455249524345
+456666456666
+45B722C63319
+484585414354
+4D414C414741
+536563644C65
+57D27B730760
+593DD8FE167A
+6472616E7265
+65626F726369
+680E95F3C287
+709BA7D4F920
+8829DAD9AF76
+92D0A0999CBA
+948EE7CFC9DB
+9EB7C8A6D4E3
+A22AE12C9013
+AFC984A3576E
+# Vigik verified by quantum-x
+# https://github.com/RfidResearchGroup/proxmark3/pull/1742#issuecomment-1206113976
+A00027000099
+A00016000028
+A00003000028
+A0000F000345
+A00001000030
+A00002000086
+A00002000036
+A00002000088
+A00000000058
+A00000000096
+A00000000008
+A00000043D79
+A00000000064
+A00025000030
+A00003000057
+# BH USA 2013 conference
+012279BAD3E5
+# iGuard Simple (and reverse) keys
+AAAAAAFFFFFF
+FFFFFFAAAAAA
+# Random Hotel A Key Sec 0 Blk 3 - KABA Lock (VideoMan)
+3111A3A303EB
+# Transport system Uruguay - STM
+# Shared key - sec 0 blk 3
+D144BD193063
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=45659#p45659
+3515AE068CAD
+# Keys Catering
+6A0D531DA1A7
+4BB29463DC29
+# Keys Swim
+8627C10A7014
+453857395635
+# Unknown hotel system Sec 0 / A
+353038383134
+# Brazil transport Sec 8 / A
+50D4C54FCDF5
+# Bandai Namco Passport [fka Banapassport] / Sega Aime Card
+# Dumped on the Flipper Devices Discord Server
+6090D00632F5
+019761AA8082
+574343467632
+A99164400748
+62742819AD7C
+CC5075E42BA1
+B9DF35A0814C
+8AF9C718F23D
+58CD5C3673CB
+FC80E88EB88C
+7A3CDAD7C023
+30424C029001
+024E4E44001F
+ECBBFA57C6AD
+4757698143BD
+1D30972E6485
+F8526D1A8D6D
+1300EC8C7E80
+F80A65A87FFA
+DEB06ED4AF8E
+4AD96BF28190
+000390014D41
+0800F9917CB0
+730050555253
+4146D4A956C4
+131157FBB126
+E69DD9015A43
+337237F254D5
+9A8389F32FBF
+7B8FB4A7100B
+C8382A233993
+7B304F2A12A6
+FC9418BF788B
+# Data from "the more the marriott" mifare project (colonelborkmundus)
+# aka The Horde
+# These keys seem to be from Vingcard / Saflok system which means they are diversified
+# and not static default keys.  To verify this, the UID from such a card is needed.
+# 20230125-01, Elite Member Marriott Rewards
+43012BD9EB87
+# 20230125-02, Elite Member Marriott Rewards
+3119A70628EB
+# 20230125-03, Elite Member Marriott Rewards
+23C9FDD9A366
+# 20230125-04, Elite Member Marriott Rewards
+7B4DFC6D6525
+# 20230125-05, Elite Member Marriott Rewards
+1330824CD356
+# 20230125-06, Elite Member Marriott Rewards
+30AAD6A711EF
+# 20230125-07, Fairfield Inn & Suites Marriott
+7B3B589A5525
+# 20230125-08, Moxy Hotels
+20C166C00ADB
+# 20230125-09, Westin Hotels & Resorts
+7D0A1C277C05
+2058580A941F
+8C29F8320617
+# 20230125-10, Westin Hotels & Resorts
+C40964215509
+D44CFC178460
+5697519A8F02
+# 20230125-12, AC Hotels Marriott
+7B56B2B38725
+# 20230125-13, AC Hotels Marriott
+8EA8EC3F2320
+# 20230125-14, Waldorf Astoria Chicago
+011C6CF459E8
+# 20230125-24, Aria Resort & Casino
+A18D9F4E75AF
+# 20230125-25, Aria Resort & Casino
+316B8FAA12EF
+# 20230125-26, Residence Inn Mariott
+3122AE5341EB
+# 20230125-27, Residence Inn Mariott
+F72CD208FDF9
+# 20230125-28, Marriott
+035C70558D7B
+# 20230125-29, Marriott
+12AB4C37BB8B
+# 20230125-30, Marriott
+9966588CB9A0
+# 20230125-31, Sheraton
+42FC522DE987
+# 20230125-32, The Industrialist
+2158E314C3DF
+# 20230125-39, The Ritz-Carlton Balharbour
+30FB20D0EFEF
+# 20230125-40, The Ritz-Carlton Balharbour
+66A3B064CC4B
+# 20230125-41, The Ritz-Carlton Balharbour
+D18296CD9E6E
+# 20230125-42, The Ritz-Carlton Balharbour
+D20289CD9E6E
+# 20230125-44, Graduate Hotels
+209A2B910545
+C49DAE1C6049
+# 20230125-46, AmericInn
+8AC04C1A4A25
+# 20230129-53, Marriott Bonvoy
+6E029927600D
+3E173F64C01C
+C670A9AD6066
+# 20230413-69, Westin
+487339FA02E0
+# 20230413-70, Marriott Bonvoy
+DBD5CA4EE467
+A0B1F234006C
+180DE12B700E
+# 20230413-71, Westin
+1352C68F7A56
+# 20230413-76, Ritz Carlton
+318BD98C1CEF
+# 20230413-77, Marriott
+D23C1CB1216E
+# 20230413-78, Caesars
+A1D92F808CAF
+# 20230413-79, The Cosmopolitan, Vegas
+# 20230413-80, Aria
+1153C319B4F8
+# 20230413-81, Aria
+110C819BBEF8
+# 20230413-82, Aria
+1332117E8756
+# 20230413-83, Kimpton
+500AE915F50A
+5032E362B484
+8B63AB712753
+# 20230413-85, Kimpton
+06106E187106
+2E45C23DC541
+D9FF8BEE7550
+# 20230413-87, Marriott
+42F7A186BF87
+# 20230413-88, Meritage Resort
+D213B093B79A
+# 20230413-89, Meritage Resort
+216024C49EDF
+# 20230413-90, Gaylord Palms
+D201DBB6AB6E
+# 20230413-91, Residence Inn
+9F4AD875BB30
+# 20230413-92, Marriott
+3352DB1E8777
+# 20230413-94, Marriott
+09074A146605
+151F3E85EC46
+# Travelodge by Wyndham Berkeley
+0000FFFFFFFF
+4663ACD2FFFF
+EDC317193709
+# Hotel Santa Cruz
+75FAB77E2E5B
+# saflok brand HOTEL key
+32F093536677
+# A WaterFront Hotel in  Oakland
+3351916B5A77
+# Ballys (2018)
+336E34CC2177
+# Random Hawaiian Hotel
+A1670589B2AF
+# SF Hotel (SoMa area)
+2E0F00700000
+# Unknown PACS from Western Australia
+CA80E51FA52B
+A71E80EA35E1
+05597810D63D
+# Hotel Key from Las Vegas
+EA0CA627FD06
+80BB8436024C
+5044068C5183
+# Key from Hotel M Montreal (probably diversified)
+7E5E05866ED6
+661ABF99AFAD
+# Key from evo Montreal (probably diversified)
+1064BA5D6DF8
+# Hotel key
+CE0F4F15E909
+D60DE9436219
+# ATM Area de Girona, spanish transport card
+A01000000000
+A02000000000
+A03000000000
+A04000000000
+A05000000000
+A06000000000
+A07000000000
+A08000000000
+A09000000000
+A10000000000
+A11000000000
+A12000000000
+A13000000000
+A14000000000
+A15000000000
+B01000000000
+B02000000000
+B03000000000
+B04000000000
+B05000000000
+B06000000000
+B07000000000
+B08000000000
+B09000000000
+B10000000000
+B11000000000
+B12000000000
+B13000000000
+B14000000000
+B15000000000
+# +--------------------------------------------------------------------------------------------------------+
+# | https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_bmp_sorted.dic |
+# +--------------------------------------------------------------------------------------------------------+
 002DE0301481
 004173272D18
 0058A4884CA5
@@ -2435,7 +3114,9 @@ EE17C426D25E
 EE487A4C806E
 EE5931913A8D
 EED56840AEBA
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_icbmp_sorted.dic
+# +----------------------------------------------------------------------------------------------------------+
+# | https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_icbmp_sorted.dic |
+# +----------------------------------------------------------------------------------------------------------+
 00383D96411D
 005307DB7853
 009A4C4C6C49
@@ -3436,276 +4117,59 @@ EE3029556CEB
 EE49610E6121
 EEB704D69BCA
 EED69A391464
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_mrzd_sorted.dic
-010203040506
-013940233313
-022FE48B3072
-123456789ABC
-123456ABCDEF
-17505586EF02
-1795902DBAF9
-1A2B3C4D5E6F
-1A982C7E459A
-200306202033
-2011092119F1
-2012053082AD
-37D4DCA92451
-40E5EA1EFC00
-435330666666
-46868F6D5677
-474249437569
-4D3A99C351DD
-533CB6C723F6
-5554AAA96321
-587EE5F9350F
-5A1B85FCE20A
-5D293AFC8D7E
-64A2EE93B12B
-64E2283FCF5E
-714C5C886E97
-833FBD3CFE51
-83BAB5ACAD62
-872B71F9D15A
-8F9B229047AC
-8FD0A4F256E9
-9AEDF9931EC1
-9B1DD7C030A1
-A0478CC39091
-A0A1A2A3A4A5
-A2B2C9D187FB
-A4EF6C3BB692
-AABBCC660429
-AABBCCDDEEFF
-ABCDEF123456
-B0699AD03D17
-B0B1B2B3B4B5
-BA28CFD15EE8
-BCFE01BCFE01
-C0C1C2C3C4C5
-CFC738403AB0
-D0D1D2D3D4D5
-D3F7D3F7D3F7
-DB5181C92CBE
-DFED39FFBB76
-E1DD284379D4
-E96246531342
-ED3A7EFBFF56
-F83466888612
-F89C86B2A961
-FFFFAE82366C
-FFFFD06F83E3
-# Unknown origin
-2DEB57A3EA8F
-32C1BB023F87
-70E3AD3F2D29
-202ECDCCC642
-3686192D813F
-24501C422387
-2C7813A721C3
-FFE04BE3D995
-D28F090677A1
-DE2D83E2DCCC
-A66A478712EA
-643232ADB2D5
-C7F4A4478415
-95C013B70D99
-3C383889362A
-3C6D9C4A90FA
-51BEDBA005E5
-74BF7363F354
-53B09DB89111
-E98075318085
-2F904641D75F
-7F60AEF68136
-F5C1B3F62FDA
-3E6E5713BA10
-8B75A29D4AB2
-7E6545076619
-4C5A766DFE3A
-32C6768847F5
-F68930789631
-8B42B6D64B02
-B627A3CB13F8
-562A4FB8260B
-88DDC24E1671
-91CB7802A559
-7A3E0F5B63FC
-8CA2C9DC8292
-5CCC6D50EAAC
-DE4F5AA9A7F3
-52D0145E1AF5
-C10F92A4E57E
-7D6E7AF43C97
-DE1E7D5F6DF1
-F4CB751B031A
-C54474936B59
-2A1F900D4533
-6303CDCBB233
-F115E91357B3
-BFE25035B0C8
-62FF943EB069
-7C82EF592001
-D5C172325DD3
-992B152E834A
-CE75D7EADEAF
-038B5F9B5A2A
-04DC35277635
-0C420A20E056
-152FD0C420A7
-296FC317A513
-29C35FA068FB
-31BEC3D9E510
-462225CD34CF
-4B7CB25354D3
-5583698DF085
-578A9ADA41E3
-6F95887A4FD3
-7600E889ADF9
-86120E488ABF
-8818A9C5D406
-8C90C70CFF4A
-8E65B3AF7D22
-9764FEC3154A
-9BA241DB3F56
-AD2BDC097023
-B0A2AAF3A1BA
-B69D40D1A439
-C956C3B80DA3
-CA96A487DE0B
-D0A4131FB290
-D27058C6E2C7
-E19504C39461
-FA1FBB3F0F1F
-FF16014FEFC7
-# Cracked by UberGuidoZ
-# https://github.com/UberGuidoZ
-# BadgeMaker Leaked
-1A1B1C1D1E1F
-1665FE2AE945
-158B51947A8E
-5E56BFA9E2C9
-F81CED821B63
-C81584EF5EDF
-9551F8F9259D
-509052C8E42E
-776C9B03BE71
-BEE8B345B949
-05D1FC14DC31
-3321FB75A356
-F22A78E29880
-EC211D12C98D
-8CCA8F62A551
-B637E46AD674
-39605B3C8917
-3882719778A1
-9F27D36C4230
-DB32A6811327
-8AA8544A2207
-8C5819E780A4
-7549E90353A2
-E46210ED98AB
-18E20102821E
-DA59354DFB88
-040047C12B75
-D10008074A6F
-686E736F6E20
-446176696453
-6F6674776172
-6520446F7665
-# Apartment keyfobs in USA from Corvette830
-E60F8387F0B9
-FFD46FF6C5EE
-4F9661ED2E70
-576A798C9904
-1C5179C4A8A1
-16CA203B811B
-11AC8C8F3AF2
-# The Westin Jakarta Indonesia from D4DB0D
-# Peppers Hotel Unknown location from D4DB0D
-6E0DD4136B0A
-141940E9B71B
-3B1D3AAC866E
-95E9EE4CCF8F
-0000014B5C31
-FEA6B332F04A
-BE0EC5155806
-0500D6BFCC4F
-FC5AC7678BE3
-F09BB8DD142D
-B4B3FFEDBE0A
-540E0D2D1D08
-# Schlage 9691T Keyfob
-7579B671051A
-4F4553746B41
-# FOOD REPUBLIC
-30C1DC9DD040
-A9B9C1D0E3F1
-# iGuard Simple (and reverse) keys
-AAAAAAFFFFFF
-FFFFFFAAAAAA
-# Vigik verified by quantum-x
-# https://github.com/RfidResearchGroup/proxmark3/pull/1742#issuecomment-1206113976
-A00027000099
-A00016000028
-A00003000028
-A0000F000345
-A00001000030
-A00002000086
-A00002000036
-A00002000088
-A00000000058
-A00000000096
-A00000000008
-A00000043D79
-A00000000064
-A00025000030
-A00003000057
-# BH USA 2013 conference
-012279BAD3E5
-# Vigik ScanBadge App (fr.badgevigik.scanbadge)
-# Website https://badge-vigik.fr/ - By Alex`
-0000A2B3C86F
-021200C20307
-021209197507
-1E34B127AF9C
-303041534956
-4143532D494E
-41454E521985
-43412D627400
-455249524345
-456666456666
-45B722C63319
-484585414354
-4D414C414741
-536563644C65
-57D27B730760
-593DD8FE167A
-6472616E7265
-65626F726369
-680E95F3C287
-709BA7D4F920
-8829DAD9AF76
-92D0A0999CBA
-948EE7CFC9DB
-9EB7C8A6D4E3
-A22AE12C9013
-AFC984A3576E
+# +-----------------------------------------------------------------------------------------------------------------------------------+
+# | https://github.com/ikarus23/MifareClassicTool/blob/master/Mifare%20Classic%20Tool/app/src/main/assets/key-files/extended-std.keys |
+# +-----------------------------------------------------------------------------------------------------------------------------------+
+# Wojo coworking space, Fance
+FF75AFDA5A3C
+558AAD64EB5B
+518108E061E2
+FCDDF7767C10
+A6B3F6C8F1D4
+B1C4A8F7F6E3
+# Key from some random card
+001122334455
+# Key from hotel in Spain
+6CA761AB6CA7
+# +----------------------------------------------------------------------------------------------+
+# | https://github.com/UberGuidoZ/Flipper/blob/main/NFC/mf_classic_dict/mf_classic_dict_user.nfc |
+# +----------------------------------------------------------------------------------------------+
 # Spackular A/B
 # data from http://www.proxmark.org/forum/viewtopic.php?pid=45100#p45100
 7CB033257498
 1153AABAFF6C
-# iGuard Simple and Reverse Keys
-D537320FF90E
-36E1765CE3E8
-C608E13ADD50
-ED0EC56EEFDD
-9716D5241E28
-2E52ABE0CE95
-61D030C0D7A8
-# BadgeMaker Leaked from https://github.com/UberGuidoZ
-E167EC67C7FF
-# Schlage 9691T Keyfob from seasnaill Added by VideoMan.
-3111A3A303EB
+# Random Hotel A key sec 0 blk 3 - Hoist Group lock
+A2CA48CA4C05
+# Chelsea Harbour Hotel London by Cazagen
+485242F22BE0
+# 8668/RevKillj0y
+164EE10EFFFF
+193DFE0FA18E
+3D6F823FFFFF
+48C8852D15F9
+4E4F584D2105
+7213B13D02E0
+7ADD3D735725
+7F796F60FFFF
+8AC04C1A4E15
+9089B668FFFF
+AEF617B3D004
+AEF617B3D040
+C1F6C7B55F5E
+# Metro card Sec 001 Blk 007 key B
+EDA4BF3E7B04
+# +--------------------------------------------------------------------------------------------------------------------------------+
+# | https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
+# +--------------------------------------------------------------------------------------------------------------------------------+
+# Volgograd (Russia) Volna transport cards keys
+2B787A063D5D
+D37C8F1793F7
+# +----------------------------------------------------------------------------------------------------------------------------+
+# | https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
+# +----------------------------------------------------------------------------------------------------------------------------+
+# FOOD REPUBLIC
+30C1DC9DD040
+A9B9C1D0E3F1
 # Transport cards
 E954024EE754
 0CD464CDC100
@@ -3723,7 +4187,6 @@ F18D91EE3033
 0E726E11CFCC
 1D14130D1A0B
 201106141030
-D144BD193063
 01E2C14F1B18
 0380293A9E6D
 08A55BC96DC1
@@ -3764,104 +4227,120 @@ E10F0E7A8DD5
 F833E24C3F1C
 FA8CA10C7D59
 FE98F38F3EE2
-#----------------------------------------------------
-# Added by colonelborkmundus, cleaned by scaff.walker
-# "the more, the marriott" Mifare project
-# 1k GRADUATE HOTEL
-C49DAE1C6049
-209A2B910545
-# 1k WESTIN
-8C29F8320617
-5697519A8F02
-7D0A1C277C05
-2058580A941F
-C40964215509
-D44CFC178460
-# 1k MARRIOT
-7B4DFC6D6525
-23C9FDD9A366
-3119A70628EB
-30AAD6A711EF
-1330824CD356
-43012BD9EB87
-035C70558D7B
-9966588CB9A0
-12AB4C37BB8B
-# 1k AC HOTELS MARRIOT
-8EA8EC3F2320
-7B56B2B38725
-# 1k THE RITZ-CARTLON
-30FB20D0EFEF
-D20289CD9E6E
-66A3B064CC4B
-D18296CD9E6E
 # 1k UNKNOWN
 722538817225
-# 1k ARIA RESORT & CASINO
-316B8FAA12EF
-A18D9F4E75AF
 # 1k FAIRFIELD INN & SUITES MARRIOT
 7AEB989A5525
-7B3B589A5525
 215E9DED9DDF
 334E91BE3377
 310308EC52EF
-# 1k RESIDENCE INN MARRIOT
-F72CD208FDF9
-# 1k SHERATON
-42FC522DE987
 # 1k millenium hotels
 132F641C948B
 # 1k MOXY HOTELS
-20C166C00ADB
 9EE3896C4530
-# 1k RESIDENCE INN MARRIOT
-3122AE5341EB
-# 1k AMERICINN 
-8AC04C1A4A25
-# 1k THE INDUSTRIALIST
-2158E314C3DF
-# 1k WALDORF ASTORIA
-011C6CF459E8
 # 1k HAWAII HOTEL
 2CAD8A83DF28
 555D8BBC2D3E
 78DF1176C8FD
 ADC169F922CB
-# Volgograd (Russia) Volna transport cards keys
-2B787A063D5D
-D37C8F1793F7
-# Bandai Namco Passport [fka Banapassport] / Sega Aime Card
-6090D00632F5
-019761AA8082
-574343467632
-A99164400748
-62742819AD7C
-CC5075E42BA1
-B9DF35A0814C
-8AF9C718F23D
-58CD5C3673CB
-FC80E88EB88C
-7A3CDAD7C023
-30424C029001
-024E4E44001F
-ECBBFA57C6AD
-4757698143BD
-1D30972E6485
-F8526D1A8D6D
-1300EC8C7E80
-F80A65A87FFA
-DEB06ED4AF8E
-4AD96BF28190
-000390014D41
-0800F9917CB0
-730050555253
-4146D4A956C4
-131157FBB126
-E69DD9015A43
-337237F254D5
-9A8389F32FBF
-7B8FB4A7100B
-C8382A233993
-7B304F2A12A6
-FC9418BF788B
+# +------------------------------------------------------------------------------------------------------------------------+
+# | https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
+# +------------------------------------------------------------------------------------------------------------------------+
+##############################################
+# STB - keys from Bucharest Public Transport
+# Found with FlipperNestedRecovery by Z3r0L1nk
+330075000850
+2FA9B556A4F6
+91B1B62402D5
+9AE05868233F
+6D2BF79566A8
+60D53F070572
+09F4EC8D7A66
+D017A84BB582
+1719EB5DAC66
+96AECCC0F7EB
+A64536FAC799
+7BF0BE85080F
+E9B376925A00
+44B61F116125
+E861FDE1B59F
+5CD02DAD8ADE
+5FA28B8E8BA4
+C497C3BE8273
+B1EEAA640EF6
+1E13EFF32CE2
+D6818C29ED9B
+050BF33DC217
+41CD3CD99DD5
+02DB253DC0C7
+25467EB0212F
+DF7C4EC20B50
+5703815494EF
+9F14D35BAC08
+F697E87E759D
+D9762D114AE5
+AC935925A876
+5AD3FC074A4C
+19BA6776233F
+EEF144866688
+C34FAA1931CA
+8A0DFD9B7AEA
+D3AEB15D410B
+251BDBF1C71D
+286A8893AC6F
+6A86C1895A21
+D7142E0F6D0D
+B0A3212D47A5
+1581C317B073
+8EF0AA6432FA
+AD00EFD353E4
+439FB891279F
+141DF3B1C017
+58DBC850A4D5
+14CD299DC0C7
+B48D7E4E508F
+32774E46C64F
+61152534ACEF
+280FD37AD407
+C789E4568B99
+122F595302AA
+84A3FD4BA0C6
+B0D58BF147B7
+15B35D0BF715
+##############################################
+# Metrorex - keys from Subway Bucharest Public Transport
+# Found with FlipperNestedRecovery by Z3r0L1nk
+7246FCE86427
+1415FFFED68D
+8C524B535E1D
+0FC4B1D2EBBA
+280713CBA260
+EDC9CC9109A2
+DCD003CF0EA3
+DD30A13519C3
+8A35039F6CD6
+538BF58687EB
+E3007FA4F781
+F654D6C7004F
+7C20975C6EC9
+C992F85B2DDD
+156EED7C5F9D
+16785FD65BA7
+A2D5D7469472
+585462E190F2
+FA4D2B3BAFEA
+251780F9FBE6
+EA4987F8D096
+48B390984150
+EA19E58DD046
+1C000EB0752F
+96227EDADBCF
+3F41891454EE
+7EDAE7923287
+11DDA4862A1C
+##############################################
+# Bubbleland Play Card - keys from Bubble Land Arcade
+# Found with FlipperNestedRecovery by CaitSith2
+168168168168
+861861861861
+686B35333376