From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Resolves #869584 - Removed libgnomekbd dependency in f18. Date: Sun, 31 May 2026 02:05:53 GMT Message-ID: <178019315338.1.2814493300366822078.rpms-ibus-16eb651bf80a@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 16eb651bf80aef0e79ef81b3a1c985815941efdf QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiAxNmViNjUxYmY4MGFlZjBlNzllZjgxYjNhMWM5ODU4MTU5NDFl ZmRmCkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDEyLTEyLTEwVDE2OjU5OjM1KzA5OjAwClN0YXRzICA6ICszODIvLTM0MiBpbiA3IGZpbGUo cykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9pYnVzL2MvMTZl YjY1MWJmODBhZWYwZTc5ZWY4MWIzYTFjOTg1ODE1OTQxZWZkZj9icmFuY2g9YXV0b3Rvb2wKCkxv ZzoKUmVzb2x2ZXMgIzg2OTU4NCAtIFJlbW92ZWQgbGliZ25vbWVrYmQgZGVwZW5kZW5jeSBpbiBm MTguCgotLS0KZGlmZiAtLWdpdCBhLy5naXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IGM0ZTY2 ZjEuLjkxZTlmZWQgMTAwNjQ0Ci0tLSBhLy5naXRpZ25vcmUKKysrIGIvLmdpdGlnbm9yZQpAQCAt NDksMyArNDksNCBAQCBpYnVzLTEuMy42LnRhci5negogL2lidXMtZ2pzLTMuNC4xLjIwMTIwNDI4 LnRhci5negogL2lidXMtZ2pzLTMuNC4xLjIwMTIwNTE4LnRhci5negogL2lidXMtZ2pzLTMuNC4x LjIwMTIwODE1LnRhci5negorL2lidXMtcG8tMS40Ljk5LjIwMTIxMjA3LnRhci5negoKZGlmZiAt LWdpdCBhL2lidXMtNTMwNzExLXByZWxvYWQtc3lzLnBhdGNoIGIvaWJ1cy01MzA3MTEtcHJlbG9h ZC1zeXMucGF0Y2gKaW5kZXggZjRiOGZmZi4uMDg3MGNjMSAxMDA2NDQKLS0tIGEvaWJ1cy01MzA3 MTEtcHJlbG9hZC1zeXMucGF0Y2gKKysrIGIvaWJ1cy01MzA3MTEtcHJlbG9hZC1zeXMucGF0Y2gK QEAgLTEsNCArMSw0IEBACi1Gcm9tIDQ1NmVhMzM2MjE4MTRhYTA4Y2E2MmUzMWY3Y2IxZTc3MGVi YjM2NzAgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tIGRmZTg1OGY3YmE0NzZhYTg3OGM1 ZDYwYTc0ODBhMDNkZWY1NTg0NjMgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCiBGcm9tOiBmdWpp d2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CiBEYXRlOiBUdWUsIDI3IE5vdiAyMDEy IDE1OjUzOjI3ICswOTAwCiBTdWJqZWN0OiBbUEFUQ0hdIFJlbG9hZCBwcmVsb2FkIGVuZ2luZXMg dW50aWwgdXNlcnMgY3VzdG9taXplIHRoZSBsaXN0LgpAQCAtMjI4LDEwICsyMjgsMTAgQEAgaW5k ZXggNzM3YjNlMi4uOGNlNWExNiAxMDA2NDQKICAgKiBAeDogeCBjb29yZGluYXRlLgogICAqIEB5 OiB5IGNvb3JkaW5hdGUuCiBkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxhIGIvdWkvZ3Rr My9wYW5lbC52YWxhCi1pbmRleCAxYWNhNDQzLi4xZWMyNTc5IDEwMDY0NAoraW5kZXggNjNiMGNk ZS4uYzRjOGYyYyAxMDA2NDQKIC0tLSBhL3VpL2d0azMvcGFuZWwudmFsYQogKysrIGIvdWkvZ3Rr My9wYW5lbC52YWxhCi1AQCAtMzA5LDYgKzMwOSw4IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5l bFNlcnZpY2UgeworQEAgLTMxMyw2ICszMTMsOCBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxT ZXJ2aWNlIHsKICAgICAgICAgIGlmIChtX2NvbmZpZyAhPSBudWxsKSB7CiAgICAgICAgICAgICAg bV9jb25maWcudmFsdWVfY2hhbmdlZC5jb25uZWN0KGNvbmZpZ192YWx1ZV9jaGFuZ2VkX2NiKTsK ICAgICAgICAgICAgICBtX2NvbmZpZy53YXRjaCgiZ2VuZXJhbCIsICJwcmVsb2FkX2VuZ2luZXMi KTsKQEAgLTI0MCw3ICsyNDAsNyBAQCBpbmRleCAxYWNhNDQzLi4xZWMyNTc5IDEwMDY0NAogICAg ICAgICAgICAgIG1fY29uZmlnLndhdGNoKCJnZW5lcmFsIiwgImVuZ2luZXNfb3JkZXIiKTsKICAg ICAgICAgICAgICBtX2NvbmZpZy53YXRjaCgiZ2VuZXJhbCIsICJzd2l0Y2hlcl9kZWxheV90aW1l Iik7CiAgICAgICAgICAgICAgbV9jb25maWcud2F0Y2goImdlbmVyYWwvaG90a2V5IiwgInRyaWdn ZXJfYWNjZWwiKTsKLUBAIC00MTcsNyArNDE5LDEzNiBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFu ZWxTZXJ2aWNlIHsKK0BAIC00MjUsNyArNDI3LDEzNiBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFu ZWxTZXJ2aWNlIHsKICAgICAgICAgICAgICBpbml0X2drYmQoKTsKICAgICAgICAgIH0KICAKQEAg LTM3Nyw3ICszNzcsNyBAQCBpbmRleCAxYWNhNDQzLi4xZWMyNTc5IDEwMDY0NAogICAgICB9CiAg CiAgICAgIHByaXZhdGUgdm9pZCB1cGRhdGVfeGtiX2VuZ2luZXMoKSB7Ci1AQCAtNTgwLDYgKzcx MSwxMSBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKK0BAIC01OTEsNiArNzIy LDExIEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgewogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RyaW5nIHNlY3Rpb24sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmcgbmFtZSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZhcmlhbnQgdmFyaWFudCkgewoKZGlmZiAtLWdp dCBhL2lidXMtNTQxNDkyLXhrYi5wYXRjaCBiL2lidXMtNTQxNDkyLXhrYi5wYXRjaAppbmRleCAz ZTI2YzcwLi5lNzJlYzQ0IDEwMDY0NAotLS0gYS9pYnVzLTU0MTQ5Mi14a2IucGF0Y2gKKysrIGIv aWJ1cy01NDE0OTIteGtiLnBhdGNoCkBAIC0xLDYgKzEsNiBAQAotRnJvbSA4Y2E1ZDc5YjNmOTE5 NjIxZGY2OTFmOGFjYmVjNThiMjA2YjE1YWEyIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJv bSA5NjVmMDlhOTQ3NDRiNjM3NDY1NjI0N2ZmMDkxZWI5MWI1YmFkMGIyIE1vbiBTZXAgMTcgMDA6 MDA6MDAgMjAwMQogRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgot RGF0ZTogVHVlLCAyNyBOb3YgMjAxMiAxNTo1MzoxNCArMDkwMAorRGF0ZTogTW9uLCAxMCBEZWMg MjAxMiAxNjoyNDozNCArMDkwMAogU3ViamVjdDogW1BBVENIXSBBZGQgaWJ1cy14a2IgYW5kIGxp Ymdub21la2JkLgogCiAtLS0KQEAgLTExLDcgKzExLDcgQEAgU3ViamVjdDogW1BBVENIXSBBZGQg aWJ1cy14a2IgYW5kIGxpYmdub21la2JkLgogIGRhdGEvaWJ1cy5zY2hlbWFzLmluICAgICAgICAg ICAgfCAgOTQgKysrKysrKwogIGVuZ2luZS9NYWtlZmlsZS5hbSAgICAgICAgICAgICAgfCAgIDYg KwogIGVuZ2luZS9pYnVzLXhrYi9NYWtlZmlsZS5hbSAgICAgfCAgNjEgKysrKwotIGVuZ2luZS9p YnVzLXhrYi9pYnVzLXhrYi1tYWluLmMgfCAxNzcgKysrKysrKysrKysrCisgZW5naW5lL2lidXMt eGtiL2lidXMteGtiLW1haW4uYyB8IDE3MyArKysrKysrKysrKysKICBlbmdpbmUvaWJ1cy14a2Iv eGtibGliLmMgICAgICAgIHwgMzI3ICsrKysrKysrKysrKysrKysrKysrKysKICBlbmdpbmUvaWJ1 cy14a2IveGtibGliLmggICAgICAgIHwgIDQxICsrKwogIGVuZ2luZS9tYWluLnZhbGEgICAgICAg ICAgICAgICAgfCAgODYgKysrKysrCkBAIC0yNiwxMSArMjYsOSBAQCBTdWJqZWN0OiBbUEFUQ0hd IEFkZCBpYnVzLXhrYiBhbmQgbGliZ25vbWVrYmQuCiAgdWkvZ3RrMy9NYWtlZmlsZS5hbSAgICAg ICAgICAgICB8ICAzNyArKysKICB1aS9ndGszL2drYmRsYXlvdXQudmFsYS5mYWxzZSAgIHwgIDYz ICsrKysrCiAgdWkvZ3RrMy9na2JkbGF5b3V0LnZhbGEudHJ1ZSAgICB8IDEwOCArKysrKysrCi0g dWkvZ3RrMy9rZXliaW5kaW5nbWFuYWdlci52YWxhICB8ICAxNCArLQotIHVpL2d0azMvcGFuZWwu dmFsYSAgICAgICAgICAgICAgfCAzNTMgKysrKysrKysrKysrKysrKysrKystLS0KLSB1aS9ndGsz L3N3aXRjaGVyLnZhbGEgICAgICAgICAgIHwgIDQ5ICsrLS0KLSB1aS9ndGszL3hrYmxheW91dC52 YWxhICAgICAgICAgIHwgNDY0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwotIDI2IGZp bGVzIGNoYW5nZWQsIDI2MjYgaW5zZXJ0aW9ucygrKSwgNjY3IGRlbGV0aW9ucygtKQorIHVpL2d0 azMvcGFuZWwudmFsYSAgICAgICAgICAgICAgfCAzNjIgKysrKysrKysrKysrKysrKysrKysrKy0t CisgdWkvZ3RrMy94a2JsYXlvdXQudmFsYSAgICAgICAgICB8IDQ2NSArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKKyAyNCBmaWxlcyBjaGFuZ2VkLCAyNTk3IGluc2VydGlvbnMoKyksIDYz OSBkZWxldGlvbnMoLSkKICBjcmVhdGUgbW9kZSAxMDA2NDQgYmluZGluZ3MvdmFsYS9Ha2JkLTMu MC5tZXRhZGF0YQogIGNyZWF0ZSBtb2RlIDEwMDY0NCBiaW5kaW5ncy92YWxhL1hrbC0xLjAubWV0 YWRhdGEKICBjcmVhdGUgbW9kZSAxMDA2NDQgZW5naW5lL2lidXMteGtiL01ha2VmaWxlLmFtCkBA IC00MDQsMTAgKzQwMiwxMCBAQCBpbmRleCAwMDAwMDAwLi40YTMyZTg3CiArLWluY2x1ZGUgJCh0 b3Bfc3JjZGlyKS9naXQubWsKIGRpZmYgLS1naXQgYS9lbmdpbmUvaWJ1cy14a2IvaWJ1cy14a2It bWFpbi5jIGIvZW5naW5lL2lidXMteGtiL2lidXMteGtiLW1haW4uYwogbmV3IGZpbGUgbW9kZSAx MDA2NDQKLWluZGV4IDAwMDAwMDAuLjM4NzhiNWYKK2luZGV4IDAwMDAwMDAuLjNkZmQ5ODcKIC0t LSAvZGV2L251bGwKICsrKyBiL2VuZ2luZS9pYnVzLXhrYi9pYnVzLXhrYi1tYWluLmMKLUBAIC0w LDAgKzEsMTc3IEBACitAQCAtMCwwICsxLDE3MyBAQAogKy8qIC0qLSBtb2RlOiBDOyBjLWJhc2lj LW9mZnNldDogNDsgaW5kZW50LXRhYnMtbW9kZTogbmlsOyAtKi0gKi8KICsvKiB2aW06c2V0IGV0 IHN0cz00OiAqLwogKy8qIGJ1cyAtIFRoZSBJbnB1dCBCdXMKQEAgLTU0NywxMCArNTQ1LDYgQEAg aW5kZXggMDAwMDAwMC4uMzg3OGI1ZgogKyAgICBpYnVzX3hrYl9pbml0ICh4ZGlzcGxheSk7CiAr CiArICAgIGlmIChsYXlvdXQpIHsKLSsgICAgICAgIGlmICh2YXJpYW50ID09IE5VTEwpIHsKLSsg ICAgICAgICAgICB2YXJpYW50ID0gaWJ1c194a2JfZ2V0X2N1cnJlbnRfdmFyaWFudCAoKTsKLSsg ICAgICAgIH0KLSsKICsgICAgICAgIGlmIChvcHRpb24gPT0gTlVMTCkgewogKyAgICAgICAgICAg IG9wdGlvbiA9IGlidXNfeGtiX2dldF9jdXJyZW50X29wdGlvbiAoKTsKICsgICAgICAgIH0KQEAg LTI3NzQsNjkgKzI3NjgsOCBAQCBpbmRleCAwMDAwMDAwLi4yYjc4YzY5CiArICAgIH0KICsgICAg Ki8KICt9Ci1kaWZmIC0tZ2l0IGEvdWkvZ3RrMy9rZXliaW5kaW5nbWFuYWdlci52YWxhIGIvdWkv Z3RrMy9rZXliaW5kaW5nbWFuYWdlci52YWxhCi1pbmRleCAxMmQ3MzFkLi4wZjZiN2M5IDEwMDY0 NAotLS0tIGEvdWkvZ3RrMy9rZXliaW5kaW5nbWFuYWdlci52YWxhCi0rKysgYi91aS9ndGszL2tl eWJpbmRpbmdtYW5hZ2VyLnZhbGEKLUBAIC00MSwxNSArNDEsMTggQEAgcHVibGljIGNsYXNzIEtl eWJpbmRpbmdNYW5hZ2VyIDogR0xpYi5PYmplY3QgewotICAgICBwcml2YXRlIGNsYXNzIEtleWJp bmRpbmcgewotICAgICAgICAgcHVibGljIEtleWJpbmRpbmcodWludCBrZXlzeW0sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICBHZGsuTW9kaWZpZXJUeXBlIG1vZGlmaWVycywKLS0gICAgICAg ICAgICAgICAgICAgICAgICAgIEtleWJpbmRpbmdIYW5kbGVyRnVuYyBoYW5kbGVyKSB7Ci0rICAg ICAgICAgICAgICAgICAgICAgICAgICBLZXliaW5kaW5nSGFuZGxlckZ1bmMgaGFuZGxlciwKLSsg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmV2ZXJzZSkgewotICAgICAgICAgICAgIHRo aXMua2V5c3ltID0ga2V5c3ltOwotICAgICAgICAgICAgIHRoaXMubW9kaWZpZXJzID0gbW9kaWZp ZXJzOwotICAgICAgICAgICAgIHRoaXMuaGFuZGxlciA9IGhhbmRsZXI7Ci0rICAgICAgICAgICAg dGhpcy5yZXZlcnNlID0gcmV2ZXJzZTsKLSAgICAgICAgIH0KLSAKLSAgICAgICAgIHB1YmxpYyB1 aW50IGtleXN5bSB7IGdldDsgc2V0OyB9Ci0gICAgICAgICBwdWJsaWMgR2RrLk1vZGlmaWVyVHlw ZSBtb2RpZmllcnMgeyBnZXQ7IHNldDsgfQotICAgICAgICAgcHVibGljIHVub3duZWQgS2V5Ymlu ZGluZ0hhbmRsZXJGdW5jIGhhbmRsZXIgeyBnZXQ7IHNldDsgfQotKyAgICAgICAgcHVibGljIGJv b2wgcmV2ZXJzZSB7IGdldDsgc2V0OyB9Ci0gICAgIH0KLSAKLSAgICAgLyoqCi1AQCAtNTcsNyAr NjAsNyBAQCBwdWJsaWMgY2xhc3MgS2V5YmluZGluZ01hbmFnZXIgOiBHTGliLk9iamVjdCB7Ci0g ICAgICAqCi0gICAgICAqIEBwYXJhbSBldmVudCBwYXNzaW5nIG9uIGdkayBldmVudAotICAgICAg Ki8KLS0gICAgcHVibGljIGRlbGVnYXRlIHZvaWQgS2V5YmluZGluZ0hhbmRsZXJGdW5jKEdkay5F dmVudCBldmVudCk7Ci0rICAgIHB1YmxpYyBkZWxlZ2F0ZSB2b2lkIEtleWJpbmRpbmdIYW5kbGVy RnVuYyhHZGsuRXZlbnQgZXZlbnQsIGJvb2wgcmV2ZXJzZSk7Ci0gCi0gCi0gICAgIHByaXZhdGUg IEtleWJpbmRpbmdNYW5hZ2VyKCkgewotQEAgLTczLDcgKzc2LDggQEAgcHVibGljIGNsYXNzIEtl eWJpbmRpbmdNYW5hZ2VyIDogR0xpYi5PYmplY3QgewotICAgICAgKi8KLSAgICAgcHVibGljIGJv b2wgYmluZCh1aW50IGtleXN5bSwKLSAgICAgICAgICAgICAgICAgICAgICBHZGsuTW9kaWZpZXJU eXBlIG1vZGlmaWVycywKLS0gICAgICAgICAgICAgICAgICAgICBLZXliaW5kaW5nSGFuZGxlckZ1 bmMgaGFuZGxlcikgewotKyAgICAgICAgICAgICAgICAgICAgIEtleWJpbmRpbmdIYW5kbGVyRnVu YyBoYW5kbGVyLAotKyAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmV2ZXJzZSkgewotICAgICAg ICAgdW5vd25lZCBYLkRpc3BsYXkgZGlzcGxheSA9IEdkay54MTFfZ2V0X2RlZmF1bHRfeGRpc3Bs YXkoKTsKLSAKLSAgICAgICAgIGludCBrZXljb2RlID0gZGlzcGxheS5rZXlzeW1fdG9fa2V5Y29k ZShrZXlzeW0pOwotQEAgLTg0LDcgKzg4LDcgQEAgcHVibGljIGNsYXNzIEtleWJpbmRpbmdNYW5h Z2VyIDogR0xpYi5PYmplY3QgewotICAgICAgICAgZ3JhYl9rZXljb2RlIChHZGsuRGlzcGxheS5n ZXRfZGVmYXVsdCgpLCBrZXlzeW0sIG1vZGlmaWVycyk7Ci0gCi0gICAgICAgICAvLyBzdG9yZSBi aW5kaW5nCi0tICAgICAgICBLZXliaW5kaW5nIGJpbmRpbmcgPSBuZXcgS2V5YmluZGluZyhrZXlz eW0sIG1vZGlmaWVycywgaGFuZGxlcik7Ci0rICAgICAgICBLZXliaW5kaW5nIGJpbmRpbmcgPSBu ZXcgS2V5YmluZGluZyhrZXlzeW0sIG1vZGlmaWVycywgaGFuZGxlciwgcmV2ZXJzZSk7Ci0gICAg ICAgICBtX2JpbmRpbmdzLmFwcGVuZChiaW5kaW5nKTsKLSAKLSAgICAgICAgIHJldHVybiB0cnVl OwotQEAgLTE5OSw3ICsyMDMsNyBAQCBwdWJsaWMgY2xhc3MgS2V5YmluZGluZ01hbmFnZXIgOiBH TGliLk9iamVjdCB7Ci0gICAgICAgICAgICAgICAgICAgICBpZiAoZXZlbnQua2V5LmtleXZhbCAh PSBiaW5kaW5nLmtleXN5bSB8fAotICAgICAgICAgICAgICAgICAgICAgICAgIG1vZGlmaWVycyAh PSBiaW5kaW5nLm1vZGlmaWVycykKLSAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK LS0gICAgICAgICAgICAgICAgICAgIGJpbmRpbmcuaGFuZGxlcihldmVudCk7Ci0rICAgICAgICAg ICAgICAgICAgICBiaW5kaW5nLmhhbmRsZXIoZXZlbnQsIGJpbmRpbmcucmV2ZXJzZSk7Ci0gICAg ICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICB9CiBkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxhIGIvdWkvZ3RrMy9wYW5lbC52YWxh Ci1pbmRleCBjMTU5NjkzLi4xYWNhNDQzIDEwMDY0NAoraW5kZXggYzE1OTY5My4uNjNiMGNkZSAx MDA2NDQKIC0tLSBhL3VpL2d0azMvcGFuZWwudmFsYQogKysrIGIvdWkvZ3RrMy9wYW5lbC52YWxh CiBAQCAtMjEsNiArMjEsMjAgQEAKQEAgLTI4ODAsMzcgKzI4MTMsNDAgQEAgaW5kZXggYzE1OTY5 My4uMWFjYTQ0MyAxMDA2NDQKICAKICAgICAgcHVibGljIFBhbmVsKElCdXMuQnVzIGJ1cykgewog ICAgICAgICAgR0xpYi5hc3NlcnQoYnVzLmlzX2Nvbm5lY3RlZCgpKTsKLUBAIC02MCw3ICs4MSw2 IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworQEAgLTYwLDcgKzgxLDggQEAg Y2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CiAgICAgICAgICBtX2NhbmRpZGF0ZV9w YW5lbC5wYWdlX2Rvd24uY29ubmVjdCgodykgPT4gdGhpcy5wYWdlX2Rvd24oKSk7CiAgCiAgICAg ICAgICBtX3N3aXRjaGVyID0gbmV3IFN3aXRjaGVyKCk7CiAtICAgICAgICBiaW5kX3N3aXRjaF9z aG9ydGN1dCgpOworKyAgICAgICAgLy8gVGhlIGluaXRpYWwgc2hvcnRjdXQgaXMgIjxDb250cm9s PnNwYWNlIgorKyAgICAgICAgYmluZF9zd2l0Y2hfc2hvcnRjdXQobnVsbCk7CiAgCiAgICAgICAg ICBpZiAobV9zd2l0Y2hlcl9kZWxheV90aW1lID49IDApIHsKICAgICAgICAgICAgICBtX3N3aXRj aGVyLnNldF9wb3B1cF9kZWxheV90aW1lKCh1aW50KSBtX3N3aXRjaGVyX2RlbGF5X3RpbWUpOwot QEAgLTc2LDY0ICs5NiwxMjkgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CitA QCAtNzYsNjQgKzk4LDEzMiBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKICAK ICAgICAgflBhbmVsKCkgewogICAgICAgICAgdW5iaW5kX3N3aXRjaF9zaG9ydGN1dCgpOwotLSAg ICB9Ci0gCi0tICAgIHByaXZhdGUgdm9pZCBiaW5kX3N3aXRjaF9zaG9ydGN1dCgpIHsKLS0gICAg ICAgIHZhciBrZXliaW5kaW5nX21hbmFnZXIgPSBLZXliaW5kaW5nTWFuYWdlci5nZXRfaW5zdGFu Y2UoKTsKKysKICsgICAgICAgIGlmIChIQVZFX0lCVVNfR0tCRCAmJiBtX2drYmRsYXlvdXQgIT0g bnVsbCkgewogKyAgICAgICAgICAgIG1fZ2tiZGxheW91dC5jaGFuZ2VkLmRpc2Nvbm5lY3QoZ2ti ZGxheW91dF9jaGFuZ2VkX2NiKTsKICsgICAgICAgICAgICBtX2drYmRsYXlvdXQuc3RvcF9saXN0 ZW4oKTsKICsgICAgICAgICAgICBtX2drYmRsYXlvdXQgPSBudWxsOwogKyAgICAgICAgfQotIAot LSAgICAgICAgdmFyIGFjY2VsZXJhdG9yID0gQUNDRUxFUkFUT1JfU1dJVENIX0lNRV9GT1JFV0FS RDsKLSsgICAgICAgIG1feGtibGF5b3V0ID0gbnVsbDsKLSsgICAgfQogKworKyAgICAgICAgbV94 a2JsYXlvdXQgPSBudWxsOworICAgICB9CisgCistICAgIHByaXZhdGUgdm9pZCBiaW5kX3N3aXRj aF9zaG9ydGN1dCgpIHsKKy0gICAgICAgIHZhciBrZXliaW5kaW5nX21hbmFnZXIgPSBLZXliaW5k aW5nTWFuYWdlci5nZXRfaW5zdGFuY2UoKTsKICsgICAgcHJpdmF0ZSB2b2lkIGtleWJpbmRpbmdf bWFuYWdlcl9iaW5kKEtleWJpbmRpbmdNYW5hZ2VyIGtleWJpbmRpbmdfbWFuYWdlciwKLSsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZz8gYWNjZWxlcmF0b3Is Ci0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJldmVyc2Up IHsKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZz8gICAg ICAgICAgIGFjY2VsZXJhdG9yKSB7CiArICAgICAgICB1aW50IHN3aXRjaF9rZXlzeW0gPSAwOwog KyAgICAgICAgR2RrLk1vZGlmaWVyVHlwZSBzd2l0Y2hfbW9kaWZpZXJzID0gMDsKKysgICAgICAg IEdkay5Nb2RpZmllclR5cGUgcmV2ZXJzZV9tb2RpZmllciA9IEdkay5Nb2RpZmllclR5cGUuU0hJ RlRfTUFTSzsKKysgICAgICAgIEtleWJpbmRpbmcga2V5YmluZGluZzsKKyAKKy0gICAgICAgIHZh ciBhY2NlbGVyYXRvciA9IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQ7CiAgICAgICAg ICBHdGsuYWNjZWxlcmF0b3JfcGFyc2UoYWNjZWxlcmF0b3IsCiAtICAgICAgICAgICAgICAgIG91 dCBtX3N3aXRjaF9rZXlzeW0sIG91dCBtX3N3aXRjaF9tb2RpZmllcnMpOwogKyAgICAgICAgICAg ICAgICBvdXQgc3dpdGNoX2tleXN5bSwgb3V0IHN3aXRjaF9tb2RpZmllcnMpOwpAQCAtMjk1MCw3 NSArMjg4Niw3MyBAQCBpbmRleCBjMTU5NjkzLi4xYWNhNDQzIDEwMDY0NAogICAgICAgICAgfQog IAogLSAgICAgICAga2V5YmluZGluZ19tYW5hZ2VyLmJpbmQobV9zd2l0Y2hfa2V5c3ltLCBtX3N3 aXRjaF9tb2RpZmllcnMsCi0tICAgICAgICAgICAgICAgIChlKSA9PiBoYW5kbGVfZW5naW5lX3N3 aXRjaChlLCBmYWxzZSkpOwotKyAgICAgICAgS2V5YmluZGluZyBrZXliaW5kaW5nID0gbmV3IEtl eWJpbmRpbmcoc3dpdGNoX2tleXN5bSwKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN3aXRjaF9tb2RpZmllcnMsCi0rICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXZlcnNlKTsKKysgICAgICAgIGtleWJpbmRpbmcg PSBuZXcgS2V5YmluZGluZyhzd2l0Y2hfa2V5c3ltLAorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN3aXRjaF9tb2RpZmllcnMsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmFsc2UpOwogKyAgICAgICAgbV9rZXliaW5kaW5ncy5hcHBlbmQoa2V5Ymlu ZGluZyk7CisrCisrICAgICAgICBrZXliaW5kaW5nX21hbmFnZXIuYmluZChzd2l0Y2hfa2V5c3lt LCBzd2l0Y2hfbW9kaWZpZXJzLAorICAgICAgICAgICAgICAgICAoZSkgPT4gaGFuZGxlX2VuZ2lu ZV9zd2l0Y2goZSwgZmFsc2UpKTsKICAKLS0gICAgICAgIC8vIGFjY2VsZXJhdG9yIGFscmVhZHkg aGFzIFNoaWZ0IG1hc2sKKyAgICAgICAgIC8vIGFjY2VsZXJhdG9yIGFscmVhZHkgaGFzIFNoaWZ0 IG1hc2sKIC0gICAgICAgIGlmICgobV9zd2l0Y2hfbW9kaWZpZXJzICYgR2RrLk1vZGlmaWVyVHlw ZS5TSElGVF9NQVNLKSAhPSAwKQotLSAgICAgICAgICAgIHJldHVybjsKKysgICAgICAgIGlmICgo c3dpdGNoX21vZGlmaWVycyAmIHJldmVyc2VfbW9kaWZpZXIpICE9IDApIHsKKyAgICAgICAgICAg ICByZXR1cm47CisrICAgICAgICB9CisgCistICAgICAgICBrZXliaW5kaW5nX21hbmFnZXIuYmlu ZChtX3N3aXRjaF9rZXlzeW0sCistICAgICAgICAgICAgICAgIG1fc3dpdGNoX21vZGlmaWVycyB8 IEdkay5Nb2RpZmllclR5cGUuU0hJRlRfTUFTSywKKysgICAgICAgIHN3aXRjaF9tb2RpZmllcnMg fD0gcmV2ZXJzZV9tb2RpZmllcjsKKysgICAgICAgIGtleWJpbmRpbmcgPSBuZXcgS2V5YmluZGlu Zyhzd2l0Y2hfa2V5c3ltLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN3 aXRjaF9tb2RpZmllcnMsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1 ZSk7CisrICAgICAgICBtX2tleWJpbmRpbmdzLmFwcGVuZChrZXliaW5kaW5nKTsKKysKICsgICAg ICAgIGtleWJpbmRpbmdfbWFuYWdlci5iaW5kKHN3aXRjaF9rZXlzeW0sIHN3aXRjaF9tb2RpZmll cnMsCi0rICAgICAgICAgICAgICAgIChlLCBfcmV2ZXJzZSkgPT4gaGFuZGxlX2VuZ2luZV9zd2l0 Y2goZSwgX3JldmVyc2UpLAotKyAgICAgICAgICAgICAgICByZXZlcnNlKTsKKyAgICAgICAgICAg ICAgICAgKGUpID0+IGhhbmRsZV9lbmdpbmVfc3dpdGNoKGUsIHRydWUpKTsKKysKICsgICAgfQog KwogKyAgICAvLyBUb0RvOiBDdXN0b21pemUgdGhlIGlucHV0IG1ldGhvZCB3aXRoIGlidXMtc2V0 dXAKLSsgICAgcHJpdmF0ZSB2b2lkIGJpbmRfc3dpdGNoX3Nob3J0Y3V0KCkgeworKyAgICBwcml2 YXRlIHZvaWQgYmluZF9zd2l0Y2hfc2hvcnRjdXQoVmFyaWFudCA/dmFyaWFudCkgewogKyAgICAg ICAgc3RyaW5nIGxvY2FsZSA9IEdMaWIuSW50bC5zZXRsb2NhbGUoR0xpYi5Mb2NhbGVDYXRlZ29y eS5BTEwsCiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxs KTsKICsgICAgICAgIGlmIChsb2NhbGUgPT0gbnVsbCkgewogKyAgICAgICAgICAgIGxvY2FsZSA9 ICJDIjsKICsgICAgICAgIH0KICsKLSsgICAgICAgIHN0cmluZ1tdIEFDQ0VMRVJBVE9SX0lNRV9I T1RLRVlTID0ge307Ci0rICAgICAgICBBQ0NFTEVSQVRPUl9JTUVfSE9US0VZUyArPSBBQ0NFTEVS QVRPUl9TV0lUQ0hfSU1FX0ZPUkVXQVJEOworKyAgICAgICAgc3RyaW5nW10gYWNjZWxlcmF0b3Jz ID0ge307CisrICAgICAgICBWYXJpYW50IHZhcl90cmlnZ2VyID0gdmFyaWFudDsKICsKLSsgICAg ICAgIGlmIChtX2NvbmZpZyAhPSBudWxsKSB7Ci0rICAgICAgICAgICAgR0xpYi5WYXJpYW50IHZh cmlhbnQgPSBtX2NvbmZpZy5nZXRfdmFsdWUoImdlbmVyYWwvaG90a2V5IiwKLSsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidHJpZ2dlcl9hY2Nl bCIpOwotKyAgICAgICAgICAgIGlmICh2YXJpYW50ICE9IG51bGwpIHsKLSsgICAgICAgICAgICAg ICAgQUNDRUxFUkFUT1JfSU1FX0hPVEtFWVMgPSB2YXJpYW50LmR1cF9zdHJ2KCk7Ci0rICAgICAg ICAgICAgfQorKyAgICAgICAgaWYgKHZhcl90cmlnZ2VyID09IG51bGwgJiYgbV9jb25maWcgIT0g bnVsbCkgeworKyAgICAgICAgICAgIHZhcl90cmlnZ2VyID0gbV9jb25maWcuZ2V0X3ZhbHVlKCJn ZW5lcmFsL2hvdGtleSIsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgInRyaWdnZXJfYWNjZWwiKTsKICsgICAgICAgIH0KICsKLSsgICAgICAgIGlmIChBQ0NF TEVSQVRPUl9JTUVfSE9US0VZUy5sZW5ndGggPT0gMSAmJgotKyAgICAgICAgICAgIEFDQ0VMRVJB VE9SX0lNRV9IT1RLRVlTWzBdID09IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQpIHsK KysgICAgICAgIGlmICh2YXJfdHJpZ2dlciAhPSBudWxsKSB7CisrICAgICAgICAgICAgYWNjZWxl cmF0b3JzID0gdmFyX3RyaWdnZXIuZHVwX3N0cnYoKTsKKysgICAgICAgIH0gZWxzZSB7CisrICAg ICAgICAgICAgYWNjZWxlcmF0b3JzICs9IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQ7 CisrICAgICAgICB9CisrCisrICAgICAgICBpZiAoYWNjZWxlcmF0b3JzLmxlbmd0aCA9PSAxICYm CisrICAgICAgICAgICAgYWNjZWxlcmF0b3JzWzBdID09IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVf Rk9SRVdBUkQpIHsKICsgICAgICAgICAgICAvLyBGSVhNRTogV2hlbiB1cyBrZXlib2FyZCBpcyB1 c2VkLCBaZW5rYWt1X0hhbmtha3UgZG9lcyBub3Qgd29yay4KICsgICAgICAgICAgICAvKgogKyAg ICAgICAgICAgIGlmIChsb2NhbGVbMDoyXSA9PSAiamEiKSB7Ci0rICAgICAgICAgICAgICAgIEFD Q0VMRVJBVE9SX0lNRV9IT1RLRVlTICs9ICJaZW5rYWt1X0hhbmtha3UiOworKyAgICAgICAgICAg ICAgICBhY2NlbGVyYXRvcnMgKz0gIlplbmtha3VfSGFua2FrdSI7CiArICAgICAgICAgICAgfQog KyAgICAgICAgICAgICovCiArICAgICAgICAgICAgaWYgKGxvY2FsZVswOjJdID09ICJrbyIpIHsK LSsgICAgICAgICAgICAgICAgQUNDRUxFUkFUT1JfSU1FX0hPVEtFWVMgKz0gIkhhbmd1bCI7Ci0r ICAgICAgICAgICAgICAgIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTICs9ICJBbHRfUiI7CisrICAg ICAgICAgICAgICAgIGFjY2VsZXJhdG9ycyArPSAiSGFuZ3VsIjsKKysgICAgICAgICAgICAgICAg YWNjZWxlcmF0b3JzICs9ICJBbHRfUiI7CiArICAgICAgICAgICAgfQogKyAgICAgICAgfQogKwog KyAgICAgICAgdmFyIGtleWJpbmRpbmdfbWFuYWdlciA9IEtleWJpbmRpbmdNYW5hZ2VyLmdldF9p bnN0YW5jZSgpOwogKwotKyAgICAgICAgZm9yZWFjaCAodmFyIGFjY2VsZXJhdG9yIGluIEFDQ0VM RVJBVE9SX0lNRV9IT1RLRVlTKSB7Ci0rICAgICAgICAgICAga2V5YmluZGluZ19tYW5hZ2VyX2Jp bmQoa2V5YmluZGluZ19tYW5hZ2VyLCBhY2NlbGVyYXRvciwgZmFsc2UpOwotKyAgICAgICAgfQot KwotKyAgICAgICAgQUNDRUxFUkFUT1JfSU1FX0hPVEtFWVMgPSB7fTsKLSsgICAgICAgIEFDQ0VM RVJBVE9SX0lNRV9IT1RLRVlTICs9IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfQkFDS1dBUkQ7Ci0r Ci0rICAgICAgICBpZiAobV9jb25maWcgIT0gbnVsbCkgewotKyAgICAgICAgICAgIEdMaWIuVmFy aWFudCB2YXJpYW50ID0gbV9jb25maWcuZ2V0X3ZhbHVlKCJnZW5lcmFsL2hvdGtleSIsCi0rICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRyaWdn ZXJfYWNjZWxfYmFja3dhcmQiKTsKLSsgICAgICAgICAgICBpZiAodmFyaWFudCAhPSBudWxsKSB7 Ci0rICAgICAgICAgICAgICAgIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTID0gdmFyaWFudC5kdXBf c3RydigpOwotKyAgICAgICAgICAgIH0KLSsgICAgICAgIH0KLSAKLS0gICAgICAgIGtleWJpbmRp bmdfbWFuYWdlci5iaW5kKG1fc3dpdGNoX2tleXN5bSwKLS0gICAgICAgICAgICAgICAgbV9zd2l0 Y2hfbW9kaWZpZXJzIHwgR2RrLk1vZGlmaWVyVHlwZS5TSElGVF9NQVNLLAotLSAgICAgICAgICAg ICAgICAoZSkgPT4gaGFuZGxlX2VuZ2luZV9zd2l0Y2goZSwgdHJ1ZSkpOwotKyAgICAgICAgZm9y ZWFjaCAodmFyIGFjY2VsZXJhdG9yIGluIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTKSB7Ci0rICAg ICAgICAgICAga2V5YmluZGluZ19tYW5hZ2VyX2JpbmQoa2V5YmluZGluZ19tYW5hZ2VyLCBhY2Nl bGVyYXRvciwgdHJ1ZSk7CisrICAgICAgICBmb3JlYWNoICh2YXIgYWNjZWxlcmF0b3IgaW4gYWNj ZWxlcmF0b3JzKSB7CisrICAgICAgICAgICAga2V5YmluZGluZ19tYW5hZ2VyX2JpbmQoa2V5Ymlu ZGluZ19tYW5hZ2VyLCBhY2NlbGVyYXRvcik7CiArICAgICAgICB9CiAgICAgIH0KICAKQEAgLTMw MjgsNDQgKzI5NjIsNDAgQEAgaW5kZXggYzE1OTY5My4uMWFjYTQ0MyAxMDA2NDQKIC0gICAgICAg IGlmIChtX3N3aXRjaF9rZXlzeW0gPT0gMCAmJiBtX3N3aXRjaF9tb2RpZmllcnMgPT0gMCkKIC0g ICAgICAgICAgICByZXR1cm47CiArICAgICAgICB1bm93bmVkIEdMaWIuTGlzdDxLZXliaW5kaW5n PiBrZXliaW5kaW5ncyA9IG1fa2V5YmluZGluZ3M7CisrCisrICAgICAgICB3aGlsZSAoa2V5Ymlu ZGluZ3MgIT0gbnVsbCkgeworKyAgICAgICAgICAgIEtleWJpbmRpbmcga2V5YmluZGluZyA9IGtl eWJpbmRpbmdzLmRhdGE7CiAgCiAtICAgICAgICBrZXliaW5kaW5nX21hbmFnZXIudW5iaW5kKG1f c3dpdGNoX2tleXN5bSwgbV9zd2l0Y2hfbW9kaWZpZXJzKTsKIC0gICAgICAgIGtleWJpbmRpbmdf bWFuYWdlci51bmJpbmQobV9zd2l0Y2hfa2V5c3ltLAogLSAgICAgICAgICAgICAgICBtX3N3aXRj aF9tb2RpZmllcnMgfCBHZGsuTW9kaWZpZXJUeXBlLlNISUZUX01BU0spOwotKyAgICAgICAgd2hp bGUgKGtleWJpbmRpbmdzICE9IG51bGwpIHsKLSsgICAgICAgICAgICBLZXliaW5kaW5nIGtleWJp bmRpbmcgPSBrZXliaW5kaW5ncy5kYXRhOwotIAotLSAgICAgICAgbV9zd2l0Y2hfa2V5c3ltID0g MDsKLS0gICAgICAgIG1fc3dpdGNoX21vZGlmaWVycyA9IDA7CiArICAgICAgICAgICAga2V5Ymlu ZGluZ19tYW5hZ2VyLnVuYmluZChrZXliaW5kaW5nLmtleXN5bSwKICsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGtleWJpbmRpbmcubW9kaWZpZXJzKTsKLSsKLSsgICAgICAg ICAgICAvLyBOZWVkIHRvIGdldCBrZXliaW5kaW5ncy5uZXh0IGJlZm9yZSBHTGlzdC5yZW1vdmUg aXMgY2FsbGVkLgogKyAgICAgICAgICAgIGtleWJpbmRpbmdzID0ga2V5YmluZGluZ3MubmV4dDsK LSsgICAgICAgICAgICBtX2tleWJpbmRpbmdzLnJlbW92ZShrZXliaW5kaW5nKTsKICsgICAgICAg IH0KKyAKKy0gICAgICAgIG1fc3dpdGNoX2tleXN5bSA9IDA7CistICAgICAgICBtX3N3aXRjaF9t b2RpZmllcnMgPSAwOworKyAgICAgICAgbV9rZXliaW5kaW5ncyA9IG51bGw7CiAgICAgIH0KICAK ICAgICAgcHJpdmF0ZSB2b2lkIHNldF9jdXN0b21fZm9udCgpIHsKLUBAIC0yMjAsMTMgKzMwNSwx NyBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKLSAgICAgICAgIH0KLSAKLSAg ICAgICAgIG1fY29uZmlnID0gY29uZmlnOwotKyAgICAgICAgYmluZF9zd2l0Y2hfc2hvcnRjdXQo KTsKLSAgICAgICAgIGlmIChtX2NvbmZpZyAhPSBudWxsKSB7Ci0gICAgICAgICAgICAgbV9jb25m aWcudmFsdWVfY2hhbmdlZC5jb25uZWN0KGNvbmZpZ192YWx1ZV9jaGFuZ2VkX2NiKTsKK0BAIC0y MjUsMTAgKzMxNSwxNCBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKICAgICAg ICAgICAgICBtX2NvbmZpZy53YXRjaCgiZ2VuZXJhbCIsICJwcmVsb2FkX2VuZ2luZXMiKTsKICAg ICAgICAgICAgICBtX2NvbmZpZy53YXRjaCgiZ2VuZXJhbCIsICJlbmdpbmVzX29yZGVyIik7CiAg ICAgICAgICAgICAgbV9jb25maWcud2F0Y2goImdlbmVyYWwiLCAic3dpdGNoZXJfZGVsYXlfdGlt ZSIpOwogKyAgICAgICAgICAgIG1fY29uZmlnLndhdGNoKCJnZW5lcmFsL2hvdGtleSIsICJ0cmln Z2VyX2FjY2VsIik7Ci0rICAgICAgICAgICAgbV9jb25maWcud2F0Y2goImdlbmVyYWwvaG90a2V5 IiwgInRyaWdnZXJfYWNjZWxfYmFja3dhcmQiKTsKICAgICAgICAgICAgICBtX2NvbmZpZy53YXRj aCgicGFuZWwiLCAiY3VzdG9tX2ZvbnQiKTsKICAgICAgICAgICAgICBtX2NvbmZpZy53YXRjaCgi cGFuZWwiLCAidXNlX2N1c3RvbV9mb250Iik7CiArICAgICAgICAgICAgaW5pdF9lbmdpbmVzX29y ZGVyKCk7CiAgICAgICAgICAgICAgdXBkYXRlX2VuZ2luZXMobV9jb25maWcuZ2V0X3ZhbHVlKCJn ZW5lcmFsIiwgInByZWxvYWRfZW5naW5lcyIpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fY29uZmlnLmdldF92YWx1ZSgiZ2VuZXJhbCIsICJlbmdpbmVzX29yZGVyIikpOworKyAgICAg ICAgICAgIHVuYmluZF9zd2l0Y2hfc2hvcnRjdXQoKTsKKysgICAgICAgICAgICBiaW5kX3N3aXRj aF9zaG9ydGN1dChudWxsKTsKICAgICAgICAgICAgICBzZXRfc3dpdGNoZXJfZGVsYXlfdGltZShu dWxsKTsKLUBAIC0yODIsNiArMzcxLDE5NCBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2 aWNlIHsKKyAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgdXBkYXRlX2VuZ2luZXMobnVs bCwgbnVsbCk7CitAQCAtMjgyLDYgKzM3NiwyMDAgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVs U2VydmljZSB7CiAgICAgICAgICB9CiAgICAgIH0KICAKQEAgLTMxMTAsOCArMzA0MCwxMSBAQCBp bmRleCBjMTU5NjkzLi4xYWNhNDQzIDEwMDY0NAogKyAgICAgICAgfQogKwogKyAgICAgICAgbV94 a2JsYXlvdXQgPSBuZXcgWEtCTGF5b3V0KG1fY29uZmlnKTsKKysgICAgICAgIHN0cmluZyBzZXNz aW9uID0gRW52aXJvbm1lbnQuZ2V0X3ZhcmlhYmxlKCJERVNLVE9QX1NFU1NJT04iKTsKICsKLSsg ICAgICAgIGlmIChIQVZFX0lCVVNfR0tCRCkgeworKyAgICAgICAgaWYgKEhBVkVfSUJVU19HS0JE ICYmCisrICAgICAgICAgICAgc2Vzc2lvbiAhPSBudWxsICYmIHNlc3Npb24ubGVuZ3RoID49IDUg JiYKKysgICAgICAgICAgICBzZXNzaW9uWzA6NV0gPT0gImdub21lIikgewogKyAgICAgICAgICAg IGluaXRfZ2tiZCgpOwogKyAgICAgICAgfQogKwpAQCAtMzIwMyw3ICszMTM2LDEwIEBAIGluZGV4 IGMxNTk2OTMuLjFhY2E0NDMgMTAwNjQ0CiArICAgIH0KICsKICsgICAgcHJpdmF0ZSB2b2lkIHNl dF94a2JfZ3JvdXBfbGF5b3V0KHN0cmluZyBsYXlvdXQpIHsKLSsgICAgICAgIGludFtdIHJldHZh bCA9IG1feGtibGF5b3V0LnNldF9sYXlvdXQobGF5b3V0KTsKKysgICAgICAgIGludFtdIHJldHZh bCA9IG1feGtibGF5b3V0LnNldF9sYXlvdXQobGF5b3V0LAorKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiZGVmYXVsdCIsCisrICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJkZWZhdWx0IiwKKysgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSk7CiArICAgICAgICBpZiAocmV0dmFs WzBdID49IDApIHsKICsgICAgICAgICAgICAvKiBJZiBhbiBYS0Iga2V5bWFwIGlzIGFkZGVkIGlu dG8gdGhlIFhLQiBncm91cCwKICsgICAgICAgICAgICAgKiB0aGlzLl9na2JkbGF5b3V0LmxvY2tf Z3JvdXAgd2lsbCBiZSBjYWxsZWQgYWZ0ZXIKQEAgLTMyNDYsNyArMzE4Miw3IEBAIGluZGV4IGMx NTk2OTMuLjFhY2E0NDMgMTAwNjQ0CiArICAgICAgICAgICAgaW5pdF9lbmdpbmVzX29yZGVyKCk7 CiArICAgICAgICB9CiArCi0rICAgICAgICBpZiAoSEFWRV9JQlVTX0dLQkQpIHsKKysgICAgICAg IGlmIChIQVZFX0lCVVNfR0tCRCAmJiBtX2drYmRsYXlvdXQgIT0gbnVsbCkgewogKyAgICAgICAg ICAgIGlmIChzZXRfZ2tiZF9sYXlvdXQobGF5b3V0KSkgewogKyAgICAgICAgICAgICAgICByZXR1 cm47CiArICAgICAgICAgICAgfQpAQCAtMzI2MCw3ICszMTk2LDcgQEAgaW5kZXggYzE1OTY5My4u MWFjYTQ0MyAxMDA2NDQKICAgICAgcHJpdmF0ZSB2b2lkIHN3aXRjaF9lbmdpbmUoaW50IGksIGJv b2wgZm9yY2UgPSBmYWxzZSkgewogICAgICAgICAgR0xpYi5hc3NlcnQoaSA+PSAwICYmIGkgPCBt X2VuZ2luZXMubGVuZ3RoKTsKICAKLUBAIC0yOTYsNyArNTczLDcgQEAgY2xhc3MgUGFuZWwgOiBJ QnVzLlBhbmVsU2VydmljZSB7CitAQCAtMjk2LDcgKzU4NCw3IEBAIGNsYXNzIFBhbmVsIDogSUJ1 cy5QYW5lbFNlcnZpY2UgewogICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgIH0KICAgICAg ICAgIC8vIHNldCB4a2IgbGF5b3V0CkBAIC0zMjY5LDEzMyArMzIwNSw1OCBAQCBpbmRleCBjMTU5 NjkzLi4xYWNhNDQzIDEwMDY0NAogICAgICB9CiAgCiAgICAgIHByaXZhdGUgdm9pZCBjb25maWdf dmFsdWVfY2hhbmdlZF9jYihJQnVzLkNvbmZpZyBjb25maWcsCi1AQCAtMzA4LDYgKzU4NSwxMyBA QCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKK0BAIC0zMDgsNiArNTk2LDEyIEBA IGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgewogICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgIH0KICAKLSsgICAgICAgIGlmIChzZWN0aW9uID09ICJnZW5lcmFsL2hvdGtleSIg JiYKLSsgICAgICAgICAgICBuYW1lLmxlbmd0aCA+PSAxMyAmJiBuYW1lWzA6MTNdID09ICJ0cmln Z2VyX2FjY2VsIikgeworKyAgICAgICAgaWYgKHNlY3Rpb24gPT0gImdlbmVyYWwvaG90a2V5IiAm JiBuYW1lID09ICJ0cmlnZ2VyX2FjY2VsIikgewogKyAgICAgICAgICAgIHVuYmluZF9zd2l0Y2hf c2hvcnRjdXQoKTsKLSsgICAgICAgICAgICBiaW5kX3N3aXRjaF9zaG9ydGN1dCgpOworKyAgICAg ICAgICAgIGJpbmRfc3dpdGNoX3Nob3J0Y3V0KHZhcmlhbnQpOwogKyAgICAgICAgICAgIHJldHVy bjsKICsgICAgICAgIH0KICsKICAgICAgICAgIGlmIChzZWN0aW9uID09ICJwYW5lbCIgJiYgKG5h bWUgPT0gImN1c3RvbV9mb250IiB8fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbmFtZSA9PSAidXNlX2N1c3RvbV9mb250IikpIHsKICAgICAgICAgICAgICBzZXRfY3VzdG9t X2ZvbnQoKTsKLUBAIC0zMzEsOCArNjE1LDcgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2Vy dmljZSB7CitAQCAtMzE2LDYgKzYxMCw3IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZp Y2UgeworIAorICAgICAgICAgaWYgKHNlY3Rpb24gPT0gImdlbmVyYWwiICYmIG5hbWUgPT0gInN3 aXRjaGVyX2RlbGF5X3RpbWUiKSB7CisgICAgICAgICAgICAgc2V0X3N3aXRjaGVyX2RlbGF5X3Rp bWUodmFyaWFudCk7CisrICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgfQorICAgICB9Cisg CitAQCAtMzI0LDE1ICs2MTksMjIgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7 CisgICAgICAgICBpZiAobV9lbmdpbmVzLmxlbmd0aCA8PSAxKQorICAgICAgICAgICAgIHJldHVy bjsKKyAKKysgICAgICAgIHVpbnQga2V5dmFsID0gZXZlbnQua2V5LmtleXZhbDsKKysgICAgICAg IHVpbnQgbW9kaWZpZXJzID0gS2V5YmluZGluZ01hbmFnZXIuTU9ESUZJRVJfRklMVEVSICYgZXZl bnQua2V5LnN0YXRlOworKworICAgICAgICAgdWludCBwcmltYXJ5X21vZGlmaWVycyA9CisgICAg ICAgICAgICAgS2V5YmluZGluZ01hbmFnZXIuZ2V0X3ByaW1hcnlfbW9kaWZpZXIoZXZlbnQua2V5 LnN0YXRlKTsKKyAKKyAgICAgICAgIGJvb2wgcHJlc3NlZCA9IEtleWJpbmRpbmdNYW5hZ2VyLnBy aW1hcnlfbW9kaWZpZXJfc3RpbGxfcHJlc3NlZCgKICAgICAgICAgICAgICAgICAgZXZlbnQsIHBy aW1hcnlfbW9kaWZpZXJzKTsKKysKKysgICAgICAgIGlmIChyZXZlcnQpIHsKKysgICAgICAgICAg ICBtb2RpZmllcnMgJj0gfkdkay5Nb2RpZmllclR5cGUuU0hJRlRfTUFTSzsKKysgICAgICAgIH0K KysKICAgICAgICAgIGlmIChwcmVzc2VkICYmIG1fc3dpdGNoZXJfZGVsYXlfdGltZSA+PSAwKSB7 CiAgICAgICAgICAgICAgaW50IGkgPSByZXZlcnQgPyBtX2VuZ2luZXMubGVuZ3RoIC0gMSA6IDE7 CiAtICAgICAgICAgICAgaSA9IG1fc3dpdGNoZXIucnVuKG1fc3dpdGNoX2tleXN5bSwgbV9zd2l0 Y2hfbW9kaWZpZXJzLCBldmVudCwKIC0gICAgICAgICAgICAgICAgICAgIG1fZW5naW5lcywgaSk7 Ci0rICAgICAgICAgICAgaSA9IG1fc3dpdGNoZXIucnVuKG1fa2V5YmluZGluZ3MsIGV2ZW50LCBt X2VuZ2luZXMsIGkpOworKyAgICAgICAgICAgIGkgPSBtX3N3aXRjaGVyLnJ1bihrZXl2YWwsIG1v ZGlmaWVycywgZXZlbnQsIG1fZW5naW5lcywgaSk7CiAgICAgICAgICAgICAgaWYgKGkgPCAwKSB7 CiAgICAgICAgICAgICAgICAgIGRlYnVnKCJzd2l0Y2ggY2FuY2VsbGVkIik7CiAgICAgICAgICAg ICAgfSBlbHNlIHsKLWRpZmYgLS1naXQgYS91aS9ndGszL3N3aXRjaGVyLnZhbGEgYi91aS9ndGsz L3N3aXRjaGVyLnZhbGEKLWluZGV4IGM1Mjg2YjEuLjg4MzZjYjIgMTAwNjQ0Ci0tLS0gYS91aS9n dGszL3N3aXRjaGVyLnZhbGEKLSsrKyBiL3VpL2d0azMvc3dpdGNoZXIudmFsYQotQEAgLTYzLDEz ICs2MywyNiBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgewotICAgICAgICAgcHVibGlj IHN0cmluZyBsb25nbmFtZSB7IGdldDsgc2V0OyB9Ci0gICAgIH0KLSAKLSsgICAgcHJpdmF0ZSBj bGFzcyBLZXliaW5kaW5nIHsKLSsgICAgICAgIHB1YmxpYyBLZXliaW5kaW5nKHVpbnQga2V5c3lt LAotKyAgICAgICAgICAgICAgICAgICAgICAgICAgR2RrLk1vZGlmaWVyVHlwZSBtb2RpZmllcnMs Ci0rICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJldmVyc2UpIHsKLSsgICAgICAgICAg ICB0aGlzLmtleXN5bSA9IGtleXN5bTsKLSsgICAgICAgICAgICB0aGlzLm1vZGlmaWVycyA9IG1v ZGlmaWVyczsKLSsgICAgICAgICAgICB0aGlzLnJldmVyc2UgPSByZXZlcnNlOwotKyAgICAgICAg fQotKwotKyAgICAgICAgcHVibGljIHVpbnQga2V5c3ltIHsgZ2V0OyBzZXQ7IH0KLSsgICAgICAg IHB1YmxpYyBHZGsuTW9kaWZpZXJUeXBlIG1vZGlmaWVycyB7IGdldDsgc2V0OyB9Ci0rICAgICAg ICBwdWJsaWMgYm9vbCByZXZlcnNlIHsgZ2V0OyBzZXQ7IH0KLSsgICAgfQotKwotICAgICBwcml2 YXRlIEd0ay5Cb3ggbV9ib3g7Ci0gICAgIHByaXZhdGUgR3RrLkxhYmVsIG1fbGFiZWw7Ci0gICAg IHByaXZhdGUgSUJ1c0VuZ2luZUJ1dHRvbltdIG1fYnV0dG9ucyA9IHt9OwotICAgICBwcml2YXRl IElCdXMuRW5naW5lRGVzY1tdIG1fZW5naW5lczsKLSAgICAgcHJpdmF0ZSB1aW50IG1fc2VsZWN0 ZWRfZW5naW5lOwotLSAgICBwcml2YXRlIHVpbnQgbV9rZXl2YWw7Ci0tICAgIHByaXZhdGUgdWlu dCBtX21vZGlmaWVyczsKLSsgICAgcHJpdmF0ZSB1bm93bmVkIEdMaWIuTGlzdDxLZXliaW5kaW5n PiBtX2tleWJpbmRpbmdzOwotICAgICBwcml2YXRlIEdkay5Nb2RpZmllclR5cGUgbV9wcmltYXJ5 X21vZGlmaWVyOwotICAgICBwcml2YXRlIEdMaWIuTWFpbkxvb3AgbV9sb29wOwotICAgICBwcml2 YXRlIGludCBtX3Jlc3VsdDsKLUBAIC0xMDksMTkgKzEyMiwxNyBAQCBjbGFzcyBTd2l0Y2hlciA6 IEd0ay5XaW5kb3cgewotICAgICAgICAgZ3JhYl9mb2N1cygpOwotICAgICB9Ci0gCi0tICAgIHB1 YmxpYyBpbnQgcnVuKHVpbnQga2V5dmFsLAotLSAgICAgICAgICAgICAgICAgICB1aW50IHN0YXRl LAotKyAgICBwdWJsaWMgaW50IHJ1bihHTGliLkxpc3Qga2V5YmluZGluZ3MsCi0gICAgICAgICAg ICAgICAgICAgIEdkay5FdmVudCBldmVudCwKLSAgICAgICAgICAgICAgICAgICAgSUJ1cy5Fbmdp bmVEZXNjW10gZW5naW5lcywKLSAgICAgICAgICAgICAgICAgICAgaW50IGluZGV4KSB7Ci0gICAg ICAgICBhc3NlcnQgKG1fbG9vcCA9PSBudWxsKTsKLSAgICAgICAgIGFzc2VydCAoaW5kZXggPCBl bmdpbmVzLmxlbmd0aCk7Ci0gCi0tICAgICAgICBtX2tleXZhbCA9IGtleXZhbDsKLS0gICAgICAg IG1fbW9kaWZpZXJzID0gc3RhdGU7Ci0rICAgICAgICBtX2tleWJpbmRpbmdzID0gKEdMaWIuTGlz dDxLZXliaW5kaW5nPikga2V5YmluZGluZ3M7Ci0gICAgICAgICBtX3ByaW1hcnlfbW9kaWZpZXIg PQotICAgICAgICAgICAgIEtleWJpbmRpbmdNYW5hZ2VyLmdldF9wcmltYXJ5X21vZGlmaWVyKAot LSAgICAgICAgICAgICAgICBzdGF0ZSAmIEtleWJpbmRpbmdNYW5hZ2VyLk1PRElGSUVSX0ZJTFRF Uik7Ci0rICAgICAgICAgICAgICAgIGV2ZW50LmtleS5zdGF0ZSAmIEtleWJpbmRpbmdNYW5hZ2Vy Lk1PRElGSUVSX0ZJTFRFUik7Ci0gCi0gICAgICAgICB1cGRhdGVfZW5naW5lcyhlbmdpbmVzKTsK LSAgICAgICAgIC8qIExldCBndGsgcmVjYWxjdWxhdGUgdGhlIHdpbmRvdyBzaXplLiAqLwotQEAg LTMyOCwyNyArMzM5LDI5IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7Ci0gICAgIHB1 YmxpYyBvdmVycmlkZSBib29sIGtleV9wcmVzc19ldmVudChHZGsuRXZlbnRLZXkgZSkgewotICAg ICAgICAgYm9vbCByZXR2YWwgPSB0cnVlOwotICAgICAgICAgR2RrLkV2ZW50S2V5ICpwZSA9ICZl OwotKyAgICAgICAgdWludCBtb2RpZmllcnMgPSBLZXliaW5kaW5nTWFuYWdlci5NT0RJRklFUl9G SUxURVIgJiBwZS0+c3RhdGU7Ci0gCi0gICAgICAgICBpZiAobV9wb3B1cF9kZWxheV90aW1lID4g MCkgewotICAgICAgICAgICAgIHJlc3RvcmVfd2luZG93X3Bvc2l0aW9uKCJwcmVzc2VkIik7Ci0g ICAgICAgICB9Ci0gCi0tICAgICAgICBkbyB7Ci0tICAgICAgICAgICAgdWludCBtb2RpZmllcnMg PSBLZXliaW5kaW5nTWFuYWdlci5NT0RJRklFUl9GSUxURVIgJiBwZS0+c3RhdGU7Ci0rICAgICAg ICBmb3IgKHVub3duZWQgR0xpYi5MaXN0PEtleWJpbmRpbmc+IGtleWJpbmRpbmdzID0gbV9rZXli aW5kaW5nczsKLSsgICAgICAgICAgICAga2V5YmluZGluZ3MgIT0gbnVsbDsKLSsgICAgICAgICAg ICAga2V5YmluZGluZ3MgPSBrZXliaW5kaW5ncy5uZXh0KSB7Ci0rICAgICAgICAgICAgS2V5Ymlu ZGluZyBrZXliaW5kaW5nID0ga2V5YmluZGluZ3MuZGF0YTsKLSAKLS0gICAgICAgICAgICBpZiAo KG1vZGlmaWVycyAhPSBtX21vZGlmaWVycykgJiYKLS0gICAgICAgICAgICAgICAgKG1vZGlmaWVy cyAhPSAobV9tb2RpZmllcnMgfCBHZGsuTW9kaWZpZXJUeXBlLlNISUZUX01BU0spKSkgewotLSAg ICAgICAgICAgICAgICBicmVhazsKLS0gICAgICAgICAgICB9Ci0tCi0tICAgICAgICAgICAgaWYg KHBlLT5rZXl2YWwgPT0gbV9rZXl2YWwpIHsKLS0gICAgICAgICAgICAgICAgaWYgKG1vZGlmaWVy cyA9PSBtX21vZGlmaWVycykKLSsgICAgICAgICAgICBpZiAocGUtPmtleXZhbCA9PSBrZXliaW5k aW5nLmtleXN5bSAmJgotKyAgICAgICAgICAgICAgICBtb2RpZmllcnMgPT0gKHVpbnQpIGtleWJp bmRpbmcubW9kaWZpZXJzKSB7Ci0rICAgICAgICAgICAgICAgIGlmICgha2V5YmluZGluZy5yZXZl cnNlKSB7Ci0gICAgICAgICAgICAgICAgICAgICBuZXh0X2VuZ2luZSgpOwotLSAgICAgICAgICAg ICAgICBlbHNlIC8vIG1vZGlmaWZlcnMgPT0gbV9tb2RpZmllcnMgfCBTSElGVF9NQVNLCi0rICAg ICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICBwcmV2aW91c19lbmdp bmUoKTsKLS0gICAgICAgICAgICAgICAgYnJlYWs7Ci0rICAgICAgICAgICAgICAgIH0KLSsgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICAgfQotKyAgICAgICAgfQotIAot KyAgICAgICAgZG8gewotICAgICAgICAgICAgIHN3aXRjaCAocGUtPmtleXZhbCkgewotICAgICAg ICAgICAgICAgICBjYXNlIDB4MDhmYjogLyogbGVmdGFycm93ICovCi0gICAgICAgICAgICAgICAg IGNhc2UgMHhmZjUxOiAvKiBMZWZ0ICovCiBkaWZmIC0tZ2l0IGEvdWkvZ3RrMy94a2JsYXlvdXQu dmFsYSBiL3VpL2d0azMveGtibGF5b3V0LnZhbGEKIG5ldyBmaWxlIG1vZGUgMTAwNjQ0Ci1pbmRl eCAwMDAwMDAwLi4zM2U5ZDlkCitpbmRleCAwMDAwMDAwLi4yMDkyYTYwCiAtLS0gL2Rldi9udWxs CiArKysgYi91aS9ndGszL3hrYmxheW91dC52YWxhCi1AQCAtMCwwICsxLDQ2NCBAQAorQEAgLTAs MCArMSw0NjUgQEAKICsvKiB2aW06c2V0IGV0IHN0cz00IHN3PTQ6CiArICoKICsgKiBpYnVzIC0g VGhlIElucHV0IEJ1cwpAQCAtMzY0Niw3ICszNTA3LDggQEAgaW5kZXggMDAwMDAwMC4uMzNlOWQ5 ZAogKwogKyAgICBwdWJsaWMgaW50W10gc2V0X2xheW91dChzdHJpbmcgX2xheW91dD0iZGVmYXVs dCIsCiArICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZyBfdmFyaWFudD0iZGVmYXVs dCIsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZyBfb3B0aW9uPSJkZWZhdWx0 IikgeworKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmcgX29wdGlvbj0iZGVmYXVs dCIsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgICB1c2VfZ3JvdXBfbGF5b3V0 PWZhbHNlKSB7CiArICAgICAgICBhc3NlcnQgKF9sYXlvdXQgIT0gbnVsbCk7CiArCiArICAgICAg ICBpbnQgeGtiX2dyb3VwX2lkID0gMDsKQEAgLTM3MDksNyArMzU3MSw3IEBAIGluZGV4IDAwMDAw MDAuLjMzZTlkOWQKICsgICAgICAgICAgICBsYXlvdXQgPSBtX2RlZmF1bHRfbGF5b3V0OwogKyAg ICAgICAgICAgIHZhcmlhbnQgPSBtX2RlZmF1bHRfdmFyaWFudDsKICsgICAgICAgIH0gZWxzZSB7 Ci0rICAgICAgICAgICAgaWYgKEhBVkVfSUJVU19HS0JEKSB7CisrICAgICAgICAgICAgaWYgKHVz ZV9ncm91cF9sYXlvdXQpIHsKICsgICAgICAgICAgICAgICAgaWYgKHZhcmlhbnQgPT0gImRlZmF1 bHQiKSB7CiArICAgICAgICAgICAgICAgICAgICB2YXJpYW50ID0gIiI7CiArICAgICAgICAgICAg ICAgIH0KCmRpZmYgLS1naXQgYS9pYnVzLXh4LW5vLXVzZS5kaWZmIGIvaWJ1cy14eC1uby11c2Uu ZGlmZgppbmRleCA2ZDQ2MzZjLi5kOTViZDRjIDEwMDY0NAotLS0gYS9pYnVzLXh4LW5vLXVzZS5k aWZmCisrKyBiL2lidXMteHgtbm8tdXNlLmRpZmYKQEAgLTEsMTkgKzEsMzkgQEAKLUZyb20gOTA3 ZWRiMTBmZDUzZTkxZjA1YmI0MzI3ZGYyMDEzNDU1MjVmNGQ5MCBNb24gU2VwIDE3IDAwOjAwOjAw IDIwMDEKK0Zyb20gZmRlYzU5NTQ1ZmI5NGY3NjhjODQ3NzMwODU0Y2EwM2M1YWYyZjY1MiBNb24g U2VwIDE3IDAwOjAwOjAwIDIwMDEKIEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdt YWlsLmNvbT4KLURhdGU6IFR1ZSwgMTMgTm92IDIwMTIgMjI6Mzg6MTkgKzA5MDAKK0RhdGU6IEZy aSwgNyBEZWMgMjAxMiAxNzo1OTo0OSArMDkwMAogU3ViamVjdDogW1BBVENIXSBEaXNhYmxlZCB0 byBzaG93IG5vbi11c2VkIEdVSS4KIAogLS0tCi0gc2V0dXAva2V5Ym9hcmRzaG9ydGN1dC5weSB8 IDg3ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0gc2V0 dXAvbWFpbi5weSAgICAgICAgICAgICB8IDIzICsrKysrKystLS0tLS0KLSBzZXR1cC9zZXR1cC51 aSAgICAgICAgICAgIHwgMjYgKysrKysrKy0tLS0tLS0KLSAzIGZpbGVzIGNoYW5nZWQsIDcyIGlu c2VydGlvbnMoKyksIDY0IGRlbGV0aW9ucygtKQorIHNldHVwL2tleWJvYXJkc2hvcnRjdXQucHkg fCA5MCArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorIHNl dHVwL21haW4ucHkgICAgICAgICAgICAgfCA0NSArKysrKysrKysrKysrLS0tLS0tLS0tLS0KKyBz ZXR1cC9zZXR1cC51aSAgICAgICAgICAgIHwgNTEgKysrKysrKysrKysrKysrKystLS0tLS0tLS0t CisgMyBmaWxlcyBjaGFuZ2VkLCAxMDMgaW5zZXJ0aW9ucygrKSwgODMgZGVsZXRpb25zKC0pCiAK IGRpZmYgLS1naXQgYS9zZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5IGIvc2V0dXAva2V5Ym9hcmRz aG9ydGN1dC5weQotaW5kZXggMzg2MWQyZi4uZWZiZGViNyAxMDA2NDQKK2luZGV4IDM4NjFkMmYu LjkzNDllNDIgMTAwNjQ0CiAtLS0gYS9zZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5CiArKysgYi9z ZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5Ci1AQCAtMTg1LDE1ICsxODUsMTcgQEAgY2xhc3MgS2V5 Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbihHdGsuVkJveCk6CitAQCAtMTAzLDkgKzEwMyw4IEBAIGNs YXNzIEtleWJvYXJkU2hvcnRjdXRTZWxlY3Rpb24oR3RrLlZCb3gpOgorICAgICAgICAgc2VsZi5f X21vZGlmaWVyX2J1dHRvbnMuYXBwZW5kKCgiSHlwZXIiLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBHdGsuQ2hlY2tCdXR0b24ubmV3X3dpdGhfbW5lbW9uaWMoIl9I eXBlciIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHZGsuTW9k aWZpZXJUeXBlLkhZUEVSX01BU0spKQorLSAgICAgICAgc2VsZi5fX21vZGlmaWVyX2J1dHRvbnMu YXBwZW5kKCgiQ2Fwc2xvY2siLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHdGsuQ2hlY2tCdXR0b24ubmV3X3dpdGhfbW5lbW9uaWMoIkNhcHNsb2NfayIpLAorLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHZGsuTW9kaWZpZXJUeXBlLkxP Q0tfTUFTSykpCisrICAgICAgICAjIDxDYXBzTG9jaz4gaXMgbm90IHBhcnNlZCBieSBndGtfYWNj ZWxlcmF0b3JfcGFyc2UoKQorKyAgICAgICAgIyBGSVhNRTogTmVlZCB0byBjaGVjayBpZiBpYnVz IGd0ayBwYW5lbCBjYW4gZW5hYmxlIDxSZWxlYXNlPi4KKyAgICAgICAgIHNlbGYuX19tb2RpZmll cl9idXR0b25zLmFwcGVuZCgoIlJlbGVhc2UiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBHdGsuQ2hlY2tCdXR0b24ubmV3X3dpdGhfbW5lbW9uaWMoIl9SZWxlYXNl IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdkay5Nb2RpZmll clR5cGUuUkVMRUFTRV9NQVNLKSkKK0BAIC0xMTksNyArMTE4LDYgQEAgY2xhc3MgS2V5Ym9hcmRT aG9ydGN1dFNlbGVjdGlvbihHdGsuVkJveCk6CisgICAgICAgICB0YWJsZS5hdHRhY2goc2VsZi5f X21vZGlmaWVyX2J1dHRvbnNbNF1bMV0sIDAsIDEsIDEsIDIpCisgICAgICAgICB0YWJsZS5hdHRh Y2goc2VsZi5fX21vZGlmaWVyX2J1dHRvbnNbNV1bMV0sIDEsIDIsIDEsIDIpCisgICAgICAgICB0 YWJsZS5hdHRhY2goc2VsZi5fX21vZGlmaWVyX2J1dHRvbnNbNl1bMV0sIDIsIDMsIDEsIDIpCist ICAgICAgICB0YWJsZS5hdHRhY2goc2VsZi5fX21vZGlmaWVyX2J1dHRvbnNbN11bMV0sIDMsIDQs IDEsIDIpCisgICAgICAgICBoYm94LnBhY2tfc3RhcnQodGFibGUsIFRydWUsIFRydWUsIDQpCisg ICAgICAgICBzZWxmLnBhY2tfc3RhcnQoaGJveCwgRmFsc2UsIFRydWUsIDQpCisgCitAQCAtMTg1 LDE5ICsxODMsMjAgQEAgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbihHdGsuVkJveCk6 CiAgICAgICAgICAgICAgICAgIG1vZGlmaWVycy5hcHBlbmQobmFtZSkKICAgICAgICAgIGlmIGtl eWNvZGUuc3RhcnRzd2l0aCgiXyIpOgogICAgICAgICAgICAgIGtleWNvZGUgPSBrZXljb2RlWzE6 XQpAQCAtMjksMjAgKzQ5LDE4IEBAIGluZGV4IDM4NjFkMmYuLmVmYmRlYjcgMTAwNjQ0CiArICAg ICAgICAoa2V5dmFsLCBzdGF0ZSkgPSBHdGsuYWNjZWxlcmF0b3JfcGFyc2Uoc2hvcnRjdXQpCiAr ICAgICAgICBpZiBrZXl2YWwgPT0gMCBhbmQgc3RhdGUgPT0gMDoKICsgICAgICAgICAgICByZXR1 cm4KLSsgICAgICAgIGtleXMgPSBzaG9ydGN1dC5zcGxpdCgnPicpCiAgICAgICAgICBmb3IgbmFt ZSwgYnV0dG9uLCBtYXNrIGluIHNlbGYuX19tb2RpZmllcl9idXR0b25zOgogLSAgICAgICAgICAg IGlmIG5hbWUgaW4gbW9kczoKICsgICAgICAgICAgICBpZiBzdGF0ZSAmIG1hc2s6CiAgICAgICAg ICAgICAgICAgIGJ1dHRvbi5zZXRfYWN0aXZlKFRydWUpCiAgICAgICAgICAgICAgZWxzZToKICAg ICAgICAgICAgICAgICAgYnV0dG9uLnNldF9hY3RpdmUoRmFsc2UpCi1AQCAtMjQ3LDU0ICsyNDks NTkgQEAgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbihHdGsuVkJveCk6Ci0gICAgICAg ICBzZWxmLl9fdXBkYXRlX2FkZF9hbmRfYXBwbHlfYnV0dG9ucygpCistICAgICAgICBzZWxmLl9f a2V5Y29kZV9lbnRyeS5zZXRfdGV4dChrZXlzWy0xXSkKKysgICAgICAgIHNlbGYuX19rZXljb2Rl X2VudHJ5LnNldF90ZXh0KHNob3J0Y3V0LnJzcGxpdCgnPicsIDEpWy0xXSkKICAKLSAgICAgZGVm IF9fa2V5Y29kZV9idXR0b25fY2xpY2tlZF9jYihzZWxmLCBidXR0b24pOgotLSAgICAgICAgb3V0 ID0gW10KLSAgICAgICAgIGRsZyA9IEd0ay5NZXNzYWdlRGlhbG9nKHBhcmVudCA9IHNlbGYuZ2V0 X3RvcGxldmVsKCksIGJ1dHRvbnMgPSBHdGsuQnV0dG9uc1R5cGUuQ0xPU0UpCi0rICAgICAgICBv dXQgPSBbZGxnXQorICAgICBkZWYgX19nZXRfc2VsZWN0ZWRfc2hvcnRjdXQoc2VsZik6CisgICAg ICAgICBtb2RlbCA9IHNlbGYuX19zaG9ydGN1dF92aWV3LmdldF9tb2RlbCgpCitAQCAtMjUyLDQ5 ICsyNTEsNTIgQEAgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbihHdGsuVkJveCk6CiAg ICAgICAgICBtZXNzYWdlID0gXygiUGxlYXNlIHByZXNzIGEga2V5IChvciBhIGtleSBjb21iaW5h dGlvbikuXG5UaGUgZGlhbG9nIHdpbGwgYmUgY2xvc2VkIHdoZW4gdGhlIGtleSBpcyByZWxlYXNl ZC4iKQogICAgICAgICAgZGxnLnNldF9tYXJrdXAobWVzc2FnZSkKICAgICAgICAgIGRsZy5zZXRf dGl0bGUoXygiUGxlYXNlIHByZXNzIGEga2V5IChvciBhIGtleSBjb21iaW5hdGlvbikiKSkKQEAg LTU3LDggKzc1LDcgQEAgaW5kZXggMzg2MWQyZi4uZWZiZGViNyAxMDA2NDQKIC0gICAgICAgIGRs Zy5jb25uZWN0KCJrZXktcmVsZWFzZS1ldmVudCIsIF9fa2V5X3JlbGVhc2VfZXZlbnQsIE5vbmUp CiArICAgICAgICBzdyA9IEd0ay5TY3JvbGxlZFdpbmRvdygpCiArCi0rICAgICAgICBkZWYgX19h Y2NlbF9lZGl0ZWRfY2IoYywgcGF0aCwga2V5dmFsLCBzdGF0ZSwga2V5Y29kZSwgb3V0KToKLSsg ICAgICAgICAgICBkbGcgPSBvdXRbMF0KKysgICAgICAgIGRlZiBfX2FjY2VsX2VkaXRlZF9jYihj LCBwYXRoLCBrZXl2YWwsIHN0YXRlLCBrZXljb2RlKToKICsgICAgICAgICAgICBvdXQuYXBwZW5k KGtleXZhbCkKICsgICAgICAgICAgICBvdXQuYXBwZW5kKHN0YXRlKQogKyAgICAgICAgICAgIG91 dC5hcHBlbmQoa2V5Y29kZSkKQEAgLTcyLDcgKzg5LDcgQEAgaW5kZXggMzg2MWQyZi4uZWZiZGVi NyAxMDA2NDQKICsgICAgICAgIGNvbHVtbiA9IEd0ay5UcmVlVmlld0NvbHVtbigpCiArICAgICAg ICByZW5kZXJlciA9IEd0ay5DZWxsUmVuZGVyZXJBY2NlbChhY2NlbF9tb2RlPUd0ay5DZWxsUmVu ZGVyZXJBY2NlbE1vZGUuT1RIRVIsCiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlZGl0YWJsZT1UcnVlKQotKyAgICAgICAgcmVuZGVyZXIuY29ubmVjdCgnYWNjZWwt ZWRpdGVkJywgX19hY2NlbF9lZGl0ZWRfY2IsIG91dCkKKysgICAgICAgIHJlbmRlcmVyLmNvbm5l Y3QoJ2FjY2VsLWVkaXRlZCcsIF9fYWNjZWxfZWRpdGVkX2NiKQogKyAgICAgICAgY29sdW1uLnBh Y2tfc3RhcnQocmVuZGVyZXIsIFRydWUpCiArICAgICAgICBjb2x1bW4uYWRkX2F0dHJpYnV0ZShy ZW5kZXJlciwgJ2FjY2VsLW1vZHMnLCAwKQogKyAgICAgICAgY29sdW1uLmFkZF9hdHRyaWJ1dGUo cmVuZGVyZXIsICdhY2NlbC1rZXknLCAxKQpAQCAtODUsNyArMTAyLDcgQEAgaW5kZXggMzg2MWQy Zi4uZWZiZGViNyAxMDA2NDQKICAgICAgICAgIGlkID0gZGxnLnJ1bigpCiAgICAgICAgICBkbGcu ZGVzdHJveSgpCiAtICAgICAgICBpZiBpZCAhPSBHdGsuUmVzcG9uc2VUeXBlLk9LIG9yIG5vdCBv dXQ6Ci0rICAgICAgICBpZiBpZCAhPSBHdGsuUmVzcG9uc2VUeXBlLk9LIG9yIGxlbihvdXQpID09 IDE6CisrICAgICAgICBpZiBpZCAhPSBHdGsuUmVzcG9uc2VUeXBlLk9LIG9yIGxlbihvdXQpIDwg MzoKICAgICAgICAgICAgICByZXR1cm4KIC0gICAgICAgIGtleWV2ZW50ID0gb3V0W2xlbihvdXQp IC0gMV0KIC0gICAgICAgIHN0YXRlID0ga2V5ZXZlbnQuc3RhdGUgJiAoR2RrLk1vZGlmaWVyVHlw ZS5DT05UUk9MX01BU0sgfCBcCkBAIC0xMTAsOSArMTI3LDkgQEAgaW5kZXggMzg2MWQyZi4uZWZi ZGViNyAxMDA2NDQKIC0gICAgICAgICAgICBzdGF0ZSA9IHN0YXRlIHwgR2RrLk1vZGlmaWVyVHlw ZS5SRUxFQVNFX01BU0sKIC0gICAgICAgIGVsaWYga2V5ZXZlbnQua2V5dmFsIGluIChHZGsuS0VZ X0h5cGVyX0wsIEdkay5LRVlfSHlwZXJfUikgYW5kIHN0YXRlID09IEdkay5Nb2RpZmllclR5cGUu SFlQRVJfTUFTSzoKIC0gICAgICAgICAgICBzdGF0ZSA9IHN0YXRlIHwgR2RrLk1vZGlmaWVyVHlw ZS5SRUxFQVNFX01BU0sKLSsgICAgICAgIGtleXZhbCA9IG91dFsxXQotKyAgICAgICAgc3RhdGUg PSBvdXRbMl0KLSsgICAgICAgIGtleWNvZGUgPSBvdXRbM10KKysgICAgICAgIGtleXZhbCA9IG91 dFswXQorKyAgICAgICAgc3RhdGUgPSBvdXRbMV0KKysgICAgICAgIGtleWNvZGUgPSBvdXRbMl0K ICAKICAgICAgICAgIGZvciBuYW1lLCBidXR0b24sIG1hc2sgaW4gc2VsZi5fX21vZGlmaWVyX2J1 dHRvbnM6CiAgICAgICAgICAgICAgaWYgc3RhdGUgJiBtYXNrOgpAQCAtMTI2LDU4ICsxNDMsNjYg QEAgaW5kZXggMzg2MWQyZi4uZWZiZGViNyAxMDA2NDQKICsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleWNvZGUsCiArICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZSkKICsgICAgICAgIHNo b3J0Y3V0ID0gc2hvcnRjdXQucmVwbGFjZSgnPFByaW1hcnk+JywgJzxDb250cm9sPicpCi0rICAg ICAgICBrZXlzID0gc2hvcnRjdXQuc3BsaXQoJz4nKQotKyAgICAgICAgc2VsZi5fX2tleWNvZGVf ZW50cnkuc2V0X3RleHQoa2V5c1stMV0pCisrICAgICAgICBzZWxmLl9fa2V5Y29kZV9lbnRyeS5z ZXRfdGV4dChzaG9ydGN1dC5yc3BsaXQoJz4nLCAxKVstMV0pCiAgCiAgICAgIGRlZiBfX2FkZF9i dXR0b25fY2xpY2tlZF9jYihzZWxmLCBidXR0b24pOgogICAgICAgICAgc2hvcnRjdXQgPSBzZWxm Ll9fZ2V0X3Nob3J0Y3V0X2Zyb21fYnV0dG9ucygpCiBkaWZmIC0tZ2l0IGEvc2V0dXAvbWFpbi5w eSBiL3NldHVwL21haW4ucHkKLWluZGV4IDQ2MjA5YjYuLjFiOThlMTcgMTAwNjQ0CitpbmRleCA0 NjIwOWI2Li5hYThlOTM1IDEwMDY0NAogLS0tIGEvc2V0dXAvbWFpbi5weQogKysrIGIvc2V0dXAv bWFpbi5weQotQEAgLTkzLDIxICs5MywyMyBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorQEAgLTky LDIyICs5MiwyNCBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorICAgICAgICAgc2VsZi5fX2luaXRf dWkoKQogIAogICAgICBkZWYgX19pbml0X2hvdGtleShzZWxmKToKLSAgICAgICAgIGRlZmF1bHRf dmFsdWVzID0geworLSAgICAgICAgZGVmYXVsdF92YWx1ZXMgPSB7CiAtICAgICAgICAgICAgInRy aWdnZXIiIDogKE5fKCJ0cmlnZ2VyIiksIFsiQ29udHJvbCtzcGFjZSJdKSwKIC0gICAgICAgICAg ICAiZW5hYmxlX3VuY29uZGl0aW9uYWwiIDogKE5fKCJlbmFibGUiKSwgW10pLAogLSAgICAgICAg ICAgICJkaXNhYmxlX3VuY29uZGl0aW9uYWwiIDogKE5fKCJkaXNhYmxlIiksIFtdKQotKyAgICAg ICAgICAgICd0cmlnZ2VyX2FjY2VsJyA6ICgnbmV4dF9lbmdpbmUnLCBbJzxDb250cm9sPnNwYWNl J10pLAotKyAgICAgICAgICAgICd0cmlnZ2VyX2FjY2VsX2JhY2t3YXJkJyA6ICgncHJldl9lbmdp bmUnLCBbJzxDb250cm9sPjxTaGlmdD5zcGFjZSddKSwKLSAgICAgICAgIH0KLSAKLSAgICAgICAg IHZhbHVlcyA9IGRpY3Qoc2VsZi5fX2NvbmZpZy5nZXRfdmFsdWVzKCJnZW5lcmFsL2hvdGtleSIp KQotIAotICAgICAgICAgZm9yIG5hbWUsIChsYWJlbCwgc2hvcnRjdXRzKSBpbiBkZWZhdWx0X3Zh bHVlcy5pdGVtcygpOgotICAgICAgICAgICAgIHNob3J0Y3V0cyA9IHZhbHVlcy5nZXQobmFtZSwg c2hvcnRjdXRzKQorLSAgICAgICAgfQorLQorLSAgICAgICAgdmFsdWVzID0gZGljdChzZWxmLl9f Y29uZmlnLmdldF92YWx1ZXMoImdlbmVyYWwvaG90a2V5IikpCistCistICAgICAgICBmb3IgbmFt ZSwgKGxhYmVsLCBzaG9ydGN1dHMpIGluIGRlZmF1bHRfdmFsdWVzLml0ZW1zKCk6CistICAgICAg ICAgICAgc2hvcnRjdXRzID0gdmFsdWVzLmdldChuYW1lLCBzaG9ydGN1dHMpCiAtICAgICAgICAg ICAgYnV0dG9uID0gc2VsZi5fX2J1aWxkZXIuZ2V0X29iamVjdCgiYnV0dG9uXyVzIiAlIG5hbWUp CiAtICAgICAgICAgICAgZW50cnkgPSBzZWxmLl9fYnVpbGRlci5nZXRfb2JqZWN0KCJlbnRyeV8l cyIgJSBuYW1lKQotKyAgICAgICAgICAgIGJ1dHRvbiA9IHNlbGYuX19idWlsZGVyLmdldF9vYmpl Y3QoImJ1dHRvbl8lcyIgJSBsYWJlbCkKLSsgICAgICAgICAgICBlbnRyeSA9IHNlbGYuX19idWls ZGVyLmdldF9vYmplY3QoImVudHJ5XyVzIiAlIGxhYmVsKQotICAgICAgICAgICAgIGVudHJ5LnNl dF90ZXh0KCI7ICIuam9pbihzaG9ydGN1dHMpKQorLSAgICAgICAgICAgIGVudHJ5LnNldF90ZXh0 KCI7ICIuam9pbihzaG9ydGN1dHMpKQogLSAgICAgICAgICAgIGVudHJ5LnNldF90b29sdGlwX3Rl eHQoIlxuIi5qb2luKHNob3J0Y3V0cykpCi0rICAgICAgICAgICAgdGV4dCA9ICdcbicuam9pbihz aG9ydGN1dHMpCi0rICAgICAgICAgICAgdGV4dCA9ICJVc2UgJzsnIHNlcGFyYXRlZCB2YWx1ZXNc biIgKyB0ZXh0Ci0rICAgICAgICAgICAgZW50cnkuc2V0X3Rvb2x0aXBfdGV4dCh0ZXh0KQotICAg ICAgICAgICAgIGJ1dHRvbi5jb25uZWN0KCJjbGlja2VkIiwgc2VsZi5fX3Nob3J0Y3V0X2J1dHRv bl9jbGlja2VkX2NiLAorLSAgICAgICAgICAgIGJ1dHRvbi5jb25uZWN0KCJjbGlja2VkIiwgc2Vs Zi5fX3Nob3J0Y3V0X2J1dHRvbl9jbGlja2VkX2NiLAogLSAgICAgICAgICAgICAgICAgICAgbGFi ZWwsICJnZW5lcmFsL2hvdGtleSIsIG5hbWUsIGVudHJ5KQotKyAgICAgICAgICAgICAgICAgICAg bmFtZSwgImdlbmVyYWwvaG90a2V5IiwgbGFiZWwsIGVudHJ5KQotKyAgICAgICAgICAgIGJ1dHRv bi5zZXRfdG9vbHRpcF90ZXh0KCJTYXZlIHRoZSBsZWZ0IGVudHJ5IHN0cmluZyIpCisrICAgICAg ICBuYW1lID0gJ3RyaWdnZXJfYWNjZWwnCisrICAgICAgICBsYWJlbCA9ICdzd2l0Y2hfZW5naW5l JworKyAgICAgICAgdmFyaWFudCA9IHNlbGYuX19jb25maWcuZ2V0X3ZhbHVlKCdnZW5lcmFsL2hv dGtleScsIG5hbWUpCisrICAgICAgICBpZiB2YXJpYW50ICE9IE5vbmU6CisrICAgICAgICAgICAg c2hvcnRjdXRzID0gdmFyaWFudC5kdXBfc3RydigpCisrICAgICAgICBlbHNlOgorKyAgICAgICAg ICAgIHNob3J0Y3V0cyA9ICBbJzxDb250cm9sPnNwYWNlJ10KKysKKysgICAgICAgIGJ1dHRvbiA9 IHNlbGYuX19idWlsZGVyLmdldF9vYmplY3QoImJ1dHRvbl8lcyIgJSBsYWJlbCkKKysgICAgICAg IGVudHJ5ID0gc2VsZi5fX2J1aWxkZXIuZ2V0X29iamVjdCgiZW50cnlfJXMiICUgbGFiZWwpCisr ICAgICAgICBlbnRyeS5zZXRfdGV4dCgiOyAiLmpvaW4oc2hvcnRjdXRzKSkKKysgICAgICAgIHRv b2x0aXAgPSAiXG4iLmpvaW4oc2hvcnRjdXRzKQorKyAgICAgICAgdG9vbHRpcCArPSAiXG4iICsg XAorKyAgICAgICAgICAgIF8oIlVzZSBzaG9ydGN1dCB3aXRoIHNoaWZ0IHRvIHN3aXRjaCB0byB0 aGUgcHJldmlvdXMgaW5wdXQgbWV0aG9kIikKKysKKysgICAgICAgIGVudHJ5LnNldF90b29sdGlw X3RleHQodG9vbHRpcCkKKysgICAgICAgIGJ1dHRvbi5jb25uZWN0KCJjbGlja2VkIiwgc2VsZi5f X3Nob3J0Y3V0X2J1dHRvbl9jbGlja2VkX2NiLAorKyAgICAgICAgICAgICAgICBuYW1lLCAiZ2Vu ZXJhbC9ob3RrZXkiLCBsYWJlbCwgZW50cnkpCiAgCiAgICAgIGRlZiBfX2luaXRfcGFuZWwoc2Vs Zik6CiAgICAgICAgICB2YWx1ZXMgPSBkaWN0KHNlbGYuX19jb25maWcuZ2V0X3ZhbHVlcygicGFu ZWwiKSkKLUBAIC00NDksNyArNDUxLDkgQEAgY2xhc3MgU2V0dXAob2JqZWN0KToKK0BAIC00NDks NyArNDUxLDggQEAgY2xhc3MgU2V0dXAob2JqZWN0KToKICAgICAgZGVmIF9fc2hvcnRjdXRfYnV0 dG9uX2NsaWNrZWRfY2Ioc2VsZiwgYnV0dG9uLCBuYW1lLCBzZWN0aW9uLCBfbmFtZSwgZW50cnkp OgogICAgICAgICAgYnV0dG9ucyA9IChHdGsuU1RPQ0tfQ0FOQ0VMLCBHdGsuUmVzcG9uc2VUeXBl LkNBTkNFTCwKICAgICAgICAgICAgICAgICAgR3RrLlNUT0NLX09LLCBHdGsuUmVzcG9uc2VUeXBl Lk9LKQogLSAgICAgICAgdGl0bGUgPSBfKCJTZWxlY3Qga2V5Ym9hcmQgc2hvcnRjdXQgZm9yICVz IikgJSAgXyhuYW1lKQogKyAgICAgICAgdGl0bGUgPSBfKCJTZWxlY3Qga2V5Ym9hcmQgc2hvcnRj dXQgZm9yICVzIikgJSBcCi0rICAgICAgICAgICAgICAgIF8oIm5leHQgZW5naW5lIikgaWYgbmFt ZSA9PSAnbmV4dF9lbmdpbmUnIGVsc2UgXAotKyAgICAgICAgICAgICAgICBfKCJwcmV2aW91cyBl bmdpbmUiKQorKyAgICAgICAgICAgICAgICBfKCJzd2l0Y2hpbmcgaW5wdXQgbWV0aG9kcyIpCiAg ICAgICAgICBkaWFsb2cgPSBrZXlib2FyZHNob3J0Y3V0LktleWJvYXJkU2hvcnRjdXRTZWxlY3Rp b25EaWFsb2coYnV0dG9ucyA9IGJ1dHRvbnMsIHRpdGxlID0gdGl0bGUpCiAgICAgICAgICB0ZXh0 ID0gZW50cnkuZ2V0X3RleHQoKQogICAgICAgICAgaWYgdGV4dDoKLUBAIC00NjIsMTIgKzQ2Niwx MSBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorQEAgLTQ2MiwxMSArNDY1LDEzIEBAIGNsYXNzIFNl dHVwKG9iamVjdCk6CiAgICAgICAgICBkaWFsb2cuZGVzdHJveSgpCiAgICAgICAgICBpZiBpZCAh PSBHdGsuUmVzcG9uc2VUeXBlLk9LOgogICAgICAgICAgICAgIHJldHVybgpAQCAtMTg1LDIxICsy MTAsMjYgQEAgaW5kZXggNDYyMDliNi4uMWI5OGUxNyAxMDA2NDQKICsgICAgICAgIHNlbGYuX19j b25maWcuc2V0X3ZhbHVlKHNlY3Rpb24sIG5hbWUsIEdMaWIuVmFyaWFudC5uZXdfc3RydihzaG9y dGN1dHMpKQogICAgICAgICAgdGV4dCA9ICI7ICIuam9pbihzaG9ydGN1dHMpCiAgICAgICAgICBl bnRyeS5zZXRfdGV4dCh0ZXh0KQotICAgICAgICAgZW50cnkuc2V0X3Rvb2x0aXBfdGV4dCh0ZXh0 KQotIAorLSAgICAgICAgZW50cnkuc2V0X3Rvb2x0aXBfdGV4dCh0ZXh0KQogLQorKyAgICAgICAg dG9vbHRpcCA9ICJcbiIuam9pbihzaG9ydGN1dHMpCisrICAgICAgICB0b29sdGlwICs9ICJcbiIg KyBcCisrICAgICAgICAgICAgXygiVXNlIHNob3J0Y3V0IHdpdGggc2hpZnQgdG8gc3dpdGNoIHRv IHRoZSBwcmV2aW91cyBpbnB1dCBtZXRob2QiKSAKKysgICAgICAgIGVudHJ5LnNldF90b29sdGlw X3RleHQodG9vbHRpcCkKKyAKICAgICAgZGVmIF9faXRlbV9zdGFydGVkX2NvbHVtbl90b2dnbGVk X2NiKHNlbGYsIGNlbGwsIHBhdGhfc3RyLCBtb2RlbCk6CiAgCi0gICAgICAgICAjIGdldCB0b2dn bGVkIGl0ZXIKIGRpZmYgLS1naXQgYS9zZXR1cC9zZXR1cC51aSBiL3NldHVwL3NldHVwLnVpCi1p bmRleCAyMDI2MTcyLi5mYjQzNDBkIDEwMDY0NAoraW5kZXggMjAyNjE3Mi4uYWE0MTQ1MyAxMDA2 NDQKIC0tLSBhL3NldHVwL3NldHVwLnVpCiArKysgYi9zZXR1cC9zZXR1cC51aQotQEAgLTEyMiw3 ICsxMjIsNiBAQAorQEAgLTEyMSw4ICsxMjEsNyBAQAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPC9jaGlsZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGls ZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0iR3Rr TGFiZWwiIGlkPSJsYWJlbDkiPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDxwcm9wZXJ0eSBuYW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KKy0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idmlzaWJsZSI+VHJ1ZTwvcHJv cGVydHk+CiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5h bWU9InNlbnNpdGl2ZSI+RmFsc2U8L3Byb3BlcnR5PgorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJub19zaG93X2FsbCI+VHJ1ZTwvcHJvcGVydHk+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImNh bl9mb2N1cyI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ0b29sdGlwX3RleHQiIHRyYW5zbGF0YWJsZT0ieWVzIj5U aGUgc2hvcnRjdXQga2V5cyBmb3Igc3dpdGNoaW5nIHRvIHByZXZpb3VzIGlucHV0IG1ldGhvZCBp biB0aGUgbGlzdDwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPHByb3BlcnR5IG5hbWU9InhhbGlnbiI+MDwvcHJvcGVydHk+CkBAIC0yMjAsMjMgKzI1MCw2 MSBAQCBpbmRleCAyMDI2MTcyLi5mYjQzNDBkIDEwMDY0NAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8L3BhY2tpbmc+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8L2NoaWxkPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNoaWxkPgotQEAg LTIyMyw3ICsyMjMsNiBAQAorQEAgLTE4MCw3ICsxODAsNyBAQAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJjYW5fZm9jdXMiPkZhbHNlPC9wcm9w ZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFt ZT0ic3BhY2luZyI+NjwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGNoaWxkPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9i amVjdCBjbGFzcz0iR3RrRW50cnkiIGlkPSJlbnRyeV9wcmV2X2VuZ2luZSI+CistICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8b2JqZWN0IGNsYXNzPSJHdGtFbnRyeSIgaWQ9 ImVudHJ5X25leHRfZW5naW5lIj4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxvYmplY3QgY2xhc3M9Ikd0a0VudHJ5IiBpZD0iZW50cnlfc3dpdGNoX2VuZ2luZSI+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ2 aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImNhbl9mb2N1cyI+VHJ1ZTwvcHJvcGVydHk+CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJlZGl0 YWJsZSI+RmFsc2U8L3Byb3BlcnR5PgorQEAgLTE5Miw3ICsxOTIsNyBAQAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9wYWNraW5nPgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPGNoaWxkPgorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PG9iamVjdCBjbGFzcz0iR3RrQnV0dG9uIiBpZD0iYnV0dG9uX25leHRfZW5naW5lIj4KKysgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0J1dHRv biIgaWQ9ImJ1dHRvbl9zd2l0Y2hfZW5naW5lIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+ Li4uPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PHByb3BlcnR5IG5hbWU9InVzZV9hY3Rpb25fYXBwZWFyYW5jZSI+RmFsc2U8L3Byb3BlcnR5Pgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0i dmlzaWJsZSI+VHJ1ZTwvcHJvcGVydHk+CitAQCAtMjEzLDE3ICsyMTMsMTcgQEAKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0icmlnaHRfYXR0YWNo Ij4yPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJv cGVydHkgbmFtZT0idG9wX2F0dGFjaCI+MzwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImJvdHRvbV9hdHRhY2giPjQ8L3Byb3Bl cnR5PgorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1l PSJ5X29wdGlvbnMiPkdUS19GSUxMPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9wYWNraW5nPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PC9jaGlsZD4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0iR3RrSEJveCIgaWQ9 Imhib3g2Ij4KKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkg bmFtZT0idmlzaWJsZSI+VHJ1ZTwvcHJvcGVydHk+CisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9Im5vX3Nob3dfYWxsIj5UcnVlPC9wcm9wZXJ0eT4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iY2Fu X2ZvY3VzIj5GYWxzZTwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPHByb3BlcnR5IG5hbWU9InNwYWNpbmciPjY8L3Byb3BlcnR5PgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0VudHJ5IiBpZD0iZW50cnlfcHJldl9l bmdpbmUiPgorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVy dHkgbmFtZT0idmlzaWJsZSI+VHJ1ZTwvcHJvcGVydHk+CiAtICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJzZW5zaXRpdmUiPkZhbHNlPC9wcm9w ZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5 IG5hbWU9Im5vX3Nob3dfYWxsIj5UcnVlPC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImNhbl9mb2N1cyI+VHJ1ZTwvcHJv cGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0 eSBuYW1lPSJlZGl0YWJsZSI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPC9vYmplY3Q+Ci1AQCAtMjM4LDcgKzIzNyw2IEBACitAQCAtMjM3 LDggKzIzNyw3IEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8b2Jq ZWN0IGNsYXNzPSJHdGtCdXR0b24iIGlkPSJidXR0b25fcHJldl9lbmdpbmUiPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ibGFiZWwiIHRy YW5zbGF0YWJsZT0ieWVzIj4uLi48L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idXNlX2FjdGlvbl9hcHBlYXJhbmNlIj5G YWxzZTwvcHJvcGVydHk+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDxwcm9wZXJ0eSBuYW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KKy0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InZpc2libGUiPlRydWU8 L3Byb3BlcnR5PgogLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJv cGVydHkgbmFtZT0ic2Vuc2l0aXZlIj5GYWxzZTwvcHJvcGVydHk+CisrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJub19zaG93X2FsbCI+VHJ1 ZTwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxw cm9wZXJ0eSBuYW1lPSJjYW5fZm9jdXMiPlRydWU8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0icmVjZWl2ZXNfZGVmYXVs dCI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8cHJvcGVydHkgbmFtZT0idXNlX2FjdGlvbl9hcHBlYXJhbmNlIj5GYWxzZTwvcHJvcGVy dHk+Ci1AQCAtMjYwLDcgKzI1OCw3IEBACitAQCAtMjU2LDExICsyNTUsMTIgQEAKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0icmlnaHRfYXR0YWNo Ij4yPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJv cGVydHkgbmFtZT0idG9wX2F0dGFjaCI+NDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImJvdHRvbV9hdHRhY2giPjU8L3Byb3Bl cnR5PgorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1l PSJ5X29wdGlvbnMiPkdUS19GSUxMPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9wYWNraW5nPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PC9jaGlsZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0iR3RrTGFiZWwiIGlk PSJsYWJlbDciPgpAQCAtMjQ1LDcgKzMxMyw3IEBAIGluZGV4IDIwMjYxNzIuLmZiNDM0MGQgMTAw NjQ0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9 ImNhbl9mb2N1cyI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ0b29sdGlwX3RleHQiIHRyYW5zbGF0YWJsZT0ieWVz Ij5UaGUgc2hvcnRjdXQga2V5cyBmb3IgdHVybmluZyBpbnB1dCBtZXRob2Qgb24gb3Igb2ZmPC9w cm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkg bmFtZT0ieGFsaWduIj4wPC9wcm9wZXJ0eT4KLUBAIC0yNzMsNyArMjcxLDcgQEAKK0BAIC0yNzMs NyArMjczLDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY2hpbGQ+CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0xhYmVsIiBpZD0ibGFiZWwxOCI+ CkBAIC0yNTQsNyArMzIyLDcgQEAgaW5kZXggMjAyNjE3Mi4uZmI0MzQwZCAxMDA2NDQKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iY2FuX2ZvY3Vz Ij5GYWxzZTwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PHByb3BlcnR5IG5hbWU9InhhbGlnbiI+MDwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9Inll cyI+RW5hYmxlOjwvcHJvcGVydHk+Ci1AQCAtMjg3LDcgKzI4NSw3IEBACitAQCAtMjg3LDcgKzI4 Nyw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2NoaWxkPgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNoaWxkPgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8b2JqZWN0IGNsYXNzPSJHdGtIQm94IiBpZD0iaGJveDIiPgpAQCAtMjYz LDcgKzMzMSwxMiBAQCBpbmRleCAyMDI2MTcyLi5mYjQzNDBkIDEwMDY0NAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJjYW5fZm9jdXMiPkZhbHNl PC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVy dHkgbmFtZT0ic3BhY2luZyI+NjwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGNoaWxkPgotQEAgLTMyOCw3ICszMjYsNyBAQAorQEAgLTMyNCwxMSArMzI0 LDEyIEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5h bWU9InJpZ2h0X2F0dGFjaCI+MjwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InRvcF9hdHRhY2giPjE8L3Byb3BlcnR5PgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJib3R0b21f YXR0YWNoIj4yPC9wcm9wZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8cHJvcGVydHkgbmFtZT0ieV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvcGFja2luZz4KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDwvY2hpbGQ+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8Y2hpbGQ+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxvYmplY3QgY2xh c3M9Ikd0a0xhYmVsIiBpZD0ibGFiZWwxOSI+CkBAIC0yNzIsNyArMzQ1LDcgQEAgaW5kZXggMjAy NjE3Mi4uZmI0MzQwZCAxMDA2NDQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8cHJvcGVydHkgbmFtZT0iY2FuX2ZvY3VzIj5GYWxzZTwvcHJvcGVydHk+CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InhhbGlnbiI+MDwvcHJv cGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5h bWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+RGlzYWJsZTo8L3Byb3BlcnR5PgotQEAgLTM0 Miw3ICszNDAsNyBAQAorQEAgLTM0Miw3ICszNDMsNyBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9jaGlsZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxj aGlsZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0i R3RrSEJveCIgaWQ9Imhib3gzIj4KQEAgLTI4MSw3ICszNTQsMjggQEAgaW5kZXggMjAyNjE3Mi4u ZmI0MzQwZCAxMDA2NDQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJv cGVydHkgbmFtZT0iY2FuX2ZvY3VzIj5GYWxzZTwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InNwYWNpbmciPjY8L3Byb3BlcnR5 PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KLUBAIC00NTIs NyArNDUwLDcgQEAKK0BAIC0zNzksNiArMzgwLDcgQEAKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0icmlnaHRfYXR0YWNoIj4yPC9wcm9wZXJ0eT4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idG9w X2F0dGFjaCI+MjwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPHByb3BlcnR5IG5hbWU9ImJvdHRvbV9hdHRhY2giPjM8L3Byb3BlcnR5PgorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ5X29wdGlvbnMiPkdU S19GSUxMPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9w YWNraW5nPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jaGlsZD4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8L29iamVjdD4KK0BAIC00MzEsNiArNDMzLDcgQEAK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9vYmplY3Q+CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxwYWNraW5nPgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ4X29wdGlvbnMiPkdUS19GSUxMPC9wcm9w ZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFt ZT0ieV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDwvcGFja2luZz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CitAQCAt NDQ4LDExICs0NTEsMTIgQEAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHBh Y2tpbmc+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5h bWU9ImxlZnRfYXR0YWNoIj4xPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0icmlnaHRfYXR0YWNoIj4yPC9wcm9wZXJ0eT4KKysg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ieV9vcHRp b25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDwvcGFja2luZz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY2hpbGQ+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0xhYmVsIiBpZD0ibGFiZWwx MCI+CkBAIC0yOTAsNyArMzg0LDIwIEBAIGluZGV4IDIwMjYxNzIuLmZiNDM0MGQgMTAwNjQ0CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImNhbl9m b2N1cyI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxwcm9wZXJ0eSBuYW1lPSJ0b29sdGlwX3RleHQiIHRyYW5zbGF0YWJsZT0ieWVzIj5TZXQg dGhlIGJlaGF2aW9yIG9mIGlidXMgaG93IHRvIHNob3cgb3IgaGlkZSBsYW5ndWFnZSBiYXI8L3By b3BlcnR5PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBu YW1lPSJ4YWxpZ24iPjA8L3Byb3BlcnR5PgotQEAgLTQ4MSw3ICs0NzksNyBAQAorQEAgLTQ2Myw2 ICs0NjcsNyBAQAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0 eSBuYW1lPSJ0b3BfYXR0YWNoIj4xPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iYm90dG9tX2F0dGFjaCI+MjwvcHJvcGVydHk+ CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9Inhf b3B0aW9ucyI+R1RLX0ZJTEw8L3Byb3BlcnR5PgorKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ5X29wdGlvbnMiPkdUS19GSUxMPC9wcm9wZXJ0eT4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9wYWNraW5nPgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPC9jaGlsZD4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxjaGlsZD4KK0BAIC00NzcsMTEgKzQ4MiwxMiBAQAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ0b3BfYXR0YWNoIj4yPC9wcm9w ZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFt ZT0iYm90dG9tX2F0dGFjaCI+MzwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9Inhfb3B0aW9ucyI+R1RLX0ZJTEw8L3Byb3BlcnR5 PgorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ5 X29wdGlvbnMiPkdUS19GSUxMPC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPC9wYWNraW5nPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9j aGlsZD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPG9iamVjdCBjbGFzcz0iR3RrQ29tYm9Cb3giIGlk PSJjb21ib2JveF9wYW5lbF9zaG93Ij4KQEAgLTI5OSwxNiArNDA2LDMwIEBAIGluZGV4IDIwMjYx NzIuLmZiNDM0MGQgMTAwNjQ0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PHByb3BlcnR5IG5hbWU9ImNhbl9mb2N1cyI+RmFsc2U8L3Byb3BlcnR5PgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJtb2RlbCI+bW9kZWxfcGFu ZWxfc2hvd19tb2RlPC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8Y2hpbGQ+Ci1AQCAtNTIxLDcgKzUxOSw3IEBACi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0NoZWNrQnV0dG9uIiBpZD0iY2hlY2tidXR0 b25fc2hvd19pY29uX29uX3N5c3RyYXkiPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJsYWJlbCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPlNob3cgaWNv biBvbiBzeXN0ZW0gdHJheTwvcHJvcGVydHk+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPHByb3BlcnR5IG5hbWU9InVzZV9hY3Rpb25fYXBwZWFyYW5jZSI+RmFsc2U8L3By b3BlcnR5PgotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBu YW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KLSsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ibm9fc2hvd19hbGwiPlRydWU8L3Byb3BlcnR5Pgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJjYW5f Zm9jdXMiPlRydWU8L3Byb3BlcnR5PgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxwcm9wZXJ0eSBuYW1lPSJyZWNlaXZlc19kZWZhdWx0Ij5GYWxzZTwvcHJvcGVydHk+Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InRvb2x0 aXBfdGV4dCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPlNob3cgaWNvbiBvbiBzeXN0ZW0gdHJheTwvcHJv cGVydHk+Ci1AQCAtNTQwLDcgKzUzOCw3IEBACitAQCAtNDk2LDYgKzUwMiw3IEBACisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InJpZ2h0X2F0dGFj aCI+MjwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHBy b3BlcnR5IG5hbWU9InRvcF9hdHRhY2giPjE8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJib3R0b21fYXR0YWNoIj4yPC9wcm9w ZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFt ZT0ieV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDwvcGFja2luZz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CitAQCAt NTE1LDYgKzUyMiw3IEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHBy b3BlcnR5IG5hbWU9InJpZ2h0X2F0dGFjaCI+MjwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InRvcF9hdHRhY2giPjI8L3Byb3Bl cnR5PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1l PSJib3R0b21fYXR0YWNoIj4zPC9wcm9wZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ieV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+ CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvcGFja2luZz4KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8Y2hpbGQ+CitAQCAtNTM0LDEzICs1NDIsMTQgQEAKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idG9wX2F0dGFjaCI+MzwvcHJv cGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5h bWU9ImJvdHRvbV9hdHRhY2giPjQ8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ4X29wdGlvbnMiPkdUS19GSUxMPC9wcm9wZXJ0 eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0i eV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDwvcGFja2luZz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwv Y2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0NoZWNrQnV0dG9u IiBpZD0iY2hlY2tidXR0b25fc2hvd19pbV9uYW1lIj4KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ibGFiZWwiIHRyYW5zbGF0YWJsZT0ieWVzIj5T aG93IGlucHV0IG1ldGhvZCBuYW1lIG9uIGxhbmd1YWdlIGJhcjwvcHJvcGVydHk+CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InVzZV9hY3Rpb25f YXBwZWFyYW5jZSI+RmFsc2U8L3Byb3BlcnR5PgpAQCAtMzE3LDcgKzQzOCwzOSBAQCBpbmRleCAy MDI2MTcyLi5mYjQzNDBkIDEwMDY0NAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxwcm9wZXJ0eSBuYW1lPSJjYW5fZm9jdXMiPlRydWU8L3Byb3BlcnR5PgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJyZWNlaXZlc19kZWZh dWx0Ij5GYWxzZTwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPHByb3BlcnR5IG5hbWU9InRvb2x0aXBfdGV4dCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPlNob3cg aW5wdXQgbWV0aG9kJ3MgbmFtZSBvbiBsYW5ndWFnZSBiYXIgd2hlbiBjaGVjayB0aGUgY2hlY2ti b3g8L3Byb3BlcnR5PgotQEAgLTEwMDEsNyArOTk5LDcgQEAgWW91IG1heSB1c2UgdXAvZG93biBi dXR0b25zIHRvIGNoYW5nZSBpdC4mbHQ7L2kmZ3Q7Jmx0Oy9zbWFsbCZndDs8L3Byb3BlcnR5Pgor QEAgLTU1Myw2ICs1NjIsNyBAQAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDxwcm9wZXJ0eSBuYW1lPSJ0b3BfYXR0YWNoIj40PC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iYm90dG9tX2F0dGFjaCI+NTwv cHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5 IG5hbWU9Inhfb3B0aW9ucyI+R1RLX0ZJTEw8L3Byb3BlcnR5PgorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ5X29wdGlvbnMiPkdUS19GSUxMPC9w cm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9wYWNraW5nPgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jaGlsZD4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxjaGlsZD4KK0BAIC01NzIsNiArNTgyLDcgQEAKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0idG9wX2F0dGFjaCI+ NTwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3Bl cnR5IG5hbWU9ImJvdHRvbV9hdHRhY2giPjY8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ4X29wdGlvbnMiPkdUS19GSUxMPC9w cm9wZXJ0eT4KKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkg bmFtZT0ieV9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDwvcGFja2luZz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDwvY2hpbGQ+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CitA QCAtNTkwLDYgKzYwMSw3IEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PHByb3BlcnR5IG5hbWU9InRvcF9hdHRhY2giPjY8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJib3R0b21fYXR0YWNoIj43PC9w cm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cHJvcGVydHkg bmFtZT0ieF9vcHRpb25zIj5HVEtfRklMTDwvcHJvcGVydHk+CisrICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9Inlfb3B0aW9ucyI+R1RLX0ZJTEw8L3By b3BlcnR5PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L3BhY2tpbmc+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2NoaWxkPgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPGNoaWxkPgorQEAgLTYwNSw2ICs2MTcsNyBAQAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJyaWdodF9hdHRhY2gi PjI8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9w ZXJ0eSBuYW1lPSJ0b3BfYXR0YWNoIj42PC9wcm9wZXJ0eT4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iYm90dG9tX2F0dGFjaCI+NzwvcHJvcGVy dHk+CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9 Inlfb3B0aW9ucyI+R1RLX0ZJTEw8L3Byb3BlcnR5PgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8L3BhY2tpbmc+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 L2NoaWxkPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvb2JqZWN0PgorQEAgLTEw MDEsNyArMTAxNCw3IEBAIFlvdSBtYXkgdXNlIHVwL2Rvd24gYnV0dG9ucyB0byBjaGFuZ2UgaXQu Jmx0Oy9pJmd0OyZsdDsvc21hbGwmZ3Q7PC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAg IDwvY2hpbGQ+CiAgICAgICAgICAgICAgICAgICAgICA8Y2hpbGQ+CiAgICAgICAgICAgICAgICAg ICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0ZyYW1lIiBpZD0iZnJhbWU1Ij4KCmRpZmYgLS1naXQg YS9pYnVzLXh4LXNldHVwLWZyZXF1ZW50LWxhbmcucGF0Y2ggYi9pYnVzLXh4LXNldHVwLWZyZXF1 ZW50LWxhbmcucGF0Y2gKaW5kZXggY2E3MDA0OC4uYmVkZGFkMyAxMDA2NDQKLS0tIGEvaWJ1cy14 eC1zZXR1cC1mcmVxdWVudC1sYW5nLnBhdGNoCisrKyBiL2lidXMteHgtc2V0dXAtZnJlcXVlbnQt bGFuZy5wYXRjaApAQCAtMSw0ICsxLDQgQEAKLUZyb20gZDNjZTA0NjdiYjc4MjVjYzk3ZGE5NjQ2 MjU0YmMwOWY1ODExOWZkYSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb20gNThkNGM5NDZk YjMzOTY4OTdmMzZmNzFkMzNlOTM5ZGZiYmYwZWJlZCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEK IEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KIERhdGU6IFR1ZSwg MjcgTm92IDIwMTIgMTU6NTM6MzQgKzA5MDAKIFN1YmplY3Q6IFtQQVRDSF0gRW5hYmxlIGlidXMt c2V0dXAgdG8gc2hvdyB0aGUgZnJlcXVlbnRseSB1c2VkIGxhbmd1YWdlcwoKZGlmZiAtLWdpdCBh L2lidXMuc3BlYyBiL2lidXMuc3BlYwppbmRleCAzNTg1Y2E3Li5kNTgzYWM5IDEwMDY0NAotLS0g YS9pYnVzLnNwZWMKKysrIGIvaWJ1cy5zcGVjCkBAIC0xMSw2ICsxMSwxMiBAQAogJWdsb2JhbCB3 aXRoX2dqcyAxCiAlZW5kaWYKIAorJWlmICgwJXs/ZmVkb3JhfSA+IDE3IHx8IDAlez9yaGVsfSA+ IDYpCislZ2xvYmFsIHdpdGhfZ2tiZCAwCislZWxzZQorJWdsb2JhbCB3aXRoX2drYmQgMQorJWVu ZGlmCisKICVnbG9iYWwgaWJ1c19nanNfdmVyc2lvbiAzLjQuMS4yMDEyMDgxNQogCiAlZ2xvYmFs IGlidXNfYXBpX3ZlcnNpb24gMS4wCkBAIC0zMSw3ICszNyw3IEBACiAKIE5hbWU6ICAgICAgIGli dXMKIFZlcnNpb246ICAgIDEuNC45OS4yMDEyMTEwOQotUmVsZWFzZTogICAgNyV7P2Rpc3R9CitS ZWxlYXNlOiAgICA4JXs/ZGlzdH0KIFN1bW1hcnk6ICAgIEludGVsbGlnZW50IElucHV0IEJ1cyBm b3IgTGludXggT1MKIExpY2Vuc2U6ICAgIExHUEx2MisKIEdyb3VwOiAgICAgIFN5c3RlbSBFbnZp cm9ubWVudC9MaWJyYXJpZXMKQEAgLTM5LDggKzQ1LDEzIEBAIFVSTDogICAgICAgIGh0dHA6Ly9j b2RlLmdvb2dsZS5jb20vcC9pYnVzLwogU291cmNlMDogICAgaHR0cDovL2lidXMuZ29vZ2xlY29k ZS5jb20vZmlsZXMvJXtuYW1lfS0le3ZlcnNpb259LnRhci5negogU291cmNlMTogICAgJXtuYW1l fS14aW5wdXQKICVpZiAld2l0aF9nanMKKyMgaWJ1cy1nanMKIFNvdXJjZTI6ICAgIGh0dHA6Ly9m dWppd2FyYS5mZWRvcmFwZW9wbGUub3JnL2lidXMvZ25vbWUtc2hlbGwvJXtuYW1lfS1nanMtJXtp YnVzX2dqc192ZXJzaW9ufS50YXIuZ3oKICVlbmRpZgorJWlmICgwJXs/ZmVkb3JhfSA8IDE5ICYm IDAlez9yaGVsfSA8IDcpCisjIFVwc3RyZWFtZWQgdHJhbnNsYXRpb25zLgorU291cmNlMzogICAg aHR0cDovL2Z1aml3YXJhLmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9wby8le25hbWV9LXBvLTEuNC45 OS4yMDEyMTIwNy50YXIuZ3oKKyVlbmRpZgogIyBVcHN0cmVhbWVkIHBhdGNoZXMuCiBQYXRjaDA6 ICAgICAle25hbWV9LUhFQUQucGF0Y2gKICMgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3No b3dfYnVnLmNnaT9pZD04MTAyMTEKQEAgLTg1LDYgKzk2LDggQEAgQnVpbGRSZXF1aXJlczogIGlu dGx0b29sCiBCdWlsZFJlcXVpcmVzOiAgaXNvLWNvZGVzLWRldmVsCiAlaWYgJXdpdGhfeGtiZmls ZQogQnVpbGRSZXF1aXJlczogIGxpYnhrYmZpbGUtZGV2ZWwKKyVlbmRpZgorJWlmICV3aXRoX2dr YmQKIEJ1aWxkUmVxdWlyZXM6ICBsaWJnbm9tZWtiZC1kZXZlbAogJWVuZGlmCiAlaWYgJXdpdGhf Z2pzCkBAIC0xMTUsNyArMTI4LDkgQEAgUmVxdWlyZXM6ICAgaW0tY2hvb3NlcgogJWVuZGlmCiBS ZXF1aXJlczogICBkY29uZgogUmVxdWlyZXM6ICAgbm90aWZ5LXB5dGhvbgorJWlmICV3aXRoX2dr YmQKIFJlcXVpcmVzOiAgIGxpYmdub21la2JkCislZW5kaWYKIFJlcXVpcmVzOiAgIGxpYnJzdmcy CiBSZXF1aXJlczogICBnbm9tZS1pY29uLXRoZW1lLWxlZ2FjeSA+PSAle2dub21lX2ljb25fdGhl bWVfbGVnYWN5X3ZlcnNpb259CiAlaWYgKDAlez9mZWRvcmF9IDw9IDE3ICYmIDAlez9yaGVsfSA8 IDcpCkBAIC0yMTMsNyArMjI4LDEwIEBAIFRoZSBpYnVzLWRldmVsLWRvY3MgcGFja2FnZSBjb250 YWlucyBkZXZlbG9wZXIgZG9jdW1lbnRhdGlvbiBmb3IgaWJ1cwogJXByZXAKICVzZXR1cCAtcQog JWlmICV3aXRoX2dqcwotemNhdCAlU09VUkNFMiB8IHRhciB4ZiAtCitnemlwIC1kYyAlU09VUkNF MiB8IHRhciB4ZiAtCislZW5kaWYKKyVpZiAoMCV7P2ZlZG9yYX0gPCAxOSAmJiAwJXs/cmhlbH0g PCA3KQorZ3ppcCAtZGMgJVNPVVJDRTMgfCB0YXIgeGYgLQogJWVuZGlmCiAKICMgaG9tZSBbZG90 XSBjb3JwIFtkb3RdIHJlZGhhdCBbZG90XSBjb20vd2lraS9ycG1kaWZmLW11bHRpbGliCkBAIC0y NzIsNiArMjkwLDggQEAgYXV0b3JlY29uZiAtZiAtaQogJWVuZGlmCiAlaWYgJXdpdGhfeGtiZmls ZQogICAgIC0td2l0aC14a2ItY29tbWFuZD1pYnVzLXhrYiBcCislZW5kaWYKKyVpZiAld2l0aF9n a2JkCiAgICAgLS1lbmFibGUtbGliZ25vbWVrYmQgXAogJWVuZGlmCiAgICAgLS1lbmFibGUtZGNv bmYgXApAQCAtNDYzLDYgKzQ4Myw5IEBAIGZpCiAle19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgog CiAlY2hhbmdlbG9nCisqIEZyaSBEZWMgMDcgMjAxMiBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJA cmVkaGF0LmNvbT4gLSAxLjQuOTkuMjAxMjExMDktOAorLSBSZXNvbHZlcyAjODY5NTg0IC0gUmVt b3ZlZCBsaWJnbm9tZWtiZCBkZXBlbmRlbmN5IGluIGYxOC4KKwogKiBGcmkgTm92IDMwIDIwMTIg VGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS40Ljk5LjIwMTIxMTA5LTcK IC0gU2V0IHRpbWUgc3RhbXAgb2YgaWJ1cy9fY29uZmlnLnB5CiAKCmRpZmYgLS1naXQgYS9zb3Vy Y2VzIGIvc291cmNlcwppbmRleCA2NWM0NDBiLi5hYTYxZjk1IDEwMDY0NAotLS0gYS9zb3VyY2Vz CisrKyBiL3NvdXJjZXMKQEAgLTEsMyArMSw0IEBACiBiZTQ4MjQ3OTM1NzIxMDI4M2U5MWE0N2Y0 M2EwYTBmZSAgaWJ1cy0xLjQuOTkuMjAxMjExMDkudGFyLmd6CiAyZDJhZDU4ZTNlNDE0MjlkYmQ4 ODNiYTdlNTAxYzliMiAgaWJ1cy1nanMtMy4yLjEuMjAxMTEyMzAudGFyLmd6CiA4YWNmNGFjNGQx YTdkZmI5YTBhZjllNzU1YThlN2RiYSAgaWJ1cy1nanMtMy40LjEuMjAxMjA4MTUudGFyLmd6Citl MmExM2M0NWVlYTJjZGI4NjU3MmJiY2NlYzdhMmUxNiAgaWJ1cy1wby0xLjQuOTkuMjAxMjEyMDcu dGFyLmd6Cg==