From 4120e2fe9154edba0faffa6d3289d02894e65763 Mon Sep 17 00:00:00 2001
From: amec0e <88857687+amec0e@users.noreply.github.com>
Date: Tue, 4 Oct 2022 00:12:48 +0100
Subject: [PATCH] Updated mfc_default_keys

Removed extra whitespaces, Uppercased all the keys, Grouped keys where grouping was possible, removed extra line comments (and some for example "data from..."), moved line comments to above the key.

Hopefully this little spring clean will help in the future when checking for duplicates, please do check this thoroughly and make sure it is okay.

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
---
 client/dictionaries/mfc_default_keys.dic | 1357 ++++++++++++----------
 1 file changed, 718 insertions(+), 639 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index f3284a448..492ef91b5 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -3,63 +3,87 @@
 #   -- iceman fork version --
 #   -- contribute to this list, sharing is caring --
 #
-ffffffffffff # Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
-000000000000 # Blankkey
-a0a1a2a3a4a5 # NFC Forum MADkey
-A5A4A3A2A1A0 # MAD access key A (reversed) 
-89ECA97F8C2A # MAD access key B
-b0b1b2b3b4b5
-c0c1c2c3c4c5
-d0d1d2d3d4d5
-aabbccddeeff
-4d3a99c351dd
-1a982c7e459a
-d3f7d3f7d3f7 # key A Wien
-5a1b85fce20a # key B Wien
-714c5c886e97
-587ee5f9350f
-a0478cc39091
-533cb6c723f6
-8fd0a4f256e9
-e00000000000 # iCopy-X
-e7d6064c5860
-b27ccab30dbd
+# Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
+FFFFFFFFFFFF
+# Blankkey
+000000000000
+# NFC Forum MADkey
+A0A1A2A3A4A5
+# MAD access key A (reversed)
+A5A4A3A2A1A0
+# MAD access key B
+89ECA97F8C2A
 #
-d2ece8b9395e # lib / Nat Bieb
+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
+D2ECE8B9395E
 # NSCP default key
 1494E81663D7
 #
 # Kiev keys
-569369c5a0e5 # kiev
-632193be1c3c # kiev
-644672bd4afe # kiev
-8fe644038790 # kiev
-9de89e070277 # kiev
-b5ff67cba951 # kiev / ov-chipkaart
-eff603e1efe9 # kiev
-f14ee7cae863 # kiev
+569369C5A0E5
+632193BE1C3C
+644672BD4AFE
+8FE644038790
+9DE89E070277
+B5FF67CBA951
+EFF603E1EFE9
+F14EE7CAE863
 #
 # RKF
-fc00018778f7 # Västtrafiken KeyA, RKF ÖstgötaTrafiken KeyA
-0297927c0f77 # Västtrafiken KeyA
-54726176656c # Västtrafiken KeyA
-00000ffe2488 # Västtrafiken KeyB
-776974687573 # Västtrafiken KeyB
-ee0042f88840 # Västtrafiken KeyB
-26940b21ff5d # RKF SLKeyA
-a64598a77478 # RKF SLKeyA
-5c598c9c58b5 # RKF SLKeyB
-e4d2770a89be # RKF SLKeyB
-722bfcc5375f # RKF RejskortDanmark KeyA
-f1d83f964314 # RKF RejskortDanmark KeyB
-505249564141 # RKF JOJOPRIVAKeyA
-505249564142 # RKF JOJOPRIVAKeyB
-47524f555041 # RKF JOJOGROUPKeyA
-47524f555042 # RKF JOJOGROUPKeyB
-434f4d4d4f41 # RKF JOJOGROUPKeyA
-434f4d4d4f42 # RKF JOJOGROUPKeyB
-# 
-4b0b20107ccb # TNP3xxx
+# Västtrafiken KeyA, RKF ÖstgötaTrafiken KeyA
+FC00018778F7
+# Västtrafiken KeyA
+0297927C0F77
+54726176656C
+# Västtrafiken KeyB
+00000FFE2488
+776974687573
+EE0042F88840
+# RKF SLKeyA
+26940B21FF5D
+A64598A77478
+# RKF SLKeyB
+5C598C9C58B5
+E4D2770A89BE
+# RKF RejskortDanmark KeyA
+722BFCC5375F
+# RKF RejskortDanmark KeyB
+F1D83F964314
+# RKF JOJOPRIVAKeyA
+505249564141
+# RKF JOJOPRIVAKeyB
+505249564142
+# RKF JOJOGROUPKeyA
+47524F555041
+434F4D4D4F41
+# RKF JOJOGROUPKeyB
+47524F555042
+434F4D4D4F42
+#
+# TNP3xxx
+4B0B20107CCB
 #
 # Access control system
 605F5E5D5C5B
@@ -71,81 +95,95 @@ f1d83f964314 # RKF RejskortDanmark KeyB
 # more Keys from mfc_default_keys.lua
 000000000001
 000000000002
-00000000000a
-00000000000b
+00000000000A
+00000000000B
 010203040506
-0123456789ab
+0123456789AB
 100000000000
 111111111111
-123456789abc
-12f2ee3478c1
-14d446e33363
-1999a3554a55
+123456789ABC
+12F2EE3478C1
+14D446E33363
+1999A3554A55
 200000000000
 222222222222
-27dd91f1fcf1
-2BA9621E0A36 # DirectoryandeventlogKeyB
-4AF9D7ADEBE4 # DirectoryandeventlogKeyA
+27DD91F1FCF1
+# DirectoryandeventlogKeyB
+2BA9621E0A36
+# DirectoryandeventlogKeyA
+4AF9D7ADEBE4
+#
 333333333333
