152755 2016-01-05 13:22:21 -0800 Web Inspector: Add border-image properties to Visual sidebar 2016-01-07 14:37:13 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1152862 0 hi 2016-01-05 13:22:21 -0800 . 1152863 1 webkit-bug-importer 2016-01-05 13:22:36 -0800 <rdar://problem/24061969> 1152878 2 268322 hi 2016-01-05 14:01:39 -0800 Created attachment 268322 Patch 1153080 3 268322 commit-queue 2016-01-06 10:29:43 -0800 Comment on attachment 268322 Patch Rejecting attachment 268322 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 268322, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: imothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Parsed 8 diffs from patch file(s). patching file Source/WebInspectorUI/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. Original content of Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js mismatches at /Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply line 283. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/658304 1153593 4 268489 hi 2016-01-07 14:22:05 -0800 Created attachment 268489 Patch 1153614 5 268489 commit-queue 2016-01-07 14:37:08 -0800 Comment on attachment 268489 Patch Clearing flags on attachment: 268489 Committed r194728: <http://trac.webkit.org/changeset/194728> 1153615 6 commit-queue 2016-01-07 14:37:13 -0800 All reviewed patches have been landed. Closing bug. 268322 2016-01-05 14:01:39 -0800 2016-01-07 14:22:05 -0800 Patch bug-152755-20160105150106.patch text/plain 21299 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNlOTBhNTI4ZjUyMDQ4MzVjY2Q0ODY4ZGZmYWFl NjQxYzJkY2Y0YTguLmQ3NDdlMDA5ZmYxMDE1NjJhYWQ0MjQ0ZWJkNjc1MjMwOTNkYWRkOTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY2IEBACisyMDE2LTAxLTA1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBib3JkZXItaW1hZ2UgcHJvcGVydGllcyB0byBWaXN1YWwgc2lkZWJhcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNzU1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9NYWluLmh0bWw6CisgICAgICAgIFN3aXRjaGVkIHRoZSBvcmRlciBvZiBWaXN1YWxTdHlsZVVS TElucHV0IGFuZCBWaXN1YWxTdHlsZVVuaXRTbGlkZXIKKyAgICAgICAgdG8gYmUgb3JkZXJlZCBh bHBoYWJldGljYWxseS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVEZXRhaWxzUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5j c3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5j b250ZW50ID4gLmdyb3VwICsgLmdyb3VwID4gLnJvdzpmaXJzdC1jaGlsZCk6CisgICAgICAgICgu c2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2Vj dGlvbi5iYWNrZ3JvdW5kIC5kZXRhaWxzLXNlY3Rpb24uYm9yZGVyIC52aXN1YWwtc3R5bGUtcHJv cGVydHktY29udGFpbmVyLmtleXdvcmQtY2hlY2tib3guYm9yZGVyLWltYWdlLXNsaWNlKToKKyAg ICAgICAgU2luY2UgdGhlIGNoZWNrYm94IGlzIHNvIHNtYWxsLCBnaXZlIGl0IGxlc3Mgcm9vbS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90 eXBlLl9wb3B1bGF0ZUJvcmRlclNlY3Rpb24uZ2VuZXJhdGVCb3JkZXJJbWFnZVByb3BlcnR5RWRp dG9ycyk6CisgICAgICAgIFRoZSB0aHJlZSBwcm9wZXJ0aWVzICJib3JkZXItaW1hZ2Utd2lkdGgi LCAiYm9yZGVyLWltYWdlLW91dHNldCIsIGFuZCAKKyAgICAgICAgImJvcmRlci1pbWFnZS1zbGlj ZSIgYWxsIGhhdmUgdGhlIHNhbWUgc3ludGF4LCBzbyBvbmUgZnVuY3Rpb24gdG8gZ2VuZXJhdGUK KyAgICAgICAgdGhlIGxheW91dCBmb3IgYWxsIHRocmVlIGlzIG11Y2ggc2ltcGxlci4KKworICAg ICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9w dWxhdGVCb3JkZXJTZWN0aW9uKToKKyAgICAgICAgQWRkZWQgdGhlIGJvcmRlciBpbWFnZSBwcm9w ZXJ0aWVzIHRvIGEgc2VwZXJhdGUgZ3JvdXAgdW5kZXIgQmFja2dyb3VuZCA+IEJvcmRlci4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LnByb3RvdHlwZS5z ZXQgdW5pdHMpOgorICAgICAgICBSZW9yZGVyZWQgbG9naWMgdG8gYWxsb3cgYSB2YWx1ZSBvZiAi Ii9udWxsIHRvIHNldCB0aGUgdW5pdHMgdG8gdGhlICJOdW1iZXIiCisgICAgICAgIHZhbHVlIGlm IGl0IGlzIGFsbG93ZWQgZm9yIHRoYXQgZWRpdG9yLgorCisgICAgICAgIChXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5wcm90b3R5cGUuZ2V0IHN5bnRoZXNpemVkVmFsdWUp OgorICAgICAgICBJbnN0ZWFkIG9mIHJlbHlpbmcgdXBvbiB3aGV0aGVyIHRoZSBlZGl0b3IgaGFz IGFueSB1bml0cywganVzdCBjaGVjayB0byBzZWUgaWYKKyAgICAgICAgdGhlIHNlbGVjdGVkIHVu aXRzIGFyZSAiTnVtYmVyIiBhbmQsIGlmIG5vdCwgYWRkIHRoZW0gdG8gdGhlIHZhbHVlLgorCisg ICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5wcm90b3R5cGUu X3VuaXRzRWxlbWVudFRleHRDb250ZW50KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlZpc3VhbFN0eWxlUHJvcGVydHlDb21iaW5lcik6CisgICAgICAgIE5vdyBoYXMgYW5vdGhlciBh cmd1bWVudCB0aGF0LCB3aGVuIHRydWUsIGFzc3VtZXMgdGhlIGNvbWJpbmVyIGhhcyBhdCBsZWFz dCA0CisgICAgICAgIG51bWVyaWNhbCB2YWx1ZXMgYW5kIGlzIG9mIHRoZSBmb3JtIChjYW4gaGF2 ZSB1bml0cyk6CisgICAgICAgICAgICBwcm9wZXJ0eS1uYW1lOiB2YWx1ZTEgW3ZhbHVlMiBbdmFs dWUzIFt2YWx1ZTQgWy4uLl1dXV07CisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZVByb3BlcnR5Q29tYmluZXIucHJvdG90eXBlLmdldCBzeW50aGVzaXplZFZhbHVlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIucHJvdG90eXBlLnVw ZGF0ZVZhbHVlc0Zyb21UZXh0LnVwZGF0ZUVkaXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLnByb3RvdHlwZS51cGRhdGVWYWx1ZXNGcm9tVGV4 dC51cGRhdGVDb21wYXRpYmxlRWRpdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZVByb3BlcnR5Q29tYmluZXIucHJvdG90eXBlLnVwZGF0ZVZhbHVlc0Zyb21UZXh0KToKKyAg ICAgICAgSWYgdGhlIG5ldyBhcmd1bWVudCBpcyB0cnVlLCBhc3NpZ25zIHRoZSBleGlzdGluZyB2 YWx1ZXMgaW4gdGhlIGZvbGxvd2luZyB3YXk6CisgICAgICAgICAtIElmIHRoZXJlIGlzIDEgdmFs dWUsIGFzc2lnbiBpdCB0byBhbGwgb2YgdGhlIGVkaXRvcnMuCisgICAgICAgICAtIElmIHRoZXJl IGFyZSAyIHZhbHVlcywgYXNzaWduIHRoZSAxc3Qgb25lIHRvIGVkaXRvcnMgMSBhbmQgMyBhbmQg dGhlIDJuZCBvbmUKKyAgICAgICAgICAgIHRvIGVkaXRvcnMgMiBhbmQgNC4KKyAgICAgICAgIC0g SWYgdGhlcmUgYXJlIDMgdmFsdWVzLCBhc3NpZ24gdGhlIDFzdCBvbmUgdG8gZWRpdG9yIDEsIHRo ZSAybmQgb25lIHRvIGVkaXRvcnMKKyAgICAgICAgICAgIDIgYW5kIDQsIGFuZCB0aGUgM3JkIG9u ZSB0byBlZGl0b3IgMy4KKyAgICAgICAgIC0gSWYgdGhlcmUgYXJlIDQgb3IgbW9yZSB2YWx1ZXMs IGFzc2lnbiB0aGVtIG5vcm1hbGx5LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlUHJvcGVydHlFZGl0b3IucHJvdG90eXBlLnZhbHVlSXNTdXBwb3J0ZWRLZXl3b3JkKToK KyAgICAgICAgUmVtb3ZlZCBjYWxsIHRvIHRoaXMudmFsdWUgdG8gcHJldmVudCByZWN1cnNpb24g ZnJvbSBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LgorCisgICAgICAgIChXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5wcm90b3R5cGUudmFsdWVJc1N1cHBvcnRlZFVuaXQp OgorICAgICAgICBSZW1vdmVkIGNhbGwgdG8gdGhpcy51bml0cyB0byBwcmV2ZW50IHJlY3Vyc2lv biBmcm9tIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guCisKIDIwMTYtMDEtMDUgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxODc5 MjkpOiBXZWIgSW5zcGVjdG9yOiBGb3JjZWQgTGF5b3V0IGFuZCBTdHlsZSBSZWNhbGN1bGF0aW9u IHJlY29yZHMgZG8gbm90IHNob3cgdXAgaW4gTGF5b3V0ICYgUmVuZGVyaW5nIHRpbWVsaW5lIERh dGFHcmlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA2NzM4NmYwZmRhZTM1 NzQ2OTQwODE5NDVjOTY3NDNjNmE0MDgxMmU1Li44ZGM5YWZhMTkyMTZiZGM2ZjAwNDJhNTAzNGRj MWU4YzMzMWMyMWM0IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDExNQp6Y21jY2RnSnMo PG1KUjNvTH58SUY3LUFVfDc7SiU5aU5URV9sT2N5OFhWTjZ5JjhQYmNKWS04NU4qSWI2UWhfQTAK ckR0YHZCX35aclpga083VUEyTzI2MGN1TUlEbm5LajNeWFduYFU3VDAhfGxJMDhEb3RBT2l+Xm4K CmRlbHRhIDI5CmxjbWRuP2l7LWAtbUpSM29DZz1CYVk/a2QkQHp7TCtgVD9XdUhATyZOalI1Y3c0 ekI8SgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01h aW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApp bmRleCBmMjZlOGNjYjMwYWIzNDA5ODI4MDczMTAyZGE3YTc2Y2Y4ZjFhMWRjLi4zN2Q4Y2Y1NmFl OWJjYTQ0ODcyODExNWRhYWUyODhkMzkyMjU4ZTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC02MDAsOCArNjAwLDggQEAKICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVUYWJiZWRQcm9wZXJ0aWVzUm93Lmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVUaW1pbmdFZGl0 b3IuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVVuaXRT bGlkZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVVS TElucHV0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVV bml0U2xpZGVyLmpzIj48L3NjcmlwdD4KIAogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9B bm5vdGF0b3IuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9Db2Rl TWlycm9yRWRpdGluZ0NvbnRyb2xsZXIuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDQ3YTY4OGY2MjJhZDljYzMxMGIyNjQ4YThlNzIy NGFkZjU3OGYxNmUuLjU3ZTY4MWI0ZTk3NzljMTg4ZmZkOGRjYWUzZDE0ZDAwMTRkODU3MDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTY0LDYgKzY0LDEx IEBACiAgICAgZGlzcGxheTogZmxleDsKIH0KIAorLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5j c3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5j b250ZW50ID4gLmdyb3VwICsgLmdyb3VwID4gLnJvdzpmaXJzdC1jaGlsZCB7CisgICAgcGFkZGlu Zy10b3A6IDdweDsKKyAgICBib3JkZXItdG9wOiBub25lOworfQorCiAuc2lkZWJhciA+IC5wYW5l bC5kZXRhaWxzLmNzcy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uID4gLmNvbnRlbnQgLmdyb3VwID4gLnJvdzpsYXN0LWNoaWxkIHsKICAgICBwYWRkaW5n LWJvdHRvbTogM3B4OwogfQpAQCAtOTcsNiArMTAyLDExIEBACiAgICAgcG9pbnRlci1ldmVudHM6 IG5vbmU7CiB9CiAKKy5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1YWwg PiAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZ3JvdXAgPiAu cm93ICsgLnJvdy52aXN1YWwtc3R5bGUtdGFiYmVkLXByb3BlcnRpZXMtcm93LAogLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24uYmFj a2dyb3VuZCAuZGV0YWlscy1zZWN0aW9uLmJhY2tncm91bmQtc3R5bGUgLnZpc3VhbC1zdHlsZS1w cm9wZXJ0eS1jb250YWluZXIuY29tbWEtc2VwYXJhdGVkLWtleXdvcmQtZWRpdG9yLmJhY2tncm91 bmQgewogICAgIG1hcmdpbi10b3A6IDNweDsKIH0KKworLnNpZGViYXIgPiAucGFuZWwuZGV0YWls cy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24uYmFja2dyb3VuZCAuZGV0YWls cy1zZWN0aW9uLmJvcmRlciAudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3Jk LWNoZWNrYm94LmJvcmRlci1pbWFnZS1zbGljZSB7CisgICAgZmxleDogMTsKK30KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl RGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggNTc1Mjc3YTg4ZmQ3Mjg2ZDY1MjIz YWI2NDViOGRhNTVkMGFkMzBmMi4uOTBiMmQ2MTc5ZDk4ZWU0OGU1NTFmMjdlNDI1ODBlYjM3YWRk N2I1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTk1Miwx MCArOTUyLDc0IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNz IFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyhncm91cC5wcm9wZXJ0aWVzLmJvcmRlckxlZnRXaWR0aCwgaGln aGxpZ2h0TW9kZSk7CiAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhncm91 cC5wcm9wZXJ0aWVzLmJvcmRlclJpZ2h0V2lkdGgsIGhpZ2hsaWdodE1vZGUpOwogCisgICAgICAg IGxldCBib3JkZXJHcm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChb Ym9yZGVyVGFiQ29udHJvbGxlciwgYm9yZGVyQWxsR3JvdXAsIGJvcmRlclRvcEdyb3VwLCBib3Jk ZXJSaWdodEdyb3VwLCBib3JkZXJCb3R0b21Hcm91cCwgYm9yZGVyTGVmdEdyb3VwXSk7CisKKyAg ICAgICAgbGV0IGJvcmRlckltYWdlU291cmNlUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxz U2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0aWVzLmJvcmRlckltYWdlU291cmNlID0gbmV3 IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVVSTElucHV0KCJib3JkZXItaW1hZ2Utc291cmNlIiwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJJbWFnZSIpLCB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cy5j b25jYXQoWyJOb25lIl0pKTsKKworICAgICAgICBib3JkZXJJbWFnZVNvdXJjZVJvdy5lbGVtZW50 LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYm9yZGVySW1hZ2VTb3VyY2UuZWxlbWVudCk7CisKKyAg ICAgICAgbGV0IGJvcmRlckltYWdlUmVwZWF0Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxz U2VjdGlvblJvdzsKKworICAgICAgICBsZXQgYm9yZGVySW1hZ2VTbGljZUZpbGwgPSBuZXcgV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94KCJib3JkZXItaW1hZ2Utc2xpY2Ui LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZpbGwiKSwgIkZpbGwiKTsKKyAgICAgICAgYm9yZGVy SW1hZ2VTbGljZUZpbGwub3B0aW9uYWxQcm9wZXJ0eSA9IHRydWU7CisgICAgICAgIHByb3BlcnRp ZXMuYm9yZGVySW1hZ2VSZXBlYXQgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29y ZFBpY2tlcigiYm9yZGVyLWltYWdlLXJlcGVhdCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVw ZWF0IiksIHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIlN0cmV0Y2giLCAiUmVwZWF0 IiwgIlJvdW5kIiwgIlNwYWNlIl0pKTsKKworICAgICAgICBib3JkZXJJbWFnZVJlcGVhdFJvdy5l bGVtZW50LmFwcGVuZENoaWxkKGJvcmRlckltYWdlU2xpY2VGaWxsLmVsZW1lbnQpOworICAgICAg ICBib3JkZXJJbWFnZVJlcGVhdFJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYm9y ZGVySW1hZ2VSZXBlYXQuZWxlbWVudCk7CisKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVCb3Jk ZXJJbWFnZVByb3BlcnR5RWRpdG9ycyhwcm9wZXJ0eU5hbWUsIGtleXdvcmRzLCB1bml0cykgewor ICAgICAgICAgICAgbGV0IHZlcnRpY2FsID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlv blJvdzsKKworICAgICAgICAgICAgbGV0IHRvcCA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVG9w IiksIGtleXdvcmRzLCB1bml0cyk7CisgICAgICAgICAgICB0b3AubWFzdGVyUHJvcGVydHkgPSB0 cnVlOworICAgICAgICAgICAgbGV0IGJvdHRvbSA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQm90 dG9tIiksIGtleXdvcmRzLCB1bml0cyk7CisgICAgICAgICAgICBib3R0b20ubWFzdGVyUHJvcGVy dHkgPSB0cnVlOworCisgICAgICAgICAgICB2ZXJ0aWNhbC5lbGVtZW50LmFwcGVuZENoaWxkKHRv cC5lbGVtZW50KTsKKyAgICAgICAgICAgIHZlcnRpY2FsLmVsZW1lbnQuYXBwZW5kQ2hpbGQoYm90 dG9tLmVsZW1lbnQpOworCisgICAgICAgICAgICBsZXQgaG9yaXpvbnRhbCA9IG5ldyBXZWJJbnNw ZWN0b3IuRGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAgICAgICAgIGxldCBsZWZ0ID0gbmV3IFdl Ykluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94KHByb3BlcnR5TmFtZSwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJMZWZ0IiksIGtleXdvcmRzLCB1bml0cyk7CisgICAgICAgICAgICBs ZWZ0Lm1hc3RlclByb3BlcnR5ID0gdHJ1ZTsKKyAgICAgICAgICAgIGxldCByaWdodCA9IG5ldyBX ZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWUsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiUmlnaHQiKSwga2V5d29yZHMsIHVuaXRzKTsKKyAgICAgICAgICAg IHJpZ2h0Lm1hc3RlclByb3BlcnR5ID0gdHJ1ZTsKKworICAgICAgICAgICAgaG9yaXpvbnRhbC5l bGVtZW50LmFwcGVuZENoaWxkKGxlZnQuZWxlbWVudCk7CisgICAgICAgICAgICBob3Jpem9udGFs LmVsZW1lbnQuYXBwZW5kQ2hpbGQocmlnaHQuZWxlbWVudCk7CisKKyAgICAgICAgICAgIHJldHVy biB7Z3JvdXA6IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChbdmVydGljYWws IGhvcml6b250YWxdKSwgcHJvcGVydGllczogW3RvcCwgYm90dG9tLCBsZWZ0LCByaWdodF19Owor ICAgICAgICB9CisKKyAgICAgICAgbGV0IG5vbktleXdvcmRVbml0cyA9IFtXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIk51bWJlciIpXTsKKworICAgICAgICBsZXQgYm9yZGVySW1hZ2VVbml0cyA9IHRo aXMuX3VuaXRzLmRlZmF1bHRzOworICAgICAgICBib3JkZXJJbWFnZVVuaXRzLmJhc2ljID0gbm9u S2V5d29yZFVuaXRzLmNvbmNhdChib3JkZXJJbWFnZVVuaXRzLmJhc2ljKTsKKyAgICAgICAgbGV0 IGJvcmRlckltYWdlV2lkdGggPSBnZW5lcmF0ZUJvcmRlckltYWdlUHJvcGVydHlFZGl0b3JzKCJi b3JkZXItaW1hZ2Utd2lkdGgiLCB0aGlzLl9rZXl3b3Jkcy5ib3hNb2RlbCwgYm9yZGVySW1hZ2VV bml0cyk7CisgICAgICAgIHByb3BlcnRpZXMuYm9yZGVySW1hZ2VXaWR0aCA9IG5ldyBXZWJJbnNw ZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyKCJib3JkZXItaW1hZ2Utd2lkdGgiLCBi b3JkZXJJbWFnZVdpZHRoLnByb3BlcnRpZXMsIHRydWUpOworCisgICAgICAgIGxldCBib3JkZXJP dXRzZXRVbml0cyA9IHRoaXMuX3VuaXRzLmRlZmF1bHRzU2Fuc1BlcmNlbnQ7CisgICAgICAgIGJv cmRlck91dHNldFVuaXRzLmJhc2ljID0gbm9uS2V5d29yZFVuaXRzLmNvbmNhdChib3JkZXJPdXRz ZXRVbml0cy5iYXNpYyk7CisgICAgICAgIGxldCBib3JkZXJJbWFnZU91dHNldCA9IGdlbmVyYXRl Qm9yZGVySW1hZ2VQcm9wZXJ0eUVkaXRvcnMoImJvcmRlci1pbWFnZS1vdXRzZXQiLCB0aGlzLl9r ZXl3b3Jkcy5kZWZhdWx0cywgYm9yZGVyT3V0c2V0VW5pdHMpOworICAgICAgICBwcm9wZXJ0aWVz LmJvcmRlckltYWdlT3V0c2V0ID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5 Q29tYmluZXIoImJvcmRlci1pbWFnZS1vdXRzZXQiLCBib3JkZXJJbWFnZU91dHNldC5wcm9wZXJ0 aWVzLCB0cnVlKTsKKworICAgICAgICBsZXQgYm9yZGVySW1hZ2VTbGljZSA9IGdlbmVyYXRlQm9y ZGVySW1hZ2VQcm9wZXJ0eUVkaXRvcnMoImJvcmRlci1pbWFnZS1zbGljZSIsIHRoaXMuX2tleXdv cmRzLmRlZmF1bHRzLCBbIiUiXS5jb25jYXQobm9uS2V5d29yZFVuaXRzKSk7CisgICAgICAgIGJv cmRlckltYWdlU2xpY2UucHJvcGVydGllcy5wdXNoKGJvcmRlckltYWdlU2xpY2VGaWxsKTsKKyAg ICAgICAgcHJvcGVydGllcy5ib3JkZXJJbWFnZVNsaWNlID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVByb3BlcnR5Q29tYmluZXIoImJvcmRlci1pbWFnZS1zbGljZSIsIGJvcmRlckltYWdl U2xpY2UucHJvcGVydGllcywgdHJ1ZSk7CisKKyAgICAgICAgbGV0IGJvcmRlckltYWdlUHJvcGVy dGllc1RhYkNvbnRyb2xsZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlVGFiYmVkUHJv cGVydGllc1Jvdyh7CisgICAgICAgICAgICAid2lkdGgiOiB7dGl0bGU6IFdlYkluc3BlY3Rvci5V SVN0cmluZygiV2lkdGgiKSwgZWxlbWVudDogYm9yZGVySW1hZ2VXaWR0aC5ncm91cC5lbGVtZW50 LCBwcm9wZXJ0aWVzOiBbcHJvcGVydGllcy5ib3JkZXJJbWFnZVdpZHRoXX0sCisgICAgICAgICAg ICAib3V0c2V0Ijoge3RpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk91dHNldCIpLCBlbGVt ZW50OiBib3JkZXJJbWFnZU91dHNldC5ncm91cC5lbGVtZW50LCBwcm9wZXJ0aWVzOiBbcHJvcGVy dGllcy5ib3JkZXJJbWFnZU91dHNldF19LAorICAgICAgICAgICAgInNsaWNlIjoge3RpdGxlOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNsaWNlIiksIGVsZW1lbnQ6IGJvcmRlckltYWdlU2xpY2Uu Z3JvdXAuZWxlbWVudCwgcHJvcGVydGllczogW3Byb3BlcnRpZXMuYm9yZGVySW1hZ2VTbGljZV19 CisgICAgICAgIH0pOworCisgICAgICAgIGxldCBib3JkZXJJbWFnZUdyb3VwID0gbmV3IFdlYklu c3BlY3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFtib3JkZXJJbWFnZVNvdXJjZVJvdywgYm9yZGVy SW1hZ2VSZXBlYXRSb3csIGJvcmRlckltYWdlUHJvcGVydGllc1RhYkNvbnRyb2xsZXIsIGJvcmRl ckltYWdlV2lkdGguZ3JvdXAsIGJvcmRlckltYWdlT3V0c2V0Lmdyb3VwLCBib3JkZXJJbWFnZVNs aWNlLmdyb3VwXSk7CisKICAgICAgICAgZ3JvdXAuYXV0b2NvbXBsZXRlQ29tcGF0aWJsZVByb3Bl cnRpZXMgPSBbcHJvcGVydGllcy5ib3JkZXJDb2xvciwgcHJvcGVydGllcy5ib3JkZXJUb3BDb2xv ciwgcHJvcGVydGllcy5ib3JkZXJCb3R0b21Db2xvciwgcHJvcGVydGllcy5ib3JkZXJMZWZ0Q29s b3IsIHByb3BlcnRpZXMuYm9yZGVyUmlnaHRDb2xvcl07CiAKLSAgICAgICAgbGV0IGJvcmRlckdy b3VwID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFtib3JkZXJUYWJDb250 cm9sbGVyLCBib3JkZXJBbGxHcm91cCwgYm9yZGVyVG9wR3JvdXAsIGJvcmRlclJpZ2h0R3JvdXAs IGJvcmRlckJvdHRvbUdyb3VwLCBib3JkZXJMZWZ0R3JvdXBdKTsKLSAgICAgICAgdGhpcy5fcG9w dWxhdGVTZWN0aW9uKGdyb3VwLCBbYm9yZGVyR3JvdXBdKTsKKyAgICAgICAgdGhpcy5fcG9wdWxh dGVTZWN0aW9uKGdyb3VwLCBbYm9yZGVyR3JvdXAsIGJvcmRlckltYWdlR3JvdXBdKTsKICAgICB9 CiAKICAgICBfcG9wdWxhdGVPdXRsaW5lU2VjdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVOdW1iZXJJbnB1dEJveC5qcwppbmRleCBmYjc5MWE1MTQwN2JhZDI4NmFiOGE2ZTUyYjIzNWQx YzI2M2M2MzY5Li5hMzVhYjFiZDdkMzI0NTdlMjczZGJlYWZhYzM1ZDlhZGI4ZjQyMDc4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZU51bWJlcklucHV0Qm94LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMKQEAgLTI3LDkgKzI3LDEz IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFs U3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiB7CiAgICAgY29uc3RydWN0b3IocHJvcGVydHlO YW1lcywgdGV4dCwgcG9zc2libGVWYWx1ZXMsIHBvc3NpYmxlVW5pdHMsIGFsbG93TmVnYXRpdmVW YWx1ZXMsIGxheW91dFJldmVyc2VkKQogICAgIHsKLSAgICAgICAgc3VwZXIocHJvcGVydHlOYW1l cywgdGV4dCwgcG9zc2libGVWYWx1ZXMsIHBvc3NpYmxlVW5pdHMgfHwgW1dlYkluc3BlY3Rvci5V SVN0cmluZygiTnVtYmVyIildLCAibnVtYmVyLWlucHV0LWJveCIsIGxheW91dFJldmVyc2VkKTsK KyAgICAgICAgbGV0IHVuaXRsZXNzTnVtYmVyVW5pdCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi TnVtYmVyIik7CiAKLSAgICAgICAgdGhpcy5faGFzVW5pdHMgPSAhIXBvc3NpYmxlVW5pdHM7Cisg ICAgICAgIHN1cGVyKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBwb3NzaWJs ZVVuaXRzIHx8IFt1bml0bGVzc051bWJlclVuaXRdLCAibnVtYmVyLWlucHV0LWJveCIsIGxheW91 dFJldmVyc2VkKTsKKworICAgICAgICB0aGlzLl91bml0bGVzc051bWJlclVuaXQgPSB1bml0bGVz c051bWJlclVuaXQ7CisKKyAgICAgICAgdGhpcy5faGFzVW5pdHMgPSB0aGlzLl9wb3NzaWJsZVVu aXRzLmJhc2ljLnNvbWUoKHVuaXQpID0+IHVuaXQgIT09IHVuaXRsZXNzTnVtYmVyVW5pdCk7CiAg ICAgICAgIHRoaXMuX2FsbG93TmVnYXRpdmVWYWx1ZXMgPSAhIWFsbG93TmVnYXRpdmVWYWx1ZXMg fHwgZmFsc2U7CiAKICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5jbGFzc0xpc3QudG9nZ2xl KCJuby12YWx1ZXMiLCAhcG9zc2libGVWYWx1ZXMgfHwgIXBvc3NpYmxlVmFsdWVzLmxlbmd0aCk7 CkBAIC04OSw4ICs5Myw4IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94 ID0gY2xhc3MgVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAgICAgICAgIHRoaXMu Y29udGVudEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibnVtYmVyLWlucHV0LWVkaXRhYmxlIik7CiAg ICAgICAgIHRoaXMuX3ZhbHVlTnVtYmVySW5wdXRFbGVtZW50LnZhbHVlID0gbnVsbDsKICAgICAg ICAgdGhpcy5fdmFsdWVOdW1iZXJJbnB1dEVsZW1lbnQuc2V0QXR0cmlidXRlKCJwbGFjZWhvbGRl ciIsIDApOwotICAgICAgICBpZiAodGhpcy5faGFzVW5pdHMgJiYgdGhpcy52YWx1ZUlzU3VwcG9y dGVkVW5pdCgicHgiKSkKLSAgICAgICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudFRleHRDb250ZW50 ID0gdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWUgPSAicHgiOworICAgICAgICBpZiAo dGhpcy5faGFzVW5pdHMpCisgICAgICAgICAgICB0aGlzLl91bml0c0VsZW1lbnRUZXh0Q29udGVu dCA9IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlID0gdGhpcy52YWx1ZUlzU3VwcG9y dGVkVW5pdCgicHgiKSA/ICJweCIgOiB0aGlzLl9wb3NzaWJsZVVuaXRzLmJhc2ljWzBdOwogICAg IH0KIAogICAgIC8vIFB1YmxpYwpAQCAtMTU5LDIwICsxNjMsMTcgQEAgV2ViSW5zcGVjdG9yLlZp c3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94 IGV4dGVuZHMKIAogICAgIHNldCB1bml0cyh1bml0KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMu X3VuY2hhbmdlZE9wdGlvbkVsZW1lbnQuc2VsZWN0ZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgaWYgKCF1bml0IHx8IHVuaXQgPT09IHRoaXMudW5pdHMpCisgICAgICAgIGlmICh0 aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkIHx8IHVuaXQgPT09IHRoaXMudW5p dHMpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKCF0aGlzLnZhbHVlSXNTdXBw b3J0ZWRVbml0KHVuaXQpKQorICAgICAgICBpZiAoIXVuaXQgJiYgIXRoaXMuX3Bvc3NpYmxlVW5p dHMuYmFzaWMuaW5jbHVkZXModGhpcy5fdW5pdGxlc3NOdW1iZXJVbml0KSAmJiAhdGhpcy52YWx1 ZUlzU3VwcG9ydGVkVW5pdCh1bml0KSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBp ZiAodGhpcy5fdmFsdWVJc1N1cHBvcnRlZEFkdmFuY2VkVW5pdCh1bml0KSkKICAgICAgICAgICAg IHRoaXMuX2FkZEFkdmFuY2VkVW5pdHMoKTsKIAogICAgICAgICB0aGlzLl9zZXROdW1iZXJJbnB1 dElzRWRpdGFibGUodHJ1ZSk7Ci0gICAgICAgIHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZh bHVlID0gdW5pdDsKKyAgICAgICAgdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWUgPSB1 bml0IHx8IHRoaXMuX3VuaXRsZXNzTnVtYmVyVW5pdDsKICAgICAgICAgdGhpcy5fdW5pdHNFbGVt ZW50VGV4dENvbnRlbnQgPSB1bml0OwogICAgIH0KIApAQCAtMjAzLDcgKzIwNCw3IEBAIFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFsU3R5bGVOdW1i ZXJJbnB1dEJveCBleHRlbmRzCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICBs ZXQga2V5d29yZCA9IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlOwotICAgICAgICBy ZXR1cm4gdGhpcy52YWx1ZUlzU3VwcG9ydGVkVW5pdChrZXl3b3JkKSA/IHZhbHVlICsgKHRoaXMu X2hhc1VuaXRzID8ga2V5d29yZCA6ICIiKSA6IGtleXdvcmQ7CisgICAgICAgIHJldHVybiB0aGlz LnZhbHVlSXNTdXBwb3J0ZWRVbml0KGtleXdvcmQpID8gdmFsdWUgKyAoa2V5d29yZCA9PT0gdGhp cy5fdW5pdGxlc3NOdW1iZXJVbml0ID8gIiIgOiBrZXl3b3JkKSA6IGtleXdvcmQ7CiAgICAgfQog CiAgICAgdXBkYXRlVmFsdWVGcm9tVGV4dCh0ZXh0LCB2YWx1ZSkKQEAgLTIyOCw3ICsyMjksNyBA QCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0 eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5kcwogICAgICAgICBpZiAoIXRoaXMuX2hhc1VuaXRzKQog ICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudC50ZXh0Q29u dGVudCA9IHRleHQ7CisgICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudC50ZXh0Q29udGVudCA9IHRl eHQgPT09IHRoaXMuX3VuaXRsZXNzTnVtYmVyVW5pdCA/ICIiIDogdGV4dDsKICAgICAgICAgdGhp cy5fbWFya1VuaXRzQ29udGFpbmVySWZJbnB1dEhhc1ZhbHVlKCk7CiAgICAgfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZVByb3BlcnR5Q29tYmluZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanMKaW5kZXggMzEyYTc5YmQxZjdm M2Q5YmI4ZmUwMDQ5YWJjNTNhMWFlMzFiOTdmMS4uMjg1ODY4ZTJiM2M5MWY1MjJjMzNiOGY1OTFj ZDAwMjQwMTY4OWQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlDb21i aW5lci5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9w ZXJ0eUNvbWJpbmVyID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyIGV4dGVuZHMg V2ViSW5zcGVjdG9yLk9iamVjdAogewotICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZSwgcHJv cGVydHlFZGl0b3JzKQorICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZSwgcHJvcGVydHlFZGl0 b3JzLCBzcHJlYWROdW1iZXJWYWx1ZXMpCiAgICAgewogICAgICAgICBzdXBlcigpOwogCkBAIC0z Myw2ICszMyw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgPSBj bGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgIHRoaXMuX3Byb3Bl cnR5TmFtZSA9IHByb3BlcnR5TmFtZTsKICAgICAgICAgdGhpcy5fcHJvcGVydHlNaXNzaW5nID0g ZmFsc2U7CiAgICAgICAgIHRoaXMuX3Byb3BlcnR5RWRpdG9ycyA9IHByb3BlcnR5RWRpdG9ycyB8 fCBbXTsKKyAgICAgICAgdGhpcy5fc3ByZWFkTnVtYmVyVmFsdWVzID0gISFzcHJlYWROdW1iZXJW YWx1ZXMgJiYgdGhpcy5fcHJvcGVydHlFZGl0b3JzLmxlbmd0aCA+PSA0OwogCiAgICAgICAgIGZv ciAobGV0IGVkaXRvciBvZiB0aGlzLl9wcm9wZXJ0eUVkaXRvcnMpIHsKICAgICAgICAgICAgIGVk aXRvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRp dG9yLkV2ZW50LlZhbHVlRGlkQ2hhbmdlLCB0aGlzLl9oYW5kbGVQcm9wZXJ0eUVkaXRvclZhbHVl Q2hhbmdlZCwgdGhpcyk7CkBAIC02MCw3ICs2MSw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZVByb3BlcnR5Q29tYmluZXIgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgZXh0 CiAgICAgICAgICAgICBlbHNlIGlmIChlZGl0b3Iub3B0aW9uYWxQcm9wZXJ0eSkKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgaWYgKGVkaXRvci5tYXN0ZXJQcm9wZXJ0 eSAmJiBlZGl0b3IudmFsdWVJc1N1cHBvcnRlZEtleXdvcmQoKSkgeworICAgICAgICAgICAgaWYg KGVkaXRvci5tYXN0ZXJQcm9wZXJ0eSAmJiBlZGl0b3IudmFsdWVJc1N1cHBvcnRlZEtleXdvcmQo ZWRpdG9yLnZhbHVlKSkgewogICAgICAgICAgICAgICAgIHRoaXMuX21hcmtFZGl0b3JzKGVkaXRv ciwgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGVkaXRvclZhbHVlOwogICAgICAgICAg ICAgfQpAQCAtMTE3LDYgKzExOCwzNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0 eUNvbWJpbmVyID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyIGV4dAogICAgICAg ICBmb3IgKGxldCBlZGl0b3Igb2YgdGhpcy5fcHJvcGVydHlFZGl0b3JzKQogICAgICAgICAgICAg ZWRpdG9yW1dlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9yVXBk YXRlZFN5bWJvbF0gPSBmYWxzZTsKIAorICAgICAgICBmdW5jdGlvbiB1cGRhdGVFZGl0b3IoZWRp dG9yLCB2YWx1ZSkgeworICAgICAgICAgICAgbGV0IHVwZGF0ZWRWYWx1ZXMgPSBlZGl0b3IuZ2V0 VmFsdWVzRnJvbVRleHQodmFsdWUgfHwgIiIsIHByb3BlcnR5TWlzc2luZyk7CisgICAgICAgICAg ICBpZiAoIXVwZGF0ZWRWYWx1ZXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg ICAgICBlZGl0b3IudXBkYXRlRWRpdG9yVmFsdWVzKHVwZGF0ZWRWYWx1ZXMpOworICAgICAgICAg ICAgZWRpdG9yW1dlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9y VXBkYXRlZFN5bWJvbF0gPSB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHRoaXMuX3Nw cmVhZE51bWJlclZhbHVlcykgeworICAgICAgICAgICAgbGV0IG51bWJlclZhbHVlcyA9IHN0eWxl VGV4dC5tYXRjaCgvXGQrW1x3JV0qL2cpOworICAgICAgICAgICAgbGV0IGNvdW50ID0gbnVtYmVy VmFsdWVzICYmIG51bWJlclZhbHVlcy5sZW5ndGg7CisgICAgICAgICAgICBpZiAoY291bnQgPT09 IDEpIHsKKyAgICAgICAgICAgICAgICBmb3IgKGxldCBlZGl0b3Igb2YgdGhpcy5fcHJvcGVydHlF ZGl0b3JzKQorICAgICAgICAgICAgICAgICAgICB1cGRhdGVFZGl0b3IoZWRpdG9yLCBudW1iZXJW YWx1ZXNbMF0pOworICAgICAgICAgICAgfSBlbHNlIGlmIChjb3VudCA9PT0gMikgeworICAgICAg ICAgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgeworICAgICAgICAgICAg ICAgICAgICB1cGRhdGVFZGl0b3IodGhpcy5fcHJvcGVydHlFZGl0b3JzW2ldLCBudW1iZXJWYWx1 ZXNbaV0pOworICAgICAgICAgICAgICAgICAgICB1cGRhdGVFZGl0b3IodGhpcy5fcHJvcGVydHlF ZGl0b3JzW2kgKyAyXSwgbnVtYmVyVmFsdWVzW2ldKTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICB9IGVsc2UgaWYgKGNvdW50ID09PSAzKSB7CisgICAgICAgICAgICAgICAgdXBkYXRl RWRpdG9yKHRoaXMuX3Byb3BlcnR5RWRpdG9yc1swXSwgbnVtYmVyVmFsdWVzWzBdKTsKKyAgICAg ICAgICAgICAgICB1cGRhdGVFZGl0b3IodGhpcy5fcHJvcGVydHlFZGl0b3JzWzFdLCBudW1iZXJW YWx1ZXNbMV0pOworICAgICAgICAgICAgICAgIHVwZGF0ZUVkaXRvcih0aGlzLl9wcm9wZXJ0eUVk aXRvcnNbMl0sIG51bWJlclZhbHVlc1syXSk7CisgICAgICAgICAgICAgICAgdXBkYXRlRWRpdG9y KHRoaXMuX3Byb3BlcnR5RWRpdG9yc1szXSwgbnVtYmVyVmFsdWVzWzFdKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorCiAgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZUNvbXBhdGlibGVFZGl0b3Io dmFsdWUpIHsKICAgICAgICAgICAgIGZvciAobGV0IGVkaXRvciBvZiB0aGlzLl9wcm9wZXJ0eUVk aXRvcnMpIHsKICAgICAgICAgICAgICAgICBpZiAodmFsdWUgJiYgIWVkaXRvci52YWx1ZUlzQ29t cGF0aWJsZSh2YWx1ZSkgfHwgZWRpdG9yW1dlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5 Q29tYmluZXIuRWRpdG9yVXBkYXRlZFN5bWJvbF0pCkBAIC0xMjUsMTEgKzE1NCw3IEBAIFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgPSBjbGFzcyBWaXN1YWxTdHlsZVBy b3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRWYWx1 ZUlzS2V5d29yZCAmJiBlZGl0b3IuZGlzYWJsZWQpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogCi0gICAgICAgICAgICAgICAgbGV0IHVwZGF0ZWRWYWx1ZXMgPSBlZGl0b3IuZ2V0VmFs dWVzRnJvbVRleHQodmFsdWUgfHwgIiIsIHByb3BlcnR5TWlzc2luZyk7Ci0gICAgICAgICAgICAg ICAgaWYgKHVwZGF0ZWRWYWx1ZXMpCi0gICAgICAgICAgICAgICAgICAgIGVkaXRvci51cGRhdGVF ZGl0b3JWYWx1ZXModXBkYXRlZFZhbHVlcyk7Ci0gICAgICAgICAgICAgICAgZWRpdG9yW1dlYklu c3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9yVXBkYXRlZFN5bWJvbF0g PSB0cnVlOwotCisgICAgICAgICAgICAgICAgdXBkYXRlRWRpdG9yKGVkaXRvciwgdmFsdWUpOwog ICAgICAgICAgICAgICAgIGlmICh2YWx1ZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IuanMK aW5kZXggNmU4OGYxNWM2MTNmZjQ5NjQxMGE1YmZiY2M5ZTU0ODkzNWZmYWZjNi4uMDM0ZDMxOWE3 ZWFjNjcwNmNlODI3ZjFkYjZlMmYzNWMxYzU4NTJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZVByb3BlcnR5RWRpdG9yLmpzCkBAIC0zNzksNyArMzc5LDYgQEAgV2ViSW5zcGVjdG9yLlZp c3VhbFN0eWxlUHJvcGVydHlFZGl0b3IgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9y IGV4dGVuZHMKICAgICAgICAgaWYgKCF0aGlzLl9wb3NzaWJsZVZhbHVlcykKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgICAgICB2YWx1ZSA9IHZhbHVlIHx8IHRoaXMudmFsdWU7CiAg ICAgICAgIGlmIChPYmplY3Qua2V5cyh0aGlzLl9wb3NzaWJsZVZhbHVlcy5iYXNpYykuaW5jbHVk ZXModmFsdWUpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTM5MSw3ICszOTAsNiBA QCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvciA9IGNsYXNzIFZpc3VhbFN0 eWxlUHJvcGVydHlFZGl0b3IgZXh0ZW5kcwogICAgICAgICBpZiAoIXRoaXMuX3Bvc3NpYmxlVW5p dHMpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgdW5pdCA9IHVuaXQgfHwg dGhpcy51bml0czsKICAgICAgICAgaWYgKHRoaXMuX3Bvc3NpYmxlVW5pdHMuYmFzaWMuaW5jbHVk ZXModW5pdCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAo= 268489 2016-01-07 14:22:05 -0800 2016-01-07 14:37:08 -0800 Patch 152755.diff text/plain 23797 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ5MjlmNWMuLjNkNmQ2NmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDc2IEBACiAyMDE2LTAxLTA3ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBib3JkZXItaW1hZ2UgcHJvcGVydGllcyB0byBWaXN1YWwgc2lkZWJhcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNzU1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTWFpbi5o dG1sOgorICAgICAgICBTd2l0Y2hlZCB0aGUgb3JkZXIgb2YgVmlzdWFsU3R5bGVVUkxJbnB1dCBh bmQgVmlzdWFsU3R5bGVVbml0U2xpZGVyCisgICAgICAgIHRvIGJlIG9yZGVyZWQgYWxwaGFiZXRp Y2FsbHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQmFja2dy b3VuZFBpY2tlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUJhY2tncm91 bmRQaWNrZXIucHJvdG90eXBlLl9rZXl3b3JkU2VsZWN0TW91c2VEb3duKToKKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuY3NzOgorICAgICAg ICAoLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxz LXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwICsgLmdyb3VwID4g LnJvdzpmaXJzdC1jaGlsZCk6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNz cy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbi5iYWNrZ3JvdW5kIC5kZXRhaWxzLXNl Y3Rpb24uYm9yZGVyIC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmtleXdvcmQtY2hl Y2tib3guYm9yZGVyLWltYWdlLXNsaWNlKToKKyAgICAgICAgU2luY2UgdGhlIGNoZWNrYm94IGlz IHNvIHNtYWxsLCBnaXZlIGl0IGxlc3Mgcm9vbS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZUJvcmRlclNlY3Rpb24u Z2VuZXJhdGVCb3JkZXJJbWFnZVByb3BlcnR5RWRpdG9ycyk6CisgICAgICAgIFRoZSB0aHJlZSBw cm9wZXJ0aWVzICJib3JkZXItaW1hZ2Utd2lkdGgiLCAiYm9yZGVyLWltYWdlLW91dHNldCIsIGFu ZAorICAgICAgICAiYm9yZGVyLWltYWdlLXNsaWNlIiBhbGwgaGF2ZSB0aGUgc2FtZSBzeW50YXgs IHNvIG9uZSBmdW5jdGlvbiB0byBnZW5lcmF0ZQorICAgICAgICB0aGUgbGF5b3V0IGZvciBhbGwg dGhyZWUgaXMgbXVjaCBzaW1wbGVyLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZUJvcmRlclNlY3Rpb24pOgorICAgICAg ICBBZGRlZCB0aGUgYm9yZGVyIGltYWdlIHByb3BlcnRpZXMgdG8gYSBzZXBlcmF0ZSBncm91cCB1 bmRlciBCYWNrZ3JvdW5kID4gQm9yZGVyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlz dWFsU3R5bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5fa2V5d29yZFNlbGVjdE1vdXNlRG93bik6 CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRC b3guanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5wcm90b3R5 cGUuc2V0IHVuaXRzKToKKyAgICAgICAgUmVvcmRlcmVkIGxvZ2ljIHRvIGFsbG93IGEgdmFsdWUg b2YgIiIvbnVsbCB0byBzZXQgdGhlIHVuaXRzIHRvIHRoZSAiTnVtYmVyIgorICAgICAgICB2YWx1 ZSBpZiBpdCBpcyBhbGxvd2VkIGZvciB0aGF0IGVkaXRvci4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gucHJvdG90eXBlLmdldCBzeW50aGVzaXplZFZh bHVlKToKKyAgICAgICAgSW5zdGVhZCBvZiByZWx5aW5nIHVwb24gd2hldGhlciB0aGUgZWRpdG9y IGhhcyBhbnkgdW5pdHMsIGp1c3QgY2hlY2sgdG8gc2VlIGlmCisgICAgICAgIHRoZSBzZWxlY3Rl ZCB1bml0cyBhcmUgIk51bWJlciIgYW5kLCBpZiBub3QsIGFkZCB0aGVtIHRvIHRoZSB2YWx1ZS4K KworICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gucHJvdG90 eXBlLl91bml0c0VsZW1lbnRUZXh0Q29udGVudCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlDb21iaW5lci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIpOgorICAgICAgICBOb3cgaGFzIGFub3Ro ZXIgYXJndW1lbnQgdGhhdCwgd2hlbiB0cnVlLCBhc3N1bWVzIHRoZSBjb21iaW5lciBoYXMgYXQg bGVhc3QgNAorICAgICAgICBudW1lcmljYWwgdmFsdWVzIGFuZCBpcyBvZiB0aGUgZm9ybSAoY2Fu IGhhdmUgdW5pdHMpOgorICAgICAgICAgICAgcHJvcGVydHktbmFtZTogdmFsdWUxIFt2YWx1ZTIg W3ZhbHVlMyBbdmFsdWU0IFsuLi5dXV1dOworCisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVQcm9wZXJ0eUNvbWJpbmVyLnByb3RvdHlwZS5nZXQgc3ludGhlc2l6ZWRWYWx1ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLnByb3RvdHlw ZS51cGRhdGVWYWx1ZXNGcm9tVGV4dC51cGRhdGVFZGl0b3IpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlUHJvcGVydHlDb21iaW5lci5wcm90b3R5cGUudXBkYXRlVmFsdWVzRnJv bVRleHQudXBkYXRlQ29tcGF0aWJsZUVkaXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlz dWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLnByb3RvdHlwZS51cGRhdGVWYWx1ZXNGcm9tVGV4dCk6 CisgICAgICAgIElmIHRoZSBuZXcgYXJndW1lbnQgaXMgdHJ1ZSwgYXNzaWducyB0aGUgZXhpc3Rp bmcgdmFsdWVzIGluIHRoZSBmb2xsb3dpbmcgd2F5OgorICAgICAgICAgLSBJZiB0aGVyZSBpcyAx IHZhbHVlLCBhc3NpZ24gaXQgdG8gYWxsIG9mIHRoZSBlZGl0b3JzLgorICAgICAgICAgLSBJZiB0 aGVyZSBhcmUgMiB2YWx1ZXMsIGFzc2lnbiB0aGUgMXN0IG9uZSB0byBlZGl0b3JzIDEgYW5kIDMg YW5kIHRoZSAybmQgb25lCisgICAgICAgICAgICB0byBlZGl0b3JzIDIgYW5kIDQuCisgICAgICAg ICAtIElmIHRoZXJlIGFyZSAzIHZhbHVlcywgYXNzaWduIHRoZSAxc3Qgb25lIHRvIGVkaXRvciAx LCB0aGUgMm5kIG9uZSB0byBlZGl0b3JzCisgICAgICAgICAgICAyIGFuZCA0LCBhbmQgdGhlIDNy ZCBvbmUgdG8gZWRpdG9yIDMuCisgICAgICAgICAtIElmIHRoZXJlIGFyZSA0IG9yIG1vcmUgdmFs dWVzLCBhc3NpZ24gdGhlbSBub3JtYWxseS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5W aXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLnByb3RvdHlwZS52YWx1ZUlzU3VwcG9ydGVkS2V5d29y ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5wcm90 b3R5cGUuX3ZhbHVlSXNTdXBwb3J0ZWRBZHZhbmNlZEtleXdvcmQpOgorICAgICAgICBSZW1vdmVk IGNhbGwgdG8gdGhpcy52YWx1ZSB0byBwcmV2ZW50IHJlY3Vyc2lvbiBmcm9tIFZpc3VhbFN0eWxl TnVtYmVySW5wdXRCb3guCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3Bl cnR5RWRpdG9yLnByb3RvdHlwZS52YWx1ZUlzU3VwcG9ydGVkVW5pdCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5wcm90b3R5cGUuX3ZhbHVlSXNTdXBw b3J0ZWRBZHZhbmNlZFVuaXQpOgorICAgICAgICBSZW1vdmVkIGNhbGwgdG8gdGhpcy51bml0cyB0 byBwcmV2ZW50IHJlY3Vyc2lvbiBmcm9tIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guCisKKzIw MTYtMDEtMDcgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBjcmVhdGluZyBuZXcgcnVsZXMgaW4gdGhlIFN0eWxl cyBzaWRlYmFyIHNpbXBsZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MjcyNgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA3 ZDYzYjI3YjM2MzI4ZjM5ZDc3ZDU1ZGY3NjRlMGFhOTczZTBlMTk0Li45MmNhNjIzNmRhNWU5MTM3 NDdhMDZkYTczY2YwZjdlYzgxZTAwNWY5IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEy Mgp6Y21jYzd6YEN1OGI7SFVEIWIlTFczPD9ha0smLV56IypvUjchO214aSFVVigzJU9+OU5sckNp YFZKSyF1MShMfGgKensyNzRhbExJeXhQUUhETVhMSWlANj1VZmZwdzQ4VkxTJHZaSyhtME5sUTth O3BNSUhfUUVkQmhVZEQrPTA3P1RRCkFPI2xEQAoKZGVsdGEgMjkKbmNtVismME9KMylmKDYpczEr Yn0qdit0MUZOdDRncDJEMlU4Q15OVEA0Z3NlIT0pNFk0CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCmluZGV4IGJlODk1YzMuLmU3N2Y3NjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTYwMSw4 ICs2MDEsOCBAQAogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJl ZUl0ZW0uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVRh YmJlZFByb3BlcnRpZXNSb3cuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9W aXN1YWxTdHlsZVRpbWluZ0VkaXRvci5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlwdCBzcmM9IlZp ZXdzL1Zpc3VhbFN0eWxlVW5pdFNsaWRlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9 IlZpZXdzL1Zpc3VhbFN0eWxlVVJMSW5wdXQuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9WaXN1YWxTdHlsZVVuaXRTbGlkZXIuanMiPjwvc2NyaXB0PgogCiAgICAgPHNjcmlw dCBzcmM9IkNvbnRyb2xsZXJzL0Fubm90YXRvci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBz cmM9IkNvbnRyb2xsZXJzL0NvZGVNaXJyb3JFZGl0aW5nQ29udHJvbGxlci5qcyI+PC9zY3JpcHQ+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZUJhY2tncm91bmRQaWNrZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUJhY2tncm91bmRQaWNrZXIuanMKaW5kZXggODEw ZmI5Yy4uMTA1ZGUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVCYWNrZ3JvdW5kUGlja2VyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQmFja2dyb3VuZFBp Y2tlci5qcwpAQCAtMjA2LDcgKzIwNiw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUJhY2tn cm91bmRQaWNrZXIgPSBjbGFzcyBWaXN1YWxTdHlsZUJhY2tncm91bmRQaWNrZXIgZXh0CiAgICAg ewogICAgICAgICBpZiAoZXZlbnQuYWx0S2V5KQogICAgICAgICAgICAgdGhpcy5fYWRkQWR2YW5j ZWRWYWx1ZXMoKTsKLSAgICAgICAgZWxzZSBpZiAoIXRoaXMuX3ZhbHVlSXNTdXBwb3J0ZWRBZHZh bmNlZEtleXdvcmQoKSkKKyAgICAgICAgZWxzZSBpZiAoIXRoaXMuX3ZhbHVlSXNTdXBwb3J0ZWRB ZHZhbmNlZEtleXdvcmQodGhpcy52YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLl9yZW1vdmVBZHZh bmNlZFZhbHVlcygpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuY3NzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuY3NzCmluZGV4IDQ3YTY4OGYuLjU3ZTY4MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5jc3MKQEAgLTY0LDYgKzY0LDExIEBACiAgICAgZGlzcGxheTogZmxleDsK IH0KIAorLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRh aWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwICsgLmdyb3Vw ID4gLnJvdzpmaXJzdC1jaGlsZCB7CisgICAgcGFkZGluZy10b3A6IDdweDsKKyAgICBib3JkZXIt dG9wOiBub25lOworfQorCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAudmlz dWFsID4gLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgLmdyb3Vw ID4gLnJvdzpsYXN0LWNoaWxkIHsKICAgICBwYWRkaW5nLWJvdHRvbTogM3B4OwogfQpAQCAtOTcs NiArMTAyLDExIEBACiAgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiB9CiAKKy5zaWRlYmFyID4g LnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRh aWxzLXNlY3Rpb24gPiAuY29udGVudCAuZ3JvdXAgPiAucm93ICsgLnJvdy52aXN1YWwtc3R5bGUt dGFiYmVkLXByb3BlcnRpZXMtcm93LAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5 bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24uYmFja2dyb3VuZCAuZGV0YWlscy1zZWN0aW9u LmJhY2tncm91bmQtc3R5bGUgLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIuY29tbWEt c2VwYXJhdGVkLWtleXdvcmQtZWRpdG9yLmJhY2tncm91bmQgewogICAgIG1hcmdpbi10b3A6IDNw eDsKIH0KKworLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5k ZXRhaWxzLXNlY3Rpb24uYmFja2dyb3VuZCAuZGV0YWlscy1zZWN0aW9uLmJvcmRlciAudmlzdWFs LXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94LmJvcmRlci1pbWFnZS1z bGljZSB7CisgICAgZmxleDogMTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuanMKaW5kZXggNTRhNWVjNC4uNWY5MGM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuanMKQEAgLTk2MiwxMCArOTYyLDc0IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMg V2ViCiAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhncm91cC5wcm9wZXJ0 aWVzLmJvcmRlckxlZnRXaWR0aCwgaGlnaGxpZ2h0TW9kZSk7CiAgICAgICAgIHRoaXMuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyhncm91cC5wcm9wZXJ0aWVzLmJvcmRlclJpZ2h0V2lkdGgsIGhp Z2hsaWdodE1vZGUpOwogCisgICAgICAgIGxldCBib3JkZXJHcm91cCA9IG5ldyBXZWJJbnNwZWN0 b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChbYm9yZGVyVGFiQ29udHJvbGxlciwgYm9yZGVyQWxsR3Jv dXAsIGJvcmRlclRvcEdyb3VwLCBib3JkZXJSaWdodEdyb3VwLCBib3JkZXJCb3R0b21Hcm91cCwg Ym9yZGVyTGVmdEdyb3VwXSk7CisKKyAgICAgICAgbGV0IGJvcmRlckltYWdlU291cmNlUm93ID0g bmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0aWVz LmJvcmRlckltYWdlU291cmNlID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVVSTElucHV0 KCJib3JkZXItaW1hZ2Utc291cmNlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJJbWFnZSIpLCB0 aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cy5jb25jYXQoWyJOb25lIl0pKTsKKworICAgICAgICBib3Jk ZXJJbWFnZVNvdXJjZVJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYm9yZGVySW1h Z2VTb3VyY2UuZWxlbWVudCk7CisKKyAgICAgICAgbGV0IGJvcmRlckltYWdlUmVwZWF0Um93ID0g bmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBsZXQgYm9yZGVy SW1hZ2VTbGljZUZpbGwgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZENoZWNr Ym94KCJib3JkZXItaW1hZ2Utc2xpY2UiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZpbGwiKSwg IkZpbGwiKTsKKyAgICAgICAgYm9yZGVySW1hZ2VTbGljZUZpbGwub3B0aW9uYWxQcm9wZXJ0eSA9 IHRydWU7CisgICAgICAgIHByb3BlcnRpZXMuYm9yZGVySW1hZ2VSZXBlYXQgPSBuZXcgV2ViSW5z cGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlcigiYm9yZGVyLWltYWdlLXJlcGVhdCIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiUmVwZWF0IiksIHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNv bmNhdChbIlN0cmV0Y2giLCAiUmVwZWF0IiwgIlJvdW5kIiwgIlNwYWNlIl0pKTsKKworICAgICAg ICBib3JkZXJJbWFnZVJlcGVhdFJvdy5lbGVtZW50LmFwcGVuZENoaWxkKGJvcmRlckltYWdlU2xp Y2VGaWxsLmVsZW1lbnQpOworICAgICAgICBib3JkZXJJbWFnZVJlcGVhdFJvdy5lbGVtZW50LmFw cGVuZENoaWxkKHByb3BlcnRpZXMuYm9yZGVySW1hZ2VSZXBlYXQuZWxlbWVudCk7CisKKyAgICAg ICAgZnVuY3Rpb24gZ2VuZXJhdGVCb3JkZXJJbWFnZVByb3BlcnR5RWRpdG9ycyhwcm9wZXJ0eU5h bWUsIGtleXdvcmRzLCB1bml0cykgeworICAgICAgICAgICAgbGV0IHZlcnRpY2FsID0gbmV3IFdl Ykluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICAgICAgbGV0IHRvcCA9IG5l dyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWUsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiVG9wIiksIGtleXdvcmRzLCB1bml0cyk7CisgICAgICAgICAg ICB0b3AubWFzdGVyUHJvcGVydHkgPSB0cnVlOworICAgICAgICAgICAgbGV0IGJvdHRvbSA9IG5l dyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWUsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQm90dG9tIiksIGtleXdvcmRzLCB1bml0cyk7CisgICAgICAg ICAgICBib3R0b20ubWFzdGVyUHJvcGVydHkgPSB0cnVlOworCisgICAgICAgICAgICB2ZXJ0aWNh bC5lbGVtZW50LmFwcGVuZENoaWxkKHRvcC5lbGVtZW50KTsKKyAgICAgICAgICAgIHZlcnRpY2Fs LmVsZW1lbnQuYXBwZW5kQ2hpbGQoYm90dG9tLmVsZW1lbnQpOworCisgICAgICAgICAgICBsZXQg aG9yaXpvbnRhbCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAg ICAgICAgIGxldCBsZWZ0ID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0 Qm94KHByb3BlcnR5TmFtZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMZWZ0IiksIGtleXdvcmRz LCB1bml0cyk7CisgICAgICAgICAgICBsZWZ0Lm1hc3RlclByb3BlcnR5ID0gdHJ1ZTsKKyAgICAg ICAgICAgIGxldCByaWdodCA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1 dEJveChwcm9wZXJ0eU5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmlnaHQiKSwga2V5d29y ZHMsIHVuaXRzKTsKKyAgICAgICAgICAgIHJpZ2h0Lm1hc3RlclByb3BlcnR5ID0gdHJ1ZTsKKwor ICAgICAgICAgICAgaG9yaXpvbnRhbC5lbGVtZW50LmFwcGVuZENoaWxkKGxlZnQuZWxlbWVudCk7 CisgICAgICAgICAgICBob3Jpem9udGFsLmVsZW1lbnQuYXBwZW5kQ2hpbGQocmlnaHQuZWxlbWVu dCk7CisKKyAgICAgICAgICAgIHJldHVybiB7Z3JvdXA6IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWls c1NlY3Rpb25Hcm91cChbdmVydGljYWwsIGhvcml6b250YWxdKSwgcHJvcGVydGllczogW3RvcCwg Ym90dG9tLCBsZWZ0LCByaWdodF19OworICAgICAgICB9CisKKyAgICAgICAgbGV0IG5vbktleXdv cmRVbml0cyA9IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk51bWJlciIpXTsKKworICAgICAgICBs ZXQgYm9yZGVySW1hZ2VVbml0cyA9IHRoaXMuX3VuaXRzLmRlZmF1bHRzOworICAgICAgICBib3Jk ZXJJbWFnZVVuaXRzLmJhc2ljID0gbm9uS2V5d29yZFVuaXRzLmNvbmNhdChib3JkZXJJbWFnZVVu aXRzLmJhc2ljKTsKKyAgICAgICAgbGV0IGJvcmRlckltYWdlV2lkdGggPSBnZW5lcmF0ZUJvcmRl ckltYWdlUHJvcGVydHlFZGl0b3JzKCJib3JkZXItaW1hZ2Utd2lkdGgiLCB0aGlzLl9rZXl3b3Jk cy5ib3hNb2RlbCwgYm9yZGVySW1hZ2VVbml0cyk7CisgICAgICAgIHByb3BlcnRpZXMuYm9yZGVy SW1hZ2VXaWR0aCA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVy KCJib3JkZXItaW1hZ2Utd2lkdGgiLCBib3JkZXJJbWFnZVdpZHRoLnByb3BlcnRpZXMsIHRydWUp OworCisgICAgICAgIGxldCBib3JkZXJPdXRzZXRVbml0cyA9IHRoaXMuX3VuaXRzLmRlZmF1bHRz U2Fuc1BlcmNlbnQ7CisgICAgICAgIGJvcmRlck91dHNldFVuaXRzLmJhc2ljID0gbm9uS2V5d29y ZFVuaXRzLmNvbmNhdChib3JkZXJPdXRzZXRVbml0cy5iYXNpYyk7CisgICAgICAgIGxldCBib3Jk ZXJJbWFnZU91dHNldCA9IGdlbmVyYXRlQm9yZGVySW1hZ2VQcm9wZXJ0eUVkaXRvcnMoImJvcmRl ci1pbWFnZS1vdXRzZXQiLCB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cywgYm9yZGVyT3V0c2V0VW5p dHMpOworICAgICAgICBwcm9wZXJ0aWVzLmJvcmRlckltYWdlT3V0c2V0ID0gbmV3IFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIoImJvcmRlci1pbWFnZS1vdXRzZXQiLCBi b3JkZXJJbWFnZU91dHNldC5wcm9wZXJ0aWVzLCB0cnVlKTsKKworICAgICAgICBsZXQgYm9yZGVy SW1hZ2VTbGljZSA9IGdlbmVyYXRlQm9yZGVySW1hZ2VQcm9wZXJ0eUVkaXRvcnMoImJvcmRlci1p bWFnZS1zbGljZSIsIHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLCBbIiUiXS5jb25jYXQobm9uS2V5 d29yZFVuaXRzKSk7CisgICAgICAgIGJvcmRlckltYWdlU2xpY2UucHJvcGVydGllcy5wdXNoKGJv cmRlckltYWdlU2xpY2VGaWxsKTsKKyAgICAgICAgcHJvcGVydGllcy5ib3JkZXJJbWFnZVNsaWNl ID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIoImJvcmRlci1p bWFnZS1zbGljZSIsIGJvcmRlckltYWdlU2xpY2UucHJvcGVydGllcywgdHJ1ZSk7CisKKyAgICAg ICAgbGV0IGJvcmRlckltYWdlUHJvcGVydGllc1RhYkNvbnRyb2xsZXIgPSBuZXcgV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlVGFiYmVkUHJvcGVydGllc1Jvdyh7CisgICAgICAgICAgICAid2lkdGgi OiB7dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiV2lkdGgiKSwgZWxlbWVudDogYm9yZGVy SW1hZ2VXaWR0aC5ncm91cC5lbGVtZW50LCBwcm9wZXJ0aWVzOiBbcHJvcGVydGllcy5ib3JkZXJJ bWFnZVdpZHRoXX0sCisgICAgICAgICAgICAib3V0c2V0Ijoge3RpdGxlOiBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIk91dHNldCIpLCBlbGVtZW50OiBib3JkZXJJbWFnZU91dHNldC5ncm91cC5lbGVt ZW50LCBwcm9wZXJ0aWVzOiBbcHJvcGVydGllcy5ib3JkZXJJbWFnZU91dHNldF19LAorICAgICAg ICAgICAgInNsaWNlIjoge3RpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNsaWNlIiksIGVs ZW1lbnQ6IGJvcmRlckltYWdlU2xpY2UuZ3JvdXAuZWxlbWVudCwgcHJvcGVydGllczogW3Byb3Bl cnRpZXMuYm9yZGVySW1hZ2VTbGljZV19CisgICAgICAgIH0pOworCisgICAgICAgIGxldCBib3Jk ZXJJbWFnZUdyb3VwID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFtib3Jk ZXJJbWFnZVNvdXJjZVJvdywgYm9yZGVySW1hZ2VSZXBlYXRSb3csIGJvcmRlckltYWdlUHJvcGVy dGllc1RhYkNvbnRyb2xsZXIsIGJvcmRlckltYWdlV2lkdGguZ3JvdXAsIGJvcmRlckltYWdlT3V0 c2V0Lmdyb3VwLCBib3JkZXJJbWFnZVNsaWNlLmdyb3VwXSk7CisKICAgICAgICAgZ3JvdXAuYXV0 b2NvbXBsZXRlQ29tcGF0aWJsZVByb3BlcnRpZXMgPSBbcHJvcGVydGllcy5ib3JkZXJDb2xvciwg cHJvcGVydGllcy5ib3JkZXJUb3BDb2xvciwgcHJvcGVydGllcy5ib3JkZXJCb3R0b21Db2xvciwg cHJvcGVydGllcy5ib3JkZXJMZWZ0Q29sb3IsIHByb3BlcnRpZXMuYm9yZGVyUmlnaHRDb2xvcl07 CiAKLSAgICAgICAgbGV0IGJvcmRlckdyb3VwID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2Vj dGlvbkdyb3VwKFtib3JkZXJUYWJDb250cm9sbGVyLCBib3JkZXJBbGxHcm91cCwgYm9yZGVyVG9w R3JvdXAsIGJvcmRlclJpZ2h0R3JvdXAsIGJvcmRlckJvdHRvbUdyb3VwLCBib3JkZXJMZWZ0R3Jv dXBdKTsKLSAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBbYm9yZGVyR3JvdXBd KTsKKyAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBbYm9yZGVyR3JvdXAsIGJv cmRlckltYWdlR3JvdXBdKTsKICAgICB9CiAKICAgICBfcG9wdWxhdGVPdXRsaW5lU2VjdGlvbigp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanMKaW5kZXggMzk4MmU4Ny4u MTc0MWYzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5qcwpAQCAt MTI5LDcgKzEyOSw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIgPSBj bGFzcyBWaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIgZXh0ZW5kcyBXCiAgICAgewogICAgICAgICBp ZiAoZXZlbnQuYWx0S2V5KQogICAgICAgICAgICAgdGhpcy5fYWRkQWR2YW5jZWRWYWx1ZXMoKTsK LSAgICAgICAgZWxzZSBpZiAoIXRoaXMuX3ZhbHVlSXNTdXBwb3J0ZWRBZHZhbmNlZEtleXdvcmQo KSkKKyAgICAgICAgZWxzZSBpZiAoIXRoaXMuX3ZhbHVlSXNTdXBwb3J0ZWRBZHZhbmNlZEtleXdv cmQodGhpcy52YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLl9yZW1vdmVBZHZhbmNlZFZhbHVlcygp OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMKaW5k ZXggZmI3OTFhNS4uNGRiNmU3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZU51bWJlcklu cHV0Qm94LmpzCkBAIC0yNyw5ICsyNywxMyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1i ZXJJbnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5kcwogewog ICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBwb3Nz aWJsZVVuaXRzLCBhbGxvd05lZ2F0aXZlVmFsdWVzLCBsYXlvdXRSZXZlcnNlZCkKICAgICB7Ci0g ICAgICAgIHN1cGVyKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBwb3NzaWJs ZVVuaXRzIHx8IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk51bWJlciIpXSwgIm51bWJlci1pbnB1 dC1ib3giLCBsYXlvdXRSZXZlcnNlZCk7CisgICAgICAgIGxldCB1bml0bGVzc051bWJlclVuaXQg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk51bWJlciIpOwogCi0gICAgICAgIHRoaXMuX2hhc1Vu aXRzID0gISFwb3NzaWJsZVVuaXRzOworICAgICAgICBzdXBlcihwcm9wZXJ0eU5hbWVzLCB0ZXh0 LCBwb3NzaWJsZVZhbHVlcywgcG9zc2libGVVbml0cyB8fCBbdW5pdGxlc3NOdW1iZXJVbml0XSwg Im51bWJlci1pbnB1dC1ib3giLCBsYXlvdXRSZXZlcnNlZCk7CisKKyAgICAgICAgdGhpcy5fdW5p dGxlc3NOdW1iZXJVbml0ID0gdW5pdGxlc3NOdW1iZXJVbml0OworCisgICAgICAgIHRoaXMuX2hh c1VuaXRzID0gdGhpcy5fcG9zc2libGVVbml0cy5iYXNpYy5zb21lKCh1bml0KSA9PiB1bml0ICE9 PSB1bml0bGVzc051bWJlclVuaXQpOwogICAgICAgICB0aGlzLl9hbGxvd05lZ2F0aXZlVmFsdWVz ID0gISFhbGxvd05lZ2F0aXZlVmFsdWVzIHx8IGZhbHNlOwogCiAgICAgICAgIHRoaXMuY29udGVu dEVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgibm8tdmFsdWVzIiwgIXBvc3NpYmxlVmFsdWVzIHx8 ICFwb3NzaWJsZVZhbHVlcy5sZW5ndGgpOwpAQCAtODksOCArOTMsOCBAQCBXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRC b3ggZXh0ZW5kcwogICAgICAgICB0aGlzLmNvbnRlbnRFbGVtZW50LmNsYXNzTGlzdC5hZGQoIm51 bWJlci1pbnB1dC1lZGl0YWJsZSIpOwogICAgICAgICB0aGlzLl92YWx1ZU51bWJlcklucHV0RWxl bWVudC52YWx1ZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX3ZhbHVlTnVtYmVySW5wdXRFbGVtZW50 LnNldEF0dHJpYnV0ZSgicGxhY2Vob2xkZXIiLCAwKTsKLSAgICAgICAgaWYgKHRoaXMuX2hhc1Vu aXRzICYmIHRoaXMudmFsdWVJc1N1cHBvcnRlZFVuaXQoInB4IikpCi0gICAgICAgICAgICB0aGlz Ll91bml0c0VsZW1lbnRUZXh0Q29udGVudCA9IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZh bHVlID0gInB4IjsKKyAgICAgICAgaWYgKHRoaXMuX2hhc1VuaXRzKQorICAgICAgICAgICAgdGhp cy5fdW5pdHNFbGVtZW50VGV4dENvbnRlbnQgPSB0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC52 YWx1ZSA9IHRoaXMudmFsdWVJc1N1cHBvcnRlZFVuaXQoInB4IikgPyAicHgiIDogdGhpcy5fcG9z c2libGVVbml0cy5iYXNpY1swXTsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTE1OSwyMCAr MTYzLDE3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3Mg VmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAKICAgICBzZXQgdW5pdHModW5pdCkK ICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVk KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlmICghdW5pdCB8fCB1bml0ID09PSB0 aGlzLnVuaXRzKQorICAgICAgICBpZiAodGhpcy5fdW5jaGFuZ2VkT3B0aW9uRWxlbWVudC5zZWxl Y3RlZCB8fCB1bml0ID09PSB0aGlzLnVuaXRzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIGlmICghdGhpcy52YWx1ZUlzU3VwcG9ydGVkVW5pdCh1bml0KSkKKyAgICAgICAgaWYgKCF1 bml0ICYmICF0aGlzLl9wb3NzaWJsZVVuaXRzLmJhc2ljLmluY2x1ZGVzKHRoaXMuX3VuaXRsZXNz TnVtYmVyVW5pdCkgJiYgIXRoaXMudmFsdWVJc1N1cHBvcnRlZFVuaXQodW5pdCkpCiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKHRoaXMuX3ZhbHVlSXNTdXBwb3J0ZWRBZHZhbmNl ZFVuaXQodW5pdCkpCiAgICAgICAgICAgICB0aGlzLl9hZGRBZHZhbmNlZFVuaXRzKCk7CiAKICAg ICAgICAgdGhpcy5fc2V0TnVtYmVySW5wdXRJc0VkaXRhYmxlKHRydWUpOwotICAgICAgICB0aGlz Ll9rZXl3b3JkU2VsZWN0RWxlbWVudC52YWx1ZSA9IHVuaXQ7CisgICAgICAgIHRoaXMuX2tleXdv cmRTZWxlY3RFbGVtZW50LnZhbHVlID0gdW5pdCB8fCB0aGlzLl91bml0bGVzc051bWJlclVuaXQ7 CiAgICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudFRleHRDb250ZW50ID0gdW5pdDsKICAgICB9CiAK QEAgLTIwMyw3ICsyMDQsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJv eCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5kcwogICAgICAgICAgICAg cmV0dXJuIG51bGw7CiAKICAgICAgICAgbGV0IGtleXdvcmQgPSB0aGlzLl9rZXl3b3JkU2VsZWN0 RWxlbWVudC52YWx1ZTsKLSAgICAgICAgcmV0dXJuIHRoaXMudmFsdWVJc1N1cHBvcnRlZFVuaXQo a2V5d29yZCkgPyB2YWx1ZSArICh0aGlzLl9oYXNVbml0cyA/IGtleXdvcmQgOiAiIikgOiBrZXl3 b3JkOworICAgICAgICByZXR1cm4gdGhpcy52YWx1ZUlzU3VwcG9ydGVkVW5pdChrZXl3b3JkKSA/ IHZhbHVlICsgKGtleXdvcmQgPT09IHRoaXMuX3VuaXRsZXNzTnVtYmVyVW5pdCA/ICIiIDoga2V5 d29yZCkgOiBrZXl3b3JkOwogICAgIH0KIAogICAgIHVwZGF0ZVZhbHVlRnJvbVRleHQodGV4dCwg dmFsdWUpCkBAIC0yMjgsNyArMjI5LDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVy SW5wdXRCb3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94IGV4dGVuZHMKICAgICAg ICAgaWYgKCF0aGlzLl9oYXNVbml0cykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0 aGlzLl91bml0c0VsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXh0OworICAgICAgICB0aGlzLl91bml0 c0VsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXh0ID09PSB0aGlzLl91bml0bGVzc051bWJlclVuaXQg PyAiIiA6IHRleHQ7CiAgICAgICAgIHRoaXMuX21hcmtVbml0c0NvbnRhaW5lcklmSW5wdXRIYXNW YWx1ZSgpOwogICAgIH0KIApAQCAtMzIzLDcgKzMyNCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCBleHRl bmRzCiAgICAgewogICAgICAgICBpZiAoZXZlbnQuYWx0S2V5KQogICAgICAgICAgICAgdGhpcy5f YWRkQWR2YW5jZWRVbml0cygpOwotICAgICAgICBlbHNlIGlmICghdGhpcy5fdmFsdWVJc1N1cHBv cnRlZEFkdmFuY2VkVW5pdCgpKQorICAgICAgICBlbHNlIGlmICghdGhpcy5fdmFsdWVJc1N1cHBv cnRlZEFkdmFuY2VkVW5pdCh0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC52YWx1ZSkpCiAgICAg ICAgICAgICB0aGlzLl9yZW1vdmVBZHZhbmNlZFVuaXRzKCk7CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVBy b3BlcnR5Q29tYmluZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanMKaW5kZXggMzEyYTc5Yi4uMjg1ODY4 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlDb21iaW5lci5qcwpAQCAt MjUsNyArMjUsNyBAQAogCiBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVy ID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyIGV4dGVuZHMgV2ViSW5zcGVjdG9y Lk9iamVjdAogewotICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZSwgcHJvcGVydHlFZGl0b3Jz KQorICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZSwgcHJvcGVydHlFZGl0b3JzLCBzcHJlYWRO dW1iZXJWYWx1ZXMpCiAgICAgewogICAgICAgICBzdXBlcigpOwogCkBAIC0zMyw2ICszMyw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgPSBjbGFzcyBWaXN1YWxT dHlsZVByb3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgIHRoaXMuX3Byb3BlcnR5TmFtZSA9IHBy b3BlcnR5TmFtZTsKICAgICAgICAgdGhpcy5fcHJvcGVydHlNaXNzaW5nID0gZmFsc2U7CiAgICAg ICAgIHRoaXMuX3Byb3BlcnR5RWRpdG9ycyA9IHByb3BlcnR5RWRpdG9ycyB8fCBbXTsKKyAgICAg ICAgdGhpcy5fc3ByZWFkTnVtYmVyVmFsdWVzID0gISFzcHJlYWROdW1iZXJWYWx1ZXMgJiYgdGhp cy5fcHJvcGVydHlFZGl0b3JzLmxlbmd0aCA+PSA0OwogCiAgICAgICAgIGZvciAobGV0IGVkaXRv ciBvZiB0aGlzLl9wcm9wZXJ0eUVkaXRvcnMpIHsKICAgICAgICAgICAgIGVkaXRvci5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLkV2ZW50LlZh bHVlRGlkQ2hhbmdlLCB0aGlzLl9oYW5kbGVQcm9wZXJ0eUVkaXRvclZhbHVlQ2hhbmdlZCwgdGhp cyk7CkBAIC02MCw3ICs2MSw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29t YmluZXIgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgICAg ICBlbHNlIGlmIChlZGl0b3Iub3B0aW9uYWxQcm9wZXJ0eSkKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICAgICAgaWYgKGVkaXRvci5tYXN0ZXJQcm9wZXJ0eSAmJiBlZGl0b3Iu dmFsdWVJc1N1cHBvcnRlZEtleXdvcmQoKSkgeworICAgICAgICAgICAgaWYgKGVkaXRvci5tYXN0 ZXJQcm9wZXJ0eSAmJiBlZGl0b3IudmFsdWVJc1N1cHBvcnRlZEtleXdvcmQoZWRpdG9yLnZhbHVl KSkgewogICAgICAgICAgICAgICAgIHRoaXMuX21hcmtFZGl0b3JzKGVkaXRvciwgdHJ1ZSk7CiAg ICAgICAgICAgICAgICAgcmV0dXJuIGVkaXRvclZhbHVlOwogICAgICAgICAgICAgfQpAQCAtMTE3 LDYgKzExOCwzNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyID0g Y2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyIGV4dAogICAgICAgICBmb3IgKGxldCBl ZGl0b3Igb2YgdGhpcy5fcHJvcGVydHlFZGl0b3JzKQogICAgICAgICAgICAgZWRpdG9yW1dlYklu c3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9yVXBkYXRlZFN5bWJvbF0g PSBmYWxzZTsKIAorICAgICAgICBmdW5jdGlvbiB1cGRhdGVFZGl0b3IoZWRpdG9yLCB2YWx1ZSkg eworICAgICAgICAgICAgbGV0IHVwZGF0ZWRWYWx1ZXMgPSBlZGl0b3IuZ2V0VmFsdWVzRnJvbVRl eHQodmFsdWUgfHwgIiIsIHByb3BlcnR5TWlzc2luZyk7CisgICAgICAgICAgICBpZiAoIXVwZGF0 ZWRWYWx1ZXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBlZGl0b3Iu dXBkYXRlRWRpdG9yVmFsdWVzKHVwZGF0ZWRWYWx1ZXMpOworICAgICAgICAgICAgZWRpdG9yW1dl Ykluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9yVXBkYXRlZFN5bWJv bF0gPSB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHRoaXMuX3NwcmVhZE51bWJlclZh bHVlcykgeworICAgICAgICAgICAgbGV0IG51bWJlclZhbHVlcyA9IHN0eWxlVGV4dC5tYXRjaCgv XGQrW1x3JV0qL2cpOworICAgICAgICAgICAgbGV0IGNvdW50ID0gbnVtYmVyVmFsdWVzICYmIG51 bWJlclZhbHVlcy5sZW5ndGg7CisgICAgICAgICAgICBpZiAoY291bnQgPT09IDEpIHsKKyAgICAg ICAgICAgICAgICBmb3IgKGxldCBlZGl0b3Igb2YgdGhpcy5fcHJvcGVydHlFZGl0b3JzKQorICAg ICAgICAgICAgICAgICAgICB1cGRhdGVFZGl0b3IoZWRpdG9yLCBudW1iZXJWYWx1ZXNbMF0pOwor ICAgICAgICAgICAgfSBlbHNlIGlmIChjb3VudCA9PT0gMikgeworICAgICAgICAgICAgICAgIGZv ciAobGV0IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgeworICAgICAgICAgICAgICAgICAgICB1cGRh dGVFZGl0b3IodGhpcy5fcHJvcGVydHlFZGl0b3JzW2ldLCBudW1iZXJWYWx1ZXNbaV0pOworICAg ICAgICAgICAgICAgICAgICB1cGRhdGVFZGl0b3IodGhpcy5fcHJvcGVydHlFZGl0b3JzW2kgKyAy XSwgbnVtYmVyVmFsdWVzW2ldKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVs c2UgaWYgKGNvdW50ID09PSAzKSB7CisgICAgICAgICAgICAgICAgdXBkYXRlRWRpdG9yKHRoaXMu X3Byb3BlcnR5RWRpdG9yc1swXSwgbnVtYmVyVmFsdWVzWzBdKTsKKyAgICAgICAgICAgICAgICB1 cGRhdGVFZGl0b3IodGhpcy5fcHJvcGVydHlFZGl0b3JzWzFdLCBudW1iZXJWYWx1ZXNbMV0pOwor ICAgICAgICAgICAgICAgIHVwZGF0ZUVkaXRvcih0aGlzLl9wcm9wZXJ0eUVkaXRvcnNbMl0sIG51 bWJlclZhbHVlc1syXSk7CisgICAgICAgICAgICAgICAgdXBkYXRlRWRpdG9yKHRoaXMuX3Byb3Bl cnR5RWRpdG9yc1szXSwgbnVtYmVyVmFsdWVzWzFdKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCiAgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZUNvbXBhdGlibGVFZGl0b3IodmFsdWUpIHsKICAg ICAgICAgICAgIGZvciAobGV0IGVkaXRvciBvZiB0aGlzLl9wcm9wZXJ0eUVkaXRvcnMpIHsKICAg ICAgICAgICAgICAgICBpZiAodmFsdWUgJiYgIWVkaXRvci52YWx1ZUlzQ29tcGF0aWJsZSh2YWx1 ZSkgfHwgZWRpdG9yW1dlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRp dG9yVXBkYXRlZFN5bWJvbF0pCkBAIC0xMjUsMTEgKzE1NCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmlu ZXIgZXh0CiAgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRWYWx1ZUlzS2V5d29yZCAm JiBlZGl0b3IuZGlzYWJsZWQpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAg ICAgICAgICAgICAgbGV0IHVwZGF0ZWRWYWx1ZXMgPSBlZGl0b3IuZ2V0VmFsdWVzRnJvbVRleHQo dmFsdWUgfHwgIiIsIHByb3BlcnR5TWlzc2luZyk7Ci0gICAgICAgICAgICAgICAgaWYgKHVwZGF0 ZWRWYWx1ZXMpCi0gICAgICAgICAgICAgICAgICAgIGVkaXRvci51cGRhdGVFZGl0b3JWYWx1ZXMo dXBkYXRlZFZhbHVlcyk7Ci0gICAgICAgICAgICAgICAgZWRpdG9yW1dlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuRWRpdG9yVXBkYXRlZFN5bWJvbF0gPSB0cnVlOwotCisg ICAgICAgICAgICAgICAgdXBkYXRlRWRpdG9yKGVkaXRvciwgdmFsdWUpOwogICAgICAgICAgICAg ICAgIGlmICh2YWx1ZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IuanMKaW5kZXggNmU4OGYx NS4uZmM4OWVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLmpz CkBAIC0zNzksNyArMzc5LDYgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0 b3IgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yIGV4dGVuZHMKICAgICAgICAgaWYg KCF0aGlzLl9wb3NzaWJsZVZhbHVlcykKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg ICAgICB2YWx1ZSA9IHZhbHVlIHx8IHRoaXMudmFsdWU7CiAgICAgICAgIGlmIChPYmplY3Qua2V5 cyh0aGlzLl9wb3NzaWJsZVZhbHVlcy5iYXNpYykuaW5jbHVkZXModmFsdWUpKQogICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAKQEAgLTM5MSw3ICszOTAsNiBAQCBXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVQcm9wZXJ0eUVkaXRvciA9IGNsYXNzIFZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IgZXh0 ZW5kcwogICAgICAgICBpZiAoIXRoaXMuX3Bvc3NpYmxlVW5pdHMpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICAgICAgdW5pdCA9IHVuaXQgfHwgdGhpcy51bml0czsKICAgICAgICAg aWYgKHRoaXMuX3Bvc3NpYmxlVW5pdHMuYmFzaWMuaW5jbHVkZXModW5pdCkpCiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKIApAQCAtNDE5LDEyICs0MTcsMTIgQEAgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlUHJvcGVydHlFZGl0b3IgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yIGV4 dGVuZHMKIAogICAgIF92YWx1ZUlzU3VwcG9ydGVkQWR2YW5jZWRLZXl3b3JkKHZhbHVlKQogICAg IHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Bvc3NpYmxlVmFsdWVzLmFkdmFuY2VkICYmIE9iamVj dC5rZXlzKHRoaXMuX3Bvc3NpYmxlVmFsdWVzLmFkdmFuY2VkKS5pbmNsdWRlcyh2YWx1ZSB8fCB0 aGlzLnZhbHVlKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Bvc3NpYmxlVmFsdWVzLmFkdmFuY2Vk ICYmIE9iamVjdC5rZXlzKHRoaXMuX3Bvc3NpYmxlVmFsdWVzLmFkdmFuY2VkKS5pbmNsdWRlcyh2 YWx1ZSk7CiAgICAgfQogCiAgICAgX3ZhbHVlSXNTdXBwb3J0ZWRBZHZhbmNlZFVuaXQodW5pdCkK ICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9wb3NzaWJsZVVuaXRzLmFkdmFuY2VkICYmIHRo aXMuX3Bvc3NpYmxlVW5pdHMuYWR2YW5jZWQuaW5jbHVkZXModW5pdCB8fCB0aGlzLnVuaXRzKTsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3Bvc3NpYmxlVW5pdHMuYWR2YW5jZWQgJiYgdGhpcy5fcG9z c2libGVVbml0cy5hZHZhbmNlZC5pbmNsdWRlcyh1bml0KTsKICAgICB9CiAKICAgICBfY2Fub25p Y2FsaXplZEtleXdvcmRGb3JLZXkodmFsdWUpCg==