Recover more keys

deobfuscated.py

@@ -290,6 +290,7 @@
     "cRjPy4Ef+KZwJ+nfPeBV5Q": "DeviceSupportsSwimmingWorkouts",
     "cT44WE1EohiwRzhsZ8xEsw": "RingerButtonCapability",
     "ct5Dh6u0D6WDJKg2PrMFVQ": "FaceTimePreferredEncoding",
+    "CUMH6bG4DFnu7ZREp5YkUQ": "jasper-camera",
     "cux58RcuSiBhpxWnT3pE4A": "FrontFacingCameraVideoCapture4kMaxFPS",
     "cW+7coMzO/hTtCCDcSvNOw": "RequiresNaturalVolumeButtonArrangement",
     "cWWKdUn+rIclZ60ZGAVhBw": "CameraHDR2Capability",
@@ -379,6 +380,7 @@
     "fJZs6N8SqTS4RuQVh3szxA": "camera-front-flash",
     "FkD7K642S082lnfw/ohHzg": "BasebandFirmwareManifestData",
     "fkWvcjYnYzGRhVKiBoYzgA": "HasPKA",
+    "flgGiGu1dR1hEWcC1cTLTw": "rear-low-light-photo",
     "FLmEtGw+OD98VLXasx7W6A": "DeviceSupportsWirelessChargingEnergyUseNotification",
     "FNvQ6lBvJIUcYBzQ8ggOUQ": "SavageUID",
     "FOs+LbLUs+TajsEE4xkbrw": "gas-gauge-battery",
@@ -477,6 +479,7 @@
     "ibhfX8FQ6b809N632Ey98g": "Allow32BitApps",
     "iBLsDETxB4ATmspGucaJyg": "IsLargeFormatPhone",
     "IBqcPacFMPIX8HMWob444A": "AirDropCapability",
+    "ieuwDGiHrHoYRjSl6gT+1A": "supports-concurrent-hp-lp-mics",
     "IFBSPGnQVFrGFW+ujtZu6Q": "RegionalBehaviorNTSC",
     "IFHQSJ65DoElWQl/+eCfNQ": "fast-switch-options",
     "iFOX66VmcijipO3YRc+AXg": "display-mirroring",
@@ -504,6 +507,7 @@
     "IweaHIDpz+rknAcb3+xg9g": "AggregateDeviceVideoZoomFactor",
     "iyfxmLogGVIaH7aEgqwcIA": "green-tea",
     "izFv/qj3IUhqAIiEuYH6xw": "MusicStore",
+    "j/8nlHWXO3OvKHQHgl905Q": "front-cam-rotation-isp",
     "J/a5Y6rhDH0gVkYtWUylOA": "supports-listening-on-gesture",
     "j1pdCAYnpIEYMqIAitm3JA": "DeviceSupportsCinnamon",
     "J1QHVh74Nnd6Rqyiq71/yw": "AVDDecodingRate",
@@ -820,6 +824,7 @@
     "RNcdWbM8+dO5tx82A+YCcQ": "ProvisioningUniqueDeviceID",
     "RR4G+l3k5mfFFr6Igw88kQ": "auto-low-light-video",
     "RrhB72r1de9N65EG4pgqJw": "tnr-mode-front",
+    "rt/G6Vk3NTGWs5N9WEjztQ": "front-low-light-photo",
     "rtIWWK0kM4F+ZMkIqhE7yQ": "DeviceStingHousingColor",
     "RvCUAjrf7O/zAzV1StnBlg": "IsComputeNode",
     "rwnje21oPXH375umjxV6YQ": "accel",
@@ -836,6 +841,7 @@
     "S5Bf9bF00BTHrySCydAkdg": "bitrate-2g",
     "s7nuHoZIYNoOHCqT9iyZkQ": "DeviceSupportsInductiveCharging",
     "s8TgWYc7BjtSNbtuycqauw": "DeviceSupportsLaguna",
+    "sad18VQX7AeS+291aKhJlw": "function-button_ringeren",
     "SaW+DA+cbiqDHrex8MTABA": "DeviceSupportsEnvironmentalDosimetry",
     "sBBgbCSIQcUOXwgaDW/Xew": "aggregate-camera",
     "SbXytSPZXB1jQ8GLZOxCPw": "VolumeDownButtonNormalizedCGRect",
