82602 2012-03-29 05:48:01 -0700 Web Inspector: "go to the previous panel" shortcut is painful to maintain 2012-03-29 11:00:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 591093 0 pfeldman 2012-03-29 05:48:01 -0700 Present go back shortcut "Cmd - Left" gets painful to support since we have more and more free flow editing capabilities (where Cmd - Left is handled by the editor). I'm suggesting that we remap it to Cmd - Option - Left (Ctrl - Alt - Left). 591126 1 134567 pfeldman 2012-03-29 06:40:14 -0700 Created attachment 134567 Patch 591188 2 134567 vsevik 2012-03-29 07:49:25 -0700 Comment on attachment 134567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134567&action=review > Source/WebCore/ChangeLog:10 > + Remaping it to Cmd - Option - Left (Ctrl - Alt - Left). Your ChangeLog is inconsistent with the code. 591189 3 134583 pfeldman 2012-03-29 07:50:01 -0700 Created attachment 134583 Patch 591192 4 134583 vsevik 2012-03-29 07:57:51 -0700 Comment on attachment 134583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134583&action=review > Source/WebCore/ChangeLog:10 > + Remaping it to Cmd - Option - Left (Ctrl - Alt - [ (]) ). This looks weird. On the last line: Left -> [ 591197 5 134588 pfeldman 2012-03-29 08:01:37 -0700 Created attachment 134588 Patch 591215 6 134588 webkit-ews 2012-03-29 08:43:32 -0700 Comment on attachment 134588 Patch Attachment 134588 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12193370 591247 7 pfeldman 2012-03-29 09:22:38 -0700 Committed r112539: <http://trac.webkit.org/changeset/112539> 591322 8 134588 vsevik 2012-03-29 11:00:48 -0700 Comment on attachment 134588 Patch Clearing r? 134567 2012-03-29 06:40:14 -0700 2012-03-29 07:49:54 -0700 Patch bug-82602-20120329174012.patch text/plain 10967 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkN2YyZjNhMjQ0MjRl YjE4MWUwYjMyZDg3YTYwYTY3YTdhOGI5My4uYjBmZDFiZDU3ZTRmZTA0ZGY4NmEyYzkyY2FiNDM4 ODk0ZDBmNWZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTI5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6ICJnbyB0byB0aGUgcHJldmlvdXMgcGFuZWwiIHNob3J0Y3V0IGlzIHBhaW5mdWwgdG8gbWFp bnRhaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgy NjAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJl c2VudCBnbyB0byBwcmV2aW91cyBwYW5lbCBzaG9ydGN1dCAiQ21kIC0gTGVmdCIgaXMgcGFpbmZ1 bCB0byBzdXBwb3J0IHNpbmNlIHdlIGhhdmUKKyAgICAgICAgbW9yZSBhbmQgbW9yZSBmcmVlIGZs b3cgZWRpdGluZyBjYXBhYmlsaXRpZXMgKHdoZXJlIENtZCAtIExlZnQgaXMgaGFuZGxlZCBieSB0 aGUgZWRpdG9yKS4KKyAgICAgICAgUmVtYXBpbmcgaXQgdG8gQ21kIC0gT3B0aW9uIC0gTGVmdCAo Q3RybCAtIEFsdCAtIExlZnQpLgorCisgICAgICAgIERyaXZlLWJ5OiBkZS1jYXBpdGFsaXplIGNh cHRpb25zIGZyb20gdGhlIHNldHRpbmdzIHBhbmVsLgorCisgICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9yZWdpc3RlclNob3J0Y3V0cyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNw ZWN0b3JWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkluc3BlY3RvclZpZXcucHJvdG90 eXBlLl9rZXlEb3duKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX3JlZ2lzdGVyU2hv cnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5f Y29udGV4dE1lbnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9yZWdpc3RlclNob3J0Y3V0cyk6CisKIDIwMTItMDMt MjggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNwbGl0IFdl YktpdENTU0tleWZyYW1lUnVsZSBpbnRvIGludGVybmFsIGFuZCBDU1NPTSB0eXBlcyAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBi L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1 NzY3NTU2YjhmMjQyNmNiZTgzZDAyNjg5MjUxMDEzOGU5ZmYzYmMzLi43YWMwMTRkNjk4MGQ1YmJh NDgzOWIxYjQzNTc0Y2RkY2U1NDBlNTBmIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDQx OAp6Y21hRiVnWFBkcW1KUVM2JS10RkM4NTled3BreExeRHYoI2VralJoK1dhVkpVPE4hc31mVTVQ VVB0YXIocEx7bG4KeiRHQyluWGlXQDc0NERrKzM+bE4kYm43QVpDSU18cVgyQHBIMmIhNz5scjlK SWl4XlVYX0dTV0lmYTtQQXBqYXszCnpyOX0qdDNgentLS3pVbXJSJD9ILUVEbzRxbE1CQS1aeClU OCFfMWdBSVdKS2Y8UiErbSY5ez1jZHBBM09oIUNFQgp6b2BzUXZ2MUdhZjMhfnhXK0NxLSRTNkxY ZnJkeld6OGJKbDgmdTMrZm4qNj9pMyZOTTJUdiNYcVFZMTZeYFVJYFgKei1MYFA/TXRpYTh4dlkj KkFvMXo0OyoweyoqSzt0K1pDN1Z3SmczWjlKcEcje3FhdEpSPGIpe0c/WT4lIWwwcEVECkNOQGoh cgoKZGVsdGEgMjMxCnpjbVhAfmxqWWVEbUpRUzZ4Wk1+czhTKXJYNyEoLXRDY2kwezZqeCUxMSty fntTY3c1bVpuQUtrLWUmSEU4TylSOAp6bFZtM0VQdiY4QytrN1VPeUkwdHFBcz91fDFXZnZYJX1i cHVsT29DSkdnK159YVAjI0s1eUZnVykzYUNANFg0TW0KekYhRGd5a3dFR24zIV5iZWh6cjZfb25G a3NyfndrbG82Z0EhVlIyM1cmJXppcmRHQ0lYPkdSb3YlSnx0Q1Jra2xACnJWX2M9bzluNnItUHox RUNmVDNoXksjVGF+XyRhZ0t7RjAxMyk4QV9XKSFmdSNkP15TMyNGYXMtCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggNTBhMzQz ZjgwZWNiOTExOGRlMjliMTYwZTljMzQwZjc5MDExYzJhMC4uYWUzZmQ1NWZhYzlmNDdlNjFiZjI0 MTA5NWViMDQ1NTVmNWMwYTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC01MzksNyArNTM5LDcgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgc2VjdGlvbiA9IFdlYklu c3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNv bnNvbGUiKSk7CiAgICAgICAgIHZhciBrZXlzID0gV2ViSW5zcGVjdG9yLmlzTWFjKCkgPyBbIHNo b3J0Y3V0Sy5uYW1lLCBzaG9ydGN1dEwubmFtZSBdIDogWyBzaG9ydGN1dEwubmFtZSBdOwotICAg ICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoa2V5cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJDbGVhciBDb25zb2xlIikpOworICAgICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoa2V5 cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBjb25zb2xlIikpOwogCiAgICAgICAgIGtl eXMgPSBbCiAgICAgICAgICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKHNob3J0Y3V0Lktl eXMuVGFiKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SW5zcGVjdG9yVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5z cGVjdG9yVmlldy5qcwppbmRleCAwNmIwNTFiYTRhYzc5OGY4OGE0ZDA1NmM4MTZiNWQ1ODk5ZDAw MjJhLi41MmYzMDFlMTI5OTg2NzJmMTVkZTc4MWQ5MGE2OTYyNDJmODVmMDg1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvclZpZXcuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JWaWV3LmpzCkBA IC04OCwyMiArODgsNiBAQCBXZWJJbnNwZWN0b3IuSW5zcGVjdG9yVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgX2tleURvd246IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgc3dpdGNoIChl dmVudC5rZXlJZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICBjYXNlICJMZWZ0IjoKLSAgICAgICAg ICAgICAgICB2YXIgaXNCYWNrS2V5ID0gIWV2ZW50LnNoaWZ0S2V5ICYmIFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LmV2ZW50SGFzQ3RybE9yTWV0YShldmVudCkgJiYgIVdlYkluc3BlY3Rv ci5pc0JlaW5nRWRpdGVkKGV2ZW50LnRhcmdldCk7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQmFj a0tleSAmJiB0aGlzLl9jYW5Hb0JhY2tJbkhpc3RvcnkoKSkgewotICAgICAgICAgICAgICAgICAg ICB0aGlzLl9nb0JhY2tJbkhpc3RvcnkoKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnQucHJl dmVudERlZmF1bHQoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0KLSAgICAgICAgICAgIGNhc2UgIlJpZ2h0IjoKLSAgICAgICAgICAgICAgICB2YXIgaXNGb3J3 YXJkS2V5ID0gIWV2ZW50LnNoaWZ0S2V5ICYmIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 LmV2ZW50SGFzQ3RybE9yTWV0YShldmVudCkgJiYgIVdlYkluc3BlY3Rvci5pc0JlaW5nRWRpdGVk KGV2ZW50LnRhcmdldCk7Ci0gICAgICAgICAgICAgICAgaWYgKGlzRm9yd2FyZEtleSAmJiB0aGlz Ll9jYW5Hb0ZvcndhcmRJbkhpc3RvcnkoKSkgewotICAgICAgICAgICAgICAgICAgICB0aGlzLl9n b0ZvcndhcmRJbkhpc3RvcnkoKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERl ZmF1bHQoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0KICAg ICAgICAgICAgIC8vIFdpbmRvd3MgYW5kIE1hYyBoYXZlIHR3byBkaWZmZXJlbnQgZGVmaW5pdGlv bnMgb2YgWywgc28gYWNjZXB0IGJvdGguCiAgICAgICAgICAgICBjYXNlICJVKzAwNUIiOgogICAg ICAgICAgICAgY2FzZSAiVSswMERCIjogLy8gWyBrZXkKQEAgLTExMiw3ICs5NiwxNCBAQCBXZWJJ bnNwZWN0b3IuSW5zcGVjdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAg IHZhciBpbmRleCA9IHRoaXMuX3BhbmVsT3JkZXIuaW5kZXhPZih0aGlzLmN1cnJlbnRQYW5lbCgp KTsKICAgICAgICAgICAgICAgICAgICAgaW5kZXggPSAoaW5kZXggPT09IDApID8gdGhpcy5fcGFu ZWxPcmRlci5sZW5ndGggLSAxIDogaW5kZXggLSAxOwogICAgICAgICAgICAgICAgICAgICB0aGlz Ll9wYW5lbE9yZGVyW2luZGV4XS50b29sYmFySXRlbS5jbGljaygpOwotICAgICAgICAgICAgICAg ICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgICAgICAgICAgICBldmVudC5j b25zdW1lKCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgICAgICB2YXIgaXNHb0JhY2sgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5ldmVudEhhc0N0cmxPck1ldGEoZXZlbnQpICYmIGV2ZW50LmFsdEtleTsKKyAgICAg ICAgICAgICAgICBpZiAoaXNHb0JhY2sgJiYgdGhpcy5fY2FuR29CYWNrSW5IaXN0b3J5KCkpIHsK KyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZ29CYWNrSW5IaXN0b3J5KCk7CisgICAgICAgICAg ICAgICAgICAgIGV2ZW50LmNvbnN1bWUoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAKQEAgLTEyNCw5ICsxMTUsMTUgQEAgV2ViSW5zcGVjdG9yLkluc3BlY3Rv clZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB2YXIgaW5kZXggPSB0aGlz Ll9wYW5lbE9yZGVyLmluZGV4T2YodGhpcy5jdXJyZW50UGFuZWwoKSk7CiAgICAgICAgICAgICAg ICAgICAgIGluZGV4ID0gKGluZGV4ICsgMSkgJSB0aGlzLl9wYW5lbE9yZGVyLmxlbmd0aDsKICAg ICAgICAgICAgICAgICAgICAgdGhpcy5fcGFuZWxPcmRlcltpbmRleF0udG9vbGJhckl0ZW0uY2xp Y2soKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAg ICAgICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgpOworICAgICAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdmFyIGlzR29Gb3J3YXJk ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRhKGV2ZW50 KSAmJiBldmVudC5hbHRLZXk7CisgICAgICAgICAgICAgICAgaWYgKGlzR29Gb3J3YXJkICYmIHRo aXMuX2NhbkdvRm9yd2FyZEluSGlzdG9yeSgpKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMu X2dvRm9yd2FyZEluSGlzdG9yeSgpOworICAgICAgICAgICAgICAgICAgICBldmVudC5jb25zdW1l KCk7CiAgICAgICAgICAgICAgICAgfQotICAgIAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggOWYzNDQwYjljYzM0ZGY0ZWFhMTUzOGQxODMzN2M0ZjE3 N2MyOTM1MS4uMzk1MThiM2FmMTg5Y2IyNGNmZjNkOWI0Nzg5MTM3ZjgwZjViOTJhMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTEzOCwxMCArMTM4LDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlv bihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQoZXZhbHVhdGVJ bkNvbnNvbGVTaG9ydGN1dC5rZXksIHRoaXMuX2V2YWx1YXRlU2VsZWN0aW9uSW5Db25zb2xlLmJp bmQodGhpcykpOwogCiAgICAgdmFyIG9wZW5SZXNvdXJjZVNob3J0Y3V0ID0gV2ViSW5zcGVjdG9y Lk9wZW5SZXNvdXJjZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIGhlbHBTZWN0aW9uLmFk ZEtleShvcGVuUmVzb3VyY2VTaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9w ZW4gU2NyaXB0IikpOworICAgIGhlbHBTZWN0aW9uLmFkZEtleShvcGVuUmVzb3VyY2VTaG9ydGN1 dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9wZW4gc2NyaXB0IikpOwogCiAgICAgdmFy IHNjcmlwdE91dGxpbmVTaG9ydGN1dCA9IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURp YWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIGhlbHBTZWN0aW9uLmFkZEtleShzY3JpcHRPdXRs aW5lU2hvcnRjdXQubmFtZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyB0byBGdW5jdGlvbiIp KTsKKyAgICBoZWxwU2VjdGlvbi5hZGRLZXkoc2NyaXB0T3V0bGluZVNob3J0Y3V0Lm5hbWUsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiR28gdG8gZnVuY3Rpb24iKSk7CiAKICAgICB2YXIgcGFuZWxF bmFibGVySGVhZGluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiWW91IG5lZWQgdG8gZW5hYmxl IGRlYnVnZ2luZyBiZWZvcmUgeW91IGNhbiB1c2UgdGhlIFNjcmlwdHMgcGFuZWwuIik7CiAgICAg dmFyIHBhbmVsRW5hYmxlckRpc2NsYWltZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVuYWJs aW5nIGRlYnVnZ2luZyB3aWxsIG1ha2Ugc2NyaXB0cyBydW4gc2xvd2VyLiIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4 IDFlOWQ4NjAzNTQ4NTE2YjhkMDZlMjQyNzhiNWFlODVlZWI3OWE3Y2UuLmRlYmQyOGZmNjZhMWVi YjI5M2Q5NTVlMDk2MjQ5ZDU4MmQ2MjgzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTI3MSwxMSArMjcxLDExIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAo SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNhblNhdmVBcygpKSB7CiAgICAgICAgICAgICB0aGlzLl9z aG9ydGN1dHNbc2hvcnRjdXQubWFrZUtleSgicyIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0 aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhpcyk7Ci0gICAgICAgICAgICBzZWN0aW9uLmFkZEtleShz aG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJzIiwgbW9kaWZpZXJzLkN0cmxPck1ldGEpLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUgVGltZWxpbmUgZGF0YVx1MjAyNiIpKTsKKyAgICAgICAg ICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoInMiLCBtb2RpZmll cnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSB0aW1lbGluZSBkYXRh IikpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0Lm1ha2VL ZXkoIm8iLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVu dC5jbGljay5iaW5kKHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQpOwotICAgICAgICBzZWN0aW9u LmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJvIiwgbW9kaWZpZXJzLkN0cmxPck1l dGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgVGltZWxpbmUgZGF0YVx1MjAyNiIpKTsK KyAgICAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygibyIsIG1v ZGlmaWVycy5DdHJsT3JNZXRhKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIHRpbWVsaW5l IGRhdGEiKSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVGaWxlU2VsZWN0b3I6IGZ1bmN0aW9uKCkK QEAgLTI5Niw4ICsyOTYsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNv bnRleHRNZW51KCk7CiAgICAgICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2FuU2F2ZUFz KCkpCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJlNhdmUgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxlLmJpbmQo dGhpcykpOwotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0 cmluZygiTCZvYWQgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9maWxlU2VsZWN0b3JFbGVt ZW50LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCkpOworICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUgVGltZWxp bmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhpcykpOworICAgICAgICBj b250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZCBUaW1lbGlu ZSBkYXRhXHUyMDI2IiksIHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQuY2xpY2suYmluZCh0aGlz Ll9maWxlU2VsZWN0b3JFbGVtZW50KSk7CiAgICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQp OwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMKaW5kZXggOTM3MzA1OTkzOTZlYWM0MWJkYzhhYzY5MTIwMjZlODk0MDg1ZjIzZC4u MzEyZDA5ZjA0OGVkN2EzNjM4OWJlMjJlNWEwMDI4NmQ5M2I2MWQ5MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTY1Miw3ICs2NTIs MTQgQEAgV2ViSW5zcGVjdG9yLl9yZWdpc3RlclNob3J0Y3V0cyA9IGZ1bmN0aW9uKCkKICAgICAg ICAgc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygiXSIsIHNob3J0Y3V0Lk1vZGlmaWVycy5DdHJs T3JNZXRhKSwKICAgICAgICAgc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygiWyIsIHNob3J0Y3V0 Lk1vZGlmaWVycy5DdHJsT3JNZXRhKQogICAgIF07Ci0gICAgc2VjdGlvbi5hZGRSZWxhdGVkS2V5 cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5leHQvcHJldmlvdXMgcGFuZWwiKSk7Cisg ICAgc2VjdGlvbi5hZGRSZWxhdGVkS2V5cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdv IHRvIHRoZSBwYW5lbCB0byB0aGUgbGVmdC9yaWdodCIpKTsKKworICAgIHZhciBrZXlzID0gWwor ICAgICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJbIiwgc2hvcnRjdXQuTW9kaWZpZXJz LkN0cmxPck1ldGEgfCBzaG9ydGN1dC5Nb2RpZmllcnMuQWx0KSwKKyAgICAgICAgc2hvcnRjdXQu c2hvcnRjdXRUb1N0cmluZygiXSIsIHNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhIHwgc2hv cnRjdXQuTW9kaWZpZXJzLkFsdCkKKyAgICBdOworICAgIHNlY3Rpb24uYWRkUmVsYXRlZEtleXMo a2V5cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyBiYWNrL2ZvcndhcmQgaW4gcGFuZWwgaGlz dG9yeSIpKTsKKwogICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmco c2hvcnRjdXQuS2V5cy5Fc2MpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvZ2dsZSBjb25zb2xl IikpOwogICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoImYiLCBz aG9ydGN1dC5Nb2RpZmllcnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vh cmNoIikpOwogICAgIApAQCAtNjY4LDcgKzY3NSw3IEBAIFdlYkluc3BlY3Rvci5fcmVnaXN0ZXJT aG9ydGN1dHMgPSBmdW5jdGlvbigpCiAgICAgfQogCiAgICAgdmFyIGdvVG9TaG9ydGN1dCA9IFdl Ykluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIHNlY3Rpb24u YWRkS2V5KGdvVG9TaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdvIHRvIExp bmUiKSk7CisgICAgc2VjdGlvbi5hZGRLZXkoZ29Ub1Nob3J0Y3V0Lm5hbWUsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiR28gdG8gbGluZSIpKTsKIH0KIAogV2ViSW5zcGVjdG9yLmRvY3VtZW50S2V5 RG93biA9IGZ1bmN0aW9uKGV2ZW50KQo= 134583 2012-03-29 07:50:01 -0700 2012-03-29 08:01:30 -0700 Patch bug-82602-20120329184959.patch text/plain 10969 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkN2YyZjNhMjQ0MjRl YjE4MWUwYjMyZDg3YTYwYTY3YTdhOGI5My4uZTA3ZTRiZGQ2Nzg3NzdlN2Y5OGJhMTk4OWE5NzMx MTMzZWU2MGNhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTI5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6ICJnbyB0byB0aGUgcHJldmlvdXMgcGFuZWwiIHNob3J0Y3V0IGlzIHBhaW5mdWwgdG8gbWFp bnRhaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgy NjAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJl c2VudCBnbyB0byBwcmV2aW91cyBwYW5lbCBzaG9ydGN1dCAiQ21kIC0gTGVmdCIgaXMgcGFpbmZ1 bCB0byBzdXBwb3J0IHNpbmNlIHdlIGhhdmUKKyAgICAgICAgbW9yZSBhbmQgbW9yZSBmcmVlIGZs b3cgZWRpdGluZyBjYXBhYmlsaXRpZXMgKHdoZXJlIENtZCAtIExlZnQgaXMgaGFuZGxlZCBieSB0 aGUgZWRpdG9yKS4KKyAgICAgICAgUmVtYXBpbmcgaXQgdG8gQ21kIC0gT3B0aW9uIC0gTGVmdCAo Q3RybCAtIEFsdCAtIFsgKF0pICkuCisKKyAgICAgICAgRHJpdmUtYnk6IGRlLWNhcGl0YWxpemUg Y2FwdGlvbnMgZnJvbSB0aGUgc2V0dGluZ3MgcGFuZWwuCisKKyAgICAgICAgKiBFbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0lu c3BlY3RvclZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5zcGVjdG9yVmlldy5wcm90 b3R5cGUuX2tleURvd24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fcmVnaXN0ZXJT aG9ydGN1dHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl Ll9jb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKwogMjAxMi0w My0yOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgU3BsaXQg V2ViS2l0Q1NTS2V5ZnJhbWVSdWxlIGludG8gaW50ZXJuYWwgYW5kIENTU09NIHR5cGVzIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4 IDU3Njc1NTZiOGYyNDI2Y2JlODNkMDI2ODkyNTEwMTM4ZTlmZjNiYzMuLjdhYzAxNGQ2OTgwZDVi YmE0ODM5YjFiNDM1NzRjZGRjZTU0MGU1MGYgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEg NDE4CnpjbWFGJWdYUGRxbUpRUzYlLXRGQzg1OV53cGt4TF5EdigjZWtqUmgrV2FWSlU8TiFzfWZV NVBVUHRhcihwTHtsbgp6JEdDKW5YaVdANzQ0RGsrMz5sTiRibjdBWkNJTXxxWDJAcEgyYiE3Pmxy OUpJaXheVVhfR1NXSWZhO1BBcGphezMKenI5fSp0M2B6e0tLelVtclIkP0gtRURvNHFsTUJBLVp4 KVQ4IV8xZ0FJV0pLZjxSISttJjl7PWNkcEEzT2ghQ0VCCnpvYHNRdnYxR2FmMyF+eFcrQ3EtJFM2 TFhmcmR6V3o4YkpsOCZ1Mytmbio2P2kzJk5NMlR2I1hxUVkxNl5gVUlgWAp6LUxgUD9NdGlhOHh2 WSMqQW8xejQ7KjB7KipLO3QrWkM3VndKZzNaOUpwRyN7cWF0SlI8Yil7Rz9ZPiUhbDBwRUQKQ05A aiFyCgpkZWx0YSAyMzEKemNtWEB+bGpZZURtSlFTNnhaTX5zOFMpclg3ISgtdENjaTB7Nmp4JTEx K3J+e1NjdzVtWm5BS2stZSZIRThPKVI4CnpsVm0zRVB2JjhDK2s3VU95STB0cUFzP3V8MVdmdlgl fWJwdWxPb0NKR2crXn1hUCMjSzV5RmdXKTNhQ0A0WDRNbQp6RiFEZ3lrd0VHbjMhXmJlaHpyNl9v bkZrc3J+d2tsbzZnQSFWUjIzVyYlemlyZEdDSVg+R1JvdiVKfHRDUmtrbEAKclZfYz1vOW42ci1Q ejFFQ2ZUM2heSyNUYX5fJGFnS3tGMDEzKThBX1cpIWZ1I2Q/XlMzI0Zhcy0KCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA1MGEz NDNmODBlY2I5MTE4ZGUyOWIxNjBlOWMzNDBmNzkwMTFjMmEwLi5hZTNmZDU1ZmFjOWY0N2U2MWJm MjQxMDk1ZWIwNDU1NWY1YzBhNzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTUzOSw3ICs1MzksNyBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBzZWN0aW9uID0gV2Vi SW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5zZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygi Q29uc29sZSIpKTsKICAgICAgICAgdmFyIGtleXMgPSBXZWJJbnNwZWN0b3IuaXNNYWMoKSA/IFsg c2hvcnRjdXRLLm5hbWUsIHNob3J0Y3V0TC5uYW1lIF0gOiBbIHNob3J0Y3V0TC5uYW1lIF07Ci0g ICAgICAgIHNlY3Rpb24uYWRkQWx0ZXJuYXRlS2V5cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkNsZWFyIENvbnNvbGUiKSk7CisgICAgICAgIHNlY3Rpb24uYWRkQWx0ZXJuYXRlS2V5cyhr ZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIGNvbnNvbGUiKSk7CiAKICAgICAgICAg a2V5cyA9IFsKICAgICAgICAgICAgIHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoc2hvcnRjdXQu S2V5cy5UYWIpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9JbnNwZWN0b3JWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9J bnNwZWN0b3JWaWV3LmpzCmluZGV4IDA2YjA1MWJhNGFjNzk4Zjg4YTRkMDU2YzgxNmI1ZDU4OTlk MDAyMmEuLjUyZjMwMWUxMjk5ODY3MmYxNWRlNzgxZDkwYTY5NjI0MmY4NWYwODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvclZpZXcuanMK QEAgLTg4LDIyICs4OCw2IEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JWaWV3LnByb3RvdHlwZSA9 IHsKICAgICBfa2V5RG93bjogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBzd2l0Y2gg KGV2ZW50LmtleUlkZW50aWZpZXIpIHsKLSAgICAgICAgICAgIGNhc2UgIkxlZnQiOgotICAgICAg ICAgICAgICAgIHZhciBpc0JhY2tLZXkgPSAhZXZlbnQuc2hpZnRLZXkgJiYgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRhKGV2ZW50KSAmJiAhV2ViSW5zcGVj dG9yLmlzQmVpbmdFZGl0ZWQoZXZlbnQudGFyZ2V0KTsKLSAgICAgICAgICAgICAgICBpZiAoaXNC YWNrS2V5ICYmIHRoaXMuX2NhbkdvQmFja0luSGlzdG9yeSgpKSB7Ci0gICAgICAgICAgICAgICAg ICAgIHRoaXMuX2dvQmFja0luSGlzdG9yeSgpOwotICAgICAgICAgICAgICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVh azsKLQotICAgICAgICAgICAgY2FzZSAiUmlnaHQiOgotICAgICAgICAgICAgICAgIHZhciBpc0Zv cndhcmRLZXkgPSAhZXZlbnQuc2hpZnRLZXkgJiYgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRj dXQuZXZlbnRIYXNDdHJsT3JNZXRhKGV2ZW50KSAmJiAhV2ViSW5zcGVjdG9yLmlzQmVpbmdFZGl0 ZWQoZXZlbnQudGFyZ2V0KTsKLSAgICAgICAgICAgICAgICBpZiAoaXNGb3J3YXJkS2V5ICYmIHRo aXMuX2NhbkdvRm9yd2FyZEluSGlzdG9yeSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMu X2dvRm9yd2FyZEluSGlzdG9yeSgpOwotICAgICAgICAgICAgICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKLQog ICAgICAgICAgICAgLy8gV2luZG93cyBhbmQgTWFjIGhhdmUgdHdvIGRpZmZlcmVudCBkZWZpbml0 aW9ucyBvZiBbLCBzbyBhY2NlcHQgYm90aC4KICAgICAgICAgICAgIGNhc2UgIlUrMDA1QiI6CiAg ICAgICAgICAgICBjYXNlICJVKzAwREIiOiAvLyBbIGtleQpAQCAtMTEyLDcgKzk2LDE0IEBAIFdl Ykluc3BlY3Rvci5JbnNwZWN0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAg ICAgdmFyIGluZGV4ID0gdGhpcy5fcGFuZWxPcmRlci5pbmRleE9mKHRoaXMuY3VycmVudFBhbmVs KCkpOwogICAgICAgICAgICAgICAgICAgICBpbmRleCA9IChpbmRleCA9PT0gMCkgPyB0aGlzLl9w YW5lbE9yZGVyLmxlbmd0aCAtIDEgOiBpbmRleCAtIDE7CiAgICAgICAgICAgICAgICAgICAgIHRo aXMuX3BhbmVsT3JkZXJbaW5kZXhdLnRvb2xiYXJJdGVtLmNsaWNrKCk7Ci0gICAgICAgICAgICAg ICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50 LmNvbnN1bWUoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IH0KKworICAgICAgICAgICAgICAgIHZhciBpc0dvQmFjayA9IFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LmV2ZW50SGFzQ3RybE9yTWV0YShldmVudCkgJiYgZXZlbnQuYWx0S2V5OworICAg ICAgICAgICAgICAgIGlmIChpc0dvQmFjayAmJiB0aGlzLl9jYW5Hb0JhY2tJbkhpc3RvcnkoKSkg eworICAgICAgICAgICAgICAgICAgICB0aGlzLl9nb0JhY2tJbkhpc3RvcnkoKTsKKyAgICAgICAg ICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICBicmVhazsKIApAQCAtMTI0LDkgKzExNSwxNSBAQCBXZWJJbnNwZWN0b3IuSW5zcGVj dG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHZhciBpbmRleCA9IHRo aXMuX3BhbmVsT3JkZXIuaW5kZXhPZih0aGlzLmN1cnJlbnRQYW5lbCgpKTsKICAgICAgICAgICAg ICAgICAgICAgaW5kZXggPSAoaW5kZXggKyAxKSAlIHRoaXMuX3BhbmVsT3JkZXIubGVuZ3RoOwog ICAgICAgICAgICAgICAgICAgICB0aGlzLl9wYW5lbE9yZGVyW2luZGV4XS50b29sYmFySXRlbS5j bGljaygpOwotICAgICAgICAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAg ICAgICAgICAgICAgICAgICBldmVudC5jb25zdW1lKCk7CisgICAgICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICB2YXIgaXNHb0Zvcndh cmQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5ldmVudEhhc0N0cmxPck1ldGEoZXZl bnQpICYmIGV2ZW50LmFsdEtleTsKKyAgICAgICAgICAgICAgICBpZiAoaXNHb0ZvcndhcmQgJiYg dGhpcy5fY2FuR29Gb3J3YXJkSW5IaXN0b3J5KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhp cy5fZ29Gb3J3YXJkSW5IaXN0b3J5KCk7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50LmNvbnN1 bWUoKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA5ZjM0NDBiOWNjMzRkZjRlYWExNTM4ZDE4MzM3YzRm MTc3YzI5MzUxLi4zOTUxOGIzYWYxODljYjI0Y2ZmM2Q5YjQ3ODkxMzdmODBmNWI5MmEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cwpAQCAtMTM4LDEwICsxMzgsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0 aW9uKHByZXNlbnRhdGlvbk1vZGVsKQogICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dChldmFsdWF0 ZUluQ29uc29sZVNob3J0Y3V0LmtleSwgdGhpcy5fZXZhbHVhdGVTZWxlY3Rpb25JbkNvbnNvbGUu YmluZCh0aGlzKSk7CiAKICAgICB2YXIgb3BlblJlc291cmNlU2hvcnRjdXQgPSBXZWJJbnNwZWN0 b3IuT3BlblJlc291cmNlRGlhbG9nLmNyZWF0ZVNob3J0Y3V0KCk7Ci0gICAgaGVscFNlY3Rpb24u YWRkS2V5KG9wZW5SZXNvdXJjZVNob3J0Y3V0Lm5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi T3BlbiBTY3JpcHQiKSk7CisgICAgaGVscFNlY3Rpb24uYWRkS2V5KG9wZW5SZXNvdXJjZVNob3J0 Y3V0Lm5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3BlbiBzY3JpcHQiKSk7CiAKICAgICB2 YXIgc2NyaXB0T3V0bGluZVNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRPdXRsaW5l RGlhbG9nLmNyZWF0ZVNob3J0Y3V0KCk7Ci0gICAgaGVscFNlY3Rpb24uYWRkS2V5KHNjcmlwdE91 dGxpbmVTaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdvIHRvIEZ1bmN0aW9u IikpOworICAgIGhlbHBTZWN0aW9uLmFkZEtleShzY3JpcHRPdXRsaW5lU2hvcnRjdXQubmFtZSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyB0byBmdW5jdGlvbiIpKTsKIAogICAgIHZhciBwYW5l bEVuYWJsZXJIZWFkaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJZb3UgbmVlZCB0byBlbmFi bGUgZGVidWdnaW5nIGJlZm9yZSB5b3UgY2FuIHVzZSB0aGUgU2NyaXB0cyBwYW5lbC4iKTsKICAg ICB2YXIgcGFuZWxFbmFibGVyRGlzY2xhaW1lciA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRW5h YmxpbmcgZGVidWdnaW5nIHdpbGwgbWFrZSBzY3JpcHRzIHJ1biBzbG93ZXIuIik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5k ZXggMWU5ZDg2MDM1NDg1MTZiOGQwNmUyNDI3OGI1YWU4NWVlYjc5YTdjZS4uZGViZDI4ZmY2NmEx ZWJiMjkzZDk1NWUwOTYyNDlkNTgyZDYyODNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtMjcxLDExICsyNzEsMTEg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGlm IChJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2FuU2F2ZUFzKCkpIHsKICAgICAgICAgICAgIHRoaXMu X3Nob3J0Y3V0c1tzaG9ydGN1dC5tYWtlS2V5KCJzIiwgbW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9 IHRoaXMuX3NhdmVUb0ZpbGUuYmluZCh0aGlzKTsKLSAgICAgICAgICAgIHNlY3Rpb24uYWRkS2V5 KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoInMiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSksIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSBUaW1lbGluZSBkYXRhXHUyMDI2IikpOworICAgICAg ICAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygicyIsIG1vZGlm aWVycy5DdHJsT3JNZXRhKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTYXZlIHRpbWVsaW5lIGRh dGEiKSk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXQubWFr ZUtleSgibyIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0aGlzLl9maWxlU2VsZWN0b3JFbGVt ZW50LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCk7Ci0gICAgICAgIHNlY3Rp b24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoIm8iLCBtb2RpZmllcnMuQ3RybE9y TWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZCBUaW1lbGluZSBkYXRhXHUyMDI2Iikp OworICAgICAgICBzZWN0aW9uLmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJvIiwg bW9kaWZpZXJzLkN0cmxPck1ldGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgdGltZWxp bmUgZGF0YSIpKTsKICAgICB9LAogCiAgICAgX2NyZWF0ZUZpbGVTZWxlY3RvcjogZnVuY3Rpb24o KQpAQCAtMjk2LDggKzI5Niw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnUoKTsKICAgICAgICAgaWYgKEluc3BlY3RvckZyb250ZW5kSG9zdC5jYW5TYXZl QXMoKSkKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCImU2F2ZSBUaW1lbGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX3NhdmVUb0ZpbGUuYmlu ZCh0aGlzKSk7Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJMJm9hZCBUaW1lbGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX2ZpbGVTZWxlY3RvckVs ZW1lbnQuY2xpY2suYmluZCh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50KSk7CisgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSBUaW1l bGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX3NhdmVUb0ZpbGUuYmluZCh0aGlzKSk7CisgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIFRpbWVs aW5lIGRhdGFcdTIwMjYiKSwgdGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudC5jbGljay5iaW5kKHRo aXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQpKTsKICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVu dCk7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwppbmRleCA5MzczMDU5OTM5NmVhYzQxYmRjOGFjNjkxMjAyNmU4OTQwODVmMjNk Li4zMTJkMDlmMDQ4ZWQ3YTM2Mzg5YmUyMmU1YTAwMjg2ZDkzYjYxZDkwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNjUyLDcgKzY1 MiwxNCBAQCBXZWJJbnNwZWN0b3IuX3JlZ2lzdGVyU2hvcnRjdXRzID0gZnVuY3Rpb24oKQogICAg ICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJdIiwgc2hvcnRjdXQuTW9kaWZpZXJzLkN0 cmxPck1ldGEpLAogICAgICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJbIiwgc2hvcnRj dXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpCiAgICAgXTsKLSAgICBzZWN0aW9uLmFkZFJlbGF0ZWRL ZXlzKGtleXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTmV4dC9wcmV2aW91cyBwYW5lbCIpKTsK KyAgICBzZWN0aW9uLmFkZFJlbGF0ZWRLZXlzKGtleXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi R28gdG8gdGhlIHBhbmVsIHRvIHRoZSBsZWZ0L3JpZ2h0IikpOworCisgICAgdmFyIGtleXMgPSBb CisgICAgICAgIHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoIlsiLCBzaG9ydGN1dC5Nb2RpZmll cnMuQ3RybE9yTWV0YSB8IHNob3J0Y3V0Lk1vZGlmaWVycy5BbHQpLAorICAgICAgICBzaG9ydGN1 dC5zaG9ydGN1dFRvU3RyaW5nKCJdIiwgc2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEgfCBz aG9ydGN1dC5Nb2RpZmllcnMuQWx0KQorICAgIF07CisgICAgc2VjdGlvbi5hZGRSZWxhdGVkS2V5 cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdvIGJhY2svZm9yd2FyZCBpbiBwYW5lbCBo aXN0b3J5IikpOworCiAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmlu ZyhzaG9ydGN1dC5LZXlzLkVzYyksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVG9nZ2xlIGNvbnNv bGUiKSk7CiAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygiZiIs IHNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT ZWFyY2giKSk7CiAgICAgCkBAIC02NjgsNyArNjc1LDcgQEAgV2ViSW5zcGVjdG9yLl9yZWdpc3Rl clNob3J0Y3V0cyA9IGZ1bmN0aW9uKCkKICAgICB9CiAKICAgICB2YXIgZ29Ub1Nob3J0Y3V0ID0g V2ViSW5zcGVjdG9yLkdvVG9MaW5lRGlhbG9nLmNyZWF0ZVNob3J0Y3V0KCk7Ci0gICAgc2VjdGlv bi5hZGRLZXkoZ29Ub1Nob3J0Y3V0Lm5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiR28gdG8g TGluZSIpKTsKKyAgICBzZWN0aW9uLmFkZEtleShnb1RvU2hvcnRjdXQubmFtZSwgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJHbyB0byBsaW5lIikpOwogfQogCiBXZWJJbnNwZWN0b3IuZG9jdW1lbnRL ZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpCg== 134588 2012-03-29 08:01:37 -0700 2012-03-29 11:00:48 -0700 Patch bug-82602-20120329190136.patch text/plain 10973 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkN2YyZjNhMjQ0MjRl YjE4MWUwYjMyZDg3YTYwYTY3YTdhOGI5My4uMjZiMjgyODI4YTllNDY1ZmVmZjBiMTBiNmUzNDIy NWI5MWI1MzI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTI5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6ICJnbyB0byB0aGUgcHJldmlvdXMgcGFuZWwiIHNob3J0Y3V0IGlzIHBhaW5mdWwgdG8gbWFp bnRhaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgy NjAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJl c2VudCBnbyB0byBwcmV2aW91cyBwYW5lbCBzaG9ydGN1dCAiQ21kIC0gTGVmdCIgaXMgcGFpbmZ1 bCB0byBzdXBwb3J0IHNpbmNlIHdlIGhhdmUKKyAgICAgICAgbW9yZSBhbmQgbW9yZSBmcmVlIGZs b3cgZWRpdGluZyBjYXBhYmlsaXRpZXMgKHdoZXJlIENtZCAtIExlZnQgaXMgaGFuZGxlZCBieSB0 aGUgZWRpdG9yKS4KKyAgICAgICAgUmVtYXBpbmcgaXQgdG8gQ21kIC0gT3B0aW9uIC0gWyAoXSkg LyAgKEN0cmwgLSBBbHQgLSBbIChdKSApLgorCisgICAgICAgIERyaXZlLWJ5OiBkZS1jYXBpdGFs aXplIGNhcHRpb25zIGZyb20gdGhlIHNldHRpbmdzIHBhbmVsLgorCisgICAgICAgICogRW5nbGlz aC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJv dG90eXBlLl9yZWdpc3RlclNob3J0Y3V0cyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9JbnNwZWN0b3JWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkluc3BlY3RvclZpZXcu cHJvdG90eXBlLl9rZXlEb3duKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX3JlZ2lz dGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZS5fY29udGV4dE1lbnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9yZWdpc3RlclNob3J0Y3V0cyk6CisKIDIw MTItMDMtMjggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNw bGl0IFdlYktpdENTU0tleWZyYW1lUnVsZSBpbnRvIGludGVybmFsIGFuZCBDU1NPTSB0eXBlcyAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpp bmRleCA1NzY3NTU2YjhmMjQyNmNiZTgzZDAyNjg5MjUxMDEzOGU5ZmYzYmMzLi43YWMwMTRkNjk4 MGQ1YmJhNDgzOWIxYjQzNTc0Y2RkY2U1NDBlNTBmIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRl bHRhIDQxOAp6Y21hRiVnWFBkcW1KUVM2JS10RkM4NTled3BreExeRHYoI2VralJoK1dhVkpVPE4h c31mVTVQVVB0YXIocEx7bG4KeiRHQyluWGlXQDc0NERrKzM+bE4kYm43QVpDSU18cVgyQHBIMmIh Nz5scjlKSWl4XlVYX0dTV0lmYTtQQXBqYXszCnpyOX0qdDNgentLS3pVbXJSJD9ILUVEbzRxbE1C QS1aeClUOCFfMWdBSVdKS2Y8UiErbSY5ez1jZHBBM09oIUNFQgp6b2BzUXZ2MUdhZjMhfnhXK0Nx LSRTNkxYZnJkeld6OGJKbDgmdTMrZm4qNj9pMyZOTTJUdiNYcVFZMTZeYFVJYFgKei1MYFA/TXRp YTh4dlkjKkFvMXo0OyoweyoqSzt0K1pDN1Z3SmczWjlKcEcje3FhdEpSPGIpe0c/WT4lIWwwcEVE CkNOQGohcgoKZGVsdGEgMjMxCnpjbVhAfmxqWWVEbUpRUzZ4Wk1+czhTKXJYNyEoLXRDY2kwezZq eCUxMStyfntTY3c1bVpuQUtrLWUmSEU4TylSOAp6bFZtM0VQdiY4QytrN1VPeUkwdHFBcz91fDFX ZnZYJX1icHVsT29DSkdnK159YVAjI0s1eUZnVykzYUNANFg0TW0KekYhRGd5a3dFR24zIV5iZWh6 cjZfb25Ga3NyfndrbG82Z0EhVlIyM1cmJXppcmRHQ0lYPkdSb3YlSnx0Q1Jra2xACnJWX2M9bzlu NnItUHoxRUNmVDNoXksjVGF+XyRhZ0t7RjAxMyk4QV9XKSFmdSNkP15TMyNGYXMtCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXgg NTBhMzQzZjgwZWNiOTExOGRlMjliMTYwZTljMzQwZjc5MDExYzJhMC4uYWUzZmQ1NWZhYzlmNDdl NjFiZjI0MTA5NWViMDQ1NTVmNWMwYTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC01MzksNyArNTM5LDcgQEAgV2ViSW5z cGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgc2VjdGlvbiA9 IFdlYkluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkNvbnNvbGUiKSk7CiAgICAgICAgIHZhciBrZXlzID0gV2ViSW5zcGVjdG9yLmlzTWFjKCkg PyBbIHNob3J0Y3V0Sy5uYW1lLCBzaG9ydGN1dEwubmFtZSBdIDogWyBzaG9ydGN1dEwubmFtZSBd OwotICAgICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoa2V5cywgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDbGVhciBDb25zb2xlIikpOworICAgICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtl eXMoa2V5cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBjb25zb2xlIikpOwogCiAgICAg ICAgIGtleXMgPSBbCiAgICAgICAgICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKHNob3J0 Y3V0LktleXMuVGFiKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSW5zcGVjdG9yVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5zcGVjdG9yVmlldy5qcwppbmRleCAwNmIwNTFiYTRhYzc5OGY4OGE0ZDA1NmM4MTZiNWQ1 ODk5ZDAwMjJhLi41MmYzMDFlMTI5OTg2NzJmMTVkZTc4MWQ5MGE2OTYyNDJmODVmMDg1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvclZpZXcu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JWaWV3 LmpzCkBAIC04OCwyMiArODgsNiBAQCBXZWJJbnNwZWN0b3IuSW5zcGVjdG9yVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgX2tleURvd246IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgc3dp dGNoIChldmVudC5rZXlJZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICBjYXNlICJMZWZ0IjoKLSAg ICAgICAgICAgICAgICB2YXIgaXNCYWNrS2V5ID0gIWV2ZW50LnNoaWZ0S2V5ICYmIFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0LmV2ZW50SGFzQ3RybE9yTWV0YShldmVudCkgJiYgIVdlYklu c3BlY3Rvci5pc0JlaW5nRWRpdGVkKGV2ZW50LnRhcmdldCk7Ci0gICAgICAgICAgICAgICAgaWYg KGlzQmFja0tleSAmJiB0aGlzLl9jYW5Hb0JhY2tJbkhpc3RvcnkoKSkgewotICAgICAgICAgICAg ICAgICAgICB0aGlzLl9nb0JhY2tJbkhpc3RvcnkoKTsKLSAgICAgICAgICAgICAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0KLSAgICAgICAgICAgIGNhc2UgIlJpZ2h0IjoKLSAgICAgICAgICAgICAgICB2YXIg aXNGb3J3YXJkS2V5ID0gIWV2ZW50LnNoaWZ0S2V5ICYmIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LmV2ZW50SGFzQ3RybE9yTWV0YShldmVudCkgJiYgIVdlYkluc3BlY3Rvci5pc0JlaW5n RWRpdGVkKGV2ZW50LnRhcmdldCk7Ci0gICAgICAgICAgICAgICAgaWYgKGlzRm9yd2FyZEtleSAm JiB0aGlzLl9jYW5Hb0ZvcndhcmRJbkhpc3RvcnkoKSkgewotICAgICAgICAgICAgICAgICAgICB0 aGlzLl9nb0ZvcndhcmRJbkhpc3RvcnkoKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnQucHJl dmVudERlZmF1bHQoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0KICAgICAgICAgICAgIC8vIFdpbmRvd3MgYW5kIE1hYyBoYXZlIHR3byBkaWZmZXJlbnQgZGVm aW5pdGlvbnMgb2YgWywgc28gYWNjZXB0IGJvdGguCiAgICAgICAgICAgICBjYXNlICJVKzAwNUIi OgogICAgICAgICAgICAgY2FzZSAiVSswMERCIjogLy8gWyBrZXkKQEAgLTExMiw3ICs5NiwxNCBA QCBXZWJJbnNwZWN0b3IuSW5zcGVjdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgICAgIHZhciBpbmRleCA9IHRoaXMuX3BhbmVsT3JkZXIuaW5kZXhPZih0aGlzLmN1cnJlbnRQ YW5lbCgpKTsKICAgICAgICAgICAgICAgICAgICAgaW5kZXggPSAoaW5kZXggPT09IDApID8gdGhp cy5fcGFuZWxPcmRlci5sZW5ndGggLSAxIDogaW5kZXggLSAxOwogICAgICAgICAgICAgICAgICAg ICB0aGlzLl9wYW5lbE9yZGVyW2luZGV4XS50b29sYmFySXRlbS5jbGljaygpOwotICAgICAgICAg ICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgICAgICAgICAgICBl dmVudC5jb25zdW1lKCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgICAgICB2YXIgaXNHb0JhY2sgPSBXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5ldmVudEhhc0N0cmxPck1ldGEoZXZlbnQpICYmIGV2ZW50LmFsdEtleTsK KyAgICAgICAgICAgICAgICBpZiAoaXNHb0JhY2sgJiYgdGhpcy5fY2FuR29CYWNrSW5IaXN0b3J5 KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZ29CYWNrSW5IaXN0b3J5KCk7CisgICAg ICAgICAgICAgICAgICAgIGV2ZW50LmNvbnN1bWUoKTsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKQEAgLTEyNCw5ICsxMTUsMTUgQEAgV2ViSW5zcGVjdG9yLklu c3BlY3RvclZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB2YXIgaW5kZXgg PSB0aGlzLl9wYW5lbE9yZGVyLmluZGV4T2YodGhpcy5jdXJyZW50UGFuZWwoKSk7CiAgICAgICAg ICAgICAgICAgICAgIGluZGV4ID0gKGluZGV4ICsgMSkgJSB0aGlzLl9wYW5lbE9yZGVyLmxlbmd0 aDsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fcGFuZWxPcmRlcltpbmRleF0udG9vbGJhckl0 ZW0uY2xpY2soKTsKLSAgICAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsK KyAgICAgICAgICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgpOworICAgICAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdmFyIGlzR29G b3J3YXJkID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRh KGV2ZW50KSAmJiBldmVudC5hbHRLZXk7CisgICAgICAgICAgICAgICAgaWYgKGlzR29Gb3J3YXJk ICYmIHRoaXMuX2NhbkdvRm9yd2FyZEluSGlzdG9yeSgpKSB7CisgICAgICAgICAgICAgICAgICAg IHRoaXMuX2dvRm9yd2FyZEluSGlzdG9yeSgpOworICAgICAgICAgICAgICAgICAgICBldmVudC5j b25zdW1lKCk7CiAgICAgICAgICAgICAgICAgfQotICAgIAogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggOWYzNDQwYjljYzM0ZGY0ZWFhMTUzOGQxODMz N2M0ZjE3N2MyOTM1MS4uMzk1MThiM2FmMTg5Y2IyNGNmZjNkOWI0Nzg5MTM3ZjgwZjViOTJhMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKQEAgLTEzOCwxMCArMTM4LDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBm dW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQoZXZh bHVhdGVJbkNvbnNvbGVTaG9ydGN1dC5rZXksIHRoaXMuX2V2YWx1YXRlU2VsZWN0aW9uSW5Db25z b2xlLmJpbmQodGhpcykpOwogCiAgICAgdmFyIG9wZW5SZXNvdXJjZVNob3J0Y3V0ID0gV2ViSW5z cGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIGhlbHBTZWN0 aW9uLmFkZEtleShvcGVuUmVzb3VyY2VTaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIk9wZW4gU2NyaXB0IikpOworICAgIGhlbHBTZWN0aW9uLmFkZEtleShvcGVuUmVzb3VyY2VT aG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9wZW4gc2NyaXB0IikpOwogCiAg ICAgdmFyIHNjcmlwdE91dGxpbmVTaG9ydGN1dCA9IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0 bGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIGhlbHBTZWN0aW9uLmFkZEtleShzY3Jp cHRPdXRsaW5lU2hvcnRjdXQubmFtZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyB0byBGdW5j dGlvbiIpKTsKKyAgICBoZWxwU2VjdGlvbi5hZGRLZXkoc2NyaXB0T3V0bGluZVNob3J0Y3V0Lm5h bWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiR28gdG8gZnVuY3Rpb24iKSk7CiAKICAgICB2YXIg cGFuZWxFbmFibGVySGVhZGluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiWW91IG5lZWQgdG8g ZW5hYmxlIGRlYnVnZ2luZyBiZWZvcmUgeW91IGNhbiB1c2UgdGhlIFNjcmlwdHMgcGFuZWwuIik7 CiAgICAgdmFyIHBhbmVsRW5hYmxlckRpc2NsYWltZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkVuYWJsaW5nIGRlYnVnZ2luZyB3aWxsIG1ha2Ugc2NyaXB0cyBydW4gc2xvd2VyLiIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz CmluZGV4IDFlOWQ4NjAzNTQ4NTE2YjhkMDZlMjQyNzhiNWFlODVlZWI3OWE3Y2UuLmRlYmQyOGZm NjZhMWViYjI5M2Q5NTVlMDk2MjQ5ZDU4MmQ2MjgzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTI3MSwxMSArMjcx LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAg ICBpZiAoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNhblNhdmVBcygpKSB7CiAgICAgICAgICAgICB0 aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXQubWFrZUtleSgicyIsIG1vZGlmaWVycy5DdHJsT3JNZXRh KV0gPSB0aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhpcyk7Ci0gICAgICAgICAgICBzZWN0aW9uLmFk ZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJzIiwgbW9kaWZpZXJzLkN0cmxPck1ldGEp LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUgVGltZWxpbmUgZGF0YVx1MjAyNiIpKTsKKyAg ICAgICAgICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoInMiLCBt b2RpZmllcnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSB0aW1lbGlu ZSBkYXRhIikpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0 Lm1ha2VLZXkoIm8iLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhpcy5fZmlsZVNlbGVjdG9y RWxlbWVudC5jbGljay5iaW5kKHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQpOwotICAgICAgICBz ZWN0aW9uLmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJvIiwgbW9kaWZpZXJzLkN0 cmxPck1ldGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgVGltZWxpbmUgZGF0YVx1MjAy NiIpKTsKKyAgICAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygi byIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIHRp bWVsaW5lIGRhdGEiKSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVGaWxlU2VsZWN0b3I6IGZ1bmN0 aW9uKCkKQEAgLTI5Niw4ICsyOTYsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVj dG9yLkNvbnRleHRNZW51KCk7CiAgICAgICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2Fu U2F2ZUFzKCkpCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiJlNhdmUgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxl LmJpbmQodGhpcykpOwotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiTCZvYWQgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9maWxlU2VsZWN0 b3JFbGVtZW50LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCkpOworICAgICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUg VGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhpcykpOworICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZCBU aW1lbGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQuY2xpY2suYmlu ZCh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50KSk7CiAgICAgICAgIGNvbnRleHRNZW51LnNob3co ZXZlbnQpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKaW5kZXggOTM3MzA1OTkzOTZlYWM0MWJkYzhhYzY5MTIwMjZlODk0MDg1 ZjIzZC4uMzEyZDA5ZjA0OGVkN2EzNjM4OWJlMjJlNWEwMDI4NmQ5M2I2MWQ5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTY1Miw3 ICs2NTIsMTQgQEAgV2ViSW5zcGVjdG9yLl9yZWdpc3RlclNob3J0Y3V0cyA9IGZ1bmN0aW9uKCkK ICAgICAgICAgc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygiXSIsIHNob3J0Y3V0Lk1vZGlmaWVy cy5DdHJsT3JNZXRhKSwKICAgICAgICAgc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygiWyIsIHNo b3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhKQogICAgIF07Ci0gICAgc2VjdGlvbi5hZGRSZWxh dGVkS2V5cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5leHQvcHJldmlvdXMgcGFuZWwi KSk7CisgICAgc2VjdGlvbi5hZGRSZWxhdGVkS2V5cyhrZXlzLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkdvIHRvIHRoZSBwYW5lbCB0byB0aGUgbGVmdC9yaWdodCIpKTsKKworICAgIHZhciBrZXlz ID0gWworICAgICAgICBzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJbIiwgc2hvcnRjdXQuTW9k aWZpZXJzLkN0cmxPck1ldGEgfCBzaG9ydGN1dC5Nb2RpZmllcnMuQWx0KSwKKyAgICAgICAgc2hv cnRjdXQuc2hvcnRjdXRUb1N0cmluZygiXSIsIHNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRh IHwgc2hvcnRjdXQuTW9kaWZpZXJzLkFsdCkKKyAgICBdOworICAgIHNlY3Rpb24uYWRkUmVsYXRl ZEtleXMoa2V5cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyBiYWNrL2ZvcndhcmQgaW4gcGFu ZWwgaGlzdG9yeSIpKTsKKwogICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9T dHJpbmcoc2hvcnRjdXQuS2V5cy5Fc2MpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvZ2dsZSBj b25zb2xlIikpOwogICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmco ImYiLCBzaG9ydGN1dC5Nb2RpZmllcnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2VhcmNoIikpOwogICAgIApAQCAtNjY4LDcgKzY3NSw3IEBAIFdlYkluc3BlY3Rvci5fcmVn aXN0ZXJTaG9ydGN1dHMgPSBmdW5jdGlvbigpCiAgICAgfQogCiAgICAgdmFyIGdvVG9TaG9ydGN1 dCA9IFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgIHNl Y3Rpb24uYWRkS2V5KGdvVG9TaG9ydGN1dC5uYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdv IHRvIExpbmUiKSk7CisgICAgc2VjdGlvbi5hZGRLZXkoZ29Ub1Nob3J0Y3V0Lm5hbWUsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiR28gdG8gbGluZSIpKTsKIH0KIAogV2ViSW5zcGVjdG9yLmRvY3Vt ZW50S2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQo=