Merge branch 'ofw-pr-4298' into mntm-dev --nobuild

CHANGELOG.md

@@ -144,7 +144,9 @@
   - OFW: Add Daikin FTXN25LV1B9 and Toyotomi KTN22-12R32 to universal remotes (by @minchogaydarov)
 - OFW: BLE: Improved pairing security (by @hedger)
 - JS: Expose button event type in `gui/widget` button callback, see breaking changes above (by @WillyJL)
-- OFW: NFC: Expose nfc_common.h (by @zinongli)
+- NFC:
+  - OFW: Synchronise mf_classic_dict.nfc with mfc_default_keys.dic from Proxmark3 Iceman fork, 164 new MFC keys (by @ry4000)
+  - OFW: Expose nfc_common.h (by @zinongli)
 - OFW: GUI: Store View by value inViewStack to save memory (by @CookiePLMonster)
 - UL: Docs: Update Sub-GHz DoorHan programming instructions (by @li0ard)
 

applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc

@@ -1,8 +1,9 @@
 # Key dictionary from 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 --
+#   -- Iceman Fork Version --
+#   -- Sharing is Caring --
+#   -- Contribute to This Dictionary --
 #
 # Default key
 FFFFFFFFFFFF
@@ -48,6 +49,10 @@ AABBCCDDEEFF
 4D3A99C351DD
 1A982C7E459A
 #
+# Gym
+FAFAFAFAFAFA
+FBFBFBFBFBFB
+#
 # key A Wien
 D3F7D3F7D3F7
 #
@@ -336,8 +341,8 @@ EAB8066C7479
 E5519E1CC92B
 # 
 # Jett's 24 Hour Fitness S0 KA/B
-# 049979614077
-# 829338771705
+049979614077
+829338771705
 #
 # Hotel KeyCard
 D3B595E9DD63
@@ -1902,15 +1907,14 @@ 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
+# Samsung Data Systems (SDS)
+# 10-11 A/B (Gen 2)
+9B7C25052FC3
 C22E04247D9A
+6C4F77534170
+704153564F6C
 #
 # Data from Discord, French pool
-# SDS Gen 2 S10 KA
-9B7C25052FC3
 494446555455
 #
 # Data from Discord, seems to be related to ASSA
@@ -2172,6 +2176,7 @@ D144BD193063
 # Brazil transport Sec 8 / A
 50d4c54fcdf5
 #
+# TEKKEN 6 Namco Data Card
 # Bandai Namco Passport [fka Banapassport] / Sega Aime Card
 # Dumped on the Flipper Devices Discord Server
 6090D00632F5
@@ -2208,6 +2213,40 @@ C8382A233993
 7B304F2A12A6
 FC9418BF788B
 #
+# Super Street Fighter 4 Capcom NESYS Card
+4B6F74696174
+6F746961744B
+4176696E7520
+76696E752041
+576C61737265
+6C6173726557
+416962616320
+696261632041
+42622074656E
+622074656E42
+416174363030
+617436303041
+5475206F7469
+75206F746954
+41726576696E
+726576696E41
+4B63206C6173
+63206C61734B
+41656E696261
+656E69626141
+5A3030622074
+30306220745A
+557469617436
+746961743655
+48696E75206F
+696E75206F48
+496173726576
+617372657649
+52626163206C
+626163206C52
+4F2074656E69
+2074656E694F
+#
 # Guest Cashless Prepaid Arcade Payment Cards
 168168168168
 198407157610
@@ -2505,7 +2544,7 @@ FAB943906E9C
 # R.A.T.T transport card key A/B
 AA034F342A55
 456776908C48
-
+#
 # BusFacil - Brazilian public transport card for some cities
 fae9b14365a9
 c567dd4a6004
@@ -2597,8 +2636,6 @@ b1ea40b2caa6
 3abf8431003b
 # Sector 15 - see above
 # SKGT personalised subscription card
-# Sector 0, 2, 16, key A
-# Sector 8-14, 17-39, key A
 # Sector 1, key A
 # blue
 f1df0ca8948b
@@ -3035,3 +3072,146 @@ AAC34D9A4E65
 #
 # Dutch Statistics Agency (CBS)
 DC7B15AA0938
+#
+# keys from https://pastebin.com/tpKwph0h
+AAAAAABBBBCC
+74ABCB1405DE
+A25CDE2F781A
+6054AC9541C8
+828DDEEE4D98
+ED2B22929167
+C552C1B92395
+F4A4AA2F63A4
+25ECB7B2BAB1
+8B02EF84CDF1
+23EAFB5DA46D
+AB921CF0752C
+#
+# Hotel cards, from one facility using TESA locks...
+90C270F690C2
+# ...along with the key used for one of the other services.
+0000013B0ED0
+#
+# Saragossa transport cards (Bus & Lazo)
+04000C0F0903
+0B02070A0409
+4E303D402F20
+216F5B212A7A
+5148755C3427
+5C7A355C295A
+5246612E7C4B
+354B39454861
+455D732C385F
+243372407C2E
+44202E476E5B
+3C4520753758
+206F7C4C4F36
+265A5F32DE73
+567D734C403C
+2426217B3B3B
+#
+# German Aral Gas Station Car-Wash cards
+080507020706
+0100815D8D00
+2459514AED5B
+5D493F6B0352
+1CEC0F0ACC0E
+922B5D1BF2BC
+2D7E76C7B8EC
+5E59896806FF
+097EEA4FE51B
+688FC86BAB79
+C01D1DBEEE79
+2529BF8544C2
+C6052FBAA150
+A1D7B3A95605
+00D0BF748E77
+C082C0F35CE6
+3C86C78541A7
+5632DCC517E1
+9310191C338F
+2761858C02D7
+8C64B49C7638
+B1BA3E778930
+2037627D9260
+28C4D7170FCD
+#
+# Card keys from Andalusian public transport system (Consorcio de Transportes)
+1848A8D1E4C5
+16EE1FE134E4
+5246B8F4ACFC
+515A8209843C
+0EF7636AA829
+E59D0F78C413
+5AF68604DD6B
+B0BCB22DCBA3
+51B3EF60BF56
+99100225D83B
+63C88F562B97
+B30B6A5AD434
+D33E4A4A0041
+9C0A4CC89D61
+5204D83D8CD3
+A662F9DC0D3D
+#
+# Card keys from EMT Malaga (Spain) bus system
+41534E354936
+454D41343253
+4541444C4130
+46305234324E
+505444505232
+5239425A3546
+454449434631
+414F4544384C
+344E4F4E4937
+45444E413254
+3255534D3033
+4F554D523935
+3141544D3735
+494E47463539
+32414F4E3341
+41534C473637
+534E41395430
+41364C38364F
+525241414D39
+41304532334F
+4D4545494F35
+4E324C453045
+394143494E32
+5352554E3245
+324553553036
+444D414E3539
+324745413232
+4E4E41455236
+394C52493639
+4D4941413236
+414D504F3243
+434C414E3639
+# Key for Waferlock shadow programming card and shadow user card
+333030313536
+#
+# Poland Warsaw public transport card keys
+2481118e5355
+b6f0fc87f57f
+e4fdac292bed
+5888180adbe6
+d572c9491137
+64ea317b7abd
+a39a286285db
+898989890823
+898989891789
+898989893089
+b6e56bad206a
+8fe6fa230c69
+4d1095f1af34
+1ad2f99bb9e9
+891089898989
+896389898989
+890163898989
+898927638989
+898989063889
+898989428989
+898989048989
+# University of Portsmouth external library card keys
+505254554E49
+505457524954