@@ -1057,6 +1063,7 @@
     "ZeGw3VKUymUAbp4noKsxoQ": "FrontFacingCameraMaxVideoZoomFactor",
     "ZepchaN1K8XQJaBUMMlV5w": "iAP2Capability",
     "ZEU7pCEskBhjQ4AOMuALDw": "HEVCDecoder10bitSupported",
+    "Zg7DduDoSCy6vY6mhy3n2w": "island-notch-location",
     "ZgIjA7Nwd2jSo13lhDO1Iw": "RegionalBehaviorShutterClick",
     "zHeENZu+wbg7PUprwNwBWg": "RegionInfo",
     "Zhoou87qmFpFwcFsm7Jlyg": "vsh-compensation-minimum-nits",

keys_desc.py

@@ -10,19 +10,15 @@
     "bbyFCcrPE+k6ZXIVbXSFUw": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with u, DevicePrefersBuildingStrokes",
     "bxQyyA/qJ3QQXTiHBsW2eg": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with o, BuddyLanguagesAnimationRequiresOptimization",
     "cq/jTAQ8zJab+ibcGUzJew": f"{NON_KEY_DESC}, IODeviceTree:/product/audio, starts with m, DeviceSupportsBeacon",
-    "CUMH6bG4DFnu7ZREp5YkUQ": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with j, RearFacingCameraTimeOfFlightCameraCapability",
     "D3LeXyjrxDFYSi6pWFEL4A": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with u, DeviceSupportsTrafficAlpha",
     "dUipfYkyvM80t4IkmMBVgQ": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with w, DeviceSupportsElton",
     "dW6ROVcD3o5ACa4jvALJ6A": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with d, DynamicFunctionRowSerialNumber",
     "e+pTfaabi1k1kfdk2vl1Kw": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with l, LunaFlexSerialNumber",
     "E3qwwdwgUSy6FV6VC+Uf3A": f"{NON_KEY_DESC}, IODeviceTree:/chosen, starts with r, ResearchFuse",
-    "flgGiGu1dR1hEWcC1cTLTw": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with r, RearFacingLowLightCameraCapability",
     "GvmsjQ/68T7do2CJxUhMig": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with b, RemoteBluetoothAddressData",
     "H4f1y1sEDUUUROeb4FZJ4A": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with n, RequiresNaturalVolumeButtonArrangement",
     "HhLXszMhK6bb9TP4sqVQWQ": f"{NON_KEY_DESC}, IODeviceTree:/chosen, starts with e, ExtendedSecurityDomain",
-    "ieuwDGiHrHoYRjSl6gT+1A": f"{NON_KEY_DESC}, IODeviceTree:/product/audio, starts with s, DeviceSupportsConcurrentHPLPMics",
     "is3zjHrEdiF6J/boqghy9A": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with m, PintoMacAddressData",
-    "j/8nlHWXO3OvKHQHgl905Q": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with f, FrontCameraRotationForISP",
     "JljZ8PqQJB8QlFC2NsgOPw": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with e, WorkoutUltraMode",
     "KWr9OM2iqeLQEhaHS0UshQ": f"{NON_KEY_DESC}, IODeviceTree:/arm-io/i2c0/audio0, starts with a, DeviceSupportsLineIn",
     "ldJQht23DQY8SUXKJhUvPw": f"{NON_KEY_DESC}, IODeviceTree:/backlight, starts with u, DeviceSupportsFrameSynchronousBrightness",
@@ -34,8 +30,6 @@
     "P1djMN/L3B6otgGpO9WYkw": f"{NON_KEY_DESC}, IODeviceTree:/, starts with s, SiliconBringupBoard",
     "qAAQUPLjf+Hl4UM3WY2qgw": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with f, FrontFacingCameraHFRVideoCapture720pMaxFPS",
     "QY61T8CLLwG/yu92ScTYtw": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with s, driverkit",
