218914 2020-11-13 10:20:03 -0800 Move some more WebKit and WebKitLegacy preferences bound to Settings to WebPreferences.yaml 2020-11-13 16:20:34 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam cdumez darin thorton webkit-bug-importer oldest_to_newest 1707297 0 sam 2020-11-13 10:20:03 -0800 Move some more WebKit and WebKitLegacy preferences bound to Settings to WebPreferences.yaml 1707301 1 414060 sam 2020-11-13 10:36:08 -0800 Created attachment 414060 Patch 1707419 2 ews-feeder 2020-11-13 16:02:43 -0800 Committed r269805: <https://trac.webkit.org/changeset/269805> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414060. 1707426 3 webkit-bug-importer 2020-11-13 16:20:34 -0800 <rdar://problem/71389606> 414060 2020-11-13 10:36:08 -0800 2020-11-13 16:02:44 -0800 Patch bug-218914-20201113103607.patch text/plain 23039 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTExLTEzICBTYW0gV2VpbmlnICA8d2Vpbmln QGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHNvbWUgbW9yZSBXZWJLaXQgYW5kIFdlYktpdExl Z2FjeSBwcmVmZXJlbmNlcyBib3VuZCB0byBTZXR0aW5ncyB0byBXZWJQcmVmZXJlbmNlcy55YW1s CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg5MTQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlcyBB cHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkLCBDb250ZW50RGlzcG9zaXRpb25BdHRhY2ht ZW50U2FuZGJveEVuYWJsZWQgYW5kCisgICAgICAgIFVzZUltYWdlRG9jdW1lbnRGb3JTdWJmcmFt ZVBERiBmcm9tIFNldHRpbmdzLnlhbWwgdG8gV2ViUHJlZmVyZW5jZXMueWFtbC4gTWVyZ2VzIGlu CisgICAgICAgIFdlYkNvcmUgdmFsdWVzIGZyb20gU2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5n RW5hYmxlZCBhbmQgcmVtb3ZlcyBiaW5kaW5nIG92ZXJyaWRlCisgICAgICAgIHNpbmNlIGl0IGNh biBub3cgYmUgZnVsbHkgZ2VuZXJhdGVkLiAKKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5j ZXMvV2ViUHJlZmVyZW5jZXMueWFtbDoKKwogMjAyMC0xMS0xMiAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBhZHZhbmNlZCBwbHVnLWluIGZl YXR1cmVzOiBzbmFwc2hvdHRpbmcgYW5kIHBsdWctaW4gbG9hZCBwb2xpY3kKSW5kZXg6IFNvdXJj ZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlcy55YW1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlcy55YW1sCShy ZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJl ZmVyZW5jZXMueWFtbAkod29ya2luZyBjb3B5KQpAQCAtMjUyLDYgKzI1MiwxNyBAQCBBbmltYXRl ZEltYWdlQXN5bmNEZWNvZGluZ0VuYWJsZWQ6CiAgICAgV2ViQ29yZToKICAgICAgIGRlZmF1bHQ6 IHRydWUKIAorQXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZDoKKyAgdHlwZTogYm9vbAor ICBkZWZhdWx0VmFsdWU6CisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UK KyAgICBXZWJLaXQ6CisgICAgICBQTEFURk9STShNQUMpOiBXZWJLaXQ6OmRlZmF1bHRBcHBsZU1h aWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkKCkKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgV2Vi Q29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKICMgRklYTUU6IElzIHRoaXMgaW1wbGVtZW50 ZWQgZm9yIFdlYktpdExlZ2FjeT8gSWYgbm90LCB0aGlzIHNob3VsZCBiZSBleGNsdWRlZCBmcm9t IFdlYktpdExlZ2FjeSBlbnRpcmVseSAodGhvdWdoIHdlIHNob3VsZCBzdGlsbCBzZXQgdGhlIGRl ZmF1bHQgdmFsdWUgdG8gZmFsc2Ugd2hlbiBpbml0aWFsaXppbmcgc2V0dGluZ3MpLgogQXBwbGVQ YXlDYXBhYmlsaXR5RGlzY2xvc3VyZUFsbG93ZWQ6CiAgIHR5cGU6IGJvb2wKQEAgLTQzNyw2ICs0 NDgsMjIgQEAgQ29udGVudENoYW5nZU9ic2VydmVyRW5hYmxlZDoKICAgICAgICJQTEFURk9STShJ T1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oTUFDQ0FUQUxZU1QpIjogdHJ1ZQogICAgICAgZGVmYXVs dDogZmFsc2UKIAorQ29udGVudERpc3Bvc2l0aW9uQXR0YWNobWVudFNhbmRib3hFbmFibGVkOgor ICBjb21tZW50OiAnU29tZSBwb3J0cyAoZS5nLiBpT1MpIG1pZ2h0IGNob29zZSB0byBkaXNwbGF5 IGF0dGFjaG1lbnRzIGlubGluZSwgcmVnYXJkbGVzcworICAgIG9mIHdoZXRoZXIgdGhlIHJlc3Bv bnNlIGluY2x1ZGVzIHRoZSBIVFRQIGhlYWRlciBcIkNvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFj aG1lbnRcIi4KKyAgICBUaGlzIHNldHRpbmcgZW5hYmxlcyBhIHNhbmRib3ggYXJvdW5kIHRoZXNl IGF0dGFjaG1lbnRzLiBUaGUgc2FuZGJveCBlbmZvcmNlcworICAgIGFsbCBmcmFtZSBzYW5kYm94 IGZsYWdzIChzZWUgZW51bSBTYW5kYm94RmxhZyBpbiBTZWN1cml0eUNvbnRleHQuaCksIGFuZCBh bHNvCisgICAgZGlzYWJsZXMgPG1ldGEgaHR0cC1lcXVpdj4gcHJvY2Vzc2luZyBhbmQgc3ViZnJh bWUgbG9hZGluZy4nCisgIHR5cGU6IGJvb2wKKyAgZGVmYXVsdFZhbHVlOgorICAgIFdlYktpdExl Z2FjeToKKyAgICAgIGRlZmF1bHQ6IHRydWUKKyAgICBXZWJLaXQ6CisgICAgICBQTEFURk9STShD T0NPQSk6IHRydWUKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViQ29yZToKKyAgICAgIGRl ZmF1bHQ6IGZhbHNlCisKICMgRklYTUU6IFRoaXMgaXMgaGFuZGxlZCB2aWEgV2ViVmlldyBTUEkg cmF0aGVyIHRoYW4gV2ViUHJlZmVyZW5jZXMgZm9yIFdlYktpdExlZ2FjeS4gV2Ugc2hvdWxkIGNo YW5nZSB0aGUgU1BJIHRvIGxvb2t1cCB0aGUgV2ViUHJlZmVyZW5jZXMgdmFsdWUgaW5zdGVhZC4K IENvb2tpZUVuYWJsZWQ6CiAgIHR5cGU6IGJvb2wKQEAgLTE4MjMsMTIgKzE4NTAsMTMgQEAgU2Ny b2xsQW5pbWF0b3JFbmFibGVkOgogU2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZDoK ICAgdHlwZTogYm9vbAogICB3ZWJjb3JlT25DaGFuZ2U6IHNjcm9sbGluZ1BlcmZvcm1hbmNlTG9n Z2luZ0VuYWJsZWRDaGFuZ2VkCi0gIHdlYmNvcmVCaW5kaW5nOiBjdXN0b20KICAgZGVmYXVsdFZh bHVlOgogICAgIFdlYktpdExlZ2FjeToKICAgICAgIGRlZmF1bHQ6IGZhbHNlCiAgICAgV2ViS2l0 OgogICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDogZmFs c2UKIAogIyBGSVhNRTogVGhpcyBpcyBoYW5kbGVkIHZpYSBXZWJWaWV3IFNQSSByYXRoZXIgdGhh biBXZWJQcmVmZXJlbmNlcyBmb3IgV2ViS2l0TGVnYWN5LiBXZSBzaG91bGQgY2hhbmdlIHRoZSBT UEkgdG8gbG9va3VwIHRoZSBXZWJQcmVmZXJlbmNlcyB2YWx1ZSBpbnN0ZWFkLgogU2VsZWN0VHJh aWxpbmdXaGl0ZXNwYWNlRW5hYmxlZDoKQEAgLTIyNzgsNiArMjMwNiwxOSBAQCBVc2VHaWFudFRp bGVzOgogICAgIFdlYkNvcmU6CiAgICAgICBkZWZhdWx0OiBmYWxzZQogCitVc2VJbWFnZURvY3Vt ZW50Rm9yU3ViZnJhbWVQREY6CisgIHR5cGU6IGJvb2wKKyAgZGVmYXVsdFZhbHVlOgorICAgIFdl YktpdExlZ2FjeToKKyAgICAgIFBMQVRGT1JNKElPU19GQU1JTFkpOiB0cnVlCisgICAgICBkZWZh dWx0OiBmYWxzZQorICAgIFdlYktpdDoKKyAgICAgIFBMQVRGT1JNKElPU19GQU1JTFkpOiB0cnVl CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6CisgICAgICBQTEFURk9STShJT1Nf RkFNSUxZKTogdHJ1ZQorICAgICAgZGVmYXVsdDogZmFsc2UKKwogVXNlTGVnYWN5QmFja2dyb3Vu ZFNpemVTaG9ydGhhbmRCZWhhdmlvcjoKICAgdHlwZTogYm9vbAogICBkZWZhdWx0VmFsdWU6Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0xMS0xMyAgU2FtIFdlaW5p ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBzb21lIG1vcmUgV2ViS2l0IGFu ZCBXZWJLaXRMZWdhY3kgcHJlZmVyZW5jZXMgYm91bmQgdG8gU2V0dGluZ3MgdG8gV2ViUHJlZmVy ZW5jZXMueWFtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE4OTE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW92ZXMgQXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCwgQ29udGVudERpc3Bvc2l0 aW9uQXR0YWNobWVudFNhbmRib3hFbmFibGVkIGFuZAorICAgICAgICBVc2VJbWFnZURvY3VtZW50 Rm9yU3ViZnJhbWVQREYgZnJvbSBTZXR0aW5ncy55YW1sIHRvIFdlYlByZWZlcmVuY2VzLnlhbWwg YW5kIG1lcmdlcyBpbgorICAgICAgICBXZWJDb3JlIHZhbHVlcyBmb3IgU2Nyb2xsaW5nUGVyZm9y bWFuY2VMb2dnaW5nRW5hYmxlZC4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKwog MjAyMC0xMS0xMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlIHVudXNlZCBhZHZhbmNlZCBwbHVnLWluIGZlYXR1cmVzOiBzbmFwc2hvdHRpbmcgYW5kIHBs dWctaW4gbG9hZCBwb2xpY3kKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwJKHJldmlz aW9uIDI2OTc4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAkod29ya2lu ZyBjb3B5KQpAQCAtNDEsMTIgKzQxLDYgQEAgQW5pbWF0ZWRJbWFnZURlYnVnQ2FudmFzRHJhd2lu Z0VuYWJsZWQ6CiAgICAgV2ViQ29yZToKICAgICAgIGRlZmF1bHQ6IGZhbHNlCiAKLUFwcGxlTWFp bFBhZ2luYXRpb25RdWlya0VuYWJsZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgZGVmYXVsdFZhbHVlOgot ICAgIFdlYkNvcmU6Ci0gICAgICBkZWZhdWx0OiBmYWxzZQotCiBBdWRpb1BsYXliYWNrUmVxdWly ZXNVc2VyR2VzdHVyZToKICAgdHlwZTogYm9vbAogICBkZWZhdWx0VmFsdWU6CkBAIC04OCwxOCAr ODIsNiBAQCBDbGlwYm9hcmRBY2Nlc3NQb2xpY3k6CiAgICAgV2ViQ29yZToKICAgICAgIGRlZmF1 bHQ6IENsaXBib2FyZEFjY2Vzc1BvbGljeTo6UmVxdWlyZXNVc2VyR2VzdHVyZQogCi1Db250ZW50 RGlzcG9zaXRpb25BdHRhY2htZW50U2FuZGJveEVuYWJsZWQ6Ci0gIGNvbW1lbnQ6ID4tCi0gICAg U29tZSBwb3J0cyAoZS5nLiBpT1MpIG1pZ2h0IGNob29zZSB0byBkaXNwbGF5IGF0dGFjaG1lbnRz IGlubGluZSwgcmVnYXJkbGVzcyBvZiB3aGV0aGVyIHRoZQotICAgIHJlc3BvbnNlIGluY2x1ZGVz IHRoZSBIVFRQIGhlYWRlciBcIkNvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnRcIi4gVGhp cyBzZXR0aW5nIGVuYWJsZXMKLSAgICBhIHNhbmRib3ggYXJvdW5kIHRoZXNlIGF0dGFjaG1lbnRz LiBUaGUgc2FuZGJveCBlbmZvcmNlcyBhbGwgZnJhbWUgc2FuZGJveCBmbGFncyAoc2VlIGVudW0K LSAgICBTYW5kYm94RmxhZyBpbiBTZWN1cml0eUNvbnRleHQuaCksIGFuZCBhbHNvIGRpc2FibGVz IDxtZXRhIGh0dHAtZXF1aXY+IHByb2Nlc3NpbmcgYW5kIHN1YmZyYW1lCi0gICAgbG9hZGluZy4K LSAgdHlwZTogYm9vbAotICBkZWZhdWx0VmFsdWU6Ci0gICAgV2ViQ29yZToKLSAgICAgIGRlZmF1 bHQ6IGZhbHNlCi0KIENyb3NzT3JpZ2luQ2hlY2tJbkdldE1hdGNoZWRDU1NSdWxlc0Rpc2FibGVk OgogICB0eXBlOiBib29sCiAgIGRlZmF1bHRWYWx1ZToKQEAgLTQ1OSwxMyArNDQxLDYgQEAgU2Ny b2xsaW5nQ29vcmRpbmF0b3JFbmFibGVkOgogICAgIFdlYkNvcmU6CiAgICAgICBkZWZhdWx0OiBm YWxzZQogCi1TY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkOgotICB0eXBlOiBib29s Ci0gIHdlYmNvcmVPbkNoYW5nZTogc2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZENo YW5nZWQKLSAgZGVmYXVsdFZhbHVlOgotICAgIFdlYkNvcmU6Ci0gICAgICBkZWZhdWx0OiBmYWxz ZQotCiBTY3JvbGxpbmdUcmVlSW5jbHVkZXNGcmFtZXM6CiAgIHR5cGU6IGJvb2wKICAgZGVmYXVs dFZhbHVlOgpAQCAtNTkwLDEyICs1NjUsNiBAQCBVc2VBbm9ueW1vdXNNb2RlV2hlbkZldGNoaW5n TWFza0ltYWdlczoKICAgICBXZWJDb3JlOgogICAgICAgZGVmYXVsdDogdHJ1ZQogCi1Vc2VJbWFn ZURvY3VtZW50Rm9yU3ViZnJhbWVQREY6Ci0gIHR5cGU6IGJvb2wKLSAgZGVmYXVsdFZhbHVlOgot ICAgIFdlYkNvcmU6Ci0gICAgICBkZWZhdWx0OiBmYWxzZQotCiBVc2VySW50ZXJmYWNlRGlyZWN0 aW9uUG9saWN5OgogICB0eXBlOiB1aW50MzJfdAogICByZWZpbmVkVHlwZTogVXNlckludGVyZmFj ZURpcmVjdGlvblBvbGljeQpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTc4NSkKKysrIFNvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDcgQEAKKzIwMjAt MTEtMTMgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc29t ZSBtb3JlIFdlYktpdCBhbmQgV2ViS2l0TGVnYWN5IHByZWZlcmVuY2VzIGJvdW5kIHRvIFNldHRp bmdzIHRvIFdlYlByZWZlcmVuY2VzLnlhbWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxODkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29u c3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUp OgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxl ZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwbGVNYWlsTGlu ZXNDbGFtcEVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICBSZW1vdmVzIGFwcGxlTWFpbFBhZ2lu YXRpb25RdWlya0VuYWJsZWQgYW5kIGFwcGxlTWFpbExpbmVzQ2xhbXBFbmFibGVkLiAKKyAgICAg ICAgYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCBpcyBub3cgaGFuZGxlZCB2aWEgdGhl IHByZWZlcmVuY2VzIGluZnJhc3RydWN0dXJlCisgICAgICAgIGFuZCBhcHBsZU1haWxMaW5lc0Ns YW1wRW5hYmxlZCB3YXMgdW51c2VkLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2Vz RGVmYXVsdFZhbHVlcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRBcHBsZU1haWxQYWdp bmF0aW9uUXVpcmtFbmFibGVkKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZh dWx0VmFsdWVzLmg6CisgICAgICAgIEFkZHMgZGVmYXVsdCB2YWx1ZSBmb3IgQXBwbGVNYWlsUGFn aW5hdGlvblF1aXJrRW5hYmxlZCwgd2hpY2ggaXMgbm93IGluIFdlYlByZWZlcmVuY2VzLnlhbWwu CisgICAgICAgIE1vdmVkIGZyb20gV2ViUGFnZVByb3h5TWFjLm1tCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVw ZGF0ZVByZWZlcmVuY2VzKToKKyAgICAgICAgUmVtb3ZlcyBleHBsaWNpdCBzZXR0aW5nIG9mIHNl dEFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQsIHNldENvbnRlbnREaXNwb3NpdGlvbkF0 dGFjaG1lbnRTYW5kYm94RW5hYmxlZCwKKyAgICAgICAgc2V0U2Nyb2xsaW5nUGVyZm9ybWFuY2VM b2dnaW5nRW5hYmxlZCBhbmQgc2V0VXNlSW1hZ2VEb2N1bWVudEZvclN1YmZyYW1lUERGIHdoaWNo IGFyZSBhbGwgZ2VuZXJhdGVkIG5vdy4KKyAgICAgICAgTGF5b3V0Vmlld3BvcnRIZWlnaHRFeHBh bnNpb25GYWN0b3Igd2FzIGFscmVhZHkgZ2VuZXJhdGVkIHNvIHRoaXMgY2FsbCB3YXMganVzdCBy ZWR1bmRhbnQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFi bGVkKTogRGVsZXRlZC4KKyAgICAgICAgSXQncyBhbHNvIG5vIGxvbmdlciBuZWNlc3NhcnkgdG8g c3RvcmUgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkIGFzIHRoZSB2YWx1ZQor ICAgICAgICBjYW4gYmUgZXh0cmFjdGVkIGRpcmVjdGx5IGZyb20gdGhlIHN0b3JlIGluIHRoZSBv bmUgcGxhY2UgaXQgd2FzIHJlYWQuIHNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJs ZWQKKyAgICAgICAgd2FzIG5ldmVyIGNhbGxlZCwgc28gaGFzIGJlZW4gcmVtb3ZlZC4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1 cGRhdGVQcmVmZXJlbmNlcyk6CisgICAgICAgIEV4dHJhY3Qgc2Nyb2xsaW5nUGVyZm9ybWFuY2VM b2dnaW5nRW5hYmxlZCBkaXJlY3RseSBmcm9tIHRoZSBzdG9yZSByYXRoZXIgdGhhbiBoYXZpbmcg dGhlIHBhZ2UKKyAgICAgICAgc2V0IGl0IGp1c3QgZm9yIHRoaXMgb25lIHBsYWNlIHRvIHJlYWQg aXQuCisKIDIwMjAtMTEtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbW92ZSB1bnVzZWQgYWR2YW5jZWQgcGx1Zy1pbiBmZWF0dXJlczogc25hcHNob3R0aW5n IGFuZCBwbHVnLWluIGxvYWQgcG9saWN5CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjY5Nzg1KQorKysg U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyNyw4ICsxMjcsNiBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnM6OmVuY29kZShJCiAjaWYgUExBVEZPUk0oV0lOKQogICAgIGVuY29kZXIgPDwgbmF0aXZlV2lu ZG93SGFuZGxlOwogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBhcHBsZU1haWxQYWdpbmF0aW9uUXVp cmtFbmFibGVkOwotICAgIGVuY29kZXIgPDwgYXBwbGVNYWlsTGluZXNDbGFtcEVuYWJsZWQ7CiAg ICAgZW5jb2RlciA8PCBzaG91bGRTY2FsZVZpZXdUb0ZpdERvY3VtZW50OwogICAgIGVuY29kZXIg PDwgdXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbjsKICAgICBlbmNvZGVyIDw8IG9ic2VydmVk TGF5b3V0TWlsZXN0b25lczsKQEAgLTM5NiwxMiArMzk0LDYgQEAgT3B0aW9uYWw8V2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVycz4gV2ViUAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogI2Vu ZGlmCiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuYXBwbGVNYWlsUGFnaW5h dGlvblF1aXJrRW5hYmxlZCkpCi0gICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0KLSAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuYXBwbGVNYWlsTGluZXNDbGFtcEVuYWJsZWQp KQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCiAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpKQogICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAg LTE4Niw4ICsxODYsNiBAQCBzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyB7CiAjaWYg UExBVEZPUk0oV0lOKQogICAgIHVpbnQ2NF90IG5hdGl2ZVdpbmRvd0hhbmRsZTsKICNlbmRpZgot ICAgIGJvb2wgYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZDsKLSAgICBib29sIGFwcGxl TWFpbExpbmVzQ2xhbXBFbmFibGVkOwogICAgIGJvb2wgc2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1 bWVudDsKIAogICAgIFdlYkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24gdXNlcklu dGVyZmFjZUxheW91dERpcmVjdGlvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBy ZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9T aGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmNwcAkocmV2aXNpb24gMjY5Nzg1KQor KysgU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsMTQgQEAgYm9vbCBkZWZhdWx0RGlzYWxsb3dTeW5j WEhSRHVyaW5nUGFnZURpcwogCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykKKworYm9vbCBk ZWZhdWx0QXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCgpCit7CisgICAgcmV0dXJuIFdl YkNvcmU6Ok1hY0FwcGxpY2F0aW9uOjppc0FwcGxlTWFpbCgpOworfQorCisjZW5kaWYKIAogc3Rh dGljIGJvb2wgZGVmYXVsdEFzeW5jRnJhbWVBbmRPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQoKQog ewpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVz LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZh dWx0VmFsdWVzLmgJKHJldmlzaW9uIDI2OTc4NSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSwx MCBAQCBib29sIGRlZmF1bHRQYXNzaXZlV2hlZWxMaXN0ZW5lcnNBc0RlZmF1CiBib29sIGRlZmF1 bHREaXNhbGxvd1N5bmNYSFJEdXJpbmdQYWdlRGlzbWlzc2FsRW5hYmxlZCgpOwogI2VuZGlmCiAK KyNpZiBQTEFURk9STShNQUMpCitib29sIGRlZmF1bHRBcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtF bmFibGVkKCk7CisjZW5kaWYKKwogI2lmICFQTEFURk9STShNQUNDQVRBTFlTVCkgJiYgIVBMQVRG T1JNKFdBVENIT1MpCiBib29sIGFsbG93c0RlcHJlY2F0ZWRTeW5jaHJvbm91c1hNTEh0dHBSZXF1 ZXN0RHVyaW5nVW5sb2FkKCk7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjY5Nzg1KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzgzNiwxOSArNzgzNiw2 IEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjoKICAgICBwYXJhbWV0 ZXJzLmNhblNob3dXaGlsZUxvY2tlZCA9IG1fY29uZmlndXJhdGlvbi0+Y2FuU2hvd1doaWxlTG9j a2VkKCk7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykKLSAgICBwYXJhbWV0ZXJzLmFwcGxl TWFpbFBhZ2luYXRpb25RdWlya0VuYWJsZWQgPSBhcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFi bGVkKCk7Ci0jZWxzZQotICAgIHBhcmFtZXRlcnMuYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5h YmxlZCA9IGZhbHNlOwotI2VuZGlmCi0gICAgCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIC8vIEZJ WE1FOiBOZWVkIHRvIHN1cHBvcnQgaU9TIHRvbywgYnV0IHRoZXJlIGlzIG5vIGlzQXBwbGVNYWls IGZvciBpT1MuCi0gICAgcGFyYW1ldGVycy5hcHBsZU1haWxMaW5lc0NsYW1wRW5hYmxlZCA9IGFw cGxlTWFpbExpbmVzQ2xhbXBFbmFibGVkKCk7Ci0jZWxzZQotICAgIHBhcmFtZXRlcnMuYXBwbGVN YWlsTGluZXNDbGFtcEVuYWJsZWQgPSBmYWxzZTsKLSNlbmRpZgotCiAjaWYgUExBVEZPUk0oQ09D T0EpCiAgICAgcGFyYW1ldGVycy5zbWFydEluc2VydERlbGV0ZUVuYWJsZWQgPSBtX2lzU21hcnRJ bnNlcnREZWxldGVFbmFibGVkOwogICAgIHBhcmFtZXRlcnMuYWRkaXRpb25hbFN1cHBvcnRlZElt YWdlVHlwZXMgPSBtX2NvbmZpZ3VyYXRpb24tPmFkZGl0aW9uYWxTdXBwb3J0ZWRJbWFnZVR5cGVz KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24g MjY5Nzg1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTIxMDMsMTUgKzIxMDMsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkUGVy Zm9ybURpY3Rpb25hcnlMb29rdXAoY29uc3QgV2ViQ29yZTo6RGljdGlvbmFyeVBvcHVwSW5mbyYp OwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpCi0gICAgYm9vbCBhcHBsZU1haWxQYWdpbmF0 aW9uUXVpcmtFbmFibGVkKCk7Ci0jZW5kaWYKLQotI2lmIFBMQVRGT1JNKE1BQykKLSAgICAvLyBG SVhNRTogTmVlZCB0byBzdXBwb3J0IGlPUyB0b28sIGJ1dCB0aGVyZSBpcyBubyBpc0FwcGxlTWFp bCBmb3IgaU9TLgotICAgIGJvb2wgYXBwbGVNYWlsTGluZXNDbGFtcEVuYWJsZWQoKTsKLSNlbmRp ZgotCiAgICAgLy8gU3BlbGxpbmcgYW5kIGdyYW1tYXIuCiAgICAgdm9pZCBjaGVja1NwZWxsaW5n T2ZTdHJpbmcoY29uc3QgU3RyaW5nJiB0ZXh0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGludDMy X3QgbWlzc3BlbGxpbmdMb2NhdGlvbiwgaW50MzJfdCBtaXNzcGVsbGluZ0xlbmd0aCk+JiYpOwog ICAgIHZvaWQgY2hlY2tHcmFtbWFyT2ZTdHJpbmcoY29uc3QgU3RyaW5nJiB0ZXh0LCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJDb3JlOjpHcmFtbWFyRGV0YWlsPiYmLCBpbnQzMl90 IGJhZEdyYW1tYXJMb2NhdGlvbiwgaW50MzJfdCBiYWRHcmFtbWFyTGVuZ3RoKT4mJik7CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0JKHJl dmlzaW9uIDI2OTc4NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv eHlNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTU5MSwxNiArNTkxLDYgQEAgQ0dSZWN0IFdlYlBh Z2VQcm94eTo6Ym91bmRzT2ZMYXllckluTGF5ZQogICAgIHJldHVybiBwYWdlQ2xpZW50KCkuYm91 bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGluYXRlcyhsYXllcik7CiB9CiAKLWJv b2wgV2ViUGFnZVByb3h5OjphcHBsZU1haWxQYWdpbmF0aW9uUXVpcmtFbmFibGVkKCkKLXsKLSAg ICByZXR1cm4gTWFjQXBwbGljYXRpb246OmlzQXBwbGVNYWlsKCk7Ci19Ci0KLWJvb2wgV2ViUGFn ZVByb3h5OjphcHBsZU1haWxMaW5lc0NsYW1wRW5hYmxlZCgpCi17Ci0gICAgcmV0dXJuIE1hY0Fw cGxpY2F0aW9uOjppc0FwcGxlTWFpbCgpOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6dXBkYXRl RWRpdG9yU3RhdGUoY29uc3QgRWRpdG9yU3RhdGUmIGVkaXRvclN0YXRlKQogewogICAgIGJvb2wg Y291bGRDaGFuZ2VTZWN1cmVJbnB1dFN0YXRlID0gbV9lZGl0b3JTdGF0ZS5pc0luUGFzc3dvcmRG aWVsZCAhPSBlZGl0b3JTdGF0ZS5pc0luUGFzc3dvcmRGaWVsZCB8fCBtX2VkaXRvclN0YXRlLnNl bGVjdGlvbklzTm9uZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzI0LDcgKzcyNCw2IEBA IFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCAKICAgICBpZiAoV2ViTWVk aWFLZXlTdG9yYWdlTWFuYWdlciogbWFuYWdlciA9IHdlYlByb2Nlc3Muc3VwcGxlbWVudDxXZWJN ZWRpYUtleVN0b3JhZ2VNYW5hZ2VyPigpKQogICAgICAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0 TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShtYW5hZ2VyLT5tZWRpYUtleVN0b3JhZ2VEaXJlY3Rv cnkoKSk7CiAjZW5kaWYKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0QXBwbGVNYWlsUGFnaW5h dGlvblF1aXJrRW5hYmxlZChwYXJhbWV0ZXJzLmFwcGxlTWFpbFBhZ2luYXRpb25RdWlya0VuYWJs ZWQpOwogICAgIAogICAgIGlmIChwYXJhbWV0ZXJzLnZpZXdTY2FsZUZhY3RvciAhPSAxKQogICAg ICAgICBzY2FsZVZpZXcocGFyYW1ldGVycy52aWV3U2NhbGVGYWN0b3IpOwpAQCAtNzMyLDcgKzcz MSw2IEBAIFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCAKICAgICBtX3Bh Z2UtPmFkZExheW91dE1pbGVzdG9uZXMocGFyYW1ldGVycy5vYnNlcnZlZExheW91dE1pbGVzdG9u ZXMpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldENv bnRlbnREaXNwb3NpdGlvbkF0dGFjaG1lbnRTYW5kYm94RW5hYmxlZCh0cnVlKTsKICAgICBzZXRT bWFydEluc2VydERlbGV0ZUVuYWJsZWQocGFyYW1ldGVycy5zbWFydEluc2VydERlbGV0ZUVuYWJs ZWQpOwogICAgIFdlYkNvcmU6OnNldEFkZGl0aW9uYWxTdXBwb3J0ZWRJbWFnZVR5cGVzKHBhcmFt ZXRlcnMuYWRkaXRpb25hbFN1cHBvcnRlZEltYWdlVHlwZXMpOwogCkBAIC0zNzUwLDkgKzM3NDgs NiBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKGNvbnN0IFdlCiAgICAgbV9hc3lu Y2hyb25vdXNQbHVnaW5Jbml0aWFsaXphdGlvbkVuYWJsZWRGb3JBbGxQbHVnaW5zID0gc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojphc3luY2hyb25vdXNQbHVnaW5J bml0aWFsaXphdGlvbkVuYWJsZWRGb3JBbGxQbHVnaW5zS2V5KCkpOwogICAgIG1fYXJ0aWZpY2lh bFBsdWdpbkluaXRpYWxpemF0aW9uRGVsYXlFbmFibGVkID0gc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjphcnRpZmljaWFsUGx1Z2luSW5pdGlhbGl6YXRpb25EZWxh eUVuYWJsZWRLZXkoKSk7CiAKLSAgICBtX3Njcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJs ZWQgPSBzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNjcm9sbGlu Z1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWRLZXkoKSk7Ci0gICAgc2V0dGluZ3Muc2V0U2Nyb2xs aW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZChtX3Njcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2lu Z0VuYWJsZWQpOwotCiAgICAgYm9vbCBpc0FwcE5hcEVuYWJsZWQgPSBzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3Vw cHJlc3Npb25FbmFibGVkS2V5KCkpOwogICAgIGlmIChtX2lzQXBwTmFwRW5hYmxlZCAhPSBpc0Fw cE5hcEVuYWJsZWQpIHsKICAgICAgICAgbV9pc0FwcE5hcEVuYWJsZWQgPSBpc0FwcE5hcEVuYWJs ZWQ7CkBAIC0zNzY4LDggKzM3NjMsNiBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2Vz KGNvbnN0IFdlCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHNldEZvcmNlQWx3YXlz VXNlclNjYWxhYmxlKG1fZm9yY2VBbHdheXNVc2VyU2NhbGFibGUgfHwgc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojpmb3JjZUFsd2F5c1VzZXJTY2FsYWJsZUtleSgp KSk7Ci0KLSAgICBzZXR0aW5ncy5zZXRVc2VJbWFnZURvY3VtZW50Rm9yU3ViZnJhbWVQREYodHJ1 ZSk7CiAjaWYgSEFWRShBVktJVCkKICAgICBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldEFW S2l0RW5hYmxlZCh0cnVlKTsKICNlbmRpZgpAQCAtMzc5MSw4ICszNzg0LDYgQEAgdm9pZCBXZWJQ YWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZQogICAgIH0KICNlbmRpZgogCi0gICAgc2V0 dGluZ3Muc2V0TGF5b3V0Vmlld3BvcnRIZWlnaHRFeHBhbnNpb25GYWN0b3Ioc3RvcmUuZ2V0RG91 YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxheW91dFZpZXdwb3J0SGVpZ2h0RXhw YW5zaW9uRmFjdG9yS2V5KCkpKTsKLQogI2lmIEVOQUJMRShBUFBfQk9VTkRfRE9NQUlOUykKICAg ICBtX25lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrcyA9IHN0b3JlLmdldEJvb2xWYWx1ZUZv cktleShXZWJQcmVmZXJlbmNlc0tleTo6bmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzS2V5 KCkpOwogI2VuZGlmCkBAIC01Mzg4LDE3ICs1Mzc5LDYgQEAgRnJhbWVWaWV3KiBXZWJQYWdlOjpt YWluRnJhbWVWaWV3KCkgY29ucwogICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lkIFdlYlBh Z2U6OnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQot ewotICAgIG1fc2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZCA9IGVuYWJsZWQ7Ci0K LSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+dmll dygpOwotICAgIGlmICghZnJhbWVWaWV3KQotICAgICAgICByZXR1cm47Ci0KLSAgICBmcmFtZVZp ZXctPnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoZW5hYmxlZCk7Ci19Ci0K IGJvb2wgV2ViUGFnZTo6Y2FuUGx1Z2luSGFuZGxlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCiB7CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiAy Njk3ODUpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdv cmtpbmcgY29weSkKQEAgLTEwNzQsOSArMTA3NCw2IEBAIHB1YmxpYzoKICAgICBib29sIGFydGlm aWNpYWxQbHVnaW5Jbml0aWFsaXphdGlvbkRlbGF5RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1f YXJ0aWZpY2lhbFBsdWdpbkluaXRpYWxpemF0aW9uRGVsYXlFbmFibGVkOyB9CiAgICAgdm9pZCBz ZXRBcnRpZmljaWFsUGx1Z2luSW5pdGlhbGl6YXRpb25EZWxheUVuYWJsZWQoYm9vbCBlbmFibGVk KSB7IG1fYXJ0aWZpY2lhbFBsdWdpbkluaXRpYWxpemF0aW9uRGVsYXlFbmFibGVkID0gZW5hYmxl ZDsgfQogCi0gICAgYm9vbCBzY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKCkgY29u c3QgeyByZXR1cm4gbV9zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkOyB9Ci0gICAg dm9pZCBzZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKGJvb2wpOwotCiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgYm9vbCBzaG91bGRVc2VQREZQbHVnaW4oKSBjb25zdDsKICAg ICBib29sIHBkZlBsdWdpbkVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3BkZlBsdWdpbkVuYWJs ZWQ7IH0KQEAgLTE4MTMsNyArMTgxMCw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2FzeW5jaHJv bm91c1BsdWdpbkluaXRpYWxpemF0aW9uRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2Fz eW5jaHJvbm91c1BsdWdpbkluaXRpYWxpemF0aW9uRW5hYmxlZEZvckFsbFBsdWdpbnMgeyBmYWxz ZSB9OwogICAgIGJvb2wgbV9hcnRpZmljaWFsUGx1Z2luSW5pdGlhbGl6YXRpb25EZWxheUVuYWJs ZWQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFi bGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fbWFpbkZyYW1lSXNTY3JvbGxhYmxlIHsgdHJ1ZSB9 OwogCiAgICAgYm9vbCBtX2Fsd2F5c1Nob3dzSG9yaXpvbnRhbFNjcm9sbGVyIHsgZmFsc2UgfTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0JKHJldmlzaW9u IDI2OTc4NSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsOCBA QAogI2ltcG9ydCAiV2ViUGFnZS5oIgogI2ltcG9ydCAiV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKKyNpbXBvcnQgIldlYlByZWZl cmVuY2VzS2V5cy5oIgorI2ltcG9ydCAiV2ViUHJlZmVyZW5jZXNTdG9yZS5oIgogI2ltcG9ydCAi V2ViUHJvY2Vzcy5oIgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9RdWFydHpDb3JlU1BJLmg+CiAj aW1wb3J0IDxRdWFydHpDb3JlL1F1YXJ0ekNvcmUuaD4KQEAgLTIxMywxMyArMjE1LDEzIEBAIHZv aWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnRyaWcKICAgICBzY2hlZHVsZVJlbmRl cmluZ1VwZGF0ZVJ1bkxvb3BPYnNlcnZlcigpOwogfQogCi12b2lkIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3Jl JikKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVByZWZlcmVuY2Vz KGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogewogICAgIFNldHRpbmdzJiBzZXR0 aW5ncyA9IG1fd2ViUGFnZS5jb3JlUGFnZSgpLT5zZXR0aW5ncygpOwogCiAjaWYgRU5BQkxFKEFT WU5DX1NDUk9MTElORykKICAgICBpZiAoQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xs aW5nQ29vcmRpbmF0b3IgPSBkb3duY2FzdDxBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yPihtX3dl YlBhZ2UuY29yZVBhZ2UoKS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkpIHsKLSAgICAgICAgYm9v bCBzY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkID0gbV93ZWJQYWdlLnNjcm9sbGlu Z1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoKTsKKyAgICAgICAgYm9vbCBzY3JvbGxpbmdQZXJm b3JtYW5jZUxvZ2dpbmdFbmFibGVkID0gc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5OjpzY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkS2V5KCkpOwogICAg ICAgICAKICAgICAgICAgUmVmUHRyPFNjcm9sbGluZ1RyZWU+IHNjcm9sbGluZ1RyZWUgPSBzY3Jv bGxpbmdDb29yZGluYXRvci0+c2Nyb2xsaW5nVHJlZSgpOwogICAgICAgICBTY3JvbGxpbmdUaHJl YWQ6OmRpc3BhdGNoKFtzY3JvbGxpbmdUcmVlLCBzY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdF bmFibGVkXSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjk3 ODUpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNiBAQAorMjAyMC0xMS0xMyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5j b20+CisKKyAgICAgICAgTW92ZSBzb21lIG1vcmUgV2ViS2l0IGFuZCBXZWJLaXRMZWdhY3kgcHJl ZmVyZW5jZXMgYm91bmQgdG8gU2V0dGluZ3MgdG8gV2ViUHJlZmVyZW5jZXMueWFtbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4OTE0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1l TmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgIFJlbW92ZSBleHBsaWNpdCBzZXR0aW5nIG9mIFNl dHRpbmdzOjpzZXRDb250ZW50RGlzcG9zaXRpb25BdHRhY2htZW50U2FuZGJveEVuYWJsZWQgYXMK KyAgICAgICAgaXQgaXMgbm93IGhhbmRsZWQgYnkgdGhlIGdlbmVyYXRlZCBjb2RlLiBNZXJnZSB0 b2dldGhlciBhIGZldyBzZXF1ZW50aWFsICNpZmRlZnMgd2hpbGUKKyAgICAgICAgaW4gdGhlIGFy ZWEuCisKIDIwMjAtMTEtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbW92ZSB1bnVzZWQgYWR2YW5jZWQgcGx1Zy1pbiBmZWF0dXJlczogc25hcHNob3R0aW5n IGFuZCBwbHVnLWluIGxvYWQgcG9saWN5CkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAyNjk3ODUpCisrKyBTb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2NTMsNyArMTY1 Myw3IEBAIC0gKHZvaWQpX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1lTmEKIAogICAgIFdl Ykluc3RhbGxNZW1vcnlQcmVzc3VyZUhhbmRsZXIoKTsKIAotI2lmICFQTEFURk9STShJT1NfRkFN SUxZKQorI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAoIVdlYktpdExpbmtlZE9uT3JBZnRlcihX RUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0xPQ0FMX1JFU09VUkNFX1NFQ1VSSVRZX1JFU1RSSUNU SU9OKSkgewogICAgICAgICAvLyBPcmlnaW5hbGx5LCB3ZSBhbGxvd2VkIGFsbCBsb2NhbCBsb2Fk cy4KICAgICAgICAgV2ViQ29yZTo6U2VjdXJpdHlQb2xpY3k6OnNldExvY2FsTG9hZFBvbGljeShX ZWJDb3JlOjpTZWN1cml0eVBvbGljeTo6QWxsb3dMb2NhbExvYWRzRm9yQWxsKTsKQEAgLTE2NjIs MjIgKzE2NjIsMTYgQEAgLSAodm9pZClfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYQog ICAgICAgICAvLyB3aXRoIHN1YnN0aXR1dGUgZGF0YS4KICAgICAgICAgV2ViQ29yZTo6U2VjdXJp dHlQb2xpY3k6OnNldExvY2FsTG9hZFBvbGljeShXZWJDb3JlOjpTZWN1cml0eVBvbGljeTo6QWxs b3dMb2NhbExvYWRzRm9yTG9jYWxBbmRTdWJzdGl0dXRlRGF0YSk7CiAgICAgfQotI2VuZGlmCiAK LSNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKCFXZWJLaXRMaW5rZWRPbk9yQWZ0ZXIoV0VCS0lU X0ZJUlNUX1ZFUlNJT05fV0lUSE9VVF9DT05URU5UX1NOSUZGSU5HX0ZPUl9GSUxFX1VSTFMpKQog ICAgICAgICBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Zm9yY2VDb250ZW50U25pZmZpbmcoKTsK IAogICAgIF9wcml2YXRlLT5wYWdlLT5zZXREZXZpY2VTY2FsZUZhY3Rvcihbc2VsZiBfZGV2aWNl U2NhbGVGYWN0b3JdKTsKLSNlbmRpZgogCi0jaWYgSEFWRShPU19EQVJLX01PREVfU1VQUE9SVCkg JiYgUExBVEZPUk0oTUFDKQorI2lmIEhBVkUoT1NfREFSS19NT0RFX1NVUFBPUlQpCiAgICAgX3By aXZhdGUtPnBhZ2UtPmVmZmVjdGl2ZUFwcGVhcmFuY2VEaWRDaGFuZ2Uoc2VsZi5fZWZmZWN0aXZl QXBwZWFyYW5jZUlzRGFyaywgc2VsZi5fZWZmZWN0aXZlVXNlckludGVyZmFjZUxldmVsSXNFbGV2 YXRlZCk7CiAjZW5kaWYKIAotICAgIF9wcml2YXRlLT5wYWdlLT5zZXR0aW5ncygpLnNldENvbnRl bnREaXNwb3NpdGlvbkF0dGFjaG1lbnRTYW5kYm94RW5hYmxlZCh0cnVlKTsKLQotI2lmIFBMQVRG T1JNKE1BQykKICAgICBbV2ViVmlld1Zpc3VhbElkZW50aWZpY2F0aW9uT3ZlcmxheSBpbnN0YWxs Rm9yV2ViVmlld0lmTmVlZGVkOnNlbGYga2luZDpAIldlYlZpZXciIGRlcHJlY2F0ZWQ6WUVTXTsK ICNlbmRpZgogfQo=