229784 2021-09-01 17:35:25 -0700 KeyboardEvent should setDefaultHandled if EventHandler::startKeyboardScrolling returns true 2021-09-08 12:59:16 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii ap darin simon.fraser thorton webkit-bug-importer oldest_to_newest 1789557 0 fujii 2021-09-01 17:35:25 -0700 KeyboardEvent should setDefaultHandled if EventHandler::startKeyboardScrolling returns true 1789558 1 437094 fujii 2021-09-01 17:37:11 -0700 Created attachment 437094 WIP patch 1789566 2 darin 2021-09-01 17:47:29 -0700 Can we create a test for this? Given this is an improvement, I imagine the improvement is detectable, and we should add a test. 1789576 3 fujii 2021-09-01 18:31:09 -0700 Yup, that's what I want to do now. 1789577 4 437101 fujii 2021-09-01 18:31:42 -0700 Created attachment 437101 WIP patch 1790065 5 437246 fujii 2021-09-02 23:40:51 -0700 Created attachment 437246 WIP Patch 1790611 6 437385 fujii 2021-09-05 23:03:33 -0700 Created attachment 437385 Patch 1791188 7 437385 thorton 2021-09-07 13:19:42 -0700 Comment on attachment 437385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437385&action=review > LayoutTests/fast/scrolling/keyboard-scrolling-last-timestamp.html:19 > + await UIHelper.delayFor(500); Is there any way to write this test without a 500ms pause? We generally try to avoid this at the scale of 60k tests :) 1791276 8 437385 fujii 2021-09-07 17:04:46 -0700 Comment on attachment 437385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437385&action=review >> LayoutTests/fast/scrolling/keyboard-scrolling-last-timestamp.html:19 >> + await UIHelper.delayFor(500); > > Is there any way to write this test without a 500ms pause? We generally try to avoid this at the scale of 60k tests :) Good point. UIHelper.waitForTargetScrollAnimationToSettle seems the one I want. 1791277 9 437572 fujii 2021-09-07 17:06:19 -0700 Created attachment 437572 Patch 1791282 10 437572 darin 2021-09-07 17:09:43 -0700 Comment on attachment 437572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437572&action=review > LayoutTests/ChangeLog:9 > + * fast/scrolling/keyboard-scrolling-last-timestamp-expected.txt: Added. > + * fast/scrolling/keyboard-scrolling-last-timestamp.html: Added. What happens in this test if default handled is not set? 1791285 11 437572 fujii 2021-09-07 17:24:26 -0700 Comment on attachment 437572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437572&action=review >> LayoutTests/ChangeLog:9 >> + * fast/scrolling/keyboard-scrolling-last-timestamp.html: Added. > > What happens in this test if default handled is not set? internals.lastHandledUserGestureTimestamp() didn't change by the key events before my change. EventHandler::keyEvent updates lastHandledUserGestureTimestamp if the default hander handled. https://github.com/WebKit/WebKit/blob/292ba371d52e1291c750185a82c7ce04e231e508/Source/WebCore/page/EventHandler.cpp#L3490 1791301 12 437572 darin 2021-09-07 18:24:11 -0700 Comment on attachment 437572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437572&action=review >>> LayoutTests/ChangeLog:9 >>> + * fast/scrolling/keyboard-scrolling-last-timestamp.html: Added. >> >> What happens in this test if default handled is not set? > > internals.lastHandledUserGestureTimestamp() didn't change by the key events before my change. > > EventHandler::keyEvent updates lastHandledUserGestureTimestamp if the default hander handled. > https://github.com/WebKit/WebKit/blob/292ba371d52e1291c750185a82c7ce04e231e508/Source/WebCore/page/EventHandler.cpp#L3490 Creating finding that. I guess it’s hard to test since "defaultHandled" is an internal thing, not directly visible to the web platform. I suppose we primarily can detect it by seeing that certain default behavior didn’t happen. 1791376 13 437572 fujii 2021-09-07 23:39:34 -0700 Comment on attachment 437572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437572&action=review >>>> LayoutTests/ChangeLog:9 >>>> + * fast/scrolling/keyboard-scrolling-last-timestamp.html: Added. >>> >>> What happens in this test if default handled is not set? >> >> internals.lastHandledUserGestureTimestamp() didn't change by the key events before my change. >> >> EventHandler::keyEvent updates lastHandledUserGestureTimestamp if the default hander handled. >> https://github.com/WebKit/WebKit/blob/292ba371d52e1291c750185a82c7ce04e231e508/Source/WebCore/page/EventHandler.cpp#L3490 > > Creating finding that. I guess it’s hard to test since "defaultHandled" is an internal thing, not directly visible to the web platform. I suppose we primarily can detect it by seeing that certain default behavior didn’t happen. I don't understand. How can I do that? I think TestWebKitAPI can test this change by using WKPageUIClientV0::didNotHandleKeyEvent. Is it better? 1791509 14 darin 2021-09-08 09:57:09 -0700 (In reply to Fujii Hironori from comment #13) > I don't understand. How can I do that? I don’t know if you can. > I think TestWebKitAPI can test this change by using > WKPageUIClientV0::didNotHandleKeyEvent. Is it better? Probably better in some ways, but this is also OK. 1791588 15 437572 fujii 2021-09-08 12:58:10 -0700 Comment on attachment 437572 Patch Clearing flags on attachment: 437572 Committed r282165 (241457@main): <https://commits.webkit.org/241457@main> 1791589 16 fujii 2021-09-08 12:58:14 -0700 All reviewed patches have been landed. Closing bug. 1791590 17 webkit-bug-importer 2021-09-08 12:59:16 -0700 <rdar://problem/82887017> 437094 2021-09-01 17:37:11 -0700 2021-09-01 18:31:42 -0700 WIP patch a.diff text/plain 1151 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCBkYjdkODhjYWExN2YuLjk2NGVi ODcxZGM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMzgwOCw3ICsz ODA4LDggQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxlcihL ZXlib2FyZEV2ZW50JiBldmVudCkKICAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmll cigpID09ICJVKzAwMDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxl cihldmVudCk7CiAgICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFn ZVVwIiB8fCBldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKLSAgICAgICAgICAg IHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpOworICAgICAgICAgICAgaWYgKHN0YXJ0S2V5 Ym9hcmRTY3JvbGxpbmcoZXZlbnQpKQorICAgICAgICAgICAgICAgIGV2ZW50LnNldERlZmF1bHRI YW5kbGVkKCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgRm9jdXNEaXJlY3Rpb24gZGly ZWN0aW9uID0gZm9jdXNEaXJlY3Rpb25Gb3JLZXkoZXZlbnQua2V5SWRlbnRpZmllcigpKTsKICAg ICAgICAgICAgIGlmIChkaXJlY3Rpb24gIT0gRm9jdXNEaXJlY3Rpb246Ok5vbmUpCkBAIC00MzA3 LDcgKzQzMDgsOCBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEFycm93RXZlbnRIYW5kbGVy KEZvY3VzRGlyZWN0aW9uIGZvY3VzRGlyZWN0aW9uLCBLZXlibwogICAgIEFTU0VSVChldmVudC50 eXBlKCkgPT0gZXZlbnROYW1lcygpLmtleWRvd25FdmVudCk7CiAKICAgICBpZiAoIWlzU3BhdGlh bE5hdmlnYXRpb25FbmFibGVkKCZtX2ZyYW1lKSkgewotICAgICAgICBzdGFydEtleWJvYXJkU2Ny b2xsaW5nKGV2ZW50KTsKKyAgICAgICAgaWYgKHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQp KQorICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAo= 437101 2021-09-01 18:31:42 -0700 2021-09-02 23:40:39 -0700 WIP patch a.diff text/plain 1369 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCBkYjdkODhjYWExN2YuLjA4Njlj NjFkNzMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMzgwNyw5ICsz ODA3LDEwIEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIo S2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgICAgICAgICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVy KGV2ZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJVKzAw MDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihldmVudCk7Ci0g ICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVu dC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKLSAgICAgICAgICAgIHN0YXJ0S2V5Ym9h cmRTY3JvbGxpbmcoZXZlbnQpOwotICAgICAgICBlbHNlIHsKKyAgICAgICAgZWxzZSBpZiAoZXZl bnQua2V5SWRlbnRpZmllcigpID09ICJQYWdlVXAiIHx8IGV2ZW50LmtleUlkZW50aWZpZXIoKSA9 PSAiUGFnZURvd24iKSB7CisgICAgICAgICAgICBpZiAoc3RhcnRLZXlib2FyZFNjcm9sbGluZyhl dmVudCkpCisgICAgICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3Vz RGlyZWN0aW9uRm9yS2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBpZiAo ZGlyZWN0aW9uICE9IEZvY3VzRGlyZWN0aW9uOjpOb25lKQogICAgICAgICAgICAgICAgIGRlZmF1 bHRBcnJvd0V2ZW50SGFuZGxlcihkaXJlY3Rpb24sIGV2ZW50KTsKQEAgLTQzMDcsNyArNDMwOCw4 IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoRm9jdXNEaXJl Y3Rpb24gZm9jdXNEaXJlY3Rpb24sIEtleWJvCiAgICAgQVNTRVJUKGV2ZW50LnR5cGUoKSA9PSBl dmVudE5hbWVzKCkua2V5ZG93bkV2ZW50KTsKIAogICAgIGlmICghaXNTcGF0aWFsTmF2aWdhdGlv bkVuYWJsZWQoJm1fZnJhbWUpKSB7Ci0gICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZl bnQpOworICAgICAgICBpZiAoc3RhcnRLZXlib2FyZFNjcm9sbGluZyhldmVudCkpCisgICAgICAg ICAgICBldmVudC5zZXREZWZhdWx0SGFuZGxlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQog Cg== 437246 2021-09-02 23:40:51 -0700 2021-09-05 23:03:22 -0700 WIP Patch bug-229784-20210903154050.patch text/plain 5165 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhiYTJhMTE5NGE5NGU3 NTUyMmY4ZjFjNDM0Nzg5ODM2NGIzZWZiNC4uYzlkMGE1ZDI1NjdmYWY5ZDk0NWJmOWE3MWU4MDRj OWE3OTBmNjI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA5LTAyICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIEtleWJvYXJk RXZlbnQgc2hvdWxkIHNldERlZmF1bHRIYW5kbGVkIGlmIEV2ZW50SGFuZGxlcjo6c3RhcnRLZXli b2FyZFNjcm9sbGluZyByZXR1cm5zIHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyOTc4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGlu Zy1sYXN0LXRpbWVzdGFtcC5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFu ZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRBcnJvd0V2ZW50 SGFuZGxlcik6CisKIDIwMjEtMDktMDIgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFJlbGF0aXZlIC13ZWJraXQtc2Nyb2xsYmFyIHdpZHRoIHZhbHVlIG1heSBsZWFk IHRvIHVuc3RhYmxlIGxheW91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4 IDViYjYyNjkzMGE4MjA3Y2UwNGE1ODI2OGI4YWU1NDQ1ZWY4MGZhMGYuLjIwZGM2MTY1MTZjNDZm MDczMDQxMGMyYWIxOTVmNmJhMWU3OWI0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxl ci5jcHAKQEAgLTM4MDcsOSArMzgwNywxMCBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEtl eWJvYXJkRXZlbnRIYW5kbGVyKEtleWJvYXJkRXZlbnQmIGV2ZW50KQogICAgICAgICAgICAgZGVm YXVsdFRhYkV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlk ZW50aWZpZXIoKSA9PSAiVSswMDA4IikKICAgICAgICAgICAgIGRlZmF1bHRCYWNrc3BhY2VFdmVu dEhhbmRsZXIoZXZlbnQpOwotICAgICAgICBlbHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyKCkg PT0gIlBhZ2VVcCIgfHwgZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJQYWdlRG93biIpCi0gICAg ICAgICAgICBzdGFydEtleWJvYXJkU2Nyb2xsaW5nKGV2ZW50KTsKLSAgICAgICAgZWxzZSB7Cisg ICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVu dC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikgeworICAgICAgICAgICAgaWYgKHN0YXJ0 S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpKQorICAgICAgICAgICAgICAgIGV2ZW50LnNldERlZmF1 bHRIYW5kbGVkKCk7CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBGb2N1c0RpcmVjdGlv biBkaXJlY3Rpb24gPSBmb2N1c0RpcmVjdGlvbkZvcktleShldmVudC5rZXlJZGVudGlmaWVyKCkp OwogICAgICAgICAgICAgaWYgKGRpcmVjdGlvbiAhPSBGb2N1c0RpcmVjdGlvbjo6Tm9uZSkKICAg ICAgICAgICAgICAgICBkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoZGlyZWN0aW9uLCBldmVudCk7 CkBAIC00MzA3LDcgKzQzMDgsOCBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEFycm93RXZl bnRIYW5kbGVyKEZvY3VzRGlyZWN0aW9uIGZvY3VzRGlyZWN0aW9uLCBLZXlibwogICAgIEFTU0VS VChldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmtleWRvd25FdmVudCk7CiAKICAgICBpZiAo IWlzU3BhdGlhbE5hdmlnYXRpb25FbmFibGVkKCZtX2ZyYW1lKSkgewotICAgICAgICBzdGFydEtl eWJvYXJkU2Nyb2xsaW5nKGV2ZW50KTsKKyAgICAgICAgaWYgKHN0YXJ0S2V5Ym9hcmRTY3JvbGxp bmcoZXZlbnQpKQorICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDViZTIyNDE2MTM2OTQ2ODE3YWYxMjc2OGIyMDY2 NWM4Nzg0MmI1MzIuLjYzYTE5ZDNhMzI4MjEzMTEzNDI1YjUzMzk3ODA1MWNhYjA3MGIxZDMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wOS0wMiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9y aS5GdWppaUBzb255LmNvbT4KKworICAgICAgICBLZXlib2FyZEV2ZW50IHNob3VsZCBzZXREZWZh dWx0SGFuZGxlZCBpZiBFdmVudEhhbmRsZXI6OnN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcgcmV0dXJu cyB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mjk3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGlu Zy1sYXN0LXRpbWVzdGFtcC5odG1sOiBBZGRlZC4KKwogMjAyMS0wOS0wMiAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjgwNzY3 KTogQ2FyZXQgY29sb3IgaXMgYmxhY2sgYWZ0ZXIgcGFzdGluZyByaWNoIHRleHQgaW4gTWFpbCBj b21wb3NlIGluIGRhcmsgbW9kZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp bmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWxhc3QtdGltZXN0YW1wLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWM5NTVjMDhjMzg0ZjhiMTY4MWExMjUyZTM2ZjUzZjk3 NDFmYmRhZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tl eWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2 IEBACisKK1BBU1MgRE9NQ29udGVudExvYWRlZAorUEFTUyBzcGFjZQorUEFTUyBkb3duQXJyb3cK K1BBU1MgcGFnZURvd24KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv a2V5Ym9hcmQtc2Nyb2xsaW5nLWxhc3QtdGltZXN0YW1wLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctbGFzdC10aW1lc3RhbXAuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4zMzY3NDdlNTQ5ZWJiNWNmM2Q5ZjEyMjdjZmZmY2NjYmYxM2YxYWEzCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWxh c3QtdGltZXN0YW1wLmh0bWwKQEAgLTAsMCArMSw0MSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0g d2Via2l0LXRlc3QtcnVubmVyIFsgRXZlbnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3Jv bGxpbmdFbmFibGVkPXRydWUgXSAtLT4KKzxtZXRhIGNoYXJzZXQ9dXRmLTg+Cis8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi8uLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4K KyAgICBhc3luYyBmdW5jdGlvbiB0ZXN0X2tleShrZXkpIHsKKyAgICAgICAgbGV0IHByZXZpb3Vz U2Nyb2xsWSA9IHNjcm9sbFk7CisgICAgICAgIGxldCBwcmV2aW91c1RpbWVzdGFtcCA9IGludGVy bmFscy5sYXN0SGFuZGxlZFVzZXJHZXN0dXJlVGltZXN0YW1wKCk7CisKKyAgICAgICAgYXdhaXQg VUlIZWxwZXIua2V5RG93bihrZXkpOworICAgICAgICBhd2FpdCBVSUhlbHBlci5kZWxheUZvcigz MDApOworCisgICAgICAgIGFzc2VydF9ub3RfZXF1YWxzKHNjcm9sbFksIHByZXZpb3VzU2Nyb2xs WSk7CisgICAgICAgIGFzc2VydF9ub3RfZXF1YWxzKGludGVybmFscy5sYXN0SGFuZGxlZFVzZXJH ZXN0dXJlVGltZXN0YW1wKCksIHByZXZpb3VzVGltZXN0YW1wKTsKKyAgICB9CisgICAgCisgICAg cHJvbWlzZV90ZXN0KCgpID0+IHsKKyAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUg PT4geworICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIkRPTUNvbnRlbnRMb2Fk ZWQiLCByZXNvbHZlKTsKKyAgICAgICAgfSk7CisgICAgfSwgIkRPTUNvbnRlbnRMb2FkZWQiKTsK KworICAgIHByb21pc2VfdGVzdChhc3luYyAoKSA9PiB7CisgICAgICAgIGF3YWl0IHRlc3Rfa2V5 KCcgJyk7CisgICAgfSwgInNwYWNlIik7CisKKyAgICBwcm9taXNlX3Rlc3QoYXN5bmMgKCkgPT4g eworICAgICAgICBhd2FpdCB0ZXN0X2tleSgnZG93bkFycm93Jyk7CisgICAgfSwgImRvd25BcnJv dyIpOworCisgICAgcHJvbWlzZV90ZXN0KGFzeW5jICgpID0+IHsKKyAgICAgICAgYXdhaXQgdGVz dF9rZXkoJ3BhZ2VEb3duJyk7CisgICAgfSwgInBhZ2VEb3duIik7Cis8L3NjcmlwdD4KKzxzdHls ZT4KKyAgICBib2R5IHsKKyAgICAgICAgYm9yZGVyOiBibHVlIDEwcHggc29saWQ7CisgICAgICAg IGhlaWdodDogMTAwMDBweDsKKyAgICB9Cis8L3N0eWxlPgo= 437385 2021-09-05 23:03:33 -0700 2021-09-07 17:06:08 -0700 Patch bug-229784-20210906150332.patch text/plain 6726 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhiYTJhMTE5NGE5NGU3 NTUyMmY4ZjFjNDM0Nzg5ODM2NGIzZWZiNC4uZGNlMmU5YTEzZDZhYmRlY2U0ZGZkZWUyZDljOWQw MDY4ODEyMGZlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA5LTA1ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIEtleWJvYXJk RXZlbnQgc2hvdWxkIHNldERlZmF1bHRIYW5kbGVkIGlmIEV2ZW50SGFuZGxlcjo6c3RhcnRLZXli b2FyZFNjcm9sbGluZyByZXR1cm5zIHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyOTc4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIElmIGEgS2V5Ym9hcmRFdmVudCBpcyBoYW5kbGVkIGJ5IHRoZSBk ZWZhdWx0IGV2ZW50IGhhbmRsZXIsIGl0CisgICAgICAgIHNob3VsZCBiZSBtYXJrZWQgYnkgRXZl bnQ6OnNldERlZmF1bHRIYW5kbGVkLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2Nyb2xsaW5nL2tl eWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRL ZXlib2FyZEV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRl ZmF1bHRBcnJvd0V2ZW50SGFuZGxlcik6CisKIDIwMjEtMDktMDIgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbGF0aXZlIC13ZWJraXQtc2Nyb2xsYmFyIHdpZHRo IHZhbHVlIG1heSBsZWFkIHRvIHVuc3RhYmxlIGxheW91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwCmluZGV4IDViYjYyNjkzMGE4MjA3Y2UwNGE1ODI2OGI4YWU1NDQ1ZWY4MGZhMGYu LjIwZGM2MTY1MTZjNDZmMDczMDQxMGMyYWIxOTVmNmJhMWU3OWI0ZWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTM4MDcsOSArMzgwNywxMCBAQCB2b2lkIEV2ZW50SGFu ZGxlcjo6ZGVmYXVsdEtleWJvYXJkRXZlbnRIYW5kbGVyKEtleWJvYXJkRXZlbnQmIGV2ZW50KQog ICAgICAgICAgICAgZGVmYXVsdFRhYkV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgIGVsc2Ug aWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiVSswMDA4IikKICAgICAgICAgICAgIGRlZmF1 bHRCYWNrc3BhY2VFdmVudEhhbmRsZXIoZXZlbnQpOwotICAgICAgICBlbHNlIGlmIChldmVudC5r ZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VVcCIgfHwgZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJQ YWdlRG93biIpCi0gICAgICAgICAgICBzdGFydEtleWJvYXJkU2Nyb2xsaW5nKGV2ZW50KTsKLSAg ICAgICAgZWxzZSB7CisgICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAi UGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikgeworICAgICAg ICAgICAgaWYgKHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpKQorICAgICAgICAgICAgICAg IGV2ZW50LnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24gPSBmb2N1c0RpcmVjdGlvbkZvcktleShldmVudC5r ZXlJZGVudGlmaWVyKCkpOwogICAgICAgICAgICAgaWYgKGRpcmVjdGlvbiAhPSBGb2N1c0RpcmVj dGlvbjo6Tm9uZSkKICAgICAgICAgICAgICAgICBkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoZGly ZWN0aW9uLCBldmVudCk7CkBAIC00MzA3LDcgKzQzMDgsOCBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6 ZGVmYXVsdEFycm93RXZlbnRIYW5kbGVyKEZvY3VzRGlyZWN0aW9uIGZvY3VzRGlyZWN0aW9uLCBL ZXlibwogICAgIEFTU0VSVChldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmtleWRvd25FdmVu dCk7CiAKICAgICBpZiAoIWlzU3BhdGlhbE5hdmlnYXRpb25FbmFibGVkKCZtX2ZyYW1lKSkgewot ICAgICAgICBzdGFydEtleWJvYXJkU2Nyb2xsaW5nKGV2ZW50KTsKKyAgICAgICAgaWYgKHN0YXJ0 S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpKQorICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhh bmRsZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDViZTIyNDE2MTM2OTQ2 ODE3YWYxMjc2OGIyMDY2NWM4Nzg0MmI1MzIuLmVhNDFiMzE5ZmE2YzE0OWFlMDA2NTE5MDI5NmQz NmMzODNjZjJmZjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wOS0wNSAgRnVqaWkgSGly b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KKworICAgICAgICBLZXlib2FyZEV2ZW50 IHNob3VsZCBzZXREZWZhdWx0SGFuZGxlZCBpZiBFdmVudEhhbmRsZXI6OnN0YXJ0S2V5Ym9hcmRT Y3JvbGxpbmcgcmV0dXJucyB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjk3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRp bWVzdGFtcC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL2tl eWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1sOiBBZGRlZC4KKwogMjAyMS0wOS0w MiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OIChyMjgwNzY3KTogQ2FyZXQgY29sb3IgaXMgYmxhY2sgYWZ0ZXIgcGFzdGluZyByaWNo IHRleHQgaW4gTWFpbCBjb21wb3NlIGluIGRhcmsgbW9kZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg MmNiMWM0NTg2MjY1NjZlMjFmMmQyODYyYTAyMjhhMjVhNGE1ZjFjMS4uOTFkZmUzYTE2YTUzNTUz ODZmOWMyYTllZWM3N2U5YjFkYzFkMWZhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC05NSw2ICs5 NSw3IEBAIHByaW50aW5nL3ByaW50aW5nLWV2ZW50cy5odG1sIFsgU2tpcCBdCiBmYXN0L2Zvcm1z L2VudGVya2V5aGludC1hdHRyaWJ1dGUtdmFsdWVzLmh0bWwgWyBTa2lwIF0KIGZhc3Qvc2Nyb2xs aW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3cuaHRtbCBbIFNraXAgXQog ZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBhZ2VEb3duLmh0bWwg WyBTa2lwIF0KK2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFt cC5odG1sIFsgU2tpcCBdCiAKICMgSGlnaGxpZ2h0aW5nIG1hcmtlZCB0ZXh0IHJhbmdlcyBmcm9t IGxheW91dCB0ZXN0cyBpcyBvbmx5IHN1cHBvcnRlZCBpbiBXZWJLaXQyLgogZWRpdGluZy9pbnB1 dC9jb21wb3NpdGlvbi1oaWdobGlnaHRzLmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxp bmctbGFzdC10aW1lc3RhbXAtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjOTU1YzA4YzM4NGY4 YjE2ODFhMTI1MmUzNmY1M2Y5NzQxZmJkYWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctbGFzdC10aW1lc3RhbXAtZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorCitQQVNTIERPTUNvbnRlbnRMb2FkZWQKK1BBU1Mgc3Bh Y2UKK1BBU1MgZG93bkFycm93CitQQVNTIHBhZ2VEb3duCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWxhc3QtdGlt ZXN0YW1wLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2MwM2Y5MTA4ZTg4MDM4ZTY5MTAwOGJkNjgyYjBhMWY0 YTYxZDc2MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tl eWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1sCkBAIC0wLDAgKzEsMzUgQEAKKzwh RE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIEV2ZW50SGFuZGxlckRyaXZl blNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZD10cnVlIF0gLS0+Cis8bWV0YSBjaGFyc2V0 PXV0Zi04PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0Lmpz Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48 L3NjcmlwdD4KKzxzY3JpcHQ+CisgICAgcHJvbWlzZV90ZXN0KCgpID0+IHsKKyAgICAgICAgcmV0 dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoIkRPTUNvbnRlbnRMb2FkZWQiLCByZXNvbHZlKTsKKyAgICAgICAgfSk7CisgICAg fSwgIkRPTUNvbnRlbnRMb2FkZWQiKTsKKworICAgIGZ1bmN0aW9uIHRlc3Rfa2V5KGtleSkgewor ICAgICAgICByZXR1cm4gYXN5bmMgKCkgPT4geworICAgICAgICAgICAgbGV0IHByZXZpb3VzU2Ny b2xsWSA9IHNjcm9sbFk7CisgICAgICAgICAgICBsZXQgcHJldmlvdXNUaW1lc3RhbXAgPSBpbnRl cm5hbHMubGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpOworCisgICAgICAgICAgICBh d2FpdCBVSUhlbHBlci5rZXlEb3duKGtleSk7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5k ZWxheUZvcig1MDApOworCisgICAgICAgICAgICBhc3NlcnRfbm90X2VxdWFscyhzY3JvbGxZLCBw cmV2aW91c1Njcm9sbFkpOworICAgICAgICAgICAgYXNzZXJ0X25vdF9lcXVhbHMoaW50ZXJuYWxz Lmxhc3RIYW5kbGVkVXNlckdlc3R1cmVUaW1lc3RhbXAoKSwgcHJldmlvdXNUaW1lc3RhbXApOwor ICAgICAgICB9OworICAgIH0KKyAgICAKKyAgICBwcm9taXNlX3Rlc3QodGVzdF9rZXkoJyAnKSwg J3NwYWNlJyk7CisgICAgcHJvbWlzZV90ZXN0KHRlc3Rfa2V5KCdkb3duQXJyb3cnKSwgJ2Rvd25B cnJvdycpOworICAgIHByb21pc2VfdGVzdCh0ZXN0X2tleSgncGFnZURvd24nKSwgJ3BhZ2VEb3du Jyk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KKyAgICBib2R5IHsKKyAgICAgICAgYm9yZGVyOiBibHVl IDEwcHggc29saWQ7CisgICAgICAgIGhlaWdodDogMTAwMDBweDsKKyAgICB9Cis8L3N0eWxlPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA0MDhjOGI0MWJj NDNjYTFiMzNmMDY0NzkxMGEyYmE1YzY2MzM2ZGJlLi4zZDM5N2I4MjIzMWNlOGE1MTVjYzAzOWM3 MGIxNjRiZmNlOTZiYTRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucwpAQCAtODU2LDYgKzg1Niw3IEBAIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkv Y2xvc2VkLXBvcnQtZGVsYXkuaHRtbCBbIFBhc3MgXQoganMvdGhyb3ctbGFyZ2Utc3RyaW5nLW9v bS5odG1sIFsgUGFzcyBdCiBmYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlzdGFu Y2UtZG93bkFycm93Lmh0bWwgWyBQYXNzIF0KIGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9s bGluZy1kaXN0YW5jZS1wYWdlRG93bi5odG1sIFsgUGFzcyBdCitmYXN0L3Njcm9sbGluZy9rZXli b2FyZC1zY3JvbGxpbmctbGFzdC10aW1lc3RhbXAuaHRtbCBbIFBhc3MgXQogZmFzdC9zcGVlY2hy ZWNvZ25pdGlvbi9wZXJtaXNzaW9uLWVycm9yLmh0bWwgWyBQYXNzIF0KIGZhc3Qvc3BlZWNocmVj b2duaXRpb24vc3RhcnQtcmVjb2duaXRpb24tdGhlbi1zdG9wLmh0bWwgWyBQYXNzIF0KIGZhc3Qv c3BlZWNocmVjb2duaXRpb24vc3RhcnQtc2Vjb25kLXJlY29nbml0aW9uLmh0bWwgWyBQYXNzIF0K 437572 2021-09-07 17:06:19 -0700 2021-09-08 12:58:10 -0700 Patch bug-229784-20210908090617.patch text/plain 6736 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEzMDFlNThmOWJiMWIz NWYwYTBmNjE2YTQwOWQ2OTc0YTc1ZTBmZS4uZmFlYjNjYzcxYjVmMjlkNTA3MGJlYjc0YTIwNDc3 Nzc4MGExNjMzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA5LTA3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIEtleWJvYXJk RXZlbnQgc2hvdWxkIHNldERlZmF1bHRIYW5kbGVkIGlmIEV2ZW50SGFuZGxlcjo6c3RhcnRLZXli b2FyZFNjcm9sbGluZyByZXR1cm5zIHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyOTc4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIElmIGEgS2V5Ym9hcmRFdmVudCBpcyBoYW5kbGVkIGJ5IHRoZSBk ZWZhdWx0IGV2ZW50IGhhbmRsZXIsIGl0CisgICAgICAgIHNob3VsZCBiZSBtYXJrZWQgYnkgRXZl bnQ6OnNldERlZmF1bHRIYW5kbGVkLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvc2Nyb2xsaW5nL2tl eWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRL ZXlib2FyZEV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRl ZmF1bHRBcnJvd0V2ZW50SGFuZGxlcik6CisKIDIwMjEtMDktMDcgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgb3JpZ2luIHBhcnRpdGlvbmluZyAo dG9wLW9yaWdpbi9mcmFtZS1vcmlnaW4pIGZvciBCcm9hZGNhc3RDaGFubmVsCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggNWJiNjI2OTMwYTgyMDdjZTA0YTU4MjY4YjhhZTU0 NDVlZjgwZmEwZi4uMjBkYzYxNjUxNmM0NmYwNzMwNDEwYzJhYjE5NWY2YmExZTc5YjRlYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMzgwNyw5ICszODA3LDEwIEBAIHZv aWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVu dCYgZXZlbnQpCiAgICAgICAgICAgICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKGV2ZW50KTsKICAg ICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJVKzAwMDgiKQogICAgICAg ICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihldmVudCk7Ci0gICAgICAgIGVsc2Ug aWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlm aWVyKCkgPT0gIlBhZ2VEb3duIikKLSAgICAgICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmco ZXZlbnQpOwotICAgICAgICBlbHNlIHsKKyAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRp ZmllcigpID09ICJQYWdlVXAiIHx8IGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZURvd24i KSB7CisgICAgICAgICAgICBpZiAoc3RhcnRLZXlib2FyZFNjcm9sbGluZyhldmVudCkpCisgICAg ICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3VzRGlyZWN0aW9uRm9y S2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBpZiAoZGlyZWN0aW9uICE9 IEZvY3VzRGlyZWN0aW9uOjpOb25lKQogICAgICAgICAgICAgICAgIGRlZmF1bHRBcnJvd0V2ZW50 SGFuZGxlcihkaXJlY3Rpb24sIGV2ZW50KTsKQEAgLTQzMDcsNyArNDMwOCw4IEBAIHZvaWQgRXZl bnRIYW5kbGVyOjpkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoRm9jdXNEaXJlY3Rpb24gZm9jdXNE aXJlY3Rpb24sIEtleWJvCiAgICAgQVNTRVJUKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCku a2V5ZG93bkV2ZW50KTsKIAogICAgIGlmICghaXNTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoJm1f ZnJhbWUpKSB7Ci0gICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpOworICAgICAg ICBpZiAoc3RhcnRLZXlib2FyZFNjcm9sbGluZyhldmVudCkpCisgICAgICAgICAgICBldmVudC5z ZXREZWZhdWx0SGFuZGxlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTE2 NmJiYWU2NDg3NDYzYzE3OTkwOThiNGM4YTQ0NzZmMGYzNzQzYy4uMWQ4ZTA4NjBmOTkzZGFkMTY5 ZTY3ZDdlMTcyOTRlYmNhMjk1ZWNkYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA5LTA3 ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIEtl eWJvYXJkRXZlbnQgc2hvdWxkIHNldERlZmF1bHRIYW5kbGVkIGlmIEV2ZW50SGFuZGxlcjo6c3Rh cnRLZXlib2FyZFNjcm9sbGluZyByZXR1cm5zIHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTc4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xs aW5nLWxhc3QtdGltZXN0YW1wLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9z Y3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWxhc3QtdGltZXN0YW1wLmh0bWw6IEFkZGVkLgor CiAyMDIxLTA5LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgog CiAgICAgICAgIFtXaW5DYWlyb10gVW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh dGlvbnMKaW5kZXggODNiOWE4NGM3NmY2OTdiMzQ2MTNkZTliM2M3NDc0OGI3NTcwNjk3Ny4uNzA0 NTk3OGZmZjcxODM3ODg0ZGU2MjM1YzA3NWIyZmY2ZGMxZGJkNCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z CkBAIC05NSw2ICs5NSw3IEBAIHByaW50aW5nL3ByaW50aW5nLWV2ZW50cy5odG1sIFsgU2tpcCBd CiBmYXN0L2Zvcm1zL2VudGVya2V5aGludC1hdHRyaWJ1dGUtdmFsdWVzLmh0bWwgWyBTa2lwIF0K IGZhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3cuaHRt bCBbIFNraXAgXQogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBh Z2VEb3duLmh0bWwgWyBTa2lwIF0KK2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1s YXN0LXRpbWVzdGFtcC5odG1sIFsgU2tpcCBdCiAKICMgSGlnaGxpZ2h0aW5nIG1hcmtlZCB0ZXh0 IHJhbmdlcyBmcm9tIGxheW91dCB0ZXN0cyBpcyBvbmx5IHN1cHBvcnRlZCBpbiBXZWJLaXQyLgog ZWRpdGluZy9pbnB1dC9jb21wb3NpdGlvbi1oaWdobGlnaHRzLmh0bWwgWyBTa2lwIF0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0 LXRpbWVzdGFtcC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXli b2FyZC1zY3JvbGxpbmctbGFzdC10aW1lc3RhbXAtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVj OTU1YzA4YzM4NGY4YjE2ODFhMTI1MmUzNmY1M2Y5NzQxZmJkYWQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctbGFzdC10aW1l c3RhbXAtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorCitQQVNTIERPTUNvbnRlbnRMb2Fk ZWQKK1BBU1Mgc3BhY2UKK1BBU1MgZG93bkFycm93CitQQVNTIHBhZ2VEb3duCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRp bWVzdGFtcC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xs aW5nLWxhc3QtdGltZXN0YW1wLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjllNzVjNzQxNTQ0YzE2YzhjODQy ZGUxNmRkNmI5ZDVkM2E3ZWUyZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv c2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1sYXN0LXRpbWVzdGFtcC5odG1sCkBAIC0wLDAg KzEsMzYgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIEV2ZW50 SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZD10cnVlIF0gLS0+Cis8 bWV0YSBjaGFyc2V0PXV0Zi04PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFy bmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3Rlc3RoYXJu ZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWkt aGVscGVyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisgICAgcHJvbWlzZV90ZXN0KCgpID0+IHsK KyAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAgICAgICAgICAgd2lu ZG93LmFkZEV2ZW50TGlzdGVuZXIoJ0RPTUNvbnRlbnRMb2FkZWQnLCByZXNvbHZlKTsKKyAgICAg ICAgfSk7CisgICAgfSwgJ0RPTUNvbnRlbnRMb2FkZWQnKTsKKworICAgIGZ1bmN0aW9uIHRlc3Rf a2V5KGtleSkgeworICAgICAgICByZXR1cm4gYXN5bmMgKCkgPT4geworICAgICAgICAgICAgbGV0 IHByZXZpb3VzU2Nyb2xsWSA9IHNjcm9sbFk7CisgICAgICAgICAgICBsZXQgcHJldmlvdXNUaW1l c3RhbXAgPSBpbnRlcm5hbHMubGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpOworCisg ICAgICAgICAgICBsZXQgd2FpdCA9IFVJSGVscGVyLndhaXRGb3JUYXJnZXRTY3JvbGxBbmltYXRp b25Ub1NldHRsZSh3aW5kb3cpOworICAgICAgICAgICAgVUlIZWxwZXIua2V5RG93bihrZXkpOwor ICAgICAgICAgICAgYXdhaXQgd2FpdDsKKworICAgICAgICAgICAgYXNzZXJ0X25vdF9lcXVhbHMo c2Nyb2xsWSwgcHJldmlvdXNTY3JvbGxZKTsKKyAgICAgICAgICAgIGFzc2VydF9ub3RfZXF1YWxz KGludGVybmFscy5sYXN0SGFuZGxlZFVzZXJHZXN0dXJlVGltZXN0YW1wKCksIHByZXZpb3VzVGlt ZXN0YW1wKTsKKyAgICAgICAgfTsKKyAgICB9CisgICAgCisgICAgcHJvbWlzZV90ZXN0KHRlc3Rf a2V5KCcgJyksICdzcGFjZScpOworICAgIHByb21pc2VfdGVzdCh0ZXN0X2tleSgnZG93bkFycm93 JyksICdkb3duQXJyb3cnKTsKKyAgICBwcm9taXNlX3Rlc3QodGVzdF9rZXkoJ3BhZ2VEb3duJyks ICdwYWdlRG93bicpOworPC9zY3JpcHQ+Cis8c3R5bGU+CisgICAgYm9keSB7CisgICAgICAgIGJv cmRlcjogYmx1ZSAxMHB4IHNvbGlkOworICAgICAgICBoZWlnaHQ6IDEwMDAwcHg7CisgICAgfQor PC9zdHlsZT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0 YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg NDA4YzhiNDFiYzQzY2ExYjMzZjA2NDc5MTBhMmJhNWM2NjMzNmRiZS4uM2QzOTdiODIyMzFjZThh NTE1Y2MwMzljNzBiMTY0YmZjZTk2YmE0ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTg1Niw2ICs4NTYsNyBAQCBodHRwL3Rlc3RzL3dlYnNvY2tldC90 ZXN0cy9oeWJpL2Nsb3NlZC1wb3J0LWRlbGF5Lmh0bWwgWyBQYXNzIF0KIGpzL3Rocm93LWxhcmdl LXN0cmluZy1vb20uaHRtbCBbIFBhc3MgXQogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xs aW5nLWRpc3RhbmNlLWRvd25BcnJvdy5odG1sIFsgUGFzcyBdCiBmYXN0L3Njcm9sbGluZy9rZXli b2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbCBbIFBhc3MgXQorZmFzdC9zY3Jv bGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWxhc3QtdGltZXN0YW1wLmh0bWwgWyBQYXNzIF0KIGZh c3Qvc3BlZWNocmVjb2duaXRpb24vcGVybWlzc2lvbi1lcnJvci5odG1sIFsgUGFzcyBdCiBmYXN0 L3NwZWVjaHJlY29nbml0aW9uL3N0YXJ0LXJlY29nbml0aW9uLXRoZW4tc3RvcC5odG1sIFsgUGFz cyBdCiBmYXN0L3NwZWVjaHJlY29nbml0aW9uL3N0YXJ0LXNlY29uZC1yZWNvZ25pdGlvbi5odG1s IFsgUGFzcyBdCg==