98420 2012-10-04 09:53:32 -0700 Unprefix the flexbox CSS properties 2014-09-12 14:43:56 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 98419 1 ojan dino 7raivis abarth benjamin commit-queue dino glenn m.goleb+bugzilla paulirish phiw2 rik simon.fraser syoichi tabatkins tony webkit-bug-importer oldest_to_newest 734777 0 ojan 2012-10-04 09:53:32 -0700 At this point we're just waiting for another browser vendor to ship the new flexboxes so that we can do some basic compatibility testing. None of the remaining open bugs at https://bugs.webkit.org/showdependencytree.cgi?id=62048&hide_resolved=1 seem worth stalling unprefixing on. 734785 1 tony 2012-10-04 10:12:36 -0700 It was just enabled in mozilla-inbound (https://wiki.mozilla.org/Tree_Rules/Inbound): https://bugzilla.mozilla.org/show_bug.cgi?id=666041#c124 735210 2 glenn 2012-10-04 18:26:01 -0700 has the CSS WG resolved to unprefix flexbox yet? if not, should we WK jump the gun on them? 735264 3 tabatkins 2012-10-04 19:47:56 -0700 (In reply to comment #2) > has the CSS WG resolved to unprefix flexbox yet? if not, should we WK jump the gun on them? Flexbox is in CR, which by definition means that we're okay with unprefixing. 735340 4 glenn 2012-10-04 22:15:59 -0700 (In reply to comment #3) > (In reply to comment #2) > > has the CSS WG resolved to unprefix flexbox yet? if not, should we WK jump the gun on them? > > Flexbox is in CR, which by definition means that we're okay with unprefixing. excellent 796509 5 paulirish 2012-12-21 15:35:10 -0800 Update: It's now landed in FF nightly builds: http://blog.dholbert.org/2012/12/css3-flexbox-enabled-in-nightlies-ready.html 837597 6 7raivis 2013-02-20 11:20:50 -0800 Landed in FF19 https://bugzilla.mozilla.org/show_bug.cgi?id=801098 916151 7 m.goleb+bugzilla 2013-08-11 15:19:11 -0700 Both Firefox & Chrome have unprefixed Flexbox properties already, the same stands for the IE11 beta. Is there anything blocking unprefixing in WebKit? 916152 8 m.goleb+bugzilla 2013-08-11 15:23:05 -0700 Worth noting is that both Firefox & Chrome have unprefixed Flexbox in their stable versions not just nightlies. So it's 3 browsers in stable versions (Opera 15 included) and IE in a preview. WebKit is the last to keep prefixes. Considering WebKit Flexbox implementation seems stable and is richer than Firefox one, I think it'd be nice to unprefix in time for Safari 6.1/7 (and maybe iOS7?), it would make web developers' lives a little bit easier. 916153 9 m.goleb+bugzilla 2013-08-11 15:33:43 -0700 Sorry, it seems I lied about Chrome having uprefixed flexbox in stable (v28), though it seems to have it in beta (v29) according to: https://code.google.com/p/chromium/issues/detail?id=249111 and I can confirm it's present in Canary (v30) 921090 10 webkit-bug-importer 2013-08-26 10:53:58 -0700 <rdar://problem/14835804> 1032500 11 m.goleb+bugzilla 2014-09-01 10:53:55 -0700 What's the status of this bug? All other browsers have unprefixed Flexbox more than 10 months ago in their stable versions and in Safari it will happen not sooner than in a year; it's almost a two-years gap! Is there anything blocking unprefixing? 1034456 12 dino 2014-09-10 16:28:55 -0700 (In reply to comment #11) > What's the status of this bug? All other browsers have unprefixed Flexbox more than 10 months ago in their stable versions and in Safari it will happen not sooner than in a year; it's almost a two-years gap! > > Is there anything blocking unprefixing? Nope. I'm taking it on now. 1034908 13 238044 dino 2014-09-12 12:05:10 -0700 Created attachment 238044 Patch 1034917 14 benjamin 2014-09-12 12:36:11 -0700 (In reply to comment #12) > (In reply to comment #11) > > What's the status of this bug? All other browsers have unprefixed Flexbox more than 10 months ago in their stable versions and in Safari it will happen not sooner than in a year; it's almost a two-years gap! > > > > Is there anything blocking unprefixing? > > Nope. I'm taking it on now. IMHO, we should also import all the flexbox tests from blink. 1034918 15 238044 tony 2014-09-12 12:37:54 -0700 Comment on attachment 238044 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238044&action=review > Source/WebCore/ChangeLog:20 > + - justify justify-content > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:292 > + CSSPropertyJustifySelf, justify-self seems to be part of the CSS Alignment spec, not the flexbox spec. Did you mean to include this change? http://dev.w3.org/csswg/css-align/ 1034919 16 dino 2014-09-12 12:44:18 -0700 (In reply to comment #15) > (From update of attachment 238044 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238044&action=review > > > Source/WebCore/ChangeLog:20 > > + - justify > > justify-content Yes. > > > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:292 > > + CSSPropertyJustifySelf, > > justify-self seems to be part of the CSS Alignment spec, not the flexbox spec. Did you mean to include this change? http://dev.w3.org/csswg/css-align/ You're right, thanks! 1034934 17 238044 commit-queue 2014-09-12 13:46:19 -0700 Comment on attachment 238044 Patch Clearing flags on attachment: 238044 Committed r173572: <http://trac.webkit.org/changeset/173572> 1034935 18 commit-queue 2014-09-12 13:46:25 -0700 All reviewed patches have been landed. Closing bug. 1034961 19 dino 2014-09-12 14:43:56 -0700 Committed r173579: <http://trac.webkit.org/changeset/173579> 238044 2014-09-12 12:05:10 -0700 2014-09-12 13:46:19 -0700 Patch bug-98420-20140913050505.patch text/plain 58362 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBmZmY5ZWE1MzQ3YjJm YmYxZjkyYjc5N2MzODRjZWM4MjVmNTVjMi4uMGJiMGM3NGVkMDc0YjJiMjQzZDYxNDFhYTQwZDc1 MzdkMDdiYzNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY1IEBACisyMDE0LTA5LTEyICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBVbnByZWZpeCB0aGUgZmxleGJv eCBDU1MgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTg0MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgdGhlIG5lZWQgZm9yIGEgIi13ZWJraXQtIiBwcmVmaXggb24gZmxleGJv eAorICAgICAgICBhbmQgcmVsYXRlZCBwcm9wZXJ0aWVzLiBUaGlzIGluY2x1ZGVzOgorICAgICAg ICAtIGFsaWduLWNvbnRlbnQKKyAgICAgICAgLSBhbGlnbi1pdGVtcworICAgICAgICAtIGFsaWdu LXNlbGYKKyAgICAgICAgLSBmbGV4LWJhc2lzCisgICAgICAgIC0gZmxleC1kaXJlY3Rpb24KKyAg ICAgICAgLSBmbGV4LXdyYXAKKyAgICAgICAgLSBmbGV4LWdyb3cKKyAgICAgICAgLSBmbGV4LXNo cmluaworICAgICAgICAtIGZsZXgKKyAgICAgICAgLSBmbGV4LWZsb3cKKyAgICAgICAgLSBqdXN0 aWZ5CisgICAgICAgIC0gb3JkZXIKKworICAgICAgICAuLi4gYXMgd2VsbCBhcyB0aGUgZGlzcGxh eSBrZXl3b3JkIHZhbHVlcyAiZmxleCIgYW5kCisgICAgICAgICJpbmxpbmUtZmxleCIuCisKKyAg ICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDogIENoYW5nZSBuYW1l cy4KKyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFs dWUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpp c0tleXdvcmRQcm9wZXJ0eUlEKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VW YWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRmxleCk6CisgICAgICAg ICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaDogU2luY2Ugd2UgbmVlZCB0byBzdGls bCBoYW5kbGUgdGhlIG9sZAorICAgICAgICBrZXl3b3JkcyBmb3IgZGlzcGxheSwgdGhpcyBoYXMg YWRkZWQgdHdvIG5ldyBrZXl3b3Jkcy4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZh bHVlOjpDU1NQcmltaXRpdmVWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVW YWx1ZTo6b3BlcmF0b3IgRURpc3BsYXkpOiBJZiB0aGUgb2xkZXIga2V5d29yZHMgd2VyZSB1c2Vk IGluCisgICAgICAgIGNvbnRlbnQsIG1hcCB0aGVtIHRvIHRoZSBuZXcgdmFsdWUgbmFtZXMuCisg ICAgICAgICogY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW46IEFkZCBhbGlhc2VzIGZvciB0aGUgcHJl Zml4ZWQgcHJvcGVydGllcy4KKyAgICAgICAgKiBjc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbjogQWRk ICJmbGV4IiBhbmQgImlubGluZS1mbGV4Ii4KKyAgICAgICAgKiBjc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHA6IENoYW5nZSBuYW1lcy4KKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRT dHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAqIGNzcy9TdHls ZVByb3BlcnRpZXMuY3BwOiBDaGFuZ2UgbmFtZXMuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZVBy b3BlcnRpZXM6OmdldFByb3BlcnR5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVQcm9w ZXJ0aWVzOjphc1RleHQpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmNw cDogUmVuYW1lIHNob3J0aGFuZCBtZXRob2RzIHRvIHJlbW92ZSB0aGUgcHJlZml4LgorICAgICAg ICAoV2ViQ29yZTo6ZmxleEZsb3dTaG9ydGhhbmQpOgorICAgICAgICAoV2ViQ29yZTo6ZmxleFNo b3J0aGFuZCk6CisgICAgICAgIChXZWJDb3JlOjpzaG9ydGhhbmRGb3JQcm9wZXJ0eSk6CisgICAg ICAgIChXZWJDb3JlOjptYXRjaGluZ1Nob3J0aGFuZHNGb3JMb25naGFuZCk6CisgICAgICAgIChX ZWJDb3JlOjp3ZWJraXRGbGV4Rmxvd1Nob3J0aGFuZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjp3ZWJraXRGbGV4U2hvcnRoYW5kKTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVQ cm9wZXJ0eVNob3J0aGFuZC5oOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmVxdWl2YWxlbnRCbG9ja0Rpc3BsYXkpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogcGFnZS9hbmltYXRp b24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwOiBDaGFuZ2UgbmFtZXMuCisgICAgICAgIChXZWJD b3JlOjpQcm9wZXJ0eVdyYXBwZXJGbGV4OjpQcm9wZXJ0eVdyYXBwZXJGbGV4KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJF bGVtZW50OjpjcmVhdGVGb3IpOiBIYW5kbGUgdGhlIHR3byBuZXcgZGlzcGxheSB2YWx1ZXMgKHRo ZSBzYW1lIHdheSBhcworICAgICAgICB0aGUgb2xkIHZhbHVlcykuCisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6IEFkZCBjb25zdGFudHMgZm9yIHRoZSBu ZXcgZGlzcGxheSB2YWx1ZXMuCisKIDIwMTQtMDktMTAgIEJldGggRGFraW4gIDxiZGFraW5AYXBw bGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzY2NTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAKaW5kZXggYjE4YzJhYTgzNWZjNTExOWJjNjA0YjRiNDA2OTZiNmM5N2FmM2M0 ZS4uZjQ4ODk3NmQ4YzlhOGYwNGI0ZTU1ZTNkYzhjNjVhZDViYzExMDBmOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTI4 MCwxNiArMjgwLDE2IEBAIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGNvbXB1dGVkUHJvcGVy dGllc1tdID0gewogI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKICAgICBDU1NQcm9wZXJ0 eVdlYmtpdERhc2hib2FyZFJlZ2lvbiwKICNlbmRpZgotICAgIENTU1Byb3BlcnR5V2Via2l0QWxp Z25Db250ZW50LAotICAgIENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtcywKLSAgICBDU1NQcm9w ZXJ0eVdlYmtpdEFsaWduU2VsZiwKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhCYXNpcywKLSAg ICBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhHcm93LAotICAgIENTU1Byb3BlcnR5V2Via2l0RmxleFNo cmluaywKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb24sCi0gICAgQ1NTUHJvcGVy dHlXZWJraXRGbGV4V3JhcCwKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdEp1c3RpZnlDb250ZW50LAot ICAgIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeVNlbGYsCisgICAgQ1NTUHJvcGVydHlBbGlnbkNv bnRlbnQsCisgICAgQ1NTUHJvcGVydHlBbGlnbkl0ZW1zLAorICAgIENTU1Byb3BlcnR5QWxpZ25T ZWxmLAorICAgIENTU1Byb3BlcnR5RmxleEJhc2lzLAorICAgIENTU1Byb3BlcnR5RmxleEdyb3cs CisgICAgQ1NTUHJvcGVydHlGbGV4U2hyaW5rLAorICAgIENTU1Byb3BlcnR5RmxleERpcmVjdGlv biwKKyAgICBDU1NQcm9wZXJ0eUZsZXhXcmFwLAorICAgIENTU1Byb3BlcnR5SnVzdGlmeUNvbnRl bnQsCisgICAgQ1NTUHJvcGVydHlKdXN0aWZ5U2VsZiwKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEZp bHRlciwKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEZvbnRLZXJuaW5nLAogICAgIENTU1Byb3BlcnR5 V2Via2l0Rm9udFNtb290aGluZywKQEAgLTM0MCw3ICszNDAsNyBAQCBzdGF0aWMgY29uc3QgQ1NT UHJvcGVydHlJRCBjb21wdXRlZFByb3BlcnRpZXNbXSA9IHsKICAgICBDU1NQcm9wZXJ0eVdlYmtp dE1hc2tTaXplLAogICAgIENTU1Byb3BlcnR5V2Via2l0TWFza1NvdXJjZVR5cGUsCiAgICAgQ1NT UHJvcGVydHlXZWJraXROYnNwTW9kZSwKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdE9yZGVyLAorICAg IENTU1Byb3BlcnR5T3JkZXIsCiAjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEX09WRVJGTE9XX1NDUk9M TElORykKICAgICBDU1NQcm9wZXJ0eVdlYmtpdE92ZXJmbG93U2Nyb2xsaW5nLAogI2VuZGlmCkBA IC0yMDMwLDExICsyMDMwLDExIEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVF eHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0CiAgICAgICAgICAg ICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmRpc3BsYXkoKSk7CiAg ICAgICAgIGNhc2UgQ1NTUHJvcGVydHlFbXB0eUNlbGxzOgogICAgICAgICAgICAgcmV0dXJuIGNz c1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5lbXB0eUNlbGxzKCkpOwotICAgICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25Db250ZW50OgorICAgICAgICBjYXNlIENTU1Byb3Bl cnR5QWxpZ25Db250ZW50OgogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKHN0eWxlLT5hbGlnbkNvbnRlbnQoKSk7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRBbGlnbkl0ZW1zOgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5QWxpZ25JdGVtczoKICAg ICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+YWxpZ25J dGVtcygpKTsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZjoKKyAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eUFsaWduU2VsZjoKICAgICAgICAgICAgIGlmIChzdHlsZS0+YWxp Z25TZWxmKCkgPT0gQWxpZ25BdXRvKSB7CiAgICAgICAgICAgICAgICAgTm9kZSogcGFyZW50ID0g c3R5bGVkTm9kZS0+cGFyZW50Tm9kZSgpOwogICAgICAgICAgICAgICAgIGlmIChwYXJlbnQgJiYg cGFyZW50LT5jb21wdXRlZFN0eWxlKCkpCkBAIC0yMDQyLDMwICsyMDQyLDMwIEBAIFBhc3NSZWZQ dHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJv cGVydHlJRCBwcm9wZXJ0CiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNy ZWF0ZVZhbHVlKEFsaWduU3RyZXRjaCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmFsaWduU2VsZigpKTsKLSAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXg6Ci0gICAgICAgICAgICByZXR1cm4gZ2V0Q1NT UHJvcGVydHlWYWx1ZXNGb3JTaG9ydGhhbmRQcm9wZXJ0aWVzKHdlYmtpdEZsZXhTaG9ydGhhbmQo KSk7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4QmFzaXM6CisgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlGbGV4OgorICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFs dWVzRm9yU2hvcnRoYW5kUHJvcGVydGllcyhmbGV4U2hvcnRoYW5kKCkpOworICAgICAgICBjYXNl IENTU1Byb3BlcnR5RmxleEJhc2lzOgogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZVZhbHVlKHN0eWxlLT5mbGV4QmFzaXMoKSk7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRGbGV4RGlyZWN0aW9uOgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5RmxleERpcmVj dGlvbjoKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHls ZS0+ZmxleERpcmVjdGlvbigpKTsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhG bG93OgotICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFsdWVzRm9yU2hvcnRoYW5k UHJvcGVydGllcyh3ZWJraXRGbGV4Rmxvd1Nob3J0aGFuZCgpKTsKLSAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhHcm93OgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5RmxleEZsb3c6 CisgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVydHlWYWx1ZXNGb3JTaG9ydGhhbmRQcm9w ZXJ0aWVzKGZsZXhGbG93U2hvcnRoYW5kKCkpOworICAgICAgICBjYXNlIENTU1Byb3BlcnR5Rmxl eEdyb3c6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5 bGUtPmZsZXhHcm93KCkpOwotICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleFNocmlu azoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhTaHJpbms6CiAgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmZsZXhTaHJpbmsoKSk7Ci0gICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4V3JhcDoKKyAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eUZsZXhXcmFwOgogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZh bHVlKHN0eWxlLT5mbGV4V3JhcCgpKTsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEp1 c3RpZnlDb250ZW50OgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5SnVzdGlmeUNvbnRlbnQ6CiAg ICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmp1c3Rp ZnlDb250ZW50KCkpOwotICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeVNlbGY6 IHsKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUp1c3RpZnlTZWxmOiB7CiAgICAgICAgICAgICBS ZWZQdHI8Q1NTVmFsdWVMaXN0PiByZXN1bHQgPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNwYWNlU2Vw YXJhdGVkKCk7CiAgICAgICAgICAgICByZXN1bHQtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6 Y3JlYXRlKHN0eWxlLT5qdXN0aWZ5U2VsZigpKSk7CiAgICAgICAgICAgICBpZiAoc3R5bGUtPmp1 c3RpZnlTZWxmKCkgPj0gSnVzdGlmeVNlbGZDZW50ZXIgJiYgc3R5bGUtPmp1c3RpZnlTZWxmT3Zl cmZsb3dBbGlnbm1lbnQoKSAhPSBKdXN0aWZ5U2VsZk92ZXJmbG93QWxpZ25tZW50RGVmYXVsdCkK ICAgICAgICAgICAgICAgICByZXN1bHQtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRl KHN0eWxlLT5qdXN0aWZ5U2VsZk92ZXJmbG93QWxpZ25tZW50KCkpKTsKICAgICAgICAgICAgIHJl dHVybiByZXN1bHQucmVsZWFzZSgpOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRPcmRlcjoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eU9yZGVyOgogICAgICAgICAg ICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5vcmRlcigpLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUik7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlGbG9h dDoKICAgICAgICAgICAgIGlmIChzdHlsZS0+ZGlzcGxheSgpICE9IE5PTkUgJiYgc3R5bGUtPmhh c091dE9mRmxvd1Bvc2l0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDIxMTJj YzM2MDFmYWIzMjRiNjc3OTQ2ZTc5Y2NjMGUzNWYwZjUwNjguLmVlZjRkYTI3YjU5NTkxYWFhNzdi NTExNDVlYzFiOGY2MTcwYmI2NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ YXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC02Nzks NyArNjc5LDcgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRW YWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICAvLyBpbmxpbmUgfCBi bG9jayB8IGxpc3QtaXRlbSB8IGlubGluZS1ibG9jayB8IHRhYmxlIHwKICAgICAgICAgLy8gaW5s aW5lLXRhYmxlIHwgdGFibGUtcm93LWdyb3VwIHwgdGFibGUtaGVhZGVyLWdyb3VwIHwgdGFibGUt Zm9vdGVyLWdyb3VwIHwgdGFibGUtcm93IHwKICAgICAgICAgLy8gdGFibGUtY29sdW1uLWdyb3Vw IHwgdGFibGUtY29sdW1uIHwgdGFibGUtY2VsbCB8IHRhYmxlLWNhcHRpb24gfCAtd2Via2l0LWJv eCB8IC13ZWJraXQtaW5saW5lLWJveCB8IG5vbmUgfCBpbmhlcml0Ci0gICAgICAgIC8vIC13ZWJr aXQtZmxleCB8IC13ZWJraXQtaW5saW5lLWZsZXggfCAtd2Via2l0LWdyaWQgfCAtd2Via2l0LWlu bGluZS1ncmlkCisgICAgICAgIC8vIGZsZXggfCAtd2Via2l0LWZsZXggfCBpbmxpbmUtZmxleCB8 IC13ZWJraXQtaW5saW5lLWZsZXggfCAtd2Via2l0LWdyaWQgfCAtd2Via2l0LWlubGluZS1ncmlk CiAgICAgICAgIGlmICgodmFsdWVJRCA+PSBDU1NWYWx1ZUlubGluZSAmJiB2YWx1ZUlEIDw9IENT U1ZhbHVlV2Via2l0SW5saW5lRmxleCkgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZU5vbmUpCiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICNpZiBFTkFCTEUoQ1NTX0dSSURfTEFZT1VUKQpAQCAtODYz LDM1ICs4NjMsMzUgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlB bmRWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICBpZiAodmFsdWVJ RCA9PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUJhbGFuY2UpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdEFsaWduQ29udGVudDoKKyAgICBjYXNlIENTU1Byb3BlcnR5QWxpZ25Db250ZW50OgogICAg ICAgICAvLyBGSVhNRTogUGVyIENTUyBhbGlnbm1lbnQsIHRoaXMgcHJvcGVydHkgc2hvdWxkIGFj Y2VwdCBhbiBvcHRpb25hbCA8b3ZlcmZsb3ctcG9zaXRpb24+LiBXZSBzaG91bGQgc2hhcmUgdGhp cyBwYXJzaW5nIGNvZGUgd2l0aCAnanVzdGlmeS1zZWxmJy4KICAgICAgICAgaWYgKHZhbHVlSUQg PT0gQ1NTVmFsdWVGbGV4U3RhcnQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUZsZXhFbmQgfHwgdmFs dWVJRCA9PSBDU1NWYWx1ZUNlbnRlciB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3BhY2VCZXR3ZWVu IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVTcGFjZUFyb3VuZCB8fCB2YWx1ZUlEID09IENTU1ZhbHVl U3RyZXRjaCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBicmVhazsKLSAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtczoKKyAgICBjYXNlIENTU1Byb3BlcnR5QWxp Z25JdGVtczoKICAgICAgICAgLy8gRklYTUU6IFBlciBDU1MgYWxpZ25tZW50LCB0aGlzIHByb3Bl cnR5IHNob3VsZCBhY2NlcHQgdGhlIHNhbWUgYXJndW1lbnRzIGFzICdqdXN0aWZ5LXNlbGYnIHNv IHdlIHNob3VsZCBzaGFyZSBpdHMgcGFyc2luZyBjb2RlLgogICAgICAgICBpZiAodmFsdWVJRCA9 PSBDU1NWYWx1ZUZsZXhTdGFydCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlRmxleEVuZCB8fCB2YWx1 ZUlEID09IENTU1ZhbHVlQ2VudGVyIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVCYXNlbGluZSB8fCB2 YWx1ZUlEID09IENTU1ZhbHVlU3RyZXRjaCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICBicmVhazsKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25TZWxmOgorICAgIGNh c2UgQ1NTUHJvcGVydHlBbGlnblNlbGY6CiAgICAgICAgIC8vIEZJWE1FOiBQZXIgQ1NTIGFsaWdu bWVudCwgdGhpcyBwcm9wZXJ0eSBzaG91bGQgYWNjZXB0IHRoZSBzYW1lIGFyZ3VtZW50cyBhcyAn anVzdGlmeS1zZWxmJyBzbyB3ZSBzaG91bGQgc2hhcmUgaXRzIHBhcnNpbmcgY29kZS4KICAgICAg ICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVGbGV4 U3RhcnQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUZsZXhFbmQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1 ZUNlbnRlciB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQmFzZWxpbmUgfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZVN0cmV0Y2gpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb246CisgICAgY2FzZSBDU1NQcm9w ZXJ0eUZsZXhEaXJlY3Rpb246CiAgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVlUm93IHx8 IHZhbHVlSUQgPT0gQ1NTVmFsdWVSb3dSZXZlcnNlIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVDb2x1 bW4gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUNvbHVtblJldmVyc2UpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhX cmFwOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4V3JhcDoKICAgICAgICAgaWYgKHZhbHVlSUQg PT0gQ1NTVmFsdWVOb3dyYXAgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVdyYXAgfHwgdmFsdWVJRCA9 PSBDU1NWYWx1ZVdyYXBSZXZlcnNlKQogICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAg ICBicmVhazsKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeUNvbnRlbnQ6CisgICAg Y2FzZSBDU1NQcm9wZXJ0eUp1c3RpZnlDb250ZW50OgogICAgICAgICAvLyBGSVhNRTogUGVyIENT UyBhbGlnbm1lbnQsIHRoaXMgcHJvcGVydHkgc2hvdWxkIGFjY2VwdCBhbiBvcHRpb25hbCA8b3Zl cmZsb3ctcG9zaXRpb24+LiBXZSBzaG91bGQgc2hhcmUgdGhpcyBwYXJzaW5nIGNvZGUgd2l0aCAn anVzdGlmeS1zZWxmJy4KICAgICAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVGbGV4U3RhcnQg fHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUZsZXhFbmQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUNlbnRl ciB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3BhY2VCZXR3ZWVuIHx8IHZhbHVlSUQgPT0gQ1NTVmFs dWVTcGFjZUFyb3VuZCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBicmVhazsK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeVNlbGY6CisgICAgY2FzZSBDU1NQcm9w ZXJ0eUp1c3RpZnlTZWxmOgogICAgICAgICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZUF1dG8gfHwg dmFsdWVJRCA9PSBDU1NWYWx1ZUZsZXhTdGFydCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlRmxleEVu ZCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQ2VudGVyIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVCYXNl bGluZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3RyZXRjaCkKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICBicmVhazsKQEAgLTExMDUsMTIgKzExMDUsMTIgQEAgc3RhdGljIGlubGlu ZSBib29sIGlzS2V5d29yZFByb3BlcnR5SUQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlkKQogICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sdW1uRmlsbDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1u UnVsZVN0eWxlOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRBbGlnbkNvbnRlbnQ6Ci0gICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFsaWduSXRlbXM6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdEFsaWduU2VsZjoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleERpcmVjdGlvbjoK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleFdyYXA6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEp1c3RpZnlDb250ZW50OgorICAgIGNhc2UgQ1NTUHJvcGVydHlBbGlnbkNvbnRlbnQ6 CisgICAgY2FzZSBDU1NQcm9wZXJ0eUFsaWduSXRlbXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUFs aWduU2VsZjoKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleERpcmVjdGlvbjoKKyAgICBjYXNlIENT U1Byb3BlcnR5RmxleFdyYXA6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUp1c3RpZnlDb250ZW50Ogog ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGb250S2VybmluZzoKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0Rm9udFNtb290aGluZzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVu czoKQEAgLTI0NzQsMjggKzI0NzQsMjggQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoQ1NT UHJvcGVydHlJRCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICAgICAgdmFsaWRQcmlt aXRpdmUgPSB0cnVlOwogICAgICAgICBicmVhazsKICNlbmRpZgotICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRGbGV4OiB7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXg6IHsKICAgICAgICAgU2hv cnRoYW5kU2NvcGUgc2NvcGUodGhpcywgcHJvcElkKTsKICAgICAgICAgaWYgKGlkID09IENTU1Zh bHVlTm9uZSkgewotICAgICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlXZWJraXRGbGV4 R3JvdywgY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoMCwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19OVU1CRVIpLCBpbXBvcnRhbnQpOwotICAgICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVy dHlXZWJraXRGbGV4U2hyaW5rLCBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSgwLCBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX05VTUJFUiksIGltcG9ydGFudCk7Ci0gICAgICAgICAgICBhZGRQcm9w ZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdEZsZXhCYXNpcywgY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRl bnRpZmllclZhbHVlKENTU1ZhbHVlQXV0byksIGltcG9ydGFudCk7CisgICAgICAgICAgICBhZGRQ cm9wZXJ0eShDU1NQcm9wZXJ0eUZsZXhHcm93LCBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSgw LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUiksIGltcG9ydGFudCk7CisgICAgICAgICAg ICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZsZXhTaHJpbmssIGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKDAsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSwgaW1wb3J0YW50KTsKKyAg ICAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5RmxleEJhc2lzLCBjc3NWYWx1ZVBvb2wo KS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVBdXRvKSwgaW1wb3J0YW50KTsKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBwYXJzZUZsZXgo bV92YWx1ZUxpc3QuZ2V0KCksIGltcG9ydGFudCk7CiAgICAgfQotICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRGbGV4QmFzaXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhCYXNpczoKICAgICAg ICAgLy8gRklYTUU6IFN1cHBvcnQgaW50cmluc2ljIGRpbWVuc2lvbnMgdG9vLgogICAgICAgICBp ZiAoaWQgPT0gQ1NTVmFsdWVBdXRvKQogICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVl OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9ICghaWQgJiYgdmFs aWRVbml0KHZhbHVlLCBGTGVuZ3RoIHwgRlBlcmNlbnQgfCBGTm9uTmVnKSk7CiAgICAgICAgIGJy ZWFrOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4R3JvdzoKLSAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0RmxleFNocmluazoKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleEdyb3c6Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhTaHJpbms6CiAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0g dmFsaWRVbml0KHZhbHVlLCBGTnVtYmVyIHwgRk5vbk5lZyk7CiAgICAgICAgIGJyZWFrOwotICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRPcmRlcjoKKyAgICBjYXNlIENTU1Byb3BlcnR5T3JkZXI6 CiAgICAgICAgIGlmICh2YWxpZFVuaXQodmFsdWUsIEZJbnRlZ2VyLCBDU1NTdHJpY3RNb2RlKSkg ewogICAgICAgICAgICAgLy8gV2UgcmVzdHJpY3QgdGhlIHNtYWxsZXN0IHZhbHVlIHRvIGludCBt aW4gKyAyIGJlY2F1c2Ugd2UgdXNlIGludCBtaW4gYW5kIGludCBtaW4gKyAxIGFzIHNwZWNpYWwg dmFsdWVzIGluIGEgaGFzaCBzZXQuCiAgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IGNzc1ZhbHVl UG9vbCgpLmNyZWF0ZVZhbHVlKHN0ZDo6bWF4PGRvdWJsZT4oc3RkOjpudW1lcmljX2xpbWl0czxp bnQ+OjptaW4oKSArIDIsIHZhbHVlLT5mVmFsdWUpLCBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVW YWx1ZTo6VW5pdFR5cGVzPih2YWx1ZS0+dW5pdCkpOwpAQCAtMjYxNSw3ICsyNjE1LDcgQEAgYm9v bCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wSWQsIGJvb2wgaW1wb3J0 YW50KQogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEp1c3RpZnlTZWxmOgorICAgIGNhc2UgQ1NTUHJvcGVydHlKdXN0aWZ5 U2VsZjoKICAgICAgICAgcmV0dXJuIHBhcnNlSnVzdGlmeVNlbGYocHJvcElkLCBpbXBvcnRhbnQp OwogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEdyaWRBdXRvQ29sdW1uczoKQEAgLTI4NzMsOCArMjg3Myw4IEBAIGJvb2wgQ1NTUGFyc2VyOjpw YXJzZVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICBjYXNl IENTU1Byb3BlcnR5UGFkZGluZzoKICAgICAgICAgLy8gPHBhZGRpbmctd2lkdGg+ezEsNH0gfCBp bmhlcml0CiAgICAgICAgIHJldHVybiBwYXJzZTRWYWx1ZXMocHJvcElkLCBwYWRkaW5nU2hvcnRo YW5kKCkucHJvcGVydGllcygpLCBpbXBvcnRhbnQpOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRGbGV4RmxvdzoKLSAgICAgICAgcmV0dXJuIHBhcnNlU2hvcnRoYW5kKHByb3BJZCwgd2Via2l0 RmxleEZsb3dTaG9ydGhhbmQoKSwgaW1wb3J0YW50KTsKKyAgICBjYXNlIENTU1Byb3BlcnR5Rmxl eEZsb3c6CisgICAgICAgIHJldHVybiBwYXJzZVNob3J0aGFuZChwcm9wSWQsIGZsZXhGbG93U2hv cnRoYW5kKCksIGltcG9ydGFudCk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnQ6CiAgICAgICAg IC8vIFsgWyAnZm9udC1zdHlsZScgfHwgJ2ZvbnQtdmFyaWFudCcgfHwgJ2ZvbnQtd2VpZ2h0JyBd PyAnZm9udC1zaXplJyBbIC8gJ2xpbmUtaGVpZ2h0JyBdPwogICAgICAgICAvLyAnZm9udC1mYW1p bHknIF0gfCBjYXB0aW9uIHwgaWNvbiB8IG1lbnUgfCBtZXNzYWdlLWJveCB8IHNtYWxsLWNhcHRp b24gfCBzdGF0dXMtYmFyIHwgaW5oZXJpdApAQCAtMzAyNCwxMiArMzAyNCwxMiBAQCBib29sIENT U1BhcnNlcjo6cGFyc2VWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQp CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrSW5zaWRlOgogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRDb2x1bW5GaWxsOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRD b2x1bW5SdWxlU3R5bGU6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFsaWduQ29udGVudDoK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtczoKLSAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0QWxpZ25TZWxmOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RGlyZWN0 aW9uOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4V3JhcDoKLSAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0SnVzdGlmeUNvbnRlbnQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUFsaWduQ29u dGVudDoKKyAgICBjYXNlIENTU1Byb3BlcnR5QWxpZ25JdGVtczoKKyAgICBjYXNlIENTU1Byb3Bl cnR5QWxpZ25TZWxmOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4RGlyZWN0aW9uOgorICAgIGNh c2UgQ1NTUHJvcGVydHlGbGV4V3JhcDoKKyAgICBjYXNlIENTU1Byb3BlcnR5SnVzdGlmeUNvbnRl bnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZvbnRLZXJuaW5nOgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRGb250U21vb3RoaW5nOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRI eXBoZW5zOgpAQCAtNzM3Nyw5ICs3Mzc3LDkgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlRmxleChD U1NQYXJzZXJWYWx1ZUxpc3QqIGFyZ3MsIGJvb2wgaW1wb3J0YW50KQogICAgIGlmICghZmxleEJh c2lzKQogICAgICAgICBmbGV4QmFzaXMgPSBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSgwLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKIAotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5 V2Via2l0RmxleEdyb3csIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGNsYW1wVG9GbG9hdChm bGV4R3JvdyksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSwgaW1wb3J0YW50KTsKLSAg ICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdEZsZXhTaHJpbmssIGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZVZhbHVlKGNsYW1wVG9GbG9hdChmbGV4U2hyaW5rKSwgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU19OVU1CRVIpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5V2Vi a2l0RmxleEJhc2lzLCBmbGV4QmFzaXMsIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NT UHJvcGVydHlGbGV4R3JvdywgY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoY2xhbXBUb0Zsb2F0 KGZsZXhHcm93KSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpLCBpbXBvcnRhbnQpOwor ICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5RmxleFNocmluaywgY3NzVmFsdWVQb29sKCkuY3Jl YXRlVmFsdWUoY2xhbXBUb0Zsb2F0KGZsZXhTaHJpbmspLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT X05VTUJFUiksIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGbGV4QmFz aXMsIGZsZXhCYXNpcywgaW1wb3J0YW50KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKaW5kZXggMzI2NDNj ZWUyZjViNGRmYTJjZTBhNTBkZmI1OGE4ZTI2ZDE0MWYxYS4uY2MzNTY2NDA5ODQ0YzVmYTNiZTdi Y2Y3YmEwN2E2MDg3MmMxYTA2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1By aW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0 aXZlVmFsdWVNYXBwaW5ncy5oCkBAIC0xMzU1LDEwICsxMzU1LDEyIEBAIHRlbXBsYXRlPD4gaW5s aW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShFRGlzcGxheSBlKQogICAg ICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZVdlYmtpdElubGluZUJveDsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBGTEVYOgotICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1 ZVdlYmtpdEZsZXg7CisgICAgY2FzZSBXRUJLSVRfRkxFWDoKKyAgICAgICAgbV92YWx1ZS52YWx1 ZUlEID0gQ1NTVmFsdWVGbGV4OwogICAgICAgICBicmVhazsKICAgICBjYXNlIElOTElORV9GTEVY OgotICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZVdlYmtpdElubGluZUZsZXg7Cisg ICAgY2FzZSBXRUJLSVRfSU5MSU5FX0ZMRVg6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENT U1ZhbHVlSW5saW5lRmxleDsKICAgICAgICAgYnJlYWs7CiAjaWYgRU5BQkxFKENTU19HUklEX0xB WU9VVCkKICAgICBjYXNlIEdSSUQ6CkBAIC0xMzgzLDYgKzEzODUsMTAgQEAgdGVtcGxhdGU8PiBp bmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEVEaXNwbGF5KCkgY29uc3QKIAogICAg IEVEaXNwbGF5IGRpc3BsYXkgPSBzdGF0aWNfY2FzdDxFRGlzcGxheT4obV92YWx1ZS52YWx1ZUlE IC0gQ1NTVmFsdWVJbmxpbmUpOwogICAgIEFTU0VSVChkaXNwbGF5ID49IElOTElORSAmJiBkaXNw bGF5IDw9IE5PTkUpOworICAgIGlmIChkaXNwbGF5ID09IFdFQktJVF9GTEVYKQorICAgICAgICBy ZXR1cm4gRkxFWDsKKyAgICBpZiAoZGlzcGxheSA9PSBXRUJLSVRfSU5MSU5FX0ZMRVgpCisgICAg ICAgIHJldHVybiBJTkxJTkVfRkxFWDsKICAgICByZXR1cm4gZGlzcGxheTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCBjOGUzNWI1ZjJhOGMxMGQ0NjkyNjUy MWYwZjU1ODcxNjRiMGIwMDA5Li43M2M3YjE2Y2JmOWFhYjEzNjlhNzYyNDgxMDFiOWM5MzE0ZDU0 ZTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtMjkzLDE4ICsy OTMsMzAgQEAgbWl4LWJsZW5kLW1vZGUKIGlzb2xhdGlvbgogI2VuZGlmCiAtd2Via2l0LWZpbHRl cgotLXdlYmtpdC1hbGlnbi1jb250ZW50Ci0td2Via2l0LWFsaWduLWl0ZW1zCi0td2Via2l0LWFs aWduLXNlbGYKLS13ZWJraXQtZmxleAotLXdlYmtpdC1mbGV4LWJhc2lzCi0td2Via2l0LWZsZXgt ZGlyZWN0aW9uCi0td2Via2l0LWZsZXgtZmxvdwotLXdlYmtpdC1mbGV4LWdyb3cKLS13ZWJraXQt ZmxleC1zaHJpbmsKLS13ZWJraXQtZmxleC13cmFwCi0td2Via2l0LWp1c3RpZnktY29udGVudAot LXdlYmtpdC1qdXN0aWZ5LXNlbGYKK2FsaWduLWNvbnRlbnQKKy13ZWJraXQtYWxpZ24tY29udGVu dCA9IGFsaWduLWNvbnRlbnQKK2FsaWduLWl0ZW1zCistd2Via2l0LWFsaWduLWl0ZW1zID0gYWxp Z24taXRlbXMKK2FsaWduLXNlbGYKKy13ZWJraXQtYWxpZ24tc2VsZiA9IGFsaWduLXNlbGYKK2Zs ZXgKKy13ZWJraXQtZmxleCA9IGZsZXgKK2ZsZXgtYmFzaXMKKy13ZWJraXQtZmxleC1iYXNpcyA9 IGZsZXgtYmFzaXMKK2ZsZXgtZGlyZWN0aW9uCistd2Via2l0LWZsZXgtZGlyZWN0aW9uID0gZmxl eC1kaXJlY3Rpb24KK2ZsZXgtZmxvdworLXdlYmtpdC1mbGV4LWZsb3cgPSBmbGV4LWZsb3cKK2Zs ZXgtZ3JvdworLXdlYmtpdC1mbGV4LWdyb3cgPSBmbGV4LWdyb3cKK2ZsZXgtc2hyaW5rCistd2Vi a2l0LWZsZXgtc2hyaW5rID0gZmxleC1zaHJpbmsKK2ZsZXgtd3JhcAorLXdlYmtpdC1mbGV4LXdy YXAgPSBmbGV4LXdyYXAKK2p1c3RpZnktY29udGVudAorLXdlYmtpdC1qdXN0aWZ5LWNvbnRlbnQg PSBqdXN0aWZ5LWNvbnRlbnQKK2p1c3RpZnktc2VsZgorLXdlYmtpdC1qdXN0aWZ5LXNlbGYgPSBq dXN0aWZ5LXNlbGYKIC13ZWJraXQtZm9udC1zaXplLWRlbHRhCiAjaWYgZGVmaW5lZChFTkFCTEVf Q1NTX0dSSURfTEFZT1VUKSAmJiBFTkFCTEVfQ1NTX0dSSURfTEFZT1VUCiAtd2Via2l0LWdyaWQK QEAgLTM3Nyw3ICszODksOCBAQCBpc29sYXRpb24KIC13ZWJraXQtbWluLWxvZ2ljYWwtd2lkdGgK IC13ZWJraXQtbWluLWxvZ2ljYWwtaGVpZ2h0CiAtd2Via2l0LW5ic3AtbW9kZSBbSW5oZXJpdGVk XQotLXdlYmtpdC1vcmRlcgorb3JkZXIKKy13ZWJraXQtb3JkZXIgPSBvcmRlcgogLXdlYmtpdC1w YWRkaW5nLWFmdGVyCiAtd2Via2l0LXBhZGRpbmctYmVmb3JlCiAtd2Via2l0LXBhZGRpbmctZW5k CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbiBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCmluZGV4IGI1ZDVjOTJmNzI1ZGM2 NDg4YTQ1MmNjMTY5ZTI1ZDgxOGFkY2YwZjIuLmU2MjcyNGU4OGJkZjgwYmY5MjYxMDg4NDZhMDlk MWNlZTIyNTk5MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdv cmRzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCkBAIC0z NTgsNyArMzU4LDkgQEAgdGFibGUtY2VsbAogdGFibGUtY2FwdGlvbgogLXdlYmtpdC1ib3gKIC13 ZWJraXQtaW5saW5lLWJveAorZmxleAogLXdlYmtpdC1mbGV4CitpbmxpbmUtZmxleAogLXdlYmtp dC1pbmxpbmUtZmxleAogLXdlYmtpdC1ncmlkCiAtd2Via2l0LWlubGluZS1ncmlkCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKaW5kZXggNGMyZTExMDEz NmI2ODVlMzk2YzRhYmM5YzAzNWJjMzg4MmE3YWQ0Yy4uNjk1YzQ5MzAxMGZhMGM4NDJjODM2NTg0 MzBkODYyMTFkNWQ4MjY0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0 ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5 bGVCdWlsZGVyLmNwcApAQCAtMjUyMSwxNiArMjUyMSwxNiBAQCBEZXByZWNhdGVkU3R5bGVCdWls ZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICNpZiBFTkFCTEUoQ1VSU09SX1ZJU0lCSUxJ VFkpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Q3Vyc29yVmlzaWJp bGl0eSwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8Q3Vyc29yVmlzaWJpbGl0eSwgJlJlbmRlclN0eWxl OjpjdXJzb3JWaXNpYmlsaXR5LCBDdXJzb3JWaXNpYmlsaXR5LCAmUmVuZGVyU3R5bGU6OnNldEN1 cnNvclZpc2liaWxpdHksIEN1cnNvclZpc2liaWxpdHksICZSZW5kZXJTdHlsZTo6aW5pdGlhbEN1 cnNvclZpc2liaWxpdHk+OjpjcmVhdGVIYW5kbGVyKCkpOwogI2VuZGlmCi0gICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25Db250ZW50LCBBcHBseVByb3BlcnR5RGVm YXVsdDxFQWxpZ25Db250ZW50LCAmUmVuZGVyU3R5bGU6OmFsaWduQ29udGVudCwgRUFsaWduQ29u dGVudCwgJlJlbmRlclN0eWxlOjpzZXRBbGlnbkNvbnRlbnQsIEVBbGlnbkNvbnRlbnQsICZSZW5k ZXJTdHlsZTo6aW5pdGlhbEFsaWduQ29udGVudD46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtcywgQXBwbHlQcm9wZXJ0 eURlZmF1bHQ8RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25JdGVtcywgRUFsaWduSXRl bXMsICZSZW5kZXJTdHlsZTo6c2V0QWxpZ25JdGVtcywgRUFsaWduSXRlbXMsICZSZW5kZXJTdHls ZTo6aW5pdGlhbEFsaWduSXRlbXM+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8 RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25TZWxmLCBFQWxpZ25JdGVtcywgJlJlbmRl clN0eWxlOjpzZXRBbGlnblNlbGYsIEVBbGlnbkl0ZW1zLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxB bGlnblNlbGY+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhCYXNpcywgQXBwbHlQcm9wZXJ0eUxlbmd0aDwmUmVuZGVyU3R5bGU6 OmZsZXhCYXNpcywgJlJlbmRlclN0eWxlOjpzZXRGbGV4QmFzaXMsICZSZW5kZXJTdHlsZTo6aW5p dGlhbEZsZXhCYXNpcywgQXV0b0VuYWJsZWQ+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb24sIEFwcGx5UHJvcGVy dHlEZWZhdWx0PEVGbGV4RGlyZWN0aW9uLCAmUmVuZGVyU3R5bGU6OmZsZXhEaXJlY3Rpb24sIEVG bGV4RGlyZWN0aW9uLCAmUmVuZGVyU3R5bGU6OnNldEZsZXhEaXJlY3Rpb24sIEVGbGV4RGlyZWN0 aW9uLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxGbGV4RGlyZWN0aW9uPjo6Y3JlYXRlSGFuZGxlcigp KTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbGV4R3JvdywgQXBw bHlQcm9wZXJ0eURlZmF1bHQ8ZmxvYXQsICZSZW5kZXJTdHlsZTo6ZmxleEdyb3csIGZsb2F0LCAm UmVuZGVyU3R5bGU6OnNldEZsZXhHcm93LCBmbG9hdCwgJlJlbmRlclN0eWxlOjppbml0aWFsRmxl eEdyb3c+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eVdlYmtpdEZsZXhTaHJpbmssIEFwcGx5UHJvcGVydHlEZWZhdWx0PGZsb2F0LCAmUmVuZGVy U3R5bGU6OmZsZXhTaHJpbmssIGZsb2F0LCAmUmVuZGVyU3R5bGU6OnNldEZsZXhTaHJpbmssIGZs b2F0LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxGbGV4U2hyaW5rPjo6Y3JlYXRlSGFuZGxlcigpKTsK LSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbGV4V3JhcCwgQXBwbHlQ cm9wZXJ0eURlZmF1bHQ8RUZsZXhXcmFwLCAmUmVuZGVyU3R5bGU6OmZsZXhXcmFwLCBFRmxleFdy YXAsICZSZW5kZXJTdHlsZTo6c2V0RmxleFdyYXAsIEVGbGV4V3JhcCwgJlJlbmRlclN0eWxlOjpp bml0aWFsRmxleFdyYXA+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eVdlYmtpdEp1c3RpZnlDb250ZW50LCBBcHBseVByb3BlcnR5RGVmYXVsdDxF SnVzdGlmeUNvbnRlbnQsICZSZW5kZXJTdHlsZTo6anVzdGlmeUNvbnRlbnQsIEVKdXN0aWZ5Q29u dGVudCwgJlJlbmRlclN0eWxlOjpzZXRKdXN0aWZ5Q29udGVudCwgRUp1c3RpZnlDb250ZW50LCAm UmVuZGVyU3R5bGU6OmluaXRpYWxKdXN0aWZ5Q29udGVudD46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0g ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0T3JkZXIsIEFwcGx5UHJvcGVy dHlEZWZhdWx0PGludCwgJlJlbmRlclN0eWxlOjpvcmRlciwgaW50LCAmUmVuZGVyU3R5bGU6OnNl dE9yZGVyLCBpbnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbE9yZGVyPjo6Y3JlYXRlSGFuZGxlcigp KTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlBbGlnbkNvbnRlbnQsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PEVBbGlnbkNvbnRlbnQsICZSZW5kZXJTdHlsZTo6YWxpZ25Db250ZW50 LCBFQWxpZ25Db250ZW50LCAmUmVuZGVyU3R5bGU6OnNldEFsaWduQ29udGVudCwgRUFsaWduQ29u dGVudCwgJlJlbmRlclN0eWxlOjppbml0aWFsQWxpZ25Db250ZW50Pjo6Y3JlYXRlSGFuZGxlcigp KTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlBbGlnbkl0ZW1zLCBBcHBseVBy b3BlcnR5RGVmYXVsdDxFQWxpZ25JdGVtcywgJlJlbmRlclN0eWxlOjphbGlnbkl0ZW1zLCBFQWxp Z25JdGVtcywgJlJlbmRlclN0eWxlOjpzZXRBbGlnbkl0ZW1zLCBFQWxpZ25JdGVtcywgJlJlbmRl clN0eWxlOjppbml0aWFsQWxpZ25JdGVtcz46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5QWxpZ25TZWxmLCBBcHBseVByb3BlcnR5RGVmYXVsdDxF QWxpZ25JdGVtcywgJlJlbmRlclN0eWxlOjphbGlnblNlbGYsIEVBbGlnbkl0ZW1zLCAmUmVuZGVy U3R5bGU6OnNldEFsaWduU2VsZiwgRUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEFs aWduU2VsZj46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1By b3BlcnR5RmxleEJhc2lzLCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6ZmxleEJh c2lzLCAmUmVuZGVyU3R5bGU6OnNldEZsZXhCYXNpcywgJlJlbmRlclN0eWxlOjppbml0aWFsRmxl eEJhc2lzLCBBdXRvRW5hYmxlZD46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5RmxleERpcmVjdGlvbiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RUZs ZXhEaXJlY3Rpb24sICZSZW5kZXJTdHlsZTo6ZmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24s ICZSZW5kZXJTdHlsZTo6c2V0RmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24sICZSZW5kZXJT dHlsZTo6aW5pdGlhbEZsZXhEaXJlY3Rpb24+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZsZXhHcm93LCBBcHBseVByb3BlcnR5RGVmYXVsdDxm bG9hdCwgJlJlbmRlclN0eWxlOjpmbGV4R3JvdywgZmxvYXQsICZSZW5kZXJTdHlsZTo6c2V0Rmxl eEdyb3csIGZsb2F0LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxGbGV4R3Jvdz46OmNyZWF0ZUhhbmRs ZXIoKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5RmxleFNocmluaywgQXBw bHlQcm9wZXJ0eURlZmF1bHQ8ZmxvYXQsICZSZW5kZXJTdHlsZTo6ZmxleFNocmluaywgZmxvYXQs ICZSZW5kZXJTdHlsZTo6c2V0RmxleFNocmluaywgZmxvYXQsICZSZW5kZXJTdHlsZTo6aW5pdGlh bEZsZXhTaHJpbms+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihD U1NQcm9wZXJ0eUZsZXhXcmFwLCBBcHBseVByb3BlcnR5RGVmYXVsdDxFRmxleFdyYXAsICZSZW5k ZXJTdHlsZTo6ZmxleFdyYXAsIEVGbGV4V3JhcCwgJlJlbmRlclN0eWxlOjpzZXRGbGV4V3JhcCwg RUZsZXhXcmFwLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxGbGV4V3JhcD46OmNyZWF0ZUhhbmRsZXIo KSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5SnVzdGlmeUNvbnRlbnQsIEFw cGx5UHJvcGVydHlEZWZhdWx0PEVKdXN0aWZ5Q29udGVudCwgJlJlbmRlclN0eWxlOjpqdXN0aWZ5 Q29udGVudCwgRUp1c3RpZnlDb250ZW50LCAmUmVuZGVyU3R5bGU6OnNldEp1c3RpZnlDb250ZW50 LCBFSnVzdGlmeUNvbnRlbnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEp1c3RpZnlDb250ZW50Pjo6 Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPcmRl ciwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8aW50LCAmUmVuZGVyU3R5bGU6Om9yZGVyLCBpbnQsICZS ZW5kZXJTdHlsZTo6c2V0T3JkZXIsIGludCwgJlJlbmRlclN0eWxlOjppbml0aWFsT3JkZXI+Ojpj cmVhdGVIYW5kbGVyKCkpOwogI2lmIEVOQUJMRShDU1NfUkVHSU9OUykKICAgICBzZXRQcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbG93RnJvbSwgQXBwbHlQcm9wZXJ0eVN0cmluZzxN YXBOb25lVG9OdWxsLCAmUmVuZGVyU3R5bGU6OnJlZ2lvblRocmVhZCwgJlJlbmRlclN0eWxlOjpz ZXRSZWdpb25UaHJlYWQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFJlZ2lvblRocmVhZD46OmNyZWF0 ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Rmxv d0ludG8sIEFwcGx5UHJvcGVydHlTdHJpbmc8TWFwTm9uZVRvTnVsbCwgJlJlbmRlclN0eWxlOjpm bG93VGhyZWFkLCAmUmVuZGVyU3R5bGU6OnNldEZsb3dUaHJlYWQsICZSZW5kZXJTdHlsZTo6aW5p dGlhbEZsb3dUaHJlYWQ+OjpjcmVhdGVIYW5kbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ cm9wZXJ0aWVzLmNwcAppbmRleCA5MDgwZDA3NTZmZjExYWNkYjI3Y2UzNWVmODMyMTZhNjg2ZjE4 NTY3Li42ZDJmZGNlMjFkZjE2ZWVjMWQ1MGQyNjU1ZWI0MGM0NTA5OWJkMmIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcApAQCAtMTUzLDEwICsxNTMsMTAgQEAgU3RyaW5n IFN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 SUQpIGNvbnN0CiAgICAgICAgIHJldHVybiBnZXRTaG9ydGhhbmRWYWx1ZSh3ZWJraXRDb2x1bW5S dWxlU2hvcnRoYW5kKCkpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5zOgogICAg ICAgICByZXR1cm4gZ2V0U2hvcnRoYW5kVmFsdWUod2Via2l0Q29sdW1uc1Nob3J0aGFuZCgpKTsK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleDoKLSAgICAgICAgcmV0dXJuIGdldFNob3J0 aGFuZFZhbHVlKHdlYmtpdEZsZXhTaG9ydGhhbmQoKSk7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdEZsZXhGbG93OgotICAgICAgICByZXR1cm4gZ2V0U2hvcnRoYW5kVmFsdWUod2Via2l0Rmxl eEZsb3dTaG9ydGhhbmQoKSk7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXg6CisgICAgICAgIHJl dHVybiBnZXRTaG9ydGhhbmRWYWx1ZShmbGV4U2hvcnRoYW5kKCkpOworICAgIGNhc2UgQ1NTUHJv cGVydHlGbGV4RmxvdzoKKyAgICAgICAgcmV0dXJuIGdldFNob3J0aGFuZFZhbHVlKGZsZXhGbG93 U2hvcnRoYW5kKCkpOwogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEdyaWRBcmVhOgogICAgICAgICByZXR1cm4gZ2V0U2hvcnRoYW5kVmFsdWUo d2Via2l0R3JpZEFyZWFTaG9ydGhhbmQoKSk7CkBAIC04OTMsMTQgKzg5MywxNCBAQCBTdHJpbmcg U3R5bGVQcm9wZXJ0aWVzOjphc1RleHQoKSBjb25zdAogICAgICAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0QW5pbWF0aW9uRmlsbE1vZGU6CiAgICAgICAgICAgICBzaG9ydGhhbmRQcm9wZXJ0eUlE ID0gQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb247CiAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb246Ci0gICAgICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRGbGV4V3JhcDoKLSAgICAgICAgICAgIHNob3J0aGFuZFByb3BlcnR5SUQg PSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhGbG93OworICAgICAgICBjYXNlIENTU1Byb3BlcnR5Rmxl eERpcmVjdGlvbjoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhXcmFwOgorICAgICAgICAg ICAgc2hvcnRoYW5kUHJvcGVydHlJRCA9IENTU1Byb3BlcnR5RmxleEZsb3c7CiAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhCYXNpczoKLSAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhHcm93OgotICAgICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0RmxleFNocmluazoKLSAgICAgICAgICAgIHNob3J0aGFuZFByb3BlcnR5SUQgPSBD U1NQcm9wZXJ0eVdlYmtpdEZsZXg7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4QmFzaXM6 CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4R3JvdzoKKyAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eUZsZXhTaHJpbms6CisgICAgICAgICAgICBzaG9ydGhhbmRQcm9wZXJ0eUlEID0gQ1NTUHJv cGVydHlGbGV4OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRNYXNrUG9zaXRpb25YOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza1Bv c2l0aW9uWToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hv cnRoYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmNw cAppbmRleCAwZmJkOTdkYTU1MDcxOWIzMDBlM2E4MGNjMzAzZjBiZjJiMDBmZWVlLi4zY2VmZWQy NzgyNGY5OGFlMjMxOWYxZDhlMjExODE5MzIyYTNjZWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlUHJvcGVydHlTaG9ydGhhbmQuY3BwCkBAIC0zMzMsMTYgKzMzMywxNiBAQCBTdHls ZVByb3BlcnR5U2hvcnRoYW5kIHdlYmtpdENvbHVtblJ1bGVTaG9ydGhhbmQoKQogICAgIHJldHVy biBTdHlsZVByb3BlcnR5U2hvcnRoYW5kKENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZSwgY29s dW1uUnVsZVByb3BlcnRpZXMsIFdURl9BUlJBWV9MRU5HVEgoY29sdW1uUnVsZVByb3BlcnRpZXMp KTsKIH0KIAotU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCB3ZWJraXRGbGV4Rmxvd1Nob3J0aGFuZCgp CitTdHlsZVByb3BlcnR5U2hvcnRoYW5kIGZsZXhGbG93U2hvcnRoYW5kKCkKIHsKLSAgICBzdGF0 aWMgY29uc3QgQ1NTUHJvcGVydHlJRCBmbGV4Rmxvd1Byb3BlcnRpZXNbXSA9IHsgQ1NTUHJvcGVy dHlXZWJraXRGbGV4RGlyZWN0aW9uLCBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhXcmFwIH07Ci0gICAg cmV0dXJuIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQoQ1NTUHJvcGVydHlXZWJraXRGbGV4Rmxvdywg ZmxleEZsb3dQcm9wZXJ0aWVzLCBXVEZfQVJSQVlfTEVOR1RIKGZsZXhGbG93UHJvcGVydGllcykp OworICAgIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGZsZXhGbG93UHJvcGVydGllc1tdID0g eyBDU1NQcm9wZXJ0eUZsZXhEaXJlY3Rpb24sIENTU1Byb3BlcnR5RmxleFdyYXAgfTsKKyAgICBy ZXR1cm4gU3R5bGVQcm9wZXJ0eVNob3J0aGFuZChDU1NQcm9wZXJ0eUZsZXhGbG93LCBmbGV4Rmxv d1Byb3BlcnRpZXMsIFdURl9BUlJBWV9MRU5HVEgoZmxleEZsb3dQcm9wZXJ0aWVzKSk7CiB9CiAK LVN0eWxlUHJvcGVydHlTaG9ydGhhbmQgd2Via2l0RmxleFNob3J0aGFuZCgpCitTdHlsZVByb3Bl cnR5U2hvcnRoYW5kIGZsZXhTaG9ydGhhbmQoKQogewotICAgIHN0YXRpYyBjb25zdCBDU1NQcm9w ZXJ0eUlEIGZsZXhQcm9wZXJ0aWVzW10gPSB7IENTU1Byb3BlcnR5V2Via2l0RmxleEdyb3csIENT U1Byb3BlcnR5V2Via2l0RmxleFNocmluaywgQ1NTUHJvcGVydHlXZWJraXRGbGV4QmFzaXMgfTsK LSAgICByZXR1cm4gU3R5bGVQcm9wZXJ0eVNob3J0aGFuZChDU1NQcm9wZXJ0eVdlYmtpdEZsZXgs IGZsZXhQcm9wZXJ0aWVzLCBXVEZfQVJSQVlfTEVOR1RIKGZsZXhQcm9wZXJ0aWVzKSk7CisgICAg c3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgZmxleFByb3BlcnRpZXNbXSA9IHsgQ1NTUHJvcGVy dHlGbGV4R3JvdywgQ1NTUHJvcGVydHlGbGV4U2hyaW5rLCBDU1NQcm9wZXJ0eUZsZXhCYXNpcyB9 OworICAgIHJldHVybiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kKENTU1Byb3BlcnR5RmxleCwgZmxl eFByb3BlcnRpZXMsIFdURl9BUlJBWV9MRU5HVEgoZmxleFByb3BlcnRpZXMpKTsKIH0KIAogU3R5 bGVQcm9wZXJ0eVNob3J0aGFuZCB3ZWJraXRNYXJnaW5Db2xsYXBzZVNob3J0aGFuZCgpCkBAIC01 NzMsMTAgKzU3MywxMCBAQCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIHNob3J0aGFuZEZvclByb3Bl cnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKICAgICAgICAgcmV0dXJuIHdlYmtpdENvbHVt bnNTaG9ydGhhbmQoKTsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZToKICAg ICAgICAgcmV0dXJuIHdlYmtpdENvbHVtblJ1bGVTaG9ydGhhbmQoKTsKLSAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0RmxleDoKLSAgICAgICAgcmV0dXJuIHdlYmtpdEZsZXhTaG9ydGhhbmQoKTsK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEZsb3c6Ci0gICAgICAgIHJldHVybiB3ZWJr aXRGbGV4Rmxvd1Nob3J0aGFuZCgpOworICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4OgorICAgICAg ICByZXR1cm4gZmxleFNob3J0aGFuZCgpOworICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4RmxvdzoK KyAgICAgICAgcmV0dXJuIGZsZXhGbG93U2hvcnRoYW5kKCk7CiAjaWYgRU5BQkxFKENTU19HUklE X0xBWU9VVCkKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZEFyZWE6CiAgICAgICAgIHJl dHVybiB3ZWJraXRHcmlkQXJlYVNob3J0aGFuZCgpOwpAQCAtNzcwLDEzICs3NzAsMTMgQEAgVmVj dG9yPFN0eWxlUHJvcGVydHlTaG9ydGhhbmQ+IG1hdGNoaW5nU2hvcnRoYW5kc0ZvckxvbmdoYW5k KENTU1Byb3BlcnR5SUQgcHJvcGUKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVs ZVN0eWxlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5SdWxlQ29sb3I6CiAgICAg ICAgIHJldHVybiBtYWtlVmVjdG9yKHdlYmtpdENvbHVtblJ1bGVTaG9ydGhhbmQoKSk7Ci0gICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhHcm93OgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRGbGV4U2hyaW5rOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4QmFzaXM6Ci0gICAg ICAgIHJldHVybiBtYWtlVmVjdG9yKHdlYmtpdEZsZXhTaG9ydGhhbmQoKSk7Ci0gICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb246Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEZsZXhXcmFwOgotICAgICAgICByZXR1cm4gbWFrZVZlY3Rvcih3ZWJraXRGbGV4Rmxvd1Nob3J0 aGFuZCgpKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleEdyb3c6CisgICAgY2FzZSBDU1NQcm9w ZXJ0eUZsZXhTaHJpbms6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhCYXNpczoKKyAgICAgICAg cmV0dXJuIG1ha2VWZWN0b3IoZmxleFNob3J0aGFuZCgpKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5 RmxleERpcmVjdGlvbjoKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleFdyYXA6CisgICAgICAgIHJl dHVybiBtYWtlVmVjdG9yKGZsZXhGbG93U2hvcnRoYW5kKCkpOwogI2lmIEVOQUJMRShDU1NfR1JJ RF9MQVlPVVQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRDb2x1bW5TdGFydDoKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZENvbHVtbkVuZDoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmggYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZC5oCmluZGV4IDA3NzY0M2UzZmMwZmVjZTMyZjBhNTE5 MjJhNmQ2YTVkZWM0N2U0ODUuLjk2NWU2YjYzZDgzYTZkYzQ4YzM4NTA4ZWIxZGNlOTJlZmEzMjZi YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5k LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTaG9ydGhhbmQuaApAQCAt ODEsNiArODEsOCBAQCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIGJvcmRlclN0eWxlU2hvcnRoYW5k KCk7CiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIGJvcmRlclRvcFNob3J0aGFuZCgpOwogU3R5bGVQ cm9wZXJ0eVNob3J0aGFuZCBib3JkZXJXaWR0aFNob3J0aGFuZCgpOwogU3R5bGVQcm9wZXJ0eVNo b3J0aGFuZCBsaXN0U3R5bGVTaG9ydGhhbmQoKTsKK1N0eWxlUHJvcGVydHlTaG9ydGhhbmQgZmxl eEZsb3dTaG9ydGhhbmQoKTsKK1N0eWxlUHJvcGVydHlTaG9ydGhhbmQgZmxleFNob3J0aGFuZCgp OwogU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCBmb250U2hvcnRoYW5kKCk7CiBTdHlsZVByb3BlcnR5 U2hvcnRoYW5kIGhlaWdodFNob3J0aGFuZCgpOwogU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCBtYXJn aW5TaG9ydGhhbmQoKTsKQEAgLTk3LDggKzk5LDYgQEAgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCB3 ZWJraXRCb3JkZXJSYWRpdXNTaG9ydGhhbmQoKTsKIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgd2Vi a2l0Qm9yZGVyU3RhcnRTaG9ydGhhbmQoKTsKIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgd2Via2l0 Q29sdW1uc1Nob3J0aGFuZCgpOwogU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCB3ZWJraXRDb2x1bW5S dWxlU2hvcnRoYW5kKCk7Ci1TdHlsZVByb3BlcnR5U2hvcnRoYW5kIHdlYmtpdEZsZXhGbG93U2hv cnRoYW5kKCk7Ci1TdHlsZVByb3BlcnR5U2hvcnRoYW5kIHdlYmtpdEZsZXhTaG9ydGhhbmQoKTsK IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgd2Via2l0R3JpZFNob3J0aGFuZCgpOwogU3R5bGVQcm9w ZXJ0eVNob3J0aGFuZCB3ZWJraXRHcmlkVGVtcGxhdGVTaG9ydGhhbmQoKTsKIFN0eWxlUHJvcGVy dHlTaG9ydGhhbmQgd2Via2l0R3JpZEFyZWFTaG9ydGhhbmQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVJlc29sdmVyLmNwcAppbmRleCBkMDJiMjJjYjA2ZWU1ZWM3NjMzNTY2OGQ5M2E0MDY4NWZkOTQy YWFlLi44OTc4YzdiZTlkYzFjN2VmZWNiOTdiMzliM2JhMWYwMDhkNWM3Zjk2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0xMDY1LDYgKzEwNjUsNyBAQCBzdGF0aWMgRURp c3BsYXkgZXF1aXZhbGVudEJsb2NrRGlzcGxheShFRGlzcGxheSBkaXNwbGF5LCBib29sIGlzRmxv YXRpbmcsIGJvb2wgcwogICAgIGNhc2UgVEFCTEU6CiAgICAgY2FzZSBCT1g6CiAgICAgY2FzZSBG TEVYOgorICAgIGNhc2UgV0VCS0lUX0ZMRVg6CiAjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkK ICAgICBjYXNlIEdSSUQ6CiAjZW5kaWYKQEAgLTEwODAsNiArMTA4MSw3IEBAIHN0YXRpYyBFRGlz cGxheSBlcXVpdmFsZW50QmxvY2tEaXNwbGF5KEVEaXNwbGF5IGRpc3BsYXksIGJvb2wgaXNGbG9h dGluZywgYm9vbCBzCiAgICAgY2FzZSBJTkxJTkVfQk9YOgogICAgICAgICByZXR1cm4gQk9YOwog ICAgIGNhc2UgSU5MSU5FX0ZMRVg6CisgICAgY2FzZSBXRUJLSVRfSU5MSU5FX0ZMRVg6CiAgICAg ICAgIHJldHVybiBGTEVYOwogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCiAgICAgY2FzZSBJ TkxJTkVfR1JJRDoKQEAgLTIzMjMsOCArMjMyNSw4IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBw bHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEJvcmRlclJhZGl1czoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 Q29sdW1uczoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZToKLSAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0RmxleDoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEZs b3c6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXg6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZsZXhG bG93OgogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdEdyaWRUZW1wbGF0ZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZEFyZWE6CkBA IC0yODQ5LDcgKzI4NTEsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NT UHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVlKQogICAgICAgICByZXR1cm47CiAgICAgfQog I2VuZGlmIC8qIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpICovCi0gICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEp1c3RpZnlTZWxmOiB7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUp1c3RpZnlTZWxmOiB7 CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKGp1c3RpZnlTZWxmLCBKdXN0aWZ5 U2VsZik7CiAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHRvQ1NT UHJpbWl0aXZlVmFsdWUodmFsdWUpOwogICAgICAgICBpZiAoUGFpciogcGFpclZhbHVlID0gcHJp bWl0aXZlVmFsdWUtPmdldFBhaXJWYWx1ZSgpKSB7CkBAIC0zMTE5LDE2ICszMTIxLDE2IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1 ZSogdmFsdWUpCiAjaWYgRU5BQkxFKENVUlNPUl9WSVNJQklMSVRZKQogICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRDdXJzb3JWaXNpYmlsaXR5OgogI2VuZGlmCi0gICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEFsaWduQ29udGVudDoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVt czoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QWxpZ25TZWxmOgotICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRGbGV4QmFzaXM6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJl Y3Rpb246Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhHcm93OgotICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRGbGV4U2hyaW5rOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4 V3JhcDoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeUNvbnRlbnQ6Ci0gICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdE9yZGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlBbGlnbkNvbnRl bnQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUFsaWduSXRlbXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0 eUFsaWduU2VsZjoKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleEJhc2lzOgorICAgIGNhc2UgQ1NT UHJvcGVydHlGbGV4RGlyZWN0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGbGV4R3JvdzoKKyAg ICBjYXNlIENTU1Byb3BlcnR5RmxleFNocmluazoKKyAgICBjYXNlIENTU1Byb3BlcnR5RmxleFdy YXA6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUp1c3RpZnlDb250ZW50OgorICAgIGNhc2UgQ1NTUHJv cGVydHlPcmRlcjoKICNpZiBFTkFCTEUoQ1NTX1JFR0lPTlMpCiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEZsb3dGcm9tOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbG93SW50bzoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcAppbmRleCBkMTBmNDFmOWVhNWI4Njk3NTg3YWYyMjk2OTNkOGQxY2I0NGE0ODllLi43 ZjA2Y2ZlMDVlZWVkZjQ0MDQ3OTk4YTg5ZTA1MWVjZjMxYWRlMzNkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwCkBA IC05ODMsNyArOTgzLDggQEAgcHJpdmF0ZToKIAogY2xhc3MgUHJvcGVydHlXcmFwcGVyRmxleCA6 IHB1YmxpYyBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlIHsKIHB1YmxpYzoKLSAgICBQcm9w ZXJ0eVdyYXBwZXJGbGV4KCkgOiBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKENTU1Byb3Bl cnR5V2Via2l0RmxleCkKKyAgICBQcm9wZXJ0eVdyYXBwZXJGbGV4KCkKKyAgICAgICAgOiBBbmlt YXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKENTU1Byb3BlcnR5RmxleCkKICAgICB7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMTk5YTY0 NTZmZjIwMzMxN2Y4ZTM0YzQxMzI1MWI4MzY3MWI2OWI0OS4uY2ZhNDJiY2ExZmEwZGZlOTM0ODQ0 ZjY2NDM1NjBmNDI4OThjNGMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmNwcApAQCAtMTg3LDYgKzE4Nyw4IEBAIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBS ZW5kZXJFbGVtZW50OjpjcmVhdGVGb3IoRWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kCiAg ICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g+ KGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpOwogICAgIGNhc2UgRkxFWDoKICAgICBjYXNlIElO TElORV9GTEVYOgorICAgIGNhc2UgV0VCS0lUX0ZMRVg6CisgICAgY2FzZSBXRUJLSVRfSU5MSU5F X0ZMRVg6CiAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJGbGV4aWJsZUJveD4o ZWxlbWVudCwgV1RGOjptb3ZlKHN0eWxlKSk7CiAjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkK ICAgICBjYXNlIEdSSUQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCmluZGV4IGMyNWU5MzliOGQyNDgwOThhYjk3YjMwNjAw M2RiMzkxYmI0ZDQ0MmMuLmQxMThhZTcyOTY3NzYxNGI4MmEyOTVlZWFlYmYyZmQ4Y2MxNTc5NTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNv bnN0YW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZUNvbnN0YW50cy5oCkBAIC00NzQsNyArNDc0LDcgQEAgZW51bSBFRGlzcGxheSB7CiAgICAgVEFC TEVfSEVBREVSX0dST1VQLCBUQUJMRV9GT09URVJfR1JPVVAsIFRBQkxFX1JPVywKICAgICBUQUJM RV9DT0xVTU5fR1JPVVAsIFRBQkxFX0NPTFVNTiwgVEFCTEVfQ0VMTCwKICAgICBUQUJMRV9DQVBU SU9OLCBCT1gsIElOTElORV9CT1gsCi0gICAgRkxFWCwgSU5MSU5FX0ZMRVgsCisgICAgRkxFWCwg V0VCS0lUX0ZMRVgsIElOTElORV9GTEVYLCBXRUJLSVRfSU5MSU5FX0ZMRVgsCiAjaWYgRU5BQkxF KENTU19HUklEX0xBWU9VVCkKICAgICBHUklELCBJTkxJTkVfR1JJRCwKICNlbmRpZgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDg0ZTAyNzE5ZTQwMTRkMTFlMjQ5YThjOGJhYzYzZDYzYWRmNmQ3MmUuLjYzMGUzZjdjZDg1ZDU0 YzYwMTFjZDZhYWJmYjUzMzU2NWVhNTlkNGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxNC0w OS0xMiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgVW5wcmVmaXgg dGhlIGZsZXhib3ggQ1NTIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk4NDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm93IHRoYXQgd2UgcmV0dXJuICJmbGV4IiBpbnN0ZWFkIG9mICIt d2Via2l0LWZsZXgiIChhbmQgc2ltaWxhcgorICAgICAgICBjaGFuZ2VzKSB1cGRhdGUgdGhlIHRl c3RzIHRoYXQgcmVseSBvbiB0aGlzLiBPdGhlciB0aGFuIHRoYXQsCisgICAgICAgIHdlJ3JlIHN0 aWxsIHRlc3RpbmcgdGhlIHByZWZpeGVkIGNvbnRlbnQuIEEgZm9sbG93dXAgcGF0Y2gKKyAgICAg ICAgd2lsbCBhZGQgdGVzdHMgZm9yIG5vbi1wcmVmaXhlZCBjb250ZW50LgorCisgICAgICAgICog Y3NzMy9mbGV4Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0LWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBjc3MzL2ZsZXhib3gvZGlzcGxheS1mbGV4Ym94LXNldC1nZXQuaHRtbDoKKyAgICAgICAg KiBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxh eW91dC9ncmlkLWl0ZW0tZGlzcGxheS5odG1sOgorICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1 dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3Nz L2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9yZXNvdXJjZXMvcHJv cGVydHktbmFtZXMuanM6CisgICAgICAgICogZmFzdC9jc3MvaW5oZXJpdC1pbml0aWFsLXNob3J0 aGFuZC12YWx1ZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzL2luaGVyaXQtaW5p dGlhbC1zaG9ydGhhbmQtdmFsdWVzLmh0bWw6CisgICAgICAgICogc3ZnL2Nzcy9nZXRDb21wdXRl ZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB0cmFuc2l0aW9ucy9mbGV4LXRy YW5zaXRpb25zLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB0cmFuc2l0aW9ucy9mbGV4LXRyYW5z aXRpb25zLmh0bWw6CisKIDIwMTQtMDktMTAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CiAKICAgICAgICAgU2tpcCBzb21lIGZsYWt5IHRlc3RzIHRoYXQgbWF5IGJlIGFmZmVj dGluZyBzdWJzZXF1ZW50IHRlc3RzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4 Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Nz czMvZmxleGJveC9kaXNwbGF5LWZsZXhib3gtc2V0LWdldC1leHBlY3RlZC50eHQKaW5kZXggYThl YmFmMmZhMzE1YjdjZGE1NjNjOGFjYTY0NWFhOTdhZGY1YzU5Ni4uODA5ZDM3MGY0NGRhYjI0MWY5 NTZkNDIyOTZhNDhkN2FlOGYyMmQxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4 Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9jc3MzL2ZsZXhib3gvZGlzcGxheS1mbGV4Ym94LXNldC1nZXQtZXhwZWN0ZWQudHh0CkBAIC00 LDE0ICs0LDE0IEBAIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIg bWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFCiAKIAogVGVzdCBnZXR0aW5nIHxk aXNwbGF5fCBzZXQgdGhyb3VnaCBDU1MKLVBBU1MgZ2V0Q29tcHV0ZWRTdHlsZShmbGV4Ym94RWxl bWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJ2Rpc3BsYXknKSBpcyAnLXdlYmtpdC1mbGV4Jwot UEFTUyBnZXRDb21wdXRlZFN0eWxlKGlubGluZUZsZXhib3hFbGVtZW50LCAnJykuZ2V0UHJvcGVy dHlWYWx1ZSgnZGlzcGxheScpIGlzICctd2Via2l0LWlubGluZS1mbGV4JworUEFTUyBnZXRDb21w dXRlZFN0eWxlKGZsZXhib3hFbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScp IGlzICdmbGV4JworUEFTUyBnZXRDb21wdXRlZFN0eWxlKGlubGluZUZsZXhib3hFbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIGlzICdpbmxpbmUtZmxleCcKIAogVGVzdCBn ZXR0aW5nIGFuZCBzZXR0aW5nIGRpc3BsYXkgdGhyb3VnaCBKUwogUEFTUyBnZXRDb21wdXRlZFN0 eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNwbGF5JykgaXMgJ2Jsb2NrJwot UEFTUyBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNw bGF5JykgaXMgJy13ZWJraXQtZmxleCcKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIGlzICdmbGV4JwogUEFTUyBnZXRDb21wdXRl ZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNwbGF5JykgaXMgJ2Jsb2Nr JwotUEFTUyBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdk aXNwbGF5JykgaXMgJy13ZWJraXQtaW5saW5lLWZsZXgnCitQQVNTIGdldENvbXB1dGVkU3R5bGUo ZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJ2Rpc3BsYXknKSBpcyAnaW5saW5lLWZsZXgn CiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9kaXNwbGF5LWZsZXhib3gtc2V0LWdldC5o dG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0Lmh0 bWwKaW5kZXggZjVjM2NhMjI5MDcyODE3ZTllYzVjODBjMWIyNGZlYjgzYjRkNjM1NC4uMTcwY2M0 N2M5MjI4ZGNkYTc0OGUyYWQzZGJiNDMyNjZiMDE1MjVkZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0Lmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvY3NzMy9mbGV4Ym94L2Rpc3BsYXktZmxleGJveC1zZXQtZ2V0Lmh0bWwKQEAgLTE1LDkg KzE1LDkgQEAgZGVzY3JpcHRpb24oJ1Rlc3QgdGhhdCBzZXR0aW5nIGFuZCBnZXR0aW5nIGRpc3Bs YXk6IC13ZWJraXQtZmxleCBhbmQgLXdlYmtpdC1pbmwKIAogZGVidWcoIlRlc3QgZ2V0dGluZyB8 ZGlzcGxheXwgc2V0IHRocm91Z2ggQ1NTIik7CiB2YXIgZmxleGJveEVsZW1lbnQgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiZmxleGJveCIpOwotc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUo ZmxleGJveEVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNwbGF5JykiLCAiJy13ZWJr aXQtZmxleCciKTsKK3Nob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGZsZXhib3hFbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIiwgIidmbGV4JyIpOwogdmFyIGlubGluZUZs ZXhib3hFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImZsZXhib3hJbmxpbmUiKTsK LXNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGlubGluZUZsZXhib3hFbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIiwgIictd2Via2l0LWlubGluZS1mbGV4JyIpOworc2hv dWxkQmUoImdldENvbXB1dGVkU3R5bGUoaW5saW5lRmxleGJveEVsZW1lbnQsICcnKS5nZXRQcm9w ZXJ0eVZhbHVlKCdkaXNwbGF5JykiLCAiJ2lubGluZS1mbGV4JyIpOwogCiBkZWJ1ZygiIik7CiBk ZWJ1ZygiVGVzdCBnZXR0aW5nIGFuZCBzZXR0aW5nIGRpc3BsYXkgdGhyb3VnaCBKUyIpOwpAQCAt MjUsMTMgKzI1LDEzIEBAIHZhciBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOwogc2hvdWxkQmUoImdldENv bXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJ2Rpc3BsYXknKSIsICIn YmxvY2snIik7CiBlbGVtZW50LnN0eWxlLmRpc3BsYXkgPSAiLXdlYmtpdC1mbGV4IjsKLXNob3Vs ZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNw bGF5JykiLCAiJy13ZWJraXQtZmxleCciKTsKK3Nob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVs ZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNwbGF5JykiLCAiJ2ZsZXgnIik7CiAKIGVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKIGRvY3VtZW50LmJvZHkuYXBw ZW5kQ2hpbGQoZWxlbWVudCk7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIiwgIidibG9jayciKTsKIGVsZW1lbnQuc3R5 bGUuZGlzcGxheSA9ICItd2Via2l0LWlubGluZS1mbGV4IjsKLXNob3VsZEJlKCJnZXRDb21wdXRl ZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCdkaXNwbGF5JykiLCAiJy13ZWJr aXQtaW5saW5lLWZsZXgnIik7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnZGlzcGxheScpIiwgIidpbmxpbmUtZmxleCciKTsKIDwvc2Ny aXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2Ny aXB0PgogPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhp dGVtLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbAppbmRleCAx MDZlZGQ0NjUwMjI4YmYwOTkzMWNlZjkxOTYyNWM3NTE5MGRlNzQ5Li45YTgzM2NhZTNlODg0YjJk NGI4ZjA3OGVlMWJiMzQyMjUxZTEzNDczIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3MzL2Zs ZXhib3gvZmxleGl0ZW0uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxleGl0 ZW0uaHRtbApAQCAtNzEsNyArNzEsNyBAQAogPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9Indp ZHRoOiA3MDBweCI+CiAgIDxkaXYgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMTAwIiBzdHlsZT0iZGlzcGxheTogaW5saW5lLWJsb2NrOyI+PC9kaXY+ CiAgIDxkaXYgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSItd2Via2l0LWJveCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMTAwIiBzdHlsZT0iZGlzcGxheTogLXdlYmtpdC1pbmxpbmUtYm94OyI+PC9kaXY+ Ci0gIDxkaXYgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSItd2Via2l0LWZsZXgiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjEwMCIgc3R5bGU9ImRpc3BsYXk6IC13ZWJraXQtaW5saW5lLWZsZXg7Ij48L2Rp dj4KKyAgPGRpdiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImZsZXgiIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjEwMCIgc3R5bGU9ImRpc3BsYXk6IC13ZWJraXQtaW5saW5lLWZsZXg7Ij48L2Rpdj4KICAg PGRpdiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIx MDAiIHN0eWxlPSJkaXNwbGF5OiB0YWJsZS1jZWxsIj48L2Rpdj4KICAgPGRpdiBkYXRhLWV4cGVj dGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIHN0eWxlPSJkaXNw bGF5OiBjb21wYWN0Ij48L2Rpdj4KICAgPGRpdiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2Nr IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIHN0eWxlPSJkaXNwbGF5OiBydW4taW4iPjwvZGl2 PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVt LWRpc3BsYXkuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRl bS1kaXNwbGF5Lmh0bWwKaW5kZXggMDM4MDk5MzBmYjc4MjMwMWM2MTZiYjBhOTVjN2ZjZGVhMmYy Y2EyNS4uNTFiMWNmYzgwNmE0MmEzYTJhN2IxYWYwNWQ0MzM1ZTg1YTkxZTlhNyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLWRpc3BsYXkuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tZGlzcGxh eS5odG1sCkBAIC0zNCw4ICszNCw4IEBACiAgICAgICAgIDxkaXYgZGF0YS1leHBlY3RlZC1kaXNw bGF5PSJibG9jayIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjE1MCIgc3R5bGU9 ImRpc3BsYXk6IGlubGluZS1ibG9jayI+PC9kaXY+CiAKICAgICAgICAgPCEtLSBTb21lIGV4dHJh IHZhbHVlcyB3ZSBzdXBwb3J0LiAtLT4KLSAgICAgICAgPGRpdiBkYXRhLWV4cGVjdGVkLWRpc3Bs YXk9Ii13ZWJraXQtZmxleCIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjE1MCIg c3R5bGU9ImRpc3BsYXk6IC13ZWJraXQtZmxleCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgZGF0YS1l eHBlY3RlZC1kaXNwbGF5PSItd2Via2l0LWZsZXgiIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9m ZnNldC15PSIxNTAiIHN0eWxlPSJkaXNwbGF5OiAtd2Via2l0LWlubGluZS1mbGV4Ij48L2Rpdj4K KyAgICAgICAgPGRpdiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImZsZXgiIGRhdGEtb2Zmc2V0LXg9 IjUwIiBkYXRhLW9mZnNldC15PSIxNTAiIHN0eWxlPSJkaXNwbGF5OiAtd2Via2l0LWZsZXgiPjwv ZGl2PgorICAgICAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iZmxleCIgZGF0YS1vZmZz ZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjE1MCIgc3R5bGU9ImRpc3BsYXk6IC13ZWJraXQtaW5s aW5lLWZsZXgiPjwvZGl2PgogICAgICAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxv Y2siIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIxNTAiIHN0eWxlPSJkaXNwbGF5 OiAtd2Via2l0LWlubGluZS1ibG9jayI+PC9kaXY+CiAgICAgICAgIDxkaXYgZGF0YS1leHBlY3Rl ZC1kaXNwbGF5PSJibG9jayIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjE1MCIg c3R5bGU9ImRpc3BsYXk6IGNvbXBhY3QiPjwvZGl2PgogICAgICAgICA8ZGl2IGRhdGEtZXhwZWN0 ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIxNTAi IHN0eWxlPSJkaXNwbGF5OiBydW4taW4iPjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVj dGVkLnR4dAppbmRleCBjZWYwNTA5YzE2Yjc4NDM1ZGNiMjRkMTNmMGVkMWEyOTkwZWZhZDU0Li44 ZTk1N2MwOWU5MWE1NDIzOTI2MzM4N2VhMjk0ZDgwMGEyYTJlYmZjIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVk LXN0eWxlLWV4cGVjdGVkLnR4dApAQCAtMTQzLDEyICsxNDMsMTIgQEAgem9vbTogMTsKIC13ZWJr aXQtY29sdW1uLXJ1bGUtd2lkdGg6IDBweDsKIC13ZWJraXQtY29sdW1uLXNwYW46IG5vbmU7CiAt d2Via2l0LWNvbHVtbi13aWR0aDogYXV0bzsKLS13ZWJraXQtYWxpZ24tY29udGVudDogc3RyZXRj aDsKLS13ZWJraXQtYWxpZ24taXRlbXM6IHN0cmV0Y2g7Ci0td2Via2l0LWFsaWduLXNlbGY6IHN0 cmV0Y2g7Ci0td2Via2l0LWZsZXgtZGlyZWN0aW9uOiByb3c7Ci0td2Via2l0LWZsZXgtd3JhcDog bm93cmFwOwotLXdlYmtpdC1qdXN0aWZ5LWNvbnRlbnQ6IGZsZXgtc3RhcnQ7CithbGlnbi1jb250 ZW50OiBzdHJldGNoOworYWxpZ24taXRlbXM6IHN0cmV0Y2g7CithbGlnbi1zZWxmOiBzdHJldGNo OworZmxleC1kaXJlY3Rpb246IHJvdzsKK2ZsZXgtd3JhcDogbm93cmFwOworanVzdGlmeS1jb250 ZW50OiBmbGV4LXN0YXJ0OwogLXdlYmtpdC1mb250LWtlcm5pbmc6IGF1dG87CiAtd2Via2l0LWZv bnQtc21vb3RoaW5nOiBhdXRvOwogLXdlYmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmVzOiBub3Jt YWw7CkBAIC0xOTMsNyArMTkzLDcgQEAgem9vbTogMTsKIC13ZWJraXQtbWFzay1yZXBlYXQ6IHJl cGVhdDsKIC13ZWJraXQtbWFzay1zaXplOiBhdXRvOwogLXdlYmtpdC1uYnNwLW1vZGU6IG5vcm1h bDsKLS13ZWJraXQtb3JkZXI6IDA7CitvcmRlcjogMDsKIC13ZWJraXQtcGVyc3BlY3RpdmU6IG5v bmU7CiAtd2Via2l0LXBlcnNwZWN0aXZlLW9yaWdpbjogMzkycHggMjg4cHg7CiAtd2Via2l0LXBy aW50LWNvbG9yLWFkanVzdDogZWNvbm9teTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVk LXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CmluZGV4IDc0ZTkyY2ZjZDk4MzY4 ZDQ2ZDhjZWVmMmZjMDk0ODYxMzllMzE5MjYuLmI0ZDBkYmE1NmVjNmE5MmFiNzQ5OWYwNGUxZWUy MjdjZWQxNGU0MzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVk U3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRo b3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dApAQCAtMTQyLDEyICsxNDIsMTIgQEAgem9vbTogMQog LXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aDogMHB4CiAtd2Via2l0LWNvbHVtbi1zcGFuOiBub25l CiAtd2Via2l0LWNvbHVtbi13aWR0aDogYXV0bwotLXdlYmtpdC1hbGlnbi1jb250ZW50OiBzdHJl dGNoCi0td2Via2l0LWFsaWduLWl0ZW1zOiBzdHJldGNoCi0td2Via2l0LWFsaWduLXNlbGY6IHN0 cmV0Y2gKLS13ZWJraXQtZmxleC1kaXJlY3Rpb246IHJvdwotLXdlYmtpdC1mbGV4LXdyYXA6IG5v d3JhcAotLXdlYmtpdC1qdXN0aWZ5LWNvbnRlbnQ6IGZsZXgtc3RhcnQKK2FsaWduLWNvbnRlbnQ6 IHN0cmV0Y2gKK2FsaWduLWl0ZW1zOiBzdHJldGNoCithbGlnbi1zZWxmOiBzdHJldGNoCitmbGV4 LWRpcmVjdGlvbjogcm93CitmbGV4LXdyYXA6IG5vd3JhcAoranVzdGlmeS1jb250ZW50OiBmbGV4 LXN0YXJ0CiAtd2Via2l0LWZvbnQta2VybmluZzogYXV0bwogLXdlYmtpdC1mb250LXNtb290aGlu ZzogYXV0bwogLXdlYmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmVzOiBub3JtYWwKQEAgLTE5Miw3 ICsxOTIsNyBAQCB6b29tOiAxCiAtd2Via2l0LW1hc2stcmVwZWF0OiByZXBlYXQKIC13ZWJraXQt bWFzay1zaXplOiBhdXRvCiAtd2Via2l0LW5ic3AtbW9kZTogbm9ybWFsCi0td2Via2l0LW9yZGVy OiAwCitvcmRlcjogMAogLXdlYmtpdC1wZXJzcGVjdGl2ZTogbm9uZQogLXdlYmtpdC1wZXJzcGVj dGl2ZS1vcmlnaW46IDUwJSA1MCUKIC13ZWJraXQtcHJpbnQtY29sb3ItYWRqdXN0OiBlY29ub215 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL3Jlc291 cmNlcy9wcm9wZXJ0eS1uYW1lcy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVk U3R5bGUvcmVzb3VyY2VzL3Byb3BlcnR5LW5hbWVzLmpzCmluZGV4IDUyYTE0NTlkMWVhNzIwZGI3 MWE1N2JiYzRmYTMxMDJjZjI3YTVjYWQuLmNiYzI3ZWFjNGY4N2FjMTAzZDQ3YjVmZTg2MDkzZWY5 NmIyYWYzZTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5 bGUvcmVzb3VyY2VzL3Byb3BlcnR5LW5hbWVzLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz L2dldENvbXB1dGVkU3R5bGUvcmVzb3VyY2VzL3Byb3BlcnR5LW5hbWVzLmpzCkBAIC0xLDggKzEs OCBAQAogLy8gV2Ugb25seSB0ZXN0IHByb3BlcnRpZXMgdGhhdCBhcmUgZXhwb3NlZCBpbiBhbGwg cG9ydHMuCiB2YXIgcHJvcGVydGllc1RvVGVzdCA9IHsKLSAgICAiLXdlYmtpdC1hbGlnbi1jb250 ZW50IjogdHJ1ZSwKLSAgICAiLXdlYmtpdC1hbGlnbi1pdGVtcyI6IHRydWUsCi0gICAgIi13ZWJr aXQtYWxpZ24tc2VsZiI6IHRydWUsCisgICAgImFsaWduLWNvbnRlbnQiOiB0cnVlLAorICAgICJh bGlnbi1pdGVtcyI6IHRydWUsCisgICAgImFsaWduLXNlbGYiOiB0cnVlLAogICAgICItd2Via2l0 LWFuaW1hdGlvbi1kZWxheSI6IHRydWUsCiAgICAgIi13ZWJraXQtYW5pbWF0aW9uLWRpcmVjdGlv biI6IHRydWUsCiAgICAgIi13ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uIjogdHJ1ZSwKQEAgLTQ0 LDggKzQ0LDggQEAgdmFyIHByb3BlcnRpZXNUb1Rlc3QgPSB7CiAgICAgIi13ZWJraXQtY29sdW1u LXJ1bGUtd2lkdGgiOiB0cnVlLAogICAgICItd2Via2l0LWNvbHVtbi1zcGFuIjogdHJ1ZSwKICAg ICAiLXdlYmtpdC1jb2x1bW4td2lkdGgiOiB0cnVlLAotICAgICItd2Via2l0LWZsZXgtZGlyZWN0 aW9uIjogdHJ1ZSwKLSAgICAiLXdlYmtpdC1mbGV4LXdyYXAiOiB0cnVlLAorICAgICJmbGV4LWRp cmVjdGlvbiI6IHRydWUsCisgICAgImZsZXgtd3JhcCI6IHRydWUsCiAgICAgIi13ZWJraXQtZm9u dC1rZXJuaW5nIjogdHJ1ZSwKICAgICAiLXdlYmtpdC1mb250LXNtb290aGluZyI6IHRydWUsCiAg ICAgIi13ZWJraXQtZm9udC12YXJpYW50LWxpZ2F0dXJlcyI6IHRydWUsCkBAIC02NCw3ICs2NCw3 IEBAIHZhciBwcm9wZXJ0aWVzVG9UZXN0ID0gewogICAgICItd2Via2l0LWh5cGhlbmF0ZS1saW1p dC1iZWZvcmUiOiB0cnVlLAogICAgICItd2Via2l0LWh5cGhlbmF0ZS1saW1pdC1saW5lcyI6IHRy dWUsCiAgICAgIi13ZWJraXQtaHlwaGVucyI6IHRydWUsCi0gICAgIi13ZWJraXQtanVzdGlmeS1j b250ZW50IjogdHJ1ZSwKKyAgICAianVzdGlmeS1jb250ZW50IjogdHJ1ZSwKICAgICAiLXdlYmtp dC1saW5lLWFsaWduIjogdHJ1ZSwKICAgICAiLXdlYmtpdC1saW5lLWJveC1jb250YWluIjogdHJ1 ZSwKICAgICAiLXdlYmtpdC1saW5lLWJyZWFrIjogdHJ1ZSwKQEAgLTkzLDcgKzkzLDcgQEAgdmFy IHByb3BlcnRpZXNUb1Rlc3QgPSB7CiAgICAgIi13ZWJraXQtbWFzay1yZXBlYXQiOiB0cnVlLAog ICAgICItd2Via2l0LW1hc2stc2l6ZSI6IHRydWUsCiAgICAgIi13ZWJraXQtbmJzcC1tb2RlIjog dHJ1ZSwKLSAgICAiLXdlYmtpdC1vcmRlciI6IHRydWUsCisgICAgIm9yZGVyIjogdHJ1ZSwKICAg ICAiLXdlYmtpdC1wZXJzcGVjdGl2ZSI6IHRydWUsCiAgICAgIi13ZWJraXQtcGVyc3BlY3RpdmUt b3JpZ2luIjogdHJ1ZSwKICAgICAiLXdlYmtpdC1wcmludC1jb2xvci1hZGp1c3QiOiB0cnVlLApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW5oZXJpdC1pbml0aWFsLXNob3J0aGFu ZC12YWx1ZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW5oZXJpdC1pbml0 aWFsLXNob3J0aGFuZC12YWx1ZXMtZXhwZWN0ZWQudHh0CmluZGV4IDI1MTRkOTI1NDFjNDA2YmRk OWM4MjdmZmM0ZmIyZTY2ODlkNmU2OWQuLjViY2FkOGQ0YTg5Yjc1MWViNWRmNTlkZmEwM2YwYzJh ODk0OThiMDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2luaGVyaXQtaW5pdGlh bC1zaG9ydGhhbmQtdmFsdWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9pbmhlcml0LWluaXRpYWwtc2hvcnRoYW5kLXZhbHVlcy1leHBlY3RlZC50eHQKQEAgLTI0LDgg KzI0LDggQEAgUEFTUyB0ZXN0KCd3ZWJraXQtYm9yZGVyLWVuZCcpIGlzICJpbmhlcml0LCBpbml0 aWFsIgogUEFTUyB0ZXN0KCd3ZWJraXQtYm9yZGVyLXN0YXJ0JykgaXMgImluaGVyaXQsIGluaXRp YWwiCiBQQVNTIHRlc3QoJ3dlYmtpdC1jb2x1bW5zJykgaXMgImluaGVyaXQsIGluaXRpYWwiCiBQ QVNTIHRlc3QoJ3dlYmtpdC1jb2x1bW4tcnVsZScpIGlzICJpbmhlcml0LCBpbml0aWFsIgotUEFT UyB0ZXN0KCd3ZWJraXQtZmxleC1mbG93JykgaXMgImluaGVyaXQsIGluaXRpYWwiCi1QQVNTIHRl c3QoJ3dlYmtpdC1mbGV4JykgaXMgImluaGVyaXQsIGluaXRpYWwiCitQQVNTIHRlc3QoJ2ZsZXgt ZmxvdycpIGlzICJpbmhlcml0LCBpbml0aWFsIgorUEFTUyB0ZXN0KCdmbGV4JykgaXMgImluaGVy aXQsIGluaXRpYWwiCiBQQVNTIHRlc3QoJ3dlYmtpdC1tYXJnaW5Db2xsYXBzZScpIGlzICJpbmhl cml0LCBpbml0aWFsIgogUEFTUyB0ZXN0KCd3ZWJraXQtbWFycXVlZScpIGlzICJpbmhlcml0LCBp bml0aWFsIgogUEFTUyB0ZXN0KCd3ZWJraXQtbWFzaycpIGlzICJpbmhlcml0LCBpbml0aWFsIgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW5oZXJpdC1pbml0aWFsLXNob3J0aGFu ZC12YWx1ZXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2luaGVyaXQtaW5pdGlhbC1zaG9y dGhhbmQtdmFsdWVzLmh0bWwKaW5kZXggY2JhZjdlYmQ1NzE4OTQxODYwZWM0NTdhYTIzNDJjNzMy MmI4Y2QyYS4uYjg1ZmRiNmQ2NTlkYWY2M2E4NmY4MWZjMTI0OWZlNTFkMWRjMmM1ZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW5oZXJpdC1pbml0aWFsLXNob3J0aGFuZC12YWx1 ZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbmhlcml0LWluaXRpYWwtc2hvcnRo YW5kLXZhbHVlcy5odG1sCkBAIC00Miw4ICs0Miw4IEBAIHZhciBzaG9ydGhhbmROYW1lcyA9IFsK ICAgICAid2Via2l0LWJvcmRlci1zdGFydCIsCiAgICAgIndlYmtpdC1jb2x1bW5zIiwKICAgICAi d2Via2l0LWNvbHVtbi1ydWxlIiwKLSAgICAid2Via2l0LWZsZXgtZmxvdyIsCi0gICAgIndlYmtp dC1mbGV4IiwKKyAgICAiZmxleC1mbG93IiwKKyAgICAiZmxleCIsCiAgICAgIndlYmtpdC1tYXJn aW5Db2xsYXBzZSIsCiAgICAgIndlYmtpdC1tYXJxdWVlIiwKICAgICAid2Via2l0LW1hc2siLApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1l eHBlY3RlZC50eHQKaW5kZXggMTFhM2I2MzJiMjExYTQwZjIwNzZlMjI0NzlkZGMxNTFiYzk3YWIw Yy4uYmQ5ODNmNzcwOTM2MWY3NGJiYzc1YTIyYTcyYzI1MTNhYzExNGUwYyAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQu dHh0CkBAIC0yODQsMTggKzI4NCwxOCBAQCByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13 ZWJraXQtY29sdW1uLXNwYW4pIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1 ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1dG8KIHJl Y3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogW29i amVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdl YmtpdC1hbGlnbi1jb250ZW50KSA6IHN0cmV0Y2gKLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NT VmFsdWUoLXdlYmtpdC1hbGlnbi1jb250ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVd Ci1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYWxpZ24taXRlbXMpIDogc3Ry ZXRjaAotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWFsaWduLWl0ZW1z KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZh bHVlKC13ZWJraXQtYWxpZ24tc2VsZikgOiBzdHJldGNoCi1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0 eUNTU1ZhbHVlKC13ZWJraXQtYWxpZ24tc2VsZikgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVl XQotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWZsZXgtZGlyZWN0aW9uKSA6 IHJvdwotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWZsZXgtZGlyZWN0 aW9uKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKC13ZWJraXQtZmxleC13cmFwKSA6IG5vd3JhcAotcmVjdDogc3R5bGUuZ2V0UHJvcGVy dHlDU1NWYWx1ZSgtd2Via2l0LWZsZXgtd3JhcCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVl XQotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWp1c3RpZnktY29udGVudCkg OiBmbGV4LXN0YXJ0Ci1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtanVz dGlmeS1jb250ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCityZWN0OiBzdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKGFsaWduLWNvbnRlbnQpIDogc3RyZXRjaAorcmVjdDogc3R5bGUuZ2V0 UHJvcGVydHlDU1NWYWx1ZShhbGlnbi1jb250ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFs dWVdCityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGFsaWduLWl0ZW1zKSA6IHN0cmV0Y2gK K3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYWxpZ24taXRlbXMpIDogW29iamVjdCBD U1NQcmltaXRpdmVWYWx1ZV0KK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYWxpZ24tc2Vs ZikgOiBzdHJldGNoCityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGFsaWduLXNlbGYp IDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFs dWUoZmxleC1kaXJlY3Rpb24pIDogcm93CityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KGZsZXgtZGlyZWN0aW9uKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCityZWN0OiBzdHls ZS5nZXRQcm9wZXJ0eVZhbHVlKGZsZXgtd3JhcCkgOiBub3dyYXAKK3JlY3Q6IHN0eWxlLmdldFBy b3BlcnR5Q1NTVmFsdWUoZmxleC13cmFwKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCity ZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGp1c3RpZnktY29udGVudCkgOiBmbGV4LXN0YXJ0 CityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGp1c3RpZnktY29udGVudCkgOiBbb2Jq ZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Vi a2l0LWZvbnQta2VybmluZykgOiBhdXRvCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KC13ZWJraXQtZm9udC1rZXJuaW5nKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtZm9udC1zbW9vdGhpbmcpIDogYXV0bwpA QCAtMzg0LDggKzM4NCw4IEBAIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1t YXNrLXNpemUpIDogYXV0bwogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0 LW1hc2stc2l6ZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZSgtd2Via2l0LW5ic3AtbW9kZSkgOiBub3JtYWwKIHJlY3Q6IHN0eWxlLmdl dFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1uYnNwLW1vZGUpIDogW29iamVjdCBDU1NQcmltaXRp dmVWYWx1ZV0KLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1vcmRlcikgOiAw Ci1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtb3JkZXIpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUob3JkZXIp IDogMAorcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShvcmRlcikgOiBbb2JqZWN0IENT U1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LXBl cnNwZWN0aXZlKSA6IG5vbmUKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtp dC1wZXJzcGVjdGl2ZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUu Z2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LXBlcnNwZWN0aXZlLW9yaWdpbikgOiAwcHggMHB4CkBA IC03OTYsMTggKzc5NiwxOCBAQCBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29s dW1uLXNwYW4pIDogbm9uZQogZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNv bHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9w ZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1dG8KIGc6IHN0eWxlLmdldFByb3Bl cnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogW29iamVjdCBDU1NQcmltaXRpdmVW YWx1ZV0KLWc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1hbGlnbi1jb250ZW50KSA6 IHN0cmV0Y2gKLWc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1hbGlnbi1jb250 ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1nOiBzdHlsZS5nZXRQcm9wZXJ0eVZh bHVlKC13ZWJraXQtYWxpZ24taXRlbXMpIDogc3RyZXRjaAotZzogc3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgtd2Via2l0LWFsaWduLWl0ZW1zKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVd Ci1nOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYWxpZ24tc2VsZikgOiBzdHJldGNo Ci1nOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYWxpZ24tc2VsZikgOiBbb2Jq ZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQotZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0 LWZsZXgtZGlyZWN0aW9uKSA6IHJvdwotZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Vi a2l0LWZsZXgtZGlyZWN0aW9uKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1nOiBzdHls ZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtZmxleC13cmFwKSA6IG5vd3JhcAotZzogc3R5bGUu Z2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWZsZXgtd3JhcCkgOiBbb2JqZWN0IENTU1ByaW1p dGl2ZVZhbHVlXQotZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWp1c3RpZnktY29u dGVudCkgOiBmbGV4LXN0YXJ0Ci1nOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQt anVzdGlmeS1jb250ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCitnOiBzdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKGFsaWduLWNvbnRlbnQpIDogc3RyZXRjaAorZzogc3R5bGUuZ2V0UHJv cGVydHlDU1NWYWx1ZShhbGlnbi1jb250ZW50KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVd CitnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGFsaWduLWl0ZW1zKSA6IHN0cmV0Y2gKK2c6IHN0 eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYWxpZ24taXRlbXMpIDogW29iamVjdCBDU1NQcmltaXRp dmVWYWx1ZV0KK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYWxpZ24tc2VsZikgOiBzdHJldGNo CitnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGFsaWduLXNlbGYpIDogW29iamVjdCBDU1NQ cmltaXRpdmVWYWx1ZV0KK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoZmxleC1kaXJlY3Rpb24p IDogcm93CitnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGZsZXgtZGlyZWN0aW9uKSA6IFtv YmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCitnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGZsZXgt d3JhcCkgOiBub3dyYXAKK2c6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoZmxleC13cmFwKSA6 IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCitnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGp1 c3RpZnktY29udGVudCkgOiBmbGV4LXN0YXJ0CitnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KGp1c3RpZnktY29udGVudCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUu Z2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWZvbnQta2VybmluZykgOiBhdXRvCiBnOiBzdHlsZS5n ZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtZm9udC1rZXJuaW5nKSA6IFtvYmplY3QgQ1NTUHJp bWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtZm9udC1zbW9v dGhpbmcpIDogYXV0bwpAQCAtODk2LDggKzg5Niw4IEBAIGc6IHN0eWxlLmdldFByb3BlcnR5VmFs dWUoLXdlYmtpdC1tYXNrLXNpemUpIDogYXV0bwogZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1 ZSgtd2Via2l0LW1hc2stc2l6ZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5 bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LW5ic3AtbW9kZSkgOiBub3JtYWwKIGc6IHN0eWxl LmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1uYnNwLW1vZGUpIDogW29iamVjdCBDU1NQcmlt aXRpdmVWYWx1ZV0KLWc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1vcmRlcikgOiAw Ci1nOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtb3JkZXIpIDogW29iamVjdCBD U1NQcmltaXRpdmVWYWx1ZV0KK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUob3JkZXIpIDogMAor Zzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShvcmRlcikgOiBbb2JqZWN0IENTU1ByaW1pdGl2 ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LXBlcnNwZWN0aXZlKSA6 IG5vbmUKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1wZXJzcGVjdGl2ZSkg OiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgt d2Via2l0LXBlcnNwZWN0aXZlLW9yaWdpbikgOiAwcHggMHB4CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy90cmFuc2l0aW9ucy9mbGV4LXRyYW5zaXRpb25zLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3RyYW5zaXRpb25zL2ZsZXgtdHJhbnNpdGlvbnMtZXhwZWN0ZWQudHh0CmluZGV4IDlhYTE1 NTIyMTg5ZjkwN2YwYTQwN2NkY2ZjMDRiOTNkZGQ0NzU5MTQuLjQ3ZmE3ODhhZDJhMGQ2ZDZmYWI2 ZTlmM2M0YjAyNGZkNzFiMWM3ODggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3RyYW5zaXRpb25z L2ZsZXgtdHJhbnNpdGlvbnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3RyYW5zaXRp b25zL2ZsZXgtdHJhbnNpdGlvbnMtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAotUEFTUyAt ICItd2Via2l0LWZsZXgiIHByb3BlcnR5IGZvciAicm93MSIgZWxlbWVudCBhdCAwLjVzIHNhdyBz b21ldGhpbmcgY2xvc2UgdG86IDIsMCwwCi1QQVNTIC0gIi13ZWJraXQtZmxleCIgcHJvcGVydHkg Zm9yICJjb2x1bW4xIiBlbGVtZW50IGF0IDAuNXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzogMC41 LDAsMTAKLVBBU1MgLSAiLXdlYmtpdC1mbGV4IiBwcm9wZXJ0eSBmb3IgIm5lZ2F0aXZlMSIgZWxl bWVudCBhdCAwLjVzIHNhdyBzb21ldGhpbmcgY2xvc2UgdG86IDEsMC41LDc1Ci1QQVNTIC0gIi13 ZWJraXQtZmxleCIgcHJvcGVydHkgZm9yICJuby1mbGV4MSIgZWxlbWVudCBhdCAwLjVzIHNhdyBz b21ldGhpbmcgY2xvc2UgdG86IDAuNSwwLDAKK1BBU1MgLSAiZmxleCIgcHJvcGVydHkgZm9yICJy b3cxIiBlbGVtZW50IGF0IDAuNXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzogMiwwLDAKK1BBU1Mg LSAiZmxleCIgcHJvcGVydHkgZm9yICJjb2x1bW4xIiBlbGVtZW50IGF0IDAuNXMgc2F3IHNvbWV0 aGluZyBjbG9zZSB0bzogMC41LDAsMTAKK1BBU1MgLSAiZmxleCIgcHJvcGVydHkgZm9yICJuZWdh dGl2ZTEiIGVsZW1lbnQgYXQgMC41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRvOiAxLDAuNSw3NQor UEFTUyAtICJmbGV4IiBwcm9wZXJ0eSBmb3IgIm5vLWZsZXgxIiBlbGVtZW50IGF0IDAuNXMgc2F3 IHNvbWV0aGluZyBjbG9zZSB0bzogMC41LDAsMAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90 cmFuc2l0aW9ucy9mbGV4LXRyYW5zaXRpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy90cmFuc2l0aW9u cy9mbGV4LXRyYW5zaXRpb25zLmh0bWwKaW5kZXggZGZkMjQyYTVhNzAzYmY5MjIxMjk0NjEyMGUx YWQ1MzQ3YjcwYTM5ZS4uNjFmNDU2YWNlOTE3MzBlN2IyNGNmZjZjNTQxOGY3MjA1ZDc1M2NkNyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvZmxleC10cmFuc2l0aW9ucy5odG1s CisrKyBiL0xheW91dFRlc3RzL3RyYW5zaXRpb25zL2ZsZXgtdHJhbnNpdGlvbnMuaHRtbApAQCAt MjAsMjcgKzIwLDI3IEBACiB9CiAKICNmbGV4LXJvdyBkaXYgewotICAgIC13ZWJraXQtZmxleDog MSAwIDBweDsKKyAgICBmbGV4OiAxIDAgMHB4OwogfQogLmZpbmFsICNyb3cxIHsKLSAgICAtd2Vi a2l0LWZsZXg6IDMgMCAwcHg7CisgICAgZmxleDogMyAwIDBweDsKIH0KIAogI2ZsZXgtY29sdW1u IHsKLSAgICAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiBjb2x1bW47CisgICAgZmxleC1kaXJlY3Rp b246IGNvbHVtbjsKIH0KICNmbGV4LWNvbHVtbiBkaXYgewotICAgIC13ZWJraXQtZmxleDogMSAw IDBweDsKKyAgICBmbGV4OiAxIDAgMHB4OwogfQogLmZpbmFsICNjb2x1bW4xIHsKLSAgICAtd2Vi a2l0LWZsZXg6IDAgMCAyMHB4OworICAgIGZsZXg6IDAgMCAyMHB4OwogfQogCiAjZmxleC1uZWdh dGl2ZSBkaXYgewotICAgIC13ZWJraXQtZmxleDogMSAxIDUwcHg7CisgICAgZmxleDogMSAxIDUw cHg7CiB9CiAuZmluYWwgI25lZ2F0aXZlMSB7Ci0gICAgLXdlYmtpdC1mbGV4OiAxIDEwMHB4Owor ICAgIGZsZXg6IDEgMTAwcHg7CiB9CiAKICNmbGV4LW5vLWZsZXggZGl2IHsKQEAgLTU2LDEwICs1 NiwxMCBAQAogCiAgICAgY29uc3QgZXhwZWN0ZWRWYWx1ZXMgPSBbCiAgICAgICAvLyBbdGltZSwg ZWxlbWVudC1pZCwgcHJvcGVydHksIGV4cGVjdGVkLXZhbHVlLCB0b2xlcmFuY2VdCi0gICAgICBb MC41LCAncm93MScsICctd2Via2l0LWZsZXgnLCBbMiwgMCwgMF0sIC41XSwKLSAgICAgIFswLjUs ICdjb2x1bW4xJywgJy13ZWJraXQtZmxleCcsIFsuNSwgMCwgMTBdLCAzXSwKLSAgICAgIFswLjUs ICduZWdhdGl2ZTEnLCAnLXdlYmtpdC1mbGV4JywgWzEsIC41LCA3NV0sIDNdLAotICAgICAgWzAu NSwgJ25vLWZsZXgxJywgJy13ZWJraXQtZmxleCcsIFsuNSwgMCwgMF0sIC40XSwKKyAgICAgIFsw LjUsICdyb3cxJywgJ2ZsZXgnLCBbMiwgMCwgMF0sIC41XSwKKyAgICAgIFswLjUsICdjb2x1bW4x JywgJ2ZsZXgnLCBbLjUsIDAsIDEwXSwgM10sCisgICAgICBbMC41LCAnbmVnYXRpdmUxJywgJ2Zs ZXgnLCBbMSwgLjUsIDc1XSwgM10sCisgICAgICBbMC41LCAnbm8tZmxleDEnLCAnZmxleCcsIFsu NSwgMCwgMF0sIC40XSwKICAgICBdOwogCiAgICAgZnVuY3Rpb24gc2V0dXBUZXN0KCkK