238510 2022-03-29 09:53:40 -0700 [LibWPE] Guard libxkbcommon code with WPE_ENABLE_XKB 2022-03-29 13:27:16 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead annulen aperez ews-watchlist gyuyoung.kim ryuan.choi sergio webkit-bug-importer oldest_to_newest 1856056 0 don.olmstead 2022-03-29 09:53:40 -0700 libwpe added an ENABLE flag for support of XKB. 1856065 1 456038 don.olmstead 2022-03-29 10:05:47 -0700 Created attachment 456038 Patch 1856077 2 456040 don.olmstead 2022-03-29 10:19:06 -0700 Created attachment 456040 Patch 1856139 3 456040 aperez 2022-03-29 12:31:39 -0700 Comment on attachment 456040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456040&action=review > Source/WebKit/UIProcess/Automation/libwpe/WebAutomationSessionLibWPE.cpp:152 > struct wpe_input_xkb_keymap_entry* entries; Meh. Too bad we don't have something like GUniqueOutPtr which would call free() instead of g_free(); it would have been perfect to use here instead of having the one line of guarded code below 🤷‍♂️️ 1856165 4 ews-feeder 2022-03-29 13:26:00 -0700 Committed r292064 (248998@main): <https://commits.webkit.org/248998@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456040. 1856166 5 webkit-bug-importer 2022-03-29 13:27:16 -0700 <rdar://problem/91001968> 456038 2022-03-29 10:05:47 -0700 2022-03-29 10:19:06 -0700 Patch bug-238510.diff text/plain 5580 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAzYjgzZTNlY2QxMmEuLjUx OWUxNjhlNzVkNSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDIyLTAzLTI5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5j b20+CisKKyAgICAgICAgW0xpYldQRV0gR3VhcmQgbGlieGtiY29tbW9uIGNvZGUgd2l0aCBXUEVf RU5BQkxFX1hLQgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM4NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUG9zdCB2MS4xMi4wIGludHJvZHVjZXMgdGhlIFdQRV9FTkFCTEVfWEtCIGRlZmluaXRpb24g dG8gbGlid3BlLiBGb3IgdjEuMTIuMCBhbmQgZWFybGllcgorICAgICAgICB0aGUgZGVmaW5lIGlz IGFkZGVkIHRvIHRoZSBXUEU6OmxpYndwZSB0YXJnZXQncyBjb21waWxlIG9wdGlvbnMuIEZvciBs YXRlciB2ZXJzaW9ucyB0aGUKKyAgICAgICAgcGtnLWNvbmZpZyBmb3IgdGhlIGxpYnJhcnkgd2ls bCBkZXRlcm1pbmUgdGhlIHByZXNlbmNlIG9mIHRoaXMgZGVmaW5pdGlvbi4KKworICAgICAgICAq IFNvdXJjZS9jbWFrZS9GaW5kV1BFLmNtYWtlOgorCiAyMDIyLTAzLTI2ICBBYWthc2ggSmFpbiAg PGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgbXkgZ2l0aHViIHVzZXJu YW1lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZwppbmRleCA0NTY5NzhmZTBhZGEuLjY4MTJkZjU1OWI1MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMi0wMy0yOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNv bnkuY29tPgorCisgICAgICAgIFtMaWJXUEVdIEd1YXJkIGxpYnhrYmNvbW1vbiBjb2RlIHdpdGgg V1BFX0VOQUJMRV9YS0IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzODUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEd1YXJkIGxpYndwZSB4a2IgY29kZSB3aXRoIFdQRV9FTkFCTEVfWEtCLgorCisgICAg ICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vbGlid3BlL1dlYkF1dG9tYXRpb25TZXNzaW9uTGli V1BFLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZG9LZXlTdHJva2VFdmVudCk6CisKIDIwMjItMDMt MjkgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBTaGFy ZSBXZWJBdXRvbWF0aW9uU2Vzc2lvbiBhbW9uZyBVU0UoTElCV1BFKSBwb3J0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9saWJ3cGUvV2ViQXV0b21hdGlv blNlc3Npb25MaWJXUEUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9s aWJ3cGUvV2ViQXV0b21hdGlvblNlc3Npb25MaWJXUEUuY3BwCmluZGV4IDg5ZGM4ZmExYzk5ZS4u YmZkMTY0NWNkYmU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0 aW9uL2xpYndwZS9XZWJBdXRvbWF0aW9uU2Vzc2lvbkxpYldQRS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9saWJ3cGUvV2ViQXV0b21hdGlvblNlc3Npb25MaWJX UEUuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lv bk1hY3Jvcy5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgPHdwZS93cGUu aD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTE0 NywxMiArMTQ4LDE3IEBAIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IFdlYkF1dG9tYXRp b25TZXNzaW9uOjpwbGF0Zm9ybVdlYk1vZGlmaWVyc0Zyb21SYXcoCiAjaWYgRU5BQkxFKFdFQkRS SVZFUl9LRVlCT0FSRF9JTlRFUkFDVElPTlMpCiBzdGF0aWMgdm9pZCBkb0tleVN0cm9rZUV2ZW50 KHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiB2aWV3QmFja2VuZCwgYm9vbCBwcmVzc2VkLCB1aW50 MzJfdCBrZXlDb2RlLCB1aW50MzJfdCBtb2RpZmllcnMsIGJvb2wgZG9SZWxlYXNlQWZ0ZXJQcmVz cyA9IGZhbHNlKQogeworI2lmIGRlZmluZWQoV1BFX0VOQUJMRV9YS0IpICYmIFdQRV9FTkFCTEVf WEtCCiAgICAgc3RydWN0IHdwZV9pbnB1dF94a2Jfa2V5bWFwX2VudHJ5KiBlbnRyaWVzOwogICAg IHVpbnQzMl90IGVudHJpZXNDb3VudDsKICAgICB3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2Vu dHJpZXNfZm9yX2tleV9jb2RlKHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBr ZXlDb2RlLCAmZW50cmllcywgJmVudHJpZXNDb3VudCk7Ci0gICAgc3RydWN0IHdwZV9pbnB1dF9r ZXlib2FyZF9ldmVudCBldmVudCA9IHsgMCwga2V5Q29kZSwgZW50cmllc0NvdW50ID8gZW50cmll c1swXS5oYXJkd2FyZV9rZXlfY29kZSA6IDAsIHByZXNzZWQsIG1vZGlmaWVycyB9OworI2Vsc2UK KyAgICBzdHJ1Y3Qgd3BlX2lucHV0X2tleWJvYXJkX2V2ZW50IGV2ZW50ID0geyAwLCBrZXlDb2Rl LCAwLCBwcmVzc2VkLCBtb2RpZmllcnMgfTsKKyNlbmRpZgogICAgIHdwZV92aWV3X2JhY2tlbmRf ZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQodmlld0JhY2tlbmQsICZldmVudCk7CisjaWYgZGVmaW5l ZChXUEVfRU5BQkxFX1hLQikgJiYgV1BFX0VOQUJMRV9YS0IKICAgICBmcmVlKGVudHJpZXMpOwor I2VuZGlmCiAKICAgICBpZiAoZG9SZWxlYXNlQWZ0ZXJQcmVzcykgewogICAgICAgICBBU1NFUlQo cHJlc3NlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmluZFdQRS5jbWFrZSBiL1NvdXJj ZS9jbWFrZS9GaW5kV1BFLmNtYWtlCmluZGV4IDdiYzQ5MzVjZjVlOC4uOTk1NzBmMDdjNDJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZFdQRS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2Uv RmluZFdQRS5jbWFrZQpAQCAtODUsNiArODUsMTEgQEAgaWYgKFdQRV9JTkNMVURFX0RJUiBBTkQg Tk9UIFdQRV9WRVJTSU9OKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCisjIFZlcnNpb24gMS4x Mi4wIGlzIHRoZSBsYXN0IHJlbGVhc2Ugd2hlcmUgWEtCIHN1cHBvcnQgd2FzIGFsd2F5cyBwcmVz ZW50CitpZiAoV1BFX1ZFUlNJT04gVkVSU0lPTl9MRVNTX0VRVUFMIDEuMTIuMCkKKyAgICBsaXN0 KEFQUEVORCBXUEVfQ09NUElMRV9PUFRJT05TIC1EV1BFX0VOQUJMRV9YS0I9MSkKK2VuZGlmICgp CisKIGluY2x1ZGUoRmluZFBhY2thZ2VIYW5kbGVTdGFuZGFyZEFyZ3MpCiBmaW5kX3BhY2thZ2Vf aGFuZGxlX3N0YW5kYXJkX2FyZ3MoV1BFCiAgICAgRk9VTkRfVkFSIFdQRV9GT1VORApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ3NTljMTVmYjA3 YS4uYThkNDg1NWUyNWI2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDMtMjkgIERvbiBPbG1zdGVhZCAgPGRv bi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAgICBbTGliV1BFXSBHdWFyZCBsaWJ4a2Jjb21t b24gY29kZSB3aXRoIFdQRV9FTkFCTEVfWEtCCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg1MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBHdWFyZCBsaWJ3cGUgeGtiIGNvZGUgd2l0aCBXUEVfRU5BQkxF X1hLQi4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJv eHlMaWJXUEUuY3BwOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjprZXlEb3duKToK KwogMjAyMi0wMy0yOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBIVE1MQXR0YWNobWVudEVsZW1lbnQuZ2V0QXR0YWNobWVudElkZW50aWZpZXIoKSBz aG91bGQgcHJvcGFnYXRlIGF0dGFjaG1lbnQgZGF0YSB0byB0aGUgY2xpZW50CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNw cCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUu Y3BwCmluZGV4IGM3ZjYyODA0OWFmYS4uYzAxZjM0NTQ0Y2UxIDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcApA QCAtMzE3LDE0ICszMTcsMjAgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3Ry aW5nUmVmIGtleVJlZiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKIHsKICAgICB1aW50 MzJfdCBtb2RpZmllcnMgPSB3a0V2ZW50TW9kaWZpZXJzVG9XUEUod2tNb2RpZmllcnMpOwogICAg IHVpbnQzMl90IGtleVN5bSA9IHdwZUtleVN5bUZvcktleVJlZihrZXlSZWYsIGxvY2F0aW9uLCAm bW9kaWZpZXJzKTsKKyNpZiBkZWZpbmVkKFdQRV9FTkFCTEVfWEtCKSAmJiBXUEVfRU5BQkxFX1hL QgogICAgIHN0cnVjdCB3cGVfaW5wdXRfeGtiX2tleW1hcF9lbnRyeSogZW50cmllczsKICAgICB1 aW50MzJfdCBlbnRyaWVzQ291bnQ7CiAgICAgd3BlX2lucHV0X3hrYl9jb250ZXh0X2dldF9lbnRy aWVzX2Zvcl9rZXlfY29kZSh3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwga2V5 U3ltLCAmZW50cmllcywgJmVudHJpZXNDb3VudCk7CiAgICAgc3RydWN0IHdwZV9pbnB1dF9rZXli b2FyZF9ldmVudCBldmVudCB7IHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwga2V5U3ltLCBlbnRy aWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9kaWZp ZXJzIH07CisjZWxzZQorICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQg eyBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIGtleVN5bSwgMCwgdHJ1ZSwgbW9kaWZpZXJzIH07 CisjZW5kaWYKICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2tleWJvYXJkX2V2ZW50KHZp ZXdCYWNrZW5kKCptX3Rlc3RDb250cm9sbGVyKSwgJmV2ZW50KTsKICAgICBldmVudC5wcmVzc2Vk ID0gZmFsc2U7CiAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9rZXlib2FyZF9ldmVudCh2 aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZldmVudCk7CisjaWYgZGVmaW5lZChXUEVf RU5BQkxFX1hLQikgJiYgV1BFX0VOQUJMRV9YS0IKICAgICBmcmVlKGVudHJpZXMpOworI2VuZGlm CiB9CiAKIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmF3S2V5RG93bihXS1N0cmluZ1JlZiBrZXks IFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCB1bnNpZ25lZCBrZXlMb2NhdGlvbikK 456040 2022-03-29 10:19:06 -0700 2022-03-29 13:26:03 -0700 Patch bug-238510.diff text/plain 5580 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAzYjgzZTNlY2QxMmEuLjUx OWUxNjhlNzVkNSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDIyLTAzLTI5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5j b20+CisKKyAgICAgICAgW0xpYldQRV0gR3VhcmQgbGlieGtiY29tbW9uIGNvZGUgd2l0aCBXUEVf RU5BQkxFX1hLQgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM4NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUG9zdCB2MS4xMi4wIGludHJvZHVjZXMgdGhlIFdQRV9FTkFCTEVfWEtCIGRlZmluaXRpb24g dG8gbGlid3BlLiBGb3IgdjEuMTIuMCBhbmQgZWFybGllcgorICAgICAgICB0aGUgZGVmaW5lIGlz IGFkZGVkIHRvIHRoZSBXUEU6OmxpYndwZSB0YXJnZXQncyBjb21waWxlIG9wdGlvbnMuIEZvciBs YXRlciB2ZXJzaW9ucyB0aGUKKyAgICAgICAgcGtnLWNvbmZpZyBmb3IgdGhlIGxpYnJhcnkgd2ls bCBkZXRlcm1pbmUgdGhlIHByZXNlbmNlIG9mIHRoaXMgZGVmaW5pdGlvbi4KKworICAgICAgICAq IFNvdXJjZS9jbWFrZS9GaW5kV1BFLmNtYWtlOgorCiAyMDIyLTAzLTI2ICBBYWthc2ggSmFpbiAg PGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgbXkgZ2l0aHViIHVzZXJu YW1lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZwppbmRleCA0NTY5NzhmZTBhZGEuLjY4MTJkZjU1OWI1MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMi0wMy0yOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNv bnkuY29tPgorCisgICAgICAgIFtMaWJXUEVdIEd1YXJkIGxpYnhrYmNvbW1vbiBjb2RlIHdpdGgg V1BFX0VOQUJMRV9YS0IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzODUxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEd1YXJkIGxpYndwZSB4a2IgY29kZSB3aXRoIFdQRV9FTkFCTEVfWEtCLgorCisgICAg ICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vbGlid3BlL1dlYkF1dG9tYXRpb25TZXNzaW9uTGli V1BFLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZG9LZXlTdHJva2VFdmVudCk6CisKIDIwMjItMDMt MjkgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBTaGFy ZSBXZWJBdXRvbWF0aW9uU2Vzc2lvbiBhbW9uZyBVU0UoTElCV1BFKSBwb3J0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9saWJ3cGUvV2ViQXV0b21hdGlv blNlc3Npb25MaWJXUEUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9s aWJ3cGUvV2ViQXV0b21hdGlvblNlc3Npb25MaWJXUEUuY3BwCmluZGV4IDg5ZGM4ZmExYzk5ZS4u YzAzNjQxZjU1NzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0 aW9uL2xpYndwZS9XZWJBdXRvbWF0aW9uU2Vzc2lvbkxpYldQRS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9saWJ3cGUvV2ViQXV0b21hdGlvblNlc3Npb25MaWJX UEUuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lv bk1hY3Jvcy5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgPHdwZS93cGUu aD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTE0 NywxMiArMTQ4LDE4IEBAIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IFdlYkF1dG9tYXRp b25TZXNzaW9uOjpwbGF0Zm9ybVdlYk1vZGlmaWVyc0Zyb21SYXcoCiAjaWYgRU5BQkxFKFdFQkRS SVZFUl9LRVlCT0FSRF9JTlRFUkFDVElPTlMpCiBzdGF0aWMgdm9pZCBkb0tleVN0cm9rZUV2ZW50 KHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiB2aWV3QmFja2VuZCwgYm9vbCBwcmVzc2VkLCB1aW50 MzJfdCBrZXlDb2RlLCB1aW50MzJfdCBtb2RpZmllcnMsIGJvb2wgZG9SZWxlYXNlQWZ0ZXJQcmVz cyA9IGZhbHNlKQogeworI2lmIGRlZmluZWQoV1BFX0VOQUJMRV9YS0IpICYmIFdQRV9FTkFCTEVf WEtCCiAgICAgc3RydWN0IHdwZV9pbnB1dF94a2Jfa2V5bWFwX2VudHJ5KiBlbnRyaWVzOwogICAg IHVpbnQzMl90IGVudHJpZXNDb3VudDsKICAgICB3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2Vu dHJpZXNfZm9yX2tleV9jb2RlKHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBr ZXlDb2RlLCAmZW50cmllcywgJmVudHJpZXNDb3VudCk7CiAgICAgc3RydWN0IHdwZV9pbnB1dF9r ZXlib2FyZF9ldmVudCBldmVudCA9IHsgMCwga2V5Q29kZSwgZW50cmllc0NvdW50ID8gZW50cmll c1swXS5oYXJkd2FyZV9rZXlfY29kZSA6IDAsIHByZXNzZWQsIG1vZGlmaWVycyB9OworI2Vsc2UK KyAgICBzdHJ1Y3Qgd3BlX2lucHV0X2tleWJvYXJkX2V2ZW50IGV2ZW50ID0geyAwLCBrZXlDb2Rl LCAwLCBwcmVzc2VkLCBtb2RpZmllcnMgfTsKKyNlbmRpZgogICAgIHdwZV92aWV3X2JhY2tlbmRf ZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQodmlld0JhY2tlbmQsICZldmVudCk7CisjaWYgZGVmaW5l ZChXUEVfRU5BQkxFX1hLQikgJiYgV1BFX0VOQUJMRV9YS0IKICAgICBmcmVlKGVudHJpZXMpOwor I2VuZGlmCiAKICAgICBpZiAoZG9SZWxlYXNlQWZ0ZXJQcmVzcykgewogICAgICAgICBBU1NFUlQo cHJlc3NlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmluZFdQRS5jbWFrZSBiL1NvdXJj ZS9jbWFrZS9GaW5kV1BFLmNtYWtlCmluZGV4IDdiYzQ5MzVjZjVlOC4uOTk1NzBmMDdjNDJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZFdQRS5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2Uv RmluZFdQRS5jbWFrZQpAQCAtODUsNiArODUsMTEgQEAgaWYgKFdQRV9JTkNMVURFX0RJUiBBTkQg Tk9UIFdQRV9WRVJTSU9OKQogICAgIGVuZGlmICgpCiBlbmRpZiAoKQogCisjIFZlcnNpb24gMS4x Mi4wIGlzIHRoZSBsYXN0IHJlbGVhc2Ugd2hlcmUgWEtCIHN1cHBvcnQgd2FzIGFsd2F5cyBwcmVz ZW50CitpZiAoV1BFX1ZFUlNJT04gVkVSU0lPTl9MRVNTX0VRVUFMIDEuMTIuMCkKKyAgICBsaXN0 KEFQUEVORCBXUEVfQ09NUElMRV9PUFRJT05TIC1EV1BFX0VOQUJMRV9YS0I9MSkKK2VuZGlmICgp CisKIGluY2x1ZGUoRmluZFBhY2thZ2VIYW5kbGVTdGFuZGFyZEFyZ3MpCiBmaW5kX3BhY2thZ2Vf aGFuZGxlX3N0YW5kYXJkX2FyZ3MoV1BFCiAgICAgRk9VTkRfVkFSIFdQRV9GT1VORApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ3NTljMTVmYjA3 YS4uYThkNDg1NWUyNWI2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDMtMjkgIERvbiBPbG1zdGVhZCAgPGRv bi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAgICBbTGliV1BFXSBHdWFyZCBsaWJ4a2Jjb21t b24gY29kZSB3aXRoIFdQRV9FTkFCTEVfWEtCCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg1MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBHdWFyZCBsaWJ3cGUgeGtiIGNvZGUgd2l0aCBXUEVfRU5BQkxF X1hLQi4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJv eHlMaWJXUEUuY3BwOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjprZXlEb3duKToK KwogMjAyMi0wMy0yOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBIVE1MQXR0YWNobWVudEVsZW1lbnQuZ2V0QXR0YWNobWVudElkZW50aWZpZXIoKSBz aG91bGQgcHJvcGFnYXRlIGF0dGFjaG1lbnQgZGF0YSB0byB0aGUgY2xpZW50CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNw cCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUu Y3BwCmluZGV4IGM3ZjYyODA0OWFmYS4uYzAxZjM0NTQ0Y2UxIDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcApA QCAtMzE3LDE0ICszMTcsMjAgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3Ry aW5nUmVmIGtleVJlZiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKIHsKICAgICB1aW50 MzJfdCBtb2RpZmllcnMgPSB3a0V2ZW50TW9kaWZpZXJzVG9XUEUod2tNb2RpZmllcnMpOwogICAg IHVpbnQzMl90IGtleVN5bSA9IHdwZUtleVN5bUZvcktleVJlZihrZXlSZWYsIGxvY2F0aW9uLCAm bW9kaWZpZXJzKTsKKyNpZiBkZWZpbmVkKFdQRV9FTkFCTEVfWEtCKSAmJiBXUEVfRU5BQkxFX1hL QgogICAgIHN0cnVjdCB3cGVfaW5wdXRfeGtiX2tleW1hcF9lbnRyeSogZW50cmllczsKICAgICB1 aW50MzJfdCBlbnRyaWVzQ291bnQ7CiAgICAgd3BlX2lucHV0X3hrYl9jb250ZXh0X2dldF9lbnRy aWVzX2Zvcl9rZXlfY29kZSh3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwga2V5 U3ltLCAmZW50cmllcywgJmVudHJpZXNDb3VudCk7CiAgICAgc3RydWN0IHdwZV9pbnB1dF9rZXli b2FyZF9ldmVudCBldmVudCB7IHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwga2V5U3ltLCBlbnRy aWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9kaWZp ZXJzIH07CisjZWxzZQorICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQg eyBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIGtleVN5bSwgMCwgdHJ1ZSwgbW9kaWZpZXJzIH07 CisjZW5kaWYKICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2tleWJvYXJkX2V2ZW50KHZp ZXdCYWNrZW5kKCptX3Rlc3RDb250cm9sbGVyKSwgJmV2ZW50KTsKICAgICBldmVudC5wcmVzc2Vk ID0gZmFsc2U7CiAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9rZXlib2FyZF9ldmVudCh2 aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZldmVudCk7CisjaWYgZGVmaW5lZChXUEVf RU5BQkxFX1hLQikgJiYgV1BFX0VOQUJMRV9YS0IKICAgICBmcmVlKGVudHJpZXMpOworI2VuZGlm CiB9CiAKIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmF3S2V5RG93bihXS1N0cmluZ1JlZiBrZXks IFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCB1bnNpZ25lZCBrZXlMb2NhdGlvbikK