209031 2020-03-12 17:56:05 -0700 Correct preference handling and naming conventions in AppBound browsing preferences 2020-03-12 20:09:51 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham aestes bfulgham commit-queue katherine_cheney webkit-bug-importer wilander oldest_to_newest 1629435 0 bfulgham 2020-03-12 17:56:05 -0700 I made a mistake in the handling of preferences related to the IsInAppBrowserPrivacyEnabled and the quirk flag, which led to some code not executing when expected. This patch does the following: 1. Uses the correct naming scheme for WebKit Internal Debug flags. 2. Adds calls 'setIsNavigatingToAppBoundDomain' in WebPageProxy::decidePolicyForNewWindowAction and WebPageProxy::decidePolicyForResponseShared, which were missed previously. 3. Updates the local quirk state in WebPage when page settings change. 1629436 1 webkit-bug-importer 2020-03-12 17:56:40 -0700 <rdar://problem/60396298> 1629438 2 393434 bfulgham 2020-03-12 18:03:03 -0700 Created attachment 393434 Patch 1629443 3 393436 bfulgham 2020-03-12 18:20:07 -0700 Created attachment 393436 Patch 1629453 4 393436 wilander 2020-03-12 19:10:01 -0700 Comment on attachment 393436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393436&action=review > Source/WebKit/ChangeLog:10 > + and the quirk flag, which led to some code not executing when expected. Would be nice with a link to the revision or bug where the mistake was made. > Source/WebKit/ChangeLog:15 > + 'WebKitDebug', not 'WebKitInternal' or 'WebKitInternalDebug'. I don’t know these by heart so I trust you made doubly sure this time. :) 1629470 5 393436 commit-queue 2020-03-12 20:09:49 -0700 Comment on attachment 393436 Patch Clearing flags on attachment: 393436 Committed r258379: <https://trac.webkit.org/changeset/258379> 1629471 6 commit-queue 2020-03-12 20:09:51 -0700 All reviewed patches have been landed. Closing bug. 393434 2020-03-12 18:03:03 -0700 2020-03-12 18:20:05 -0700 Patch bug-209031-20200312180302.patch text/plain 11830 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4YTcyOWY5YjAzZDRkMzgw MTdkNDUzMThiMDIyMTYwYzcwODk4NDkuLmIxMjJmODIzODZhZWUyZjRkZjliZjI2MThmY2U0MmVi MGQxOGJmMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDMtMTIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdCBwcmVmZXJlbmNl IGhhbmRsaW5nIGFuZCBuYW1pbmcgY29udmVudGlvbnMgaW4gQXBwQm91bmQgYnJvd3NpbmcgcHJl ZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwOTAzMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAzOTYyOTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBtYWRlIGEgbWlzdGFrZSBpbiB0 aGUgaGFuZGxpbmcgb2YgcHJlZmVyZW5jZXMgcmVsYXRlZCB0byB0aGUgSXNJbkFwcEJyb3dzZXJQ cml2YWN5RW5hYmxlZAorICAgICAgICBhbmQgdGhlIHF1aXJrIGZsYWcsIHdoaWNoIGxlZCB0byBz b21lIGNvZGUgbm90IGV4ZWN1dGluZyB3aGVuIGV4cGVjdGVkLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggZG9lcyB0aGUgZm9sbG93aW5nOgorCisgICAgICAgIDEuIFVzZXMgdGhlIGNvcnJlY3QgbmFt aW5nIHNjaGVtZSBmb3IgV2ViS2l0IEludGVybmFsIERlYnVnIGZsYWdzLiBUaGV5IHNob3VsZCBi ZQorICAgICAgICAgICAnV2ViS2l0RGVidWcnLCBub3QgJ1dlYktpdEludGVybmFsJyBvciAnV2Vi S2l0SW50ZXJuYWxEZWJ1ZycuCisgICAgICAgIDIuIEFkZHMgY2FsbHMgJ3NldElzTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW4nIGluIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmV3V2lu ZG93QWN0aW9uCisgICAgICAgICAgIGFuZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJl c3BvbnNlU2hhcmVkLCB3aGljaCB3ZXJlIG1pc3NlZCBwcmV2aW91c2x5LgorICAgICAgICAzLiBV cGRhdGVzIHRoZSBsb2NhbCBxdWlyayBzdGF0ZSBpbiBXZWJQYWdlIHdoZW4gcGFnZSBzZXR0aW5n cyBjaGFuZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24p OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNl U2hhcmVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpwYXJh bWV0ZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKwogMjAyMC0wMy0xMSAg RG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIE5vbi11bmlm aWVkIGJ1aWxkIGZpeGVzIGVhcmx5IE1hcmNoIDIwMjAgZWRpdGlvbiBUYWtlIDIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZwppbmRleCBmZmQ4ODg1ODFhYjI5NzRkNmZkZDM5NjA4MzAwZjM1YTUx MzE2Y2QxLi40NTQ1NTRiNDBhNjE3MDAwNmIxOGFlZmE4NjZiOWQ5M2Y0YTIyZDRiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDMtMTIgIEJyZW50 IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdCBwcmVmZXJl bmNlIGhhbmRsaW5nIGFuZCBuYW1pbmcgY29udmVudGlvbnMgaW4gQXBwQm91bmQgYnJvd3Npbmcg cHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwOTAzMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAzOTYyOTg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb25zaXN0 ZW50bHkgdXNlcyB0aGUgY29ycmVjdCBuYW1pbmcgc2NoZW1lIGZvciBXZWJLaXQgSW50ZXJuYWwg RGVidWcgZmxhZ3MuCisgICAgICAgIFRoZXkgc2hvdWxkIGJlICdXZWJLaXREZWJ1ZycsIG5vdCAn V2ViS2l0SW50ZXJuYWwnIG9yICdXZWJLaXRJbnRlcm5hbERlYnVnJy4KKworICAgICAgICAqIFdl YlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQ cmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVyZW5jZXMgaW5pdGlhbGl6ZV0pOgor ICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBpc0luQXBwQnJvd3NlclByaXZhY3lFbmFibGVkXSk6 CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEluQXBwQnJvd3NlclByaXZhY3lFbmFibGVk Ol0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBuZWVkc0luQXBwQnJvd3NlclByaXZhY3lR dWlya3NdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0TmVlZHNJbkFwcEJyb3dzZXJQ cml2YWN5UXVpcmtzOl0pOgorCiAyMDIwLTAzLTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBNYWtlIFRleHRJdGVyYXRvcjo6cmFuZ2UgcmV0dXJuIGEgU2ltcGxl UmFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGM1MTJk NThiNjc0ODhlNGZlZjJhMTNhYzY1ZTU2MWRhN2QyODU2MTUuLmJmNTQ4ODRmOGZlNjk5NmIwMWM3 ZDA5ZWRlOTBmY2ZmMDkyN2Q0YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcApAQCAtNTI1NCwxMSArNTI1NCwxNSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRl UG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBGcmFtZQog ICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CiAgICAgTUVTU0FHRV9DSEVDS19V UkwobV9wcm9jZXNzLCByZXF1ZXN0LnVybCgpKTsKIAotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtl UmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbGlzdGVuZXJJRCwgZnJhbWVJRF0gKFBvbGlj eUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2Fm ZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nLCBOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbiBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKSBtdXRhYmxlIHsKKyAgICBh dXRvIHJlcXVlc3RVUkwgPSByZXF1ZXN0LnVybCgpOworICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtl UmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbGlzdGVuZXJJRCwgZnJhbWVJRCwgaXNNYWlu RnJhbWUgPSBmcmFtZS0+aXNNYWluRnJhbWUoKSwgcmVxdWVzdFVSTCA9IFdURk1vdmUocmVxdWVz dFVSTCldIChQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyos IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCwgUmVmUHRyPFNhZmVCcm93c2luZ1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZywgTmF2 aWdhdGluZ1RvQXBwQm91bmREb21haW4gaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbikgbXV0 YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBBc3NlcnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGljaWVz KiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGllbnRzIG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVz ZVdpdGhQb2xpY2llcyBnbyBhd2F5LgogICAgICAgICBSRUxFQVNFX0FTU0VSVChwcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vKTsK ICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZlQnJvd3NpbmdXYXJuaW5nLCAhc2FmZUJyb3dzaW5n V2FybmluZyk7CiAKKyAgICAgICAgaWYgKHBvbGljeUFjdGlvbiAhPSBQb2xpY3lBY3Rpb246Okln bm9yZSkKKyAgICAgICAgICAgIHNldElzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4oaXNNYWlu RnJhbWUsIHJlcXVlc3RVUkwsIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4pOworCiAgICAg ICAgIGF1dG8gc2VuZGVyID0gUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShpZGVudGlmaWVy LCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQs IGxpc3RlbmVySURdIChjb25zdCBhdXRvJiBwb2xpY3lEZWNpc2lvbikgewogICAgICAgICAgICAg c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQs IGxpc3RlbmVySUQsIHBvbGljeURlY2lzaW9uKSk7CiAgICAgICAgIH0pOwpAQCAtNTMwMSw3ICs1 MzA1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hhcmVk KFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywKICAgICBNRVNTQUdFX0NIRUNLX1VSTChw cm9jZXNzLCByZXF1ZXN0LnVybCgpKTsKICAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCBy ZXNwb25zZS51cmwoKSk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbiA9 IG5hdmlnYXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25J RCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBv bGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg d2ViUGFnZUlELCBmcmFtZUlELCBpZGVudGlmaWVyLCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uID0g V1RGTW92ZShuYXZpZ2F0aW9uKSwKKyAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+ c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIHdlYlBhZ2VJRCwgZnJhbWVJRCwgaWRlbnRpZmllciwgbGlzdGVuZXJJRCwgbmF2aWdh dGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbiksIGlzTWFpbkZyYW1lID0gZnJhbWUtPmlzTWFpbkZy YW1lKCksCiAgICAgICAgIHByb2Nlc3MgPSBwcm9jZXNzLmNvcHlSZWYoKV0gKFBvbGljeUFjdGlv biBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgUHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2FmZUJyb3dz aW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nLCBOYXZpZ2F0aW5nVG9BcHBCb3VuZERv bWFpbiBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKSBtdXRhYmxlIHsKICAgICAgICAgLy8g RklYTUU6IEFzc2VydCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBv bmNlIGNsaWVudHMgb2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3 YXkuCiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg PT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwpAQCAtNTMxMSw2ICs1MzE1LDkg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hhcmVkKFJlZjxX ZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywKICAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZUlELCBsaXN0ZW5l cklELCBwb2xpY3lEZWNpc2lvbiksIHdlYlBhZ2VJRCk7CiAgICAgICAgIH0pOwogICAgICAgICAK KyAgICAgICAgaWYgKHBvbGljeUFjdGlvbiAhPSBQb2xpY3lBY3Rpb246Oklnbm9yZSkKKyAgICAg ICAgICAgIHNldElzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4oaXNNYWluRnJhbWUsIG5hdmln YXRpb24tPmN1cnJlbnRSZXF1ZXN0KCkudXJsKCksIGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21h aW4pOworCiAgICAgICAgIHJlY2VpdmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBuYXZp Z2F0aW9uLmdldCgpLCBXVEY6Om51bGxvcHQsIFdURk1vdmUoc2VuZGVyKSk7CiAgICAgfSwgU2hv dWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0OjpObywgU2hvdWxkRXhwZWN0QXBwQm91bmREb21h aW5SZXN1bHQ6Ok5vKSk7CiAgICAgaWYgKG1fcG9saWN5Q2xpZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0 ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IGY2ZjE5NDgyNTc1NTBiNjI1MTZiZjIwMTgxNDVkY2M0 YmE5Y2E4N2YuLjRkZjE3NzYzNjcxNzE1NzcwM2Y0ZTczOWQzNWM3M2U0YWQ4YjhmOGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVE YXRhU3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTE2Nyw3ICsxNjcsNyBAQCBXZWJz aXRlRGF0YVN0b3JlUGFyYW1ldGVycyBXZWJzaXRlRGF0YVN0b3JlOjpwYXJhbWV0ZXJzKCkKICNl bmRpZgogCiAgICAgYm9vbCBzaG91bGRJbmNsdWRlTG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzID0gaXNTYWZhcmk7Ci0gICAgYm9vbCBpc0luQXBwQnJvd3NlclByaXZhY3lFbmFibGVk ID0gW2RlZmF1bHRzIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJbnRl cm5hbERlYnVnJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNJbkFwcEJyb3dzZXJQcml2YWN5RW5h YmxlZEtleSgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXTsKKyAgICBib29sIGlzSW5BcHBCcm93 c2VyUHJpdmFjeUVuYWJsZWQgPSBbZGVmYXVsdHMgYm9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5n V2l0aEZvcm1hdDpAIldlYktpdERlYnVnJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNJbkFwcEJy b3dzZXJQcml2YWN5RW5hYmxlZEtleSgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXTsKICAgICAK ICAgICBXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDFiYTc4OWFkMWEzMWM0 MDBjYWIxN2UwM2VmMmNiNDNhNjEwOGMzMDkuLmU3OWUwYjE0YjgxMGVjNzcxMmYwMzUwOTEwZTFj OWIyYzQzNTYyYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCkBAIC0zNzE2LDYgKzM3MTYsOCBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVu Y2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogCiAgICAgc2V0dGluZ3Muc2V0 TGF5b3V0Vmlld3BvcnRIZWlnaHRFeHBhbnNpb25GYWN0b3Ioc3RvcmUuZ2V0RG91YmxlVmFsdWVG b3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxheW91dFZpZXdwb3J0SGVpZ2h0RXhwYW5zaW9uRmFj dG9yS2V5KCkpKTsKIAorICAgIG1fbmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzID0gc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpuZWVkc0luQXBwQnJvd3Nl clByaXZhY3lRdWlya3NLZXkoKSk7CisKICAgICBpZiAobV9kcmF3aW5nQXJlYSkKICAgICAgICAg bV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMoc3RvcmUpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZh dGUuaAppbmRleCA5NjZiNmM0ZDM5NWEyOTM4MmM3MzYyMGU2MzJmY2VkMWYwYzNjYmU5Li43N2Iz OTg5NTAyMDI1ZTYxZDcyNzY5MGM1ZTllYzgxYjJkZGFlM2JiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRl LmgKQEAgLTI4NCw2ICsyODQsNiBAQAogI2RlZmluZSBXZWJLaXRSZXF1ZXN0SWRsZUNhbGxiYWNr RW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRSZXF1ZXN0SWRsZUNhbGxiYWNrRW5hYmxlZCIK ICNkZWZpbmUgV2ViS2l0QXN5bmNDbGlwYm9hcmRBUElFbmFibGVkUHJlZmVyZW5jZUtleSBAIldl YktpdEFzeW5jQ2xpcGJvYXJkQVBJRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0TGlua1ByZWxvYWRS ZXNwb25zaXZlSW1hZ2VzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRMaW5rUHJlbG9hZFJl c3BvbnNpdmVJbWFnZXNFbmFibGVkIgotI2RlZmluZSBXZWJLaXRJbnRlcm5hbERlYnVnSW5BcHBC cm93c2VyUHJpdmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SW50ZXJuYWxEZWJ1Z0lu QXBwQnJvd3NlclByaXZhY3lFbmFibGVkIgorI2RlZmluZSBXZWJLaXREZWJ1Z0luQXBwQnJvd3Nl clByaXZhY3lFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdERlYnVnSW5BcHBCcm93c2VyUHJp dmFjeUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdEFzcGVjdFJhdGlvT2ZJbWdGcm9tV2lkdGhBbmRI ZWlnaHRFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEFzcGVjdFJhdGlvT2ZJbWdGcm9tV2lk dGhBbmRIZWlnaHRFbmFibGVkIgotI2RlZmluZSBXZWJLaXRJbnRlcm5hbERlYnVnTmVlZHNJbkFw cEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleSBAIldlYktpdEludGVybmFsRGVidWdO ZWVkc0luQXBwQnJvd3NlclByaXZhY3lRdWlya3MiCisjZGVmaW5lIFdlYktpdERlYnVnTmVlZHNJ bkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleSBAIldlYktpdE5lZWRzSW5BcHBC cm93c2VyUHJpdmFjeVF1aXJrcyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4IDJiZDA0NzA2NzJlM2QwOWI4NDYwN2NmY2M5YmU5 MTEzNWU1YzdlNmIuLjAyNzkzOTQzMDgwNDZiOGEyODNhYjZhYTM2MDQ4MjlhYjI5ZmQxYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQpAQCAtNzEwLDEwICs3MTAsMTAgQEAgKyAodm9pZClpbml0aWFsaXplCiAgICAgICAgIEBOTywg V2ViS2l0QXN5bmNDbGlwYm9hcmRBUElFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgQE5P LCBXZWJLaXRMaW5rUHJlbG9hZFJlc3BvbnNpdmVJbWFnZXNFbmFibGVkUHJlZmVyZW5jZUtleSwK ICAgICAgICAgQFlFUywgV2ViS2l0Q1NTU2hhZG93UGFydHNFbmFibGVkUHJlZmVyZW5jZUtleSwK LSAgICAgICAgQE5PLCBXZWJLaXRJbnRlcm5hbERlYnVnSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJs ZWRQcmVmZXJlbmNlS2V5LAorICAgICAgICBATk8sIFdlYktpdERlYnVnSW5BcHBCcm93c2VyUHJp dmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBATk8sIFdlYktpdEFzcGVjdFJhdGlv T2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgQE5P LCBXZWJLaXRXZWJTUUxFbmFibGVkUHJlZmVyZW5jZUtleSwKLSAgICAgICAgQFlFUywgV2ViS2l0 SW50ZXJuYWxEZWJ1Z05lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXks CisgICAgICAgIEBZRVMsIFdlYktpdERlYnVnTmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtz UHJlZmVyZW5jZUtleSwKICAgICAgICAgbmlsXTsKIAogI2lmICFQTEFURk9STShJT1NfRkFNSUxZ KQpAQCAtMzY0MiwyMiArMzY0MiwyMiBAQCAtICh2b2lkKXNldFJlbW90ZVBsYXliYWNrRW5hYmxl ZDooQk9PTClyZW1vdGVQbGF5YmFja0VuYWJsZWQKIAogLSAoQk9PTClpc0luQXBwQnJvd3NlclBy aXZhY3lFbmFibGVkCiB7Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0 SW50ZXJuYWxEZWJ1Z0luQXBwQnJvd3NlclByaXZhY3lFbmFibGVkUHJlZmVyZW5jZUtleV07Cisg ICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0RGVidWdJbkFwcEJyb3dzZXJQ cml2YWN5RW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtICh2b2lkKXNldEluQXBwQnJvd3Nl clByaXZhY3lFbmFibGVkOihCT09MKWZsYWcKIHsKLSAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZs YWcgZm9yS2V5OldlYktpdEludGVybmFsRGVidWdJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZFBy ZWZlcmVuY2VLZXldOworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0 RGVidWdJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtIChC T09MKW5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrcwogewotICAgIHJldHVybiBbc2VsZiBf Ym9vbFZhbHVlRm9yS2V5OldlYktpdEludGVybmFsRGVidWdOZWVkc0luQXBwQnJvd3NlclByaXZh Y3lRdWlya3NQcmVmZXJlbmNlS2V5XTsKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktl eTpXZWJLaXREZWJ1Z05lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXld OwogfQogCiAtICh2b2lkKXNldE5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrczooQk9PTClm bGFnCiB7Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRJbnRlcm5h bERlYnVnTmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleV07CisgICAg W3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXREZWJ1Z05lZWRzSW5BcHBCcm93 c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXldOwogfQogCiAtIChCT09MKWFzcGVjdFJhdGlv T2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFibGVkCg== 393436 2020-03-12 18:20:07 -0700 2020-03-12 20:09:49 -0700 Patch bug-209031-20200312182006.patch text/plain 7612 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4YTcyOWY5YjAzZDRkMzgw MTdkNDUzMThiMDIyMTYwYzcwODk4NDkuLjU0ZmQ2MzQzM2ZhZmE0MzUwYjkxMjZlYjk1NGY3Y2Uz OTVjNzc2OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDMtMTIgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdCBwcmVmZXJlbmNl IGhhbmRsaW5nIGFuZCBuYW1pbmcgY29udmVudGlvbnMgaW4gQXBwQm91bmQgYnJvd3NpbmcgcHJl ZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwOTAzMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjAzOTYyOTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBtYWRlIGEgbWlzdGFrZSBpbiB0 aGUgaGFuZGxpbmcgb2YgcHJlZmVyZW5jZXMgcmVsYXRlZCB0byB0aGUgSXNJbkFwcEJyb3dzZXJQ cml2YWN5RW5hYmxlZAorICAgICAgICBhbmQgdGhlIHF1aXJrIGZsYWcsIHdoaWNoIGxlZCB0byBz b21lIGNvZGUgbm90IGV4ZWN1dGluZyB3aGVuIGV4cGVjdGVkLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggZG9lcyB0aGUgZm9sbG93aW5nOgorCisgICAgICAgIDEuIFVzZXMgdGhlIGNvcnJlY3QgbmFt aW5nIHNjaGVtZSBmb3IgV2ViS2l0IEludGVybmFsIERlYnVnIGZsYWdzLiBUaGV5IHNob3VsZCBi ZQorICAgICAgICAgICAnV2ViS2l0RGVidWcnLCBub3QgJ1dlYktpdEludGVybmFsJyBvciAnV2Vi S2l0SW50ZXJuYWxEZWJ1ZycuCisgICAgICAgIDIuIFVwZGF0ZXMgdGhlIGxvY2FsIHF1aXJrIHN0 YXRlIGluIFdlYlBhZ2Ugd2hlbiBwYWdlIHNldHRpbmdzIGNoYW5nZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAg ICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnBhcmFtZXRlcnMpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMpOgorCiAyMDIwLTAzLTExICBEb24gT2xtc3RlYWQgIDxkb24ub2xt c3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgTm9uLXVuaWZpZWQgYnVpbGQgZml4ZXMgZWFybHkg TWFyY2ggMjAyMCBlZGl0aW9uIFRha2UgMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4 IGZmZDg4ODU4MWFiMjk3NGQ2ZmRkMzk2MDgzMDBmMzVhNTEzMTZjZDEuLjQ1NDU1NGI0MGE2MTcw MDA2YjE4YWVmYTg2NmI5ZDkzZjRhMjJkNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMiBAQAorMjAyMC0wMy0xMiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFw cGxlLmNvbT4KKworICAgICAgICBDb3JyZWN0IHByZWZlcmVuY2UgaGFuZGxpbmcgYW5kIG5hbWlu ZyBjb252ZW50aW9ucyBpbiBBcHBCb3VuZCBicm93c2luZyBwcmVmZXJlbmNlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MDMxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82MDM5NjI5OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvbnNpc3RlbnRseSB1c2VzIHRoZSBjb3JyZWN0 IG5hbWluZyBzY2hlbWUgZm9yIFdlYktpdCBJbnRlcm5hbCBEZWJ1ZyBmbGFncy4KKyAgICAgICAg VGhleSBzaG91bGQgYmUgJ1dlYktpdERlYnVnJywgbm90ICdXZWJLaXRJbnRlcm5hbCcgb3IgJ1dl YktpdEludGVybmFsRGVidWcnLgorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5 c1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tOgorICAgICAg ICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFsaXplXSk6CisgICAgICAgICgtW1dlYlByZWZlcmVu Y2VzIGlzSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWRdKToKKyAgICAgICAgKC1bV2ViUHJlZmVy ZW5jZXMgc2V0SW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dlYlBy ZWZlcmVuY2VzIG5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrc10pOgorICAgICAgICAoLVtX ZWJQcmVmZXJlbmNlcyBzZXROZWVkc0luQXBwQnJvd3NlclByaXZhY3lRdWlya3M6XSk6CisKIDIw MjAtMDMtMDggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ug VGV4dEl0ZXJhdG9yOjpyYW5nZSByZXR1cm4gYSBTaW1wbGVSYW5nZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0 ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IGY2ZjE5NDgyNTc1NTBiNjI1MTZiZjIwMTgxNDVkY2M0 YmE5Y2E4N2YuLjRkZjE3NzYzNjcxNzE1NzcwM2Y0ZTczOWQzNWM3M2U0YWQ4YjhmOGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVE YXRhU3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTE2Nyw3ICsxNjcsNyBAQCBXZWJz aXRlRGF0YVN0b3JlUGFyYW1ldGVycyBXZWJzaXRlRGF0YVN0b3JlOjpwYXJhbWV0ZXJzKCkKICNl bmRpZgogCiAgICAgYm9vbCBzaG91bGRJbmNsdWRlTG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzID0gaXNTYWZhcmk7Ci0gICAgYm9vbCBpc0luQXBwQnJvd3NlclByaXZhY3lFbmFibGVk ID0gW2RlZmF1bHRzIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJbnRl cm5hbERlYnVnJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNJbkFwcEJyb3dzZXJQcml2YWN5RW5h YmxlZEtleSgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXTsKKyAgICBib29sIGlzSW5BcHBCcm93 c2VyUHJpdmFjeUVuYWJsZWQgPSBbZGVmYXVsdHMgYm9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5n V2l0aEZvcm1hdDpAIldlYktpdERlYnVnJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNJbkFwcEJy b3dzZXJQcml2YWN5RW5hYmxlZEtleSgpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCldXTsKICAgICAK ICAgICBXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDFiYTc4OWFkMWEzMWM0 MDBjYWIxN2UwM2VmMmNiNDNhNjEwOGMzMDkuLmU3OWUwYjE0YjgxMGVjNzcxMmYwMzUwOTEwZTFj OWIyYzQzNTYyYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCkBAIC0zNzE2LDYgKzM3MTYsOCBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVu Y2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogCiAgICAgc2V0dGluZ3Muc2V0 TGF5b3V0Vmlld3BvcnRIZWlnaHRFeHBhbnNpb25GYWN0b3Ioc3RvcmUuZ2V0RG91YmxlVmFsdWVG b3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxheW91dFZpZXdwb3J0SGVpZ2h0RXhwYW5zaW9uRmFj dG9yS2V5KCkpKTsKIAorICAgIG1fbmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzID0gc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpuZWVkc0luQXBwQnJvd3Nl clByaXZhY3lRdWlya3NLZXkoKSk7CisKICAgICBpZiAobV9kcmF3aW5nQXJlYSkKICAgICAgICAg bV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMoc3RvcmUpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZh dGUuaAppbmRleCA5NjZiNmM0ZDM5NWEyOTM4MmM3MzYyMGU2MzJmY2VkMWYwYzNjYmU5Li43N2Iz OTg5NTAyMDI1ZTYxZDcyNzY5MGM1ZTllYzgxYjJkZGFlM2JiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRl LmgKQEAgLTI4NCw2ICsyODQsNiBAQAogI2RlZmluZSBXZWJLaXRSZXF1ZXN0SWRsZUNhbGxiYWNr RW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRSZXF1ZXN0SWRsZUNhbGxiYWNrRW5hYmxlZCIK ICNkZWZpbmUgV2ViS2l0QXN5bmNDbGlwYm9hcmRBUElFbmFibGVkUHJlZmVyZW5jZUtleSBAIldl YktpdEFzeW5jQ2xpcGJvYXJkQVBJRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0TGlua1ByZWxvYWRS ZXNwb25zaXZlSW1hZ2VzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRMaW5rUHJlbG9hZFJl c3BvbnNpdmVJbWFnZXNFbmFibGVkIgotI2RlZmluZSBXZWJLaXRJbnRlcm5hbERlYnVnSW5BcHBC cm93c2VyUHJpdmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SW50ZXJuYWxEZWJ1Z0lu QXBwQnJvd3NlclByaXZhY3lFbmFibGVkIgorI2RlZmluZSBXZWJLaXREZWJ1Z0luQXBwQnJvd3Nl clByaXZhY3lFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdERlYnVnSW5BcHBCcm93c2VyUHJp dmFjeUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdEFzcGVjdFJhdGlvT2ZJbWdGcm9tV2lkdGhBbmRI ZWlnaHRFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEFzcGVjdFJhdGlvT2ZJbWdGcm9tV2lk dGhBbmRIZWlnaHRFbmFibGVkIgotI2RlZmluZSBXZWJLaXRJbnRlcm5hbERlYnVnTmVlZHNJbkFw cEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleSBAIldlYktpdEludGVybmFsRGVidWdO ZWVkc0luQXBwQnJvd3NlclByaXZhY3lRdWlya3MiCisjZGVmaW5lIFdlYktpdERlYnVnTmVlZHNJ bkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleSBAIldlYktpdE5lZWRzSW5BcHBC cm93c2VyUHJpdmFjeVF1aXJrcyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4IDJiZDA0NzA2NzJlM2QwOWI4NDYwN2NmY2M5YmU5 MTEzNWU1YzdlNmIuLjAyNzkzOTQzMDgwNDZiOGEyODNhYjZhYTM2MDQ4MjlhYjI5ZmQxYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQpAQCAtNzEwLDEwICs3MTAsMTAgQEAgKyAodm9pZClpbml0aWFsaXplCiAgICAgICAgIEBOTywg V2ViS2l0QXN5bmNDbGlwYm9hcmRBUElFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgQE5P LCBXZWJLaXRMaW5rUHJlbG9hZFJlc3BvbnNpdmVJbWFnZXNFbmFibGVkUHJlZmVyZW5jZUtleSwK ICAgICAgICAgQFlFUywgV2ViS2l0Q1NTU2hhZG93UGFydHNFbmFibGVkUHJlZmVyZW5jZUtleSwK LSAgICAgICAgQE5PLCBXZWJLaXRJbnRlcm5hbERlYnVnSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJs ZWRQcmVmZXJlbmNlS2V5LAorICAgICAgICBATk8sIFdlYktpdERlYnVnSW5BcHBCcm93c2VyUHJp dmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBATk8sIFdlYktpdEFzcGVjdFJhdGlv T2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgQE5P LCBXZWJLaXRXZWJTUUxFbmFibGVkUHJlZmVyZW5jZUtleSwKLSAgICAgICAgQFlFUywgV2ViS2l0 SW50ZXJuYWxEZWJ1Z05lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXks CisgICAgICAgIEBZRVMsIFdlYktpdERlYnVnTmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtz UHJlZmVyZW5jZUtleSwKICAgICAgICAgbmlsXTsKIAogI2lmICFQTEFURk9STShJT1NfRkFNSUxZ KQpAQCAtMzY0MiwyMiArMzY0MiwyMiBAQCAtICh2b2lkKXNldFJlbW90ZVBsYXliYWNrRW5hYmxl ZDooQk9PTClyZW1vdGVQbGF5YmFja0VuYWJsZWQKIAogLSAoQk9PTClpc0luQXBwQnJvd3NlclBy aXZhY3lFbmFibGVkCiB7Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0 SW50ZXJuYWxEZWJ1Z0luQXBwQnJvd3NlclByaXZhY3lFbmFibGVkUHJlZmVyZW5jZUtleV07Cisg ICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0RGVidWdJbkFwcEJyb3dzZXJQ cml2YWN5RW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtICh2b2lkKXNldEluQXBwQnJvd3Nl clByaXZhY3lFbmFibGVkOihCT09MKWZsYWcKIHsKLSAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZs YWcgZm9yS2V5OldlYktpdEludGVybmFsRGVidWdJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZFBy ZWZlcmVuY2VLZXldOworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0 RGVidWdJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtIChC T09MKW5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrcwogewotICAgIHJldHVybiBbc2VsZiBf Ym9vbFZhbHVlRm9yS2V5OldlYktpdEludGVybmFsRGVidWdOZWVkc0luQXBwQnJvd3NlclByaXZh Y3lRdWlya3NQcmVmZXJlbmNlS2V5XTsKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktl eTpXZWJLaXREZWJ1Z05lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXld OwogfQogCiAtICh2b2lkKXNldE5lZWRzSW5BcHBCcm93c2VyUHJpdmFjeVF1aXJrczooQk9PTClm bGFnCiB7Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRJbnRlcm5h bERlYnVnTmVlZHNJbkFwcEJyb3dzZXJQcml2YWN5UXVpcmtzUHJlZmVyZW5jZUtleV07CisgICAg W3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXREZWJ1Z05lZWRzSW5BcHBCcm93 c2VyUHJpdmFjeVF1aXJrc1ByZWZlcmVuY2VLZXldOwogfQogCiAtIChCT09MKWFzcGVjdFJhdGlv T2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFibGVkCg==