27584 2009-07-22 16:11:00 -0700 [CSS3 Backgrounds and Borders] Handle the / and 4 values in border-radius 2009-07-28 17:18:26 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 27569 1 simon.fraser mitz bugzilla33 mitz oldest_to_newest 133974 0 simon.fraser 2009-07-22 16:11:00 -0700 CSS 3 border radius has the ability to specify 4 values at one time, and separate values with a /. We need to handle these. We already handle the radius-reducing algorithm in the spec. 135420 1 33680 mitz 2009-07-28 17:02:36 -0700 Created attachment 33680 Support the new border-radius syntax and maintain legacy -webkit-border-radius syntax 135424 2 33680 simon.fraser 2009-07-28 17:13:43 -0700 Comment on attachment 33680 Support the new border-radius syntax and maintain legacy -webkit-border-radius syntax > Index: WebCore/css/CSSParser.cpp > =================================================================== > + case CSSPropertyBorderRadius: > + case CSSPropertyWebkitBorderRadius: > + return parseBorderRadius(propId, important); > + break; No need for the break after return. r=me 135427 3 mitz 2009-07-28 17:17:45 -0700 Fixed in <http://trac.webkit.org/changeset/46508>. 135429 4 aroben 2009-07-28 17:18:26 -0700 *** Bug 23675 has been marked as a duplicate of this bug. *** 33680 2009-07-28 17:02:36 -0700 2009-07-28 17:13:43 -0700 Support the new border-radius syntax and maintain legacy -webkit-border-radius syntax 27584_r1.diff text/plain 37825 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjUwNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDYgQEAKKzIwMDktMDctMjggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ1NT MyBCYWNrZ3JvdW5kcyBhbmQgQm9yZGVyc10gRHJvcCB0aGUgcHJlZml4IGZyb20gdGhlIGJvcmRl ci1yYWRpdXMKKyAgICAgICAgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NzgKKworICAgICAgICBbQ1NTMyBCYWNrZ3JvdW5kcyBh bmQgQm9yZGVyc10gSGFuZGxlIHRoZSAvIGFuZCA0IHZhbHVlcyBpbgorICAgICAgICBib3JkZXIt cmFkaXVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzU4NAorCisgICAgICAgIFRlc3Q6IGZhc3QvYm9yZGVycy9ib3JkZXItcmFkaXVzLXBhcnNpbmcu aHRtbAorCisgICAgICAgIERyb3BwZWQgdGhlIC13ZWJraXQtIHByZWZpeCBmcm9tIHRoZSBpbmRp dmlkdWFsIGNvcm5lciBib3JkZXItcmFkaXVzCisgICAgICAgIHByb3BlcnRpZXMuIEFkZGVkIGJv cmRlci1yYWRpdXMgd2l0aCB0aGUgLyBhbmQgNC12YWx1ZSBzeW50YXgsIGFuZAorICAgICAgICBt YWludGFpbmVkIC13ZWJraXQtYm9yZGVyLXJhZGl1cyB3aXRoIGxlZ2FjeSAyLXZhbHVlIHN5bnRh eC4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAg ICAgICAoY29tcHV0ZWRQcm9wZXJ0aWVzKTogUmVtb3ZlZCBXZWJraXQgcHJlZml4LgorICAgICAg ICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1Zh bHVlKTogRGl0dG8uCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOiBSZW1vdmVkIFdlYmtpdCBwcmVmaXggZnJvbSB0 aGUKKyAgICAgICAgICAgIHNpbmdsZS1jb3JuZXIgcHJvcGVydGllcy4gQ2FsbCBvdXQgdG8gcGFy c2VCb3JkZXJSYWRpdXMoKSB0byBwYXJzZQorICAgICAgICAgICAgYm9yZGVyLXJhZGl1cyBhbmQg LXdlYmtpdC1ib3JkZXItcmFkaXVzLiAKKyAgICAgICAgKFdlYkNvcmU6OmNvbXBsZXRlQm9yZGVy UmFkaWkpOiBBZGRlZCB0aGlzIGhlbHBlciBmdW5jdGlvbiB0aGF0CisgICAgICAgICAgICBjb21w bGV0ZXMgdGhlIHZhbHVlcyBmb3IgYWxsIGZvdXIgY29ybmVycyB3aGVuIGZld2VyIHRoYW4gZm91 ciBhcmUKKyAgICAgICAgICAgIHNwZWNpZmllZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNl cjo6cGFyc2VCb3JkZXJSYWRpdXMpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNzc1Byb3Bl cnR5SUQpOiBNYXAgLXdlYmtpdC1ib3JkZXItKi0qLXJhZGl1cyB0byB0aGUKKyAgICAgICAgICAg IHVucHJlZml4ZWQgcHJvcGVydHkuCisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorICAgICAg ICAqIGNzcy9DU1NQcm9wZXJ0eUxvbmdoYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRT aG9ydGhhbmRNYXApOiBSZW1vdmVkIHRoZSBXZWJraXQgcHJlZml4LiBBZGRlZCBhbiBlbnRyeQor ICAgICAgICAgICAgZm9yIGJvcmRlci1yYWRpdXMuIEtlcHQgdGhlIGVudHJ5IGZvciAtd2Via2l0 LWJvcmRlci1yYWRpdXMuCisgICAgICAgICogY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW46IFJlbW92 ZWQgdGhlIC13ZWJraXQtIHByZWZpeCBmcm9tIHRoZQorICAgICAgICAgICAgc2luZ2xlLWNvcmVu ciBwcm9wZXJ0aWVzLiBBZGRlZCBib3JkZXItcmFkaXVzLiBLZXB0CisgICAgICAgICAgICAtd2Vi a2l0LWJvcmRlci1yYWRpdXMgYmVjYXVzZSBvZiBpdHMgY29uZmxpY3Rpbmcgc3ludGF4LgorICAg ICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOiBSZW1vdmVkIHRoZSBXZWJraXQgcHJlZml4Lgor ICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6ZW5zdXJlUHJvcGVydHlNYXApOiBEaXR0by4KKwogMjAwOS0wNy0yOCAgTmF0ZSBDaGFw aW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZp c2hlci4KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cAkocmV2aXNpb24gNDY1MDUpCisrKyBXZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSw4IEBAIHN0YXRpYyBjb25zdCBp bnQgY29tcHV0ZWRQcm9wZXJ0aWVzW10gPSAKICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRQb3Np dGlvbiwgLy8gbW9yZS1zcGVjaWZpYyBiYWNrZ3JvdW5kLXBvc2l0aW9uLXgveSBhcmUgbm9uLXN0 YW5kYXJkCiAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0LAogICAgIENTU1Byb3BlcnR5 Qm9yZGVyQm90dG9tQ29sb3IsCisgICAgQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21MZWZ0UmFkaXVz LAorICAgIENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsCiAgICAgQ1NTUHJvcGVy dHlCb3JkZXJCb3R0b21TdHlsZSwKICAgICBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbVdpZHRoLAog ICAgIENTU1Byb3BlcnR5Qm9yZGVyQ29sbGFwc2UsCkBAIC02OSw2ICs3MSw4IEBAIHN0YXRpYyBj b25zdCBpbnQgY29tcHV0ZWRQcm9wZXJ0aWVzW10gPSAKICAgICBDU1NQcm9wZXJ0eUJvcmRlclJp Z2h0U3R5bGUsCiAgICAgQ1NTUHJvcGVydHlCb3JkZXJSaWdodFdpZHRoLAogICAgIENTU1Byb3Bl cnR5Qm9yZGVyVG9wQ29sb3IsCisgICAgQ1NTUHJvcGVydHlCb3JkZXJUb3BMZWZ0UmFkaXVzLAor ICAgIENTU1Byb3BlcnR5Qm9yZGVyVG9wUmlnaHRSYWRpdXMsCiAgICAgQ1NTUHJvcGVydHlCb3Jk ZXJUb3BTdHlsZSwKICAgICBDU1NQcm9wZXJ0eUJvcmRlclRvcFdpZHRoLAogICAgIENTU1Byb3Bl cnR5Qm90dG9tLApAQCAtMTUyLDEzICsxNTYsOSBAQCBzdGF0aWMgY29uc3QgaW50IGNvbXB1dGVk UHJvcGVydGllc1tdID0gCiAgICAgQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kQ29tcG9zaXRl LAogICAgIENTU1Byb3BlcnR5V2Via2l0QmFja2dyb3VuZE9yaWdpbiwKICAgICBDU1NQcm9wZXJ0 eVdlYmtpdEJhY2tncm91bmRTaXplLAotICAgIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyQm90dG9t TGVmdFJhZGl1cywKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVz LAogICAgIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyRml0LAogICAgIENTU1Byb3BlcnR5V2Via2l0 Qm9yZGVySG9yaXpvbnRhbFNwYWNpbmcsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJJbWFn ZSwKLSAgICBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclRvcExlZnRSYWRpdXMsCi0gICAgQ1NTUHJv cGVydHlXZWJraXRCb3JkZXJUb3BSaWdodFJhZGl1cywKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEJv cmRlclZlcnRpY2FsU3BhY2luZywKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEJveEFsaWduLAogICAg IENTU1Byb3BlcnR5V2Via2l0Qm94RGlyZWN0aW9uLApAQCAtMTIyNSwxMyArMTIyNSwxMyBAQCBQ YXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjCiAgICAgICAgICAgICByZXR1 cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShzdHlsZS0+dXNlckRyYWcoKSk7CiAgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRVc2VyU2VsZWN0OgogICAgICAgICAgICAgcmV0dXJuIENT U1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoc3R5bGUtPnVzZXJTZWxlY3QoKSk7Ci0gICAgICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzOgorICAgICAgICBjYXNl IENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tTGVmdFJhZGl1czoKICAgICAgICAgICAgIHJldHVybiBn ZXRCb3JkZXJSYWRpdXNDb3JuZXJWYWx1ZShzdHlsZS0+Ym9yZGVyQm90dG9tTGVmdFJhZGl1cygp KTsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVz OgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXM6CiAgICAg ICAgICAgICByZXR1cm4gZ2V0Qm9yZGVyUmFkaXVzQ29ybmVyVmFsdWUoc3R5bGUtPmJvcmRlckJv dHRvbVJpZ2h0UmFkaXVzKCkpOwotICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVy VG9wTGVmdFJhZGl1czoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclRvcExlZnRSYWRp dXM6CiAgICAgICAgICAgICByZXR1cm4gZ2V0Qm9yZGVyUmFkaXVzQ29ybmVyVmFsdWUoc3R5bGUt PmJvcmRlclRvcExlZnRSYWRpdXMoKSk7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRC b3JkZXJUb3BSaWdodFJhZGl1czoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclRvcFJp Z2h0UmFkaXVzOgogICAgICAgICAgICAgcmV0dXJuIGdldEJvcmRlclJhZGl1c0Nvcm5lclZhbHVl KHN0eWxlLT5ib3JkZXJUb3BSaWdodFJhZGl1cygpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUNsaXA6IHsKICAgICAgICAgICAgIGlmICghc3R5bGUtPmhhc0NsaXAoKSkKQEAgLTEyOTcsNiAr MTI5Nyw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWMKICAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbToKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUJvcmRlckNvbG9yOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyTGVmdDoKKyAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclJhZGl1czoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUJvcmRlclJpZ2h0OgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyU3R5bGU6CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJUb3A6CkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHJldmlzaW9u IDQ2NTA1KQorKysgV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTE0NywxMSArMTE0NywxMCBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShpbnQgcHJvcElk LCBiCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEJvcmRlclRvcFJpZ2h0UmFkaXVzOgotICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRCb3JkZXJUb3BMZWZ0UmFkaXVzOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRC b3JkZXJCb3R0b21MZWZ0UmFkaXVzOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJC b3R0b21SaWdodFJhZGl1czoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyUmFkaXVz OiB7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclRvcFJpZ2h0UmFkaXVzOgorICAgIGNhc2Ug Q1NTUHJvcGVydHlCb3JkZXJUb3BMZWZ0UmFkaXVzOgorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJCb3R0b21MZWZ0UmFkaXVzOgorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21SaWdo dFJhZGl1czogewogICAgICAgICBpZiAobnVtICE9IDEgJiYgbnVtICE9IDIpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHZhbGlkX3ByaW1pdGl2ZSA9IHZhbGlkVW5pdCh2YWx1 ZSwgRkxlbmd0aCwgbV9zdHJpY3QpOwpAQCAtMTE2NywyMCArMTE2NiwxNiBAQCBib29sIENTU1Bh cnNlcjo6cGFyc2VWYWx1ZShpbnQgcHJvcElkLCBiCiAgICAgICAgICAgICBwYXJzZWRWYWx1ZTIg PSBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHZhbHVlLT5mVmFsdWUsIChDU1NQcmltaXRpdmVW YWx1ZTo6VW5pdFR5cGVzKXZhbHVlLT51bml0KTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICBwYXJzZWRWYWx1ZTIgPSBwYXJzZWRWYWx1ZTE7Ci0gICAgICAgIAorCiAgICAgICAgIFJlZlB0 cjxQYWlyPiBwYWlyID0gUGFpcjo6Y3JlYXRlKHBhcnNlZFZhbHVlMS5yZWxlYXNlKCksIHBhcnNl ZFZhbHVlMi5yZWxlYXNlKCkpOwogICAgICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHZh bCA9IENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUocGFpci5yZWxlYXNlKCkpOwotICAgICAgICBp ZiAocHJvcElkID09IENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyUmFkaXVzKSB7Ci0gICAgICAgICAg ICBjb25zdCBpbnQgcHJvcGVydGllc1s0XSA9IHsgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJUb3BS aWdodFJhZGl1cywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQ cm9wZXJ0eVdlYmtpdEJvcmRlclRvcExlZnRSYWRpdXMsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVz LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5V2Vi a2l0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMgfTsKLSAgICAgICAgICAgIGZvciAoaW50IGkgPSAw OyBpIDwgNDsgaSsrKQotICAgICAgICAgICAgICAgIGFkZFByb3BlcnR5KHByb3BlcnRpZXNbaV0s IHZhbC5nZXQoKSwgaW1wb3J0YW50KTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBhZGRQ cm9wZXJ0eShwcm9wSWQsIHZhbC5yZWxlYXNlKCksIGltcG9ydGFudCk7CisgICAgICAgIGFkZFBy b3BlcnR5KHByb3BJZCwgdmFsLnJlbGVhc2UoKSwgaW1wb3J0YW50KTsKICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJSYWRpdXM6CisgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclJhZGl1czoKKyAgICAgICAgcmV0dXJuIHBhcnNlQm9y ZGVyUmFkaXVzKHByb3BJZCwgaW1wb3J0YW50KTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBD U1NQcm9wZXJ0eU91dGxpbmVPZmZzZXQ6CiAgICAgICAgIHZhbGlkX3ByaW1pdGl2ZSA9IHZhbGlk VW5pdCh2YWx1ZSwgRkxlbmd0aCwgbV9zdHJpY3QpOwogICAgICAgICBicmVhazsKQEAgLTM4OTUs NiArMzg5MCw3NSBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VCb3JkZXJJbWFnZShpbnQgcHJvCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgdm9pZCBjb21wbGV0ZUJvcmRlclJhZGlpKFJl ZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcmFkaWlbNF0pCit7CisgICAgaWYgKHJhZGlpWzNdKQor ICAgICAgICByZXR1cm47CisgICAgaWYgKCFyYWRpaVsyXSkgeworICAgICAgICBpZiAoIXJhZGlp WzFdKQorICAgICAgICAgICAgcmFkaWlbMV0gPSByYWRpaVswXTsKKyAgICAgICAgcmFkaWlbMl0g PSByYWRpaVswXTsKKyAgICB9CisgICAgcmFkaWlbM10gPSByYWRpaVsxXTsKK30KKworYm9vbCBD U1NQYXJzZXI6OnBhcnNlQm9yZGVyUmFkaXVzKGludCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQor eworICAgIHVuc2lnbmVkIG51bSA9IG1fdmFsdWVMaXN0LT5zaXplKCk7CisgICAgaWYgKG51bSA+ IDkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1 ZT4gcmFkaWlbMl1bNF07CisKKyAgICB1bnNpZ25lZCBpbmRleEFmdGVyU2xhc2ggPSAwOworICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW07ICsraSkgeworICAgICAgICBDU1NQYXJzZXJW YWx1ZSogdmFsdWUgPSBtX3ZhbHVlTGlzdC0+dmFsdWVBdChpKTsKKyAgICAgICAgaWYgKHZhbHVl LT51bml0ID09IENTU1BhcnNlclZhbHVlOjpPcGVyYXRvcikgeworICAgICAgICAgICAgaWYgKHZh bHVlLT5pVmFsdWUgIT0gJy8nKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg ICAgICAgICAgaWYgKCFpIHx8IGluZGV4QWZ0ZXJTbGFzaCB8fCBpICsgMSA9PSBudW0gfHwgbnVt ID4gaSArIDUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgICAgICBp bmRleEFmdGVyU2xhc2ggPSBpICsgMTsKKyAgICAgICAgICAgIGNvbXBsZXRlQm9yZGVyUmFkaWko cmFkaWlbMF0pOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKworICAgICAgICBp ZiAoaSAtIGluZGV4QWZ0ZXJTbGFzaCA+PSA0KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgICAgIGlmICghdmFsaWRVbml0KHZhbHVlLCBGTGVuZ3RoLCBtX3N0cmljdCkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVl PiByYWRpdXMgPSBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHZhbHVlLT5mVmFsdWUsIHN0YXRp Y19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXM+KHZhbHVlLT51bml0KSk7CisKKyAg ICAgICAgaWYgKCFpbmRleEFmdGVyU2xhc2gpIHsKKyAgICAgICAgICAgIHJhZGlpWzBdW2ldID0g cmFkaXVzOworCisgICAgICAgICAgICAvLyBMZWdhY3kgc3ludGF4OiAtd2Via2l0LWJvcmRlci1y YWRpdXM6IGwxIGwyOyBpcyBlcXVpdmFsZW50IHRvIGJvcmRlci1yYWRpdXM6IGwxIC8gbDI7Cisg ICAgICAgICAgICBpZiAobnVtID09IDIgJiYgcHJvcElkID09IENTU1Byb3BlcnR5V2Via2l0Qm9y ZGVyUmFkaXVzKSB7CisgICAgICAgICAgICAgICAgaW5kZXhBZnRlclNsYXNoID0gMTsKKyAgICAg ICAgICAgICAgICBjb21wbGV0ZUJvcmRlclJhZGlpKHJhZGlpWzBdKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICByYWRpaVsxXVtpIC0gaW5kZXhBZnRlclNsYXNo XSA9IHJhZGl1cy5yZWxlYXNlKCk7CisgICAgfQorCisgICAgaWYgKCFpbmRleEFmdGVyU2xhc2gp IHsKKyAgICAgICAgY29tcGxldGVCb3JkZXJSYWRpaShyYWRpaVswXSk7CisgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCA0OyArK2kpCisgICAgICAgICAgICByYWRpaVsxXVtpXSA9IHJh ZGlpWzBdW2ldOworICAgIH0gZWxzZQorICAgICAgICBjb21wbGV0ZUJvcmRlclJhZGlpKHJhZGlp WzFdKTsKKworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Qm9yZGVyVG9wTGVmdFJhZGl1cywg Q1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShQYWlyOjpjcmVhdGUocmFkaWlbMF1bMF0ucmVsZWFz ZSgpLCByYWRpaVsxXVswXS5yZWxlYXNlKCkpKSwgaW1wb3J0YW50KTsKKyAgICBhZGRQcm9wZXJ0 eShDU1NQcm9wZXJ0eUJvcmRlclRvcFJpZ2h0UmFkaXVzLCBDU1NQcmltaXRpdmVWYWx1ZTo6Y3Jl YXRlKFBhaXI6OmNyZWF0ZShyYWRpaVswXVsxXS5yZWxlYXNlKCksIHJhZGlpWzFdWzFdLnJlbGVh c2UoKSkpLCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Qm9yZGVyQm90 dG9tUmlnaHRSYWRpdXMsIENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoUGFpcjo6Y3JlYXRlKHJh ZGlpWzBdWzJdLnJlbGVhc2UoKSwgcmFkaWlbMV1bMl0ucmVsZWFzZSgpKSksIGltcG9ydGFudCk7 CisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21MZWZ0UmFkaXVzLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Y3JlYXRlKFBhaXI6OmNyZWF0ZShyYWRpaVswXVszXS5yZWxlYXNlKCks IHJhZGlpWzFdWzNdLnJlbGVhc2UoKSkpLCBpbXBvcnRhbnQpOworICAgIHJldHVybiB0cnVlOwor fQorCiBib29sIENTU1BhcnNlcjo6cGFyc2VDb3VudGVyKGludCBwcm9wSWQsIGludCBkZWZhdWx0 VmFsdWUsIGJvb2wgaW1wb3J0YW50KQogewogICAgIGVudW0geyBJRCwgVkFMIH0gc3RhdGUgPSBJ RDsKQEAgLTQ5ODgsNiArNTA1MiwxNiBAQCBzdGF0aWMgaW50IGNzc1Byb3BlcnR5SUQoY29uc3Qg VUNoYXIqIHByCiAgICAgICAgICAgICAgICAgY29uc3QgY2hhciogY29uc3QgYm94U2hhZG93ID0g ImJveC1zaGFkb3ciOwogICAgICAgICAgICAgICAgIG5hbWUgPSBib3hTaGFkb3c7CiAgICAgICAg ICAgICAgICAgbGVuZ3RoID0gc3RybGVuKGJveFNoYWRvdyk7CisgICAgICAgICAgICB9IGVsc2Ug aWYgKGhhc1ByZWZpeChidWZmZXIgKyA3LCBsZW5ndGggLSA3LCAiLWJvcmRlci0iKSkgeworICAg ICAgICAgICAgICAgIC8vIC13ZWJraXQtYm9yZGVyLSotKi1yYWRpdXMgd29ya2VkIGluIFNhZmFy aSA0IGFuZCBlYXJsaWVyLiAtd2Via2l0LWJvcmRlci1yYWRpdXMgc3ludGF4CisgICAgICAgICAg ICAgICAgLy8gZGlmZmVycyBmcm9tIGJvcmRlci1yYWRpdXMsIHNvIGl0IGlzIHJlbWFpbnMgYXMg YSBkaXN0aW5jdCBwcm9wZXJ0eS4KKyAgICAgICAgICAgICAgICBpZiAoIXN0cmNtcChidWZmZXIg KyAxNSwgInRvcC1sZWZ0LXJhZGl1cyIpCisgICAgICAgICAgICAgICAgICAgICAgICB8fCAhc3Ry Y21wKGJ1ZmZlciArIDE1LCAidG9wLXJpZ2h0LXJhZGl1cyIpCisgICAgICAgICAgICAgICAgICAg ICAgICB8fCAhc3RyY21wKGJ1ZmZlciArIDE1LCAiYm90dG9tLXJpZ2h0LXJhZGl1cyIpCisgICAg ICAgICAgICAgICAgICAgICAgICB8fCAhc3RyY21wKGJ1ZmZlciArIDE1LCAiYm90dG9tLWxlZnQt cmFkaXVzIikpIHsKKyAgICAgICAgICAgICAgICAgICAgbmFtZSA9IGJ1ZmZlciArIDg7CisgICAg ICAgICAgICAgICAgICAgIGxlbmd0aCAtPSA4OworICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgIH0KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU1BhcnNlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU1BhcnNlci5oCShyZXZpc2lvbiA0NjUwNSkKKysr IFdlYkNvcmUvY3NzL0NTU1BhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzksNiArMTM5LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBDU1MzIFBhcnNpbmcgUm91dGluZXMg KGZvciBwcm9wZXJ0aWVzIHNwZWNpZmljIHRvIENTUzMpCiAgICAgICAgIGJvb2wgcGFyc2VTaGFk b3coaW50IHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpOwogICAgICAgICBib29sIHBhcnNlQm9yZGVy SW1hZ2UoaW50IHByb3BJZCwgYm9vbCBpbXBvcnRhbnQsIFJlZlB0cjxDU1NWYWx1ZT4mKTsKKyAg ICAgICAgYm9vbCBwYXJzZUJvcmRlclJhZGl1cyhpbnQgcHJvcElkLCBib29sIGltcG9ydGFudCk7 CiAgICAgICAgIAogICAgICAgICBib29sIHBhcnNlUmVmbGVjdChpbnQgcHJvcElkLCBib29sIGlt cG9ydGFudCk7CiAKSW5kZXg6IFdlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9uZ2hhbmQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9uZ2hhbmQuY3BwCShyZXZpc2lv biA0NjUwNSkKKysrIFdlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9uZ2hhbmQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNTIsMTEgKzE1MiwxMiBAQCBzdGF0aWMgdm9pZCBpbml0U2hvcnRoYW5kTWFw KFNob3J0aGFuZE1hCiAgICAgU0VUX1NIT1JUSEFORF9NQVBfRU5UUlkoc2hvcnRoYW5kTWFwLCBD U1NQcm9wZXJ0eU92ZXJmbG93LCBvdmVyZmxvd1Byb3BlcnRpZXMpOwogCiAgICAgc3RhdGljIGNv bnN0IGludCBib3JkZXJSYWRpdXNQcm9wZXJ0aWVzW10gPSB7Ci0gICAgICAgIENTU1Byb3BlcnR5 V2Via2l0Qm9yZGVyVG9wUmlnaHRSYWRpdXMsCi0gICAgICAgIENTU1Byb3BlcnR5V2Via2l0Qm9y ZGVyVG9wTGVmdFJhZGl1cywKLSAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJCb3R0b21M ZWZ0UmFkaXVzLAotICAgICAgICBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckJvdHRvbVJpZ2h0UmFk aXVzCisgICAgICAgIENTU1Byb3BlcnR5Qm9yZGVyVG9wUmlnaHRSYWRpdXMsCisgICAgICAgIENT U1Byb3BlcnR5Qm9yZGVyVG9wTGVmdFJhZGl1cywKKyAgICAgICAgQ1NTUHJvcGVydHlCb3JkZXJC b3R0b21MZWZ0UmFkaXVzLAorICAgICAgICBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbVJpZ2h0UmFk aXVzCiAgICAgfTsKKyAgICBTRVRfU0hPUlRIQU5EX01BUF9FTlRSWShzaG9ydGhhbmRNYXAsIENT U1Byb3BlcnR5Qm9yZGVyUmFkaXVzLCBib3JkZXJSYWRpdXNQcm9wZXJ0aWVzKTsKICAgICBTRVRf U0hPUlRIQU5EX01BUF9FTlRSWShzaG9ydGhhbmRNYXAsIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVy UmFkaXVzLCBib3JkZXJSYWRpdXNQcm9wZXJ0aWVzKTsKIAogICAgIHN0YXRpYyBjb25zdCBpbnQg bWFza1Bvc2l0aW9uUHJvcGVydGllc1tdID0geyBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tQb3NpdGlv blgsIENTU1Byb3BlcnR5V2Via2l0TWFza1Bvc2l0aW9uWSB9OwpJbmRleDogV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0 eU5hbWVzLmluCShyZXZpc2lvbiA0NjUwNSkKKysrIFdlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFt ZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIxLDYgKzIxLDggQEAgYmFja2dyb3VuZC1yZXBlYXQK IGJvcmRlcgogYm9yZGVyLWJvdHRvbQogYm9yZGVyLWJvdHRvbS1jb2xvcgorYm9yZGVyLWJvdHRv bS1sZWZ0LXJhZGl1cworYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXMKIGJvcmRlci1ib3R0b20t c3R5bGUKIGJvcmRlci1ib3R0b20td2lkdGgKIGJvcmRlci1jb2xsYXBzZQpAQCAtMjksNiArMzEs NyBAQCBib3JkZXItbGVmdAogYm9yZGVyLWxlZnQtY29sb3IKIGJvcmRlci1sZWZ0LXN0eWxlCiBi b3JkZXItbGVmdC13aWR0aAorYm9yZGVyLXJhZGl1cwogYm9yZGVyLXJpZ2h0CiBib3JkZXItcmln aHQtY29sb3IKIGJvcmRlci1yaWdodC1zdHlsZQpAQCAtMzcsNiArNDAsOCBAQCBib3JkZXItc3Bh Y2luZwogYm9yZGVyLXN0eWxlCiBib3JkZXItdG9wCiBib3JkZXItdG9wLWNvbG9yCitib3JkZXIt dG9wLWxlZnQtcmFkaXVzCitib3JkZXItdG9wLXJpZ2h0LXJhZGl1cwogYm9yZGVyLXRvcC1zdHls ZQogYm9yZGVyLXRvcC13aWR0aAogYm9yZGVyLXdpZHRoCkBAIC0xNTMsMTQgKzE1OCwxNCBAQCB6 b29tCiAtd2Via2l0LWJhY2tncm91bmQtb3JpZ2luCiAtd2Via2l0LWJhY2tncm91bmQtc2l6ZQog LXdlYmtpdC1iaW5kaW5nCi0td2Via2l0LWJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXMKLS13ZWJr aXQtYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXMKIC13ZWJraXQtYm9yZGVyLWZpdAogLXdlYmtp dC1ib3JkZXItaG9yaXpvbnRhbC1zcGFjaW5nCiAtd2Via2l0LWJvcmRlci1pbWFnZQorCisjIC13 ZWJraXQtYm9yZGVyLXJhZGl1cyBkaWZmZXJzIGZyb20gYm9yZGVyLXJhZGl1cyBvbmx5IGluIHRo ZSBpbnRlcnByZXRhdGlvbiBvZgorIyBhIHZhbHVlIGNvbnNpc3Rpbmcgb2YgdHdvIGxlbmd0aHM6 ICItd2Via2l0LWJvcmRlci1yYWRpdXM6IGwxIGwyOyIgaXMgZXF1aXZhbGVudAorIyB0byAiYm9y ZGVyLXJhZGl1czogbDEgLyBsMjsiCiAtd2Via2l0LWJvcmRlci1yYWRpdXMKLS13ZWJraXQtYm9y ZGVyLXRvcC1sZWZ0LXJhZGl1cwotLXdlYmtpdC1ib3JkZXItdG9wLXJpZ2h0LXJhZGl1cwogLXdl YmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZwogLXdlYmtpdC1ib3gtYWxpZ24KIC13ZWJraXQt Ym94LWRpcmVjdGlvbgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDQ2 NTA1KQorKysgV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ0NDUsNiArNDQ0NSw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0 eShpbnQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJSYWRpdXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclJhZGl1czoKICAgICAg ICAgaWYgKGlzSW5oZXJpdCkgewogICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyVG9wTGVm dFJhZGl1cyhtX3BhcmVudFN0eWxlLT5ib3JkZXJUb3BMZWZ0UmFkaXVzKCkpOwpAQCAtNDQ1OCwy MyArNDQ1OSwyMyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgLy8gRmFsbCB0aHJvdWdoCi0g ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclRvcExlZnRSYWRpdXM6Ci0gICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEJvcmRlclRvcFJpZ2h0UmFkaXVzOgotICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRCb3JkZXJCb3R0b21SaWdodFJhZGl1czogeworICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJU b3BMZWZ0UmFkaXVzOgorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJUb3BSaWdodFJhZGl1czoK KyAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tTGVmdFJhZGl1czoKKyAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXM6IHsKICAgICAgICAgaWYgKGlzSW5oZXJp dCkgewotICAgICAgICAgICAgSEFORExFX0lOSEVSSVRfQ09ORChDU1NQcm9wZXJ0eVdlYmtpdEJv cmRlclRvcExlZnRSYWRpdXMsIGJvcmRlclRvcExlZnRSYWRpdXMsIEJvcmRlclRvcExlZnRSYWRp dXMpCi0gICAgICAgICAgICBIQU5ETEVfSU5IRVJJVF9DT05EKENTU1Byb3BlcnR5V2Via2l0Qm9y ZGVyVG9wUmlnaHRSYWRpdXMsIGJvcmRlclRvcFJpZ2h0UmFkaXVzLCBCb3JkZXJUb3BSaWdodFJh ZGl1cykKLSAgICAgICAgICAgIEhBTkRMRV9JTkhFUklUX0NPTkQoQ1NTUHJvcGVydHlXZWJraXRC b3JkZXJCb3R0b21MZWZ0UmFkaXVzLCBib3JkZXJCb3R0b21MZWZ0UmFkaXVzLCBCb3JkZXJCb3R0 b21MZWZ0UmFkaXVzKQotICAgICAgICAgICAgSEFORExFX0lOSEVSSVRfQ09ORChDU1NQcm9wZXJ0 eVdlYmtpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzLCBib3JkZXJCb3R0b21SaWdodFJhZGl1cywg Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMpCisgICAgICAgICAgICBIQU5ETEVfSU5IRVJJVF9DT05E KENTU1Byb3BlcnR5Qm9yZGVyVG9wTGVmdFJhZGl1cywgYm9yZGVyVG9wTGVmdFJhZGl1cywgQm9y ZGVyVG9wTGVmdFJhZGl1cykKKyAgICAgICAgICAgIEhBTkRMRV9JTkhFUklUX0NPTkQoQ1NTUHJv cGVydHlCb3JkZXJUb3BSaWdodFJhZGl1cywgYm9yZGVyVG9wUmlnaHRSYWRpdXMsIEJvcmRlclRv cFJpZ2h0UmFkaXVzKQorICAgICAgICAgICAgSEFORExFX0lOSEVSSVRfQ09ORChDU1NQcm9wZXJ0 eUJvcmRlckJvdHRvbUxlZnRSYWRpdXMsIGJvcmRlckJvdHRvbUxlZnRSYWRpdXMsIEJvcmRlckJv dHRvbUxlZnRSYWRpdXMpCisgICAgICAgICAgICBIQU5ETEVfSU5IRVJJVF9DT05EKENTU1Byb3Bl cnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsIGJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzLCBCb3Jk ZXJCb3R0b21SaWdodFJhZGl1cykKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAg ICAgICAKICAgICAgICAgaWYgKGlzSW5pdGlhbCkgewotICAgICAgICAgICAgSEFORExFX0lOSVRJ QUxfQ09ORF9XSVRIX1ZBTFVFKENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyVG9wTGVmdFJhZGl1cywg Qm9yZGVyVG9wTGVmdFJhZGl1cywgQm9yZGVyUmFkaXVzKQotICAgICAgICAgICAgSEFORExFX0lO SVRJQUxfQ09ORF9XSVRIX1ZBTFVFKENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyVG9wUmlnaHRSYWRp dXMsIEJvcmRlclRvcFJpZ2h0UmFkaXVzLCBCb3JkZXJSYWRpdXMpCi0gICAgICAgICAgICBIQU5E TEVfSU5JVElBTF9DT05EX1dJVEhfVkFMVUUoQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJCb3R0b21M ZWZ0UmFkaXVzLCBCb3JkZXJCb3R0b21MZWZ0UmFkaXVzLCBCb3JkZXJSYWRpdXMpCi0gICAgICAg ICAgICBIQU5ETEVfSU5JVElBTF9DT05EX1dJVEhfVkFMVUUoQ1NTUHJvcGVydHlXZWJraXRCb3Jk ZXJCb3R0b21SaWdodFJhZGl1cywgQm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsIEJvcmRlclJhZGl1 cykKKyAgICAgICAgICAgIEhBTkRMRV9JTklUSUFMX0NPTkRfV0lUSF9WQUxVRShDU1NQcm9wZXJ0 eUJvcmRlclRvcExlZnRSYWRpdXMsIEJvcmRlclRvcExlZnRSYWRpdXMsIEJvcmRlclJhZGl1cykK KyAgICAgICAgICAgIEhBTkRMRV9JTklUSUFMX0NPTkRfV0lUSF9WQUxVRShDU1NQcm9wZXJ0eUJv cmRlclRvcFJpZ2h0UmFkaXVzLCBCb3JkZXJUb3BSaWdodFJhZGl1cywgQm9yZGVyUmFkaXVzKQor ICAgICAgICAgICAgSEFORExFX0lOSVRJQUxfQ09ORF9XSVRIX1ZBTFVFKENTU1Byb3BlcnR5Qm9y ZGVyQm90dG9tTGVmdFJhZGl1cywgQm9yZGVyQm90dG9tTGVmdFJhZGl1cywgQm9yZGVyUmFkaXVz KQorICAgICAgICAgICAgSEFORExFX0lOSVRJQUxfQ09ORF9XSVRIX1ZBTFVFKENTU1Byb3BlcnR5 Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsIEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzLCBCb3JkZXJS YWRpdXMpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtNDQ5NywxNiArNDQ5 OCwxNiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAKICAgICAg ICAgSW50U2l6ZSBzaXplKHdpZHRoLCBoZWlnaHQpOwogICAgICAgICBzd2l0Y2ggKGlkKSB7Ci0g ICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyVG9wTGVmdFJhZGl1czoKKyAg ICAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJUb3BMZWZ0UmFkaXVzOgogICAgICAgICAg ICAgICAgIG1fc3R5bGUtPnNldEJvcmRlclRvcExlZnRSYWRpdXMoc2l6ZSk7CiAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyVG9w UmlnaHRSYWRpdXM6CisgICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyVG9wUmlnaHRS YWRpdXM6CiAgICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyVG9wUmlnaHRSYWRpdXMo c2l6ZSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0Qm9yZGVyQm90dG9tTGVmdFJhZGl1czoKKyAgICAgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlCb3JkZXJCb3R0b21MZWZ0UmFkaXVzOgogICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNl dEJvcmRlckJvdHRvbUxlZnRSYWRpdXMoc2l6ZSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXM6 CisgICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXM6CiAg ICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMoc2l6ZSk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBkZWZhdWx0OgpJbmRleDogV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCShyZXZpc2lvbiA0NjUwNSkKKysr IFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ2MCwxMCArNDYwLDEwIEBAIHN0YXRpYyB2b2lkIGVuc3VyZVByb3BlcnR5TWFwKCkKICAg ICAgICAgZ1Byb3BlcnR5V3JhcHBlcnMtPmFwcGVuZChuZXcgUHJvcGVydHlXcmFwcGVyPExlbmd0 aD4oQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW5YLCAmUmVuZGVyU3R5bGU6OnRyYW5z Zm9ybU9yaWdpblgsICZSZW5kZXJTdHlsZTo6c2V0VHJhbnNmb3JtT3JpZ2luWCkpOwogICAgICAg ICBnUHJvcGVydHlXcmFwcGVycy0+YXBwZW5kKG5ldyBQcm9wZXJ0eVdyYXBwZXI8TGVuZ3RoPihD U1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpblksICZSZW5kZXJTdHlsZTo6dHJhbnNmb3Jt T3JpZ2luWSwgJlJlbmRlclN0eWxlOjpzZXRUcmFuc2Zvcm1PcmlnaW5ZKSk7CiAgICAgICAgIGdQ cm9wZXJ0eVdyYXBwZXJzLT5hcHBlbmQobmV3IFByb3BlcnR5V3JhcHBlcjxmbG9hdD4oQ1NTUHJv cGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW5aLCAmUmVuZGVyU3R5bGU6OnRyYW5zZm9ybU9yaWdp blosICZSZW5kZXJTdHlsZTo6c2V0VHJhbnNmb3JtT3JpZ2luWikpOwotICAgICAgICBnUHJvcGVy dHlXcmFwcGVycy0+YXBwZW5kKG5ldyBQcm9wZXJ0eVdyYXBwZXI8Y29uc3QgSW50U2l6ZSY+KENT U1Byb3BlcnR5V2Via2l0Qm9yZGVyVG9wTGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjpib3JkZXJU b3BMZWZ0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlclRvcExlZnRSYWRpdXMpKTsKLSAg ICAgICAgZ1Byb3BlcnR5V3JhcHBlcnMtPmFwcGVuZChuZXcgUHJvcGVydHlXcmFwcGVyPGNvbnN0 IEludFNpemUmPihDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclRvcFJpZ2h0UmFkaXVzLCAmUmVuZGVy U3R5bGU6OmJvcmRlclRvcFJpZ2h0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlclRvcFJp Z2h0UmFkaXVzKSk7Ci0gICAgICAgIGdQcm9wZXJ0eVdyYXBwZXJzLT5hcHBlbmQobmV3IFByb3Bl cnR5V3JhcHBlcjxjb25zdCBJbnRTaXplJj4oQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJCb3R0b21M ZWZ0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OmJvcmRlckJvdHRvbUxlZnRSYWRpdXMsICZSZW5kZXJT dHlsZTo6c2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cykpOwotICAgICAgICBnUHJvcGVydHlXcmFw cGVycy0+YXBwZW5kKG5ldyBQcm9wZXJ0eVdyYXBwZXI8Y29uc3QgSW50U2l6ZSY+KENTU1Byb3Bl cnR5V2Via2l0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6Ym9yZGVyQm90 dG9tUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMp KTsKKyAgICAgICAgZ1Byb3BlcnR5V3JhcHBlcnMtPmFwcGVuZChuZXcgUHJvcGVydHlXcmFwcGVy PGNvbnN0IEludFNpemUmPihDU1NQcm9wZXJ0eUJvcmRlclRvcExlZnRSYWRpdXMsICZSZW5kZXJT dHlsZTo6Ym9yZGVyVG9wTGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJUb3BMZWZ0 UmFkaXVzKSk7CisgICAgICAgIGdQcm9wZXJ0eVdyYXBwZXJzLT5hcHBlbmQobmV3IFByb3BlcnR5 V3JhcHBlcjxjb25zdCBJbnRTaXplJj4oQ1NTUHJvcGVydHlCb3JkZXJUb3BSaWdodFJhZGl1cywg JlJlbmRlclN0eWxlOjpib3JkZXJUb3BSaWdodFJhZGl1cywgJlJlbmRlclN0eWxlOjpzZXRCb3Jk ZXJUb3BSaWdodFJhZGl1cykpOworICAgICAgICBnUHJvcGVydHlXcmFwcGVycy0+YXBwZW5kKG5l dyBQcm9wZXJ0eVdyYXBwZXI8Y29uc3QgSW50U2l6ZSY+KENTU1Byb3BlcnR5Qm9yZGVyQm90dG9t TGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjpib3JkZXJCb3R0b21MZWZ0UmFkaXVzLCAmUmVuZGVy U3R5bGU6OnNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXMpKTsKKyAgICAgICAgZ1Byb3BlcnR5V3Jh cHBlcnMtPmFwcGVuZChuZXcgUHJvcGVydHlXcmFwcGVyPGNvbnN0IEludFNpemUmPihDU1NQcm9w ZXJ0eUJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OmJvcmRlckJvdHRvbVJp Z2h0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKSk7CiAg ICAgICAgIGdQcm9wZXJ0eVdyYXBwZXJzLT5hcHBlbmQobmV3IFByb3BlcnR5V3JhcHBlcjxFVmlz aWJpbGl0eT4oQ1NTUHJvcGVydHlWaXNpYmlsaXR5LCAmUmVuZGVyU3R5bGU6OnZpc2liaWxpdHks ICZSZW5kZXJTdHlsZTo6c2V0VmlzaWJpbGl0eSkpOwogICAgICAgICBnUHJvcGVydHlXcmFwcGVy cy0+YXBwZW5kKG5ldyBQcm9wZXJ0eVdyYXBwZXI8ZmxvYXQ+KENTU1Byb3BlcnR5Wm9vbSwgJlJl bmRlclN0eWxlOjp6b29tLCAmUmVuZGVyU3R5bGU6OnNldFpvb20pKTsKICAgICAgICAgCkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA0NjUwNikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDA5LTA3LTI4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTmV3IHRlc3QsIHVwZGF0ZWQgdGVzdCwgYW5kIHVwZGF0ZWQgdGVzdCByZXN1bHRzIGZvcjoK KworICAgICAgICBbQ1NTMyBCYWNrZ3JvdW5kcyBhbmQgQm9yZGVyc10gRHJvcCB0aGUgcHJlZml4 IGZyb20gdGhlIGJvcmRlci1yYWRpdXMKKyAgICAgICAgcHJvcGVydGllcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NzgKKworICAgICAgICBbQ1NT MyBCYWNrZ3JvdW5kcyBhbmQgQm9yZGVyc10gSGFuZGxlIHRoZSAvIGFuZCA0IHZhbHVlcyBpbgor ICAgICAgICBib3JkZXItcmFkaXVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNzU4NAorCisgICAgICAgICogZmFzdC9ib3JkZXJzL2JvcmRlci1yYWRp dXMtcGFyc2luZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvYm9yZGVycy9i b3JkZXItcmFkaXVzLXBhcnNpbmcuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvcmVt b3ZlLXNob3J0aGFuZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9jc3MvcmVtb3ZlLXNo b3J0aGFuZC5odG1sOiBBZGRlZCBhIHRlc3QgZm9yIGJvcmRlci1yYWRpdXMuCisgICAgICAgICog cGxhdGZvcm0vbWFjL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0 eWxlL2NvbXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIHN2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQ6CisKIDIwMDkt MDctMjggIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJ1YmJlci1zdGFtcGVkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Jv cmRlcnMvYm9yZGVyLXJhZGl1cy1wYXJzaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L2JvcmRlcnMvYm9yZGVyLXJhZGl1cy1wYXJzaW5nLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvYm9yZGVycy9ib3JkZXItcmFkaXVz LXBhcnNpbmctZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMxIEBACitUZXN0 aW5nIGJvcmRlci1yYWRpdXM6IDEwcHg7CitTVUNDRVNTCitUZXN0aW5nIGJvcmRlci1yYWRpdXM6 IDEwcHggMjBweDsKK1NVQ0NFU1MKK1Rlc3RpbmcgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAxMHB4 IDIwcHg7CitTVUNDRVNTCitUZXN0aW5nIGJvcmRlci1yYWRpdXM6IDEwcHggMjBweCAzMHB4Owor U1VDQ0VTUworVGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBweCA0MHB4OworU1VD Q0VTUworVGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBweCA0MHB4IDUwcHg7CitT VUNDRVNTCitUZXN0aW5nIGJvcmRlci1yYWRpdXM6IDEwcHggMjBweCAzMHB4IDQwcHggLyAxNXB4 OworU1VDQ0VTUworVGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBweCA0MHB4IC8g MTVweCAyNXB4OworU1VDQ0VTUworVGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBw eCA0MHB4IC8gMTVweCAyNXB4IDM1cHg7CitTVUNDRVNTCitUZXN0aW5nIGJvcmRlci1yYWRpdXM6 IDEwcHggMjBweCAzMHB4IDQwcHggLyAxNXB4IDI1cHggMzVweCA0NXB4OworU1VDQ0VTUworVGVz dGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBweCA0MHB4IC8gMTVweCAyNXB4IDM1cHgg NDVweCA1NXB4OworU1VDQ0VTUworVGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IDIwcHggMzBw eCA0MHB4IC8gMTVweCAyNXB4IDM1cHggNDVweCAvOworU1VDQ0VTUworVGVzdGluZyBib3JkZXIt cmFkaXVzOiAxMHB4IDIwcHggMzBweCA0MHB4IC8gLyAyNXB4IDM1cHggNDVweDsKK1NVQ0NFU1MK K1Rlc3RpbmcgYm9yZGVyLXJhZGl1czogLyAxMHB4IDIwcHggMzBweCA0MHB4OworU1VDQ0VTUwor VGVzdGluZyBib3JkZXItcmFkaXVzOiAxMHB4IC8gMjBweCAzMHB4IDQwcHg7CitTVUNDRVNTCisK SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvYm9yZGVycy9ib3JkZXItcmFkaXVzLXBhcnNpbmcuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2JvcmRlcnMvYm9yZGVyLXJhZGl1cy1w YXJzaW5nLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2JvcmRlcnMvYm9y ZGVyLXJhZGl1cy1wYXJzaW5nLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTAgQEAKKzxw cmUgaWQ9ImNvbnNvbGUiPjwvcHJlPgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBsb2cobWVzc2Fn ZSkKKyAgICB7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIikuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSArICJcbiIpKTsKKyAgICB9 CisKKyAgICBmdW5jdGlvbiB0ZXN0Qm9yZGVyUmFkaXVzVmFsdWUocHJvcGVydHksIHZhbHVlLCBl eHBlY3RlZFJhZGlpKQorICAgIHsKKyAgICAgICAgbG9nICgiVGVzdGluZyAiICsgcHJvcGVydHkg KyAiOiAiICsgdmFsdWUgKyAiOyIpOworCisgICAgICAgIHZhciBlbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQo ZWxlbWVudCk7CisgICAgICAgIGVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkocHJvcGVydHksIHZh bHVlKTsKKyAgICAgICAgdmFyIGNvbXB1dGVkU3R5bGUgPSBnZXRDb21wdXRlZFN0eWxlKGVsZW1l bnQpOworICAgICAgICB2YXIgcHJvcGVydGllcyA9IFsiYm9yZGVyLXRvcC1sZWZ0LXJhZGl1cyIs ICJib3JkZXItdG9wLXJpZ2h0LXJhZGl1cyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICJi b3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cyIsICJib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzIl07 CisgICAgICAgIHZhciBmYWlsZWQgPSBmYWxzZTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCA0OyArK2kpIHsKKyAgICAgICAgICAgIGFjdHVhbFJhZGl1cyA9IGNvbXB1dGVkU3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZShwcm9wZXJ0aWVzW2ldKTsKKyAgICAgICAgICAgIGlmIChhY3R1YWxSYWRp dXMgPT09IGV4cGVjdGVkUmFkaWlbaV0pCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAg ICAgICAgICAgIGZhaWxlZCA9IHRydWU7CisgICAgICAgICAgICBsb2coIkZBSUxFRDogIiArIHBy b3BlcnRpZXNbaV0gKyAiIHdhcyAiICsgYWN0dWFsUmFkaXVzICsgIiBpbnN0ZWFkIG9mICIgKyBl eHBlY3RlZFJhZGlpW2ldKQorICAgICAgICB9CisgICAgICAgIGlmICghZmFpbGVkKQorICAgICAg ICAgICAgbG9nKCJTVUNDRVNTIik7CisgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQo ZWxlbWVudCk7CisgICAgfQorCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdGVzdEJv cmRlclJhZGl1c1ZhbHVlKCJib3JkZXItcmFkaXVzIiwgIjEwcHgiLCBbIjEwcHgiLCAiMTBweCIs ICIxMHB4IiwgIjEwcHgiXSk7CisgICAgdGVzdEJvcmRlclJhZGl1c1ZhbHVlKCJib3JkZXItcmFk aXVzIiwgIjEwcHggMjBweCIsIFsiMTBweCIsICIyMHB4IiwgIjEwcHgiLCAiMjBweCJdKTsKKyAg ICB0ZXN0Qm9yZGVyUmFkaXVzVmFsdWUoIi13ZWJraXQtYm9yZGVyLXJhZGl1cyIsICIxMHB4IDIw cHgiLCBbIjEwcHggMjBweCIsICIxMHB4IDIwcHgiLCAiMTBweCAyMHB4IiwgIjEwcHggMjBweCJd KTsKKyAgICB0ZXN0Qm9yZGVyUmFkaXVzVmFsdWUoImJvcmRlci1yYWRpdXMiLCAiMTBweCAyMHB4 IDMwcHgiLCBbIjEwcHgiLCAiMjBweCIsICIzMHB4IiwgIjIwcHgiXSk7CisgICAgdGVzdEJvcmRl clJhZGl1c1ZhbHVlKCJib3JkZXItcmFkaXVzIiwgIjEwcHggMjBweCAzMHB4IDQwcHgiLCBbIjEw cHgiLCAiMjBweCIsICIzMHB4IiwgIjQwcHgiXSk7CisgICAgdGVzdEJvcmRlclJhZGl1c1ZhbHVl KCJib3JkZXItcmFkaXVzIiwgIjEwcHggMjBweCAzMHB4IDQwcHggNTBweCIsIFsiMHB4IiwgIjBw eCIsICIwcHgiLCAiMHB4Il0pOworICAgIHRlc3RCb3JkZXJSYWRpdXNWYWx1ZSgiYm9yZGVyLXJh ZGl1cyIsICIxMHB4IDIwcHggMzBweCA0MHB4IC8gMTVweCIsIFsiMTBweCAxNXB4IiwgIjIwcHgg MTVweCIsICIzMHB4IDE1cHgiLCAiNDBweCAxNXB4Il0pOworICAgIHRlc3RCb3JkZXJSYWRpdXNW YWx1ZSgiYm9yZGVyLXJhZGl1cyIsICIxMHB4IDIwcHggMzBweCA0MHB4IC8gMTVweCAyNXB4Iiwg WyIxMHB4IDE1cHgiLCAiMjBweCAyNXB4IiwgIjMwcHggMTVweCIsICI0MHB4IDI1cHgiXSk7Cisg ICAgdGVzdEJvcmRlclJhZGl1c1ZhbHVlKCJib3JkZXItcmFkaXVzIiwgIjEwcHggMjBweCAzMHB4 IDQwcHggLyAxNXB4IDI1cHggMzVweCIsIFsiMTBweCAxNXB4IiwgIjIwcHggMjVweCIsICIzMHB4 IDM1cHgiLCAiNDBweCAyNXB4Il0pOworICAgIHRlc3RCb3JkZXJSYWRpdXNWYWx1ZSgiYm9yZGVy LXJhZGl1cyIsICIxMHB4IDIwcHggMzBweCA0MHB4IC8gMTVweCAyNXB4IDM1cHggNDVweCIsIFsi MTBweCAxNXB4IiwgIjIwcHggMjVweCIsICIzMHB4IDM1cHgiLCAiNDBweCA0NXB4Il0pOworICAg IHRlc3RCb3JkZXJSYWRpdXNWYWx1ZSgiYm9yZGVyLXJhZGl1cyIsICIxMHB4IDIwcHggMzBweCA0 MHB4IC8gMTVweCAyNXB4IDM1cHggNDVweCA1NXB4IiwgWyIwcHgiLCAiMHB4IiwgIjBweCIsICIw cHgiXSk7CisgICAgdGVzdEJvcmRlclJhZGl1c1ZhbHVlKCJib3JkZXItcmFkaXVzIiwgIjEwcHgg MjBweCAzMHB4IDQwcHggLyAxNXB4IDI1cHggMzVweCA0NXB4IC8iLCBbIjBweCIsICIwcHgiLCAi MHB4IiwgIjBweCJdKTsKKyAgICB0ZXN0Qm9yZGVyUmFkaXVzVmFsdWUoImJvcmRlci1yYWRpdXMi LCAiMTBweCAyMHB4IDMwcHggNDBweCAvIC8gMjVweCAzNXB4IDQ1cHgiLCBbIjBweCIsICIwcHgi LCAiMHB4IiwgIjBweCJdKTsKKyAgICB0ZXN0Qm9yZGVyUmFkaXVzVmFsdWUoImJvcmRlci1yYWRp dXMiLCAiLyAxMHB4IDIwcHggMzBweCA0MHB4IiwgWyIwcHgiLCAiMHB4IiwgIjBweCIsICIwcHgi XSk7CisgICAgdGVzdEJvcmRlclJhZGl1c1ZhbHVlKCJib3JkZXItcmFkaXVzIiwgIjEwcHggLyAy MHB4IDMwcHggNDBweCIsIFsiMTBweCAyMHB4IiwgIjEwcHggMzBweCIsICIxMHB4IDQwcHgiLCAi MTBweCAzMHB4Il0pOworPC9zY3JpcHQ+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9yZW1v dmUtc2hvcnRoYW5kLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2Nzcy9yZW1vdmUtc2hvcnRoYW5kLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNDY1MDUpCisrKyBM YXlvdXRUZXN0cy9mYXN0L2Nzcy9yZW1vdmUtc2hvcnRoYW5kLWV4cGVjdGVkLnR4dAkod29ya2lu ZyBjb3B5KQpAQCAtMTIsNyArMTIsOCBAQCBSZW1vdmluZyBib3JkZXItbGVmdCByZW1vdmVzIGJv cmRlci1sZWZ0CiBSZW1vdmluZyBib3JkZXItY29sb3IgcmVtb3ZlcyBib3JkZXItdG9wLWNvbG9y LCBib3JkZXItcmlnaHQtY29sb3IsIGJvcmRlci1ib3R0b20tY29sb3IsIGJvcmRlci1sZWZ0LWNv bG9yLgogUmVtb3ZpbmcgYm9yZGVyLXN0eWxlIHJlbW92ZXMgYm9yZGVyLXRvcC1zdHlsZSwgYm9y ZGVyLXJpZ2h0LXN0eWxlLCBib3JkZXItYm90dG9tLXN0eWxlLCBib3JkZXItbGVmdC1zdHlsZS4K IFJlbW92aW5nIGJvcmRlci13aWR0aCByZW1vdmVzIGJvcmRlci10b3Atd2lkdGgsIGJvcmRlci1y aWdodC13aWR0aCwgYm9yZGVyLWJvdHRvbS13aWR0aCwgYm9yZGVyLWxlZnQtd2lkdGguCi1SZW1v dmluZyAtd2Via2l0LWJvcmRlci1yYWRpdXMgcmVtb3ZlcyAtd2Via2l0LWJvcmRlci10b3Atcmln aHQtcmFkaXVzLCAtd2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXMsIC13ZWJraXQtYm9yZGVy LWJvdHRvbS1sZWZ0LXJhZGl1cywgLXdlYmtpdC1ib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cy4K K1JlbW92aW5nIGJvcmRlci1yYWRpdXMgcmVtb3ZlcyBib3JkZXItdG9wLWxlZnQtcmFkaXVzLCBi b3JkZXItdG9wLXJpZ2h0LXJhZGl1cywgYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXMsIGJvcmRl ci1ib3R0b20tbGVmdC1yYWRpdXMuCitSZW1vdmluZyAtd2Via2l0LWJvcmRlci1yYWRpdXMgcmVt b3ZlcyBib3JkZXItdG9wLWxlZnQtcmFkaXVzLCBib3JkZXItdG9wLXJpZ2h0LXJhZGl1cywgYm9y ZGVyLWJvdHRvbS1yaWdodC1yYWRpdXMsIGJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXMuCiBSZW1v dmluZyBib3JkZXItc3BhY2luZyByZW1vdmVzIC13ZWJraXQtYm9yZGVyLWhvcml6b250YWwtc3Bh Y2luZywgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZy4KIFJlbW92aW5nIC13ZWJraXQt Y29sdW1ucyByZW1vdmVzIC13ZWJraXQtY29sdW1uLXdpZHRoLCAtd2Via2l0LWNvbHVtbi1jb3Vu dC4KIFJlbW92aW5nIC13ZWJraXQtY29sdW1uLXJ1bGUgcmVtb3ZlcyAtd2Via2l0LWNvbHVtbi1y dWxlLXdpZHRoLCAtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlLCAtd2Via2l0LWNvbHVtbi1ydWxl LWNvbG9yLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MvcmVtb3ZlLXNob3J0aGFuZC5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL3JlbW92ZS1zaG9ydGhhbmQuaHRt bAkocmV2aXNpb24gNDY1MDUpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9yZW1vdmUtc2hvcnRo YW5kLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAKICAgICAgICAgICAgICAg ICAiYm9yZGVyIiwKICAgICAgICAgICAgICAgICAiYm9yZGVyLXRvcCIsICJib3JkZXItcmlnaHQi LCAiYm9yZGVyLWJvdHRvbSIsICJib3JkZXItbGVmdCIsCiAgICAgICAgICAgICAgICAgImJvcmRl ci1jb2xvciIsICJib3JkZXItc3R5bGUiLCAiYm9yZGVyLXdpZHRoIiwKKyAgICAgICAgICAgICAg ICAiYm9yZGVyLXJhZGl1cyIsCiAgICAgICAgICAgICAgICAgIi13ZWJraXQtYm9yZGVyLXJhZGl1 cyIsCiAgICAgICAgICAgICAgICAgImJvcmRlci1zcGFjaW5nIiwKICAgICAgICAgICAgICAgICAi LXdlYmtpdC1jb2x1bW5zIiwKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Nz cy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9j b21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDQ2NTA1KQorKysgTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUt ZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC04LDYgKzgsOCBAQCBiYWNrZ3JvdW5kLW9y aWdpbjogcGFkZGluZy1ib3g7CiBiYWNrZ3JvdW5kLXBvc2l0aW9uOiAwJSAwJTsKIGJhY2tncm91 bmQtcmVwZWF0OiByZXBlYXQ7CiBib3JkZXItYm90dG9tLWNvbG9yOiByZ2IoMCwgMCwgMCk7Citi b3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiAwcHg7Citib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1 czogMHB4OwogYm9yZGVyLWJvdHRvbS1zdHlsZTogbm9uZTsKIGJvcmRlci1ib3R0b20td2lkdGg6 IDBweDsKIGJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7CkBAIC0xOCw2ICsyMCw4IEBAIGJvcmRl ci1yaWdodC1jb2xvcjogcmdiKDAsIDAsIDApOwogYm9yZGVyLXJpZ2h0LXN0eWxlOiBub25lOwog Ym9yZGVyLXJpZ2h0LXdpZHRoOiAwcHg7CiBib3JkZXItdG9wLWNvbG9yOiByZ2IoMCwgMCwgMCk7 Citib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAwcHg7Citib3JkZXItdG9wLXJpZ2h0LXJhZGl1czog MHB4OwogYm9yZGVyLXRvcC1zdHlsZTogbm9uZTsKIGJvcmRlci10b3Atd2lkdGg6IDBweDsKIGJv dHRvbTogYXV0bzsKQEAgLTEwMCwxMyArMTA0LDkgQEAgem9vbTogMTsKIC13ZWJraXQtYmFja2dy b3VuZC1jb21wb3NpdGU6IHNvdXJjZS1vdmVyOwogLXdlYmtpdC1iYWNrZ3JvdW5kLW9yaWdpbjog cGFkZGluZy1ib3g7CiAtd2Via2l0LWJhY2tncm91bmQtc2l6ZTogYXV0byBhdXRvOwotLXdlYmtp dC1ib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiAwcHg7Ci0td2Via2l0LWJvcmRlci1ib3R0b20t cmlnaHQtcmFkaXVzOiAwcHg7CiAtd2Via2l0LWJvcmRlci1maXQ6IGJvcmRlcjsKIC13ZWJraXQt Ym9yZGVyLWhvcml6b250YWwtc3BhY2luZzogMHB4OwogLXdlYmtpdC1ib3JkZXItaW1hZ2U6IG5v bmU7Ci0td2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXM6IDBweDsKLS13ZWJraXQtYm9yZGVy LXRvcC1yaWdodC1yYWRpdXM6IDBweDsKIC13ZWJraXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNpbmc6 IDBweDsKIC13ZWJraXQtYm94LWFsaWduOiBzdHJldGNoOwogLXdlYmtpdC1ib3gtZGlyZWN0aW9u OiBub3JtYWw7CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9jc3MvZ2V0Q29t cHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9jc3MvZ2V0Q29tcHV0 ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gNDY1MDUpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9jc3MvZ2V0Q29t cHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dAko d29ya2luZyBjb3B5KQpAQCAtNyw2ICs3LDggQEAgQ29tcHV0ZWQgc3R5bGUgb2YgYW4gZWxlbWVu dCB3aG9zZSBwYXJlbgogICAgIGJhY2tncm91bmQtcG9zaXRpb246IDAlIDAlCiAgICAgYmFja2dy b3VuZC1yZXBlYXQ6IHJlcGVhdAogICAgIGJvcmRlci1ib3R0b20tY29sb3I6IHJnYigwLCAwLCAw KQorICAgIGJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IDBweAorICAgIGJvcmRlci1ib3R0b20t cmlnaHQtcmFkaXVzOiAwcHgKICAgICBib3JkZXItYm90dG9tLXN0eWxlOiBub25lCiAgICAgYm9y ZGVyLWJvdHRvbS13aWR0aDogMHB4CiAgICAgYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZQpAQCAt MTcsNiArMTksOCBAQCBDb21wdXRlZCBzdHlsZSBvZiBhbiBlbGVtZW50IHdob3NlIHBhcmVuCiAg ICAgYm9yZGVyLXJpZ2h0LXN0eWxlOiBub25lCiAgICAgYm9yZGVyLXJpZ2h0LXdpZHRoOiAwcHgK ICAgICBib3JkZXItdG9wLWNvbG9yOiByZ2IoMCwgMCwgMCkKKyAgICBib3JkZXItdG9wLWxlZnQt cmFkaXVzOiAwcHgKKyAgICBib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogMHB4CiAgICAgYm9yZGVy LXRvcC1zdHlsZTogc29saWQKICAgICBib3JkZXItdG9wLXdpZHRoOiAxNnB4CiAgICAgYm90dG9t OiBhdXRvCkBAIC05OSwxMyArMTAzLDkgQEAgQ29tcHV0ZWQgc3R5bGUgb2YgYW4gZWxlbWVudCB3 aG9zZSBwYXJlbgogICAgIC13ZWJraXQtYmFja2dyb3VuZC1jb21wb3NpdGU6IHNvdXJjZS1vdmVy CiAgICAgLXdlYmtpdC1iYWNrZ3JvdW5kLW9yaWdpbjogcGFkZGluZy1ib3gKICAgICAtd2Via2l0 LWJhY2tncm91bmQtc2l6ZTogYXV0byBhdXRvCi0gICAgLXdlYmtpdC1ib3JkZXItYm90dG9tLWxl ZnQtcmFkaXVzOiAwcHgKLSAgICAtd2Via2l0LWJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzOiAw cHgKICAgICAtd2Via2l0LWJvcmRlci1maXQ6IGJvcmRlcgogICAgIC13ZWJraXQtYm9yZGVyLWhv cml6b250YWwtc3BhY2luZzogMHB4CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IG5vbmUKLSAg ICAtd2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXM6IDBweAotICAgIC13ZWJraXQtYm9yZGVy LXRvcC1yaWdodC1yYWRpdXM6IDBweAogICAgIC13ZWJraXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNp bmc6IDBweAogICAgIC13ZWJraXQtYm94LWFsaWduOiBzdHJldGNoCiAgICAgLXdlYmtpdC1ib3gt ZGlyZWN0aW9uOiBub3JtYWwKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRT dHlsZS1iYXNpYy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2Nz cy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNDY1MDUpCisr KyBMYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0 CSh3b3JraW5nIGNvcHkpCkBAIC0xNCw2ICsxNCwxMCBAQCByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKGJhY2tncm91bmQtCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGJhY2tn cm91bmQtcmVwZWF0KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKGJvcmRlci1ib3R0b20tY29sb3IpIDogcmdiKDAsIDAsIDApCiByZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGJvcmRlci1ib3R0b20tY29sb3IpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVy LWJvdHRvbS1sZWZ0LXJhZGl1cykgOiAwcHgKK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFs dWUoYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVl XQorcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1 cykgOiAwcHgKK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9yZGVyLWJvdHRvbS1y aWdodC1yYWRpdXMpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdl dFByb3BlcnR5VmFsdWUoYm9yZGVyLWJvdHRvbS1zdHlsZSkgOiBub25lCiByZWN0OiBzdHlsZS5n ZXRQcm9wZXJ0eUNTU1ZhbHVlKGJvcmRlci1ib3R0b20tc3R5bGUpIDogW29iamVjdCBDU1NQcmlt aXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVyLWJvdHRvbS13 aWR0aCkgOiAwcHgKQEAgLTM0LDYgKzM4LDEwIEBAIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFs dWUoYm9yZGVyLXJpZ2gKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9yZGVyLXJp Z2h0LXdpZHRoKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHlsZS5nZXRQ cm9wZXJ0eVZhbHVlKGJvcmRlci10b3AtY29sb3IpIDogcmdiKDAsIDAsIDApCiByZWN0OiBzdHls ZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGJvcmRlci10b3AtY29sb3IpIDogW29iamVjdCBDU1NQcmlt aXRpdmVWYWx1ZV0KK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVyLXRvcC1sZWZ0 LXJhZGl1cykgOiAwcHgKK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9yZGVyLXRv cC1sZWZ0LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQorcmVjdDogc3R5bGUu Z2V0UHJvcGVydHlWYWx1ZShib3JkZXItdG9wLXJpZ2h0LXJhZGl1cykgOiAwcHgKK3JlY3Q6IHN0 eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9yZGVyLXRvcC1yaWdodC1yYWRpdXMpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVy LXRvcC1zdHlsZSkgOiBub25lCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGJvcmRl ci10b3Atc3R5bGUpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdl dFByb3BlcnR5VmFsdWUoYm9yZGVyLXRvcC13aWR0aCkgOiAwcHgKQEAgLTE5OCwyMCArMjA2LDEy IEBAIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1iYWMKIHJlY3Q6IHN0eWxl LmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1iYWNrZ3JvdW5kLW9yaWdpbikgOiBbb2JqZWN0 IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0 LWJhY2tncm91bmQtc2l6ZSkgOiBhdXRvIGF1dG8KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NT VmFsdWUoLXdlYmtpdC1iYWNrZ3JvdW5kLXNpemUpIDogW29iamVjdCBDU1NWYWx1ZUxpc3RdCi1y ZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYm9yZGVyLWJvdHRvbS1sZWZ0LXJh ZGl1cykgOiAwcHgKLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1ib3Jk ZXItYm90dG9tLWxlZnQtcmFkaXVzKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1yZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRp dXMpIDogMHB4Ci1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVy LWJvdHRvbS1yaWdodC1yYWRpdXMpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6 IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1ib3JkZXItZml0KSA6IGJvcmRlcgogcmVj dDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWJvcmRlci1maXQpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtp dC1ib3JkZXItaG9yaXpvbnRhbC1zcGFjaW5nKSA6IDBweAogcmVjdDogc3R5bGUuZ2V0UHJvcGVy dHlDU1NWYWx1ZSgtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmcpIDogW29iamVjdCBD U1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1i b3JkZXItaW1hZ2UpIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Vi a2l0LWJvcmRlci1pbWFnZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQotcmVjdDogc3R5 bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXMpIDogMHB4 Ci1yZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVyLXRvcC1sZWZ0 LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQotcmVjdDogc3R5bGUuZ2V0UHJv cGVydHlWYWx1ZSgtd2Via2l0LWJvcmRlci10b3AtcmlnaHQtcmFkaXVzKSA6IDBweAotcmVjdDog c3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWJvcmRlci10b3AtcmlnaHQtcmFkaXVz KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZh bHVlKC13ZWJraXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNpbmcpIDogMHB4CiByZWN0OiBzdHlsZS5n ZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNpbmcpIDogW29i amVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdl YmtpdC1ib3gtYWxpZ24pIDogc3RyZXRjaApAQCAtNDE4LDYgKzQxOCwxMCBAQCBnOiBzdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKGJhY2tncm91bmQtcmVwCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1Zh bHVlKGJhY2tncm91bmQtcmVwZWF0KSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiBnOiBz dHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGJvcmRlci1ib3R0b20tY29sb3IpIDogcmdiKDAsIDAsIDAp CiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGJvcmRlci1ib3R0b20tY29sb3IpIDogW29i amVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVy LWJvdHRvbS1sZWZ0LXJhZGl1cykgOiAwcHgKK2c6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUo Ym9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQor Zzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cykgOiAw cHgKK2c6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRp dXMpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxlLmdldFByb3BlcnR5VmFs dWUoYm9yZGVyLWJvdHRvbS1zdHlsZSkgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1Zh bHVlKGJvcmRlci1ib3R0b20tc3R5bGUpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6 IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVyLWJvdHRvbS13aWR0aCkgOiAwcHgKQEAgLTQz OCw2ICs0NDIsMTAgQEAgZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShib3JkZXItcmlnaHQtdwog Zzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShib3JkZXItcmlnaHQtd2lkdGgpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoYm9yZGVyLXRv cC1jb2xvcikgOiByZ2IoMCwgMCwgMCkKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoYm9y ZGVyLXRvcC1jb2xvcikgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQorZzogc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZShib3JkZXItdG9wLWxlZnQtcmFkaXVzKSA6IDBweAorZzogc3R5bGUuZ2V0 UHJvcGVydHlDU1NWYWx1ZShib3JkZXItdG9wLWxlZnQtcmFkaXVzKSA6IFtvYmplY3QgQ1NTUHJp bWl0aXZlVmFsdWVdCitnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKGJvcmRlci10b3AtcmlnaHQt cmFkaXVzKSA6IDBweAorZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShib3JkZXItdG9wLXJp Z2h0LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJv cGVydHlWYWx1ZShib3JkZXItdG9wLXN0eWxlKSA6IG5vbmUKIGc6IHN0eWxlLmdldFByb3BlcnR5 Q1NTVmFsdWUoYm9yZGVyLXRvcC1zdHlsZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQog Zzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShib3JkZXItdG9wLXdpZHRoKSA6IDBweApAQCAtNjAy LDIwICs2MTAsMTIgQEAgZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWJhY2tncgog Zzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWJhY2tncm91bmQtb3JpZ2luKSA6 IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13 ZWJraXQtYmFja2dyb3VuZC1zaXplKSA6IGF1dG8gYXV0bwogZzogc3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgtd2Via2l0LWJhY2tncm91bmQtc2l6ZSkgOiBbb2JqZWN0IENTU1ZhbHVlTGlzdF0K LWc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1ib3JkZXItYm90dG9tLWxlZnQtcmFk aXVzKSA6IDBweAotZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWJvcmRlci1i b3R0b20tbGVmdC1yYWRpdXMpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KLWc6IHN0eWxl LmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1ib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cykgOiAw cHgKLWc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1ib3JkZXItYm90dG9tLXJp Z2h0LXJhZGl1cykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJv cGVydHlWYWx1ZSgtd2Via2l0LWJvcmRlci1maXQpIDogYm9yZGVyCiBnOiBzdHlsZS5nZXRQcm9w ZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVyLWZpdCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZh bHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWJvcmRlci1ob3Jpem9udGFs LXNwYWNpbmcpIDogMHB4CiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9y ZGVyLWhvcml6b250YWwtc3BhY2luZykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzog c3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWJvcmRlci1pbWFnZSkgOiBub25lCiBnOiBz dHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVyLWltYWdlKSA6IFtvYmplY3Qg Q1NTUHJpbWl0aXZlVmFsdWVdCi1nOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYm9y ZGVyLXRvcC1sZWZ0LXJhZGl1cykgOiAwcHgKLWc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUo LXdlYmtpdC1ib3JkZXItdG9wLWxlZnQtcmFkaXVzKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFs dWVdCi1nOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtYm9yZGVyLXRvcC1yaWdodC1y YWRpdXMpIDogMHB4Ci1nOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtYm9yZGVy LXRvcC1yaWdodC1yYWRpdXMpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxl LmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZykgOiAwcHgK IGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3Bh Y2luZykgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlW YWx1ZSgtd2Via2l0LWJveC1hbGlnbikgOiBzdHJldGNoCg==