176158 2017-08-31 05:20:46 -0700 [GTK] Several InputMethodFilter tests are failing and crashing 2017-09-27 12:53:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply clopez lforschler webkit-bug-importer oldest_to_newest 1343899 0 cgarcia 2017-08-31 05:20:46 -0700 **FAIL** WebKit2.InputMethodFilterComposeKey /home/slave/webkitgtk/gtk-linux-64-release/build/Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp:161 Value of: events.size() Actual: 3 Expected: 5 **PASS** WebKit2.InputMethodFilterContextEventsWithoutKeyEvents **CRASH** WebKit2.InputMethodFilterContextFocusOutDuringOngoingComposition **CRASH** WebKit2.InputMethodFilterContextMouseClickDuringOngoingComposition This has happened for a long time, I'm not sure if this is caused by WebKit change or by a GTK+ version bump. 1343901 1 319458 cgarcia 2017-08-31 05:31:24 -0700 Created attachment 319458 Patch 1343917 2 319458 clopez 2017-08-31 06:53:43 -0700 Comment on attachment 319458 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319458&action=review > Tools/ChangeLog:8 > + I don't know when this started to happen, and whether it's a change in WebKit or GTK+, but now GtkIMContext I think this started to happen with the GTK+ upgrade on the JHBuild from 3.16 to 3.22 1343921 3 cgarcia 2017-08-31 07:10:32 -0700 Committed r221420: <http://trac.webkit.org/changeset/221420> 1353711 4 webkit-bug-importer 2017-09-27 12:53:18 -0700 <rdar://problem/34694210> 319458 2017-08-31 05:31:24 -0700 2017-08-31 06:53:43 -0700 Patch wk2-im-tests-failures.diff text/plain 9758 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZmQ4YTc4MzQwMGEuLmEzZDNkMzNhZjFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBTZXZlcmFsIElucHV0TWV0aG9kRmlsdGVyIHRlc3RzIGFy ZSBmYWlsaW5nIGFuZCBjcmFzaGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc2MTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6SW5wdXRNZXRob2RGaWx0ZXI6OmNvbmZpcm1DdXJyZW50Q29tcG9zaXRp b24pOiBSZXR1cm4gZWFybHkgaW4gdGVzdGluZyBtb2RlIGJlY2F1c2UgdGhlIHBhZ2UgaXMgbm90 IGF2YWlsYWJsZS4KKyAgICAgICAgKFdlYktpdDo6SW5wdXRNZXRob2RGaWx0ZXI6OmxvZ0hhbmRs ZUtleWJvYXJkRXZlbnRXaXRoQ29tcG9zaXRpb25SZXN1bHRzRm9yVGVzdGluZyk6IFVzZSBoZXhh ZGVjaW1hbCBudW1iZXJzIGZvcgorICAgICAgICBsb2dnaW5nIGtleSBjb2Rlcy4KKwogMjAxNy0w OC0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bV2F5bGFuZF0gQ3Jhc2ggd2hlbiBnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zvcl9r ZXl2YWwgcmV0dXJucyBUUlVFIGJ1dCBuX2tleXM9MApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAKaW5kZXggNmNlYjBjMTg5NDMuLjI0ZWUx ZTliOTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvSW5wdXRNZXRo b2RGaWx0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9JbnB1dE1ldGhv ZEZpbHRlci5jcHAKQEAgLTMxMiw2ICszMTIsMTQgQEAgdm9pZCBJbnB1dE1ldGhvZEZpbHRlcjo6 Y29uZmlybUN1cnJlbnRDb21wb3NpdGlvbigpCiB7CiAgICAgaWYgKCFtX2NvbXBvc2luZ1RleHRD dXJyZW50bHkpCiAgICAgICAgIHJldHVybjsKKworI2lmIEVOQUJMRShBUElfVEVTVFMpCisgICAg aWYgKG1fdGVzdGluZ01vZGUpIHsKKyAgICAgICAgbV9jb21wb3NpbmdUZXh0Q3VycmVudGx5ID0g ZmFsc2U7CisgICAgICAgIHJldHVybjsKKyAgICB9CisjZW5kaWYKKwogICAgIG1fcGFnZS0+Y29u ZmlybUNvbXBvc2l0aW9uKFN0cmluZygpLCAtMSwgMCk7CiAgICAgbV9jb21wb3NpbmdUZXh0Q3Vy cmVudGx5ID0gZmFsc2U7CiB9CkBAIC00MzEsNyArNDM5LDcgQEAgdm9pZCBJbnB1dE1ldGhvZEZp bHRlcjo6bG9nSGFuZGxlS2V5Ym9hcmRFdmVudFdpdGhDb21wb3NpdGlvblJlc3VsdHNGb3JUZXN0 aW5nKEcKIHsKICAgICBjb25zdCBjaGFyKiBldmVudFR5cGUgPSBldmVudC0+dHlwZSA9PSBHREtf S0VZX1JFTEVBU0UgPyAicmVsZWFzZSIgOiAicHJlc3MiOwogICAgIGNvbnN0IGNoYXIqIGZha2Vk U3RyaW5nID0gZmFrZWQgPT0gRXZlbnRGYWtlZCA/ICIgKGZha2VkKSIgOiAiIjsKLSAgICBtX2V2 ZW50cy5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoInNlbmRLZXlFdmVudFdpdGhDb21wb3NpdGlvblJl c3VsdHMgdHlwZT0lcyBrZXljb2RlPSV1JXMiLCBldmVudFR5cGUsIGV2ZW50LT5rZXl2YWwsIGZh a2VkU3RyaW5nKSk7CisgICAgbV9ldmVudHMuYXBwZW5kKFN0cmluZzo6Zm9ybWF0KCJzZW5kS2V5 RXZlbnRXaXRoQ29tcG9zaXRpb25SZXN1bHRzIHR5cGU9JXMga2V5Y29kZT0leCVzIiwgZXZlbnRU eXBlLCBldmVudC0+a2V5dmFsLCBmYWtlZFN0cmluZykpOwogCiAgICAgaWYgKHJlc3VsdHNUb1Nl bmQgJiBDb21wb3NpdGlvbiAmJiAhbV9jb25maXJtZWRDb21wb3NpdGlvbi5pc051bGwoKSkKICAg ICAgICAgbG9nQ29uZmlybUNvbXBvc2l0aW9uRm9yVGVzdGluZygpOwpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDBkNTU4MTQ5NzI3Li4xYTJhYTEx OWZiZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI0IEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBTZXZlcmFsIElucHV0TWV0aG9kRmlsdGVy IHRlc3RzIGFyZSBmYWlsaW5nIGFuZCBjcmFzaGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSSBkb24ndCBrbm93IHdoZW4gdGhpcyBzdGFydGVkIHRv IGhhcHBlbiwgYW5kIHdoZXRoZXIgaXQncyBhIGNoYW5nZSBpbiBXZWJLaXQgb3IgR1RLKywgYnV0 IG5vdyBHdGtJTUNvbnRleHQKKyAgICAgICAgZG9lc24ndCBlbWl0IHRoZSBwcmVlZGl0IHNpZ25h bHMgd2hlbiB1c2luZyB0aGUgY29tcG9zZSBrZXkgKEdES19LRVlfTXVsdGlfa2V5KS4gVGhlIGNv bXBvc2l0aW9uIHJlc3VsdHMgYXJlCisgICAgICAgIGNvbW1pdHRlZCBkaXJlY3RseSB3aGVuIHRo ZXkgYXJlIHJlYWR5LiBUaGUgdGVzdCBJbnB1dE1ldGhvZEZpbHRlckNvbXBvc2VLZXkgd2FzIGZh aWxpbmcgYmVjYXVzZSBpdCBleHBlY3RlZAorICAgICAgICBwcmVlZGl0IGV2ZW50cyB0aGF0IG5v IGxvbmdlciBoYXBwZW4uIFRlc3RzIElucHV0TWV0aG9kRmlsdGVyQ29udGV4dEZvY3VzT3V0RHVy aW5nT25nb2luZ0NvbXBvc2l0aW9uIGFuZAorICAgICAgICBJbnB1dE1ldGhvZEZpbHRlckNvbnRl eHRNb3VzZUNsaWNrRHVyaW5nT25nb2luZ0NvbXBvc2l0aW9uIHdlcmUgY3Jhc2hpbmcgYmVjYXVz ZSBJbnB1dE1ldGhvZEZpbHRlcjo6Y29uZmlybUN1cnJlbnRDb21wb3NpdGlvbigpCisgICAgICAg IGFjY2Vzc2VkIHRoZSBXZWJQYWdlUHJveHkgdW5jb25kaXRpb25hbGx5LCB0aGF0IGlzIG5vdCBh dmFpbGFibGUgaW4gdGVzdGluZyBtb2RlLiBJIHdvbmRlciBob3cgdGhpcyBldmVyCisgICAgICAg IHdvcmtlZC4gT3RoZXIgdGVzdHMgcmVzdWx0cyBoYXZlIGFsc28gYmVlbiB1cGRhdGVkIGJlY2F1 c2UgbG9nSGFuZGxlS2V5Ym9hcmRFdmVudFdpdGhDb21wb3NpdGlvblJlc3VsdHNGb3JUZXN0aW5n KCkKKyAgICAgICAgbm93IHVzZXMgaGV4YWRlY2ltYWwgbnVtYmVycyBmb3IgdGhlIGtleSBjb2Rl cywgZm9yIGNvbnNpc3RlbmN5IHdpdGggYWxsIG90aGVyIGV2ZW50IGxvZ3MuCisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwOgor ICAgICAgICAoVGVzdFdlYktpdEFQSTo6VGVzdElucHV0TWV0aG9kRmlsdGVyOjpUZXN0SW5wdXRN ZXRob2RGaWx0ZXIpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgIChU ZXN0V2ViS2l0QVBJOjp2ZXJpZnlDYW5jZWxlZENvbXBvc2l0aW9uKTogRGVsZXRlZC4KKwogMjAx Ny0wOC0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bV2F5bGFuZF0gQ3Jhc2ggd2hlbiBnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zv cl9rZXl2YWwgcmV0dXJucyBUUlVFIGJ1dCBuX2tleXM9MApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAKaW5k ZXggMmRlNzkwZmM2MDMuLjk3OWRmMDFmZTRjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAKQEAgLTEy OCwxOSArMTI4LDE5IEBAIFRFU1QoV2ViS2l0MiwgSW5wdXRNZXRob2RGaWx0ZXJVbmljb2RlU2Vx dWVuY2UpCiAgICAgQVNTRVJUX0VRKDIxLCBldmVudHMuc2l6ZSgpKTsKICAgICBBU1NFUlRfRVEo U3RyaW5nKCJzZW5kU2ltcGxlS2V5RXZlbnQgdHlwZT1wcmVzcyBrZXljb2RlPWZmZTMiKSwgZXZl bnRzWzBdKTsKICAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZW5kU2ltcGxlS2V5RXZlbnQgdHlwZT1w cmVzcyBrZXljb2RlPWZmZTEiKSwgZXZlbnRzWzFdKTsKLSAgICBBU1NFUlRfRVEoU3RyaW5nKCJz ZW5kS2V5RXZlbnRXaXRoQ29tcG9zaXRpb25SZXN1bHRzIHR5cGU9cHJlc3Mga2V5Y29kZT04NSIp LCBldmVudHNbMl0pOworICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRLZXlFdmVudFdpdGhDb21w b3NpdGlvblJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2RlPTU1IiksIGV2ZW50c1syXSk7CiAgICAg QVNTRVJUX0VRKFN0cmluZygic2V0UHJlZWRpdCB0ZXh0PSd1JyBjdXJzb3JPZmZzZXQ9MSIpLCBl dmVudHNbM10pOwogICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRTaW1wbGVLZXlFdmVudCB0eXBl PXJlbGVhc2Uga2V5Y29kZT01NSIpLCBldmVudHNbNF0pOwotICAgIEFTU0VSVF9FUShTdHJpbmco InNlbmRLZXlFdmVudFdpdGhDb21wb3NpdGlvblJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2RlPTQ4 IiksIGV2ZW50c1s1XSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2ZW50V2l0aENv bXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9MzAiKSwgZXZlbnRzWzVdKTsKICAg ICBBU1NFUlRfRVEoU3RyaW5nKCJzZXRQcmVlZGl0IHRleHQ9J3UwJyBjdXJzb3JPZmZzZXQ9MiIp LCBldmVudHNbNl0pOwogICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRTaW1wbGVLZXlFdmVudCB0 eXBlPXJlbGVhc2Uga2V5Y29kZT0zMCIpLCBldmVudHNbN10pOwotICAgIEFTU0VSVF9FUShTdHJp bmcoInNlbmRLZXlFdmVudFdpdGhDb21wb3NpdGlvblJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2Rl PTQ4IiksIGV2ZW50c1s4XSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2ZW50V2l0 aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9MzAiKSwgZXZlbnRzWzhdKTsK ICAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZXRQcmVlZGl0IHRleHQ9J3UwMCcgY3Vyc29yT2Zmc2V0 PTMiKSwgZXZlbnRzWzldKTsKICAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZW5kU2ltcGxlS2V5RXZl bnQgdHlwZT1yZWxlYXNlIGtleWNvZGU9MzAiKSwgZXZlbnRzWzEwXSk7Ci0gICAgQVNTRVJUX0VR KFN0cmluZygic2VuZEtleUV2ZW50V2l0aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtl eWNvZGU9NzAiKSwgZXZlbnRzWzExXSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2 ZW50V2l0aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9NDYiKSwgZXZlbnRz WzExXSk7CiAgICAgQVNTRVJUX0VRKFN0cmluZygic2V0UHJlZWRpdCB0ZXh0PSd1MDBGJyBjdXJz b3JPZmZzZXQ9NCIpLCBldmVudHNbMTJdKTsKICAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZW5kU2lt cGxlS2V5RXZlbnQgdHlwZT1yZWxlYXNlIGtleWNvZGU9NDYiKSwgZXZlbnRzWzEzXSk7Ci0gICAg QVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2ZW50V2l0aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBl PXByZXNzIGtleWNvZGU9NTIiKSwgZXZlbnRzWzE0XSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygi c2VuZEtleUV2ZW50V2l0aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9MzQi KSwgZXZlbnRzWzE0XSk7CiAgICAgQVNTRVJUX0VRKFN0cmluZygic2V0UHJlZWRpdCB0ZXh0PSd1 MDBGNCcgY3Vyc29yT2Zmc2V0PTUiKSwgZXZlbnRzWzE1XSk7CiAgICAgQVNTRVJUX0VRKFN0cmlu Zygic2VuZFNpbXBsZUtleUV2ZW50IHR5cGU9cmVsZWFzZSBrZXljb2RlPTM0IiksIGV2ZW50c1sx Nl0pOwogICAgIEFTU0VSVF9FUShTdHJpbmcoImNvbmZpcm1Db21wb3NpdGlvbiAnw7QnIiksIGV2 ZW50c1sxN10pOwpAQCAtMTU4LDEyICsxNTgsMTAgQEAgVEVTVChXZWJLaXQyLCBJbnB1dE1ldGhv ZEZpbHRlckNvbXBvc2VLZXkpCiAgICAgaW5wdXRNZXRob2RGaWx0ZXIuc2VuZFByZXNzQW5kUmVs ZWFzZUtleUV2ZW50UGFpclRvRmlsdGVyKEdES19LRVlfbyk7CiAKICAgICBjb25zdCBWZWN0b3I8 U3RyaW5nPiYgZXZlbnRzID0gaW5wdXRNZXRob2RGaWx0ZXIuZXZlbnRzKCk7Ci0gICAgQVNTRVJU X0VRKDUsIGV2ZW50cy5zaXplKCkpOwotICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRLZXlFdmVu dFdpdGhDb21wb3NpdGlvblJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2RlPTM5IiksIGV2ZW50c1sw XSk7Ci0gICAgQVNTRVJUX0VRKFN0cmluZygic2V0UHJlZWRpdCB0ZXh0PScnIGN1cnNvck9mZnNl dD0wIiksIGV2ZW50c1sxXSk7Ci0gICAgQVNTRVJUX0VRKFN0cmluZygic2VuZFNpbXBsZUtleUV2 ZW50IHR5cGU9cmVsZWFzZSBrZXljb2RlPTI3IiksIGV2ZW50c1syXSk7Ci0gICAgQVNTRVJUX0VR KFN0cmluZygic2VuZFNpbXBsZUtleUV2ZW50IHR5cGU9cHJlc3Mga2V5Y29kZT02ZiB0ZXh0PSfD syciKSwgZXZlbnRzWzNdKTsKLSAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZW5kU2ltcGxlS2V5RXZl bnQgdHlwZT1yZWxlYXNlIGtleWNvZGU9NmYiKSwgZXZlbnRzWzRdKTsKKyAgICBBU1NFUlRfRVEo MywgZXZlbnRzLnNpemUoKSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2ZW50V2l0 aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9NmYiKSwgZXZlbnRzWzBdKTsK KyAgICBBU1NFUlRfRVEoU3RyaW5nKCJjb25maXJtQ29tcG9zaXRpb24gJ8OzJyIpLCBldmVudHNb MV0pOworICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRTaW1wbGVLZXlFdmVudCB0eXBlPXJlbGVh c2Uga2V5Y29kZT02ZiIpLCBldmVudHNbMl0pOwogfQogCiB0eXBlZGVmIHZvaWQgKCpHZXRQcmVl ZGl0U3RyaW5nQ2FsbGJhY2spIChHdGtJTUNvbnRleHQqLCBnY2hhcioqLCBQYW5nb0F0dHJMaXN0 KiosIGludCopOwpAQCAtMTkxLDEwICsxODksMTAgQEAgVEVTVChXZWJLaXQyLCBJbnB1dE1ldGhv ZEZpbHRlckNvbnRleHRFdmVudHNXaXRob3V0S2V5RXZlbnRzKQogCiAgICAgY29uc3QgVmVjdG9y PFN0cmluZz4mIGV2ZW50cyA9IGlucHV0TWV0aG9kRmlsdGVyLmV2ZW50cygpOwogICAgIEFTU0VS VF9FUSg2LCBldmVudHMuc2l6ZSgpKTsKLSAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZW5kS2V5RXZl bnRXaXRoQ29tcG9zaXRpb25SZXN1bHRzIHR5cGU9cHJlc3Mga2V5Y29kZT0xNjc3NzIxNSAoZmFr ZWQpIiksIGV2ZW50c1swXSk7CisgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZEtleUV2ZW50V2l0 aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNvZGU9ZmZmZmZmIChmYWtlZCkiKSwg ZXZlbnRzWzBdKTsKICAgICBBU1NFUlRfRVEoU3RyaW5nKCJzZXRQcmVlZGl0IHRleHQ9J3ByZWVk aXQgb2YgZG9vbSwgYnJpbmdlciBvZiBjaGVlc2UnIGN1cnNvck9mZnNldD0zIiksIGV2ZW50c1sx XSk7CiAgICAgQVNTRVJUX0VRKFN0cmluZygic2VuZFNpbXBsZUtleUV2ZW50IHR5cGU9cmVsZWFz ZSBrZXljb2RlPWZmZmZmZiAoZmFrZWQpIiksIGV2ZW50c1syXSk7Ci0gICAgQVNTRVJUX0VRKFN0 cmluZygic2VuZEtleUV2ZW50V2l0aENvbXBvc2l0aW9uUmVzdWx0cyB0eXBlPXByZXNzIGtleWNv ZGU9MTY3NzcyMTUgKGZha2VkKSIpLCBldmVudHNbM10pOworICAgIEFTU0VSVF9FUShTdHJpbmco InNlbmRLZXlFdmVudFdpdGhDb21wb3NpdGlvblJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2RlPWZm ZmZmZiAoZmFrZWQpIiksIGV2ZW50c1szXSk7CiAgICAgQVNTRVJUX0VRKFN0cmluZygiY29uZmly bUNvbXBvc2l0aW9uICdjb21taXQgdGV4dCciKSwgZXZlbnRzWzRdKTsKICAgICBBU1NFUlRfRVEo U3RyaW5nKCJzZW5kU2ltcGxlS2V5RXZlbnQgdHlwZT1yZWxlYXNlIGtleWNvZGU9ZmZmZmZmIChm YWtlZCkiKSwgZXZlbnRzWzVdKTsKIH0KQEAgLTIwNiwxNSArMjA0LDYgQEAgc3RhdGljIHZvaWQg dGVtcG9yYXJ5UmVzZXRPdmVycmlkZShHdGtJTUNvbnRleHQqKQogICAgIGdTYXdDb250ZXh0UmVz ZXQgPSB0cnVlOwogfQogCi1zdGF0aWMgdm9pZCB2ZXJpZnlDYW5jZWxlZENvbXBvc2l0aW9uKGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBldmVudHMpCi17Ci0gICAgQVNTRVJUX0VRKDMsIGV2ZW50cy5z aXplKCkpOwotICAgIEFTU0VSVF9FUShTdHJpbmcoInNlbmRLZXlFdmVudFdpdGhDb21wb3NpdGlv blJlc3VsdHMgdHlwZT1wcmVzcyBrZXljb2RlPTM5IiksIGV2ZW50c1swXSk7Ci0gICAgQVNTRVJU X0VRKFN0cmluZygic2V0UHJlZWRpdCB0ZXh0PScnIGN1cnNvck9mZnNldD0wIiksIGV2ZW50c1sx XSk7Ci0gICAgQVNTRVJUX0VRKFN0cmluZygic2VuZFNpbXBsZUtleUV2ZW50IHR5cGU9cmVsZWFz ZSBrZXljb2RlPTI3IiksIGV2ZW50c1syXSk7Ci0gICAgQVNTRVJUKGdTYXdDb250ZXh0UmVzZXQp OwotfQotCiBURVNUKFdlYktpdDIsIElucHV0TWV0aG9kRmlsdGVyQ29udGV4dEZvY3VzT3V0RHVy aW5nT25nb2luZ0NvbXBvc2l0aW9uKQogewogICAgIFRlc3RJbnB1dE1ldGhvZEZpbHRlciBpbnB1 dE1ldGhvZEZpbHRlcjsKQEAgLTIyOSw4ICsyMTgsNyBAQCBURVNUKFdlYktpdDIsIElucHV0TWV0 aG9kRmlsdGVyQ29udGV4dEZvY3VzT3V0RHVyaW5nT25nb2luZ0NvbXBvc2l0aW9uKQogICAgIGlu cHV0TWV0aG9kRmlsdGVyLnNlbmRQcmVzc0FuZFJlbGVhc2VLZXlFdmVudFBhaXJUb0ZpbHRlcihH REtfS0VZX011bHRpX2tleSk7CiAgICAgaW5wdXRNZXRob2RGaWx0ZXIuc2VuZFByZXNzQW5kUmVs ZWFzZUtleUV2ZW50UGFpclRvRmlsdGVyKEdES19LRVlfYXBvc3Ryb3BoZSk7CiAgICAgaW5wdXRN ZXRob2RGaWx0ZXIubm90aWZ5Rm9jdXNlZE91dCgpOwotCi0gICAgdmVyaWZ5Q2FuY2VsZWRDb21w b3NpdGlvbihpbnB1dE1ldGhvZEZpbHRlci5ldmVudHMoKSk7CisgICAgQVNTRVJUX1RSVUUoZ1Nh d0NvbnRleHRSZXNldCk7CiAKICAgICBjb250ZXh0Q2xhc3MtPnJlc2V0ID0gcHJldmlvdXNDYWxs YmFjazsKIH0KQEAgLTI0OSw4ICsyMzcsNyBAQCBURVNUKFdlYktpdDIsIElucHV0TWV0aG9kRmls dGVyQ29udGV4dE1vdXNlQ2xpY2tEdXJpbmdPbmdvaW5nQ29tcG9zaXRpb24pCiAgICAgaW5wdXRN ZXRob2RGaWx0ZXIuc2VuZFByZXNzQW5kUmVsZWFzZUtleUV2ZW50UGFpclRvRmlsdGVyKEdES19L RVlfTXVsdGlfa2V5KTsKICAgICBpbnB1dE1ldGhvZEZpbHRlci5zZW5kUHJlc3NBbmRSZWxlYXNl S2V5RXZlbnRQYWlyVG9GaWx0ZXIoR0RLX0tFWV9hcG9zdHJvcGhlKTsKICAgICBpbnB1dE1ldGhv ZEZpbHRlci5ub3RpZnlNb3VzZUJ1dHRvblByZXNzKCk7Ci0KLSAgICB2ZXJpZnlDYW5jZWxlZENv bXBvc2l0aW9uKGlucHV0TWV0aG9kRmlsdGVyLmV2ZW50cygpKTsKKyAgICBBU1NFUlRfVFJVRShn U2F3Q29udGV4dFJlc2V0KTsKIAogICAgIGNvbnRleHRDbGFzcy0+cmVzZXQgPSBwcmV2aW91c0Nh bGxiYWNrOwogfQo=