-33f974b42769
-34d1df9934c5
-43ab19ef5c31
+33F974B42769
+34D1DF9934C5
+43AB19EF5C31
 444444444444
 505249565441
 505249565442
 555555555555
-55f5a5dd38c9
+55F5A5DD38C9
 666666666666
 777777777777
 888888888888
 999999999999
-99c636334433
-a00000000000
-a053a292a4af
-a94133013401
-aaaaaaaaaaaa
-abcdef123456 # Keyfromladyada.net
-b00000000000
-b127c6f41436
-bbbbbbbbbbbb
-bd493a3962b6
-c934fe34d934
-cccccccccccc
-dddddddddddd
-eeeeeeeeeeee
+99C636334433
+A00000000000
+A053A292A4AF
+A94133013401
+AAAAAAAAAAAA
+# Keyfromladyada.net
+ABCDEF123456
+#
+B00000000000
+B127C6F41436
+BBBBBBBBBBBB
+BD493A3962B6
+C934FE34D934
+CCCCCCCCCCCC
+DDDDDDDDDDDD
+EEEEEEEEEEEE
 #
 # elevator
-# data from forum 
+# data from forum
 FFFFFF545846
 #
-f1a97341a9fc
-44ab09010845 # hotel system
-85fed980ea5a # hotel system
+F1A97341A9FC
+# hotel system
+44AB09010845
+85FED980EA5A
 #
-43454952534E # ARD (fr) key A
-4A2B29111213 # ARD (fr) key B
+# ARD (fr) key A
+43454952534E
+# ARD (fr) key B
+4A2B29111213
 #
 4143414F5250
-a9b43414F585 # Tehran Railway
-1FB235AC1388 # Tehran Railway
+# Tehran Railway
+A9B43414F585
+1FB235AC1388
 #
 # Data from http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
-f4a9ef2afc6d # BCARD KeyB
+# BCARD KeyB
+F4A9EF2AFC6D
 #
-# Data from ...
-89eac97f8c2a # S0 B
-43c7600dee6b # S4 A
-0120bf672a64 # S6 A
-fb0b20df1f34 # S6 B
 #
-a9f953def0a3
+# S0 B
+89EAC97F8C2A
+# S4 A
+43C7600DEE6B
+# S6 A
+0120BF672A64
+# S6 B
+FB0B20DF1F34
+#
+A9F953DEF0A3
 #
 # Data from forum
-74a386ad0a6d 
-3f7a5c2dbd81
-21edf95e7433
-c121ff19f681
-3d5d9996359a
+74A386AD0A6D
+3F7A5C2DBD81
+21EDF95E7433
+C121FF19F681
+3D5D9996359A
 #
 # Here be BIP keys...
 3A42F33AF429
@@ -182,22 +220,29 @@ D49E2826664F
 6A470D54127C
 #
 # Data from http://pastebin.com/AK9Bftpw
-48ffe71294a0 # Länstrafiken i Västerbotten
-e3429281efc1 # Länstrafiken i Västerbotten
-16f21a82ec84 # Länstrafiken i Västerbotten
-460722122510 # Länstrafiken i Västerbotten
+# Länstrafiken i Västerbotten
+48FFE71294A0
+E3429281EFC1
+16F21A82EC84
+460722122510
 #
 # 3dprinter
-AAFB06045877 # EPI Envisionte# 3dprinter
+# EPI Envisionte# 3dprinter
+AAFB06045877
 #
 # gym
-3e65e4fb65b3 # Fysiken A
-25094df6f148 # Fysiken B
-a05dbd98e0fc # CleverFit
+# Fysiken A
+3E65E4FB65B3
+# Fysiken B
+25094DF6F148
+# CleverFit
+A05DBD98E0FC
 #
-d3b595e9dd63 # Hotel KeyCard
-afbecd121004 # Hotel KeyCard
-6471a5ef2d1a # SimonsVoss
+# Hotel KeyCard
+D3B595E9DD63
+AFBECD121004
+# SimonsVoss
+6471A5EF2D1A
 #
 # ID06
 4E3552426B32
@@ -210,7 +255,7 @@ D21762B2DE3B
 0E83A374B513
 1F1FFE000000
 A10F303FC879
-1322285230b8
+1322285230B8
 0C71BCFB7E72
 C3C88C6340B8
 F101622750B7
@@ -219,8 +264,8 @@ F101622750B7
 7C335FB121B5
 B39AE17435DC
 #
-#
-454841585443 # key A
+# key A
+454841585443
 #
 # Data from http://pastebin.com/gQ6nk38G
 D39BB83F5297
@@ -253,45 +298,45 @@ A0B0C0D0E0F0
 A1B1C1D1E1F1
 #
 # Data from msk social
-2735fc181807
-2aba9519f574
-84fd7f7a12b6
-186d8c4b93f9
-3a4bba8adaf0
-8765b17968a2
-40ead80721ce
-0db5e6523f7c
-51119dae5216
-83e3549ce42d
-136bdb246cac
-7de02a7f6025
-bf23a53c1f63
-cb9a1f2d7368
-c7c0adb3284f
-9f131d8c2057
-67362d90f973
-6202a38f69e2
-100533b89331
-653a87594079
-d8a274b2e026
-b20b83cb145c
-9afa6cb4fc3d
-a229e68ad9e5
-49c2b5296ef4
+2735FC181807
+2ABA9519F574
+84FD7F7A12B6
+186D8C4B93F9
+3A4BBA8ADAF0
+8765B17968A2
+40EAD80721CE
+0DB5E6523F7C
+51119DAE5216
+83E3549CE42D
+136BDB246CAC
+7DE02A7F6025
+BF23A53C1F63
+CB9A1F2D7368
+C7C0ADB3284F
+9F131D8C2057
+67362D90F973
+6202A38F69E2
+100533B89331
+653A87594079
+D8A274B2E026
+B20B83CB145C
+9AFA6CB4FC3D
+A229E68AD9E5
+49C2B5296EF4
 #
 # Data from http://pastebin.com/RRJUEDCM
