232120 2021-10-21 17:28:02 -0700 REGRESSION (r284650-284661): [iOS15 Sim] imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html is a text failure 2021-10-27 14:34:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ehutchison katherine_cheney bfulgham ehutchison ews-watchlist katherine_cheney mkwst webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1807465 0 ehutchison 2021-10-21 17:28:02 -0700 imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html is a text failure on iOS15 EWS History: https://results.webkit.org/?suite=layout-tests&test=imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html Build: https://ews-build.webkit.org/#/builders/68/builds/159 Results: https://ews-build.s3-us-west-2.amazonaws.com/iOS-15-Simulator-WK2-Tests-EWS/r441997-159/results.html Diff: --- /Volumes/Data/worker/iOS-15-Simulator-WK2-Tests-EWS/build/layout-test-results/imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms-expected.txt +++ /Volumes/Data/worker/iOS-15-Simulator-WK2-Tests-EWS/build/layout-test-results/imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms-actual.txt @@ -1,3 +1,3 @@ -FAIL Test that script executes if allowed by proper hash values assert_true: expected true got false +FAIL Test that script executes if allowed by proper hash values assert_unreached: Should not have triggered a security event Reached unreachable code Unable to locally reproduce the text failure. 1807466 1 webkit-bug-importer 2021-10-21 17:28:57 -0700 <rdar://problem/84529888> 1807469 2 ehutchison 2021-10-21 17:34:11 -0700 Updated test expectations at https://trac.webkit.org/changeset/284659/webkit 1807738 3 ap 2021-10-22 10:13:18 -0700 Test history shows that this isn't just EWS, but a very recent trunk regression. > Unable to locally reproduce the text failure. Which revision were you attempting to reproduce with? 1807742 4 ryanhaddad 2021-10-22 10:19:09 -0700 LayoutTests/TestExpectations:5154:imported/w3c/web-platform-tests/content-security-policy/script-src/ [ DumpJSConsoleLogInStdErr ] The flaky expectation added in r284659 is overriding this and causing the test to show up as a consistent failure now. 1807819 5 ehutchison 2021-10-22 12:20:34 -0700 (In reply to Ryan Haddad from comment #4) > LayoutTests/TestExpectations:5154:imported/w3c/web-platform-tests/content- > security-policy/script-src/ [ DumpJSConsoleLogInStdErr ] > > The flaky expectation added in r284659 is overriding this and causing the > test to show up as a consistent failure now. Add expectation: https://trac.webkit.org/changeset/284708/webkit 1809353 6 442616 katherine_cheney 2021-10-27 11:41:41 -0700 Created attachment 442616 Patch 1809362 7 442616 bfulgham 2021-10-27 11:56:48 -0700 Comment on attachment 442616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442616&action=review r=me > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:374 > + Vector<ContentSecurityPolicyHash> hashes; If we might have many hashes, we could preallocate hashes for the size of algorithms, but maybe we only ever have a handful. > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:376 > ContentSecurityPolicyHash hash = cryptographicDigestForBytes(algorithm, encodedContent.data(), encodedContent.size()); This could be auto 1809380 8 katherine_cheney 2021-10-27 12:35:27 -0700 (In reply to Brent Fulgham from comment #7) > Comment on attachment 442616 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442616&action=review > > r=me > Thanks! Going to wait for EWS before landing, in case I missed any failing tests locally. > > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:374 > > + Vector<ContentSecurityPolicyHash> hashes; > > If we might have many hashes, we could preallocate hashes for the size of > algorithms, but maybe we only ever have a handful. > We will only ever have 3 at most because only sha256, sha384, and sha512 are supported. So, probably not too much of an efficiency boost, but I will change it if you think it is important. > > Source/WebCore/page/csp/ContentSecurityPolicy.cpp:376 > > ContentSecurityPolicyHash hash = cryptographicDigestForBytes(algorithm, encodedContent.data(), encodedContent.size()); > > This could be auto Will fix. 1809403 9 442626 katherine_cheney 2021-10-27 13:35:50 -0700 Created attachment 442626 Patch for landing 1809435 10 ews-feeder 2021-10-27 14:34:11 -0700 Committed r284959 (243611@main): <https://commits.webkit.org/243611@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442626. 442616 2021-10-27 11:41:41 -0700 2021-10-27 13:35:47 -0700 Patch bug-232120-20211027114140.patch text/plain 18101 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjZTg0ODNmYTYyMzdh NDdjYWUyZTBhOTQ2OWI0NGZlOWE5Y2M5OC4uNWQzYjM1YmRjNDVmNGI4ZjkzY2Q2M2JmZjA4YjNk Njc4MjYzOGExNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTEwLTI3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIyODQ2NTAtMjg0NjYxKTogW2lPUzE1IFNpbV0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3JjL3NjcmlwdC1zcmMtbXVs dGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0aG1zLmh0bWwgaXMgYSB0ZXh0 IGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMjEyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ1Mjk4ODg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmxha3kgdGVzdCB3YXMgY2F1c2Vk IGJ5IGEgcmFjZSBjb25kaXRpb24gYmV0d2VlbiAyIGVycm9yIG1lc3NhZ2VzIGluCisgICAgICAg IHRoZSB0ZXN0LiBUbyBmaXggdGhlIGZsYWtpbmVzcywgdGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyBz byB0aGUgdGVzdAorICAgICAgICB3aWxsIG5vdyBwYXNzLgorCisgICAgICAgIFRoaXMgYWRkcyBz dXBwb3J0IGZvciBtdWx0aXBsZSBDU1AgcG9saWNpZXMgd2l0aCBkaWZmZXJlbnQgaGFzaGVzIGZv ciB0aGUKKyAgICAgICAgc2FtZSBzY3JpcHQsIGUuZy4gb25lIGZvciBzaGEyNTYgYW5kIG9uZSBm b3Igc2hhMzg0LiBJbnN0ZWFkIG9mCisgICAgICAgIHNlbmRpbmcgdGhlIGhhc2ggZnJvbSBvbmUg YWxnb3JpdGhtIHRvIGNoZWNrIGFnYWluc3QgYWxsIHBvbGljaWVzLCB3ZQorICAgICAgICBub3cg c2VuZCBoYXNoZXMgZnJvbSBhbGwgc3BlY2lmaWVkIGFsZ29yaXRobXMgYW5kIG1ha2Ugc3VyZSBl YWNoCisgICAgICAgIHBvbGljeSBhbGxvd3MgYXQgbGVhc3Qgb25lIG9mIHRoZW0uCisKKyAgICAg ICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpmaW5kSGFzaE9mQ29udGVudEluUG9saWNpZXMgY29u c3QpOgorICAgICAgICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxp c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2hlY2tVbnNhZmVIYXNoZXMpOgorICAgICAgICAo V2ViQ29yZTo6Y2hlY2tIYXNoZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVIYXNoU2NyaXB0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2 ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSGFzaFN0eWxlIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVk RGlyZWN0aXZlRm9yU2NyaXB0SGFzaCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclN0eWxlSGFz aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0hhc2gpOiBEZWxldGVkLgorICAgICAg ICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuaDoKKyAgICAg ICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3Q6Om1hdGNoZXMgY29u c3QpOgorICAgICAgICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3Qu aDoKKyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGly ZWN0aXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJj ZUxpc3REaXJlY3RpdmU6OmFsbG93cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd1Vuc2FmZUhhc2hlcyBjb25z dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERp cmVjdGl2ZS5oOgorCiAyMDIxLTEwLTI2ICBHYWJyaWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJp bm9AYXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VSVChwYXJlbnQtPmVsZW1lbnQoKSkgdHJpZ2dl cmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCBhYTMyY2VmOWZmZGM0Y2QyMDA3 OTBhMTZmZGQwNTViMGZiNDc3ZmMyLi40NjcxYjUxNWM0YzViYzk1ZTc1ODZlZjYxMjEzN2UzOTlk NjRkYjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJp dHlQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0 eVBvbGljeS5jcHAKQEAgLTM3MSwxNSArMzcxLDE2IEBAIENvbnRlbnRTZWN1cml0eVBvbGljeTo6 SGFzaEluRW5mb3JjZWRBbmRSZXBvcnRPbmx5UG9saWNpZXNQYWlyIENvbnRlbnRTZWN1cml0eVBv CiAgICAgYXV0byBlbmNvZGVkQ29udGVudCA9IGVuY29kaW5nVG9Vc2UuZW5jb2RlKGNvbnRlbnQs IFVuZW5jb2RhYmxlSGFuZGxpbmc6OkVudGl0aWVzKTsKICAgICBib29sIGZvdW5kSGFzaEluRW5m b3JjZWRQb2xpY2llcyA9IGZhbHNlOwogICAgIGJvb2wgZm91bmRIYXNoSW5SZXBvcnRPbmx5UG9s aWNpZXMgPSBmYWxzZTsKKyAgICBWZWN0b3I8Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4gaGFz aGVzOwogICAgIGZvciAoYXV0byBhbGdvcml0aG0gOiBhbGdvcml0aG1zKSB7CiAgICAgICAgIENv bnRlbnRTZWN1cml0eVBvbGljeUhhc2ggaGFzaCA9IGNyeXB0b2dyYXBoaWNEaWdlc3RGb3JCeXRl cyhhbGdvcml0aG0sIGVuY29kZWRDb250ZW50LmRhdGEoKSwgZW5jb2RlZENvbnRlbnQuc2l6ZSgp KTsKLSAgICAgICAgaWYgKCFmb3VuZEhhc2hJbkVuZm9yY2VkUG9saWNpZXMgJiYgYWxsUG9saWNp ZXNXaXRoRGlzcG9zaXRpb25BbGxvdyhDb250ZW50U2VjdXJpdHlQb2xpY3k6OkRpc3Bvc2l0aW9u OjpFbmZvcmNlLCBwcmVkaWNhdGUsIGhhc2gpKQotICAgICAgICAgICAgZm91bmRIYXNoSW5FbmZv cmNlZFBvbGljaWVzID0gdHJ1ZTsKLSAgICAgICAgaWYgKCFmb3VuZEhhc2hJblJlcG9ydE9ubHlQ b2xpY2llcyAmJiBhbGxQb2xpY2llc1dpdGhEaXNwb3NpdGlvbkFsbG93KENvbnRlbnRTZWN1cml0 eVBvbGljeTo6RGlzcG9zaXRpb246OlJlcG9ydE9ubHksIHByZWRpY2F0ZSwgaGFzaCkpCi0gICAg ICAgICAgICBmb3VuZEhhc2hJblJlcG9ydE9ubHlQb2xpY2llcyA9IHRydWU7Ci0gICAgICAgIGlm IChmb3VuZEhhc2hJbkVuZm9yY2VkUG9saWNpZXMgJiYgZm91bmRIYXNoSW5SZXBvcnRPbmx5UG9s aWNpZXMpCi0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgaGFzaGVzLmFwcGVuZChoYXNoKTsK ICAgICB9CisgICAgaWYgKCFmb3VuZEhhc2hJbkVuZm9yY2VkUG9saWNpZXMgJiYgYWxsUG9saWNp ZXNXaXRoRGlzcG9zaXRpb25BbGxvdyhDb250ZW50U2VjdXJpdHlQb2xpY3k6OkRpc3Bvc2l0aW9u OjpFbmZvcmNlLCBwcmVkaWNhdGUsIGhhc2hlcykpCisgICAgICAgIGZvdW5kSGFzaEluRW5mb3Jj ZWRQb2xpY2llcyA9IHRydWU7CisgICAgaWYgKCFmb3VuZEhhc2hJblJlcG9ydE9ubHlQb2xpY2ll cyAmJiBhbGxQb2xpY2llc1dpdGhEaXNwb3NpdGlvbkFsbG93KENvbnRlbnRTZWN1cml0eVBvbGlj eTo6RGlzcG9zaXRpb246OlJlcG9ydE9ubHksIHByZWRpY2F0ZSwgaGFzaGVzKSkKKyAgICAgICAg Zm91bmRIYXNoSW5SZXBvcnRPbmx5UG9saWNpZXMgPSB0cnVlOworCiAgICAgcmV0dXJuIHsgZm91 bmRIYXNoSW5FbmZvcmNlZFBvbGljaWVzLCBmb3VuZEhhc2hJblJlcG9ydE9ubHlQb2xpY2llcyB9 OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJp dHlQb2xpY3lEaXJlY3RpdmVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRl bnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuY3BwCmluZGV4IDI1YmUxMmIwMWMzYjljMzIz YThmNjkxYWU1MmMzNzliYjkwYTlhOTMuLjlhOGRmMjkyNTBlYmQyYzY3YjMxNGYzOWUyNmM4Mjc0 Y2U0YjA0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1 cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3Nw L0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuY3BwCkBAIC01Niw5ICs1Niw5IEBA IHN0YXRpYyBpbmxpbmUgYm9vbCBjaGVja0lubGluZShDb250ZW50U2VjdXJpdHlQb2xpY3lTb3Vy Y2VMaXN0RGlyZWN0aXZlKiBkaXJlY3RpCiAgICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0 aXZlLT5hbGxvd0lubGluZSgpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tVbnNhZmVI YXNoZXMoQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aXZl LCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKQorc3RhdGljIGlubGluZSBi b29sIGNoZWNrVW5zYWZlSGFzaGVzKENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJl Y3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2g+ JiBoYXNoZXMpCiB7Ci0gICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxvd1Vu c2FmZUhhc2hlcyhoYXNoKTsKKyAgICByZXR1cm4gIWRpcmVjdGl2ZSB8fCBkaXJlY3RpdmUtPmFs bG93VW5zYWZlSGFzaGVzKGhhc2hlcyk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBjaGVja05v blBhcnNlckluc2VydGVkU2NyaXB0cyhDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGly ZWN0aXZlKiBkaXJlY3RpdmUsIFBhcnNlckluc2VydGVkIHBhcnNlckluc2VydGVkKQpAQCAtNzQs OSArNzQsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tTb3VyY2UoQ29udGVudFNlY3VyaXR5 UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aQogICAgIHJldHVybiAhZGlyZWN0aXZl IHx8IGRpcmVjdGl2ZS0+YWxsb3dzKHVybCwgZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UsIHNo b3VsZEFsbG93RW1wdHlVUkxJZlNvdXJjZUxpc3RFbXB0eSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUg Ym9vbCBjaGVja0hhc2goQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSog ZGlyZWN0aXZlLCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKQorc3RhdGlj IGlubGluZSBib29sIGNoZWNrSGFzaGVzKENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3RE aXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhh c2g+JiBoYXNoZXMpCiB7Ci0gICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxv d3MoaGFzaCk7CisgICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxvd3MoaGFz aGVzKTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGNoZWNrTm9uY2UoQ29udGVudFNlY3VyaXR5 UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aXZlLCBjb25zdCBTdHJpbmcmIG5vbmNl KQpAQCAtMTkwLDE4ICsxOTAsMTggQEAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0 aXZlKiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXQKICAgICByZXR1 cm4gb3BlcmF0aXZlRGlyZWN0aXZlOwogfQogCi1jb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lE aXJlY3RpdmUqIENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGly ZWN0aXZlRm9yVW5zYWZlSGFzaFNjcmlwdChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNo JiBoYXNoKSBjb25zdAorY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiBDb250 ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclVuc2Fm ZUhhc2hTY3JpcHQoY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2g+JiBoYXNo ZXMpIGNvbnN0CiB7CiAgICAgYXV0byogb3BlcmF0aXZlRGlyZWN0aXZlID0gdGhpcy0+b3BlcmF0 aXZlRGlyZWN0aXZlKG1fc2NyaXB0U3JjLmdldCgpLCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJl Y3RpdmVOYW1lczo6c2NyaXB0U3JjKTsKLSAgICBpZiAoY2hlY2tVbnNhZmVIYXNoZXMob3BlcmF0 aXZlRGlyZWN0aXZlLCBoYXNoKSkKKyAgICBpZiAoY2hlY2tVbnNhZmVIYXNoZXMob3BlcmF0aXZl RGlyZWN0aXZlLCBoYXNoZXMpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4g b3BlcmF0aXZlRGlyZWN0aXZlOwogfQogCi1jb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJl Y3RpdmUqIENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0 aXZlRm9yVW5zYWZlSGFzaFN0eWxlKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2gmIGhh c2gpIGNvbnN0Citjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIENvbnRlbnRT ZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSGFz aFN0eWxlKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFzaGVzKSBj b25zdAogewogICAgIGF1dG8qIG9wZXJhdGl2ZURpcmVjdGl2ZSA9IHRoaXMtPm9wZXJhdGl2ZURp cmVjdGl2ZShtX3N0eWxlU3JjLmdldCgpLCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVO YW1lczo6c2NyaXB0U3JjKTsKLSAgICBpZiAoY2hlY2tVbnNhZmVIYXNoZXMob3BlcmF0aXZlRGly ZWN0aXZlLCBoYXNoKSkKKyAgICBpZiAoY2hlY2tVbnNhZmVIYXNoZXMob3BlcmF0aXZlRGlyZWN0 aXZlLCBoYXNoZXMpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gb3BlcmF0 aXZlRGlyZWN0aXZlOwogfQpAQCAtMjQ3LDE4ICsyNDcsMTggQEAgY29uc3QgQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlKiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2 aW9sYXQKICAgICByZXR1cm4gb3BlcmF0aXZlRGlyZWN0aXZlOwogfQogCi1jb25zdCBDb250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxp c3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yU2NyaXB0SGFzaChjb25zdCBDb250ZW50U2VjdXJpdHlQ b2xpY3lIYXNoJiBoYXNoKSBjb25zdAorY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0 aXZlKiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2 ZUZvclNjcmlwdEhhc2goY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2g+JiBo YXNoZXMpIGNvbnN0CiB7CiAgICAgYXV0byogb3BlcmF0aXZlRGlyZWN0aXZlID0gdGhpcy0+b3Bl cmF0aXZlRGlyZWN0aXZlKG1fc2NyaXB0U3JjLmdldCgpLCBDb250ZW50U2VjdXJpdHlQb2xpY3lE aXJlY3RpdmVOYW1lczo6c2NyaXB0U3JjKTsKLSAgICBpZiAoY2hlY2tIYXNoKG9wZXJhdGl2ZURp cmVjdGl2ZSwgaGFzaCkpCisgICAgaWYgKGNoZWNrSGFzaGVzKG9wZXJhdGl2ZURpcmVjdGl2ZSwg aGFzaGVzKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIG9wZXJhdGl2ZURp cmVjdGl2ZTsKIH0KIAotY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiBDb250 ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclN0eWxl SGFzaChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKSBjb25zdAorY29uc3Qg Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJl Y3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclN0eWxlSGFzaChjb25zdCBWZWN0b3I8Q29u dGVudFNlY3VyaXR5UG9saWN5SGFzaD4mIGhhc2hlcykgY29uc3QKIHsKICAgICBhdXRvKiBvcGVy YXRpdmVEaXJlY3RpdmUgPSB0aGlzLT5vcGVyYXRpdmVEaXJlY3RpdmUobV9zdHlsZVNyYy5nZXQo KSwgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTmFtZXM6OnN0eWxlU3JjKTsKLSAgICBp ZiAoY2hlY2tIYXNoKG9wZXJhdGl2ZURpcmVjdGl2ZSwgaGFzaCkpCisgICAgaWYgKGNoZWNrSGFz aGVzKG9wZXJhdGl2ZURpcmVjdGl2ZSwgaGFzaGVzKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAgICAgcmV0dXJuIG9wZXJhdGl2ZURpcmVjdGl2ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Qu aAppbmRleCA3YmU5ZGE5YTJmZWI0OTNlNWRlYzYwMDZjZmQ3ZDM2MDRlNTYyOTkxLi4zZWY5ZjBj ZGYyZGU4NGVlYzU3NjliNjU5ZTJkZGZmNzBkNzUyYTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlz dC5oCkBAIC01MiwxMCArNTIsMTAgQEAgcHVibGljOgogICAgIGNvbnN0IENvbnRlbnRTZWN1cml0 eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVJbmxpbmVTdHlsZUVs ZW1lbnQoKSBjb25zdDsKICAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUq IHZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSW5saW5lU3R5bGVBdHRyaWJ1dGUoKSBjb25zdDsK IAotICAgIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0ZWREaXJl Y3RpdmVGb3JTY3JpcHRIYXNoKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2gmKSBjb25z dDsKLSAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGly ZWN0aXZlRm9yU3R5bGVIYXNoKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2gmKSBjb25z dDsKLSAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGly ZWN0aXZlRm9yVW5zYWZlSGFzaFNjcmlwdChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNo JikgY29uc3Q7Ci0gICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9s YXRlZERpcmVjdGl2ZUZvclVuc2FmZUhhc2hTdHlsZShjb25zdCBDb250ZW50U2VjdXJpdHlQb2xp Y3lIYXNoJikgY29uc3Q7CisgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZl KiB2aW9sYXRlZERpcmVjdGl2ZUZvclNjcmlwdEhhc2goY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1 cml0eVBvbGljeUhhc2g+JikgY29uc3Q7CisgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvclN0eWxlSGFzaChjb25zdCBWZWN0b3I8Q29u dGVudFNlY3VyaXR5UG9saWN5SGFzaD4mKSBjb25zdDsKKyAgICBjb25zdCBDb250ZW50U2VjdXJp dHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSGFzaFNjcmlwdChj b25zdCBWZWN0b3I8Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4mKSBjb25zdDsKKyAgICBjb25z dCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yVW5z YWZlSGFzaFN0eWxlKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYpIGNv bnN0OwogCiAgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRl ZERpcmVjdGl2ZUZvclNjcmlwdE5vbmNlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwogICAgIGNvbnN0 IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0ZWREaXJlY3RpdmVGb3JTdHls ZU5vbmNlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcAppbmRleCAz MTRkMWQzNWZhODVmYzQ1ZWY0YTAzOWNlYzlmOWZkYzM1Y2FmODE4Li4yZmIwZTFkMTFlOTBmY2Q4 ZTdmMzk4ZTEyMWNkYjY5YmIwZmI4OWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmNwcApAQCAtMTQ1 LDkgKzE0NSwxNCBAQCBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3Q6Om1hdGNo ZXMoY29uc3QgVVJMJiB1cmwsIGJvb2wgZGlkUmVjZWl2ZVJlZAogICAgIHJldHVybiBmYWxzZTsK IH0KIAotYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0OjptYXRjaGVzKGNvbnN0 IENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2gmIGhhc2gpIGNvbnN0Citib29sIENvbnRlbnRTZWN1 cml0eVBvbGljeVNvdXJjZUxpc3Q6Om1hdGNoZXMoY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0 eVBvbGljeUhhc2g+JiBoYXNoZXMpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1faGFzaGVzLmNvbnRh aW5zKGhhc2gpOworICAgIGZvciAoYXV0byYgaGFzaCA6IGhhc2hlcykgeworICAgICAgICBpZiAo bV9oYXNoZXMuY29udGFpbnMoaGFzaCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 CisKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5U291 cmNlTGlzdDo6bWF0Y2hlcyhjb25zdCBTdHJpbmcmIG5vbmNlKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlz dC5oCmluZGV4IDNlMWIyM2Q5MmVjYjI2MWFiMDIyYWJiMTc1Y2IzZWE2YTg5MWIzNzUuLjYwOTNi ODgyNmY5OTA4OTUyMWZiZjgyMjk1N2EzMzc4ZGQxODZhMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmgK QEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogICAgIHZvaWQgcGFyc2UoY29uc3QgU3RyaW5nJik7 CiAKICAgICBib29sIG1hdGNoZXMoY29uc3QgVVJMJiwgYm9vbCBkaWRSZWNlaXZlUmVkaXJlY3RS ZXNwb25zZSkgY29uc3Q7Ci0gICAgYm9vbCBtYXRjaGVzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBv bGljeUhhc2gmKSBjb25zdDsKKyAgICBib29sIG1hdGNoZXMoY29uc3QgVmVjdG9yPENvbnRlbnRT ZWN1cml0eVBvbGljeUhhc2g+JikgY29uc3Q7CiAgICAgYm9vbCBtYXRjaGVzKGNvbnN0IFN0cmlu ZyYgbm9uY2UpIGNvbnN0OwogCiAgICAgT3B0aW9uU2V0PENvbnRlbnRTZWN1cml0eVBvbGljeUhh c2hBbGdvcml0aG0+IGhhc2hBbGdvcml0aG1zVXNlZCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzaEFs Z29yaXRobXNVc2VkOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250 ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmUuY3BwCmlu ZGV4IGQ3MDU3ODk2NDBmNGUzMDkzYTNkZGI4NzI2MzZlODIwNzdhNmExMzIuLjFlMGJkMzIxMzk0 ZGM0ZjI1YTQxYjBmNTcxNzI3ZTY5MWFhMGM2NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxp c3REaXJlY3RpdmUuY3BwCkBAIC01MiwxNCArNTIsMTQgQEAgYm9vbCBDb250ZW50U2VjdXJpdHlQ b2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd3MoY29uc3QgU3RyaW5nJiBub25jZSkgY29u c3QKICAgICByZXR1cm4gbV9zb3VyY2VMaXN0Lm1hdGNoZXMobm9uY2UpOwogfQogCi1ib29sIENv bnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmU6OmFsbG93cyhjb25zdCBDb250 ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKSBjb25zdAorYm9vbCBDb250ZW50U2VjdXJpdHlQ b2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd3MoY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1 cml0eVBvbGljeUhhc2g+JiBoYXNoZXMpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fc291cmNlTGlz dC5tYXRjaGVzKGhhc2gpOworICAgIHJldHVybiBtX3NvdXJjZUxpc3QubWF0Y2hlcyhoYXNoZXMp OwogfQogCi1ib29sIENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmU6OmFs bG93VW5zYWZlSGFzaGVzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2gmIGhhc2gpIGNv bnN0Citib29sIENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmU6OmFsbG93 VW5zYWZlSGFzaGVzKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFz aGVzKSBjb25zdAogewotICAgIHJldHVybiBtX3NvdXJjZUxpc3QuYWxsb3dVbnNhZmVIYXNoZXMo KSAmJiBhbGxvd3MoaGFzaCk7CisgICAgcmV0dXJuIG1fc291cmNlTGlzdC5hbGxvd1Vuc2FmZUhh c2hlcygpICYmIGFsbG93cyhoYXNoZXMpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lT b3VyY2VMaXN0RGlyZWN0aXZlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2Vj dXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlLmgKaW5kZXggZDlkMjI0ZDVjZjY3ZDZkMWVl NzNlOTY5OGQwYmRlZmFhZjA2NzMxYS4uNGFhZjE5OTI1ZjE5NjU4ZGE4NmFmYjNmOTJjMTZmNzg1 ZTk5Y2ExOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3Vy aXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Y3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmUuaApAQCAtMzksOCAr MzksOCBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNzIFNob3VsZEFsbG93RW1wdHlVUkxJZlNv dXJjZUxpc3RJc05vdE5vbmUgeyBObywgWWVzIH07CiAgICAgYm9vbCBhbGxvd3MoY29uc3QgVVJM JiwgYm9vbCBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSwgU2hvdWxkQWxsb3dFbXB0eVVSTElm U291cmNlTGlzdElzTm90Tm9uZSk7Ci0gICAgYm9vbCBhbGxvd3MoY29uc3QgQ29udGVudFNlY3Vy aXR5UG9saWN5SGFzaCYpIGNvbnN0OwotICAgIGJvb2wgYWxsb3dVbnNhZmVIYXNoZXMoY29uc3Qg Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYpIGNvbnN0OworICAgIGJvb2wgYWxsb3dzKGNvbnN0 IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYpIGNvbnN0OworICAgIGJvb2wgYWxs b3dVbnNhZmVIYXNoZXMoY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2g+Jikg Y29uc3Q7CiAgICAgYm9vbCBhbGxvd3MoY29uc3QgU3RyaW5nJiBub25jZSkgY29uc3Q7CiAgICAg Ym9vbCBhbGxvd0lubGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlTGlzdC5hbGxvd0lubGlu ZSgpOyB9CiAgICAgYm9vbCBhbGxvd0V2YWwoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZUxpc3Qu YWxsb3dFdmFsKCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzMzU2YmVmMDUyYThiNTEwYTc4YTg1MzQ3NmYwODQyZmRj N2RiNzU2Li5lYTI1YjM5NjhjMTAzZDM2YzI3ZjkwZGQ1OTNkZmU4MTQzY2VmYTRiIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjEtMTAtMjcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NDY1MC0yODQ2NjEpOiBbaU9T MTUgU2ltXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHkt cG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNyYy1tdWx0aXBsZS1wb2xpY2llcy1tdWx0aXBsZS1o YXNoaW5nLWFsZ29yaXRobXMuaHRtbCBpcyBhIHRleHQgZmFpbHVyZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMTIwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS84NDUyOTg4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0x MC0yNiAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBb IGlPUyBSZWxlYXNlIF0gZmFzdC9mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtYWRqdXN0 Lmh0bWwgaXMgYSBmbGFreSBpbWFnZSBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cKaW5kZXggMzJiNDU3OGFjNjYyYTA4MGJiM2Q1ZmI1MjY5Zjk1MmYyNTYwNjhhYy4uNDFlMTZl M2QyOTU2NDVjODYxYWQ1NTYzYTc4ZTE1ZGRmY2I5NWNlZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTAtMjcgIEthdGUgQ2hlbmV5ICA8a2F0 aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NDY1MC0y ODQ2NjEpOiBbaU9TMTUgU2ltXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRl bnQtc2VjdXJpdHktcG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNyYy1tdWx0aXBsZS1wb2xpY2ll cy1tdWx0aXBsZS1oYXNoaW5nLWFsZ29yaXRobXMuaHRtbCBpcyBhIHRleHQgZmFpbHVyZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMTIwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84NDUyOTg4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3Vy aXR5LXBvbGljeS9zY3JpcHQtc3JjL3NjcmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlw bGUtaGFzaGluZy1hbGdvcml0aG1zLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0xMC0yNiAgTWFydGlu IFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXBkYXRlIGltcG9y dCBvZiBjc3MvY3NzLXRyYW5zZm9ybSBXUFQgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kv c2NyaXB0LXNyYy9zY3JpcHQtc3JjLW11bHRpcGxlLXBvbGljaWVzLW11bHRpcGxlLWhhc2hpbmct YWxnb3JpdGhtcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNy Yy1tdWx0aXBsZS1wb2xpY2llcy1tdWx0aXBsZS1oYXNoaW5nLWFsZ29yaXRobXMtZXhwZWN0ZWQu dHh0CmluZGV4IGRkY2QyZmM4ZDY2ZGIyNjI4ZTU4MDI4Yzg5YmFiNjJiZTgzODI1NTAuLmZiZWMy MGNhZDM4ZGZlMjk1ZDc0ZDFhZWYxZDM4NzYwMDYxNzg3Y2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY29udGVudC1zZWN1cml0eS1wb2xp Y3kvc2NyaXB0LXNyYy9zY3JpcHQtc3JjLW11bHRpcGxlLXBvbGljaWVzLW11bHRpcGxlLWhhc2hp bmctYWxnb3JpdGhtcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3JjL3Nj cmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0aG1zLWV4 cGVjdGVkLnR4dApAQCAtMSwzICsxLDMgQEAKIAotRkFJTCBUZXN0IHRoYXQgc2NyaXB0IGV4ZWN1 dGVzIGlmIGFsbG93ZWQgYnkgcHJvcGVyIGhhc2ggdmFsdWVzIGFzc2VydF90cnVlOiBleHBlY3Rl ZCB0cnVlIGdvdCBmYWxzZQorUEFTUyBUZXN0IHRoYXQgc2NyaXB0IGV4ZWN1dGVzIGlmIGFsbG93 ZWQgYnkgcHJvcGVyIGhhc2ggdmFsdWVzCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13 azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBkOGM5MDhiNDdkNjk5YzNhZDRhZWIwZDQ4M2ZmNjRk MGYzMTNkNzZkLi41OTE3N2UzYmRhYWJkYjQwMDExYzZkZTZmNzgzZjY1ZDMzNzhjZmJhIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMjM4 LDggKzIyMzgsNiBAQCB3ZWJraXQub3JnL2IvMjMxNzgwIFsgRGVidWcgXSBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9zaW11bGNhc3QvYgogCiB3ZWJraXQub3JnL2IvMjMy MDk5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vic29ja2V0cy9DbG9zZS0xMDAw LmFueS5odG1sIFsgUGFzcyBDcmFzaCBdCiAKLXdlYmtpdC5vcmcvYi8yMzIxMjAgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3Jj L3NjcmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0aG1z Lmh0bWwgWyBQYXNzIEZhaWx1cmUgRHVtcEpTQ29uc29sZUxvZ0luU3RkRXJyIF0KLQogd2Via2l0 Lm9yZy9iLzIyNTUyOCBodHRwL3dwdC9mZXRjaC9mZXRjaC1yZXNwb25zZS1ib2R5LXN0b3AtaW4t d29ya2VyLmh0bWwgWyBQYXNzIENyYXNoIF0KIAogd2Via2l0Lm9yZy9iLzIzMjI1MiBbIFJlbGVh c2UgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENEdGxzVHJhbnNw b3J0LXN0YXRlLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQo= 442626 2021-10-27 13:35:50 -0700 2021-10-27 14:34:12 -0700 Patch for landing bug-232120-20211027133549.patch text/plain 18205 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjZTg0ODNmYTYyMzdh NDdjYWUyZTBhOTQ2OWI0NGZlOWE5Y2M5OC4uOTlhZGI5Y2Q3YmY2YTA2MWI2YThmYzFjYzBkNWM1 MzQwMDY0ZmE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTEwLTI3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIyODQ2NTAtMjg0NjYxKTogW2lPUzE1IFNpbV0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3JjL3NjcmlwdC1zcmMtbXVs dGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0aG1zLmh0bWwgaXMgYSB0ZXh0 IGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMjEyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ1Mjk4ODg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBGbGFreSB0ZXN0IHdhcyBjYXVzZWQg YnkgYSByYWNlIGNvbmRpdGlvbiBiZXR3ZWVuIDIgZXJyb3IgbWVzc2FnZXMgaW4KKyAgICAgICAg dGhlIHRlc3QuIFRvIGZpeCB0aGUgZmxha2luZXNzLCB0aGlzIHBhdGNoIGZpeGVzIGEgYnVnIHNv IHRoZSB0ZXN0CisgICAgICAgIHdpbGwgbm93IHBhc3MuCisKKyAgICAgICAgVGhpcyBhZGRzIHN1 cHBvcnQgZm9yIG11bHRpcGxlIENTUCBwb2xpY2llcyB3aXRoIGRpZmZlcmVudCBoYXNoZXMgZm9y IHRoZQorICAgICAgICBzYW1lIHNjcmlwdCwgZS5nLiBvbmUgZm9yIHNoYTI1NiBhbmQgb25lIGZv ciBzaGEzODQuIEluc3RlYWQgb2YKKyAgICAgICAgc2VuZGluZyB0aGUgaGFzaCBmcm9tIG9uZSBh bGdvcml0aG0gdG8gY2hlY2sgYWdhaW5zdCBhbGwgcG9saWNpZXMsIHdlCisgICAgICAgIG5vdyBz ZW5kIGhhc2hlcyBmcm9tIGFsbCBzcGVjaWZpZWQgYWxnb3JpdGhtcyBhbmQgbWFrZSBzdXJlIGVh Y2gKKyAgICAgICAgcG9saWN5IGFsbG93cyBhdCBsZWFzdCBvbmUgb2YgdGhlbS4KKworICAgICAg ICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmZpbmRIYXNoT2ZDb250ZW50SW5Qb2xpY2llcyBjb25z dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGVja1Vuc2FmZUhhc2hlcyk6CisgICAgICAgIChX ZWJDb3JlOjpjaGVja0hhc2hlcyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQ b2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclVuc2FmZUhhc2hTY3JpcHQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZl TGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVIYXNoU3R5bGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWRE aXJlY3RpdmVGb3JTY3JpcHRIYXNoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRT ZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Q6OnZpb2xhdGVkRGlyZWN0aXZlRm9yU3R5bGVIYXNo IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OmNoZWNrSGFzaCk6IERlbGV0ZWQuCisgICAgICAg ICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5oOgorICAgICAg ICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdDo6bWF0Y2hlcyBjb25z dCk6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5o OgorICAgICAgICAqIHBhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJl Y3RpdmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNl TGlzdERpcmVjdGl2ZTo6YWxsb3dzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRT ZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmU6OmFsbG93VW5zYWZlSGFzaGVzIGNvbnN0 KToKKyAgICAgICAgKiBwYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGly ZWN0aXZlLmg6CisKIDIwMjEtMTAtMjYgIEdhYnJpZWwgTmF2YSBNYXJpbm8gIDxnbmF2YW1hcmlu b0BhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUKHBhcmVudC0+ZWxlbWVudCgpKSB0cmlnZ2Vy ZWQgaW4gU3R5bGVhYmxlOjpmcm9tUmVuZGVyZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IGFhMzJjZWY5ZmZkYzRjZDIwMDc5 MGExNmZkZDA1NWIwZmI0NzdmYzIuLjQ1YjFkNGFmMTNlMTcwMjQzNWMyMzYxNTA2MGQ4NzAwMGU5 MTI0MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0 eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5 UG9saWN5LmNwcApAQCAtMzcxLDE1ICszNzEsMTYgQEAgQ29udGVudFNlY3VyaXR5UG9saWN5OjpI YXNoSW5FbmZvcmNlZEFuZFJlcG9ydE9ubHlQb2xpY2llc1BhaXIgQ29udGVudFNlY3VyaXR5UG8K ICAgICBhdXRvIGVuY29kZWRDb250ZW50ID0gZW5jb2RpbmdUb1VzZS5lbmNvZGUoY29udGVudCwg VW5lbmNvZGFibGVIYW5kbGluZzo6RW50aXRpZXMpOwogICAgIGJvb2wgZm91bmRIYXNoSW5FbmZv cmNlZFBvbGljaWVzID0gZmFsc2U7CiAgICAgYm9vbCBmb3VuZEhhc2hJblJlcG9ydE9ubHlQb2xp Y2llcyA9IGZhbHNlOworICAgIFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiBoYXNo ZXM7CiAgICAgZm9yIChhdXRvIGFsZ29yaXRobSA6IGFsZ29yaXRobXMpIHsKLSAgICAgICAgQ29u dGVudFNlY3VyaXR5UG9saWN5SGFzaCBoYXNoID0gY3J5cHRvZ3JhcGhpY0RpZ2VzdEZvckJ5dGVz KGFsZ29yaXRobSwgZW5jb2RlZENvbnRlbnQuZGF0YSgpLCBlbmNvZGVkQ29udGVudC5zaXplKCkp OwotICAgICAgICBpZiAoIWZvdW5kSGFzaEluRW5mb3JjZWRQb2xpY2llcyAmJiBhbGxQb2xpY2ll c1dpdGhEaXNwb3NpdGlvbkFsbG93KENvbnRlbnRTZWN1cml0eVBvbGljeTo6RGlzcG9zaXRpb246 OkVuZm9yY2UsIHByZWRpY2F0ZSwgaGFzaCkpCi0gICAgICAgICAgICBmb3VuZEhhc2hJbkVuZm9y Y2VkUG9saWNpZXMgPSB0cnVlOwotICAgICAgICBpZiAoIWZvdW5kSGFzaEluUmVwb3J0T25seVBv bGljaWVzICYmIGFsbFBvbGljaWVzV2l0aERpc3Bvc2l0aW9uQWxsb3coQ29udGVudFNlY3VyaXR5 UG9saWN5OjpEaXNwb3NpdGlvbjo6UmVwb3J0T25seSwgcHJlZGljYXRlLCBoYXNoKSkKLSAgICAg ICAgICAgIGZvdW5kSGFzaEluUmVwb3J0T25seVBvbGljaWVzID0gdHJ1ZTsKLSAgICAgICAgaWYg KGZvdW5kSGFzaEluRW5mb3JjZWRQb2xpY2llcyAmJiBmb3VuZEhhc2hJblJlcG9ydE9ubHlQb2xp Y2llcykKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICBhdXRvIGhhc2ggPSBjcnlwdG9ncmFw aGljRGlnZXN0Rm9yQnl0ZXMoYWxnb3JpdGhtLCBlbmNvZGVkQ29udGVudC5kYXRhKCksIGVuY29k ZWRDb250ZW50LnNpemUoKSk7CisgICAgICAgIGhhc2hlcy5hcHBlbmQoaGFzaCk7CiAgICAgfQor ICAgIGlmICghZm91bmRIYXNoSW5FbmZvcmNlZFBvbGljaWVzICYmIGFsbFBvbGljaWVzV2l0aERp c3Bvc2l0aW9uQWxsb3coQ29udGVudFNlY3VyaXR5UG9saWN5OjpEaXNwb3NpdGlvbjo6RW5mb3Jj ZSwgcHJlZGljYXRlLCBoYXNoZXMpKQorICAgICAgICBmb3VuZEhhc2hJbkVuZm9yY2VkUG9saWNp ZXMgPSB0cnVlOworICAgIGlmICghZm91bmRIYXNoSW5SZXBvcnRPbmx5UG9saWNpZXMgJiYgYWxs UG9saWNpZXNXaXRoRGlzcG9zaXRpb25BbGxvdyhDb250ZW50U2VjdXJpdHlQb2xpY3k6OkRpc3Bv c2l0aW9uOjpSZXBvcnRPbmx5LCBwcmVkaWNhdGUsIGhhc2hlcykpCisgICAgICAgIGZvdW5kSGFz aEluUmVwb3J0T25seVBvbGljaWVzID0gdHJ1ZTsKKwogICAgIHJldHVybiB7IGZvdW5kSGFzaElu RW5mb3JjZWRQb2xpY2llcywgZm91bmRIYXNoSW5SZXBvcnRPbmx5UG9saWNpZXMgfTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJp dHlQb2xpY3lEaXJlY3RpdmVMaXN0LmNwcAppbmRleCAyNWJlMTJiMDFjM2I5YzMyM2E4ZjY5MWFl NTJjMzc5YmI5MGE5YTkzLi45YThkZjI5MjUwZWJkMmM2N2IzMTRmMzllMjZjODI3NGNlNGIwNGQx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xp Y3lEaXJlY3RpdmVMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0LmNwcApAQCAtNTYsOSArNTYsOSBAQCBzdGF0aWMg aW5saW5lIGJvb2wgY2hlY2tJbmxpbmUoQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERp cmVjdGl2ZSogZGlyZWN0aQogICAgIHJldHVybiAhZGlyZWN0aXZlIHx8IGRpcmVjdGl2ZS0+YWxs b3dJbmxpbmUoKTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGNoZWNrVW5zYWZlSGFzaGVzKENv bnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3Qg Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYgaGFzaCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBjaGVj a1Vuc2FmZUhhc2hlcyhDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlKiBk aXJlY3RpdmUsIGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFzaGVz KQogewotICAgIHJldHVybiAhZGlyZWN0aXZlIHx8IGRpcmVjdGl2ZS0+YWxsb3dVbnNhZmVIYXNo ZXMoaGFzaCk7CisgICAgcmV0dXJuICFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxvd1Vuc2Fm ZUhhc2hlcyhoYXNoZXMpOwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tOb25QYXJzZXJJ bnNlcnRlZFNjcmlwdHMoQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSog ZGlyZWN0aXZlLCBQYXJzZXJJbnNlcnRlZCBwYXJzZXJJbnNlcnRlZCkKQEAgLTc0LDkgKzc0LDkg QEAgc3RhdGljIGlubGluZSBib29sIGNoZWNrU291cmNlKENvbnRlbnRTZWN1cml0eVBvbGljeVNv dXJjZUxpc3REaXJlY3RpdmUqIGRpcmVjdGkKICAgICByZXR1cm4gIWRpcmVjdGl2ZSB8fCBkaXJl Y3RpdmUtPmFsbG93cyh1cmwsIGRpZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNlLCBzaG91bGRBbGxv d0VtcHR5VVJMSWZTb3VyY2VMaXN0RW1wdHkpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgY2hl Y2tIYXNoKENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3REaXJlY3RpdmUqIGRpcmVjdGl2 ZSwgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYgaGFzaCkKK3N0YXRpYyBpbmxpbmUg Ym9vbCBjaGVja0hhc2hlcyhDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZl KiBkaXJlY3RpdmUsIGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFz aGVzKQogewotICAgIHJldHVybiAhZGlyZWN0aXZlIHx8IGRpcmVjdGl2ZS0+YWxsb3dzKGhhc2gp OworICAgIHJldHVybiAhZGlyZWN0aXZlIHx8IGRpcmVjdGl2ZS0+YWxsb3dzKGhhc2hlcyk7CiB9 CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBjaGVja05vbmNlKENvbnRlbnRTZWN1cml0eVBvbGljeVNv dXJjZUxpc3REaXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiBub25jZSkKQEAgLTE5 MCwxOCArMTkwLDE4IEBAIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogQ29u dGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0CiAgICAgcmV0dXJuIG9wZXJh dGl2ZURpcmVjdGl2ZTsKIH0KIAotY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZl KiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZv clVuc2FmZUhhc2hTY3JpcHQoY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYgaGFzaCkg Y29uc3QKK2NvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JVbnNhZmVIYXNoU2Ny aXB0KGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFzaGVzKSBjb25z dAogewogICAgIGF1dG8qIG9wZXJhdGl2ZURpcmVjdGl2ZSA9IHRoaXMtPm9wZXJhdGl2ZURpcmVj dGl2ZShtX3NjcmlwdFNyYy5nZXQoKSwgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTmFt ZXM6OnNjcmlwdFNyYyk7Ci0gICAgaWYgKGNoZWNrVW5zYWZlSGFzaGVzKG9wZXJhdGl2ZURpcmVj dGl2ZSwgaGFzaCkpCisgICAgaWYgKGNoZWNrVW5zYWZlSGFzaGVzKG9wZXJhdGl2ZURpcmVjdGl2 ZSwgaGFzaGVzKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIG9wZXJhdGl2 ZURpcmVjdGl2ZTsKIH0KIAotY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiBD b250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclVu c2FmZUhhc2hTdHlsZShjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKSBjb25z dAorY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiBDb250ZW50U2VjdXJpdHlQ b2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9sYXRlZERpcmVjdGl2ZUZvclVuc2FmZUhhc2hTdHlsZShj b25zdCBWZWN0b3I8Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4mIGhhc2hlcykgY29uc3QKIHsK ICAgICBhdXRvKiBvcGVyYXRpdmVEaXJlY3RpdmUgPSB0aGlzLT5vcGVyYXRpdmVEaXJlY3RpdmUo bV9zdHlsZVNyYy5nZXQoKSwgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTmFtZXM6OnNj cmlwdFNyYyk7Ci0gICAgaWYgKGNoZWNrVW5zYWZlSGFzaGVzKG9wZXJhdGl2ZURpcmVjdGl2ZSwg aGFzaCkpCisgICAgaWYgKGNoZWNrVW5zYWZlSGFzaGVzKG9wZXJhdGl2ZURpcmVjdGl2ZSwgaGFz aGVzKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIG9wZXJhdGl2ZURpcmVj dGl2ZTsKIH0KQEAgLTI0NywxOCArMjQ3LDE4IEBAIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGlj eURpcmVjdGl2ZSogQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0CiAg ICAgcmV0dXJuIG9wZXJhdGl2ZURpcmVjdGl2ZTsKIH0KIAotY29uc3QgQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlKiBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0Ojp2aW9s YXRlZERpcmVjdGl2ZUZvclNjcmlwdEhhc2goY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFz aCYgaGFzaCkgY29uc3QKK2NvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogQ29u dGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JTY3Jp cHRIYXNoKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYgaGFzaGVzKSBj b25zdAogewogICAgIGF1dG8qIG9wZXJhdGl2ZURpcmVjdGl2ZSA9IHRoaXMtPm9wZXJhdGl2ZURp cmVjdGl2ZShtX3NjcmlwdFNyYy5nZXQoKSwgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZl TmFtZXM6OnNjcmlwdFNyYyk7Ci0gICAgaWYgKGNoZWNrSGFzaChvcGVyYXRpdmVEaXJlY3RpdmUs IGhhc2gpKQorICAgIGlmIChjaGVja0hhc2hlcyhvcGVyYXRpdmVEaXJlY3RpdmUsIGhhc2hlcykp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJldHVybiBvcGVyYXRpdmVEaXJlY3RpdmU7 CiB9CiAKLWNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogQ29udGVudFNlY3Vy aXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JTdHlsZUhhc2goY29u c3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYgaGFzaCkgY29uc3QKK2NvbnN0IENvbnRlbnRT ZWN1cml0eVBvbGljeURpcmVjdGl2ZSogQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlz dDo6dmlvbGF0ZWREaXJlY3RpdmVGb3JTdHlsZUhhc2goY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1 cml0eVBvbGljeUhhc2g+JiBoYXNoZXMpIGNvbnN0CiB7CiAgICAgYXV0byogb3BlcmF0aXZlRGly ZWN0aXZlID0gdGhpcy0+b3BlcmF0aXZlRGlyZWN0aXZlKG1fc3R5bGVTcmMuZ2V0KCksIENvbnRl bnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZU5hbWVzOjpzdHlsZVNyYyk7Ci0gICAgaWYgKGNoZWNr SGFzaChvcGVyYXRpdmVEaXJlY3RpdmUsIGhhc2gpKQorICAgIGlmIChjaGVja0hhc2hlcyhvcGVy YXRpdmVEaXJlY3RpdmUsIGhhc2hlcykpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJl dHVybiBvcGVyYXRpdmVEaXJlY3RpdmU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0LmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0LmgKaW5kZXgg N2JlOWRhOWEyZmViNDkzZTVkZWM2MDA2Y2ZkN2QzNjA0ZTU2Mjk5MS4uM2VmOWYwY2RmMmRlODRl ZWM1NzY5YjY1OWUyZGRmZjcwZDc1MmE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuaApAQCAt NTIsMTAgKzUyLDEwIEBAIHB1YmxpYzoKICAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lE aXJlY3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yVW5zYWZlSW5saW5lU3R5bGVFbGVtZW50KCkg Y29uc3Q7CiAgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRl ZERpcmVjdGl2ZUZvclVuc2FmZUlubGluZVN0eWxlQXR0cmlidXRlKCkgY29uc3Q7CiAKLSAgICBj b25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9y U2NyaXB0SGFzaChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJikgY29uc3Q7Ci0gICAg Y29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZv clN0eWxlSGFzaChjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJikgY29uc3Q7Ci0gICAg Y29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZv clVuc2FmZUhhc2hTY3JpcHQoY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYpIGNvbnN0 OwotICAgIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0ZWREaXJl Y3RpdmVGb3JVbnNhZmVIYXNoU3R5bGUoY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaCYp IGNvbnN0OworICAgIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0 ZWREaXJlY3RpdmVGb3JTY3JpcHRIYXNoKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xp Y3lIYXNoPiYpIGNvbnN0OworICAgIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2 ZSogdmlvbGF0ZWREaXJlY3RpdmVGb3JTdHlsZUhhc2goY29uc3QgVmVjdG9yPENvbnRlbnRTZWN1 cml0eVBvbGljeUhhc2g+JikgY29uc3Q7CisgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvclVuc2FmZUhhc2hTY3JpcHQoY29uc3QgVmVj dG9yPENvbnRlbnRTZWN1cml0eVBvbGljeUhhc2g+JikgY29uc3Q7CisgICAgY29uc3QgQ29udGVu dFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvclVuc2FmZUhhc2hT dHlsZShjb25zdCBWZWN0b3I8Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4mKSBjb25zdDsKIAog ICAgIGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZSogdmlvbGF0ZWREaXJlY3Rp dmVGb3JTY3JpcHROb25jZShjb25zdCBTdHJpbmcmKSBjb25zdDsKICAgICBjb25zdCBDb250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yU3R5bGVOb25jZShj b25zdCBTdHJpbmcmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3Nw L0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHAKaW5kZXggMzE0ZDFkMzVm YTg1ZmM0NWVmNGEwMzljZWM5ZjlmZGMzNWNhZjgxOC4uMmZiMGUxZDExZTkwZmNkOGU3ZjM5OGUx MjFjZGI2OWJiMGZiODlhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29u dGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHAKQEAgLTE0NSw5ICsxNDUs MTQgQEAgYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0OjptYXRjaGVzKGNvbnN0 IFVSTCYgdXJsLCBib29sIGRpZFJlY2VpdmVSZWQKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJv b2wgQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdDo6bWF0Y2hlcyhjb25zdCBDb250ZW50 U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKSBjb25zdAorYm9vbCBDb250ZW50U2VjdXJpdHlQb2xp Y3lTb3VyY2VMaXN0OjptYXRjaGVzKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lI YXNoPiYgaGFzaGVzKSBjb25zdAogewotICAgIHJldHVybiBtX2hhc2hlcy5jb250YWlucyhoYXNo KTsKKyAgICBmb3IgKGF1dG8mIGhhc2ggOiBoYXNoZXMpIHsKKyAgICAgICAgaWYgKG1faGFzaGVz LmNvbnRhaW5zKGhhc2gpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAg cmV0dXJuIGZhbHNlOwogfQogCiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3Q6 Om1hdGNoZXMoY29uc3QgU3RyaW5nJiBub25jZSkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3QuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZUxpc3QuaAppbmRl eCAzZTFiMjNkOTJlY2IyNjFhYjAyMmFiYjE3NWNiM2VhNmE4OTFiMzc1Li42MDkzYjg4MjZmOTkw ODk1MjFmYmY4MjI5NTdhMzM3OGRkMTg2YTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5oCkBAIC00NCw3 ICs0NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhcnNlKGNvbnN0IFN0cmluZyYpOwogCiAgICAg Ym9vbCBtYXRjaGVzKGNvbnN0IFVSTCYsIGJvb2wgZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2Up IGNvbnN0OwotICAgIGJvb2wgbWF0Y2hlcyhjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNo JikgY29uc3Q7CisgICAgYm9vbCBtYXRjaGVzKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQ b2xpY3lIYXNoPiYpIGNvbnN0OwogICAgIGJvb2wgbWF0Y2hlcyhjb25zdCBTdHJpbmcmIG5vbmNl KSBjb25zdDsKIAogICAgIE9wdGlvblNldDxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoQWxnb3Jp dGhtPiBoYXNoQWxnb3JpdGhtc1VzZWQoKSBjb25zdCB7IHJldHVybiBtX2hhc2hBbGdvcml0aG1z VXNlZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3Vy aXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Nz cC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlLmNwcAppbmRleCBkNzA1 Nzg5NjQwZjRlMzA5M2EzZGRiODcyNjM2ZTgyMDc3YTZhMTMyLi4xZTBiZDMyMTM5NGRjNGYyNWE0 MWIwZjU3MTcyN2U2OTFhYTBjNjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Nz cC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0 aXZlLmNwcApAQCAtNTIsMTQgKzUyLDE0IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5U291 cmNlTGlzdERpcmVjdGl2ZTo6YWxsb3dzKGNvbnN0IFN0cmluZyYgbm9uY2UpIGNvbnN0CiAgICAg cmV0dXJuIG1fc291cmNlTGlzdC5tYXRjaGVzKG5vbmNlKTsKIH0KIAotYm9vbCBDb250ZW50U2Vj dXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd3MoY29uc3QgQ29udGVudFNlY3Vy aXR5UG9saWN5SGFzaCYgaGFzaCkgY29uc3QKK2Jvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5U291 cmNlTGlzdERpcmVjdGl2ZTo6YWxsb3dzKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xp Y3lIYXNoPiYgaGFzaGVzKSBjb25zdAogewotICAgIHJldHVybiBtX3NvdXJjZUxpc3QubWF0Y2hl cyhoYXNoKTsKKyAgICByZXR1cm4gbV9zb3VyY2VMaXN0Lm1hdGNoZXMoaGFzaGVzKTsKIH0KIAot Ym9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd1Vuc2Fm ZUhhc2hlcyhjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoJiBoYXNoKSBjb25zdAorYm9v bCBDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlOjphbGxvd1Vuc2FmZUhh c2hlcyhjb25zdCBWZWN0b3I8Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4mIGhhc2hlcykgY29u c3QKIHsKLSAgICByZXR1cm4gbV9zb3VyY2VMaXN0LmFsbG93VW5zYWZlSGFzaGVzKCkgJiYgYWxs b3dzKGhhc2gpOworICAgIHJldHVybiBtX3NvdXJjZUxpc3QuYWxsb3dVbnNhZmVIYXNoZXMoKSAm JiBhbGxvd3MoaGFzaGVzKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlz dERpcmVjdGl2ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9s aWN5U291cmNlTGlzdERpcmVjdGl2ZS5oCmluZGV4IGQ5ZDIyNGQ1Y2Y2N2Q2ZDFlZTczZTk2OThk MGJkZWZhYWYwNjczMWEuLjRhYWYxOTkyNWYxOTY1OGRhODZhZmIzZjkyYzE2Zjc4NWU5OWNhMTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGlj eVNvdXJjZUxpc3REaXJlY3RpdmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250 ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGlyZWN0aXZlLmgKQEAgLTM5LDggKzM5LDggQEAg cHVibGljOgogCiAgICAgZW51bSBjbGFzcyBTaG91bGRBbGxvd0VtcHR5VVJMSWZTb3VyY2VMaXN0 SXNOb3ROb25lIHsgTm8sIFllcyB9OwogICAgIGJvb2wgYWxsb3dzKGNvbnN0IFVSTCYsIGJvb2wg ZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UsIFNob3VsZEFsbG93RW1wdHlVUkxJZlNvdXJjZUxp c3RJc05vdE5vbmUpOwotICAgIGJvb2wgYWxsb3dzKGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGlj eUhhc2gmKSBjb25zdDsKLSAgICBib29sIGFsbG93VW5zYWZlSGFzaGVzKGNvbnN0IENvbnRlbnRT ZWN1cml0eVBvbGljeUhhc2gmKSBjb25zdDsKKyAgICBib29sIGFsbG93cyhjb25zdCBWZWN0b3I8 Q29udGVudFNlY3VyaXR5UG9saWN5SGFzaD4mKSBjb25zdDsKKyAgICBib29sIGFsbG93VW5zYWZl SGFzaGVzKGNvbnN0IFZlY3RvcjxDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoPiYpIGNvbnN0Owog ICAgIGJvb2wgYWxsb3dzKGNvbnN0IFN0cmluZyYgbm9uY2UpIGNvbnN0OwogICAgIGJvb2wgYWxs b3dJbmxpbmUoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZUxpc3QuYWxsb3dJbmxpbmUoKTsgfQog ICAgIGJvb2wgYWxsb3dFdmFsKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VMaXN0LmFsbG93RXZh bCgpOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggMzM1NmJlZjA1MmE4YjUxMGE3OGE4NTM0NzZmMDg0MmZkYzdkYjc1Ni4u OGQ2OWY3MDE5YWZhMDE3MjVlMGVmZjQxYjAxZThiNThlMTE4YmU2MSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIxLTEwLTI3ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUu Y29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyODQ2NTAtMjg0NjYxKTogW2lPUzE1IFNpbV0g aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9z Y3JpcHQtc3JjL3NjcmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1h bGdvcml0aG1zLmh0bWwgaXMgYSB0ZXh0IGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjEyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v ODQ1Mjk4ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAg ICAqIHBsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0yNiAgQXl1 bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlPUyBSZWxl YXNlIF0gZmFzdC9mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtYWRqdXN0Lmh0bWwgaXMg YSBmbGFreSBpbWFnZSBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg MzJiNDU3OGFjNjYyYTA4MGJiM2Q1ZmI1MjY5Zjk1MmYyNTYwNjhhYy4uODliMTZjMTcyNjUxMThi NzMyMjQ2ZGJlMTEwYTk4MmYxYjAyNzY0NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTAtMjcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2No ZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NDY1MC0yODQ2NjEpOiBb aU9TMTUgU2ltXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJp dHktcG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNyYy1tdWx0aXBsZS1wb2xpY2llcy1tdWx0aXBs ZS1oYXNoaW5nLWFsZ29yaXRobXMuaHRtbCBpcyBhIHRleHQgZmFpbHVyZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMTIwCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS84NDUyOTg4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFt LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5 L3NjcmlwdC1zcmMvc2NyaXB0LXNyYy1tdWx0aXBsZS1wb2xpY2llcy1tdWx0aXBsZS1oYXNoaW5n LWFsZ29yaXRobXMtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTEwLTI2ICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVcGRhdGUgaW1wb3J0IG9mIGNzcy9j c3MtdHJhbnNmb3JtIFdQVCB0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQtc3Jj L3NjcmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0aG1z LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY29udGVudC1zZWN1cml0eS1wb2xpY3kvc2NyaXB0LXNyYy9zY3JpcHQtc3JjLW11bHRpcGxl LXBvbGljaWVzLW11bHRpcGxlLWhhc2hpbmctYWxnb3JpdGhtcy1leHBlY3RlZC50eHQKaW5kZXgg ZGRjZDJmYzhkNjZkYjI2MjhlNTgwMjhjODliYWI2MmJlODM4MjU1MC4uZmJlYzIwY2FkMzhkZmUy OTVkNzRkMWFlZjFkMzg3NjAwNjE3ODdjYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jb250ZW50LXNlY3VyaXR5LXBvbGljeS9zY3JpcHQt c3JjL3NjcmlwdC1zcmMtbXVsdGlwbGUtcG9saWNpZXMtbXVsdGlwbGUtaGFzaGluZy1hbGdvcml0 aG1zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNyYy1t dWx0aXBsZS1wb2xpY2llcy1tdWx0aXBsZS1oYXNoaW5nLWFsZ29yaXRobXMtZXhwZWN0ZWQudHh0 CkBAIC0xLDMgKzEsMyBAQAogCi1GQUlMIFRlc3QgdGhhdCBzY3JpcHQgZXhlY3V0ZXMgaWYgYWxs b3dlZCBieSBwcm9wZXIgaGFzaCB2YWx1ZXMgYXNzZXJ0X3RydWU6IGV4cGVjdGVkIHRydWUgZ290 IGZhbHNlCitQQVNTIFRlc3QgdGhhdCBzY3JpcHQgZXhlY3V0ZXMgaWYgYWxsb3dlZCBieSBwcm9w ZXIgaGFzaCB2YWx1ZXMKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdr Mi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9UZXN0RXhw ZWN0YXRpb25zCmluZGV4IGQ4YzkwOGI0N2Q2OTljM2FkNGFlYjBkNDgzZmY2NGQwZjMxM2Q3NmQu LjU5MTc3ZTNiZGFhYmRiNDAwMTFjNmRlNmY3ODNmNjVkMzM3OGNmYmEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIyMzgsOCArMjIzOCw2 IEBAIHdlYmtpdC5vcmcvYi8yMzE3ODAgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL3NpbXVsY2FzdC9iCiAKIHdlYmtpdC5vcmcvYi8yMzIwOTkgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJzb2NrZXRzL0Nsb3NlLTEwMDAuYW55Lmh0bWwg WyBQYXNzIENyYXNoIF0KIAotd2Via2l0Lm9yZy9iLzIzMjEyMCBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2NvbnRlbnQtc2VjdXJpdHktcG9saWN5L3NjcmlwdC1zcmMvc2NyaXB0LXNy Yy1tdWx0aXBsZS1wb2xpY2llcy1tdWx0aXBsZS1oYXNoaW5nLWFsZ29yaXRobXMuaHRtbCBbIFBh c3MgRmFpbHVyZSBEdW1wSlNDb25zb2xlTG9nSW5TdGRFcnIgXQotCiB3ZWJraXQub3JnL2IvMjI1 NTI4IGh0dHAvd3B0L2ZldGNoL2ZldGNoLXJlc3BvbnNlLWJvZHktc3RvcC1pbi13b3JrZXIuaHRt bCBbIFBhc3MgQ3Jhc2ggXQogCiB3ZWJraXQub3JnL2IvMjMyMjUyIFsgUmVsZWFzZSBdIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ0R0bHNUcmFuc3BvcnQtc3RhdGUu aHRtbCBbIFBhc3MgRmFpbHVyZSBdCg==