50425 2010-12-02 17:00:50 -0800 Add the ability to run script on 'new' and 'paint' in the test plugin 2010-12-02 21:15:40 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser abarth andersca eric simon.fraser webkit.review.bot yutak oldest_to_newest 316529 0 simon.fraser 2010-12-02 17:00:50 -0800 We need to emulate plugins doing bad things from 'new' and painting. 316539 1 75439 simon.fraser 2010-12-02 17:15:11 -0800 Created attachment 75439 Patch 316544 2 webkit.review.bot 2010-12-02 17:16:44 -0800 Attachment 75439 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plugins/testplugin-onnew-onpaint-expected.txt', u'LayoutTests/plugins/testplugin-onnew-onpaint.html', u'WebKitTools/ChangeLog', u'WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp', u'WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h', u'WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp']" exit_code: 1 WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp:205: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp:207: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 316566 3 simon.fraser 2010-12-02 17:42:39 -0800 http://trac.webkit.org/changeset/73226 316598 4 webkit.review.bot 2010-12-02 18:40:13 -0800 http://trac.webkit.org/changeset/73226 might have broken Qt Linux Release The following tests are not passing: plugins/testplugin-onnew-onpaint.html 316641 5 yutak 2010-12-02 20:29:13 -0800 On Chromium Linux, there are a lot of plugin test failures which seemed to come from this patch. These tests produce new console messages such as: >CONSOLE MESSAGE: line 122: PLUGIN: getFocusEvent >CONSOLE MESSAGE: line 122: PLUGIN: loseFocusEvent or >CONSOLE MESSAGE: line 0: PLUGIN: updateEvt I guess the following hunk caused the regression. Why did you drop these two lines? @@ -620,8 +657,6 @@ static int16_t handleEventX11(NPP instance, PluginObject* obj, XEvent* event) int16_t NPP_HandleEvent(NPP instance, void *event) { PluginObject* obj = static_cast<PluginObject*>(instance->pdata); - if (!obj->eventLogging) - return 0; #ifdef XP_MACOSX #ifndef NP_NO_CARBON 316645 6 simon.fraser 2010-12-02 20:43:52 -0800 I'm going to make this a mac-only test. Please stand by. 316646 7 simon.fraser 2010-12-02 20:45:11 -0800 (In reply to comment #5) > I guess the following hunk caused the regression. Why did you drop these two lines? Because the onPaintEvent trigger needs to be called when handing the drawRect event. I guess I need to fix the other ports. 316647 8 simon.fraser 2010-12-02 20:50:08 -0800 http://trac.webkit.org/changeset/73235 http://trac.webkit.org/changeset/73236 316660 9 yutak 2010-12-02 21:15:40 -0800 (In reply to comment #8) > http://trac.webkit.org/changeset/73235 > http://trac.webkit.org/changeset/73236 It seems Chromium Linux is fixed. Thanks! 75439 2010-12-02 17:15:11 -0800 2010-12-02 17:18:11 -0800 Patch bug-50425-20101202171510.patch text/plain 13943 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlZDQ0Yzc1ZmZkOGU2MGI1MjY5ODUwNzJhYTdlNWY3YjE2OGY5NTg4Li5kN2VjNWI5 ZDFjNTRiZDdmZGU1NDRiMzMyYzkxMjgxZDVkYjZiODMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMDIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBhYmls aXR5IHRvIHJ1biBzY3JpcHQgb24gJ25ldycgYW5kICdwYWludCcgaW4gdGhlIHRlc3QgcGx1Z2lu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDQyNQor ICAgICAgICAKKyAgICAgICAgVGVzdGNhc2UgdG8gdGVzdCB0aGF0IHRoZSBKUyBjYWxsYmFja3Mg YXJlIGZpcmVkLgorCisgICAgICAgICogcGx1Z2lucy90ZXN0cGx1Z2luLW9ubmV3LW9ucGFpbnQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbHVnaW5zL3Rlc3RwbHVnaW4tb25uZXct b25wYWludC5odG1sOiBBZGRlZC4KKwogMjAxMC0xMi0wMiAgRXJpayBBcnZpZHNzb24gIDxhcnZA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGx1Z2lucy90ZXN0cGx1Z2luLW9ubmV3LW9ucGFpbnQtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGx1Z2lucy90ZXN0cGx1Z2luLW9ubmV3LW9ucGFpbnQtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI2ODhmYjI4M2E3YTBjMDg2Y2IwNTIyODgxMDQ2YTZhMjZh NjBkYjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL3Rlc3RwbHVnaW4t b25uZXctb25wYWludC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKK05ldyBjYWxsZWQK K1BhaW50IGV2ZW50IHdhcyBoYW5kbGVkCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsdWdp bnMvdGVzdHBsdWdpbi1vbm5ldy1vbnBhaW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL3Rl c3RwbHVnaW4tb25uZXctb25wYWludC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM2ZjM3Y2Q3ZTQxY2IzZjIx ZmE4MjFjNzAxZDNhYWZlNjlmZDkwMmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9w bHVnaW5zL3Rlc3RwbHVnaW4tb25uZXctb25wYWludC5odG1sCkBAIC0wLDAgKzEsMzUgQEAKKzwh RE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9q YXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0 KCk7CisKKyAgICAgICAgZnVuY3Rpb24gbG9nKG0pCisgICAgICAgIHsKKyAgICAgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdsb2cnKS5pbm5lckhUTUwgKz0gbSArICc8YnI+JzsKKyAg ICAgICAgfQorICAgICAgICAKKyAgICAgICAgZnVuY3Rpb24gbmV3V2FzQ2FsbGVkKCkKKyAgICAg ICAgeworICAgICAgICAgICAgbG9nKCJOZXcgY2FsbGVkIik7CisgICAgICAgIH0KKworICAgICAg ICB2YXIgZGlkUGFpbnQgPSBmYWxzZTsKKyAgICAgICAgZnVuY3Rpb24gZ290UGFpbnRFdmVudCgp CisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIE9ubHkgbG9nIG9uY2UgdG8gYXZvaWQgcGFpbnQg ZGlmZmVyZW5jZXMgYmV0d2VlZW4gcGxhdGZvcm1zLgorICAgICAgICAgICAgaWYgKCFkaWRQYWlu dCkgeworICAgICAgICAgICAgICAgIGxvZygiUGFpbnQgZXZlbnQgd2FzIGhhbmRsZWQiKTsKKyAg ICAgICAgICAgICAgICBkaWRQYWludCA9IHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0K KyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxlbWJlZCB0eXBlPSJhcHBsaWNh dGlvbi94LXdlYmtpdC10ZXN0LW5ldHNjYXBlIiBvbm5ldz0ibmV3V2FzQ2FsbGVkKCkiIG9ucGFp bnRldmVudD0iZ290UGFpbnRFdmVudCgpIj48L2VtYmVkPgorICAgIDxkaXYgaWQ9ImxvZyI+Cisg ICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggNTI1NTk0YTM5MmI5NzJlMThkZTJi YjJhOTJjN2IwYTk2NTBjMmRiNy4uYjIxMzE5MzU3NDdiYmYyNmY3ZDllZWU0MDNlYTJjOWMwZDMx YWI5YiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTEyLTAyICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBydW4gc2NyaXB0IG9uICduZXcnIGFu ZCAncGFpbnQnIGluIHRoZSB0ZXN0IHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0MjUKKyAgICAgICAgCisgICAgICAgIEFkZCAib25uZXci IGFuZCAib25wYWludGV2ZW50IiBhdHRyaWJ1dGVzIHRvIHRoZSB0ZXN0IHBsdWdpbiwKKyAgICAg ICAgc28gdGhhdCB0ZXN0cyBjYW4gcnVuIEpTIGF0IHRoZXNlIHRpbWVzLgorCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1BsdWdpbk9iamVjdC5jcHA6CisgICAg ICAgIChwbHVnaW5BbGxvY2F0ZSk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNj YXBlUGx1Z0luL1BsdWdpbk9iamVjdC5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RO ZXRzY2FwZVBsdWdJbi9tYWluLmNwcDoKKyAgICAgICAgKE5QUF9OZXcpOgorICAgICAgICAoTlBQ X0Rlc3Ryb3kpOgorICAgICAgICAoaGFuZGxlRXZlbnRDYXJib24pOgorICAgICAgICAoaGFuZGxl RXZlbnRDb2NvYSk6CisgICAgICAgIChOUFBfSGFuZGxlRXZlbnQpOgorCiAyMDEwLTEyLTAxICBU b255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2ph biBWYWZhaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRz Y2FwZVBsdWdJbi9QbHVnaW5PYmplY3QuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv VGVzdE5ldHNjYXBlUGx1Z0luL1BsdWdpbk9iamVjdC5jcHAKaW5kZXggMTk4ZDNjNWNkOGQyM2U0 ODhkYTEzNmZhMzJmMjkzMDJlNzgyZTkzNS4uNDVlNWRkYjk0MDJhM2ZkNTI1OThjOTE1YjNlYjBk MDg0Y2ViZjZkNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5l dHNjYXBlUGx1Z0luL1BsdWdpbk9iamVjdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1BsdWdpbk9iamVjdC5jcHAKQEAgLTExMzEsNiArMTEz MSw3IEBAIHN0YXRpYyBOUE9iamVjdCAqcGx1Z2luQWxsb2NhdGUoTlBQIG5wcCwgTlBDbGFzcyAq dGhlQ2xhc3MpCiAgICAgbmV3SW5zdGFuY2UtPm9uRGVzdHJveSA9IDA7CiAgICAgbmV3SW5zdGFu Y2UtPm9uVVJMTm90aWZ5ID0gMDsKICAgICBuZXdJbnN0YW5jZS0+b25TZXRXaW5kb3cgPSAwOwor ICAgIG5ld0luc3RhbmNlLT5vblBhaW50RXZlbnQgPSAwOwogICAgIG5ld0luc3RhbmNlLT5sb2dE ZXN0cm95ID0gRkFMU0U7CiAgICAgbmV3SW5zdGFuY2UtPmxvZ1NldFdpbmRvdyA9IEZBTFNFOwog ICAgIG5ld0luc3RhbmNlLT5yZXR1cm5FcnJvckZyb21OZXdTdHJlYW0gPSBGQUxTRTsKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9QbHVn aW5PYmplY3QuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJ bi9QbHVnaW5PYmplY3QuaAppbmRleCBkZWY4YWQ4NjI1OTM5Zjg2NWIwMWU4YWMwY2YwMjRkMzIz MzA1OGQ0Li5jMjY0ZTQ5ODg3ZDhlYzhiMzdhZmZkNTA2YzFiZWI5ZTc2ZDk0ZTdiIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vUGx1Z2lu T2JqZWN0LmgKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1 Z0luL1BsdWdpbk9iamVjdC5oCkBAIC02Nyw2ICs2Nyw3IEBAIHR5cGVkZWYgc3RydWN0IHsKICAg ICBjaGFyKiBvbkRlc3Ryb3k7CiAgICAgY2hhciogb25VUkxOb3RpZnk7CiAgICAgY2hhciogb25T ZXRXaW5kb3c7CisgICAgY2hhciogb25QYWludEV2ZW50OwogICAgIGNoYXIqIGZpcnN0VXJsOwog ICAgIGNoYXIqIGZpcnN0SGVhZGVyczsKICAgICBjaGFyKiBsYXN0VXJsOwpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL21haW4uY3BwIGIv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL21haW4uY3BwCmlu ZGV4IDI2NmI0YjU1MjA5Njg4M2QxNDk2ODJlM2YwMjNhZjBjMTY2OThmZmYuLmY3YTQyMGIxY2Fi OGM4NTJkZTJjMDljNDc3ODU5MDE5M2Y5N2MyODkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9tYWluLmNwcAorKysgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vbWFpbi5jcHAKQEAgLTE4Niw2ICsx ODYsNyBAQCBOUEVycm9yIE5QUF9OZXcoTlBNSU1FVHlwZSBwbHVnaW5UeXBlLCBOUFAgaW5zdGFu Y2UsIHVpbnQxNl90IG1vZGUsIGludDE2X3QgYXJnYwogI2VuZGlmIC8vIFhQX01BQ09TWAogCiAg ICAgc3RyaW5nIHRlc3RJZGVudGlmaWVyOworICAgIGNvbnN0IGNoYXIqIG9uTmV3U2NyaXB0ID0g MDsKICAgICAKICAgICBmb3IgKGludCBpID0gMDsgaSA8IGFyZ2M7IGkrKykgewogICAgICAgICBp ZiAoc3RyY2FzZWNtcChhcmduW2ldLCAidGVzdCIpID09IDApCkBAIC0yMDEsNiArMjAyLDEwIEBA IE5QRXJyb3IgTlBQX05ldyhOUE1JTUVUeXBlIHBsdWdpblR5cGUsIE5QUCBpbnN0YW5jZSwgdWlu dDE2X3QgbW9kZSwgaW50MTZfdCBhcmdjCiAgICAgICAgICAgICBvYmotPnJldHVybkVycm9yRnJv bU5ld1N0cmVhbSA9IFRSVUU7CiAgICAgICAgIGVsc2UgaWYgKHN0cmNhc2VjbXAoYXJnbltpXSwg Im9uU2V0V2luZG93IikgPT0gMCAmJiAhb2JqLT5vblNldFdpbmRvdykKICAgICAgICAgICAgIG9i ai0+b25TZXRXaW5kb3cgPSBzdHJkdXAoYXJndltpXSk7CisgICAgICAgIGVsc2UgaWYgKHN0cmNh c2VjbXAoYXJnbltpXSwgIm9uTmV3IikgPT0gMCAmJiAhb25OZXdTY3JpcHQpCisgICAgICAgICAg ICBvbk5ld1NjcmlwdCA9IGFyZ3ZbaV07CisgICAgICAgIGVsc2UgaWYgKHN0cmNhc2VjbXAoYXJn bltpXSwgIm9uUGFpbnRFdmVudCIpID09IDAgJiYgIW9iai0+b25QYWludEV2ZW50KQorICAgICAg ICAgICAgb2JqLT5vblBhaW50RXZlbnQgPSBzdHJkdXAoYXJndltpXSk7CiAgICAgICAgIGVsc2Ug aWYgKHN0cmNhc2VjbXAoYXJnbltpXSwgImxvZ2ZpcnN0c2V0d2luZG93IikgPT0gMCkKICAgICAg ICAgICAgIG9iai0+bG9nU2V0V2luZG93ID0gVFJVRTsKICAgICAgICAgZWxzZSBpZiAoc3RyY2Fz ZWNtcChhcmduW2ldLCAidGVzdG5wcnVudGltZSIpID09IDApCkBAIC0yNzEsNiArMjc2LDkgQEAg TlBFcnJvciBOUFBfTmV3KE5QTUlNRVR5cGUgcGx1Z2luVHlwZSwgTlBQIGluc3RhbmNlLCB1aW50 MTZfdCBtb2RlLCBpbnQxNl90IGFyZ2MKICAgICBicm93c2VyLT5zZXR2YWx1ZShpbnN0YW5jZSwg TlBQVnBsdWdpbldpbmRvd0Jvb2wsIDApOwogI2VuZGlmCiAKKyAgICBpZiAob25OZXdTY3JpcHQp CisgICAgICAgIGV4ZWN1dGVTY3JpcHQob2JqLCBvbk5ld1NjcmlwdCk7CisKICAgICByZXR1cm4g b2JqLT5wbHVnaW5UZXN0LT5OUFBfTmV3KHBsdWdpblR5cGUsIG1vZGUsIGFyZ2MsIGFyZ24sIGFy Z3YsIHNhdmVkKTsKIH0KIApAQCAtMjk3LDYgKzMwNSw5IEBAIE5QRXJyb3IgTlBQX0Rlc3Ryb3ko TlBQIGluc3RhbmNlLCBOUFNhdmVkRGF0YSAqKnNhdmUpCiAKICAgICAgICAgaWYgKG9iai0+b25T ZXRXaW5kb3cpCiAgICAgICAgICAgICBmcmVlKG9iai0+b25TZXRXaW5kb3cpOworCisgICAgICAg IGlmIChvYmotPm9uUGFpbnRFdmVudCkKKyAgICAgICAgICAgIGZyZWUob2JqLT5vblBhaW50RXZl bnQpOwogICAgICAgICAKICAgICAgICAgaWYgKG9iai0+bG9nRGVzdHJveSkKICAgICAgICAgICAg IHBsdWdpbkxvZyhpbnN0YW5jZSwgIk5QUF9EZXN0cm95Iik7CkBAIC00MzgsMjIgKzQ0OSwyOCBA QCBzdGF0aWMgaW50MTZfdCBoYW5kbGVFdmVudENhcmJvbihOUFAgaW5zdGFuY2UsIFBsdWdpbk9i amVjdCogb2JqLCBFdmVudFJlY29yZCogZQogICAgICAgICAgICAgLy8gdGhlc2UgYXJlIGRlbGl2 ZXJlZCBub24tZGV0ZXJtaW5pc3RpY2FsbHksIGRvbid0IGxvZy4KICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIG1vdXNlRG93bjoKLSAgICAgICAgICAgIEdsb2JhbFRvTG9jYWwoJnB0 KTsKLSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgIm1vdXNlRG93biBhdCAoJWQsICVk KSIsIHB0LmgsIHB0LnYpOworICAgICAgICAgICAgaWYgKG9iai0+ZXZlbnRMb2dnaW5nKSB7Cisg ICAgICAgICAgICAgICAgR2xvYmFsVG9Mb2NhbCgmcHQpOworICAgICAgICAgICAgICAgIHBsdWdp bkxvZyhpbnN0YW5jZSwgIm1vdXNlRG93biBhdCAoJWQsICVkKSIsIHB0LmgsIHB0LnYpOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgaWYgKG9iai0+ZXZhbHVhdGVTY3JpcHRPbk1vdXNlRG93 bk9yS2V5RG93biAmJiBvYmotPm1vdXNlRG93bkZvckV2YWx1YXRlU2NyaXB0KQogICAgICAgICAg ICAgICAgIGV4ZWN1dGVTY3JpcHQob2JqLCBvYmotPmV2YWx1YXRlU2NyaXB0T25Nb3VzZURvd25P cktleURvd24pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgbW91c2VVcDoKLSAg ICAgICAgICAgIEdsb2JhbFRvTG9jYWwoJnB0KTsKLSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0 YW5jZSwgIm1vdXNlVXAgYXQgKCVkLCAlZCkiLCBwdC5oLCBwdC52KTsKKyAgICAgICAgICAgIGlm IChvYmotPmV2ZW50TG9nZ2luZykgeworICAgICAgICAgICAgICAgIEdsb2JhbFRvTG9jYWwoJnB0 KTsKKyAgICAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJtb3VzZVVwIGF0ICglZCwg JWQpIiwgcHQuaCwgcHQudik7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBrZXlEb3duOgotICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAia2V5 RG93biAnJWMnIiwgKGNoYXIpKGV2ZW50LT5tZXNzYWdlICYgMHhGRikpOworICAgICAgICAgICAg aWYgKG9iai0+ZXZlbnRMb2dnaW5nKQorICAgICAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5j ZSwgImtleURvd24gJyVjJyIsIChjaGFyKShldmVudC0+bWVzc2FnZSAmIDB4RkYpKTsKICAgICAg ICAgICAgIGlmIChvYmotPmV2YWx1YXRlU2NyaXB0T25Nb3VzZURvd25PcktleURvd24gJiYgIW9i ai0+bW91c2VEb3duRm9yRXZhbHVhdGVTY3JpcHQpCiAgICAgICAgICAgICAgICAgZXhlY3V0ZVNj cmlwdChvYmosIG9iai0+ZXZhbHVhdGVTY3JpcHRPbk1vdXNlRG93bk9yS2V5RG93bik7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBrZXlVcDoKLSAgICAgICAgICAgIHBsdWdpbkxv ZyhpbnN0YW5jZSwgImtleVVwICclYyciLCAoY2hhcikoZXZlbnQtPm1lc3NhZ2UgJiAweEZGKSk7 CisgICAgICAgICAgICBpZiAob2JqLT5ldmVudExvZ2dpbmcpCisgICAgICAgICAgICAgICAgcGx1 Z2luTG9nKGluc3RhbmNlLCAia2V5VXAgJyVjJyIsIChjaGFyKShldmVudC0+bWVzc2FnZSAmIDB4 RkYpKTsKICAgICAgICAgICAgIGlmIChvYmotPnRlc3RLZXlib2FyZEZvY3VzRm9yUGx1Z2lucykg ewogICAgICAgICAgICAgICAgIG9iai0+ZXZlbnRMb2dnaW5nID0gZmFsc2U7CiAgICAgICAgICAg ICAgICAgb2JqLT50ZXN0S2V5Ym9hcmRGb2N1c0ZvclBsdWdpbnMgPSBGQUxTRTsKQEAgLTQ2MSwx OCArNDc4LDI0IEBAIHN0YXRpYyBpbnQxNl90IGhhbmRsZUV2ZW50Q2FyYm9uKE5QUCBpbnN0YW5j ZSwgUGx1Z2luT2JqZWN0KiBvYmosIEV2ZW50UmVjb3JkKiBlCiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBhdXRvS2V5OgotICAgICAgICAgICAgcGx1Z2lu TG9nKGluc3RhbmNlLCAiYXV0b0tleSAnJWMnIiwgKGNoYXIpKGV2ZW50LT5tZXNzYWdlICYgMHhG RikpOworICAgICAgICAgICAgaWYgKG9iai0+ZXZlbnRMb2dnaW5nKQorICAgICAgICAgICAgICAg IHBsdWdpbkxvZyhpbnN0YW5jZSwgImF1dG9LZXkgJyVjJyIsIChjaGFyKShldmVudC0+bWVzc2Fn ZSAmIDB4RkYpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIHVwZGF0ZUV2dDoK LSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgInVwZGF0ZUV2dCIpOworICAgICAgICAg ICAgaWYgKG9iai0+ZXZlbnRMb2dnaW5nKQorICAgICAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0 YW5jZSwgInVwZGF0ZUV2dCIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgZGlz a0V2dDoKLSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgImRpc2tFdnQiKTsKKyAgICAg ICAgICAgIGlmIChvYmotPmV2ZW50TG9nZ2luZykKKyAgICAgICAgICAgICAgICBwbHVnaW5Mb2co aW5zdGFuY2UsICJkaXNrRXZ0Iik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBh Y3RpdmF0ZUV2dDoKLSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgImFjdGl2YXRlRXZ0 Iik7CisgICAgICAgICAgICBpZiAob2JqLT5ldmVudExvZ2dpbmcpCisgICAgICAgICAgICAgICAg cGx1Z2luTG9nKGluc3RhbmNlLCAiYWN0aXZhdGVFdnQiKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIG9zRXZ0OgorICAgICAgICAgICAgaWYgKCFvYmotPmV2ZW50TG9nZ2luZykK KyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIHByaW50ZigiUExVR0lOOiBvc0V2 dCAtICIpOwogICAgICAgICAgICAgc3dpdGNoICgoZXZlbnQtPm1lc3NhZ2UgJiAweEZGMDAwMDAw KSA+PiAyNCkgewogICAgICAgICAgICAgICAgIGNhc2Ugc3VzcGVuZFJlc3VtZU1lc3NhZ2U6CkBA IC00ODYsMjAgKzUwOSwyNSBAQCBzdGF0aWMgaW50MTZfdCBoYW5kbGVFdmVudENhcmJvbihOUFAg aW5zdGFuY2UsIFBsdWdpbk9iamVjdCogb2JqLCBFdmVudFJlY29yZCogZQogICAgICAgICAgICAg fQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Uga0hpZ2hMZXZlbEV2ZW50OgotICAg ICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAia0hpZ2hMZXZlbEV2ZW50Iik7CisgICAgICAg ICAgICBpZiAob2JqLT5ldmVudExvZ2dpbmcpCisgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGlu c3RhbmNlLCAia0hpZ2hMZXZlbEV2ZW50Iik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Ly8gTlBBUEkgZXZlbnRzCiAgICAgICAgIGNhc2UgTlBFdmVudFR5cGVfR2V0Rm9jdXNFdmVudDoK LSAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgImdldEZvY3VzRXZlbnQiKTsKKyAgICAg ICAgICAgIGlmIChvYmotPmV2ZW50TG9nZ2luZykKKyAgICAgICAgICAgICAgICBwbHVnaW5Mb2co aW5zdGFuY2UsICJnZXRGb2N1c0V2ZW50Iik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBOUEV2ZW50VHlwZV9Mb3NlRm9jdXNFdmVudDoKLSAgICAgICAgICAgIHBsdWdpbkxvZyhp bnN0YW5jZSwgImxvc2VGb2N1c0V2ZW50Iik7CisgICAgICAgICAgICBpZiAob2JqLT5ldmVudExv Z2dpbmcpCisgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAibG9zZUZvY3VzRXZl bnQiKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIE5QRXZlbnRUeXBlX0FkanVz dEN1cnNvckV2ZW50OgotICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiYWRqdXN0Q3Vy c29yRXZlbnQiKTsKKyAgICAgICAgICAgIGlmIChvYmotPmV2ZW50TG9nZ2luZykKKyAgICAgICAg ICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJhZGp1c3RDdXJzb3JFdmVudCIpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBwbHVnaW5Mb2coaW5z dGFuY2UsICJldmVudCAlZCIsIGV2ZW50LT53aGF0KTsKKyAgICAgICAgICAgIGlmIChvYmotPmV2 ZW50TG9nZ2luZykKKyAgICAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJldmVudCAl ZCIsIGV2ZW50LT53aGF0KTsKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIDA7CkBAIC01MTIsMjQg KzU0MCwyOSBAQCBzdGF0aWMgaW50MTZfdCBoYW5kbGVFdmVudENvY29hKE5QUCBpbnN0YW5jZSwg UGx1Z2luT2JqZWN0KiBvYmosIE5QQ29jb2FFdmVudCogZQogICAgICAgICBjYXNlIE5QQ29jb2FF dmVudFdpbmRvd0ZvY3VzQ2hhbmdlZDoKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIE5QQ29j b2FFdmVudEZvY3VzQ2hhbmdlZDoKLSAgICAgICAgICAgIGlmIChldmVudC0+ZGF0YS5mb2N1cy5o YXNGb2N1cykKLSAgICAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJnZXRGb2N1c0V2 ZW50Iik7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcGx1Z2luTG9nKGluc3Rh bmNlLCAibG9zZUZvY3VzRXZlbnQiKTsKKyAgICAgICAgICAgIGlmIChvYmotPmV2ZW50TG9nZ2lu ZykgeworICAgICAgICAgICAgICAgIGlmIChldmVudC0+ZGF0YS5mb2N1cy5oYXNGb2N1cykKKyAg ICAgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiZ2V0Rm9jdXNFdmVudCIpOwor ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGluc3Rh bmNlLCAibG9zZUZvY3VzRXZlbnQiKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVy biAxOwogCi0gICAgICAgIGNhc2UgTlBDb2NvYUV2ZW50RHJhd1JlY3Q6CisgICAgICAgIGNhc2Ug TlBDb2NvYUV2ZW50RHJhd1JlY3Q6IHsKKyAgICAgICAgICAgIGlmIChvYmotPm9uUGFpbnRFdmVu dCkKKyAgICAgICAgICAgICAgICBleGVjdXRlU2NyaXB0KG9iaiwgb2JqLT5vblBhaW50RXZlbnQp OwogICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgIH0KIAogICAgICAgICBjYXNlIE5QQ29j b2FFdmVudEtleURvd246Ci0gICAgICAgICAgICBpZiAoZXZlbnQtPmRhdGEua2V5LmNoYXJhY3Rl cnMpCisgICAgICAgICAgICBpZiAob2JqLT5ldmVudExvZ2dpbmcgJiYgZXZlbnQtPmRhdGEua2V5 LmNoYXJhY3RlcnMpCiAgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAia2V5RG93 biAnJWMnIiwgQ0ZTdHJpbmdHZXRDaGFyYWN0ZXJBdEluZGV4KHJlaW50ZXJwcmV0X2Nhc3Q8Q0ZT dHJpbmdSZWY+KGV2ZW50LT5kYXRhLmtleS5jaGFyYWN0ZXJzKSwgMCkpOwogICAgICAgICAgICAg aWYgKG9iai0+ZXZhbHVhdGVTY3JpcHRPbk1vdXNlRG93bk9yS2V5RG93biAmJiAhb2JqLT5tb3Vz ZURvd25Gb3JFdmFsdWF0ZVNjcmlwdCkKICAgICAgICAgICAgICAgICBleGVjdXRlU2NyaXB0KG9i aiwgb2JqLT5ldmFsdWF0ZVNjcmlwdE9uTW91c2VEb3duT3JLZXlEb3duKTsKICAgICAgICAgICAg IHJldHVybiAxOwogCiAgICAgICAgIGNhc2UgTlBDb2NvYUV2ZW50S2V5VXA6Ci0gICAgICAgICAg ICBpZiAoZXZlbnQtPmRhdGEua2V5LmNoYXJhY3RlcnMpIHsKKyAgICAgICAgICAgIGlmIChvYmot PmV2ZW50TG9nZ2luZyAmJiBldmVudC0+ZGF0YS5rZXkuY2hhcmFjdGVycykgewogICAgICAgICAg ICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgImtleVVwICclYyciLCBDRlN0cmluZ0dldENoYXJh Y3RlckF0SW5kZXgocmVpbnRlcnByZXRfY2FzdDxDRlN0cmluZ1JlZj4oZXZlbnQtPmRhdGEua2V5 LmNoYXJhY3RlcnMpLCAwKSk7CiAgICAgICAgICAgICAgICAgaWYgKG9iai0+dGVzdEtleWJvYXJk Rm9jdXNGb3JQbHVnaW5zKSB7CiAgICAgICAgICAgICAgICAgICAgIG9iai0+ZXZlbnRMb2dnaW5n ID0gZmFsc2U7CkBAIC01NDMsMTYgKzU3NiwyMCBAQCBzdGF0aWMgaW50MTZfdCBoYW5kbGVFdmVu dENvY29hKE5QUCBpbnN0YW5jZSwgUGx1Z2luT2JqZWN0KiBvYmosIE5QQ29jb2FFdmVudCogZQog ICAgICAgICAgICAgcmV0dXJuIDE7CiAKICAgICAgICAgY2FzZSBOUENvY29hRXZlbnRNb3VzZURv d246Ci0gICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJtb3VzZURvd24gYXQgKCVkLCAl ZCkiLCAKLSAgICAgICAgICAgICAgICAgICAoaW50KWV2ZW50LT5kYXRhLm1vdXNlLnBsdWdpblgs Ci0gICAgICAgICAgICAgICAgICAgKGludClldmVudC0+ZGF0YS5tb3VzZS5wbHVnaW5ZKTsKKyAg ICAgICAgICAgIGlmIChvYmotPmV2ZW50TG9nZ2luZykgeworICAgICAgICAgICAgICAgIHBsdWdp bkxvZyhpbnN0YW5jZSwgIm1vdXNlRG93biBhdCAoJWQsICVkKSIsIAorICAgICAgICAgICAgICAg ICAgICAgICAoaW50KWV2ZW50LT5kYXRhLm1vdXNlLnBsdWdpblgsCisgICAgICAgICAgICAgICAg ICAgICAgIChpbnQpZXZlbnQtPmRhdGEubW91c2UucGx1Z2luWSk7CisgICAgICAgICAgICB9CiAg ICAgICAgICAgICBpZiAob2JqLT5ldmFsdWF0ZVNjcmlwdE9uTW91c2VEb3duT3JLZXlEb3duICYm IG9iai0+bW91c2VEb3duRm9yRXZhbHVhdGVTY3JpcHQpCiAgICAgICAgICAgICAgICAgZXhlY3V0 ZVNjcmlwdChvYmosIG9iai0+ZXZhbHVhdGVTY3JpcHRPbk1vdXNlRG93bk9yS2V5RG93bik7CiAg ICAgICAgICAgICByZXR1cm4gMTsKICAgICAgICAgY2FzZSBOUENvY29hRXZlbnRNb3VzZVVwOgot ICAgICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAibW91c2VVcCBhdCAoJWQsICVkKSIsIAot ICAgICAgICAgICAgICAgICAgIChpbnQpZXZlbnQtPmRhdGEubW91c2UucGx1Z2luWCwKLSAgICAg ICAgICAgICAgICAgICAoaW50KWV2ZW50LT5kYXRhLm1vdXNlLnBsdWdpblkpOworICAgICAgICAg ICAgaWYgKG9iai0+ZXZlbnRMb2dnaW5nKSB7CisgICAgICAgICAgICAgICAgcGx1Z2luTG9nKGlu c3RhbmNlLCAibW91c2VVcCBhdCAoJWQsICVkKSIsIAorICAgICAgICAgICAgICAgICAgICAgICAo aW50KWV2ZW50LT5kYXRhLm1vdXNlLnBsdWdpblgsCisgICAgICAgICAgICAgICAgICAgICAgIChp bnQpZXZlbnQtPmRhdGEubW91c2UucGx1Z2luWSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICByZXR1cm4gMTsKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIE5QQ29jb2FFdmVudE1vdXNl TW92ZWQ6CkBAIC02MjAsOCArNjU3LDYgQEAgc3RhdGljIGludDE2X3QgaGFuZGxlRXZlbnRYMTEo TlBQIGluc3RhbmNlLCBQbHVnaW5PYmplY3QqIG9iaiwgWEV2ZW50KiBldmVudCkKIGludDE2X3Qg TlBQX0hhbmRsZUV2ZW50KE5QUCBpbnN0YW5jZSwgdm9pZCAqZXZlbnQpCiB7CiAgICAgUGx1Z2lu T2JqZWN0KiBvYmogPSBzdGF0aWNfY2FzdDxQbHVnaW5PYmplY3QqPihpbnN0YW5jZS0+cGRhdGEp OwotICAgIGlmICghb2JqLT5ldmVudExvZ2dpbmcpCi0gICAgICAgIHJldHVybiAwOwogCiAjaWZk ZWYgWFBfTUFDT1NYCiAjaWZuZGVmIE5QX05PX0NBUkJPTgo=