58265 2011-04-11 13:48:43 -0700 WebKit2: Cannot use Ctrl-Delete as a custom keyboard shortcut 2011-04-28 14:14:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 ap ap enrica evan oldest_to_newest 383466 0 ap 2011-04-11 13:48:43 -0700 WebPage::performDefaultBehaviorForKeyEvent() doesn't check for modifiers, so it consumes too many variations with the Delete key. This used to be fine in WebKit1, because the logic was in -[FrameView keyDown:], which was only executed after performKeyEquivalent traveled the responder chain - but in WebKit2, the web process doesn't even know if it's handling a keyDown or a performKeyEquivalent. <rdar://problem/9221468> 383497 1 89083 ap 2011-04-11 14:04:00 -0700 Created attachment 89083 proposed fix 383580 2 89083 mjs 2011-04-11 15:11:29 -0700 Comment on attachment 89083 proposed fix r=me Is there any way to make a test for this? 383614 3 ap 2011-04-11 15:50:12 -0700 Committed <http://trac.webkit.org/changeset/83522>. We can't test how UI and web processes interact, since WebKitTestRunner only uses injected bundle API. 394646 4 evan 2011-04-28 12:07:38 -0700 FYI, this seems to have regressed the behavior in Linux Chrome that pressing backspace should not go back. I'm still looking into why; I don't understand this code too well. I am not upset because we deserved it, since didn't have tests covering this behavior, just thought you might wanna know. 394734 5 ap 2011-04-28 14:14:13 -0700 Well yes, this code implements the behavior of going back on backspace in a cross platform manner. I didn't know there was any port that didn't want it, and I'm surprised. 89083 2011-04-11 14:04:00 -0700 2011-04-11 15:11:29 -0700 proposed fix CtrlDelete.txt text/plain 11271 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNDkxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMTEgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogQ2Fubm90IHVzZSBDdHJsLURlbGV0ZSBhcyBh IGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTgyNjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMjE0Njg+ CisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxlcik6IEhhbmRsZSBCYWNrc3Bh Y2UuCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRTcGFjZUV2ZW50SGFu ZGxlcik6IEVuYWJsZWQgdGhpcyBvbiBNYWMsIGFuZCBhZGRlZCBjaGVja3MgZm9yCisgICAgICAg IG90aGVyIG1vZGlmaWVycyAtIG5vIG9uZSB3YW50cyB0byBzY3JvbGwgb24gQ3RybCtBbHQrU3Bh Y2UgYW5kIHN1Y2guCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRCYWNr c3BhY2VFdmVudEhhbmRsZXIpOiBCYWNrc3BhY2UgZ29lcyBiYWNrLCBTaGlmdC1iYWNrc3BhY2UK KyAgICAgICAgZ29lcyBmb3J3YXJkLiBBbGwgYnJvd3NlcnMgZG8gaXQuCisgICAgICAgIChXZWJD b3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRBcnJvd0V2ZW50SGFuZGxlcik6IEFzc2VydCB0aGF0 IHRoaXMgZnVuY3Rpb24gd2FzIGNhbGxlZAorICAgICAgICBmb3IgYSBjb3JyZWN0IGV2ZW50Lgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKTog RGl0dG8uCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5oOiBBZGRlZCBkZWZhdWx0QmFj a3NwYWNlRXZlbnRIYW5kbGVyLgorCiAyMDExLTA0LTExICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2 aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiA4MzQ0OCkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjU0NCw2ICsyNTQ0LDggQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRLZXlib2FyZEV2ZW50 SAogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAoZXZlbnQtPmtleUlkZW50aWZpZXIo KSA9PSAiVSswMDA5IikKICAgICAgICAgICAgIGRlZmF1bHRUYWJFdmVudEhhbmRsZXIoZXZlbnQp OworICAgICAgICBlbHNlIGlmIChldmVudC0+a2V5SWRlbnRpZmllcigpID09ICJVKzAwMDgiKQor ICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAg IGVsc2UgewogICAgICAgICAgICAgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uID0gZm9jdXNEaXJl Y3Rpb25Gb3JLZXkoZXZlbnQtPmtleUlkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBpZiAoZGly ZWN0aW9uICE9IEZvY3VzRGlyZWN0aW9uTm9uZSkKQEAgLTI4NDUsMjAgKzI4NDcsMjEgQEAgdm9p ZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRUZXh0SW5wdXRFdmVudAogICAgICAgICBldmVudC0+c2V0 RGVmYXVsdEhhbmRsZWQoKTsKIH0KIAotI2lmIFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShNQUMp Ci0KLS8vIFRoZXNlIHR3byBwbGF0Zm9ybXMgaGFuZGxlIHRoZSBzcGFjZSBldmVudCBpbiB0aGUg cGxhdGZvcm0tc3BlY2lmaWMgV2ViS2l0IGNvZGUuCi0vLyBFdmVudHVhbGx5IGl0IHdvdWxkIGJl IGdvb2QgdG8gZWxpbWluYXRlIHRoYXQgYW5kIHVzZSB0aGUgY29kZSBoZXJlIGluc3RlYWQsIGJ1 dAotLy8gdGhlIFF0IHZlcnNpb24gaXMgaW5zaWRlIGFuIGlmZGVmIGFuZCB0aGUgTWFjIHZlcnNp b24gaGFzIHNvbWUgZXh0cmEgYmVoYXZpb3IKLS8vIHNvIHdlIGNhbid0IHVuaWZ5IGV2ZXJ5dGhp bmcgeWV0LgorI2lmIFBMQVRGT1JNKFFUKQorLy8gUXQgaGFuZGxlcyB0aGUgc3BhY2UgZXZlbnQg aW4gcGxhdGZvcm0tc3BlY2lmaWMgV2ViS2l0IGNvZGUuCisvLyBFdmVudHVhbGx5IGl0IHdvdWxk IGJlIGdvb2QgdG8gZWxpbWluYXRlIHRoYXQgYW5kIHVzZSB0aGUgY29kZSBoZXJlIGluc3RlYWQu CiB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdFNwYWNlRXZlbnRIYW5kbGVyKEtleWJvYXJkRXZl bnQqKQogewogfQotCiAjZWxzZQogCiB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdFNwYWNlRXZl bnRIYW5kbGVyKEtleWJvYXJkRXZlbnQqIGV2ZW50KQogeworICAgIEFTU0VSVChldmVudC0+dHlw ZSgpID09IGV2ZW50TmFtZXMoKS5rZXlwcmVzc0V2ZW50KTsKKworICAgIGlmIChldmVudC0+Y3Ry bEtleSgpIHx8IGV2ZW50LT5tZXRhS2V5KCkgfHwgZXZlbnQtPmFsdEtleSgpIHx8IGV2ZW50LT5h bHRHcmFwaEtleSgpKQorICAgICAgICByZXR1cm47CisKICAgICBTY3JvbGxMb2dpY2FsRGlyZWN0 aW9uIGRpcmVjdGlvbiA9IGV2ZW50LT5zaGlmdEtleSgpID8gU2Nyb2xsQmxvY2tEaXJlY3Rpb25C YWNrd2FyZCA6IFNjcm9sbEJsb2NrRGlyZWN0aW9uRm9yd2FyZDsKICAgICBpZiAobG9naWNhbFNj cm9sbE92ZXJmbG93KGRpcmVjdGlvbiwgU2Nyb2xsQnlQYWdlKSkgewogICAgICAgICBldmVudC0+ c2V0RGVmYXVsdEhhbmRsZWQoKTsKQEAgLTI4NzUsOCArMjg3OCwzMCBAQCB2b2lkIEV2ZW50SGFu ZGxlcjo6ZGVmYXVsdFNwYWNlRXZlbnRIYW5kCiAKICNlbmRpZgogCit2b2lkIEV2ZW50SGFuZGxl cjo6ZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihLZXlib2FyZEV2ZW50KiBldmVudCkKK3sK KyAgICBBU1NFUlQoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50KTsK KworICAgIGlmIChldmVudC0+Y3RybEtleSgpIHx8IGV2ZW50LT5tZXRhS2V5KCkgfHwgZXZlbnQt PmFsdEtleSgpIHx8IGV2ZW50LT5hbHRHcmFwaEtleSgpKQorICAgICAgICByZXR1cm47CisKKyAg ICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAg cmV0dXJuOworCisgICAgaWYgKGV2ZW50LT5zaGlmdEtleSgpKQorICAgICAgICBwYWdlLT5nb0Zv cndhcmQoKTsKKyAgICBlbHNlCisgICAgICAgIHBhZ2UtPmdvQmFjaygpOworCisgICAgZXZlbnQt PnNldERlZmF1bHRIYW5kbGVkKCk7Cit9CisKKwogdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRB cnJvd0V2ZW50SGFuZGxlcihGb2N1c0RpcmVjdGlvbiBmb2N1c0RpcmVjdGlvbiwgS2V5Ym9hcmRF dmVudCogZXZlbnQpCiB7CisgICAgQVNTRVJUKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygp LmtleWRvd25FdmVudCk7CisKICAgICBpZiAoZXZlbnQtPmN0cmxLZXkoKSB8fCBldmVudC0+bWV0 YUtleSgpIHx8IGV2ZW50LT5hbHRHcmFwaEtleSgpIHx8IGV2ZW50LT5zaGlmdEtleSgpKQogICAg ICAgICByZXR1cm47CiAKQEAgLTI4OTgsNiArMjkyMyw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpk ZWZhdWx0QXJyb3dFdmVudEhhbmQKIAogdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRUYWJFdmVu dEhhbmRsZXIoS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CisgICAgQVNTRVJUKGV2ZW50LT50eXBl KCkgPT0gZXZlbnROYW1lcygpLmtleWRvd25FdmVudCk7CisKICAgICAvLyBXZSBzaG91bGQgb25s eSBhZHZhbmNlIGZvY3VzIG9uIHRhYnMgaWYgbm8gc3BlY2lhbCBtb2RpZmllciBrZXlzIGFyZSBo ZWxkIGRvd24uCiAgICAgaWYgKGV2ZW50LT5jdHJsS2V5KCkgfHwgZXZlbnQtPm1ldGFLZXkoKSB8 fCBldmVudC0+YWx0R3JhcGhLZXkoKSkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5oCShyZXZpc2lvbiA4MzQ0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0NSw2ICszNDUsNyBAQCBwcml2 YXRlOgogICAgIGJvb2wgcGFzc1doZWVsRXZlbnRUb1dpZGdldChQbGF0Zm9ybVdoZWVsRXZlbnQm LCBXaWRnZXQqKTsKIAogICAgIHZvaWQgZGVmYXVsdFNwYWNlRXZlbnRIYW5kbGVyKEtleWJvYXJk RXZlbnQqKTsKKyAgICB2b2lkIGRlZmF1bHRCYWNrc3BhY2VFdmVudEhhbmRsZXIoS2V5Ym9hcmRF dmVudCopOwogICAgIHZvaWQgZGVmYXVsdFRhYkV2ZW50SGFuZGxlcihLZXlib2FyZEV2ZW50Kik7 CiAgICAgdm9pZCBkZWZhdWx0QXJyb3dFdmVudEhhbmRsZXIoRm9jdXNEaXJlY3Rpb24sIEtleWJv YXJkRXZlbnQqKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gODM0OTEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0w NC0xMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyOiBDYW5ub3QgdXNlIEN0 cmwtRGVsZXRlIGFzIGEgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODI2NQorICAgICAgICA8cmRhcjovL3By b2JsZW0vOTIyMTQ2OD4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6a2V5RXZlbnQpOiBBZGRlZCBhIGNvbW1lbnQg ZXhwbGFpbmluZyB0aGF0IGRvaW5nIHdvcmsgYWZ0ZXIgRE9NIGV2ZW50CisgICAgICAgIGRpc3Bh dGNoIGlzbid0IGdyZWF0LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFn ZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybU5vbkVkaXRpbmdCZWhh dmlvckZvclNlbGVjdG9yKTogQWRkZWQgYSBjb21tZW50IGV4cGxhaW5pbmcgaG93IHRoaXMKKyAg ICAgICAgbWlnaHQgYmUgbW92ZWQgZG93biB0byBXZWJDb3JlLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpwZXJmb3JtRGVmYXVsdEJlaGF2aW9yRm9yS2V5RXZlbnQpOiBUaGlzIGlzIG5vdyBl bXB0eSwgc2luY2UgYm90aCBTcGFjZQorICAgICAgICBhbmQgQmFja3NwYWNlIGJlaGF2aW9ycyBh cmUgaW1wbGVtZW50ZWQgaW4gV2ViQ29yZS4KKwogMjAxMS0wNC0xMSAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcu CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CShyZXZpc2lvbiA4MzQ0OCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTUzLDYgKzk1Myw3IEBAIHZvaWQgV2ViUGFn ZTo6a2V5RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmQKICAgICBDdXJyZW50RXZlbnQgY3VycmVudEV2 ZW50KGtleWJvYXJkRXZlbnQpOwogCiAgICAgYm9vbCBoYW5kbGVkID0gaGFuZGxlS2V5RXZlbnQo a2V5Ym9hcmRFdmVudCwgbV9wYWdlLmdldCgpKTsKKyAgICAvLyBGSVhNRTogUGxhdGZvcm0gZGVm YXVsdCBiZWhhdmlvcnMgc2hvdWxkIGJlIHBlcmZvcm1lZCBkdXJpbmcgbm9ybWFsIERPTSBldmVu dCBkaXNwYXRjaCAoaW4gbW9zdCBjYXNlcywgaW4gZGVmYXVsdCBrZXlkb3duIGV2ZW50IGhhbmRs ZXIpLgogICAgIGlmICghaGFuZGxlZCkKICAgICAgICAgaGFuZGxlZCA9IHBlcmZvcm1EZWZhdWx0 QmVoYXZpb3JGb3JLZXlFdmVudChrZXlib2FyZEV2ZW50KTsKIApJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkocmV2aXNp b24gODM0NDgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh Z2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTU0Miw2ICs1NDIsOCBAQCB2b2lkIFdlYlBhZ2U6 OnBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwRm9yCiAKIGJvb2wgV2ViUGFnZTo6cGVyZm9ybU5vbkVk aXRpbmdCZWhhdmlvckZvclNlbGVjdG9yKGNvbnN0IFN0cmluZyYgc2VsZWN0b3IpCiB7CisgICAg Ly8gRklYTUU6IEFsbCB0aGVzZSBzZWxlY3RvcnMgaGF2ZSBjb3JyZXNwb25kaW5nIEVkaXRvciBj b21tYW5kcywgYnV0IHRoZSBjb21tYW5kcyBvbmx5IHdvcmsgaW4gZWRpdGFibGUgY29udGVudC4K KyAgICAvLyBTaG91bGQgc3VjaCBub24tZWRpdGluZyBiZWhhdmlvcnMgYmUgaW1wbGVtZW50ZWQg aW4gRWRpdG9yIG9yIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEFycm93RXZlbnRIYW5kbGVyKCkgcGVy aGFwcz8KICAgICBpZiAoc2VsZWN0b3IgPT0gIm1vdmVVcDoiKQogICAgICAgICBzY3JvbGwobV9w YWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsQnlMaW5lKTsKICAgICBlbHNlIGlmIChzZWxlY3Rv ciA9PSAibW92ZVRvQmVnaW5uaW5nT2ZQYXJhZ3JhcGg6IikKQEAgLTU3NCwzMyArNTc2LDkgQEAg Ym9vbCBXZWJQYWdlOjpwZXJmb3JtTm9uRWRpdGluZ0JlaGF2aW9yRgogICAgIHJldHVybiB0cnVl OwogfQogCi1ib29sIFdlYlBhZ2U6OnBlcmZvcm1EZWZhdWx0QmVoYXZpb3JGb3JLZXlFdmVudChj b25zdCBXZWJLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2ZW50KQorYm9vbCBXZWJQYWdlOjpwZXJm b3JtRGVmYXVsdEJlaGF2aW9yRm9yS2V5RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpCiB7 Ci0gICAgaWYgKGtleWJvYXJkRXZlbnQudHlwZSgpICE9IFdlYkV2ZW50OjpLZXlEb3duKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBzd2l0Y2ggKGtleWJvYXJkRXZlbnQud2luZG93c1Zp cnR1YWxLZXlDb2RlKCkpIHsKLSAgICBjYXNlIFZLX0JBQ0s6Ci0gICAgICAgIC8vIEZJWE1FOiBI YW5kbGluZyBCYWNrc3BhY2UgaGVyZSBtZWFucyB0aGF0IGEga2V5cHJlc3MgRE9NIGV2ZW50IHdp bGwgYmUgZGlzcGF0Y2hlZCB3aGVuIGZvY3VzCi0gICAgICAgIC8vIGlzIG91dHNpZGUgZWRpdGFi bGUgY29udGVudCwgd2hpY2ggaXMgbGlrZWx5IHdyb25nLiBJdCBzaG91bGQgYmUgbW92ZWQgdG8g cGVyZm9ybU5vbkVkaXRpbmdCZWhhdmlvckZvclNlbGVjdG9yKCksCi0gICAgICAgIC8vIHdoaWNo IGlzIGNvbXBsaWNhdGVkIGJ5IHRoZSBmYWN0IHRoYXQgYm90aCBCYWNrc3BhY2UgYW5kIFNoaWZ0 K0JhY2tzcGFjZSBnZXQgdGhlIHNhbWUgY29tbWFuZC4KLSAgICAgICAgaWYgKGtleWJvYXJkRXZl bnQuc2hpZnRLZXkoKSkKLSAgICAgICAgICAgIG1fcGFnZS0+Z29Gb3J3YXJkKCk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIG1fcGFnZS0+Z29CYWNrKCk7Ci0gICAgICAgIGJyZWFrOwotICAg IGNhc2UgVktfU1BBQ0U6Ci0gICAgICAgIC8vIFNwYWNlIGlzIG5vdCB0cmFuc2xhdGVkIHRvIGEg Y29tbWFuZCBieSBrZXkgYmluZGluZ3MsIHNvIHdlIG5lZWQgdG8gaGFuZGxlIGl0IGhlcmUuCi0g ICAgICAgIGlmIChrZXlib2FyZEV2ZW50LnNoaWZ0S2V5KCkpCi0gICAgICAgICAgICBsb2dpY2Fs U2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsQmxvY2tEaXJlY3Rpb25CYWNrd2FyZCwgU2Nyb2xs QnlQYWdlKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbG9naWNhbFNjcm9sbChtX3BhZ2Uu Z2V0KCksIFNjcm9sbEJsb2NrRGlyZWN0aW9uRm9yd2FyZCwgU2Nyb2xsQnlQYWdlKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQot ICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBXZWJQYWdlOjpy ZWdpc3RlclVJUHJvY2Vzc0FjY2Vzc2liaWxpdHlUb2tlbnMoY29uc3QgQ29yZUlQQzo6RGF0YVJl ZmVyZW5jZSYgZWxlbWVudFRva2VuLCBjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJiB3aW5k b3dUb2tlbikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNDQ4KQorKysgU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTEtMDQtMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogU2FmYXJpIGRv ZXNuJ3QgcmVzcGVjdCBjbWQtYXJyb3dzIChhbmQgdmFyaWF0aW9ucykgYXMgY3VzdG9tIGtleWJv YXJkIHNob3J0Y3V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTgxNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkwNjA1NTU+CisKKyAgICAgICAg KiBXZWJWaWV3L1dlYkZyYW1lVmlldy5tbTogKC1bV2ViRnJhbWVWaWV3IGtleURvd246XSk6IEFk ZGVkIGEgY29tbWVudCBleHBsYWluaW5nIGhvdyB0aGlzCisgICAgICAgIHNob3VsZCBiZSBjaGFu Z2VkIHRvIG1hdGNoIFdlYktpdDIuCisKIDIwMTEtMDQtMDggIEdlb2ZmcmV5IEdhcmVuICA8Z2dh cmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNDkxKQorKysgU291cmNlL1dlYktpdC93aW4vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMTEgIEFsZXhl eSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogQ2Fubm90IHVzZSBDdHJsLURlbGV0ZSBh cyBhIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyNjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMjE0 Njg+CisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDogKFdlYlZpZXc6OmtleURvd24pOiBSZW1vdmVk IHNwZWNpYWwgaGFuZGxpbmcgb2YgQmFja3NwYWNlLCB3aGljaCBpcyB1bm5lY2Vzc2FyeQorICAg ICAgICBub3cgdGhhdCBXZWJDb3JlIGltcGxlbWVudHMgaXQuCisKIDIwMTEtMDQtMDYgIEJyaWFu IFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gUm9iZW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gODM0NDgpCisr KyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk1Mywx MCArMTk1MywxMiBAQCBib29sIFdlYlZpZXc6OmtleURvd24oV1BBUkFNIHZpcnR1YWxLZXlDCiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotICAgIC8vIFdlIG5lZWQgdG8gaGFuZGxlIGJh Y2svZm9yd2FyZCB1c2luZyBlaXRoZXIgQmFja3NwYWNlKCtTaGlmdCkgb3IgQ3RybCtMZWZ0L1Jp Z2h0IEFycm93IGtleXMuCi0gICAgaWYgKCh2aXJ0dWFsS2V5Q29kZSA9PSBWS19CQUNLICYmIGtl eUV2ZW50LnNoaWZ0S2V5KCkpIHx8ICh2aXJ0dWFsS2V5Q29kZSA9PSBWS19SSUdIVCAmJiBrZXlF dmVudC5jdHJsS2V5KCkpKQorICAgIC8vIFdlIG5lZWQgdG8gaGFuZGxlIGJhY2svZm9yd2FyZCB1 c2luZyBlaXRoZXIgQ3RybCtMZWZ0L1JpZ2h0IEFycm93IGtleXMuCisgICAgLy8gRklYTUU6IFRo aXMgbG9naWMgc2hvdWxkIHByb2JhYmx5IGJlIGluIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEFycm93 RXZlbnRIYW5kbGVyKCkuCisgICAgLy8gRklYTUU6IFNob3VsZCBjaGVjayB0aGF0IG90aGVyIG1v ZGlmaWVycyBhcmVuJ3QgcHJlc3NlZC4KKyAgICBpZiAodmlydHVhbEtleUNvZGUgPT0gVktfUklH SFQgJiYga2V5RXZlbnQuY3RybEtleSgpKQogICAgICAgICByZXR1cm4gbV9wYWdlLT5nb0Zvcndh cmQoKTsKLSAgICBpZiAodmlydHVhbEtleUNvZGUgPT0gVktfQkFDSyB8fCAodmlydHVhbEtleUNv ZGUgPT0gVktfTEVGVCAmJiBrZXlFdmVudC5jdHJsS2V5KCkpKQorICAgIGlmICh2aXJ0dWFsS2V5 Q29kZSA9PSBWS19MRUZUICYmIGtleUV2ZW50LmN0cmxLZXkoKSkKICAgICAgICAgcmV0dXJuIG1f cGFnZS0+Z29CYWNrKCk7CiAKICAgICAvLyBOZWVkIHRvIHNjcm9sbCB0aGUgcGFnZSBpZiB0aGUg YXJyb3cga2V5cywgcGd1cC9kbiwgb3IgaG9tZS9lbmQgYXJlIGhpdC4K