-0d258fe90296
-e55a3ca71826
-a4f204203f56
-eeb420209d0c
-911e52fd7ce4
-752fbb5b7b45
-66b03aca6ee9
-48734389edc3
-17193709adf4
-1acc3189578c
-c2b7ec7d4eb1
-369a4663acd2
+0D258FE90296
+E55A3CA71826
+A4F204203F56
+EEB420209D0C
+911E52FD7CE4
+752FBB5B7B45
+66B03ACA6EE9
+48734389EDC3
+17193709ADF4
+1ACC3189578C
+C2B7EC7D4EB1
+369A4663ACD2
 #
 # Data from https://github.com/zhangjingye03/zxcardumper
 # zxcard Key A/B
@@ -299,144 +344,150 @@ c2b7ec7d4eb1
 003003003003
 #
 # Data from http://phreakerclub.com/forum/showthread.php?p=41266
-26973ea74321
-71f3a315ad26
-51044efb5aab
-ac70ca327a04
-eb0a8ff88ade
+26973EA74321
+71F3A315AD26
+51044EFB5AAB
+AC70CA327A04
+EB0A8FF88ADE
 #
 # Transport system Metromoney
-2803bcb0c7e1 
-9c616585e26d 
-4fa9eb49f75e
-2dade48942c5
-a160fcd5ec4c
+2803BCB0C7E1
+9C616585E26D
+4FA9EB49F75E
+2DADE48942C5
+A160FCD5EC4C
 112233445566
-361a62f35bc9
-# 
+361A62F35BC9
+#
 # Transport system Spain
-83f3cb98c258
-070d486bc555
-a9b018868cc1
-9dcdb136110c
-749934cc8ed3
-506db955f161
-f088a85e71d7
-72b458d60363
-70c714869dc7
-b32464412ee3
-f253c30568c4
-1c68315674ac
-cfe63749080a
-c1e6f8afc9ec
-dd0de3ba08a6
-3d923eb73534
-ff94f86b09a6
-d61707ffdfb1
-8223205047b6
-9951a273dee7
-c9449301af93
-66695a45c9fa
-89aa9d743812
-c41514defc07
-c52876869800
-5353b3aecb53
-2e4169a5c79d
-4bb747e48c2a
-6285a1c8eb5c
-5145c34dba19
-25352912cd8d
-81b20c274c3f
+83F3CB98C258
+070D486BC555
+A9B018868CC1
+9DCDB136110C
+749934CC8ED3
+506DB955F161
+F088A85E71D7
+72B458D60363
+70C714869DC7
+B32464412EE3
+F253C30568C4
+1C68315674AC
+CFE63749080A
+C1E6F8AFC9EC
+DD0DE3BA08A6
+3D923EB73534
+FF94F86B09A6
+D61707FFDFB1
+8223205047B6
+9951A273DEE7
+C9449301AF93
+66695A45C9FA
+89AA9D743812
+C41514DEFC07
+C52876869800
+5353B3AECB53
+2E4169A5C79D
+4BB747E48C2A
+6285A1C8EB5C
+5145C34DBA19
+25352912CD8D
+81B20C274C3F
 #
 # Data from mall
-abba1234fcb0 # playland balikesir
-314f495254ff # A trio bowling bahcelievler
-4152414b4e41 # A trio bowling bahcelievler
-4E474434FFFF # karinca park nigde
+# playland balikesir
+ABBA1234FCB0
+# A trio bowling bahcelievler
+314F495254FF
+4152414B4E41
+# karinca park nigde
+4E474434FFFF
 #
 # Data from https://github.com/RadioWar/NFCGUI
-44dd5a385aaf
-21a600056cb0
-b1aca33180a5
-dd61eb6bce22
-1565a172770f
-3e84d2612e2a
-f23442436765
-79674f96c771
-87df99d496cb
-c5132c8980bc
-a21680c27773
-f26e21edcee2
-675557ecc92e
-f4396e468114
-6db17c16b35b
-4186562a5bb2
-2feae851c199
-db1a3338b2eb
-157b10d84c6b
-a643f952ea57
-df37dcb6afb3
-4c32baf326e0
-91ce16c07ac5
-3c5d1c2bcd18
-c3f19ec592a2
-f72a29005459
-185fa3438949
-321a695bd266
-d327083a60a7
-45635ef66ef3
-5481986d2d62
-cba6ae869ad5
-645a166b1eeb
-a7abbc77cc9e
-f792c4c76a5c
-bfb6796a11db
+44DD5A385AAF
+21A600056CB0
+B1ACA33180A5
+DD61EB6BCE22
+1565A172770F
+3E84D2612E2A
+F23442436765
+79674F96C771
+87DF99D496CB
+C5132C8980BC
+A21680C27773
+F26E21EDCEE2
+675557ECC92E
+F4396E468114
+6DB17C16B35B
+4186562A5BB2
+2FEAE851C199
+DB1A3338B2EB
+157B10D84C6B
+A643F952EA57
+DF37DCB6AFB3
+4C32BAF326E0
+91CE16C07AC5
+3C5D1C2BCD18
+C3F19EC592A2
+F72A29005459
+185FA3438949
+321A695BD266
+D327083A60A7
+45635EF66EF3
+5481986D2D62
+CBA6AE869AD5
+645A166B1EEB
+A7ABBC77CC9E
+F792C4C76A5C
+BFB6796A11DB
 #
 # Data from Salto A/B
 6A1987C40A21
 7F33625BC129
 #
 # Data from forum
