146249 2015-06-23 14:40:01 -0700 Update JavaScript dialog delegates to include a WKSecurityOriginRef argument 2015-06-28 08:32:48 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=146396 InRadar P2 Normal --- 1 beidson beidson commit-queue mitz oldest_to_newest 1104188 0 beidson 2015-06-23 14:40:01 -0700 Update JavaScript dialog delegates to include a WKSecurityOriginRef argument. This is the C-SPI version of https://bugs.webkit.org/show_bug.cgi?id=146162 In radar as rdar://problem/21269187 1104190 1 255437 beidson 2015-06-23 14:44:25 -0700 Created attachment 255437 Patch v1 1104192 2 commit-queue 2015-06-23 14:46:34 -0700 Attachment 255437 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/C/WKPage.cpp:1411: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/API/C/WKPage.cpp:1427: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/API/C/WKPage.cpp:1444: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 1104233 3 255437 achristensen 2015-06-23 16:13:10 -0700 Comment on attachment 255437 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=255437&action=review > Source/WebKit2/UIProcess/API/C/WKPageUIClient.h:121 > + WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5; > + WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5; > + WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5; You shouldn't need to change the name of V0-V4 and the unnamed one, right? > Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:60 > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; otter (ditto to a later comment) > Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:115 > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; Please change the name of the function, too. Line 60. That will avoid lots of confusion. > Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:102 > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; ditto. 1104250 4 beidson 2015-06-23 17:06:50 -0700 (In reply to comment #3) > Comment on attachment 255437 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255437&action=review > > > Source/WebKit2/UIProcess/API/C/WKPageUIClient.h:121 > > + WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5; > > + WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5; > > + WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5; > > You shouldn't need to change the name of V0-V4 and the unnamed one, right? That's actually not right - We change the name in earlier versions. But this did make me realize ForUseWithV5 is wrong - It's ForUseWithV0, as we tag with the first version the method originally appeared in. > > > Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:60 > > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; > > otter (ditto to a later comment) > > > Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:115 > > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; > > Please change the name of the function, too. Line 60. That will avoid lots > of confusion. > > > Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:102 > > + uiClient.runJavaScriptAlert_deprecatedForUseWithV5 = runJavaScriptAlert; > > ditto. Will do, thanks! 1104393 5 beidson 2015-06-24 09:59:04 -0700 http://trac.webkit.org/changeset/185915 1105276 6 mitz 2015-06-28 08:32:48 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 255437 [details] > > Patch v1 > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=255437&action=review > > > > > Source/WebKit2/UIProcess/API/C/WKPageUIClient.h:121 > > > + WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5; > > > + WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5; > > > + WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5; > > > > You shouldn't need to change the name of V0-V4 and the unnamed one, right? > > That's actually not right - We change the name in earlier versions. The goes back to when we intended for clients to be using the “current” version of the clients. Now the clients are using specific versions, there is no reason to introduce a source incompatibility like this. Filed bug 146396. 255437 2015-06-23 14:44:25 -0700 2015-06-23 16:13:10 -0700 Patch v1 patch text/plain 34274 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NDgwYTBjLi5jNmEyMTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTUtMDYtMjMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBKYXZhU2NyaXB0IGRpYWxvZyBkZWxlZ2F0ZXMgdG8gaW5jbHVkZSBhIFdLU2Vj dXJpdHlPcmlnaW5SZWYgYXJndW1lbnQuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTI2OTE4 Nz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYyNDkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU2V0UGFnZVVJQ2xpZW50KTogQ2Fs bCB0aGUgbmV3IHNpZ25hdHVyZSBpZiB0aGUgY2xpZW50IGhhcyBpdCBzZXQuCisgICAgICAgICAg T3RoZXJ3aXNlIGZhbGwgYmFjayB0byB0aGUgb2xkIHNpZ25hdHVyZS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0MvV0tQYWdlVUlDbGllbnQuaDogRGVwcmVjYXRlIHRoZSBvbGQgbWV0aG9kIHNp Z25hdHVyZSwgYW5kIGFkZCB0aGUgbmV3CisgICAgICAgICAgb25lIHRvIHRoZSBuZXdlc3QgVjUg Y2xpZW50IHN0cnVjdHVyZS4KKwogMjAxNS0wNi0yMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgYnVpbGQg YWZ0ZXIgcjE4NTg3NiBhbmQgcjE4NTg3Ny4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUGFnZS5jcHAKaW5kZXggZTJiNGFlOC4uN2I1YWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTE0MDgsMzYgKzE0MDgsNTMgQEAgdm9pZCBXS1Bh Z2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBhZ2VSZWYsIGNvbnN0IFdLUGFnZVVJQ2xpZW50 QmFzZSogd2tDbGllbnQKICAgICAgICAgICAgIG1fY2xpZW50LnVuZm9jdXModG9BUEkocGFnZSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KIAotICAgICAgICB2aXJ0dWFs IHZvaWQgcnVuSmF2YVNjcmlwdEFsZXJ0KFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5n JiBtZXNzYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRh Jiwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikgb3ZlcnJpZGUKKyAg ICAgICAgdmlydHVhbCB2b2lkIHJ1bkphdmFTY3JpcHRBbGVydChXZWJQYWdlUHJveHkqIHBhZ2Us IGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW5EYXRhLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+ IGNvbXBsZXRpb25IYW5kbGVyKSBvdmVycmlkZQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAo IW1fY2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydCkgeworICAgICAgICAgICAgaWYgKCFtX2NsaWVu dC5ydW5KYXZhU2NyaXB0QWxlcnQgJiYgIW1fY2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydF9kZXBy ZWNhdGVkRm9yVXNlV2l0aFY1KSB7CiAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IG1fY2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydCh0b0FQSShwYWdlKSwgdG9BUEkobWVzc2FnZS5p bXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAg ICAgICBpZiAobV9jbGllbnQucnVuSmF2YVNjcmlwdEFsZXJ0KSB7CisgICAgICAgICAgICAgICAg UmVmUHRyPEFQSTo6U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luID0gQVBJOjpTZWN1cml0 eU9yaWdpbjo6Y3JlYXRlKHNlY3VyaXR5T3JpZ2luRGF0YS5wcm90b2NvbCwgc2VjdXJpdHlPcmln aW5EYXRhLmhvc3QsIHNlY3VyaXR5T3JpZ2luRGF0YS5wb3J0KTsKKyAgICAgICAgICAgICAgICBt X2NsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQodG9BUEkocGFnZSksIHRvQVBJKG1lc3NhZ2UuaW1w bCgpKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShzZWN1cml0eU9yaWdpbi5nZXQoKSksIG1fY2xpZW50 LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBt X2NsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSh0b0FQSShw YWdlKSwgdG9BUEkobWVzc2FnZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmJhc2Uu Y2xpZW50SW5mbyk7CisKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgICAg IH0KIAotICAgICAgICB2aXJ0dWFsIHZvaWQgcnVuSmF2YVNjcmlwdENvbmZpcm0oV2ViUGFnZVBy b3h5KiBwYWdlLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBj b25zdCBTZWN1cml0eU9yaWdpbkRhdGEmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGJvb2wpPiBjb21w bGV0aW9uSGFuZGxlcikgb3ZlcnJpZGUKKyAgICAgICAgdmlydHVhbCB2b2lkIHJ1bkphdmFTY3Jp cHRDb25maXJtKFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBXZWJG cmFtZVByb3h5KiBmcmFtZSwgY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBzZWN1cml0eU9yaWdp bkRhdGEsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoYm9vbCk+IGNvbXBsZXRpb25IYW5kbGVyKSBvdmVy cmlkZQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIW1fY2xpZW50LnJ1bkphdmFTY3JpcHRD b25maXJtKSB7CisgICAgICAgICAgICBpZiAoIW1fY2xpZW50LnJ1bkphdmFTY3JpcHRDb25maXJt ICYmICFtX2NsaWVudC5ydW5KYXZhU2NyaXB0Q29uZmlybV9kZXByZWNhdGVkRm9yVXNlV2l0aFY1 KSB7CiAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoZmFsc2UpOwogICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgYm9vbCByZXN1bHQg PSBtX2NsaWVudC5ydW5KYXZhU2NyaXB0Q29uZmlybSh0b0FQSShwYWdlKSwgdG9BUEkobWVzc2Fn ZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAg ICAgICAgICBib29sIHJlc3VsdDsKKyAgICAgICAgICAgIGlmIChtX2NsaWVudC5ydW5KYXZhU2Ny aXB0Q29uZmlybSkgeworICAgICAgICAgICAgICAgIFJlZlB0cjxBUEk6OlNlY3VyaXR5T3JpZ2lu PiBzZWN1cml0eU9yaWdpbiA9IEFQSTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShzZWN1cml0eU9y aWdpbkRhdGEucHJvdG9jb2wsIHNlY3VyaXR5T3JpZ2luRGF0YS5ob3N0LCBzZWN1cml0eU9yaWdp bkRhdGEucG9ydCk7CisgICAgICAgICAgICAgICAgcmVzdWx0ID0gbV9jbGllbnQucnVuSmF2YVNj cmlwdENvbmZpcm0odG9BUEkocGFnZSksIHRvQVBJKG1lc3NhZ2UuaW1wbCgpKSwgdG9BUEkoZnJh bWUpLCB0b0FQSShzZWN1cml0eU9yaWdpbi5nZXQoKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5m byk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICByZXN1bHQgPSBtX2NsaWVu dC5ydW5KYXZhU2NyaXB0Q29uZmlybV9kZXByZWNhdGVkRm9yVXNlV2l0aFY1KHRvQVBJKHBhZ2Up LCB0b0FQSShtZXNzYWdlLmltcGwoKSksIHRvQVBJKGZyYW1lKSwgbV9jbGllbnQuYmFzZS5jbGll bnRJbmZvKTsKKwogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIocmVzdWx0KTsKICAgICAg ICAgfQogCi0gICAgICAgIHZpcnR1YWwgdm9pZCBydW5KYXZhU2NyaXB0UHJvbXB0KFdlYlBhZ2VQ cm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlZmF1bHRW YWx1ZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYsIHN0 ZDo6ZnVuY3Rpb248dm9pZCAoY29uc3QgU3RyaW5nJik+IGNvbXBsZXRpb25IYW5kbGVyKSBvdmVy cmlkZQorICAgICAgICB2aXJ0dWFsIHZvaWQgcnVuSmF2YVNjcmlwdFByb21wdChXZWJQYWdlUHJv eHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFs dWUsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3Vy aXR5T3JpZ2luRGF0YSwgc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmKT4gY29tcGxl dGlvbkhhbmRsZXIpIG92ZXJyaWRlCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmICghbV9jbGll bnQucnVuSmF2YVNjcmlwdFByb21wdCkgeworICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5ydW5K YXZhU2NyaXB0UHJvbXB0ICYmICFtX2NsaWVudC5ydW5KYXZhU2NyaXB0UHJvbXB0X2RlcHJlY2F0 ZWRGb3JVc2VXaXRoVjUpIHsKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihTdHJp bmcoKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBSZWZQdHI8QVBJOjpTdHJpbmc+IHN0cmluZyA9IGFkb3B0UmVmKHRvSW1wbChtX2NsaWVu dC5ydW5KYXZhU2NyaXB0UHJvbXB0KHRvQVBJKHBhZ2UpLCB0b0FQSShtZXNzYWdlLmltcGwoKSks IHRvQVBJKGRlZmF1bHRWYWx1ZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmJhc2Uu Y2xpZW50SW5mbykpKTsKKyAgICAgICAgICAgIFJlZlB0cjxBUEk6OlN0cmluZz4gc3RyaW5nOwor ICAgICAgICAgICAgaWYgKG1fY2xpZW50LnJ1bkphdmFTY3JpcHRQcm9tcHQpIHsKKyAgICAgICAg ICAgICAgICBSZWZQdHI8QVBJOjpTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW4gPSBBUEk6 OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoc2VjdXJpdHlPcmlnaW5EYXRhLnByb3RvY29sLCBzZWN1 cml0eU9yaWdpbkRhdGEuaG9zdCwgc2VjdXJpdHlPcmlnaW5EYXRhLnBvcnQpOworICAgICAgICAg ICAgICAgIHN0cmluZyA9IGFkb3B0UmVmKHRvSW1wbChtX2NsaWVudC5ydW5KYXZhU2NyaXB0UHJv bXB0KHRvQVBJKHBhZ2UpLCB0b0FQSShtZXNzYWdlLmltcGwoKSksIHRvQVBJKGRlZmF1bHRWYWx1 ZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIHRvQVBJKHNlY3VyaXR5T3JpZ2luLmdldCgpKSwgbV9j bGllbnQuYmFzZS5jbGllbnRJbmZvKSkpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICAgICAgc3RyaW5nID0gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LnJ1bkphdmFTY3JpcHRQcm9t cHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSh0b0FQSShwYWdlKSwgdG9BUEkobWVzc2FnZS5pbXBs KCkpLCB0b0FQSShkZWZhdWx0VmFsdWUuaW1wbCgpKSwgdG9BUEkoZnJhbWUpLCBtX2NsaWVudC5i YXNlLmNsaWVudEluZm8pKSk7CisKICAgICAgICAgICAgIGlmICghc3RyaW5nKSB7CiAgICAgICAg ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoU3RyaW5nKCkpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VV SUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZVVJQ2xpZW50 LmgKaW5kZXggOWNhMDY2ZC4uYmUyMjZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZVVJQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZVVJQ2xpZW50LmgKQEAgLTUwLDkgKzUwLDkgQEAgdHlwZWRlZiB1aW50 MzJfdCBXS1BsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uOwogCiB0eXBlZGVmIHZvaWQgKCpXS1Bh Z2VVSUNsaWVudENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5m byk7CiB0eXBlZGVmIFdLUGFnZVJlZiAoKldLUGFnZUNyZWF0ZU5ld1BhZ2VDYWxsYmFjaykoV0tQ YWdlUmVmIHBhZ2UsIFdLVVJMUmVxdWVzdFJlZiB1cmxSZXF1ZXN0LCBXS0RpY3Rpb25hcnlSZWYg ZmVhdHVyZXMsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24g bW91c2VCdXR0b24sIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwotdHlwZWRlZiB2b2lkICgqV0tQ YWdlUnVuSmF2YVNjcmlwdEFsZXJ0Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1Jl ZiBhbGVydFRleHQsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwot dHlwZWRlZiBib29sICgqV0tQYWdlUnVuSmF2YVNjcmlwdENvbmZpcm1DYWxsYmFjaykoV0tQYWdl UmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG1lc3NhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZv aWQgKmNsaWVudEluZm8pOwotdHlwZWRlZiBXS1N0cmluZ1JlZiAoKldLUGFnZVJ1bkphdmFTY3Jp cHRQcm9tcHRDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG1lc3NhZ2UsIFdL U3RyaW5nUmVmIGRlZmF1bHRWYWx1ZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7Cit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFtZVJlZiBmcmFt ZSwgV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbiwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7Cit0eXBlZGVmIGJvb2wgKCpXS1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmlybUNhbGxiYWNr KShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiBmcmFtZSwg V0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbiwgY29uc3Qgdm9pZCAqY2xpZW50SW5m byk7Cit0eXBlZGVmIFdLU3RyaW5nUmVmICgqV0tQYWdlUnVuSmF2YVNjcmlwdFByb21wdENhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tTdHJpbmdSZWYgZGVm YXVsdFZhbHVlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5 T3JpZ2luLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZVRh a2VGb2N1c0NhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGb2N1c0RpcmVjdGlvbiBkaXJlY3Rp b24sIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRm9jdXND YWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRl ZiB2b2lkICgqV0tQYWdlVW5mb2N1c0NhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9p ZCAqY2xpZW50SW5mbyk7CkBAIC05Nyw2ICs5Nyw5IEBAIHR5cGVkZWYgV0tQYWdlUmVmICgqV0tQ YWdlQ3JlYXRlTmV3UGFnZUNhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApKFdLUGFnZVJl CiB0eXBlZGVmIHZvaWQgICAgICAoKldLUGFnZU1vdXNlRGlkTW92ZU92ZXJFbGVtZW50Q2FsbGJh Y2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkoV0tQYWdlUmVmIHBhZ2UsIFdLRXZlbnRNb2RpZmll cnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OwogdHlwZWRlZiB2b2lkICgqV0tQYWdlTWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRDYWxsYmFj a19kZXByZWNhdGVkRm9yVXNlV2l0aFYwKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWlt ZVR5cGUsIFdLU3RyaW5nUmVmIHVybCwgV0tTdHJpbmdSZWYgcGx1Z2luc1BhZ2VVUkwsIGNvbnN0 IHZvaWQqIGNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlVW5hdmFpbGFibGVQbHVn aW5CdXR0b25DbGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMSkoV0tQYWdlUmVm IHBhZ2UsIFdLUGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gcGx1Z2luVW5hdmFpbGFiaWxpdHlS ZWFzb24sIFdLU3RyaW5nUmVmIG1pbWVUeXBlLCBXS1N0cmluZ1JlZiB1cmwsIFdLU3RyaW5nUmVm IHBsdWdpbnNQYWdlVVJMLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAo KldLUGFnZVJ1bkphdmFTY3JpcHRBbGVydENhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjUp KFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBhbGVydFRleHQsIFdLRnJhbWVSZWYgZnJhbWUs IGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiBib29sICgqV0tQYWdlUnVuSmF2YVNj cmlwdENvbmZpcm1DYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFY1KShXS1BhZ2VSZWYgcGFn ZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7Cit0eXBlZGVmIFdLU3RyaW5nUmVmICgqV0tQYWdlUnVuSmF2YVNjcmlwdFByb21w dENhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjUpKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiBtZXNzYWdlLCBXS1N0cmluZ1JlZiBkZWZhdWx0VmFsdWUsIFdLRnJhbWVSZWYgZnJhbWUs IGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogCiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVu dEJhc2UgewogICAgIGludCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbjsKQEAgLTExMyw5ICsxMTYsOSBAQCB0eXBl ZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudFYwIHsKICAgICBXS1BhZ2VUYWtlRm9jdXNDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRha2VGb2N1czsK ICAgICBXS1BhZ2VGb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGZvY3VzOwogICAgIFdLUGFnZVVuZm9jdXNDYWxsYmFjayAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5mb2N1czsKLSAgICBXS1Bh Z2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydDsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmly bUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRD b25maXJtOwotICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdDsKKyAgICBXS1BhZ2VS dW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAgICAg ICAgIHJ1bkphdmFTY3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1OworICAgIFdLUGFn ZVJ1bkphdmFTY3JpcHRDb25maXJtQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAg ICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm1fZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKKyAgICBX S1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAg ICAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKICAg ICBXS1BhZ2VTZXRTdGF0dXNUZXh0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNldFN0YXR1c1RleHQ7CiAgICAgV0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVs ZW1lbnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYwICAgICAgICBtb3VzZURpZE1vdmVP dmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwOwogICAgIFdLUGFnZU1pc3NpbmdQbHVn aW5CdXR0b25DbGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAgICAgbWlzc2lu Z1BsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMDsKQEAgLTE1OCw5ICsx NjEsOSBAQCB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudFYxIHsKICAgICBXS1BhZ2VUYWtl Rm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRha2VGb2N1czsKICAgICBXS1BhZ2VGb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvY3VzOwogICAgIFdLUGFnZVVuZm9jdXNDYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5mb2N1 czsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydDsKLSAgICBXS1BhZ2VSdW5KYXZh U2NyaXB0Q29uZmlybUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1 bkphdmFTY3JpcHRDb25maXJtOwotICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdDsK KyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0 aFY1ICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1 OworICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRDb25maXJtQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVz ZVdpdGhWNSAgICAgICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm1fZGVwcmVjYXRlZEZvclVzZVdp dGhWNTsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2tfZGVwcmVjYXRlZEZv clVzZVdpdGhWNSAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVwcmVjYXRlZEZvclVz ZVdpdGhWNTsKICAgICBXS1BhZ2VTZXRTdGF0dXNUZXh0Q2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNldFN0YXR1c1RleHQ7CiAgICAgV0tQYWdlTW91c2VE aWRNb3ZlT3ZlckVsZW1lbnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYwICAgICAgICBt b3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwOwogICAgIFdLUGFn ZU1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhW MCAgICAgbWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMDsK QEAgLTIwOSw5ICsyMTIsOSBAQCB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudFYyIHsKICAg ICBXS1BhZ2VUYWtlRm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHRha2VGb2N1czsKICAgICBXS1BhZ2VGb2N1c0NhbGxiYWNrICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvY3VzOwogICAgIFdLUGFn ZVVuZm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdW5mb2N1czsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydDsKLSAgICBX S1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmlybUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJ1bkphdmFTY3JpcHRDb25maXJtOwotICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQ cm9tcHRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNj cmlwdFByb21wdDsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFja19kZXByZWNh dGVkRm9yVXNlV2l0aFY1ICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydF9kZXByZWNhdGVk Rm9yVXNlV2l0aFY1OworICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRDb25maXJtQ2FsbGJhY2tfZGVw cmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm1fZGVwcmVj YXRlZEZvclVzZVdpdGhWNTsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2tf ZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVw cmVjYXRlZEZvclVzZVdpdGhWNTsKICAgICBXS1BhZ2VTZXRTdGF0dXNUZXh0Q2FsbGJhY2sgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldFN0YXR1c1RleHQ7CiAgICAg V0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0 aFYwICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYw OwogICAgIFdLUGFnZU1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRl ZEZvclVzZVdpdGhWMCAgICAgbWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZv clVzZVdpdGhWMDsKQEAgLTI2NSw5ICsyNjgsOSBAQCB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNs aWVudFYzIHsKICAgICBXS1BhZ2VUYWtlRm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRha2VGb2N1czsKICAgICBXS1BhZ2VGb2N1c0NhbGxi YWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvY3Vz OwogICAgIFdLUGFnZVVuZm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5mb2N1czsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRB bGVydDsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmlybUNhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRDb25maXJtOwotICAgIFdLUGFnZVJ1 bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcnVuSmF2YVNjcmlwdFByb21wdDsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxs YmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVy dF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1OworICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRDb25maXJt Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAgcnVuSmF2YVNjcmlwdENv bmZpcm1fZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJv bXB0Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAgIHJ1bkphdmFTY3Jp cHRQcm9tcHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKICAgICBXS1BhZ2VTZXRTdGF0dXNUZXh0 Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldFN0YXR1 c1RleHQ7CiAgICAgV0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRDYWxsYmFja19kZXByZWNh dGVkRm9yVXNlV2l0aFYwICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXByZWNhdGVk Rm9yVXNlV2l0aFYwOwogICAgIFdLUGFnZU1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkQ2FsbGJh Y2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAgICAgbWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRf ZGVwcmVjYXRlZEZvclVzZVdpdGhWMDsKQEAgLTMyNCw5ICszMjcsOSBAQCB0eXBlZGVmIHN0cnVj dCBXS1BhZ2VVSUNsaWVudFY0IHsKICAgICBXS1BhZ2VUYWtlRm9jdXNDYWxsYmFjayAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRha2VGb2N1czsKICAgICBXS1Bh Z2VGb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGZvY3VzOwogICAgIFdLUGFnZVVuZm9jdXNDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5mb2N1czsKLSAgICBXS1BhZ2VSdW5KYXZh U2NyaXB0QWxlcnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1 bkphdmFTY3JpcHRBbGVydDsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0Q29uZmlybUNhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRDb25maXJtOwot ICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdDsKKyAgICBXS1BhZ2VSdW5KYXZhU2Ny aXB0QWxlcnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAgICAgICAgIHJ1bkph dmFTY3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1OworICAgIFdLUGFnZVJ1bkphdmFT Y3JpcHRDb25maXJtQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAgcnVu SmF2YVNjcmlwdENvbmZpcm1fZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKKyAgICBXS1BhZ2VSdW5K YXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAgICAgICAgICAg IHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKICAgICBXS1BhZ2VT ZXRTdGF0dXNUZXh0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNldFN0YXR1c1RleHQ7CiAgICAgV0tQYWdlTW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRDYWxs YmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYwICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVu dF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwOwogICAgIFdLUGFnZU1pc3NpbmdQbHVnaW5CdXR0b25D bGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAgICAgbWlzc2luZ1BsdWdpbkJ1 dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMDsKQEAgLTM4OSw5ICszOTIsOSBAQCB0 eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudFY1IHsKICAgICBXS1BhZ2VUYWtlRm9jdXNDYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRha2VGb2N1 czsKICAgICBXS1BhZ2VGb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZvY3VzOwogICAgIFdLUGFnZVVuZm9jdXNDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5mb2N1czsKLSAgICBX S1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydDsKLSAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0Q29u ZmlybUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3Jp cHRDb25maXJtOwotICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFjayAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdDsKKyAgICBXS1Bh Z2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAg ICAgICAgIHJ1bkphdmFTY3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1OworICAgIFdL UGFnZVJ1bkphdmFTY3JpcHRDb25maXJtQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWNSAg ICAgICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm1fZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsKKyAg ICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhW NSAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNTsK ICAgICBXS1BhZ2VTZXRTdGF0dXNUZXh0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNldFN0YXR1c1RleHQ7CiAgICAgV0tQYWdlTW91c2VEaWRNb3ZlT3Zl ckVsZW1lbnRDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYwICAgICAgICBtb3VzZURpZE1v dmVPdmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwOwogICAgIFdLUGFnZU1pc3NpbmdQ bHVnaW5CdXR0b25DbGlja2VkQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCAgICAgbWlz c2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMDsKQEAgLTQ0Niw2 ICs0NDksOSBAQCB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VVSUNsaWVudFY1IHsKICAgICAvLyBWZXJz aW9uIDUuCiAgICAgV0tQYWdlRGVjaWRlUG9saWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVl c3RDYWxsYmFjayAgICAgICAgICAgICBkZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9u UmVxdWVzdDsKICAgICBXS1BhZ2VEaWRDbGlja0F1dG9GaWxsQnV0dG9uQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZENsaWNrQXV0b0ZpbGxCdXR0b247CisgICAgV0tQ YWdlUnVuSmF2YVNjcmlwdEFsZXJ0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBydW5KYXZhU2NyaXB0QWxlcnQ7CisgICAgV0tQYWdlUnVuSmF2YVNjcmlwdENvbmZp cm1DYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydW5KYXZhU2NyaXB0 Q29uZmlybTsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0Q2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHQ7CiB9IFdLUGFnZVVJ Q2xpZW50VjU7CiAKIGVudW0geyBrV0tQYWdlVUlDbGllbnRDdXJyZW50VmVyc2lvbiBXS19FTlVN X0RFUFJFQ0FURUQoIlVzZSBhbiBleHBsaWNpdCB2ZXJzaW9uIG51bWJlciBpbnN0ZWFkIikgPSAy IH07CkBAIC00NjAsOSArNDY2LDkgQEAgdHlwZWRlZiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgewog ICAgIFdLUGFnZVRha2VGb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGFrZUZvY3VzOwogICAgIFdLUGFnZUZvY3VzQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9jdXM7CiAgICAgV0tQ YWdlVW5mb2N1c0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bmZvY3VzOwotICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRBbGVydENhbGxiYWNrICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdEFsZXJ0OwotICAg IFdLUGFnZVJ1bkphdmFTY3JpcHRDb25maXJtQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcnVuSmF2YVNjcmlwdENvbmZpcm07Ci0gICAgV0tQYWdlUnVuSmF2YVNjcmlw dFByb21wdENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBydW5KYXZh U2NyaXB0UHJvbXB0OworICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRBbGVydENhbGxiYWNrX2RlcHJl Y2F0ZWRGb3JVc2VXaXRoVjUgICAgICAgICAgICAgcnVuSmF2YVNjcmlwdEFsZXJ0X2RlcHJlY2F0 ZWRGb3JVc2VXaXRoVjU7CisgICAgV0tQYWdlUnVuSmF2YVNjcmlwdENvbmZpcm1DYWxsYmFja19k ZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAgICAgICBydW5KYXZhU2NyaXB0Q29uZmlybV9kZXBy ZWNhdGVkRm9yVXNlV2l0aFY1OworICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRQcm9tcHRDYWxsYmFj a19kZXByZWNhdGVkRm9yVXNlV2l0aFY1ICAgICAgICAgICAgcnVuSmF2YVNjcmlwdFByb21wdF9k ZXByZWNhdGVkRm9yVXNlV2l0aFY1OwogICAgIFdLUGFnZVNldFN0YXR1c1RleHRDYWxsYmFjayAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2V0U3RhdHVzVGV4dDsKICAg ICBXS1BhZ2VNb3VzZURpZE1vdmVPdmVyRWxlbWVudENhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VX aXRoVjAgICAgICAgIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50X2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjA7CiAgICAgV0tQYWdlTWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRDYWxsYmFja19kZXByZWNh dGVkRm9yVXNlV2l0aFYwICAgICBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZF9kZXByZWNhdGVk Rm9yVXNlV2l0aFYwOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDUzYjE0MzEuLjlkYWE5MWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MyBAQAogMjAxNS0wNi0yMyAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgVXBkYXRlIEphdmFTY3JpcHQg ZGlhbG9nIGRlbGVnYXRlcyB0byBpbmNsdWRlIGEgV0tTZWN1cml0eU9yaWdpblJlZiBhcmd1bWVu dC4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxMjY5MTg3PiBhbmQgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gVXBkYXRlIFdLVFIgdG8gdGhlIG5ldyBjbGllbnQg c3RydWN0dXJlLgorICAgICAgICAtIFVwZGF0ZSBleGlzdGluZyBUZXN0V2ViS2l0QVBJIHRlc3Rz IHRvIGVpdGhlciB1c2UgdGhlIG5ldyBjbGllbnQgc3RydWN0dXJlIG9yCisgICAgICAgICAgYXNz aWduIHRoZSBvbGQgZnVuY3Rpb24gc2lnbmF0dXJlIHRvIHRoZSB1cGRhdGVkIHZhcmlhYmxlIG5h bWUuCisgICAgICAgIC0gSW5jbHVkZSBhIG5ldyB0ZXN0LgorCisgICAgICAgICogVGVzdFdlYktp dEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvQ2xvc2VGcm9tV2l0aGluQ3JlYXRlUGFnZS5j cHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpydW5KYXZhU2NyaXB0QWxlcnQpOgorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0RvY3VtZW50U3RhcnRVc2VyU2NyaXB0 QWxlcnRDcmFzaC5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9Nb2RhbEFsZXJ0c1NQSS5jcHA6CisgICAg ICAgIChUZXN0V2ViS2l0QVBJOjphbmFseXplRGlhbG9nQXJndW1lbnRzKToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OnJ1bkphdmFTY3JpcHRBbGVydCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpydW5KYXZh U2NyaXB0UHJvbXB0KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OmNyZWF0ZU5ld1BhZ2UpOgor ICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL21hYy9GdWxsc2NyZWVuWm9vbUluaXRpYWxGcmFtZS5tbToKKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OkZ1bGxzY3JlZW5ab29tSW5pdGlhbEZyYW1lOjppbml0aWFsaXplVmlldyk6CisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9QYWdlVmlzaWJpbGl0eVN0YXRlV2l0 aFdpbmRvd0NoYW5nZXMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpQYWdlVmlzaWJpbGl0 eVN0YXRlV2l0aFdpbmRvd0NoYW5nZXM6OmluaXRpYWxpemVWaWV3KToKKworICAgICAgICAqIFdl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29u dHJvbGxlcjo6Y3JlYXRlT3RoZXJQYWdlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OmNyZWF0ZVdlYlZpZXdXaXRoT3B0aW9ucyk6CisKKzIwMTUtMDYtMjMgIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIFdLRnJhbWVJbmZvIHNob3VsZCBoYXZlIGFu IGFjY2Vzc29yIGZvciB0aGUgRnJhbWUncyBjdXJyZW50IHNlY3VyaXR5IG9yaWdpbi4KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE2MgogCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvaiBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IGQ5Njk4MGUuLjQ4MzBhNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCkBAIC01MSw2ICs1MSw3IEBACiAJCTUxMzkzRTIyMTUyMzk1MkQwMDVGMzlDNSAvKiBE T01XaW5kb3dFeHRlbnNpb25CYXNpY19CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTEzOTNFMUQxNTIzOTQ0QTAwNUYzOUM1IC8qIERPTVdp bmRvd0V4dGVuc2lvbkJhc2ljX0J1bmRsZS5jcHAgKi87IH07CiAJCTUxNDJCMjczMTUxN0M4Qzgw MEMzMkIxOSAvKiBDb250ZXh0TWVudUNhbkNvcHlVUkwuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTQyQjI3MjE1MTdDODkxMDBDMzJC MTkgLyogQ29udGV4dE1lbnVDYW5Db3B5VVJMLmh0bWwgKi87IH07CiAJCTUxN0U3RTA0MTUxMTE5 QzEwMEQwQjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUu aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA1MTdFN0UwMzE1MTExODc1MDBEMEIwMDggLyogTWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJlc291 cmNlTG9hZERlbGVnYXRlLmh0bWwgKi87IH07CisJCTUxQ0I0QUQ4MUIzQTA3OUMwMEMxQjFDNiAv KiBNb2RhbEFsZXJ0c1NQSS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA1MUNCNEFENzFCM0EwNzlDMDBDMUIxQzYgLyogTW9kYWxBbGVydHNTUEkuY3Bw ICovOyB9OwogCQk1MUNEMUM2QzFCMzhDRTQzMDAxNDJDQTUgLyogTW9kYWxBbGVydHMubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUNEMUM2QTFCMzhD RTM2MDAxNDJDQTUgLyogTW9kYWxBbGVydHMubW0gKi87IH07CiAJCTUxQ0QxQzcyMUIzOEQ0ODQw MDE0MkNBNSAvKiBtb2RhbC1hbGVydHMtaW4tbmV3LWFib3V0LWJsYW5rLXdpbmRvdy5odG1sIGlu IENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxQ0Qx QzcxMUIzOEQ0ODQwMDE0MkNBNSAvKiBtb2RhbC1hbGVydHMtaW4tbmV3LWFib3V0LWJsYW5rLXdp bmRvdy5odG1sICovOyB9OwogCQk1MUU1QzcwMjE5MTlDM0IyMDBEOEIzRTEgLyogc2ltcGxlMi5o dG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDUxRTc4MDM2MTkxOUFGRjgwMDE4MjlBMiAvKiBzaW1wbGUyLmh0bWwgKi87IH07CkBAIC01MTks NiArNTIwLDcgQEAKIAkJNTE0MkIyNzIxNTE3Qzg5MTAwQzMyQjE5IC8qIENvbnRleHRNZW51Q2Fu Q29weVVSTC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gQ29udGV4dE1lbnVDYW5D b3B5VVJMLmh0bWw7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxN0U3REZCMTUxMTBF QTYwMEQwQjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUu bW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBNZW1vcnlDYWNoZVBy dW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTUxN0U3RTAzMTUxMTE4NzUwMEQwQjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0aGlu UmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9IE1l bW9yeUNhY2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5odG1sOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQk1MUNCNEFENzFCM0EwNzlDMDBDMUIxQzYgLyogTW9kYWxBbGVy dHNTUEkuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTW9kYWxBbGVy dHNTUEkuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MUNEMUM2QTFCMzhDRTM2 MDAxNDJDQTUgLyogTW9kYWxBbGVydHMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBNb2RhbEFsZXJ0cy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NTFDRDFDNzExQjM4RDQ4NDAwMTQyQ0E1IC8qIG1vZGFsLWFsZXJ0cy1pbi1uZXctYWJvdXQtYmxh bmstd2luZG93Lmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAibW9kYWwtYWxlcnRzLWluLW5ldy1hYm91dC1ibGFu ay13aW5kb3cuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxRTVDNzA0MTkx OUVBNUYwMEQ4QjNFMSAvKiBTaG91bGRLZWVwQ3VycmVudEJhY2tGb3J3YXJkTGlzdEl0ZW1Jbkxp c3QuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2hvdWxkS2VlcEN1 cnJlbnRCYWNrRm9yd2FyZExpc3RJdGVtSW5MaXN0LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTEwMDUsNiArMTAwNyw3IEBACiAJCQkJMzNEQzg5MTAxNDE5NTNBMzAwNzQ3RUY3 IC8qIExvYWRDYW5jZWxlZE5vU2VydmVyUmVkaXJlY3RDYWxsYmFjay5jcHAgKi8sCiAJCQkJMzNE Qzg5MTMxNDE5NTc5RjAwNzQ3RUY3IC8qIExvYWRDYW5jZWxlZE5vU2VydmVyUmVkaXJlY3RDYWxs YmFja19CdW5kbGUuY3BwICovLAogCQkJCThBQTI4QzE5MTZEMkZBN0IwMDJGRjREQiAvKiBMb2Fk UGFnZU9uQ3Jhc2guY3BwICovLAorCQkJCTUxQ0I0QUQ3MUIzQTA3OUMwMEMxQjFDNiAvKiBNb2Rh bEFsZXJ0c1NQSS5jcHAgKi8sCiAJCQkJMzNCRTVBRjQxMzdCNUE2QzAwNzA1ODEzIC8qIE1vdXNl TW92ZUFmdGVyQ3Jhc2guY3BwICovLAogCQkJCTMzQkU1QUY4MTM3QjVBQUUwMDcwNTgxMyAvKiBN b3VzZU1vdmVBZnRlckNyYXNoX0J1bmRsZS5jcHAgKi8sCiAJCQkJOTNGMURCMzAxNERBMjA3NjAw MjRDMzYyIC8qIE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dC5jcHAgKi8sCkBAIC0xNjI2 LDYgKzE2MjksNyBAQAogCQkJCTJFNzc2NUNGMTZDNEQ4MTEwMEJBMkJCMSAvKiBtYWluTWFjLm1t IGluIFNvdXJjZXMgKi8sCiAJCQkJNDE5NzNCNUIxQUYyMjg2QTAwNkM3QjM2IC8qIEZpbGVTeXN0 ZW0uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJN0E1NjIzMTExQUQ1QUYzRTAwOTZCOTIwIC8qIE1l bnVUeXBlc0Zvck1vdXNlRXZlbnRzLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTUxQ0I0QUQ4MUIz QTA3OUMwMEMxQjFDNiAvKiBNb2RhbEFsZXJ0c1NQSS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQky NkY2RTFGMDFBREM3NDlCMDBERTY5NkIgLyogREZBTWluaW1pemVyLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCTI2MEJBNTc5MUIxRDJFN0IwMDRGQTA3QyAvKiBERkFDb21iaW5lci5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQk3QTk5RDk5NDFBRDRBMjlEMDAzNzMxNDEgLyogTWVudVR5cGVzRm9yTW91 c2VFdmVudHMubW0gaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mi9DbG9zZUZyb21XaXRoaW5DcmVhdGVQYWdlLmNwcCBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9DbG9zZUZyb21XaXRoaW5DcmVhdGVQYWdlLmNwcApp bmRleCAzNzNjNTcxLi5iNWU0YTkwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDIvQ2xvc2VGcm9tV2l0aGluQ3JlYXRlUGFnZS5jcHAKKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0Nsb3NlRnJvbVdpdGhpbkNyZWF0ZVBhZ2UuY3BwCkBA IC0zNSw3ICszNSw3IEBAIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIHN0YXRpYyBib29sIHRl c3REb25lOwogc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybVdlYlZpZXc+IG9wZW5lZFdl YlZpZXc7CiAKLXN0YXRpYyB2b2lkIHJ1bkphdmFTY3JpcHRBbGVydChXS1BhZ2VSZWYgcGFnZSwg V0tTdHJpbmdSZWYgYWxlcnRUZXh0LCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQorc3RhdGljIHZvaWQgcnVuSmF2YVNjcmlwdEFsZXJ0KFdLUGFnZVJlZiBwYWdlLCBX S1N0cmluZ1JlZiBhbGVydFRleHQsIFdLRnJhbWVSZWYgZnJhbWUsIFdLU2VjdXJpdHlPcmlnaW5S ZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgLy8gRklYTUU6IENoZWNrIHRoYXQg dGhlIGFsZXJ0IHRleHQgbWF0Y2hlcyB0aGUgc3RvcmFnZS4KICAgICB0ZXN0RG9uZSA9IHRydWU7 CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvRG9jdW1lbnRT dGFydFVzZXJTY3JpcHRBbGVydENyYXNoLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Mi9Eb2N1bWVudFN0YXJ0VXNlclNjcmlwdEFsZXJ0Q3Jhc2guY3BwCmluZGV4IDIxYmNh NzQuLjI3OGRhYzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mi9Eb2N1bWVudFN0YXJ0VXNlclNjcmlwdEFsZXJ0Q3Jhc2guY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9Eb2N1bWVudFN0YXJ0VXNlclNjcmlwdEFsZXJ0Q3Jhc2gu Y3BwCkBAIC01Nyw3ICs1Nyw3IEBAIFRFU1QoV2ViS2l0MiwgRG9jdW1lbnRTdGFydFVzZXJTY3Jp cHRBbGVydENyYXNoVGVzdCkKICAgICBtZW1zZXQoJnVpQ2xpZW50LCAwLCBzaXplb2YodWlDbGll bnQpKTsKIAogICAgIHVpQ2xpZW50LmJhc2UudmVyc2lvbiA9IDA7Ci0gICAgdWlDbGllbnQucnVu SmF2YVNjcmlwdEFsZXJ0ID0gcnVuSmF2YVNjcmlwdEFsZXJ0OworICAgIHVpQ2xpZW50LnJ1bkph dmFTY3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1ID0gcnVuSmF2YVNjcmlwdEFsZXJ0 OwogCiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHdlYlZpZXcucGFnZSgpLCAmdWlDbGllbnQu YmFzZSk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9N b2RhbEFsZXJ0c1NQSS5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvTW9k YWxBbGVydHNTUEkuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAyNzhm MDAKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv TW9kYWxBbGVydHNTUEkuY3BwCkBAIC0wLDAgKzEsMTIzIEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRP UlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURF TlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1 ZGUgImNvbmZpZy5oIgorCisjaWYgV0tfSEFWRV9DX1NQSQorCisjaW5jbHVkZSAiUGxhdGZvcm1V dGlsaXRpZXMuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKKyNpbmNsdWRlICJUZXN0 LmgiCisjaW5jbHVkZSA8V2ViS2l0L1dLRnJhbWUuaD4KKyNpbmNsdWRlIDxXZWJLaXQvV0tSZXRh aW5QdHIuaD4KKyNpbmNsdWRlIDxXZWJLaXQvV0tTZWN1cml0eU9yaWdpblJlZi5oPgorCituYW1l c3BhY2UgVGVzdFdlYktpdEFQSSB7CisKK3N0YXRpYyBib29sIGRvbmU7CitzdGF0aWMgdW5zaWdu ZWQgZGlhbG9nc1NlZW47CitzdGF0aWMgY29uc3QgdW5zaWduZWQgZGlhbG9nc0V4cGVjdGVkID0g MzsKKworc3RhdGljIHZvaWQgYW5hbHl6ZURpYWxvZ0FyZ3VtZW50cyhXS1BhZ2VSZWYgcGFnZSwg V0tGcmFtZVJlZiBmcmFtZSwgV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbikKK3sK KyAgICBFWFBFQ1RfRVEocGFnZSwgV0tGcmFtZUdldFBhZ2UoZnJhbWUpKTsKKworICAgIFdLUmV0 YWluUHRyPFdLVVJMUmVmPiB1cmwgPSBhZG9wdFdLKFdLRnJhbWVDb3B5VVJMKGZyYW1lKSk7Cisg ICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHVybFN0cmluZyA9IGFkb3B0V0soV0tVUkxDb3B5 U3RyaW5nKHVybC5nZXQoKSkpOworICAgIEVYUEVDVF9XS19TVFJFUSgiYWJvdXQ6YmxhbmsiLCB1 cmxTdHJpbmcuZ2V0KCkpOworCisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHByb3RvY29s ID0gYWRvcHRXSyhXS1NlY3VyaXR5T3JpZ2luQ29weVByb3RvY29sKHNlY3VyaXR5T3JpZ2luKSk7 CisgICAgRVhQRUNUX1dLX1NUUkVRKCJmaWxlIiwgcHJvdG9jb2wuZ2V0KCkpOworCisgICAgV0tS ZXRhaW5QdHI8V0tTdHJpbmdSZWY+IGhvc3QgPSBhZG9wdFdLKFdLU2VjdXJpdHlPcmlnaW5Db3B5 SG9zdChzZWN1cml0eU9yaWdpbikpOworICAgIEVYUEVDVF9XS19TVFJFUSgiIiwgaG9zdC5nZXQo KSk7CisKKyAgICBFWFBFQ1RfRVEoV0tTZWN1cml0eU9yaWdpbkdldFBvcnQoc2VjdXJpdHlPcmln aW4pLCAwKTsKKworICAgIGlmICgrK2RpYWxvZ3NTZWVuID09IGRpYWxvZ3NFeHBlY3RlZCkKKyAg ICAgICAgZG9uZSA9IHRydWU7Cit9CisKK3N0YXRpYyB2b2lkIHJ1bkphdmFTY3JpcHRBbGVydChX S1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYsIFdLRnJhbWVSZWYgZnJhbWUsIFdLU2VjdXJpdHlP cmlnaW5SZWYgc2VjdXJpdHlPcmlnaW4sIGNvbnN0IHZvaWQqKQoreworICAgIGFuYWx5emVEaWFs b2dBcmd1bWVudHMocGFnZSwgZnJhbWUsIHNlY3VyaXR5T3JpZ2luKTsKK30KKworc3RhdGljIGJv b2wgcnVuSmF2YVNjcmlwdENvbmZpcm0oV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmLCBXS0Zy YW1lUmVmIGZyYW1lLCBXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luLCBjb25zdCB2 b2lkKikKK3sKKyAgICBhbmFseXplRGlhbG9nQXJndW1lbnRzKHBhZ2UsIGZyYW1lLCBzZWN1cml0 eU9yaWdpbik7CisgICAgcmV0dXJuIGZhbHNlOworfQorCitzdGF0aWMgV0tTdHJpbmdSZWYgcnVu SmF2YVNjcmlwdFByb21wdChXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYsIFdLU3RyaW5nUmVm LCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luLCBj b25zdCB2b2lkKikKK3sKKyAgICBhbmFseXplRGlhbG9nQXJndW1lbnRzKHBhZ2UsIGZyYW1lLCBz ZWN1cml0eU9yaWdpbik7CisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisKK3N0YXRpYyBzdGQ6OnVu aXF1ZV9wdHI8UGxhdGZvcm1XZWJWaWV3PiBvcGVuZWRXZWJWaWV3OworCitzdGF0aWMgV0tQYWdl UmVmIGNyZWF0ZU5ld1BhZ2UoV0tQYWdlUmVmIHBhZ2UsIFdLVVJMUmVxdWVzdFJlZiB1cmxSZXF1 ZXN0LCBXS0RpY3Rpb25hcnlSZWYgZmVhdHVyZXMsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJz LCBXS0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p Cit7CisgICAgRVhQRUNUX1RSVUUob3BlbmVkV2ViVmlldyA9PSBudWxscHRyKTsKKworICAgIG9w ZW5lZFdlYlZpZXcgPSBzdGQ6Om1ha2VfdW5pcXVlPFBsYXRmb3JtV2ViVmlldz4ocGFnZSk7CisK KyAgICBXS1BhZ2VVSUNsaWVudFY1IHVpQ2xpZW50OworICAgIG1lbXNldCgmdWlDbGllbnQsIDAs IHNpemVvZih1aUNsaWVudCkpOworCisgICAgdWlDbGllbnQuYmFzZS52ZXJzaW9uID0gNTsKKyAg ICB1aUNsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQgPSBydW5KYXZhU2NyaXB0QWxlcnQ7CisgICAg dWlDbGllbnQucnVuSmF2YVNjcmlwdENvbmZpcm0gPSBydW5KYXZhU2NyaXB0Q29uZmlybTsKKyAg ICB1aUNsaWVudC5ydW5KYXZhU2NyaXB0UHJvbXB0ID0gcnVuSmF2YVNjcmlwdFByb21wdDsKKwor ICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChvcGVuZWRXZWJWaWV3LT5wYWdlKCksICZ1aUNsaWVu dC5iYXNlKTsKKworICAgIFdLUmV0YWluKG9wZW5lZFdlYlZpZXctPnBhZ2UoKSk7CisgICAgcmV0 dXJuIG9wZW5lZFdlYlZpZXctPnBhZ2UoKTsKK30KKworVEVTVChXZWJLaXQyLCBNb2RhbEFsZXJ0 c1NQSSkKK3sKKyAgICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBhZG9wdFdL KFdLQ29udGV4dENyZWF0ZSgpKTsKKyAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhjb250ZXh0 LmdldCgpKTsKKworICAgIFdLUGFnZVVJQ2xpZW50VjUgdWlDbGllbnQ7CisgICAgbWVtc2V0KCZ1 aUNsaWVudCwgMCwgc2l6ZW9mKHVpQ2xpZW50KSk7CisKKyAgICB1aUNsaWVudC5iYXNlLnZlcnNp b24gPSA1OworICAgIHVpQ2xpZW50LmNyZWF0ZU5ld1BhZ2UgPSBjcmVhdGVOZXdQYWdlOworCisg ICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHdlYlZpZXcucGFnZSgpLCAmdWlDbGllbnQuYmFzZSk7 CisKKyAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gdXJsKEFkb3B0V0ssIFV0aWw6OmNyZWF0ZVVS TEZvclJlc291cmNlKCJtb2RhbC1hbGVydHMtaW4tbmV3LWFib3V0LWJsYW5rLXdpbmRvdyIsICJo dG1sIikpOworICAgIFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIHVybC5nZXQoKSk7CisK KyAgICBVdGlsOjpydW4oJmRvbmUpOworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJ CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvRnVs bHNjcmVlblpvb21Jbml0aWFsRnJhbWUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21h Yy9GdWxsc2NyZWVuWm9vbUluaXRpYWxGcmFtZS5tbQppbmRleCA1MmYwMWY2Li4yMmJlYTI1IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9GdWxsc2NyZWVuWm9vbUlu aXRpYWxGcmFtZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9GdWxsc2Ny ZWVuWm9vbUluaXRpYWxGcmFtZS5tbQpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgRnVsbHNjcmVl blpvb21Jbml0aWFsRnJhbWU6OmluaXRpYWxpemVWaWV3KFdLVmlldyAqd2tWaWV3KQogICAgIG1l bXNldCgmdWlDbGllbnQsIDAsIHNpemVvZih1aUNsaWVudCkpOwogCiAgICAgdWlDbGllbnQuYmFz ZS52ZXJzaW9uID0gMDsKLSAgICB1aUNsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQgPSBydW5KYXZh U2NyaXB0QWxlcnQ7CisgICAgdWlDbGllbnQucnVuSmF2YVNjcmlwdEFsZXJ0X2RlcHJlY2F0ZWRG b3JVc2VXaXRoVjUgPSBydW5KYXZhU2NyaXB0QWxlcnQ7CiAKICAgICBXS1BhZ2VTZXRQYWdlVUlD bGllbnQod2tWaWV3LnBhZ2VSZWYsICZ1aUNsaWVudC5iYXNlKTsKIApkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvUGFnZVZpc2liaWxpdHlTdGF0ZVdpdGhXaW5kb3dD aGFuZ2VzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvUGFnZVZpc2liaWxpdHlT dGF0ZVdpdGhXaW5kb3dDaGFuZ2VzLm1tCmluZGV4IGJkY2NjMmUuLjk1NTIyZmFlIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9QYWdlVmlzaWJpbGl0eVN0YXRlV2l0 aFdpbmRvd0NoYW5nZXMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvUGFn ZVZpc2liaWxpdHlTdGF0ZVdpdGhXaW5kb3dDaGFuZ2VzLm1tCkBAIC05OSw3ICs5OSw3IEBAIHZv aWQgUGFnZVZpc2liaWxpdHlTdGF0ZVdpdGhXaW5kb3dDaGFuZ2VzOjppbml0aWFsaXplVmlldyhX S1ZpZXcgKndrVmlldykKICAgICBtZW1zZXQoJnVpQ2xpZW50LCAwLCBzaXplb2YodWlDbGllbnQp KTsKIAogICAgIHVpQ2xpZW50LmJhc2UudmVyc2lvbiA9IDA7Ci0gICAgdWlDbGllbnQucnVuSmF2 YVNjcmlwdEFsZXJ0ID0gcnVuSmF2YVNjcmlwdEFsZXJ0OworICAgIHVpQ2xpZW50LnJ1bkphdmFT Y3JpcHRBbGVydF9kZXByZWNhdGVkRm9yVXNlV2l0aFY1ID0gcnVuSmF2YVNjcmlwdEFsZXJ0Owog CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHdrVmlldy5wYWdlUmVmLCAmdWlDbGllbnQuYmFz ZSk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IGQw M2I5NDUuLjg0ZWQ4YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCkBAIC0yMTMsOSArMjEzLDkgQEAgV0tQYWdlUmVmIFRlc3RDb250cm9sbGVyOjpjcmVhdGVP dGhlclBhZ2UoV0tQYWdlUmVmIG9sZFBhZ2UsIFdLVVJMUmVxdWVzdFJlZiwgV0sKICAgICAgICAg MCwgLy8gdGFrZUZvY3VzCiAgICAgICAgIGZvY3VzLAogICAgICAgICB1bmZvY3VzLAotICAgICAg ICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKLSAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdENv bmZpcm0KLSAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdFByb21wdAorICAgICAgICAwLCAvLyBy dW5KYXZhU2NyaXB0QWxlcnRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNQorICAgICAgICAwLCAvLyBy dW5KYXZhU2NyaXB0Q29uZmlybV9kZXByZWNhdGVkRm9yVXNlV2l0aFY1CisgICAgICAgIDAsIC8v IHJ1bkphdmFTY3JpcHRQcm9tcHRfZGVwcmVjYXRlZEZvclVzZVdpdGhWNQogICAgICAgICAwLCAv LyBzZXRTdGF0dXNUZXh0CiAgICAgICAgIDAsIC8vIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50X2Rl cHJlY2F0ZWRGb3JVc2VXaXRoVjAKICAgICAgICAgMCwgLy8gbWlzc2luZ1BsdWdpbkJ1dHRvbkNs aWNrZWQKQEAgLTI2MCw2ICsyNjAsOSBAQCBXS1BhZ2VSZWYgVGVzdENvbnRyb2xsZXI6OmNyZWF0 ZU90aGVyUGFnZShXS1BhZ2VSZWYgb2xkUGFnZSwgV0tVUkxSZXF1ZXN0UmVmLCBXSwogICAgICAg ICAwLCAvLyBpc1BsYXlpbmdBdWRpb0RpZENoYW5nZQogICAgICAgICBkZWNpZGVQb2xpY3lGb3JV c2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdCwKICAgICAgICAgMCwgLy8gZGlkQ2xpY2tBdXRvZmls bEJ1dHRvbgorICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKKyAgICAgICAgMCwgLy8g cnVuSmF2YVNjcmlwdENvbmZpcm0KKyAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdFByb21wdAog ICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KG5ld1BhZ2UsICZvdGhlclBhZ2VVSUNs aWVudC5iYXNlKTsKICAgICAKQEAgLTQ1OCw5ICs0NjEsOSBAQCB2b2lkIFRlc3RDb250cm9sbGVy OjpjcmVhdGVXZWJWaWV3V2l0aE9wdGlvbnMoV0tEaWN0aW9uYXJ5UmVmIG9wdGlvbnMpCiAgICAg ICAgIDAsIC8vIHRha2VGb2N1cwogICAgICAgICBmb2N1cywKICAgICAgICAgdW5mb2N1cywKLSAg ICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdEFsZXJ0Ci0gICAgICAgIDAsIC8vIHJ1bkphdmFTY3Jp cHRDb25maXJtCi0gICAgICAgIDAsIC8vIHJ1bkphdmFTY3JpcHRQcm9tcHQKKyAgICAgICAgMCwg Ly8gcnVuSmF2YVNjcmlwdEFsZXJ0X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjUKKyAgICAgICAgMCwg Ly8gcnVuSmF2YVNjcmlwdENvbmZpcm1fZGVwcmVjYXRlZEZvclVzZVdpdGhWNQorICAgICAgICAw LCAvLyBydW5KYXZhU2NyaXB0UHJvbXB0X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjUKICAgICAgICAg MCwgLy8gc2V0U3RhdHVzVGV4dAogICAgICAgICAwLCAvLyBtb3VzZURpZE1vdmVPdmVyRWxlbWVu dF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwCiAgICAgICAgIDAsIC8vIG1pc3NpbmdQbHVnaW5CdXR0 b25DbGlja2VkCkBAIC01MDUsNiArNTA4LDkgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6Y3JlYXRl V2ViVmlld1dpdGhPcHRpb25zKFdLRGljdGlvbmFyeVJlZiBvcHRpb25zKQogICAgICAgICAwLCAv LyBpc1BsYXlpbmdBdWRpb0RpZENoYW5nZQogICAgICAgICBkZWNpZGVQb2xpY3lGb3JVc2VyTWVk aWFQZXJtaXNzaW9uUmVxdWVzdCwKICAgICAgICAgMCwgLy8gZGlkQ2xpY2tBdXRvZmlsbEJ1dHRv bgorICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKKyAgICAgICAgMCwgLy8gcnVuSmF2 YVNjcmlwdENvbmZpcm0KKyAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdFByb21wdAogICAgIH07 CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KG1fbWFpbldlYlZpZXctPnBhZ2UoKSwgJnBhZ2VV SUNsaWVudC5iYXNlKTsKIAo=