60612 2011-05-11 00:25:40 -0700 initTouchEvent in TouchEvent.idl does not match the W3C Touch Events Specification editor's draft. 2011-10-15 00:07:45 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 32485 1 aestes webkit-unassigned aestes apandia.ttg benjamin benm diegohcg hausmann joepeck kenneth laszlo.gombos mbrubeck mjs tonikitoo webkit.review.bot oldest_to_newest 401818 0 aestes 2011-05-11 00:25:40 -0700 WebKit's current definition of initTouchEvent() [1] is incompatible with the W3C's Touch Events Specification editor's draft [2]. We should update our definition to match the spec draft. [1] https://trac.webkit.org/browser/trunk/WebCore/dom/TouchEvent.idl?rev=52113#L40 [1] https://dvcs.w3.org/hg/webevents/raw-file/tip/touchevents.html#touchevent-interface 403139 1 aestes 2011-05-12 14:10:07 -0700 FWIW, Apple's implementation of TouchEvent closely matches the W3C spec, with the exception of having two additional parameters at the end of initTouchEvent() (scale and rotation). See <http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/TouchEventClassReference/TouchEvent/TouchEvent.html>. 434730 2 apandia.ttg 2011-07-11 02:55:06 -0700 There are some more differences between apple's implementation and the W3C's touch events spec.The apple's implementation includes parameter as "screenX", "screenY", "clientX" and "clientY". Another related issue(https://bugs.webkit.org/show_bug.cgi?id=32484) is logged for qt port but involves changes to the initTouchEvent API signature.It is primarily for adding support for scale and transformation properties. 439160 3 mbrubeck 2011-07-19 08:42:03 -0700 In the W3C Web Events working group, we are currently discussing whether the W3C Touch Events spec should be changed to be more compatible with current WebKit implementations. Some old discussion about createTouch and initTouchEvent here: http://www.w3.org/2010/webevents/track/issues/17 New discussion about initTouchEvent will be tracked here: http://www.w3.org/2010/webevents/track/issues/19 In particular, we are wondering whether it is necessary or useful to have screenX/Y and clientX/Y parameters to the initTouchEvent method (since coordinates in touch events are properties of each Touch object rather than the TouchEvent object itself). Are these parameters useful to authors using the interface, or are they just an artifact of how WebKit's implementation inherits from other interfaces? If they aren't useful, is it possible to remove them from WebKit? Feedback is welcome at http://lists.w3.org/Archives/Public/public-webevents/ 462328 4 106378 laszlo.gombos 2011-09-05 20:11:57 -0700 Created attachment 106378 Remove screenX/Y and clientX/Y parameters from the initTouchEvent method This change aligns the interface with the latest W3C Touch Events Specification, but makes it different from exsiting Apple's iOS and Google's Android products. 462329 5 webkit.review.bot 2011-09-05 20:15:22 -0700 Attachment 106378 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast..." exit_code: 1 Source/WebCore/dom/TouchEvent.h:56: The parameter name "view" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 462330 6 106379 laszlo.gombos 2011-09-05 20:24:14 -0700 Created attachment 106379 same as previous + fix style 477687 7 mbrubeck 2011-10-04 10:19:46 -0700 The Web Events working group has decided to remove the initTouchEvent method from the spec, and add a DOM4-style constructor instead. See this issue for discussion and links: http://www.w3.org/2010/webevents/track/issues/23 So this patch is no longer needed, and this issue can be resolved as INVALID. 477729 8 tonikitoo 2011-10-04 10:48:41 -0700 WONTFIX as per comment #7 484513 9 106379 abarth 2011-10-15 00:07:45 -0700 Comment on attachment 106379 same as previous + fix style Cleared review? from attachment 106379 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 106378 2011-09-05 20:11:57 -0700 2011-09-05 20:24:14 -0700 Remove screenX/Y and clientX/Y parameters from the initTouchEvent method 60612.patch text/plain 8732 laszlo.gombos ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NWZlZWU1Li5lYTg5N2Y3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDkt MDYgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAg IFJlbW92ZSBzY3JlZW5YL1kgYW5kIGNsaWVudFgvWSBwYXJhbWV0ZXJzIGZyb20gdGhlIGluaXRU b3VjaEV2ZW50IG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjA2MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9kb2N1bWVudC1jcmVhdGUt dG91Y2gtbGlzdC5qczoKKwogMjAxMS0wOS0wMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHI5NDI3NCk6IHNlbGVjdGlvbi1jaGFuZ2UtY2xv c2VzLXR5cGluZy5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50 cy90b3VjaC9zY3JpcHQtdGVzdHMvZG9jdW1lbnQtY3JlYXRlLXRvdWNoLWxpc3QuanMgYi9MYXlv dXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9zY3JpcHQtdGVzdHMvZG9jdW1lbnQtY3JlYXRlLXRv dWNoLWxpc3QuanMKaW5kZXggYmU4OWY0OC4uN2VjNDFlYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2RvY3VtZW50LWNyZWF0ZS10b3VjaC1s aXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9k b2N1bWVudC1jcmVhdGUtdG91Y2gtbGlzdC5qcwpAQCAtMTcsNyArMTcsNyBAQCB0cnkgewogICAg IHZhciB0bCA9IGRvY3VtZW50LmNyZWF0ZVRvdWNoTGlzdCh0LCB0Mik7CiAKICAgICB2YXIgZXZ0 ID0gZG9jdW1lbnQuY3JlYXRlRXZlbnQoIlRvdWNoRXZlbnQiKTsKLSAgICBldnQuaW5pdFRvdWNo RXZlbnQodGwsIHRsLCB0bCwgInRvdWNoc3RhcnQiLCB3aW5kb3csIDAsIDAsIDAsIDAsIHRydWUs IGZhbHNlLCBmYWxzZSwgZmFsc2UpOworICAgIGV2dC5pbml0VG91Y2hFdmVudCh0bCwgdGwsIHRs LCAidG91Y2hzdGFydCIsIHdpbmRvdywgdHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7CiAKICAg ICBkb2N1bWVudC5ib2R5LmFkZEV2ZW50TGlzdGVuZXIoInRvdWNoc3RhcnQiLCBmdW5jdGlvbiBo YW5kbGVUb3VjaFN0YXJ0KGV2KSB7CiAgICAgICAgIHRzID0gZXY7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ3 ZTQzNy4uNTQzNmY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTA5LTA2ICBM YXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KKworICAgICAgICBSZW1v dmUgc2NyZWVuWC9ZIGFuZCBjbGllbnRYL1kgcGFyYW1ldGVycyBmcm9tIHRoZSBpbml0VG91Y2hF dmVudCBtZXRob2QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYwNjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ29vcmRpbmF0ZXMgaW4gdG91Y2ggZXZlbnRzIGFyZSBwcm9wZXJ0aWVzIG9mIGVhY2ggVG91 Y2ggb2JqZWN0IHJhdGhlcgorICAgICAgICB0aGFuIHRoZSBUb3VjaEV2ZW50IG9iamVjdCBpdHNl bGYuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxpZ25zIHRoZSBpbnRlcmZhY2Ugd2l0aCB0aGUg bGF0ZXN0IFczQyBUb3VjaCBFdmVudHMgU3BlY2lmaWNhdGlvbiwKKyAgICAgICAgYnV0IG1ha2Vz IGl0IGRpZmZlcmVudCBmcm9tIGV4c2l0aW5nIEFwcGxlJ3MgaU9TIGFuZCBHb29nbGUncyBBbmRy b2lkIHByb2R1Y3RzLgorCisgICAgICAgIFRoZSBjaGFuZ2UgaXMgY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cyB1bmRlciBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC4KKworICAgICAgICAq IGRvbS9Ub3VjaEV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRvdWNoRXZlbnQ6OlRvdWNo RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6VG91Y2hFdmVudDo6aW5pdFRvdWNoRXZlbnQpOgor CisgICAgICAgICogZG9tL1RvdWNoRXZlbnQuaDogRGVyaXZlIGZyb20gVUlFdmVudFdpdGhLZXlT dGF0ZSBpbnN0ZWFkIG9mCisgICAgICAgIE1vdXNlUmVsYXRlZEV2ZW50LgorICAgICAgICAoV2Vi Q29yZTo6VG91Y2hFdmVudDo6Y3JlYXRlKToKKworICAgICAgICAqIGRvbS9Ub3VjaEV2ZW50Lmlk bDoKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQpOgorCiAyMDExLTA5LTAzICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChy ODYyNjgpOiBGaXggZm9yIHF0X25ldHdvcmtBY2Nlc3NBbGxvd2VkKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3Vj aEV2ZW50LmNwcAppbmRleCA2MzhhNDQ0Li40ODkzMjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vVG91Y2hFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNoRXZl bnQuY3BwCkBAIC0zOCwxMCArMzgsMTAgQEAgVG91Y2hFdmVudDo6VG91Y2hFdmVudCgpCiAKIFRv dWNoRXZlbnQ6OlRvdWNoRXZlbnQoVG91Y2hMaXN0KiB0b3VjaGVzLCBUb3VjaExpc3QqIHRhcmdl dFRvdWNoZXMsCiAgICAgICAgIFRvdWNoTGlzdCogY2hhbmdlZFRvdWNoZXMsIGNvbnN0IEF0b21p Y1N0cmluZyYgdHlwZSwgCi0gICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBp bnQgc2NyZWVuWCwgaW50IHNjcmVlblksIGludCBwYWdlWCwgaW50IHBhZ2VZLAorICAgICAgICBQ YXNzUmVmUHRyPEFic3RyYWN0Vmlldz4gdmlldywKICAgICAgICAgYm9vbCBjdHJsS2V5LCBib29s IGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5KQotICAgIDogTW91c2VSZWxhdGVk RXZlbnQodHlwZSwgdHJ1ZSwgdHJ1ZSwgdmlldywgMCwgSW50UG9pbnQoc2NyZWVuWCwgc2NyZWVu WSksCi0gICAgICAgICAgICAgICAgICAgICAgICBJbnRQb2ludChwYWdlWCwgcGFnZVkpLCBjdHJs S2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5KQorICAgIDogVUlFdmVudFdpdGhLZXlTdGF0 ZSh0eXBlLCB0cnVlLCB0cnVlLCB2aWV3LCAwLCBjdHJsS2V5LCBhbHRLZXksCisgICAgICAgICAg ICAgICAgICAgICAgICAgIHNoaWZ0S2V5LCBtZXRhS2V5KQogICAgICwgbV90b3VjaGVzKHRvdWNo ZXMpCiAgICAgLCBtX3RhcmdldFRvdWNoZXModGFyZ2V0VG91Y2hlcykKICAgICAsIG1fY2hhbmdl ZFRvdWNoZXMoY2hhbmdlZFRvdWNoZXMpCkBAIC01NCw4ICs1NCw4IEBAIFRvdWNoRXZlbnQ6On5U b3VjaEV2ZW50KCkKIAogdm9pZCBUb3VjaEV2ZW50Ojppbml0VG91Y2hFdmVudChUb3VjaExpc3Qq IHRvdWNoZXMsIFRvdWNoTGlzdCogdGFyZ2V0VG91Y2hlcywKICAgICAgICAgVG91Y2hMaXN0KiBj aGFuZ2VkVG91Y2hlcywgY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCAKLSAgICAgICAgUGFzc1Jl ZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcsIGludCBzY3JlZW5YLCBpbnQgc2NyZWVuWSwgaW50IGNs aWVudFgsIGludCBjbGllbnRZLAotICAgICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBi b29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXkpCisgICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RW aWV3PiB2aWV3LCBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LAorICAgICAgICBib29sIHNoaWZ0 S2V5LCBib29sIG1ldGFLZXkpCiB7CiAgICAgaWYgKGRpc3BhdGNoZWQoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtNjUsMTIgKzY1LDEwIEBAIHZvaWQgVG91Y2hFdmVudDo6aW5pdFRvdWNoRXZlbnQo VG91Y2hMaXN0KiB0b3VjaGVzLCBUb3VjaExpc3QqIHRhcmdldFRvdWNoZXMsCiAgICAgbV90b3Vj aGVzID0gdG91Y2hlczsKICAgICBtX3RhcmdldFRvdWNoZXMgPSB0YXJnZXRUb3VjaGVzOwogICAg IG1fY2hhbmdlZFRvdWNoZXMgPSBjaGFuZ2VkVG91Y2hlczsKLSAgICBtX3NjcmVlbkxvY2F0aW9u ID0gSW50UG9pbnQoc2NyZWVuWCwgc2NyZWVuWSk7CiAgICAgbV9jdHJsS2V5ID0gY3RybEtleTsK ICAgICBtX2FsdEtleSA9IGFsdEtleTsKICAgICBtX3NoaWZ0S2V5ID0gc2hpZnRLZXk7CiAgICAg bV9tZXRhS2V5ID0gbWV0YUtleTsKLSAgICBpbml0Q29vcmRpbmF0ZXMoSW50UG9pbnQoY2xpZW50 WCwgY2xpZW50WSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vVG91Y2hFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNo RXZlbnQuaAppbmRleCAyNmZjNWZjLi43ZjUzNjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vVG91Y2hFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmgK QEAgLTI4LDEzICsyOCwxMyBAQAogCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKIAotI2luY2x1 ZGUgIk1vdXNlUmVsYXRlZEV2ZW50LmgiCisjaW5jbHVkZSAiVUlFdmVudFdpdGhLZXlTdGF0ZS5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFRvdWNoTGlzdDsKIAotY2xhc3MgVG91 Y2hFdmVudCA6IHB1YmxpYyBNb3VzZVJlbGF0ZWRFdmVudCB7CitjbGFzcyBUb3VjaEV2ZW50IDog cHVibGljIFVJRXZlbnRXaXRoS2V5U3RhdGUgewogcHVibGljOgogICAgIHZpcnR1YWwgflRvdWNo RXZlbnQoKTsKIApAQCAtNDUsMTkgKzQ1LDE2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxUb3VjaEV2ZW50PiBjcmVhdGUoVG91Y2hMaXN0KiB0b3VjaGVzLCAKICAgICAgICAgICAg IFRvdWNoTGlzdCogdGFyZ2V0VG91Y2hlcywgVG91Y2hMaXN0KiBjaGFuZ2VkVG91Y2hlcywgCiAg ICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RW aWV3PiB2aWV3LAotICAgICAgICAgICAgaW50IHNjcmVlblgsIGludCBzY3JlZW5ZLCBpbnQgcGFn ZVgsIGludCBwYWdlWSwKICAgICAgICAgICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJv b2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZihuZXcgVG91Y2hFdmVudCh0b3VjaGVzLCB0YXJnZXRUb3VjaGVzLCBjaGFuZ2VkVG91Y2hlcywK LSAgICAgICAgICAgICAgICB0eXBlLCB2aWV3LCBzY3JlZW5YLCBzY3JlZW5ZLCBwYWdlWCwgcGFn ZVksCi0gICAgICAgICAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSkp OworICAgICAgICAgICAgICAgIHR5cGUsIHZpZXcsIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXks IG1ldGFLZXkpKTsKICAgICB9CiAKICAgICB2b2lkIGluaXRUb3VjaEV2ZW50KFRvdWNoTGlzdCog dG91Y2hlcywgVG91Y2hMaXN0KiB0YXJnZXRUb3VjaGVzLAogICAgICAgICAgICAgVG91Y2hMaXN0 KiBjaGFuZ2VkVG91Y2hlcywgY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCAKLSAgICAgICAgICAg IFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBpbnQgc2NyZWVuWCwgaW50IHNjcmVlblks IAotICAgICAgICAgICAgaW50IGNsaWVudFgsIGludCBjbGllbnRZLAotICAgICAgICAgICAgYm9v bCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5KTsKKyAg ICAgICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBib29sIGN0cmxLZXksIGJv b2wgYWx0S2V5LAorICAgICAgICAgICAgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5KTsKIAog ICAgIFRvdWNoTGlzdCogdG91Y2hlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG91Y2hlcy5nZXQoKTsg fQogICAgIFRvdWNoTGlzdCogdGFyZ2V0VG91Y2hlcygpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0 VG91Y2hlcy5nZXQoKTsgfQpAQCAtNjcsOSArNjQsOCBAQCBwcml2YXRlOgogICAgIFRvdWNoRXZl bnQoKTsKICAgICBUb3VjaEV2ZW50KFRvdWNoTGlzdCogdG91Y2hlcywgVG91Y2hMaXN0KiB0YXJn ZXRUb3VjaGVzLAogICAgICAgICAgICAgVG91Y2hMaXN0KiBjaGFuZ2VkVG91Y2hlcywgY29uc3Qg QXRvbWljU3RyaW5nJiB0eXBlLAotICAgICAgICAgICAgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+ LCBpbnQgc2NyZWVuWCwgaW50IHNjcmVlblksIGludCBwYWdlWCwKLSAgICAgICAgICAgIGludCBw YWdlWSwKLSAgICAgICAgICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRL ZXksIGJvb2wgbWV0YUtleSk7CisgICAgICAgICAgICBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4s IGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksCisgICAgICAgICAgICBib29sIHNoaWZ0S2V5LCBi b29sIG1ldGFLZXkpOwogCiAgICAgdmlydHVhbCBib29sIGlzVG91Y2hFdmVudCgpIGNvbnN0IHsg cmV0dXJuIHRydWU7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNoRXZl bnQuaWRsIGIvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNoRXZlbnQuaWRsCmluZGV4IDM5ZWRmYzgu LjlmNWExM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmlkbAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vVG91Y2hFdmVudC5pZGwKQEAgLTQxLDEwICs0MSw2IEBA IG1vZHVsZSBldmVudHMgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25h bD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gVG91Y2hMaXN0IGNoYW5nZWRUb3VjaGVzLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0g RE9NU3RyaW5nIHR5cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFs PUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBET01XaW5kb3cgdmlldywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGxvbmcgc2NyZWVu WCwgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVm YXVsdFZhbHVlXSBsb25nIHNjcmVlblksIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu IFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gbG9uZyBjbGllbnRYLCAKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGxv bmcgY2xpZW50WSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2Fs bFdpdGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gY3RybEtleSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gYWx0S2V5 LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1 bHRWYWx1ZV0gYm9vbGVhbiBzaGlmdEtleSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAppbmRleCAyMWVjZjMyLi5mMzI3MDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC0zMjg0LDcgKzMyODQsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hF dmVudChjb25zdCBQbGF0Zm9ybVRvdWNoRXZlbnQmIGV2ZW50KQogICAgICAgICAgICAgUmVmUHRy PFRvdWNoRXZlbnQ+IHRvdWNoRXZlbnQgPQogICAgICAgICAgICAgICAgIFRvdWNoRXZlbnQ6OmNy ZWF0ZShlZmZlY3RpdmVUb3VjaGVzLmdldCgpLCB0YXJnZXRUb3VjaGVzLmdldCgpLCBjaGFuZ2Vk VG91Y2hlc1tzdGF0ZV0ubV90b3VjaGVzLmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzdGF0ZU5hbWUsIHRvdWNoRXZlbnRUYXJnZXQtPnRvTm9kZSgpLT5kb2N1bWVu dCgpLT5kZWZhdWx0VmlldygpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAw LCAwLCAwLCAwLCBldmVudC5jdHJsS2V5KCksIGV2ZW50LmFsdEtleSgpLCBldmVudC5zaGlmdEtl eSgpLCBldmVudC5tZXRhS2V5KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBldmVudC5jdHJsS2V5KCksIGV2ZW50LmFsdEtleSgpLCBldmVudC5zaGlmdEtleSgpLCBldmVu dC5tZXRhS2V5KCkpOwogICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgICAg ICAgICB0b3VjaEV2ZW50VGFyZ2V0LT5kaXNwYXRjaEV2ZW50KHRvdWNoRXZlbnQuZ2V0KCksIGVj KTsKICAgICAgICAgICAgIGRlZmF1bHRQcmV2ZW50ZWQgfD0gdG91Y2hFdmVudC0+ZGVmYXVsdFBy ZXZlbnRlZCgpOwo= 106379 2011-09-05 20:24:14 -0700 2011-10-15 00:07:45 -0700 same as previous + fix style 60612.patch text/plain 8727 laszlo.gombos ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NWZlZWU1Li5lYTg5N2Y3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDkt MDYgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAg IFJlbW92ZSBzY3JlZW5YL1kgYW5kIGNsaWVudFgvWSBwYXJhbWV0ZXJzIGZyb20gdGhlIGluaXRU b3VjaEV2ZW50IG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjA2MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9kb2N1bWVudC1jcmVhdGUt dG91Y2gtbGlzdC5qczoKKwogMjAxMS0wOS0wMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHI5NDI3NCk6IHNlbGVjdGlvbi1jaGFuZ2UtY2xv c2VzLXR5cGluZy5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50 cy90b3VjaC9zY3JpcHQtdGVzdHMvZG9jdW1lbnQtY3JlYXRlLXRvdWNoLWxpc3QuanMgYi9MYXlv dXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9zY3JpcHQtdGVzdHMvZG9jdW1lbnQtY3JlYXRlLXRv dWNoLWxpc3QuanMKaW5kZXggYmU4OWY0OC4uN2VjNDFlYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2RvY3VtZW50LWNyZWF0ZS10b3VjaC1s aXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9k b2N1bWVudC1jcmVhdGUtdG91Y2gtbGlzdC5qcwpAQCAtMTcsNyArMTcsNyBAQCB0cnkgewogICAg IHZhciB0bCA9IGRvY3VtZW50LmNyZWF0ZVRvdWNoTGlzdCh0LCB0Mik7CiAKICAgICB2YXIgZXZ0 ID0gZG9jdW1lbnQuY3JlYXRlRXZlbnQoIlRvdWNoRXZlbnQiKTsKLSAgICBldnQuaW5pdFRvdWNo RXZlbnQodGwsIHRsLCB0bCwgInRvdWNoc3RhcnQiLCB3aW5kb3csIDAsIDAsIDAsIDAsIHRydWUs IGZhbHNlLCBmYWxzZSwgZmFsc2UpOworICAgIGV2dC5pbml0VG91Y2hFdmVudCh0bCwgdGwsIHRs LCAidG91Y2hzdGFydCIsIHdpbmRvdywgdHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7CiAKICAg ICBkb2N1bWVudC5ib2R5LmFkZEV2ZW50TGlzdGVuZXIoInRvdWNoc3RhcnQiLCBmdW5jdGlvbiBo YW5kbGVUb3VjaFN0YXJ0KGV2KSB7CiAgICAgICAgIHRzID0gZXY7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ3 ZTQzNy4uNTQzNmY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTA5LTA2ICBM YXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KKworICAgICAgICBSZW1v dmUgc2NyZWVuWC9ZIGFuZCBjbGllbnRYL1kgcGFyYW1ldGVycyBmcm9tIHRoZSBpbml0VG91Y2hF dmVudCBtZXRob2QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYwNjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ29vcmRpbmF0ZXMgaW4gdG91Y2ggZXZlbnRzIGFyZSBwcm9wZXJ0aWVzIG9mIGVhY2ggVG91 Y2ggb2JqZWN0IHJhdGhlcgorICAgICAgICB0aGFuIHRoZSBUb3VjaEV2ZW50IG9iamVjdCBpdHNl bGYuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxpZ25zIHRoZSBpbnRlcmZhY2Ugd2l0aCB0aGUg bGF0ZXN0IFczQyBUb3VjaCBFdmVudHMgU3BlY2lmaWNhdGlvbiwKKyAgICAgICAgYnV0IG1ha2Vz IGl0IGRpZmZlcmVudCBmcm9tIGV4c2l0aW5nIEFwcGxlJ3MgaU9TIGFuZCBHb29nbGUncyBBbmRy b2lkIHByb2R1Y3RzLgorCisgICAgICAgIFRoZSBjaGFuZ2UgaXMgY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cyB1bmRlciBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC4KKworICAgICAgICAq IGRvbS9Ub3VjaEV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRvdWNoRXZlbnQ6OlRvdWNo RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6VG91Y2hFdmVudDo6aW5pdFRvdWNoRXZlbnQpOgor CisgICAgICAgICogZG9tL1RvdWNoRXZlbnQuaDogRGVyaXZlIGZyb20gVUlFdmVudFdpdGhLZXlT dGF0ZSBpbnN0ZWFkIG9mCisgICAgICAgIE1vdXNlUmVsYXRlZEV2ZW50LgorICAgICAgICAoV2Vi Q29yZTo6VG91Y2hFdmVudDo6Y3JlYXRlKToKKworICAgICAgICAqIGRvbS9Ub3VjaEV2ZW50Lmlk bDoKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQpOgorCiAyMDExLTA5LTAzICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChy ODYyNjgpOiBGaXggZm9yIHF0X25ldHdvcmtBY2Nlc3NBbGxvd2VkKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3Vj aEV2ZW50LmNwcAppbmRleCA2MzhhNDQ0Li40ODkzMjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vVG91Y2hFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNoRXZl bnQuY3BwCkBAIC0zOCwxMCArMzgsMTAgQEAgVG91Y2hFdmVudDo6VG91Y2hFdmVudCgpCiAKIFRv dWNoRXZlbnQ6OlRvdWNoRXZlbnQoVG91Y2hMaXN0KiB0b3VjaGVzLCBUb3VjaExpc3QqIHRhcmdl dFRvdWNoZXMsCiAgICAgICAgIFRvdWNoTGlzdCogY2hhbmdlZFRvdWNoZXMsIGNvbnN0IEF0b21p Y1N0cmluZyYgdHlwZSwgCi0gICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBp bnQgc2NyZWVuWCwgaW50IHNjcmVlblksIGludCBwYWdlWCwgaW50IHBhZ2VZLAorICAgICAgICBQ YXNzUmVmUHRyPEFic3RyYWN0Vmlldz4gdmlldywKICAgICAgICAgYm9vbCBjdHJsS2V5LCBib29s IGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5KQotICAgIDogTW91c2VSZWxhdGVk RXZlbnQodHlwZSwgdHJ1ZSwgdHJ1ZSwgdmlldywgMCwgSW50UG9pbnQoc2NyZWVuWCwgc2NyZWVu WSksCi0gICAgICAgICAgICAgICAgICAgICAgICBJbnRQb2ludChwYWdlWCwgcGFnZVkpLCBjdHJs S2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5KQorICAgIDogVUlFdmVudFdpdGhLZXlTdGF0 ZSh0eXBlLCB0cnVlLCB0cnVlLCB2aWV3LCAwLCBjdHJsS2V5LCBhbHRLZXksCisgICAgICAgICAg ICAgICAgICAgICAgICAgIHNoaWZ0S2V5LCBtZXRhS2V5KQogICAgICwgbV90b3VjaGVzKHRvdWNo ZXMpCiAgICAgLCBtX3RhcmdldFRvdWNoZXModGFyZ2V0VG91Y2hlcykKICAgICAsIG1fY2hhbmdl ZFRvdWNoZXMoY2hhbmdlZFRvdWNoZXMpCkBAIC01NCw4ICs1NCw4IEBAIFRvdWNoRXZlbnQ6On5U b3VjaEV2ZW50KCkKIAogdm9pZCBUb3VjaEV2ZW50Ojppbml0VG91Y2hFdmVudChUb3VjaExpc3Qq IHRvdWNoZXMsIFRvdWNoTGlzdCogdGFyZ2V0VG91Y2hlcywKICAgICAgICAgVG91Y2hMaXN0KiBj aGFuZ2VkVG91Y2hlcywgY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCAKLSAgICAgICAgUGFzc1Jl ZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcsIGludCBzY3JlZW5YLCBpbnQgc2NyZWVuWSwgaW50IGNs aWVudFgsIGludCBjbGllbnRZLAotICAgICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBi b29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXkpCisgICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RW aWV3PiB2aWV3LCBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LAorICAgICAgICBib29sIHNoaWZ0 S2V5LCBib29sIG1ldGFLZXkpCiB7CiAgICAgaWYgKGRpc3BhdGNoZWQoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtNjUsMTIgKzY1LDEwIEBAIHZvaWQgVG91Y2hFdmVudDo6aW5pdFRvdWNoRXZlbnQo VG91Y2hMaXN0KiB0b3VjaGVzLCBUb3VjaExpc3QqIHRhcmdldFRvdWNoZXMsCiAgICAgbV90b3Vj aGVzID0gdG91Y2hlczsKICAgICBtX3RhcmdldFRvdWNoZXMgPSB0YXJnZXRUb3VjaGVzOwogICAg IG1fY2hhbmdlZFRvdWNoZXMgPSBjaGFuZ2VkVG91Y2hlczsKLSAgICBtX3NjcmVlbkxvY2F0aW9u ID0gSW50UG9pbnQoc2NyZWVuWCwgc2NyZWVuWSk7CiAgICAgbV9jdHJsS2V5ID0gY3RybEtleTsK ICAgICBtX2FsdEtleSA9IGFsdEtleTsKICAgICBtX3NoaWZ0S2V5ID0gc2hpZnRLZXk7CiAgICAg bV9tZXRhS2V5ID0gbWV0YUtleTsKLSAgICBpbml0Q29vcmRpbmF0ZXMoSW50UG9pbnQoY2xpZW50 WCwgY2xpZW50WSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vVG91Y2hFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1RvdWNo RXZlbnQuaAppbmRleCAyNmZjNWZjLi5lN2FlMTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vVG91Y2hFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmgK QEAgLTI4LDEzICsyOCwxMyBAQAogCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKIAotI2luY2x1 ZGUgIk1vdXNlUmVsYXRlZEV2ZW50LmgiCisjaW5jbHVkZSAiVUlFdmVudFdpdGhLZXlTdGF0ZS5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFRvdWNoTGlzdDsKIAotY2xhc3MgVG91 Y2hFdmVudCA6IHB1YmxpYyBNb3VzZVJlbGF0ZWRFdmVudCB7CitjbGFzcyBUb3VjaEV2ZW50IDog cHVibGljIFVJRXZlbnRXaXRoS2V5U3RhdGUgewogcHVibGljOgogICAgIHZpcnR1YWwgflRvdWNo RXZlbnQoKTsKIApAQCAtNDUsMTkgKzQ1LDE2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxUb3VjaEV2ZW50PiBjcmVhdGUoVG91Y2hMaXN0KiB0b3VjaGVzLCAKICAgICAgICAgICAg IFRvdWNoTGlzdCogdGFyZ2V0VG91Y2hlcywgVG91Y2hMaXN0KiBjaGFuZ2VkVG91Y2hlcywgCiAg ICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RW aWV3PiB2aWV3LAotICAgICAgICAgICAgaW50IHNjcmVlblgsIGludCBzY3JlZW5ZLCBpbnQgcGFn ZVgsIGludCBwYWdlWSwKICAgICAgICAgICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJv b2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZihuZXcgVG91Y2hFdmVudCh0b3VjaGVzLCB0YXJnZXRUb3VjaGVzLCBjaGFuZ2VkVG91Y2hlcywK LSAgICAgICAgICAgICAgICB0eXBlLCB2aWV3LCBzY3JlZW5YLCBzY3JlZW5ZLCBwYWdlWCwgcGFn ZVksCi0gICAgICAgICAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0YUtleSkp OworICAgICAgICAgICAgICAgIHR5cGUsIHZpZXcsIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXks IG1ldGFLZXkpKTsKICAgICB9CiAKICAgICB2b2lkIGluaXRUb3VjaEV2ZW50KFRvdWNoTGlzdCog dG91Y2hlcywgVG91Y2hMaXN0KiB0YXJnZXRUb3VjaGVzLAogICAgICAgICAgICAgVG91Y2hMaXN0 KiBjaGFuZ2VkVG91Y2hlcywgY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCAKLSAgICAgICAgICAg IFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LCBpbnQgc2NyZWVuWCwgaW50IHNjcmVlblks IAotICAgICAgICAgICAgaW50IGNsaWVudFgsIGludCBjbGllbnRZLAotICAgICAgICAgICAgYm9v bCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5KTsKKyAg ICAgICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiwgYm9vbCBjdHJsS2V5LCBib29sIGFs dEtleSwKKyAgICAgICAgICAgIGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSk7CiAKICAgICBU b3VjaExpc3QqIHRvdWNoZXMoKSBjb25zdCB7IHJldHVybiBtX3RvdWNoZXMuZ2V0KCk7IH0KICAg ICBUb3VjaExpc3QqIHRhcmdldFRvdWNoZXMoKSBjb25zdCB7IHJldHVybiBtX3RhcmdldFRvdWNo ZXMuZ2V0KCk7IH0KQEAgLTY3LDkgKzY0LDggQEAgcHJpdmF0ZToKICAgICBUb3VjaEV2ZW50KCk7 CiAgICAgVG91Y2hFdmVudChUb3VjaExpc3QqIHRvdWNoZXMsIFRvdWNoTGlzdCogdGFyZ2V0VG91 Y2hlcywKICAgICAgICAgICAgIFRvdWNoTGlzdCogY2hhbmdlZFRvdWNoZXMsIGNvbnN0IEF0b21p Y1N0cmluZyYgdHlwZSwKLSAgICAgICAgICAgIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiwgaW50 IHNjcmVlblgsIGludCBzY3JlZW5ZLCBpbnQgcGFnZVgsCi0gICAgICAgICAgICBpbnQgcGFnZVks Ci0gICAgICAgICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0S2V5LCBi b29sIG1ldGFLZXkpOworICAgICAgICAgICAgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+LCBib29s IGN0cmxLZXksIGJvb2wgYWx0S2V5LAorICAgICAgICAgICAgYm9vbCBzaGlmdEtleSwgYm9vbCBt ZXRhS2V5KTsKIAogICAgIHZpcnR1YWwgYm9vbCBpc1RvdWNoRXZlbnQoKSBjb25zdCB7IHJldHVy biB0cnVlOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50Lmlk bCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ub3VjaEV2ZW50LmlkbAppbmRleCAzOWVkZmM4Li45ZjVh MTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVG91Y2hFdmVudC5pZGwKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL1RvdWNoRXZlbnQuaWRsCkBAIC00MSwxMCArNDEsNiBAQCBtb2R1 bGUgZXZlbnRzIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2Fs bFdpdGhEZWZhdWx0VmFsdWVdIFRvdWNoTGlzdCBjaGFuZ2VkVG91Y2hlcywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0 cmluZyB0eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxs V2l0aERlZmF1bHRWYWx1ZV0gRE9NV2luZG93IHZpZXcsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIHNjcmVlblgsIAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRW YWx1ZV0gbG9uZyBzY3JlZW5ZLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0 aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGxvbmcgY2xpZW50WCwgCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIGNs aWVudFksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRo RGVmYXVsdFZhbHVlXSBib29sZWFuIGN0cmxLZXksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBib29sZWFuIGFsdEtleSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFs dWVdIGJvb2xlYW4gc2hpZnRLZXksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5k ZXggMjFlY2YzMi4uZjMyNzAzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApA QCAtMzI4NCw3ICszMjg0LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQo Y29uc3QgUGxhdGZvcm1Ub3VjaEV2ZW50JiBldmVudCkKICAgICAgICAgICAgIFJlZlB0cjxUb3Vj aEV2ZW50PiB0b3VjaEV2ZW50ID0KICAgICAgICAgICAgICAgICBUb3VjaEV2ZW50OjpjcmVhdGUo ZWZmZWN0aXZlVG91Y2hlcy5nZXQoKSwgdGFyZ2V0VG91Y2hlcy5nZXQoKSwgY2hhbmdlZFRvdWNo ZXNbc3RhdGVdLm1fdG91Y2hlcy5nZXQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdGVOYW1lLCB0b3VjaEV2ZW50VGFyZ2V0LT50b05vZGUoKS0+ZG9jdW1lbnQoKS0+ ZGVmYXVsdFZpZXcoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwg MCwgMCwgZXZlbnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwg ZXZlbnQubWV0YUtleSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZl bnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwgZXZlbnQubWV0 YUtleSgpKTsKICAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAgICAgICAg dG91Y2hFdmVudFRhcmdldC0+ZGlzcGF0Y2hFdmVudCh0b3VjaEV2ZW50LmdldCgpLCBlYyk7CiAg ICAgICAgICAgICBkZWZhdWx0UHJldmVudGVkIHw9IHRvdWNoRXZlbnQtPmRlZmF1bHRQcmV2ZW50 ZWQoKTsK