216556 2020-09-15 09:13:31 -0700 Remove runtime setting for enabling/disabling the User/Resource Timing API 2020-09-17 19:09:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 216512 1 sam sam cdumez darin esprehn+autocc ews-watchlist japhet joepeck kondapallykalyan webkit-bug-importer oldest_to_newest 1688707 0 sam 2020-09-15 09:13:31 -0700 Remove runtime setting for enabling/disabling the Resource Timing API. It should always be enabled at this point. 1689617 1 sam 2020-09-17 15:45:45 -0700 *** Bug 216557 has been marked as a duplicate of this bug. *** 1689623 2 409074 sam 2020-09-17 16:10:24 -0700 Created attachment 409074 Patch 1689626 3 409076 sam 2020-09-17 16:11:50 -0700 Created attachment 409076 Patch 1689629 4 409078 sam 2020-09-17 16:14:45 -0700 Created attachment 409078 Patch 1689646 5 409084 sam 2020-09-17 16:35:27 -0700 Created attachment 409084 Patch 1689696 6 ews-feeder 2020-09-17 19:08:25 -0700 Committed r267222: <https://trac.webkit.org/changeset/267222> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409084. 1689697 7 webkit-bug-importer 2020-09-17 19:09:16 -0700 <rdar://problem/69112979> 409074 2020-09-17 16:10:24 -0700 2020-09-17 16:11:48 -0700 Patch bug-216556-20200917161023.patch text/plain 5734 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTE3ICBTYW0gV2Vpbmln ICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5nIGZv ciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIEFQ SXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjU1 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFuZCBS ZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBmb3Ig YSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3duIHVz ZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0aGUg c2V0dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktpdCBh cyB3ZWxsLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWw6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJl bmNlc1NldFVzZXJUaW1pbmdFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRVc2Vy VGltaW5nRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdF bmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oOgor CiAyMDIwLTA5LTE3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZSBzaG91bGRuJ3QgbmVlZCB0byBzcGVjaWZ5IGEgY2F0ZWdvcnkgZm9yIHByZWZlcmVuY2VzIG5v dyB0aGF0IHRoZXkgYXJlIHNwbGl0IGludG8gc2VwYXJhdGUgZmlsZXMKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAkod29ya2luZyBjb3B5KQpAQCAt Njc3LDIwICs2NzcsNiBAQCBNb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZDoKICAgaHVtYW5SZWFk YWJsZURlc2NyaXB0aW9uOiAiVXNlIG1vZGVybiBtZWRpYSBjb250cm9scyBsb29rIgogICB3ZWJj b3JlQmluZGluZzogUnVudGltZUVuYWJsZWRGZWF0dXJlcwogCi1SZXNvdXJjZVRpbWluZ0VuYWJs ZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgZGVmYXVsdFZhbHVlOiB0cnVlCi0gIGh1bWFuUmVhZGFibGVO YW1lOiAiUmVzb3VyY2UgVGltaW5nIgotICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJFbmFi bGUgUmVzb3VyY2VUaW1pbmcgQVBJIgotICB3ZWJjb3JlQmluZGluZzogUnVudGltZUVuYWJsZWRG ZWF0dXJlcwotCi1Vc2VyVGltaW5nRW5hYmxlZDoKLSAgdHlwZTogYm9vbAotICBkZWZhdWx0VmFs dWU6IHRydWUKLSAgaHVtYW5SZWFkYWJsZU5hbWU6ICJVc2VyIFRpbWluZyIKLSAgaHVtYW5SZWFk YWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIFVzZXJUaW1pbmcgQVBJIgotICB3ZWJjb3JlQmluZGlu ZzogUnVudGltZUVuYWJsZWRGZWF0dXJlcwotCiBCZWFjb25BUElFbmFibGVkOgogICB0eXBlOiBi b29sCiAgIGRlZmF1bHRWYWx1ZTogdHJ1ZQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNjg5LDE2ICsxNjg5LDYgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0TWVudUl0ZW1FbGVt ZW50RW5hYgogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5tZW51SXRlbUVsZW1l bnRFbmFibGVkKCk7CiB9CiAKLXZvaWQgV0tQcmVmZXJlbmNlc1NldFVzZXJUaW1pbmdFbmFibGVk KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKLXsKLSAgICB0b0lt cGwocHJlZmVyZW5jZXNSZWYpLT5zZXRVc2VyVGltaW5nRW5hYmxlZChmbGFnKTsKLX0KLQotYm9v bCBXS1ByZWZlcmVuY2VzR2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlc1JlZikKLXsKLSAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+dXNlclRp bWluZ0VuYWJsZWQoKTsKLX0KLQogdm9pZCBXS1ByZWZlcmVuY2VzU2V0UGFpbnRUaW1pbmdFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKIHsKICAgICB0 b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRQYWludFRpbWluZ0VuYWJsZWQoZmxhZyk7CkBAIC0x NzA5LDE1ICsxNjk5LDYgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0UGFpbnRUaW1pbmdFbmFibGVk KAogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5wYWludFRpbWluZ0VuYWJsZWQo KTsKIH0KIAotdm9pZCBXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKLXsKLSAgICB0b0ltcGwocHJl ZmVyZW5jZXNSZWYpLT5zZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoZmxhZyk7Ci19Ci0KLWJvb2wg V0tQcmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHBy ZWZlcmVuY2VzUmVmKQotewotICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5yZXNv dXJjZVRpbWluZ0VuYWJsZWQoKTsKLX0KIAogdm9pZCBXS1ByZWZlcmVuY2VzU2V0SXNOU1VSTFNl c3Npb25XZWJTb2NrZXRFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJv b2wgZmxhZykKIHsKQEAgLTIyMjQsMyArMjIwNSwyMSBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRJ c1NlY3VyZUNvbnRleHRBdHRyCiB7CiAgICAgcmV0dXJuIHRydWU7CiB9CisKK3ZvaWQgV0tQcmVm ZXJlbmNlc1NldFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wpCit7Cit9 CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNS ZWYpCit7CisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgV0tQcmVmZXJlbmNlc1NldFJlc291 cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKQoreworfQorCitib29sIFdL UHJlZmVyZW5jZXNHZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZikKK3sK KyAgICByZXR1cm4gdHJ1ZTsKK30KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAkocmV2aXNpb24gMjY3MTk0 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZh dGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDYxLDE4ICs0NjEsMTAgQEAgV0tfRVhQT1JUIHZvaWQg V0tQcmVmZXJlbmNlc1NldFdlYlNoYXJlRQogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dl dFdlYlNoYXJlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKIAogLy8gRGVmYXVsdHMgdG8gZmFs c2UKLVdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwotV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dl dFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwotCi0vLyBEZWZhdWx0cyB0byBm YWxzZQogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFBhaW50VGltaW5nRW5hYmxlZChX S1ByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNl c0dldFBhaW50VGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKIAogLy8gRGVmYXVsdHMg dG8gZmFsc2UKLVdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRSZXNvdXJjZVRpbWluZ0Vu YWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKLVdLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZik7Ci0KLS8v IERlZmF1bHRzIHRvIGZhbHNlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0RmV0Y2hB UElLZWVwQWxpdmVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7CiBXS19FWFBP UlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0RmV0Y2hBUElLZWVwQWxpdmVFbmFibGVkKFdLUHJlZmVy ZW5jZXNSZWYpOwogCkBAIC01OTUsNiArNTg3LDEwIEBAIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRGZXRjaEFQSUUKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRGZXRjaEFQ SUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZikgV0tfQ19BUElfREVQUkVDQVRFRDsKIFdLX0VYUE9S VCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRJc1NlY3VyZUNvbnRleHRBdHRyaWJ1dGVFbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYsIGJvb2wpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CiBXS19FWFBPUlQgYm9v bCBXS1ByZWZlcmVuY2VzR2V0SXNTZWN1cmVDb250ZXh0QXR0cmlidXRlRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmKSBXS19DX0FQSV9ERVBSRUNBVEVEOworV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJl bmNlc1NldFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wpIFdLX0NfQVBJ X0RFUFJFQ0FURUQ7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0VXNlclRpbWluZ0Vu YWJsZWQoV0tQcmVmZXJlbmNlc1JlZikgV0tfQ19BUElfREVQUkVDQVRFRDsKK1dLX0VYUE9SVCB2 b2lkIFdLUHJlZmVyZW5jZXNTZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl ZiwgYm9vbCkgV0tfQ19BUElfREVQUkVDQVRFRDsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5j ZXNHZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZikgV0tfQ19BUElfREVQ UkVDQVRFRDsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiB9Cg== 409076 2020-09-17 16:11:50 -0700 2020-09-17 16:16:44 -0700 Patch bug-216556-20200917161149.patch text/plain 34403 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDIwLTA5LTE3ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5n IGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5n IEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFu ZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBm b3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3du IHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0 aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktp dCBhcyB3ZWxsLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIFVzZXJUaW1pbmcg YW5kIFJlc291cmNlVGltaW5nLCB3ZSBjYW4gYWxzbyByZW1vdmUgdGhlCisgICAgICAgIGNoZWNr cyBmb3IgUGVyZm9ybWFuY2VUaW1lbGluZUVuYWJsZWQsIGFzIHRoYXQgd2FzIGRlZmluZWQgZW50 aXJlbHkgaW4gdGVybXMKKyAgICAgICAgb2YgdGhlIGZvcm1lci4KKworICAgICAgICAqIGxvYWRl ci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3Jv c3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyOjpzdGFydFByZWZsaWdodCk6CisgICAgICAgICogbG9h ZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvUmVz b3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVRp bWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZyk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5m b3JtYXRpb24pOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6cmVwb3J0UmVzb3VyY2VUaW1pbmcpOgor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNvdXJjZSk6Cisg ICAgICAgICogcGFnZS9QZXJmb3JtYW5jZS5pZGw6CisgICAgICAgICogcGFnZS9QZXJmb3JtYW5j ZUVudHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlRW50cnk6OnBhcnNlRW50 cnlUeXBlU3RyaW5nKToKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlRW50cnkuaWRsOgorICAg ICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VPYnNlcnZlci5pZGw6CisgICAgICAgICogcGFnZS9QZXJm b3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbDoKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNl UmVzb3VyY2VUaW1pbmcuaWRsOgorICAgICAgICAqIHBhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJl cy5oOgorICAgICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2V0UmVzb3Vy Y2VUaW1pbmdFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnJlc291cmNlVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzZXRVc2VyVGltaW5nRW5hYmxl ZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp1 c2VyVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpwZXJmb3JtYW5jZVRpbWVsaW5lRW5hYmxlZCBjb25zdCk6IERl bGV0ZWQuCisKIDIwMjAtMDktMTcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFN0eWxlOjpDaGFuZ2Ugc2hvdWxkIGJlIGVudW0gY2xhc3MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIu Y3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmln aW5QcmVmbGlnaHRDaGVja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzExNiw3IEBA IHZvaWQgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyOjpzdGFydFAKICAgICBvcHRpb25zLmlu aXRpYXRvckNvbnRleHQgPSBtX2xvYWRlci5vcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dDsKIAog ICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBwcmVmbGlnaHRSZXF1ZXN0KGNyZWF0ZUFjY2Vzc0Nv bnRyb2xQcmVmbGlnaHRSZXF1ZXN0KG1fcmVxdWVzdCwgbV9sb2FkZXIuc2VjdXJpdHlPcmlnaW4o KSwgbV9sb2FkZXIucmVmZXJyZXIoKSksIG9wdGlvbnMpOwotICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAg ICAgICBwcmVmbGlnaHRSZXF1ZXN0LnNldEluaXRpYXRvcihtX2xvYWRlci5vcHRpb25zKCkuaW5p dGlhdG9yKTsKKyAgICBwcmVmbGlnaHRSZXF1ZXN0LnNldEluaXRpYXRvcihtX2xvYWRlci5vcHRp b25zKCkuaW5pdGlhdG9yKTsKIAogICAgIEFTU0VSVCghbV9yZXNvdXJjZSk7CiAgICAgbV9yZXNv dXJjZSA9IG1fbG9hZGVyLmRvY3VtZW50KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0 UmF3UmVzb3VyY2UoV1RGTW92ZShwcmVmbGlnaHRSZXF1ZXN0KSkudmFsdWVfb3IobnVsbHB0cik7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxl TG9hZGVyLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0OCw4ICs1NDgs NyBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlCiAKICAgICAgICAg cmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXMobV9vcHRpb25zLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5 ID09IFN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UpOwogICAgICAgICBDYWNoZWRSZXNvdXJj ZVJlcXVlc3QgbmV3UmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpLCBvcHRpb25zKTsKLSAgICAgICAg aWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1p bmdFbmFibGVkKCkpCi0gICAgICAgICAgICBuZXdSZXF1ZXN0LnNldEluaXRpYXRvcihtX29wdGlv bnMuaW5pdGlhdG9yKTsKKyAgICAgICAgbmV3UmVxdWVzdC5zZXRJbml0aWF0b3IobV9vcHRpb25z LmluaXRpYXRvcik7CiAgICAgICAgIG5ld1JlcXVlc3Quc2V0T3JpZ2luKHNlY3VyaXR5T3JpZ2lu KCkpOwogCiAgICAgICAgIEFTU0VSVCghbV9yZXNvdXJjZSk7CkBAIC02MzksMjAgKzYzOCwxOCBA QCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlCiAgICAgaWYgKGRhdGEp CiAgICAgICAgIGRpZFJlY2VpdmVEYXRhKGlkZW50aWZpZXIsIGRhdGEtPmRhdGEoKSwgZGF0YS0+ c2l6ZSgpKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJl cygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKSB7Ci0gICAgICAgIGNvbnN0IGF1dG8qIHRpbWlu ZyA9IHJlc3BvbnNlLmRlcHJlY2F0ZWROZXR3b3JrTG9hZE1ldHJpY3NPck51bGwoKTsKLSAgICAg ICAgT3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBlbXB0eTsKLSAgICAgICAgaWYgKCF0aW1p bmcpIHsKLSAgICAgICAgICAgIGVtcHR5LmVtcGxhY2UoKTsKLSAgICAgICAgICAgIHRpbWluZyA9 ICZlbXB0eS52YWx1ZSgpOwotICAgICAgICB9Ci0gICAgICAgIGF1dG8gcmVzb3VyY2VUaW1pbmcg PSBSZXNvdXJjZVRpbWluZzo6ZnJvbVN5bmNocm9ub3VzTG9hZChyZXF1ZXN0VVJMLCBtX29wdGlv bnMuaW5pdGlhdG9yLCBsb2FkVGltaW5nLCAqdGltaW5nLCByZXNwb25zZSwgc2VjdXJpdHlPcmln aW4oKSk7Ci0gICAgICAgIGlmIChvcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dCA9PSBJbml0aWF0 b3JDb250ZXh0OjpXb3JrZXIpCi0gICAgICAgICAgICBmaW5pc2hlZFRpbWluZ0Zvcldvcmtlckxv YWQocmVzb3VyY2VUaW1pbmcpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChhdXRv KiB3aW5kb3cgPSBkb2N1bWVudCgpLmRvbVdpbmRvdygpKQotICAgICAgICAgICAgICAgIHdpbmRv dy0+cGVyZm9ybWFuY2UoKS5hZGRSZXNvdXJjZVRpbWluZyhXVEZNb3ZlKHJlc291cmNlVGltaW5n KSk7Ci0gICAgICAgIH0KKyAgICBjb25zdCBhdXRvKiB0aW1pbmcgPSByZXNwb25zZS5kZXByZWNh dGVkTmV0d29ya0xvYWRNZXRyaWNzT3JOdWxsKCk7CisgICAgT3B0aW9uYWw8TmV0d29ya0xvYWRN ZXRyaWNzPiBlbXB0eTsKKyAgICBpZiAoIXRpbWluZykgeworICAgICAgICBlbXB0eS5lbXBsYWNl KCk7CisgICAgICAgIHRpbWluZyA9ICZlbXB0eS52YWx1ZSgpOworICAgIH0KKyAgICBhdXRvIHJl c291cmNlVGltaW5nID0gUmVzb3VyY2VUaW1pbmc6OmZyb21TeW5jaHJvbm91c0xvYWQocmVxdWVz dFVSTCwgbV9vcHRpb25zLmluaXRpYXRvciwgbG9hZFRpbWluZywgKnRpbWluZywgcmVzcG9uc2Us IHNlY3VyaXR5T3JpZ2luKCkpOworICAgIGlmIChvcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dCA9 PSBJbml0aWF0b3JDb250ZXh0OjpXb3JrZXIpCisgICAgICAgIGZpbmlzaGVkVGltaW5nRm9yV29y a2VyTG9hZChyZXNvdXJjZVRpbWluZyk7CisgICAgZWxzZSB7CisgICAgICAgIGlmIChhdXRvKiB3 aW5kb3cgPSBkb2N1bWVudCgpLmRvbVdpbmRvdygpKQorICAgICAgICAgICAgd2luZG93LT5wZXJm b3JtYW5jZSgpLmFkZFJlc291cmNlVGltaW5nKFdURk1vdmUocmVzb3VyY2VUaW1pbmcpKTsKICAg ICB9CiAKICAgICBkaWRGaW5pc2hMb2FkaW5nKGlkZW50aWZpZXIpOwpJbmRleDogU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcAkocmV2 aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5m b3JtYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw2IEBAIGJvb2wgUmVzb3Vy Y2VUaW1pbmdJbmZvcm1hdGlvbjo6c2hvdWxkQWQKIAogdm9pZCBSZXNvdXJjZVRpbWluZ0luZm9y bWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZyhDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UsIERvY3Vt ZW50JiBkb2N1bWVudCwgUmVzb3VyY2VUaW1pbmcmJiByZXNvdXJjZVRpbWluZykKIHsKLSAgICBB U1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRp bWluZ0VuYWJsZWQoKSk7CiAgICAgaWYgKCFSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzaG91 bGRBZGRSZXNvdXJjZVRpbWluZyhyZXNvdXJjZSkpCiAgICAgICAgIHJldHVybjsKIApAQCAtODks NyArODgsNiBAQCB2b2lkIFJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291CiAKIHZv aWQgUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbjo6c3RvcmVSZXNvdXJjZVRpbWluZ0luaXRpYXRv ckluZm9ybWF0aW9uKGNvbnN0IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiYg cmVzb3VyY2UsIGNvbnN0IEF0b21TdHJpbmcmIGluaXRpYXRvck5hbWUsIEZyYW1lKiBmcmFtZSkK IHsKLSAgICBBU1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5y ZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSk7CiAgICAgQVNTRVJUKHJlc291cmNlLmdldCgpKTsKIAog ICAgIGlmIChyZXNvdXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVz b3VyY2UpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy LmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODY1LDkgKzg2NSw2IEBAIHZvaWQgU3Vi cmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNvdXJjZXMKIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRl cjo6cmVwb3J0UmVzb3VyY2VUaW1pbmcoY29uc3QgTmV0d29ya0xvYWRNZXRyaWNzJiBuZXR3b3Jr TG9hZE1ldHJpY3MpCiB7Ci0gICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRG ZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAg ICBpZiAoIVJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OnNob3VsZEFkZFJlc291cmNlVGltaW5n KCptX3Jlc291cmNlKSkKICAgICAgICAgcmV0dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9u IDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1OCw3ICs5NTgsNyBAQCBSZXNvdXJjZUVycm9y T3I8Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjCiAKICAgICAgICAgICAgIG1lbW9yeUNhY2hlLnJl c291cmNlQWNjZXNzZWQoKnJlc291cmNlKTsKIAotICAgICAgICAgICAgaWYgKFJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkgJiYg ZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2UtPmlzTG9hZGluZygpKSB7CisgICAgICAgICAgICBpZiAo ZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2UtPmlzTG9hZGluZygpKSB7CiAgICAgICAgICAgICAgICAg YXV0byByZXNvdXJjZVRpbWluZyA9IFJlc291cmNlVGltaW5nOjpmcm9tQ2FjaGUodXJsLCByZXF1 ZXN0LmluaXRpYXRvck5hbWUoKSwgbG9hZFRpbWluZywgcmVzb3VyY2UtPnJlc3BvbnNlKCksICpy ZXF1ZXN0Lm9yaWdpbigpKTsKICAgICAgICAgICAgICAgICBpZiAoaW5pdGlhdG9yQ29udGV4dCA9 PSBJbml0aWF0b3JDb250ZXh0OjpXb3JrZXIpIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJU KGlzPENhY2hlZFJhd1Jlc291cmNlPihyZXNvdXJjZS5nZXQoKSkpOwpAQCAtMTA0Miw4ICsxMDQy LDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhYwogICAgIG1lbW9y eUNhY2hlLnJlbW92ZShyZXNvdXJjZSk7CiAgICAgbWVtb3J5Q2FjaGUuYWRkKCpuZXdSZXNvdXJj ZSk7CiAKLSAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5y ZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSkKLSAgICAgICAgbV9yZXNvdXJjZVRpbWluZ0luZm8uc3Rv cmVSZXNvdXJjZVRpbWluZ0luaXRpYXRvckluZm9ybWF0aW9uKG5ld1Jlc291cmNlLCBuZXdSZXNv dXJjZS0+aW5pdGlhdG9yTmFtZSgpLCBmcmFtZSgpKTsKKyAgICBtX3Jlc291cmNlVGltaW5nSW5m by5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24obmV3UmVzb3VyY2UsIG5l d1Jlc291cmNlLT5pbml0aWF0b3JOYW1lKCksIGZyYW1lKCkpOwogCiAgICAgcmV0dXJuIG5ld1Jl c291cmNlOwogfQpAQCAtMTA2MSw4ICsxMDYwLDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2Fj aGVkUmVzb3VyY2U+IENhYwogICAgIGlmIChyZXNvdXJjZS0+YWxsb3dzQ2FjaGluZygpKQogICAg ICAgICBtZW1vcnlDYWNoZS5hZGQoKnJlc291cmNlKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAg ICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5m b3JtYXRpb24ocmVzb3VyY2UsIHJlc291cmNlLT5pbml0aWF0b3JOYW1lKCksIGZyYW1lKCkpOwor ICAgIG1fcmVzb3VyY2VUaW1pbmdJbmZvLnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZv cm1hdGlvbihyZXNvdXJjZSwgcmVzb3VyY2UtPmluaXRpYXRvck5hbWUoKSwgZnJhbWUoKSk7CiAK ICAgICByZXR1cm4gcmVzb3VyY2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZv cm1hbmNlLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNl LmlkbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5j ZS5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTM3LDI4ICszNywzMSBAQCB0eXBlZGVmIGRvdWJsZSBE T01IaWdoUmVzVGltZVN0YW1wOwogICAgIEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogICAgIEdl bmVyYXRlSXNSZWFjaGFibGU9SW1wbFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsCiBdIGludGVyZmFj ZSBQZXJmb3JtYW5jZSA6IEV2ZW50VGFyZ2V0IHsKLQogICAgIERPTUhpZ2hSZXNUaW1lU3RhbXAg bm93KCk7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCAndGltZU9yaWdpbicuCisgICAgLy8gcmVh ZG9ubHkgYXR0cmlidXRlIERPTUhpZ2hSZXNUaW1lU3RhbXAgdGltZU9yaWdpbjsKKyAgICAvLyBG SVhNRTogSW1wbGVtZW50ICd0b0pTT04nLgorICAgIC8vIFtEZWZhdWx0XSBvYmplY3QgdG9KU09O KCk7CiAKICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vbmF2aWdhdGlvbi10aW1pbmcvCiAg ICAgcmVhZG9ubHkgYXR0cmlidXRlIFBlcmZvcm1hbmNlTmF2aWdhdGlvbiBuYXZpZ2F0aW9uOwog ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBQZXJmb3JtYW5jZVRpbWluZyB0aW1pbmc7CiAKICAgICAv LyBodHRwczovL3czYy5naXRodWIuaW8vcGVyZm9ybWFuY2UtdGltZWxpbmUvCi0gICAgW0VuYWJs ZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VUaW1lbGluZV0gUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0 RW50cmllcygpOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmVdIFBl cmZvcm1hbmNlRW50cnlMaXN0IGdldEVudHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5VHlwZSk7 Ci0gICAgW0VuYWJsZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VUaW1lbGluZV0gUGVyZm9ybWFuY2VF bnRyeUxpc3QgZ2V0RW50cmllc0J5TmFtZShET01TdHJpbmcgbmFtZSwgb3B0aW9uYWwgRE9NU3Ry aW5nIGVudHJ5VHlwZSk7CisgICAgUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllcygpOwor ICAgIFBlcmZvcm1hbmNlRW50cnlMaXN0IGdldEVudHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5 VHlwZSk7CisgICAgUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllc0J5TmFtZShET01TdHJp bmcgbmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIGVudHJ5VHlwZSk7CiAKICAgICAvLyBodHRwczov L3czYy5naXRodWIuaW8vcmVzb3VyY2UtdGltaW5nLwotICAgIFtFbmFibGVkQXRSdW50aW1lPVJl c291cmNlVGltaW5nXSB1bmRlZmluZWQgY2xlYXJSZXNvdXJjZVRpbWluZ3MoKTsKLSAgICBbRW5h YmxlZEF0UnVudGltZT1SZXNvdXJjZVRpbWluZ10gdW5kZWZpbmVkIHNldFJlc291cmNlVGltaW5n QnVmZmVyU2l6ZSh1bnNpZ25lZCBsb25nIG1heFNpemUpOwotICAgIFtFbmFibGVkQXRSdW50aW1l PVJlc291cmNlVGltaW5nXSBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdi dWZmZXJmdWxsOworICAgIHVuZGVmaW5lZCBjbGVhclJlc291cmNlVGltaW5ncygpOworICAgIHVu ZGVmaW5lZCBzZXRSZXNvdXJjZVRpbWluZ0J1ZmZlclNpemUodW5zaWduZWQgbG9uZyBtYXhTaXpl KTsKKyAgICBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdidWZmZXJmdWxs OwogCiAgICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3VzZXItdGltaW5nLwotICAgIFtFbmFi bGVkQXRSdW50aW1lPVVzZXJUaW1pbmcsIE1heVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWFy ayhET01TdHJpbmcgbWFya05hbWUpOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVVzZXJUaW1pbmdd IHVuZGVmaW5lZCBjbGVhck1hcmtzKG9wdGlvbmFsIERPTVN0cmluZyBtYXJrTmFtZSk7Ci0gICAg W0VuYWJsZWRBdFJ1bnRpbWU9VXNlclRpbWluZywgTWF5VGhyb3dFeGNlcHRpb25dIHVuZGVmaW5l ZCBtZWFzdXJlKERPTVN0cmluZyBtZWFzdXJlTmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIHN0YXJ0 TWFyaywgb3B0aW9uYWwgRE9NU3RyaW5nIGVuZE1hcmspOwotICAgIFtFbmFibGVkQXRSdW50aW1l PVVzZXJUaW1pbmddIHVuZGVmaW5lZCBjbGVhck1lYXN1cmVzKG9wdGlvbmFsIERPTVN0cmluZyBt ZWFzdXJlTmFtZSk7CisgICAgTWF5VGhyb3dFeGNlcHRpb25dIHVuZGVmaW5lZCBtYXJrKERPTVN0 cmluZyBtYXJrTmFtZSk7CisgICAgdW5kZWZpbmVkIGNsZWFyTWFya3Mob3B0aW9uYWwgRE9NU3Ry aW5nIG1hcmtOYW1lKTsKKyAgICBNYXlUaHJvd0V4Y2VwdGlvbl0gdW5kZWZpbmVkIG1lYXN1cmUo RE9NU3RyaW5nIG1lYXN1cmVOYW1lLCBvcHRpb25hbCBET01TdHJpbmcgc3RhcnRNYXJrLCBvcHRp b25hbCBET01TdHJpbmcgZW5kTWFyayk7CisgICAgdW5kZWZpbmVkIGNsZWFyTWVhc3VyZXMob3B0 aW9uYWwgRE9NU3RyaW5nIG1lYXN1cmVOYW1lKTsKIH07CiAKIHR5cGVkZWYgc2VxdWVuY2U8UGVy Zm9ybWFuY2VFbnRyeT4gUGVyZm9ybWFuY2VFbnRyeUxpc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BlcmZvcm1hbmNlRW50cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5jcHAJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUyLDE3 ICs1MiwxMyBAQCBPcHRpb25hbDxQZXJmb3JtYW5jZUVudHJ5OjpUeXBlPiBQZXJmb3JtCiAgICAg aWYgKGVudHJ5VHlwZSA9PSAibmF2aWdhdGlvbiIpCiAgICAgICAgIHJldHVybiBPcHRpb25hbDxU eXBlPihUeXBlOjpOYXZpZ2F0aW9uKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVz OjpzaGFyZWRGZWF0dXJlcygpLnVzZXJUaW1pbmdFbmFibGVkKCkpIHsKLSAgICAgICAgaWYgKGVu dHJ5VHlwZSA9PSAibWFyayIpCi0gICAgICAgICAgICByZXR1cm4gT3B0aW9uYWw8VHlwZT4oVHlw ZTo6TWFyayk7Ci0gICAgICAgIGlmIChlbnRyeVR5cGUgPT0gIm1lYXN1cmUiKQotICAgICAgICAg ICAgcmV0dXJuIE9wdGlvbmFsPFR5cGU+KFR5cGU6Ok1lYXN1cmUpOwotICAgIH0KKyAgICBpZiAo ZW50cnlUeXBlID09ICJtYXJrIikKKyAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFR5cGU+KFR5cGU6 Ok1hcmspOworICAgIGlmIChlbnRyeVR5cGUgPT0gIm1lYXN1cmUiKQorICAgICAgICByZXR1cm4g T3B0aW9uYWw8VHlwZT4oVHlwZTo6TWVhc3VyZSk7CiAKLSAgICBpZiAoUnVudGltZUVuYWJsZWRG ZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSkgewotICAg ICAgICBpZiAoZW50cnlUeXBlID09ICJyZXNvdXJjZSIpCi0gICAgICAgICAgICByZXR1cm4gT3B0 aW9uYWw8VHlwZT4oVHlwZTo6UmVzb3VyY2UpOwotICAgIH0KKyAgICBpZiAoZW50cnlUeXBlID09 ICJyZXNvdXJjZSIpCisgICAgICAgIHJldHVybiBPcHRpb25hbDxUeXBlPihUeXBlOjpSZXNvdXJj ZSk7CiAKICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5w YWludFRpbWluZ0VuYWJsZWQoKSkgewogICAgICAgICBpZiAoZW50cnlUeXBlID09ICJwYWludCIp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlRW50cnkuaWRsCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5pZGwJKHJldmlzaW9u IDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5pZGwJKHdv cmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDYgQEAgdHlwZWRlZiBkb3VibGUgRE9NSGlnaFJlc1Rp bWVTdGFtcDsKIAogWwogICAgIEN1c3RvbVRvSlNPYmplY3QsCi0gICAgRW5hYmxlZEF0UnVudGlt ZT1QZXJmb3JtYW5jZVRpbWVsaW5lLAogICAgIEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogXSBp bnRlcmZhY2UgUGVyZm9ybWFuY2VFbnRyeSB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0 cmluZyBuYW1lOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU9ic2VydmVy LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2 ZXIuaWRsCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1h bmNlT2JzZXJ2ZXIuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2IEBACiAKIFsKICAg ICBDdXN0b21Jc1JlYWNoYWJsZSwKLSAgICBFbmFibGVkQXRSdW50aW1lPVBlcmZvcm1hbmNlVGlt ZWxpbmUsCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtlciksCiAgICAgSW1wbGVtZW50YXRpb25M YWNrc1ZUYWJsZSwKICAgICBKU0N1c3RvbU1hcmtGdW5jdGlvbiwKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BhZ2UvUGVyZm9ybWFuY2VPYnNlcnZlckVudHJ5TGlzdC5pZGwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbAkocmV2 aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU9ic2VydmVy RW50cnlMaXN0LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAogLy8gaHR0cHM6 Ly93M2MuZ2l0aHViLmlvL3BlcmZvcm1hbmNlLXRpbWVsaW5lLwogCiBbCi0gICAgRW5hYmxlZEF0 UnVudGltZT1QZXJmb3JtYW5jZVRpbWVsaW5lLAogICAgIEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIp LAogICAgIEltcGxlbWVudGF0aW9uTGFja3NWVGFibGUsCiBdIGludGVyZmFjZSBQZXJmb3JtYW5j ZU9ic2VydmVyRW50cnlMaXN0IHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFu Y2VSZXNvdXJjZVRpbWluZy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Q ZXJmb3JtYW5jZVJlc291cmNlVGltaW5nLmlkbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZVJlc291cmNlVGltaW5nLmlkbAkod29ya2luZyBjb3B5 KQpAQCAtMzMsNyArMzMsNiBAQAogdHlwZWRlZiBkb3VibGUgRE9NSGlnaFJlc1RpbWVTdGFtcDsK IAogWwotICAgIEVuYWJsZWRBdFJ1bnRpbWU9UmVzb3VyY2VUaW1pbmcsCiAgICAgRXhwb3NlZD0o V2luZG93LFdvcmtlciksCiBdIGludGVyZmFjZSBQZXJmb3JtYW5jZVJlc291cmNlVGltaW5nIDog UGVyZm9ybWFuY2VFbnRyeSB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBpbml0 aWF0b3JUeXBlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1 cmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9SdW50aW1lRW5hYmxlZEZl YXR1cmVzLmgJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUnVudGlt ZUVuYWJsZWRGZWF0dXJlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCwxNyArNDQsOSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBSdW50aW1lRW5hYmxlZEZlYXR1cmVzIHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShSdW50aW1lRW5hYmxlZEZlYXR1cmVzKTsKIHB1YmxpYzoKLSAgICB2 b2lkIHNldFJlc291cmNlVGltaW5nRW5hYmxlZChib29sIGlzRW5hYmxlZCkgeyBtX2lzUmVzb3Vy Y2VUaW1pbmdFbmFibGVkID0gaXNFbmFibGVkOyB9Ci0gICAgYm9vbCByZXNvdXJjZVRpbWluZ0Vu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzUmVzb3VyY2VUaW1pbmdFbmFibGVkOyB9Ci0KLSAg ICB2b2lkIHNldFVzZXJUaW1pbmdFbmFibGVkKGJvb2wgaXNFbmFibGVkKSB7IG1faXNVc2VyVGlt aW5nRW5hYmxlZCA9IGlzRW5hYmxlZDsgfQotICAgIGJvb2wgdXNlclRpbWluZ0VuYWJsZWQoKSBj b25zdCB7IHJldHVybiBtX2lzVXNlclRpbWluZ0VuYWJsZWQ7IH0KLQogICAgIHZvaWQgc2V0UGFp bnRUaW1pbmdFbmFibGVkKGJvb2wgaXNFbmFibGVkKSB7IG1faXNQYWludFRpbWluZ0VuYWJsZWQg PSBpc0VuYWJsZWQ7IH0KICAgICBib29sIHBhaW50VGltaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0 dXJuIG1faXNQYWludFRpbWluZ0VuYWJsZWQ7IH0KIAotICAgIGJvb2wgcGVyZm9ybWFuY2VUaW1l bGluZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiByZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSB8fCB1 c2VyVGltaW5nRW5hYmxlZCgpOyB9Ci0KICAgICB2b2lkIHNldE1lbnVJdGVtRWxlbWVudEVuYWJs ZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9pc01lbnVJdGVtRWxlbWVudEVuYWJsZWQgPSBpc0VuYWJs ZWQ7IH0KICAgICBib29sIG1lbnVJdGVtRWxlbWVudEVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2lzTWVudUl0ZW1FbGVtZW50RW5hYmxlZDsgfQogCkBAIC0yODIsOCArMjc0LDYgQEAgcHJpdmF0 ZToKIAogICAgIGJvb2wgbV9hcmVNb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCB7IGZhbHNlIH07 CiAgICAgYm9vbCBtX2lzUGFpbnRUaW1pbmdFbmFibGVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1f aXNSZXNvdXJjZVRpbWluZ0VuYWJsZWQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9pc1VzZXJUaW1p bmdFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNNZW51SXRlbUVsZW1lbnRFbmFibGVk IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNEaXJlY3RvcnlVcGxvYWRFbmFibGVkIHsgZmFsc2Ug fTsKICAgICBib29sIG1faXNDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQgeyBmYWxzZSB9OwpJ bmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDktMTcgIFNhbSBXZWluaWcg IDx3ZWluaWdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9y IGVuYWJsaW5nL2Rpc2FibGluZyB0aGUgVXNlclRpbWluZyBhbmQgUmVzb3VyY2VUaW1pbmcgQVBJ cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTU2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl IHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5hYmxpbmcvZGlzYWJsaW5nIFVzZXJUaW1pbmcgYW5kIFJl c291cmNlVGltaW5nIAorICAgICAgICBBUElzLiBUaGV5IGhhdmUgYm90aCBiZWVuIG9uIGZvciBh IHdoaWxlIGluIFdlYktpdDIgYW5kIHRoZXJlIGFyZW4ndCBhbnkKKyAgICAgICAga25vd24gdXNl cyBjYXNlcyBmb3IgZGlzYWJsaW5nIHRoZW0uIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRoZSBz ZXR0aW5nLCAKKyAgICAgICAgdGhleSBhcmUgbm93IGVuYWJsZWQgaW4gTGVnYWN5V2ViS2l0IGFz IHdlbGwuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVu Y2VzU2V0VXNlclRpbWluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldFVzZXJU aW1pbmdFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRSZXNvdXJjZVRpbWluZ0Vu YWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZCk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmg6CisK IDIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFdl IHNob3VsZG4ndCBuZWVkIHRvIHNwZWNpZnkgYSBjYXRlZ29yeSBmb3IgcHJlZmVyZW5jZXMgbm93 IHRoYXQgdGhleSBhcmUgc3BsaXQgaW50byBzZXBhcmF0ZSBmaWxlcwpJbmRleDogU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC02 NzcsMjAgKzY3Nyw2IEBAIE1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkOgogICBodW1hblJlYWRh YmxlRGVzY3JpcHRpb246ICJVc2UgbW9kZXJuIG1lZGlhIGNvbnRyb2xzIGxvb2siCiAgIHdlYmNv cmVCaW5kaW5nOiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzCiAKLVJlc291cmNlVGltaW5nRW5hYmxl ZDoKLSAgdHlwZTogYm9vbAotICBkZWZhdWx0VmFsdWU6IHRydWUKLSAgaHVtYW5SZWFkYWJsZU5h bWU6ICJSZXNvdXJjZSBUaW1pbmciCi0gIGh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbjogIkVuYWJs ZSBSZXNvdXJjZVRpbWluZyBBUEkiCi0gIHdlYmNvcmVCaW5kaW5nOiBSdW50aW1lRW5hYmxlZEZl YXR1cmVzCi0KLVVzZXJUaW1pbmdFbmFibGVkOgotICB0eXBlOiBib29sCi0gIGRlZmF1bHRWYWx1 ZTogdHJ1ZQotICBodW1hblJlYWRhYmxlTmFtZTogIlVzZXIgVGltaW5nIgotICBodW1hblJlYWRh YmxlRGVzY3JpcHRpb246ICJFbmFibGUgVXNlclRpbWluZyBBUEkiCi0gIHdlYmNvcmVCaW5kaW5n OiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzCi0KIEJlYWNvbkFQSUVuYWJsZWQ6CiAgIHR5cGU6IGJv b2wKICAgZGVmYXVsdFZhbHVlOiB0cnVlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1ByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE2ODksMTYgKzE2ODksNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRNZW51SXRlbUVsZW1l bnRFbmFiCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm1lbnVJdGVtRWxlbWVu dEVuYWJsZWQoKTsKIH0KIAotdm9pZCBXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQo V0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQotewotICAgIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPnNldFVzZXJUaW1pbmdFbmFibGVkKGZsYWcpOwotfQotCi1ib29s IFdLUHJlZmVyZW5jZXNHZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZl cmVuY2VzUmVmKQotewotICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT51c2VyVGlt aW5nRW5hYmxlZCgpOwotfQotCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRQYWludFRpbWluZ0VuYWJs ZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQogewogICAgIHRv SW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFBhaW50VGltaW5nRW5hYmxlZChmbGFnKTsKQEAgLTE3 MDksMTUgKzE2OTksNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRQYWludFRpbWluZ0VuYWJsZWQo CiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnBhaW50VGltaW5nRW5hYmxlZCgp OwogfQogCi12b2lkIFdLUHJlZmVyZW5jZXNTZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQotewotICAgIHRvSW1wbChwcmVm ZXJlbmNlc1JlZiktPnNldFJlc291cmNlVGltaW5nRW5hYmxlZChmbGFnKTsKLX0KLQotYm9vbCBX S1ByZWZlcmVuY2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYpCi17Ci0gICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnJlc291 cmNlVGltaW5nRW5hYmxlZCgpOwotfQogCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRJc05TVVJMU2Vz c2lvbldlYlNvY2tldEVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9v bCBmbGFnKQogewpAQCAtMjIyNCwzICsyMjA1LDIxIEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldElz U2VjdXJlQ29udGV4dEF0dHIKIHsKICAgICByZXR1cm4gdHJ1ZTsKIH0KKwordm9pZCBXS1ByZWZl cmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCkKK3sKK30K KworYm9vbCBXS1ByZWZlcmVuY2VzR2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl ZikKK3sKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBXS1ByZWZlcmVuY2VzU2V0UmVzb3Vy Y2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wpCit7Cit9CisKK2Jvb2wgV0tQ cmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKQorewor ICAgIHJldHVybiB0cnVlOworfQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCShyZXZpc2lvbiAyNjcxOTQp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NjEsMTggKzQ2MSwxMCBAQCBXS19FWFBPUlQgdm9pZCBX S1ByZWZlcmVuY2VzU2V0V2ViU2hhcmVFCiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0 V2ViU2hhcmVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0byBmYWxz ZQotV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFVzZXJUaW1pbmdFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7Ci1XS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0 VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZik7Ci0KLS8vIERlZmF1bHRzIHRvIGZh bHNlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0UGFpbnRUaW1pbmdFbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2Vz R2V0UGFpbnRUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0 byBmYWxzZQotV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5nRW5h YmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwotV0tfRVhQT1JUIGJvb2wgV0tQcmVm ZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKLQotLy8g RGVmYXVsdHMgdG8gZmFsc2UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRGZXRjaEFQ SUtlZXBBbGl2ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKIFdLX0VYUE9S VCBib29sIFdLUHJlZmVyZW5jZXNHZXRGZXRjaEFQSUtlZXBBbGl2ZUVuYWJsZWQoV0tQcmVmZXJl bmNlc1JlZik7CiAKQEAgLTU5NSw2ICs1ODcsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJl bmNlc1NldEZldGNoQVBJRQogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEZldGNoQVBJ RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogV0tfRVhQT1JU IHZvaWQgV0tQcmVmZXJlbmNlc1NldElzU2VjdXJlQ29udGV4dEF0dHJpYnV0ZUVuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiwgYm9vbCkgV0tfQ19BUElfREVQUkVDQVRFRDsKIFdLX0VYUE9SVCBib29s IFdLUHJlZmVyZW5jZXNHZXRJc1NlY3VyZUNvbnRleHRBdHRyaWJ1dGVFbmFibGVkKFdLUHJlZmVy ZW5jZXNSZWYpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVu Y2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCkgV0tfQ19BUElf REVQUkVDQVRFRDsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRVc2VyVGltaW5nRW5h YmxlZChXS1ByZWZlcmVuY2VzUmVmKSBXS19DX0FQSV9ERVBSRUNBVEVEOworV0tfRVhQT1JUIHZv aWQgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVm LCBib29sKSBXS19DX0FQSV9ERVBSRUNBVEVEOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNl c0dldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKSBXS19DX0FQSV9ERVBS RUNBVEVEOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D aGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTE3ICBTYW0g V2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0 aW5nIGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGlt aW5nIEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5n IGFuZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBv biBmb3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtu b3duIHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmlu ZyB0aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdl YktpdCBhcyB3ZWxsLgorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAg ICAgICAgKCtbV2ViUHJlZmVyZW5jZXMgaW5pdGlhbGl6ZV0pOgorICAgICAgICAoLVtXZWJQcmVm ZXJlbmNlcyBzZXRVc2VyVGltaW5nRW5hYmxlZDpdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5j ZXMgdXNlclRpbWluZ0VuYWJsZWRdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0UmVz b3VyY2VUaW1pbmdFbmFibGVkOl0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyByZXNvdXJj ZVRpbWluZ0VuYWJsZWRdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0 ZS5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBf cHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDIwLTA5LTE3ICBBbnRvaW5lIFF1aW50ICA8Z3Jh b3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB0aGUgbGVnYWN5IGFuaW1hdGlvbiBj b2RlCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2Vz Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJl ZmVyZW5jZXMubW0JKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY4NCw4ICs2ODQs NiBAQCArICh2b2lkKWluaXRpYWxpemUKICNpZiBFTkFCTEUoSU5URVJTRUNUSU9OX09CU0VSVkVS KQogICAgICAgICBATk8sIFdlYktpdEludGVyc2VjdGlvbk9ic2VydmVyRW5hYmxlZFByZWZlcmVu Y2VLZXksCiAjZW5kaWYKLSAgICAgICAgQE5PLCBXZWJLaXRVc2VyVGltaW5nRW5hYmxlZFByZWZl cmVuY2VLZXksCi0gICAgICAgIEBOTywgV2ViS2l0UmVzb3VyY2VUaW1pbmdFbmFibGVkUHJlZmVy ZW5jZUtleSwKICAgICAgICAgQE5PLCBXZWJLaXRNZWRpYVVzZXJHZXN0dXJlSW5oZXJpdHNGcm9t RG9jdW1lbnQsCiAgICAgICAgIEBZRVMsIFdlYktpdExlZ2FjeUVuY3J5cHRlZE1lZGlhQVBJRW5h YmxlZEtleSwKICAgICAgICAgQE5PLCBXZWJLaXRFbmNyeXB0ZWRNZWRpYUFQSUVuYWJsZWRLZXks CkBAIC0zMjUyLDI2ICszMjUwLDYgQEAgLSAodm9pZClzZXRNZW51SXRlbUVsZW1lbnRFbmFibGVk OihCT09MKQogICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0TWVudUl0 ZW1FbGVtZW50RW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCi0tIChCT09MKXVzZXJUaW1pbmdF bmFibGVkCi17Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0VXNlclRp bWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKLX0KLQotLSAodm9pZClzZXRVc2VyVGltaW5nRW5h YmxlZDooQk9PTClmbGFnCi17Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpX ZWJLaXRVc2VyVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXldOwotfQotCi0tIChCT09MKXJlc291 cmNlVGltaW5nRW5hYmxlZAotewotICAgIHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5Oldl YktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXldOwotfQotCi0tICh2b2lkKXNl dFJlc291cmNlVGltaW5nRW5hYmxlZDooQk9PTClmbGFnCi17Ci0gICAgW3NlbGYgX3NldEJvb2xW YWx1ZTpmbGFnIGZvcktleTpXZWJLaXRSZXNvdXJjZVRpbWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5 XTsKLX0KLQogLSAoQk9PTCltZWRpYVVzZXJHZXN0dXJlSW5oZXJpdHNGcm9tRG9jdW1lbnQKIHsK ICAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRNZWRpYVVzZXJHZXN0dXJl SW5oZXJpdHNGcm9tRG9jdW1lbnRdOwpAQCAtMzY0OCw2ICszNjI2LDI0IEBAICsgKE5TU3RyaW5n ICopX2NvbmNhdGVuYXRlS2V5V2l0aElCQ3JlYXQKIC8vIFRoZSBwcmVmZXJlbmNlcyBpbiB0aGlz IGNhdGVnb3J5IGFyZSBkZXByZWNhdGVkIGFuZCBoYXZlIG5vIGVmZmVjdC4gVGhleSBzaG91bGQK IC8vIGJlIHJlbW92ZWQgd2hlbiBpdCBpcyBjb25zaWRlcmVkIHNhZmUgdG8gZG8gc28uCiAKKy0g KHZvaWQpc2V0VXNlclRpbWluZ0VuYWJsZWQ6KEJPT0wpZmxhZworeworfQorCistIChCT09MKXVz ZXJUaW1pbmdFbmFibGVkCit7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZClzZXRSZXNv dXJjZVRpbWluZ0VuYWJsZWQ6KEJPT0wpZmxhZworeworfQorCistIChCT09MKXJlc291cmNlVGlt aW5nRW5hYmxlZAoreworICAgIHJldHVybiBZRVM7Cit9CisKIC0gKHZvaWQpc2V0Q1NTU2hhZG93 UGFydHNFbmFibGVkOihCT09MKWZsYWcKIHsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAkocmV2aXNp b24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJl bmNlc1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjQwLDggKzY0MCw2IEBAIEBpbnRlcmZh Y2UgV2ViUHJlZmVyZW5jZXMgKFdlYlByaXZhdGUpCiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9P TCBpbnRlcnNlY3Rpb25PYnNlcnZlckVuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9P TCBtZW51SXRlbUVsZW1lbnRFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wga2V5 Z2VuRWxlbWVudEVuYWJsZWQ7Ci1AcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCB1c2VyVGltaW5n RW5hYmxlZDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHJlc291cmNlVGltaW5nRW5hYmxl ZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGxpbmtQcmVsb2FkRW5hYmxlZDsKIEBwcm9w ZXJ0eSAobm9uYXRvbWljKSBCT09MIG1lZGlhVXNlckdlc3R1cmVJbmhlcml0c0Zyb21Eb2N1bWVu dDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGlzU2VjdXJlQ29udGV4dEF0dHJpYnV0ZUVu YWJsZWQ7CkBAIC02ODYsNiArNjg0LDkgQEAgQGludGVyZmFjZSBXZWJQcmVmZXJlbmNlcyAoV2Vi UHJpdmF0ZURlcAogLy8gVGhlIHByZWZlcmVuY2VzIGluIHRoaXMgY2F0ZWdvcnkgYXJlIGRlcHJl Y2F0ZWQgYW5kIGhhdmUgbm8gZWZmZWN0LiBUaGV5IHNob3VsZAogLy8gYmUgcmVtb3ZlZCB3aGVu IGl0IGlzIGNvbnNpZGVyZWQgc2FmZSB0byBkbyBzby4KIAorQHByb3BlcnR5IChub25hdG9taWMp IEJPT0wgdXNlclRpbWluZ0VuYWJsZWQ7CitAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCByZXNv dXJjZVRpbWluZ0VuYWJsZWQ7CisKIC0gKHZvaWQpc2V0Q1NTU2hhZG93UGFydHNFbmFibGVkOihC T09MKWZsYWc7CiAtIChCT09MKWNzc1NoYWRvd1BhcnRzRW5hYmxlZDsKIApJbmRleDogU291cmNl L1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMjY3MTk0KQor KysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC0zMzY1LDggKzMzNjUsNiBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdl YlByZWZlcmVuCiAgICAgc2V0dGluZ3Muc2V0SW50ZXJzZWN0aW9uT2JzZXJ2ZXJFbmFibGVkKHBy ZWZlcmVuY2VzLmludGVyc2VjdGlvbk9ic2VydmVyRW5hYmxlZCk7CiAjZW5kaWYKIAotICAgIFJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0VXNlclRpbWluZ0VuYWJs ZWQocHJlZmVyZW5jZXMudXNlclRpbWluZ0VuYWJsZWQpOwotICAgIFJ1bnRpbWVFbmFibGVkRmVh dHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKHByZWZlcmVu Y2VzLnJlc291cmNlVGltaW5nRW5hYmxlZCk7CiAgICAgc2V0dGluZ3Muc2V0TGlua1ByZWxvYWRF bmFibGVkKHByZWZlcmVuY2VzLmxpbmtQcmVsb2FkRW5hYmxlZCk7CiAgICAgc2V0dGluZ3Muc2V0 TWVkaWFQcmVsb2FkaW5nRW5hYmxlZChwcmVmZXJlbmNlcy5tZWRpYVByZWxvYWRpbmdFbmFibGVk KTsKICAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNldERpcmVj dG9yeVVwbG9hZEVuYWJsZWQoW3ByZWZlcmVuY2VzIGRpcmVjdG9yeVVwbG9hZEVuYWJsZWRdKTsK SW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNv dXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDI0IEBACisyMDIwLTA5LTE3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5nIGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVz ZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJs aW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFuZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJ cy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBmb3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVy ZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3duIHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVt LiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJl IG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktpdCBhcyB3ZWxsLgorCisgICAgICAgICogV2ViUHJl ZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OmluaXRpYWxpemVEZWZhdWx0 U2V0dGluZ3MpOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OnNldFVzZXJUaW1pbmdFbmFibGVk KToKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjp1c2VyVGltaW5nRW5hYmxlZCk6CisgICAgICAg IChXZWJQcmVmZXJlbmNlczo6c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKToKKyAgICAgICAgKFdl YlByZWZlcmVuY2VzOjpyZXNvdXJjZVRpbWluZ0VuYWJsZWQpOgorICAgICAgICAqIFdlYlZpZXcu Y3BwOgorICAgICAgICAoV2ViVmlldzo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKToKKwogMjAy MC0wOS0xNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZW1vdmUgdGhlIGxlZ2FjeSBhbmltYXRpb24gY29kZQpJbmRleDogU291cmNlL1dlYktpdExlZ2Fj eS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdh Y3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dl YktpdExlZ2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTcs MTAgKzMxNyw2IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmluaXRpYWxpemVEZWZhdWx0U2UKIAog ICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRDU1NDdXN0b21Q cm9wZXJ0aWVzQW5kVmFsdWVzRW5hYmxlZFByZWZlcmVuY2VLZXkpLCBrQ0ZCb29sZWFuRmFsc2Up OwogCi0gICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RSKFdlYktpdFVzZXJU aW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7Ci0KLSAgICBDRkRp Y3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0UmVzb3VyY2VUaW1pbmdFbmFi bGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7Ci0KICAgICBDRkRpY3Rpb25hcnlB ZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0TGlua1ByZWxvYWRFbmFibGVkUHJlZmVyZW5j ZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7CiAKICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZh dWx0cywgQ0ZTVFIoV2ViS2l0TWVkaWFQcmVsb2FkaW5nRW5hYmxlZFByZWZlcmVuY2VLZXkpLCBr Q0ZCb29sZWFuRmFsc2UpOwpAQCAtMjM2MSw5ICsyMzU3LDggQEAgSFJFU1VMVCBXZWJQcmVmZXJl bmNlczo6Q1NTQ3VzdG9tUHJvcGVydAogICAgIHJldHVybiBTX09LOwogfQogICAgIAotSFJFU1VM VCBXZWJQcmVmZXJlbmNlczo6c2V0VXNlclRpbWluZ0VuYWJsZWQoQk9PTCBlbmFibGVkKQorSFJF U1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0VXNlclRpbWluZ0VuYWJsZWQoQk9PTCkKIHsKLSAgICBz ZXRCb29sVmFsdWUoV2ViS2l0VXNlclRpbWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5LCBlbmFibGVk KTsKICAgICByZXR1cm4gU19PSzsKIH0KIApAQCAtMjM3MSwxMyArMjM2NiwxMiBAQCBIUkVTVUxU IFdlYlByZWZlcmVuY2VzOjp1c2VyVGltaW5nRW5hYmxlCiB7CiAgICAgaWYgKCFlbmFibGVkKQog ICAgICAgICByZXR1cm4gRV9QT0lOVEVSOwotICAgICplbmFibGVkID0gYm9vbFZhbHVlRm9yS2V5 KFdlYktpdFVzZXJUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSk7CisgICAgKmVuYWJsZWQgPSB0 cnVlOwogICAgIHJldHVybiBTX09LOwogfQogCi1IUkVTVUxUIFdlYlByZWZlcmVuY2VzOjpzZXRS ZXNvdXJjZVRpbWluZ0VuYWJsZWQoQk9PTCBlbmFibGVkKQorSFJFU1VMVCBXZWJQcmVmZXJlbmNl czo6c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKEJPT0wpCiB7Ci0gICAgc2V0Qm9vbFZhbHVlKFdl YktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXksIGVuYWJsZWQpOwogICAgIHJl dHVybiBTX09LOwogfQogCkBAIC0yMzg1LDcgKzIzNzksNyBAQCBIUkVTVUxUIFdlYlByZWZlcmVu Y2VzOjpyZXNvdXJjZVRpbWluZ0VuCiB7CiAgICAgaWYgKCFlbmFibGVkKQogICAgICAgICByZXR1 cm4gRV9QT0lOVEVSOwotICAgICplbmFibGVkID0gYm9vbFZhbHVlRm9yS2V5KFdlYktpdFJlc291 cmNlVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXkpOworICAgICplbmFibGVkID0gdHJ1ZTsKICAg ICByZXR1cm4gU19PSzsKIH0KIApJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmll dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAJ KHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01MjU5LDE2ICs1MjU5LDYgQEAgSFJFU1VMVCBXZWJWaWV3Ojpu b3RpZnlQcmVmZXJlbmNlc0NoYW5nZQogICAgICAgICByZXR1cm4gaHI7CiAgICAgc2V0dGluZ3Mu c2V0Q1NTQ3VzdG9tUHJvcGVydGllc0FuZFZhbHVlc0VuYWJsZWQoISFlbmFibGVkKTsKIAotICAg IGhyID0gcHJlZnNQcml2YXRlLT51c2VyVGltaW5nRW5hYmxlZCgmZW5hYmxlZCk7Ci0gICAgaWYg KEZBSUxFRChocikpCi0gICAgICAgIHJldHVybiBocjsKLSAgICBSdW50aW1lRW5hYmxlZEZlYXR1 cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNldFVzZXJUaW1pbmdFbmFibGVkKCEhZW5hYmxlZCk7Ci0K LSAgICBociA9IHByZWZzUHJpdmF0ZS0+cmVzb3VyY2VUaW1pbmdFbmFibGVkKCZlbmFibGVkKTsK LSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgcmV0dXJuIGhyOwotICAgIFJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKCEh ZW5hYmxlZCk7Ci0KICAgICBociA9IHByZWZzUHJpdmF0ZS0+bGlua1ByZWxvYWRFbmFibGVkKCZl bmFibGVkKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgcmV0dXJuIGhyOwpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MjY3MjEzKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIg QEAKKzIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgorCisgICAgICAg IFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyB0aGUgVXNlclRp bWluZyBhbmQgUmVzb3VyY2VUaW1pbmcgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5hYmxpbmcv ZGlzYWJsaW5nIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIAorICAgICAgICBBUElzLiBU aGV5IGhhdmUgYm90aCBiZWVuIG9uIGZvciBhIHdoaWxlIGluIFdlYktpdDIgYW5kIHRoZXJlIGFy ZW4ndCBhbnkKKyAgICAgICAga25vd24gdXNlcyBjYXNlcyBmb3IgZGlzYWJsaW5nIHRoZW0uIElu IGFkZGl0aW9uIHRvIHJlbW92aW5nIHRoZSBzZXR0aW5nLCAKKyAgICAgICAgdGhleSBhcmUgbm93 IGVuYWJsZWQgaW4gTGVnYWN5V2ViS2l0IGFzIHdlbGwuCisKKyAgICAgICAgKiBEdW1wUmVuZGVy VHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChyZXNldFdlYlByZWZlcmVuY2Vz VG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJl bmRlclRyZWUuY3BwOgorICAgICAgICAocmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZh bHVlcyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpyZXNldFByZWZlcmVuY2VzVG9Db25zaXN0ZW50 VmFsdWVzKToKKwogMjAyMC0wOS0xNyAgVsOtY3RvciBNYW51ZWwgSsOhcXVleiBMZWFsICA8dmph cXVlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0cGFrIFNES10gYndyYXA6IGFkZCBwaXBl d2lyZSBzb2NrZXQgYXMgYmluZCBtb3VudApJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFj L0R1bXBSZW5kZXJUcmVlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21h Yy9EdW1wUmVuZGVyVHJlZS5tbQkocmV2aXNpb24gMjY3MTk0KQorKysgVG9vbHMvRHVtcFJlbmRl clRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NTEsOCArOTUx LDYgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdAogICAgIFtwcmVm ZXJlbmNlcyBzZXRMYXJnZUltYWdlQXN5bmNEZWNvZGluZ0VuYWJsZWQ6Tk9dOwogCiAgICAgW3By ZWZlcmVuY2VzIHNldE1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkOllFU107Ci0gICAgW3ByZWZl cmVuY2VzIHNldFJlc291cmNlVGltaW5nRW5hYmxlZDpZRVNdOwotICAgIFtwcmVmZXJlbmNlcyBz ZXRVc2VyVGltaW5nRW5hYmxlZDpZRVNdOwogCiAgICAgW3ByZWZlcmVuY2VzIHNldENhY2hlQVBJ RW5hYmxlZDpOT107CiAgICAgcHJlZmVyZW5jZXMubWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkID0g WUVTOwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw CShyZXZpc2lvbiAyNjcxOTQpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRl clRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OTYsOCArODk2LDYgQEAgc3RhdGljIHZvaWQg cmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdAogCiAgICAgcHJlZmVyZW5jZXMtPnNldEZvbnRT bW9vdGhpbmcoRm9udFNtb290aGluZ1R5cGVTdGFuZGFyZCk7CiAKLSAgICBwcmVmc1ByaXZhdGUt PnNldFJlc291cmNlVGltaW5nRW5hYmxlZChUUlVFKTsKLSAgICBwcmVmc1ByaXZhdGUtPnNldFVz ZXJUaW1pbmdFbmFibGVkKFRSVUUpOwogICAgIHByZWZzUHJpdmF0ZS0+c2V0RGF0YVRyYW5zZmVy SXRlbXNFbmFibGVkKFRSVUUpOwogICAgIHByZWZzUHJpdmF0ZS0+Y2xlYXJOZXR3b3JrTG9hZGVy U2Vzc2lvbigpOwogCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u dHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1Niw4ICs5NTYsNiBAQCB2b2lkIFRlc3RD b250cm9sbGVyOjpyZXNldFByZWZlcmVuY2VzVG9DCiAgICAgV0tQcmVmZXJlbmNlc1NldElzTlNV UkxTZXNzaW9uV2ViU29ja2V0RW5hYmxlZChwcmVmZXJlbmNlcywgZmFsc2UpOwogCiAgICAgV0tQ cmVmZXJlbmNlc1NldEZldGNoQVBJS2VlcEFsaXZlRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7 Ci0gICAgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5nRW5hYmxlZChwcmVmZXJlbmNlcywg dHJ1ZSk7Ci0gICAgV0tQcmVmZXJlbmNlc1NldFVzZXJUaW1pbmdFbmFibGVkKHByZWZlcmVuY2Vz LCB0cnVlKTsKICAgICBXS1ByZWZlcmVuY2VzU2V0TWVkaWFQcmVsb2FkaW5nRW5hYmxlZChwcmVm ZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldEV4cG9zZVNwZWFrZXJzRW5hYmxl ZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldE1lZGlhUGxheWJhY2tB bGxvd3NJbmxpbmUocHJlZmVyZW5jZXMsIHRydWUpOwo= 409078 2020-09-17 16:14:45 -0700 2020-09-17 16:35:41 -0700 Patch bug-216556-20200917161444.patch text/plain 34405 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDIwLTA5LTE3ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5n IGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5n IEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFu ZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBm b3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3du IHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0 aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktp dCBhcyB3ZWxsLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIFVzZXJUaW1pbmcg YW5kIFJlc291cmNlVGltaW5nLCB3ZSBjYW4gYWxzbyByZW1vdmUgdGhlCisgICAgICAgIGNoZWNr cyBmb3IgUGVyZm9ybWFuY2VUaW1lbGluZUVuYWJsZWQsIGFzIHRoYXQgd2FzIGRlZmluZWQgZW50 aXJlbHkgaW4gdGVybXMKKyAgICAgICAgb2YgdGhlIGZvcm1lci4KKworICAgICAgICAqIGxvYWRl ci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3Jv c3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyOjpzdGFydFByZWZsaWdodCk6CisgICAgICAgICogbG9h ZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvUmVz b3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVRp bWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZyk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5m b3JtYXRpb24pOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6cmVwb3J0UmVzb3VyY2VUaW1pbmcpOgor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNvdXJjZSk6Cisg ICAgICAgICogcGFnZS9QZXJmb3JtYW5jZS5pZGw6CisgICAgICAgICogcGFnZS9QZXJmb3JtYW5j ZUVudHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlRW50cnk6OnBhcnNlRW50 cnlUeXBlU3RyaW5nKToKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlRW50cnkuaWRsOgorICAg ICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VPYnNlcnZlci5pZGw6CisgICAgICAgICogcGFnZS9QZXJm b3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbDoKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNl UmVzb3VyY2VUaW1pbmcuaWRsOgorICAgICAgICAqIHBhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJl cy5oOgorICAgICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2V0UmVzb3Vy Y2VUaW1pbmdFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnJlc291cmNlVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzZXRVc2VyVGltaW5nRW5hYmxl ZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp1 c2VyVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpwZXJmb3JtYW5jZVRpbWVsaW5lRW5hYmxlZCBjb25zdCk6IERl bGV0ZWQuCisKIDIwMjAtMDktMTcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFN0eWxlOjpDaGFuZ2Ugc2hvdWxkIGJlIGVudW0gY2xhc3MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIu Y3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmln aW5QcmVmbGlnaHRDaGVja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzExNiw3IEBA IHZvaWQgQ3Jvc3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyOjpzdGFydFAKICAgICBvcHRpb25zLmlu aXRpYXRvckNvbnRleHQgPSBtX2xvYWRlci5vcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dDsKIAog ICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBwcmVmbGlnaHRSZXF1ZXN0KGNyZWF0ZUFjY2Vzc0Nv bnRyb2xQcmVmbGlnaHRSZXF1ZXN0KG1fcmVxdWVzdCwgbV9sb2FkZXIuc2VjdXJpdHlPcmlnaW4o KSwgbV9sb2FkZXIucmVmZXJyZXIoKSksIG9wdGlvbnMpOwotICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAg ICAgICBwcmVmbGlnaHRSZXF1ZXN0LnNldEluaXRpYXRvcihtX2xvYWRlci5vcHRpb25zKCkuaW5p dGlhdG9yKTsKKyAgICBwcmVmbGlnaHRSZXF1ZXN0LnNldEluaXRpYXRvcihtX2xvYWRlci5vcHRp b25zKCkuaW5pdGlhdG9yKTsKIAogICAgIEFTU0VSVCghbV9yZXNvdXJjZSk7CiAgICAgbV9yZXNv dXJjZSA9IG1fbG9hZGVyLmRvY3VtZW50KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0 UmF3UmVzb3VyY2UoV1RGTW92ZShwcmVmbGlnaHRSZXF1ZXN0KSkudmFsdWVfb3IobnVsbHB0cik7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxl TG9hZGVyLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0OCw4ICs1NDgs NyBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlCiAKICAgICAgICAg cmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXMobV9vcHRpb25zLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5 ID09IFN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpVc2UpOwogICAgICAgICBDYWNoZWRSZXNvdXJj ZVJlcXVlc3QgbmV3UmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpLCBvcHRpb25zKTsKLSAgICAgICAg aWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1p bmdFbmFibGVkKCkpCi0gICAgICAgICAgICBuZXdSZXF1ZXN0LnNldEluaXRpYXRvcihtX29wdGlv bnMuaW5pdGlhdG9yKTsKKyAgICAgICAgbmV3UmVxdWVzdC5zZXRJbml0aWF0b3IobV9vcHRpb25z LmluaXRpYXRvcik7CiAgICAgICAgIG5ld1JlcXVlc3Quc2V0T3JpZ2luKHNlY3VyaXR5T3JpZ2lu KCkpOwogCiAgICAgICAgIEFTU0VSVCghbV9yZXNvdXJjZSk7CkBAIC02MzksMjAgKzYzOCwxOCBA QCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlCiAgICAgaWYgKGRhdGEp CiAgICAgICAgIGRpZFJlY2VpdmVEYXRhKGlkZW50aWZpZXIsIGRhdGEtPmRhdGEoKSwgZGF0YS0+ c2l6ZSgpKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJl cygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKSB7Ci0gICAgICAgIGNvbnN0IGF1dG8qIHRpbWlu ZyA9IHJlc3BvbnNlLmRlcHJlY2F0ZWROZXR3b3JrTG9hZE1ldHJpY3NPck51bGwoKTsKLSAgICAg ICAgT3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBlbXB0eTsKLSAgICAgICAgaWYgKCF0aW1p bmcpIHsKLSAgICAgICAgICAgIGVtcHR5LmVtcGxhY2UoKTsKLSAgICAgICAgICAgIHRpbWluZyA9 ICZlbXB0eS52YWx1ZSgpOwotICAgICAgICB9Ci0gICAgICAgIGF1dG8gcmVzb3VyY2VUaW1pbmcg PSBSZXNvdXJjZVRpbWluZzo6ZnJvbVN5bmNocm9ub3VzTG9hZChyZXF1ZXN0VVJMLCBtX29wdGlv bnMuaW5pdGlhdG9yLCBsb2FkVGltaW5nLCAqdGltaW5nLCByZXNwb25zZSwgc2VjdXJpdHlPcmln aW4oKSk7Ci0gICAgICAgIGlmIChvcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dCA9PSBJbml0aWF0 b3JDb250ZXh0OjpXb3JrZXIpCi0gICAgICAgICAgICBmaW5pc2hlZFRpbWluZ0Zvcldvcmtlckxv YWQocmVzb3VyY2VUaW1pbmcpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChhdXRv KiB3aW5kb3cgPSBkb2N1bWVudCgpLmRvbVdpbmRvdygpKQotICAgICAgICAgICAgICAgIHdpbmRv dy0+cGVyZm9ybWFuY2UoKS5hZGRSZXNvdXJjZVRpbWluZyhXVEZNb3ZlKHJlc291cmNlVGltaW5n KSk7Ci0gICAgICAgIH0KKyAgICBjb25zdCBhdXRvKiB0aW1pbmcgPSByZXNwb25zZS5kZXByZWNh dGVkTmV0d29ya0xvYWRNZXRyaWNzT3JOdWxsKCk7CisgICAgT3B0aW9uYWw8TmV0d29ya0xvYWRN ZXRyaWNzPiBlbXB0eTsKKyAgICBpZiAoIXRpbWluZykgeworICAgICAgICBlbXB0eS5lbXBsYWNl KCk7CisgICAgICAgIHRpbWluZyA9ICZlbXB0eS52YWx1ZSgpOworICAgIH0KKyAgICBhdXRvIHJl c291cmNlVGltaW5nID0gUmVzb3VyY2VUaW1pbmc6OmZyb21TeW5jaHJvbm91c0xvYWQocmVxdWVz dFVSTCwgbV9vcHRpb25zLmluaXRpYXRvciwgbG9hZFRpbWluZywgKnRpbWluZywgcmVzcG9uc2Us IHNlY3VyaXR5T3JpZ2luKCkpOworICAgIGlmIChvcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dCA9 PSBJbml0aWF0b3JDb250ZXh0OjpXb3JrZXIpCisgICAgICAgIGZpbmlzaGVkVGltaW5nRm9yV29y a2VyTG9hZChyZXNvdXJjZVRpbWluZyk7CisgICAgZWxzZSB7CisgICAgICAgIGlmIChhdXRvKiB3 aW5kb3cgPSBkb2N1bWVudCgpLmRvbVdpbmRvdygpKQorICAgICAgICAgICAgd2luZG93LT5wZXJm b3JtYW5jZSgpLmFkZFJlc291cmNlVGltaW5nKFdURk1vdmUocmVzb3VyY2VUaW1pbmcpKTsKICAg ICB9CiAKICAgICBkaWRGaW5pc2hMb2FkaW5nKGlkZW50aWZpZXIpOwpJbmRleDogU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcAkocmV2 aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5m b3JtYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw2IEBAIGJvb2wgUmVzb3Vy Y2VUaW1pbmdJbmZvcm1hdGlvbjo6c2hvdWxkQWQKIAogdm9pZCBSZXNvdXJjZVRpbWluZ0luZm9y bWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZyhDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UsIERvY3Vt ZW50JiBkb2N1bWVudCwgUmVzb3VyY2VUaW1pbmcmJiByZXNvdXJjZVRpbWluZykKIHsKLSAgICBB U1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRp bWluZ0VuYWJsZWQoKSk7CiAgICAgaWYgKCFSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzaG91 bGRBZGRSZXNvdXJjZVRpbWluZyhyZXNvdXJjZSkpCiAgICAgICAgIHJldHVybjsKIApAQCAtODks NyArODgsNiBAQCB2b2lkIFJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291CiAKIHZv aWQgUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbjo6c3RvcmVSZXNvdXJjZVRpbWluZ0luaXRpYXRv ckluZm9ybWF0aW9uKGNvbnN0IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiYg cmVzb3VyY2UsIGNvbnN0IEF0b21TdHJpbmcmIGluaXRpYXRvck5hbWUsIEZyYW1lKiBmcmFtZSkK IHsKLSAgICBBU1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5y ZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSk7CiAgICAgQVNTRVJUKHJlc291cmNlLmdldCgpKTsKIAog ICAgIGlmIChyZXNvdXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVz b3VyY2UpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy LmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODY1LDkgKzg2NSw2IEBAIHZvaWQgU3Vi cmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNvdXJjZXMKIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRl cjo6cmVwb3J0UmVzb3VyY2VUaW1pbmcoY29uc3QgTmV0d29ya0xvYWRNZXRyaWNzJiBuZXR3b3Jr TG9hZE1ldHJpY3MpCiB7Ci0gICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRG ZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAg ICBpZiAoIVJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OnNob3VsZEFkZFJlc291cmNlVGltaW5n KCptX3Jlc291cmNlKSkKICAgICAgICAgcmV0dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9u IDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1OCw3ICs5NTgsNyBAQCBSZXNvdXJjZUVycm9y T3I8Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjCiAKICAgICAgICAgICAgIG1lbW9yeUNhY2hlLnJl c291cmNlQWNjZXNzZWQoKnJlc291cmNlKTsKIAotICAgICAgICAgICAgaWYgKFJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkgJiYg ZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2UtPmlzTG9hZGluZygpKSB7CisgICAgICAgICAgICBpZiAo ZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2UtPmlzTG9hZGluZygpKSB7CiAgICAgICAgICAgICAgICAg YXV0byByZXNvdXJjZVRpbWluZyA9IFJlc291cmNlVGltaW5nOjpmcm9tQ2FjaGUodXJsLCByZXF1 ZXN0LmluaXRpYXRvck5hbWUoKSwgbG9hZFRpbWluZywgcmVzb3VyY2UtPnJlc3BvbnNlKCksICpy ZXF1ZXN0Lm9yaWdpbigpKTsKICAgICAgICAgICAgICAgICBpZiAoaW5pdGlhdG9yQ29udGV4dCA9 PSBJbml0aWF0b3JDb250ZXh0OjpXb3JrZXIpIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJU KGlzPENhY2hlZFJhd1Jlc291cmNlPihyZXNvdXJjZS5nZXQoKSkpOwpAQCAtMTA0Miw4ICsxMDQy LDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhYwogICAgIG1lbW9y eUNhY2hlLnJlbW92ZShyZXNvdXJjZSk7CiAgICAgbWVtb3J5Q2FjaGUuYWRkKCpuZXdSZXNvdXJj ZSk7CiAKLSAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5y ZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSkKLSAgICAgICAgbV9yZXNvdXJjZVRpbWluZ0luZm8uc3Rv cmVSZXNvdXJjZVRpbWluZ0luaXRpYXRvckluZm9ybWF0aW9uKG5ld1Jlc291cmNlLCBuZXdSZXNv dXJjZS0+aW5pdGlhdG9yTmFtZSgpLCBmcmFtZSgpKTsKKyAgICBtX3Jlc291cmNlVGltaW5nSW5m by5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24obmV3UmVzb3VyY2UsIG5l d1Jlc291cmNlLT5pbml0aWF0b3JOYW1lKCksIGZyYW1lKCkpOwogCiAgICAgcmV0dXJuIG5ld1Jl c291cmNlOwogfQpAQCAtMTA2MSw4ICsxMDYwLDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2Fj aGVkUmVzb3VyY2U+IENhYwogICAgIGlmIChyZXNvdXJjZS0+YWxsb3dzQ2FjaGluZygpKQogICAg ICAgICBtZW1vcnlDYWNoZS5hZGQoKnJlc291cmNlKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAg ICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5m b3JtYXRpb24ocmVzb3VyY2UsIHJlc291cmNlLT5pbml0aWF0b3JOYW1lKCksIGZyYW1lKCkpOwor ICAgIG1fcmVzb3VyY2VUaW1pbmdJbmZvLnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZv cm1hdGlvbihyZXNvdXJjZSwgcmVzb3VyY2UtPmluaXRpYXRvck5hbWUoKSwgZnJhbWUoKSk7CiAK ICAgICByZXR1cm4gcmVzb3VyY2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZv cm1hbmNlLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNl LmlkbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5j ZS5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTM3LDI4ICszNywzMSBAQCB0eXBlZGVmIGRvdWJsZSBE T01IaWdoUmVzVGltZVN0YW1wOwogICAgIEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogICAgIEdl bmVyYXRlSXNSZWFjaGFibGU9SW1wbFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsCiBdIGludGVyZmFj ZSBQZXJmb3JtYW5jZSA6IEV2ZW50VGFyZ2V0IHsKLQogICAgIERPTUhpZ2hSZXNUaW1lU3RhbXAg bm93KCk7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCAndGltZU9yaWdpbicuCisgICAgLy8gcmVh ZG9ubHkgYXR0cmlidXRlIERPTUhpZ2hSZXNUaW1lU3RhbXAgdGltZU9yaWdpbjsKKyAgICAvLyBG SVhNRTogSW1wbGVtZW50ICd0b0pTT04nLgorICAgIC8vIFtEZWZhdWx0XSBvYmplY3QgdG9KU09O KCk7CiAKICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vbmF2aWdhdGlvbi10aW1pbmcvCiAg ICAgcmVhZG9ubHkgYXR0cmlidXRlIFBlcmZvcm1hbmNlTmF2aWdhdGlvbiBuYXZpZ2F0aW9uOwog ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBQZXJmb3JtYW5jZVRpbWluZyB0aW1pbmc7CiAKICAgICAv LyBodHRwczovL3czYy5naXRodWIuaW8vcGVyZm9ybWFuY2UtdGltZWxpbmUvCi0gICAgW0VuYWJs ZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VUaW1lbGluZV0gUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0 RW50cmllcygpOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmVdIFBl cmZvcm1hbmNlRW50cnlMaXN0IGdldEVudHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5VHlwZSk7 Ci0gICAgW0VuYWJsZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VUaW1lbGluZV0gUGVyZm9ybWFuY2VF bnRyeUxpc3QgZ2V0RW50cmllc0J5TmFtZShET01TdHJpbmcgbmFtZSwgb3B0aW9uYWwgRE9NU3Ry aW5nIGVudHJ5VHlwZSk7CisgICAgUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllcygpOwor ICAgIFBlcmZvcm1hbmNlRW50cnlMaXN0IGdldEVudHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5 VHlwZSk7CisgICAgUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllc0J5TmFtZShET01TdHJp bmcgbmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIGVudHJ5VHlwZSk7CiAKICAgICAvLyBodHRwczov L3czYy5naXRodWIuaW8vcmVzb3VyY2UtdGltaW5nLwotICAgIFtFbmFibGVkQXRSdW50aW1lPVJl c291cmNlVGltaW5nXSB1bmRlZmluZWQgY2xlYXJSZXNvdXJjZVRpbWluZ3MoKTsKLSAgICBbRW5h YmxlZEF0UnVudGltZT1SZXNvdXJjZVRpbWluZ10gdW5kZWZpbmVkIHNldFJlc291cmNlVGltaW5n QnVmZmVyU2l6ZSh1bnNpZ25lZCBsb25nIG1heFNpemUpOwotICAgIFtFbmFibGVkQXRSdW50aW1l PVJlc291cmNlVGltaW5nXSBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdi dWZmZXJmdWxsOworICAgIHVuZGVmaW5lZCBjbGVhclJlc291cmNlVGltaW5ncygpOworICAgIHVu ZGVmaW5lZCBzZXRSZXNvdXJjZVRpbWluZ0J1ZmZlclNpemUodW5zaWduZWQgbG9uZyBtYXhTaXpl KTsKKyAgICBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdidWZmZXJmdWxs OwogCiAgICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3VzZXItdGltaW5nLwotICAgIFtFbmFi bGVkQXRSdW50aW1lPVVzZXJUaW1pbmcsIE1heVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWFy ayhET01TdHJpbmcgbWFya05hbWUpOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVVzZXJUaW1pbmdd IHVuZGVmaW5lZCBjbGVhck1hcmtzKG9wdGlvbmFsIERPTVN0cmluZyBtYXJrTmFtZSk7Ci0gICAg W0VuYWJsZWRBdFJ1bnRpbWU9VXNlclRpbWluZywgTWF5VGhyb3dFeGNlcHRpb25dIHVuZGVmaW5l ZCBtZWFzdXJlKERPTVN0cmluZyBtZWFzdXJlTmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIHN0YXJ0 TWFyaywgb3B0aW9uYWwgRE9NU3RyaW5nIGVuZE1hcmspOwotICAgIFtFbmFibGVkQXRSdW50aW1l PVVzZXJUaW1pbmddIHVuZGVmaW5lZCBjbGVhck1lYXN1cmVzKG9wdGlvbmFsIERPTVN0cmluZyBt ZWFzdXJlTmFtZSk7CisgICAgW01heVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWFyayhET01T dHJpbmcgbWFya05hbWUpOworICAgIHVuZGVmaW5lZCBjbGVhck1hcmtzKG9wdGlvbmFsIERPTVN0 cmluZyBtYXJrTmFtZSk7CisgICAgW01heVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWVhc3Vy ZShET01TdHJpbmcgbWVhc3VyZU5hbWUsIG9wdGlvbmFsIERPTVN0cmluZyBzdGFydE1hcmssIG9w dGlvbmFsIERPTVN0cmluZyBlbmRNYXJrKTsKKyAgICB1bmRlZmluZWQgY2xlYXJNZWFzdXJlcyhv cHRpb25hbCBET01TdHJpbmcgbWVhc3VyZU5hbWUpOwogfTsKIAogdHlwZWRlZiBzZXF1ZW5jZTxQ ZXJmb3JtYW5jZUVudHJ5PiBQZXJmb3JtYW5jZUVudHJ5TGlzdDsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5LmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIs MTcgKzUyLDEzIEBAIE9wdGlvbmFsPFBlcmZvcm1hbmNlRW50cnk6OlR5cGU+IFBlcmZvcm0KICAg ICBpZiAoZW50cnlUeXBlID09ICJuYXZpZ2F0aW9uIikKICAgICAgICAgcmV0dXJuIE9wdGlvbmFs PFR5cGU+KFR5cGU6Ok5hdmlnYXRpb24pOwogCi0gICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVy ZXM6OnNoYXJlZEZlYXR1cmVzKCkudXNlclRpbWluZ0VuYWJsZWQoKSkgewotICAgICAgICBpZiAo ZW50cnlUeXBlID09ICJtYXJrIikKLSAgICAgICAgICAgIHJldHVybiBPcHRpb25hbDxUeXBlPihU eXBlOjpNYXJrKTsKLSAgICAgICAgaWYgKGVudHJ5VHlwZSA9PSAibWVhc3VyZSIpCi0gICAgICAg ICAgICByZXR1cm4gT3B0aW9uYWw8VHlwZT4oVHlwZTo6TWVhc3VyZSk7Ci0gICAgfQorICAgIGlm IChlbnRyeVR5cGUgPT0gIm1hcmsiKQorICAgICAgICByZXR1cm4gT3B0aW9uYWw8VHlwZT4oVHlw ZTo6TWFyayk7CisgICAgaWYgKGVudHJ5VHlwZSA9PSAibWVhc3VyZSIpCisgICAgICAgIHJldHVy biBPcHRpb25hbDxUeXBlPihUeXBlOjpNZWFzdXJlKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKSB7Ci0g ICAgICAgIGlmIChlbnRyeVR5cGUgPT0gInJlc291cmNlIikKLSAgICAgICAgICAgIHJldHVybiBP cHRpb25hbDxUeXBlPihUeXBlOjpSZXNvdXJjZSk7Ci0gICAgfQorICAgIGlmIChlbnRyeVR5cGUg PT0gInJlc291cmNlIikKKyAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFR5cGU+KFR5cGU6OlJlc291 cmNlKTsKIAogICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygp LnBhaW50VGltaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgIGlmIChlbnRyeVR5cGUgPT0gInBhaW50 IikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5pZGwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5LmlkbAkocmV2aXNp b24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5LmlkbAko d29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNiBAQCB0eXBlZGVmIGRvdWJsZSBET01IaWdoUmVz VGltZVN0YW1wOwogCiBbCiAgICAgQ3VzdG9tVG9KU09iamVjdCwKLSAgICBFbmFibGVkQXRSdW50 aW1lPVBlcmZvcm1hbmNlVGltZWxpbmUsCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtlciksCiBd IGludGVyZmFjZSBQZXJmb3JtYW5jZUVudHJ5IHsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9N U3RyaW5nIG5hbWU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2 ZXIuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VPYnNl cnZlci5pZGwJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9y bWFuY2VPYnNlcnZlci5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAogWwog ICAgIEN1c3RvbUlzUmVhY2hhYmxlLAotICAgIEVuYWJsZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VU aW1lbGluZSwKICAgICBFeHBvc2VkPShXaW5kb3csV29ya2VyKSwKICAgICBJbXBsZW1lbnRhdGlv bkxhY2tzVlRhYmxlLAogICAgIEpTQ3VzdG9tTWFya0Z1bmN0aW9uLApJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9QZXJmb3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2ZXJFbnRyeUxpc3QuaWRsCShy ZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2 ZXJFbnRyeUxpc3QuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBACiAvLyBodHRw czovL3czYy5naXRodWIuaW8vcGVyZm9ybWFuY2UtdGltZWxpbmUvCiAKIFsKLSAgICBFbmFibGVk QXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmUsCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtl ciksCiAgICAgSW1wbGVtZW50YXRpb25MYWNrc1ZUYWJsZSwKIF0gaW50ZXJmYWNlIFBlcmZvcm1h bmNlT2JzZXJ2ZXJFbnRyeUxpc3QgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3Jt YW5jZVJlc291cmNlVGltaW5nLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L1BlcmZvcm1hbmNlUmVzb3VyY2VUaW1pbmcuaWRsCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlUmVzb3VyY2VUaW1pbmcuaWRsCSh3b3JraW5nIGNv cHkpCkBAIC0zMyw3ICszMyw2IEBACiB0eXBlZGVmIGRvdWJsZSBET01IaWdoUmVzVGltZVN0YW1w OwogCiBbCi0gICAgRW5hYmxlZEF0UnVudGltZT1SZXNvdXJjZVRpbWluZywKICAgICBFeHBvc2Vk PShXaW5kb3csV29ya2VyKSwKIF0gaW50ZXJmYWNlIFBlcmZvcm1hbmNlUmVzb3VyY2VUaW1pbmcg OiBQZXJmb3JtYW5jZUVudHJ5IHsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGlu aXRpYXRvclR5cGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVkRmVh dHVyZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVk RmVhdHVyZXMuaAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9SdW50 aW1lRW5hYmxlZEZlYXR1cmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDE3ICs0NCw5IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMgewogICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMpOwogcHVibGljOgotICAg IHZvaWQgc2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKGJvb2wgaXNFbmFibGVkKSB7IG1faXNSZXNv dXJjZVRpbWluZ0VuYWJsZWQgPSBpc0VuYWJsZWQ7IH0KLSAgICBib29sIHJlc291cmNlVGltaW5n RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNSZXNvdXJjZVRpbWluZ0VuYWJsZWQ7IH0KLQot ICAgIHZvaWQgc2V0VXNlclRpbWluZ0VuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9pc1VzZXJU aW1pbmdFbmFibGVkID0gaXNFbmFibGVkOyB9Ci0gICAgYm9vbCB1c2VyVGltaW5nRW5hYmxlZCgp IGNvbnN0IHsgcmV0dXJuIG1faXNVc2VyVGltaW5nRW5hYmxlZDsgfQotCiAgICAgdm9pZCBzZXRQ YWludFRpbWluZ0VuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9pc1BhaW50VGltaW5nRW5hYmxl ZCA9IGlzRW5hYmxlZDsgfQogICAgIGJvb2wgcGFpbnRUaW1pbmdFbmFibGVkKCkgY29uc3QgeyBy ZXR1cm4gbV9pc1BhaW50VGltaW5nRW5hYmxlZDsgfQogCi0gICAgYm9vbCBwZXJmb3JtYW5jZVRp bWVsaW5lRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIHJlc291cmNlVGltaW5nRW5hYmxlZCgpIHx8 IHVzZXJUaW1pbmdFbmFibGVkKCk7IH0KLQogICAgIHZvaWQgc2V0TWVudUl0ZW1FbGVtZW50RW5h YmxlZChib29sIGlzRW5hYmxlZCkgeyBtX2lzTWVudUl0ZW1FbGVtZW50RW5hYmxlZCA9IGlzRW5h YmxlZDsgfQogICAgIGJvb2wgbWVudUl0ZW1FbGVtZW50RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJu IG1faXNNZW51SXRlbUVsZW1lbnRFbmFibGVkOyB9CiAKQEAgLTI4Miw4ICsyNzQsNiBAQCBwcml2 YXRlOgogCiAgICAgYm9vbCBtX2FyZU1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkIHsgZmFsc2Ug fTsKICAgICBib29sIG1faXNQYWludFRpbWluZ0VuYWJsZWQgeyBmYWxzZSB9OwotICAgIGJvb2wg bV9pc1Jlc291cmNlVGltaW5nRW5hYmxlZCB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzVXNlclRp bWluZ0VuYWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc01lbnVJdGVtRWxlbWVudEVuYWJs ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc0RpcmVjdG9yeVVwbG9hZEVuYWJsZWQgeyBmYWxz ZSB9OwogICAgIGJvb2wgbV9pc0N1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCB7IGZhbHNlIH07 CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAyMC0wOS0xNyAgU2FtIFdlaW5p ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBm b3IgZW5hYmxpbmcvZGlzYWJsaW5nIHRoZSBVc2VyVGltaW5nIGFuZCBSZXNvdXJjZVRpbWluZyBB UElzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY1 NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1v dmUgcnVudGltZSBzZXR0aW5nIGZvciBlbmFibGluZy9kaXNhYmxpbmcgVXNlclRpbWluZyBhbmQg UmVzb3VyY2VUaW1pbmcgCisgICAgICAgIEFQSXMuIFRoZXkgaGF2ZSBib3RoIGJlZW4gb24gZm9y IGEgd2hpbGUgaW4gV2ViS2l0MiBhbmQgdGhlcmUgYXJlbid0IGFueQorICAgICAgICBrbm93biB1 c2VzIGNhc2VzIGZvciBkaXNhYmxpbmcgdGhlbS4gSW4gYWRkaXRpb24gdG8gcmVtb3ZpbmcgdGhl IHNldHRpbmcsIAorICAgICAgICB0aGV5IGFyZSBub3cgZW5hYmxlZCBpbiBMZWdhY3lXZWJLaXQg YXMgd2VsbC4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVy ZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0VXNl clRpbWluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5n RW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFibGVk KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaDoK KwogMjAyMC0wOS0xNyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAg V2Ugc2hvdWxkbid0IG5lZWQgdG8gc3BlY2lmeSBhIGNhdGVnb3J5IGZvciBwcmVmZXJlbmNlcyBu b3cgdGhhdCB0aGV5IGFyZSBzcGxpdCBpbnRvIHNlcGFyYXRlIGZpbGVzCkluZGV4OiBTb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWwJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWwJKHdvcmtpbmcgY29weSkKQEAg LTY3NywyMCArNjc3LDYgQEAgTW9kZXJuTWVkaWFDb250cm9sc0VuYWJsZWQ6CiAgIGh1bWFuUmVh ZGFibGVEZXNjcmlwdGlvbjogIlVzZSBtb2Rlcm4gbWVkaWEgY29udHJvbHMgbG9vayIKICAgd2Vi Y29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKIAotUmVzb3VyY2VUaW1pbmdFbmFi bGVkOgotICB0eXBlOiBib29sCi0gIGRlZmF1bHRWYWx1ZTogdHJ1ZQotICBodW1hblJlYWRhYmxl TmFtZTogIlJlc291cmNlIFRpbWluZyIKLSAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5h YmxlIFJlc291cmNlVGltaW5nIEFQSSIKLSAgd2ViY29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVk RmVhdHVyZXMKLQotVXNlclRpbWluZ0VuYWJsZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgZGVmYXVsdFZh bHVlOiB0cnVlCi0gIGh1bWFuUmVhZGFibGVOYW1lOiAiVXNlciBUaW1pbmciCi0gIGh1bWFuUmVh ZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBVc2VyVGltaW5nIEFQSSIKLSAgd2ViY29yZUJpbmRp bmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKLQogQmVhY29uQVBJRW5hYmxlZDoKICAgdHlwZTog Ym9vbAogICBkZWZhdWx0VmFsdWU6IHRydWUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTY4OSwxNiArMTY4OSw2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldE1lbnVJdGVtRWxl bWVudEVuYWIKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+bWVudUl0ZW1FbGVt ZW50RW5hYmxlZCgpOwogfQogCi12b2lkIFdLUHJlZmVyZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpCi17Ci0gICAgdG9J bXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0VXNlclRpbWluZ0VuYWJsZWQoZmxhZyk7Ci19Ci0KLWJv b2wgV0tQcmVmZXJlbmNlc0dldFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYpCi17Ci0gICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnVzZXJU aW1pbmdFbmFibGVkKCk7Ci19Ci0KIHZvaWQgV0tQcmVmZXJlbmNlc1NldFBhaW50VGltaW5nRW5h YmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpCiB7CiAgICAg dG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0UGFpbnRUaW1pbmdFbmFibGVkKGZsYWcpOwpAQCAt MTcwOSwxNSArMTY5OSw2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldFBhaW50VGltaW5nRW5hYmxl ZCgKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+cGFpbnRUaW1pbmdFbmFibGVk KCk7CiB9CiAKLXZvaWQgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpCi17Ci0gICAgdG9JbXBsKHBy ZWZlcmVuY2VzUmVmKS0+c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKGZsYWcpOwotfQotCi1ib29s IFdLUHJlZmVyZW5jZXNHZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZikKLXsKLSAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+cmVz b3VyY2VUaW1pbmdFbmFibGVkKCk7Ci19CiAKIHZvaWQgV0tQcmVmZXJlbmNlc1NldElzTlNVUkxT ZXNzaW9uV2ViU29ja2V0RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBi b29sIGZsYWcpCiB7CkBAIC0yMjI0LDMgKzIyMDUsMjEgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0 SXNTZWN1cmVDb250ZXh0QXR0cgogewogICAgIHJldHVybiB0cnVlOwogfQorCit2b2lkIFdLUHJl ZmVyZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKQorewor fQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2Vz UmVmKQoreworICAgIHJldHVybiB0cnVlOworfQorCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRSZXNv dXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCkKK3sKK30KKworYm9vbCBX S1ByZWZlcmVuY2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpCit7 CisgICAgcmV0dXJuIHRydWU7Cit9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgJKHJldmlzaW9uIDI2NzE5 NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2 YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2MSwxOCArNDYxLDEwIEBAIFdLX0VYUE9SVCB2b2lk IFdLUHJlZmVyZW5jZXNTZXRXZWJTaGFyZUUKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXRXZWJTaGFyZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZik7CiAKIC8vIERlZmF1bHRzIHRvIGZh bHNlCi1XS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKLVdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKLQotLy8gRGVmYXVsdHMgdG8g ZmFsc2UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRQYWludFRpbWluZ0VuYWJsZWQo V0tQcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5j ZXNHZXRQYWludFRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZik7CiAKIC8vIERlZmF1bHRz IHRvIGZhbHNlCi1XS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdF bmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7Ci1XS19FWFBPUlQgYm9vbCBXS1By ZWZlcmVuY2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwotCi0v LyBEZWZhdWx0cyB0byBmYWxzZQogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEZldGNo QVBJS2VlcEFsaXZlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwogV0tfRVhQ T1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEZldGNoQVBJS2VlcEFsaXZlRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmKTsKIApAQCAtNTk1LDYgKzU4NywxMCBAQCBXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzU2V0RmV0Y2hBUElFCiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0RmV0Y2hB UElFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CiBXS19FWFBP UlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0SXNTZWN1cmVDb250ZXh0QXR0cmlidXRlRW5hYmxlZChX S1ByZWZlcmVuY2VzUmVmLCBib29sKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogV0tfRVhQT1JUIGJv b2wgV0tQcmVmZXJlbmNlc0dldElzU2VjdXJlQ29udGV4dEF0dHJpYnV0ZUVuYWJsZWQoV0tQcmVm ZXJlbmNlc1JlZikgV0tfQ19BUElfREVQUkVDQVRFRDsKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKSBXS19DX0FQ SV9ERVBSRUNBVEVEOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFVzZXJUaW1pbmdF bmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CitXS19FWFBPUlQg dm9pZCBXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNS ZWYsIGJvb2wpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVu Y2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpIFdLX0NfQVBJX0RF UFJFQ0FURUQ7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpJbmRleDogU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZwkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDktMTcgIFNh bSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBydW50aW1lIHNl dHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyB0aGUgVXNlclRpbWluZyBhbmQgUmVzb3VyY2VU aW1pbmcgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE2NTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5hYmxpbmcvZGlzYWJsaW5nIFVzZXJUaW1p bmcgYW5kIFJlc291cmNlVGltaW5nIAorICAgICAgICBBUElzLiBUaGV5IGhhdmUgYm90aCBiZWVu IG9uIGZvciBhIHdoaWxlIGluIFdlYktpdDIgYW5kIHRoZXJlIGFyZW4ndCBhbnkKKyAgICAgICAg a25vd24gdXNlcyBjYXNlcyBmb3IgZGlzYWJsaW5nIHRoZW0uIEluIGFkZGl0aW9uIHRvIHJlbW92 aW5nIHRoZSBzZXR0aW5nLCAKKyAgICAgICAgdGhleSBhcmUgbm93IGVuYWJsZWQgaW4gTGVnYWN5 V2ViS2l0IGFzIHdlbGwuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tOgor ICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFsaXplXSk6CisgICAgICAgICgtW1dlYlBy ZWZlcmVuY2VzIHNldFVzZXJUaW1pbmdFbmFibGVkOl0pOgorICAgICAgICAoLVtXZWJQcmVmZXJl bmNlcyB1c2VyVGltaW5nRW5hYmxlZF0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBzZXRS ZXNvdXJjZVRpbWluZ0VuYWJsZWQ6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHJlc291 cmNlVGltaW5nRW5hYmxlZF0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2 YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3 IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6CisKIDIwMjAtMDktMTcgIEFudG9pbmUgUXVpbnQgIDxn cmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBsZWdhY3kgYW5pbWF0aW9u IGNvZGUKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQ cmVmZXJlbmNlcy5tbQkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjg0LDggKzY4 NCw2IEBAICsgKHZvaWQpaW5pdGlhbGl6ZQogI2lmIEVOQUJMRShJTlRFUlNFQ1RJT05fT0JTRVJW RVIpCiAgICAgICAgIEBOTywgV2ViS2l0SW50ZXJzZWN0aW9uT2JzZXJ2ZXJFbmFibGVkUHJlZmVy ZW5jZUtleSwKICNlbmRpZgotICAgICAgICBATk8sIFdlYktpdFVzZXJUaW1pbmdFbmFibGVkUHJl ZmVyZW5jZUtleSwKLSAgICAgICAgQE5PLCBXZWJLaXRSZXNvdXJjZVRpbWluZ0VuYWJsZWRQcmVm ZXJlbmNlS2V5LAogICAgICAgICBATk8sIFdlYktpdE1lZGlhVXNlckdlc3R1cmVJbmhlcml0c0Zy b21Eb2N1bWVudCwKICAgICAgICAgQFlFUywgV2ViS2l0TGVnYWN5RW5jcnlwdGVkTWVkaWFBUElF bmFibGVkS2V5LAogICAgICAgICBATk8sIFdlYktpdEVuY3J5cHRlZE1lZGlhQVBJRW5hYmxlZEtl eSwKQEAgLTMyNTIsMjYgKzMyNTAsNiBAQCAtICh2b2lkKXNldE1lbnVJdGVtRWxlbWVudEVuYWJs ZWQ6KEJPT0wpCiAgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRNZW51 SXRlbUVsZW1lbnRFbmFibGVkUHJlZmVyZW5jZUtleV07CiB9CiAKLS0gKEJPT0wpdXNlclRpbWlu Z0VuYWJsZWQKLXsKLSAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRVc2Vy VGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXldOwotfQotCi0tICh2b2lkKXNldFVzZXJUaW1pbmdF bmFibGVkOihCT09MKWZsYWcKLXsKLSAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5 OldlYktpdFVzZXJUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleV07Ci19Ci0KLS0gKEJPT0wpcmVz b3VyY2VUaW1pbmdFbmFibGVkCi17Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6 V2ViS2l0UmVzb3VyY2VUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleV07Ci19Ci0KLS0gKHZvaWQp c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkOihCT09MKWZsYWcKLXsKLSAgICBbc2VsZiBfc2V0Qm9v bFZhbHVlOmZsYWcgZm9yS2V5OldlYktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVuY2VL ZXldOwotfQotCiAtIChCT09MKW1lZGlhVXNlckdlc3R1cmVJbmhlcml0c0Zyb21Eb2N1bWVudAog ewogICAgIHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdE1lZGlhVXNlckdlc3R1 cmVJbmhlcml0c0Zyb21Eb2N1bWVudF07CkBAIC0zNjQ4LDYgKzM2MjYsMjQgQEAgKyAoTlNTdHJp bmcgKilfY29uY2F0ZW5hdGVLZXlXaXRoSUJDcmVhdAogLy8gVGhlIHByZWZlcmVuY2VzIGluIHRo aXMgY2F0ZWdvcnkgYXJlIGRlcHJlY2F0ZWQgYW5kIGhhdmUgbm8gZWZmZWN0LiBUaGV5IHNob3Vs ZAogLy8gYmUgcmVtb3ZlZCB3aGVuIGl0IGlzIGNvbnNpZGVyZWQgc2FmZSB0byBkbyBzby4KIAor LSAodm9pZClzZXRVc2VyVGltaW5nRW5hYmxlZDooQk9PTClmbGFnCit7Cit9CisKKy0gKEJPT0wp dXNlclRpbWluZ0VuYWJsZWQKK3sKKyAgICByZXR1cm4gWUVTOworfQorCistICh2b2lkKXNldFJl c291cmNlVGltaW5nRW5hYmxlZDooQk9PTClmbGFnCit7Cit9CisKKy0gKEJPT0wpcmVzb3VyY2VU aW1pbmdFbmFibGVkCit7CisgICAgcmV0dXJuIFlFUzsKK30KKwogLSAodm9pZClzZXRDU1NTaGFk b3dQYXJ0c0VuYWJsZWQ6KEJPT0wpZmxhZwogewogfQpJbmRleDogU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCShyZXZp c2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VzUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NDAsOCArNjQwLDYgQEAgQGludGVy ZmFjZSBXZWJQcmVmZXJlbmNlcyAoV2ViUHJpdmF0ZSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBC T09MIGludGVyc2VjdGlvbk9ic2VydmVyRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBC T09MIG1lbnVJdGVtRWxlbWVudEVuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBr ZXlnZW5FbGVtZW50RW5hYmxlZDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHVzZXJUaW1p bmdFbmFibGVkOwotQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgcmVzb3VyY2VUaW1pbmdFbmFi bGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgbGlua1ByZWxvYWRFbmFibGVkOwogQHBy b3BlcnR5IChub25hdG9taWMpIEJPT0wgbWVkaWFVc2VyR2VzdHVyZUluaGVyaXRzRnJvbURvY3Vt ZW50OwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgaXNTZWN1cmVDb250ZXh0QXR0cmlidXRl RW5hYmxlZDsKQEAgLTY4Niw2ICs2ODQsOSBAQCBAaW50ZXJmYWNlIFdlYlByZWZlcmVuY2VzIChX ZWJQcml2YXRlRGVwCiAvLyBUaGUgcHJlZmVyZW5jZXMgaW4gdGhpcyBjYXRlZ29yeSBhcmUgZGVw cmVjYXRlZCBhbmQgaGF2ZSBubyBlZmZlY3QuIFRoZXkgc2hvdWxkCiAvLyBiZSByZW1vdmVkIHdo ZW4gaXQgaXMgY29uc2lkZXJlZCBzYWZlIHRvIGRvIHNvLgogCitAcHJvcGVydHkgKG5vbmF0b21p YykgQk9PTCB1c2VyVGltaW5nRW5hYmxlZDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHJl c291cmNlVGltaW5nRW5hYmxlZDsKKwogLSAodm9pZClzZXRDU1NTaGFkb3dQYXJ0c0VuYWJsZWQ6 KEJPT0wpZmxhZzsKIC0gKEJPT0wpY3NzU2hhZG93UGFydHNFbmFibGVkOwogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAyNjcxOTQp CisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcg Y29weSkKQEAgLTMzNjUsOCArMzM2NSw2IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZDoo V2ViUHJlZmVyZW4KICAgICBzZXR0aW5ncy5zZXRJbnRlcnNlY3Rpb25PYnNlcnZlckVuYWJsZWQo cHJlZmVyZW5jZXMuaW50ZXJzZWN0aW9uT2JzZXJ2ZXJFbmFibGVkKTsKICNlbmRpZgogCi0gICAg UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRVc2VyVGltaW5nRW5h YmxlZChwcmVmZXJlbmNlcy51c2VyVGltaW5nRW5hYmxlZCk7Ci0gICAgUnVudGltZUVuYWJsZWRG ZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQocHJlZmVy ZW5jZXMucmVzb3VyY2VUaW1pbmdFbmFibGVkKTsKICAgICBzZXR0aW5ncy5zZXRMaW5rUHJlbG9h ZEVuYWJsZWQocHJlZmVyZW5jZXMubGlua1ByZWxvYWRFbmFibGVkKTsKICAgICBzZXR0aW5ncy5z ZXRNZWRpYVByZWxvYWRpbmdFbmFibGVkKHByZWZlcmVuY2VzLm1lZGlhUHJlbG9hZGluZ0VuYWJs ZWQpOwogICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0RGly ZWN0b3J5VXBsb2FkRW5hYmxlZChbcHJlZmVyZW5jZXMgZGlyZWN0b3J5VXBsb2FkRW5hYmxlZF0p OwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMjY3MTk0KQorKysg U291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjQgQEAKKzIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgorCisg ICAgICAgIFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyB0aGUg VXNlclRpbWluZyBhbmQgUmVzb3VyY2VUaW1pbmcgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5h YmxpbmcvZGlzYWJsaW5nIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIAorICAgICAgICBB UElzLiBUaGV5IGhhdmUgYm90aCBiZWVuIG9uIGZvciBhIHdoaWxlIGluIFdlYktpdDIgYW5kIHRo ZXJlIGFyZW4ndCBhbnkKKyAgICAgICAga25vd24gdXNlcyBjYXNlcyBmb3IgZGlzYWJsaW5nIHRo ZW0uIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRoZSBzZXR0aW5nLCAKKyAgICAgICAgdGhleSBh cmUgbm93IGVuYWJsZWQgaW4gTGVnYWN5V2ViS2l0IGFzIHdlbGwuCisKKyAgICAgICAgKiBXZWJQ cmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1 bHRTZXR0aW5ncyk6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6c2V0VXNlclRpbWluZ0VuYWJs ZWQpOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OnVzZXJUaW1pbmdFbmFibGVkKToKKyAgICAg ICAgKFdlYlByZWZlcmVuY2VzOjpzZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQpOgorICAgICAgICAo V2ViUHJlZmVyZW5jZXM6OnJlc291cmNlVGltaW5nRW5hYmxlZCk6CisgICAgICAgICogV2ViVmll dy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQpOgorCiAy MDIwLTA5LTE3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAg IFJlbW92ZSB0aGUgbGVnYWN5IGFuaW1hdGlvbiBjb2RlCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVn YWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExl Z2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2Uv V2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMx NywxMCArMzE3LDYgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1bHRTZQog CiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RSKFdlYktpdENTU0N1c3Rv bVByb3BlcnRpZXNBbmRWYWx1ZXNFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxz ZSk7CiAKLSAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0VXNl clRpbWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhbkZhbHNlKTsKLQotICAgIENG RGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRSZXNvdXJjZVRpbWluZ0Vu YWJsZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhbkZhbHNlKTsKLQogICAgIENGRGljdGlvbmFy eUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRMaW5rUHJlbG9hZEVuYWJsZWRQcmVmZXJl bmNlS2V5KSwga0NGQm9vbGVhbkZhbHNlKTsKIAogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGRl ZmF1bHRzLCBDRlNUUihXZWJLaXRNZWRpYVByZWxvYWRpbmdFbmFibGVkUHJlZmVyZW5jZUtleSks IGtDRkJvb2xlYW5GYWxzZSk7CkBAIC0yMzYxLDkgKzIzNTcsOCBAQCBIUkVTVUxUIFdlYlByZWZl cmVuY2VzOjpDU1NDdXN0b21Qcm9wZXJ0CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAgICAgCi1IUkVT VUxUIFdlYlByZWZlcmVuY2VzOjpzZXRVc2VyVGltaW5nRW5hYmxlZChCT09MIGVuYWJsZWQpCitI UkVTVUxUIFdlYlByZWZlcmVuY2VzOjpzZXRVc2VyVGltaW5nRW5hYmxlZChCT09MKQogewotICAg IHNldEJvb2xWYWx1ZShXZWJLaXRVc2VyVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXksIGVuYWJs ZWQpOwogICAgIHJldHVybiBTX09LOwogfQogCkBAIC0yMzcxLDEzICsyMzY2LDEyIEBAIEhSRVNV TFQgV2ViUHJlZmVyZW5jZXM6OnVzZXJUaW1pbmdFbmFibGUKIHsKICAgICBpZiAoIWVuYWJsZWQp CiAgICAgICAgIHJldHVybiBFX1BPSU5URVI7Ci0gICAgKmVuYWJsZWQgPSBib29sVmFsdWVGb3JL ZXkoV2ViS2l0VXNlclRpbWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5KTsKKyAgICAqZW5hYmxlZCA9 IHRydWU7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKLUhSRVNVTFQgV2ViUHJlZmVyZW5jZXM6OnNl dFJlc291cmNlVGltaW5nRW5hYmxlZChCT09MIGVuYWJsZWQpCitIUkVTVUxUIFdlYlByZWZlcmVu Y2VzOjpzZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoQk9PTCkKIHsKLSAgICBzZXRCb29sVmFsdWUo V2ViS2l0UmVzb3VyY2VUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSwgZW5hYmxlZCk7CiAgICAg cmV0dXJuIFNfT0s7CiB9CiAKQEAgLTIzODUsNyArMjM3OSw3IEBAIEhSRVNVTFQgV2ViUHJlZmVy ZW5jZXM6OnJlc291cmNlVGltaW5nRW4KIHsKICAgICBpZiAoIWVuYWJsZWQpCiAgICAgICAgIHJl dHVybiBFX1BPSU5URVI7Ci0gICAgKmVuYWJsZWQgPSBib29sVmFsdWVGb3JLZXkoV2ViS2l0UmVz b3VyY2VUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSk7CisgICAgKmVuYWJsZWQgPSB0cnVlOwog ICAgIHJldHVybiBTX09LOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNw cAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUyNTksMTYgKzUyNTksNiBAQCBIUkVTVUxUIFdlYlZpZXc6 Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlCiAgICAgICAgIHJldHVybiBocjsKICAgICBzZXR0aW5n cy5zZXRDU1NDdXN0b21Qcm9wZXJ0aWVzQW5kVmFsdWVzRW5hYmxlZCghIWVuYWJsZWQpOwogCi0g ICAgaHIgPSBwcmVmc1ByaXZhdGUtPnVzZXJUaW1pbmdFbmFibGVkKCZlbmFibGVkKTsKLSAgICBp ZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgcmV0dXJuIGhyOwotICAgIFJ1bnRpbWVFbmFibGVkRmVh dHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0VXNlclRpbWluZ0VuYWJsZWQoISFlbmFibGVkKTsK LQotICAgIGhyID0gcHJlZnNQcml2YXRlLT5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoJmVuYWJsZWQp OwotICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAgICByZXR1cm4gaHI7Ci0gICAgUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQo ISFlbmFibGVkKTsKLQogICAgIGhyID0gcHJlZnNQcml2YXRlLT5saW5rUHJlbG9hZEVuYWJsZWQo JmVuYWJsZWQpOwogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAgICByZXR1cm4gaHI7CkluZGV4 OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lv biAyNjcyMTMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwy MiBAQAorMjAyMC0wOS0xNyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CisKKyAgICAg ICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5hYmxpbmcvZGlzYWJsaW5nIHRoZSBVc2Vy VGltaW5nIGFuZCBSZXNvdXJjZVRpbWluZyBBUElzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY1NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5nIGZvciBlbmFibGlu Zy9kaXNhYmxpbmcgVXNlclRpbWluZyBhbmQgUmVzb3VyY2VUaW1pbmcgCisgICAgICAgIEFQSXMu IFRoZXkgaGF2ZSBib3RoIGJlZW4gb24gZm9yIGEgd2hpbGUgaW4gV2ViS2l0MiBhbmQgdGhlcmUg YXJlbid0IGFueQorICAgICAgICBrbm93biB1c2VzIGNhc2VzIGZvciBkaXNhYmxpbmcgdGhlbS4g SW4gYWRkaXRpb24gdG8gcmVtb3ZpbmcgdGhlIHNldHRpbmcsIAorICAgICAgICB0aGV5IGFyZSBu b3cgZW5hYmxlZCBpbiBMZWdhY3lXZWJLaXQgYXMgd2VsbC4KKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKHJlc2V0V2ViUHJlZmVyZW5j ZXNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EdW1w UmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChyZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50 VmFsdWVzKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoK KyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3Rl bnRWYWx1ZXMpOgorCiAyMDIwLTA5LTE3ICBWw61jdG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2 amFxdWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZsYXRwYWsgU0RLXSBid3JhcDogYWRkIHBp cGV3aXJlIHNvY2tldCBhcyBiaW5kIG1vdW50CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9t YWMvRHVtcFJlbmRlclRyZWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0R1bXBSZW5kZXJUcmVlLm1tCShyZXZpc2lvbiAyNjcxOTQpCisrKyBUb29scy9EdW1wUmVu ZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTk1MSw4ICs5 NTEsNiBAQCBzdGF0aWMgdm9pZCByZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0CiAgICAgW3By ZWZlcmVuY2VzIHNldExhcmdlSW1hZ2VBc3luY0RlY29kaW5nRW5hYmxlZDpOT107CiAKICAgICBb cHJlZmVyZW5jZXMgc2V0TW9kZXJuTWVkaWFDb250cm9sc0VuYWJsZWQ6WUVTXTsKLSAgICBbcHJl ZmVyZW5jZXMgc2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2Vz IHNldFVzZXJUaW1pbmdFbmFibGVkOllFU107CiAKICAgICBbcHJlZmVyZW5jZXMgc2V0Q2FjaGVB UElFbmFibGVkOk5PXTsKICAgICBwcmVmZXJlbmNlcy5tZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQg PSBZRVM7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5j cHAJKHJldmlzaW9uIDI2NzE5NCkKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVu ZGVyVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5Niw4ICs4OTYsNiBAQCBzdGF0aWMgdm9p ZCByZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0CiAKICAgICBwcmVmZXJlbmNlcy0+c2V0Rm9u dFNtb290aGluZyhGb250U21vb3RoaW5nVHlwZVN0YW5kYXJkKTsKIAotICAgIHByZWZzUHJpdmF0 ZS0+c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFRSVUUpOwotICAgIHByZWZzUHJpdmF0ZS0+c2V0 VXNlclRpbWluZ0VuYWJsZWQoVFJVRSk7CiAgICAgcHJlZnNQcml2YXRlLT5zZXREYXRhVHJhbnNm ZXJJdGVtc0VuYWJsZWQoVFJVRSk7CiAgICAgcHJlZnNQcml2YXRlLT5jbGVhck5ldHdvcmtMb2Fk ZXJTZXNzaW9uKCk7CiAKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xs ZXIuY3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTU2LDggKzk1Niw2IEBAIHZvaWQgVGVz dENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0MKICAgICBXS1ByZWZlcmVuY2VzU2V0SXNO U1VSTFNlc3Npb25XZWJTb2NrZXRFbmFibGVkKHByZWZlcmVuY2VzLCBmYWxzZSk7CiAKICAgICBX S1ByZWZlcmVuY2VzU2V0RmV0Y2hBUElLZWVwQWxpdmVFbmFibGVkKHByZWZlcmVuY2VzLCB0cnVl KTsKLSAgICBXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKHByZWZlcmVuY2Vz LCB0cnVlKTsKLSAgICBXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQocHJlZmVyZW5j ZXMsIHRydWUpOwogICAgIFdLUHJlZmVyZW5jZXNTZXRNZWRpYVByZWxvYWRpbmdFbmFibGVkKHBy ZWZlcmVuY2VzLCB0cnVlKTsKICAgICBXS1ByZWZlcmVuY2VzU2V0RXhwb3NlU3BlYWtlcnNFbmFi bGVkKHByZWZlcmVuY2VzLCB0cnVlKTsKICAgICBXS1ByZWZlcmVuY2VzU2V0TWVkaWFQbGF5YmFj a0FsbG93c0lubGluZShwcmVmZXJlbmNlcywgdHJ1ZSk7Cg== 409084 2020-09-17 16:35:27 -0700 2020-09-17 19:08:25 -0700 Patch bug-216556-20200917163526.patch text/plain 37505 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDIwLTA5LTE3ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5n IGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5n IEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFu ZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBm b3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3du IHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0 aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktp dCBhcyB3ZWxsLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIFVzZXJUaW1pbmcg YW5kIFJlc291cmNlVGltaW5nLCB3ZSBjYW4gYWxzbyByZW1vdmUgdGhlCisgICAgICAgIGNoZWNr cyBmb3IgUGVyZm9ybWFuY2VUaW1lbGluZUVuYWJsZWQsIGFzIHRoYXQgd2FzIGRlZmluZWQgZW50 aXJlbHkgaW4gdGVybXMKKyAgICAgICAgb2YgdGhlIGZvcm1lci4KKworICAgICAgICAqIGxvYWRl ci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3Jv c3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyOjpzdGFydFByZWZsaWdodCk6CisgICAgICAgICogbG9h ZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvUmVz b3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVRp bWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZyk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5m b3JtYXRpb24pOgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6cmVwb3J0UmVzb3VyY2VUaW1pbmcpOgor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNvdXJjZSk6Cisg ICAgICAgICogcGFnZS9QZXJmb3JtYW5jZS5pZGw6CisgICAgICAgICogcGFnZS9QZXJmb3JtYW5j ZUVudHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlRW50cnk6OnBhcnNlRW50 cnlUeXBlU3RyaW5nKToKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlRW50cnkuaWRsOgorICAg ICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VPYnNlcnZlci5pZGw6CisgICAgICAgICogcGFnZS9QZXJm b3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbDoKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNl UmVzb3VyY2VUaW1pbmcuaWRsOgorICAgICAgICAqIHBhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJl cy5oOgorICAgICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2V0UmVzb3Vy Y2VUaW1pbmdFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnJlc291cmNlVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzZXRVc2VyVGltaW5nRW5hYmxl ZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjp1 c2VyVGltaW5nRW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpwZXJmb3JtYW5jZVRpbWVsaW5lRW5hYmxlZCBjb25zdCk6IERl bGV0ZWQuCisKIDIwMjAtMDktMTcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFN0eWxlOjpDaGFuZ2Ugc2hvdWxkIGJlIGVudW0gY2xhc3MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlz aW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTA0MDIsNiArMTA0MDIsOCBAQAogCQk3Q0UxOTE2 RTFGMkFCNzBEMDAyNzJGN0EgLyogSlNET01DYWNoZVN0b3JhZ2UuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gSlNET01DYWNoZVN0b3JhZ2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk3Q0UxOTE2RTFGMkFCNzBEMDAyNzJGN0IgLyogSlNDYWNoZVF1ZXJ5T3B0aW9ucy5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKU0NhY2hlUXVlcnlPcHRpb25zLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJN0NFMTkxNkYxRjJBQjcwRjAwMjcyRjc4IC8qIEpTRmV0Y2hSZXF1ZXN0 UmVkaXJlY3QuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNGZXRjaFJlcXVlc3RSZWRpcmVjdC5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTdDRTIyMUVFMjUxNDI5RjQwMDA2ODg2 QiAvKiBQZXJmb3JtYW5jZU1hcmsuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFBlcmZvcm1hbmNlTWFyay5pZGw7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTdDRTIyMUYwMjUxNDI5RjUwMDA2ODg2QiAvKiBQZXJm b3JtYW5jZU1lYXN1cmUuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFBlcmZvcm1hbmNlTWVhc3VyZS5pZGw7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDRTU4RDQ5MURENjRBNUIwMDEyODU1MiAvKiBTVkdQb2lu dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTVkdQb2ludC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0U1OEQ0RjFERDY5QTFFMDAxMjg1NTIgLyogU1ZHTnVt YmVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNWR051bWJlci5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0U1OEQ1MTFERDdCMDkzMDAxMjg1NTIgLyogU1ZH TGVuZ3RoLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNWR0xlbmd0aC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMjE1NjUsNyArMjE1NjcsOSBAQAogCQkJCTBG RjJFODBDMUVFMEQ0MzAwMDlFQUJENCAvKiBQZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQuY3BwICov LAogCQkJCTBGODUwRkUyMUVEN0MxODMwMEZCNzdBNyAvKiBQZXJmb3JtYW5jZUxvZ2dpbmdDbGll bnQuaCAqLywKIAkJCQkzN0M3MzhFODFFREJEMkVEMDAzRjJCMEIgLyogUGVyZm9ybWFuY2VNYXJr LmggKi8sCisJCQkJN0NFMjIxRUUyNTE0MjlGNDAwMDY4ODZCIC8qIFBlcmZvcm1hbmNlTWFyay5p ZGwgKi8sCiAJCQkJMzdDNzM4RUExRURCRDM4MTAwM0YyQjBCIC8qIFBlcmZvcm1hbmNlTWVhc3Vy ZS5oICovLAorCQkJCTdDRTIyMUYwMjUxNDI5RjUwMDA2ODg2QiAvKiBQZXJmb3JtYW5jZU1lYXN1 cmUuaWRsICovLAogCQkJCTgzRkU5MDI1MUUzMDdDMUMwMDNFOTE5OSAvKiBQZXJmb3JtYW5jZU1v bml0b3IuY3BwICovLAogCQkJCTgzRkU5MDI2MUUzMDdDMUMwMDNFOTE5OSAvKiBQZXJmb3JtYW5j ZU1vbml0b3IuaCAqLywKIAkJCQk4QUY0RTU1MjExREM1QTM2MDAwRUQzREUgLyogUGVyZm9ybWFu Y2VOYXZpZ2F0aW9uLmNwcCAqLywKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09y aWdpblByZWZsaWdodENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9Dcm9zc09yaWdpblByZWZsaWdodENoZWNrZXIuY3BwCShyZXZpc2lvbiAyNjcxOTQpCisr KyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5QcmVmbGlnaHRDaGVja2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzExNiw3IEBAIHZvaWQgQ3Jvc3NPcmlnaW5QcmVmbGln aHRDaGVja2VyOjpzdGFydFAKICAgICBvcHRpb25zLmluaXRpYXRvckNvbnRleHQgPSBtX2xvYWRl ci5vcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dDsKIAogICAgIENhY2hlZFJlc291cmNlUmVxdWVz dCBwcmVmbGlnaHRSZXF1ZXN0KGNyZWF0ZUFjY2Vzc0NvbnRyb2xQcmVmbGlnaHRSZXF1ZXN0KG1f cmVxdWVzdCwgbV9sb2FkZXIuc2VjdXJpdHlPcmlnaW4oKSwgbV9sb2FkZXIucmVmZXJyZXIoKSks IG9wdGlvbnMpOwotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJl cygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAgICAgICBwcmVmbGlnaHRSZXF1ZXN0LnNl dEluaXRpYXRvcihtX2xvYWRlci5vcHRpb25zKCkuaW5pdGlhdG9yKTsKKyAgICBwcmVmbGlnaHRS ZXF1ZXN0LnNldEluaXRpYXRvcihtX2xvYWRlci5vcHRpb25zKCkuaW5pdGlhdG9yKTsKIAogICAg IEFTU0VSVCghbV9yZXNvdXJjZSk7CiAgICAgbV9yZXNvdXJjZSA9IG1fbG9hZGVyLmRvY3VtZW50 KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0UmF3UmVzb3VyY2UoV1RGTW92ZShwcmVm bGlnaHRSZXF1ZXN0KSkudmFsdWVfb3IobnVsbHB0cik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcAkocmV2aXNpb24gMjY3 MTk0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU0OCw4ICs1NDgsNyBAQCB2b2lkIERvY3VtZW50VGhyZWFk YWJsZUxvYWRlcjo6bG9hZFJlcXVlCiAKICAgICAgICAgcmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXMo bV9vcHRpb25zLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5ID09IFN0b3JlZENyZWRlbnRpYWxzUG9s aWN5OjpVc2UpOwogICAgICAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdChXVEZN b3ZlKHJlcXVlc3QpLCBvcHRpb25zKTsKLSAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVy ZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkpCi0gICAgICAgICAg ICBuZXdSZXF1ZXN0LnNldEluaXRpYXRvcihtX29wdGlvbnMuaW5pdGlhdG9yKTsKKyAgICAgICAg bmV3UmVxdWVzdC5zZXRJbml0aWF0b3IobV9vcHRpb25zLmluaXRpYXRvcik7CiAgICAgICAgIG5l d1JlcXVlc3Quc2V0T3JpZ2luKHNlY3VyaXR5T3JpZ2luKCkpOwogCiAgICAgICAgIEFTU0VSVCgh bV9yZXNvdXJjZSk7CkBAIC02MzksMjAgKzYzOCwxOCBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJs ZUxvYWRlcjo6bG9hZFJlcXVlCiAgICAgaWYgKGRhdGEpCiAgICAgICAgIGRpZFJlY2VpdmVEYXRh KGlkZW50aWZpZXIsIGRhdGEtPmRhdGEoKSwgZGF0YS0+c2l6ZSgpKTsKIAotICAgIGlmIChSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxl ZCgpKSB7Ci0gICAgICAgIGNvbnN0IGF1dG8qIHRpbWluZyA9IHJlc3BvbnNlLmRlcHJlY2F0ZWRO ZXR3b3JrTG9hZE1ldHJpY3NPck51bGwoKTsKLSAgICAgICAgT3B0aW9uYWw8TmV0d29ya0xvYWRN ZXRyaWNzPiBlbXB0eTsKLSAgICAgICAgaWYgKCF0aW1pbmcpIHsKLSAgICAgICAgICAgIGVtcHR5 LmVtcGxhY2UoKTsKLSAgICAgICAgICAgIHRpbWluZyA9ICZlbXB0eS52YWx1ZSgpOwotICAgICAg ICB9Ci0gICAgICAgIGF1dG8gcmVzb3VyY2VUaW1pbmcgPSBSZXNvdXJjZVRpbWluZzo6ZnJvbVN5 bmNocm9ub3VzTG9hZChyZXF1ZXN0VVJMLCBtX29wdGlvbnMuaW5pdGlhdG9yLCBsb2FkVGltaW5n LCAqdGltaW5nLCByZXNwb25zZSwgc2VjdXJpdHlPcmlnaW4oKSk7Ci0gICAgICAgIGlmIChvcHRp b25zKCkuaW5pdGlhdG9yQ29udGV4dCA9PSBJbml0aWF0b3JDb250ZXh0OjpXb3JrZXIpCi0gICAg ICAgICAgICBmaW5pc2hlZFRpbWluZ0ZvcldvcmtlckxvYWQocmVzb3VyY2VUaW1pbmcpOwotICAg ICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChhdXRvKiB3aW5kb3cgPSBkb2N1bWVudCgpLmRv bVdpbmRvdygpKQotICAgICAgICAgICAgICAgIHdpbmRvdy0+cGVyZm9ybWFuY2UoKS5hZGRSZXNv dXJjZVRpbWluZyhXVEZNb3ZlKHJlc291cmNlVGltaW5nKSk7Ci0gICAgICAgIH0KKyAgICBjb25z dCBhdXRvKiB0aW1pbmcgPSByZXNwb25zZS5kZXByZWNhdGVkTmV0d29ya0xvYWRNZXRyaWNzT3JO dWxsKCk7CisgICAgT3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBlbXB0eTsKKyAgICBpZiAo IXRpbWluZykgeworICAgICAgICBlbXB0eS5lbXBsYWNlKCk7CisgICAgICAgIHRpbWluZyA9ICZl bXB0eS52YWx1ZSgpOworICAgIH0KKyAgICBhdXRvIHJlc291cmNlVGltaW5nID0gUmVzb3VyY2VU aW1pbmc6OmZyb21TeW5jaHJvbm91c0xvYWQocmVxdWVzdFVSTCwgbV9vcHRpb25zLmluaXRpYXRv ciwgbG9hZFRpbWluZywgKnRpbWluZywgcmVzcG9uc2UsIHNlY3VyaXR5T3JpZ2luKCkpOworICAg IGlmIChvcHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dCA9PSBJbml0aWF0b3JDb250ZXh0OjpXb3Jr ZXIpCisgICAgICAgIGZpbmlzaGVkVGltaW5nRm9yV29ya2VyTG9hZChyZXNvdXJjZVRpbWluZyk7 CisgICAgZWxzZSB7CisgICAgICAgIGlmIChhdXRvKiB3aW5kb3cgPSBkb2N1bWVudCgpLmRvbVdp bmRvdygpKQorICAgICAgICAgICAgd2luZG93LT5wZXJmb3JtYW5jZSgpLmFkZFJlc291cmNlVGlt aW5nKFdURk1vdmUocmVzb3VyY2VUaW1pbmcpKTsKICAgICB9CiAKICAgICBkaWRGaW5pc2hMb2Fk aW5nKGlkZW50aWZpZXIpOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGlt aW5nSW5mb3JtYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01OCw3ICs1OCw2IEBAIGJvb2wgUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbjo6c2hv dWxkQWQKIAogdm9pZCBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWlu ZyhDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UsIERvY3VtZW50JiBkb2N1bWVudCwgUmVzb3VyY2VU aW1pbmcmJiByZXNvdXJjZVRpbWluZykKIHsKLSAgICBBU1NFUlQoUnVudGltZUVuYWJsZWRGZWF0 dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSk7CiAgICAgaWYg KCFSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjpzaG91bGRBZGRSZXNvdXJjZVRpbWluZyhyZXNv dXJjZSkpCiAgICAgICAgIHJldHVybjsKIApAQCAtODksNyArODgsNiBAQCB2b2lkIFJlc291cmNl VGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291CiAKIHZvaWQgUmVzb3VyY2VUaW1pbmdJbmZvcm1h dGlvbjo6c3RvcmVSZXNvdXJjZVRpbWluZ0luaXRpYXRvckluZm9ybWF0aW9uKGNvbnN0IENhY2hl ZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiYgcmVzb3VyY2UsIGNvbnN0IEF0b21TdHJp bmcmIGluaXRpYXRvck5hbWUsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBBU1NFUlQoUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSk7 CiAgICAgQVNTRVJUKHJlc291cmNlLmdldCgpKTsKIAogICAgIGlmIChyZXNvdXJjZS0+dHlwZSgp ID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpIHsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMjY3MTk0KQor KysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtODY1LDkgKzg2NSw2IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VS ZXNvdXJjZXMKIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6cmVwb3J0UmVzb3VyY2VUaW1pbmco Y29uc3QgTmV0d29ya0xvYWRNZXRyaWNzJiBuZXR3b3JrTG9hZE1ldHJpY3MpCiB7Ci0gICAgaWYg KCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5n RW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAoIVJlc291cmNlVGltaW5nSW5m b3JtYXRpb246OnNob3VsZEFkZFJlc291cmNlVGltaW5nKCptX3Jlc291cmNlKSkKICAgICAgICAg cmV0dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk1OCw3ICs5NTgsNyBAQCBSZXNvdXJjZUVycm9yT3I8Q2FjaGVkUmVzb3VyY2VIYW5kbGU8 Q2FjCiAKICAgICAgICAgICAgIG1lbW9yeUNhY2hlLnJlc291cmNlQWNjZXNzZWQoKnJlc291cmNl KTsKIAotICAgICAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1 cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkgJiYgZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2Ut PmlzTG9hZGluZygpKSB7CisgICAgICAgICAgICBpZiAoZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2Ut PmlzTG9hZGluZygpKSB7CiAgICAgICAgICAgICAgICAgYXV0byByZXNvdXJjZVRpbWluZyA9IFJl c291cmNlVGltaW5nOjpmcm9tQ2FjaGUodXJsLCByZXF1ZXN0LmluaXRpYXRvck5hbWUoKSwgbG9h ZFRpbWluZywgcmVzb3VyY2UtPnJlc3BvbnNlKCksICpyZXF1ZXN0Lm9yaWdpbigpKTsKICAgICAg ICAgICAgICAgICBpZiAoaW5pdGlhdG9yQ29udGV4dCA9PSBJbml0aWF0b3JDb250ZXh0OjpXb3Jr ZXIpIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGlzPENhY2hlZFJhd1Jlc291cmNlPihy ZXNvdXJjZS5nZXQoKSkpOwpAQCAtMTA0Miw4ICsxMDQyLDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5k bGU8Q2FjaGVkUmVzb3VyY2U+IENhYwogICAgIG1lbW9yeUNhY2hlLnJlbW92ZShyZXNvdXJjZSk7 CiAgICAgbWVtb3J5Q2FjaGUuYWRkKCpuZXdSZXNvdXJjZSk7CiAKLSAgICBpZiAoUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSkK LSAgICAgICAgbV9yZXNvdXJjZVRpbWluZ0luZm8uc3RvcmVSZXNvdXJjZVRpbWluZ0luaXRpYXRv ckluZm9ybWF0aW9uKG5ld1Jlc291cmNlLCBuZXdSZXNvdXJjZS0+aW5pdGlhdG9yTmFtZSgpLCBm cmFtZSgpKTsKKyAgICBtX3Jlc291cmNlVGltaW5nSW5mby5zdG9yZVJlc291cmNlVGltaW5nSW5p dGlhdG9ySW5mb3JtYXRpb24obmV3UmVzb3VyY2UsIG5ld1Jlc291cmNlLT5pbml0aWF0b3JOYW1l KCksIGZyYW1lKCkpOwogCiAgICAgcmV0dXJuIG5ld1Jlc291cmNlOwogfQpAQCAtMTA2MSw4ICsx MDYwLDcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhYwogICAgIGlm IChyZXNvdXJjZS0+YWxsb3dzQ2FjaGluZygpKQogICAgICAgICBtZW1vcnlDYWNoZS5hZGQoKnJl c291cmNlKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJl cygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQotICAgICAgICBtX3Jlc291cmNlVGltaW5nSW5m by5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24ocmVzb3VyY2UsIHJlc291 cmNlLT5pbml0aWF0b3JOYW1lKCksIGZyYW1lKCkpOworICAgIG1fcmVzb3VyY2VUaW1pbmdJbmZv LnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZvcm1hdGlvbihyZXNvdXJjZSwgcmVzb3Vy Y2UtPmluaXRpYXRvck5hbWUoKSwgZnJhbWUoKSk7CiAKICAgICByZXR1cm4gcmVzb3VyY2U7CiB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlLmlkbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlLmlkbAkocmV2aXNpb24gMjY3MTk0KQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZS5pZGwJKHdvcmtpbmcgY29weSkKQEAg LTM3LDI4ICszNywzMSBAQCB0eXBlZGVmIGRvdWJsZSBET01IaWdoUmVzVGltZVN0YW1wOwogICAg IEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogICAgIEdlbmVyYXRlSXNSZWFjaGFibGU9SW1wbFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQsCiBdIGludGVyZmFjZSBQZXJmb3JtYW5jZSA6IEV2ZW50VGFy Z2V0IHsKLQogICAgIERPTUhpZ2hSZXNUaW1lU3RhbXAgbm93KCk7CisgICAgLy8gRklYTUU6IElt cGxlbWVudCAndGltZU9yaWdpbicuCisgICAgLy8gcmVhZG9ubHkgYXR0cmlidXRlIERPTUhpZ2hS ZXNUaW1lU3RhbXAgdGltZU9yaWdpbjsKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50ICd0b0pTT04n LgorICAgIC8vIFtEZWZhdWx0XSBvYmplY3QgdG9KU09OKCk7CiAKICAgICAvLyBodHRwczovL3cz Yy5naXRodWIuaW8vbmF2aWdhdGlvbi10aW1pbmcvCiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFBl cmZvcm1hbmNlTmF2aWdhdGlvbiBuYXZpZ2F0aW9uOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBQ ZXJmb3JtYW5jZVRpbWluZyB0aW1pbmc7CiAKICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8v cGVyZm9ybWFuY2UtdGltZWxpbmUvCi0gICAgW0VuYWJsZWRBdFJ1bnRpbWU9UGVyZm9ybWFuY2VU aW1lbGluZV0gUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllcygpOwotICAgIFtFbmFibGVk QXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmVdIFBlcmZvcm1hbmNlRW50cnlMaXN0IGdldEVu dHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5VHlwZSk7Ci0gICAgW0VuYWJsZWRBdFJ1bnRpbWU9 UGVyZm9ybWFuY2VUaW1lbGluZV0gUGVyZm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllc0J5TmFt ZShET01TdHJpbmcgbmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIGVudHJ5VHlwZSk7CisgICAgUGVy Zm9ybWFuY2VFbnRyeUxpc3QgZ2V0RW50cmllcygpOworICAgIFBlcmZvcm1hbmNlRW50cnlMaXN0 IGdldEVudHJpZXNCeVR5cGUoRE9NU3RyaW5nIGVudHJ5VHlwZSk7CisgICAgUGVyZm9ybWFuY2VF bnRyeUxpc3QgZ2V0RW50cmllc0J5TmFtZShET01TdHJpbmcgbmFtZSwgb3B0aW9uYWwgRE9NU3Ry aW5nIGVudHJ5VHlwZSk7CiAKICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vcmVzb3VyY2Ut dGltaW5nLwotICAgIFtFbmFibGVkQXRSdW50aW1lPVJlc291cmNlVGltaW5nXSB1bmRlZmluZWQg Y2xlYXJSZXNvdXJjZVRpbWluZ3MoKTsKLSAgICBbRW5hYmxlZEF0UnVudGltZT1SZXNvdXJjZVRp bWluZ10gdW5kZWZpbmVkIHNldFJlc291cmNlVGltaW5nQnVmZmVyU2l6ZSh1bnNpZ25lZCBsb25n IG1heFNpemUpOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVJlc291cmNlVGltaW5nXSBhdHRyaWJ1 dGUgRXZlbnRIYW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdidWZmZXJmdWxsOworICAgIHVuZGVmaW5l ZCBjbGVhclJlc291cmNlVGltaW5ncygpOworICAgIHVuZGVmaW5lZCBzZXRSZXNvdXJjZVRpbWlu Z0J1ZmZlclNpemUodW5zaWduZWQgbG9uZyBtYXhTaXplKTsKKyAgICBhdHRyaWJ1dGUgRXZlbnRI YW5kbGVyIG9ucmVzb3VyY2V0aW1pbmdidWZmZXJmdWxsOwogCiAgICAgLy8gaHR0cHM6Ly93M2Mu Z2l0aHViLmlvL3VzZXItdGltaW5nLwotICAgIFtFbmFibGVkQXRSdW50aW1lPVVzZXJUaW1pbmcs IE1heVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWFyayhET01TdHJpbmcgbWFya05hbWUpOwot ICAgIFtFbmFibGVkQXRSdW50aW1lPVVzZXJUaW1pbmddIHVuZGVmaW5lZCBjbGVhck1hcmtzKG9w dGlvbmFsIERPTVN0cmluZyBtYXJrTmFtZSk7Ci0gICAgW0VuYWJsZWRBdFJ1bnRpbWU9VXNlclRp bWluZywgTWF5VGhyb3dFeGNlcHRpb25dIHVuZGVmaW5lZCBtZWFzdXJlKERPTVN0cmluZyBtZWFz dXJlTmFtZSwgb3B0aW9uYWwgRE9NU3RyaW5nIHN0YXJ0TWFyaywgb3B0aW9uYWwgRE9NU3RyaW5n IGVuZE1hcmspOwotICAgIFtFbmFibGVkQXRSdW50aW1lPVVzZXJUaW1pbmddIHVuZGVmaW5lZCBj bGVhck1lYXN1cmVzKG9wdGlvbmFsIERPTVN0cmluZyBtZWFzdXJlTmFtZSk7CisgICAgW01heVRo cm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWFyayhET01TdHJpbmcgbWFya05hbWUpOworICAgIHVu ZGVmaW5lZCBjbGVhck1hcmtzKG9wdGlvbmFsIERPTVN0cmluZyBtYXJrTmFtZSk7CisgICAgW01h eVRocm93RXhjZXB0aW9uXSB1bmRlZmluZWQgbWVhc3VyZShET01TdHJpbmcgbWVhc3VyZU5hbWUs IG9wdGlvbmFsIERPTVN0cmluZyBzdGFydE1hcmssIG9wdGlvbmFsIERPTVN0cmluZyBlbmRNYXJr KTsKKyAgICB1bmRlZmluZWQgY2xlYXJNZWFzdXJlcyhvcHRpb25hbCBET01TdHJpbmcgbWVhc3Vy ZU5hbWUpOwogfTsKIAogdHlwZWRlZiBzZXF1ZW5jZTxQZXJmb3JtYW5jZUVudHJ5PiBQZXJmb3Jt YW5jZUVudHJ5TGlzdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VFbnRy eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5 LmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5j ZUVudHJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsMTcgKzUyLDEzIEBAIE9wdGlvbmFsPFBl cmZvcm1hbmNlRW50cnk6OlR5cGU+IFBlcmZvcm0KICAgICBpZiAoZW50cnlUeXBlID09ICJuYXZp Z2F0aW9uIikKICAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFR5cGU+KFR5cGU6Ok5hdmlnYXRpb24p OwogCi0gICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkudXNl clRpbWluZ0VuYWJsZWQoKSkgewotICAgICAgICBpZiAoZW50cnlUeXBlID09ICJtYXJrIikKLSAg ICAgICAgICAgIHJldHVybiBPcHRpb25hbDxUeXBlPihUeXBlOjpNYXJrKTsKLSAgICAgICAgaWYg KGVudHJ5VHlwZSA9PSAibWVhc3VyZSIpCi0gICAgICAgICAgICByZXR1cm4gT3B0aW9uYWw8VHlw ZT4oVHlwZTo6TWVhc3VyZSk7Ci0gICAgfQorICAgIGlmIChlbnRyeVR5cGUgPT0gIm1hcmsiKQor ICAgICAgICByZXR1cm4gT3B0aW9uYWw8VHlwZT4oVHlwZTo6TWFyayk7CisgICAgaWYgKGVudHJ5 VHlwZSA9PSAibWVhc3VyZSIpCisgICAgICAgIHJldHVybiBPcHRpb25hbDxUeXBlPihUeXBlOjpN ZWFzdXJlKTsKIAotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJl cygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKSB7Ci0gICAgICAgIGlmIChlbnRyeVR5cGUgPT0g InJlc291cmNlIikKLSAgICAgICAgICAgIHJldHVybiBPcHRpb25hbDxUeXBlPihUeXBlOjpSZXNv dXJjZSk7Ci0gICAgfQorICAgIGlmIChlbnRyeVR5cGUgPT0gInJlc291cmNlIikKKyAgICAgICAg cmV0dXJuIE9wdGlvbmFsPFR5cGU+KFR5cGU6OlJlc291cmNlKTsKIAogICAgIGlmIChSdW50aW1l RW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnBhaW50VGltaW5nRW5hYmxlZCgpKSB7 CiAgICAgICAgIGlmIChlbnRyeVR5cGUgPT0gInBhaW50IikKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BhZ2UvUGVyZm9ybWFuY2VFbnRyeS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9QZXJmb3JtYW5jZUVudHJ5LmlkbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9QZXJmb3JtYW5jZUVudHJ5LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyAr MzQsNiBAQCB0eXBlZGVmIGRvdWJsZSBET01IaWdoUmVzVGltZVN0YW1wOwogCiBbCiAgICAgQ3Vz dG9tVG9KU09iamVjdCwKLSAgICBFbmFibGVkQXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmUs CiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtlciksCiBdIGludGVyZmFjZSBQZXJmb3JtYW5jZUVu dHJ5IHsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIG5hbWU7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTWFyay5pZGwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU1hcmsuaWRsCShyZXZpc2lvbiAyNjcxOTQpCisrKyBT b3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTWFyay5pZGwJKHdvcmtpbmcgY29weSkKQEAg LTI2LDcgKzI2LDYgQEAKIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby91c2VyLXRpbWluZy8KIAog WwotICAgIEVuYWJsZWRBdFJ1bnRpbWU9VXNlclRpbWluZywKICAgICBFeHBvc2VkPShXaW5kb3cs V29ya2VyKSwKIF0gaW50ZXJmYWNlIFBlcmZvcm1hbmNlTWFyayA6IFBlcmZvcm1hbmNlRW50cnkg ewogfTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNZWFzdXJlLmlkbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTWVhc3VyZS5pZGwJ KHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNZWFz dXJlLmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAogLy8gaHR0cHM6Ly93M2Mu Z2l0aHViLmlvL3VzZXItdGltaW5nLwogCiBbCi0gICAgRW5hYmxlZEF0UnVudGltZT1Vc2VyVGlt aW5nLAogICAgIEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogXSBpbnRlcmZhY2UgUGVyZm9ybWFu Y2VNZWFzdXJlIDogUGVyZm9ybWFuY2VFbnRyeSB7CiB9OwpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9QZXJmb3JtYW5jZU9ic2VydmVyLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2ZXIuaWRsCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlT2JzZXJ2ZXIuaWRsCSh3b3JraW5nIGNvcHkpCkBA IC0yNyw3ICsyNyw2IEBACiAKIFsKICAgICBDdXN0b21Jc1JlYWNoYWJsZSwKLSAgICBFbmFibGVk QXRSdW50aW1lPVBlcmZvcm1hbmNlVGltZWxpbmUsCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtl ciksCiAgICAgSW1wbGVtZW50YXRpb25MYWNrc1ZUYWJsZSwKICAgICBKU0N1c3RvbU1hcmtGdW5j dGlvbiwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VPYnNlcnZlckVudHJ5 TGlzdC5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU9i c2VydmVyRW50cnlMaXN0LmlkbAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9QZXJmb3JtYW5jZU9ic2VydmVyRW50cnlMaXN0LmlkbAkod29ya2luZyBjb3B5KQpAQCAt MjYsNyArMjYsNiBAQAogLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3BlcmZvcm1hbmNlLXRpbWVs aW5lLwogCiBbCi0gICAgRW5hYmxlZEF0UnVudGltZT1QZXJmb3JtYW5jZVRpbWVsaW5lLAogICAg IEV4cG9zZWQ9KFdpbmRvdyxXb3JrZXIpLAogICAgIEltcGxlbWVudGF0aW9uTGFja3NWVGFibGUs CiBdIGludGVyZmFjZSBQZXJmb3JtYW5jZU9ic2VydmVyRW50cnlMaXN0IHsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VSZXNvdXJjZVRpbWluZy5pZGwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZVJlc291cmNlVGltaW5nLmlkbAkocmV2 aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZVJlc291cmNl VGltaW5nLmlkbAkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNiBAQAogdHlwZWRlZiBkb3Vi bGUgRE9NSGlnaFJlc1RpbWVTdGFtcDsKIAogWwotICAgIEVuYWJsZWRBdFJ1bnRpbWU9UmVzb3Vy Y2VUaW1pbmcsCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtlciksCiBdIGludGVyZmFjZSBQZXJm b3JtYW5jZVJlc291cmNlVGltaW5nIDogUGVyZm9ybWFuY2VFbnRyeSB7CiAgICAgcmVhZG9ubHkg YXR0cmlidXRlIERPTVN0cmluZyBpbml0aWF0b3JUeXBlOwpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC00NCwxNyArNDQsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBSdW50aW1lRW5h YmxlZEZlYXR1cmVzIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSdW50aW1lRW5hYmxlZEZl YXR1cmVzKTsKIHB1YmxpYzoKLSAgICB2b2lkIHNldFJlc291cmNlVGltaW5nRW5hYmxlZChib29s IGlzRW5hYmxlZCkgeyBtX2lzUmVzb3VyY2VUaW1pbmdFbmFibGVkID0gaXNFbmFibGVkOyB9Ci0g ICAgYm9vbCByZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzUmVzb3Vy Y2VUaW1pbmdFbmFibGVkOyB9Ci0KLSAgICB2b2lkIHNldFVzZXJUaW1pbmdFbmFibGVkKGJvb2wg aXNFbmFibGVkKSB7IG1faXNVc2VyVGltaW5nRW5hYmxlZCA9IGlzRW5hYmxlZDsgfQotICAgIGJv b2wgdXNlclRpbWluZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzVXNlclRpbWluZ0VuYWJs ZWQ7IH0KLQogICAgIHZvaWQgc2V0UGFpbnRUaW1pbmdFbmFibGVkKGJvb2wgaXNFbmFibGVkKSB7 IG1faXNQYWludFRpbWluZ0VuYWJsZWQgPSBpc0VuYWJsZWQ7IH0KICAgICBib29sIHBhaW50VGlt aW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNQYWludFRpbWluZ0VuYWJsZWQ7IH0KIAot ICAgIGJvb2wgcGVyZm9ybWFuY2VUaW1lbGluZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiByZXNv dXJjZVRpbWluZ0VuYWJsZWQoKSB8fCB1c2VyVGltaW5nRW5hYmxlZCgpOyB9Ci0KICAgICB2b2lk IHNldE1lbnVJdGVtRWxlbWVudEVuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9pc01lbnVJdGVt RWxlbWVudEVuYWJsZWQgPSBpc0VuYWJsZWQ7IH0KICAgICBib29sIG1lbnVJdGVtRWxlbWVudEVu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzTWVudUl0ZW1FbGVtZW50RW5hYmxlZDsgfQogCkBA IC0yODIsOCArMjc0LDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9hcmVNb2Rlcm5NZWRpYUNv bnRyb2xzRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzUGFpbnRUaW1pbmdFbmFibGVk IHsgZmFsc2UgfTsKLSAgICBib29sIG1faXNSZXNvdXJjZVRpbWluZ0VuYWJsZWQgeyBmYWxzZSB9 OwotICAgIGJvb2wgbV9pc1VzZXJUaW1pbmdFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1f aXNNZW51SXRlbUVsZW1lbnRFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNEaXJlY3Rv cnlVcGxvYWRFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNDdXN0b21QYXN0ZWJvYXJk RGF0YUVuYWJsZWQgeyBmYWxzZSB9OwpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysr IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAK KzIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgorCisgICAgICAgIFJl bW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyB0aGUgVXNlclRpbWlu ZyBhbmQgUmVzb3VyY2VUaW1pbmcgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHJ1bnRpbWUgc2V0dGluZyBmb3IgZW5hYmxpbmcvZGlz YWJsaW5nIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIAorICAgICAgICBBUElzLiBUaGV5 IGhhdmUgYm90aCBiZWVuIG9uIGZvciBhIHdoaWxlIGluIFdlYktpdDIgYW5kIHRoZXJlIGFyZW4n dCBhbnkKKyAgICAgICAga25vd24gdXNlcyBjYXNlcyBmb3IgZGlzYWJsaW5nIHRoZW0uIEluIGFk ZGl0aW9uIHRvIHJlbW92aW5nIHRoZSBzZXR0aW5nLCAKKyAgICAgICAgdGhleSBhcmUgbm93IGVu YWJsZWQgaW4gTGVnYWN5V2ViS2l0IGFzIHdlbGwuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJl ZmVyZW5jZXMueWFtbDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5j cHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQpOgorICAgICAg ICAoV0tQcmVmZXJlbmNlc0dldFVzZXJUaW1pbmdFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVy ZW5jZXNTZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dFJlc291cmNlVGltaW5nRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJl ZmVyZW5jZXNSZWZQcml2YXRlLmg6CisKIDIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWluaWdA YXBwbGUuY29tPgogCiAgICAgICAgIFdlIHNob3VsZG4ndCBuZWVkIHRvIHNwZWNpZnkgYSBjYXRl Z29yeSBmb3IgcHJlZmVyZW5jZXMgbm93IHRoYXQgdGhleSBhcmUgc3BsaXQgaW50byBzZXBhcmF0 ZSBmaWxlcwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCShy ZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55 YW1sCSh3b3JraW5nIGNvcHkpCkBAIC02NzcsMjAgKzY3Nyw2IEBAIE1vZGVybk1lZGlhQ29udHJv bHNFbmFibGVkOgogICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJVc2UgbW9kZXJuIG1lZGlh IGNvbnRyb2xzIGxvb2siCiAgIHdlYmNvcmVCaW5kaW5nOiBSdW50aW1lRW5hYmxlZEZlYXR1cmVz CiAKLVJlc291cmNlVGltaW5nRW5hYmxlZDoKLSAgdHlwZTogYm9vbAotICBkZWZhdWx0VmFsdWU6 IHRydWUKLSAgaHVtYW5SZWFkYWJsZU5hbWU6ICJSZXNvdXJjZSBUaW1pbmciCi0gIGh1bWFuUmVh ZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBSZXNvdXJjZVRpbWluZyBBUEkiCi0gIHdlYmNvcmVC aW5kaW5nOiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzCi0KLVVzZXJUaW1pbmdFbmFibGVkOgotICB0 eXBlOiBib29sCi0gIGRlZmF1bHRWYWx1ZTogdHJ1ZQotICBodW1hblJlYWRhYmxlTmFtZTogIlVz ZXIgVGltaW5nIgotICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJFbmFibGUgVXNlclRpbWlu ZyBBUEkiCi0gIHdlYmNvcmVCaW5kaW5nOiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzCi0KIEJlYWNv bkFQSUVuYWJsZWQ6CiAgIHR5cGU6IGJvb2wKICAgZGVmYXVsdFZhbHVlOiB0cnVlCkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2 aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2ODksMTYgKzE2ODksNiBAQCBib29sIFdLUHJl ZmVyZW5jZXNHZXRNZW51SXRlbUVsZW1lbnRFbmFiCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJl bmNlc1JlZiktPm1lbnVJdGVtRWxlbWVudEVuYWJsZWQoKTsKIH0KIAotdm9pZCBXS1ByZWZlcmVu Y2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwg Ym9vbCBmbGFnKQotewotICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFVzZXJUaW1pbmdF bmFibGVkKGZsYWcpOwotfQotCi1ib29sIFdLUHJlZmVyZW5jZXNHZXRVc2VyVGltaW5nRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQotewotICAgIHJldHVybiB0b0ltcGwo cHJlZmVyZW5jZXNSZWYpLT51c2VyVGltaW5nRW5hYmxlZCgpOwotfQotCiB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRQYWludFRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl ZiwgYm9vbCBmbGFnKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFBhaW50VGlt aW5nRW5hYmxlZChmbGFnKTsKQEAgLTE3MDksMTUgKzE2OTksNiBAQCBib29sIFdLUHJlZmVyZW5j ZXNHZXRQYWludFRpbWluZ0VuYWJsZWQoCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1Jl ZiktPnBhaW50VGltaW5nRW5hYmxlZCgpOwogfQogCi12b2lkIFdLUHJlZmVyZW5jZXNTZXRSZXNv dXJjZVRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBm bGFnKQotewotICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFJlc291cmNlVGltaW5nRW5h YmxlZChmbGFnKTsKLX0KLQotYm9vbCBXS1ByZWZlcmVuY2VzR2V0UmVzb3VyY2VUaW1pbmdFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCi17Ci0gICAgcmV0dXJuIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPnJlc291cmNlVGltaW5nRW5hYmxlZCgpOwotfQogCiB2b2lkIFdL UHJlZmVyZW5jZXNTZXRJc05TVVJMU2Vzc2lvbldlYlNvY2tldEVuYWJsZWQoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQogewpAQCAtMjIyNCwzICsyMjA1LDIxIEBA IGJvb2wgV0tQcmVmZXJlbmNlc0dldElzU2VjdXJlQ29udGV4dEF0dHIKIHsKICAgICByZXR1cm4g dHJ1ZTsKIH0KKwordm9pZCBXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVm ZXJlbmNlc1JlZiwgYm9vbCkKK3sKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0VXNlclRpbWlu Z0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZikKK3sKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9p ZCBXS1ByZWZlcmVuY2VzU2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYs IGJvb2wpCit7Cit9CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0cnVlOworfQpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJp dmF0ZS5oCShyZXZpc2lvbiAyNjcxOTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NjEsMTggKzQ2 MSwxMCBAQCBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0V2ViU2hhcmVFCiBXS19FWFBP UlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0V2ViU2hhcmVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYp OwogCiAvLyBEZWZhdWx0cyB0byBmYWxzZQotV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Nl dFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7Ci1XS19FWFBP UlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl Zik7Ci0KLS8vIERlZmF1bHRzIHRvIGZhbHNlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2Vz U2V0UGFpbnRUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7CiBXS19F WFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0UGFpbnRUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5j ZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0byBmYWxzZQotV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJl bmNlc1NldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcp OwotV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZChX S1ByZWZlcmVuY2VzUmVmKTsKLQotLy8gRGVmYXVsdHMgdG8gZmFsc2UKIFdLX0VYUE9SVCB2b2lk IFdLUHJlZmVyZW5jZXNTZXRGZXRjaEFQSUtlZXBBbGl2ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl ZiwgYm9vbCBmbGFnKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRGZXRjaEFQSUtl ZXBBbGl2ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZik7CiAKQEAgLTU5NSw2ICs1ODcsMTAgQEAg V0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEZldGNoQVBJRQogV0tfRVhQT1JUIGJvb2wg V0tQcmVmZXJlbmNlc0dldEZldGNoQVBJRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKSBXS19DX0FQ SV9ERVBSRUNBVEVEOwogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldElzU2VjdXJlQ29u dGV4dEF0dHJpYnV0ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCkgV0tfQ19BUElfREVQ UkVDQVRFRDsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRJc1NlY3VyZUNvbnRleHRB dHRyaWJ1dGVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpIFdLX0NfQVBJX0RFUFJFQ0FURUQ7CitX S19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0VXNlclRpbWluZ0VuYWJsZWQoV0tQcmVmZXJl bmNlc1JlZiwgYm9vbCkgV0tfQ19BUElfREVQUkVDQVRFRDsKK1dLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRVc2VyVGltaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKSBXS19DX0FQSV9E RVBSRUNBVEVEOworV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGltaW5n RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKSBXS19DX0FQSV9ERVBSRUNBVEVEOworV0tf RVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFJlc291cmNlVGltaW5nRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K SW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDI1IEBACisyMDIwLTA5LTE3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5nIGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVz ZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjU1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJs aW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFuZCBSZXNvdXJjZVRpbWluZyAKKyAgICAgICAgQVBJ cy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBmb3IgYSB3aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVy ZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3duIHVzZXMgY2FzZXMgZm9yIGRpc2FibGluZyB0aGVt LiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0aGUgc2V0dGluZywgCisgICAgICAgIHRoZXkgYXJl IG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktpdCBhcyB3ZWxsLgorCisgICAgICAgICogV2ViVmll dy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVyZW5jZXMgaW5pdGlhbGl6 ZV0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBzZXRVc2VyVGltaW5nRW5hYmxlZDpdKToK KyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgdXNlclRpbWluZ0VuYWJsZWRdKToKKyAgICAgICAg KC1bV2ViUHJlZmVyZW5jZXMgc2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkOl0pOgorICAgICAgICAo LVtXZWJQcmVmZXJlbmNlcyByZXNvdXJjZVRpbWluZ0VuYWJsZWRdKToKKyAgICAgICAgKiBXZWJW aWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5t bToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDIwLTA5 LTE3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92 ZSB0aGUgbGVnYWN5IGFuaW1hdGlvbiBjb2RlCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0JKHJldmlzaW9uIDI2NzE5NCkKKysr IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0JKHdvcmtp bmcgY29weSkKQEAgLTY4NCw4ICs2ODQsNiBAQCArICh2b2lkKWluaXRpYWxpemUKICNpZiBFTkFC TEUoSU5URVJTRUNUSU9OX09CU0VSVkVSKQogICAgICAgICBATk8sIFdlYktpdEludGVyc2VjdGlv bk9ic2VydmVyRW5hYmxlZFByZWZlcmVuY2VLZXksCiAjZW5kaWYKLSAgICAgICAgQE5PLCBXZWJL aXRVc2VyVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXksCi0gICAgICAgIEBOTywgV2ViS2l0UmVz b3VyY2VUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgQE5PLCBXZWJLaXRNZWRp YVVzZXJHZXN0dXJlSW5oZXJpdHNGcm9tRG9jdW1lbnQsCiAgICAgICAgIEBZRVMsIFdlYktpdExl Z2FjeUVuY3J5cHRlZE1lZGlhQVBJRW5hYmxlZEtleSwKICAgICAgICAgQE5PLCBXZWJLaXRFbmNy eXB0ZWRNZWRpYUFQSUVuYWJsZWRLZXksCkBAIC0zMjUyLDI2ICszMjUwLDYgQEAgLSAodm9pZClz ZXRNZW51SXRlbUVsZW1lbnRFbmFibGVkOihCT09MKQogICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6 ZmxhZyBmb3JLZXk6V2ViS2l0TWVudUl0ZW1FbGVtZW50RW5hYmxlZFByZWZlcmVuY2VLZXldOwog fQogCi0tIChCT09MKXVzZXJUaW1pbmdFbmFibGVkCi17Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29s VmFsdWVGb3JLZXk6V2ViS2l0VXNlclRpbWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKLX0KLQot LSAodm9pZClzZXRVc2VyVGltaW5nRW5hYmxlZDooQk9PTClmbGFnCi17Ci0gICAgW3NlbGYgX3Nl dEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRVc2VyVGltaW5nRW5hYmxlZFByZWZlcmVuY2VL ZXldOwotfQotCi0tIChCT09MKXJlc291cmNlVGltaW5nRW5hYmxlZAotewotICAgIHJldHVybiBb c2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVu Y2VLZXldOwotfQotCi0tICh2b2lkKXNldFJlc291cmNlVGltaW5nRW5hYmxlZDooQk9PTClmbGFn Ci17Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJLaXRSZXNvdXJjZVRp bWluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKLX0KLQogLSAoQk9PTCltZWRpYVVzZXJHZXN0dXJl SW5oZXJpdHNGcm9tRG9jdW1lbnQKIHsKICAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktl eTpXZWJLaXRNZWRpYVVzZXJHZXN0dXJlSW5oZXJpdHNGcm9tRG9jdW1lbnRdOwpAQCAtMzY0OCw2 ICszNjI2LDI0IEBAICsgKE5TU3RyaW5nICopX2NvbmNhdGVuYXRlS2V5V2l0aElCQ3JlYXQKIC8v IFRoZSBwcmVmZXJlbmNlcyBpbiB0aGlzIGNhdGVnb3J5IGFyZSBkZXByZWNhdGVkIGFuZCBoYXZl IG5vIGVmZmVjdC4gVGhleSBzaG91bGQKIC8vIGJlIHJlbW92ZWQgd2hlbiBpdCBpcyBjb25zaWRl cmVkIHNhZmUgdG8gZG8gc28uCiAKKy0gKHZvaWQpc2V0VXNlclRpbWluZ0VuYWJsZWQ6KEJPT0wp ZmxhZworeworfQorCistIChCT09MKXVzZXJUaW1pbmdFbmFibGVkCit7CisgICAgcmV0dXJuIFlF UzsKK30KKworLSAodm9pZClzZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQ6KEJPT0wpZmxhZworewor fQorCistIChCT09MKXJlc291cmNlVGltaW5nRW5hYmxlZAoreworICAgIHJldHVybiBZRVM7Cit9 CisKIC0gKHZvaWQpc2V0Q1NTU2hhZG93UGFydHNFbmFibGVkOihCT09MKWZsYWcKIHsKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVm ZXJlbmNlc1ByaXZhdGUuaAkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAt NjQwLDggKzY0MCw2IEBAIEBpbnRlcmZhY2UgV2ViUHJlZmVyZW5jZXMgKFdlYlByaXZhdGUpCiBA cHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBpbnRlcnNlY3Rpb25PYnNlcnZlckVuYWJsZWQ7CiBA cHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBtZW51SXRlbUVsZW1lbnRFbmFibGVkOwogQHByb3Bl cnR5IChub25hdG9taWMpIEJPT0wga2V5Z2VuRWxlbWVudEVuYWJsZWQ7Ci1AcHJvcGVydHkgKG5v bmF0b21pYykgQk9PTCB1c2VyVGltaW5nRW5hYmxlZDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBC T09MIHJlc291cmNlVGltaW5nRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGxp bmtQcmVsb2FkRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIG1lZGlhVXNlckdl c3R1cmVJbmhlcml0c0Zyb21Eb2N1bWVudDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGlz U2VjdXJlQ29udGV4dEF0dHJpYnV0ZUVuYWJsZWQ7CkBAIC02ODYsNiArNjg0LDkgQEAgQGludGVy ZmFjZSBXZWJQcmVmZXJlbmNlcyAoV2ViUHJpdmF0ZURlcAogLy8gVGhlIHByZWZlcmVuY2VzIGlu IHRoaXMgY2F0ZWdvcnkgYXJlIGRlcHJlY2F0ZWQgYW5kIGhhdmUgbm8gZWZmZWN0LiBUaGV5IHNo b3VsZAogLy8gYmUgcmVtb3ZlZCB3aGVuIGl0IGlzIGNvbnNpZGVyZWQgc2FmZSB0byBkbyBzby4K IAorQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgdXNlclRpbWluZ0VuYWJsZWQ7CitAcHJvcGVy dHkgKG5vbmF0b21pYykgQk9PTCByZXNvdXJjZVRpbWluZ0VuYWJsZWQ7CisKIC0gKHZvaWQpc2V0 Q1NTU2hhZG93UGFydHNFbmFibGVkOihCT09MKWZsYWc7CiAtIChCT09MKWNzc1NoYWRvd1BhcnRz RW5hYmxlZDsKIApJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQkocmV2aXNpb24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMzY1LDggKzMzNjUsNiBAQCAtICh2b2lk KV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuCiAgICAgc2V0dGluZ3Muc2V0SW50ZXJz ZWN0aW9uT2JzZXJ2ZXJFbmFibGVkKHByZWZlcmVuY2VzLmludGVyc2VjdGlvbk9ic2VydmVyRW5h YmxlZCk7CiAjZW5kaWYKIAotICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1 cmVzKCkuc2V0VXNlclRpbWluZ0VuYWJsZWQocHJlZmVyZW5jZXMudXNlclRpbWluZ0VuYWJsZWQp OwotICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0UmVzb3Vy Y2VUaW1pbmdFbmFibGVkKHByZWZlcmVuY2VzLnJlc291cmNlVGltaW5nRW5hYmxlZCk7CiAgICAg c2V0dGluZ3Muc2V0TGlua1ByZWxvYWRFbmFibGVkKHByZWZlcmVuY2VzLmxpbmtQcmVsb2FkRW5h YmxlZCk7CiAgICAgc2V0dGluZ3Muc2V0TWVkaWFQcmVsb2FkaW5nRW5hYmxlZChwcmVmZXJlbmNl cy5tZWRpYVByZWxvYWRpbmdFbmFibGVkKTsKICAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz aGFyZWRGZWF0dXJlcygpLnNldERpcmVjdG9yeVVwbG9hZEVuYWJsZWQoW3ByZWZlcmVuY2VzIGRp cmVjdG9yeVVwbG9hZEVuYWJsZWRdKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cJ KHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA5LTE3ICBTYW0gV2VpbmlnICA8 d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcnVudGltZSBzZXR0aW5nIGZvciBl bmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1pbmcgYW5kIFJlc291cmNlVGltaW5nIEFQSXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjU1Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBy dW50aW1lIHNldHRpbmcgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBVc2VyVGltaW5nIGFuZCBSZXNv dXJjZVRpbWluZyAKKyAgICAgICAgQVBJcy4gVGhleSBoYXZlIGJvdGggYmVlbiBvbiBmb3IgYSB3 aGlsZSBpbiBXZWJLaXQyIGFuZCB0aGVyZSBhcmVuJ3QgYW55CisgICAgICAgIGtub3duIHVzZXMg Y2FzZXMgZm9yIGRpc2FibGluZyB0aGVtLiBJbiBhZGRpdGlvbiB0byByZW1vdmluZyB0aGUgc2V0 dGluZywgCisgICAgICAgIHRoZXkgYXJlIG5vdyBlbmFibGVkIGluIExlZ2FjeVdlYktpdCBhcyB3 ZWxsLgorCisgICAgICAgICogV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVy ZW5jZXM6OmluaXRpYWxpemVEZWZhdWx0U2V0dGluZ3MpOgorICAgICAgICAoV2ViUHJlZmVyZW5j ZXM6OnNldFVzZXJUaW1pbmdFbmFibGVkKToKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjp1c2Vy VGltaW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6c2V0UmVzb3VyY2VUaW1p bmdFbmFibGVkKToKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjpyZXNvdXJjZVRpbWluZ0VuYWJs ZWQpOgorICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6bm90aWZ5UHJl ZmVyZW5jZXNDaGFuZ2VkKToKKwogMjAyMC0wOS0xNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgdGhlIGxlZ2FjeSBhbmltYXRpb24gY29kZQpJ bmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNp b24gMjY3MTk0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zMTcsMTAgKzMxNyw2IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6 OmluaXRpYWxpemVEZWZhdWx0U2UKIAogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRz LCBDRlNUUihXZWJLaXRDU1NDdXN0b21Qcm9wZXJ0aWVzQW5kVmFsdWVzRW5hYmxlZFByZWZlcmVu Y2VLZXkpLCBrQ0ZCb29sZWFuRmFsc2UpOwogCi0gICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVm YXVsdHMsIENGU1RSKFdlYktpdFVzZXJUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJv b2xlYW5GYWxzZSk7Ci0KLSAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIo V2ViS2l0UmVzb3VyY2VUaW1pbmdFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxz ZSk7Ci0KICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0TGlu a1ByZWxvYWRFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7CiAKICAgICBD RkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0TWVkaWFQcmVsb2FkaW5n RW5hYmxlZFByZWZlcmVuY2VLZXkpLCBrQ0ZCb29sZWFuRmFsc2UpOwpAQCAtMjM2MSw5ICsyMzU3 LDggQEAgSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6Q1NTQ3VzdG9tUHJvcGVydAogICAgIHJldHVy biBTX09LOwogfQogICAgIAotSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0VXNlclRpbWluZ0Vu YWJsZWQoQk9PTCBlbmFibGVkKQorSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0VXNlclRpbWlu Z0VuYWJsZWQoQk9PTCkKIHsKLSAgICBzZXRCb29sVmFsdWUoV2ViS2l0VXNlclRpbWluZ0VuYWJs ZWRQcmVmZXJlbmNlS2V5LCBlbmFibGVkKTsKICAgICByZXR1cm4gU19PSzsKIH0KIApAQCAtMjM3 MSwxMyArMjM2NiwxMiBAQCBIUkVTVUxUIFdlYlByZWZlcmVuY2VzOjp1c2VyVGltaW5nRW5hYmxl CiB7CiAgICAgaWYgKCFlbmFibGVkKQogICAgICAgICByZXR1cm4gRV9QT0lOVEVSOwotICAgICpl bmFibGVkID0gYm9vbFZhbHVlRm9yS2V5KFdlYktpdFVzZXJUaW1pbmdFbmFibGVkUHJlZmVyZW5j ZUtleSk7CisgICAgKmVuYWJsZWQgPSB0cnVlOwogICAgIHJldHVybiBTX09LOwogfQogCi1IUkVT VUxUIFdlYlByZWZlcmVuY2VzOjpzZXRSZXNvdXJjZVRpbWluZ0VuYWJsZWQoQk9PTCBlbmFibGVk KQorSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0UmVzb3VyY2VUaW1pbmdFbmFibGVkKEJPT0wp CiB7Ci0gICAgc2V0Qm9vbFZhbHVlKFdlYktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVu Y2VLZXksIGVuYWJsZWQpOwogICAgIHJldHVybiBTX09LOwogfQogCkBAIC0yMzg1LDcgKzIzNzks NyBAQCBIUkVTVUxUIFdlYlByZWZlcmVuY2VzOjpyZXNvdXJjZVRpbWluZ0VuCiB7CiAgICAgaWYg KCFlbmFibGVkKQogICAgICAgICByZXR1cm4gRV9QT0lOVEVSOwotICAgICplbmFibGVkID0gYm9v bFZhbHVlRm9yS2V5KFdlYktpdFJlc291cmNlVGltaW5nRW5hYmxlZFByZWZlcmVuY2VLZXkpOwor ICAgICplbmFibGVkID0gdHJ1ZTsKICAgICByZXR1cm4gU19PSzsKIH0KIApJbmRleDogU291cmNl L1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dExlZ2FjeS93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDI2NzE5NCkKKysrIFNvdXJjZS9XZWJL aXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjU5LDE2ICs1MjU5 LDYgQEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZQogICAgICAgICBy ZXR1cm4gaHI7CiAgICAgc2V0dGluZ3Muc2V0Q1NTQ3VzdG9tUHJvcGVydGllc0FuZFZhbHVlc0Vu YWJsZWQoISFlbmFibGVkKTsKIAotICAgIGhyID0gcHJlZnNQcml2YXRlLT51c2VyVGltaW5nRW5h YmxlZCgmZW5hYmxlZCk7Ci0gICAgaWYgKEZBSUxFRChocikpCi0gICAgICAgIHJldHVybiBocjsK LSAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNldFVzZXJUaW1p bmdFbmFibGVkKCEhZW5hYmxlZCk7Ci0KLSAgICBociA9IHByZWZzUHJpdmF0ZS0+cmVzb3VyY2VU aW1pbmdFbmFibGVkKCZlbmFibGVkKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgcmV0 dXJuIGhyOwotICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0 UmVzb3VyY2VUaW1pbmdFbmFibGVkKCEhZW5hYmxlZCk7Ci0KICAgICBociA9IHByZWZzUHJpdmF0 ZS0+bGlua1ByZWxvYWRFbmFibGVkKCZlbmFibGVkKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAg ICAgICAgcmV0dXJuIGhyOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjY3MjEzKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDktMTcgIFNhbSBXZWluaWcgIDx3ZWlu aWdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBydW50aW1lIHNldHRpbmcgZm9yIGVuYWJs aW5nL2Rpc2FibGluZyB0aGUgVXNlclRpbWluZyBhbmQgUmVzb3VyY2VUaW1pbmcgQVBJcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTU2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHJ1bnRp bWUgc2V0dGluZyBmb3IgZW5hYmxpbmcvZGlzYWJsaW5nIFVzZXJUaW1pbmcgYW5kIFJlc291cmNl VGltaW5nIAorICAgICAgICBBUElzLiBUaGV5IGhhdmUgYm90aCBiZWVuIG9uIGZvciBhIHdoaWxl IGluIFdlYktpdDIgYW5kIHRoZXJlIGFyZW4ndCBhbnkKKyAgICAgICAga25vd24gdXNlcyBjYXNl cyBmb3IgZGlzYWJsaW5nIHRoZW0uIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRoZSBzZXR0aW5n LCAKKyAgICAgICAgdGhleSBhcmUgbm93IGVuYWJsZWQgaW4gTGVnYWN5V2ViS2l0IGFzIHdlbGwu CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAg ICAgIChyZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocmVzZXRXZWJQ cmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpyZXNl dFByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKToKKwogMjAyMC0wOS0xNyAgVsOtY3RvciBN YW51ZWwgSsOhcXVleiBMZWFsICA8dmphcXVlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0 cGFrIFNES10gYndyYXA6IGFkZCBwaXBld2lyZSBzb2NrZXQgYXMgYmluZCBtb3VudApJbmRleDog VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQkocmV2aXNpb24gMjY3 MTk0KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC05NTEsOCArOTUxLDYgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJQcmVmZXJl bmNlc1RvQ29uc2lzdAogICAgIFtwcmVmZXJlbmNlcyBzZXRMYXJnZUltYWdlQXN5bmNEZWNvZGlu Z0VuYWJsZWQ6Tk9dOwogCiAgICAgW3ByZWZlcmVuY2VzIHNldE1vZGVybk1lZGlhQ29udHJvbHNF bmFibGVkOllFU107Ci0gICAgW3ByZWZlcmVuY2VzIHNldFJlc291cmNlVGltaW5nRW5hYmxlZDpZ RVNdOwotICAgIFtwcmVmZXJlbmNlcyBzZXRVc2VyVGltaW5nRW5hYmxlZDpZRVNdOwogCiAgICAg W3ByZWZlcmVuY2VzIHNldENhY2hlQVBJRW5hYmxlZDpOT107CiAgICAgcHJlZmVyZW5jZXMubWVk aWFDYXBhYmlsaXRpZXNFbmFibGVkID0gWUVTOwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUv d2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiAyNjcxOTQpCisrKyBUb29scy9EdW1w UmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OTYs OCArODk2LDYgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJQcmVmZXJlbmNlc1RvQ29uc2lzdAogCiAg ICAgcHJlZmVyZW5jZXMtPnNldEZvbnRTbW9vdGhpbmcoRm9udFNtb290aGluZ1R5cGVTdGFuZGFy ZCk7CiAKLSAgICBwcmVmc1ByaXZhdGUtPnNldFJlc291cmNlVGltaW5nRW5hYmxlZChUUlVFKTsK LSAgICBwcmVmc1ByaXZhdGUtPnNldFVzZXJUaW1pbmdFbmFibGVkKFRSVUUpOwogICAgIHByZWZz UHJpdmF0ZS0+c2V0RGF0YVRyYW5zZmVySXRlbXNFbmFibGVkKFRSVUUpOwogICAgIHByZWZzUHJp dmF0ZS0+Y2xlYXJOZXR3b3JrTG9hZGVyU2Vzc2lvbigpOwogCkluZGV4OiBUb29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjY3MTk0KQorKysgVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1 Niw4ICs5NTYsNiBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpyZXNldFByZWZlcmVuY2VzVG9DCiAg ICAgV0tQcmVmZXJlbmNlc1NldElzTlNVUkxTZXNzaW9uV2ViU29ja2V0RW5hYmxlZChwcmVmZXJl bmNlcywgZmFsc2UpOwogCiAgICAgV0tQcmVmZXJlbmNlc1NldEZldGNoQVBJS2VlcEFsaXZlRW5h YmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7Ci0gICAgV0tQcmVmZXJlbmNlc1NldFJlc291cmNlVGlt aW5nRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7Ci0gICAgV0tQcmVmZXJlbmNlc1NldFVzZXJU aW1pbmdFbmFibGVkKHByZWZlcmVuY2VzLCB0cnVlKTsKICAgICBXS1ByZWZlcmVuY2VzU2V0TWVk aWFQcmVsb2FkaW5nRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNl c1NldEV4cG9zZVNwZWFrZXJzRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVm ZXJlbmNlc1NldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUocHJlZmVyZW5jZXMsIHRydWUpOwo=