-2338b4913111
+2338B4913111
 #
 # Data from stoye
-cb779c50e1bd
-a27d3804c259
-003cc420001a
-f9861526130f
-381ece050fbd
-a57186bdd2b9
-48c739e21a04
-36abf5874ed7
-649d2abbbd20
-bbe8fffcf363
-ab4e7045e97d
-340e40f81cd8
-e4f65c0ef32c
-d2a597d76936
-a920f32fe93a
-86afd95200f7
-9b832a9881ff
-26643965b16e
-0c669993c776
-b468d1991af9
-d9a37831dce5
-2fc1f32f51b1
-0ffbf65b5a14
-c5cfe06d9ea3
-c0dece673829
+CB779C50E1BD
+A27D3804C259
+003CC420001A
+F9861526130F
+381ECE050FBD
+A57186BDD2B9
+48C739E21A04
+36ABF5874ED7
+649D2ABBBD20
+BBE8FFFCF363
+AB4E7045E97D
+340E40F81CD8
+E4F65C0EF32C
+D2A597D76936
+A920F32FE93A
+86AFD95200F7
+9B832A9881FF
+26643965B16E
+0C669993C776
+B468D1991AF9
+D9A37831DCE5
+2FC1F32F51B1
+0FFBF65B5A14
+C5CFE06D9EA3
+C0DECE673829
 #
-a56c2df9a26d
+A56C2DF9A26D
 #
 # Data from https://pastebin.com/vbwast74
 #
-68d3f7307c89
-568c9083f71c # Smart Rider. Western Australian Public Transport Cards
+68D3F7307C89
+# Smart Rider. Western Australian Public Transport Cards
+568C9083F71C
 #
-#
-97F5DA640B18 # Bangkok metro key
-A8844B0BCA06 # Metro Valencia key
-857464D3AAD1 # HTC Eindhoven key
+# Bangkok metro key
+97F5DA640B18
+# Metro Valencia key
+A8844B0BCA06
+# HTC Eindhoven key
+857464D3AAD1
 #
 # Vigik Keys
 # Various sources :
@@ -445,95 +496,103 @@ A8844B0BCA06 # Metro Valencia key
 # * Own dumps
 #
 # French VIGIK
-314B49474956 # VIGIK1 A
-564c505f4d41 # VIGIK1 B
-ba5b895da162 # VIGIK1 B
+# VIGIK1 A
+314B49474956
+# VIGIK1 B
+564C505F4D41
+BA5B895DA162
 #
 # Vigik mystery Keys Mifare 1k EV1 (S50)
-5c8ff9990da2 # 16 A
-75ccb59c9bed # 17 A
-d01afeeb890a # 16 B
-4b791bea7bcc # 17 B
+# 16 A
+5C8FF9990DA2
+# 17 A
+75CCB59C9BED
+# 16 B
+D01AFEEB890A
+# 17 B
+4B791BEA7BCC
 #
-021209197591 # BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
-2ef720f2af76
-414c41524f4e
-424c41524f4e
-4a6352684677
-bf1f4424af76
-536653644c65
+# BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
+021209197591
+#
+2EF720F2AF76
+414C41524F4E
+424C41524F4E
+4A6352684677
+BF1F4424AF76
+536653644C65
 #
 # Intratone Cogelec
 # Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
 484558414354
-a22ae129c013
-49fae4e3849f
-38fcf33072e0
-8ad5517b4b18
-509359f131b1
-6c78928e1317
-aa0720018738
-a6cac2886412
-62d0c424ed8e
-e64a986a5d94
-8fa1d601d0a2
-89347350bd36
-66d2b7dc39ef
-6bc1e1ae547d
-22729a9bd40f
+A22AE129C013
+49FAE4E3849F
+38FCF33072E0
+8AD5517B4B18
+509359F131B1
+6C78928E1317
+AA0720018738
+A6CAC2886412
+62D0C424ED8E
+E64A986A5D94
+8FA1D601D0A2
+89347350BD36
+66D2B7DC39EF
+6BC1E1AE547D
+22729A9BD40F
 #
 # Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
-925b158f796f
-fad63ecb5891
-bba840ba1c57
-cc6b3b3cd263
-6245e47352e6
-8ed41e8b8056
-2dd39a54e1f3
-6d4c5b3658d2
-1877ed29435a
-52264716efde
-961c0db4a7ed
-703140fd6d86
-157c9a513fa5
-e2a5dc8e066f
+925B158F796F
+FAD63ECB5891
+BBA840BA1C57
+CC6B3B3CD263
+6245E47352E6
+8ED41E8B8056
+2DD39A54E1F3
+6D4C5B3658D2
+1877ED29435A
+52264716EFDE
+961C0DB4A7ED
+703140FD6D86
+157C9A513FA5
+E2A5DC8E066F
 #
 # Data from forum,  schlage 9691T fob
-ef1232ab18a0
+EF1232AB18A0
 #
 # Data from a oyster card
-374bf468607f
-bfc8e353af63
-15cafd6159f6
-62efd80ab715
-987a7f7f1a35
-c4104fa3c526
-4c961f23e6be
-67546972bc69
-f4cd5d4c13ff
-94414c1a07dc
-16551d52fd20
-9cb290282f7d
-77a84170b574
-ed646c83a4f3
-e703589db50b
-513c85d06cde
-95093f0b2e22
-543b01b27a95
-c6d375b99972
-ee4cc572b40e
-5106ca7e4a69
-c96bd1ce607f
-167a1be102e0
-a8d0d850a606
-a2abb693ce34
-7b296c40c486
-91f93a5564c9
-e10623e7a016
-b725f9cbf183
+374BF468607F
+BFC8E353AF63
+15CAFD6159F6
+62EFD80AB715
+987A7F7F1A35
+C4104FA3C526
+4C961F23E6BE
+67546972BC69
+F4CD5D4C13FF
+94414C1A07DC
+16551D52FD20
+9CB290282F7D
+77A84170B574
+ED646C83A4F3
+E703589DB50B
+513C85D06CDE
+95093F0B2E22
+543B01B27A95
+C6D375B99972
+EE4CC572B40E
+5106CA7E4A69
+C96BD1CE607F
+167A1BE102E0
+A8D0D850A606
+A2ABB693CE34
+7B296C40C486
+91F93A5564C9
+E10623E7A016
+B725F9CBF183
 #
 # Data from FDi tag
