148021 2015-08-14 00:24:00 -0700 Web Inspector: Style changes to Visual sidebar editors 2015-08-14 15:05:25 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 147064 147563 147570 147576 148022 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1117607 0 hi 2015-08-14 00:24:00 -0700 Modify the styles of the existing editors to fix bugs and positioning issues. 1117608 1 webkit-bug-importer 2015-08-14 00:24:18 -0700 <rdar://problem/22283851> 1117610 2 258994 hi 2015-08-14 00:34:04 -0700 Created attachment 258994 Patch 1117631 3 258994 bburg 2015-08-14 08:33:50 -0700 Comment on attachment 258994 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258994&action=review > Source/WebInspectorUI/ChangeLog:35 > + Due to a current bug, you cannot extend ES6 getters/setters. In order to work around this, a member Please link the bug. I have not heard about this, and we use it throughout the codebase. If this is a JSC bug, you should annotate relevant code with the bug URL, so at a later time we will know why it was done that way (and if the workaround can be removed). > Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css:47 > + content: "Small Caps"; If we do this, then the string can't be localized. > Source/WebInspectorUI/UserInterface/Views/VisualStyleRelativeNumberSlider.js:70 > + this._origin = this._startingValue; Isn't a number line's origin always 0, in the mathematical sense? This code seems to assign this._origin to outside the range represented by this._scale. I am confused by what this code is doing. 1117664 4 258994 timothy 2015-08-14 10:43:51 -0700 Comment on attachment 258994 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258994&action=review >> Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css:47 >> + content: "Small Caps"; > > If we do this, then the string can't be localized. That is true, but we don't localize things that match the CSS keywords. We might change that stance after feedback, but I think "Small Caps" rendered in small caps makes sense here. The same effect wouldn't work if "Small Caps" was in Chinese or Japanese. 1117669 5 hi 2015-08-14 11:00:34 -0700 > > Source/WebInspectorUI/ChangeLog:35 > > + Due to a current bug, you cannot extend ES6 getters/setters. In order to work around this, a member > > Please link the bug. I have not heard about this, and we use it throughout > the codebase. > > If this is a JSC bug, you should annotate relevant code with the bug URL, so > at a later time we will know why it was done that way (and if the workaround > can be removed). https://bugs.webkit.org/show_bug.cgi?id=147064 > > Source/WebInspectorUI/UserInterface/Views/VisualStyleRelativeNumberSlider.js:70 > > + this._origin = this._startingValue; > > Isn't a number line's origin always 0, in the mathematical sense? > > This code seems to assign this._origin to outside the range represented by > this._scale. I am confused by what this code is doing. The origin represents the offset of the value that isn't contained in the range. For example, if the original number is 1000, we would want the origin to be 1000 so that when the user moves the slider in either direction they are adding to 1000. Another example would be if the value is 50 and cannot go negative. In this case, the origin would be 0 as the starting value is not outside of the slider's range. I'll rename some of the variables to better explain this. 1117697 6 259015 hi 2015-08-14 12:02:37 -0700 Created attachment 259015 Patch 1117765 7 259015 bburg 2015-08-14 14:21:42 -0700 Comment on attachment 259015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259015&action=review r=me, looking nice. I will add 147064 as a "blocker" so we get pinged when it's fixed. > Source/WebInspectorUI/UserInterface/Views/VisualStyleRelativeNumberSlider.js:65 > + let midpoint = this._scale / 2; I guess the reason I found this code this confusing is that I would expect scale to be [min, max] not a scalar. It's fine for now, I guess. 1117797 8 259015 commit-queue 2015-08-14 15:05:20 -0700 Comment on attachment 259015 Patch Clearing flags on attachment: 259015 Committed r188490: <http://trac.webkit.org/changeset/188490> 1117798 9 commit-queue 2015-08-14 15:05:25 -0700 All reviewed patches have been landed. Closing bug. 258994 2015-08-14 00:34:04 -0700 2015-08-14 12:02:34 -0700 Patch bug-148021-20150814003345.patch text/plain 17193 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM4MjVhMDJiZDYyNzZhNjM3YzNlZjAxYmFiYTc1 NTRlNzQ5OWI4MGUuLjQwY2ZmMWJkNTkzNWM3NTI0ZjcwNTU2MDA4OTIwMTE3OGRhOWM4Y2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDE1LTA4LTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZSBjaGFuZ2VzIHRvIFZpc3VhbCBzaWRlYmFyIGVkaXRvcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODAyMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZhcmlvdXMgc3R5bGUgZml4ZXMgYW5kIGZl YXR1cmUgZW5oYW5jZW1lbnRzIGluIHNvbWUgb2YgdGhlIFZpc3VhbCBzdHlsZSBwcm9wZXJ0eSBl ZGl0b3JzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbG9y UGlja2VyLmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmlu cHV0LWNvbG9yLXBpY2tlciA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVy ID4gLmNvbG9yLXN3YXRjaCk6CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRh aW5lci5pbnB1dC1jb2xvci1waWNrZXIgPiAudmlzdWFsLXN0eWxlLXByb3BlcnR5LXZhbHVlLWNv bnRhaW5lciA+IGlucHV0KToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFp bmVyLmlucHV0LWNvbG9yLXBpY2tlci5tdWx0aXBsZSA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHkt dmFsdWUtY29udGFpbmVyID4gLnZpc3VhbC1zdHlsZS1tdWx0aXBsZS1wcm9wZXJ0eS1wbGFjZWhv bGRlcik6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29y ZENoZWNrYm94LmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVy LmtleXdvcmQtY2hlY2tib3guZm9udC12YXJpYW50ID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS12 YWx1ZS1jb250YWluZXIgPiBpbnB1dCk6CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5 LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQtdmFyaWFudCA+IC52aXN1YWwtc3R5bGUt cHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQ6OmJlZm9yZSk6CisgICAgICAgICgudmlz dWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94ID4gLnZpc3VhbC1z dHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiBpbnB1dCk6IERlbGV0ZWQuCisgICAgICAg ICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94ID4gLnZp c3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiBkaXYpOiBEZWxldGVkLgorICAg ICAgICBSZXBsYWNlZCB0aGUgU1ZHIGltYWdlIGJlZm9yZSB0aGUgY2hlY2tib3ggd2l0aCBhIDpi ZWZvcmUgcHNldWRvLWVsZW1lbnQgd2l0aCBjb250ZW50LgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveCk6CisgICAgICAgIFJlbW92ZWQgdGhl IFNWRyBpbWFnZSBiZWZvcmUgdGhlIGNoZWNrYm94LgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5nZXQgdmFsdWUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90b3R5cGUuc2V0IHZh bHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIucHJv dG90eXBlLnNldCBwbGFjZWhvbGRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5nZXQgc3ludGhlc2l6ZWRWYWx1ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5fZ2V0VmFs dWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90 b3R5cGUuX3NldFZhbHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdv cmRQaWNrZXIucHJvdG90eXBlLl9nZW5lcmF0ZVN5bnRoZXNpemVkVmFsdWUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90b3R5cGUuX2hhbmRsZUtl eXdvcmRDaGFuZ2VkKToKKyAgICAgICAgRHVlIHRvIGEgY3VycmVudCBidWcsIHlvdSBjYW5ub3Qg ZXh0ZW5kIEVTNiBnZXR0ZXJzL3NldHRlcnMuICBJbiBvcmRlciB0byB3b3JrIGFyb3VuZCB0aGlz LCBhIG1lbWJlcgorICAgICAgICBmdW5jdGlvbiB3YXMgYWRkZWQgdGhhdCBwZXJmb3JtcyB0aGUg c2FtZSBhY3Rpb24gYXMgdGhlIGdldHRlci9zZXR0ZXIsIGJ1dCBjYW4gYmUgZXh0ZW5kZWQuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JM aW5rLmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktZWRpdG9yLWxpbmsubGlu a2VkID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluay1ib3JkZXIpOgorICAgICAg ICAoLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluayA+IC52aXN1YWwtc3R5bGUtcHJv cGVydHktZWRpdG9yLWxpbmstaWNvbiA+IC51bmxpbmtlZC1pY29uKToKKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVSZWxhdGl2ZU51bWJlclNsaWRlci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVJlbGF0aXZlTnVtYmVyU2xpZGVyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVJlbGF0aXZlTnVtYmVyU2xpZGVyLnByb3Rv dHlwZS5fcmVzZXRTbGlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUmVs YXRpdmVOdW1iZXJTbGlkZXIucHJvdG90eXBlLl9zbGlkZXJDaGFuZ2VkKToKKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmNzczoKKyAg ICAgICAgKC5pdGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVtID4gaW5wdXRbdHlwZT0iY2hl Y2tib3giXSk6CisgICAgICAgICguaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxl Y3RlZCA+IGlucHV0W3R5cGU9ImNoZWNrYm94Il06OmJlZm9yZSk6CisgICAgICAgICguaXRlbS52 aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5tb2RpZmllZCA+IC5pY29uKToKKyAgICAgICAgKC5p dGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVtOm5vdCguZG9tLWVsZW1lbnQtaWNvbikuZWRp dGFibGUgPiAudGl0bGVzID4gLnRpdGxlOmZvY3VzKToKKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5wcm90b3R5cGUuX2hhbmRsZUNvbnRl eHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JU cmVlSXRlbS5wcm90b3R5cGUuX2hhbmRsZU1haW5UaXRsZU1vdXNlRG93bik6CisgICAgICAgIEFk ZGVkIGFub3RoZXIgY29udGV4dCBtZW51IGl0ZW0gdG8gc2hvdyB0aGUgc291cmNlIGxvY2F0aW9u IGZvciB0aGUgc2VsZWN0ZWQgcnVsZS4KKwogMjAxNS0wOC0xMyAgTmlraXRhIFZhc2lseWV2ICA8 bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYW4ndCByZXNp emUgc3BsaXQgY29uc29sZSB3aGVuIHdpbmRvdyBpcyB0b28gbmFycm93CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbG9y UGlja2VyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlQ29sb3JQaWNrZXIuY3NzCmluZGV4IGYwMzE4ZWZhYTM0OWM1NWYxMjE1MDk0OGNh NWExOTM3NGViMzE0NmEuLmFmNDZmMDVmNjE2MDVkOTc0YzljNzk4MjhiMTUzMTVlYjExNzMzNGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlQ29sb3JQaWNrZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQ29sb3JQaWNrZXIuY3NzCkBAIC00MCw3ICs0MCw3 IEBACiAgICAgLyogTWFrZSBhIGNoZWNrZXJlZCBiYWNrZ3JvdW5kIGZvciB0cmFuc3BhcmVudCBj b2xvcnMgdG8gc2hvdyBhZ2FpbnN0LiAqLwogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1n cmFkaWVudCh0byBib3R0b20sIGhzbCgwLCAwJSwgODAlKSwgaHNsKDAsIDAlLCA4MCUpKSwKICAg ICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgaHNsKDAsIDAlLCA4MCUpLCBoc2woMCwg MCUsIDgwJSkpOwotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAxMDAlLCAxMDAlKTsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKICAgICBiYWNrZ3JvdW5kLXNpemU6IDUwJTsKICAg ICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiB0b3AgbGVmdCwgYm90dG9tIHJpZ2h0OwogICAgIGJhY2tn cm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CkBAIC03Myw3ICs3Myw3IEBACiAgICAgYm9yZGVyLWJv dHRvbS1yaWdodC1yYWRpdXM6IDRweDsKICAgICBib3JkZXI6IHNvbGlkIDFweCBoc2woMCwgMCUs IDgzJSk7CiAgICAgYm9yZGVyLWxlZnQ6IG5vbmU7Ci0gICAgdGV4dC1hbGlnbjogcmlnaHQ7Cisg ICAgdGV4dC1hbGlnbjogbGVmdDsKICAgICBmb250LXNpemU6IDEwcHg7CiB9CiAKQEAgLTgxLDUg KzgxLDUgQEAKICAgICB3aWR0aDogY2FsYygxMDAlIC0gMjBweCk7CiAgICAgbGVmdDogMThweDsK ICAgICBwYWRkaW5nLXJpZ2h0OiAzcHg7Ci0gICAgdGV4dC1hbGlnbjogcmlnaHQ7CisgICAgdGV4 dC1hbGlnbjogbGVmdDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNr Ym94LmNzcwppbmRleCBmNDdmOTg4YmE3ZGM1NzUzNWE3NzFiNGFhNGQ2NGNjN2I1ZTAyYjE1Li4x YzFjNjhlZWUxYjI4N2FjNGI5NTljNzM5YjFmOGViMDkwNDMyNGU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRD aGVja2JveC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVLZXl3b3JkQ2hlY2tib3guY3NzCkBAIC0yOSwxMyArMjksMjAgQEAKIH0K IAogLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIua2V5d29yZC1jaGVja2JveCA+IC52 aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQgewotICAgIG9yZGVy OiAxOwotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6IDRweDsKICAgICB3aWR0aDog YXV0bzsKIH0KIAotLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIua2V5d29yZC1jaGVj a2JveCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gZGl2IHsKLSAg ICB3aWR0aDogMThweDsKLSAgICBtYXJnaW46IDAgMnB4OworLyogRm9udCBWYXJpYW50ICovCisu dmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQtdmFy aWFudCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQgewor ICAgIG1hcmdpbi1sZWZ0OiA0N3B4OworfQorCisudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRh aW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQtdmFyaWFudCA+IC52aXN1YWwtc3R5bGUtcHJvcGVy dHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQ6OmJlZm9yZSB7CisgICAgcG9zaXRpb246IGFic29s dXRlOworICAgIHRvcDogNXB4OworICAgIGxlZnQ6IDA7CisgICAgZm9udC1zaXplOiA5cHg7Cisg ICAgZm9udC12YXJpYW50OiBzbWFsbC1jYXBzOworICAgIHdvcmQtc3BhY2luZzogLTJweDsKKyAg ICBjb250ZW50OiAiU21hbGwgQ2FwcyI7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5 d29yZENoZWNrYm94LmpzCmluZGV4IGRhMmQxMjdkN2FiNWRmOTNiMDlkM2JlN2E3YzNhY2UzNjRk ZjYzM2EuLmJlNDE1Y2ZkOTEzOGM4YzI5OWEzNmM3NzU2NmU4NTcyMTg2NGRkNGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl S2V5d29yZENoZWNrYm94LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94LmpzCkBAIC0yNSwyMiArMjUsMTYg QEAKIAogV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94ID0gY2xhc3MgVmlz dWFsU3R5bGVLZXl3b3JkQ2hlY2tib3ggZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQ cm9wZXJ0eUVkaXRvcgogewotICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHZh bHVlLCBjaGVja2JveEltYWdlLCBsYXlvdXRSZXZlcnNlZCkKKyAgICBjb25zdHJ1Y3Rvcihwcm9w ZXJ0eU5hbWVzLCB0ZXh0LCB2YWx1ZSwgbGF5b3V0UmV2ZXJzZWQpCiAgICAgewogICAgICAgICBz dXBlcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBudWxsLCBudWxsLCAia2V5d29yZC1jaGVja2JveCIs IGxheW91dFJldmVyc2VkKTsKIAotICAgICAgICB0aGlzLl92YWx1ZSA9IHZhbHVlIHx8IG51bGw7 Ci0KICAgICAgICAgdGhpcy5fY2hlY2tib3hFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiaW5wdXQiKTsKICAgICAgICAgdGhpcy5fY2hlY2tib3hFbGVtZW50LnR5cGUgPSAiY2hlY2ti b3giOwogICAgICAgICB0aGlzLl9jaGVja2JveEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hh bmdlIiwgdGhpcy5fdmFsdWVEaWRDaGFuZ2UuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuY29u dGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2hlY2tib3hFbGVtZW50KTsKIAotICAgICAg ICBpZiAoY2hlY2tib3hJbWFnZSkgewotICAgICAgICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KGNo ZWNrYm94SW1hZ2UsIG51bGwsIHZhbHVlLCBmdW5jdGlvbih3cmFwcGVyKSB7Ci0gICAgICAgICAg ICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh3cmFwcGVyKTsKLSAgICAgICAg ICAgIH0uYmluZCh0aGlzKSk7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5fdmFsdWUgPSB2YWx1 ZS50b0xvd2VyQ2FzZSgpLnJlcGxhY2UoL1xzL2csICItIikgfHwgbnVsbDsKICAgICB9CiAKICAg ICAvLyBQdWJsaWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5qcwppbmRl eCBlMjRmYjUzODg4MWVjMzg4ZWVmYjE0YjdiN2ZmM2MwZjA3MzYxNDZiLi5lNDFhYzc3OWI5OWI0 NWRjZmNmNWZhZWZiYzA2MmU1ZDA4MTI1YzUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVL ZXl3b3JkUGlja2VyLmpzCkBAIC01MywyMSArNTMsMTIgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0 eWxlS2V5d29yZFBpY2tlciA9IGNsYXNzIFZpc3VhbFN0eWxlS2V5d29yZFBpY2tlciBleHRlbmRz IFcKIAogICAgIGdldCB2YWx1ZSgpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fa2V5d29y ZFNlbGVjdEVsZW1lbnQudmFsdWU7CisgICAgICAgIHJldHVybiB0aGlzLl9nZXRWYWx1ZSgpOwog ICAgIH0KIAogICAgIHNldCB2YWx1ZSh2YWx1ZSkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl91 cGRhdGVkVmFsdWVzLnByb3BlcnR5TWlzc2luZyB8fCAhdGhpcy52YWx1ZUlzU3VwcG9ydGVkS2V5 d29yZCh2YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKHZhbHVlID09 PSB0aGlzLnZhbHVlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlmICh0aGlzLl92 YWx1ZUlzU3VwcG9ydGVkQWR2YW5jZWRLZXl3b3JkKHZhbHVlKSkKLSAgICAgICAgICAgIHRoaXMu X2FkZEFkdmFuY2VkVmFsdWVzKCk7Ci0KLSAgICAgICAgdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1l bnQudmFsdWUgPSB2YWx1ZTsKKyAgICAgICAgdGhpcy5fc2V0VmFsdWUodmFsdWUpOwogICAgIH0K IAogICAgIHNldCBwbGFjZWhvbGRlcihwbGFjZWhvbGRlcikKQEAgLTc1LDE2ICs2NiwxMiBAQCBX ZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyID0gY2xhc3MgVmlzdWFsU3R5bGVL ZXl3b3JkUGlja2VyIGV4dGVuZHMgVwogICAgICAgICBpZiAodGhpcy5fdXBkYXRlZFZhbHVlcy5j b25mbGljdGluZ1ZhbHVlcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLnNw ZWNpYWxQcm9wZXJ0eVBsYWNlaG9sZGVyRWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX2tleUZv cktleXdvcmQocGxhY2Vob2xkZXIpIHx8IHBsYWNlaG9sZGVyOworICAgICAgICB0aGlzLnNwZWNp YWxQcm9wZXJ0eVBsYWNlaG9sZGVyRWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX2Nhbm9uaWNh bGl6ZWRLZXl3b3JkRm9yS2V5KHBsYWNlaG9sZGVyKSB8fCBwbGFjZWhvbGRlcjsKICAgICB9CiAK ICAgICBnZXQgc3ludGhlc2l6ZWRWYWx1ZSgpCiAgICAgewotICAgICAgICBsZXQgdmFsdWUgPSB0 aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC52YWx1ZTsKLSAgICAgICAgaWYgKCF2YWx1ZSB8fCAh dmFsdWUubGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAgICAgICAgcmV0dXJu IHZhbHVlOworICAgICAgICByZXR1cm4gdGhpcy5fZ2VuZXJhdGVTeW50aGVzaXplZFZhbHVlKCk7 CiAgICAgfQogCiAgICAgdXBkYXRlRWRpdG9yVmFsdWVzKHVwZGF0ZWRWYWx1ZXMpCkBAIC05OSwx MiArODYsNDAgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlciA9IGNsYXNz IFZpc3VhbFN0eWxlS2V5d29yZFBpY2tlciBleHRlbmRzIFcKIAogICAgIC8vIFByaXZhdGUKIAot ICAgIF9oYW5kbGVLZXl3b3JkQ2hhbmdlZCgpCisgICAgX2dldFZhbHVlKCkKICAgICB7Ci0gICAg ICAgIHRoaXMuX3ZhbHVlRGlkQ2hhbmdlKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9rZXl3b3Jk U2VsZWN0RWxlbWVudC52YWx1ZTsKKyAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMuX2tleXdvcmRT ZWxlY3RFbGVtZW50LmNvbnRhaW5zKHRoaXMuX3VuY2hhbmdlZE9wdGlvbkVsZW1lbnQpICYmIHRo aXMuX3VuY2hhbmdlZE9wdGlvbkVsZW1lbnQuc2VsZWN0ZWQpCisgICAgX3NldFZhbHVlKHZhbHVl KQorICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZSB8fCAhdmFsdWUubGVuZ3RoKSB7CisgICAgICAg ICAgICB0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkID0gdHJ1ZTsKICAgICAg ICAgICAgIHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vob2xkZXJFbGVtZW50LmhpZGRlbiA9IGZh bHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHRoaXMu X3VwZGF0ZWRWYWx1ZXMucHJvcGVydHlNaXNzaW5nIHx8ICF0aGlzLnZhbHVlSXNTdXBwb3J0ZWRL ZXl3b3JkKHZhbHVlKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAodmFsdWUg PT09IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIGlmICh0aGlzLl92YWx1ZUlzU3VwcG9ydGVkQWR2YW5jZWRLZXl3b3JkKHZh bHVlKSkKKyAgICAgICAgICAgIHRoaXMuX2FkZEFkdmFuY2VkVmFsdWVzKCk7CisKKyAgICAgICAg dGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWUgPSB2YWx1ZTsKKyAgICB9CisKKyAgICBf Z2VuZXJhdGVTeW50aGVzaXplZFZhbHVlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl91 bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkID8gbnVsbCA6IHRoaXMuX2tleXdvcmRTZWxl Y3RFbGVtZW50LnZhbHVlOworICAgIH0KKworICAgIF9oYW5kbGVLZXl3b3JkQ2hhbmdlZCgpCisg ICAgeworICAgICAgICB0aGlzLl92YWx1ZURpZENoYW5nZSgpOworICAgICAgICB0aGlzLnNwZWNp YWxQcm9wZXJ0eVBsYWNlaG9sZGVyRWxlbWVudC5oaWRkZW4gPSAhdGhpcy5fdW5jaGFuZ2VkT3B0 aW9uRWxlbWVudC5zZWxlY3RlZDsKICAgICB9CiAKICAgICBfa2V5d29yZFNlbGVjdE1vdXNlRG93 bihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5r LmNzcwppbmRleCBhN2RlYWE3MzdhY2QyMjMzOWIyODczODhmYjk4MWY2YWU3MDMwZTNlLi5kMDNi MjIyNDY0ZTc2ZjljZmZlNGFmM2IyY2FiNWJmODhmZDFiMzU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRp dG9yTGluay5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsuY3NzCkBAIC03MSw3ICs3MSw3IEBACiB9 CiAKIC52aXN1YWwtc3R5bGUtcHJvcGVydHktZWRpdG9yLWxpbmsubGlua2VkID4gLnZpc3VhbC1z dHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluay1ib3JkZXIgewotICAgIGJvcmRlci10b3A6IDFweCBz b2xpZCBoc2woMCwgMCwgMCk7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIGJsYWNrOwogfQog CiAudmlzdWFsLXN0eWxlLXByb3BlcnR5LWVkaXRvci1saW5rID4gLnZpc3VhbC1zdHlsZS1wcm9w ZXJ0eS1lZGl0b3ItbGluay1ib3JkZXIubGVmdCB7CkBAIC0xMDYsNyArMTA2LDcgQEAKIAogLnZp c3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluayA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHkt ZWRpdG9yLWxpbmstaWNvbiA+IC51bmxpbmtlZC1pY29uIHsKICAgICBwb3NpdGlvbjogcmVsYXRp dmU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDEwMCUsIDEwMCUpOworICAgIGJhY2tn cm91bmQtY29sb3I6IHdoaXRlOwogICAgIHotaW5kZXg6IDE7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUmVsYXRp dmVOdW1iZXJTbGlkZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZVJlbGF0aXZlTnVtYmVyU2xpZGVyLmpzCmluZGV4IDBhMGUxMTE1ZDRk ZTIzYzMwOWM5ZGZiNmY1NTE2YTc2MWNmYzJjY2IuLjkwMjQwMDBiOGM4NjM5OGMzNDVhYTBkNTY0 MjM0M2E5NjM4NmVlYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJTbGlkZXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVSZWxhdGl2 ZU51bWJlclNsaWRlci5qcwpAQCAtMzgsNyArMzgsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVSZWxhdGl2ZU51bWJlclNsaWRlciA9IGNsYXNzIFZpc3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJT bAogICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3NsaWRlckVsZW1lbnQp OwogCiAgICAgICAgIHRoaXMuX3N0YXJ0aW5nVmFsdWUgPSBudWxsOwotICAgICAgICB0aGlzLl9z Y2FsZSA9IDEwMDsKKyAgICAgICAgdGhpcy5fc2NhbGUgPSAyMDA7CiAgICAgfQogCiAgICAgLy8g UHVibGljCkBAIC02MiwyMSArNjIsMjMgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUmVsYXRp dmVOdW1iZXJTbGlkZXIgPSBjbGFzcyBWaXN1YWxTdHlsZVJlbGF0aXZlTnVtYmVyU2wKICAgICAg ICAgaWYgKGlzTmFOKHRoaXMuX3N0YXJ0aW5nVmFsdWUpKQogICAgICAgICAgICAgdGhpcy5fc3Rh cnRpbmdWYWx1ZSA9IHBhcnNlRmxvYXQodGhpcy5wbGFjZWhvbGRlcikgfHwgMDsKIAotICAgICAg ICBsZXQgb3JpZ2luID0gdGhpcy5fc2NhbGUgLyAyOwotICAgICAgICBpZiAodGhpcy5fYWxsb3dO ZWdhdGl2ZVZhbHVlcyB8fCB0aGlzLl9zdGFydGluZ1ZhbHVlID4gb3JpZ2luKSB7Ci0gICAgICAg ICAgICB0aGlzLl9zbGlkZXJFbGVtZW50Lm1pbiA9IC1vcmlnaW47Ci0gICAgICAgICAgICB0aGlz Ll9zbGlkZXJFbGVtZW50Lm1heCA9IG9yaWdpbjsKKyAgICAgICAgbGV0IG1pZHBvaW50ID0gdGhp cy5fc2NhbGUgLyAyOworICAgICAgICBpZiAodGhpcy5fYWxsb3dOZWdhdGl2ZVZhbHVlcyB8fCB0 aGlzLl9zdGFydGluZ1ZhbHVlID4gbWlkcG9pbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX3NsaWRl ckVsZW1lbnQubWluID0gLW1pZHBvaW50OworICAgICAgICAgICAgdGhpcy5fc2xpZGVyRWxlbWVu dC5tYXggPSBtaWRwb2ludDsKICAgICAgICAgICAgIHRoaXMuX3NsaWRlckVsZW1lbnQudmFsdWUg PSAwOworICAgICAgICAgICAgdGhpcy5fb3JpZ2luID0gdGhpcy5fc3RhcnRpbmdWYWx1ZTsKICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuX3NsaWRlckVsZW1lbnQubWluID0gMDsK ICAgICAgICAgICAgIHRoaXMuX3NsaWRlckVsZW1lbnQubWF4ID0gdGhpcy5fc2NhbGU7CiAgICAg ICAgICAgICB0aGlzLl9zbGlkZXJFbGVtZW50LnZhbHVlID0gdGhpcy5fc3RhcnRpbmdWYWx1ZTsK KyAgICAgICAgICAgIHRoaXMuX29yaWdpbiA9IDA7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBf c2xpZGVyQ2hhbmdlZCgpCiAgICAgewotICAgICAgICB0aGlzLnZhbHVlID0gdGhpcy5fc3RhcnRp bmdWYWx1ZSArIE1hdGgucm91bmQocGFyc2VGbG9hdCh0aGlzLl9zbGlkZXJFbGVtZW50LnZhbHVl KSAqIDEwMCkgLyAxMDA7CisgICAgICAgIHRoaXMudmFsdWUgPSB0aGlzLl9vcmlnaW4gKyBNYXRo LnJvdW5kKHBhcnNlRmxvYXQodGhpcy5fc2xpZGVyRWxlbWVudC52YWx1ZSkgKiAxMDApIC8gMTAw OwogICAgICAgICB0aGlzLl92YWx1ZURpZENoYW5nZSgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxl Y3RvclRyZWVJdGVtLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MKaW5kZXggNGU0MmY0MmUwMTE2Yzc0 ZjUyNTk0MzUzZDcwYjIyOWZkNjA4MDMzZS4uMzE1ZDY3ZGFmN2VjMDI4NWQ4MTNhMzYyMWI1OTVl NWExMTQzZDM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmNzcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0 ZW0uY3NzCkBAIC00Miw5ICs0MiwyMSBAQAogfQogCiAuaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0 b3ItaXRlbSA+IGlucHV0W3R5cGU9ImNoZWNrYm94Il0geworICAgIHBvc2l0aW9uOiByZWxhdGl2 ZTsKICAgICBtYXJnaW46IDQuNXB4IDAgNHB4IDVweDsKIH0KIAorLml0ZW0udmlzdWFsLXN0eWxl LXNlbGVjdG9yLWl0ZW0uc2VsZWN0ZWQgPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdOjpiZWZvcmUg eworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDA7CisgICAgcmlnaHQ6IDA7Cisg ICAgYm90dG9tOiAwOworICAgIGxlZnQ6IDA7CisgICAgYm9yZGVyOiAxcHggc29saWQgd2hpdGU7 CisgICAgYm9yZGVyLXJhZGl1czogM3B4OworICAgIGNvbnRlbnQ6ICIiOworfQorCiAuaXRlbS52 aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbSA+IC5pY29uIHsKICAgICB3aWR0aDogMTZweDsKICAg ICBoZWlnaHQ6IDE2cHg7CkBAIC01Miw3ICs2NCw3IEBACiB9CiAKIC5pdGVtLnZpc3VhbC1zdHls ZS1zZWxlY3Rvci1pdGVtLm1vZGlmaWVkID4gLmljb24gewotICAgIC13ZWJraXQtZmlsdGVyOiBi cmlnaHRuZXNzKDAuNzUpOworICAgIGZpbHRlcjogYnJpZ2h0bmVzcygwLjc1KTsKIH0KIAogLml0 ZW0udmlzdWFsLXN0eWxlLXNlbGVjdG9yLWl0ZW0uc2VsZWN0b3ItaW52YWxpZCA+IC5pY29uIHsK QEAgLTk2LDcgKzEwOCw3IEBACiAKIC5pdGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVtOm5v dCguZG9tLWVsZW1lbnQtaWNvbikuZWRpdGFibGUgPiAudGl0bGVzID4gLnRpdGxlOmZvY3VzIHsK ICAgICBjb2xvcjogYmxhY2s7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDEwMCUsIDEw MCUpOworICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogICAgIGJvcmRlci1yYWRpdXM6IDJw eDsKICAgICBib3gtc2hhZG93OiBoc2xhKDAsIDAlLCAwJSwgMC4xNSkgMCAxcHggMCwgMCAwIDAg M3B4IGhzbGEoMCwgMTAwJSwgMTAwJSwgMC4zKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRl bS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwppbmRleCBjYTRkMGEzZjk2NmVhNjAxYWFjNjA5MWY2OWIy YWUzZWE3N2ZjNjc3Li4xZDQyOWQ0MjkzZGMzYWNkY2U3NTYzNmJiOGQyMjc5YWJlMDE0MDk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1 YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzCkBAIC0xMzQs OCArMTM0LDE4IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0gPSBj bGFzcyBWaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0gZXh0CiAgICAgewogICAgICAgICBsZXQg Y29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKIAorICAg ICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5vd25lclJ1bGUpIHsKKyAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IFNvdXJj ZSIpLCBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBpZiAoZXZlbnQubWV0YUtleSkKKyAg ICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbFVuZm9ybWF0dGVkU291 cmNlQ29kZUxvY2F0aW9uKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qub3duZXJSdWxlLnNvdXJjZUNv ZGVMb2NhdGlvbik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVMb2NhdGlvbih0aGlzLnJlcHJlc2VudGVkT2JqZWN0 Lm93bmVyUnVsZS5zb3VyY2VDb2RlTG9jYXRpb24pOworICAgICAgICAgICAgfS5iaW5kKHRoaXMp KTsKKyAgICAgICAgfQorCiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJDb3B5IFJ1bGUiKSwgZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICBJbnNw ZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQodGhpcy5yZXByZXNlbnRlZE9iamVjdC5nZW5lcmF0 ZUNTU1J1bGVTdHJpbmcoKSk7CisgICAgICAgICAgICBsZXQgc2VsZWN0b3JUZXh0ID0gIXRoaXMu cmVwcmVzZW50ZWRPYmplY3Qub3duZXJSdWxlID8gdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2Rl LmFwcHJvcHJpYXRlU2VsZWN0b3JGb3IodHJ1ZSkgOiBudWxsOworICAgICAgICAgICAgSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHRoaXMucmVwcmVzZW50ZWRPYmplY3QuZ2VuZXJhdGVD U1NSdWxlU3RyaW5nKHNlbGVjdG9yVGV4dCkpOwogICAgICAgICB9LmJpbmQodGhpcykpOwogCiAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNl dCIpLCBmdW5jdGlvbigpIHsKQEAgLTE2Miw2ICsxNzIsOSBAQCBXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVTZWxlY3RvclRyZWVJdGVtID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVt IGV4dAogCiAgICAgX2hhbmRsZU1haW5UaXRsZU1vdXNlRG93bihldmVudCkKICAgICB7CisgICAg ICAgIGlmIChldmVudC5idXR0b24gIT09IDAgfHwgZXZlbnQuY3RybEtleSkKKyAgICAgICAgICAg IHJldHVybjsKKwogICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LnRvZ2dsZSgi ZWRpdGFibGUiLCB0aGlzLnNlbGVjdGVkKTsKICAgICB9CiAK 259015 2015-08-14 12:02:37 -0700 2015-08-14 15:05:20 -0700 Patch bug-148021-20150814120219.patch text/plain 17593 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM4MjVhMDJiZDYyNzZhNjM3YzNlZjAxYmFiYTc1 NTRlNzQ5OWI4MGUuLjI3NzI0MzRmZTMyMDg3OGNjNjk2MDFlMTAxYjdmYTA0MmVlZmRjMTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDE1LTA4LTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZSBjaGFuZ2VzIHRvIFZpc3VhbCBzaWRlYmFyIGVkaXRvcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODAyMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZhcmlvdXMgc3R5bGUgZml4ZXMgYW5kIGZl YXR1cmUgZW5oYW5jZW1lbnRzIGluIHNvbWUgb2YgdGhlIFZpc3VhbCBzdHlsZSBwcm9wZXJ0eSBl ZGl0b3JzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbG9y UGlja2VyLmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmlu cHV0LWNvbG9yLXBpY2tlciA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVy ID4gLmNvbG9yLXN3YXRjaCk6CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRh aW5lci5pbnB1dC1jb2xvci1waWNrZXIgPiAudmlzdWFsLXN0eWxlLXByb3BlcnR5LXZhbHVlLWNv bnRhaW5lciA+IGlucHV0KToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFp bmVyLmlucHV0LWNvbG9yLXBpY2tlci5tdWx0aXBsZSA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHkt dmFsdWUtY29udGFpbmVyID4gLnZpc3VhbC1zdHlsZS1tdWx0aXBsZS1wcm9wZXJ0eS1wbGFjZWhv bGRlcik6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29y ZENoZWNrYm94LmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVy LmtleXdvcmQtY2hlY2tib3guZm9udC12YXJpYW50ID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS12 YWx1ZS1jb250YWluZXIgPiBpbnB1dCk6CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5 LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQtdmFyaWFudCA+IC52aXN1YWwtc3R5bGUt cHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQ6OmJlZm9yZSk6CisgICAgICAgICgudmlz dWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94ID4gLnZpc3VhbC1z dHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiBpbnB1dCk6IERlbGV0ZWQuCisgICAgICAg ICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94ID4gLnZp c3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiBkaXYpOiBEZWxldGVkLgorICAg ICAgICBSZXBsYWNlZCB0aGUgU1ZHIGltYWdlIGJlZm9yZSB0aGUgY2hlY2tib3ggd2l0aCBhIDpi ZWZvcmUgcHNldWRvLWVsZW1lbnQgd2l0aCBjb250ZW50LgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveCk6CisgICAgICAgIFJlbW92ZWQgdGhl IFNWRyBpbWFnZSBiZWZvcmUgdGhlIGNoZWNrYm94LgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5nZXQgdmFsdWUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90b3R5cGUuc2V0IHZh bHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIucHJv dG90eXBlLnNldCBwbGFjZWhvbGRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5nZXQgc3ludGhlc2l6ZWRWYWx1ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLnByb3RvdHlwZS5fZ2V0VmFs dWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90 b3R5cGUuX3NldFZhbHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdv cmRQaWNrZXIucHJvdG90eXBlLl9nZW5lcmF0ZVN5bnRoZXNpemVkVmFsdWUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlci5wcm90b3R5cGUuX2hhbmRsZUtl eXdvcmRDaGFuZ2VkKToKKyAgICAgICAgRHVlIHRvIGEgY3VycmVudCBidWcgKGh0dHBzOi8vd2Vi a2l0Lm9yZy9iLzE0NzA2NCksIHlvdSBjYW5ub3QgZXh0ZW5kIEVTNiBnZXR0ZXJzL3NldHRlcnMu ICBJbiBvcmRlciB0byB3b3JrCisgICAgICAgIGFyb3VuZCB0aGlzLCBhIG1lbWJlciBmdW5jdGlv biB3YXMgYWRkZWQgdGhhdCBwZXJmb3JtcyB0aGUgc2FtZSBhY3Rpb24gYXMgdGhlIGdldHRlci9z ZXR0ZXIsIGJ1dCBjYW4gYmUgZXh0ZW5kZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rLmNzczoKKyAgICAgICAgKC52aXN1YWwt c3R5bGUtcHJvcGVydHktZWRpdG9yLWxpbmsubGlua2VkID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0 eS1lZGl0b3ItbGluay1ib3JkZXIpOgorICAgICAgICAoLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1l ZGl0b3ItbGluayA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktZWRpdG9yLWxpbmstaWNvbiA+IC51 bmxpbmtlZC1pY29uKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVSZWxhdGl2ZU51bWJlclNsaWRlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZVJlbGF0aXZlTnVtYmVyU2xpZGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZVJlbGF0aXZlTnVtYmVyU2xpZGVyLnByb3RvdHlwZS5fcmVzZXRTbGlkZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJTbGlkZXIucHJvdG90eXBl Ll9zbGlkZXJDaGFuZ2VkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVTZWxlY3RvclRyZWVJdGVtLmNzczoKKyAgICAgICAgKC5pdGVtLnZpc3VhbC1zdHlsZS1z ZWxlY3Rvci1pdGVtID4gaW5wdXRbdHlwZT0iY2hlY2tib3giXSk6CisgICAgICAgICguaXRlbS52 aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxlY3RlZCA+IGlucHV0W3R5cGU9ImNoZWNrYm94 Il06OmJlZm9yZSk6CisgICAgICAgICguaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5t b2RpZmllZCA+IC5pY29uKToKKyAgICAgICAgKC5pdGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1p dGVtOm5vdCguZG9tLWVsZW1lbnQtaWNvbikuZWRpdGFibGUgPiAudGl0bGVzID4gLnRpdGxlOmZv Y3VzKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3Rv clRyZWVJdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JU cmVlSXRlbS5wcm90b3R5cGUuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5wcm90b3R5cGUuX2hhbmRsZU1h aW5UaXRsZU1vdXNlRG93bik6CisgICAgICAgIEFkZGVkIGFub3RoZXIgY29udGV4dCBtZW51IGl0 ZW0gdG8gc2hvdyB0aGUgc291cmNlIGxvY2F0aW9uIGZvciB0aGUgc2VsZWN0ZWQgcnVsZS4KKwog MjAxNS0wOC0xMyAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBDYW4ndCByZXNpemUgc3BsaXQgY29uc29sZSB3aGVuIHdpbmRv dyBpcyB0b28gbmFycm93CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbG9yUGlja2VyLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQ29sb3JQaWNrZXIuY3NzCmlu ZGV4IGYwMzE4ZWZhYTM0OWM1NWYxMjE1MDk0OGNhNWExOTM3NGViMzE0NmEuLmFmNDZmMDVmNjE2 MDVkOTc0YzljNzk4MjhiMTUzMTVlYjExNzMzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQ29sb3JQaWNrZXIuY3NzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl Q29sb3JQaWNrZXIuY3NzCkBAIC00MCw3ICs0MCw3IEBACiAgICAgLyogTWFrZSBhIGNoZWNrZXJl ZCBiYWNrZ3JvdW5kIGZvciB0cmFuc3BhcmVudCBjb2xvcnMgdG8gc2hvdyBhZ2FpbnN0LiAqLwog ICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIGhzbCgwLCAw JSwgODAlKSwgaHNsKDAsIDAlLCA4MCUpKSwKICAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJv dHRvbSwgaHNsKDAsIDAlLCA4MCUpLCBoc2woMCwgMCUsIDgwJSkpOwotICAgIGJhY2tncm91bmQt Y29sb3I6IGhzbCgwLCAxMDAlLCAxMDAlKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK ICAgICBiYWNrZ3JvdW5kLXNpemU6IDUwJTsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiB0b3Ag bGVmdCwgYm90dG9tIHJpZ2h0OwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CkBA IC03Myw3ICs3Myw3IEBACiAgICAgYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXM6IDRweDsKICAg ICBib3JkZXI6IHNvbGlkIDFweCBoc2woMCwgMCUsIDgzJSk7CiAgICAgYm9yZGVyLWxlZnQ6IG5v bmU7Ci0gICAgdGV4dC1hbGlnbjogcmlnaHQ7CisgICAgdGV4dC1hbGlnbjogbGVmdDsKICAgICBm b250LXNpemU6IDEwcHg7CiB9CiAKQEAgLTgxLDUgKzgxLDUgQEAKICAgICB3aWR0aDogY2FsYygx MDAlIC0gMjBweCk7CiAgICAgbGVmdDogMThweDsKICAgICBwYWRkaW5nLXJpZ2h0OiAzcHg7Ci0g ICAgdGV4dC1hbGlnbjogcmlnaHQ7CisgICAgdGV4dC1hbGlnbjogbGVmdDsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl S2V5d29yZENoZWNrYm94LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94LmNzcwppbmRleCBmNDdmOTg4YmE3ZGM1 NzUzNWE3NzFiNGFhNGQ2NGNjN2I1ZTAyYjE1Li4xYzFjNjhlZWUxYjI4N2FjNGI5NTljNzM5YjFm OGViMDkwNDMyNGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRDaGVja2JveC5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkQ2hlY2ti b3guY3NzCkBAIC0yOSwxMyArMjksMjAgQEAKIH0KIAogLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1j b250YWluZXIua2V5d29yZC1jaGVja2JveCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUt Y29udGFpbmVyID4gaW5wdXQgewotICAgIG9yZGVyOiAxOwotICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKLSAgICB0b3A6IDRweDsKICAgICB3aWR0aDogYXV0bzsKIH0KIAotLnZpc3VhbC1zdHlsZS1w cm9wZXJ0eS1jb250YWluZXIua2V5d29yZC1jaGVja2JveCA+IC52aXN1YWwtc3R5bGUtcHJvcGVy dHktdmFsdWUtY29udGFpbmVyID4gZGl2IHsKLSAgICB3aWR0aDogMThweDsKLSAgICBtYXJnaW46 IDAgMnB4OworLyogRm9udCBWYXJpYW50ICovCisudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRh aW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQtdmFyaWFudCA+IC52aXN1YWwtc3R5bGUtcHJvcGVy dHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQgeworICAgIG1hcmdpbi1sZWZ0OiA0N3B4OworfQor CisudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWNoZWNrYm94LmZvbnQt dmFyaWFudCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gaW5wdXQ6 OmJlZm9yZSB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogNXB4OworICAgIGxl ZnQ6IDA7CisgICAgZm9udC1zaXplOiA5cHg7CisgICAgZm9udC12YXJpYW50OiBzbWFsbC1jYXBz OworICAgIHdvcmQtc3BhY2luZzogLTJweDsKKyAgICBjb250ZW50OiAiU21hbGwgQ2FwcyI7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZUtleXdvcmRDaGVja2JveC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94LmpzCmluZGV4IGRhMmQx MjdkN2FiNWRmOTNiMDlkM2JlN2E3YzNhY2UzNjRkZjYzM2EuLmJlNDE1Y2ZkOTEzOGM4YzI5OWEz NmM3NzU2NmU4NTcyMTg2NGRkNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZENoZWNrYm94LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29y ZENoZWNrYm94LmpzCkBAIC0yNSwyMiArMjUsMTYgQEAKIAogV2ViSW5zcGVjdG9yLlZpc3VhbFN0 eWxlS2V5d29yZENoZWNrYm94ID0gY2xhc3MgVmlzdWFsU3R5bGVLZXl3b3JkQ2hlY2tib3ggZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvcgogewotICAgIGNvbnN0 cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHZhbHVlLCBjaGVja2JveEltYWdlLCBsYXlvdXRS ZXZlcnNlZCkKKyAgICBjb25zdHJ1Y3Rvcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCB2YWx1ZSwgbGF5 b3V0UmV2ZXJzZWQpCiAgICAgewogICAgICAgICBzdXBlcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBu dWxsLCBudWxsLCAia2V5d29yZC1jaGVja2JveCIsIGxheW91dFJldmVyc2VkKTsKIAotICAgICAg ICB0aGlzLl92YWx1ZSA9IHZhbHVlIHx8IG51bGw7Ci0KICAgICAgICAgdGhpcy5fY2hlY2tib3hF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKICAgICAgICAgdGhpcy5f Y2hlY2tib3hFbGVtZW50LnR5cGUgPSAiY2hlY2tib3giOwogICAgICAgICB0aGlzLl9jaGVja2Jv eEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgdGhpcy5fdmFsdWVEaWRDaGFuZ2Uu YmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhp cy5fY2hlY2tib3hFbGVtZW50KTsKIAotICAgICAgICBpZiAoY2hlY2tib3hJbWFnZSkgewotICAg ICAgICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KGNoZWNrYm94SW1hZ2UsIG51bGwsIHZhbHVlLCBm dW5jdGlvbih3cmFwcGVyKSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5h cHBlbmRDaGlsZCh3cmFwcGVyKTsKLSAgICAgICAgICAgIH0uYmluZCh0aGlzKSk7Ci0gICAgICAg IH0KKyAgICAgICAgdGhpcy5fdmFsdWUgPSB2YWx1ZS50b0xvd2VyQ2FzZSgpLnJlcGxhY2UoL1xz L2csICItIikgfHwgbnVsbDsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29y ZFBpY2tlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlS2V5d29yZFBpY2tlci5qcwppbmRleCBlMjRmYjUzODg4MWVjMzg4ZWVmYjE0Yjdi N2ZmM2MwZjA3MzYxNDZiLi45MDMwNTRjNjFlOWE2Mjk1Yzk0ZWI2MTQ1NTA0OGI2ZGQxZDNlNzgy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZUtleXdvcmRQaWNrZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyLmpzCkBAIC01MywyMSAr NTMsMTQgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlciA9IGNsYXNzIFZp c3VhbFN0eWxlS2V5d29yZFBpY2tlciBleHRlbmRzIFcKIAogICAgIGdldCB2YWx1ZSgpCiAgICAg ewotICAgICAgICByZXR1cm4gdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWU7CisgICAg ICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQ3MDY0PiBHZXR0ZXIgYW5kIHNl dHRlciBvbiBzdXBlciBhcmUgY2FsbGVkIHdpdGggd3JvbmcgInRoaXMiIG9iamVjdAorICAgICAg ICByZXR1cm4gdGhpcy5fZ2V0VmFsdWUoKTsKICAgICB9CiAKICAgICBzZXQgdmFsdWUodmFsdWUp CiAgICAgewotICAgICAgICBpZiAodGhpcy5fdXBkYXRlZFZhbHVlcy5wcm9wZXJ0eU1pc3Npbmcg fHwgIXRoaXMudmFsdWVJc1N1cHBvcnRlZEtleXdvcmQodmFsdWUpKQotICAgICAgICAgICAgcmV0 dXJuOwotCi0gICAgICAgIGlmICh2YWx1ZSA9PT0gdGhpcy52YWx1ZSkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBpZiAodGhpcy5fdmFsdWVJc1N1cHBvcnRlZEFkdmFuY2VkS2V5d29y ZCh2YWx1ZSkpCi0gICAgICAgICAgICB0aGlzLl9hZGRBZHZhbmNlZFZhbHVlcygpOwotCi0gICAg ICAgIHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlID0gdmFsdWU7CisgICAgICAgIC8v IEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQ3MDY0PiBHZXR0ZXIgYW5kIHNldHRlciBv biBzdXBlciBhcmUgY2FsbGVkIHdpdGggd3JvbmcgInRoaXMiIG9iamVjdAorICAgICAgICB0aGlz Ll9zZXRWYWx1ZSh2YWx1ZSk7CiAgICAgfQogCiAgICAgc2V0IHBsYWNlaG9sZGVyKHBsYWNlaG9s ZGVyKQpAQCAtNzUsMTYgKzY4LDEzIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRQ aWNrZXIgPSBjbGFzcyBWaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIgZXh0ZW5kcyBXCiAgICAgICAg IGlmICh0aGlzLl91cGRhdGVkVmFsdWVzLmNvbmZsaWN0aW5nVmFsdWVzKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vob2xkZXJFbGVtZW50 LnRleHRDb250ZW50ID0gdGhpcy5fa2V5Rm9yS2V5d29yZChwbGFjZWhvbGRlcikgfHwgcGxhY2Vo b2xkZXI7CisgICAgICAgIHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vob2xkZXJFbGVtZW50LnRl eHRDb250ZW50ID0gdGhpcy5fY2Fub25pY2FsaXplZEtleXdvcmRGb3JLZXkocGxhY2Vob2xkZXIp IHx8IHBsYWNlaG9sZGVyOwogICAgIH0KIAogICAgIGdldCBzeW50aGVzaXplZFZhbHVlKCkKICAg ICB7Ci0gICAgICAgIGxldCB2YWx1ZSA9IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVl OwotICAgICAgICBpZiAoIXZhbHVlIHx8ICF2YWx1ZS5sZW5ndGgpCi0gICAgICAgICAgICByZXR1 cm4gbnVsbDsKLQotICAgICAgICByZXR1cm4gdmFsdWU7CisgICAgICAgIC8vIEZJWE1FOiA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTQ3MDY0PiBHZXR0ZXIgYW5kIHNldHRlciBvbiBzdXBlciBhcmUg Y2FsbGVkIHdpdGggd3JvbmcgInRoaXMiIG9iamVjdAorICAgICAgICByZXR1cm4gdGhpcy5fZ2Vu ZXJhdGVTeW50aGVzaXplZFZhbHVlKCk7CiAgICAgfQogCiAgICAgdXBkYXRlRWRpdG9yVmFsdWVz KHVwZGF0ZWRWYWx1ZXMpCkBAIC05OSwxMiArODksNDAgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0 eWxlS2V5d29yZFBpY2tlciA9IGNsYXNzIFZpc3VhbFN0eWxlS2V5d29yZFBpY2tlciBleHRlbmRz IFcKIAogICAgIC8vIFByaXZhdGUKIAotICAgIF9oYW5kbGVLZXl3b3JkQ2hhbmdlZCgpCisgICAg X2dldFZhbHVlKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3ZhbHVlRGlkQ2hhbmdlKCk7CisgICAg ICAgIHJldHVybiB0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC52YWx1ZTsKKyAgICB9CiAKLSAg ICAgICAgaWYgKHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LmNvbnRhaW5zKHRoaXMuX3VuY2hh bmdlZE9wdGlvbkVsZW1lbnQpICYmIHRoaXMuX3VuY2hhbmdlZE9wdGlvbkVsZW1lbnQuc2VsZWN0 ZWQpCisgICAgX3NldFZhbHVlKHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZSB8fCAh dmFsdWUubGVuZ3RoKSB7CisgICAgICAgICAgICB0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50 LnNlbGVjdGVkID0gdHJ1ZTsKICAgICAgICAgICAgIHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vo b2xkZXJFbGVtZW50LmhpZGRlbiA9IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICB9CisKKyAgICAgICAgaWYgKHRoaXMuX3VwZGF0ZWRWYWx1ZXMucHJvcGVydHlNaXNzaW5nIHx8 ICF0aGlzLnZhbHVlSXNTdXBwb3J0ZWRLZXl3b3JkKHZhbHVlKSkKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBpZiAodmFsdWUgPT09IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZh bHVlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICh0aGlzLl92YWx1ZUlzU3Vw cG9ydGVkQWR2YW5jZWRLZXl3b3JkKHZhbHVlKSkKKyAgICAgICAgICAgIHRoaXMuX2FkZEFkdmFu Y2VkVmFsdWVzKCk7CisKKyAgICAgICAgdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWUg PSB2YWx1ZTsKKyAgICB9CisKKyAgICBfZ2VuZXJhdGVTeW50aGVzaXplZFZhbHVlKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkID8g bnVsbCA6IHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlOworICAgIH0KKworICAgIF9o YW5kbGVLZXl3b3JkQ2hhbmdlZCgpCisgICAgeworICAgICAgICB0aGlzLl92YWx1ZURpZENoYW5n ZSgpOworICAgICAgICB0aGlzLnNwZWNpYWxQcm9wZXJ0eVBsYWNlaG9sZGVyRWxlbWVudC5oaWRk ZW4gPSAhdGhpcy5fdW5jaGFuZ2VkT3B0aW9uRWxlbWVudC5zZWxlY3RlZDsKICAgICB9CiAKICAg ICBfa2V5d29yZFNlbGVjdE1vdXNlRG93bihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JM aW5rLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rLmNzcwppbmRleCBhN2RlYWE3MzdhY2QyMjMzOWIyODcz ODhmYjk4MWY2YWU3MDMwZTNlLi5kMDNiMjIyNDY0ZTc2ZjljZmZlNGFmM2IyY2FiNWJmODhmZDFi MzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluay5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsu Y3NzCkBAIC03MSw3ICs3MSw3IEBACiB9CiAKIC52aXN1YWwtc3R5bGUtcHJvcGVydHktZWRpdG9y LWxpbmsubGlua2VkID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluay1ib3JkZXIg ewotICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBoc2woMCwgMCwgMCk7CisgICAgYm9yZGVyLXRv cDogMXB4IHNvbGlkIGJsYWNrOwogfQogCiAudmlzdWFsLXN0eWxlLXByb3BlcnR5LWVkaXRvci1s aW5rID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluay1ib3JkZXIubGVmdCB7CkBA IC0xMDYsNyArMTA2LDcgQEAKIAogLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1lZGl0b3ItbGluayA+ IC52aXN1YWwtc3R5bGUtcHJvcGVydHktZWRpdG9yLWxpbmstaWNvbiA+IC51bmxpbmtlZC1pY29u IHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAs IDEwMCUsIDEwMCUpOworICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogICAgIHotaW5kZXg6 IDE7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJTbGlkZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVJlbGF0aXZlTnVtYmVyU2xp ZGVyLmpzCmluZGV4IDBhMGUxMTE1ZDRkZTIzYzMwOWM5ZGZiNmY1NTE2YTc2MWNmYzJjY2IuLmYx NTU4MjVmNWE1YTRhMGVkNDk5YWE3MDljZGQwM2E3YzU2OGRlYzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUmVsYXRpdmVO dW1iZXJTbGlkZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVSZWxhdGl2ZU51bWJlclNsaWRlci5qcwpAQCAtMzcsOCArMzcsOCBA QCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVSZWxhdGl2ZU51bWJlclNsaWRlciA9IGNsYXNzIFZp c3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJTbAogICAgICAgICB0aGlzLl9zbGlkZXJFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImlucHV0IiwgdGhpcy5fc2xpZGVyQ2hhbmdlZC5iaW5kKHRoaXMpKTsK ICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zbGlkZXJFbGVtZW50KTsK IAotICAgICAgICB0aGlzLl9zdGFydGluZ1ZhbHVlID0gbnVsbDsKLSAgICAgICAgdGhpcy5fc2Nh bGUgPSAxMDA7CisgICAgICAgIHRoaXMuX3N0YXJ0aW5nVmFsdWUgPSAwOworICAgICAgICB0aGlz Ll9zY2FsZSA9IDIwMDsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTYyLDE1ICs2MiwxNiBA QCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVSZWxhdGl2ZU51bWJlclNsaWRlciA9IGNsYXNzIFZp c3VhbFN0eWxlUmVsYXRpdmVOdW1iZXJTbAogICAgICAgICBpZiAoaXNOYU4odGhpcy5fc3RhcnRp bmdWYWx1ZSkpCiAgICAgICAgICAgICB0aGlzLl9zdGFydGluZ1ZhbHVlID0gcGFyc2VGbG9hdCh0 aGlzLnBsYWNlaG9sZGVyKSB8fCAwOwogCi0gICAgICAgIGxldCBvcmlnaW4gPSB0aGlzLl9zY2Fs ZSAvIDI7Ci0gICAgICAgIGlmICh0aGlzLl9hbGxvd05lZ2F0aXZlVmFsdWVzIHx8IHRoaXMuX3N0 YXJ0aW5nVmFsdWUgPiBvcmlnaW4pIHsKLSAgICAgICAgICAgIHRoaXMuX3NsaWRlckVsZW1lbnQu bWluID0gLW9yaWdpbjsKLSAgICAgICAgICAgIHRoaXMuX3NsaWRlckVsZW1lbnQubWF4ID0gb3Jp Z2luOworICAgICAgICBsZXQgbWlkcG9pbnQgPSB0aGlzLl9zY2FsZSAvIDI7CisgICAgICAgIGlm ICh0aGlzLl9hbGxvd05lZ2F0aXZlVmFsdWVzIHx8IHRoaXMuX3N0YXJ0aW5nVmFsdWUgPiBtaWRw b2ludCkgeworICAgICAgICAgICAgdGhpcy5fc2xpZGVyRWxlbWVudC5taW4gPSAtbWlkcG9pbnQ7 CisgICAgICAgICAgICB0aGlzLl9zbGlkZXJFbGVtZW50Lm1heCA9IG1pZHBvaW50OwogICAgICAg ICAgICAgdGhpcy5fc2xpZGVyRWxlbWVudC52YWx1ZSA9IDA7CiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICB0aGlzLl9zbGlkZXJFbGVtZW50Lm1pbiA9IDA7CiAgICAgICAgICAgICB0aGlz Ll9zbGlkZXJFbGVtZW50Lm1heCA9IHRoaXMuX3NjYWxlOwogICAgICAgICAgICAgdGhpcy5fc2xp ZGVyRWxlbWVudC52YWx1ZSA9IHRoaXMuX3N0YXJ0aW5nVmFsdWU7CisgICAgICAgICAgICB0aGlz Ll9zdGFydGluZ1ZhbHVlID0gMDsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3Rv clRyZWVJdGVtLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MKaW5kZXggNGU0MmY0MmUwMTE2Yzc0ZjUy NTk0MzUzZDcwYjIyOWZkNjA4MDMzZS4uYzdmZDdkN2RiNzc2M2RiZmRkYWNiMTQyZDRkODg0MmYz M2Y0NTFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmNzcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0u Y3NzCkBAIC0zNCw3ICszNCw3IEBACiAKIC5pdGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVt LnNlbGVjdGVkIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMjEzLCA5MiUsIDU1JSkgIWlt cG9ydGFudDsKLSAgICBjb2xvcjogaHNsKDAsIDEwMCUsIDEwMCUpOworICAgIGNvbG9yOiB3aGl0 ZTsKIH0KIAogLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVjdG9yLWl0ZW0gPiAuZGlzY2xvc3VyZS1i dXR0b24gewpAQCAtNDIsOSArNDIsMjEgQEAKIH0KIAogLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVj dG9yLWl0ZW0gPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdIHsKKyAgICBwb3NpdGlvbjogcmVsYXRp dmU7CiAgICAgbWFyZ2luOiA0LjVweCAwIDRweCA1cHg7CiB9CiAKKy5pdGVtLnZpc3VhbC1zdHls ZS1zZWxlY3Rvci1pdGVtLnNlbGVjdGVkID4gaW5wdXRbdHlwZT0iY2hlY2tib3giXTo6YmVmb3Jl IHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwOworICAgIHJpZ2h0OiAwOwor ICAgIGJvdHRvbTogMDsKKyAgICBsZWZ0OiAwOworICAgIGJvcmRlcjogMXB4IHNvbGlkIHdoaXRl OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKKyAgICBjb250ZW50OiAiIjsKK30KKwogLml0ZW0u dmlzdWFsLXN0eWxlLXNlbGVjdG9yLWl0ZW0gPiAuaWNvbiB7CiAgICAgd2lkdGg6IDE2cHg7CiAg ICAgaGVpZ2h0OiAxNnB4OwpAQCAtNTIsNyArNjQsNyBAQAogfQogCiAuaXRlbS52aXN1YWwtc3R5 bGUtc2VsZWN0b3ItaXRlbS5tb2RpZmllZCA+IC5pY29uIHsKLSAgICAtd2Via2l0LWZpbHRlcjog YnJpZ2h0bmVzcygwLjc1KTsKKyAgICBmaWx0ZXI6IGJyaWdodG5lc3MoMC43NSk7CiB9CiAKIC5p dGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVtLnNlbGVjdG9yLWludmFsaWQgPiAuaWNvbiB7 CkBAIC05Niw3ICsxMDgsNyBAQAogCiAuaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbTpu b3QoLmRvbS1lbGVtZW50LWljb24pLmVkaXRhYmxlID4gLnRpdGxlcyA+IC50aXRsZTpmb2N1cyB7 CiAgICAgY29sb3I6IGJsYWNrOwotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAxMDAlLCAx MDAlKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKICAgICBib3JkZXItcmFkaXVzOiAy cHg7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAw IDNweCBoc2xhKDAsIDEwMCUsIDEwMCUsIDAuMyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0 ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZVNlbGVjdG9yVHJlZUl0ZW0uanMKaW5kZXggY2E0ZDBhM2Y5NjZlYTYwMWFhYzYwOTFmNjli MmFlM2VhNzdmYzY3Ny4uMWQ0MjlkNDI5M2RjM2FjZGNlNzU2MzZiYjhkMjI3OWFiZTAxNDA5NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwpAQCAtMTM0 LDggKzEzNCwxOCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtID0g Y2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtIGV4dAogICAgIHsKICAgICAgICAgbGV0 IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAKKyAg ICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qub3duZXJSdWxlKSB7CisgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBTb3Vy Y2UiKSwgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgaWYgKGV2ZW50Lm1ldGFLZXkpCisg ICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93T3JpZ2luYWxVbmZvcm1hdHRlZFNv dXJjZUNvZGVMb2NhdGlvbih0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm93bmVyUnVsZS5zb3VyY2VD b2RlTG9jYXRpb24pOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlTG9jYXRpb24odGhpcy5yZXByZXNlbnRlZE9iamVj dC5vd25lclJ1bGUuc291cmNlQ29kZUxvY2F0aW9uKTsKKyAgICAgICAgICAgIH0uYmluZCh0aGlz KSk7CisgICAgICAgIH0KKwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiQ29weSBSdWxlIiksIGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHRoaXMucmVwcmVzZW50ZWRPYmplY3QuZ2VuZXJh dGVDU1NSdWxlU3RyaW5nKCkpOworICAgICAgICAgICAgbGV0IHNlbGVjdG9yVGV4dCA9ICF0aGlz LnJlcHJlc2VudGVkT2JqZWN0Lm93bmVyUnVsZSA/IHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9k ZS5hcHByb3ByaWF0ZVNlbGVjdG9yRm9yKHRydWUpIDogbnVsbDsKKyAgICAgICAgICAgIEluc3Bl Y3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmdlbmVyYXRl Q1NTUnVsZVN0cmluZyhzZWxlY3RvclRleHQpKTsKICAgICAgICAgfS5iaW5kKHRoaXMpKTsKIAog ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVz ZXQiKSwgZnVuY3Rpb24oKSB7CkBAIC0xNjIsNiArMTcyLDkgQEAgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlU2VsZWN0b3JUcmVlSXRlbSA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRl bSBleHQKIAogICAgIF9oYW5kbGVNYWluVGl0bGVNb3VzZURvd24oZXZlbnQpCiAgICAgeworICAg ICAgICBpZiAoZXZlbnQuYnV0dG9uICE9PSAwIHx8IGV2ZW50LmN0cmxLZXkpCisgICAgICAgICAg ICByZXR1cm47CisKICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNzTGlzdC50b2dnbGUo ImVkaXRhYmxlIiwgdGhpcy5zZWxlY3RlZCk7CiAgICAgfQogCg==