233182 2021-11-16 03:04:46 -0800 CSP: security policy violation event is always using document as target 2021-11-23 08:24:39 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233037 233398 1 cgarcia webkit-unassigned cdumez cmarcelo esprehn+autocc ews-watchlist kangil.han katherine_cheney mkwst pgriffis webkit-bug-importer oldest_to_newest 1815418 0 cgarcia 2021-11-16 03:04:46 -0800 We should use the violation element instead if not null. This is causing failures in imported/w3c/web-platform-tests/content-security-policy/securitypolicyviolation/targeting.html but also time outs in other tests connecting the event listener to the target element. 1815419 1 444366 cgarcia 2021-11-16 03:09:00 -0800 Created attachment 444366 WIP This is WIP for now because it won't apply, it applies on top of patch attached to bug #233037. Once that lands I'll include changelog and new test results. 1817260 2 444954 cgarcia 2021-11-22 02:54:05 -0800 Created attachment 444954 Patch 1817427 3 webkit-bug-importer 2021-11-23 03:05:19 -0800 <rdar://problem/85697149> 1817477 4 444954 katherine_cheney 2021-11-23 08:11:55 -0800 Comment on attachment 444954 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444954&action=review > Source/WebCore/ChangeLog:15 > + (WebCore::Element::enqueueSecurityPolicyViolationEvent): Helper to queue ecuritypolicyviolationEvent for element. nit: ecuritypolicyviolationEvent > securitypolicyviolationEvent 1817478 5 cgarcia 2021-11-23 08:24:39 -0800 Committed r286136 (244523@main): <https://commits.webkit.org/244523@main> 444366 2021-11-16 03:09:00 -0800 2021-11-22 02:54:05 -0800 WIP wcore-wip-csp-event-target.diff text/plain 20701 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuY3BwCmluZGV4 IGU0YjdkMzVjYTU1Mi4uN2I5Y2UzMzVjZDNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAKQEAgLTEyNiw4ICsxMjYsMTEgQEAgdm9pZCBKU0V2 ZW50TGlzdGVuZXI6OmhhbmRsZUV2ZW50KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIHNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQKICAgICAgICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IGpzQ2FzdDxKU0RP TVdpbmRvdyo+KGdsb2JhbE9iamVjdCk7CiAgICAgICAgIGlmICghd2luZG93LT53cmFwcGVkKCku aXNDdXJyZW50bHlEaXNwbGF5ZWRJbkZyYW1lKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGlmICh3YXNDcmVhdGVkRnJvbU1hcmt1cCgpICYmICFzY3JpcHRFeGVjdXRpb25Db250ZXh0 LmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0lubGluZUV2ZW50SGFuZGxlcnMoc291cmNl VVJMKCkuc3RyaW5nKCksIHNvdXJjZVBvc2l0aW9uKCkubV9saW5lLCBjb2RlKCkpKQotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICBpZiAod2FzQ3JlYXRlZEZyb21NYXJrdXAoKSkgeworICAg ICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IGV2ZW50LnRhcmdldCgpLT5pc05vZGUoKSAmJiAh ZG93bmNhc3Q8Tm9kZT4oKmV2ZW50LnRhcmdldCgpKS5pc0RvY3VtZW50Tm9kZSgpICYmIGlzPEVs ZW1lbnQ+KCpldmVudC50YXJnZXQoKSkgPyBkb3duY2FzdDxFbGVtZW50PihldmVudC50YXJnZXQo KSkgOiBudWxscHRyOworICAgICAgICAgICAgaWYgKCFzY3JpcHRFeGVjdXRpb25Db250ZXh0LmNv bnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0lubGluZUV2ZW50SGFuZGxlcnMoc291cmNlVVJM KCkuc3RyaW5nKCksIHNvdXJjZVBvc2l0aW9uKCkubV9saW5lLCBjb2RlKCksIGVsZW1lbnQpKQor ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgICAgICAvLyBGSVhNRTogSXMg dGhpcyBjaGVjayBuZWVkZWQgZm9yIG90aGVyIGNvbnRleHRzPwogICAgICAgICBTY3JpcHRDb250 cm9sbGVyJiBzY3JpcHQgPSB3aW5kb3ctPndyYXBwZWQoKS5mcmFtZSgpLT5zY3JpcHQoKTsKICAg ICAgICAgaWYgKCFzY3JpcHQuY2FuRXhlY3V0ZVNjcmlwdHMoQWJvdXRUb0V4ZWN1dGVTY3JpcHQp IHx8IHNjcmlwdC5pc1BhdXNlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNMYXp5RXZlbnRMaXN0ZW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0xhenlFdmVudExpc3RlbmVyLmNwcAppbmRleCA2ZDJkNWI0YTYwMDMuLjEzNzIzYWE5NWNh OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNMYXp5RXZlbnRMaXN0 ZW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNMYXp5RXZlbnRMaXN0 ZW5lci5jcHAKQEAgLTEzMSw3ICsxMzEsOCBAQCBKU09iamVjdCogSlNMYXp5RXZlbnRMaXN0ZW5l cjo6aW5pdGlhbGl6ZUpTRnVuY3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgZXhlYwogICAg IGlmICghZG9jdW1lbnQuZnJhbWUoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBp ZiAoIWRvY3VtZW50LmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0lubGluZUV2ZW50SGFu ZGxlcnMobV9zb3VyY2VVUkwuc3RyaW5nKCksIG1fc291cmNlUG9zaXRpb24ubV9saW5lLCBtX2Nv ZGUpKQorICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBtX29yaWdpbmFsTm9kZSAmJiAhbV9vcmlnaW5h bE5vZGUtPmlzRG9jdW1lbnROb2RlKCkgJiYgaXM8RWxlbWVudD4oKm1fb3JpZ2luYWxOb2RlKSA/ IGRvd25jYXN0PEVsZW1lbnQ+KG1fb3JpZ2luYWxOb2RlLmdldCgpKSA6IG51bGxwdHI7CisgICAg aWYgKCFkb2N1bWVudC5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dJbmxpbmVFdmVudEhh bmRsZXJzKG1fc291cmNlVVJMLnN0cmluZygpLCBtX3NvdXJjZVBvc2l0aW9uLm1fbGluZSwgbV9j b2RlLCBlbGVtZW50KSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBhdXRvJiBzY3Jp cHQgPSBkb2N1bWVudC5mcmFtZSgpLT5zY3JpcHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRl eCA1ZDdiMWJlMjYxNjQuLjg1NTI5YTA4NWY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAt NTIsNiArNTIsNyBAQAogI2luY2x1ZGUgIkVsZW1lbnRSYXJlRGF0YS5oIgogI2luY2x1ZGUgIkV2 ZW50RGlzcGF0Y2hlci5oIgogI2luY2x1ZGUgIkV2ZW50SGFuZGxlci5oIgorI2luY2x1ZGUgIkV2 ZW50TG9vcC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGb2N1c0NvbnRy b2xsZXIuaCIKICNpbmNsdWRlICJGb2N1c0V2ZW50LmgiCkBAIC0xMDksNiArMTEwLDcgQEAKICNp bmNsdWRlICJTY3JpcHREaXNhbGxvd2VkU2NvcGUuaCIKICNpbmNsdWRlICJTY3JvbGxJbnRvVmll d09wdGlvbnMuaCIKICNpbmNsdWRlICJTY3JvbGxMYXRjaGluZ0NvbnRyb2xsZXIuaCIKKyNpbmNs dWRlICJTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50LmgiCiAjaW5jbHVkZSAiU2VsZWN0b3JR dWVyeS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU2hhZG93Um9vdEluaXQu aCIKQEAgLTMzMTMsNiArMzMxNSwxMyBAQCBib29sIEVsZW1lbnQ6OmRpc3BhdGNoTW91c2VGb3Jj ZVdpbGxCZWdpbigpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCit2b2lkIEVsZW1lbnQ6OmVucXVl dWVTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50KFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZl bnRJbml0JiYgZXZlbnRJbml0KQoreworICAgIGRvY3VtZW50KCkuZXZlbnRMb29wKCkucXVldWVU YXNrKFRhc2tTb3VyY2U6OkRPTU1hbmlwdWxhdGlvbiwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBS ZWYgeyAqdGhpcyB9LCBldmVudCA9IFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQ6OmNyZWF0 ZShldmVudE5hbWVzKCkuc2VjdXJpdHlwb2xpY3l2aW9sYXRpb25FdmVudCwgV1RGTW92ZShldmVu dEluaXQpLCBFdmVudDo6SXNUcnVzdGVkOjpZZXMpXSB7CisgICAgICAgIGRpc3BhdGNoRXZlbnQo ZXZlbnQpOworICAgIH0pOworfQorCiBFeGNlcHRpb25Pcjx2b2lkPiBFbGVtZW50OjptZXJnZVdp dGhOZXh0VGV4dE5vZGUoVGV4dCYgbm9kZSkKIHsKICAgICBhdXRvKiBuZXh0ID0gbm9kZS5uZXh0 U2libGluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKaW5kZXggMDRjZTY1ZGU2ZTg3Li4zMzc3NmYzOGIz NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtODgsNiArODgsNyBAQCBzdHJ1Y3QgS2V5ZnJhbWVB bmltYXRpb25PcHRpb25zOwogc3RydWN0IFJlc2l6ZU9ic2VydmVyRGF0YTsKIHN0cnVjdCBTY3Jv bGxJbnRvVmlld09wdGlvbnM7CiBzdHJ1Y3QgU2Nyb2xsVG9PcHRpb25zOworc3RydWN0IFNlY3Vy aXR5UG9saWN5VmlvbGF0aW9uRXZlbnRJbml0Owogc3RydWN0IFNoYWRvd1Jvb3RJbml0OwogCiBu YW1lc3BhY2UgU3R5bGUgewpAQCAtNTcwLDYgKzU3MSw4IEBAIHB1YmxpYzoKIAogICAgIFdFQkNP UkVfRVhQT1JUIGJvb2wgZGlzcGF0Y2hNb3VzZUZvcmNlV2lsbEJlZ2luKCk7CiAKKyAgICB2b2lk IGVucXVldWVTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50KFNlY3VyaXR5UG9saWN5VmlvbGF0 aW9uRXZlbnRJbml0JiYpOworCiAgICAgdmlydHVhbCB2b2lkIHdpbGxSZWNhbGNTdHlsZShTdHls ZTo6Q2hhbmdlKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjYWxjU3R5bGUoU3R5bGU6OkNoYW5n ZSk7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxSZXNldENvbXB1dGVkU3R5bGUoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9JbmxpbmVTdHlsZVNoZWV0T3duZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0lubGluZVN0eWxlU2hlZXRPd25lci5jcHAKaW5kZXggZDEzYTQ0ZmNhNDRj Li5mNmEwNmZiZTk4ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9JbmxpbmVTdHls ZVNoZWV0T3duZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9JbmxpbmVTdHlsZVNoZWV0 T3duZXIuY3BwCkBAIC0xNjksNyArMTY5LDcgQEAgdm9pZCBJbmxpbmVTdHlsZVNoZWV0T3duZXI6 OmNyZWF0ZVNoZWV0KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFN0cmluZyYgdGV4dCkKICAgICBB U1NFUlQoZG9jdW1lbnQuY29udGVudFNlY3VyaXR5UG9saWN5KCkpOwogICAgIGNvbnN0IENvbnRl bnRTZWN1cml0eVBvbGljeSYgY29udGVudFNlY3VyaXR5UG9saWN5ID0gKmRvY3VtZW50LmNvbnRl bnRTZWN1cml0eVBvbGljeSgpOwogICAgIGJvb2wgaGFzS25vd25Ob25jZSA9IGNvbnRlbnRTZWN1 cml0eVBvbGljeS5hbGxvd1N0eWxlV2l0aE5vbmNlKGVsZW1lbnQubm9uY2UoKSwgZWxlbWVudC5p c0luVXNlckFnZW50U2hhZG93VHJlZSgpKTsKLSAgICBpZiAoIWNvbnRlbnRTZWN1cml0eVBvbGlj eS5hbGxvd0lubGluZVN0eWxlKGRvY3VtZW50LnVybCgpLnN0cmluZygpLCBtX3N0YXJ0VGV4dFBv c2l0aW9uLm1fbGluZSwgdGV4dCwgQ2hlY2tVbnNhZmVIYXNoZXM6Ok5vLCBoYXNLbm93bk5vbmNl KSkKKyAgICBpZiAoIWNvbnRlbnRTZWN1cml0eVBvbGljeS5hbGxvd0lubGluZVN0eWxlKGRvY3Vt ZW50LnVybCgpLnN0cmluZygpLCBtX3N0YXJ0VGV4dFBvc2l0aW9uLm1fbGluZSwgdGV4dCwgQ2hl Y2tVbnNhZmVIYXNoZXM6Ok5vLCBlbGVtZW50LCBoYXNLbm93bk5vbmNlKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgYXV0byBtZWRpYVF1ZXJpZXMgPSBNZWRpYVF1ZXJ5U2V0OjpjcmVhdGUobV9t ZWRpYSwgTWVkaWFRdWVyeVBhcnNlckNvbnRleHQoZG9jdW1lbnQpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9T Y3JpcHRFbGVtZW50LmNwcAppbmRleCBmMDNiZTdhYzcwMDYuLjIzOTJhM2FhZWY1ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9TY3JpcHRFbGVtZW50LmNwcApAQCAtMzc3LDcgKzM3Nyw3IEBAIGJvb2wgU2Ny aXB0RWxlbWVudDo6cmVxdWVzdE1vZHVsZVNjcmlwdChjb25zdCBUZXh0UG9zaXRpb24mIHNjcmlw dFN0YXJ0UG9zaXRpb24pCiAgICAgQVNTRVJUKG1fZWxlbWVudC5kb2N1bWVudCgpLmNvbnRlbnRT ZWN1cml0eVBvbGljeSgpKTsKICAgICBjb25zdCBhdXRvJiBjb250ZW50U2VjdXJpdHlQb2xpY3kg PSAqbV9lbGVtZW50LmRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5UG9saWN5KCk7CiAgICAgYm9v bCBoYXNLbm93bk5vbmNlID0gY29udGVudFNlY3VyaXR5UG9saWN5LmFsbG93U2NyaXB0V2l0aE5v bmNlKG5vbmNlLCBtX2VsZW1lbnQuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7Ci0gICAgaWYg KCFjb250ZW50U2VjdXJpdHlQb2xpY3kuYWxsb3dJbmxpbmVTY3JpcHQobV9lbGVtZW50LmRvY3Vt ZW50KCkudXJsKCkuc3RyaW5nKCksIG1fc3RhcnRMaW5lTnVtYmVyLCBzb3VyY2VDb2RlLnNvdXJj ZSgpLCBoYXNLbm93bk5vbmNlKSkKKyAgICBpZiAoIWNvbnRlbnRTZWN1cml0eVBvbGljeS5hbGxv d0lubGluZVNjcmlwdChtX2VsZW1lbnQuZG9jdW1lbnQoKS51cmwoKS5zdHJpbmcoKSwgbV9zdGFy dExpbmVOdW1iZXIsIHNvdXJjZUNvZGUuc291cmNlKCksIG1fZWxlbWVudCwgaGFzS25vd25Ob25j ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIG1fbG9hZGFibGVTY3JpcHQgPSBXVEZN b3ZlKHNjcmlwdCk7CkBAIC00MDEsNyArNDAxLDcgQEAgdm9pZCBTY3JpcHRFbGVtZW50OjpleGVj dXRlQ2xhc3NpY1NjcmlwdChjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2VDb2RlKQogICAg ICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGJvb2wgaGFzS25vd25Ob25jZSA9IGNvbnRlbnRT ZWN1cml0eVBvbGljeS5hbGxvd1NjcmlwdFdpdGhOb25jZShtX2VsZW1lbnQubm9uY2UoKSwgbV9l bGVtZW50LmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwotICAgICAgICBpZiAoIWNvbnRlbnRT ZWN1cml0eVBvbGljeS5hbGxvd0lubGluZVNjcmlwdChtX2VsZW1lbnQuZG9jdW1lbnQoKS51cmwo KS5zdHJpbmcoKSwgbV9zdGFydExpbmVOdW1iZXIsIHNvdXJjZUNvZGUuc291cmNlKCksIGhhc0tu b3duTm9uY2UpKQorICAgICAgICBpZiAoIWNvbnRlbnRTZWN1cml0eVBvbGljeS5hbGxvd0lubGlu ZVNjcmlwdChtX2VsZW1lbnQuZG9jdW1lbnQoKS51cmwoKS5zdHJpbmcoKSwgbV9zdGFydExpbmVO dW1iZXIsIHNvdXJjZUNvZGUuc291cmNlKCksIG1fZWxlbWVudCwgaGFzS25vd25Ob25jZSkpCiAg ICAgICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vU3R5bGVkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5j cHAKaW5kZXggNzliODRiZWQ4NDIxLi42YWMxZTNjMGM1YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5 bGVkRWxlbWVudC5jcHAKQEAgLTIwNiw3ICsyMDYsNyBAQCB2b2lkIFN0eWxlZEVsZW1lbnQ6OnN0 eWxlQXR0cmlidXRlQ2hhbmdlZChjb25zdCBBdG9tU3RyaW5nJiBuZXdTdHlsZVN0cmluZywgQXR0 cgogICAgIGlmIChkb2N1bWVudCgpLnNjcmlwdGFibGVEb2N1bWVudFBhcnNlcigpICYmICFkb2N1 bWVudCgpLmlzSW5Eb2N1bWVudFdyaXRlKCkpCiAgICAgICAgIHN0YXJ0TGluZU51bWJlciA9IGRv Y3VtZW50KCkuc2NyaXB0YWJsZURvY3VtZW50UGFyc2VyKCktPnRleHRQb3NpdGlvbigpLm1fbGlu ZTsKIAotICAgIGlmIChyZWFzb24gPT0gTW9kaWZpZWRCeUNsb25pbmcgfHwgZG9jdW1lbnQoKS5j b250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dJbmxpbmVTdHlsZShkb2N1bWVudCgpLnVybCgp LnN0cmluZygpLCBzdGFydExpbmVOdW1iZXIsIG5ld1N0eWxlU3RyaW5nLnN0cmluZygpLCBDaGVj a1Vuc2FmZUhhc2hlczo6WWVzLCBpc0luVXNlckFnZW50U2hhZG93VHJlZSgpKSkKKyAgICBpZiAo cmVhc29uID09IE1vZGlmaWVkQnlDbG9uaW5nIHx8IGRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5 UG9saWN5KCktPmFsbG93SW5saW5lU3R5bGUoZG9jdW1lbnQoKS51cmwoKS5zdHJpbmcoKSwgc3Rh cnRMaW5lTnVtYmVyLCBuZXdTdHlsZVN0cmluZy5zdHJpbmcoKSwgQ2hlY2tVbnNhZmVIYXNoZXM6 OlllcywgKnRoaXMsIGlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpKQogICAgICAgICBzZXRJbmxp bmVTdHlsZUZyb21TdHJpbmcobmV3U3R5bGVTdHJpbmcpOwogCiAgICAgZWxlbWVudERhdGEoKS0+ c2V0U3R5bGVBdHRyaWJ1dGVJc0RpcnR5KGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDU4ZWMwNjM3NDkyYS4uOTU3 MzVjMDBlYzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2Vj dXJpdHlQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHAKQEAgLTQxNiwxNCArNDE2LDE0IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5 UG9saWN5OjphbGxvd0phdmFTY3JpcHRVUkxzKGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29u c3QKICAgICByZXR1cm4gY2hlY2tIYXNoQW5kUmVwb3J0VmlvbGF0aW9uKHNvdXJjZSwgJkNvbnRl bnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZl SW5saW5lU2NyaXB0RWxlbWVudCwgJkNvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6 OnZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSGFzaFNjcmlwdCwgbV9oYXNoQWxnb3JpdGhtc0Zv cklubGluZVNjcmlwdHMsIGhhbmRsZVZpb2xhdGVkRGlyZWN0aXZlKTsKIH0KIAotYm9vbCBDb250 ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5lRXZlbnRIYW5kbGVycyhjb25zdCBTdHJpbmcm IGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBjb25zdCBTdHJp bmcmIHNvdXJjZSwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSkgY29uc3QKK2Jv b2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZUV2ZW50SGFuZGxlcnMoY29uc3Qg U3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgY29u c3QgU3RyaW5nJiBzb3VyY2UsIEVsZW1lbnQqIGVsZW1lbnQsIGJvb2wgb3ZlcnJpZGVDb250ZW50 U2VjdXJpdHlQb2xpY3kpIGNvbnN0CiB7CiAgICAgaWYgKG92ZXJyaWRlQ29udGVudFNlY3VyaXR5 UG9saWN5KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBib29sIGRpZE5vdGlmeUluc3BlY3Rv ciA9IGZhbHNlOwogICAgIGF1dG8gaGFuZGxlVmlvbGF0ZWREaXJlY3RpdmUgPSBbJl0gKGNvbnN0 IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSYgdmlvbGF0ZWREaXJlY3RpdmUpIHsKICAg ICAgICAgU3RyaW5nIGNvbnNvbGVNZXNzYWdlID0gY29uc29sZU1lc3NhZ2VGb3JWaW9sYXRpb24o Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWRE aXJlY3RpdmUsIFVSTCgpLCAiUmVmdXNlZCB0byBleGVjdXRlIGEgc2NyaXB0IGZvciBhbiBpbmxp bmUgZXZlbnQgaGFuZGxlciIsICIndW5zYWZlLWlubGluZSciKTsKLSAgICAgICAgcmVwb3J0Vmlv bGF0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpzY3JpcHRTcmMsIHZp b2xhdGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xlTWVzc2FnZSwgY29udGV4dFVSTCwg VGV4dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVtYmVyKCkpKTsKKyAgICAgICAgcmVw b3J0VmlvbGF0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpzY3JpcHRT cmMsIHZpb2xhdGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xlTWVzc2FnZSwgY29udGV4 dFVSTCwgVGV4dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVtYmVyKCkpLCBVUkwoKSwg bnVsbHB0ciwgZWxlbWVudCk7CiAgICAgICAgIGlmICghZGlkTm90aWZ5SW5zcGVjdG9yICYmICF2 aW9sYXRlZERpcmVjdGl2ZS5kaXJlY3RpdmVMaXN0KCkuaXNSZXBvcnRPbmx5KCkpIHsKICAgICAg ICAgICAgIHJlcG9ydEJsb2NrZWRTY3JpcHRFeGVjdXRpb25Ub0luc3BlY3Rvcih2aW9sYXRlZERp cmVjdGl2ZS50ZXh0KCkpOwogICAgICAgICAgICAgZGlkTm90aWZ5SW5zcGVjdG9yID0gdHJ1ZTsK QEAgLTQ4MCwxNCArNDgwLDE0IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd05v blBhcnNlckluc2VydGVkU2NyaXB0cyhjb25zdCBVUkwmIHVybCwgY29uc3QKICAgICByZXR1cm4g YWxsU2NyaXB0UG9saWNpZXNBbGxvdyhoYW5kbGVWaW9sYXRlZERpcmVjdGl2ZSwgdXJsLCBub25j ZSwgc2NyaXB0Q29udGVudCwgcGFyc2VySW5zZXJ0ZWQpOwogfQogCi1ib29sIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBj b25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgU3RyaW5nVmlldyBzY3JpcHRDb250ZW50 LCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KSBjb25zdAorYm9vbCBDb250ZW50 U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5lU2NyaXB0KGNvbnN0IFN0cmluZyYgY29udGV4dFVS TCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIFN0cmluZ1ZpZXcgc2NyaXB0Q29u dGVudCwgRWxlbWVudCYgZWxlbWVudCwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGlj eSkgY29uc3QKIHsKICAgICBpZiAob3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgfHwgc2hv dWxkUGVyZm9ybUVhcmx5Q1NQQ2hlY2soKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgYm9v bCBkaWROb3RpZnlJbnNwZWN0b3IgPSBmYWxzZTsKICAgICBhdXRvIGhhbmRsZVZpb2xhdGVkRGly ZWN0aXZlID0gWyZdIChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUmIHZpb2xh dGVkRGlyZWN0aXZlKSB7CiAgICAgICAgIFN0cmluZyBjb25zb2xlTWVzc2FnZSA9IGNvbnNvbGVN ZXNzYWdlRm9yVmlvbGF0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpz Y3JpcHRTcmMsIHZpb2xhdGVkRGlyZWN0aXZlLCBVUkwoKSwgIlJlZnVzZWQgdG8gZXhlY3V0ZSBh IHNjcmlwdCIsICJpdHMgaGFzaCwgaXRzIG5vbmNlLCBvciAndW5zYWZlLWlubGluZSciKTsKLSAg ICAgICAgcmVwb3J0VmlvbGF0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVz OjpzY3JpcHRTcmMsIHZpb2xhdGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xlTWVzc2Fn ZSwgY29udGV4dFVSTCwgVGV4dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVtYmVyKCkp KTsKKyAgICAgICAgcmVwb3J0VmlvbGF0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2 ZU5hbWVzOjpzY3JpcHRTcmMsIHZpb2xhdGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xl TWVzc2FnZSwgY29udGV4dFVSTCwgVGV4dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVt YmVyKCkpLCBVUkwoKSwgbnVsbHB0ciwgJmVsZW1lbnQpOwogICAgICAgICBpZiAoIWRpZE5vdGlm eUluc3BlY3RvciAmJiAhdmlvbGF0ZWREaXJlY3RpdmUuZGlyZWN0aXZlTGlzdCgpLmlzUmVwb3J0 T25seSgpKSB7CiAgICAgICAgICAgICByZXBvcnRCbG9ja2VkU2NyaXB0RXhlY3V0aW9uVG9JbnNw ZWN0b3IodmlvbGF0ZWREaXJlY3RpdmUudGV4dCgpKTsKICAgICAgICAgICAgIGRpZE5vdGlmeUlu c3BlY3RvciA9IHRydWU7CkBAIC00OTgsNyArNDk4LDcgQEAgYm9vbCBDb250ZW50U2VjdXJpdHlQ b2xpY3k6OmFsbG93SW5saW5lU2NyaXB0KGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3Qg T3IKICAgICByZXR1cm4gY2hlY2tIYXNoQW5kUmVwb3J0VmlvbGF0aW9uKHNjcmlwdENvbnRlbnQu dG9TdHJpbmcoKSwgJkNvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVk RGlyZWN0aXZlRm9yVW5zYWZlSW5saW5lU2NyaXB0RWxlbWVudCwgJkNvbnRlbnRTZWN1cml0eVBv bGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yU2NyaXB0SGFzaCwgbV9oYXNo QWxnb3JpdGhtc0ZvcklubGluZVNjcmlwdHMsIGhhbmRsZVZpb2xhdGVkRGlyZWN0aXZlKTsKIH0K IAotYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5lU3R5bGUoY29uc3QgU3Ry aW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgU3RyaW5n VmlldyBzdHlsZUNvbnRlbnQsIENoZWNrVW5zYWZlSGFzaGVzIHNob3VsZENoZWNrVW5zYWZlSGFz aGVzLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KSBjb25zdAorYm9vbCBDb250 ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5lU3R5bGUoY29uc3QgU3RyaW5nJiBjb250ZXh0 VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgU3RyaW5nVmlldyBzdHlsZUNv bnRlbnQsIENoZWNrVW5zYWZlSGFzaGVzIHNob3VsZENoZWNrVW5zYWZlSGFzaGVzLCBFbGVtZW50 JiBlbGVtZW50LCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KSBjb25zdAogewog ICAgIGlmIChvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSkKICAgICAgICAgcmV0dXJuIHRy dWU7CkBAIC01MDcsNyArNTA3LDcgQEAgYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93 SW5saW5lU3R5bGUoY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmQKICAgICBhdXRv IGhhbmRsZVZpb2xhdGVkRGlyZWN0aXZlID0gWyZdIChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xp Y3lEaXJlY3RpdmUmIHZpb2xhdGVkRGlyZWN0aXZlKSB7CiAgICAgICAgIGF1dG8gbmFtZSA9IHNo b3VsZENoZWNrVW5zYWZlSGFzaGVzID09IENoZWNrVW5zYWZlSGFzaGVzOjpZZXMgPyBDb250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVOYW1lczo6c3R5bGVTcmNBdHRyIDogQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlTmFtZXM6OnN0eWxlU3JjRWxlbTsKICAgICAgICAgU3RyaW5nIGNv bnNvbGVNZXNzYWdlID0gY29uc29sZU1lc3NhZ2VGb3JWaW9sYXRpb24oQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTmFtZXM6OnN0eWxlU3JjLCB2aW9sYXRlZERpcmVjdGl2ZSwgVVJMKCks ICJSZWZ1c2VkIHRvIGFwcGx5IGEgc3R5bGVzaGVldCIsICJpdHMgaGFzaCwgaXRzIG5vbmNlLCBv ciAndW5zYWZlLWlubGluZSciKTsKLSAgICAgICAgcmVwb3J0VmlvbGF0aW9uKG5hbWUsIHZpb2xh dGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xlTWVzc2FnZSwgY29udGV4dFVSTCwgVGV4 dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVtYmVyKCkpKTsKKyAgICAgICAgcmVwb3J0 VmlvbGF0aW9uKG5hbWUsIHZpb2xhdGVkRGlyZWN0aXZlLCAiaW5saW5lIl9zLCBjb25zb2xlTWVz c2FnZSwgY29udGV4dFVSTCwgVGV4dFBvc2l0aW9uKGNvbnRleHRMaW5lLCBPcmRpbmFsTnVtYmVy KCkpLCBVUkwoKSwgbnVsbHB0ciwgJmVsZW1lbnQpOwogICAgIH07CiAKICAgICBpZiAoc2hvdWxk Q2hlY2tVbnNhZmVIYXNoZXMgPT0gQ2hlY2tVbnNhZmVIYXNoZXM6OlllcykKQEAgLTczNCwxMiAr NzM0LDEyIEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29u c3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjCiAgICAgcmV0dXJuIHJlcG9ydFZpb2xh dGlvbihlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgdmlvbGF0ZWREaXJlY3RpdmUsIHZpb2xh dGVkRGlyZWN0aXZlTGlzdCwgYmxvY2tlZFVSTCwgY29uc29sZU1lc3NhZ2UsIFN0cmluZygpLCBU ZXh0UG9zaXRpb24oT3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3QoKSwgT3JkaW5hbE51bWJlcjo6 YmVmb3JlRmlyc3QoKSksIHN0YXRlKTsKIH0KIAotdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OnJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUmIHZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2Us IGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0 aW9uLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiBzdGF0 ZSkgY29uc3QKK3ZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29u c3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiBibG9j a2VkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlLCBjb25zdCBTdHJpbmcmIHNvdXJj ZVVSTCwgY29uc3QgVGV4dFBvc2l0aW9uJiBzb3VyY2VQb3NpdGlvbiwgY29uc3QgVVJMJiBwcmVS ZWRpcmVjdFVSTCwgSlNDOjpKU0dsb2JhbE9iamVjdCogc3RhdGUsIEVsZW1lbnQqIGVsZW1lbnQp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIHJlcG9ydFZpb2xhdGlvbihlZmZlY3RpdmVWaW9sYXRlZERp cmVjdGl2ZSwgdmlvbGF0ZWREaXJlY3RpdmUubmFtZUZvclJlcG9ydGluZygpLmNvbnZlcnRUb0FT Q0lJTG93ZXJjYXNlKCksIHZpb2xhdGVkRGlyZWN0aXZlLmRpcmVjdGl2ZUxpc3QoKSwgYmxvY2tl ZFVSTCwgY29uc29sZU1lc3NhZ2UsIHNvdXJjZVVSTCwgc291cmNlUG9zaXRpb24sIHN0YXRlLCBw cmVSZWRpcmVjdFVSTCk7CisgICAgcmV0dXJuIHJlcG9ydFZpb2xhdGlvbihlZmZlY3RpdmVWaW9s YXRlZERpcmVjdGl2ZSwgdmlvbGF0ZWREaXJlY3RpdmUubmFtZUZvclJlcG9ydGluZygpLmNvbnZl cnRUb0FTQ0lJTG93ZXJjYXNlKCksIHZpb2xhdGVkRGlyZWN0aXZlLmRpcmVjdGl2ZUxpc3QoKSwg YmxvY2tlZFVSTCwgY29uc29sZU1lc3NhZ2UsIHNvdXJjZVVSTCwgc291cmNlUG9zaXRpb24sIHN0 YXRlLCBwcmVSZWRpcmVjdFVSTCwgZWxlbWVudCk7CiB9CiAKLXZvaWQgQ29udGVudFNlY3VyaXR5 UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERp cmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdCYgdmlvbGF0ZWREaXJlY3RpdmVMaXN0LCBjb25zdCBT dHJpbmcmIGJsb2NrZWRVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2UsIGNv bnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0aW9u LCBKU0M6OkpTR2xvYmFsT2JqZWN0KiBzdGF0ZSwgY29uc3QgVVJMJiBwcmVSZWRpcmVjdFVSTCkg Y29uc3QKK3ZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3Qg U3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB2aW9sYXRl ZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdCYgdmlv bGF0ZWREaXJlY3RpdmVMaXN0LCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgY29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBU ZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0aW9uLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiBzdGF0ZSwg Y29uc3QgVVJMJiBwcmVSZWRpcmVjdFVSTCwgRWxlbWVudCogZWxlbWVudCkgY29uc3QKIHsKICAg ICBsb2dUb0NvbnNvbGUoY29uc29sZU1lc3NhZ2UsIHNvdXJjZVVSTCwgc291cmNlUG9zaXRpb24u bV9saW5lLCBzb3VyY2VQb3NpdGlvbi5tX2NvbHVtbiwgc3RhdGUpOwogCkBAIC04MDQsOCArODA0 LDEzIEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3Qg U3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjCiAgICAgdmlvbGF0aW9uRXZlbnRJbml0LmJ1 YmJsZXMgPSB0cnVlOwogICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgbV9jbGllbnQtPmVucXVl dWVTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50KFdURk1vdmUodmlvbGF0aW9uRXZlbnRJbml0 KSk7Ci0gICAgZWxzZQotICAgICAgICBkb3duY2FzdDxEb2N1bWVudD4oKm1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCkuZW5xdWV1ZVNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQoV1RGTW92ZSh2 aW9sYXRpb25FdmVudEluaXQpKTsKKyAgICBlbHNlIHsKKyAgICAgICAgYXV0byYgZG9jdW1lbnQg PSBkb3duY2FzdDxEb2N1bWVudD4oKm1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAg IGlmIChlbGVtZW50ICYmIGVsZW1lbnQtPmRvY3VtZW50KCkgPT0gZG9jdW1lbnQpCisgICAgICAg ICAgICBlbGVtZW50LT5lbnF1ZXVlU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudChXVEZNb3Zl KHZpb2xhdGlvbkV2ZW50SW5pdCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkb2N1bWVu dC5lbnF1ZXVlU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudChXVEZNb3ZlKHZpb2xhdGlvbkV2 ZW50SW5pdCkpOworICAgIH0KIAogICAgIC8vIDIuIFNlbmQgdmlvbGF0aW9uIHJlcG9ydCAoaWYg YXBwbGljYWJsZSkuCiAgICAgYXV0byYgcmVwb3J0VVJJcyA9IHZpb2xhdGVkRGlyZWN0aXZlTGlz dC5yZXBvcnRVUklzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250 ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5oCmluZGV4IDlhNThjMzYzOTdhZS4uOTI1YWJkYTY2NjI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaApAQCAtNTEsNiAr NTEsNyBAQCBjbGFzcyBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmU7CiBjbGFzcyBDb250 ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0OwogY2xhc3MgQ29udGVudFNlY3VyaXR5UG9s aWN5U291cmNlOwogY2xhc3MgRE9NU3RyaW5nTGlzdDsKK2NsYXNzIEVsZW1lbnQ7CiBjbGFzcyBG cmFtZTsKIGNsYXNzIEpTV2luZG93UHJveHk7CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CkBAIC05 NSwxMCArOTYsMTAgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dTdHlsZVdpdGhOb25jZShjb25z dCBTdHJpbmcmIG5vbmNlLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5ID0gZmFs c2UpIGNvbnN0OwogCiAgICAgYm9vbCBhbGxvd0phdmFTY3JpcHRVUkxzKGNvbnN0IFN0cmluZyYg Y29udGV4dFVSTCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIGNvbnN0IFN0cmlu ZyYgY29kZSwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZhbHNlKSBjb25z dDsKLSAgICBib29sIGFsbG93SW5saW5lRXZlbnRIYW5kbGVycyhjb25zdCBTdHJpbmcmIGNvbnRl eHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBjb25zdCBTdHJpbmcmIGNv ZGUsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7Ci0g ICAgYm9vbCBhbGxvd0lubGluZVNjcmlwdChjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0 IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBTdHJpbmdWaWV3IHNjcmlwdENvbnRlbnQsIGJv b2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CisgICAgYm9v bCBhbGxvd0lubGluZUV2ZW50SGFuZGxlcnMoY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25z dCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgY29uc3QgU3RyaW5nJiBjb2RlLCBFbGVtZW50 KiwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZhbHNlKSBjb25zdDsKKyAg ICBib29sIGFsbG93SW5saW5lU2NyaXB0KGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3Qg T3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIFN0cmluZ1ZpZXcgc2NyaXB0Q29udGVudCwgRWxl bWVudCYsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7 CiAgICAgYm9vbCBhbGxvd05vblBhcnNlckluc2VydGVkU2NyaXB0cyhjb25zdCBVUkwmLCBjb25z dCBTdHJpbmcmLCBjb25zdCBTdHJpbmdWaWV3JiwgUGFyc2VySW5zZXJ0ZWQpIGNvbnN0OwotICAg IGJvb2wgYWxsb3dJbmxpbmVTdHlsZShjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IE9y ZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBTdHJpbmdWaWV3IHN0eWxlQ29udGVudCwgQ2hlY2tV bnNhZmVIYXNoZXMsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkg Y29uc3Q7CisgICAgYm9vbCBhbGxvd0lubGluZVN0eWxlKGNvbnN0IFN0cmluZyYgY29udGV4dFVS TCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIFN0cmluZ1ZpZXcgc3R5bGVDb250 ZW50LCBDaGVja1Vuc2FmZUhhc2hlcywgRWxlbWVudCYsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2Vj dXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CiAKICAgICBib29sIGFsbG93RXZhbChKU0M6OkpT R2xvYmFsT2JqZWN0KiwgTG9nVG9Db25zb2xlLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5 UG9saWN5ID0gZmFsc2UpIGNvbnN0OwogCkBAIC0yMjIsOCArMjIzLDggQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgcmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZWZmZWN0aXZlVmlvbGF0ZWRE aXJlY3RpdmUsIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSYgdmlvbGF0ZWRE aXJlY3RpdmUsIGNvbnN0IFN0cmluZyYgYmxvY2tlZFVSTCwgY29uc3QgU3RyaW5nJiBjb25zb2xl TWVzc2FnZSwgSlNDOjpKU0dsb2JhbE9iamVjdCopIGNvbnN0OwogICAgIHZvaWQgcmVwb3J0Vmlv bGF0aW9uKGNvbnN0IFN0cmluZyYgZWZmZWN0aXZlVmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IFN0 cmluZyYgdmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVj dGl2ZUxpc3QmLCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29s ZU1lc3NhZ2UsIEpTQzo6SlNHbG9iYWxPYmplY3QqID0gbnVsbHB0cikgY29uc3Q7Ci0gICAgdm9p ZCByZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2 ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlJiB2aW9sYXRlZERpcmVjdGl2 ZSwgY29uc3QgU3RyaW5nJiBibG9ja2VkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdl LCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgVGV4dFBvc2l0aW9uJiBzb3VyY2VQb3Np dGlvbiwgY29uc3QgVVJMJiBwcmVSZWRpcmVjdFVSTCA9IFVSTCgpLCBKU0M6OkpTR2xvYmFsT2Jq ZWN0KiA9IG51bGxwdHIpIGNvbnN0OwotICAgIHZvaWQgcmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0 cmluZyYgZWZmZWN0aXZlVmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IFN0cmluZyYgdmlvbGF0ZWRE aXJlY3RpdmUsIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QmIHZpb2xh dGVkRGlyZWN0aXZlTGlzdCwgY29uc3QgU3RyaW5nJiBibG9ja2VkVVJMLCBjb25zdCBTdHJpbmcm IGNvbnNvbGVNZXNzYWdlLCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgVGV4dFBvc2l0 aW9uJiBzb3VyY2VQb3NpdGlvbiwgSlNDOjpKU0dsb2JhbE9iamVjdCosIGNvbnN0IFVSTCYgcHJl UmVkaXJlY3RVUkwgPSBVUkwoKSkgY29uc3Q7CisgICAgdm9pZCByZXBvcnRWaW9sYXRpb24oY29u c3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiBibG9j a2VkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlLCBjb25zdCBTdHJpbmcmIHNvdXJj ZVVSTCwgY29uc3QgVGV4dFBvc2l0aW9uJiBzb3VyY2VQb3NpdGlvbiwgY29uc3QgVVJMJiBwcmVS ZWRpcmVjdFVSTCA9IFVSTCgpLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiA9IG51bGxwdHIsIEVsZW1l bnQqID0gbnVsbHB0cikgY29uc3Q7CisgICAgdm9pZCByZXBvcnRWaW9sYXRpb24oY29uc3QgU3Ry aW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB2aW9sYXRlZERp cmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdCYgdmlvbGF0 ZWREaXJlY3RpdmVMaXN0LCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYg Y29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRp b24mIHNvdXJjZVBvc2l0aW9uLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiwgY29uc3QgVVJMJiBwcmVS ZWRpcmVjdFVSTCA9IFVSTCgpLCBFbGVtZW50KiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQg cmVwb3J0QmxvY2tlZFNjcmlwdEV4ZWN1dGlvblRvSW5zcGVjdG9yKGNvbnN0IFN0cmluZyYgZGly ZWN0aXZlVGV4dCkgY29uc3Q7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWaW9sYXRlZERpcmVj dGl2ZSwgdHlwZW5hbWUgSGFzaFNlYXJjaFBvbGljeT4gYm9vbCBjaGVja0hhc2hBbmRSZXBvcnRW aW9sYXRpb24oY29uc3QgU3RyaW5nJiwgY29uc3QgVmlvbGF0ZWREaXJlY3RpdmUmLCBjb25zdCBI YXNoU2VhcmNoUG9saWN5JiwgT3B0aW9uU2V0PENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2hBbGdv cml0aG0+LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlZpb2xhdGVkRGlyZWN0aXZlQ2FsbGJhY2sm JikgY29uc3Q7Cg== 444954 2021-11-22 02:54:05 -0800 2021-11-23 08:11:55 -0800 Patch wcore-csp-violation-event-target.diff text/plain 32805 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyYWEwNDQ5NzgxMDQuLjkwNDllMjEwYjczZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTExLTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBDU1A6IHNlY3VyaXR5IHBvbGljeSB2aW9sYXRpb24gZXZlbnQgaXMgYWx3YXlz IHVzaW5nIGRvY3VtZW50IGFzIHRhcmdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgbm8gbG9uZ2VyIHRpbWUgb3V0Lgor CisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMS0yMSAgQWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIEVuYWJsZSBi aWRpIGNvbnRlbnQgZm9yIG5vbi1pbmxpbmUtYm94IGNhc2VzCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCBmMDkwOGMzNzgxOWIuLmQ1NzRmYjhlOGY4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC01MjUs OCArNTI1LDYgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3Vy aXR5LXBvbGljeS9pbnNpZGUtd29ya2VyL3NlcnZpY2V3b3IKIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvcHJlZmV0Y2gtc3JjL3ByZWZldGNo LWJsb2NrZWQtYnktZGVmYXVsdC5odG1sIFsgU2tpcCBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3ByZWZldGNoLXNyYy9wcmVmZXRjaC1o ZWFkZXItYmxvY2tlZC1ieS1kZWZhdWx0Lmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvcmVwb3J0aW5nLWFwaS9yZXBv cnQtdG8tZGlyZWN0aXZlLWFsbG93ZWQtaW4tbWV0YS5odHRwcy5zdWIuaHRtbCBbIFNraXAgXQot aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9z ZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zb3VyY2UtZmlsZS1ibG9iLXNjaGVtZS5odG1sIFsgU2tp cCBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9s aWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3NvdXJjZS1maWxlLWRhdGEtc2NoZW1lLmh0bWwg WyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29va2llcy9kb21haW4v ZG9tYWluLWF0dHJpYnV0ZS1ob3N0LXdpdGgtYW5kLXdpdGhvdXQtbGVhZGluZy1wZXJpb2Quc3Vi Lmh0dHBzLmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29v a2llcy9kb21haW4vZG9tYWluLWF0dHJpYnV0ZS1ob3N0LXdpdGgtbGVhZGluZy1wZXJpb2Quc3Vi Lmh0dHBzLmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29v a2llcy9kb21haW4vZG9tYWluLWF0dHJpYnV0ZS1tYXRjaGVzLWhvc3Quc3ViLmh0dHBzLmh0bWwg WyBTa2lwIF0KQEAgLTk1MCw4ICs5NDgsNiBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3N2Zy9pbmNsdWRpbmcuc3ViLnN2ZyBbCiAjIFNr aXAgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgdGVzdHMgdGhhdCB0aW1lIG91dAogaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9uYXZpZ2F0ZS10 by9ocmVmLWxvY2F0aW9uLWNyb3NzLW9yaWdpbi1hbGxvd2VkLnN1Yi5odG1sIFsgU2tpcCBdCiBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3N0 eWxlLXNyYy9zdHlsZS1zcmMtaW5saW5lLXN0eWxlLW5vbmNlLWJsb2NrZWQtZXJyb3ItZXZlbnQu aHRtbCBbIFNraXAgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNl Y3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1wbGUuaHRtbCBb IFNraXAgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5 LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1wbGUtbm8tb3B0LWluLmh0 bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1 cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vaW5zaWRlLWRlZGljYXRlZC13b3Jr ZXIuaHRtbCBbIFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50 LXNlY3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9pbWctc3JjLXJlZGlyZWN0 LXVwZ3JhZGUtcmVwb3J0aW5nLmh0dHBzLmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvcmVwb3J0aW5nL3JlcG9ydC1z dHJpcHMtZnJhZ21lbnQuaHRtbCBbIFNraXAgXQpAQCAtOTgwLDcgKzk3Niw2IEBAIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvbmF2aWdhdGUt dG8vdW5zYWZlLWFsbG93CiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQt c2VjdXJpdHktcG9saWN5L25hdmlnYXRlLXRvL3Vuc2FmZS1hbGxvdy1yZWRpcmVjdHMvYWxsb3dl ZC1lbmQtb2YtY2hhaW4uc3ViLmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvbmF2aWdhdGUtdG8vdW5zYWZlLWFsbG93 LXJlZGlyZWN0cy9ibG9ja2VkLWVuZC1vZi1jaGFpbi5zdWIuaHRtbCBbIFNraXAgXQogaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9yZXBvcnRp bmctYXBpL3JlcG9ydGluZy1hcGktd29ya3Mtb24tZnJhbWUtc3JjLmh0dHBzLnN1Yi5odG1sIFsg U2tpcCBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHkt cG9saWN5L3NjcmlwdC1zcmMvamF2YXNjcmlwdC13aW5kb3ctb3Blbi1ibG9ja2VkLmh0bWwgWyBT a2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1w b2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vc2NyaXB0LXNhbXBsZS1uby1vcHQtaW4uaHRt bCBbIFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3Vy aXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zY3JpcHQtc2FtcGxlLmh0bWwgWyBT a2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1w b2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24tYmxv Y2staW1hZ2UtZnJvbS1zY3JpcHQuc3ViLmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCmluZGV4IDcyODI2Y2ZjMTRjNi4uNDRiNzUzODUyNTI4IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0xMS0yMiAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NQOiBzZWN1cml0 eSBwb2xpY3kgdmlvbGF0aW9uIGV2ZW50IGlzIGFsd2F5cyB1c2luZyBkb2N1bWVudCBhcyB0YXJn ZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzE4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSB0ZXN0IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jb250 ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3JjL2phdmFzY3JpcHQtd2luZG93LW9wZW4tYmxv Y2tlZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQt c2VjdXJpdHktcG9saWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3NvdXJjZS1maWxlLWJsb2It c2NoZW1lLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY29udGVu dC1zZWN1cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vc291cmNlLWZpbGUtZGF0 YS1zY2hlbWUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jb250 ZW50LXNlY3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1wbGUt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3Vy aXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1wbGUtbm8tb3B0LWlu LWV4cGVjdGVkLnR4dDoKKwogMjAyMS0xMS0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVwb3J0IHRoZSBpbml0aWF0aW5nIHVybCBpbnN0 ZWFkIG9mIHRoZSByZWRpcmVjdGVkIG9uZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQt c3JjL2phdmFzY3JpcHQtd2luZG93LW9wZW4tYmxvY2tlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9s aWN5L3NjcmlwdC1zcmMvamF2YXNjcmlwdC13aW5kb3ctb3Blbi1ibG9ja2VkLWV4cGVjdGVkLnR4 dAppbmRleCA3OTA2MDNmOTQ1OTEuLmE1OTJlZjlhNGQxMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGlj eS9zY3JpcHQtc3JjL2phdmFzY3JpcHQtd2luZG93LW9wZW4tYmxvY2tlZC1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50 LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3JjL2phdmFzY3JpcHQtd2luZG93LW9wZW4tYmxvY2tl ZC1leHBlY3RlZC50eHQKQEAgLTEsMyArMSwzIEBACi0gCi1GQUlMIENoZWNrIHRoYXQgYSBzZWN1 cml0eXBvbGljeXZpb2xhdGlvbiBldmVudCBpcyBmaXJlZCBhc3NlcnRfZXF1YWxzOiBleHBlY3Rl ZCAiaW5saW5lIiBidXQgZ290ICIiCisKK1BBU1MgQ2hlY2sgdGhhdCBhIHNlY3VyaXR5cG9saWN5 dmlvbGF0aW9uIGV2ZW50IGlzIGZpcmVkCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2VjdXJp dHlwb2xpY3l2aW9sYXRpb24vc291cmNlLWZpbGUtYmxvYi1zY2hlbWUtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3Vy aXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zb3VyY2UtZmlsZS1ibG9iLXNjaGVt ZS1leHBlY3RlZC50eHQKaW5kZXggZWJmOTFkM2E2YWQwLi5kOTYxZWZmYzA2ZGIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1z ZWN1cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vc291cmNlLWZpbGUtYmxvYi1z Y2hlbWUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRp b24vc291cmNlLWZpbGUtYmxvYi1zY2hlbWUtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsMyBAQAog Ci1IYXJuZXNzIEVycm9yIChUSU1FT1VUKSwgbWVzc2FnZSA9IG51bGwKLQotVElNRU9VVCBWaW9s YXRpb25zIGZyb20gZGF0YTotVVJMIHNjcmlwdHMgaGF2ZSBhIHNvdXJjZUZpbGUgb2YgJ2Jsb2In IFRlc3QgdGltZWQgb3V0CitGQUlMIFZpb2xhdGlvbnMgZnJvbSBkYXRhOi1VUkwgc2NyaXB0cyBo YXZlIGEgc291cmNlRmlsZSBvZiAnYmxvYicgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgMTYgYnV0 IGdvdCAyMQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9u L3NvdXJjZS1maWxlLWRhdGEtc2NoZW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2VjdXJp dHlwb2xpY3l2aW9sYXRpb24vc291cmNlLWZpbGUtZGF0YS1zY2hlbWUtZXhwZWN0ZWQudHh0Cmlu ZGV4IGVmOTNjZDg1MjUzNy4uZmMyYmYzYThkY2QyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3Nl Y3VyaXR5cG9saWN5dmlvbGF0aW9uL3NvdXJjZS1maWxlLWRhdGEtc2NoZW1lLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRl bnQtc2VjdXJpdHktcG9saWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3NvdXJjZS1maWxlLWRh dGEtc2NoZW1lLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDMgQEAKIAotSGFybmVzcyBFcnJvciAo VElNRU9VVCksIG1lc3NhZ2UgPSBudWxsCi0KLVRJTUVPVVQgVmlvbGF0aW9ucyBmcm9tIGRhdGE6 LVVSTCBzY3JpcHRzIGhhdmUgYSBzb3VyY2VGaWxlIG9mICdkYXRhJyBUZXN0IHRpbWVkIG91dAor RkFJTCBWaW9sYXRpb25zIGZyb20gZGF0YTotVVJMIHNjcmlwdHMgaGF2ZSBhIHNvdXJjZUZpbGUg b2YgJ2RhdGEnIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkIDE2IGJ1dCBnb3QgMjEKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50 LXNlY3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1wbGUtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j b250ZW50LXNlY3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1zYW1w bGUtZXhwZWN0ZWQudHh0CmluZGV4IDNmZjIxOWM1OTVmYS4uODY5OTFmNjc0Y2Y3IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQt c2VjdXJpdHktcG9saWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3N0eWxlLXNhbXBsZS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zZWN1cml0eXBvbGljeXZpb2xhdGlvbi9zdHlsZS1z YW1wbGUtZXhwZWN0ZWQudHh0CkBAIC0xLDkgKzEsNCBAQAotQ09OU09MRSBNRVNTQUdFOiBUaGUg c291cmNlIGxpc3QgZm9yIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5IGRpcmVjdGl2ZSAnc3R5bGUt c3JjJyBjb250YWlucyBhbiBpbnZhbGlkIHNvdXJjZTogJydyZXBvcnQtc2FtcGxlJycuIEl0IHdp bGwgYmUgaWdub3JlZC4KLUNPTlNPTEUgTUVTU0FHRTogUmVmdXNlZCB0byBhcHBseSBhIHN0eWxl c2hlZXQgYmVjYXVzZSBpdHMgaGFzaCwgaXRzIG5vbmNlLCBvciAndW5zYWZlLWlubGluZScgZG9l cyBub3QgYXBwZWFyIGluIHRoZSBzdHlsZS1zcmMgZGlyZWN0aXZlIG9mIHRoZSBDb250ZW50IFNl Y3VyaXR5IFBvbGljeS4KLUNPTlNPTEUgTUVTU0FHRTogUmVmdXNlZCB0byBhcHBseSBhIHN0eWxl c2hlZXQgYmVjYXVzZSBpdHMgaGFzaCwgaXRzIG5vbmNlLCBvciAndW5zYWZlLWlubGluZScgZG9l cyBub3QgYXBwZWFyIGluIHRoZSBzdHlsZS1zcmMgZGlyZWN0aXZlIG9mIHRoZSBDb250ZW50IFNl Y3VyaXR5IFBvbGljeS4KIAotSGFybmVzcyBFcnJvciAoVElNRU9VVCksIG1lc3NhZ2UgPSBudWxs Ci0KLVRJTUVPVVQgSW5saW5lIHN0eWxlIGJsb2NrcyBzaG91bGQgaGF2ZSBhIHNhbXBsZS4gVGVz dCB0aW1lZCBvdXQKLVRJTUVPVVQgSW5saW5lIHN0eWxlIGF0dHJpYnV0ZXMgc2hvdWxkIGhhdmUg YSBzYW1wbGUuIFRlc3QgdGltZWQgb3V0CitGQUlMIElubGluZSBzdHlsZSBibG9ja3Mgc2hvdWxk IGhhdmUgYSBzYW1wbGUuIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJwIHsgb21nOiB5YXkgIWlt cG9ydGFudDsgfSIgYnV0IGdvdCAiIgorRkFJTCBJbmxpbmUgc3R5bGUgYXR0cmlidXRlcyBzaG91 bGQgaGF2ZSBhIHNhbXBsZS4gYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIm9tZzogeWF5ICFpbXBv cnRhbnQ7IiBidXQgZ290ICIiCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xp Y3l2aW9sYXRpb24vc3R5bGUtc2FtcGxlLW5vLW9wdC1pbi1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9s aWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3N0eWxlLXNhbXBsZS1uby1vcHQtaW4tZXhwZWN0 ZWQudHh0CmluZGV4IDU5ODdjZTAyMjU4Zi4uYjM1N2U0NWEyYTU5IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHkt cG9saWN5L3NlY3VyaXR5cG9saWN5dmlvbGF0aW9uL3N0eWxlLXNhbXBsZS1uby1vcHQtaW4tZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2VjdXJpdHlwb2xpY3l2aW9sYXRpb24vc3R5bGUt c2FtcGxlLW5vLW9wdC1pbi1leHBlY3RlZC50eHQKQEAgLTEsOCArMSw0IEBACi1DT05TT0xFIE1F U1NBR0U6IFJlZnVzZWQgdG8gYXBwbHkgYSBzdHlsZXNoZWV0IGJlY2F1c2UgaXRzIGhhc2gsIGl0 cyBub25jZSwgb3IgJ3Vuc2FmZS1pbmxpbmUnIGRvZXMgbm90IGFwcGVhciBpbiB0aGUgc3R5bGUt c3JjIGRpcmVjdGl2ZSBvZiB0aGUgQ29udGVudCBTZWN1cml0eSBQb2xpY3kuCi1DT05TT0xFIE1F U1NBR0U6IFJlZnVzZWQgdG8gYXBwbHkgYSBzdHlsZXNoZWV0IGJlY2F1c2UgaXRzIGhhc2gsIGl0 cyBub25jZSwgb3IgJ3Vuc2FmZS1pbmxpbmUnIGRvZXMgbm90IGFwcGVhciBpbiB0aGUgc3R5bGUt c3JjIGRpcmVjdGl2ZSBvZiB0aGUgQ29udGVudCBTZWN1cml0eSBQb2xpY3kuCiAKLUhhcm5lc3Mg RXJyb3IgKFRJTUVPVVQpLCBtZXNzYWdlID0gbnVsbAotCi1USU1FT1VUIElubGluZSBzdHlsZSBi bG9ja3Mgc2hvdWxkIG5vdCBoYXZlIGEgc2FtcGxlLiBUZXN0IHRpbWVkIG91dAotVElNRU9VVCBJ bmxpbmUgc3R5bGUgYXR0cmlidXRlcyBzaG91bGQgbm90IGhhdmUgYSBzYW1wbGUuIFRlc3QgdGlt ZWQgb3V0CitQQVNTIElubGluZSBzdHlsZSBibG9ja3Mgc2hvdWxkIG5vdCBoYXZlIGEgc2FtcGxl LgorUEFTUyBJbmxpbmUgc3R5bGUgYXR0cmlidXRlcyBzaG91bGQgbm90IGhhdmUgYSBzYW1wbGUu CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAwZDRhZTA4YjlmNmMuLjkyZDJlZmE2MTRlMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM0IEBACisyMDIxLTExLTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKworICAgICAgICBDU1A6IHNlY3VyaXR5IHBvbGljeSB2aW9sYXRpb24g ZXZlbnQgaXMgYWx3YXlzIHVzaW5nIGRvY3VtZW50IGFzIHRhcmdldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMTgyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxkIHVzZSB0aGUgdmlvbGF0 aW9uIGVsZW1lbnQgaW5zdGVhZCBpZiBub3QgbnVsbC4KKworICAgICAgICAqIGJpbmRpbmdzL2pz L0pTRXZlbnRMaXN0ZW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0V2ZW50TGlzdGVuZXI6 OmhhbmRsZUV2ZW50KTogUGFzcyBlbGVtZW50IHRvIGFsbG93SW5saW5lRXZlbnRIYW5kbGVycygp LgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTTGF6eUV2ZW50TGlzdGVuZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SlNMYXp5RXZlbnRMaXN0ZW5lcjo6aW5pdGlhbGl6ZUpTRnVuY3Rpb24gY29u c3QpOiBEaXR0by4KKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjplbnF1ZXVlU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudCk6IEhlbHBlciB0 byBxdWV1ZSBlY3VyaXR5cG9saWN5dmlvbGF0aW9uRXZlbnQgZm9yIGVsZW1lbnQuCisgICAgICAg ICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKiBkb20vSW5saW5lU3R5bGVTaGVldE93bmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVN0eWxlU2hlZXRPd25lcjo6Y3JlYXRlU2hlZXQp OiBQYXNzIGVsZW1lbnQgdG8gYWxsb3dJbmxpbmVTdHlsZSgpLgorICAgICAgICAqIGRvbS9TY3Jp cHRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEVsZW1lbnQ6OnJlcXVlc3RN b2R1bGVTY3JpcHQpOiBQYXNzIGVsZW1lbnQgdG8gYWxsb3dJbmxpbmVTY3JpcHQoKS4KKyAgICAg ICAgKFdlYkNvcmU6OlNjcmlwdEVsZW1lbnQ6OmV4ZWN1dGVDbGFzc2ljU2NyaXB0KTogRGl0dG8u CisgICAgICAgICogZG9tL1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGVkRWxlbWVudDo6c3R5bGVBdHRyaWJ1dGVDaGFuZ2VkKTogUGFzcyBlbGVtZW50IHRvIGFsbG93 SW5saW5lU3R5bGUoKS4KKyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3ku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGlu ZUV2ZW50SGFuZGxlcnMgY29uc3QpOiBQYXNzIGdpdmVuIGVsZW1lbnQgdG8gcmVwb3J0VmlvbGF0 aW9uKCkuCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5s aW5lU2NyaXB0IGNvbnN0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJp dHlQb2xpY3k6OmFsbG93SW5saW5lU3R5bGUgY29uc3QpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uIGNvbnN0KTogQ2FsbCBF bGVtZW50OjplbnF1ZXVlU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudCgpIGlmCisgICAgICAg IGVsZW1lbnQgaXMgbm90IG51bGxwdHIuCisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3Vy aXR5UG9saWN5Lmg6CisKIDIwMjEtMTEtMjEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUgYmlkaSBjb250ZW50IGZvciBu b24taW5saW5lLWJveCBjYXNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNFdmVudExpc3RlbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZl bnRMaXN0ZW5lci5jcHAKaW5kZXggZTRiN2QzNWNhNTUyLi43YjljZTMzNWNkM2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmNwcApAQCAtMTI2LDgg KzEyNiwxMSBAQCB2b2lkIEpTRXZlbnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4dAogICAgICAgICBKU0RPTVdpbmRvdyog d2luZG93ID0ganNDYXN0PEpTRE9NV2luZG93Kj4oZ2xvYmFsT2JqZWN0KTsKICAgICAgICAgaWYg KCF3aW5kb3ctPndyYXBwZWQoKS5pc0N1cnJlbnRseURpc3BsYXllZEluRnJhbWUoKSkKICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKHdhc0NyZWF0ZWRGcm9tTWFya3VwKCkgJiYgIXNj cmlwdEV4ZWN1dGlvbkNvbnRleHQuY29udGVudFNlY3VyaXR5UG9saWN5KCktPmFsbG93SW5saW5l RXZlbnRIYW5kbGVycyhzb3VyY2VVUkwoKS5zdHJpbmcoKSwgc291cmNlUG9zaXRpb24oKS5tX2xp bmUsIGNvZGUoKSkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmICh3YXNDcmVhdGVk RnJvbU1hcmt1cCgpKSB7CisgICAgICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gZXZlbnQudGFy Z2V0KCktPmlzTm9kZSgpICYmICFkb3duY2FzdDxOb2RlPigqZXZlbnQudGFyZ2V0KCkpLmlzRG9j dW1lbnROb2RlKCkgJiYgaXM8RWxlbWVudD4oKmV2ZW50LnRhcmdldCgpKSA/IGRvd25jYXN0PEVs ZW1lbnQ+KGV2ZW50LnRhcmdldCgpKSA6IG51bGxwdHI7CisgICAgICAgICAgICBpZiAoIXNjcmlw dEV4ZWN1dGlvbkNvbnRleHQuY29udGVudFNlY3VyaXR5UG9saWN5KCktPmFsbG93SW5saW5lRXZl bnRIYW5kbGVycyhzb3VyY2VVUkwoKS5zdHJpbmcoKSwgc291cmNlUG9zaXRpb24oKS5tX2xpbmUs IGNvZGUoKSwgZWxlbWVudCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAg ICAgICAgIC8vIEZJWE1FOiBJcyB0aGlzIGNoZWNrIG5lZWRlZCBmb3Igb3RoZXIgY29udGV4dHM/ CiAgICAgICAgIFNjcmlwdENvbnRyb2xsZXImIHNjcmlwdCA9IHdpbmRvdy0+d3JhcHBlZCgpLmZy YW1lKCktPnNjcmlwdCgpOwogICAgICAgICBpZiAoIXNjcmlwdC5jYW5FeGVjdXRlU2NyaXB0cyhB Ym91dFRvRXhlY3V0ZVNjcmlwdCkgfHwgc2NyaXB0LmlzUGF1c2VkKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0xhenlFdmVudExpc3RlbmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTGF6eUV2ZW50TGlzdGVuZXIuY3BwCmluZGV4IDZkMmQ1 YjRhNjAwMy4uMTM3MjNhYTk1Y2E5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0xhenlFdmVudExpc3RlbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0xhenlFdmVudExpc3RlbmVyLmNwcApAQCAtMTMxLDcgKzEzMSw4IEBAIEpTT2JqZWN0 KiBKU0xhenlFdmVudExpc3RlbmVyOjppbml0aWFsaXplSlNGdW5jdGlvbihTY3JpcHRFeGVjdXRp b25Db250ZXh0JiBleGVjCiAgICAgaWYgKCFkb2N1bWVudC5mcmFtZSgpKQogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKIAotICAgIGlmICghZG9jdW1lbnQuY29udGVudFNlY3VyaXR5UG9saWN5KCkt PmFsbG93SW5saW5lRXZlbnRIYW5kbGVycyhtX3NvdXJjZVVSTC5zdHJpbmcoKSwgbV9zb3VyY2VQ b3NpdGlvbi5tX2xpbmUsIG1fY29kZSkpCisgICAgRWxlbWVudCogZWxlbWVudCA9IG1fb3JpZ2lu YWxOb2RlICYmICFtX29yaWdpbmFsTm9kZS0+aXNEb2N1bWVudE5vZGUoKSAmJiBpczxFbGVtZW50 PigqbV9vcmlnaW5hbE5vZGUpID8gZG93bmNhc3Q8RWxlbWVudD4obV9vcmlnaW5hbE5vZGUuZ2V0 KCkpIDogbnVsbHB0cjsKKyAgICBpZiAoIWRvY3VtZW50LmNvbnRlbnRTZWN1cml0eVBvbGljeSgp LT5hbGxvd0lubGluZUV2ZW50SGFuZGxlcnMobV9zb3VyY2VVUkwuc3RyaW5nKCksIG1fc291cmNl UG9zaXRpb24ubV9saW5lLCBtX2NvZGUsIGVsZW1lbnQpKQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAogICAgIGF1dG8mIHNjcmlwdCA9IGRvY3VtZW50LmZyYW1lKCktPnNjcmlwdCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCmluZGV4IDVkN2IxYmUyNjE2NC4uODU1MjlhMDg1ZjQ3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCkBAIC01Miw2ICs1Miw3IEBACiAjaW5jbHVkZSAiRWxlbWVudFJhcmVE YXRhLmgiCiAjaW5jbHVkZSAiRXZlbnREaXNwYXRjaGVyLmgiCiAjaW5jbHVkZSAiRXZlbnRIYW5k bGVyLmgiCisjaW5jbHVkZSAiRXZlbnRMb29wLmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgog I2luY2x1ZGUgIkZvY3VzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkZvY3VzRXZlbnQuaCIKQEAg LTEwOSw2ICsxMTAsNyBAQAogI2luY2x1ZGUgIlNjcmlwdERpc2FsbG93ZWRTY29wZS5oIgogI2lu Y2x1ZGUgIlNjcm9sbEludG9WaWV3T3B0aW9ucy5oIgogI2luY2x1ZGUgIlNjcm9sbExhdGNoaW5n Q29udHJvbGxlci5oIgorI2luY2x1ZGUgIlNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQuaCIK ICNpbmNsdWRlICJTZWxlY3RvclF1ZXJ5LmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNs dWRlICJTaGFkb3dSb290SW5pdC5oIgpAQCAtMzMxMyw2ICszMzE1LDEzIEBAIGJvb2wgRWxlbWVu dDo6ZGlzcGF0Y2hNb3VzZUZvcmNlV2lsbEJlZ2luKCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK K3ZvaWQgRWxlbWVudDo6ZW5xdWV1ZVNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQoU2VjdXJp dHlQb2xpY3lWaW9sYXRpb25FdmVudEluaXQmJiBldmVudEluaXQpCit7CisgICAgZG9jdW1lbnQo KS5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6RE9NTWFuaXB1bGF0aW9uLCBbdGhp cywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGV2ZW50ID0gU2VjdXJpdHlQb2xpY3lW aW9sYXRpb25FdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5zZWN1cml0eXBvbGljeXZpb2xhdGlv bkV2ZW50LCBXVEZNb3ZlKGV2ZW50SW5pdCksIEV2ZW50OjpJc1RydXN0ZWQ6OlllcyldIHsKKyAg ICAgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CisgICAgfSk7Cit9CisKIEV4Y2VwdGlvbk9yPHZv aWQ+IEVsZW1lbnQ6Om1lcmdlV2l0aE5leHRUZXh0Tm9kZShUZXh0JiBub2RlKQogewogICAgIGF1 dG8qIG5leHQgPSBub2RlLm5leHRTaWJsaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCAwNGNl NjVkZTZlODcuLjMzNzc2ZjM4YjM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0Vs ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBAIC04OCw2ICs4OCw3 IEBAIHN0cnVjdCBLZXlmcmFtZUFuaW1hdGlvbk9wdGlvbnM7CiBzdHJ1Y3QgUmVzaXplT2JzZXJ2 ZXJEYXRhOwogc3RydWN0IFNjcm9sbEludG9WaWV3T3B0aW9uczsKIHN0cnVjdCBTY3JvbGxUb09w dGlvbnM7CitzdHJ1Y3QgU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudEluaXQ7CiBzdHJ1Y3Qg U2hhZG93Um9vdEluaXQ7CiAKIG5hbWVzcGFjZSBTdHlsZSB7CkBAIC01NzAsNiArNTcxLDggQEAg cHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBkaXNwYXRjaE1vdXNlRm9yY2VXaWxs QmVnaW4oKTsKIAorICAgIHZvaWQgZW5xdWV1ZVNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQo U2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudEluaXQmJik7CisKICAgICB2aXJ0dWFsIHZvaWQg d2lsbFJlY2FsY1N0eWxlKFN0eWxlOjpDaGFuZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNh bGNTdHlsZShTdHlsZTo6Q2hhbmdlKTsKICAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlc2V0Q29tcHV0 ZWRTdHlsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0lubGluZVN0eWxlU2hl ZXRPd25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vSW5saW5lU3R5bGVTaGVldE93bmVyLmNw cAppbmRleCBkMTNhNDRmY2E0NGMuLmY2YTA2ZmJlOThlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0lubGluZVN0eWxlU2hlZXRPd25lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0lubGluZVN0eWxlU2hlZXRPd25lci5jcHAKQEAgLTE2OSw3ICsxNjksNyBAQCB2b2lkIElu bGluZVN0eWxlU2hlZXRPd25lcjo6Y3JlYXRlU2hlZXQoRWxlbWVudCYgZWxlbWVudCwgY29uc3Qg U3RyaW5nJiB0ZXh0KQogICAgIEFTU0VSVChkb2N1bWVudC5jb250ZW50U2VjdXJpdHlQb2xpY3ko KSk7CiAgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5JiBjb250ZW50U2VjdXJpdHlQb2xp Y3kgPSAqZG9jdW1lbnQuY29udGVudFNlY3VyaXR5UG9saWN5KCk7CiAgICAgYm9vbCBoYXNLbm93 bk5vbmNlID0gY29udGVudFNlY3VyaXR5UG9saWN5LmFsbG93U3R5bGVXaXRoTm9uY2UoZWxlbWVu dC5ub25jZSgpLCBlbGVtZW50LmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwotICAgIGlmICgh Y29udGVudFNlY3VyaXR5UG9saWN5LmFsbG93SW5saW5lU3R5bGUoZG9jdW1lbnQudXJsKCkuc3Ry aW5nKCksIG1fc3RhcnRUZXh0UG9zaXRpb24ubV9saW5lLCB0ZXh0LCBDaGVja1Vuc2FmZUhhc2hl czo6Tm8sIGhhc0tub3duTm9uY2UpKQorICAgIGlmICghY29udGVudFNlY3VyaXR5UG9saWN5LmFs bG93SW5saW5lU3R5bGUoZG9jdW1lbnQudXJsKCkuc3RyaW5nKCksIG1fc3RhcnRUZXh0UG9zaXRp b24ubV9saW5lLCB0ZXh0LCBDaGVja1Vuc2FmZUhhc2hlczo6Tm8sIGVsZW1lbnQsIGhhc0tub3du Tm9uY2UpKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIG1lZGlhUXVlcmllcyA9IE1lZGlh UXVlcnlTZXQ6OmNyZWF0ZShtX21lZGlhLCBNZWRpYVF1ZXJ5UGFyc2VyQ29udGV4dChkb2N1bWVu dCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuY3BwCmluZGV4IGYwM2JlN2FjNzAwNi4u MjM5MmEzYWFlZjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEVsZW1lbnQuY3BwCkBAIC0zNzcs NyArMzc3LDcgQEAgYm9vbCBTY3JpcHRFbGVtZW50OjpyZXF1ZXN0TW9kdWxlU2NyaXB0KGNvbnN0 IFRleHRQb3NpdGlvbiYgc2NyaXB0U3RhcnRQb3NpdGlvbikKICAgICBBU1NFUlQobV9lbGVtZW50 LmRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5UG9saWN5KCkpOwogICAgIGNvbnN0IGF1dG8mIGNv bnRlbnRTZWN1cml0eVBvbGljeSA9ICptX2VsZW1lbnQuZG9jdW1lbnQoKS5jb250ZW50U2VjdXJp dHlQb2xpY3koKTsKICAgICBib29sIGhhc0tub3duTm9uY2UgPSBjb250ZW50U2VjdXJpdHlQb2xp Y3kuYWxsb3dTY3JpcHRXaXRoTm9uY2Uobm9uY2UsIG1fZWxlbWVudC5pc0luVXNlckFnZW50U2hh ZG93VHJlZSgpKTsKLSAgICBpZiAoIWNvbnRlbnRTZWN1cml0eVBvbGljeS5hbGxvd0lubGluZVNj cmlwdChtX2VsZW1lbnQuZG9jdW1lbnQoKS51cmwoKS5zdHJpbmcoKSwgbV9zdGFydExpbmVOdW1i ZXIsIHNvdXJjZUNvZGUuc291cmNlKCksIGhhc0tub3duTm9uY2UpKQorICAgIGlmICghY29udGVu dFNlY3VyaXR5UG9saWN5LmFsbG93SW5saW5lU2NyaXB0KG1fZWxlbWVudC5kb2N1bWVudCgpLnVy bCgpLnN0cmluZygpLCBtX3N0YXJ0TGluZU51bWJlciwgc291cmNlQ29kZS5zb3VyY2UoKSwgbV9l bGVtZW50LCBoYXNLbm93bk5vbmNlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgbV9s b2FkYWJsZVNjcmlwdCA9IFdURk1vdmUoc2NyaXB0KTsKQEAgLTQwMSw3ICs0MDEsNyBAQCB2b2lk IFNjcmlwdEVsZW1lbnQ6OmV4ZWN1dGVDbGFzc2ljU2NyaXB0KGNvbnN0IFNjcmlwdFNvdXJjZUNv ZGUmIHNvdXJjZUNvZGUpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgYm9vbCBoYXNL bm93bk5vbmNlID0gY29udGVudFNlY3VyaXR5UG9saWN5LmFsbG93U2NyaXB0V2l0aE5vbmNlKG1f ZWxlbWVudC5ub25jZSgpLCBtX2VsZW1lbnQuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7Ci0g ICAgICAgIGlmICghY29udGVudFNlY3VyaXR5UG9saWN5LmFsbG93SW5saW5lU2NyaXB0KG1fZWxl bWVudC5kb2N1bWVudCgpLnVybCgpLnN0cmluZygpLCBtX3N0YXJ0TGluZU51bWJlciwgc291cmNl Q29kZS5zb3VyY2UoKSwgaGFzS25vd25Ob25jZSkpCisgICAgICAgIGlmICghY29udGVudFNlY3Vy aXR5UG9saWN5LmFsbG93SW5saW5lU2NyaXB0KG1fZWxlbWVudC5kb2N1bWVudCgpLnVybCgpLnN0 cmluZygpLCBtX3N0YXJ0TGluZU51bWJlciwgc291cmNlQ29kZS5zb3VyY2UoKSwgbV9lbGVtZW50 LCBoYXNLbm93bk5vbmNlKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9TdHlsZWRFbGVtZW50LmNwcAppbmRleCA3OWI4NGJlZDg0MjEuLjZhYzFlM2MwYzVhYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcApAQCAtMjA2LDcgKzIwNiw3IEBAIHZv aWQgU3R5bGVkRWxlbWVudDo6c3R5bGVBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IEF0b21TdHJpbmcm IG5ld1N0eWxlU3RyaW5nLCBBdHRyCiAgICAgaWYgKGRvY3VtZW50KCkuc2NyaXB0YWJsZURvY3Vt ZW50UGFyc2VyKCkgJiYgIWRvY3VtZW50KCkuaXNJbkRvY3VtZW50V3JpdGUoKSkKICAgICAgICAg c3RhcnRMaW5lTnVtYmVyID0gZG9jdW1lbnQoKS5zY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIoKS0+ dGV4dFBvc2l0aW9uKCkubV9saW5lOwogCi0gICAgaWYgKHJlYXNvbiA9PSBNb2RpZmllZEJ5Q2xv bmluZyB8fCBkb2N1bWVudCgpLmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0lubGluZVN0 eWxlKGRvY3VtZW50KCkudXJsKCkuc3RyaW5nKCksIHN0YXJ0TGluZU51bWJlciwgbmV3U3R5bGVT dHJpbmcuc3RyaW5nKCksIENoZWNrVW5zYWZlSGFzaGVzOjpZZXMsIGlzSW5Vc2VyQWdlbnRTaGFk b3dUcmVlKCkpKQorICAgIGlmIChyZWFzb24gPT0gTW9kaWZpZWRCeUNsb25pbmcgfHwgZG9jdW1l bnQoKS5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dJbmxpbmVTdHlsZShkb2N1bWVudCgp LnVybCgpLnN0cmluZygpLCBzdGFydExpbmVOdW1iZXIsIG5ld1N0eWxlU3RyaW5nLnN0cmluZygp LCBDaGVja1Vuc2FmZUhhc2hlczo6WWVzLCAqdGhpcywgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUo KSkpCiAgICAgICAgIHNldElubGluZVN0eWxlRnJvbVN0cmluZyhuZXdTdHlsZVN0cmluZyk7CiAK ICAgICBlbGVtZW50RGF0YSgpLT5zZXRTdHlsZUF0dHJpYnV0ZUlzRGlydHkoZmFsc2UpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKaW5k ZXggNThlYzA2Mzc0OTJhLi45NTczNWMwMGVjM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtNDE2LDE0ICs0MTYsMTQgQEAg Ym9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SmF2YVNjcmlwdFVSTHMoY29uc3QgU3Ry aW5nJiBjb250ZXh0VVJMLCBjb25zdAogICAgIHJldHVybiBjaGVja0hhc2hBbmRSZXBvcnRWaW9s YXRpb24oc291cmNlLCAmQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0 ZWREaXJlY3RpdmVGb3JVbnNhZmVJbmxpbmVTY3JpcHRFbGVtZW50LCAmQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVIYXNoU2NyaXB0 LCBtX2hhc2hBbGdvcml0aG1zRm9ySW5saW5lU2NyaXB0cywgaGFuZGxlVmlvbGF0ZWREaXJlY3Rp dmUpOwogfQogCi1ib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVFdmVudEhh bmRsZXJzKGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29u dGV4dExpbmUsIGNvbnN0IFN0cmluZyYgc291cmNlLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3Vy aXR5UG9saWN5KSBjb25zdAorYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5l RXZlbnRIYW5kbGVycyhjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1i ZXImIGNvbnRleHRMaW5lLCBjb25zdCBTdHJpbmcmIHNvdXJjZSwgRWxlbWVudCogZWxlbWVudCwg Ym9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSkgY29uc3QKIHsKICAgICBpZiAob3Zl cnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGJv b2wgZGlkTm90aWZ5SW5zcGVjdG9yID0gZmFsc2U7CiAgICAgYXV0byBoYW5kbGVWaW9sYXRlZERp cmVjdGl2ZSA9IFsmXSAoY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlJiB2aW9s YXRlZERpcmVjdGl2ZSkgewogICAgICAgICBTdHJpbmcgY29uc29sZU1lc3NhZ2UgPSBjb25zb2xl TWVzc2FnZUZvclZpb2xhdGlvbihDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVOYW1lczo6 c2NyaXB0U3JjLCB2aW9sYXRlZERpcmVjdGl2ZSwgVVJMKCksICJSZWZ1c2VkIHRvIGV4ZWN1dGUg YSBzY3JpcHQgZm9yIGFuIGlubGluZSBldmVudCBoYW5kbGVyIiwgIid1bnNhZmUtaW5saW5lJyIp OwotICAgICAgICByZXBvcnRWaW9sYXRpb24oQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZl TmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWREaXJlY3RpdmUsICJpbmxpbmUiX3MsIGNvbnNvbGVN ZXNzYWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29udGV4dExpbmUsIE9yZGluYWxOdW1i ZXIoKSkpOworICAgICAgICByZXBvcnRWaW9sYXRpb24oQ29udGVudFNlY3VyaXR5UG9saWN5RGly ZWN0aXZlTmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWREaXJlY3RpdmUsICJpbmxpbmUiX3MsIGNv bnNvbGVNZXNzYWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29udGV4dExpbmUsIE9yZGlu YWxOdW1iZXIoKSksIFVSTCgpLCBudWxscHRyLCBlbGVtZW50KTsKICAgICAgICAgaWYgKCFkaWRO b3RpZnlJbnNwZWN0b3IgJiYgIXZpb2xhdGVkRGlyZWN0aXZlLmRpcmVjdGl2ZUxpc3QoKS5pc1Jl cG9ydE9ubHkoKSkgewogICAgICAgICAgICAgcmVwb3J0QmxvY2tlZFNjcmlwdEV4ZWN1dGlvblRv SW5zcGVjdG9yKHZpb2xhdGVkRGlyZWN0aXZlLnRleHQoKSk7CiAgICAgICAgICAgICBkaWROb3Rp ZnlJbnNwZWN0b3IgPSB0cnVlOwpAQCAtNDgwLDE0ICs0ODAsMTQgQEAgYm9vbCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OmFsbG93Tm9uUGFyc2VySW5zZXJ0ZWRTY3JpcHRzKGNvbnN0IFVSTCYgdXJs LCBjb25zdAogICAgIHJldHVybiBhbGxTY3JpcHRQb2xpY2llc0FsbG93KGhhbmRsZVZpb2xhdGVk RGlyZWN0aXZlLCB1cmwsIG5vbmNlLCBzY3JpcHRDb250ZW50LCBwYXJzZXJJbnNlcnRlZCk7CiB9 CiAKLWJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZVNjcmlwdChjb25zdCBT dHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBTdHJp bmdWaWV3IHNjcmlwdENvbnRlbnQsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kp IGNvbnN0Citib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoY29u c3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwg U3RyaW5nVmlldyBzY3JpcHRDb250ZW50LCBFbGVtZW50JiBlbGVtZW50LCBib29sIG92ZXJyaWRl Q29udGVudFNlY3VyaXR5UG9saWN5KSBjb25zdAogewogICAgIGlmIChvdmVycmlkZUNvbnRlbnRT ZWN1cml0eVBvbGljeSB8fCBzaG91bGRQZXJmb3JtRWFybHlDU1BDaGVjaygpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICBib29sIGRpZE5vdGlmeUluc3BlY3RvciA9IGZhbHNlOwogICAgIGF1 dG8gaGFuZGxlVmlvbGF0ZWREaXJlY3RpdmUgPSBbJl0gKGNvbnN0IENvbnRlbnRTZWN1cml0eVBv bGljeURpcmVjdGl2ZSYgdmlvbGF0ZWREaXJlY3RpdmUpIHsKICAgICAgICAgU3RyaW5nIGNvbnNv bGVNZXNzYWdlID0gY29uc29sZU1lc3NhZ2VGb3JWaW9sYXRpb24oQ29udGVudFNlY3VyaXR5UG9s aWN5RGlyZWN0aXZlTmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWREaXJlY3RpdmUsIFVSTCgpLCAi UmVmdXNlZCB0byBleGVjdXRlIGEgc2NyaXB0IiwgIml0cyBoYXNoLCBpdHMgbm9uY2UsIG9yICd1 bnNhZmUtaW5saW5lJyIpOwotICAgICAgICByZXBvcnRWaW9sYXRpb24oQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWREaXJlY3RpdmUsICJpbmxp bmUiX3MsIGNvbnNvbGVNZXNzYWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29udGV4dExp bmUsIE9yZGluYWxOdW1iZXIoKSkpOworICAgICAgICByZXBvcnRWaW9sYXRpb24oQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlTmFtZXM6OnNjcmlwdFNyYywgdmlvbGF0ZWREaXJlY3RpdmUs ICJpbmxpbmUiX3MsIGNvbnNvbGVNZXNzYWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29u dGV4dExpbmUsIE9yZGluYWxOdW1iZXIoKSksIFVSTCgpLCBudWxscHRyLCAmZWxlbWVudCk7CiAg ICAgICAgIGlmICghZGlkTm90aWZ5SW5zcGVjdG9yICYmICF2aW9sYXRlZERpcmVjdGl2ZS5kaXJl Y3RpdmVMaXN0KCkuaXNSZXBvcnRPbmx5KCkpIHsKICAgICAgICAgICAgIHJlcG9ydEJsb2NrZWRT Y3JpcHRFeGVjdXRpb25Ub0luc3BlY3Rvcih2aW9sYXRlZERpcmVjdGl2ZS50ZXh0KCkpOwogICAg ICAgICAgICAgZGlkTm90aWZ5SW5zcGVjdG9yID0gdHJ1ZTsKQEAgLTQ5OCw3ICs0OTgsNyBAQCBi b29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoY29uc3QgU3RyaW5n JiBjb250ZXh0VVJMLCBjb25zdCBPcgogICAgIHJldHVybiBjaGVja0hhc2hBbmRSZXBvcnRWaW9s YXRpb24oc2NyaXB0Q29udGVudC50b1N0cmluZygpLCAmQ29udGVudFNlY3VyaXR5UG9saWN5RGly ZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVJbmxpbmVTY3JpcHRFbGVtZW50 LCAmQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVG b3JTY3JpcHRIYXNoLCBtX2hhc2hBbGdvcml0aG1zRm9ySW5saW5lU2NyaXB0cywgaGFuZGxlVmlv bGF0ZWREaXJlY3RpdmUpOwogfQogCi1ib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJ bmxpbmVTdHlsZShjb25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXIm IGNvbnRleHRMaW5lLCBTdHJpbmdWaWV3IHN0eWxlQ29udGVudCwgQ2hlY2tVbnNhZmVIYXNoZXMg c2hvdWxkQ2hlY2tVbnNhZmVIYXNoZXMsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xp Y3kpIGNvbnN0Citib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTdHlsZShj b25zdCBTdHJpbmcmIGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5l LCBTdHJpbmdWaWV3IHN0eWxlQ29udGVudCwgQ2hlY2tVbnNhZmVIYXNoZXMgc2hvdWxkQ2hlY2tV bnNhZmVIYXNoZXMsIEVsZW1lbnQmIGVsZW1lbnQsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2VjdXJp dHlQb2xpY3kpIGNvbnN0CiB7CiAgICAgaWYgKG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5 KQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTUwNyw3ICs1MDcsNyBAQCBib29sIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTdHlsZShjb25zdCBTdHJpbmcmIGNvbnRleHRVUkws IGNvbnN0IE9yZAogICAgIGF1dG8gaGFuZGxlVmlvbGF0ZWREaXJlY3RpdmUgPSBbJl0gKGNvbnN0 IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSYgdmlvbGF0ZWREaXJlY3RpdmUpIHsKICAg ICAgICAgYXV0byBuYW1lID0gc2hvdWxkQ2hlY2tVbnNhZmVIYXNoZXMgPT0gQ2hlY2tVbnNhZmVI YXNoZXM6OlllcyA/IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpzdHlsZVNy Y0F0dHIgOiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVOYW1lczo6c3R5bGVTcmNFbGVt OwogICAgICAgICBTdHJpbmcgY29uc29sZU1lc3NhZ2UgPSBjb25zb2xlTWVzc2FnZUZvclZpb2xh dGlvbihDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVOYW1lczo6c3R5bGVTcmMsIHZpb2xh dGVkRGlyZWN0aXZlLCBVUkwoKSwgIlJlZnVzZWQgdG8gYXBwbHkgYSBzdHlsZXNoZWV0IiwgIml0 cyBoYXNoLCBpdHMgbm9uY2UsIG9yICd1bnNhZmUtaW5saW5lJyIpOwotICAgICAgICByZXBvcnRW aW9sYXRpb24obmFtZSwgdmlvbGF0ZWREaXJlY3RpdmUsICJpbmxpbmUiX3MsIGNvbnNvbGVNZXNz YWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29udGV4dExpbmUsIE9yZGluYWxOdW1iZXIo KSkpOworICAgICAgICByZXBvcnRWaW9sYXRpb24obmFtZSwgdmlvbGF0ZWREaXJlY3RpdmUsICJp bmxpbmUiX3MsIGNvbnNvbGVNZXNzYWdlLCBjb250ZXh0VVJMLCBUZXh0UG9zaXRpb24oY29udGV4 dExpbmUsIE9yZGluYWxOdW1iZXIoKSksIFVSTCgpLCBudWxscHRyLCAmZWxlbWVudCk7CiAgICAg fTsKIAogICAgIGlmIChzaG91bGRDaGVja1Vuc2FmZUhhc2hlcyA9PSBDaGVja1Vuc2FmZUhhc2hl czo6WWVzKQpAQCAtNzM0LDEyICs3MzQsMTIgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OnJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWMKICAg ICByZXR1cm4gcmVwb3J0VmlvbGF0aW9uKGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCB2aW9s YXRlZERpcmVjdGl2ZSwgdmlvbGF0ZWREaXJlY3RpdmVMaXN0LCBibG9ja2VkVVJMLCBjb25zb2xl TWVzc2FnZSwgU3RyaW5nKCksIFRleHRQb3NpdGlvbihPcmRpbmFsTnVtYmVyOjpiZWZvcmVGaXJz dCgpLCBPcmRpbmFsTnVtYmVyOjpiZWZvcmVGaXJzdCgpKSwgc3RhdGUpOwogfQogCi12b2lkIENv bnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZWZmZWN0 aXZlVmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2 ZSYgdmlvbGF0ZWREaXJlY3RpdmUsIGNvbnN0IFN0cmluZyYgYmxvY2tlZFVSTCwgY29uc3QgU3Ry aW5nJiBjb25zb2xlTWVzc2FnZSwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIGNvbnN0IFRleHRQ b3NpdGlvbiYgc291cmNlUG9zaXRpb24sIGNvbnN0IFVSTCYgcHJlUmVkaXJlY3RVUkwsIEpTQzo6 SlNHbG9iYWxPYmplY3QqIHN0YXRlKSBjb25zdAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OnJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUmIHZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2Us IGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0 aW9uLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiBzdGF0 ZSwgRWxlbWVudCogZWxlbWVudCkgY29uc3QKIHsKLSAgICByZXR1cm4gcmVwb3J0VmlvbGF0aW9u KGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCB2aW9sYXRlZERpcmVjdGl2ZS5uYW1lRm9yUmVw b3J0aW5nKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKSwgdmlvbGF0ZWREaXJlY3RpdmUuZGly ZWN0aXZlTGlzdCgpLCBibG9ja2VkVVJMLCBjb25zb2xlTWVzc2FnZSwgc291cmNlVVJMLCBzb3Vy Y2VQb3NpdGlvbiwgc3RhdGUsIHByZVJlZGlyZWN0VVJMKTsKKyAgICByZXR1cm4gcmVwb3J0Vmlv bGF0aW9uKGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCB2aW9sYXRlZERpcmVjdGl2ZS5uYW1l Rm9yUmVwb3J0aW5nKCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKSwgdmlvbGF0ZWREaXJlY3Rp dmUuZGlyZWN0aXZlTGlzdCgpLCBibG9ja2VkVVJMLCBjb25zb2xlTWVzc2FnZSwgc291cmNlVVJM LCBzb3VyY2VQb3NpdGlvbiwgc3RhdGUsIHByZVJlZGlyZWN0VVJMLCBlbGVtZW50KTsKIH0KIAot dm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcm IGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCBjb25zdCBTdHJpbmcmIHZpb2xhdGVkRGlyZWN0 aXZlLCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0JiB2aW9sYXRlZERp cmVjdGl2ZUxpc3QsIGNvbnN0IFN0cmluZyYgYmxvY2tlZFVSTFN0cmluZywgY29uc3QgU3RyaW5n JiBjb25zb2xlTWVzc2FnZSwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIGNvbnN0IFRleHRQb3Np dGlvbiYgc291cmNlUG9zaXRpb24sIEpTQzo6SlNHbG9iYWxPYmplY3QqIHN0YXRlLCBjb25zdCBV UkwmIHByZVJlZGlyZWN0VVJMKSBjb25zdAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJl cG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCBj b25zdCBTdHJpbmcmIHZpb2xhdGVkRGlyZWN0aXZlLCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xp Y3lEaXJlY3RpdmVMaXN0JiB2aW9sYXRlZERpcmVjdGl2ZUxpc3QsIGNvbnN0IFN0cmluZyYgYmxv Y2tlZFVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBjb25zb2xlTWVzc2FnZSwgY29uc3QgU3RyaW5n JiBzb3VyY2VVUkwsIGNvbnN0IFRleHRQb3NpdGlvbiYgc291cmNlUG9zaXRpb24sIEpTQzo6SlNH bG9iYWxPYmplY3QqIHN0YXRlLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMLCBFbGVtZW50KiBl bGVtZW50KSBjb25zdAogewogICAgIGxvZ1RvQ29uc29sZShjb25zb2xlTWVzc2FnZSwgc291cmNl VVJMLCBzb3VyY2VQb3NpdGlvbi5tX2xpbmUsIHNvdXJjZVBvc2l0aW9uLm1fY29sdW1uLCBzdGF0 ZSk7CiAKQEAgLTgwNCw4ICs4MDQsMTMgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnJl cG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWMKICAgICB2 aW9sYXRpb25FdmVudEluaXQuYnViYmxlcyA9IHRydWU7CiAgICAgaWYgKG1fY2xpZW50KQogICAg ICAgICBtX2NsaWVudC0+ZW5xdWV1ZVNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZlbnQoV1RGTW92 ZSh2aW9sYXRpb25FdmVudEluaXQpKTsKLSAgICBlbHNlCi0gICAgICAgIGRvd25jYXN0PERvY3Vt ZW50PigqbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KS5lbnF1ZXVlU2VjdXJpdHlQb2xpY3lWaW9s YXRpb25FdmVudChXVEZNb3ZlKHZpb2xhdGlvbkV2ZW50SW5pdCkpOworICAgIGVsc2UgeworICAg ICAgICBhdXRvJiBkb2N1bWVudCA9IGRvd25jYXN0PERvY3VtZW50PigqbV9zY3JpcHRFeGVjdXRp b25Db250ZXh0KTsKKyAgICAgICAgaWYgKGVsZW1lbnQgJiYgZWxlbWVudC0+ZG9jdW1lbnQoKSA9 PSBkb2N1bWVudCkKKyAgICAgICAgICAgIGVsZW1lbnQtPmVucXVldWVTZWN1cml0eVBvbGljeVZp b2xhdGlvbkV2ZW50KFdURk1vdmUodmlvbGF0aW9uRXZlbnRJbml0KSk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGRvY3VtZW50LmVucXVldWVTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50 KFdURk1vdmUodmlvbGF0aW9uRXZlbnRJbml0KSk7CisgICAgfQogCiAgICAgLy8gMi4gU2VuZCB2 aW9sYXRpb24gcmVwb3J0IChpZiBhcHBsaWNhYmxlKS4KICAgICBhdXRvJiByZXBvcnRVUklzID0g dmlvbGF0ZWREaXJlY3RpdmVMaXN0LnJlcG9ydFVSSXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKaW5kZXggOWE1OGMzNjM5N2FlLi45MjVh YmRhNjY2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0 eVBvbGljeS5oCkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIENvbnRlbnRTZWN1cml0eVBvbGljeURp cmVjdGl2ZTsKIGNsYXNzIENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q7CiBjbGFz cyBDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2U7CiBjbGFzcyBET01TdHJpbmdMaXN0OworY2xh c3MgRWxlbWVudDsKIGNsYXNzIEZyYW1lOwogY2xhc3MgSlNXaW5kb3dQcm94eTsKIGNsYXNzIFJl c291cmNlUmVxdWVzdDsKQEAgLTk1LDEwICs5NiwxMCBAQCBwdWJsaWM6CiAgICAgYm9vbCBhbGxv d1N0eWxlV2l0aE5vbmNlKGNvbnN0IFN0cmluZyYgbm9uY2UsIGJvb2wgb3ZlcnJpZGVDb250ZW50 U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CiAKICAgICBib29sIGFsbG93SmF2YVNjcmlw dFVSTHMoY29uc3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250 ZXh0TGluZSwgY29uc3QgU3RyaW5nJiBjb2RlLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5 UG9saWN5ID0gZmFsc2UpIGNvbnN0OwotICAgIGJvb2wgYWxsb3dJbmxpbmVFdmVudEhhbmRsZXJz KGNvbnN0IFN0cmluZyYgY29udGV4dFVSTCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExp bmUsIGNvbnN0IFN0cmluZyYgY29kZSwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGlj eSA9IGZhbHNlKSBjb25zdDsKLSAgICBib29sIGFsbG93SW5saW5lU2NyaXB0KGNvbnN0IFN0cmlu ZyYgY29udGV4dFVSTCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIFN0cmluZ1Zp ZXcgc2NyaXB0Q29udGVudCwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZh bHNlKSBjb25zdDsKKyAgICBib29sIGFsbG93SW5saW5lRXZlbnRIYW5kbGVycyhjb25zdCBTdHJp bmcmIGNvbnRleHRVUkwsIGNvbnN0IE9yZGluYWxOdW1iZXImIGNvbnRleHRMaW5lLCBjb25zdCBT dHJpbmcmIGNvZGUsIEVsZW1lbnQqLCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5 ID0gZmFsc2UpIGNvbnN0OworICAgIGJvb2wgYWxsb3dJbmxpbmVTY3JpcHQoY29uc3QgU3RyaW5n JiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwgU3RyaW5nVmll dyBzY3JpcHRDb250ZW50LCBFbGVtZW50JiwgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBv bGljeSA9IGZhbHNlKSBjb25zdDsKICAgICBib29sIGFsbG93Tm9uUGFyc2VySW5zZXJ0ZWRTY3Jp cHRzKGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZ1ZpZXcmLCBQYXJzZXJJ bnNlcnRlZCkgY29uc3Q7Ci0gICAgYm9vbCBhbGxvd0lubGluZVN0eWxlKGNvbnN0IFN0cmluZyYg Y29udGV4dFVSTCwgY29uc3QgT3JkaW5hbE51bWJlciYgY29udGV4dExpbmUsIFN0cmluZ1ZpZXcg c3R5bGVDb250ZW50LCBDaGVja1Vuc2FmZUhhc2hlcywgYm9vbCBvdmVycmlkZUNvbnRlbnRTZWN1 cml0eVBvbGljeSA9IGZhbHNlKSBjb25zdDsKKyAgICBib29sIGFsbG93SW5saW5lU3R5bGUoY29u c3QgU3RyaW5nJiBjb250ZXh0VVJMLCBjb25zdCBPcmRpbmFsTnVtYmVyJiBjb250ZXh0TGluZSwg U3RyaW5nVmlldyBzdHlsZUNvbnRlbnQsIENoZWNrVW5zYWZlSGFzaGVzLCBFbGVtZW50JiwgYm9v bCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZhbHNlKSBjb25zdDsKIAogICAgIGJv b2wgYWxsb3dFdmFsKEpTQzo6SlNHbG9iYWxPYmplY3QqLCBMb2dUb0NvbnNvbGUsIGJvb2wgb3Zl cnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CiAKQEAgLTIyMiw4ICsy MjMsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCByZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5n JiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiBibG9ja2VkVVJMLCBj b25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlLCBKU0M6OkpTR2xvYmFsT2JqZWN0KikgY29uc3Q7 CiAgICAgdm9pZCByZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRl ZERpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVu dFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdCYsIGNvbnN0IFN0cmluZyYgYmxvY2tlZFVSTCwg Y29uc3QgU3RyaW5nJiBjb25zb2xlTWVzc2FnZSwgSlNDOjpKU0dsb2JhbE9iamVjdCogPSBudWxs cHRyKSBjb25zdDsKLSAgICB2b2lkIHJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVj dGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3Rp dmUmIHZpb2xhdGVkRGlyZWN0aXZlLCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0 cmluZyYgY29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0 UG9zaXRpb24mIHNvdXJjZVBvc2l0aW9uLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMID0gVVJM KCksIEpTQzo6SlNHbG9iYWxPYmplY3QqID0gbnVsbHB0cikgY29uc3Q7Ci0gICAgdm9pZCByZXBv cnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBlZmZlY3RpdmVWaW9sYXRlZERpcmVjdGl2ZSwgY29u c3QgU3RyaW5nJiB2aW9sYXRlZERpcmVjdGl2ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlTGlzdCYgdmlvbGF0ZWREaXJlY3RpdmVMaXN0LCBjb25zdCBTdHJpbmcmIGJsb2Nr ZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc291cmNl VVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0aW9uLCBKU0M6OkpTR2xvYmFsT2Jq ZWN0KiwgY29uc3QgVVJMJiBwcmVSZWRpcmVjdFVSTCA9IFVSTCgpKSBjb25zdDsKKyAgICB2b2lk IHJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUmIHZpb2xhdGVkRGlyZWN0aXZl LCBjb25zdCBTdHJpbmcmIGJsb2NrZWRVUkwsIGNvbnN0IFN0cmluZyYgY29uc29sZU1lc3NhZ2Us IGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBjb25zdCBUZXh0UG9zaXRpb24mIHNvdXJjZVBvc2l0 aW9uLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMID0gVVJMKCksIEpTQzo6SlNHbG9iYWxPYmpl Y3QqID0gbnVsbHB0ciwgRWxlbWVudCogPSBudWxscHRyKSBjb25zdDsKKyAgICB2b2lkIHJlcG9y dFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGVmZmVjdGl2ZVZpb2xhdGVkRGlyZWN0aXZlLCBjb25z dCBTdHJpbmcmIHZpb2xhdGVkRGlyZWN0aXZlLCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lE aXJlY3RpdmVMaXN0JiB2aW9sYXRlZERpcmVjdGl2ZUxpc3QsIGNvbnN0IFN0cmluZyYgYmxvY2tl ZFVSTCwgY29uc3QgU3RyaW5nJiBjb25zb2xlTWVzc2FnZSwgY29uc3QgU3RyaW5nJiBzb3VyY2VV UkwsIGNvbnN0IFRleHRQb3NpdGlvbiYgc291cmNlUG9zaXRpb24sIEpTQzo6SlNHbG9iYWxPYmpl Y3QqLCBjb25zdCBVUkwmIHByZVJlZGlyZWN0VVJMID0gVVJMKCksIEVsZW1lbnQqID0gbnVsbHB0 cikgY29uc3Q7CiAgICAgdm9pZCByZXBvcnRCbG9ja2VkU2NyaXB0RXhlY3V0aW9uVG9JbnNwZWN0 b3IoY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVUZXh0KSBjb25zdDsKIAogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFZpb2xhdGVkRGlyZWN0aXZlLCB0eXBlbmFtZSBIYXNoU2VhcmNoUG9saWN5PiBib29s IGNoZWNrSGFzaEFuZFJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmLCBjb25zdCBWaW9sYXRl ZERpcmVjdGl2ZSYsIGNvbnN0IEhhc2hTZWFyY2hQb2xpY3kmLCBPcHRpb25TZXQ8Q29udGVudFNl Y3VyaXR5UG9saWN5SGFzaEFsZ29yaXRobT4sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6VmlvbGF0 ZWREaXJlY3RpdmVDYWxsYmFjayYmKSBjb25zdDsK