-8829da9daf76
+8829DA9DAF76
 #
 # Data from GitHub issue
 0A7932DC7E65
@@ -565,11 +624,11 @@ E241E8AFCBAF
 050908080008
 #
 # Data from hoist
-4f9f59c9c875
+4F9F59C9C875
 #
 # Data from pastebin
-66f3ed00fed7
-f7a39753d018
+66F3ED00FED7
+F7A39753D018
 #
 # Data from https://pastebin.com/Z7pEeZif
 386B4D634A65
@@ -604,28 +663,28 @@ f7a39753d018
 77646B633657
 #
 # Data from TransPert
-2031d1e57a3b
-53c11f90822a
-9189449ea24e
+2031D1E57A3B
+53C11F90822A
+9189449EA24E
 #
 # data from Github
-410b9b40b872
-2cb1a90071c8
+410B9B40B872
+2CB1A90071C8
 #
-# data from
 8697389ACA26
 1AB23CD45EF6
 013889343891
 #
 #
-0000000018de
-16ddcb6b3f24
+0000000018DE
+16DDCB6B3F24
 #
 # Data from https://pastebin.com/vwDRZW7d
-EC0A9B1A9E06 # Vingcard Mifare 4k Staff card
-6C94E1CED026 # Vingcard Mifare 4k Staff card
-0F230695923F # Vingcard Mifare 4k Staff card
-0000014B5C31 # Vingcard Mifare 4k Staff card
+# Vingcard Mifare 4k Staff card
+EC0A9B1A9E06
+6C94E1CED026
+0F230695923F
+0000014B5C31
 #
 BEDB604CC9D1
 B8A1F613CF3D
@@ -635,91 +694,101 @@ B66AC040203A
 2E641D99AD5B
 AD4FB33388BF
 69FB7B7CD8EE
-2A6D9205E7CA # Hotel
-2a2c13cc242a # KABA Hotel Locks
+# Hotel
+2A6D9205E7CA
+13B91C226E56
+# KABA Hotel Locks
+2A2C13CC242A
+#
 27FBC86A00D0
 01FA3FC68349
 #
-13B91C226E56 # Hotel
+# Smart Rider. Western Australian Public Transport Cards
+6D44B5AAF464
+1717E34A7A8A
 #
-6D44B5AAF464 # Smart Rider. Western Australian Public Transport Cards
-1717E34A7A8A # Smart Rider. Western Australian Public Transport Cards
+# RFIDeas
+6B6579737472
 #
-6B6579737472 # RFIDeas
+# HID MIFARE Classic 1k Key
+484944204953
+204752454154 
+# HID MIFARE SO
+3B7E4FD575AD
+11496F97752A
 #
-484944204953 # HID MIFARE Classic 1k Key
-204752454154 # HID MIFARE Classic 1k Key
-3B7E4FD575AD # HID MIFARE SO
-11496F97752A # HID MIFARE SO
+# Luxeo/Aztek cashless vending
+415A54454B4D
 #
-415A54454B4D # Luxeo/Aztek cashless vending
+# BQT
+321958042333
 #
-321958042333 # BQT
+# Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
+160A91D29A9C
 #
-160A91D29A9C # Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
-#
-b7bf0c13066e # Gallagher
+# Gallagher
+B7BF0C13066E
 #
 # PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
 009FB42D98ED
 002E626E2820
 #
 # Boston, MA, USA Transit - MBTA Charlie Card
-3060206f5b0a # charlie
-5ec39b022f2b # charlie
-3a09594c8587 # charlie
-f1b9f5669cc8 # charlie
-f662248e7e89 # charlie
-62387b8d250d # charlie
-f238d78ff48f # charlie
-9dc282d46217 # charlie
-afd0ba94d624 # charlie
-92ee4dc87191 # charlie
-b35a0e4acc09 # charlie
-756ef55e2507 # charlie
-447ab7fd5a6b # charlie
-932b9cb730ef # charlie
-1f1a0a111b5b # charlie
-ad9e0a1ca2f7 # charlie
-d58023ba2bdc # charlie
-62ced42a6d87 # charlie
-2548a443df28 # charlie
-2ed3b15e7c0f # charlie
-f66224ee1e89 # charlie
+3060206F5B0A
+5EC39B022F2B
+3A09594C8587
+F1B9F5669CC8
+F662248E7E89
+62387B8D250D
+F238D78FF48F
+9DC282D46217
+AFD0BA94D624
+92EE4DC87191
+B35A0E4ACC09
+756EF55E2507
+447AB7FD5A6B
+932B9CB730EF
+1F1A0A111B5B
+AD9E0A1CA2F7
+D58023BA2BDC
+62CED42A6D87
+2548A443DF28
+2ED3B15E7C0F
+F66224EE1E89
 #
-60012e9ba3fa
+60012E9BA3FA
 #
-de1fcbec764b
-81bfbe8cacba
-bff123126c9b
-2f47741062a0
-b4166b0a27ea
-a170d9b59f95
-400bc9be8976
-d80511fc2ab4
-1fcef3005bcf
-bb467463acd6
-e67c8010502d
-ff58ba1b4478
+DE1FCBEC764B
+81BFBE8CACBA
+BFF123126C9B
+2F47741062A0
+B4166B0A27EA
+A170D9B59F95
+400BC9BE8976
+D80511FC2AB4
+1FCEF3005BCF
+BB467463ACD6
+E67C8010502D
+FF58BA1B4478
 # Data from https://pastebin.com/Kz8xp4ev
-fbf225dc5d58
+FBF225DC5D58
 #
 # Data  https://pastebin.com/BEm6bdAE
 # vingcard.txt
-4708111c8604
-3d50d902ea48
-96a301bce267
-6700f10fec09
-7a09cc1db70a
-560f7cff2d81
-66b31e64ca4b
-9e53491f685b
-3a09911d860c
-8a036920ac0c
-361f69d2c462
-d9bcde7fc489
-0c03a720f208
-6018522fac02
+4708111C8604
+3D50D902EA48
+96A301BCE267
+6700F10FEC09
+7A09CC1DB70A
+560F7CFF2D81
+66B31E64CA4B
+9E53491F685B
+3A09911D860C
+8A036920AC0C
+361F69D2C462
+D9BCDE7FC489
+0C03A720F208
+6018522FAC02
 #
 # Data from https://pastebin.com/4t2yFMgt
 # Mifare technische Universität Graz TUG
@@ -728,9 +797,10 @@ D58660D1ACDE
 C01FC822C6E5
 0854BF31111E
 # More keys:
-8a19d40cf2b5
-ae8587108640
-135b88a94b8b # SafLock standalone door locks.
+8A19D40CF2B5
+AE8587108640
+# SafLock standalone door locks.
+135B88A94B8B
 #
 # Russian Troika card
 08B386463229
@@ -840,12 +910,12 @@ E56AC127DD45
 EA0FD73CB149
 FC0001877BF7
 FD8705E721B0
-00ada2cd516d
+00ADA2CD516D
 #
 #
 ##
-237a4d0d9119
-0ed7846c2bc9
+237A4D0D9119
+0ED7846C2BC9
 FFFFD06F83E3
 FFFFAE82366C
 F89C86B2A961
@@ -896,9 +966,10 @@ A2B2C9D187FB
 A2F63A485632
 98631ED2B229
 19F1FFE02563
-563A22C01FC8 # Argentina
-43CA22C13091 # Argentina
-25094DF2C1BD # Argentina
+# Argentina
+563A22C01FC8
+43CA22C13091
+25094DF2C1BD
 #
 # OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
 AFBECD120454
@@ -996,38 +1067,38 @@ A7FB4824ACBF
 #
 # Transportes Insular La Palma
 #
-0172066b2f03
-0000085f0000
-1a80b93f7107
-70172066b2f0
-b1a80c94f710
-0b0172066b2f
-0f1a81c95071
-f0f0172066b2
-1131a81d9507
-2f130172066b
-71171a82d951
-b2f170172066
-1711b1a82e96
-6b2f1b017206
-62711f1a83e9
-66b2f1f01720
-97271231a83f
-066b2f230172
-f97371271a84
-2066b2f27017
-50983712b1a8
-72066b2f2b01
-850984712f1a
-172066b2f2f0
-a85198481331
-0172066b2f33
-1a8619858137
-70172066b2f3
-b1a862985913
-3b0172066b2f
-3f1a87298691
-f3f0172066b2
+0172066B2F03
+0000085F0000
+1A80B93F7107
+70172066B2F0
+B1A80C94F710
+0B0172066B2F
+0F1A81C95071
+F0F0172066B2
+1131A81D9507
+2F130172066B
+71171A82D951
+B2F170172066
+1711B1A82E96
+6B2F1B017206
+62711F1A83E9
+66B2F1F01720
+97271231A83F
+066B2F230172
+F97371271A84
+2066B2F27017
+50983712B1A8
+72066B2F2B01
+850984712F1A
+172066B2F2F0
+A85198481331
+0172066B2F33
+1A8619858137
+70172066B2F3
+B1A862985913
+3B0172066B2F
+3F1A87298691
+F3F0172066B2
 #
 # Tehran ezpay
 #
@@ -1043,15 +1114,15 @@ EEC0626B01A1
 D3B1C7EA5C53
 41C82D231497
 0B8B21C692C2
-604Ac8D87C7E
+604AC8D87C7E
 8E7B29460F12
 BB3D7B11D224
 #
 # Chaco
 #
-b210cfa436d2
-b8b1cfa646a8
-a9f95891f0a4
+B210CFA436D2
+B8B1CFA646A8
+A9F95891F0A4
 #
 # Keys from APK application "Scan Badge"
 4A4C474F524D
@@ -1076,39 +1147,39 @@ B069D0D03D17
 #
 # From the DFW Area, TX, USA
 #
-a506370e7c0f
-26396f2042e7
-70758fdd31e0
-9f9d8eeddcce
-06ff5f03aa1a
-4098653289d3
-904735f00f9e
-b4c36c79da8d
-68f9a1f0b424
-5a85536395b3
-7dd399d4e897
-ef4c5a7ac6fc
-b47058139187
-8268046cd154
-67cc03b7d577
+A506370E7C0F
+26396F2042E7
+70758FDD31E0
+9F9D8EEDDCCE
+06FF5F03AA1A
+4098653289D3
+904735F00F9E
+B4C36C79DA8D
+68F9A1F0B424
+5A85536395B3
+7DD399D4E897
+EF4C5A7AC6FC
+B47058139187
+8268046CD154
+67CC03B7D577
 #
 # From the HTL Mödling, NÖ, AT
 #
