199393 2019-07-01 19:25:43 -0700 Command + . generates Escape with key identifier Period, should be Escape 2019-07-08 16:07:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build iPhone / iPad Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=198137 https://w3c.github.io/uievents/tools/key-event-viewer.html InRadar, PlatformOnly P2 Normal --- 190571 1 dbates dbates webkit-bug-importer wenson_hsieh oldest_to_newest 1549447 0 dbates 2019-07-01 19:25:43 -0700 Steps to reproduce: 1. Visit <https://w3c.github.io/uievents/tools/key-event-viewer.html> 2. Focus the text field 3. Press Command + . Then you see a key down and key press with key Escape, but code Period 😃. (Also keyup is missing, but that’s “expected” because it was generated from a key command. I put “expected” in quotes, because I’m kinda leaning towards fixing that in UIKit just for Escape). 1549448 1 webkit-bug-importer 2019-07-01 19:25:51 -0700 <rdar://problem/52498001> 1550435 2 dbates 2019-07-05 10:56:50 -0700 There's a few ways I could go about with this bug: 1. Do what I originally complained about: fix the key code of the dispatched event to be Escape instead of Period. 2. Take this opportunity to re-evaluate this whole Command + . business: maybe the experience should match the experience when typing a Roman variant (e.g. Option + 2 == ™) => this dispatches (looking at key codes): keydown Option, keydown 2, keypress ™, keyup 2, keyup Option. The benefit of (2) is that a web app could still know about Command + . and have their own handling. But how many web apps would even care about this? I know of 0 web apps that have their own Command + . handling and it's such an esoteric Mac/iOS key command that I kinda doubt a web app would unless that app is targeted at such platforms or embedded in a native app on those platforms. Another downside is that it reveals an implementation detail and we don't reveal such a detail to native apps on iOS..... Lastly, if we do (1) and a developer really wants to distinguish between Escape and Command + . they still can! They just have to do a little bit more work and track keydown, keyup Command whenever they see a keydown/keypress of Escape. So, I'm leaning towards doing (1). 1550438 3 373515 dbates 2019-07-05 11:01:30 -0700 Created attachment 373515 Patch 1550439 4 373516 dbates 2019-07-05 11:02:53 -0700 Created attachment 373516 Patch 1551017 5 373516 dbates 2019-07-08 16:07:07 -0700 Comment on attachment 373516 Patch Clearing flags on attachment: 373516 Committed r247232: <https://trac.webkit.org/changeset/247232> 1551018 6 dbates 2019-07-08 16:07:08 -0700 All reviewed patches have been landed. Closing bug. 373515 2019-07-05 11:01:30 -0700 2019-07-05 11:02:52 -0700 Patch bug-199393-20190705110130.patch text/plain 5424 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNkMjIxZmJmYzA1OTI2 Yjc0MThiN2Y2ODM1NWVhYzEyM2I2MzkwOS4uODc2ZWI0NDU4OTZmNmQ5NWIxODJlNmE4MmQ2MWE2 Yjc3ZTAzNTdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTA1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDb21tYW5kICsgLiBnZW5l cmF0ZXMgRXNjYXBlIHdpdGgga2V5IGlkZW50aWZpZXIgUGVyaW9kLCBzaG91bGQgYmUgRXNjYXBl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzOTMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyNDk4MDAxPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbWFwIHRoZSBrZXkgY29kZSBmb3IgQ29tbWFu ZCArIC4gYmVmb3JlIHdlIGNvbXB1dGUgdGhlIFdpbmRvd3MgdmlydHVhbCBrZXkgY29kZS4KKyAg ICAgICAgT3RoZXJ3aXNlLCB0aGUgV2luZG93cyB2aXJ0dWFsIGtleSBjb2RlIHJldmVhbHMgdGhl IHByZS1tYXBwZWQga2V5IGNvZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViRXZlbnQu bW06CisgICAgICAgICgtW1dlYkV2ZW50IGluaXRXaXRoS2V5RXZlbnRUeXBlOnRpbWVTdGFtcDpj aGFyYWN0ZXJzOmNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczptb2RpZmllcnM6aXNSZXBlYXRp bmc6d2l0aEZsYWdzOndpdGhJbnB1dE1hbmFnZXJIaW50OmtleUNvZGU6aXNUYWJLZXk6XSk6CisK IDIwMTktMDctMDUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb TEZDXVtJRkNdIElubGluZSBydW5zIHNob3VsZCBiZSByZWxhdGl2ZSB0byB0aGUgbGluZSdzIHRv cC9sZWZ0IGluaXRpYWxseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYkV2ZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCmlu ZGV4IDEzN2NjNDQ3NDk1Y2IwYjRkMjg3YzVmNDY1YmRiMzEwZDg3YTUxNmQuLjNhMTA5ZjI4Mjll NzUyMGNjNThkNjY4NjA3YTljZTI3YmIxNDZhNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViRXZlbnQubW0KQEAgLTE4NSw2ICsxODUsMTYgQEAgLSAoV2ViRXZlbnQgKilpbml0V2l0 aEtleUV2ZW50VHlwZTooV2ViRXZlbnRUeXBlKXR5cGUKICAgICBfbW9kaWZpZXJGbGFncyA9IG1v ZGlmaWVyczsKICAgICBfa2V5Ym9hcmRGbGFncyA9IGZsYWdzOwogICAgIF9pbnB1dE1hbmFnZXJI aW50ID0gW2hpbnQgcmV0YWluXTsKKworICAgIGlmICghKF9rZXlib2FyZEZsYWdzICYgV2ViRXZl bnRLZXlib2FyZElucHV0TW9kaWZpZXJGbGFnc0NoYW5nZWQpKSB7CisgICAgICAgIC8vIE1hcCBD b21tYW5kICsgLiB0byBFc2NhcGUgc2luY2UgQXBwbGUgU21hcnQgS2V5Ym9hcmRzIGxhY2sgYW4g RXNjYXBlIGtleS4KKyAgICAgICAgLy8gRklYTUU6IFRoaXMgZG9lc24ndCB3b3JrIGZvciBzb21l IGtleWJvYXJkIGxheW91dHMsIGxpa2UgRnJlbmNoLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzUxMDQ3 MDExPi4KKyAgICAgICAgaWYgKFtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMgaXNFcXVhbFRv U3RyaW5nOkAiLiJdICYmIChtb2RpZmllcnMgJiBXZWJFdmVudEZsYWdNYXNrQ29tbWFuZEtleSkp IHsKKyAgICAgICAgICAgIGtleUNvZGUgPSBrSElEVXNhZ2VfS2V5Ym9hcmRFc2NhcGU7CisgICAg ICAgICAgICBfbW9kaWZpZXJGbGFncyAmPSB+V2ViRXZlbnRGbGFnTWFza0NvbW1hbmRLZXk7Cisg ICAgICAgIH0KKyAgICB9CisKICAgICBpZiAoa2V5Q29kZSkKICAgICAgICAgX2tleUNvZGUgPSB3 aW5kb3dzS2V5Q29kZUZvcktleUNvZGUoa2V5Q29kZSk7CiAgICAgZWxzZSBpZiAoW2NoYXJhY3Rl cnNJZ25vcmluZ01vZGlmaWVycyBsZW5ndGhdID09IDEpIHsKQEAgLTE5MywxMSArMjAzLDYgQEAg LSAoV2ViRXZlbnQgKilpbml0V2l0aEtleUV2ZW50VHlwZTooV2ViRXZlbnRUeXBlKXR5cGUKICAg ICB9CiAKICAgICBpZiAoIShfa2V5Ym9hcmRGbGFncyAmIFdlYkV2ZW50S2V5Ym9hcmRJbnB1dE1v ZGlmaWVyRmxhZ3NDaGFuZ2VkKSkgewotICAgICAgICAvLyBNYXAgQ29tbWFuZCArIC4gdG8gRXNj YXBlIHNpbmNlIEFwcGxlIFNtYXJ0IEtleWJvYXJkcyBsYWNrIGFuIEVzY2FwZSBrZXkuCi0gICAg ICAgIGlmIChbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzIGlzRXF1YWxUb1N0cmluZzpAIi4i XSAmJiAobW9kaWZpZXJzICYgV2ViRXZlbnRGbGFnTWFza0NvbW1hbmRLZXkpKSB7Ci0gICAgICAg ICAgICBrZXlDb2RlID0ga0hJRFVzYWdlX0tleWJvYXJkRXNjYXBlOwotICAgICAgICAgICAgX21v ZGlmaWVyRmxhZ3MgJj0gfldlYkV2ZW50RmxhZ01hc2tDb21tYW5kS2V5OwotICAgICAgICB9CiAg ICAgICAgIF9jaGFyYWN0ZXJzID0gW25vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJp bGl0eU1hcHBpbmcoY2hhcmFjdGVycywga2V5Q29kZSkgcmV0YWluXTsKICAgICAgICAgX2NoYXJh Y3RlcnNJZ25vcmluZ01vZGlmaWVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBh dGliaWxpdHlNYXBwaW5nKGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycywga2V5Q29kZSkgcmV0 YWluXTsKICAgICAgICAgX3RhYktleSA9IHRhYktleTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMjVhOGZkMDdmNmU2ZmIy YmIwZjg2YTZmZDcwZjU4M2QzN2I2ZTYyLi40ZTg5NzFhYjIwMThkMDRkMWY1MTUzNTUwMWRhYTA3 YzFhOWFhYzljIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDctMDUgIERhbmllbCBCYXRl cyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENvbW1hbmQgKyAuIGdlbmVyYXRlcyBF c2NhcGUgd2l0aCBrZXkgaWRlbnRpZmllciBQZXJpb2QsIHNob3VsZCBiZSBFc2NhcGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTM5MworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNTI0OTgwMDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRlc3QgcmVzdWx0LgorCisgICAgICAgICogZmFz dC9ldmVudHMvaW9zL2tleS1ldmVudHMtY29tcHJlaGVuc2l2ZS9rZXktZXZlbnRzLW1ldGEtZXhw ZWN0ZWQudHh0OgorCiAyMDE5LTA3LTAyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBTdXBwb3J0IHNlbGVjdCBhbGwgaW4gbm9uLWVkaXRhYmxlIGVs ZW1lbnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9rZXktZXZlbnRz LWNvbXByZWhlbnNpdmUva2V5LWV2ZW50cy1tZXRhLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2lvcy9rZXktZXZlbnRzLWNvbXByZWhlbnNpdmUva2V5LWV2ZW50cy1tZXRh LWV4cGVjdGVkLnR4dAppbmRleCBjNzVhNzcyZjRhMzNjNzI5ZDE3M2ZlY2M1OGRjNDRhYjViNjMz YjNiLi43N2JiNTIyZWQxYjUxNGQ0ZDY1YWU2MTEwNjFhNTE0OTFmYjg4NGEzIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mva2V5LWV2ZW50cy1jb21wcmVoZW5zaXZlL2tl eS1ldmVudHMtbWV0YS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv aW9zL2tleS1ldmVudHMtY29tcHJlaGVuc2l2ZS9rZXktZXZlbnRzLW1ldGEtZXhwZWN0ZWQudHh0 CkBAIC0xNDAsOCArMTQwLDggQEAgdHlwZToga2V5dXAsIGtleTogTWV0YSwgY29kZTogTWV0YUxl ZnQsIGtleUlkZW50aWZpZXI6IE1ldGEsIGtleUNvZGU6IDkxLCBjaGFyQ28KIAogVGVzdCBDb21t YW5kICsgLjoKIHR5cGU6IGtleWRvd24sIGtleTogTWV0YSwgY29kZTogTWV0YUxlZnQsIGtleUlk ZW50aWZpZXI6IE1ldGEsIGtleUNvZGU6IDkxLCBjaGFyQ29kZTogMCwga2V5Q29kZTogOTEsIHdo aWNoOiA5MSwgYWx0S2V5OiBmYWxzZSwgY3RybEtleTogZmFsc2UsIG1ldGFLZXk6IHRydWUsIHNo aWZ0S2V5OiBmYWxzZSwgbG9jYXRpb246IDEsIGtleUxvY2F0aW9uOiAxCi10eXBlOiBrZXlkb3du LCBrZXk6IEVzY2FwZSwgY29kZTogUGVyaW9kLCBrZXlJZGVudGlmaWVyOiBVKzAwMUIsIGtleUNv ZGU6IDI3LCBjaGFyQ29kZTogMCwga2V5Q29kZTogMjcsIHdoaWNoOiAyNywgYWx0S2V5OiBmYWxz ZSwgY3RybEtleTogZmFsc2UsIG1ldGFLZXk6IGZhbHNlLCBzaGlmdEtleTogZmFsc2UsIGxvY2F0 aW9uOiAwLCBrZXlMb2NhdGlvbjogMAotdHlwZToga2V5cHJlc3MsIGtleTogRXNjYXBlLCBjb2Rl OiBQZXJpb2QsIGtleUlkZW50aWZpZXI6ICwga2V5Q29kZTogMjcsIGNoYXJDb2RlOiAyNywga2V5 Q29kZTogMjcsIHdoaWNoOiAyNywgYWx0S2V5OiBmYWxzZSwgY3RybEtleTogZmFsc2UsIG1ldGFL ZXk6IGZhbHNlLCBzaGlmdEtleTogZmFsc2UsIGxvY2F0aW9uOiAwLCBrZXlMb2NhdGlvbjogMAor dHlwZToga2V5ZG93biwga2V5OiBFc2NhcGUsIGNvZGU6IEVzY2FwZSwga2V5SWRlbnRpZmllcjog VSswMDFCLCBrZXlDb2RlOiAyNywgY2hhckNvZGU6IDAsIGtleUNvZGU6IDI3LCB3aGljaDogMjcs IGFsdEtleTogZmFsc2UsIGN0cmxLZXk6IGZhbHNlLCBtZXRhS2V5OiBmYWxzZSwgc2hpZnRLZXk6 IGZhbHNlLCBsb2NhdGlvbjogMCwga2V5TG9jYXRpb246IDAKK3R5cGU6IGtleXByZXNzLCBrZXk6 IEVzY2FwZSwgY29kZTogRXNjYXBlLCBrZXlJZGVudGlmaWVyOiAsIGtleUNvZGU6IDI3LCBjaGFy Q29kZTogMjcsIGtleUNvZGU6IDI3LCB3aGljaDogMjcsIGFsdEtleTogZmFsc2UsIGN0cmxLZXk6 IGZhbHNlLCBtZXRhS2V5OiBmYWxzZSwgc2hpZnRLZXk6IGZhbHNlLCBsb2NhdGlvbjogMCwga2V5 TG9jYXRpb246IDAKIHR5cGU6IGtleXVwLCBrZXk6IE1ldGEsIGNvZGU6IE1ldGFMZWZ0LCBrZXlJ ZGVudGlmaWVyOiBNZXRhLCBrZXlDb2RlOiA5MSwgY2hhckNvZGU6IDAsIGtleUNvZGU6IDkxLCB3 aGljaDogOTEsIGFsdEtleTogZmFsc2UsIGN0cmxLZXk6IGZhbHNlLCBtZXRhS2V5OiBmYWxzZSwg c2hpZnRLZXk6IGZhbHNlLCBsb2NhdGlvbjogMSwga2V5TG9jYXRpb246IDEKIAogVGVzdCBDb21t YW5kICsgLzoK 373516 2019-07-05 11:02:53 -0700 2019-07-08 16:07:07 -0700 Patch bug-199393-20190705110252.patch text/plain 5587 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNkMjIxZmJmYzA1OTI2 Yjc0MThiN2Y2ODM1NWVhYzEyM2I2MzkwOS4uODc2ZWI0NDU4OTZmNmQ5NWIxODJlNmE4MmQ2MWE2 Yjc3ZTAzNTdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTA1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDb21tYW5kICsgLiBnZW5l cmF0ZXMgRXNjYXBlIHdpdGgga2V5IGlkZW50aWZpZXIgUGVyaW9kLCBzaG91bGQgYmUgRXNjYXBl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzOTMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyNDk4MDAxPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbWFwIHRoZSBrZXkgY29kZSBmb3IgQ29tbWFu ZCArIC4gYmVmb3JlIHdlIGNvbXB1dGUgdGhlIFdpbmRvd3MgdmlydHVhbCBrZXkgY29kZS4KKyAg ICAgICAgT3RoZXJ3aXNlLCB0aGUgV2luZG93cyB2aXJ0dWFsIGtleSBjb2RlIHJldmVhbHMgdGhl IHByZS1tYXBwZWQga2V5IGNvZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViRXZlbnQu bW06CisgICAgICAgICgtW1dlYkV2ZW50IGluaXRXaXRoS2V5RXZlbnRUeXBlOnRpbWVTdGFtcDpj aGFyYWN0ZXJzOmNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczptb2RpZmllcnM6aXNSZXBlYXRp bmc6d2l0aEZsYWdzOndpdGhJbnB1dE1hbmFnZXJIaW50OmtleUNvZGU6aXNUYWJLZXk6XSk6CisK IDIwMTktMDctMDUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb TEZDXVtJRkNdIElubGluZSBydW5zIHNob3VsZCBiZSByZWxhdGl2ZSB0byB0aGUgbGluZSdzIHRv cC9sZWZ0IGluaXRpYWxseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYkV2ZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCmlu ZGV4IDEzN2NjNDQ3NDk1Y2IwYjRkMjg3YzVmNDY1YmRiMzEwZDg3YTUxNmQuLmY4NDNjNTRhNDZh MmYyY2Y0NzlmMzg2Y2I4NGFjZGNkNWI1MWZmNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViRXZlbnQubW0KQEAgLTE4NSw2ICsxODUsMTcgQEAgLSAoV2ViRXZlbnQgKilpbml0V2l0 aEtleUV2ZW50VHlwZTooV2ViRXZlbnRUeXBlKXR5cGUKICAgICBfbW9kaWZpZXJGbGFncyA9IG1v ZGlmaWVyczsKICAgICBfa2V5Ym9hcmRGbGFncyA9IGZsYWdzOwogICAgIF9pbnB1dE1hbmFnZXJI aW50ID0gW2hpbnQgcmV0YWluXTsKKworICAgIEJPT0wgZmxhZ3NDaGFuZ2VkID0gX2tleWJvYXJk RmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRNb2RpZmllckZsYWdzQ2hhbmdlZDsKKyAgICBp ZiAoIWZsYWdzQ2hhbmdlZCkgeworICAgICAgICAvLyBNYXAgQ29tbWFuZCArIC4gdG8gRXNjYXBl IHNpbmNlIEFwcGxlIFNtYXJ0IEtleWJvYXJkcyBsYWNrIGFuIEVzY2FwZSBrZXkuCisgICAgICAg IC8vIEZJWE1FOiBUaGlzIGRvZXNuJ3Qgd29yayBmb3Igc29tZSBrZXlib2FyZCBsYXlvdXRzLCBs aWtlIEZyZW5jaC4gU2VlIDxyZGFyOi8vcHJvYmxlbS81MTA0NzAxMT4uCisgICAgICAgIGlmIChb Y2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzIGlzRXF1YWxUb1N0cmluZzpAIi4iXSAmJiAobW9k aWZpZXJzICYgV2ViRXZlbnRGbGFnTWFza0NvbW1hbmRLZXkpKSB7CisgICAgICAgICAgICBrZXlD b2RlID0ga0hJRFVzYWdlX0tleWJvYXJkRXNjYXBlOworICAgICAgICAgICAgX21vZGlmaWVyRmxh Z3MgJj0gfldlYkV2ZW50RmxhZ01hc2tDb21tYW5kS2V5OworICAgICAgICB9CisgICAgfQorCiAg ICAgaWYgKGtleUNvZGUpCiAgICAgICAgIF9rZXlDb2RlID0gd2luZG93c0tleUNvZGVGb3JLZXlD b2RlKGtleUNvZGUpOwogICAgIGVsc2UgaWYgKFtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMg bGVuZ3RoXSA9PSAxKSB7CkBAIC0xOTIsMTIgKzIwMyw3IEBAIC0gKFdlYkV2ZW50ICopaW5pdFdp dGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlwZSl0eXBlCiAgICAgICAgIF9rZXlDb2RlID0gd2lu ZG93c0tleUNvZGVGb3JDaGFyQ29kZUlPUyhbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzIGNo YXJhY3RlckF0SW5kZXg6MF0pOwogICAgIH0KIAotICAgIGlmICghKF9rZXlib2FyZEZsYWdzICYg V2ViRXZlbnRLZXlib2FyZElucHV0TW9kaWZpZXJGbGFnc0NoYW5nZWQpKSB7Ci0gICAgICAgIC8v IE1hcCBDb21tYW5kICsgLiB0byBFc2NhcGUgc2luY2UgQXBwbGUgU21hcnQgS2V5Ym9hcmRzIGxh Y2sgYW4gRXNjYXBlIGtleS4KLSAgICAgICAgaWYgKFtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmll cnMgaXNFcXVhbFRvU3RyaW5nOkAiLiJdICYmIChtb2RpZmllcnMgJiBXZWJFdmVudEZsYWdNYXNr Q29tbWFuZEtleSkpIHsKLSAgICAgICAgICAgIGtleUNvZGUgPSBrSElEVXNhZ2VfS2V5Ym9hcmRF c2NhcGU7Ci0gICAgICAgICAgICBfbW9kaWZpZXJGbGFncyAmPSB+V2ViRXZlbnRGbGFnTWFza0Nv bW1hbmRLZXk7Ci0gICAgICAgIH0KKyAgICBpZiAoIWZsYWdzQ2hhbmdlZCkgewogICAgICAgICBf Y2hhcmFjdGVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBhdGliaWxpdHlNYXBw aW5nKGNoYXJhY3RlcnMsIGtleUNvZGUpIHJldGFpbl07CiAgICAgICAgIF9jaGFyYWN0ZXJzSWdu b3JpbmdNb2RpZmllcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21wYXRpYmlsaXR5 TWFwcGluZyhjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIGtleUNvZGUpIHJldGFpbl07CiAg ICAgICAgIF90YWJLZXkgPSB0YWJLZXk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDI1YThmZDA3ZjZlNmZiMmJiMGY4NmE2 ZmQ3MGY1ODNkMzdiNmU2Mi4uNGU4OTcxYWIyMDE4ZDA0ZDFmNTE1MzU1MDFkYWEwN2MxYTlhYWM5 YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA3LTA1ICBEYW5pZWwgQmF0ZXMgIDxkYWJh dGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDb21tYW5kICsgLiBnZW5lcmF0ZXMgRXNjYXBlIHdp dGgga2V5IGlkZW50aWZpZXIgUGVyaW9kLCBzaG91bGQgYmUgRXNjYXBlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzOTMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUyNDk4MDAxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSB0ZXN0IHJlc3VsdC4KKworICAgICAgICAqIGZhc3QvZXZlbnRz L2lvcy9rZXktZXZlbnRzLWNvbXByZWhlbnNpdmUva2V5LWV2ZW50cy1tZXRhLWV4cGVjdGVkLnR4 dDoKKwogMjAxOS0wNy0wMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gU3VwcG9ydCBzZWxlY3QgYWxsIGluIG5vbi1lZGl0YWJsZSBlbGVtZW50CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mva2V5LWV2ZW50cy1jb21wcmVo ZW5zaXZlL2tleS1ldmVudHMtbWV0YS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9pb3Mva2V5LWV2ZW50cy1jb21wcmVoZW5zaXZlL2tleS1ldmVudHMtbWV0YS1leHBlY3Rl ZC50eHQKaW5kZXggYzc1YTc3MmY0YTMzYzcyOWQxNzNmZWNjNThkYzQ0YWI1YjYzM2IzYi4uNzdi YjUyMmVkMWI1MTRkNGQ2NWFlNjExMDYxYTUxNDkxZmI4ODRhMyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvZmFzdC9ldmVudHMvaW9zL2tleS1ldmVudHMtY29tcHJlaGVuc2l2ZS9rZXktZXZlbnRz LW1ldGEtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9rZXkt ZXZlbnRzLWNvbXByZWhlbnNpdmUva2V5LWV2ZW50cy1tZXRhLWV4cGVjdGVkLnR4dApAQCAtMTQw LDggKzE0MCw4IEBAIHR5cGU6IGtleXVwLCBrZXk6IE1ldGEsIGNvZGU6IE1ldGFMZWZ0LCBrZXlJ ZGVudGlmaWVyOiBNZXRhLCBrZXlDb2RlOiA5MSwgY2hhckNvCiAKIFRlc3QgQ29tbWFuZCArIC46 CiB0eXBlOiBrZXlkb3duLCBrZXk6IE1ldGEsIGNvZGU6IE1ldGFMZWZ0LCBrZXlJZGVudGlmaWVy OiBNZXRhLCBrZXlDb2RlOiA5MSwgY2hhckNvZGU6IDAsIGtleUNvZGU6IDkxLCB3aGljaDogOTEs IGFsdEtleTogZmFsc2UsIGN0cmxLZXk6IGZhbHNlLCBtZXRhS2V5OiB0cnVlLCBzaGlmdEtleTog ZmFsc2UsIGxvY2F0aW9uOiAxLCBrZXlMb2NhdGlvbjogMQotdHlwZToga2V5ZG93biwga2V5OiBF c2NhcGUsIGNvZGU6IFBlcmlvZCwga2V5SWRlbnRpZmllcjogVSswMDFCLCBrZXlDb2RlOiAyNywg Y2hhckNvZGU6IDAsIGtleUNvZGU6IDI3LCB3aGljaDogMjcsIGFsdEtleTogZmFsc2UsIGN0cmxL ZXk6IGZhbHNlLCBtZXRhS2V5OiBmYWxzZSwgc2hpZnRLZXk6IGZhbHNlLCBsb2NhdGlvbjogMCwg a2V5TG9jYXRpb246IDAKLXR5cGU6IGtleXByZXNzLCBrZXk6IEVzY2FwZSwgY29kZTogUGVyaW9k LCBrZXlJZGVudGlmaWVyOiAsIGtleUNvZGU6IDI3LCBjaGFyQ29kZTogMjcsIGtleUNvZGU6IDI3 LCB3aGljaDogMjcsIGFsdEtleTogZmFsc2UsIGN0cmxLZXk6IGZhbHNlLCBtZXRhS2V5OiBmYWxz ZSwgc2hpZnRLZXk6IGZhbHNlLCBsb2NhdGlvbjogMCwga2V5TG9jYXRpb246IDAKK3R5cGU6IGtl eWRvd24sIGtleTogRXNjYXBlLCBjb2RlOiBFc2NhcGUsIGtleUlkZW50aWZpZXI6IFUrMDAxQiwg a2V5Q29kZTogMjcsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAyNywgd2hpY2g6IDI3LCBhbHRLZXk6 IGZhbHNlLCBjdHJsS2V5OiBmYWxzZSwgbWV0YUtleTogZmFsc2UsIHNoaWZ0S2V5OiBmYWxzZSwg bG9jYXRpb246IDAsIGtleUxvY2F0aW9uOiAwCit0eXBlOiBrZXlwcmVzcywga2V5OiBFc2NhcGUs IGNvZGU6IEVzY2FwZSwga2V5SWRlbnRpZmllcjogLCBrZXlDb2RlOiAyNywgY2hhckNvZGU6IDI3 LCBrZXlDb2RlOiAyNywgd2hpY2g6IDI3LCBhbHRLZXk6IGZhbHNlLCBjdHJsS2V5OiBmYWxzZSwg bWV0YUtleTogZmFsc2UsIHNoaWZ0S2V5OiBmYWxzZSwgbG9jYXRpb246IDAsIGtleUxvY2F0aW9u OiAwCiB0eXBlOiBrZXl1cCwga2V5OiBNZXRhLCBjb2RlOiBNZXRhTGVmdCwga2V5SWRlbnRpZmll cjogTWV0YSwga2V5Q29kZTogOTEsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiA5MSwgd2hpY2g6IDkx LCBhbHRLZXk6IGZhbHNlLCBjdHJsS2V5OiBmYWxzZSwgbWV0YUtleTogZmFsc2UsIHNoaWZ0S2V5 OiBmYWxzZSwgbG9jYXRpb246IDEsIGtleUxvY2F0aW9uOiAxCiAKIFRlc3QgQ29tbWFuZCArIC86 Cg==