212465 2020-05-28 06:28:58 -0700 [GTK] WebDriver: stop using GdkEvent API in preparation for GTK4 2020-05-30 00:55:20 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 212316 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1656823 0 cgarcia 2020-05-28 06:28:58 -0700 Use the new internal API to synthesize events. 1656828 1 400451 cgarcia 2020-05-28 06:47:45 -0700 Created attachment 400451 Patch 1656829 2 ews-watchlist 2020-05-28 06:48:15 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1657597 3 cgarcia 2020-05-30 00:55:20 -0700 Committed r262343: <https://trac.webkit.org/changeset/262343> 400451 2020-05-28 06:47:45 -0700 2020-05-29 15:36:47 -0700 Patch wkgtk-web-driver-events.diff text/plain 29795 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMzk4OTYwMTUyZTY3Li42YjM3MzMyNDhkMmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzIgQEAKKzIwMjAtMDUtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYkRyaXZlcjogc3RvcCB1c2luZyBHZGtFdmVudCBB UEkgaW4gcHJlcGFyYXRpb24gZm9yIEdUSzQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMjQ2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgbmV3IGludGVybmFsIEFQSSB0byBzeW50aGVzaXpl IGV2ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZUtleUV2ZW50KTogQWRk IHR5cGUgcGFyYW1ldGVyLCBzaW5jZSBXZWJEcml2ZXIgY2FuIHNlbmQgcHJlc3MgYW5kIHJlbGVh c2UgZXZlbnRzCisgICAgICAgIHNlcGFyYXRlbHkuIEFsc28gYWRkIGEgcGFyYW1ldGVyIHRvIGlu ZGljYXRlIHRoYXQga2V5dmFsIHNob3VsZCBiZSB0cmFuc2xhdGVkIGFjY29yZGluZyB0byBjdXJy ZW50IHN0YXRlIHRoYXQgaXMKKyAgICAgICAgcmVxdWlyZWQgYnkgV2ViRHJpdmVyLgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlSW50ZXJuYWwuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpkb2N1bWVudExvYWRlZEZvckZyYW1l KTogQ2FsbCByZXNldENsaWNrQ291bnQoKS4KKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlv blNlc3Npb246OnVwZGF0ZUNsaWNrQ291bnQpOiBVcGRhdGUgdGhlIGNsaWNrIGNvdW50IGZvciB0 aGUgZ2l2ZW4gYnV0dG9uIHBvc2l0aW9uIGFuZAorICAgICAgICBtYXhpbXVtIHRpbWUgYW5kIGRp c3RhbmNlLgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cmVzZXRDbGlj a0NvdW50KTogUmVzZXQgdGhlIGNsaWNrIGNvdW50LgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRv bWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0F1dG9t YXRpb24vZ3RrL1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxhdGVNb3VzZUludGVyYWN0aW9uKTog VXNlIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZU1vdXNlRXZlbnQoKS4KKyAgICAgICAgKFdl YktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxhdGVLZXlib2FyZEludGVy YWN0aW9uKTogVXNlIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZUtleUV2ZW50KCkuCisgICAg ICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpwbGF0Zm9ybVNpbXVsYXRlS2V5U2Vx dWVuY2UpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6ZG9Nb3VzZUV2ZW50KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYktpdDo6ZG9Nb3Rpb25FdmVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OmRvS2V5U3Ryb2tlRXZlbnQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsv S2V5QmluZGluZ1RyYW5zbGF0b3IuY3BwOiBBZGQgbWlzc2luZyBrZXkgc2hvcnRjdXRzIHRvIHBy ZWRlZmluZWQgbGlzdC4KKwogMjAyMC0wNS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gW0dUS10gTWFrZSB3ZWJraXRX ZWJWaWV3QmFzZVNuYXBzaG90IHN0YXRpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBjNmU1NmRmMWUxOGYuLmU1 ODhlNzA3NGQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTI0MTUsNzIgKzI0MTUsODQgQEAgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZVN5bnRoZXNpemVNb3VzZUV2ZW50KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJW aWV3QmFzZSwgTW91c2UKICAgICAgICAgd2lkZ2V0Um9vdENvb3JkcyhHVEtfV0lER0VUKHdlYlZp ZXdCYXNlKSwgeCwgeSksIGNsaWNrQ291bnQsIHRvV2ViS2l0TW9kaWZpZXJzKG1vZGlmaWVycyks IG1vdmVtZW50RGVsdGEpKTsKIH0KIAotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVL ZXlFdmVudChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIHVuc2lnbmVkIGtleXZhbCwg dW5zaWduZWQgbW9kaWZpZXJzKQordm9pZCB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVLZXlF dmVudChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIEtleUV2ZW50VHlwZSB0eXBlLCB1 bnNpZ25lZCBrZXl2YWwsIHVuc2lnbmVkIG1vZGlmaWVycywgU2hvdWxkVHJhbnNsYXRlS2V5Ym9h cmRTdGF0ZSBzaG91bGRUcmFuc2xhdGUpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRl KiBwcml2ID0gd2ViVmlld0Jhc2UtPnByaXY7CiAgICAgaWYgKHByaXYtPmRpYWxvZykKICAgICAg ICAgcmV0dXJuOwogCisgICAgaWYgKHR5cGUgIT0gS2V5RXZlbnRUeXBlOjpSZWxlYXNlKSB7CiAj aWYgIVVTRShHVEs0KQotICAgIGlmIChhdXRvKiBwb3B1cE1lbnUgPSBwcml2LT5wYWdlUHJveHkt PmFjdGl2ZVBvcHVwTWVudSgpKSB7Ci0gICAgICAgIGF1dG8qIGd0a1BvcHVwTWVudSA9IHN0YXRp Y19jYXN0PFdlYlBvcHVwTWVudVByb3h5R3RrKj4ocG9wdXBNZW51KTsKLSAgICAgICAgaWYgKGd0 a1BvcHVwTWVudS0+aGFuZGxlS2V5UHJlc3Moa2V5dmFsLCBHREtfQ1VSUkVOVF9USU1FKSkKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAoa2V5dmFsID09IEdES19LRVlfUmV0dXJu KSB7Ci0gICAgICAgICAgICBndGtQb3B1cE1lbnUtPmFjdGl2YXRlU2VsZWN0ZWRJdGVtKCk7Ci0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChhdXRvKiBwb3B1cE1lbnUgPSBwcml2LT5w YWdlUHJveHktPmFjdGl2ZVBvcHVwTWVudSgpKSB7CisgICAgICAgICAgICBhdXRvKiBndGtQb3B1 cE1lbnUgPSBzdGF0aWNfY2FzdDxXZWJQb3B1cE1lbnVQcm94eUd0ayo+KHBvcHVwTWVudSk7Cisg ICAgICAgICAgICBpZiAoZ3RrUG9wdXBNZW51LT5oYW5kbGVLZXlQcmVzcyhrZXl2YWwsIEdES19D VVJSRU5UX1RJTUUpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgaWYg KGtleXZhbCA9PSBHREtfS0VZX1JldHVybikgeworICAgICAgICAgICAgICAgIGd0a1BvcHVwTWVu dS0+YWN0aXZhdGVTZWxlY3RlZEl0ZW0oKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICB9CiAgICAgICAgIH0KLSAgICB9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShGVUxMU0NS RUVOX0FQSSkKLSAgICBpZiAocHJpdi0+ZnVsbFNjcmVlbk1vZGVBY3RpdmUpIHsKLSAgICAgICAg c3dpdGNoIChrZXl2YWwpIHsKLSAgICAgICAgY2FzZSBHREtfS0VZX0VzY2FwZToKLSAgICAgICAg Y2FzZSBHREtfS0VZX2Y6Ci0gICAgICAgIGNhc2UgR0RLX0tFWV9GOgotICAgICAgICAgICAgcHJp di0+cGFnZVByb3h5LT5mdWxsU2NyZWVuTWFuYWdlcigpLT5yZXF1ZXN0RXhpdEZ1bGxTY3JlZW4o KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBpZiAocHJpdi0+ZnVsbFNjcmVlbk1vZGVBY3RpdmUpIHsKKyAgICAgICAg ICAgIHN3aXRjaCAoa2V5dmFsKSB7CisgICAgICAgICAgICBjYXNlIEdES19LRVlfRXNjYXBlOgor ICAgICAgICAgICAgY2FzZSBHREtfS0VZX2Y6CisgICAgICAgICAgICBjYXNlIEdES19LRVlfRjoK KyAgICAgICAgICAgICAgICBwcml2LT5wYWdlUHJveHktPmZ1bGxTY3JlZW5NYW5hZ2VyKCktPnJl cXVlc3RFeGl0RnVsbFNjcmVlbigpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CiAgICAg ICAgIH0KLSAgICB9CiAjZW5kaWYKIAogI2lmICFVU0UoR1RLNCkKLSAgICBpZiAoa2V5dmFsID09 IEdES19LRVlfTWVudSkgewotICAgICAgICB3ZWJraXRXZWJWaWV3QmFzZVBvcHVwTWVudShHVEtf V0lER0VUKHdlYlZpZXdCYXNlKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgICAgIGlm IChrZXl2YWwgPT0gR0RLX0tFWV9NZW51KSB7CisgICAgICAgICAgICB3ZWJraXRXZWJWaWV3QmFz ZVBvcHVwTWVudShHVEtfV0lER0VUKHdlYlZpZXdCYXNlKSk7CisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KICNlbmRpZgorICAgIH0KIAogICAgIGF1dG8ga2V5Y29kZSA9IHdpZGdldEtl eXZhbFRvS2V5Y29kZShHVEtfV0lER0VUKHdlYlZpZXdCYXNlKSwga2V5dmFsKTsKKyAgICBpZiAo bW9kaWZpZXJzICYmIHNob3VsZFRyYW5zbGF0ZSA9PSBTaG91bGRUcmFuc2xhdGVLZXlib2FyZFN0 YXRlOjpZZXMpIHsKKyAgICAgICAgYXV0byogZGlzcGxheSA9IGd0a193aWRnZXRfZ2V0X2Rpc3Bs YXkoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworI2lmICFVU0UoR1RLNCkKKyAgICAgICAgZ2Rr X2tleW1hcF90cmFuc2xhdGVfa2V5Ym9hcmRfc3RhdGUoZ2RrX2tleW1hcF9nZXRfZm9yX2Rpc3Bs YXkoZGlzcGxheSksIGtleWNvZGUsIHN0YXRpY19jYXN0PEdka01vZGlmaWVyVHlwZT4obW9kaWZp ZXJzKSwgMCwgJmtleXZhbCwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7CisjZW5kaWYKKyAg ICB9CiAgICAgYXV0byB3ZWJFdmVudE1vZGlmaWVycyA9IHRvV2ViS2l0TW9kaWZpZXJzKG1vZGlm aWVycyk7CiAKLSAgICBwcml2LT5wYWdlUHJveHktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZl V2ViS2V5Ym9hcmRFdmVudCgKLSAgICAgICAgV2ViRXZlbnQ6OktleURvd24sCi0gICAgICAgIFBs YXRmb3JtS2V5Ym9hcmRFdmVudDo6c2luZ2xlQ2hhcmFjdGVyU3RyaW5nKGtleXZhbCksCi0gICAg ICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6a2V5VmFsdWVGb3JHZGtLZXlDb2RlKGtleXZhbCks Ci0gICAgICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6a2V5Q29kZUZvckhhcmR3YXJlS2V5Q29k ZShrZXljb2RlKSwKLSAgICAgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjprZXlJZGVudGlmaWVy Rm9yR2RrS2V5Q29kZShrZXl2YWwpLAotICAgICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6Ondp bmRvd3NLZXlDb2RlRm9yR2RrS2V5Q29kZShrZXl2YWwpLAotICAgICAgICBzdGF0aWNfY2FzdDxp bnQ+KGtleXZhbCksCi0gICAgICAgIHByaXYtPmtleUJpbmRpbmdUcmFuc2xhdG9yLmNvbW1hbmRz Rm9yS2V5dmFsKGtleXZhbCwgbW9kaWZpZXJzKSwKLSAgICAgICAga2V5dmFsID49IEdES19LRVlf S1BfU3BhY2UgJiYga2V5dmFsIDw9IEdES19LRVlfS1BfOSwKLSAgICAgICAgd2ViRXZlbnRNb2Rp ZmllcnMpKTsKLQotICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRp dmVXZWJLZXlib2FyZEV2ZW50KAotICAgICAgICBXZWJFdmVudDo6S2V5VXAsCi0gICAgICAgIFBs YXRmb3JtS2V5Ym9hcmRFdmVudDo6c2luZ2xlQ2hhcmFjdGVyU3RyaW5nKGtleXZhbCksCi0gICAg ICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6a2V5VmFsdWVGb3JHZGtLZXlDb2RlKGtleXZhbCks Ci0gICAgICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6a2V5Q29kZUZvckhhcmR3YXJlS2V5Q29k ZShrZXljb2RlKSwKLSAgICAgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjprZXlJZGVudGlmaWVy Rm9yR2RrS2V5Q29kZShrZXl2YWwpLAotICAgICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6Ondp bmRvd3NLZXlDb2RlRm9yR2RrS2V5Q29kZShrZXl2YWwpLAotICAgICAgICBzdGF0aWNfY2FzdDxp bnQ+KGtleXZhbCksCi0gICAgICAgIHsgfSwKLSAgICAgICAga2V5dmFsID49IEdES19LRVlfS1Bf U3BhY2UgJiYga2V5dmFsIDw9IEdES19LRVlfS1BfOSwKLSAgICAgICAgd2ViRXZlbnRNb2RpZmll cnMpKTsKKyAgICBpZiAodHlwZSAhPSBLZXlFdmVudFR5cGU6OlJlbGVhc2UpIHsKKyAgICAgICAg cHJpdi0+cGFnZVByb3h5LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZl bnQoCisgICAgICAgICAgICBXZWJFdmVudDo6S2V5RG93biwKKyAgICAgICAgICAgIFBsYXRmb3Jt S2V5Ym9hcmRFdmVudDo6c2luZ2xlQ2hhcmFjdGVyU3RyaW5nKGtleXZhbCksCisgICAgICAgICAg ICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OmtleVZhbHVlRm9yR2RrS2V5Q29kZShrZXl2YWwpLAor ICAgICAgICAgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjprZXlDb2RlRm9ySGFyZHdhcmVLZXlD b2RlKGtleWNvZGUpLAorICAgICAgICAgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjprZXlJZGVu dGlmaWVyRm9yR2RrS2V5Q29kZShrZXl2YWwpLAorICAgICAgICAgICAgUGxhdGZvcm1LZXlib2Fy ZEV2ZW50Ojp3aW5kb3dzS2V5Q29kZUZvckdka0tleUNvZGUoa2V5dmFsKSwKKyAgICAgICAgICAg IHN0YXRpY19jYXN0PGludD4oa2V5dmFsKSwKKyAgICAgICAgICAgIHByaXYtPmtleUJpbmRpbmdU cmFuc2xhdG9yLmNvbW1hbmRzRm9yS2V5dmFsKGtleXZhbCwgbW9kaWZpZXJzKSwKKyAgICAgICAg ICAgIGtleXZhbCA+PSBHREtfS0VZX0tQX1NwYWNlICYmIGtleXZhbCA8PSBHREtfS0VZX0tQXzks CisgICAgICAgICAgICB3ZWJFdmVudE1vZGlmaWVycykpOworICAgIH0KKworICAgIGlmICh0eXBl ICE9IEtleUV2ZW50VHlwZTo6UHJlc3MpIHsKKyAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5oYW5k bGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoCisgICAgICAgICAgICBXZWJF dmVudDo6S2V5VXAsCisgICAgICAgICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OnNpbmdsZUNo YXJhY3RlclN0cmluZyhrZXl2YWwpLAorICAgICAgICAgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50 OjprZXlWYWx1ZUZvckdka0tleUNvZGUoa2V5dmFsKSwKKyAgICAgICAgICAgIFBsYXRmb3JtS2V5 Ym9hcmRFdmVudDo6a2V5Q29kZUZvckhhcmR3YXJlS2V5Q29kZShrZXljb2RlKSwKKyAgICAgICAg ICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6a2V5SWRlbnRpZmllckZvckdka0tleUNvZGUoa2V5 dmFsKSwKKyAgICAgICAgICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6d2luZG93c0tleUNvZGVG b3JHZGtLZXlDb2RlKGtleXZhbCksCisgICAgICAgICAgICBzdGF0aWNfY2FzdDxpbnQ+KGtleXZh bCksCisgICAgICAgICAgICB7IH0sCisgICAgICAgICAgICBrZXl2YWwgPj0gR0RLX0tFWV9LUF9T cGFjZSAmJiBrZXl2YWwgPD0gR0RLX0tFWV9LUF85LAorICAgICAgICAgICAgd2ViRXZlbnRNb2Rp ZmllcnMpKTsKKyAgICB9CiB9CiAKIHN0YXRpYyBpbmxpbmUgV2ViV2hlZWxFdmVudDo6UGhhc2Ug dG9XZWJLaXRXaGVlbEV2ZW50UGhhc2UoV2hlZWxFdmVudFBoYXNlIHBoYXNlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZUludGVy bmFsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl SW50ZXJuYWwuaAppbmRleCBmYWVlYTRhNzU5Y2QuLmVkNDlkNTgyYzcyYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZUludGVybmFs LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFz ZUludGVybmFsLmgKQEAgLTMwLDcgKzMwLDkgQEAgdHlwZWRlZiBzdHJ1Y3QgX1dlYktpdFdlYlZp ZXdCYXNlIFdlYktpdFdlYlZpZXdCYXNlOwogZW51bSBjbGFzcyBNb3VzZUV2ZW50VHlwZSB7IFBy ZXNzLCBSZWxlYXNlLCBNb3Rpb24gfTsKIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VTeW50aGVzaXpl TW91c2VFdmVudChXZWJLaXRXZWJWaWV3QmFzZSosIE1vdXNlRXZlbnRUeXBlIHR5cGUsIHVuc2ln bmVkIGJ1dHRvbiwgdW5zaWduZWQgc2hvcnQgYnV0dG9ucywgaW50IHgsIGludCB5LCB1bnNpZ25l ZCBtb2RpZmllcnMsIGludCBjbGlja0NvdW50KTsKIAotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVN5 bnRoZXNpemVLZXlFdmVudChXZWJLaXRXZWJWaWV3QmFzZSosIHVuc2lnbmVkIGtleVZhbCwgdW5z aWduZWQgbW9kaWZpZXJzKTsKK2VudW0gY2xhc3MgS2V5RXZlbnRUeXBlIHsgUHJlc3MsIFJlbGVh c2UsIEluc2VydCB9OworZW51bSBjbGFzcyBTaG91bGRUcmFuc2xhdGVLZXlib2FyZFN0YXRlIHsg Tm8sIFllcyB9Owordm9pZCB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVLZXlFdmVudChXZWJL aXRXZWJWaWV3QmFzZSosIEtleUV2ZW50VHlwZSwgdW5zaWduZWQga2V5VmFsLCB1bnNpZ25lZCBt b2RpZmllcnMsIFNob3VsZFRyYW5zbGF0ZUtleWJvYXJkU3RhdGUpOwogCiBlbnVtIGNsYXNzIFdo ZWVsRXZlbnRQaGFzZSB7IE5vUGhhc2UsIEJlZ2FuLCBDaGFuZ2VkLCBFbmRlZCwgQ2FuY2VsbGVk LCBNYXlCZWdpbiB9Owogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVXaGVlbEV2ZW50 KFdlYktpdFdlYlZpZXdCYXNlKiwgZG91YmxlIGRlbHRhWCwgZG91YmxlIGRlbHRhWSwgaW50IHgs IGludCB5LCBXaGVlbEV2ZW50UGhhc2UsIFdoZWVsRXZlbnRQaGFzZSBtb21lbnR1bVBoYXNlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21h dGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJB dXRvbWF0aW9uU2Vzc2lvbi5jcHAKaW5kZXggY2EyMzM4NjcxZTViLi5mZjdlNDVmN2NlZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlv blNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uY3BwCkBAIC03NzksNiArNzc5LDEwIEBAIHZvaWQgV2ViQXV0b21h dGlvblNlc3Npb246OmRvY3VtZW50TG9hZGVkRm9yRnJhbWUoY29uc3QgV2ViRnJhbWVQcm94eSYg ZnJhbWUpCiAgICAgICAgICAgICBtX2xvYWRUaW1lci5zdG9wKCk7CiAgICAgICAgICAgICBjYWxs YmFjay0+c2VuZFN1Y2Nlc3MoSlNPTjo6T2JqZWN0OjpjcmVhdGUoKSk7CiAgICAgICAgIH0KKwor I2lmIEVOQUJMRShXRUJEUklWRVJfTU9VU0VfSU5URVJBQ1RJT05TKQorICAgICAgICByZXNldENs aWNrQ291bnQoKTsKKyNlbmRpZgogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChhdXRvIGNhbGxi YWNrID0gbV9wZW5kaW5nRWFnZXJOYXZpZ2F0aW9uSW5Ccm93c2luZ0NvbnRleHRDYWxsYmFja3NQ ZXJGcmFtZS50YWtlKGZyYW1lLmZyYW1lSUQoKSkpIHsKICAgICAgICAgICAgIG1fbG9hZFRpbWVy LnN0b3AoKTsKQEAgLTE1MTEsNiArMTUxNSwyNyBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9u Ojp2aWV3cG9ydEluVmlld0NlbnRlclBvaW50T2ZFbGVtZW50KFdlYlBhZ2VQcm94eSYgcGFnZQog fQogCiAjaWYgRU5BQkxFKFdFQkRSSVZFUl9NT1VTRV9JTlRFUkFDVElPTlMpCit2b2lkIFdlYkF1 dG9tYXRpb25TZXNzaW9uOjp1cGRhdGVDbGlja0NvdW50KE1vdXNlQnV0dG9uIGJ1dHRvbiwgY29u c3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCBTZWNvbmRzIG1heFRpbWUsIGludCBtYXhE aXN0YW5jZSkKK3sKKyAgICBhdXRvIG5vdyA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGlm IChub3cgLSBtX2xhc3RDbGlja1RpbWUgPCBtYXhUaW1lICYmIGJ1dHRvbiA9PSBtX2xhc3RDbGlj a0J1dHRvbiAmJiBtX2xhc3RDbGlja1Bvc2l0aW9uLmRpc3RhbmNlU3F1YXJlZFRvUG9pbnQocG9z aXRpb24pIDwgbWF4RGlzdGFuY2UpIHsKKyAgICAgICAgbV9jbGlja0NvdW50Kys7CisgICAgICAg IG1fbGFzdENsaWNrVGltZSA9IG5vdzsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1f Y2xpY2tDb3VudCA9IDE7CisgICAgbV9sYXN0Q2xpY2tUaW1lID0gbm93OworICAgIG1fbGFzdENs aWNrQnV0dG9uID0gYnV0dG9uOworICAgIG1fbGFzdENsaWNrUG9zaXRpb24gPSBwb3NpdGlvbjsK K30KKwordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cmVzZXRDbGlja0NvdW50KCkKK3sKKyAg ICBtX2NsaWNrQ291bnQgPSAxOworICAgIG1fbGFzdENsaWNrQnV0dG9uID0gTW91c2VCdXR0b246 Ok5vbmU7CisgICAgbV9sYXN0Q2xpY2tQb3NpdGlvbiA9IHsgfTsKK30KIAogdm9pZCBXZWJBdXRv bWF0aW9uU2Vzc2lvbjo6c2ltdWxhdGVNb3VzZUludGVyYWN0aW9uKFdlYlBhZ2VQcm94eSYgcGFn ZSwgTW91c2VJbnRlcmFjdGlvbiBpbnRlcmFjdGlvbiwgTW91c2VCdXR0b24gbW91c2VCdXR0b24s IGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBsb2NhdGlvbkluVmlld3BvcnQsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoT3B0aW9uYWw8QXV0b21hdGlvbkNvbW1hbmRFcnJvcj4pPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21h dGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCmluZGV4IDIzYjk5MmYzY2U0NS4uMDVkOGQw NjAyMzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21h dGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCkBAIC0yNDcsNiArMjQ3LDggQEAgcHJpdmF0ZToK IAogICAgIC8vIFBsYXRmb3JtLWRlcGVuZGVudCBpbXBsZW1lbnRhdGlvbnMuCiAjaWYgRU5BQkxF KFdFQkRSSVZFUl9NT1VTRV9JTlRFUkFDVElPTlMpCisgICAgdm9pZCB1cGRhdGVDbGlja0NvdW50 KE1vdXNlQnV0dG9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIFNlY29uZHMgbWF4VGltZSwg aW50IG1heERpc3RhbmNlKTsKKyAgICB2b2lkIHJlc2V0Q2xpY2tDb3VudCgpOwogICAgIHZvaWQg cGxhdGZvcm1TaW11bGF0ZU1vdXNlSW50ZXJhY3Rpb24oV2ViUGFnZVByb3h5JiwgTW91c2VJbnRl cmFjdGlvbiwgTW91c2VCdXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBsb2NhdGlvbklu Vmlld3BvcnQsIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+KTsKICNlbmRpZgogI2lmIEVO QUJMRShXRUJEUklWRVJfVE9VQ0hfSU5URVJBQ1RJT05TKQpAQCAtMzM0LDYgKzMzNiwxMiBAQCBw cml2YXRlOgogI2lmIEVOQUJMRShXRUJEUklWRVJfVE9VQ0hfSU5URVJBQ1RJT05TKQogICAgIGJv b2wgbV9zaW11bGF0aW5nVG91Y2hJbnRlcmFjdGlvbiB7IGZhbHNlIH07CiAjZW5kaWYKKyNpZiBF TkFCTEUoV0VCRFJJVkVSX01PVVNFX0lOVEVSQUNUSU9OUykKKyAgICBNb25vdG9uaWNUaW1lIG1f bGFzdENsaWNrVGltZTsKKyAgICBNb3VzZUJ1dHRvbiBtX2xhc3RDbGlja0J1dHRvbiB7IE1vdXNl QnV0dG9uOjpOb25lIH07CisgICAgV2ViQ29yZTo6SW50UG9pbnQgbV9sYXN0Q2xpY2tQb3NpdGlv bjsKKyAgICB1bnNpZ25lZCBtX2NsaWNrQ291bnQgeyAxIH07CisjZW5kaWYKIAogI2lmIEVOQUJM RShSRU1PVEVfSU5TUEVDVE9SKQogICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsKiBtX3Jl bW90ZUNoYW5uZWwgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5j cHAKaW5kZXggNDI4MDIyZWVhODZjLi4yZjliMmE5YjUyNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0 aW9uU2Vzc2lvbkd0ay5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJXZWJBdXRvbWF0 aW9uU2Vzc2lvbi5oIgogCiAjaW5jbHVkZSAiV2ViQXV0b21hdGlvblNlc3Npb25NYWNyb3MuaCIK KyNpbmNsdWRlICJXZWJLaXRXZWJWaWV3QmFzZUludGVybmFsLmgiCiAjaW5jbHVkZSAiV2ViUGFn ZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL0d0a1ZlcnNpb25pbmcuaD4KQEAgLTM1LDcgKzM2LDYgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogI2lmIEVOQUJMRShXRUJEUklWRVJfTU9V U0VfSU5URVJBQ1RJT05TKQotI2lmICFVU0UoR1RLNCkKIHN0YXRpYyB1bnNpZ25lZCBtb2RpZmll cnNUb0V2ZW50U3RhdGUoT3B0aW9uU2V0PFdlYkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzKQog ewogICAgIHVuc2lnbmVkIHN0YXRlID0gMDsKQEAgLTY0LDExNyArNjQsNDQgQEAgc3RhdGljIHVu c2lnbmVkIG1vdXNlQnV0dG9uVG9HZGtCdXR0b24oTW91c2VCdXR0b24gYnV0dG9uKQogICAgIHJl dHVybiBHREtfQlVUVE9OX1BSSU1BUlk7CiB9CiAKLXN0YXRpYyB2b2lkIGRvTW91c2VFdmVudChH ZGtFdmVudFR5cGUgdHlwZSwgR3RrV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBsb2NhdGlvbiwgdW5zaWduZWQgYnV0dG9uLCB1bnNpZ25lZCBzdGF0ZSkKLXsKLSAgICBB U1NFUlQodHlwZSA9PSBHREtfQlVUVE9OX1BSRVNTIHx8IHR5cGUgPT0gR0RLX0JVVFRPTl9SRUxF QVNFKTsKLQotICAgIEdVbmlxdWVQdHI8R2RrRXZlbnQ+IGV2ZW50KGdka19ldmVudF9uZXcodHlw ZSkpOwotICAgIGV2ZW50LT5idXR0b24ud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KHdp ZGdldCk7Ci0gICAgZ19vYmplY3RfcmVmKGV2ZW50LT5idXR0b24ud2luZG93KTsKLSAgICBldmVu dC0+YnV0dG9uLnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOwotICAgIGV2ZW50LT5idXR0b24ueCA9 IGxvY2F0aW9uLngoKTsKLSAgICBldmVudC0+YnV0dG9uLnkgPSBsb2NhdGlvbi55KCk7Ci0gICAg ZXZlbnQtPmJ1dHRvbi5heGVzID0gMDsKLSAgICBldmVudC0+YnV0dG9uLnN0YXRlID0gc3RhdGU7 Ci0gICAgZXZlbnQtPmJ1dHRvbi5idXR0b24gPSBidXR0b247Ci0gICAgZXZlbnQtPmJ1dHRvbi5k ZXZpY2UgPSBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0 KGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkod2lkZ2V0KSkpOwotICAgIGludCB4Um9vdCwgeVJvb3Q7 Ci0gICAgZ2RrX3dpbmRvd19nZXRfcm9vdF9jb29yZHMoZ3RrX3dpZGdldF9nZXRfd2luZG93KHdp ZGdldCksIGxvY2F0aW9uLngoKSwgbG9jYXRpb24ueSgpLCAmeFJvb3QsICZ5Um9vdCk7Ci0gICAg ZXZlbnQtPmJ1dHRvbi54X3Jvb3QgPSB4Um9vdDsKLSAgICBldmVudC0+YnV0dG9uLnlfcm9vdCA9 IHlSb290OwotICAgIGd0a19tYWluX2RvX2V2ZW50KGV2ZW50LmdldCgpKTsKLX0KLQotc3RhdGlj IHZvaWQgZG9Nb3Rpb25FdmVudChHdGtXaWRnZXQqIHdpZGdldCwgY29uc3QgV2ViQ29yZTo6SW50 UG9pbnQmIGxvY2F0aW9uLCB1bnNpZ25lZCBzdGF0ZSkKLXsKLSAgICBHVW5pcXVlUHRyPEdka0V2 ZW50PiBldmVudChnZGtfZXZlbnRfbmV3KEdES19NT1RJT05fTk9USUZZKSk7Ci0gICAgZXZlbnQt Pm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KTsKLSAgICBnX29i amVjdF9yZWYoZXZlbnQtPm1vdGlvbi53aW5kb3cpOwotICAgIGV2ZW50LT5tb3Rpb24udGltZSA9 IEdES19DVVJSRU5UX1RJTUU7Ci0gICAgZXZlbnQtPm1vdGlvbi54ID0gbG9jYXRpb24ueCgpOwot ICAgIGV2ZW50LT5tb3Rpb24ueSA9IGxvY2F0aW9uLnkoKTsKLSAgICBldmVudC0+bW90aW9uLmF4 ZXMgPSAwOwotICAgIGV2ZW50LT5tb3Rpb24uc3RhdGUgPSBzdGF0ZTsKLSAgICBldmVudC0+bW90 aW9uLmRldmljZSA9IGdka19zZWF0X2dldF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZWZhdWx0 X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh3aWRnZXQpKSk7Ci0gICAgaW50IHhSb290LCB5 Um9vdDsKLSAgICBnZGtfd2luZG93X2dldF9yb290X2Nvb3JkcyhndGtfd2lkZ2V0X2dldF93aW5k b3cod2lkZ2V0KSwgbG9jYXRpb24ueCgpLCBsb2NhdGlvbi55KCksICZ4Um9vdCwgJnlSb290KTsK LSAgICBldmVudC0+bW90aW9uLnhfcm9vdCA9IHhSb290OwotICAgIGV2ZW50LT5tb3Rpb24ueV9y b290ID0geVJvb3Q7Ci0gICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQuZ2V0KCkpOwotfQotI2Vu ZGlmCi0KIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxhdGVNb3VzZUlu dGVyYWN0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgTW91c2VJbnRlcmFjdGlvbiBpbnRlcmFjdGlv biwgTW91c2VCdXR0b24gYnV0dG9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbG9jYXRpb25J blZpZXcsIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IGtleU1vZGlmaWVycykKIHsKLSNp ZiAhVVNFKEdUSzQpCiAgICAgdW5zaWduZWQgZ2RrQnV0dG9uID0gbW91c2VCdXR0b25Ub0dka0J1 dHRvbihidXR0b24pOwogICAgIGF1dG8gbW9kaWZpZXIgPSBzdGF0ZU1vZGlmaWVyRm9yR2RrQnV0 dG9uKGdka0J1dHRvbik7CiAgICAgdW5zaWduZWQgc3RhdGUgPSBtb2RpZmllcnNUb0V2ZW50U3Rh dGUoa2V5TW9kaWZpZXJzKSB8IG1fY3VycmVudE1vZGlmaWVyczsKKyAgICBhdXRvKiB2aWV3V2lk Z2V0ID0gcmVpbnRlcnByZXRfY2FzdDxXZWJLaXRXZWJWaWV3QmFzZSo+KHBhZ2Uudmlld1dpZGdl dCgpKTsKIAogICAgIHN3aXRjaCAoaW50ZXJhY3Rpb24pIHsKICAgICBjYXNlIE1vdXNlSW50ZXJh Y3Rpb246Ok1vdmU6Ci0gICAgICAgIGRvTW90aW9uRXZlbnQocGFnZS52aWV3V2lkZ2V0KCksIGxv Y2F0aW9uSW5WaWV3LCBzdGF0ZSk7CisgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6 ZU1vdXNlRXZlbnQodmlld1dpZGdldCwgTW91c2VFdmVudFR5cGU6Ok1vdGlvbiwgMCwgbV9jdXJy ZW50TW9kaWZpZXJzLCBsb2NhdGlvbkluVmlldy54KCksIGxvY2F0aW9uSW5WaWV3LnkoKSwgc3Rh dGUsIDApOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIE1vdXNlSW50ZXJhY3Rpb246OkRvd246 Ci0gICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1BSRVNTLCBwYWdlLnZpZXdXaWRnZXQo KSwgbG9jYXRpb25JblZpZXcsIGdka0J1dHRvbiwgc3RhdGUpOworICAgIGNhc2UgTW91c2VJbnRl cmFjdGlvbjo6RG93bjogeworICAgICAgICBpbnQgZG91YmxlQ2xpY2tUaW1lLCBkb3VibGVDbGlj a0Rpc3RhbmNlOworICAgICAgICBnX29iamVjdF9nZXQoZ3RrX3dpZGdldF9nZXRfc2V0dGluZ3Mo cGFnZS52aWV3V2lkZ2V0KCkpLCAiZ3RrLWRvdWJsZS1jbGljay10aW1lIiwgJmRvdWJsZUNsaWNr VGltZSwgImd0ay1kb3VibGUtY2xpY2stZGlzdGFuY2UiLCAmZG91YmxlQ2xpY2tEaXN0YW5jZSwg bnVsbHB0cik7CisgICAgICAgIHVwZGF0ZUNsaWNrQ291bnQoYnV0dG9uLCBsb2NhdGlvbkluVmll dywgU2Vjb25kczo6ZnJvbU1pbGxpc2Vjb25kcyhkb3VibGVDbGlja1RpbWUpLCBkb3VibGVDbGlj a0Rpc3RhbmNlKTsKICAgICAgICAgbV9jdXJyZW50TW9kaWZpZXJzIHw9IG1vZGlmaWVyOworICAg ICAgICB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVNb3VzZUV2ZW50KHZpZXdXaWRnZXQsIE1v dXNlRXZlbnRUeXBlOjpQcmVzcywgZ2RrQnV0dG9uLCBtX2N1cnJlbnRNb2RpZmllcnMsIGxvY2F0 aW9uSW5WaWV3LngoKSwgbG9jYXRpb25JblZpZXcueSgpLCBzdGF0ZSwgbV9jbGlja0NvdW50KTsK ICAgICAgICAgYnJlYWs7CisgICAgfQogICAgIGNhc2UgTW91c2VJbnRlcmFjdGlvbjo6VXA6Ci0g ICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uudmlld1dpZGdldCgp LCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSk7CiAgICAgICAgIG1fY3VycmVudE1v ZGlmaWVycyAmPSB+bW9kaWZpZXI7CisgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6 ZU1vdXNlRXZlbnQodmlld1dpZGdldCwgTW91c2VFdmVudFR5cGU6OlJlbGVhc2UsIGdka0J1dHRv biwgbV9jdXJyZW50TW9kaWZpZXJzLCBsb2NhdGlvbkluVmlldy54KCksIGxvY2F0aW9uSW5WaWV3 LnkoKSwgc3RhdGUsIDApOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1vdXNlSW50ZXJhY3Rp b246OlNpbmdsZUNsaWNrOgotICAgICAgICBkb01vdXNlRXZlbnQoR0RLX0JVVFRPTl9QUkVTUywg cGFnZS52aWV3V2lkZ2V0KCksIGxvY2F0aW9uSW5WaWV3LCBnZGtCdXR0b24sIHN0YXRlKTsKLSAg ICAgICAgZG9Nb3VzZUV2ZW50KEdES19CVVRUT05fUkVMRUFTRSwgcGFnZS52aWV3V2lkZ2V0KCks IGxvY2F0aW9uSW5WaWV3LCBnZGtCdXR0b24sIHN0YXRlIHwgbW9kaWZpZXIpOworICAgICAgICB3 ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVNb3VzZUV2ZW50KHZpZXdXaWRnZXQsIE1vdXNlRXZl bnRUeXBlOjpQcmVzcywgZ2RrQnV0dG9uLCBtX2N1cnJlbnRNb2RpZmllcnMgfCBtb2RpZmllciwg bG9jYXRpb25JblZpZXcueCgpLCBsb2NhdGlvbkluVmlldy55KCksIHN0YXRlLCAxKTsKKyAgICAg ICAgd2Via2l0V2ViVmlld0Jhc2VTeW50aGVzaXplTW91c2VFdmVudCh2aWV3V2lkZ2V0LCBNb3Vz ZUV2ZW50VHlwZTo6UmVsZWFzZSwgZ2RrQnV0dG9uLCBtX2N1cnJlbnRNb2RpZmllcnMsIGxvY2F0 aW9uSW5WaWV3LngoKSwgbG9jYXRpb25JblZpZXcueSgpLCBzdGF0ZSwgMCk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgTW91c2VJbnRlcmFjdGlvbjo6RG91YmxlQ2xpY2s6Ci0gICAgICAgIGRv TW91c2VFdmVudChHREtfQlVUVE9OX1BSRVNTLCBwYWdlLnZpZXdXaWRnZXQoKSwgbG9jYXRpb25J blZpZXcsIGdka0J1dHRvbiwgc3RhdGUpOwotICAgICAgICBkb01vdXNlRXZlbnQoR0RLX0JVVFRP Tl9SRUxFQVNFLCBwYWdlLnZpZXdXaWRnZXQoKSwgbG9jYXRpb25JblZpZXcsIGdka0J1dHRvbiwg c3RhdGUgfCBtb2RpZmllcik7Ci0gICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1BSRVNT LCBwYWdlLnZpZXdXaWRnZXQoKSwgbG9jYXRpb25JblZpZXcsIGdka0J1dHRvbiwgc3RhdGUpOwot ICAgICAgICBkb01vdXNlRXZlbnQoR0RLX0JVVFRPTl9SRUxFQVNFLCBwYWdlLnZpZXdXaWRnZXQo KSwgbG9jYXRpb25JblZpZXcsIGdka0J1dHRvbiwgc3RhdGUgfCBtb2RpZmllcik7CisgICAgICAg IHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZU1vdXNlRXZlbnQodmlld1dpZGdldCwgTW91c2VF dmVudFR5cGU6OlByZXNzLCBnZGtCdXR0b24sIG1fY3VycmVudE1vZGlmaWVycyB8IG1vZGlmaWVy LCBsb2NhdGlvbkluVmlldy54KCksIGxvY2F0aW9uSW5WaWV3LnkoKSwgc3RhdGUsIDEpOworICAg ICAgICB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVNb3VzZUV2ZW50KHZpZXdXaWRnZXQsIE1v dXNlRXZlbnRUeXBlOjpSZWxlYXNlLCBnZGtCdXR0b24sIG1fY3VycmVudE1vZGlmaWVycywgbG9j YXRpb25JblZpZXcueCgpLCBsb2NhdGlvbkluVmlldy55KCksIHN0YXRlLCAwKTsKKyAgICAgICAg d2Via2l0V2ViVmlld0Jhc2VTeW50aGVzaXplTW91c2VFdmVudCh2aWV3V2lkZ2V0LCBNb3VzZUV2 ZW50VHlwZTo6UHJlc3MsIGdka0J1dHRvbiwgbV9jdXJyZW50TW9kaWZpZXJzIHwgbW9kaWZpZXIs IGxvY2F0aW9uSW5WaWV3LngoKSwgbG9jYXRpb25JblZpZXcueSgpLCBzdGF0ZSwgMik7CisgICAg ICAgIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZU1vdXNlRXZlbnQodmlld1dpZGdldCwgTW91 c2VFdmVudFR5cGU6OlJlbGVhc2UsIGdka0J1dHRvbiwgbV9jdXJyZW50TW9kaWZpZXJzLCBsb2Nh dGlvbkluVmlldy54KCksIGxvY2F0aW9uSW5WaWV3LnkoKSwgc3RhdGUsIDApOwogICAgICAgICBi cmVhazsKICAgICB9Ci0jZW5kaWYKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCRFJJVkVSX01PVVNF X0lOVEVSQUNUSU9OUykKIAogI2lmIEVOQUJMRShXRUJEUklWRVJfS0VZQk9BUkRfSU5URVJBQ1RJ T05TKQotI2lmICFVU0UoR1RLNCkKLXN0YXRpYyB2b2lkIGRvS2V5U3Ryb2tlRXZlbnQoR2RrRXZl bnRUeXBlIHR5cGUsIEd0a1dpZGdldCogd2lkZ2V0LCB1bnNpZ25lZCBrZXlWYWwsIHVuc2lnbmVk IHN0YXRlLCBib29sIGRvUmVsZWFzZUFmdGVyUHJlc3MgPSBmYWxzZSkKLXsKLSAgICBBU1NFUlQo dHlwZSA9PSBHREtfS0VZX1BSRVNTIHx8IHR5cGUgPT0gR0RLX0tFWV9SRUxFQVNFKTsKLQotICAg IEdVbmlxdWVQdHI8R2RrRXZlbnQ+IGV2ZW50KGdka19ldmVudF9uZXcodHlwZSkpOwotICAgIGV2 ZW50LT5rZXkua2V5dmFsID0ga2V5VmFsOwotCi0gICAgZXZlbnQtPmtleS50aW1lID0gR0RLX0NV UlJFTlRfVElNRTsKLSAgICBldmVudC0+a2V5LndpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3dpbmRv dyh3aWRnZXQpOwotICAgIGdfb2JqZWN0X3JlZihldmVudC0+a2V5LndpbmRvdyk7Ci0KLSAgICBH ZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh3aWRnZXQpOwotICAg IGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LmdldCgpLCBnZGtfc2VhdF9nZXRfcG9pbnRlcihn ZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGRpc3BsYXkpKSk7Ci0gICAgZXZlbnQtPmtleS5z dGF0ZSA9IHN0YXRlOwotCi0gICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGlu dmFsaWQgaGFyZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJv Y2Vzc2VkIGJ5IEdUSysuCi0gICAgR1VuaXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7Ci0g ICAgaW50IGtleXNDb3VudDsKLSAgICBHZGtLZXltYXAqIGtleW1hcCA9IGdka19rZXltYXBfZ2V0 X2Zvcl9kaXNwbGF5KGRpc3BsYXkpOwotICAgIGlmIChnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zv cl9rZXl2YWwoa2V5bWFwLCBrZXlWYWwsICZrZXlzLm91dFB0cigpLCAma2V5c0NvdW50KSAmJiBr ZXlzQ291bnQpCi0gICAgICAgIGV2ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXMuZ2V0 KClbMF0ua2V5Y29kZTsKLQotICAgIGlmIChzdGF0ZSkgewotICAgICAgICBnZGtfa2V5bWFwX3Ry YW5zbGF0ZV9rZXlib2FyZF9zdGF0ZShrZXltYXAsIGV2ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29k ZSwgc3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPihzdGF0ZSksCi0gICAgICAgICAgICAwLCAm ZXZlbnQtPmtleS5rZXl2YWwsIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOwotICAgIH0KLQot ICAgIGd0a19tYWluX2RvX2V2ZW50KGV2ZW50LmdldCgpKTsKLSAgICBpZiAoZG9SZWxlYXNlQWZ0 ZXJQcmVzcykgewotICAgICAgICBBU1NFUlQodHlwZSA9PSBHREtfS0VZX1BSRVNTKTsKLSAgICAg ICAgZXZlbnQtPmtleS50eXBlID0gR0RLX0tFWV9SRUxFQVNFOwotICAgICAgICBndGtfbWFpbl9k b19ldmVudChldmVudC5nZXQoKSk7Ci0gICAgfQotfQotCiBzdGF0aWMgaW50IGtleUNvZGVGb3JW aXJ0dWFsS2V5KEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlZpcnR1YWxLZXkga2V5 KQogewogICAgIHN3aXRjaCAoa2V5KSB7CkBAIC0zMDgsMTEgKzIzNSw5IEBAIHN0YXRpYyB1bnNp Z25lZCBtb2RpZmllcnNGb3JLZXlDb2RlKHVuc2lnbmVkIGtleUNvZGUpCiAgICAgfQogICAgIHJl dHVybiAwOwogfQotI2VuZGlmCiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3Jt U2ltdWxhdGVLZXlib2FyZEludGVyYWN0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgS2V5Ym9hcmRJ bnRlcmFjdGlvbiBpbnRlcmFjdGlvbiwgV1RGOjpWYXJpYW50PFZpcnR1YWxLZXksIENoYXJLZXk+ JiYga2V5KQogewotI2lmICFVU0UoR1RLNCkKICAgICB1bnNpZ25lZCBrZXlDb2RlOwogICAgIFdU Rjo6c3dpdGNoT24oa2V5LAogICAgICAgICBbJl0gKFZpcnR1YWxLZXkgdmlydHVhbEtleSkgewpA QCAtMzIzLDMzICsyNDgsMzUgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGxhdGZvcm1T aW11bGF0ZUtleWJvYXJkSW50ZXJhY3Rpb24oV2ViUGFnZVByb3h5JiBwYWcKICAgICAgICAgfQog ICAgICk7CiAgICAgdW5zaWduZWQgbW9kaWZpZXJzID0gbW9kaWZpZXJzRm9yS2V5Q29kZShrZXlD b2RlKTsKKyAgICBhdXRvKiB2aWV3V2lkZ2V0ID0gcmVpbnRlcnByZXRfY2FzdDxXZWJLaXRXZWJW aWV3QmFzZSo+KHBhZ2Uudmlld1dpZGdldCgpKTsKIAorICAgIEtleUV2ZW50VHlwZSB0eXBlOwog ICAgIHN3aXRjaCAoaW50ZXJhY3Rpb24pIHsKICAgICBjYXNlIEtleWJvYXJkSW50ZXJhY3Rpb246 OktleVByZXNzOgorICAgICAgICB0eXBlID0gS2V5RXZlbnRUeXBlOjpQcmVzczsKICAgICAgICAg bV9jdXJyZW50TW9kaWZpZXJzIHw9IG1vZGlmaWVyczsKLSAgICAgICAgZG9LZXlTdHJva2VFdmVu dChHREtfS0VZX1BSRVNTLCBwYWdlLnZpZXdXaWRnZXQoKSwga2V5Q29kZSwgbV9jdXJyZW50TW9k aWZpZXJzKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBLZXlib2FyZEludGVyYWN0aW9uOjpL ZXlSZWxlYXNlOgorICAgICAgICB0eXBlID0gS2V5RXZlbnRUeXBlOjpSZWxlYXNlOwogICAgICAg ICBtX2N1cnJlbnRNb2RpZmllcnMgJj0gfm1vZGlmaWVyczsKLSAgICAgICAgZG9LZXlTdHJva2VF dmVudChHREtfS0VZX1JFTEVBU0UsIHBhZ2Uudmlld1dpZGdldCgpLCBrZXlDb2RlLCBtX2N1cnJl bnRNb2RpZmllcnMpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEtleWJvYXJkSW50ZXJhY3Rp b246Okluc2VydEJ5S2V5OgotICAgICAgICBkb0tleVN0cm9rZUV2ZW50KEdES19LRVlfUFJFU1Ms IHBhZ2Uudmlld1dpZGdldCgpLCBrZXlDb2RlLCBtX2N1cnJlbnRNb2RpZmllcnMsIHRydWUpOwor ICAgICAgICB0eXBlID0gS2V5RXZlbnRUeXBlOjpJbnNlcnQ7CiAgICAgICAgIGJyZWFrOwogICAg IH0KLSNlbmRpZgorCisgICAgd2Via2l0V2ViVmlld0Jhc2VTeW50aGVzaXplS2V5RXZlbnQodmll d1dpZGdldCwgdHlwZSwga2V5Q29kZSwgbV9jdXJyZW50TW9kaWZpZXJzLCBTaG91bGRUcmFuc2xh dGVLZXlib2FyZFN0YXRlOjpZZXMpOwogfQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpw bGF0Zm9ybVNpbXVsYXRlS2V5U2VxdWVuY2UoV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBTdHJp bmcmIGtleVNlcXVlbmNlKQogewotI2lmICFVU0UoR1RLNCkKICAgICBDU3RyaW5nIGtleVNlcXVl bmNlVVRGOCA9IGtleVNlcXVlbmNlLnV0ZjgoKTsKICAgICBjb25zdCBjaGFyKiBwID0ga2V5U2Vx dWVuY2VVVEY4LmRhdGEoKTsKKyAgICBhdXRvKiB2aWV3V2lkZ2V0ID0gcmVpbnRlcnByZXRfY2Fz dDxXZWJLaXRXZWJWaWV3QmFzZSo+KHBhZ2Uudmlld1dpZGdldCgpKTsKICAgICBkbyB7Ci0gICAg ICAgIGRvS2V5U3Ryb2tlRXZlbnQoR0RLX0tFWV9QUkVTUywgcGFnZS52aWV3V2lkZ2V0KCksIGdk a191bmljb2RlX3RvX2tleXZhbChnX3V0ZjhfZ2V0X2NoYXIocCkpLCBtX2N1cnJlbnRNb2RpZmll cnMsIHRydWUpOworICAgICAgICB3ZWJraXRXZWJWaWV3QmFzZVN5bnRoZXNpemVLZXlFdmVudCh2 aWV3V2lkZ2V0LCBLZXlFdmVudFR5cGU6Okluc2VydCwgZ2RrX3VuaWNvZGVfdG9fa2V5dmFsKGdf dXRmOF9nZXRfY2hhcihwKSksIG1fY3VycmVudE1vZGlmaWVycywgU2hvdWxkVHJhbnNsYXRlS2V5 Ym9hcmRTdGF0ZTo6WWVzKTsKICAgICAgICAgcCA9IGdfdXRmOF9uZXh0X2NoYXIocCk7CiAgICAg fSB3aGlsZSAoKnApOwotI2VuZGlmCiB9CiAjZW5kaWYgLy8gRU5BQkxFKFdFQkRSSVZFUl9LRVlC T0FSRF9JTlRFUkFDVElPTlMpCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2d0ay9LZXlCaW5kaW5nVHJhbnNsYXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9n dGsvS2V5QmluZGluZ1RyYW5zbGF0b3IuY3BwCmluZGV4IDZkYjI0YjcxMzU5YS4uMTU5OTcxYWNj NmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvS2V5QmluZGluZ1Ry YW5zbGF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9LZXlCaW5kaW5n VHJhbnNsYXRvci5jcHAKQEAgLTMyMCw3ICszMjAsMTggQEAgc3RhdGljIGNvbnN0IEtleUNvbWJp bmF0aW9uRW50cnkgcHJlZGVmaW5lZEtleUJpbmRpbmdzW10gPSB7CiAgICAgeyBHREtfS0VZX0Rl bGV0ZSwgICAgICAgR0RLX0NPTlRST0xfTUFTSywgICAgICAgICAgICAgICAgICAiRGVsZXRlV29y ZEZvcndhcmQiIH0sCiAgICAgeyBHREtfS0VZX0tQX0RlbGV0ZSwgICAgR0RLX0NPTlRST0xfTUFT SywgICAgICAgICAgICAgICAgICAiRGVsZXRlV29yZEZvcndhcmQiIH0sCiAgICAgeyBHREtfS0VZ X0JhY2tTcGFjZSwgICAgMCwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRGVsZXRl QmFja3dhcmQiIH0sCi0gICAgeyBHREtfS0VZX0JhY2tTcGFjZSwgICAgR0RLX0NPTlRST0xfTUFT SywgICAgICAgICAgICAgICAgICAiRGVsZXRlV29yZEJhY2t3YXJkIiB9CisgICAgeyBHREtfS0VZ X0JhY2tTcGFjZSwgICAgR0RLX1NISUZUX01BU0ssICAgICAgICAgICAgICAgICAgICAiRGVsZXRl QmFja3dhcmQiIH0sCisgICAgeyBHREtfS0VZX0JhY2tTcGFjZSwgICAgR0RLX0NPTlRST0xfTUFT SywgICAgICAgICAgICAgICAgICAiRGVsZXRlV29yZEJhY2t3YXJkIiB9LAorICAgIHsgR0RLX0tF WV9hLCAgICAgICAgICAgIEdES19DT05UUk9MX01BU0ssICAgICAgICAgICAgICAgICAgIlNlbGVj dEFsbCIgfSwKKyAgICB7IEdES19LRVlfYSwgICAgICAgICAgICBHREtfQ09OVFJPTF9NQVNLIHwg R0RLX1NISUZUX01BU0ssICJVbnNlbGVjdCIgfSwKKyAgICB7IEdES19LRVlfc2xhc2gsICAgICAg ICBHREtfQ09OVFJPTF9NQVNLLCAgICAgICAgICAgICAgICAgICJTZWxlY3RBbGwiIH0sCisgICAg eyBHREtfS0VZX2JhY2tzbGFzaCwgICAgR0RLX0NPTlRST0xfTUFTSywgICAgICAgICAgICAgICAg ICAiVW5zZWxlY3QiIH0sCisgICAgeyBHREtfS0VZX3gsICAgICAgICAgICAgR0RLX0NPTlRST0xf TUFTSywgICAgICAgICAgICAgICAgICAiQ3V0IiB9LAorICAgIHsgR0RLX0tFWV9jLCAgICAgICAg ICAgIEdES19DT05UUk9MX01BU0ssICAgICAgICAgICAgICAgICAgIkNvcHkiIH0sCisgICAgeyBH REtfS0VZX3YsICAgICAgICAgICAgR0RLX0NPTlRST0xfTUFTSywgICAgICAgICAgICAgICAgICAi UGFzdGUiIH0sCisgICAgeyBHREtfS0VZX0tQX0RlbGV0ZSwgICAgR0RLX1NISUZUX01BU0ssICAg ICAgICAgICAgICAgICAgICAiQ3V0IiB9LAorICAgIHsgR0RLX0tFWV9LUF9JbnNlcnQsICAgIEdE S19DT05UUk9MX01BU0ssICAgICAgICAgICAgICAgICAgIkNvcHkiIH0sCisgICAgeyBHREtfS0VZ X0tQX0luc2VydCwgICAgR0RLX1NISUZUX01BU0ssICAgICAgICAgICAgICAgICAgICAiUGFzdGUi IH0KIH07CiAKIFZlY3RvcjxTdHJpbmc+IEtleUJpbmRpbmdUcmFuc2xhdG9yOjpjb21tYW5kc0Zv cktleXZhbCh1bnNpZ25lZCBrZXl2YWwsIHVuc2lnbmVkIG1vZGlmaWVycykKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiOTRjZWIyNjhkNGUuLjE4 M2JmMWNlOGRlOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA1LTI4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBXZWJEcml2ZXI6IHN0b3AgdXNp bmcgR2RrRXZlbnQgQVBJIGluIHByZXBhcmF0aW9uIGZvciBHVEs0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI0NjUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdG8gdGhlIG5ldyB3ZWJraXRX ZWJWaWV3QmFzZVN5bnRoZXNpemVLZXlFdmVudCgpIEFQSS4KKworICAgICAgICAqIFdlYktpdFRl c3RSdW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwOgorICAgICAgICAoV1RSOjpFdmVu dFNlbmRlclByb3h5OjprZXlEb3duKToKKwogMjAyMC0wNS0yNyAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZsYXRwYWsgU0RLXSBVcGRhdGUgb3Bl bnhyIHJlY2lwZQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRT ZW5kZXJQcm94eUd0ay5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNlbmRl clByb3h5R3RrLmNwcAppbmRleCAwOTU1ZjUxNjg3MWMuLmNmZTYzOGE2MjU1NCAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKQEAg LTIzNSw3ICsyMzUsNyBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmtleURvd24oV0tTdHJpbmdS ZWYga2V5UmVmLCBXS0V2ZW50TW9kaWZpZXJzIHdrTW9kaWZpZXJzLAogewogICAgIGd1aW50IG1v ZGlmaWVycyA9IHdlYmtpdE1vZGlmaWVyc1RvR0RLTW9kaWZpZXJzKHdrTW9kaWZpZXJzKTsKICAg ICBpbnQgZ2RrS2V5U3ltID0gZ2V0R0RLS2V5U3ltRm9yS2V5UmVmKGtleVJlZiwgbG9jYXRpb24s ICZtb2RpZmllcnMpOwotICAgIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZUtleUV2ZW50KHRv V2ViS2l0R0xpYkFQSShtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZp ZXcoKSksIGdka0tleVN5bSwgbW9kaWZpZXJzKTsKKyAgICB3ZWJraXRXZWJWaWV3QmFzZVN5bnRo ZXNpemVLZXlFdmVudCh0b1dlYktpdEdMaWJBUEkobV90ZXN0Q29udHJvbGxlci0+bWFpbldlYlZp ZXcoKS0+cGxhdGZvcm1WaWV3KCkpLCBLZXlFdmVudFR5cGU6Okluc2VydCwgZ2RrS2V5U3ltLCBt b2RpZmllcnMsIFNob3VsZFRyYW5zbGF0ZUtleWJvYXJkU3RhdGU6Ok5vKTsKIH0KIAogdm9pZCBF dmVudFNlbmRlclByb3h5Ojptb3VzZURvd24odW5zaWduZWQgYnV0dG9uLCBXS0V2ZW50TW9kaWZp ZXJzIHdrTW9kaWZpZXJzKQpkaWZmIC0tZ2l0IGEvV2ViRHJpdmVyVGVzdHMvQ2hhbmdlTG9nIGIv V2ViRHJpdmVyVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZjMTBmZjk3MTgzZS4uYjBlODEzOTM5YTMw IDEwMDY0NAotLS0gYS9XZWJEcml2ZXJUZXN0cy9DaGFuZ2VMb2cKKysrIGIvV2ViRHJpdmVyVGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDUtMjggIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYkRyaXZlcjog c3RvcCB1c2luZyBHZGtFdmVudCBBUEkgaW4gcHJlcGFyYXRpb24gZm9yIEdUSzQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjQ2NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBleHBlY3RhdGlv bnMgZm9yIHRlc3RzIHRoYXQgYXJlIHBhc3Npbmcgbm93LgorCisgICAgICAgICogVGVzdEV4cGVj dGF0aW9ucy5qc29uOgorCiAyMDIwLTA1LTE5ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtXZWJEcml2ZXJdW1dQRV0gU2tpcCB3aW5kb3dpbmcgdGVzdHMuCmRp ZmYgLS1naXQgYS9XZWJEcml2ZXJUZXN0cy9UZXN0RXhwZWN0YXRpb25zLmpzb24gYi9XZWJEcml2 ZXJUZXN0cy9UZXN0RXhwZWN0YXRpb25zLmpzb24KaW5kZXggYTVhNGU1Y2I1N2RhLi40MTk5Zjg1 ZWU5OTYgMTAwNjQ0Ci0tLSBhL1dlYkRyaXZlclRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMuanNvbgor KysgYi9XZWJEcml2ZXJUZXN0cy9UZXN0RXhwZWN0YXRpb25zLmpzb24KQEAgLTE2MSw5ICsxNjEs NiBAQAogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJ0ZXN0QWxsUHJpbnRhYmxlS2V5cyI6 IHsKICAgICAgICAgICAgICAgICAiZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3RhdHVzIjogWyJGQUlM Il0sICJidWciOiAid2Via2l0Lm9yZy9iLzE4MjMzMyJ9fQotICAgICAgICAgICAgfSwKLSAgICAg ICAgICAgICJ0ZXN0TnVtYmVycGFkQW5kRnVuY3Rpb25LZXlzIjogewotICAgICAgICAgICAgICAg ICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQu b3JnL2IvMTgyMzMzIn19CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9LApAQCAtMjc2 LDE1ICsyNzMsOSBAQAogICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9rZXlfc2VuZHNfa2V5ZG93 bltTRU1JQ09MT04tZXhwZWN0ZWQyMF0iOiB7CiAgICAgICAgICAgICAgICAgImV4cGVjdGVkIjog eyJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCJdLCAiYnVnIjogIndlYmtpdC5vcmcvYi8xODQ5Njci fX0KICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAidGVzdF9zcGVjaWFsX2tleV9zZW5kc19r ZXlkb3duW05VTVBBRDQtZXhwZWN0ZWQyMl0iOiB7Ci0gICAgICAgICAgICAgICAgImV4cGVjdGVk IjogeyJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCJdLCAiYnVnIjogIndlYmtpdC5vcmcvYi8xODQ5 NjcifX0KLSAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAidGVzdF9zcGVjaWFsX2tleV9zZW5k c19rZXlkb3duW1JfQUxULWV4cGVjdGVkMjVdIjogewogICAgICAgICAgICAgICAgICJleHBlY3Rl ZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMTg0 OTY3In19CiAgICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9rZXlfc2Vu ZHNfa2V5ZG93bltERUNJTUFMLWV4cGVjdGVkMjddIjogewotICAgICAgICAgICAgICAgICJleHBl Y3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2Iv MTg0OTY3In19Ci0gICAgICAgICAgICB9LAogICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9rZXlf c2VuZHNfa2V5ZG93bltSX0RFTEVURS1leHBlY3RlZDI5XSI6IHsKICAgICAgICAgICAgICAgICAi ZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9y Zy9iLzE4NDk2NyJ9fQogICAgICAgICAgICAgfSwKQEAgLTMwNiw5ICsyOTcsNiBAQAogICAgICAg ICAgICAgInRlc3Rfc3BlY2lhbF9rZXlfc2VuZHNfa2V5ZG93bltSX1BBR0VET1dOLWV4cGVjdGVk MzldIjogewogICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBb IkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMTg0OTY3In19CiAgICAgICAgICAgICB9LAot ICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9rZXlfc2VuZHNfa2V5ZG93bltOVU1QQUQxLWV4cGVj dGVkNDFdIjogewotICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMi OiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMTg0OTY3In19Ci0gICAgICAgICAgICB9 LAogICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9rZXlfc2VuZHNfa2V5ZG93bltSX0lOU0VSVC1l eHBlY3RlZDQyXSI6IHsKICAgICAgICAgICAgICAgICAiZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3Rh dHVzIjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9yZy9iLzE4NDk2NyJ9fQogICAgICAgICAg ICAgfSwKQEAgLTMxOCwyNyArMzA2LDkgQEAKICAgICAgICAgICAgICJ0ZXN0X3NwZWNpYWxfa2V5 X3NlbmRzX2tleWRvd25bQ0FOQ0VMLWV4cGVjdGVkNDRdIjogewogICAgICAgICAgICAgICAgICJl eHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3Jn L2IvMTg0OTY3In19CiAgICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rfc3BlY2lhbF9r ZXlfc2VuZHNfa2V5ZG93bltOVU1QQUQ2LWV4cGVjdGVkNDVdIjogewotICAgICAgICAgICAgICAg ICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQu b3JnL2IvMTg0OTY3In19Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rfc3BlY2lh bF9rZXlfc2VuZHNfa2V5ZG93bltGMTEtZXhwZWN0ZWQ0N10iOiB7Ci0gICAgICAgICAgICAgICAg ImV4cGVjdGVkIjogeyJhbGwiOiB7InN0YXR1cyI6IFsiRkFJTCJdLCAiYnVnIjogIndlYmtpdC5v cmcvYi8xODQ5NjcifX0KLSAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAidGVzdF9zcGVjaWFs X2tleV9zZW5kc19rZXlkb3duW1JfRU5ELWV4cGVjdGVkNDhdIjogewogICAgICAgICAgICAgICAg ICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQu b3JnL2IvMTg0OTY3In19CiAgICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rfc3BlY2lh bF9rZXlfc2VuZHNfa2V5ZG93bltOVU1QQUQ3LWV4cGVjdGVkNDldIjogewotICAgICAgICAgICAg ICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJr aXQub3JnL2IvMTg0OTY3In19Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rfc3Bl Y2lhbF9rZXlfc2VuZHNfa2V5ZG93bltOVU1QQUQyLWV4cGVjdGVkNTBdIjogewotICAgICAgICAg ICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3 ZWJraXQub3JnL2IvMTg0OTY3In19Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgInRlc3Rf c3BlY2lhbF9rZXlfc2VuZHNfa2V5ZG93bltGNS1leHBlY3RlZDU1XSI6IHsKLSAgICAgICAgICAg ICAgICAiZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAid2Vi a2l0Lm9yZy9iLzE4NDk2NyJ9fQotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICJ0ZXN0X3Nw ZWNpYWxfa2V5X3NlbmRzX2tleWRvd25bTlVNUEFEOC1leHBlY3RlZDYwXSI6IHsKLSAgICAgICAg ICAgICAgICAiZXhwZWN0ZWQiOiB7ImFsbCI6IHsic3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAi d2Via2l0Lm9yZy9iLzE4NDk2NyJ9fQotICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJ0ZXN0 X3NwZWNpYWxfa2V5X3NlbmRzX2tleWRvd25bUl9IT01FLWV4cGVjdGVkNjNdIjogewogICAgICAg ICAgICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwgImJ1ZyI6 ICJ3ZWJraXQub3JnL2IvMTg0OTY3In19CiAgICAgICAgICAgICB9LAo=