-    "rt/G6Vk3NTGWs5N9WEjztQ": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with f, FrontFacingLowLightCameraCapability",
-    "sad18VQX7AeS+291aKhJlw": f"{NON_KEY_DESC}, IODeviceTree:/buttons, starts with f, RingerButtonCapability",
     "SIC/2YcTF6ydv8Hfcn9THw": f"{NON_KEY_DESC}, IODeviceTree:/arm-io/aop/iop-aop-nub/als, starts with a, DisplayInactiveBrightnessClass",
     "SLu4aVo/V1CulJ7eyTDh1w": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with e, DeviceSupportsEnvironmentalDosimetry",
     "smT9LjRW3acTT7WTS/XqyQ": f"{NON_KEY_DESC}, IODeviceTree:/product/camera, starts with f, FrontFacingCameraHFRVideoCapture1080pMaxFPS",
@@ -47,7 +41,6 @@
     "wAbB2fAjUqUc6lNBelfWMA": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with n, DeviceSupportsPeriodicALSUpdates",
     "xgs6iXf0KFHUJ9d4FKaRYg": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with s, DeviceSupportsGrey",
     "yeQy+rgNoD7+YIY6mSVOhg": f"{NON_KEY_DESC}, IODeviceTree:/opal, starts with e",
-    "Zg7DduDoSCy6vY6mhy3n2w": f"{NON_KEY_DESC}, IODeviceTree:/product, starts with i, DeviceSupportsDynamicIsland",
 }
 
 known_keys_desc = {
@@ -118,6 +111,7 @@
     "cganRwxlDnONJx4WeDI0kQ": NON_KEY_DESC,
     "ch7KBY7aSsznfICVzjFldw": NON_KEY_DESC,
     "cmkS/KVB6ubxH76sLbumbw": NON_KEY_DESC,
+    "CUMH6bG4DFnu7ZREp5YkUQ": NON_KEY_DESC,
     "D6PT05dEJ0f9Ayk7Yi92RA": NON_KEY_DESC,
     "dbYxhQWXkJhjp8uPhoMDvw": NON_KEY_DESC,
     "DCy89X5oErFAps95GX38mQ": NON_KEY_DESC,
@@ -132,6 +126,7 @@
     "F6wqOqCR9tpYWyB1taxxnw": NON_KEY_DESC,
     "Fam17Ufz3CiHdZPcma0AeQ": NON_KEY_DESC,
     "fb+1apeTeouqt+fo3nZ6sg": NON_KEY_DESC,
+    "flgGiGu1dR1hEWcC1cTLTw": NON_KEY_DESC,
     "FQHZ8VqG8mVzDQ+g085l8w": NON_KEY_DESC,
     "FuR7SfqQmxpRW5MyqMm7FQ": NON_KEY_DESC,
     "fxnMXVRwuznDzWhoDCxb2A": NON_KEY_DESC,
@@ -150,13 +145,15 @@
     "I6rd1SCXpRqBMDTPBbcWzA": NON_KEY_DESC,
     "i6wlxJoKNXBiVXJHJ1EHBg": NON_KEY_DESC,
     "I83EgnDEGxinSKU4QAykmA": NON_KEY_DESC,
+    "ieuwDGiHrHoYRjSl6gT+1A": NON_KEY_DESC,
     "IFHQSJ65DoElWQl/+eCfNQ": NON_KEY_DESC,
     "iifCuJmggYlB4hLzc0Zoiw": NON_KEY_DESC,
     "IMlsLCL69XUZau9QyPnxeQ": NON_KEY_DESC,
     "Ini7+h7Q4ZZctfFM9+KTBw": NON_KEY_DESC,
     "ItOvlwIhFj2aCXL4wk3ijg": NON_KEY_DESC,
     "IUvPFaILUl3l0684dR0AlA": NON_KEY_DESC,
     "IvdL59ITgJvhb5ptpLbqRg": NON_KEY_DESC,
+    "j/8nlHWXO3OvKHQHgl905Q": NON_KEY_DESC,
     "J/a5Y6rhDH0gVkYtWUylOA": NON_KEY_DESC,
     "jkRyJt34tZOjsO1YhVc0mw": NON_KEY_DESC,
     "JOlwW/P8Cw3CDCoFunq8og": NON_KEY_DESC,
@@ -228,8 +225,10 @@
     "RN4AimpWqqD2JZCB67qtvQ": NON_KEY_DESC,
     "RR4G+l3k5mfFFr6Igw88kQ": NON_KEY_DESC,
     "RrhB72r1de9N65EG4pgqJw": NON_KEY_DESC,
+    "rt/G6Vk3NTGWs5N9WEjztQ": NON_KEY_DESC,
     "rwnje21oPXH375umjxV6YQ": NON_KEY_DESC,
     "S5Bf9bF00BTHrySCydAkdg": NON_KEY_DESC,
+    "sad18VQX7AeS+291aKhJlw": NON_KEY_DESC,
     "sBBgbCSIQcUOXwgaDW/Xew": NON_KEY_DESC,
     "SKBEzVsOS9Wr/WlkVtlUMQ": NON_KEY_DESC,
     "Sr1Bmb3uoIfgKyaZguG0Gw": NON_KEY_DESC,
@@ -264,6 +263,7 @@
     "yPSUYPhrVLHnvX0TUugiwg": NON_KEY_DESC,
     "ZcPQWuQwUJtMR5Oj99uc8w": NON_KEY_DESC,
     "zDBaE8nqtDP8hY4pOa6iMw": NON_KEY_DESC,
+    "Zg7DduDoSCy6vY6mhy3n2w": NON_KEY_DESC,
     "Zhoou87qmFpFwcFsm7Jlyg": NON_KEY_DESC,
     "zJUWenIp94snlzBD1cub3g": NON_KEY_DESC,
     "znvmheFkjr6hiqIK9TrCVw": NON_KEY_DESC,

mapping.h

@@ -1,7 +1,7 @@
 #include "struct.h"
 
 // Total: 1115 keys
-// Deobfuscated: 1070 keys (95.96%)
+// Deobfuscated: 1077 keys (96.59%)
 // Total gestalt keys: 862 keys
 // Deobfuscated gestalt: 861 keys (99.88%)
 // Unexplored: 0 keys
@@ -305,7 +305,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "cRjPy4Ef+KZwJ+nfPeBV5Q", "DeviceSupportsSwimmingWorkouts",
     "cT44WE1EohiwRzhsZ8xEsw", "RingerButtonCapability",
     "ct5Dh6u0D6WDJKg2PrMFVQ", "FaceTimePreferredEncoding",
-    "CUMH6bG4DFnu7ZREp5YkUQ", NULL, // non-gestalt-key, IODeviceTree:/product/camera, starts with j, RearFacingCameraTimeOfFlightCameraCapability
+    "CUMH6bG4DFnu7ZREp5YkUQ", "jasper-camera", // non-gestalt-key
     "cux58RcuSiBhpxWnT3pE4A", "FrontFacingCameraVideoCapture4kMaxFPS",
     "cW+7coMzO/hTtCCDcSvNOw", "RequiresNaturalVolumeButtonArrangement",
     "cWWKdUn+rIclZ60ZGAVhBw", "CameraHDR2Capability",
@@ -400,7 +400,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "fJZs6N8SqTS4RuQVh3szxA", "camera-front-flash",
     "FkD7K642S082lnfw/ohHzg", "BasebandFirmwareManifestData",
     "fkWvcjYnYzGRhVKiBoYzgA", "HasPKA",
-    "flgGiGu1dR1hEWcC1cTLTw", NULL, // non-gestalt-key, IODeviceTree:/product/camera, starts with r, RearFacingLowLightCameraCapability
+    "flgGiGu1dR1hEWcC1cTLTw", "rear-low-light-photo", // non-gestalt-key
     "FLmEtGw+OD98VLXasx7W6A", "DeviceSupportsWirelessChargingEnergyUseNotification",
     "FNvQ6lBvJIUcYBzQ8ggOUQ", "SavageUID",
     "FOs+LbLUs+TajsEE4xkbrw", "gas-gauge-battery",
@@ -502,7 +502,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "ibhfX8FQ6b809N632Ey98g", "Allow32BitApps",
     "iBLsDETxB4ATmspGucaJyg", "IsLargeFormatPhone",
     "IBqcPacFMPIX8HMWob444A", "AirDropCapability",
-    "ieuwDGiHrHoYRjSl6gT+1A", NULL, // non-gestalt-key, IODeviceTree:/product/audio, starts with s, DeviceSupportsConcurrentHPLPMics
+    "ieuwDGiHrHoYRjSl6gT+1A", "supports-concurrent-hp-lp-mics", // non-gestalt-key
     "IFBSPGnQVFrGFW+ujtZu6Q", "RegionalBehaviorNTSC",
     "IFHQSJ65DoElWQl/+eCfNQ", "fast-switch-options", // non-gestalt-key
     "iFOX66VmcijipO3YRc+AXg", "display-mirroring",
@@ -531,7 +531,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "IweaHIDpz+rknAcb3+xg9g", "AggregateDeviceVideoZoomFactor",
     "iyfxmLogGVIaH7aEgqwcIA", "green-tea",
     "izFv/qj3IUhqAIiEuYH6xw", "MusicStore",
-    "j/8nlHWXO3OvKHQHgl905Q", NULL, // non-gestalt-key, IODeviceTree:/product/camera, starts with f, FrontCameraRotationForISP
+    "j/8nlHWXO3OvKHQHgl905Q", "front-cam-rotation-isp", // non-gestalt-key
     "J/a5Y6rhDH0gVkYtWUylOA", "supports-listening-on-gesture", // non-gestalt-key
     "j1pdCAYnpIEYMqIAitm3JA", "DeviceSupportsCinnamon",
     "J1QHVh74Nnd6Rqyiq71/yw", "AVDDecodingRate",
@@ -859,7 +859,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "RNcdWbM8+dO5tx82A+YCcQ", "ProvisioningUniqueDeviceID",
     "RR4G+l3k5mfFFr6Igw88kQ", "auto-low-light-video", // non-gestalt-key
     "RrhB72r1de9N65EG4pgqJw", "tnr-mode-front", // non-gestalt-key
-    "rt/G6Vk3NTGWs5N9WEjztQ", NULL, // non-gestalt-key, IODeviceTree:/product/camera, starts with f, FrontFacingLowLightCameraCapability
+    "rt/G6Vk3NTGWs5N9WEjztQ", "front-low-light-photo", // non-gestalt-key
     "rtIWWK0kM4F+ZMkIqhE7yQ", "DeviceStingHousingColor",
     "RvCUAjrf7O/zAzV1StnBlg", "IsComputeNode",
     "rwnje21oPXH375umjxV6YQ", "accel", // non-gestalt-key
@@ -876,7 +876,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "S5Bf9bF00BTHrySCydAkdg", "bitrate-2g", // non-gestalt-key
     "s7nuHoZIYNoOHCqT9iyZkQ", "DeviceSupportsInductiveCharging",
     "s8TgWYc7BjtSNbtuycqauw", "DeviceSupportsLaguna",
-    "sad18VQX7AeS+291aKhJlw", NULL, // non-gestalt-key, IODeviceTree:/buttons, starts with f, RingerButtonCapability
+    "sad18VQX7AeS+291aKhJlw", "function-button_ringeren", // non-gestalt-key
     "SaW+DA+cbiqDHrex8MTABA", "DeviceSupportsEnvironmentalDosimetry",
     "sBBgbCSIQcUOXwgaDW/Xew", "aggregate-camera", // non-gestalt-key
     "SbXytSPZXB1jQ8GLZOxCPw", "VolumeDownButtonNormalizedCGRect",
@@ -1109,7 +1109,7 @@ static const struct tKeyMapping keyMappingTable[] = {
     "ZeGw3VKUymUAbp4noKsxoQ", "FrontFacingCameraMaxVideoZoomFactor",
     "ZepchaN1K8XQJaBUMMlV5w", "iAP2Capability",
     "ZEU7pCEskBhjQ4AOMuALDw", "HEVCDecoder10bitSupported",
-    "Zg7DduDoSCy6vY6mhy3n2w", NULL, // non-gestalt-key, IODeviceTree:/product, starts with i, DeviceSupportsDynamicIsland
+    "Zg7DduDoSCy6vY6mhy3n2w", "island-notch-location", // non-gestalt-key
     "ZgIjA7Nwd2jSo13lhDO1Iw", "RegionalBehaviorShutterClick",
     "zHeENZu+wbg7PUprwNwBWg", "RegionInfo",
     "Zhoou87qmFpFwcFsm7Jlyg", "vsh-compensation-minimum-nits", // non-gestalt-key