134926 2014-07-15 10:03:23 -0700 CSP: Drop 'script-nonce' directive. 2014-07-16 13:31:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116508 1 mkwst mkwst ap commit-queue esprehn+autocc kangil.han rniwa oldest_to_newest 1022496 0 mkwst 2014-07-15 10:03:23 -0700 This directive was dropped from the CSP2 draft, and replaced with different syntax as part of the 'script-src' directive[1]. I'd recommend removing the implementation to ensure no one ends up relying on it. [1]: https://w3c.github.io/webappsec/specs/content-security-policy/#directive-script-src 1022499 1 234933 mkwst 2014-07-15 10:11:07 -0700 Created attachment 234933 Patch 1022653 2 mkwst 2014-07-15 21:08:45 -0700 Alexey, would you mind taking a look at this patch? I'd like to start getting rid of some of the old, old CSP 1.1 implementation in WebKit now that CSP2 has hit Last Call[1]. I'm not sure I'll have time to implement the new bits, but I certainly want to make sure the old bits don't get in the way. CCing Ryosuke as well, as he filed the bug this blocks. [1]: http://www.w3.org/TR/CSP2/ 1022807 3 234933 mkwst 2014-07-16 12:59:40 -0700 Comment on attachment 234933 Patch Thanks, Darin. 1022809 4 234933 commit-queue 2014-07-16 13:31:33 -0700 Comment on attachment 234933 Patch Clearing flags on attachment: 234933 Committed r171150: <http://trac.webkit.org/changeset/171150> 1022810 5 commit-queue 2014-07-16 13:31:37 -0700 All reviewed patches have been landed. Closing bug. 234933 2014-07-15 10:11:07 -0700 2014-07-16 13:31:33 -0700 Patch bug-134926-20140715191052.patch text/plain 30980 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWYxM2JlZWNkMTEyY2Vh ZWEwOWFmMmVmNjUyNjQwZWJmZTVmNjZjMC4uYzI5YTU0ZTUxZTNhODkxYjZkMDViMDc2ODg1ZGVm YTI1ZDA4YjRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTA3LTE1ICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQOiBEcm9wICdzY3JpcHQt bm9uY2UnIGRpcmVjdGl2ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDkyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgcGF0Y2ggZHJvcHMgdGhlIG91dGRhdGVkICdzY3JpcHQtbm9uY2UnIENv bnRlbnQgU2VjdXJpdHkKKyAgICAgICAgUG9saWN5IGRpcmVjdGl2ZS4gSXQgd2FzIHJlbW92ZWQg ZnJvbSB0aGUgc3BlYywgYW5kIHJlcGxhY2VkIGluCisgICAgICAgIENTUDIgd2l0aCBhIG5ldyAn c2NyaXB0LXNyYycgc3ludGF4LiBXZSBzaG91bGQgaW1wbGVtZW50IHRoYXQKKyAgICAgICAgaW5z dGVhZC4KKworICAgICAgICBVbnRpbCB0aGVuLCByZW1vdmluZyB0aGUgb3V0ZGF0ZWQgc3ludGF4 IHdpbGwgZW5zdXJlIHRoYXQgbm8gb25lCisgICAgICAgIGVuZHMgdXAgcmVseWluZyBvbiBpdCBp biBXZWJLaXQncyBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICBUaGlzIHNob3VsZCBoYXZlIGxp bWl0ZWQgd2ViLXZpc2libGUgaW1wYWN0LCBhcyB0aGUgZmVhdHVyZSBpcworICAgICAgICBiZWhp bmQgdGhlIENTUF9ORVhUIGZsYWcsIHdoaWNoIGlzIG5vdCBlbmFibGVkIGJ5IGRlZmF1bHQuCisK KyAgICAgICAgKiBkb20vU2NyaXB0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jp cHRFbGVtZW50OjpyZXF1ZXN0U2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEVsZW1l bnQ6OmV4ZWN1dGVTY3JpcHQpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFsbG93SmF2YVNjcmlw dFVSTHMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NQRGlyZWN0aXZlTGlzdDo6YWxsb3dJbmxpbmVF dmVudEhhbmRsZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFkZERp cmVjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpOb25jZURpcmVjdGl2ZTo6Tm9uY2VEaXJlY3Rp dmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Tm9uY2VEaXJlY3RpdmU6OmFsbG93cyk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpOb25jZURpcmVjdGl2ZTo6cGFyc2UpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6Q1NQRGlyZWN0aXZlTGlzdDo6Y2hlY2tOb25jZSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDU1BEaXJlY3RpdmVMaXN0OjpjaGVja05vbmNlQW5k UmVwb3J0VmlvbGF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2 ZUxpc3Q6OmFsbG93U2NyaXB0Tm9uY2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6aXNB bGxvd2VkQnlBbGxXaXRoTm9uY2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dFNlY3VyaXR5UG9saWN5OjphbGxvd1NjcmlwdE5vbmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0SW52YWxpZE5vbmNlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oOgorCiAyMDE0LTA3LTE1 ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O IChyMTU1OTU3KTogSW52YWxpZCBjYXN0IGluIFdlYkNvcmU6OlJlbmRlck5hbWVkRmxvd1RocmVh ZDo6Z2V0UmFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RWxlbWVudC5jcHAKaW5kZXggMjA0N2Fl Mzg5OWM0YWU5ODYyNDE1YzQ5NmU3MzYxNjhkY2UzOTc2Yi4uNzJjN2NkMDJlMzM3YWM3NTI5Mjk2 ZDM1NGM5N2ZjYjI5MTg0ZWZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1Njcmlw dEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50LmNwcApA QCAtMjQ3LDggKzI0Nyw2IEBAIGJvb2wgU2NyaXB0RWxlbWVudDo6cmVxdWVzdFNjcmlwdChjb25z dCBTdHJpbmcmIHNvdXJjZVVybCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghbV9l bGVtZW50LmluRG9jdW1lbnQoKSB8fCAmbV9lbGVtZW50LmRvY3VtZW50KCkgIT0gJm9yaWdpbmFs RG9jdW1lbnQuZ2V0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIW1fZWxlbWVu dC5kb2N1bWVudCgpLmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd1NjcmlwdE5vbmNlKG1f ZWxlbWVudC5mYXN0R2V0QXR0cmlidXRlKEhUTUxOYW1lczo6bm9uY2VBdHRyKSwgbV9lbGVtZW50 LmRvY3VtZW50KCkudXJsKCksIG1fc3RhcnRMaW5lTnVtYmVyLCBtX2VsZW1lbnQuZG9jdW1lbnQo KS5jb21wbGV0ZVVSTChzb3VyY2VVcmwpKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg QVNTRVJUKCFtX2NhY2hlZFNjcmlwdCk7CiAgICAgaWYgKCFzdHJpcExlYWRpbmdBbmRUcmFpbGlu Z0hUTUxTcGFjZXMoc291cmNlVXJsKS5pc0VtcHR5KCkpIHsKQEAgLTI4Miw5ICsyODAsNiBAQCB2 b2lkIFNjcmlwdEVsZW1lbnQ6OmV4ZWN1dGVTY3JpcHQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYg c291cmNlQ29kZSkKICAgICBpZiAoc291cmNlQ29kZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGlmICghbV9lbGVtZW50LmRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5UG9saWN5 KCktPmFsbG93U2NyaXB0Tm9uY2UobV9lbGVtZW50LmZhc3RHZXRBdHRyaWJ1dGUoSFRNTE5hbWVz Ojpub25jZUF0dHIpLCBtX2VsZW1lbnQuZG9jdW1lbnQoKS51cmwoKSwgbV9zdGFydExpbmVOdW1i ZXIpKQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAoIW1faXNFeHRlcm5hbFNjcmlwdCAmJiAh bV9lbGVtZW50LmRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5UG9saWN5KCktPmFsbG93SW5saW5l U2NyaXB0KG1fZWxlbWVudC5kb2N1bWVudCgpLnVybCgpLCBtX3N0YXJ0TGluZU51bWJlcikpCiAg ICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50 U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQ b2xpY3kuY3BwCmluZGV4IGYwYTljZWExYzdlZDRkN2RiNzAxYzU5YjgwODEyZGYzY2MwYjgzMjUu LjU0NmY2ZDIxNmZmNDhkODJhMDUzYTkxNmE2YjgzYmMyZjIyNDQ1N2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTY3LDExICs2Nyw2IEBA IGJvb2wgaXNEaXJlY3RpdmVWYWx1ZUNoYXJhY3RlcihVQ2hhciBjKQogICAgIHJldHVybiBpc0FT Q0lJU3BhY2UoYykgfHwgKGMgPj0gMHgyMSAmJiBjIDw9IDB4N2UpOyAvLyBXaGl0ZXNwYWNlICsg VkNIQVIKIH0KIAotYm9vbCBpc05vbmNlQ2hhcmFjdGVyKFVDaGFyIGMpCi17Ci0gICAgcmV0dXJu IChjID49IDB4MjEgJiYgYyA8PSAweDdlKSAmJiBjICE9ICcsJyAmJiBjICE9ICc7JzsgLy8gVkNI QVIgLSAnLCcgLSAnOycKLX0KLQogYm9vbCBpc1NvdXJjZUNoYXJhY3RlcihVQ2hhciBjKQogewog ICAgIHJldHVybiAhaXNBU0NJSVNwYWNlKGMpOwpAQCAtMTI0LDcgKzExOSw2IEBAIHN0YXRpYyBj b25zdCBjaGFyIHN0eWxlU3JjW10gPSAic3R5bGUtc3JjIjsKIHN0YXRpYyBjb25zdCBjaGFyIGJh c2VVUklbXSA9ICJiYXNlLXVyaSI7CiBzdGF0aWMgY29uc3QgY2hhciBmb3JtQWN0aW9uW10gPSAi Zm9ybS1hY3Rpb24iOwogc3RhdGljIGNvbnN0IGNoYXIgcGx1Z2luVHlwZXNbXSA9ICJwbHVnaW4t dHlwZXMiOwotc3RhdGljIGNvbnN0IGNoYXIgc2NyaXB0Tm9uY2VbXSA9ICJzY3JpcHQtbm9uY2Ui OwogI2lmIEVOQUJMRShDU1BfTkVYVCkKIHN0YXRpYyBjb25zdCBjaGFyIHJlZmxlY3RlZFhTU1td ID0gInJlZmxlY3RlZC14c3MiOwogI2VuZGlmCkBAIC0xNDYsNyArMTQwLDYgQEAgYm9vbCBpc0Rp cmVjdGl2ZU5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5n Q2FzZShuYW1lLCBiYXNlVVJJKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBm b3JtQWN0aW9uKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBwbHVnaW5UeXBl cykKLSAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgc2NyaXB0Tm9uY2UpCiAgICAg ICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHJlZmxlY3RlZFhTUykKICNlbmRpZgogICAg ICk7CkBAIC02NjQsNTEgKzY1Nyw2IEBAIHByaXZhdGU6CiAgICAgQ29udGVudFNlY3VyaXR5UG9s aWN5KiBtX3BvbGljeTsKIH07CiAKLWNsYXNzIE5vbmNlRGlyZWN0aXZlIDogcHVibGljIENTUERp cmVjdGl2ZSB7Ci1wdWJsaWM6Ci0gICAgTm9uY2VEaXJlY3RpdmUoY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBDb250ZW50U2VjdXJpdHlQb2xpY3kqIHBvbGljeSkKLSAg ICAgICAgOiBDU1BEaXJlY3RpdmUobmFtZSwgdmFsdWUsIHBvbGljeSkKLSAgICB7Ci0gICAgICAg IHBhcnNlKHZhbHVlKTsKLSAgICB9Ci0KLSAgICBib29sIGFsbG93cyhjb25zdCBTdHJpbmcmIG5v bmNlKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuICghbV9zY3JpcHROb25jZS5pc0VtcHR5 KCkgJiYgbm9uY2Uuc3RyaXBXaGl0ZVNwYWNlKCkgPT0gbV9zY3JpcHROb25jZSk7Ci0gICAgfQot Ci1wcml2YXRlOgotICAgIHZvaWQgcGFyc2UoY29uc3QgU3RyaW5nJiB2YWx1ZSkKLSAgICB7Ci0g ICAgICAgIFN0cmluZyBub25jZTsKLSAgICAgICAgYXV0byBjaGFyYWN0ZXJzID0gU3RyaW5nVmll dyh2YWx1ZSkudXBjb252ZXJ0ZWRDaGFyYWN0ZXJzKCk7Ci0gICAgICAgIGNvbnN0IFVDaGFyKiBw b3NpdGlvbiA9IGNoYXJhY3RlcnM7Ci0gICAgICAgIGNvbnN0IFVDaGFyKiBlbmQgPSBwb3NpdGlv biArIHZhbHVlLmxlbmd0aCgpOwotCi0gICAgICAgIHNraXBXaGlsZTxpc0FTQ0lJU3BhY2U+KHBv c2l0aW9uLCBlbmQpOwotICAgICAgICBjb25zdCBVQ2hhciogbm9uY2VCZWdpbiA9IHBvc2l0aW9u OwotICAgICAgICBpZiAocG9zaXRpb24gPT0gZW5kKSB7Ci0gICAgICAgICAgICBwb2xpY3koKS0+ cmVwb3J0SW52YWxpZE5vbmNlKFN0cmluZygpKTsKLSAgICAgICAgICAgIG1fc2NyaXB0Tm9uY2Ug PSAiIjsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBza2lwV2hpbGU8 aXNOb25jZUNoYXJhY3Rlcj4ocG9zaXRpb24sIGVuZCk7Ci0gICAgICAgIGlmIChub25jZUJlZ2lu IDwgcG9zaXRpb24pCi0gICAgICAgICAgICBub25jZSA9IFN0cmluZyhub25jZUJlZ2luLCBwb3Np dGlvbiAtIG5vbmNlQmVnaW4pOwotCi0gICAgICAgIC8vIFRyaW0gb2ZmIHRyYWlsaW5nIHdoaXRl c3BhY2U6IElmIHdlJ3JlIG5vdCBhdCB0aGUgZW5kIG9mIHRoZSBzdHJpbmcsIGxvZwotICAgICAg ICAvLyBhbiBlcnJvci4KLSAgICAgICAgc2tpcFdoaWxlPGlzQVNDSUlTcGFjZT4ocG9zaXRpb24s IGVuZCk7Ci0gICAgICAgIGlmIChwb3NpdGlvbiA8IGVuZCkgewotICAgICAgICAgICAgcG9saWN5 KCktPnJlcG9ydEludmFsaWROb25jZSh2YWx1ZSk7Ci0gICAgICAgICAgICBtX3NjcmlwdE5vbmNl ID0gIiI7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgbV9zY3JpcHROb25jZSA9IG5vbmNl OwotICAgIH0KLQotICAgIFN0cmluZyBtX3NjcmlwdE5vbmNlOwotfTsKLQogY2xhc3MgTWVkaWFM aXN0RGlyZWN0aXZlIDogcHVibGljIENTUERpcmVjdGl2ZSB7CiBwdWJsaWM6CiAgICAgTWVkaWFM aXN0RGlyZWN0aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgQ29u dGVudFNlY3VyaXR5UG9saWN5KiBwb2xpY3kpCkBAIC04MjEsNyArNzY5LDYgQEAgcHVibGljOgog ICAgIGJvb2wgYWxsb3dJbmxpbmVTY3JpcHQoY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25z dCBXVEY6Ok9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OlJlcG9ydGluZ1N0YXR1cykgY29uc3Q7CiAgICAgYm9vbCBhbGxvd0lubGluZVN0eWxlKGNvbnN0 IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGlu ZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnRpbmdTdGF0dXMpIGNvbnN0OwogICAgIGJv b2wgYWxsb3dFdmFsKEpTQzo6RXhlY1N0YXRlKiwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBv cnRpbmdTdGF0dXMpIGNvbnN0OwotICAgIGJvb2wgYWxsb3dTY3JpcHROb25jZShjb25zdCBTdHJp bmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IFdURjo6T3JkaW5hbE51 bWJlciYgY29udGV4dExpbmUsIGNvbnN0IFVSTCYpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dQbHVn aW5UeXBlKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiB0eXBlQXR0cmlidXRlLCBj b25zdCBVUkwmLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydGluZ1N0YXR1cykgY29uc3Q7 CiAKICAgICBib29sIGFsbG93U2NyaXB0RnJvbVNvdXJjZShjb25zdCBVUkwmLCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OlJlcG9ydGluZ1N0YXR1cykgY29uc3Q7CkBAIC04NDYsNyArNzkzLDYgQEAg cHJpdmF0ZToKIAogICAgIGJvb2wgcGFyc2VEaXJlY3RpdmUoY29uc3QgVUNoYXIqIGJlZ2luLCBj b25zdCBVQ2hhciogZW5kLCBTdHJpbmcmIG5hbWUsIFN0cmluZyYgdmFsdWUpOwogICAgIHZvaWQg cGFyc2VSZXBvcnRVUkkoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsK LSAgICB2b2lkIHBhcnNlU2NyaXB0Tm9uY2UoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJp bmcmIHZhbHVlKTsKICAgICB2b2lkIHBhcnNlUGx1Z2luVHlwZXMoY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKICAgICB2b2lkIHBhcnNlUmVmbGVjdGVkWFNTKGNvbnN0 IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBhZGREaXJlY3Rp dmUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKQEAgLTg2MCw3ICs4 MDYsNiBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBjaGVja0V2YWwoU291cmNlTGlzdERpcmVjdGl2 ZSopIGNvbnN0OwogICAgIGJvb2wgY2hlY2tJbmxpbmUoU291cmNlTGlzdERpcmVjdGl2ZSopIGNv bnN0OwotICAgIGJvb2wgY2hlY2tOb25jZShOb25jZURpcmVjdGl2ZSosIGNvbnN0IFN0cmluZyYp IGNvbnN0OwogICAgIGJvb2wgY2hlY2tTb3VyY2UoU291cmNlTGlzdERpcmVjdGl2ZSosIGNvbnN0 IFVSTCYpIGNvbnN0OwogICAgIGJvb2wgY2hlY2tNZWRpYVR5cGUoTWVkaWFMaXN0RGlyZWN0aXZl KiwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIHR5cGVBdHRyaWJ1dGUpIGNvbnN0 OwogCkBAIC04NjgsNyArODEzLDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgY2hlY2tFdmFsQW5k UmVwb3J0VmlvbGF0aW9uKFNvdXJjZUxpc3REaXJlY3RpdmUqLCBjb25zdCBTdHJpbmcmIGNvbnNv bGVNZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwgPSBTdHJpbmcoKSwgY29uc3QgV1RG OjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSA9IFdURjo6T3JkaW5hbE51bWJlcjo6YmVmb3Jl Rmlyc3QoKSwgSlNDOjpFeGVjU3RhdGUqID0gMCkgY29uc3Q7CiAgICAgYm9vbCBjaGVja0lubGlu ZUFuZFJlcG9ydFZpb2xhdGlvbihTb3VyY2VMaXN0RGlyZWN0aXZlKiwgY29uc3QgU3RyaW5nJiBj b25zb2xlTWVzc2FnZSwgY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBXVEY6Ok9yZGlu YWxOdW1iZXImIGNvbnRleHRMaW5lLCBib29sIGlzU2NyaXB0KSBjb25zdDsKLSAgICBib29sIGNo ZWNrTm9uY2VBbmRSZXBvcnRWaW9sYXRpb24oTm9uY2VEaXJlY3RpdmUqLCBjb25zdCBTdHJpbmcm IG5vbmNlLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlLCBjb25zdCBTdHJpbmcmIGNvbnRl eHRVUkwsIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUpIGNvbnN0OwogCiAg ICAgYm9vbCBjaGVja1NvdXJjZUFuZFJlcG9ydFZpb2xhdGlvbihTb3VyY2VMaXN0RGlyZWN0aXZl KiwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVEaXJlY3RpdmUpIGNvbnN0Owog ICAgIGJvb2wgY2hlY2tNZWRpYVR5cGVBbmRSZXBvcnRWaW9sYXRpb24oTWVkaWFMaXN0RGlyZWN0 aXZlKiwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIHR5cGVBdHRyaWJ1dGUsIGNv bnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2UpIGNvbnN0OwpAQCAtODg1LDcgKzgyOSw2IEBAIHBy aXZhdGU6CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZWZsZWN0ZWRYU1NEaXNwb3NpdGlv biBtX3JlZmxlY3RlZFhTU0Rpc3Bvc2l0aW9uOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPE1lZGlh TGlzdERpcmVjdGl2ZT4gbV9wbHVnaW5UeXBlczsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8Tm9uY2VE aXJlY3RpdmU+IG1fc2NyaXB0Tm9uY2U7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFNvdXJjZUxpc3RE aXJlY3RpdmU+IG1fYmFzZVVSSTsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U291cmNlTGlzdERpcmVj dGl2ZT4gbV9jb25uZWN0U3JjOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxTb3VyY2VMaXN0RGlyZWN0 aXZlPiBtX2RlZmF1bHRTcmM7CkBAIC05NDUsMTEgKzg4OCw2IEBAIGJvb2wgQ1NQRGlyZWN0aXZl TGlzdDo6Y2hlY2tJbmxpbmUoU291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aXZlKSBjb25zdAog ICAgIHJldHVybiAhZGlyZWN0aXZlIHx8IGRpcmVjdGl2ZS0+YWxsb3dJbmxpbmUoKTsKIH0KIAot Ym9vbCBDU1BEaXJlY3RpdmVMaXN0OjpjaGVja05vbmNlKE5vbmNlRGlyZWN0aXZlKiBkaXJlY3Rp dmUsIGNvbnN0IFN0cmluZyYgbm9uY2UpIGNvbnN0Ci17Ci0gICAgcmV0dXJuICFkaXJlY3RpdmUg fHwgZGlyZWN0aXZlLT5hbGxvd3Mobm9uY2UpOwotfQotCiBib29sIENTUERpcmVjdGl2ZUxpc3Q6 OmNoZWNrU291cmNlKFNvdXJjZUxpc3REaXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgVVJMJiB1 cmwpIGNvbnN0CiB7CiAgICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxvd3Mo dXJsKTsKQEAgLTk4NiwxNCArOTI0LDYgQEAgYm9vbCBDU1BEaXJlY3RpdmVMaXN0OjpjaGVja0V2 YWxBbmRSZXBvcnRWaW9sYXRpb24oU291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aXYKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBDU1BEaXJlY3RpdmVMaXN0OjpjaGVja05vbmNlQW5kUmVw b3J0VmlvbGF0aW9uKE5vbmNlRGlyZWN0aXZlKiBkaXJlY3RpdmUsIGNvbnN0IFN0cmluZyYgbm9u Y2UsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgY29udGV4dFVS TCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSkgY29uc3QKLXsKLSAgICBp ZiAoY2hlY2tOb25jZShkaXJlY3RpdmUsIG5vbmNlKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgcmVwb3J0VmlvbGF0aW9uKGRpcmVjdGl2ZS0+dGV4dCgpLCBzY3JpcHROb25jZSwgY29uc29s ZU1lc3NhZ2UgKyAiXCIiICsgZGlyZWN0aXZlLT50ZXh0KCkgKyAiXCIuXG4iLCBVUkwoKSwgY29u dGV4dFVSTCwgY29udGV4dExpbmUpOwotICAgIHJldHVybiBkZW55SWZFbmZvcmNpbmdQb2xpY3ko KTsKLX0KLQogYm9vbCBDU1BEaXJlY3RpdmVMaXN0OjpjaGVja01lZGlhVHlwZUFuZFJlcG9ydFZp b2xhdGlvbihNZWRpYUxpc3REaXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB0eXBl LCBjb25zdCBTdHJpbmcmIHR5cGVBdHRyaWJ1dGUsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3Nh Z2UpIGNvbnN0CiB7CiAgICAgaWYgKGNoZWNrTWVkaWFUeXBlKGRpcmVjdGl2ZSwgdHlwZSwgdHlw ZUF0dHJpYnV0ZSkpCkBAIC0xMDY0LDI1ICs5OTQsMTcgQEAgYm9vbCBDU1BEaXJlY3RpdmVMaXN0 OjpjaGVja1NvdXJjZUFuZFJlcG9ydFZpb2xhdGlvbihTb3VyY2VMaXN0RGlyZWN0aXZlKiBkaXJl Y3QKIGJvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6YWxsb3dKYXZhU2NyaXB0VVJMcyhjb25zdCBTdHJp bmcmIGNvbnRleHRVUkwsIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIENv bnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0aW5nU3RhdHVzIHJlcG9ydGluZ1N0YXR1cykgY29u c3QKIHsKICAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBjb25zb2xl TWVzc2FnZSwgKEFTQ0lJTGl0ZXJhbCgiUmVmdXNlZCB0byBleGVjdXRlIEphdmFTY3JpcHQgVVJM IGJlY2F1c2UgaXQgdmlvbGF0ZXMgdGhlIGZvbGxvd2luZyBDb250ZW50IFNlY3VyaXR5IFBvbGlj eSBkaXJlY3RpdmU6ICIpKSk7Ci0gICAgaWYgKHJlcG9ydGluZ1N0YXR1cyA9PSBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OlNlbmRSZXBvcnQpIHsKLSAgICAgICAgcmV0dXJuIChjaGVja0lubGluZUFu ZFJlcG9ydFZpb2xhdGlvbihvcGVyYXRpdmVEaXJlY3RpdmUobV9zY3JpcHRTcmMuZ2V0KCkpLCBj b25zb2xlTWVzc2FnZSwgY29udGV4dFVSTCwgY29udGV4dExpbmUsIHRydWUpCi0gICAgICAgICAg ICAgICAgJiYgY2hlY2tOb25jZUFuZFJlcG9ydFZpb2xhdGlvbihtX3NjcmlwdE5vbmNlLmdldCgp LCBTdHJpbmcoKSwgY29uc29sZU1lc3NhZ2UsIGNvbnRleHRVUkwsIGNvbnRleHRMaW5lKSk7Ci0g ICAgfSBlbHNlIHsKLSAgICAgICAgcmV0dXJuIChjaGVja0lubGluZShvcGVyYXRpdmVEaXJlY3Rp dmUobV9zY3JpcHRTcmMuZ2V0KCkpKQotICAgICAgICAgICAgICAgICYmIGNoZWNrTm9uY2UobV9z Y3JpcHROb25jZS5nZXQoKSwgU3RyaW5nKCkpKTsKLSAgICB9CisgICAgcmV0dXJuIHJlcG9ydGlu Z1N0YXR1cyA9PSBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlNlbmRSZXBvcnQgPworICAgICAgICBj aGVja0lubGluZUFuZFJlcG9ydFZpb2xhdGlvbihvcGVyYXRpdmVEaXJlY3RpdmUobV9zY3JpcHRT cmMuZ2V0KCkpLCBjb25zb2xlTWVzc2FnZSwgY29udGV4dFVSTCwgY29udGV4dExpbmUsIHRydWUp CisgICAgICAgIDogY2hlY2tJbmxpbmUob3BlcmF0aXZlRGlyZWN0aXZlKG1fc2NyaXB0U3JjLmdl dCgpKSk7CiB9CiAKIGJvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6YWxsb3dJbmxpbmVFdmVudEhhbmRs ZXJzKGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBj b250ZXh0TGluZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnRpbmdTdGF0dXMgcmVwb3J0 aW5nU3RhdHVzKSBjb25zdAogewogICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChT dHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoQVNDSUlMaXRlcmFsKCJSZWZ1c2VkIHRvIGV4ZWN1dGUg aW5saW5lIGV2ZW50IGhhbmRsZXIgYmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENv bnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVjdGl2ZTogIikpKTsKLSAgICBpZiAocmVwb3J0aW5n U3RhdHVzID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6U2VuZFJlcG9ydCkgewotICAgICAgICBy ZXR1cm4gKGNoZWNrSW5saW5lQW5kUmVwb3J0VmlvbGF0aW9uKG9wZXJhdGl2ZURpcmVjdGl2ZSht X3NjcmlwdFNyYy5nZXQoKSksIGNvbnNvbGVNZXNzYWdlLCBjb250ZXh0VVJMLCBjb250ZXh0TGlu ZSwgdHJ1ZSkKLSAgICAgICAgICAgICAgICAmJiBjaGVja05vbmNlQW5kUmVwb3J0VmlvbGF0aW9u KG1fc2NyaXB0Tm9uY2UuZ2V0KCksIFN0cmluZygpLCBjb25zb2xlTWVzc2FnZSwgY29udGV4dFVS TCwgY29udGV4dExpbmUpKTsKLSAgICB9IGVsc2UgewotICAgICAgICByZXR1cm4gKGNoZWNrSW5s aW5lKG9wZXJhdGl2ZURpcmVjdGl2ZShtX3NjcmlwdFNyYy5nZXQoKSkpCi0gICAgICAgICAgICAg ICAgJiYgY2hlY2tOb25jZShtX3NjcmlwdE5vbmNlLmdldCgpLCBTdHJpbmcoKSkpOwotICAgIH0K KyAgICByZXR1cm4gcmVwb3J0aW5nU3RhdHVzID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6U2Vu ZFJlcG9ydCA/CisgICAgICAgIGNoZWNrSW5saW5lQW5kUmVwb3J0VmlvbGF0aW9uKG9wZXJhdGl2 ZURpcmVjdGl2ZShtX3NjcmlwdFNyYy5nZXQoKSksIGNvbnNvbGVNZXNzYWdlLCBjb250ZXh0VVJM LCBjb250ZXh0TGluZSwgdHJ1ZSkKKyAgICAgICAgOiBjaGVja0lubGluZShvcGVyYXRpdmVEaXJl Y3RpdmUobV9zY3JpcHRTcmMuZ2V0KCkpKTsKIH0KIAogYm9vbCBDU1BEaXJlY3RpdmVMaXN0Ojph bGxvd0lubGluZVNjcmlwdChjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IFdURjo6T3Jk aW5hbE51bWJlciYgY29udGV4dExpbmUsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0aW5n U3RhdHVzIHJlcG9ydGluZ1N0YXR1cykgY29uc3QKQEAgLTExMDksMTQgKzEwMzEsNiBAQCBib29s IENTUERpcmVjdGl2ZUxpc3Q6OmFsbG93RXZhbChKU0M6OkV4ZWNTdGF0ZSogc3RhdGUsIENvbnRl bnRTZWN1cml0eVBvbGljeTo6UgogICAgICAgICBjaGVja0V2YWwob3BlcmF0aXZlRGlyZWN0aXZl KG1fc2NyaXB0U3JjLmdldCgpKSk7CiB9CiAKLWJvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6YWxsb3dT Y3JpcHROb25jZShjb25zdCBTdHJpbmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGNvbnRleHRVUkws IGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIGNvbnN0IFVSTCYgdXJsKSBj b25zdAotewotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNv bGVNZXNzYWdlLCAoQVNDSUlMaXRlcmFsKCJSZWZ1c2VkIHRvIGV4ZWN1dGUgc2NyaXB0IGJlY2F1 c2UgaXQgdmlvbGF0ZXMgdGhlIGZvbGxvd2luZyBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkaXJl Y3RpdmU6ICIpKSk7Ci0gICAgaWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBjaGVj a05vbmNlQW5kUmVwb3J0VmlvbGF0aW9uKG1fc2NyaXB0Tm9uY2UuZ2V0KCksIG5vbmNlLCBjb25z b2xlTWVzc2FnZSwgY29udGV4dFVSTCwgY29udGV4dExpbmUpOwotICAgIHJldHVybiBjaGVja05v bmNlQW5kUmVwb3J0VmlvbGF0aW9uKG1fc2NyaXB0Tm9uY2UuZ2V0KCksIG5vbmNlLCAiUmVmdXNl ZCB0byBsb2FkICciICsgdXJsLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgpICsgIicg YmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5 IGRpcmVjdGl2ZTogIiwgY29udGV4dFVSTCwgY29udGV4dExpbmUpOwotfQotCiBib29sIENTUERp cmVjdGl2ZUxpc3Q6OmFsbG93UGx1Z2luVHlwZShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0 cmluZyYgdHlwZUF0dHJpYnV0ZSwgY29uc3QgVVJMJiB1cmwsIENvbnRlbnRTZWN1cml0eVBvbGlj eTo6UmVwb3J0aW5nU3RhdHVzIHJlcG9ydGluZ1N0YXR1cykgY29uc3QKIHsKICAgICByZXR1cm4g cmVwb3J0aW5nU3RhdHVzID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6U2VuZFJlcG9ydCA/CkBA IC0xNDE1LDggKzEzMjksNiBAQCB2b2lkIENTUERpcmVjdGl2ZUxpc3Q6OmFkZERpcmVjdGl2ZShj b25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiAgICAgICAgICAgICBzZXRD U1BEaXJlY3RpdmU8U291cmNlTGlzdERpcmVjdGl2ZT4obmFtZSwgdmFsdWUsIG1fZm9ybUFjdGlv bik7CiAgICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHBsdWdpblR5cGVz KSkKICAgICAgICAgICAgIHNldENTUERpcmVjdGl2ZTxNZWRpYUxpc3REaXJlY3RpdmU+KG5hbWUs IHZhbHVlLCBtX3BsdWdpblR5cGVzKTsKLSAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nh c2UobmFtZSwgc2NyaXB0Tm9uY2UpKQotICAgICAgICAgICAgc2V0Q1NQRGlyZWN0aXZlPE5vbmNl RGlyZWN0aXZlPihuYW1lLCB2YWx1ZSwgbV9zY3JpcHROb25jZSk7CiAgICAgICAgIGVsc2UgaWYg KGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHJlZmxlY3RlZFhTUykpCiAgICAgICAgICAgICBwYXJz ZVJlZmxlY3RlZFhTUyhuYW1lLCB2YWx1ZSk7CiAgICAgICAgIGVsc2UKQEAgLTE1MTYsMTYgKzE0 MjgsNiBAQCBib29sIGlzQWxsb3dlZEJ5QWxsV2l0aENvbnRleHQoY29uc3QgQ1NQRGlyZWN0aXZl TGlzdFZlY3RvciYgcG9saWNpZXMsIGNvbnN0IFN0cgogICAgIHJldHVybiB0cnVlOwogfQogCi10 ZW1wbGF0ZTxib29sIChDU1BEaXJlY3RpdmVMaXN0OjoqYWxsb3dlZCkoY29uc3QgU3RyaW5nJiwg Y29uc3QgU3RyaW5nJiwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiwgY29uc3QgVVJMJikgY29u c3Q+Ci1ib29sIGlzQWxsb3dlZEJ5QWxsV2l0aE5vbmNlKGNvbnN0IENTUERpcmVjdGl2ZUxpc3RW ZWN0b3ImIHBvbGljaWVzLCBjb25zdCBTdHJpbmcmIG5vbmNlLCBjb25zdCBTdHJpbmcmIGNvbnRl eHRVUkwsIGNvbnN0IFdURjo6T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIGNvbnN0IFVSTCYg dXJsKQotewotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcG9saWNpZXMuc2l6ZSgpOyArK2kp IHsKLSAgICAgICAgaWYgKCEocG9saWNpZXNbaV0uZ2V0KCktPiphbGxvd2VkKShub25jZSwgY29u dGV4dFVSTCwgY29udGV4dExpbmUsIHVybCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgfQotICAgIHJldHVybiB0cnVlOwotfQotCiB0ZW1wbGF0ZTxib29sIChDU1BEaXJlY3RpdmVM aXN0OjoqYWxsb3dGcm9tVVJMKShjb25zdCBVUkwmLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJl cG9ydGluZ1N0YXR1cykgY29uc3Q+CiBib29sIGlzQWxsb3dlZEJ5QWxsV2l0aFVSTChjb25zdCBD U1BEaXJlY3RpdmVMaXN0VmVjdG9yJiBwb2xpY2llcywgY29uc3QgVVJMJiB1cmwsIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6UmVwb3J0aW5nU3RhdHVzIHJlcG9ydGluZ1N0YXR1cykKIHsKQEAgLTE1 NzUsMTEgKzE0NzcsNiBAQCBTdHJpbmcgQ29udGVudFNlY3VyaXR5UG9saWN5OjpldmFsRGlzYWJs ZWRFcnJvck1lc3NhZ2UoKSBjb25zdAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAotYm9vbCBD b250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93U2NyaXB0Tm9uY2UoY29uc3QgU3RyaW5nJiBub25j ZSwgY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBXVEY6Ok9yZGluYWxOdW1iZXImIGNv bnRleHRMaW5lLCBjb25zdCBVUkwmIHVybCkgY29uc3QKLXsKLSAgICByZXR1cm4gaXNBbGxvd2Vk QnlBbGxXaXRoTm9uY2U8JkNTUERpcmVjdGl2ZUxpc3Q6OmFsbG93U2NyaXB0Tm9uY2U+KG1fcG9s aWNpZXMsIG5vbmNlLCBjb250ZXh0VVJMLCBjb250ZXh0TGluZSwgdXJsKTsKLX0KLQogYm9vbCBD b250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93UGx1Z2luVHlwZShjb25zdCBTdHJpbmcmIHR5cGUs IGNvbnN0IFN0cmluZyYgdHlwZUF0dHJpYnV0ZSwgY29uc3QgVVJMJiB1cmwsIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6UmVwb3J0aW5nU3RhdHVzIHJlcG9ydGluZ1N0YXR1cykgY29uc3QKIHsKICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcG9saWNpZXMuc2l6ZSgpOyArK2kpIHsKQEAgLTE4 NDUsMTIgKzE3NDIsNiBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0SW52YWxp ZFBhdGhDaGFyYWN0ZXIoY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVOYQogICAgIGxvZ1RvQ29uc29s ZShtZXNzYWdlKTsKIH0KIAotdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydEludmFs aWROb25jZShjb25zdCBTdHJpbmcmIG5vbmNlKSBjb25zdAotewotICAgIFN0cmluZyBtZXNzYWdl ID0gbWFrZVN0cmluZygiSWdub3JpbmcgaW52YWxpZCBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBz Y3JpcHQgbm9uY2U6ICciLCBub25jZSwgIicuXG4iKTsKLSAgICBsb2dUb0NvbnNvbGUobWVzc2Fn ZSk7Ci19Ci0KIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRJbnZhbGlkU291cmNl RXhwcmVzc2lvbihjb25zdCBTdHJpbmcmIGRpcmVjdGl2ZU5hbWUsIGNvbnN0IFN0cmluZyYgc291 cmNlKSBjb25zdAogewogICAgIFN0cmluZyBtZXNzYWdlID0gbWFrZVN0cmluZygiVGhlIHNvdXJj ZSBsaXN0IGZvciBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkaXJlY3RpdmUgJyIsIGRpcmVjdGl2 ZU5hbWUsICInIGNvbnRhaW5zIGFuIGludmFsaWQgc291cmNlOiAnIiwgc291cmNlLCAiJy4gSXQg d2lsbCBiZSBpZ25vcmVkLiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5 UG9saWN5LmgKaW5kZXggMWE1MjE2Y2E3ZWE1YzhlYTEwNmY4ZTc5MDJjM2ViODkxMThjODZlNi4u MDk3NzJlMWU2NzM5YTEwNTRlODMzZjEyYTgyNzY1MWFhOTUzNzY0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC04OSw3ICs4OSw2IEBAIHB1Ymxp YzoKICAgICBib29sIGFsbG93SW5saW5lU2NyaXB0KGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwg Y29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgUmVwb3J0aW5nU3RhdHVzID0g U2VuZFJlcG9ydCkgY29uc3Q7CiAgICAgYm9vbCBhbGxvd0lubGluZVN0eWxlKGNvbnN0IFN0cmlu ZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgUmVw b3J0aW5nU3RhdHVzID0gU2VuZFJlcG9ydCkgY29uc3Q7CiAgICAgYm9vbCBhbGxvd0V2YWwoSlND OjpFeGVjU3RhdGUqID0gMCwgUmVwb3J0aW5nU3RhdHVzID0gU2VuZFJlcG9ydCkgY29uc3Q7Ci0g ICAgYm9vbCBhbGxvd1NjcmlwdE5vbmNlKGNvbnN0IFN0cmluZyYgbm9uY2UsIGNvbnN0IFN0cmlu ZyYgY29udGV4dFVSTCwgY29uc3QgV1RGOjpPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgY29u c3QgVVJMJiA9IFVSTCgpKSBjb25zdDsKICAgICBib29sIGFsbG93UGx1Z2luVHlwZShjb25zdCBT dHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgdHlwZUF0dHJpYnV0ZSwgY29uc3QgVVJMJiwgUmVw b3J0aW5nU3RhdHVzID0gU2VuZFJlcG9ydCkgY29uc3Q7CiAKICAgICBib29sIGFsbG93U2NyaXB0 RnJvbVNvdXJjZShjb25zdCBVUkwmLCBSZXBvcnRpbmdTdGF0dXMgPSBTZW5kUmVwb3J0KSBjb25z dDsKQEAgLTExNCw3ICsxMTMsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXBvcnREdXBsaWNhdGVE aXJlY3RpdmUoY29uc3QgU3RyaW5nJikgY29uc3Q7CiAgICAgdm9pZCByZXBvcnRJbnZhbGlkRGly ZWN0aXZlVmFsdWVDaGFyYWN0ZXIoY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVOYW1lLCBjb25zdCBT dHJpbmcmIHZhbHVlKSBjb25zdDsKICAgICB2b2lkIHJlcG9ydEludmFsaWRQYXRoQ2hhcmFjdGVy KGNvbnN0IFN0cmluZyYgZGlyZWN0aXZlTmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3Qg Y2hhcikgY29uc3Q7Ci0gICAgdm9pZCByZXBvcnRJbnZhbGlkTm9uY2UoY29uc3QgU3RyaW5nJikg Y29uc3Q7CiAgICAgdm9pZCByZXBvcnRJbnZhbGlkUGx1Z2luVHlwZXMoY29uc3QgU3RyaW5nJikg Y29uc3Q7CiAgICAgdm9pZCByZXBvcnRJbnZhbGlkU2FuZGJveEZsYWdzKGNvbnN0IFN0cmluZyYp IGNvbnN0OwogICAgIHZvaWQgcmVwb3J0SW52YWxpZFNvdXJjZUV4cHJlc3Npb24oY29uc3QgU3Ry aW5nJiBkaXJlY3RpdmVOYW1lLCBjb25zdCBTdHJpbmcmIHNvdXJjZSkgY29uc3Q7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZjczNTE3YTQ2NDM5Yjc2NTllYmUxZTk4MzQyNjIxMDc4NTk2OWNmMy4uMzQ3M2QxOTAwYTJlOWRh YmUzNGQzMWQ1ODM1ZjA1NDc4ZjE3ZjM2MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA3 LTE1ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQOiBEcm9w ICdzY3JpcHQtbm9uY2UnIGRpcmVjdGl2ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNDkyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERyb3BwaW5nIHRoZSBub25jZSB0ZXN0cywgYXMgd2UncmUgcmVt b3ZpbmcgdGhlIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtYWxsb3dlZC1leHBlY3RlZC50 eHQ6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWFsbG93ZWQuaHRtbDogUmVtb3ZlZC4KKyAgICAgICAg KiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9u Y2UtYmxvY2tlZC1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9z ZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWJsb2NrZWQuaHRt bDogUmVtb3ZlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtaW52YWxpZG5vbmNlLWV4cGVjdGVkLnR4dDogUmVtb3Zl ZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8x LjEvc2NyaXB0bm9uY2UtaW52YWxpZG5vbmNlLmh0bWw6IFJlbW92ZWQuCisgICAgICAgICogaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLXNj cmlwdHNyYy1ibG9ja2VkLWV4cGVjdGVkLnR4dDogUmVtb3ZlZC4KKyAgICAgICAgKiBodHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2Utc2NyaXB0 c3JjLWJsb2NrZWQuaHRtbDogUmVtb3ZlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2Utc2VwYXJhdG9ycy1hbGxvd2Vk LWV4cGVjdGVkLnR4dDogUmVtb3ZlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Nv bnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2Utc2VwYXJhdG9ycy1hbGxvd2VkLmh0 bWw6IFJlbW92ZWQuCisKIDIwMTQtMDctMTUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNTU5NTcpOiBJbnZhbGlkIGNhc3QgaW4gV2Vi Q29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjpnZXRSYW5nZXMKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9zY3Jp cHRub25jZS1hbGxvd2VkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1hbGxvd2VkLWV4cGVj dGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTg1YTU0MGMzMGVkMzE4NWVh YWIzZjRlMTY5MjNjNzcxOTY2NjEzYi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1 cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtYWxsb3dlZC1leHBlY3RlZC50eHQKKysrIC9kZXYv bnVsbApAQCAtMSwyICswLDAgQEAKLUFMRVJUOiBQQVNTICgxLzEpCi1UaGlzIHRlc3RzIHRoZSBl ZmZlY3Qgb2YgYSB2YWxpZCBzY3JpcHQtbm9uY2UgdmFsdWUuIEl0IHBhc3NlcyBpZiBubyBjb25z b2xlIHdhcm5pbmcgaXMgdmlzaWJsZSwgYW5kIHRoZSBhbGVydCgpIGlzIGV4ZWN1dGVkLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvMS4xL3NjcmlwdG5vbmNlLWFsbG93ZWQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1hbGxvd2Vk Lmh0bWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDIzNDU0ZTIxOTIwMzk5YTM5MDY0 ZWZmYzM4MTI2MmVkNGU5MzVjYWEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWFsbG93ZWQuaHRtbAorKysgL2Rldi9udWxsCkBAIC0x LDE5ICswLDAgQEAKLTwhRE9DVFlQRSBodG1sPgotPGh0bWw+Ci0gICAgPGhlYWQ+Ci0gICAgICAg IDxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LW5vbmNlIG5v bmN5bm9uY2U7Ij4KLSAgICAgICAgPHNjcmlwdCBub25jZT0ibm9uY3lub25jZSI+Ci0gICAgICAg IGlmICh3aW5kb3cudGVzdFJ1bm5lcikKLSAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4 dCgpOwotICAgICAgICA8L3NjcmlwdD4KLSAgICAgICAgPHNjcmlwdCBub25jZT0ibm9uY3lub25j ZSI+Ci0gICAgICAgICAgICBhbGVydCgnUEFTUyAoMS8xKScpOwotICAgICAgICA8L3NjcmlwdD4K LSAgICA8L2hlYWQ+Ci0gICAgPGJvZHk+Ci0gICAgICAgIDxwPgotICAgICAgICAgICAgVGhpcyB0 ZXN0cyB0aGUgZWZmZWN0IG9mIGEgdmFsaWQgc2NyaXB0LW5vbmNlIHZhbHVlLiBJdCBwYXNzZXMg aWYKLSAgICAgICAgICAgIG5vIGNvbnNvbGUgd2FybmluZyBpcyB2aXNpYmxlLCBhbmQgdGhlIGFs ZXJ0KCkgaXMgZXhlY3V0ZWQuCi0gICAgICAgIDwvcD4KLSAgICA8L2JvZHk+Ci08L2h0bWw+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtYmxvY2tlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9u Y2UtYmxvY2tlZC1leHBlY3RlZC50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDkz Y2IxNTY1ZjMzMTVlNjIwYjA3MTE3ZDgwNmQ5NjE1NGE4ZmJlMmQuLjAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1 cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWJsb2NrZWQtZXhwZWN0 ZWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEsOSArMCwwIEBACi1BTEVSVDogUEFTUyAoMS8yKQot QUxFUlQ6IFBBU1MgKDIvMikKLUNPTlNPTEUgTUVTU0FHRTogbGluZSAxMzogUmVmdXNlZCB0byBl eGVjdXRlIHNjcmlwdCBiZWNhdXNlIGl0IHZpb2xhdGVzIHRoZSBmb2xsb3dpbmcgQ29udGVudCBT ZWN1cml0eSBQb2xpY3kgZGlyZWN0aXZlOiAic2NyaXB0LW5vbmNlIG5vbmN5bm9uY2UiLgotCi1D T05TT0xFIE1FU1NBR0U6IGxpbmUgMTY6IFJlZnVzZWQgdG8gZXhlY3V0ZSBzY3JpcHQgYmVjYXVz ZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVj dGl2ZTogInNjcmlwdC1ub25jZSBub25jeW5vbmNlIi4KLQotQ09OU09MRSBNRVNTQUdFOiBsaW5l IDE5OiBSZWZ1c2VkIHRvIGV4ZWN1dGUgc2NyaXB0IGJlY2F1c2UgaXQgdmlvbGF0ZXMgdGhlIGZv bGxvd2luZyBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkaXJlY3RpdmU6ICJzY3JpcHQtbm9uY2Ug bm9uY3lub25jZSIuCi0KLVRoaXMgdGVzdHMgdGhlIGVmZmVjdCBvZiBhIHZhbGlkIHNjcmlwdC1u b25jZSB2YWx1ZS4gSXQgcGFzc2VzIGlmIHRocmVlIGNvbnNvbGUgd2FybmluZ3MgYXJlIHZpc2li bGUsIGFuZCB0aGUgdHdvIFBBU1MgYWxlcnRzIGFyZSBleGVjdXRlZC4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9z Y3JpcHRub25jZS1ibG9ja2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtYmxvY2tlZC5odG1sCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4YzBlYzRlNDU3Mjk5NmRjMTQ5MGQyMWI0OGY3ZGNj ZGU3YzBkNjgzLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEu MS9zY3JpcHRub25jZS1ibG9ja2VkLmh0bWwKKysrIC9kZXYvbnVsbApAQCAtMSwzMCArMCwwIEBA Ci08IURPQ1RZUEUgaHRtbD4KLTxodG1sPgotICAgIDxoZWFkPgotICAgICAgICA8bWV0YSBodHRw LWVxdWl2PSJYLVdlYktpdC1DU1AiIGNvbnRlbnQ9InNjcmlwdC1ub25jZSBub25jeW5vbmNlOyI+ Ci0gICAgICAgIDxzY3JpcHQgbm9uY2U9Im5vbmN5bm9uY2UiPgotICAgICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCi0gICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKLSAgICAg ICAgYWxlcnQoJ1BBU1MgKDEvMiknKTsKLSAgICAgICAgPC9zY3JpcHQ+Ci0gICAgICAgIDxzY3Jp cHQgbm9uY2U9IiAgIG5vbmN5bm9uY2UgICAgIj4KLSAgICAgICAgYWxlcnQoJ1BBU1MgKDIvMikn KTsKLSAgICAgICAgPC9zY3JpcHQ+Ci0gICAgICAgIDxzY3JpcHQgbm9uY2U9Im5vbmN5bm9uY2Ug bm9uY3lub25jZSI+Ci0gICAgICAgICAgICBhbGVydCgnRkFJTCAoMS8zKScpOwotICAgICAgICA8 L3NjcmlwdD4KLSAgICAgICAgPHNjcmlwdD4KLSAgICAgICAgICAgIGFsZXJ0KCdGQUlMICgyLzMp Jyk7Ci0gICAgICAgIDwvc2NyaXB0PgotICAgICAgICA8c2NyaXB0IG5vbmNlPSJub25jeW5vbmNl bm8/Ij4KLSAgICAgICAgICAgIGFsZXJ0KCdGQUlMICgzLzMpJyk7Ci0gICAgICAgIDwvc2NyaXB0 PgotICAgIDwvaGVhZD4KLSAgICA8Ym9keT4KLSAgICAgICAgPHA+Ci0gICAgICAgICAgICBUaGlz IHRlc3RzIHRoZSBlZmZlY3Qgb2YgYSB2YWxpZCBzY3JpcHQtbm9uY2UgdmFsdWUuIEl0IHBhc3Nl cyBpZgotICAgICAgICAgICAgdGhyZWUgY29uc29sZSB3YXJuaW5ncyBhcmUgdmlzaWJsZSwgYW5k IHRoZSB0d28gUEFTUyBhbGVydHMgYXJlCi0gICAgICAgICAgICBleGVjdXRlZC4KLSAgICAgICAg PC9wPgotICAgIDwvYm9keT4KLTwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1pbnZh bGlkbm9uY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWludmFsaWRub25jZS1leHBlY3Rl ZC50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDk5ODUwYjFhNTViMTY4Nzg3NDdm NDQ5NWE5ZjZhZTdiM2YyMDIyZmEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLWludmFsaWRub25jZS1leHBlY3RlZC50eHQKKysrIC9k ZXYvbnVsbApAQCAtMSwzOSArMCwwIEBACi1DT05TT0xFIE1FU1NBR0U6IElnbm9yaW5nIGludmFs aWQgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgc2NyaXB0IG5vbmNlOiAnJy4KLQotQ09OU09MRSBN RVNTQUdFOiBsaW5lIDc6IFJlZnVzZWQgdG8gbG9hZCAnaHR0cDovLzEyNy4wLjAuMTo4MDAwL3Nl Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvc2NyaXB0LmpzJyBiZWNhdXNl IGl0IHZpb2xhdGVzIHRoZSBmb2xsb3dpbmcgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgZGlyZWN0 aXZlOiAic2NyaXB0LW5vbmNlICIuCi0KLUNPTlNPTEUgTUVTU0FHRTogSWdub3JpbmcgaW52YWxp ZCBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBzY3JpcHQgbm9uY2U6ICcnLgotCi1DT05TT0xFIE1F U1NBR0U6IGxpbmUgNzogUmVmdXNlZCB0byBsb2FkICdodHRwOi8vMTI3LjAuMC4xOjgwMDAvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9zY3JpcHQuanMnIGJlY2F1c2Ug aXQgdmlvbGF0ZXMgdGhlIGZvbGxvd2luZyBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBkaXJlY3Rp dmU6ICJzY3JpcHQtbm9uY2UgIi4KLQotQ09OU09MRSBNRVNTQUdFOiBJZ25vcmluZyBpbnZhbGlk IENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IHNjcmlwdCBub25jZTogJycuCi0KLUNPTlNPTEUgTUVT U0FHRTogbGluZSA3OiBSZWZ1c2VkIHRvIGxvYWQgJ2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1 cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVzb3VyY2VzL3NjcmlwdC5qcycgYmVjYXVzZSBp dCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVjdGl2 ZTogInNjcmlwdC1ub25jZSAiLgotCi1DT05TT0xFIE1FU1NBR0U6IElnbm9yaW5nIGludmFsaWQg Q29udGVudCBTZWN1cml0eSBQb2xpY3kgc2NyaXB0IG5vbmNlOiAnbm9uY2VzIGhhdmUgbm8gc3Bh Y2VzJy4KLQotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDc6IFJlZnVzZWQgdG8gbG9hZCAnaHR0cDov LzEyNy4wLjAuMTo4MDAwL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMv c2NyaXB0LmpzJyBiZWNhdXNlIGl0IHZpb2xhdGVzIHRoZSBmb2xsb3dpbmcgQ29udGVudCBTZWN1 cml0eSBQb2xpY3kgZGlyZWN0aXZlOiAic2NyaXB0LW5vbmNlIG5vbmNlcyBoYXZlIG5vIHNwYWNl cyIuCi0KLU5vbmUgb2YgdGhlc2Ugc2NyaXB0cyBzaG91bGQgZXhlY3V0ZSwgYXMgYWxsIHRoZSBu b25jZXMgYXJlIGludmFsaWQuCi0KLQotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWVQYXRo IC8vPCEtLWZyYW1lMC0tPi0tPicKLS0tLS0tLS0tCi1QQVNTCi0KLS0tLS0tLS0tCi1GcmFtZTog JzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUxLS0+LS0+JwotLS0tLS0tLS0KLVBBU1MKLQotLS0t LS0tLS0KLUZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTItLT4tLT4nCi0tLS0tLS0t LQotUEFTUwotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1lMy0t Pi0tPicKLS0tLS0tLS0tCi1QQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtaW52YWxpZG5v bmNlLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS8xLjEvc2NyaXB0bm9uY2UtaW52YWxpZG5vbmNlLmh0bWwKZGVsZXRlZCBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDkyNTczZjNlOTc1OTIyMGZlNTNkYWY1MTRlZjcxYzIxYWUyM2NjZjYu LjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5v bmNlLWludmFsaWRub25jZS5odG1sCisrKyAvZGV2L251bGwKQEAgLTEsMTcgKzAsMCBAQAotPCFE T0NUWVBFIGh0bWw+Ci08aHRtbD4KLTxoZWFkPgotPHNjcmlwdCBzcmM9Jy4uL3Jlc291cmNlcy9t dWx0aXBsZS1pZnJhbWUtdGVzdC5qcyc+PC9zY3JpcHQ+Ci08c2NyaXB0PgotdmFyIHRlc3RzID0g WwotICAgIFsnbm8nLCAnc2NyaXB0LXNyYyAxMjcuMC4wLjE6ODAwMDsgc2NyaXB0LW5vbmNlOycs ICdyZXNvdXJjZXMvc2NyaXB0LmpzJywgJyddLAotICAgIFsnbm8nLCAnc2NyaXB0LXNyYyAxMjcu MC4wLjE6ODAwMDsgc2NyaXB0LW5vbmNlIDsnLCAncmVzb3VyY2VzL3NjcmlwdC5qcycsICcnXSwK LSAgICBbJ25vJywgJ3NjcmlwdC1zcmMgMTI3LjAuMC4xOjgwMDA7IHNjcmlwdC1ub25jZSAgICAg IDsnLCAncmVzb3VyY2VzL3NjcmlwdC5qcycsICcnXSwKLSAgICBbJ25vJywgJ3NjcmlwdC1zcmMg MTI3LjAuMC4xOjgwMDA7IHNjcmlwdC1ub25jZSBub25jZXMgaGF2ZSBubyBzcGFjZXM7JywgJ3Jl c291cmNlcy9zY3JpcHQuanMnLCAnJ10sCi1dOwotPC9zY3JpcHQ+Ci08L2hlYWQ+Ci08Ym9keSBv bmxvYWQ9InRlc3RFeHBlcmltZW50YWxQb2xpY3koKSI+Ci0gIDxwPgotICAgICAgTm9uZSBvZiB0 aGVzZSBzY3JpcHRzIHNob3VsZCBleGVjdXRlLCBhcyBhbGwgdGhlIG5vbmNlcyBhcmUgaW52YWxp ZC4KLSAgPC9wPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLXNjcmlwdHNyYy1ibG9ja2VkLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3Vy aXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1zY3JpcHRzcmMtYmxvY2tlZC1leHBlY3RlZC50eHQK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDkwMzQ3ZWM0NDEwNTZjOWU0ZTQ4YmY1Y2Zj OWJiY2E4ZDY3MzlmODMuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK LS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xp Y3kvMS4xL3NjcmlwdG5vbmNlLXNjcmlwdHNyYy1ibG9ja2VkLWV4cGVjdGVkLnR4dAorKysgL2Rl di9udWxsCkBAIC0xLDI3ICswLDAgQEAKLUNPTlNPTEUgTUVTU0FHRTogbGluZSA3OiBSZWZ1c2Vk IHRvIGxvYWQgJ2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvcmVzb3VyY2VzL3NjcmlwdC5qcycgYmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93 aW5nIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVjdGl2ZTogInNjcmlwdC1ub25jZSBub25j ZSIuCi0KLUNPTlNPTEUgTUVTU0FHRTogbGluZSA3OiBSZWZ1c2VkIHRvIGxvYWQgJ2h0dHA6Ly8x MjcuMC4wLjE6ODAwMC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVzb3VyY2VzL3Nj cmlwdC5qcycgYmVjYXVzZSBpdCB2aW9sYXRlcyB0aGUgZm9sbG93aW5nIENvbnRlbnQgU2VjdXJp dHkgUG9saWN5IGRpcmVjdGl2ZTogInNjcmlwdC1ub25jZSBub3Rub25jZSIuCi0KLU5vbmUgb2Yg dGhlc2Ugc2NyaXB0cyBzaG91bGQgZXhlY3V0ZSBldmVuIHRob3VnaCB0aGVyZSBhcmUgcGFyc2Ug ZXJyb3JzIGluIHRoZSBwb2xpY3kuCi0KLQotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWVQ YXRoIC8vPCEtLWZyYW1lMC0tPi0tPicKLS0tLS0tLS0tCi1QQVNTCi0KLS0tLS0tLS0tCi1GcmFt ZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUxLS0+LS0+JwotLS0tLS0tLS0KLVBBU1MKLQot LS0tLS0tLS0KLUZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTItLT4tLT4nCi0tLS0t LS0tLQotUEFTUwotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1l My0tPi0tPicKLS0tLS0tLS0tCi1QQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2Utc2NyaXB0 c3JjLWJsb2NrZWQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVu dFNlY3VyaXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1zY3JpcHRzcmMtYmxvY2tlZC5odG1sCmRl bGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiNWJhMDExMjQ0ZDQ5ZWUwN2M1ZGY1YjYyYzI0 OTUwNjYzYWM4MzkzLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0t LSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5 LzEuMS9zY3JpcHRub25jZS1zY3JpcHRzcmMtYmxvY2tlZC5odG1sCisrKyAvZGV2L251bGwKQEAg LTEsMTcgKzAsMCBAQAotPCFET0NUWVBFIGh0bWw+Ci08aHRtbD4KLTxoZWFkPgotPHNjcmlwdCBz cmM9Jy4uL3Jlc291cmNlcy9tdWx0aXBsZS1pZnJhbWUtdGVzdC5qcyc+PC9zY3JpcHQ+Ci08c2Ny aXB0PgotdmFyIHRlc3RzID0gWwotICAgIFsneWVzJywgJ3NjcmlwdC1zcmMgMTI3LjAuMC4xOjgw MDAnLCAncmVzb3VyY2VzL3NjcmlwdC5qcycsICdub25jZSddLAotICAgIFsneWVzJywgJ3Njcmlw dC1zcmMgMTI3LjAuMC4xOjgwMDA7IHNjcmlwdC1ub25jZSBub25jZScsICdyZXNvdXJjZXMvc2Ny aXB0LmpzJywgJ25vbmNlJ10sCi0gICAgWydubycsICdzY3JpcHQtc3JjIDEyNy4wLjAuMTo4MDAw OyBzY3JpcHQtbm9uY2Ugbm9uY2UnLCAncmVzb3VyY2VzL3NjcmlwdC5qcycsICdub3Rub25jZSdd LAotICAgIFsnbm8nLCAnc2NyaXB0LXNyYyAxMjcuMC4wLjE6ODAwMDsgc2NyaXB0LW5vbmNlIG5v dG5vbmNlJywgJ3Jlc291cmNlcy9zY3JpcHQuanMnLCAnbm9uY2UnXSwKLV07Ci08L3NjcmlwdD4K LTwvaGVhZD4KLTxib2R5IG9ubG9hZD0idGVzdEV4cGVyaW1lbnRhbFBvbGljeSgpIj4KLSAgPHA+ Ci0gICAgTm9uZSBvZiB0aGVzZSBzY3JpcHRzIHNob3VsZCBleGVjdXRlIGV2ZW4gdGhvdWdoIHRo ZXJlIGFyZSBwYXJzZSBlcnJvcnMgaW4gdGhlIHBvbGljeS4KLSAgPC9wPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4x L3NjcmlwdG5vbmNlLXNlcGFyYXRvcnMtYWxsb3dlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9u Y2Utc2VwYXJhdG9ycy1hbGxvd2VkLWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggYmI4YThlM2IzZmU0NDRhMmUwOTlkOWJjZDU4NDg1MTIzNmIyOGY4Ni4uMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS8xLjEvc2NyaXB0bm9uY2Utc2Vw YXJhdG9ycy1hbGxvd2VkLWV4cGVjdGVkLnR4dAorKysgL2Rldi9udWxsCkBAIC0xLDE4ICswLDAg QEAKLUFsbCBvZiB0aGVzZSBzY3JpcHRzIHNob3VsZCBleGVjdXRlLCBhcyBhbGwgdGhlIG5vbmNl cyBhcmUgdmFsaWQuCi0KLQotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEt LWZyYW1lMC0tPi0tPicKLS0tLS0tLS0tCi1QQVNTCi0KLS0tLS0tLS0tCi1GcmFtZTogJzwhLS1m cmFtZVBhdGggLy88IS0tZnJhbWUxLS0+LS0+JwotLS0tLS0tLS0KLVBBU1MKLQotLS0tLS0tLS0K LUZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTItLT4tLT4nCi0tLS0tLS0tLQotUEFT UwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kvMS4xL3NjcmlwdG5vbmNlLXNlcGFyYXRvcnMtYWxsb3dlZC5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvMS4xL3Nj cmlwdG5vbmNlLXNlcGFyYXRvcnMtYWxsb3dlZC5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAyMDVhODBlNDJjNjY2MzVlMjA4MzBjMzQ4NDgwNGE0MGJmY2ZmNjFlLi4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LzEuMS9zY3JpcHRub25jZS1zZXBh cmF0b3JzLWFsbG93ZWQuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDE2ICswLDAgQEAKLTwhRE9D VFlQRSBodG1sPgotPGh0bWw+Ci08aGVhZD4KLTxzY3JpcHQgc3JjPScuLi9yZXNvdXJjZXMvbXVs dGlwbGUtaWZyYW1lLXRlc3QuanMnPjwvc2NyaXB0PgotPHNjcmlwdD4KLXZhciB0ZXN0cyA9IFsK LSAgICBbJ3llcycsICdzY3JpcHQtc3JjIDEyNy4wLjAuMTo4MDAwOyBzY3JpcHQtbm9uY2UgMS8x OycsICdyZXNvdXJjZXMvc2NyaXB0LmpzJywgJzEvMSddLAotICAgIFsneWVzJywgJ3NjcmlwdC1z cmMgMTI3LjAuMC4xOjgwMDA7IHNjcmlwdC1ub25jZSB7fTsnLCAncmVzb3VyY2VzL3NjcmlwdC5q cycsICd7fSddLAotICAgIFsneWVzJywgJ3NjcmlwdC1zcmMgMTI3LjAuMC4xOjgwMDA7IHNjcmlw dC1ub25jZSAvXFw7JywgJ3Jlc291cmNlcy9zY3JpcHQuanMnLCAnL1xcJ10sCi1dOwotPC9zY3Jp cHQ+Ci08L2hlYWQ+Ci08Ym9keSBvbmxvYWQ9InRlc3RFeHBlcmltZW50YWxQb2xpY3koKSI+Ci0g IDxwPgotICAgICAgQWxsIG9mIHRoZXNlIHNjcmlwdHMgc2hvdWxkIGV4ZWN1dGUsIGFzIGFsbCB0 aGUgbm9uY2VzIGFyZSB2YWxpZC4KLSAgPC9wPgo=