-a5524645cd91
-d964406e67b4
-99858a49c119
-7b7e752b6a2d
-c27d999912ea
-66a163ba82b4
-4c60f4b15ba8
+A5524645CD91
+D964406E67B4
+99858A49C119
+7B7E752B6A2D
+C27D999912EA
+66A163BA82B4
+4C60F4B15BA8
 #
 # CAFE + CO, AT
 #
-35d850d10a24
-4b511f4d28dd
-e45230e7a9e8
-535f47d35e39
-fb6c88b7e279
+35D850D10A24
+4B511F4D28DD
+E45230E7A9E8
+535F47D35E39
+FB6C88B7E279
 #
 # Metro Card, AT
 #
@@ -1116,110 +1187,115 @@ fb6c88b7e279
 #
 # Unknown, AT
 #
-23d4cdff8da3
-e6849fcc324b
-12fd3a94df0e
+23D4CDFF8DA3
+E6849FCC324B
+12FD3A94DF0E
 #
 # Unknown, AT
 #
-0b83797a9c64
-39ad2963d3d1
-34b16cd59ff8 # Hotel Berlin Classic room A KEY
-bb2c0007d022 # Hotel Berlin Classic room B KEY
+0B83797A9C64
+39AD2963D3D1
+# Hotel Berlin Classic room A KEY
+34B16CD59FF8
+# Hotel Berlin Classic room B KEY
+BB2C0007D022
 #
 # Coinmatic laundry Smart card
 # data from: https://pastebin.com/XZQiLtUf
 #
-0734bfb93dab
-85a438f72a8a
+0734BFB93DAB
+85A438F72A8A
 #
 # Data from forum, Chinese hotel
-58ac17bf3629
-b62307b62307
+58AC17BF3629
+B62307B62307
 #
-a2a3cca2a3cc
+A2A3CCA2A3CC
 #
 # Granada, ES Transport Card
 000000270000
-0f385ffb6529
-29173860fc76
-2fca8492f386
-385efa542907
-3864fcba5937
-3f3865fccb69
-6291b3860fc8
-63fca9492f38
-863fcb959373
-87291f3861fc
-913385ffb752
-b385efa64290
-c9739233861f
-f3864fcca693
-fc9839273862
+0F385FFB6529
+29173860FC76
+2FCA8492F386
+385EFA542907
+3864FCBA5937
+3F3865FCCB69
+6291B3860FC8
+63FCA9492F38
+863FCB959373
+87291F3861FC
+913385FFB752
+B385EFA64290
+C9739233861F
+F3864FCCA693
+FC9839273862
 #
 # various hotel keys
 34D3C568B348
 91FF18E63887
 4D8B8B95FDEE
 354A787087F1
-4a306e62e9b6
+4A306E62E9B6
 B9C874AE63D0
 #
 # Data from official repo
-f00dfeedd0d0
-0bb31dc123e5
-7578bf2c66a9
-cd212889c3ed
-6936c035ae1b
-c6c866aa421e
-590bd659cdd2
-aa734d2f40e0
-09800ff94aaf
-5a12f83326e7
-c554ef6a6015
-0d8ca561bdf3
-b8937130b6ba
-d7744a1a0c44
-82908b57ef4f
-fe04ecfe5577
+F00DFEEDD0D0
+0BB31DC123E5
+7578BF2C66A9
+CD212889C3ED
+6936C035AE1B
+C6C866AA421E
+590BD659CDD2
+AA734D2F40E0
+09800FF94AAF
+5A12F83326E7
+C554EF6A6015
+0D8CA561BDF3
+B8937130B6BA
+D7744A1A0C44
+82908B57EF4F
+FE04ECFE5577
 # comfort inn hotel
-4d57414c5648
-4d48414c5648
-# 
-# unknown hotel key
-6d9b485a4845
+4D57414C5648
+4D48414C5648
 #
-5a7a52d5e20d # Bosch Solution 6000
+# unknown hotel key
+6D9B485A4845
+#
+# Bosch Solution 6000
+5A7A52D5E20D
 #
 # Found in TagInfo app
-C1E51C63B8F5 # RATB key 
+# RATB key
+C1E51C63B8F5
 1DB710648A65
-18F34C92A56E # E-GO card key 
+# E-GO card key
+18F34C92A56E
 #
 # Library Card MFP - SL1
-4a832584637d
-ca679d6291b0
-30d9690fc5bc
-5296c26109d4
-e77952748484
-91c2376005a1
-30b7680b2bc9
-e2a9e88bfe16
-43b04995d234
-aade86b1f9c1
-5ea088c824c9
-c67beb41ffbf
-b84d52971107
-52b0d3f6116e
+4A832584637D
+CA679D6291B0
+30D9690FC5BC
+5296C26109D4
+E77952748484
+91C2376005A1
+30B7680B2BC9
+E2A9E88BFE16
+43B04995D234
+AADE86B1F9C1
+5EA088C824C9
+C67BEB41FFBF
+B84D52971107
+52B0D3F6116E
 #
 # Data from https://pastebin.com/cLSQQ9xN
-ca3a24669d45
-4087c6a75a96
-403f09848b87
-d73438698eea
-5f31f6fcd3a0
-a0974382c4c5
-a82045a10949
+CA3A24669D45
+4087C6A75A96
+403F09848B87
+D73438698EEA
+5F31F6FCD3A0
+A0974382C4C5
+A82045A10949
 #
 # Data from https://pastebin.com/2iV8h93h
 #
@@ -1352,16 +1428,16 @@ AABAFFCC7612
 17D071403C20
 #
 534F4C415249
-534f4c303232
+534F4C303232
 #
 # Nespresso, smart card
 # key-gen algo, these keys are for one card
-ff9a84635bd2
-6f30126ee7e4
-6039abb101bb
-f1a1239a4487
+FF9A84635BD2
+6F30126EE7E4
+6039ABB101BB
+F1A1239A4487
 #
