From 7a55429eb712dd2ded063d6e4e3c24374ccd54d0 Mon Sep 17 00:00:00 2001
From: noproto
Date: Sun, 3 Nov 2024 21:07:05 -0500
Subject: [PATCH 01/18] MFC dictionary (reduced, deduped, known dynamic keys
removed)
---
.../resources/nfc/assets/mf_classic_dict.nfc | 2794 ++++++++++-------
1 file changed, 1700 insertions(+), 1094 deletions(-)
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 e2b74f847..4d2f92336 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -1,538 +1,697 @@
-# Key dictionary from https://github.com/ikarus23/MifareClassicTool.git
-
-# More well known keys!
-# Standard keys
+# MIFARE Classic Default Keys (from PM3 Iceman fork)
+# This file has comments and sections removed to optimize SD loading. To see the full file:
+# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
FFFFFFFFFFFF
-A0A1A2A3A4A5
-D3F7D3F7D3F7
000000000000
-
-# Keys from mfoc
+A0A1A2A3A4A5
+A5A4A3A2A1A0
+89ECA97F8C2A
+5C8FF9990DA2
+75CCB59C9BED
+D01AFEEB890A
+4B791BEA7BCC
+2612C6DE84CA
+707B11FC1481
+03F9067646AE
+2352C5B56D85
B0B1B2B3B4B5
+C0C1C2C3C4C5
+D0D1D2D3D4D5
+AABBCCDDEEFF
4D3A99C351DD
1A982C7E459A
-AABBCCDDEEFF
+D3F7D3F7D3F7
+5A1B85FCE20A
714C5C886E97
587EE5F9350F
A0478CC39091
533CB6C723F6
8FD0A4F256E9
-
-# Keys from:
-# http://pastebin.com/wcTHXLZZ
-A64598A77478
-26940B21FF5D
+E00000000000
+E7D6064C5860
+B27CCAB30DBD
+D2ECE8B9395E
+1494E81663D7
+7C9FB8474242
+569369C5A0E5
+632193BE1C3C
+644672BD4AFE
+8FE644038790
+9DE89E070277
+B5FF67CBA951
+EFF603E1EFE9
+F14EE7CAE863
+9C28A60F7249
+C9826AF02794
FC00018778F7
+0297927C0F77
+54726176656C
00000FFE2488
+776974687573
+EE0042F88840
+26940B21FF5D
+A64598A77478
5C598C9C58B5
E4D2770A89BE
-
-# Keys from:
-# http://pastebin.com/svGjN30Q
-434F4D4D4F41
-434F4D4D4F42
-47524F555041
-47524F555042
-505249564141
-505249564142
-
-# Keys from:
-# http://pastebin.com/d7sSetef
-0297927C0F77
-EE0042F88840
722BFCC5375F
F1D83F964314
-
-# Keys from:
-# http://pastebin.com/pvJX0xVS
-54726176656C
-776974687573
-4AF9D7ADEBE4
-2BA9621E0A36
-
-# Keys from:
-# http://pastebin.com/y3PDBWR1
+505249564141
+505249564142
+47524F555041
+434F4D4D4F41
+47524F555042
+434F4D4D4F42
+4B0B20107CCB
+605F5E5D5C5B
+199404281970
+199404281998
+FFF011223358
+FF9F11223358
+AC37E76385F5
+576DCFFF2F25
+1EE38419EF39
+26578719DCD9
000000000001
+000000000002
+00000000000A
+00000000000B
+010203040506
+0123456789AB
+100000000000
+111111111111
123456789ABC
-B127C6F41436
12F2EE3478C1
-34D1DF9934C5
-55F5A5DD38C9
-F1A97341A9FC
-33F974B42769
14D446E33363
-C934FE34D934
1999A3554A55
+200000000000
+222222222222
27DD91F1FCF1
-A94133013401
-99C636334433
+505209016A1F
+2BA9621E0A36
+4AF9D7ADEBE4
+333333333333
+33F974B42769
+34D1DF9934C5
43AB19EF5C31
-A053A292A4AF
+444444444444
505249565441
505249565442
-
-# Keys from:
-# http://pastebin.com/TUXj17K3
-FC0001877BF7
-
-# Keys from:
-# http://0x9000.blogspot.com/2010/12/mifare-classic-default-keys.html
-A0B0C0D0E0F0
-A1B1C1D1E1F1
-
-# Keys from:
-# https://code.google.com/p/mifare-key-cracker/downloads/list
-BD493A3962B6
-010203040506
-111111111111
-222222222222
-333333333333
-444444444444
555555555555
+55F5A5DD38C9
666666666666
777777777777
888888888888
999999999999
+99C636334433
+A00000000000
+A053A292A4AF
+A94133013401
AAAAAAAAAAAA
+ABCDEF123456
+B00000000000
+B127C6F41436
BBBBBBBBBBBB
+BD493A3962B6
+C934FE34D934
CCCCCCCCCCCC
DDDDDDDDDDDD
EEEEEEEEEEEE
-0123456789AB
-
-# Keys from:
-# https://github.com/4ZM/mfterm/blob/master/dictionary.txt
-000000000002
-00000000000A
-00000000000B
-100000000000
-200000000000
-A00000000000
-B00000000000
-
-# Key from:
-# ladyada.net
-ABCDEF123456
-
-# Key from:
-# http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
-F4A9EF2AFC6D
-
-# Keys from:
-# https://github.com/iceman1001/proxmark
-4B0B20107CCB
-569369C5A0E5
-632193BE1C3C
-644672BD4AFE
-8FE644038790
-9DE89E070277
-B5FF67CBA951
-EFF603E1EFE9
-F14EE7CAE863
+FFFFFF545846
+F1A97341A9FC
44AB09010845
85FED980EA5A
-314B49474956
-564C505F4D41
-0263DE1278F3
-067DB45454A9
-15FC4C7613FE
-16F21A82EC84
-16F3D5AB1139
-17758856B182
+43454952534E
+4A2B29111213
+4143414F5250
+A9B43414F585
+1FB235AC1388
+F4A9EF2AFC6D
+89EAC97F8C2A
+43C7600DEE6B
+0120BF672A64
+FB0B20DF1F34
+A9F953DEF0A3
+74A386AD0A6D
+3F7A5C2DBD81
+21EDF95E7433
+C121FF19F681
+3D5D9996359A
+3A42F33AF429
1FC235AC1309
-22C1BAE1AACD
+6338A371C0ED
243F160918D1
-25094DF6F148
-2A3C347A1200
-324F5DF65310
+F124C2578AD0
+9AFC42372AF1
32AC3B90AC13
+682D401ABB09
+4AD1E273EAF1
+067DB45454A9
+E2C42591368A
+15FC4C7613FE
+2A3C347A1200
+68D30288910A
+16F3D5AB1139
+F59A36A2546D
+937A4FFF3011
+64E3C10394C2
35C3D2CAEE88
-3A42F33AF429
+B736412614AF
+693143F10368
+324F5DF65310
+A3F97428DD01
+643FB6DE2217
+63F17A449AF0
+82F435DEDF01
+C4652C54261C
+0263DE1278F3
+D49E2826664F
+51284C3686A6
3DF14C8000A1
-3E3554AF0E12
+6A470D54127C
+48FFE71294A0
+E3429281EFC1
+16F21A82EC84
+460722122510
+AAFB06045877
3E65E4FB65B3
+25094DF6F148
+81CC25EBBB6A
+195DC63DB3A3
+A05DBD98E0FC
+AA4DDA458EBB
+EAB8066C7479
+E5519E1CC92B
+D3B595E9DD63
+AFBECD121004
+6471A5EF2D1A
+4E3552426B32
+22BDACF5A33F
+6E7747394E63
+763958704B78
+8A19D40CF2B5
+3961EA82C46D
+D21762B2DE3B
+0E83A374B513
+1F1FFE000000
+A10F303FC879
+1322285230B8
+0C71BCFB7E72
+C3C88C6340B8
+F101622750B7
+1F107328DC8D
+710732200D34
+7C335FB121B5
+B39AE17435DC
454841585443
-460722122510
-48FFE71294A0
-491CDCFB7752
-4AD1E273EAF1
-4B791BEA7BCC
-51284C3686A6
+190819842023
+D39BB83F5297
+85675B200017
528C9DFFE28C
-5EB8F884C8D1
+C82EC29E3235
+3E3554AF0E12
+491CDCFB7752
+22C1BAE1AACD
5F146716E373
-6338A371C0ED
-63F17A449AF0
-643FB6DE2217
-64E3C10394C2
-682D401ABB09
-68D30288910A
-693143F10368
-6A470D54127C
740E9A4F9AAF
-75CCB59C9BED
-75D8690F21B6
-75EDE6A84460
-82F435DEDF01
-85675B200017
-871B8C085997
-937A4FFF3011
+AC0E24C75527
97184D136233
-97D1101F18B0
-9AFC42372AF1
-A27D3804C259
-A3F97428DD01
+E444D53D359F
+17758856B182
A8966C7CC54B
-A9F953DEF0A3
-AAFB06045877
-AC0E24C75527
-AE3FF4EEA0DB
-B0C9DD55DD4D
-B736412614AF
-C4652C54261C
C6AD00254562
-C82EC29E3235
-D39BB83F5297
-D49E2826664F
-DF27A8F1CB8E
-E2C42591368A
-E3429281EFC1
-E444D53D359F
-F124C2578AD0
-F59A36A2546D
+AE3FF4EEA0DB
+5EB8F884C8D1
FEE470A4CB58
-0000000018DE
-0000014B5C31
-003003003003
-003CC420001A
-013889343891
-01FA3FC68349
-021209197591
-050908080008
-0A7932DC7E65
-0C669993C776
-0C71BCFB7E72
+75D8690F21B6
+871B8C085997
+97D1101F18B0
+75EDE6A84460
+DF27A8F1CB8E
+B0C9DD55DD4D
+A0B0C0D0E0F0
+A1B1C1D1E1F1
+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
0D258FE90296
-0E83A374B513
-0F230695923F
-0FFBF65B5A14
-11428B5BCE06
-11428B5BCE07
-11428B5BCE08
-11428B5BCE09
-11428B5BCE0A
-11428B5BCE0F
-11496F97752A
-123F8888F322
-1322285230B8
-1565A172770F
-157B10D84C6B
-157C9A513FA5
-15CAFD6159F6
-160A91D29A9C
-16551D52FD20
-167A1BE102E0
-16DDCB6B3F24
-1717E34A7A8A
+E55A3CA71826
+A4F204203F56
+EEB420209D0C
+911E52FD7CE4
+752FBB5B7B45
+66B03ACA6EE9
+48734389EDC3
17193709ADF4
-185FA3438949
-1877ED29435A
-18971D893494
-1AB23CD45EF6
1ACC3189578C
-1F107328DC8D
-1F1A0A111B5B
-1F1FFE000000
-2031D1E57A3B
-# HID Key B
-204752454154
-21A600056CB0
-22729A9BD40F
-2338B4913111
-2548A443DF28
-25D60050BF6E
-26643965B16E
+C2B7EC7D4EB1
+369A4663ACD2
+668770666644
+003003003003
26973EA74321
-27FBC86A00D0
-2A2C13CC242A
-2A6D9205E7CA
-2CB1A90071C8
-2DD39A54E1F3
-2ED3B15E7C0F
-2EF720F2AF76
-2FC1F32F51B1
+71F3A315AD26
+51044EFB5AAB
+AC70CA327A04
+EB0A8FF88ADE
+2803BCB0C7E1
+9C616585E26D
+4FA9EB49F75E
+2DADE48942C5
+A160FCD5EC4C
+112233445566
+361A62F35BC9
+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
+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
+ABBA1234FCB0
+314F495254FF
+4152414B4E41
+4E474434FFFF
+537930363139
+44DD5A385AAF
+21A600056CB0
+B1ACA33180A5
+DD61EB6BCE22
+1565A172770F
+3E84D2612E2A
+F23442436765
+79674F96C771
+87DF99D496CB
+C5132C8980BC
+A21680C27773
+F26E21EDCEE2
+675557ECC92E
+F4396E468114
+6DB17C16B35B
+4186562A5BB2
2FEAE851C199
-3060206F5B0A
-31646241686C
-321958042333
+DB1A3338B2EB
+157B10D84C6B
+A643F952EA57
+DF37DCB6AFB3
+4C32BAF326E0
+91CE16C07AC5
+3C5D1C2BCD18
+C3F19EC592A2
+F72A29005459
+185FA3438949
321A695BD266
-340E40F81CD8
-345547514B4D
-356D46474348
-369A4663ACD2
-36ABF5874ED7
-374BF468607F
+D327083A60A7
+45635EF66EF3
+5481986D2D62
+CBA6AE869AD5
+645A166B1EEB
+A7ABBC77CC9E
+F792C4C76A5C
+BFB6796A11DB
+6A1987C40A21
+7F33625BC129
+6BE9314930D8
+2338B4913111
+CB779C50E1BD
+A27D3804C259
+003CC420001A
+F9861526130F
381ECE050FBD
-386B4D634A65
-38FCF33072E0
-3A09594C8587
-3B7E4FD575AD
-3C5D1C2BCD18
-3E84D2612E2A
-3FA7217EC575
-410B9B40B872
+A57186BDD2B9
+48C739E21A04
+36ABF5874ED7
+649D2ABBBD20
+BBE8FFFCF363
+AB4E7045E97D
+340E40F81CD8
+E4F65C0EF32C
+D2A597D76936
+A920F32FE93A
+86AFD95200F7
+9B832A9881FF
+26643965B16E
+0C669993C776
+B468D1991AF9
+D9A37831DCE5
+2FC1F32F51B1
+0FFBF65B5A14
+C5CFE06D9EA3
+C0DECE673829
+A56C2DF9A26D
+68D3F7307C89
+568C9083F71C
+117E5C165B10
+24BB421C7973
+3E3A546650EA
+41F262D3AB66
+514956AB3142
+863933AE8388
+97F5DA640B18
+A8844B0BCA06
+857464D3AAD1
+314B49474956
+564C505F4D41
+BA5B895DA162
+021209197591
+2EF720F2AF76
414C41524F4E
-415A54454B4D
-4186562A5BB2
424C41524F4E
-425A73484166
-436A46587552
-447AB7FD5A6B
-44DD5A385AAF
-44F0B5FBE344
-45635EF66EF3
-476242304C53
+4A6352684677
+BF1F4424AF76
+536653644C65
484558414354
-# HID Key A
-484944204953
-484A57696F4A
-48734389EDC3
-48C739E21A04
+A22AE129C013
49FAE4E3849F
-4A6352684677
-4C32BAF326E0
-4C6B69723461
-4C961F23E6BE
-4D3248735131
-4D5076656D58
-4E32336C6E38
-4E4175623670
-4F9F59C9C875
+38FCF33072E0
+8AD5517B4B18
509359F131B1
-51044EFB5AAB
-5106CA7E4A69
-513C85D06CDE
-52264716EFDE
-536653644C65
-53C11F90822A
-543B01B27A95
-5481986D2D62
-5544564E6E67
-564777315276
-568C9083F71C
-57734F6F6974
-57784A533069
-584F66326877
-5A1B85FCE20A
-5EC39B022F2B
-623055724556
-62387B8D250D
-6245E47352E6
-62CED42A6D87
+6C78928E1317
+AA0720018738
+A6CAC2886412
62D0C424ED8E
-62EFD80AB715
-645A166B1EEB
-649D2ABBBD20
-666E564F4A44
-668770666644
-66B03ACA6EE9
+E64A986A5D94
+8FA1D601D0A2
+89347350BD36
66D2B7DC39EF
-66F3ED00FED7
-67546972BC69
-675557ECC92E
-686A736A356E
-68D3F7307C89
-69FB7B7CD8EE
-6A1987C40A21
-6A676C315142
-6A696B646631
-6B6579737472
6BC1E1AE547D
-6C78928E1317
-6C94E1CED026
-6D44B5AAF464
+22729A9BD40F
+925B158F796F
+FAD63ECB5891
+BBA840BA1C57
+CC6B3B3CD263
+6245E47352E6
+8ED41E8B8056
+2DD39A54E1F3
6D4C5B3658D2
-6D4E334B6C48
-6DB17C16B35B
-6F4B6D644178
-6F506F493353
+1877ED29435A
+52264716EFDE
+961C0DB4A7ED
703140FD6D86
-70564650584F
-710732200D34
-71F3A315AD26
-744E326B3441
-752FBB5B7B45
-756EF55E2507
-77494C526339
-77646B633657
+157C9A513FA5
+E2A5DC8E066F
+EF1232AB18A0
+374BF468607F
+BFC8E353AF63
+15CAFD6159F6
+62EFD80AB715
+987A7F7F1A35
+C4104FA3C526
+4C961F23E6BE
+67546972BC69
+F4CD5D4C13FF
+94414C1A07DC
+16551D52FD20
+9CB290282F7D
77A84170B574
-79674F96C771
+ED646C83A4F3
+E703589DB50B
+513C85D06CDE
+95093F0B2E22
+543B01B27A95
+C6D375B99972
+EE4CC572B40E
+5106CA7E4A69
+C96BD1CE607F
+167A1BE102E0
+A8D0D850A606
+A2ABB693CE34
7B296C40C486
+91F93A5564C9
+E10623E7A016
+B725F9CBF183
+8829DA9DAF76
+0A7932DC7E65
+11428B5BCE06
+11428B5BCE07
+11428B5BCE08
+11428B5BCE09
+11428B5BCE0A
+11428B5BCE0F
+18971D893494
+25D60050BF6E
+44F0B5FBE344
7B296F353C6B
-7C335FB121B5
-7F33625BC129
8553263F4FF0
-8697389ACA26
-86AFD95200F7
-87DF99D496CB
-8829DA9DAF76
-89347350BD36
-8AD5517B4B18
8E5D33A6ED51
-8ED41E8B8056
-8FA1D601D0A2
-911E52FD7CE4
-9189449EA24E
-91CE16C07AC5
-91F93A5564C9
-925B158F796F
-92EE4DC87191
-932B9CB730EF
-94414C1A07DC
-95093F0B2E22
-961C0DB4A7ED
-987A7F7F1A35
-9B832A9881FF
-9CB290282F7D
-9DC282D46217
9F42971E8322
-A10F303FC879
-A21680C27773
-A22AE129C013
-A2ABB693CE34
-A4F204203F56
-A56C2DF9A26D
-A57186BDD2B9
-A643F952EA57
-A6CAC2886412
-A7ABBC77CC9E
-A8D0D850A606
-A920F32FE93A
-AA0720018738
-AB4E7045E97D
-AC70CA327A04
-AD4FB33388BF
-AD9E0A1CA2F7
-AFD0BA94D624
-B1ACA33180A5
-B35A0E4ACC09
-B39AE17435DC
-B468D1991AF9
-B578F38A5C61
-B725F9CBF183
-B7BF0C13066E
-B8A1F613CF3D
-BA5B895DA162
-BBA840BA1C57
-BBE8FFFCF363
-BEDB604CC9D1
-BF1F4424AF76
-BFB6796A11DB
-BFC8E353AF63
-C0C1C2C3C4C5
-C0DECE673829
-C2B7EC7D4EB1
-C3C88C6340B8
-C3F19EC592A2
-C4104FA3C526
-C5132C8980BC
-C5CFE06D9EA3
C620318EF179
-C6D375B99972
-C96BD1CE607F
-CB779C50E1BD
-CBA6AE869AD5
-CC6B3B3CD263
-D0D1D2D3D4D5
-D21762B2DE3B
-D2A597D76936
-D327083A60A7
D4FE03CE5B06
D4FE03CE5B07
D4FE03CE5B08
D4FE03CE5B09
D4FE03CE5B0A
D4FE03CE5B0F
-D58023BA2BDC
-D9A37831DCE5
-DB1A3338B2EB
-DD61EB6BCE22
-DF37DCB6AFB3
-E10623E7A016
E241E8AFCBAF
-E2A5DC8E066F
-E4F65C0EF32C
-E55A3CA71826
-E64A986A5D94
-E703589DB50B
-EB0A8FF88ADE
-EC0A9B1A9E06
-ED646C83A4F3
-EE4CC572B40E
-EEB420209D0C
-F101622750B7
-F1B9F5669CC8
-F23442436765
-F238D78FF48F
-F26E21EDCEE2
-F4396E468114
-F4CD5D4C13FF
-F662248E7E89
-F72A29005459
-F792C4C76A5C
+3FA7217EC575
+123F8888F322
+050908080008
+4F9F59C9C875
+66F3ED00FED7
F7A39753D018
-F9861526130F
-FAD63ECB5891
-
-# Some keys of https://w3bsit3-dns.com and https://ikey.ru
-BC4580B7F20B
-8E26E45E7D65
-A7141147D430
-18E3A02B5EFF
-E328A1C7156D
-8A8D88151A00
-7A86AA203788
-72F96BDD3714
-C76BF71A2509
-1B61B2E78C75
-045CECA15535
-6B07877E2C5C
-0CE7CD2CC72B
-EA0FD73CB149
-B81F2B0C2F66
-BB52F8CCE07F
-46D78E850A7E
-E4821A377B75
-8791B2CCB5C4
-D5524F591EED
-BAFF3053B496
-0F318130ED18
-42E9B54E51AB
-7413B599C4EA
-9EA3387A63C1
-B27ADDFB64B0
-E56AC127DD45
-0BE5FAC8B06A
-FD8705E721B0
-7259FA0197C6
-22052B480D11
-9D993C5D4EF4
-C65D4EAA645B
-0EB23CC8110B
-3A8A139C20B4
-19FC84A3784B
-0F01CEFF2742
-A3FAA6DAFF67
-BC2D1791DEC1
-7A396F0D633D
-ACFFFFFFFFFF
-77DABC9825E1
-518DC6EEA089
-044CE1872BC3
-114D6BE9440C
-AFCEF64C9913
-
-# Russian Troika card
+386B4D634A65
+666E564F4A44
+564777315276
+476242304C53
+6A696B646631
+4D3248735131
+425A73484166
+57784A533069
+345547514B4D
+4C6B69723461
+4E4175623670
+4D5076656D58
+686A736A356E
+484A57696F4A
+6F4B6D644178
+744E326B3441
+70564650584F
+584F66326877
+6D4E334B6C48
+6A676C315142
+77494C526339
+623055724556
+356D46474348
+4E32336C6E38
+57734F6F6974
+436A46587552
+5544564E6E67
+6F506F493353
+31646241686C
+77646B633657
+2031D1E57A3B
+53C11F90822A
+9189449EA24E
+410B9B40B872
+2CB1A90071C8
+8697389ACA26
+1AB23CD45EF6
+013889343891
+0000000018DE
+16DDCB6B3F24
+EC0A9B1A9E06
+6C94E1CED026
+0F230695923F
+0000014B5C31
+BEDB604CC9D1
+B8A1F613CF3D
+B578F38A5C61
+B66AC040203A
+6D0B6A2A0003
+2E641D99AD5B
+AD4FB33388BF
+69FB7B7CD8EE
+2A6D9205E7CA
+13B91C226E56
+2A2C13CC242A
+27FBC86A00D0
+01FA3FC68349
+6D44B5AAF464
+1717E34A7A8A
+6B6579737472
+484944204953
+204752454154
+3B7E4FD575AD
+11496F97752A
+415A54454B4D
+321958042333
+160A91D29A9C
+B7BF0C13066E
+009FB42D98ED
+002E626E2820
+3060206F5B0A
+5EC39B022F2B
+3A09594C8587
+F1B9F5669CC8
+F662248E7E89
+62387B8D250D
+F238D78FF48F
+9DC282D46217
+AFD0BA94D624
+92EE4DC87191
+B35A0E4ACC09
+756EF55E2507
+447AB7FD5A6B
+932B9CB730EF
+1F1A0A111B5B
+AD9E0A1CA2F7
+D58023BA2BDC
+62CED42A6D87
+2548A443DF28
+2ED3B15E7C0F
+F66224EE1E89
+60012E9BA3FA
+DE1FCBEC764B
+81BFBE8CACBA
+BFF123126C9B
+2F47741062A0
+B4166B0A27EA
+A170D9B59F95
+400BC9BE8976
+D80511FC2AB4
+1FCEF3005BCF
+BB467463ACD6
+E67C8010502D
+FF58BA1B4478
+FBF225DC5D58
+96A301BCE267
+4708111C8604
+3D50D902EA48
+6700F10FEC09
+7A09CC1DB70A
+560F7CFF2D81
+66B31E64CA4B
+9E53491F685B
+3A09911D860C
+8A036920AC0C
+361F69D2C462
+D9BCDE7FC489
+0C03A720F208
+6018522FAC02
+D58660D1ACDE
+50A11381502C
+C01FC822C6E5
+0854BF31111E
+AE8587108640
+135B88A94B8B
+EC29806D9738
08B386463229
0E8F64340BA4
0F1C63013DBA
@@ -587,694 +746,547 @@ EAAC88E5DC99
F8493407799D
6B8BD9860763
D3A297DC2698
-FBF225DC5D58
-# Strelka extension
+34635A313344
+593367486137
+044CE1872BC3
+045CECA15535
+0BE5FAC8B06A
+0CE7CD2CC72B
+0EB23CC8110B
+0F01CEFF2742
+0F318130ED18
+114D6BE9440C
+18E3A02B5EFF
+19FC84A3784B
+1B61B2E78C75
+22052B480D11
3367BFAA91DB
+3A8A139C20B4
+42E9B54E51AB
+46D78E850A7E
4B609876BBA3
-5C83859F2224
-66B504430416
-70D1CF2C6843
+518DC6EEA089
+6B07877E2C5C
+7259FA0197C6
+72F96BDD3714
+7413B599C4EA
+77DABC9825E1
+7A396F0D633D
+7A86AA203788
+8791B2CCB5C4
+8A8D88151A00
8C97CD7A0E56
+8E26E45E7D65
+9D993C5D4EF4
+9EA3387A63C1
+A3FAA6DAFF67
+A7141147D430
+ACFFFFFFFFFF
+AFCEF64C9913
+B27ADDFB64B0
+B81F2B0C2F66
B9F8A7D83978
-C4B3BD0ED5F1
-C4D3911AD1B3
-CAD7D4A6A996
-DA898ACBB854
-FEA1295774F9
-
-# Moscow public toilets card
-807119F81418
-22C8BCD10AAA
-0AAABA420191
-E51B4C22C8BC
-DBF9F79AB7A2
-34EDE51B4C22
-C8BCD10AAABA
-BCD10AAABA42
-
-# Moscow social card
-2735FC181807
-2ABA9519F574
-84FD7F7A12B6
-186D8C4B93F9
-3A4BBA8ADAF0
-8765B17968A2
-40EAD80721CE
-0DB5E6523F7C
-51119DAE5216
-83E3549CE42D
-136BDB246CAC
-2F87F74090D1
-E53EAEFE478F
-CE2797E73070
-328A034B93DB
-81E1529AE22B
-FC55C50E579F
-1A72E2337BC3
-5DB52676BE07
-F64FBF085098
-8FE758A8F039
-BB1484CC155D
-41990A529AE2
-CD2E9EE62F77
-69C1327AC20B
-3C9C0D559DE5
-67BF3880C811
-48A01159A1E9
-2B83FB448CD4
-F24BBB044C94
-7DE02A7F6025
-BF23A53C1F63
-CB9A1F2D7368
-C7C0ADB3284F
-9F131D8C2057
-67362D90F973
-6202A38F69E2
-100533B89331
-653A87594079
-D8A274B2E026
-B20B83CB145C
-9AFA6CB4FC3D
-94F46DB5FD46
-C31C8CD41D65
-BB1684CC155D
-CA2393DB246C
-1D75E52E76BE
-81D9529AE223
-0159C9125AA2
-52AA1B6BB3FB
-97EF60A8F031
-6FC73888D011
-3A92FA438BD3
-74CC3D85CD0E
-025ACA1B63A3
-AF0878C81151
-9BFB6CB4FC45
-F750C0095199
-075FCF1860A8
-2686EE3F87C7
-277FEF3880C0
-82DA4B93DB1C
-9CF46DB5FD46
-93EB64ACF43D
-
-# Keys from RfidResearchGroup proxmark3 project
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
-0854BF31111E
-0C03A720F208
-135B88A94B8B
-1FCEF3005BCF
-2F47741062A0
-361F69D2C462
-3A09911D860C
-3D50D902EA48
-400BC9BE8976
-4708111C8604
-50A11381502C
-560F7CFF2D81
-60012E9BA3FA
-6018522FAC02
-66B31E64CA4B
-6700F10FEC09
-7A09CC1DB70A
-81BFBE8CACBA
-8A036920AC0C
-8A19D40CF2B5
-96A301BCE267
-9E53491F685B
-A170D9B59F95
-AE8587108640
-B4166B0A27EA
-BB467463ACD6
-BFF123126C9B
-C01FC822C6E5
-D58660D1ACDE
-D80511FC2AB4
-D9BCDE7FC489
-DE1FCBEC764B
-E67C8010502D
-FF58BA1B4478
-
-C1E51C63B8F5
-4143414F5250
-474249437569
+BAFF3053B496
+BB52F8CCE07F
+BC2D1791DEC1
+BC4580B7F20B
+C65D4EAA645B
+C76BF71A2509
+D5524F591EED
+E328A1C7156D
+E4821A377B75
+E56AC127DD45
+EA0FD73CB149
+FC0001877BF7
+FD8705E721B0
+00ADA2CD516D
+518108E061E2
+558AAD64EB5B
+001122334455
+6CA761AB6CA7
+B1C4A8F7F6E3
+FF75AFDA5A3C
+FCDDF7767C10
+A6B3F6C8F1D4
+237A4D0D9119
+0ED7846C2BC9
+FFFFD06F83E3
+FFFFAE82366C
+F89C86B2A961
+F83466888612
+ED3A7EFBFF56
+E96246531342
+E1DD284379D4
+DFED39FFBB76
+DB5181C92CBE
+CFC738403AB0
+BCFE01BCFE01
+BA28CFD15EE8
B0699AD03D17
-B18CDCDE52B7
-3864FCBA5937
-85A438F72A8A
-C342F825B01B
-C6A76CB2F3B5
-323334353637
-43C7600DEE6B
-D01AFEEB890A
-26396F2042E7
-F3F0172066B2
-BB320A757099
-00F0BD116D70
-25094DF2C1BD
-E41E6199318F
-F00DFEEDD0D0
-6D9B485A4845
-71171A82D951
-62711F1A83E9
-1711B1A82E96
-F3864FCCA693
-7B7E752B6A2D
-2012053082AD
-9AEDF9931EC1
-B9C874AE63D0
-83BAB5ACAD62
-A541538F1416
-4A2B29111213
-D31463A7AB6D
-AD5645062534
-B069D0D03D17
-30FFB6B056F5
-D7744A1A0C44
-D1991E71E2C5
-1795902DBAF9
-4243414F5250
-C554EF6A6015
-A5524645CD91
-200306202033
-A00003000084
-CEE3632EEFF5
-F0F0172066B2
-B021669B44BB
-3F1A87298691
+AABBCC660429
+A4EF6C3BB692
A2B2C9D187FB
-4B511F4D28DD
-E3AD9E9BA5D4
-B3630C9F11C8
-F83466888612
-857464D3AAD1
-A2A3CCA2A3CC
-35D850D10A24
-B2F170172066
-0D8CA561BDF3
-05F89678CFCF
-850984712F1A
-21EDF95E7433
-172066B2F2F0
-6B2F1B017206
-363119000001
-23D4CDFF8DA3
-EF4C5A7AC6FC
-123456ABCDEF
+9B1DD7C030A1
+9AEDF9931EC1
8F9B229047AC
-E96246531342
+872B71F9D15A
+833FBD3CFE51
5D293AFC8D7E
-AABBCC660429
-63FCA9492F38
-354A787087F1
+5554AAA96321
+474249437569
+435330666666
+1A2B3C4D5E6F
+123456ABCDEF
+83BAB5ACAD62
+64E2283FCF5E
+64A2EE93B12B
+46868F6D5677
40E5EA1EFC00
-675A32413770
-12FD3A94DF0E
-C4F271F5F0B3
-4A306E62E9B6
-4CFF128FA3EF
-0000085F0000
-0F385FFB6529
-FA38F70215AD
-904735F00F9E
-B66AC040203A
-BCFE01BCFE01
-2FCA8492F386
-237A4D0D9119
-E6849FCC324B
-0ED7846C2BC9
-1FB235AC1388
-EA1B88DF0A76
-C9739233861F
-89EAC97F8C2A
-D964406E67B4
-563A22C01FC8
-DB5181C92CBE
-1E352F9E19E5
-6291B3860FC8
-A9A4045DCE77
-434456495243
-B5F454568271
+37D4DCA92451
+2012053082AD
+2011092119F1
+200306202033
+1795902DBAF9
+17505586EF02
+022FE48B3072
+013940233313
+9EBC3EB37130
+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
491CDC863104
-4D8B8B95FDEE
-AFBECD121004
-4D48414C5648
-E1DD284379D4
+A2F63A485632
+98631ED2B229
+19F1FFE02563
+563A22C01FC8
+43CA22C13091
+25094DF2C1BD
AFBECD120454
-CFC738403AB0
-0AF7DB99AEE4
+842146108088
+EA1B88DF0A76
+D1991E71E2C5
+05F89678CFCF
+D31463A7AB6D
+C38197C36420
772219470B38
-EF61A3D48E2A
-4A4C474F524D
-0172066B2F03
-3D5D9996359A
-66A163BA82B4
-2011092119F1
-BB2C0007D022
-1494E81663D7
-590BD659CDD2
-A6C028A12FBB
-BCF5A6B5E13F
-A2F63A485632
-39CF885474DD
-D2ECE8B9395E
-17505586EF02
-70172066B2F0
-B385EFA64290
-B7C344A36D88
-010000000000
-2F130172066B
-DFED39FFBB76
-3F7A5C2DBD81
-DFE73BE48AC6
-FB0B20DF1F34
-913385FFB752
-2066B2F27017
-91FF18E63887
-0734BFB93DAB
-97F5DA640B18
-B42C4DFD7A90
-C121FF19F681
-BE7C4F6C7A9A
-FE04ECFE5577
-18F34C92A56E
-0BB31DC123E5
+1C1532A6F1BC
+FA38F70215AD
+E907470D31CC
+160F4B7AB806
+1D28C58BBE8A
+B3830B95CA34
+6A0E215D1EEB
+E41E6199318F
+C4F271F5F0B3
+1E352F9E19E5
0E0E8C6D8EB6
-1CFA22DBDFC3
-0F1A81C95071
-AA4D051954AC
-9F9D8EEDDCCE
-863FCB959373
-98631ED2B229
-A23456789123
-833FBD3CFE51
-AB28A44AD5F5
-74A386AD0A6D
-4C60F4B15BA8
-022FE48B3072
-97271231A83F
-385EFA542907
-066B2F230172
-BA729428E808
-BDF837787A71
-A05DBD98E0FC
-395244733978
-9B1DD7C030A1
-2C9F3D45BA13
-1DB710648A65
+C342F825B01B
+CB911A1A1929
E65B66089AFC
-A85198481331
-5A12F83326E7
-A7D71AC06DC2
-64E2283FCF5E
-FFFFAE82366C
-10F3BEBC01DF
-00ADA2CD516D
-1D28C58BBE8A
-6936C035AE1B
-AC45AD2D620D
-64A2EE93B12B
-A9F95891F0A4
-E45230E7A9E8
-A7FB4824ACBF
-223C3427108A
-58AC17BF3629
-535F47D35E39
-10F2BBAA4D1C
-A0004A000036
-3F3865FCCB69
-0B0172066B2F
-4098653289D3
-BA28CFD15EE8
-A22647F422AE
-99858A49C119
-29173860FC76
-1A80B93F7107
-1A2B3C4D5E6F
+B81846F06EDF
+37FC71221B46
+880C09CFA23C
+6476FA0746E7
+419A13811554
2C60E904539C
+4ECCA6236400
+10F2BBAA4D1C
+4857DD68ECD9
+C6A76CB2F3B5
+E3AD9E9BA5D4
6C9EC046C1A4
-FC9839273862
-1C1532A6F1BC
-09800FF94AAF
-FFFFD06F83E3
-0B83797A9C64
-13B91C226E56
-A4EF6C3BB692
-000000270000
-A00002000021
-872B71F9D15A
+B021669B44BB
+B18CDCDE52B7
+A22647F422AE
+B268F7C9CA63
A37A30004AC9
-B1A862985913
+B3630C9F11C8
A4CDFF3B1848
-2E641D99AD5B
-827ED62B31A7
-CD212889C3ED
-B1A80C94F710
-CB911A1A1929
+B42C4DFD7A90
+A541538F1416
+B5F454568271
+A6C028A12FBB
+B6323F550F54
+A7D71AC06DC2
+B7C344A36D88
A844F4F52385
-C0BEEFEC850B
-5C8FF9990DA2
-160F4B7AB806
-B8937130B6BA
-66B2F1F01720
-82D58AA49CCB
-A9B43414F585
-C38197C36420
-0172066B2F33
-434143445649
-34B16CD59FF8
-5A7A52D5E20D
-6471A5EF2D1A
-F57F410E18FF
-3B0172066B2F
-E907470D31CC
B8457ACC5F5D
-67CC03B7D577
-A8844B0BCA06
-435330666666
-B47058139187
-46868F6D5677
-C27D999912EA
-37FC71221B46
-F97371271A84
+A9A4045DCE77
+B9B8B7B6B5B3
+AA4D051954AC
+BA729428E808
+AB28A44AD5F5
+BB320A757099
+AC45AD2D620D
+BCF5A6B5E13F
+AD5645062534
+BDF837787A71
AE43F36C1A9A
+BE7C4F6C7A9A
5EC7938F140A
-AA734D2F40E0
-A5A4A3A2A1A0
-70172066B2F3
+82D58AA49CCB
+323334353637
+CEE3632EEFF5
+827ED62B31A7
03EA4053C6ED
+C0BEEFEC850B
+F57F410E18FF
+0AF7DB99AEE4
+A7FB4824ACBF
+207FFED492FD
+1CFA22DBDFC3
+30FFB6B056F5
+39CF885474DD
+00F0BD116D70
+4CFF128FA3EF
+10F3BEBC01DF
+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
+38A88AEC1C43
+CBD2568BC7C6
+7BCB4774EC8F
+22ECE9316461
+AE4B497A2527
+EEC0626B01A1
+2C71E22A32FE
+91142568B22F
+7D56759A974A
+D3B1C7EA5C53
+41C82D231497
+0B8B21C692C2
+604AC8D87C7E
+8E7B29460F12
+BB3D7B11D224
+B210CFA436D2
+B8B1CFA646A8
+A9F95891F0A4
+4A4C474F524D
+444156494442
+434143445649
+434456495243
+A00002000021
+EF61A3D48E2A
+A23456789123
+010000000000
+363119000001
+A00003000084
+675A32413770
+395244733978
+A0004A000036
+2C9F3D45BA13
+4243414F5250
+DFE73BE48AC6
+B069D0D03D17
+000131B93F28
+A506370E7C0F
+26396F2042E7
+70758FDD31E0
+9F9D8EEDDCCE
06FF5F03AA1A
-5554AAA96321
-0120BF672A64
-87291F3861FC
-9EBC3EB37130
+4098653289D3
+904735F00F9E
B4C36C79DA8D
-43CA22C13091
-6D0B6A2A0003
-FB6C88B7E279
-013940233313
-7DD399D4E897
-ED3A7EFBFF56
68F9A1F0B424
-6476FA0746E7
-1A8619858137
-1131A81D9507
+5A85536395B3
+7DD399D4E897
+EF4C5A7AC6FC
+B47058139187
8268046CD154
-4857DD68ECD9
+67CC03B7D577
+A5524645CD91
+D964406E67B4
+99858A49C119
+7B7E752B6A2D
+C27D999912EA
+66A163BA82B4
+4C60F4B15BA8
+35D850D10A24
+4B511F4D28DD
+E45230E7A9E8
+535F47D35E39
+FB6C88B7E279
+223C3427108A
+23D4CDFF8DA3
+E6849FCC324B
+12FD3A94DF0E
+0B83797A9C64
+39AD2963D3D1
+34B16CD59FF8
+BB2C0007D022
+0734BFB93DAB
+85A438F72A8A
+58AC17BF3629
B62307B62307
-C6C866AA421E
-F66224EE1E89
-4ECCA6236400
-72066B2F2B01
+A2A3CCA2A3CC
+000000270000
+0F385FFB6529
+29173860FC76
+2FCA8492F386
+385EFA542907
+3864FCBA5937
+3F3865FCCB69
+6291B3860FC8
+63FCA9492F38
+863FCB959373
+87291F3861FC
+913385FFB752
+B385EFA64290
+C9739233861F
+F3864FCCA693
+FC9839273862
34D3C568B348
-000131B93F28
-419A13811554
-B6323F550F54
-F89C86B2A961
-B268F7C9CA63
-B8B1CFA646A8
-4D57414C5648
-6A0E215D1EEB
-70758FDD31E0
-37D4DCA92451
-444156494442
-B210CFA436D2
-207FFED492FD
+91FF18E63887
+4D8B8B95FDEE
+354A787087F1
+4A306E62E9B6
+B9C874AE63D0
+F00DFEEDD0D0
+0BB31DC123E5
7578BF2C66A9
-50983712B1A8
-5A85536395B3
-B81846F06EDF
-842146108088
-19F1FFE02563
-D3B595E9DD63
-B3830B95CA34
-A506370E7C0F
-880C09CFA23C
-43454952534E
-39AD2963D3D1
-B9B8B7B6B5B3
+CD212889C3ED
+6936C035AE1B
+C6C866AA421E
+590BD659CDD2
+AA734D2F40E0
+09800FF94AAF
+5A12F83326E7
+C554EF6A6015
+0D8CA561BDF3
+B8937130B6BA
+D7744A1A0C44
82908B57EF4F
-
-C67BEB41FFBF
-2AFFD6F88B97
-E77952748484
-988ACDECDFB0
-605F5E5D5C5B
-42EF7BF572AB
-4087C6A75A96
-AADE86B1F9C1
-5EA088C824C9
-120D00FFFFFF
+FE04ECFE5577
+4D57414C5648
+4D48414C5648
+6D9B485A4845
+5A7A52D5E20D
+C1E51C63B8F5
+1DB710648A65
+18F34C92A56E
+4A832584637D
CA679D6291B0
+30D9690FC5BC
+5296C26109D4
+E77952748484
+91C2376005A1
+30B7680B2BC9
E2A9E88BFE16
-0A4600FF00FF
43B04995D234
-0602721E8F06
+AADE86B1F9C1
+5EA088C824C9
+C67BEB41FFBF
+B84D52971107
+52B0D3F6116E
+CA3A24669D45
+4087C6A75A96
+403F09848B87
+D73438698EEA
5F31F6FCD3A0
-4AE23A562A80
A0974382C4C5
-91C2376005A1
-FEE2A3FBC5B6
-2602FFFFFFFF
-CA3A24669D45
-A9F3F289B70C
-B84D52971107
-274E6101FC5E
-00DD300F4F10
-F7BA51A9434E
-4A832584637D
-B16B2E573235
A82045A10949
-FC0B50AF8700
-403F09848B87
+2602FFFFFFFF
+0A4600FF00FF
DFF293979FA7
-4118D7EF0902
-30B7680B2BC9
-52B0D3F6116E
-5296C26109D4
-DB6819558A25
4D6F62692E45
+4118D7EF0902
0406080A0C0E
+988ACDECDFB0
+120D00FFFFFF
+4AE23A562A80
+2AFFD6F88B97
+A9F3F289B70C
+DB6819558A25
6130DFA578A0
-30D9690FC5BC
-D73438698EEA
+B16B2E573235
+42EF7BF572AB
+274E6101FC5E
+00DD300F4F10
+FEE2A3FBC5B6
005078565703
-
-7C87013A648A
-9E7168064993
-45FEE09C1D06
-734EBE504CE8
-E592ED478E59
-C229CE5123D5
-240F0BB84681
-D8BA1AA9ABA0
-865B6472B1C0
-974A36E2B1BA
-57D83754711D
-C9CD8D7C65E5
-C197AE6D6990
-AABAFFCC7612
-C0AD1B72921A
-AFAAFCC40DEC
+0602721E8F06
+FC0B50AF8700
+F7BA51A9434E
E902395C1744
-DAC7E0CBA8FD
-755D49191A78
-68D3263A8CD6
-2F8A867B06B4
+4051A85E7F2D
7357EBD483CC
-ABCC1276FCB0
-26BF1A68B00F
-704A81DDACED
+D8BA1AA9ABA0
+76939DDD9E97
+3BF391815A8D
+7C87013A648A
E8794FB14C63
+9F97C182585B
EC070A52E539
-037F64F470AD
-76939DDD9E97
-4D80A10649DF
-89E00BC444EF
-26107E7006A0
+C229CE5123D5
+E495D6E69D9C
+26BF1A68B00F
B1D3BC5A7CCA
-ECC58C5D34CA
-9F97C182585B
-B2FE3B2875A6
+734EBE504CE8
+974A36E2B1BA
+C197AE6D6990
+4D80A10649DF
+037F64F470AD
+C9CD8D7C65E5
B70B1957FE71
-E495D6E69D9C
-0860318A3A89
-4051A85E7F2D
-17D071403C20
-3BF391815A8D
-1927A45A83D3
CE7712C5071D
+C0AD1B72921A
+45FEE09C1D06
+E592ED478E59
F3C1F1DB1D83
+704A81DDACED
+89E00BC444EF
+AFAAFCC40DEC
+ECC58C5D34CA
+57D83754711D
D0DDDF2933EC
-
-# Iron Logic
-A3A26EF4C6B0
-2C3FEAAE99FC
-E85B73382E1F
-F4ED24C2B998
-CB574C6D3B19
-E092081D724B
-B38D82CF7B6C
-8228D2AA6EFA
-2C7E983588A3
-CF7A7B77E232
-32A7F5EAF87D
-7453A687B5F0
-01A0C008A5B9
-DEC0CEB0CE24
-413BED2AE45B
-D6261A9A4B3F
-CB9D507CE56D
-
-# Tehran ezpay
-38A88AEC1C43
-CBD2568BC7C6
-7BCB4774EC8F
-22ECE9316461
-AE4B497A2527
-EEC0626B01A1
-2C71E22A32FE
-91142568B22F
-7D56759A974A
-D3B1C7EA5C53
-41C82D231497
-0B8B21C692C2
-604AC8D87C7E
-8E7B29460F12
-BB3D7B11D224
-
-# More keys from the PM3 repo
-DC018FC1D126
-C428C4550A75
-0C4233587119
-5B0C7EC83645
-540D5E6355CC
-35C649004000
-CFE63749080A
-6307417353C1
-411053C05273
-749934CC8ED3
-1C68315674AC
-35D152154017
-D1417E431949
-26B85DCA4321
-D973D917A4C7
-3A471B2192BF
+240F0BB84681
+9E7168064993
+2F8A867B06B4
+755D49191A78
+DAC7E0CBA8FD
+68D3263A8CD6
+865B6472B1C0
+0860318A3A89
+1927A45A83D3
+B2FE3B2875A6
+ABCC1276FCB0
+AABAFFCC7612
+26107E7006A0
+17D071403C20
+534F4C415249
534F4C303232
-730956C72BC2
-C9449301AF93
-F678905568C3
-4578ABFEDC12
-075D1A4DD323
-43E69C28F08C
-0F35D5660653
-F7FA2F629BB1
-5145C34DBA19
-124578ABFEDC
-E2F14D0A0E28
-C8AACD7CF3D1
-9C616585E26D
-4927C97F1D57
+FF9A84635BD2
6F30126EE7E4
-155332417E00
-5353B3AECB53
-361A62F35BC9
-00460740D722
-A9B018868CC1
-2E71D3BD262A
-4F75030AD12B
-42454C4C4147
-D75971531042
-25352912CD8D
-51E97FFF51E9
-1170553E4304
-D1F71E05AD9D
-541C417E57C0
-AE76242931F1
6039ABB101BB
-0E620691B9FE
-4BF6DE347FB6
-10510049D725
-1F0128447C00
+F1A1239A4487
+B882FD4A9F78
+CD7FFFF81C4A
+AA0857C641A3
+C8AACD7CF3D1
+9FFDA233B496
+26B85DCA4321
+D4B2D140CB2D
+A7395CCB42A0
+541C417E57C0
D14E615E0545
-94B6A644DFF6
-81B20C274C3F
-66695A45C9FA
-130662240200
-DD0DE3BA08A6
-05F5EC05133C
-4FA9EB49F75E
-C1E6F8AFC9EC
-28D70900734C
-32CA52054416
+69D92108C8B5
703265497350
-3D923EB73534
+D75971531042
+10510049D725
+35C649004000
+5B0C7EC83645
+05F5EC05133C
+521B517352C7
+94B6A644DFF6
+2CA4A4D68B8E
+A7765C952DDF
+E2F14D0A0E28
+DC018FC1D126
+4927C97F1D57
+046154274C11
+155332417E00
+6B13935CD550
C151D998C669
-534F4C415249
-70C714869DC7
-A7395CCB42A0
-89AA9D743812
-A160FCD5EC4C
-9DCDB136110C
-9951A273DEE7
-AA0857C641A3
-F1A1239A4487
-B882FD4A9F78
+D973D917A4C7
+130662240200
9386E2A48280
+52750A0E592A
+075D1A4DD323
+32CA52054416
460661C93045
-EF1232AB18A0
-6285A1C8EB5C
-C41514DEFC07
-ABFEDC124578
-046154274C11
5429D67E1F57
-# SMARTair Key B
-E7316853E731
-CD7FFFF81C4A
-F253C30568C4
-E7D6064C5860
-506DB955F161
-8223205047B6
-070D486BC555
-D4B2D140CB2D
0C734F230E13
-2E4169A5C79D
-69D92108C8B5
-A297CEB7D34B
-FF9A84635BD2
+1F0128447C00
+411053C05273
+42454C4C4147
+C428C4550A75
+730956C72BC2
+28D70900734C
+4F75030AD12B
+6307417353C1
+D65561530174
+D1F71E05AD9D
+F7FA2F629BB1
+0E620691B9FE
+43E69C28F08C
735175696421
-5D0762D13401
-D61707FFDFB1
-2803BCB0C7E1
-C52876869800
424C0FFBF657
-AF9E38D36582
-B32464412EE3
+51E97FFF51E9
+E7316853E731
+00460740D722
+35D152154017
+5D0762D13401
+0F35D5660653
+1170553E4304
+0C4233587119
+F678905568C3
50240A68D1D8
-6B13935CD550
-83F3CB98C258
-521B517352C7
-4BB747E48C2A
+2E71D3BD262A
+540D5E6355CC
+D1417E431949
+4BF6DE347FB6
+3A471B2192BF
+A297CEB7D34B
+AE76242931F1
+124578ABFEDC
+ABFEDC124578
+4578ABFEDC12
5E594208EF02
-FFFFFF545846
-D65561530174
-52750A0E592A
-112233445566
-2DADE48942C5
-A7765C952DDF
-2CA4A4D68B8E
-72B458D60363
-F088A85E71D7
-FF94F86B09A6
-B27CCAB30DBD
-89ECA97F8C2A
-E00000000000
-9FFDA233B496
+AF9E38D36582
10DF4D1859C8
B5244E79B0C8
F5C1C4C5DE34
-
-# Rotterdam University of applied sciences campus card
BB7923232725
A95BD5BB4FC5
B099335628DF
@@ -1297,27 +1309,323 @@ B5ADEFCA46C4
BF3FE47637EC
B290401B0CAD
AD11006B0601
-
-# Keys of Armenian underground ticket
-A0A1A2A8A4A5
+E4410EF8ED2D
+6A68A7D83E11
0D6057E8133B
D3F3B958B8A3
-6A68A7D83E11
-7C469FE86855
-E4410EF8ED2D
3E120568A35C
-CE99FBC8BD26
2196FAD8115B
-
-# PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
-009FB42D98ED
-002E626E2820
-
-# Volgograd (Russia) Volna transport cards keys
-2B787A063D5D
-D37C8F1793F7
-
-# Bandai Namco Passport [fka Banapassport] / Sega Aime Card
+7C469FE86855
+CE99FBC8BD26
+D66D91829013
+75B691829013
+83E391829013
+A23C91829013
+E46A91829013
+D9E091829013
+FED791829013
+155F91829013
+06CC91829013
+8DDC91829013
+54AF91829013
+29A791829013
+668091829013
+00008627C10A
+310D51E539CA
+2CCDA1358323
+03E0094CEDFE
+562E6EF73DB6
+F53E9F4114A9
+AD38C17DE7D2
+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
+6686FADE5566
+C22E04247D9A
+9B7C25052FC3
+494446555455
+427553754D47
+9A677289564D
+186C59E6AFC9
+DDDAA35A9749
+9D0D0A829F49
+97D77FAE77D3
+5AF445D2B87A
+16901CB400BC
+F0FE56621A42
+8C187E78EE9C
+FE2A42E85CA8
+6A6C80423226
+F4CE4AF888AE
+307448829EBC
+C2A0105EB028
+5C83859F2224
+66B504430416
+70D1CF2C6843
+C4B3BD0ED5F1
+C4D3911AD1B3
+CAD7D4A6A996
+DA898ACBB854
+FEA1295774F9
+807119F81418
+22C8BCD10AAA
+0AAABA420191
+E51B4C22C8BC
+DBF9F79AB7A2
+34EDE51B4C22
+C8BCD10AAABA
+BCD10AAABA42
+2F87F74090D1
+E53EAEFE478F
+CE2797E73070
+328A034B93DB
+81E1529AE22B
+FC55C50E579F
+1A72E2337BC3
+5DB52676BE07
+F64FBF085098
+8FE758A8F039
+BB1484CC155D
+41990A529AE2
+CD2E9EE62F77
+69C1327AC20B
+3C9C0D559DE5
+67BF3880C811
+48A01159A1E9
+2B83FB448CD4
+F24BBB044C94
+94F46DB5FD46
+C31C8CD41D65
+BB1684CC155D
+CA2393DB246C
+1D75E52E76BE
+81D9529AE223
+0159C9125AA2
+52AA1B6BB3FB
+97EF60A8F031
+6FC73888D011
+3A92FA438BD3
+74CC3D85CD0E
+025ACA1B63A3
+AF0878C81151
+9BFB6CB4FC45
+F750C0095199
+075FCF1860A8
+2686EE3F87C7
+277FEF3880C0
+82DA4B93DB1C
+9CF46DB5FD46
+93EB64ACF43D
+A3A26EF4C6B0
+2C3FEAAE99FC
+E85B73382E1F
+F4ED24C2B998
+CB574C6D3B19
+E092081D724B
+B38D82CF7B6C
+8228D2AA6EFA
+2C7E983588A3
+CF7A7B77E232
+32A7F5EAF87D
+7453A687B5F0
+01A0C008A5B9
+DEC0CEB0CE24
+413BED2AE45B
+D6261A9A4B3F
+CB9D507CE56D
+A0A1A2A8A4A5
+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
+E60F8387F0B9
+FFD46FF6C5EE
+4F9661ED2E70
+576A798C9904
+1C5179C4A8A1
+16CA203B811B
+11AC8C8F3AF2
+6E0DD4136B0A
+141940E9B71B
+3B1D3AAC866E
+95E9EE4CCF8F
+FEA6B332F04A
+BE0EC5155806
+0500D6BFCC4F
+FC5AC7678BE3
+F09BB8DD142D
+B4B3FFEDBE0A
+540E0D2D1D08
+7579B671051A
+4F4553746B41
+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
+A00027000099
+A00016000028
+A00003000028
+A0000F000345
+A00001000030
+A00002000086
+A00002000036
+A00002000088
+A00000000058
+A00000000096
+A00000000008
+A00000043D79
+A00000000064
+A00025000030
+A00003000057
+012279BAD3E5
+AAAAAAFFFFFF
+FFFFFFAAAAAA
+3111A3A303EB
+D144BD193063
+3515AE068CAD
+6A0D531DA1A7
+4BB29463DC29
+8627C10A7014
+453857395635
+353038383134
+50D4C54FCDF5
6090D00632F5
019761AA8082
574343467632
@@ -1351,8 +1659,306 @@ E69DD9015A43
C8382A233993
7B304F2A12A6
FC9418BF788B
-
-# H World Hotel Chain Room Keys
-543071543071
-5F01015F0101
-200510241234
+168168168168
+198407157610
+4E4F584D2101
+4E4F584D2105
+686B35333376
+861861861861
+B071A76BA2E9
+B3A181BCA5F2
+3225942F7717
+80D00703C5FB
+6DD510E080B1
+87529F30FC58
+B75C4FA614AE
+42DC568C64F4
+43012BD9EB87
+3119A70628EB
+23C9FDD9A366
+7B4DFC6D6525
+1330824CD356
+30AAD6A711EF
+7B3B589A5525
+20C166C00ADB
+7D0A1C277C05
+2058580A941F
+8C29F8320617
+C40964215509
+D44CFC178460
+5697519A8F02
+7B56B2B38725
+8EA8EC3F2320
+011C6CF459E8
+A18D9F4E75AF
+316B8FAA12EF
+3122AE5341EB
+F72CD208FDF9
+035C70558D7B
+12AB4C37BB8B
+9966588CB9A0
+42FC522DE987
+2158E314C3DF
+30FB20D0EFEF
+66A3B064CC4B
+D18296CD9E6E
+D20289CD9E6E
+209A2B910545
+C49DAE1C6049
+8AC04C1A4A25
+6E029927600D
+3E173F64C01C
+C670A9AD6066
+487339FA02E0
+DBD5CA4EE467
+A0B1F234006C
+180DE12B700E
+1352C68F7A56
+318BD98C1CEF
+D23C1CB1216E
+A1D92F808CAF
+1153C319B4F8
+110C819BBEF8
+1332117E8756
+500AE915F50A
+5032E362B484
+8B63AB712753
+06106E187106
+2E45C23DC541
+D9FF8BEE7550
+42F7A186BF87
+D213B093B79A
+216024C49EDF
+D201DBB6AB6E
+9F4AD875BB30
+3352DB1E8777
+09074A146605
+151F3E85EC46
+0000FFFFFFFF
+4663ACD2FFFF
+EDC317193709
+75FAB77E2E5B
+32F093536677
+3351916B5A77
+336E34CC2177
+A1670589B2AF
+2E0F00700000
+CA80E51FA52B
+A71E80EA35E1
+05597810D63D
+EA0CA627FD06
+80BB8436024C
+5044068C5183
+7E5E05866ED6
+661ABF99AFAD
+1064BA5D6DF8
+CE0F4F15E909
+D60DE9436219
+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
+A7AE4A5A33DC
+6B857B568C10
+E2CE9A674CBE
+A4896B2EBA4E
+0724DF9AEDE8
+0E368FB140C1
+874EB25C8721
+5C313F4539CD
+C5498606E0A8
+79C69F7EC7C0
+DA7DD0044DA2
+1B8189BD966B
+765584147990
+4B7C7C315E6E
+46CAAD12C524
+53BD03DEA5C9
+D2D72CB60F59
+14D258786538
+E2E89A375B36
+B3FA87DB0C45
+44D3B1561B34
+2817C6E02F97
+A513FF1232E9
+BD454BD52792
+391771654DC8
+5162797F8E1C
+F700BD8E042D
+3973ABFD8B66
+CE8BFF3728EE
+09938D05DA78
+EACDA4DBE420
+EC2B9FD483CA
+04256CFE0425
+C18063858BB9
+13254608D0AB
+24A2971BC0B2
+14264709D1AC
+25A3981CC1B3
+1527480AD2AD
+26A4991DC2B4
+1628490BD3AE
+27A59A1EC3B5
+17294A0CD4AF
+28A69B1FC4B6
+182A4B0DD5B0
+29A79C20C5B7
+192B4C0ED6B1
+2AA89D21C6B8
+1A2C4D0FD7B2
+2BA99E22C7B9
+1B2D4E10D8B3
+2CAA9F23C8BA
+1C2E4F11D9B4
+2DABA024C9BB
+1D2F5012DAB5
+2EACA125CABC
+1E305113DBB6
+2FADA226CBBD
+1F315214DCB7
+30AEA327CCBE
+20325315DDB8
+31AFA428CDBF
+21335416DEB9
+32B0A529CEC0
+22345517DFBA
+33B1A62ACFC1
+17B50E38F1B0
+24E311F594CE
+3794FBFB1A54
+43B229069F6A
+4531952F765F
+4943F2F35E0A
+4985E681EF88
+4F56C88E0337
+710070E92C79
+8A036C5C35D4
+A027BD830A06
+D33673C19243
+D89A506542F2
+E5813CD228F1
+FAB943906E9C
+AA034F342A55
+456776908C48
+FAE9B14365A9
+C567DD4A6004
+C567DD4A6005
+C567DD4A6006
+C567DD4A6007
+C567DD4A6008
+C567DD4A6009
+C567DD4A600A
+C567DD4A600D
+C567DD4A600E
+C567DD4A600F
+5EF014EC5D7F
+5086052022AC
+BD6AF9754C18
+5D67D4732A7D
+17FE45604A04
+17FE45604A05
+17FE45604A06
+17FE45604A07
+17FE45604A08
+17FE45604A09
+17FE45604A0A
+17FE45604A0D
+17FE45604A0E
+17FE45604A0F
+28220F14BEF0
+300724070486
+60FCB3C42ABF
+722F24F0722F
+535453535453
+F618B3D7855A
+F1AFA4DA949F
+67362DACE527
+633A010FA3C3
+F93C98655B9C
+67EC0A47B0FB
+54A028818AC7
+B2E87E53C5A0
+3E93CF0644B6
+79E12280E219
+2204B9FBF033
+4537FD238C8E
+D1B44A9DF05F
+CFA526835A1F
+21CC007AD81C
+C097D0A85446
+D2268262710F
+730BB7B8B3DE
+9FE7C5BE7DFF
+61AE2D920C79
+78FCD4470C50
+B638CAF7357B
+0DC1DD7C8EA2
+4C6A6866B934
+03DE2CEB2EA1
+93E0118B21ED
+8FBCED387BF4
+F57CA95C6EDD
+EF24FE3B4CF7
+8B44D303D62F
+B1EA40B2CAA6
+3ABF8431003B
+F1DF0CA8948B
+7747B4912984
+09D556D57A4B
+3ED158C6934E
+839DEDBFEC0D
+C694A9ED2F9E
+81D55F4551B9
+6E9A040C3C91
+5B72C63FB416
+A3CDCED46371
+87A61433D026
+9CD3A81F11AB
+7070D331360C
+836C790F6E2C
+7FE057787C4F
+FF59C6D13F88
+536F6669614D
+AAAFBA10FC37
+C61F2C28DADF
+23AACA30CBF2
+7E2BC58168EB
+291A65CBEA7B
+344A359BBAD9
+476572726974
+4D696368656C
+4F3748E6C826
+69D40AF8B353
+72DEA10F21DF
+74845AA8E3F1
+8C3C43EDCC55
+ACD30DFFB434
+D1A27C8EC5DF
+F14D329CBDBE
\ No newline at end of file
From aaedf2ffe5d0c17ac8c02ba4f81bd629b29d4593 Mon Sep 17 00:00:00 2001
From: noproto
Date: Mon, 4 Nov 2024 08:54:42 -0500
Subject: [PATCH 02/18] Add Picopass utility
---
.gitmodules | 3 +++
applications/ReadMe.md | 1 +
applications/system/application.fam | 1 +
applications/system/picopass | 1 +
4 files changed, 6 insertions(+)
create mode 160000 applications/system/picopass
diff --git a/.gitmodules b/.gitmodules
index 0297da14d..5d10b23b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,6 @@
[submodule "documentation/doxygen/doxygen-awesome-css"]
path = documentation/doxygen/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "applications/system/picopass"]
+ path = applications/system/picopass
+ url = https://gitlab.com/bettse/picopass.git
diff --git a/applications/ReadMe.md b/applications/ReadMe.md
index dd664f37b..b8cee72ac 100644
--- a/applications/ReadMe.md
+++ b/applications/ReadMe.md
@@ -80,3 +80,4 @@ Utility apps not visible in other menus, plus few external apps pre-packaged wit
- `storage_move_to_sd` - Data migration tool for internal storage
- `updater` - Update service & application
- `mfkey` - MIFARE Classic key recovery tool
+- `picopass` - Picopass tool
diff --git a/applications/system/application.fam b/applications/system/application.fam
index 647800e59..79796fd56 100644
--- a/applications/system/application.fam
+++ b/applications/system/application.fam
@@ -6,6 +6,7 @@ App(
"updater_app",
"js_app",
"mfkey",
+ "picopass",
# "archive",
],
)
diff --git a/applications/system/picopass b/applications/system/picopass
new file mode 160000
index 000000000..00f8a221f
--- /dev/null
+++ b/applications/system/picopass
@@ -0,0 +1 @@
+Subproject commit 00f8a221fa020ab0fcc22d77e43ae1ab6ac51c6b
From c9ea421a3c7a707b97da2af847a72c75e0312616 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Fri, 8 Nov 2024 07:22:34 +0000
Subject: [PATCH 03/18] NFC: New MFC keys, 100 from RRG pm3, 17 from MCT
--nobuild
---
CHANGELOG.md | 1 +
.../resources/nfc/assets/mf_classic_dict.nfc | 177 ++++++++++++++++++
2 files changed, 178 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa0af23ad..0047dfb45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -150,6 +150,7 @@
- Decoding of URL-encoded URI characters (#267 by @jaylikesbunda)
- SmartPoster record support (#275 by @Willy-JL)
- Enable parsing NTAG I2C Plus 1k and 2k chips too (#237 by @RocketGod-git)
+ - NFC: Updated MFC dict, +100 keys from RRG proxmark3, +17 keys from Mifare Classic Tool
- Added 6 new Mifare Classic keys from Bulgaria Hotel (#216 by @z3r0l1nk)
- UL: Add iq aparts hotel key (by @xMasterX)
- OFW/UL: Rename 'Detect Reader' to 'Extract MFC Keys' (by @bettse & @xMasterX)
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 c0b1a35e5..0e7b62b47 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -278,6 +278,7 @@ AFBECD121004
763958704B78
# Onity S1 A/B
8A19D40CF2B5
+3961EA82C46D
# 24-7
D21762B2DE3B
0E83A374B513
@@ -1955,6 +1956,15 @@ FC9418BF788B
4E4F584D2105
686B35333376
861861861861
+# Transport System Cracow / Polen
+B071A76BA2E9
+B3A181BCA5F2
+3225942F7717
+80D00703C5FB
+6DD510E080B1
+87529F30FC58
+B75C4FA614AE
+42DC568C64F4
# 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
@@ -2257,12 +2267,179 @@ BD6AF9754C18
722F24F0722F
# STS Hotel 2A
535453535453
+# Public transport in Sofia, Bulgaria (SKGT)
+# upgraded to DESFire since January 2024
+# SKGT common
+# Sector 15, key A
+F618B3D7855A
+# Sector 15, key B
+F1AFA4DA949F
+# SKGT multi-use ticket
+# Sector 0
+67362DACE527
+633A010FA3C3
+# Sector 1
+F93C98655B9C
+67EC0A47B0FB
+# Sector 2
+54A028818AC7
+B2E87E53C5A0
+# Sector 3
+3E93CF0644B6
+79E12280E219
+# Sector 4
+2204B9FBF033
+4537FD238C8E
+# Sector 5
+D1B44A9DF05F
+CFA526835A1F
+# Sector 6
+21CC007AD81C
+C097D0A85446
+# Sector 7
+D2268262710F
+730BB7B8B3DE
+# Sector 8
+9FE7C5BE7DFF
+61AE2D920C79
+# Sector 9
+78FCD4470C50
+B638CAF7357B
+# Sector 10
+0DC1DD7C8EA2
+4C6A6866B934
+# Sector 11
+03DE2CEB2EA1
+93E0118B21ED
+# Sector 12
+8FBCED387BF4
+F57CA95C6EDD
+# Sector 13
+EF24FE3B4CF7
+8B44D303D62F
+# Sector 14
+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
+# yellow
+7747B4912984
+# Sector 3, key A
+# blue
+09D556D57A4B
+# yellow
+3ED158C6934E
+# Sector 4-7, key A
+# blue
+839DEDBFEC0D
+# yellow
+C694A9ED2F9E
+# Sector 15 - see above
+# Sector 0, 16, key B (blue)
+81D55F4551B9
+# Sector 0, key B (yellow)
+6E9A040C3C91
+# Sector 1, key B
+# blue
+5B72C63FB416
+# yellow
+A3CDCED46371
+# Sector 2, key B
+# blue
+87A61433D026
+# yellow
+9CD3A81F11AB
+# Sector 3, key B
+# blue
+7070D331360C
+# yellow
+836C790F6E2C
+# Sector 4-7, key B
+# blue
+7FE057787C4F
+# yellow
+FF59C6D13F88
+# Sector 8-14, 17-39, key B
+536F6669614D
+# Sector 15 - see above
+# End of SKGT
+# Hanoi Bus Rapid Transit - 1/2/3 A
+AAAFBA10FC37
+C61F2C28DADF
+23AACA30CBF2
+# Keys dumped from student ID (AGH Cracow - Poland), may be diversified
+# Need to be verified
+833E4F32589E
+432D02DA59F3
+5C161CA2716F
+F60B5F9666B8
+98EAC5321D2F
+CC945E3FE5C4
+70783C436CF4
+2D186C7149A9
+5D60AC0939FC
+93A5CE63C873
+87174550E900
+45675B25A3DA
+F91750E629D5
+A3E662ABCDC8
+33D99E9FFA6A
+FF7AABA39C61
+A8248C049BEA
+C2AF731771C4
+9263B2E0DD80
+CE7FCCBBA5D8
+F8E385E5A2A0
+B27678B5C4AE
+D68D7EBB9551
+7AB63F082328
+# Payment cards used by Eurest on certain campuses
+7E2BC58168EB
+# Shower cards provided by Seijsener
+291A65CBEA7B
+344A359BBAD9
+476572726974
+4D696368656C
+4F3748E6C826
+69D40AF8B353
+72DEA10F21DF
+74845AA8E3F1
+8C3C43EDCC55
+ACD30DFFB434
+D1A27C8EC5DF
+F14D329CBDBE
+# Hotel cards from Austria
+AB287B3B4903
+7B0DEDA7E162
# +-----------------------------------------------------------------------------------------------------------------------------------+
# | https://github.com/ikarus23/MifareClassicTool/blob/master/Mifare%20Classic%20Tool/app/src/main/assets/key-files/extended-std.keys |
# +-----------------------------------------------------------------------------------------------------------------------------------+
# UK London Office
435DF6296EC4
2338B4913222
+# Acces card of students, and more in Occitanie, France
+E9A553102EA5
+F982E971CFED
+1F42AB9159EE
+BBFB836A48B8
+B5D170B2E8F5
+E76978A05F10
+0B1A995DD007
+650DB9CEDB6B
+13E54B4448B7
+3E3540C2C273
+A76152840117
+066CCC7666BC
+3C0B3AC3AFA3
+CCB541598D72
+1988B5D48EC3
+892EEF0D30FB
+0FE5CE5CC640
# +----------------------------------------------------------------------------------------------+
# | https://github.com/UberGuidoZ/Flipper/blob/main/NFC/mf_classic_dict/mf_classic_dict_user.nfc |
# +----------------------------------------------------------------------------------------------+
From 2da2cf2940bbe5f25488733b46a0194d5d765fb6 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Nov 2024 04:06:33 +0000
Subject: [PATCH 04/18] Settings: Add warnings for settings you shouldn't touch
---
.../settings/system/system_settings.c | 102 +++++++++++++++++-
1 file changed, 100 insertions(+), 2 deletions(-)
diff --git a/applications/settings/system/system_settings.c b/applications/settings/system/system_settings.c
index b853abd33..43163dc17 100644
--- a/applications/settings/system/system_settings.c
+++ b/applications/settings/system/system_settings.c
@@ -2,6 +2,21 @@
#include
#include
#include
+#include
+
+enum VarItemListIndex {
+ VarItemListIndexHandOrient,
+ VarItemListIndexUnits,
+ VarItemListIndexTimeFormat,
+ VarItemListIndexDateFormat,
+ VarItemListIndexLogLevel,
+ VarItemListIndexLogDevice,
+ VarItemListIndexLogBaudRate,
+ VarItemListIndexDebug,
+ VarItemListIndexHeapTrace,
+ VarItemListIndexSleepMethod,
+ VarItemListIndexFileNaming,
+};
const char* const log_level_text[] = {
"Default",
@@ -80,10 +95,11 @@ const char* const debug_text[] = {
};
static void debug_changed(VariableItem* item) {
+ SystemSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, debug_text[index]);
if(index) {
- furi_hal_rtc_set_flag(FuriHalRtcFlagDebug);
+ view_dispatcher_send_custom_event(app->view_dispatcher, VarItemListIndexDebug);
} else {
furi_hal_rtc_reset_flag(FuriHalRtcFlagDebug);
}
@@ -108,9 +124,13 @@ const uint32_t heap_trace_mode_value[] = {
};
static void heap_trace_mode_changed(VariableItem* item) {
+ SystemSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, heap_trace_mode_text[index]);
furi_hal_rtc_set_heap_track_mode(heap_trace_mode_value[index]);
+ if(index) {
+ view_dispatcher_send_custom_event(app->view_dispatcher, VarItemListIndexHeapTrace);
+ }
}
const char* const measurement_units_text[] = {
@@ -184,10 +204,11 @@ const char* const sleep_method[] = {
};
static void sleep_method_changed(VariableItem* item) {
+ SystemSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, sleep_method[index]);
if(index) {
- furi_hal_rtc_set_flag(FuriHalRtcFlagLegacySleep);
+ view_dispatcher_send_custom_event(app->view_dispatcher, VarItemListIndexSleepMethod);
} else {
furi_hal_rtc_reset_flag(FuriHalRtcFlagLegacySleep);
}
@@ -213,6 +234,81 @@ static uint32_t system_settings_exit(void* context) {
return VIEW_NONE;
}
+static bool system_settings_custom_event_callback(void* context, uint32_t event) {
+ furi_assert(context);
+ SystemSettings* app = context;
+
+ VariableItem* item = variable_item_list_get(app->var_item_list, event);
+ DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+ DialogMessage* msg = dialog_message_alloc();
+ dialog_message_set_buttons(msg, "No", NULL, "Yes");
+
+ switch(event) {
+ case VarItemListIndexDebug:
+ dialog_message_set_header(msg, "Enable Debug?", 64, 4, AlignCenter, AlignTop);
+ dialog_message_set_text(
+ msg,
+ "This consumes 400% more\n"
+ "battery life. Don't use unless\n"
+ "you know exactly what\n"
+ "you're doing.",
+ 64,
+ 36,
+ AlignCenter,
+ AlignCenter);
+ if(dialog_message_show(dialogs, msg) == DialogMessageButtonRight) {
+ furi_hal_rtc_set_flag(FuriHalRtcFlagDebug);
+ } else {
+ variable_item_set_current_value_text(item, debug_text[0]);
+ variable_item_set_current_value_index(item, 0);
+ }
+ break;
+ case VarItemListIndexSleepMethod:
+ dialog_message_set_header(msg, "Disable DeepSleep?", 64, 4, AlignCenter, AlignTop);
+ dialog_message_set_text(
+ msg,
+ "Disabling will consume 400%\n"
+ "more battery life. Only\n"
+ "disable if you have a\n"
+ "specific reason.",
+ 64,
+ 36,
+ AlignCenter,
+ AlignCenter);
+ if(dialog_message_show(dialogs, msg) == DialogMessageButtonRight) {
+ furi_hal_rtc_set_flag(FuriHalRtcFlagLegacySleep);
+ } else {
+ variable_item_set_current_value_text(item, sleep_method[0]);
+ variable_item_set_current_value_index(item, 0);
+ }
+ break;
+ case VarItemListIndexHeapTrace:
+ dialog_message_set_header(msg, "Enable Heap Trace?", 64, 4, AlignCenter, AlignTop);
+ dialog_message_set_text(
+ msg,
+ "Will use more RAM and might\n"
+ "cause Out Of Memory errors.\n"
+ "Don't enable without a\n"
+ "specific reason.",
+ 64,
+ 36,
+ AlignCenter,
+ AlignCenter);
+ if(dialog_message_show(dialogs, msg) != DialogMessageButtonRight) {
+ furi_hal_rtc_set_heap_track_mode(heap_trace_mode_value[0]);
+ variable_item_set_current_value_text(item, heap_trace_mode_text[0]);
+ variable_item_set_current_value_index(item, 0);
+ }
+ break;
+ default:
+ break;
+ }
+
+ dialog_message_free(msg);
+ furi_record_close(RECORD_DIALOGS);
+ return true;
+}
+
SystemSettings* system_settings_alloc(void) {
SystemSettings* app = malloc(sizeof(SystemSettings));
@@ -221,6 +317,8 @@ SystemSettings* system_settings_alloc(void) {
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+ view_dispatcher_set_custom_event_callback(
+ app->view_dispatcher, system_settings_custom_event_callback);
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
From 6f8cb3b6c4e1fcb2febd12d8a5192c409b854739 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Nov 2024 04:36:21 +0000
Subject: [PATCH 05/18] Improve clarity of some error messages
---
applications/main/subghz/subghz_i.c | 2 +-
applications/services/cli/cli.c | 2 +-
applications/services/loader/loader.c | 2 +-
applications/services/loader/loader_menu_storage.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/main/subghz/subghz_i.c b/applications/main/subghz/subghz_i.c
index 9b5e26bdf..d8cf5240a 100644
--- a/applications/main/subghz/subghz_i.c
+++ b/applications/main/subghz/subghz_i.c
@@ -51,7 +51,7 @@ void subghz_dialog_message_freq_error(SubGhz* subghz, SubGhzTx can_tx) {
default:
return;
case SubGhzTxBlockedRegionNotProvisioned:
- message_text = "Region is not\nprovisioned.\nUpdate firmware\nor bypass region.";
+ message_text = "Missing region file.\nReinstall firmware\nwith Web/App\nor bypass region.";
break;
case SubGhzTxBlockedRegion:
message_text = "Frequency outside\nof region range.\nMNTM > Protocols\n> Bypass Region";
diff --git a/applications/services/cli/cli.c b/applications/services/cli/cli.c
index e9c123081..9756d1eef 100644
--- a/applications/services/cli/cli.c
+++ b/applications/services/cli/cli.c
@@ -596,7 +596,7 @@ void cli_plugin_wrapper(const char* name, Cli* cli, FuriString* args, void* cont
handler(cli, args, context);
} else {
printf(
- "CLI plugin '%s' failed (code %" PRIu16 "), update firmware or check logs\r\n",
+ "CLI plugin '%s' failed (code %" PRIu16 "), reinstall firmware or check logs\r\n",
name,
error);
}
diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index 7efae76d1..bcaa9b250 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -107,7 +107,7 @@ static void loader_show_gui_error(
Storage* storage = furi_record_open(RECORD_STORAGE);
if(storage_sd_status(storage) == FSE_OK) {
header = "Update needed";
- text = "Update firmware\nto run this app";
+ text = "Reinstall firmware\nto run this app";
} else {
header = "SD card needed";
text = "Install SD card\nto run this app";
diff --git a/applications/services/loader/loader_menu_storage.c b/applications/services/loader/loader_menu_storage.c
index 8823ec208..755ee1243 100644
--- a/applications/services/loader/loader_menu_storage.c
+++ b/applications/services/loader/loader_menu_storage.c
@@ -46,10 +46,10 @@ int32_t loader_menu_storage_settings(void* context) {
dialog_ex_set_header(dialog_ex, "Update needed", 64, 0, AlignCenter, AlignTop);
dialog_ex_set_text(
dialog_ex,
- "Update firmware\n"
- "to run this app\n"
+ "Reinstall firmware\n"
+ "to run this app.\n"
"Can format SD\n"
- "here if needed",
+ "here if needed.",
3,
17,
AlignLeft,
From 2d559a15760f074cd1bb4f8491e683a39d2a57e7 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Nov 2024 04:42:30 +0000
Subject: [PATCH 06/18] Update changelog
---
CHANGELOG.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0047dfb45..5764a840b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,7 +103,9 @@
- Added typedocs for all extra JS modules in Momentum (by @Willy-JL)
- RPC: Added ASCII event support (#284 by @Willy-JL)
- FBT/SDK: New app flag UnloadAssetPacks to free RAM in heavy apps like NFC, MFKey, uPython (#260 by @Willy-JL)
-- OFW: Settings: Clock editing & Alarm function (目覚め時計) (by @skotopes)
+- Settings:
+ - OFW: Clock editing & Alarm function (目覚め時計) (by @skotopes)
+ - Add warnings for some settings you shouldn't touch like Debug, Sleep Method, Heap Trace (#296 by @Willy-JL)
- BadKB:
- OFW: Add linux/gnome badusb demo files (by @thomasnemer)
- Add older qFlipper install demos for windows and macos (by @DXVVAY & @grugnoymeme)
@@ -179,7 +181,9 @@
- Move more commands as plugins on SD, refactor plugin wrapper (#276 by @Willy-JL)
- FBT: Optimize icons blob, scrub unused icons (#291 by @Willy-JL)
- OFW: BadKB: Improve ChromeOS and GNOME demo scripts (by @kowalski7cc)
-- OFW: GUI: Change dialog_ex text ownership model (by @skotopes)
+- GUI:
+ - OFW: Change dialog_ex text ownership model (by @skotopes)
+ - Improve some error messages to be more clear, like Sub-GHz region missing and Main Menu .fap file missing (#296 by @Willy-JL)
- OFW: CCID: App changes and improvements (by @kidbomb)
- OFW: API: Exposed `view_dispatcher_get_event_loop` (by @CookiePLMonster)
- Furi:
From 9e4ff668f4469824df5c418681ca11a4d640932c Mon Sep 17 00:00:00 2001
From: WillyJL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:08:52 +0000
Subject: [PATCH 07/18] Asset Packer: Fix font terminator causing
freezes/crashes (#295)
* Asset Packer: Fix font terminator causing freezes/crashes
* Update changelog
---
CHANGELOG.md | 1 +
scripts/asset_packer.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0047dfb45..21fc015e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -200,6 +200,7 @@
- OFW: Fix detection of GProx II cards and false detection of other cards (by @Astrrra)
- OFW: Fix Guard GProxII False Positive and 36-bit Parsing (by @zinongli)
- OFW: GProxII Fix Writing and Rendering Conflict (by @zinongli)
+- Asset Packer: Fix font terminator causing freezes/crashes, like in Marauder AP scan/list (#295 by @Willy-JL)
- Desktop:
- Fallback Poweroff prompt when power settings is unavailable (by @Willy-JL)
- Sub-GHz:
diff --git a/scripts/asset_packer.py b/scripts/asset_packer.py
index dda625fc3..6f3187d77 100755
--- a/scripts/asset_packer.py
+++ b/scripts/asset_packer.py
@@ -119,6 +119,7 @@ def pack_font(src: pathlib.Path, dst: pathlib.Path):
.decode("unicode_escape")
.encode("latin_1")
)
+ font += b"\0"
dst.with_suffix(".u8f").write_bytes(font)
elif src.suffix == ".u8f":
if not dst.is_file():
From 641754bc24be2002200b0f44fde1740b804599a0 Mon Sep 17 00:00:00 2001
From: vollukas
Date: Sun, 10 Nov 2024 10:34:59 +0100
Subject: [PATCH 08/18] Update ReadMe.md
---
ReadMe.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ReadMe.md b/ReadMe.md
index 5552bdb86..9665cce2b 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,6 +1,10 @@
-
for Flipper Zero
+ With 5 passport icons: Angry, Lonely, Okay, Happy, Awesome
+ With added **better-pet** asset pack
+ - Many vanilla-friendly(dolphin) animations, every level unlocks at least 1 new animation
+
+ USE **BETTER-PET** BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
From dd7983b92f5295a93f8ed01b6f182d1e692d16e7 Mon Sep 17 00:00:00 2001
From: vollukas
Date: Sun, 10 Nov 2024 10:36:10 +0100
Subject: [PATCH 09/18] Update ReadMe.md
---
ReadMe.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ReadMe.md b/ReadMe.md
index 9665cce2b..6a933b998 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,10 +1,10 @@
With 5 passport icons: Angry, Lonely, Okay, Happy, Awesome
- With added **better-pet** asset pack
+ With added better-pet asset pack
- Many vanilla-friendly(dolphin) animations, every level unlocks at least 1 new animation
- USE **BETTER-PET** BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
+ USE BETTER-PET BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
From da3561706c9b7f016ad6e1d7893edf072e187c61 Mon Sep 17 00:00:00 2001
From: vollukas
Date: Sun, 10 Nov 2024 10:39:38 +0100
Subject: [PATCH 10/18] Update ReadMe.md
---
ReadMe.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ReadMe.md b/ReadMe.md
index 6a933b998..9665cce2b 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,10 +1,10 @@
With 5 passport icons: Angry, Lonely, Okay, Happy, Awesome
- With added better-pet asset pack
+ With added **better-pet** asset pack
- Many vanilla-friendly(dolphin) animations, every level unlocks at least 1 new animation
- USE BETTER-PET BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
+ USE **BETTER-PET** BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
From 612d3f061bb9afebd685d31c26a5c3bc9fb6aa69 Mon Sep 17 00:00:00 2001
From: vollukas
Date: Sun, 10 Nov 2024 10:42:02 +0100
Subject: [PATCH 11/18] Update ReadMe.md
---
ReadMe.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ReadMe.md b/ReadMe.md
index 9665cce2b..deadcccf1 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,10 +1,12 @@
-
With 5 passport icons: Angry, Lonely, Okay, Happy, Awesome
- With added **better-pet** asset pack
- - Many vanilla-friendly(dolphin) animations, every level unlocks at least 1 new animation
+ With 5 passport icons: Angry, Lonely, Okay, Happy, Awesome
+ With added **better-pet** asset pack
+ - Many vanilla-friendly(dolphin) animations, every level unlocks at least 1 new animation
+
+ USE **BETTER-PET** BRANCH.
+ Dev branch is without any changes and I use it just to merge new updates from momentum
- USE **BETTER-PET** BRANCH. Dev branch is without any changes and I use it just to merge new updates from momentum
From f19d426d1db5db89a9998fce62d8d348c20163c0 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 11 Nov 2024 01:20:59 +0000
Subject: [PATCH 12/18] Fix missing comma
---
lib/toolbox/name_generator.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index ea6213d98..1700006e7 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -15,25 +15,9 @@ const char* const name_generator_left[] = {
};
const char* const name_generator_right[] = {
- "bidet",
- "sus",
- "fed",
- "moroder",
- "bobr",
- "chomik",
- "sidorovich",
- "stalker",
- "yapper",
- "bnuuy",
- "jezyk",
- "juzyk",
- "cult",
- "pp",
- "zalaz",
- "breeky",
- "bunker"
- "pingwin",
- "kot",
+ "bidet", "sus", "fed", "moroder", "bobr", "chomik", "sidorovich",
+ "stalker", "yapper", "bnuuy", "jezyk", "juzyk", "cult", "pp",
+ "zalaz", "breeky", "bunker", "pingwin", "kot",
};
void name_generator_make_auto_datetime(
From 3d74f4e1dc2a4d28568179a01f0c1a34b9141830 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:22:55 +0300
Subject: [PATCH 13/18] Loader: Fix BusFault in handling of OOM ofw PR 3992
by Willy-JL
---
lib/flipper_application/elf/elf_file.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c
index d0c4f52fb..2a9307cac 100644
--- a/lib/flipper_application/elf/elf_file.c
+++ b/lib/flipper_application/elf/elf_file.c
@@ -8,11 +8,11 @@
#define TAG "Elf"
-#define ELF_NAME_BUFFER_LEN 32
-#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr))
-#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m))
+#define ELF_NAME_BUFFER_LEN 32
+#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr))
+#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m))
#define RESOLVER_THREAD_YIELD_STEP 30
-#define FAST_RELOCATION_VERSION 1
+#define FAST_RELOCATION_VERSION 1
// #define ELF_DEBUG_LOG 1
@@ -834,7 +834,9 @@ void elf_file_free(ELFFile* elf) {
aligned_free(itref->value.data);
}
if(itref->value.fast_rel) {
- aligned_free(itref->value.fast_rel->data);
+ if(itref->value.fast_rel->data) {
+ aligned_free(itref->value.fast_rel->data);
+ }
free(itref->value.fast_rel);
}
free((void*)itref->key);
From bc4881aa123053d669431c2e5dec41393b591d6c Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 11 Nov 2024 16:52:41 +0300
Subject: [PATCH 14/18] fix discord changelog posting [ci skip]
---
.drone.yml | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index d14ebd517..46ec80cad 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -245,9 +245,11 @@ steps:
- wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
- chmod +x ./discord.sh
- sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt
- - truncate -s -1 changelogcut.txt
- - tail -c +2 changelogcut.txt > changelogready.txt
+ - head -c 1544 changelogcut.txt > changelogcutfin.txt
+ - truncate -s -1 changelogcutfin.txt
+ - tail -c +2 changelogcutfin.txt > changelogready.txt
- rm -f changelogcut.txt
+ - rm -f changelogcutfin.txt
- echo '' >> changelogready.txt
- echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')' >> changelogready.txt
- sed -i 's/(releasever)/'${DRONE_TAG}'/g' .ci_files/release_msg_discord.txt
@@ -529,14 +531,20 @@ steps:
commands:
- wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
- chmod +x ./discord.sh
- - sed -n '/## Main changes/,/
/p' CHANGELOG.md | sed -e 's/
//' > changelogcut.txt
- - truncate -s -1 changelogcut.txt
+ - sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt
+ - head -c 1544 changelogcut.txt > changelogcutfin.txt
+ - truncate -s -1 changelogcutfin.txt
+ - tail -c +2 changelogcutfin.txt > changelogready.txt
+ - rm -f changelogcut.txt
+ - rm -f changelogcutfin.txt
+ - echo '' >> changelogready.txt
+ - echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')' >> changelogready.txt
- sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_discord.txt
- sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_discord.txt
- sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_telegram.txt
- sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_telegram.txt
- cp .ci_files/devbuild_msg_telegram.txt tg_dev_message.tpl
- - ./discord.sh --title "Changelog" --description "$(jq -Rs .
Date: Mon, 11 Nov 2024 16:58:34 +0300
Subject: [PATCH 15/18] upd changelog
---
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccc30823d..d263bb8ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## Main changes
+- Current API: 78.1
- SubGHz:
- Frequency analyzer fixes and improvements:
- **Enforce int module** (like in OFW) usage due to lack of required hardware on external boards (PathIsolate (+rf switch for multiple paths)) and incorrect usage and/or understanding the purpose of frequency analyzer app by users, it should be used only to get frequency of the remote placed around 1-10cm around flipper's left corner
@@ -35,6 +36,7 @@
* SubGHz: Freq analyzer - Fix duplicated frequency lists and use user config for nearest frequency selector too
* SubGHz: Code cleanup and fix for rare dupicated (Data) field cases
* OFW: NFC TRT Parser: Additional checks to prevent false positives
+* OFW PR 3992: Loader: Fix BusFault in handling of OOM (by @Willy-JL)
* OFW PR 3885: NFC: Add API to enforce ISO15693 mode (by @aaronjamt)
* OFW: NFC: iso14443_4a improvements (by @RebornedBrain)
* OFW: NFC: Plantain parser improvements (by @assasinfil) & fixes (by @mxcdoam)
@@ -69,6 +71,7 @@
* OFW: Put errno into TCB
* OFW: Fix USB-UART bridge exit screen stopping the bridge prematurely
**More details on JS changes** (js changelog written by @Willy-JL , thanks!):
+- Our custom JS SDK can be found on npm now: https://www.npmjs.com/org/darkflippers
- Non-exhaustive list of changes to help you fix your scripts:
- `badusb`:
- `setup()`: `mfr_name`, `prod_name`, `layout_path` parameters renamed to `mfrName`, `prodName`, `layoutPath`
From 7ef1a705be6c5decb6c327888d68069bc3919bf1 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 11 Nov 2024 19:49:20 +0300
Subject: [PATCH 16/18] fix ci
---
.drone.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 46ec80cad..0c6ef0975 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -114,7 +114,7 @@ steps:
from_secret: fbt_link
- name: "Bundle self-update packages"
- image: kramos/alpine-zip
+ image: joshkeegan/zip
commands:
- cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.tgz .
- cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.tgz .
@@ -419,7 +419,7 @@ steps:
from_secret: fbt_link
- name: "Bundle self-update packages"
- image: kramos/alpine-zip
+ image: joshkeegan/zip
commands:
- cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz .
- cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz .
From 6370e814d4a84ab3b938c8bfa3e0fe127acd1fdb Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:21:20 +0000
Subject: [PATCH 17/18] Update apps
- All Flip* apps updated (by jblanked), change to use chosen GPIO Pins setting (by Willy-JL)
- ESP Flasher: Update FlipperHTTP, reorder quick flash options (by Willy-JL)
- UL: RFID/iButton Fuzzer: Add protocols Electra, Idteck, Gallagher, Nexwatch, refactor to make RFID protocols easier to add (by SkeletonMan03), add more Dallas 1990 IDs (by eblis)
---
CHANGELOG.md | 1 +
applications/external | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 652d3a84d..62c00706b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,6 +141,7 @@
- CLI-GUI Bridge: Add more symbols to keyboard (#222 by @Willy-JL)
- NRF24 Batch: Add Aeropac SN board txt file (by @vad7)
- UL: Sub-GHz Bruteforcer: Add new protocols for existing dump option (by @xMasterX), use FW functions for top buttons (by @DerSkythe)
+ - UL: RFID/iButton Fuzzer: Add protocols Electra, Idteck, Gallagher, Nexwatch, refactor to make RFID protocols easier to add (by @SkeletonMan03), add more Dallas 1990 IDs (by @eblis)
- UL: NRF24 Apps: Use string library compatible with OFW SDK (by @xMasterX)
- UL: W5500 Ethernet: Various fixes and improvements (by @xMasterX)
- OFW: SPI Mem Manager: Fixed UI rendering bug related to line breaks (by @portasynthinca3)
diff --git a/applications/external b/applications/external
index 1b8f9fcf6..861fe3351 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 1b8f9fcf6cd977dff6bc8192588e37c172bf07b4
+Subproject commit 861fe3351399f62a705bf3ebea3ca291b4319670
From c06c7c98c1aa648eb648523277d0013e348345d4 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 11 Nov 2024 22:47:59 +0000
Subject: [PATCH 18/18] Update changelog --nobuild
---
CHANGELOG.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62c00706b..b3f4dbaab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
- Reworks how communication with battery guage is done, improves reliability and fixes issues with battery percentage not showing
- After installing firmware with this change, downgrading to old firmware will cause battery percentage to be blank
- If you must downgrade firmware, use the [Guage Tool app](https://github.com/skotopes/flipperzero_gauge_tool) to unseal the guage
+- OFW: Furi: RTC Alarm support (目覚め時計) (by @skotopes)
+ - Reworks RTC initialization to support Alarms functionality
+ - Older firmware will be unable to handle alarm, downgrading might be problematic
+ - If you must downgrade firmware, disable Alarm in Settings > Clock & Alarm first
- OFW: JS: Modules backport & overhaul (by @portasynthinca3), backport of backport (by @Willy-JL & @xMasterX)
- OFW backported some modules we had, added lots of new stuff, and overhauled many other things
- Non-exhaustive list of changes to help you fix your scripts:
@@ -47,7 +51,6 @@
- effort required to update old scripts using these: minimal
- Added type definitions (typescript files for type checking in IDE, Flipper does not run typescript)
- Documentation is incomplete and deprecated, from now on you should refer to type definitions (`applications/system/js_app/packages/fz-sdk`), those will always be correct
- - Type definitions for extra modules we have that OFW doesn't will come later
- GUI: Refactored TextInput illegal symbols (by @Willy-JL)
- If your app used `text_input_add_illegal_symbols(text_input)` it should change to `text_input_show_illegal_symbols(text_input, true)`
@@ -121,7 +124,6 @@
- Furi:
- OFW: Add FuriEventLoop support for FuriEventFlag, simplify API (by @Skorpionm)
- OFW: Put errno into TCB, better integration with libc (by @portasynthinca3)
- - OFW: FuriHalRtc Alarm support (目覚め時計) (by @skotopes)
### Updated:
- Apps: