46993 2010-10-01 10:11:27 -0700 Spatial Navigation: Add support for <input type="radio"> 2010-10-05 09:18:01 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46905 1 yael yael ademar commit-queue oldest_to_newest 288317 0 yael 2010-10-01 10:11:27 -0700 We need a way to navigate radio buttons with Spatial Navigation without changing the selection. Currently, the selection changes when the user navigates to the next radio button within a group. 288347 1 69488 yael 2010-10-01 10:59:19 -0700 Created attachment 69488 Patch When using Spatial Navigation, every radio button should be focusable and users should be able to navigate from one button to the next without moving the selection. No tests in this patch yet, I wanted to get initial review while preparing the tests. thanks! 288384 2 69488 yael 2010-10-01 11:50:16 -0700 Comment on attachment 69488 Patch I'll be adding tests shortly, cancelling the review. 288418 3 69504 yael 2010-10-01 12:36:35 -0700 Created attachment 69504 Patch When using Spatial Navigation, every radio button should be focusable and users should be able to navigate from one button to the next without moving the selection. The patch is the same as before, with the addition of the tests. 289452 4 69504 commit-queue 2010-10-04 22:44:07 -0700 Comment on attachment 69504 Patch Clearing flags on attachment: 69504 Committed r69078: <http://trac.webkit.org/changeset/69078> 289453 5 commit-queue 2010-10-04 22:44:12 -0700 All reviewed patches have been landed. Closing bug. 289653 6 ademar 2010-10-05 09:17:52 -0700 Revision r69078 cherry-picked into qtwebkit-2.1 with commit 867aa08 <http://gitorious.org/webkit/qtwebkit/commit/867aa08> 69488 2010-10-01 10:59:19 -0700 2010-10-01 12:36:35 -0700 Patch 46993.patch text/plain 5246 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODg5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDEgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNwYXRpYWwgTmF2aWdhdGlvbjogQWRkIHN1cHBvcnQgZm9yIDxpbnB1dCB0eXBlPSJyYWRpbyI+ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njk5Mwor CisgICAgICAgIFdoZW4gdXNpbmcgU3BhdGlhbCBOYXZpZ2F0aW9uLCBldmVyeSByYWRpbyBidXR0 b24gc2hvdWxkIGJlIGZvY3VzYWJsZSBhbmQgCisgICAgICAgIHVzZXJzIHNob3VsZCBiZSBhYmxl IHRvIG5hdmlnYXRlIGZyb20gb25lIGJ1dHRvbiB0byB0aGUgbmV4dCB3aXRob3V0IG1vdmluZyB0 aGUgc2VsZWN0aW9uLiAKKworICAgICAgICAqIGh0bWwvSFRNTElucHV0RWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojppc0tleWJvYXJkRm9jdXNhYmxlKToK KyAgICAgICAgRXZlcnkgcmFkaW8gYnV0dG9uIHNob3VsZCBiZSBrZXlib2FyZCBmb2N1c2FibGUs IGlmIHVzaW5nIFNwYXRpYWwgTmF2aWdhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1 dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICBEaXNhYmxlIHRoZSBhbGdv cml0aG0gZm9yIHNlbGVjdGluZyB0aGUgbmV4dCByYWRpbyBidXR0b24gd2l0aGluIGEgZ3JvdXAs IGlmIHVzaW5nIFNwYXRpYWwgTmF2aWdhdGlvbi4KKwogMjAxMC0xMC0wMSAgUmFmYWVsIEFudG9n bm9sbGkgIDxhbnRvZ25vbGxpQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQg YnVpbGQgZml4LgpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkocmV2aXNpb24gNjg3 ODcpCisrKyBXZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY1LDYgKzY1LDcgQEAKICNpbmNsdWRlICJSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUu aCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgogI2luY2x1ZGUgIlNjcmlwdEV2ZW50TGlzdGVu ZXIuaCIKKyNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlN0ZXBSYW5nZS5oIgogI2lu Y2x1ZGUgIlRleHRFdmVudC5oIgogI2luY2x1ZGUgIldoZWVsRXZlbnQuaCIKQEAgLTc2Nyw2ICs3 NjgsOSBAQCBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FiCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmIChkZXByZWNhdGVkSW5wdXRUeXBlKCkgPT0gUkFESU8p IHsKKyAgICAgICAgLy8gV2hlbiB1c2luZyBTcGF0aWFsIE5hdmlnYXRpb24sIGV2ZXJ5IHJhZGlv IGJ1dHRvbiBzaG91bGQgYmUgZm9jdXNhYmxlLgorICAgICAgICBpZiAoZG9jdW1lbnQoKS0+ZnJh bWUoKSAmJiBkb2N1bWVudCgpLT5mcmFtZSgpLT5zZXR0aW5ncygpICYmIGRvY3VtZW50KCktPmZy YW1lKCktPnNldHRpbmdzKCktPmlzU3BhdGlhbE5hdmlnYXRpb25FbmFibGVkKCkpCisgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICAvLyBOZXZlciBhbGxvdyBrZXlib2FyZCB0YWJi aW5nIHRvIGxlYXZlIHlvdSBpbiB0aGUgc2FtZSByYWRpbyBncm91cC4gIEFsd2F5cwogICAgICAg ICAvLyBza2lwIGFueSBvdGhlciBlbGVtZW50cyBpbiB0aGUgZ3JvdXAuCkBAIC0yMzE0LDI5ICsy MzE4LDMyIEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGwKICAgICAg ICAgICAgIC8vIFJpZ2h0IGFuZCBkb3duIG1lYW4gIm5leHQgcmFkaW8gYnV0dG9uIi4KICAgICAg ICAgICAgIC8vIFRlc3RlZCBpbiBXaW5JRSwgYW5kIGV2ZW4gZm9yIFJUTCwgbGVmdCBzdGlsbCBt ZWFucyBwcmV2aW91cyByYWRpbyBidXR0b24gKGFuZCBzbyBtb3ZlcwogICAgICAgICAgICAgLy8g dG8gdGhlIHJpZ2h0KS4gIFNlZW1zIHN0cmFuZ2UsIGJ1dCB3ZSdsbCBtYXRjaCBpdC4KLSAgICAg ICAgICAgIGJvb2wgZm9yd2FyZCA9IChrZXkgPT0gIkRvd24iIHx8IGtleSA9PSAiUmlnaHQiKTsK LSAgICAgICAgICAgIAotICAgICAgICAgICAgLy8gV2UgY2FuIG9ubHkgc3RheSB3aXRoaW4gdGhl IGZvcm0ncyBjaGlsZHJlbiBpZiB0aGUgZm9ybSBoYXNuJ3QgYmVlbiBkZW1vdGVkIHRvIGEgbGVh ZiBiZWNhdXNlCi0gICAgICAgICAgICAvLyBvZiBtYWxmb3JtZWQgSFRNTC4KLSAgICAgICAgICAg IE5vZGUqIG4gPSB0aGlzOwotICAgICAgICAgICAgd2hpbGUgKChuID0gKGZvcndhcmQgPyBuLT50 cmF2ZXJzZU5leHROb2RlKCkgOiBuLT50cmF2ZXJzZVByZXZpb3VzTm9kZSgpKSkpIHsKLSAgICAg ICAgICAgICAgICAvLyBPbmNlIHdlIGVuY291bnRlciBhIGZvcm0gZWxlbWVudCwgd2Uga25vdyB3 ZSdyZSB0aHJvdWdoLgotICAgICAgICAgICAgICAgIGlmIChuLT5oYXNUYWdOYW1lKGZvcm1UYWcp KQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgCi0gICAg ICAgICAgICAgICAgLy8gTG9vayBmb3IgbW9yZSByYWRpbyBidXR0b25zLgotICAgICAgICAgICAg ICAgIGlmIChuLT5oYXNUYWdOYW1lKGlucHV0VGFnKSkgewotICAgICAgICAgICAgICAgICAgICBI VE1MSW5wdXRFbGVtZW50KiBlbHQgPSBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4obik7 Ci0gICAgICAgICAgICAgICAgICAgIGlmIChlbHQtPmZvcm0oKSAhPSBmb3JtKCkpCisgICAgICAg ICAgICAvLyBIb3dldmVyLCB3aGVuIHVzaW5nIFNwYXRpYWwgTmF2aWdhdGlvbiwgd2UgbmVlZCB0 byBiZSBhYmxlIHRvIG5hdmlnYXRlIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHNlbGVjdGlvbi4KKyAg ICAgICAgICAgIGlmICghZG9jdW1lbnQoKS0+ZnJhbWUoKSB8fCAhZG9jdW1lbnQoKS0+ZnJhbWUo KS0+c2V0dGluZ3MoKSB8fCAhZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2V0dGluZ3MoKS0+aXNTcGF0 aWFsTmF2aWdhdGlvbkVuYWJsZWQoKSkgeworICAgICAgICAgICAgICAgIGJvb2wgZm9yd2FyZCA9 IChrZXkgPT0gIkRvd24iIHx8IGtleSA9PSAiUmlnaHQiKTsKKworICAgICAgICAgICAgICAgIC8v IFdlIGNhbiBvbmx5IHN0YXkgd2l0aGluIHRoZSBmb3JtJ3MgY2hpbGRyZW4gaWYgdGhlIGZvcm0g aGFzbid0IGJlZW4gZGVtb3RlZCB0byBhIGxlYWYgYmVjYXVzZQorICAgICAgICAgICAgICAgIC8v IG9mIG1hbGZvcm1lZCBIVE1MLgorICAgICAgICAgICAgICAgIE5vZGUqIG4gPSB0aGlzOworICAg ICAgICAgICAgICAgIHdoaWxlICgobiA9IChmb3J3YXJkID8gbi0+dHJhdmVyc2VOZXh0Tm9kZSgp IDogbi0+dHJhdmVyc2VQcmV2aW91c05vZGUoKSkpKSB7CisgICAgICAgICAgICAgICAgICAgIC8v IE9uY2Ugd2UgZW5jb3VudGVyIGEgZm9ybSBlbGVtZW50LCB3ZSBrbm93IHdlJ3JlIHRocm91Z2gu CisgICAgICAgICAgICAgICAgICAgIGlmIChuLT5oYXNUYWdOYW1lKGZvcm1UYWcpKQogICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gTG9vayBm b3IgbW9yZSByYWRpbyBidXR0b25zLgogICAgICAgICAgICAgICAgICAgICBpZiAobi0+aGFzVGFn TmFtZShpbnB1dFRhZykpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIEhUTUxJbnB1dEVsZW1l bnQqIGlucHV0RWx0ID0gc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KG4pOwotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGlucHV0RWx0LT5kZXByZWNhdGVkSW5wdXRUeXBlKCkgPT0g UkFESU8gJiYgaW5wdXRFbHQtPm5hbWUoKSA9PSBuYW1lKCkgJiYgaW5wdXRFbHQtPmlzRm9jdXNh YmxlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dEVsdC0+c2V0Q2hlY2tl ZCh0cnVlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb2N1bWVudCgpLT5zZXRGb2N1 c2VkTm9kZShpbnB1dEVsdCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRFbHQt PmRpc3BhdGNoU2ltdWxhdGVkQ2xpY2soZXZ0LCBmYWxzZSwgZmFsc2UpOwotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGV2dC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGVsdCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVs ZW1lbnQqPihuKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChlbHQtPmZvcm0oKSAhPSBm b3JtKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAg ICAgICAgICAgICBpZiAobi0+aGFzVGFnTmFtZShpbnB1dFRhZykpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dEVsdCA9IHN0YXRpY19jYXN0PEhU TUxJbnB1dEVsZW1lbnQqPihuKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaW5w dXRFbHQtPmRlcHJlY2F0ZWRJbnB1dFR5cGUoKSA9PSBSQURJTyAmJiBpbnB1dEVsdC0+bmFtZSgp ID09IG5hbWUoKSAmJiBpbnB1dEVsdC0+aXNGb2N1c2FibGUoKSkgeworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnB1dEVsdC0+c2V0Q2hlY2tlZCh0cnVlKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnQoKS0+c2V0Rm9jdXNlZE5vZGUoaW5wdXRFbHQp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dEVsdC0+ZGlzcGF0Y2hTaW11 bGF0ZWRDbGljayhldnQsIGZhbHNlLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGV2dC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg fQo= 69504 2010-10-01 12:36:35 -0700 2010-10-04 22:44:07 -0700 Patch 46993.patch text/plain 16103 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODkxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMTAtMDEgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNwYXRpYWwgTmF2aWdhdGlvbjogQWRkIHN1cHBvcnQgZm9yIDxpbnB1dCB0eXBlPSJyYWRpbyI+ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njk5Mwor CisgICAgICAgIFdoZW4gdXNpbmcgU3BhdGlhbCBOYXZpZ2F0aW9uLCBldmVyeSByYWRpbyBidXR0 b24gc2hvdWxkIGJlIGZvY3VzYWJsZSBhbmQgCisgICAgICAgIHVzZXJzIHNob3VsZCBiZSBhYmxl IHRvIG5hdmlnYXRlIGZyb20gb25lIGJ1dHRvbiB0byB0aGUgbmV4dCB3aXRob3V0IG1vdmluZyB0 aGUgc2VsZWN0aW9uLiAKKworICAgICAgICBUZXN0czogZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZp Z2F0aW9uL3NuYXYtcmFkaW8tZ3JvdXAuaHRtbAorICAgICAgICAgICAgICAgZmFzdC9ldmVudHMv c3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtcmFkaW8uaHRtbAorCisgICAgICAgICogaHRtbC9IVE1M SW5wdXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6Omlz S2V5Ym9hcmRGb2N1c2FibGUpOgorICAgICAgICBFdmVyeSByYWRpbyBidXR0b24gc2hvdWxkIGJl IGtleWJvYXJkIGZvY3VzYWJsZSwgaWYgdXNpbmcgU3BhdGlhbCBOYXZpZ2F0aW9uLgorICAgICAg ICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAg ICAgIERpc2FibGUgdGhlIGFsZ29yaXRobSBmb3Igc2VsZWN0aW5nIHRoZSBuZXh0IHJhZGlvIGJ1 dHRvbiB3aXRoaW4gYSBncm91cCwgaWYgdXNpbmcgU3BhdGlhbCBOYXZpZ2F0aW9uLgorCiAyMDEw LTEwLTAxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRlbGUgUGV0ZXJzb24uCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCShy ZXZpc2lvbiA2ODc4NykKKysrIFdlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjUsNiArNjUsNyBAQAogI2luY2x1ZGUgIlJlbmRlclRleHRDb250cm9s U2luZ2xlTGluZS5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiU2NyaXB0 RXZlbnRMaXN0ZW5lci5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU3RlcFJh bmdlLmgiCiAjaW5jbHVkZSAiVGV4dEV2ZW50LmgiCiAjaW5jbHVkZSAiV2hlZWxFdmVudC5oIgpA QCAtNzY3LDYgKzc2OCw5IEBAIGJvb2wgSFRNTElucHV0RWxlbWVudDo6aXNLZXlib2FyZEZvY3Vz YWIKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKGRlcHJlY2F0ZWRJbnB1dFR5cGUo KSA9PSBSQURJTykgeworICAgICAgICAvLyBXaGVuIHVzaW5nIFNwYXRpYWwgTmF2aWdhdGlvbiwg ZXZlcnkgcmFkaW8gYnV0dG9uIHNob3VsZCBiZSBmb2N1c2FibGUuCisgICAgICAgIGlmIChkb2N1 bWVudCgpLT5mcmFtZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnNldHRpbmdzKCkgJiYgZG9j dW1lbnQoKS0+ZnJhbWUoKS0+c2V0dGluZ3MoKS0+aXNTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQo KSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgICAgIC8vIE5ldmVyIGFsbG93IGtl eWJvYXJkIHRhYmJpbmcgdG8gbGVhdmUgeW91IGluIHRoZSBzYW1lIHJhZGlvIGdyb3VwLiAgQWx3 YXlzCiAgICAgICAgIC8vIHNraXAgYW55IG90aGVyIGVsZW1lbnRzIGluIHRoZSBncm91cC4KQEAg LTIzMTQsMjkgKzIzMTgsMzIgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRI YW5kbAogICAgICAgICAgICAgLy8gUmlnaHQgYW5kIGRvd24gbWVhbiAibmV4dCByYWRpbyBidXR0 b24iLgogICAgICAgICAgICAgLy8gVGVzdGVkIGluIFdpbklFLCBhbmQgZXZlbiBmb3IgUlRMLCBs ZWZ0IHN0aWxsIG1lYW5zIHByZXZpb3VzIHJhZGlvIGJ1dHRvbiAoYW5kIHNvIG1vdmVzCiAgICAg ICAgICAgICAvLyB0byB0aGUgcmlnaHQpLiAgU2VlbXMgc3RyYW5nZSwgYnV0IHdlJ2xsIG1hdGNo IGl0LgotICAgICAgICAgICAgYm9vbCBmb3J3YXJkID0gKGtleSA9PSAiRG93biIgfHwga2V5ID09 ICJSaWdodCIpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICAvLyBXZSBjYW4gb25seSBzdGF5 IHdpdGhpbiB0aGUgZm9ybSdzIGNoaWxkcmVuIGlmIHRoZSBmb3JtIGhhc24ndCBiZWVuIGRlbW90 ZWQgdG8gYSBsZWFmIGJlY2F1c2UKLSAgICAgICAgICAgIC8vIG9mIG1hbGZvcm1lZCBIVE1MLgot ICAgICAgICAgICAgTm9kZSogbiA9IHRoaXM7Ci0gICAgICAgICAgICB3aGlsZSAoKG4gPSAoZm9y d2FyZCA/IG4tPnRyYXZlcnNlTmV4dE5vZGUoKSA6IG4tPnRyYXZlcnNlUHJldmlvdXNOb2RlKCkp KSkgewotICAgICAgICAgICAgICAgIC8vIE9uY2Ugd2UgZW5jb3VudGVyIGEgZm9ybSBlbGVtZW50 LCB3ZSBrbm93IHdlJ3JlIHRocm91Z2guCi0gICAgICAgICAgICAgICAgaWYgKG4tPmhhc1RhZ05h bWUoZm9ybVRhZykpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICAvLyBMb29rIGZvciBtb3JlIHJhZGlvIGJ1dHRvbnMuCi0g ICAgICAgICAgICAgICAgaWYgKG4tPmhhc1RhZ05hbWUoaW5wdXRUYWcpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGVsdCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVs ZW1lbnQqPihuKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGVsdC0+Zm9ybSgpICE9IGZvcm0o KSkKKyAgICAgICAgICAgIC8vIEhvd2V2ZXIsIHdoZW4gdXNpbmcgU3BhdGlhbCBOYXZpZ2F0aW9u LCB3ZSBuZWVkIHRvIGJlIGFibGUgdG8gbmF2aWdhdGUgd2l0aG91dCBjaGFuZ2luZyB0aGUgc2Vs ZWN0aW9uLgorICAgICAgICAgICAgaWYgKCFkb2N1bWVudCgpLT5mcmFtZSgpIHx8ICFkb2N1bWVu dCgpLT5mcmFtZSgpLT5zZXR0aW5ncygpIHx8ICFkb2N1bWVudCgpLT5mcmFtZSgpLT5zZXR0aW5n cygpLT5pc1NwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZCgpKSB7CisgICAgICAgICAgICAgICAgYm9v bCBmb3J3YXJkID0gKGtleSA9PSAiRG93biIgfHwga2V5ID09ICJSaWdodCIpOworCisgICAgICAg ICAgICAgICAgLy8gV2UgY2FuIG9ubHkgc3RheSB3aXRoaW4gdGhlIGZvcm0ncyBjaGlsZHJlbiBp ZiB0aGUgZm9ybSBoYXNuJ3QgYmVlbiBkZW1vdGVkIHRvIGEgbGVhZiBiZWNhdXNlCisgICAgICAg ICAgICAgICAgLy8gb2YgbWFsZm9ybWVkIEhUTUwuCisgICAgICAgICAgICAgICAgTm9kZSogbiA9 IHRoaXM7CisgICAgICAgICAgICAgICAgd2hpbGUgKChuID0gKGZvcndhcmQgPyBuLT50cmF2ZXJz ZU5leHROb2RlKCkgOiBuLT50cmF2ZXJzZVByZXZpb3VzTm9kZSgpKSkpIHsKKyAgICAgICAgICAg ICAgICAgICAgLy8gT25jZSB3ZSBlbmNvdW50ZXIgYSBmb3JtIGVsZW1lbnQsIHdlIGtub3cgd2Un cmUgdGhyb3VnaC4KKyAgICAgICAgICAgICAgICAgICAgaWYgKG4tPmhhc1RhZ05hbWUoZm9ybVRh ZykpCiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgICAg ICAvLyBMb29rIGZvciBtb3JlIHJhZGlvIGJ1dHRvbnMuCiAgICAgICAgICAgICAgICAgICAgIGlm IChuLT5oYXNUYWdOYW1lKGlucHV0VGFnKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgSFRN TElucHV0RWxlbWVudCogaW5wdXRFbHQgPSBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4o bik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoaW5wdXRFbHQtPmRlcHJlY2F0ZWRJbnB1 dFR5cGUoKSA9PSBSQURJTyAmJiBpbnB1dEVsdC0+bmFtZSgpID09IG5hbWUoKSAmJiBpbnB1dEVs dC0+aXNGb2N1c2FibGUoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0RWx0 LT5zZXRDaGVja2VkKHRydWUpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50 KCktPnNldEZvY3VzZWROb2RlKGlucHV0RWx0KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnB1dEVsdC0+ZGlzcGF0Y2hTaW11bGF0ZWRDbGljayhldnQsIGZhbHNlLCBmYWxzZSk7Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZ0LT5zZXREZWZhdWx0SGFuZGxlZCgpOworICAg ICAgICAgICAgICAgICAgICAgICAgSFRNTElucHV0RWxlbWVudCogZWx0ID0gc3RhdGljX2Nhc3Q8 SFRNTElucHV0RWxlbWVudCo+KG4pOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVsdC0+ Zm9ybSgpICE9IGZvcm0oKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChuLT5oYXNUYWdOYW1lKGlucHV0VGFnKSkgeworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0RWx0ID0gc3Rh dGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KG4pOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmIChpbnB1dEVsdC0+ZGVwcmVjYXRlZElucHV0VHlwZSgpID09IFJBRElPICYmIGlucHV0 RWx0LT5uYW1lKCkgPT0gbmFtZSgpICYmIGlucHV0RWx0LT5pc0ZvY3VzYWJsZSgpKSB7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0RWx0LT5zZXRDaGVja2VkKHRydWUpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb2N1bWVudCgpLT5zZXRGb2N1c2VkTm9k ZShpbnB1dEVsdCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0RWx0LT5k aXNwYXRjaFNpbXVsYXRlZENsaWNrKGV2dCwgZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZXZ0LT5zZXREZWZhdWx0SGFuZGxlZCgpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODkxMikKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEwLTEwLTAxICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGF0aWFsIE5hdmlnYXRpb246IEFkZCBzdXBwb3J0 IGZvciA8aW5wdXQgdHlwZT0icmFkaW8iPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDY5OTMKKworICAgICAgICAqIGZhc3QvZXZlbnRzL3NwYXRpYWwt bmF2aWdhdGlvbi9zbmF2LXJhZGlvLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtcmFkaW8tZ3JvdXAtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1y YWRpby1ncm91cC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9zcGF0aWFsLW5h dmlnYXRpb24vc25hdi1yYWRpby5odG1sOiBBZGRlZC4KKwogMjAxMC0xMC0wMSAgQWxwaGEgTGFt ICA8aGNsYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gQnVpbGQgZml4 LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYt cmFkaW8tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRz L3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LXJhZGlvLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LXJhZGlv LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMiBAQAorMgkKKzQJCTYKKzgJ CitQQVNTIGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikg aXMgIjgiCitQQVNTIGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUo ImlkIikgaXMgInN0YXJ0IgorUEFTUyBnRm9jdXNlZERvY3VtZW50LmFjdGl2ZUVsZW1lbnQuZ2V0 QXR0cmlidXRlKCJpZCIpIGlzICIyIgorUEFTUyBnRm9jdXNlZERvY3VtZW50LmFjdGl2ZUVsZW1l bnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICJzdGFydCIKK1BBU1MgZ0ZvY3VzZWREb2N1bWVudC5h Y3RpdmVFbGVtZW50LmdldEF0dHJpYnV0ZSgiaWQiKSBpcyAiNiIKK1BBU1MgZ0ZvY3VzZWREb2N1 bWVudC5hY3RpdmVFbGVtZW50LmdldEF0dHJpYnV0ZSgiaWQiKSBpcyAic3RhcnQiCitQQVNTIGdG b2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgIjQiCitQ QVNTIGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMg InN0YXJ0IgorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRp b24vc25hdi1yYWRpby1ncm91cC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtcmFkaW8tZ3JvdXAtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvc3BhdGlhbC1u YXZpZ2F0aW9uL3NuYXYtcmFkaW8tZ3JvdXAtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDI0IEBACisyCQorNAkKKwkKKwkJCisJCTYKKzgJCitQQVNTIGdGb2N1c2VkRG9jdW1l bnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgImRvd24iCitQQVNTIGdGb2N1 c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgIjgiCitQQVNT IGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgImRv d24iCitQQVNTIGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlk IikgaXMgInN0YXJ0IgorUEFTUyBnRm9jdXNlZERvY3VtZW50LmFjdGl2ZUVsZW1lbnQuZ2V0QXR0 cmlidXRlKCJpZCIpIGlzICJ1cCIKK1BBU1MgZ0ZvY3VzZWREb2N1bWVudC5hY3RpdmVFbGVtZW50 LmdldEF0dHJpYnV0ZSgiaWQiKSBpcyAiMiIKK1BBU1MgZ0ZvY3VzZWREb2N1bWVudC5hY3RpdmVF bGVtZW50LmdldEF0dHJpYnV0ZSgiaWQiKSBpcyAidXAiCitQQVNTIGdGb2N1c2VkRG9jdW1lbnQu YWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUoImlkIikgaXMgInN0YXJ0IgorUEFTUyBnRm9jdXNl ZERvY3VtZW50LmFjdGl2ZUVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICJyaWdodCIKK1BB U1MgZ0ZvY3VzZWREb2N1bWVudC5hY3RpdmVFbGVtZW50LmdldEF0dHJpYnV0ZSgiaWQiKSBpcyAi NiIKK1BBU1MgZ0ZvY3VzZWREb2N1bWVudC5hY3RpdmVFbGVtZW50LmdldEF0dHJpYnV0ZSgiaWQi KSBpcyAicmlnaHQiCitQQVNTIGdGb2N1c2VkRG9jdW1lbnQuYWN0aXZlRWxlbWVudC5nZXRBdHRy aWJ1dGUoImlkIikgaXMgInN0YXJ0IgorUEFTUyBnRm9jdXNlZERvY3VtZW50LmFjdGl2ZUVsZW1l bnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICJsZWZ0IgorUEFTUyBnRm9jdXNlZERvY3VtZW50LmFj dGl2ZUVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICI0IgorUEFTUyBnRm9jdXNlZERvY3Vt ZW50LmFjdGl2ZUVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICJsZWZ0IgorUEFTUyBnRm9j dXNlZERvY3VtZW50LmFjdGl2ZUVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpIGlzICJzdGFydCIK K1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Rvd24nKS5jaGVja2VkIGlzIHRydWUKKwpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtcmFk aW8tZ3JvdXAuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0 aWFsLW5hdmlnYXRpb24vc25hdi1yYWRpby1ncm91cC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtcmFkaW8tZ3JvdXAu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMDkgQEAKKzxodG1sPgorICA8IS0tCisgICAg VGhpcyB0ZXN0IGVuc3VyZXMgdGhlIGNvcnJlY3RuZXNzIG9mIFNwYXRpYWwgTmF2aWdhdGlvbiAo U05hdikgYWxnb3JpdGhtIG92ZXIgc2luZ2xlIHNlbGVjdCBlbGVtZW50LgorCisgICAgKiBQcmUt Y29uZGl0aW9uczoKKyAgICAxKSBEUlQgc3VwcG9ydCBmb3IgU05hdiBlbmFibGUvZGlzYWJsZS4K KworICAgICogTmF2aWdhdGlvbiBzdGVwczoKKyAgICAxKSBMb2FkcyB0aGlzIHBhZ2UsIGZvY3Vz IGdvZXMgdG8gInN0YXJ0IiBhdXRvbWF0aWNhbGx5LgorICAgIDIpIEZvY3VzIG1vdmVzIGF3YXkg ZnJvbSBzZWxlY3QgaW4gNCBkaWZmZXJlbnQgZGlyZWN0aW9ucyB0byBuZWlnaGJvciBub2RlcyBh bmQgYmFjay4KKyAgLS0+CisgIDxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJj ZXMvc3BhdGlhbC1uYXZpZ2F0aW9uLXV0aWxzLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5 cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiPgorCisgICAgdmFyIHJlc3VsdE1hcCA9IFsKKyAg ICAgIFsiRG93biIsICJkb3duIl0sCisgICAgICBbIkRvd24iLCAiOCJdLAorICAgICAgWyJVcCIs ICJkb3duIl0sCisgICAgICBbIlVwIiwgInN0YXJ0Il0sCisgICAgICBbIlVwIiwgInVwIl0sCisg ICAgICBbIlVwIiwgIjIiXSwKKyAgICAgIFsiRG93biIsICJ1cCJdLAorICAgICAgWyJEb3duIiwg InN0YXJ0Il0sCisgICAgICBbIlJpZ2h0IiwgInJpZ2h0Il0sCisgICAgICBbIlJpZ2h0IiwgIjYi XSwKKyAgICAgIFsiTGVmdCIsICJyaWdodCJdLAorICAgICAgWyJMZWZ0IiwgInN0YXJ0Il0sCisg ICAgICBbIkxlZnQiLCAibGVmdCJdLAorICAgICAgWyJMZWZ0IiwgIjQiXSwKKyAgICAgIFsiUmln aHQiLCAibGVmdCJdLAorICAgICAgWyJSaWdodCIsICJzdGFydCJdLAorICAgICAgWyJET05FIiwg IkRPTkUiXQorICAgIF07CisKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7 CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5zZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQodHJ1ZSk7CisgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktpdFRhYlRvTGlua3NQ cmVmZXJlbmNlS2V5IiwgMSk7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxE b25lKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVzdCgpCisgICAgeworICAgICAgLy8g c3RhcnRpbmcgdGhlIHRlc3QgaXRzZWxmOiBnZXQgdG8gYSBrbm93biBwbGFjZS4KKyAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdGFydCIpLmZvY3VzKCk7CisKKyAgICAgIGluaXRUZXN0 KHJlc3VsdE1hcCwgdGVzdENvbXBsZXRlZCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gdGVzdENv bXBsZXRlZCgpCisgICAgeworICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgc2hvdWxkQmUoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkb3duJykuY2hlY2tl ZCIsICJ0cnVlIik7ICAgICAgICAgICAgCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5v dGlmeURvbmUoKTsKKyAgICB9CisKKyAgICB3aW5kb3cub25sb2FkID0gcnVuVGVzdDsKKworICAg IDwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKyAgPC9oZWFkPgorICA8Ym9keSBpZD0ic29tZS1jb250ZW50IiB4bWxu cz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+CisgICAgPHRhYmxlIHN0eWxlPSJ0ZXh0 LWFsaWduOiBsZWZ0OyB3aWR0aDogMTAwJTsgbWFyZ2luLWxlZnQ6IGF1dG87IG1hcmdpbi1yaWdo dDogYXV0bzsiIGJvcmRlcj0iMSIgY2VsbHBhZGRpbmc9IjIiIGNlbGxzcGFjaW5nPSIxIj4KKyAg ICAgIDx0Ym9keT4KKyAgICAgICAgPHRyPgorICAgICAgICAgIDx0ZCBzdHlsZT0idmVydGljYWwt YWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2VudGVyOyI+PC90ZD4KKyAgICAgICAgICA8dGQg c3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50ZXI7IHRleHQtYWxpZ246IGNlbnRlcjsiPjxhIGlk PSIyIiBocmVmPSJhIj4yPC9hPjwvdGQ+CisgICAgICAgICAgPHRkIHN0eWxlPSJ2ZXJ0aWNhbC1h bGlnbjogY2VudGVyOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48L3RkPgorICAgICAgICA8L3RyPgor ICAgICAgICA8dHI+CisgICAgICAgICAgPHRkIHN0eWxlPSJ2ZXJ0aWNhbC1hbGlnbjogY2VudGVy OyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48YSBpZD0iNCIgaHJlZj0iYSI+NDwvYT48L3RkPgorICAg ICAgICAgIDx0ZCBzdHlsZT0idmVydGljYWwtYWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2Vu dGVyOyI+CisgICAgICAgICAgICA8dGFibGUgc3R5bGU9InRleHQtYWxpZ246IGNlbnRlcjsgd2lk dGg6IDEwMCU7IG1hcmdpbi1sZWZ0OiBhdXRvOyBtYXJnaW4tcmlnaHQ6IGF1dG87IiBib3JkZXI9 IjEiIGNlbGxwYWRkaW5nPSIyIiBjZWxsc3BhY2luZz0iMSI+CisgICAgICAgICAgICAgIDx0Ym9k eT4KKyAgICAgICAgICAgICAgICA8dHI+CisgICAgICAgICAgICAgICAgICA8dGQgc3R5bGU9InZl cnRpY2FsLWFsaWduOiBjZW50ZXI7IHRleHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAg ICAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50ZXI7IHRleHQtYWxpZ246 IGNlbnRlcjsiPjxpbnB1dCB0eXBlPSJyYWRpbyIgbmFtZT0iZ3JvdXAiIGlkPSJ1cCIgPjwvdGQ+ CisgICAgICAgICAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50ZXI7IHRl eHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAgICAgICAgICAgPC90cj4KKyAgICAgICAg ICAgICAgICA8dHI+CisgICAgICAgICAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWdu OiBjZW50ZXI7IHRleHQtYWxpZ246IGNlbnRlcjsiPjxpbnB1dCB0eXBlPSJyYWRpbyIgbmFtZT0i Z3JvdXAiIGlkPSJsZWZ0IiA+PC90ZD4KKyAgICAgICAgICAgICAgICAgIDx0ZCBzdHlsZT0idmVy dGljYWwtYWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2VudGVyOyI+CisgICAgICAgICAgICAg ICAgICAgIDxpbnB1dCB0eXBlPSJyYWRpbyIgbmFtZT0iZ3JvdXAiIGlkPSJzdGFydCIgPgorICAg ICAgICAgICAgICAgICAgPC90ZD4KKyAgICAgICAgICAgICAgICAgIDx0ZCBzdHlsZT0idmVydGlj YWwtYWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2VudGVyOyI+PGlucHV0IHR5cGU9InJhZGlv IiBuYW1lPSJncm91cCIgaWQ9InJpZ2h0IiA+PC90ZD4KKyAgICAgICAgICAgICAgICA8L3RyPgor ICAgICAgICAgICAgICAgIDx0cj4KKyAgICAgICAgICAgICAgICAgIDx0ZCBzdHlsZT0idmVydGlj YWwtYWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2VudGVyOyI+PC90ZD4KKyAgICAgICAgICAg ICAgICAgIDx0ZCBzdHlsZT0idmVydGljYWwtYWxpZ246IGNlbnRlcjsgdGV4dC1hbGlnbjogY2Vu dGVyOyI+PGlucHV0IHR5cGU9InJhZGlvIiBuYW1lPSJncm91cCIgaWQ9ImRvd24iIGNoZWNrZWQg PjwvdGQ+CisgICAgICAgICAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50 ZXI7IHRleHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAgICAgICAgICAgPC90cj4KKyAg ICAgICAgICAgICAgPC90Ym9keT4KKyAgICAgICAgICAgIDwvdGFibGU+CisgICAgICAgICAgPC90 ZD4KKyAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50ZXI7IHRleHQtYWxp Z246IGNlbnRlcjsiPjxhIGlkPSI2IiBocmVmPSJhIj42PC9hPjwvdGQ+CisgICAgICAgIDwvdHI+ CisgICAgICAgIDx0cj4KKyAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBjZW50 ZXI7IHRleHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAgICAgPHRkIHN0eWxlPSJ2ZXJ0 aWNhbC1hbGlnbjogY2VudGVyOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48YSBpZD0iOCIgaHJlZj0i YSI+ODwvYT48L3RkPgorICAgICAgICAgIDx0ZCBzdHlsZT0idmVydGljYWwtYWxpZ246IGNlbnRl cjsgdGV4dC1hbGlnbjogY2VudGVyOyI+PC90ZD4KKyAgICAgICAgPC90cj4KKyAgICAgIDwvdGJv ZHk+CisgICAgPC90YWJsZT4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgPC9ib2R5 PgorPC9odG1sPgorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmln YXRpb24vc25hdi1yYWRpby5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZl bnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LXJhZGlvLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1yYWRpby5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDc4IEBACis8aHRtbD4KKyAgPCEtLQorICAgIFRoaXMg dGVzdCBlbnN1cmVzIHRoZSBjb3JyZWN0bmVzcyBvZiBTcGF0aWFsIE5hdmlnYXRpb24gKFNOYXYp IGFsZ29yaXRobSBvdmVyIHNpbmdsZSBzZWxlY3QgZWxlbWVudC4KKworICAgICogUHJlLWNvbmRp dGlvbnM6CisgICAgMSkgRFJUIHN1cHBvcnQgZm9yIFNOYXYgZW5hYmxlL2Rpc2FibGUuCisKKyAg ICAqIE5hdmlnYXRpb24gc3RlcHM6CisgICAgMSkgTG9hZHMgdGhpcyBwYWdlLCBmb2N1cyBnb2Vz IHRvICJzdGFydCIgYXV0b21hdGljYWxseS4KKyAgICAyKSBGb2N1cyBtb3ZlcyBhd2F5IGZyb20g c2VsZWN0IGluIDQgZGlmZmVyZW50IGRpcmVjdGlvbnMgdG8gbmVpZ2hib3Igbm9kZXMgYW5kIGJh Y2suCisgIC0tPgorICA8aGVhZD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3Nw YXRpYWwtbmF2aWdhdGlvbi11dGlscy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJh cHBsaWNhdGlvbi9qYXZhc2NyaXB0Ij4KKworICAgIHZhciByZXN1bHRNYXAgPSBbCisgICAgICBb IkRvd24iLCAiOCJdLAorICAgICAgWyJVcCIsICJzdGFydCJdLAorICAgICAgWyJVcCIsICIyIl0s CisgICAgICBbIkRvd24iLCAic3RhcnQiXSwKKyAgICAgIFsiUmlnaHQiLCAiNiJdLAorICAgICAg WyJMZWZ0IiwgInN0YXJ0Il0sCisgICAgICBbIkxlZnQiLCAiNCJdLAorICAgICAgWyJSaWdodCIs ICJzdGFydCJdLAorICAgICAgWyJET05FIiwgIkRPTkUiXQorICAgIF07CisKKyAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wQXNUZXh0KCk7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRTcGF0aWFsTmF2aWdh dGlvbkVuYWJsZWQodHJ1ZSk7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVBy ZWZlcmVuY2UoIldlYktpdFRhYlRvTGlua3NQcmVmZXJlbmNlS2V5IiwgMSk7CisgICAgICBsYXlv dXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24g cnVuVGVzdCgpCisgICAgeworICAgICAgLy8gc3RhcnRpbmcgdGhlIHRlc3QgaXRzZWxmOiBnZXQg dG8gYSBrbm93biBwbGFjZS4KKyAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdGFydCIp LmZvY3VzKCk7CisKKyAgICAgIGluaXRUZXN0KHJlc3VsdE1hcCwgdGVzdENvbXBsZXRlZCk7Cisg ICAgfQorCisgICAgZnVuY3Rpb24gdGVzdENvbXBsZXRlZCgpCisgICAgeworICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu bm90aWZ5RG9uZSgpOworICAgIH0KKworICAgIHdpbmRvdy5vbmxvYWQgPSBydW5UZXN0OworCisg ICAgPC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorICA8L2hlYWQ+CisgIDxib2R5IGlkPSJzb21lLWNvbnRlbnQiIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKyAgICA8dGFibGUgc3R5bGU9InRl eHQtYWxpZ246IGxlZnQ7IHdpZHRoOiAxMDAlOyBtYXJnaW4tbGVmdDogYXV0bzsgbWFyZ2luLXJp Z2h0OiBhdXRvOyIgYm9yZGVyPSIxIiBjZWxscGFkZGluZz0iMiIgY2VsbHNwYWNpbmc9IjEiPgor ICAgICAgPHRib2R5PgorICAgICAgICA8dHI+CisgICAgICAgICAgPHRkIHN0eWxlPSJ2ZXJ0aWNh bC1hbGlnbjogdG9wOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48L3RkPgorICAgICAgICAgIDx0ZCBz dHlsZT0idmVydGljYWwtYWxpZ246IHRvcDsgdGV4dC1hbGlnbjogY2VudGVyOyI+PGEgaWQ9IjIi IGhyZWY9ImEiPjI8L2E+PC90ZD4KKyAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWdu OiB0b3A7IHRleHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAgIDwvdHI+CisgICAgICAg IDx0cj4KKyAgICAgICAgICA8dGQgc3R5bGU9InZlcnRpY2FsLWFsaWduOiB0b3A7IHRleHQtYWxp Z246IGNlbnRlcjsiPjxhIGlkPSI0IiBocmVmPSJhIj40PC9hPjwvdGQ+CisgICAgICAgICAgPHRk IHN0eWxlPSJ2ZXJ0aWNhbC1hbGlnbjogdG9wOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48aW5wdXQg dHlwZT0icmFkaW8iIGlkPSJzdGFydCIgPjwvdGQ+CisgICAgICAgICAgPHRkIHN0eWxlPSJ2ZXJ0 aWNhbC1hbGlnbjogdG9wOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48YSBpZD0iNiIgaHJlZj0iYSI+ NjwvYT48L3RkPgorICAgICAgICA8L3RyPgorICAgICAgICA8dHI+CisgICAgICAgICAgPHRkIHN0 eWxlPSJ2ZXJ0aWNhbC1hbGlnbjogdG9wOyB0ZXh0LWFsaWduOiBjZW50ZXI7Ij48L3RkPgorICAg ICAgICAgIDx0ZCBzdHlsZT0idmVydGljYWwtYWxpZ246IHRvcDsgdGV4dC1hbGlnbjogY2VudGVy OyI+PGEgaWQ9IjgiIGhyZWY9ImEiPjg8L2E+PC90ZD4KKyAgICAgICAgICA8dGQgc3R5bGU9InZl cnRpY2FsLWFsaWduOiB0b3A7IHRleHQtYWxpZ246IGNlbnRlcjsiPjwvdGQ+CisgICAgICAgIDwv dHI+CisgICAgICA8L3Rib2R5PgorICAgIDwvdGFibGU+CisgICAgPGRpdiBpZD0iY29uc29sZSI+ PC9kaXY+CisgIDwvYm9keT4KKzwvaHRtbD4KKwo=