-b882fd4a9f78
+B882FD4A9F78
 CD7FFFF81C4A
 AA0857C641A3
 C8AACD7CF3D1
@@ -1373,25 +1449,25 @@ A7395CCB42A0
 D14E615E0545
 69D92108C8B5
 703265497350
-D75971531042    
-10510049D725     
-35C649004000    
+D75971531042
+10510049D725
+35C649004000
 5B0C7EC83645
-05F5EC05133C 
-521B517352C7     
-94B6A644DFF6    
-2CA4A4D68B8E    
-A7765C952DDF    
-E2F14D0A0E28    
-DC018FC1D126        
-4927C97F1D57    
-046154274C11     
-155332417E00    
-6B13935CD550    
-C151D998C669    
-D973D917A4C7    
-130662240200    
-9386E2A48280    
+05F5EC05133C
+521B517352C7
+94B6A644DFF6
+2CA4A4D68B8E
+A7765C952DDF
+E2F14D0A0E28
+DC018FC1D126
+4927C97F1D57
+046154274C11
+155332417E00
+6B13935CD550
+C151D998C669
+D973D917A4C7
+130662240200
+9386E2A48280
 52750A0E592A
 075D1A4DD323
 32CA52054416
@@ -1401,54 +1477,56 @@ D973D917A4C7
 1F0128447C00
 411053C05273
 42454C4C4147
-C428C4550A75     
-730956C72BC2    
-28D70900734C     
-4F75030AD12B    
-6307417353C1     
+C428C4550A75
+730956C72BC2
+28D70900734C
+4F75030AD12B
+6307417353C1
 D65561530174
 D1F71E05AD9D
-F7FA2F629BB1    
-0E620691B9FE    
-43E69C28F08C    
-735175696421     
-424C0FFBF657    
+F7FA2F629BB1
+0E620691B9FE
+43E69C28F08C
+735175696421
+424C0FFBF657
 51E97FFF51E9
-E7316853E731   
-00460740D722     
-35D152154017    
-5D0762D13401     
-0F35D5660653   
-1170553E4304     
-0C4233587119         
-F678905568C3    
-50240A68D1D8   
-2E71D3BD262A    
-540D5E6355CC     
-D1417E431949    
+E7316853E731
+00460740D722
+35D152154017
+5D0762D13401
+0F35D5660653
+1170553E4304
+0C4233587119
+F678905568C3
+50240A68D1D8
+2E71D3BD262A
+540D5E6355CC
+D1417E431949
 4BF6DE347FB6
 #
 #
-3a471b2192bf
-a297ceb7d34b
-ae76242931f1
+3A471B2192BF
+A297CEB7D34B
+AE76242931F1
 #
 #
 124578ABFEDC
 ABFEDC124578
 4578ABFEDC12
 #
-# Data from 
+# Data from
 # premier inn hotel chain
-5e594208ef02    
-af9e38d36582 
+5E594208EF02
+AF9E38D36582
 #
 #Norwegian building site identication card. (HMS KORT)
-10DF4D1859C8 # Key a
-B5244E79B0C8 # Key B
+# Key a
+10DF4D1859C8
+# Key B
+B5244E79B0C8
 #
 # Ukraine hotel
-f5c1c4c5de34
+F5C1C4C5DE34
 #
 # Data from Mifare Classic Tool repo
 # Rotterdam University of applied sciences campus card
@@ -1476,7 +1554,7 @@ B290401B0CAD
 AD11006B0601
 #
 # Data from Mifare Classic Tool repo
-# Armenian Metro 
+# Armenian Metro
 E4410EF8ED2D
 6A68A7D83E11
 0D6057E8133B
@@ -1487,20 +1565,20 @@ D3F3B958B8A3
 CE99FBC8BD26
 #
 # keys from Eurothermes group (Switzerland)
-d66d91829013
-75b691829013
-83e391829013
-a23c91829013
-e46a91829013
-d9e091829013
-fed791829013
-155f91829013
-06cc91829013
-8ddc91829013
-54af91829013
-29a791829013
+D66D91829013
+75B691829013
+83E391829013
+A23C91829013
+E46A91829013
+D9E091829013
+FED791829013
+155F91829013
+06CC91829013
+8DDC91829013
+54AF91829013
+29A791829013
 668091829013
-00008627c10a
+00008627C10A
 #
 # easycard
 310D51E539CA
@@ -1568,7 +1646,6 @@ BFE25035B0C8
 D5C172325DD3
 992B152E834A
 CE75D7EADEAF
-
 # Russian Podorozhnik card (Saint-Petersburg transport, may be combined with Troika)
 038B5F9B5A2A
 04DC35277635
@@ -1761,13 +1838,13 @@ B4B3FFEDBE0A
 # Vigik ScanBadge App (fr.badgevigik.scanbadge)
 # Website https://badge-vigik.fr/ - By Alex`
 0000A2B3C86F
-021200c20307
+021200C20307
 021209197507
 1E34B127AF9C
 303041534956
 4143532D494E
 41454E521985
-43412d627400
+43412D627400
 455249524345
 456666456666
 45B722C63319
@@ -1806,11 +1883,13 @@ A00003000057
 #
 # BH USA 2013 conference
 012279BAD3E5
-# 
+#
 # iGuard Simple (and reverse) keys
 AAAAAAFFFFFF
 FFFFFFAAAAAA
 # Added by VideoMan.
-3111A3A303EB # Random Hotel A Key Sec 0 Blk 3 - KABA Lock
+# Random Hotel A Key Sec 0 Blk 3 - KABA Lock
+3111A3A303EB
 # Transport system Uruguay
-D144BD193063 # Shared key
+# Shared key
+D144BD193063