197081 2019-04-18 16:26:06 -0700 Use existing KeyEventCodesIOS constants instead of duplicating them 2019-04-19 14:54:27 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1528645 0 dbates 2019-04-18 16:26:06 -0700 Use existing KeyEventCodesIOS constants instead of duplicating them. 1528646 1 367772 dbates 2019-04-18 16:28:43 -0700 Created attachment 367772 Patch 1528647 2 367772 wenson_hsieh 2019-04-18 16:30:39 -0700 Comment on attachment 367772 Patch rs=me 1528654 3 367775 dbates 2019-04-18 16:45:13 -0700 Created attachment 367775 Patch 1528891 4 dbates 2019-04-19 14:53:29 -0700 Committed r244471: <https://trac.webkit.org/changeset/244471> 1528893 5 webkit-bug-importer 2019-04-19 14:54:27 -0700 <rdar://problem/50060449> 367772 2019-04-18 16:28:43 -0700 2019-04-18 16:45:12 -0700 Patch bug-197081-20190418162842.patch text/plain 4942 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyNzkyMGEzNTA2MWU0MjYz OTAwNjdiYjY3ZWYwNmE0M2U1MjU1NDMuLjQyMDg2MTMxYjhmNDQwYWFkNmZiNzI3OGZjZGUwZGY1 MzZjYzg2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMTggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBleGlzdGluZyBLZXlFdmVu dENvZGVzSU9TIGNvbnN0YW50cyBpbnN0ZWFkIG9mIGR1cGxpY2F0aW5nIHRoZW0KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA4MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2lu dGVycHJldEtleUV2ZW50OmlzQ2hhckV2ZW50Ol0pOiBXaGlsZSBJIGFtIGhlcmUsIHJlbW92ZSB0 aGUgY2FzZSBmb3IgdGhlIHNwYWNlIGtleQorICAgICAgICBhcyBpdCBpcyBpZGVudGljYWwgdG8g dGhlIGRlZmF1bHQgc3dpdGNoIGNhc2UuCisKIDIwMTktMDQtMTggIERvbiBPbG1zdGVhZCAgPGRv bi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbQ01ha2VdIE1ha2UgV2ViQ29yZSBoZWFk ZXJzIGNvcGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGVjNWY3NjAzM2RkYmRm NmUzZTQ5NzdjMDk3NzMzOGU4YTk0Y2IzMGUuLmRmMjA4OTY5YzRiZDE0YzIwODllZDA5MWJjNjAx ZTIzMWYwNDEwZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBA QAorMjAxOS0wNC0xOCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAg ICAgVXNlIGV4aXN0aW5nIEtleUV2ZW50Q29kZXNJT1MgY29uc3RhbnRzIGluc3RlYWQgb2YgZHVw bGljYXRpbmcgdGhlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk3MDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBf aGFuZGxlRWRpdGluZ0tleUV2ZW50Ol0pOgorCiAyMDE5LTA0LTE4ICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yaW5nOiBQdWxsIGFsbCBmdWxsc2Ny ZWVuIGNvZGUgb3V0IG9mIERvY3VtZW50IGFuZCBpbnRvIGl0cyBvd24gaGVscGVyIGNsYXNzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQppbmRleCBhNzdhMmIxZDUxNDkyMzQwMjdjNjhlODQ2Y2M3NWI2MGZjYTYyMTVh Li5kMDlhMzAxYzRjYmRlZWMyMjYwNjAyZjU0MGE3YTY3NGY5ZTA3ZGQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KQEAgLTgzLDYgKzgzLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvRmxvYXRRdWFkLmg+CiAjaW1w b3J0IDxXZWJDb3JlL0ZvbnRBdHRyaWJ1dGVDaGFuZ2VzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0lu cHV0TW9kZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9LZXlFdmVudENvZGVzSU9TLmg+CiAjaW1wb3J0 IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4KICNpbXBvcnQgPFdlYkNvcmUvTm90SW1wbGVt ZW50ZWQuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGFzdGVib2FyZC5oPgpAQCAtNDUzNCwzMCArNDUz NSwyMSBAQCAtIChCT09MKV9pbnRlcnByZXRLZXlFdmVudDooOjpXZWJFdmVudCAqKWV2ZW50IGlz Q2hhckV2ZW50OihCT09MKWlzQ2hhckV2ZW50CiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIHN3 aXRjaCAoW2NoYXJhY3RlcnMgY2hhcmFjdGVyQXRJbmRleDowXSkgewotICAgIGNhc2Uga1dlYkJh Y2tzcGFjZUtleToKLSAgICBjYXNlIGtXZWJEZWxldGVLZXk6CisgICAgY2FzZSBOU0JhY2tzcGFj ZUNoYXJhY3RlcjoKKyAgICBjYXNlIE5TRGVsZXRlQ2hhcmFjdGVyOgogICAgICAgICBpZiAoY29u dGVudEVkaXRhYmxlKSB7CiAgICAgICAgICAgICBba2V5Ym9hcmQgZGVsZXRlRnJvbUlucHV0V2l0 aEZsYWdzOmV2ZW50LmtleWJvYXJkRmxhZ3NdOwogICAgICAgICAgICAgcmV0dXJuIFlFUzsKICAg ICAgICAgfQogICAgICAgICBicmVhazsKLQotICAgIGNhc2Uga1dlYlNwYWNlS2V5OgotICAgICAg ICBpZiAoY29udGVudEVkaXRhYmxlICYmIGlzQ2hhckV2ZW50KSB7Ci0gICAgICAgICAgICBba2V5 Ym9hcmQgYWRkSW5wdXRTdHJpbmc6ZXZlbnQuY2hhcmFjdGVycyB3aXRoRmxhZ3M6ZXZlbnQua2V5 Ym9hcmRGbGFncyB3aXRoSW5wdXRNYW5hZ2VySGludDpldmVudC5pbnB1dE1hbmFnZXJIaW50XTsK LSAgICAgICAgICAgIHJldHVybiBZRVM7Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0KLSAg ICBjYXNlIGtXZWJFbnRlcktleToKLSAgICBjYXNlIGtXZWJSZXR1cm5LZXk6CisgICAgY2FzZSBO U0VudGVyQ2hhcmFjdGVyOgorICAgIGNhc2UgTlNDYXJyaWFnZVJldHVybkNoYXJhY3RlcjoKICAg ICAgICAgaWYgKGNvbnRlbnRFZGl0YWJsZSAmJiBpc0NoYXJFdmVudCkgewogICAgICAgICAgICAg Ly8gTWFwIFxyIGZyb20gSFcga2V5Ym9hcmQgdG8gXG4gdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9m IHRoZSBzb2Z0IGtleWJvYXJkLgogICAgICAgICAgICAgW2tleWJvYXJkIGFkZElucHV0U3RyaW5n OkAiXG4iIHdpdGhGbGFnczowIHdpdGhJbnB1dE1hbmFnZXJIaW50Om5pbF07CiAgICAgICAgICAg ICByZXR1cm4gWUVTOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwotCiAgICAgZGVmYXVsdDoK ICAgICAgICAgaWYgKGNvbnRlbnRFZGl0YWJsZSAmJiBpc0NoYXJFdmVudCkgewogICAgICAgICAg ICAgW2tleWJvYXJkIGFkZElucHV0U3RyaW5nOmV2ZW50LmNoYXJhY3RlcnMgd2l0aEZsYWdzOmV2 ZW50LmtleWJvYXJkRmxhZ3Mgd2l0aElucHV0TWFuYWdlckhpbnQ6ZXZlbnQuaW5wdXRNYW5hZ2Vy SGludF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkhU TUxWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQppbmRleCBjOWNmN2Y5ZTdmYTFkMWY2NDBjZjg1YWQyOWEzZmFlNGJmZWQxNWYyLi42YjA0OGEx NjQyZTM5ZjcyYjljOWY0YjM4M2M5NTI4MmJlYzg2YWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTYwNjksMTEgKzYwNjksNiBAQCAt IChCT09MKV9pbnRlcnByZXRLZXlFdmVudDooS2V5Ym9hcmRFdmVudCopZXZlbnQgc2F2aW5nQ29t bWFuZHM6KEJPT0wpc2F2aW5nQ29tbQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAK LSNkZWZpbmUga1dlYkVudGVyS2V5ICAgICAgICAgMHgwMDAzCi0jZGVmaW5lIGtXZWJCYWNrc3Bh Y2VLZXkgICAgIDB4MDAwOAotI2RlZmluZSBrV2ViUmV0dXJuS2V5ICAgICAgICAweDAwMGQKLSNk ZWZpbmUga1dlYkRlbGV0ZUtleSAgICAgICAgMHgwMDdGCi0gICAgCiAtIChCT09MKV9oYW5kbGVF ZGl0aW5nS2V5RXZlbnQ6KEtleWJvYXJkRXZlbnQgKil3Y0V2ZW50CiB7CiAgICAgLy8gVXNlIHRo ZSBpc0VkaXRhYmxlIHN0YXRlIHRvIGRldGVybWluZSB3aGV0aGVyIG9yIG5vdCB0byBwcm9jZXNz IHRhYiBrZXkgZXZlbnRzLgpAQCAtNjEwNSwxMiArNjEwMCwxMiBAQCAtIChCT09MKV9oYW5kbGVF ZGl0aW5nS2V5RXZlbnQ6KEtleWJvYXJkRXZlbnQgKil3Y0V2ZW50CiAgICAgICAgIGlmICghcy5s ZW5ndGgpCiAgICAgICAgICAgICByZXR1cm4gTk87CiAgICAgICAgIHN3aXRjaCAoW3MgY2hhcmFj dGVyQXRJbmRleDowXSkgewotICAgICAgICBjYXNlIGtXZWJCYWNrc3BhY2VLZXk6Ci0gICAgICAg IGNhc2Uga1dlYkRlbGV0ZUtleToKKyAgICAgICAgY2FzZSBOU0JhY2tzcGFjZUNoYXJhY3RlcjoK KyAgICAgICAgY2FzZSBOU0RlbGV0ZUNoYXJhY3RlcjoKICAgICAgICAgICAgIFtbd2ViVmlldyBf VUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gZGVsZXRlRnJvbUlucHV0V2l0aEZsYWdzOmV2ZW50Lmtl eWJvYXJkRmxhZ3NdOwogICAgICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAgICAgY2FzZSBrV2Vi RW50ZXJLZXk6Ci0gICAgICAgIGNhc2Uga1dlYlJldHVybktleToKKyAgICAgICAgY2FzZSBOU0Vu dGVyQ2hhcmFjdGVyOgorICAgICAgICBjYXNlIE5TQ2FycmlhZ2VSZXR1cm5DaGFyYWN0ZXI6CiAg ICAgICAgICAgICBpZiAoaXNDaGFyRXZlbnQpIHsKICAgICAgICAgICAgICAgICAvLyBNYXAgXHIg ZnJvbSBIVyBrZXlib2FyZCB0byBcbiB0byBtYXRjaCB0aGUgYmVoYXZpb3Igb2YgdGhlIHNvZnQg a2V5Ym9hcmQuCiAgICAgICAgICAgICAgICAgW1t3ZWJWaWV3IF9VSUtpdERlbGVnYXRlRm9yd2Fy ZGVyXSBhZGRJbnB1dFN0cmluZzpAIlxuIiB3aXRoRmxhZ3M6MF07Cg== 367775 2019-04-18 16:45:13 -0700 2019-04-18 16:45:13 -0700 Patch bug-197081-20190418164513.patch text/plain 5489 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyNzkyMGEzNTA2MWU0MjYz OTAwNjdiYjY3ZWYwNmE0M2U1MjU1NDMuLmJjYzdkZTM5YWExM2YzYjJhZDE4ZTJhNjVmNmVkOGJm MWM5OWM4MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMTggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBleGlzdGluZyBLZXlFdmVu dENvZGVzSU9TIGNvbnN0YW50cyBpbnN0ZWFkIG9mIGR1cGxpY2F0aW5nIHRoZW0KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA4MQorCisgICAgICAg IFJ1YmJlci1zdGFtcGVkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IF9pbnRlcnByZXRLZXlFdmVudDppc0NoYXJFdmVudDpdKTogV2hpbGUgSSBhbSBoZXJlLCByZW1v dmUgdGhlIGNhc2UgZm9yIHRoZSBzcGFjZSBrZXkKKyAgICAgICAgYXMgaXQgaXMgaWRlbnRpY2Fs IHRvIHRoZSBkZWZhdWx0IHN3aXRjaCBjYXNlLgorCiAyMDE5LTA0LTE4ICBEb24gT2xtc3RlYWQg IDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBNYWtlIFdlYkNvcmUg aGVhZGVycyBjb3BpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBlYzVmNzYwMzNk ZGJkZjZlM2U0OTc3YzA5NzczMzhlOGE5NGNiMzBlLi43NzYxYjgzY2UyZTBjODNjYzg5ODhjNjI5 ODAzNGM5ODY4ZTkyODYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTktMDQtMTggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisg ICAgICAgIFVzZSBleGlzdGluZyBLZXlFdmVudENvZGVzSU9TIGNvbnN0YW50cyBpbnN0ZWFkIG9m IGR1cGxpY2F0aW5nIHRoZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5NzA4MQorCisgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IFdlbnNvbiBIc2ll aC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhU TUxWaWV3IF9oYW5kbGVFZGl0aW5nS2V5RXZlbnQ6XSk6CisKIDIwMTktMDQtMTggIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3Jpbmc6IFB1bGwgYWxs IGZ1bGxzY3JlZW4gY29kZSBvdXQgb2YgRG9jdW1lbnQgYW5kIGludG8gaXRzIG93biBoZWxwZXIg Y2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGE3N2EyYjFkNTE0OTIzNDAyN2M2OGU4NDZjYzc1YjYw ZmNhNjIxNWEuLmZlNTQ0YTY5Mzc4ZGMxYmNmNzdhY2Q1NTY1YmQ2NGMwNjY0M2YzNjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtODMsNiArODMsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9GbG9hdFF1YWQu aD4KICNpbXBvcnQgPFdlYkNvcmUvRm9udEF0dHJpYnV0ZUNoYW5nZXMuaD4KICNpbXBvcnQgPFdl YkNvcmUvSW5wdXRNb2RlLmg+CisjaW1wb3J0IDxXZWJDb3JlL0tleUV2ZW50Q29kZXNJT1MuaD4K ICNpbXBvcnQgPFdlYkNvcmUvTG9jYWxpemVkU3RyaW5ncy5oPgogI2ltcG9ydCA8V2ViQ29yZS9O b3RJbXBsZW1lbnRlZC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYXN0ZWJvYXJkLmg+CkBAIC00NTAz LDEyICs0NTA0LDYgQEAgLSAodm9pZClfZGlkSGFuZGxlS2V5RXZlbnQ6KDo6V2ViRXZlbnQgKill dmVudCBldmVudFdhc0hhbmRsZWQ6KEJPT0wpZXZlbnRXYXNIYW4KIAogLSAoQk9PTClfaW50ZXJw cmV0S2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudCBpc0NoYXJFdmVudDooQk9PTClpc0NoYXJF dmVudAogewotICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBrV2ViRW50ZXJLZXkgPSAweDAwMDM7 Ci0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGtXZWJCYWNrc3BhY2VLZXkgPSAweDAwMDg7Ci0g ICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGtXZWJSZXR1cm5LZXkgPSAweDAwMEQ7Ci0gICAgc3Rh dGljIGNvbnN0IHVuc2lnbmVkIGtXZWJEZWxldGVLZXkgPSAweDAwN0Y7Ci0gICAgc3RhdGljIGNv bnN0IHVuc2lnbmVkIGtXZWJTcGFjZUtleSA9IDB4MjA7Ci0KICAgICBpZiAoZXZlbnQua2V5Ym9h cmRGbGFncyAmIFdlYkV2ZW50S2V5Ym9hcmRJbnB1dE1vZGlmaWVyRmxhZ3NDaGFuZ2VkKQogICAg ICAgICByZXR1cm4gTk87CiAKQEAgLTQ1MzQsMzAgKzQ1MjksMjEgQEAgLSAoQk9PTClfaW50ZXJw cmV0S2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudCBpc0NoYXJFdmVudDooQk9PTClpc0NoYXJF dmVudAogICAgICAgICByZXR1cm4gTk87CiAKICAgICBzd2l0Y2ggKFtjaGFyYWN0ZXJzIGNoYXJh Y3RlckF0SW5kZXg6MF0pIHsKLSAgICBjYXNlIGtXZWJCYWNrc3BhY2VLZXk6Ci0gICAgY2FzZSBr V2ViRGVsZXRlS2V5OgorICAgIGNhc2UgTlNCYWNrc3BhY2VDaGFyYWN0ZXI6CisgICAgY2FzZSBO U0RlbGV0ZUNoYXJhY3RlcjoKICAgICAgICAgaWYgKGNvbnRlbnRFZGl0YWJsZSkgewogICAgICAg ICAgICAgW2tleWJvYXJkIGRlbGV0ZUZyb21JbnB1dFdpdGhGbGFnczpldmVudC5rZXlib2FyZEZs YWdzXTsKICAgICAgICAgICAgIHJldHVybiBZRVM7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7 Ci0KLSAgICBjYXNlIGtXZWJTcGFjZUtleToKLSAgICAgICAgaWYgKGNvbnRlbnRFZGl0YWJsZSAm JiBpc0NoYXJFdmVudCkgewotICAgICAgICAgICAgW2tleWJvYXJkIGFkZElucHV0U3RyaW5nOmV2 ZW50LmNoYXJhY3RlcnMgd2l0aEZsYWdzOmV2ZW50LmtleWJvYXJkRmxhZ3Mgd2l0aElucHV0TWFu YWdlckhpbnQ6ZXZlbnQuaW5wdXRNYW5hZ2VySGludF07Ci0gICAgICAgICAgICByZXR1cm4gWUVT OwotICAgICAgICB9Ci0gICAgICAgIGJyZWFrOwotCi0gICAgY2FzZSBrV2ViRW50ZXJLZXk6Ci0g ICAgY2FzZSBrV2ViUmV0dXJuS2V5OgorICAgIGNhc2UgTlNFbnRlckNoYXJhY3RlcjoKKyAgICBj YXNlIE5TQ2FycmlhZ2VSZXR1cm5DaGFyYWN0ZXI6CiAgICAgICAgIGlmIChjb250ZW50RWRpdGFi bGUgJiYgaXNDaGFyRXZlbnQpIHsKICAgICAgICAgICAgIC8vIE1hcCBcciBmcm9tIEhXIGtleWJv YXJkIHRvIFxuIHRvIG1hdGNoIHRoZSBiZWhhdmlvciBvZiB0aGUgc29mdCBrZXlib2FyZC4KICAg ICAgICAgICAgIFtrZXlib2FyZCBhZGRJbnB1dFN0cmluZzpAIlxuIiB3aXRoRmxhZ3M6MCB3aXRo SW5wdXRNYW5hZ2VySGludDpuaWxdOwogICAgICAgICAgICAgcmV0dXJuIFlFUzsKICAgICAgICAg fQogICAgICAgICBicmVhazsKLQogICAgIGRlZmF1bHQ6CiAgICAgICAgIGlmIChjb250ZW50RWRp dGFibGUgJiYgaXNDaGFyRXZlbnQpIHsKICAgICAgICAgICAgIFtrZXlib2FyZCBhZGRJbnB1dFN0 cmluZzpldmVudC5jaGFyYWN0ZXJzIHdpdGhGbGFnczpldmVudC5rZXlib2FyZEZsYWdzIHdpdGhJ bnB1dE1hbmFnZXJIaW50OmV2ZW50LmlucHV0TWFuYWdlckhpbnRdOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJL aXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggYzljZjdmOWU3ZmExZDFm NjQwY2Y4NWFkMjlhM2ZhZTRiZmVkMTVmMi4uNmIwNDhhMTY0MmUzOWY3MmI5YzlmNGIzODNjOTUy ODJiZWM4NmFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkhU TUxWaWV3Lm1tCkBAIC02MDY5LDExICs2MDY5LDYgQEAgLSAoQk9PTClfaW50ZXJwcmV0S2V5RXZl bnQ6KEtleWJvYXJkRXZlbnQqKWV2ZW50IHNhdmluZ0NvbW1hbmRzOihCT09MKXNhdmluZ0NvbW0K IAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgCi0jZGVmaW5lIGtXZWJFbnRlcktleSAg ICAgICAgIDB4MDAwMwotI2RlZmluZSBrV2ViQmFja3NwYWNlS2V5ICAgICAweDAwMDgKLSNkZWZp bmUga1dlYlJldHVybktleSAgICAgICAgMHgwMDBkCi0jZGVmaW5lIGtXZWJEZWxldGVLZXkgICAg ICAgIDB4MDA3RgotICAgIAogLSAoQk9PTClfaGFuZGxlRWRpdGluZ0tleUV2ZW50OihLZXlib2Fy ZEV2ZW50ICopd2NFdmVudAogewogICAgIC8vIFVzZSB0aGUgaXNFZGl0YWJsZSBzdGF0ZSB0byBk ZXRlcm1pbmUgd2hldGhlciBvciBub3QgdG8gcHJvY2VzcyB0YWIga2V5IGV2ZW50cy4KQEAgLTYx MDUsMTIgKzYxMDAsMTIgQEAgLSAoQk9PTClfaGFuZGxlRWRpdGluZ0tleUV2ZW50OihLZXlib2Fy ZEV2ZW50ICopd2NFdmVudAogICAgICAgICBpZiAoIXMubGVuZ3RoKQogICAgICAgICAgICAgcmV0 dXJuIE5POwogICAgICAgICBzd2l0Y2ggKFtzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKLSAgICAg ICAgY2FzZSBrV2ViQmFja3NwYWNlS2V5OgotICAgICAgICBjYXNlIGtXZWJEZWxldGVLZXk6Cisg ICAgICAgIGNhc2UgTlNCYWNrc3BhY2VDaGFyYWN0ZXI6CisgICAgICAgIGNhc2UgTlNEZWxldGVD aGFyYWN0ZXI6CiAgICAgICAgICAgICBbW3dlYlZpZXcgX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJd IGRlbGV0ZUZyb21JbnB1dFdpdGhGbGFnczpldmVudC5rZXlib2FyZEZsYWdzXTsKICAgICAgICAg ICAgIHJldHVybiBZRVM7Ci0gICAgICAgIGNhc2Uga1dlYkVudGVyS2V5OgotICAgICAgICBjYXNl IGtXZWJSZXR1cm5LZXk6CisgICAgICAgIGNhc2UgTlNFbnRlckNoYXJhY3RlcjoKKyAgICAgICAg Y2FzZSBOU0NhcnJpYWdlUmV0dXJuQ2hhcmFjdGVyOgogICAgICAgICAgICAgaWYgKGlzQ2hhckV2 ZW50KSB7CiAgICAgICAgICAgICAgICAgLy8gTWFwIFxyIGZyb20gSFcga2V5Ym9hcmQgdG8gXG4g dG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mIHRoZSBzb2Z0IGtleWJvYXJkLgogICAgICAgICAgICAg ICAgIFtbd2ViVmlldyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6QCJc biIgd2l0aEZsYWdzOjBdOwo=