ZGlmZiAtLWdpdCBhLy5jbGFuZy1mb3JtYXQgYi8uY2xhbmctZm9ybWF0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE3NjE0ZDIKLS0tIC9kZXYvbnVsbAorKysgYi8uY2xhbmctZm9ybWF0CkBAIC0wLDAgKzEsMTMgQEAKK0Jhc2VkT25TdHlsZTogR29vZ2xlCitTdGFuZGFyZDogQ3BwMTEKK0FjY2Vzc01vZGlmaWVyT2Zmc2V0OiAtMgorQWxsb3dTaG9ydEZ1bmN0aW9uc09uQVNpbmdsZUxpbmU6IElubGluZQorQ29sdW1uTGltaXQ6IDEwMAorQ29tbWVudFByYWdtYXM6IE5PTElOVDouKgorRGVyaXZlUG9pbnRlckFsaWdubWVudDogZmFsc2UKK0luY2x1ZGVCbG9ja3M6IFByZXNlcnZlCitJbmRlbnRXaWR0aDogNAorQ29udGludWF0aW9uSW5kZW50V2lkdGg6IDgKK1BvaW50ZXJBbGlnbm1lbnQ6IExlZnQKK1RhYldpZHRoOiA0CitVc2VUYWI6IE5ldmVyCmRpZmYgLS1naXQgYS9hcGV4L09XTkVSUyBiL2FwZXgvT1dORVJTCmluZGV4IDU1ODdmNWYuLjU0ODAyZDQgMTAwNjQ0Ci0tLSBhL2FwZXgvT1dORVJTCisrKyBiL2FwZXgvT1dORVJTCkBAIC0xLDYgKzEsNyBAQAotY2h6QGdvb2dsZS5jb20KLWR3a2FuZ0Bnb29nbGUuY29tCitlc3NpY2tAZ29vZ2xlLmNvbQogaml5b25nQGdvb2dsZS5jb20KIGxham9zQGdvb2dsZS5jb20KLW1hcmNvbmVAZ29vZ2xlLmNvbQotd2ppYUBnb29nbGUuY29tCituY2hhbGtvQGdvb2dsZS5jb20KKworaW5jbHVkZSBwbGF0Zm9ybS9wYWNrYWdlcy9tb2R1bGVzL2NvbW1vbjovTU9EVUxFU19PV05FUlMKKwpkaWZmIC0tZ2l0IGEvYXBleC9tZWRpYXN3Y29kZWMuMzJyYyBiL2FwZXgvbWVkaWFzd2NvZGVjLjMycmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzlhZWYzNgotLS0gL2Rldi9udWxsCisrKyBiL2FwZXgvbWVkaWFzd2NvZGVjLjMycmMKQEAgLTAsMCArMSw2IEBACitzZXJ2aWNlIG1lZGlhLnN3Y29kZWMgL2FwZXgvY29tLmFuZHJvaWQubWVkaWEuc3djb2RlYy9iaW4vbWVkaWFzd2NvZGVjCisgICAgY2xhc3MgbWFpbgorICAgIHVzZXIgbWVkaWFjb2RlYworICAgIGdyb3VwIGNhbWVyYSBkcm1ycGMgbWVkaWFkcm0KKyAgICBpb3ByaW8gcnQgNAorICAgIHRhc2tfcHJvZmlsZXMgUHJvY2Vzc0NhcGFjaXR5SGlnaApkaWZmIC0tZ2l0IGEvYXBleC9tZWRpYXRyYW5zY29kaW5nLjMycmMgYi9hcGV4L21lZGlhdHJhbnNjb2RpbmcuMzJyYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MTY5NDYyCi0tLSAvZGV2L251bGwKKysrIGIvYXBleC9tZWRpYXRyYW5zY29kaW5nLjMycmMKQEAgLTAsMCArMSwxMiBAQAorIyBtZWRpYS50cmFuc2NvZGluZyBzZXJ2aWNlIGlzIGRlZmluZWQgb24gY29tLmFuZHJvaWQubWVkaWEgYXBleCB3aGljaCBnb2VzIGJhY2sKKyMgdG8gQVBJMjksIGJ1dCB3ZSBvbmx5IHdhbnQgaXQgc3RhcnRlZCBvbiBBUEkzMSsgZGV2aWNlcy4gU28gd2UgZGVjbGFyZSBpdCBhcworIyAiZGlzYWJsZWQiIGFuZCBzdGFydCBpdCBleHBsaWNpdGx5IG9uIGJvb3QuCitzZXJ2aWNlIG1lZGlhLnRyYW5zY29kaW5nIC9hcGV4L2NvbS5hbmRyb2lkLm1lZGlhL2Jpbi9tZWRpYXRyYW5zY29kaW5nCisgICAgY2xhc3MgbWFpbgorICAgIHVzZXIgbWVkaWEKKyAgICBncm91cCBtZWRpYQorICAgIGlvcHJpbyBydCA0CisgICAgIyBSZXN0cmljdCB0byBsaXR0bGUgY29yZXMgb25seSB3aXRoIHN5c3RlbS1iYWNrZ3JvdW5kIGNwdXNldC4KKyAgICB0YXNrX3Byb2ZpbGVzIFNlcnZpY2VDYXBhY2l0eUxvdworICAgIGludGVyZmFjZSBhaWRsIG1lZGlhLnRyYW5zY29kaW5nCisgICAgZGlzYWJsZWQKZGlmZiAtLWdpdCBhL2NhbWVyYS9BbmRyb2lkLmJwIGIvY2FtZXJhL0FuZHJvaWQuYnAKaW5kZXggNjg3OGMyMC4uNGVkMzI2OSAxMDA2NDQKLS0tIGEvY2FtZXJhL0FuZHJvaWQuYnAKKysrIGIvY2FtZXJhL0FuZHJvaWQuYnAKQEAgLTQzLDYgKzQzLDEwIEBACiAgICAgXSwKIH0KIAorY2NfbGlicmFyeV9oZWFkZXJzIHsKKyAgICBuYW1lOiAiY2FtZXJhX2hlYWRlcnMiLAorICAgIGV4cG9ydF9pbmNsdWRlX2RpcnM6IFsiaW5jbHVkZSJdLAorfQogY2NfbGlicmFyeV9zaGFyZWQgewogICAgIG5hbWU6ICJsaWJjYW1lcmFfY2xpZW50IiwKIApkaWZmIC0tZ2l0IGEvY2FtZXJhL09XTkVSUyBiL2NhbWVyYS9PV05FUlMKaW5kZXggMWI1NDhlNC4uMmExZDUyMyAxMDA2NDQKLS0tIGEvY2FtZXJhL09XTkVSUworKysgYi9jYW1lcmEvT1dORVJTCkBAIC0xLDMgKzEsNCBAQAorCiAjIEJ1ZyBjb21wb25lbnQ6IDQxNzI3CiBldGFsdmFsYUBnb29nbGUuY29tCiBhcmFrZXNoQGdvb2dsZS5jb20KQEAgLTUsNCArNiwzIEBACiBqY2hvd2RoYXJ5QGdvb2dsZS5jb20KIHNodXpoZW53YW5nQGdvb2dsZS5jb20KIHJ1Y2hhbWtAZ29vZ2xlLmNvbQotCmRpZmYgLS1naXQgYS9jYW1lcmEvbmRrL2ltcGwvQUNhbWVyYU1hbmFnZXIuaCBiL2NhbWVyYS9uZGsvaW1wbC9BQ2FtZXJhTWFuYWdlci5oCmluZGV4IGNjYmZhYTkuLmRhODg3YTIgMTAwNjQ0Ci0tLSBhL2NhbWVyYS9uZGsvaW1wbC9BQ2FtZXJhTWFuYWdlci5oCisrKyBiL2NhbWVyYS9uZGsvaW1wbC9BQ2FtZXJhTWFuYWdlci5oCkBAIC0xMzksNiArMTM5LDggQEAKICAgICAgICAgICAgIHJldHVybiAhKCp0aGlzID09IG90aGVyKTsKICAgICAgICAgfQogICAgICAgICBib29sIG9wZXJhdG9yIDwgKGNvbnN0IENhbGxiYWNrJiBvdGhlcikgY29uc3QgeworI3ByYWdtYSBHQ0MgZGlhZ25vc3RpYyBwdXNoCisjcHJhZ21hIEdDQyBkaWFnbm9zdGljIGlnbm9yZWQgIi1Xb3JkZXJlZC1jb21wYXJlLWZ1bmN0aW9uLXBvaW50ZXJzIgogICAgICAgICAgICAgaWYgKCp0aGlzID09IG90aGVyKSByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBpZiAobUNvbnRleHQgIT0gb3RoZXIubUNvbnRleHQpIHJldHVybiBtQ29udGV4dCA8IG90aGVyLm1Db250ZXh0OwogICAgICAgICAgICAgaWYgKG1QaHlzaWNhbENhbUF2YWlsYWJsZSAhPSBvdGhlci5tUGh5c2ljYWxDYW1BdmFpbGFibGUpIHsKQEAgLTE1Miw2ICsxNTQsNyBAQAogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKG1BdmFpbGFibGUgIT0gb3RoZXIubUF2YWlsYWJsZSkgcmV0dXJuIG1BdmFpbGFibGUgPCBvdGhlci5tQXZhaWxhYmxlOwogICAgICAgICAgICAgcmV0dXJuIG1VbmF2YWlsYWJsZSA8IG90aGVyLm1VbmF2YWlsYWJsZTsKKyNwcmFnbWEgR0NDIGRpYWdub3N0aWMgcG9wCiAgICAgICAgIH0KICAgICAgICAgYm9vbCBvcGVyYXRvciA+IChjb25zdCBDYWxsYmFjayYgb3RoZXIpIGNvbnN0IHsKICAgICAgICAgICAgIHJldHVybiAoKnRoaXMgIT0gb3RoZXIgJiYgISgqdGhpcyA8IG90aGVyKSk7CmRpZmYgLS1naXQgYS9jYW1lcmEvbmRrL25ka192ZW5kb3IvaW1wbC9BQ2FtZXJhTWFuYWdlci5oIGIvY2FtZXJhL25kay9uZGtfdmVuZG9yL2ltcGwvQUNhbWVyYU1hbmFnZXIuaAppbmRleCA4MzU5YmIxLi40NjYzNTI5IDEwMDY0NAotLS0gYS9jYW1lcmEvbmRrL25ka192ZW5kb3IvaW1wbC9BQ2FtZXJhTWFuYWdlci5oCisrKyBiL2NhbWVyYS9uZGsvbmRrX3ZlbmRvci9pbXBsL0FDYW1lcmFNYW5hZ2VyLmgKQEAgLTEzNiw2ICsxMzYsOCBAQAogICAgICAgICAgICAgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOwogICAgICAgICB9CiAgICAgICAgIGJvb2wgb3BlcmF0b3IgPCAoY29uc3QgQ2FsbGJhY2smIG90aGVyKSBjb25zdCB7CisjcHJhZ21hIEdDQyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgR0NDIGRpYWdub3N0aWMgaWdub3JlZCAiLVdvcmRlcmVkLWNvbXBhcmUtZnVuY3Rpb24tcG9pbnRlcnMiCiAgICAgICAgICAgICBpZiAoKnRoaXMgPT0gb3RoZXIpIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIGlmIChtQ29udGV4dCAhPSBvdGhlci5tQ29udGV4dCkgcmV0dXJuIG1Db250ZXh0IDwgb3RoZXIubUNvbnRleHQ7CiAgICAgICAgICAgICBpZiAobUF2YWlsYWJsZSAhPSBvdGhlci5tQXZhaWxhYmxlKSByZXR1cm4gbUF2YWlsYWJsZSA8IG90aGVyLm1BdmFpbGFibGU7CkBAIC0xNDYsNiArMTQ4LDcgQEAKICAgICAgICAgICAgIGlmIChtUGh5c2ljYWxDYW1VbmF2YWlsYWJsZSAhPSBvdGhlci5tUGh5c2ljYWxDYW1VbmF2YWlsYWJsZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG1QaHlzaWNhbENhbVVuYXZhaWxhYmxlIDwgb3RoZXIubVBoeXNpY2FsQ2FtVW5hdmFpbGFibGU7CiAgICAgICAgICAgICByZXR1cm4gbVVuYXZhaWxhYmxlIDwgb3RoZXIubVVuYXZhaWxhYmxlOworI3ByYWdtYSBHQ0MgZGlhZ25vc3RpYyBwb3AKICAgICAgICAgfQogICAgICAgICBib29sIG9wZXJhdG9yID4gKGNvbnN0IENhbGxiYWNrJiBvdGhlcikgY29uc3QgewogICAgICAgICAgICAgcmV0dXJuICgqdGhpcyAhPSBvdGhlciAmJiAhKCp0aGlzIDwgb3RoZXIpKTsKZGlmZiAtLWdpdCBhL2NtZHMvT1dORVJTIGIvY21kcy9PV05FUlMKaW5kZXggMGQzMmFhYy4uYTQ4YzM3YSAxMDA2NDQKLS0tIGEvY21kcy9PV05FUlMKKysrIGIvY21kcy9PV05FUlMKQEAgLTEsMyArMSwzIEBACiBlbGF1cmVudEBnb29nbGUuY29tCitlc3NpY2tAZ29vZ2xlLmNvbQogbGFqb3NAZ29vZ2xlLmNvbQotbWFyY29uZUBnb29nbGUuY29tCmRpZmYgLS1naXQgYS9jbWRzL3N0YWdlZnJpZ2h0L0FuZHJvaWQuYnAgYi9jbWRzL3N0YWdlZnJpZ2h0L0FuZHJvaWQuYnAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzQ3ODNkMwotLS0gL2Rldi9udWxsCisrKyBiL2NtZHMvc3RhZ2VmcmlnaHQvQW5kcm9pZC5icApAQCAtMCwwICsxLDI3OCBAQAorcGFja2FnZSB7CisgICAgZGVmYXVsdF9hcHBsaWNhYmxlX2xpY2Vuc2VzOiBbImZyYW1ld29ya3NfYXZfY21kc19zdGFnZWZyaWdodF9saWNlbnNlIl0sCit9CisKKy8vIEFkZGVkIGF1dG9tYXRpY2FsbHkgYnkgYSBsYXJnZS1zY2FsZS1jaGFuZ2UKKy8vIFNlZTogaHR0cDovL2dvL2FuZHJvaWQtbGljZW5zZS1mYXEKK2xpY2Vuc2UgeworICAgIG5hbWU6ICJmcmFtZXdvcmtzX2F2X2NtZHNfc3RhZ2VmcmlnaHRfbGljZW5zZSIsCisgICAgdmlzaWJpbGl0eTogWyI6X19zdWJwYWNrYWdlc19fIl0sCisgICAgbGljZW5zZV9raW5kczogWworICAgICAgICAiU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMCIsCisgICAgXSwKKyAgICBsaWNlbnNlX3RleHQ6IFsKKyAgICAgICAgIk5PVElDRSIsCisgICAgXSwKK30KKworY2NfYmluYXJ5IHsKKyAgICBuYW1lOiAic3RhZ2VmcmlnaHQiLAorCisgICAgc3JjczogWworICAgICAgICAiQXVkaW9QbGF5ZXIuY3BwIiwKKyAgICAgICAgInN0YWdlZnJpZ2h0LmNwcCIsCisgICAgICAgICJqcGVnLmNwcCIsCisgICAgICAgICJTaW5lU291cmNlLmNwcCIsCisgICAgXSwKKworICAgIGhlYWRlcl9saWJzOiBbCisgICAgICAgICJsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9oZWFkZXJzIiwKKyAgICBdLAorCisgICAgc2hhcmVkX2xpYnM6IFsKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0IiwKKyAgICAgICAgImxpYm1lZGlhIiwKKyAgICAgICAgImxpYm1lZGlhX2NvZGVjbGlzdCIsCisgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJsaWJiaW5kZXIiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCisgICAgICAgICJsaWJqcGVnIiwKKyAgICAgICAgImxpYnVpIiwKKyAgICAgICAgImxpYmd1aSIsCisgICAgICAgICJsaWJjdXRpbHMiLAorICAgICAgICAibGlibG9nIiwKKyAgICAgICAgImxpYmhpZGxiYXNlIiwKKyAgICAgICAgImxpYmRhdGFzb3VyY2UiLAorICAgICAgICAibGliYXVkaW9jbGllbnQiLAorICAgICAgICAiYW5kcm9pZC5oYXJkd2FyZS5tZWRpYS5vbXhAMS4wIiwKKyAgICAgICAgImZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwIiwKKyAgICBdLAorCisgICAgc3RhdGljX2xpYnM6IFsiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiXSwKKworICAgIGNmbGFnczogWworICAgICAgICAiLVduby1tdWx0aWNoYXIiLAorICAgIF0sCisKKyAgICBzeXN0ZW1fZXh0X3NwZWNpZmljOiB0cnVlLAorfQorCitjY19iaW5hcnkgeworICAgIG5hbWU6ICJyZWNvcmQiLAorCisgICAgc3JjczogWworICAgICAgICAiQXVkaW9QbGF5ZXIuY3BwIiwKKyAgICAgICAgIlNpbmVTb3VyY2UuY3BwIiwKKyAgICAgICAgInJlY29yZC5jcHAiLAorICAgIF0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFtZXRyaWNzX2hlYWRlcnMiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfaGVhZGVycyIsCisgICAgICAgICJjYW1lcmFfaGVhZGVycyIsCisgICAgXSwKKworICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJzdGFnZWZyaWdodCIsCisgICAgICAgICJsaWJtZWRpYSIsCisgICAgICAgICJsaWJsb2ciLAorICAgICAgICAibGlidXRpbHMiLAorICAgICAgICAibGliYmluZGVyIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24iLAorICAgICAgICAibGliZGF0YXNvdXJjZSIsCisgICAgICAgICJsaWJhdWRpb2NsaWVudCIsCisgICAgICAgICJmcmFtZXdvcmstcGVybWlzc2lvbi1haWRsLWNwcCIsCisgICAgXSwKKworICAgIGNmbGFnczogWworICAgICAgICAiLVduby1tdWx0aWNoYXIiLAorICAgIF0sCit9CisKK2NjX2JpbmFyeSB7CisgICAgbmFtZTogInJlY29yZHZpZGVvIiwKKworICAgIHNyY3M6IFsKKyAgICAgICAgIkF1ZGlvUGxheWVyLmNwcCIsCisgICAgICAgICJyZWNvcmR2aWRlby5jcHAiLAorICAgIF0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFtZXRyaWNzX2hlYWRlcnMiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfaGVhZGVycyIsCisgICAgXSwKKworICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJzdGFnZWZyaWdodCIsCisgICAgICAgICJsaWJtZWRpYSIsCisgICAgICAgICJsaWJsb2ciLAorICAgICAgICAibGlidXRpbHMiLAorICAgICAgICAibGliYmluZGVyIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24iLAorICAgICAgICAibGliYXVkaW9jbGllbnQiLAorICAgICAgICAiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiLAorICAgIF0sCisKKyAgICBjZmxhZ3M6IFsKKyAgICAgICAgIi1Xbm8tbXVsdGljaGFyIiwKKyAgICBdLAorfQorCitjY19iaW5hcnkgeworICAgIG5hbWU6ICJhdWRpb2xvb3AiLAorCisgICAgc3JjczogWworICAgICAgICAiQXVkaW9QbGF5ZXIuY3BwIiwKKyAgICAgICAgIlNpbmVTb3VyY2UuY3BwIiwKKyAgICAgICAgImF1ZGlvbG9vcC5jcHAiLAorICAgIF0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFtZXRyaWNzX2hlYWRlcnMiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfaGVhZGVycyIsCisgICAgXSwKKworICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJzdGFnZWZyaWdodCIsCisgICAgICAgICJsaWJtZWRpYSIsCisgICAgICAgICJsaWJsb2ciLAorICAgICAgICAibGlidXRpbHMiLAorICAgICAgICAibGliYmluZGVyIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24iLAorICAgICAgICAibGliYXVkaW9jbGllbnQiLAorICAgICAgICAiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiLAorICAgIF0sCisKKyAgICBjZmxhZ3M6IFsKKyAgICAgICAgIi1Xbm8tbXVsdGljaGFyIiwKKyAgICBdLAorfQorCitjY19iaW5hcnkgeworICAgIG5hbWU6ICJzdHJlYW0iLAorCisgICAgc3JjczogWyJzdHJlYW0uY3BwIl0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFtZXRyaWNzX2hlYWRlcnMiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfaGVhZGVycyIsCisgICAgXSwKKworICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJzdGFnZWZyaWdodCIsCisgICAgICAgICJsaWJsb2ciLAorICAgICAgICAibGlidXRpbHMiLAorICAgICAgICAibGliYmluZGVyIiwKKyAgICAgICAgImxpYnVpIiwKKyAgICAgICAgImxpYmd1aSIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9mb3VuZGF0aW9uIiwKKyAgICAgICAgImxpYm1lZGlhIiwKKyAgICAgICAgImxpYmN1dGlscyIsCisgICAgICAgICJsaWJkYXRhc291cmNlIiwKKyAgICBdLAorCisgICAgY2ZsYWdzOiBbCisgICAgICAgICItV25vLW11bHRpY2hhciIsCisgICAgXSwKK30KKworY2NfYmluYXJ5IHsKKyAgICBuYW1lOiAiY29kZWMiLAorCisgICAgc3JjczogWworICAgICAgICAiY29kZWMuY3BwIiwKKyAgICAgICAgIlNpbXBsZVBsYXllci5jcHAiLAorICAgIF0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFkcm1faGVhZGVycyIsCisgICAgICAgICJsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9oZWFkZXJzIiwKKyAgICBdLAorCisgICAgc2hhcmVkX2xpYnM6IFsKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0IiwKKyAgICAgICAgImxpYmxvZyIsCisgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJsaWJiaW5kZXIiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCisgICAgICAgICJsaWJtZWRpYSIsCisgICAgICAgICJsaWJtZWRpYV9vbXgiLAorICAgICAgICAibGliYXVkaW9jbGllbnQiLAorICAgICAgICAibGlidWkiLAorICAgICAgICAibGliZ3VpIiwKKyAgICAgICAgImxpYmN1dGlscyIsCisgICAgXSwKKworICAgIGNmbGFnczogWworICAgICAgICAiLVduby1tdWx0aWNoYXIiLAorICAgIF0sCit9CisKK2NjX2JpbmFyeSB7CisgICAgbmFtZTogIm1lZGlhZmlsdGVyIiwKKworICAgIHNyY3M6IFsKKyAgICAgICAgImZpbHRlcnMvYXJnYnRvcmdiYS5yc2NyaXB0IiwKKyAgICAgICAgImZpbHRlcnMvbmlnaHR2aXNpb24ucnNjcmlwdCIsCisgICAgICAgICJmaWx0ZXJzL3NhdHVyYXRpb24ucnNjcmlwdCIsCisgICAgICAgICJtZWRpYWZpbHRlci5jcHAiLAorICAgIF0sCisKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFkcm1faGVhZGVycyIsCisgICAgICAgICJsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9oZWFkZXJzIiwKKyAgICAgICAgInJzLWhlYWRlcnMiLAorICAgIF0sCisKKyAgICBpbmNsdWRlX2RpcnM6IFsiZnJhbWV3b3Jrcy9hdi9tZWRpYS9saWJzdGFnZWZyaWdodCJdLAorCisgICAgc2hhcmVkX2xpYnM6IFsKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0IiwKKyAgICAgICAgImxpYmxvZyIsCisgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJsaWJiaW5kZXIiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCisgICAgICAgICJsaWJtZWRpYV9vbXgiLAorICAgICAgICAibGlidWkiLAorICAgICAgICAibGliZ3VpIiwKKyAgICAgICAgImxpYlJTY3BwIiwKKyAgICBdLAorCisgICAgc3RhdGljX2xpYnM6IFsibGlic3RhZ2VmcmlnaHRfbWVkaWFmaWx0ZXIiXSwKKworICAgIGNmbGFnczogWworICAgICAgICAiLVduby1tdWx0aWNoYXIiLAorICAgIF0sCisKKyAgICBzYW5pdGl6ZTogeworICAgICAgICBjZmk6IHRydWUsCisgICAgfSwKK30KKworY2NfYmluYXJ5IHsKKyAgICBuYW1lOiAibXV4ZXIiLAorCisgICAgc3JjczogWyJtdXhlci5jcHAiXSwKKworICAgIGhlYWRlcl9saWJzOiBbCisgICAgICAgICJsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9oZWFkZXJzIiwKKyAgICBdLAorCisgICAgc2hhcmVkX2xpYnM6IFsKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0IiwKKyAgICAgICAgImxpYmxvZyIsCisgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJsaWJiaW5kZXIiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCisgICAgICAgICJsaWJjdXRpbHMiLAorICAgICAgICAibGliYyIsCisgICAgXSwKKworICAgIGNmbGFnczogWworICAgICAgICAiLVduby1tdWx0aWNoYXIiLAorICAgIF0sCit9CmRpZmYgLS1naXQgYS9jbWRzL3N0YWdlZnJpZ2h0L0FuZHJvaWQubWsgYi9jbWRzL3N0YWdlZnJpZ2h0L0FuZHJvaWQubWsKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDgwM2M0YTQuLjAwMDAwMDAKLS0tIGEvY21kcy9zdGFnZWZyaWdodC9BbmRyb2lkLm1rCisrKyAvZGV2L251bGwKQEAgLTEsMjc2ICswLDAgQEAKLUxPQ0FMX1BBVEg6PSAkKGNhbGwgbXktZGlyKQotCi1pbmNsdWRlICQoQ0xFQVJfVkFSUykKLQotTE9DQUxfU1JDX0ZJTEVTOj0gICAgICAgXAotICAgICAgICBBdWRpb1BsYXllci5jcHAgXAotICAgICAgICBzdGFnZWZyaWdodC5jcHAgXAotICAgICAgICBqcGVnLmNwcCAgICAgICAgXAotICAgICAgICBTaW5lU291cmNlLmNwcAotCi1MT0NBTF9IRUFERVJfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlibWVkaWFtZXRyaWNzX2hlYWRlcnMgXAotCi1MT0NBTF9TSEFSRURfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlic3RhZ2VmcmlnaHQgbGlibWVkaWEgbGlibWVkaWFfY29kZWNsaXN0IGxpYnV0aWxzIGxpYmJpbmRlciBcCi0gICAgICAgIGxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24gbGlianBlZyBsaWJ1aSBsaWJndWkgbGliY3V0aWxzIGxpYmxvZyBcCi0gICAgICAgIGxpYmhpZGxiYXNlIGxpYmRhdGFzb3VyY2UgbGliYXVkaW9jbGllbnQgXAotICAgICAgICBhbmRyb2lkLmhhcmR3YXJlLm1lZGlhLm9teEAxLjAgXAotICAgICAgICBmcmFtZXdvcmstcGVybWlzc2lvbi1haWRsLWNwcAotCi1MT0NBTF9TVEFUSUNfTElCUkFSSUVTIDo9IGZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvbWVkaWEvbGlic3RhZ2VmcmlnaHQgXAotICAgICAgICBmcmFtZXdvcmtzL2F2L21lZGlhL2xpYnN0YWdlZnJpZ2h0L2luY2x1ZGUgXAotICAgICAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXggXAotCi1MT0NBTF9DRkxBR1MgKz0gLVduby1tdWx0aWNoYXIgLVdlcnJvciAtV2FsbAotCi1MT0NBTF9NT0RVTEVfVEFHUyA6PSBvcHRpb25hbAotCi1MT0NBTF9TWVNURU1fRVhUX01PRFVMRTo9IHRydWUKLUxPQ0FMX01PRFVMRTo9IHN0YWdlZnJpZ2h0Ci1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLWluY2x1ZGUgJChCVUlMRF9FWEVDVVRBQkxFKQotCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotCi1pbmNsdWRlICQoQ0xFQVJfVkFSUykKLQotTE9DQUxfU1JDX0ZJTEVTOj0gICAgICAgICBcCi0gICAgICAgIEF1ZGlvUGxheWVyLmNwcCBcCi0gICAgICAgIFNpbmVTb3VyY2UuY3BwICAgIFwKLSAgICAgICAgcmVjb3JkLmNwcAotCi1MT0NBTF9IRUFERVJfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlibWVkaWFtZXRyaWNzX2hlYWRlcnMgXAotCi1MT0NBTF9TSEFSRURfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlic3RhZ2VmcmlnaHQgbGlibWVkaWEgbGlibG9nIGxpYnV0aWxzIGxpYmJpbmRlciBcCi0gICAgICAgIGxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24gbGliZGF0YXNvdXJjZSBsaWJhdWRpb2NsaWVudCBcCi0gICAgICAgIGZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvY2FtZXJhL2luY2x1ZGUgXAotICAgICAgICBmcmFtZXdvcmtzL2F2L21lZGlhL2xpYnN0YWdlZnJpZ2h0IFwKLSAgICAgICAgZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZS9tZWRpYS9vcGVubWF4IFwKLSAgICAgICAgZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZS9tZWRpYS9oYXJkd2FyZQotCi1MT0NBTF9DRkxBR1MgKz0gLVduby1tdWx0aWNoYXIgLVdlcnJvciAtV2FsbAotCi1MT0NBTF9NT0RVTEVfVEFHUyA6PSBvcHRpb25hbAotCi1MT0NBTF9NT0RVTEU6PSByZWNvcmQKLUxPQ0FMX0xJQ0VOU0VfS0lORFM6PSBTUERYLWxpY2Vuc2UtaWRlbnRpZmllci1BcGFjaGUtMi4wCi1MT0NBTF9MSUNFTlNFX0NPTkRJVElPTlM6PSBub3RpY2UKLUxPQ0FMX05PVElDRV9GSUxFOj0gJChMT0NBTF9QQVRIKS9OT1RJQ0UKLQotaW5jbHVkZSAkKEJVSUxEX0VYRUNVVEFCTEUpCi0KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0KLWluY2x1ZGUgJChDTEVBUl9WQVJTKQotCi1MT0NBTF9TUkNfRklMRVM6PSAgICAgICAgIFwKLSAgICAgICAgQXVkaW9QbGF5ZXIuY3BwIFwKLSAgICAgICAgcmVjb3JkdmlkZW8uY3BwCi0KLUxPQ0FMX0hFQURFUl9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyBcCi0KLUxPQ0FMX1NIQVJFRF9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJzdGFnZWZyaWdodCBsaWJtZWRpYSBsaWJsb2cgbGlidXRpbHMgbGliYmluZGVyIFwKLSAgICAgICAgbGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiBsaWJhdWRpb2NsaWVudAotCi1MT0NBTF9DX0lOQ0xVREVTOj0gXAotICAgICAgICBmcmFtZXdvcmtzL2F2L21lZGlhL2xpYnN0YWdlZnJpZ2h0IFwKLSAgICAgICAgZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZS9tZWRpYS9vcGVubWF4IFwKLSAgICAgICAgZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZS9tZWRpYS9oYXJkd2FyZSBcCi0gICAgICAgIGZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwCi0KLUxPQ0FMX0NGTEFHUyArPSAtV25vLW11bHRpY2hhciAtV2Vycm9yIC1XYWxsCi0KLUxPQ0FMX01PRFVMRV9UQUdTIDo9IG9wdGlvbmFsCi0KLUxPQ0FMX01PRFVMRTo9IHJlY29yZHZpZGVvCi1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLWluY2x1ZGUgJChCVUlMRF9FWEVDVVRBQkxFKQotCi0KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0KLWluY2x1ZGUgJChDTEVBUl9WQVJTKQotCi1MT0NBTF9TUkNfRklMRVM6PSAgICAgICAgIFwKLSAgICAgICAgQXVkaW9QbGF5ZXIuY3BwIFwKLSAgICAgICAgU2luZVNvdXJjZS5jcHAgICAgXAotICAgICAgICBhdWRpb2xvb3AuY3BwCi0KLUxPQ0FMX0hFQURFUl9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyBcCi0KLUxPQ0FMX1NIQVJFRF9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJzdGFnZWZyaWdodCBsaWJtZWRpYSBsaWJsb2cgbGlidXRpbHMgbGliYmluZGVyIFwKLSAgICAgICAgbGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiBsaWJhdWRpb2NsaWVudCBcCi0gICAgICAgIGZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvbWVkaWEvbGlic3RhZ2VmcmlnaHQgXAotICAgICAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXgKLQotTE9DQUxfQ0ZMQUdTICs9IC1Xbm8tbXVsdGljaGFyIC1XZXJyb3IgLVdhbGwKLQotTE9DQUxfTU9EVUxFX1RBR1MgOj0gb3B0aW9uYWwKLQotTE9DQUxfTU9EVUxFOj0gYXVkaW9sb29wCi1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLWluY2x1ZGUgJChCVUlMRF9FWEVDVVRBQkxFKQotCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotCi1pbmNsdWRlICQoQ0xFQVJfVkFSUykKLQotTE9DQUxfU1JDX0ZJTEVTOj0gICAgICAgICBcCi0gICAgICAgIHN0cmVhbS5jcHAgICAgXAotCi1MT0NBTF9IRUFERVJfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlibWVkaWFtZXRyaWNzX2hlYWRlcnMgXAotCi1MT0NBTF9TSEFSRURfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlic3RhZ2VmcmlnaHQgbGlibG9nIGxpYnV0aWxzIGxpYmJpbmRlciBsaWJ1aSBsaWJndWkgXAotICAgICAgICBsaWJzdGFnZWZyaWdodF9mb3VuZGF0aW9uIGxpYm1lZGlhIGxpYmN1dGlscyBsaWJkYXRhc291cmNlCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvbWVkaWEvbGlic3RhZ2VmcmlnaHQgXAotICAgICAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXgKLQotTE9DQUxfQ0ZMQUdTICs9IC1Xbm8tbXVsdGljaGFyIC1XZXJyb3IgLVdhbGwKLQotTE9DQUxfTU9EVUxFX1RBR1MgOj0gb3B0aW9uYWwKLQotTE9DQUxfTU9EVUxFOj0gc3RyZWFtCi1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLWluY2x1ZGUgJChCVUlMRF9FWEVDVVRBQkxFKQotCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotCi1pbmNsdWRlICQoQ0xFQVJfVkFSUykKLQotTE9DQUxfU1JDX0ZJTEVTOj0gICAgICAgICAgICAgICBcCi0gICAgICAgIGNvZGVjLmNwcCAgICAgICAgICAgICAgIFwKLSAgICAgICAgU2ltcGxlUGxheWVyLmNwcCAgICAgICAgXAotCi1MT0NBTF9IRUFERVJfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlibWVkaWFkcm1faGVhZGVycyBcCi0gICAgICAgIGxpYm1lZGlhbWV0cmljc19oZWFkZXJzIFwKLQotTE9DQUxfU0hBUkVEX0xJQlJBUklFUyA6PSBcCi0gICAgICAgIGxpYnN0YWdlZnJpZ2h0IGxpYmxvZyBsaWJ1dGlscyBsaWJiaW5kZXIgbGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiBcCi0gICAgICAgIGxpYm1lZGlhIGxpYm1lZGlhX29teCBsaWJhdWRpb2NsaWVudCBsaWJ1aSBsaWJndWkgbGliY3V0aWxzCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvbWVkaWEvbGlic3RhZ2VmcmlnaHQgXAotICAgICAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXgKLQotTE9DQUxfQ0ZMQUdTICs9IC1Xbm8tbXVsdGljaGFyIC1XZXJyb3IgLVdhbGwKLQotTE9DQUxfTU9EVUxFX1RBR1MgOj0gb3B0aW9uYWwKLQotTE9DQUxfTU9EVUxFOj0gY29kZWMKLUxPQ0FMX0xJQ0VOU0VfS0lORFM6PSBTUERYLWxpY2Vuc2UtaWRlbnRpZmllci1BcGFjaGUtMi4wCi1MT0NBTF9MSUNFTlNFX0NPTkRJVElPTlM6PSBub3RpY2UKLUxPQ0FMX05PVElDRV9GSUxFOj0gJChMT0NBTF9QQVRIKS9OT1RJQ0UKLQotaW5jbHVkZSAkKEJVSUxEX0VYRUNVVEFCTEUpCi0KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0KLWluY2x1ZGUgJChDTEVBUl9WQVJTKQotCi1MT0NBTF9TUkNfRklMRVM6PSBcCi0gICAgICAgIGZpbHRlcnMvYXJnYnRvcmdiYS5yc2NyaXB0IFwKLSAgICAgICAgZmlsdGVycy9uaWdodHZpc2lvbi5yc2NyaXB0IFwKLSAgICAgICAgZmlsdGVycy9zYXR1cmF0aW9uLnJzY3JpcHQgXAotICAgICAgICBtZWRpYWZpbHRlci5jcHAgXAotCi1MT0NBTF9IRUFERVJfTElCUkFSSUVTIDo9IFwKLSAgICAgICAgbGlibWVkaWFkcm1faGVhZGVycyBcCi0gICAgICAgIGxpYm1lZGlhbWV0cmljc19oZWFkZXJzIFwKLQotTE9DQUxfU0hBUkVEX0xJQlJBUklFUyA6PSBcCi0gICAgICAgIGxpYnN0YWdlZnJpZ2h0IFwKLSAgICAgICAgbGlibG9nIFwKLSAgICAgICAgbGlidXRpbHMgXAotICAgICAgICBsaWJiaW5kZXIgXAotICAgICAgICBsaWJzdGFnZWZyaWdodF9mb3VuZGF0aW9uIFwKLSAgICAgICAgbGlibWVkaWFfb214IFwKLSAgICAgICAgbGlidWkgXAotICAgICAgICBsaWJndWkgXAotICAgICAgICBsaWJSU2NwcCBcCi0KLUxPQ0FMX0NfSU5DTFVERVM6PSBcCi0gICAgICAgIGZyYW1ld29ya3MvYXYvbWVkaWEvbGlic3RhZ2VmcmlnaHQgXAotICAgICAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXggXAotICAgICAgICBmcmFtZXdvcmtzL3JzL2NwcCBcCi0gICAgICAgIGZyYW1ld29ya3MvcnMgXAotCi1pbnRlcm1lZGlhdGVzIDo9ICQoY2FsbCBpbnRlcm1lZGlhdGVzLWRpci1mb3IsU1RBVElDX0xJQlJBUklFUyxsaWJSUyxUQVJHRVQsKQotTE9DQUxfQ19JTkNMVURFUyArPSAkKGludGVybWVkaWF0ZXMpCi0KLUxPQ0FMX1NUQVRJQ19MSUJSQVJJRVM6PSBcCi0gICAgICAgIGxpYnN0YWdlZnJpZ2h0X21lZGlhZmlsdGVyCi0KLUxPQ0FMX0NGTEFHUyArPSAtV25vLW11bHRpY2hhciAtV2Vycm9yIC1XYWxsCi0KLUxPQ0FMX01PRFVMRV9UQUdTIDo9IG9wdGlvbmFsCi0KLUxPQ0FMX01PRFVMRTo9IG1lZGlhZmlsdGVyCi1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLUxPQ0FMX1NBTklUSVpFIDo9IGNmaQotCi1pbmNsdWRlICQoQlVJTERfRVhFQ1VUQUJMRSkKLQotIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLQotaW5jbHVkZSAkKENMRUFSX1ZBUlMpCi0KLUxPQ0FMX1NSQ19GSUxFUzo9ICAgICAgICAgICAgICAgXAotICAgICAgICBtdXhlci5jcHAgICAgICAgICAgICBcCi0KLUxPQ0FMX0hFQURFUl9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJtZWRpYW1ldHJpY3NfaGVhZGVycyBcCi0KLUxPQ0FMX1NIQVJFRF9MSUJSQVJJRVMgOj0gXAotICAgICAgICBsaWJzdGFnZWZyaWdodCBsaWJsb2cgbGlidXRpbHMgbGliYmluZGVyIGxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb24gXAotICAgICAgICBsaWJjdXRpbHMgbGliYwotCi1MT0NBTF9DX0lOQ0xVREVTOj0gXAotICAgICAgICBmcmFtZXdvcmtzL2F2L21lZGlhL2xpYnN0YWdlZnJpZ2h0IFwKLSAgICAgICAgZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZS9tZWRpYS9vcGVubWF4Ci0KLUxPQ0FMX0NGTEFHUyArPSAtV25vLW11bHRpY2hhciAtV2Vycm9yIC1XYWxsCi0KLUxPQ0FMX01PRFVMRV9UQUdTIDo9IG9wdGlvbmFsCi0KLUxPQ0FMX01PRFVMRTo9IG11eGVyCi1MT0NBTF9MSUNFTlNFX0tJTkRTOj0gU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAotTE9DQUxfTElDRU5TRV9DT05ESVRJT05TOj0gbm90aWNlCi1MT0NBTF9OT1RJQ0VfRklMRTo9ICQoTE9DQUxfUEFUSCkvTk9USUNFCi0KLWluY2x1ZGUgJChCVUlMRF9FWEVDVVRBQkxFKQpkaWZmIC0tZ2l0IGEvZHJtL2RybXNlcnZlci9kcm1zZXJ2ZXIucmMgYi9kcm0vZHJtc2VydmVyL2RybXNlcnZlci5yYwppbmRleCBlYjE3NmMxLi4wMzE5ZmY5IDEwMDY0NAotLS0gYS9kcm0vZHJtc2VydmVyL2RybXNlcnZlci5yYworKysgYi9kcm0vZHJtc2VydmVyL2RybXNlcnZlci5yYwpAQCAtMyw3ICszLDcgQEAKICAgICBjbGFzcyBtYWluCiAgICAgdXNlciBkcm0KICAgICBncm91cCBkcm0gc3lzdGVtIGluZXQgZHJtcnBjIHJlYWRwcm9jCi0gICAgd3JpdGVwaWQgL2Rldi9jcHVzZXQvZm9yZWdyb3VuZC90YXNrcworICAgIHRhc2tfcHJvZmlsZXMgUHJvY2Vzc0NhcGFjaXR5SGlnaAogCiBvbiBwcm9wZXJ0eTpkcm0uc2VydmljZS5lbmFibGVkPXRydWUKICAgICBzdGFydCBkcm0KZGlmZiAtLWdpdCBhL2RybS9saWJtZWRpYWRybS9BbmRyb2lkLmJwIGIvZHJtL2xpYm1lZGlhZHJtL0FuZHJvaWQuYnAKaW5kZXggMGZmZTYyNi4uNzFkZjU4YyAxMDA2NDQKLS0tIGEvZHJtL2xpYm1lZGlhZHJtL0FuZHJvaWQuYnAKKysrIGIvZHJtL2xpYm1lZGlhZHJtL0FuZHJvaWQuYnAKQEAgLTY2LDcgKzY2LDcgQEAKICAgICBdLAogCiAgICAgc3RhdGljX2xpYnM6IFsKLSAgICAgICAgInJlc291cmNlbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAicmVzb3VyY2VtYW5hZ2VyX2FpZGxfaW50ZXJmYWNlLW5kayIsCiAgICAgXSwKIAogICAgIGV4cG9ydF9zaGFyZWRfbGliX2hlYWRlcnM6IFsKZGlmZiAtLWdpdCBhL2RybS9saWJtZWRpYWRybS9mdXp6ZXIvQW5kcm9pZC5icCBiL2RybS9saWJtZWRpYWRybS9mdXp6ZXIvQW5kcm9pZC5icAppbmRleCA3MjgxMDY2Li40OWJiYWQ0IDEwMDY0NAotLS0gYS9kcm0vbGlibWVkaWFkcm0vZnV6emVyL0FuZHJvaWQuYnAKKysrIGIvZHJtL2xpYm1lZGlhZHJtL2Z1enplci9BbmRyb2lkLmJwCkBAIC0zNSw3ICszNSw3IEBACiAgICAgc3RhdGljX2xpYnM6IFsKICAgICAgICAgImxpYm1lZGlhZHJtIiwKICAgICAgICAgImxpYmxvZyIsCi0gICAgICAgICJyZXNvdXJjZW1hbmFnZXJfYWlkbF9pbnRlcmZhY2UtbmRrX3BsYXRmb3JtIiwKKyAgICAgICAgInJlc291cmNlbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGsiLAogICAgIF0sCiAgICAgaGVhZGVyX2xpYnM6IFsKICAgICAgICAgImxpYm1lZGlhX2hlYWRlcnMiLApkaWZmIC0tZ2l0IGEvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjItc2VydmljZS1sYXp5LmNsZWFya2V5LnJjIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjItc2VydmljZS1sYXp5LmNsZWFya2V5LnJjCmluZGV4IDlhZmQzZDcuLmVjNDUxN2QgMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4yLXNlcnZpY2UtbGF6eS5jbGVhcmtleS5yYworKysgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuMi1zZXJ2aWNlLWxhenkuY2xlYXJrZXkucmMKQEAgLTExLDQgKzExLDQgQEAKICAgICB1c2VyIG1lZGlhCiAgICAgZ3JvdXAgbWVkaWEgbWVkaWFkcm0KICAgICBpb3ByaW8gcnQgNAotICAgIHdyaXRlcGlkIC9kZXYvY3B1c2V0L2ZvcmVncm91bmQvdGFza3MKKyAgICB0YXNrX3Byb2ZpbGVzIFByb2Nlc3NDYXBhY2l0eUhpZ2gKZGlmZiAtLWdpdCBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4yLXNlcnZpY2UuY2xlYXJrZXkucmMgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuMi1zZXJ2aWNlLmNsZWFya2V5LnJjCmluZGV4IGMxYWJlN2YuLjNiNDhjZjIgMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4yLXNlcnZpY2UuY2xlYXJrZXkucmMKKysrIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjItc2VydmljZS5jbGVhcmtleS5yYwpAQCAtMTAsNCArMTAsNCBAQAogICAgIHVzZXIgbWVkaWEKICAgICBncm91cCBtZWRpYSBtZWRpYWRybQogICAgIGlvcHJpbyBydCA0Ci0gICAgd3JpdGVwaWQgL2Rldi9jcHVzZXQvZm9yZWdyb3VuZC90YXNrcworICAgIHRhc2tfcHJvZmlsZXMgUHJvY2Vzc0NhcGFjaXR5SGlnaApkaWZmIC0tZ2l0IGEvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjMtc2VydmljZS1sYXp5LmNsZWFya2V5LnJjIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjMtc2VydmljZS1sYXp5LmNsZWFya2V5LnJjCmluZGV4IDFlMGQ0MzEuLjZlNjQ5NzggMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4zLXNlcnZpY2UtbGF6eS5jbGVhcmtleS5yYworKysgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuMy1zZXJ2aWNlLWxhenkuY2xlYXJrZXkucmMKQEAgLTEzLDQgKzEzLDQgQEAKICAgICB1c2VyIG1lZGlhCiAgICAgZ3JvdXAgbWVkaWEgbWVkaWFkcm0KICAgICBpb3ByaW8gcnQgNAotICAgIHdyaXRlcGlkIC9kZXYvY3B1c2V0L2ZvcmVncm91bmQvdGFza3MKKyAgICB0YXNrX3Byb2ZpbGVzIFByb2Nlc3NDYXBhY2l0eUhpZ2gKZGlmZiAtLWdpdCBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4zLXNlcnZpY2UuY2xlYXJrZXkucmMgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuMy1zZXJ2aWNlLmNsZWFya2V5LnJjCmluZGV4IDgxMzA1MTEuLmUzMDJlMWIgMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS4zLXNlcnZpY2UuY2xlYXJrZXkucmMKKysrIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjMtc2VydmljZS5jbGVhcmtleS5yYwpAQCAtMTEsNCArMTEsNCBAQAogICAgIHVzZXIgbWVkaWEKICAgICBncm91cCBtZWRpYSBtZWRpYWRybQogICAgIGlvcHJpbyBydCA0Ci0gICAgd3JpdGVwaWQgL2Rldi9jcHVzZXQvZm9yZWdyb3VuZC90YXNrcworICAgIHRhc2tfcHJvZmlsZXMgUHJvY2Vzc0NhcGFjaXR5SGlnaApkaWZmIC0tZ2l0IGEvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjQtc2VydmljZS1sYXp5LmNsZWFya2V5LnJjIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjQtc2VydmljZS1sYXp5LmNsZWFya2V5LnJjCmluZGV4IDQ2YWJhODguLjg0YTYzYTEgMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS40LXNlcnZpY2UtbGF6eS5jbGVhcmtleS5yYworKysgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuNC1zZXJ2aWNlLWxhenkuY2xlYXJrZXkucmMKQEAgLTE1LDQgKzE1LDQgQEAKICAgICB1c2VyIG1lZGlhCiAgICAgZ3JvdXAgbWVkaWEgbWVkaWFkcm0KICAgICBpb3ByaW8gcnQgNAotICAgIHdyaXRlcGlkIC9kZXYvY3B1c2V0L2ZvcmVncm91bmQvdGFza3MKKyAgICB0YXNrX3Byb2ZpbGVzIFByb2Nlc3NDYXBhY2l0eUhpZ2gKZGlmZiAtLWdpdCBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS40LXNlcnZpY2UuY2xlYXJrZXkucmMgYi9kcm0vbWVkaWFkcm0vcGx1Z2lucy9jbGVhcmtleS9oaWRsL2FuZHJvaWQuaGFyZHdhcmUuZHJtQDEuNC1zZXJ2aWNlLmNsZWFya2V5LnJjCmluZGV4IDgxODY5MzMuLjY0OTU5OWUgMTAwNjQ0Ci0tLSBhL2RybS9tZWRpYWRybS9wbHVnaW5zL2NsZWFya2V5L2hpZGwvYW5kcm9pZC5oYXJkd2FyZS5kcm1AMS40LXNlcnZpY2UuY2xlYXJrZXkucmMKKysrIGIvZHJtL21lZGlhZHJtL3BsdWdpbnMvY2xlYXJrZXkvaGlkbC9hbmRyb2lkLmhhcmR3YXJlLmRybUAxLjQtc2VydmljZS5jbGVhcmtleS5yYwpAQCAtMTMsNCArMTMsNCBAQAogICAgIHVzZXIgbWVkaWEKICAgICBncm91cCBtZWRpYSBtZWRpYWRybQogICAgIGlvcHJpbyBydCA0Ci0gICAgd3JpdGVwaWQgL2Rldi9jcHVzZXQvZm9yZWdyb3VuZC90YXNrcworICAgIHRhc2tfcHJvZmlsZXMgUHJvY2Vzc0NhcGFjaXR5SGlnaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9PV05FUlMgYi9pbmNsdWRlL09XTkVSUwppbmRleCBkNmJkOTk4Li44OGRlNTk1IDEwMDY0NAotLS0gYS9pbmNsdWRlL09XTkVSUworKysgYi9pbmNsdWRlL09XTkVSUwpAQCAtMSw2ICsxLDUgQEAKIGVsYXVyZW50QGdvb2dsZS5jb20KLWdrYXN0ZW5AZ29vZ2xlLmNvbQogaHVuZ2FAZ29vZ2xlLmNvbQoganRpbmtlckBnb29nbGUuY29tCiBsYWpvc0Bnb29nbGUuY29tCi1tYXJjb25lQGdvb2dsZS5jb20KK2Vzc2lja0Bnb29nbGUuY29tCmRpZmYgLS1naXQgYS9tZWRpYS9PV05FUlMgYi9tZWRpYS9PV05FUlMKaW5kZXggNGNmNDg3MC4uMDk5NzI5ZiAxMDA2NDQKLS0tIGEvbWVkaWEvT1dORVJTCisrKyBiL21lZGlhL09XTkVSUwpAQCAtMTUsNiArMTUsNyBAQAogcm9iZXJ0c2hpaEBnb29nbGUuY29tCiB0YWtsZWVAZ29vZ2xlLmNvbQogd29uc2lrQGdvb2dsZS5jb20KK3l0YWlAZ29vZ2xlLmNvbQogCiAjIGdvL2FuZHJvaWQtZndrLW1lZGlhLXNvbHV0aW9ucyBmb3IgaW5mbyBvbiBhcmVhcyBvZiBvd25lcnNoaXAuCiBpbmNsdWRlIHBsYXRmb3JtL2ZyYW1ld29ya3MvYXY6L21lZGlhL2phbml0b3JzL21lZGlhX3NvbHV0aW9uc19PV05FUlMKZGlmZiAtLWdpdCBhL21lZGlhL2F1ZGlvc2VydmVyL0FuZHJvaWQuYnAgYi9tZWRpYS9hdWRpb3NlcnZlci9BbmRyb2lkLmJwCmluZGV4IGJlMjVmZmIuLmU1Zjk5MDcgMTAwNjQ0Ci0tLSBhL21lZGlhL2F1ZGlvc2VydmVyL0FuZHJvaWQuYnAKKysrIGIvbWVkaWEvYXVkaW9zZXJ2ZXIvQW5kcm9pZC5icApAQCAtMjUsNiArMjUsNyBAQAogICAgIF0sCiAKICAgICBzaGFyZWRfbGliczogWworICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgICAgICAibGliYWF1ZGlvc2VydmljZSIsCiAgICAgICAgICJsaWJhdWRpb2ZsaW5nZXIiLAogICAgICAgICAibGliYXVkaW9wb2xpY3lzZXJ2aWNlIiwKQEAgLTQxLDcgKzQyLDYgQEAKICAgICAgICAgImxpYnBvd2VybWFuYWdlciIsCiAgICAgICAgICJsaWJ1dGlscyIsCiAgICAgICAgICJsaWJ2aWJyYXRvciIsCi0KICAgICBdLAogCiAgICAgLy8gVE9ETyBjaGVjayBpZiB3ZSBzdGlsbCBuZWVkIGFsbCBvZiB0aGVzZSBpbmNsdWRlIGRpcmVjdG9yaWVzCmRpZmYgLS1naXQgYS9tZWRpYS9hdWRpb3NlcnZlci9tYWluX2F1ZGlvc2VydmVyLmNwcCBiL21lZGlhL2F1ZGlvc2VydmVyL21haW5fYXVkaW9zZXJ2ZXIuY3BwCmluZGV4IDhlZTFlZmIuLmM1YWM3ZjkgMTAwNjQ0Ci0tLSBhL21lZGlhL2F1ZGlvc2VydmVyL21haW5fYXVkaW9zZXJ2ZXIuY3BwCisrKyBiL21lZGlhL2F1ZGlvc2VydmVyL21haW5fYXVkaW9zZXJ2ZXIuY3BwCkBAIC03MywxMCArNzMsOCBAQAogICAgICAgICBJUENUaHJlYWRTdGF0ZTo6c2VsZigpLT5qb2luVGhyZWFkUG9vbCgpOwogICAgICAgICBmb3IgKDs7KSB7CiAgICAgICAgICAgICBzaWdpbmZvX3QgaW5mbzsKLSAgICAgICAgICAgIGludCByZXQgPSB3YWl0aWQoUF9QSUQsIGNoaWxkUGlkLCAmaW5mbywgV0VYSVRFRCB8IFdTVE9QUEVEIHwgV0NPTlRJTlVFRCk7Ci0gICAgICAgICAgICBpZiAocmV0ID09IEVJTlRSKSB7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpbnQgcmV0ID0gVEVNUF9GQUlMVVJFX1JFVFJZKHdhaXRpZChQX1BJRCwgY2hpbGRQaWQsICZpbmZvLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VYSVRFRCB8IFdTVE9QUEVEIHwgV0NPTlRJTlVFRCkpOwogICAgICAgICAgICAgaWYgKHJldCA8IDApIHsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9URVNUX01BUFBJTkcgYi9tZWRpYS9jb2RlYzIvVEVTVF9NQVBQSU5HCmluZGV4IDZhYzQyMTAuLjE2Y2IzMjMgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9URVNUX01BUFBJTkcKKysrIGIvbWVkaWEvY29kZWMyL1RFU1RfTUFQUElORwpAQCAtMTUsMTMgKzE1LDI0IEBACiAgICAgICAgIH0sCiAgICAgICAgIHsKICAgICAgICAgICAiZXhjbHVkZS1hbm5vdGF0aW9uIjogImFuZHJvaWQucGxhdGZvcm0udGVzdC5hbm5vdGF0aW9ucy5SZXF1aXJlc0RldmljZSIKKyAgICAgICAgfQorICAgICAgXQorICAgIH0sCisgICAgeworICAgICAgIm5hbWUiOiAiQ3RzTWVkaWFBdWRpb1Rlc3RDYXNlcyIsCisgICAgICAib3B0aW9ucyI6IFsKKyAgICAgICAgeworICAgICAgICAgICJpbmNsdWRlLWFubm90YXRpb24iOiAiYW5kcm9pZC5wbGF0Zm9ybS50ZXN0LmFubm90YXRpb25zLlByZXN1Ym1pdCIKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICJleGNsdWRlLWFubm90YXRpb24iOiAiYW5kcm9pZC5wbGF0Zm9ybS50ZXN0LmFubm90YXRpb25zLlJlcXVpcmVzRGV2aWNlIgogICAgICAgICB9LAogICAgICAgICAvLyBUT0RPOiBiLzE0OTMxNDQxOQogICAgICAgICB7Ci0gICAgICAgICAgImV4Y2x1ZGUtZmlsdGVyIjogImFuZHJvaWQubWVkaWEuY3RzLkF1ZGlvUGxheWJhY2tDYXB0dXJlVGVzdCIKKyAgICAgICAgICAiZXhjbHVkZS1maWx0ZXIiOiAiYW5kcm9pZC5tZWRpYS5hdWRpby5jdHMuQXVkaW9QbGF5YmFja0NhcHR1cmVUZXN0IgogICAgICAgICB9LAogICAgICAgICB7Ci0gICAgICAgICAgImV4Y2x1ZGUtZmlsdGVyIjogImFuZHJvaWQubWVkaWEuY3RzLkF1ZGlvUmVjb3JkVGVzdCIKKyAgICAgICAgICAiZXhjbHVkZS1maWx0ZXIiOiAiYW5kcm9pZC5tZWRpYS5hdWRpby5jdHMuQXVkaW9SZWNvcmRUZXN0IgogICAgICAgICB9CiAgICAgICBdCiAgICAgfQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvYXZjL0MyU29mdEF2Y0RlYy5jcHAgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9hdmMvQzJTb2Z0QXZjRGVjLmNwcAppbmRleCBlODI4N2Y5Li5jYzQ1MTdkIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9hdmMvQzJTb2Z0QXZjRGVjLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9hdmMvQzJTb2Z0QXZjRGVjLmNwcApAQCAtNTExLDcgKzUxMSw3IEBACiBzdGF0dXNfdCBDMlNvZnRBdmNEZWM6OmluaXREZWNvZGVyKCkgewogICAgIGlmIChPSyAhPSBjcmVhdGVEZWNvZGVyKCkpIHJldHVybiBVTktOT1dOX0VSUk9SOwogICAgIG1OdW1Db3JlcyA9IE1JTihnZXRDcHVDb3JlQ291bnQoKSwgTUFYX05VTV9DT1JFUyk7Ci0gICAgbVN0cmlkZSA9IEFMSUdOMzIobVdpZHRoKTsKKyAgICBtU3RyaWRlID0gQUxJR04xMjgobVdpZHRoKTsKICAgICBtU2lnbmFsbGVkRXJyb3IgPSBmYWxzZTsKICAgICByZXNldFBsdWdpbigpOwogICAgICh2b2lkKSBzZXROdW1Db3JlcygpOwpAQCAtNzc3LDIwICs3NzcsMjAgQEAKICAgICAgICAgcmV0dXJuIEMyX0NPUlJVUFRFRDsKICAgICB9CiAgICAgaWYgKG1PdXRCbG9jayAmJgotICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjMyKG1XaWR0aCkgfHwgbU91dEJsb2NrLT5oZWlnaHQoKSAhPSBtSGVpZ2h0KSkgeworICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjEyOChtV2lkdGgpIHx8IG1PdXRCbG9jay0+aGVpZ2h0KCkgIT0gbUhlaWdodCkpIHsKICAgICAgICAgbU91dEJsb2NrLnJlc2V0KCk7CiAgICAgfQogICAgIGlmICghbU91dEJsb2NrKSB7CiAgICAgICAgIHVpbnQzMl90IGZvcm1hdCA9IEhBTF9QSVhFTF9GT1JNQVRfWVYxMjsKICAgICAgICAgQzJNZW1vcnlVc2FnZSB1c2FnZSA9IHsgQzJNZW1vcnlVc2FnZTo6Q1BVX1JFQUQsIEMyTWVtb3J5VXNhZ2U6OkNQVV9XUklURSB9OwogICAgICAgICBjMl9zdGF0dXNfdCBlcnIgPQotICAgICAgICAgICAgcG9vbC0+ZmV0Y2hHcmFwaGljQmxvY2soQUxJR04zMihtV2lkdGgpLCBtSGVpZ2h0LCBmb3JtYXQsIHVzYWdlLCAmbU91dEJsb2NrKTsKKyAgICAgICAgICAgIHBvb2wtPmZldGNoR3JhcGhpY0Jsb2NrKEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQsIGZvcm1hdCwgdXNhZ2UsICZtT3V0QmxvY2spOwogICAgICAgICBpZiAoZXJyICE9IEMyX09LKSB7CiAgICAgICAgICAgICBBTE9HRSgiZmV0Y2hHcmFwaGljQmxvY2sgZm9yIE91dHB1dCBmYWlsZWQgd2l0aCBzdGF0dXMgJWQiLCBlcnIpOwogICAgICAgICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgICAgICBBTE9HVigicHJvdmlkZWQgKCVkeCVkKSByZXF1aXJlZCAoJWR4JWQpIiwKLSAgICAgICAgICAgICAgbU91dEJsb2NrLT53aWR0aCgpLCBtT3V0QmxvY2stPmhlaWdodCgpLCBBTElHTjMyKG1XaWR0aCksIG1IZWlnaHQpOworICAgICAgICAgICAgICBtT3V0QmxvY2stPndpZHRoKCksIG1PdXRCbG9jay0+aGVpZ2h0KCksIEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQpOwogICAgIH0KIAogICAgIHJldHVybiBDMl9PSzsKQEAgLTkyOCw3ICs5MjgsNyBAQAogICAgICAgICBpZiAoMCA8IHBzX2RlY29kZV9vcC0+dTRfcGljX3dkICYmIDAgPCBwc19kZWNvZGVfb3AtPnU0X3BpY19odCkgewogICAgICAgICAgICAgaWYgKG1IZWFkZXJEZWNvZGVkID09IGZhbHNlKSB7CiAgICAgICAgICAgICAgICAgbUhlYWRlckRlY29kZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgIG1TdHJpZGUgPSBBTElHTjMyKHBzX2RlY29kZV9vcC0+dTRfcGljX3dkKTsKKyAgICAgICAgICAgICAgICBtU3RyaWRlID0gQUxJR04xMjgocHNfZGVjb2RlX29wLT51NF9waWNfd2QpOwogICAgICAgICAgICAgICAgIHNldFBhcmFtcyhtU3RyaWRlLCBJVkRfREVDT0RFX0ZSQU1FKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChwc19kZWNvZGVfb3AtPnU0X3BpY193ZCAhPSBtV2lkdGggfHwgcHNfZGVjb2RlX29wLT51NF9waWNfaHQgIT0gbUhlaWdodCkgewpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvYXZjL0MyU29mdEF2Y0RlYy5oIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvYXZjL0MyU29mdEF2Y0RlYy5oCmluZGV4IDVjMDdkMjkuLjU5ZDUxODQgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2F2Yy9DMlNvZnRBdmNEZWMuaAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9hdmMvQzJTb2Z0QXZjRGVjLmgKQEAgLTM4LDcgKzM4LDcgQEAKICNkZWZpbmUgaXZkZXh0X2N0bF9zZXRfbnVtX2NvcmVzX29wX3QgICBpaDI2NGRfY3RsX3NldF9udW1fY29yZXNfb3BfdAogI2RlZmluZSBpdmRleHRfY3RsX2dldF92dWlfcGFyYW1zX2lwX3QgIGloMjY0ZF9jdGxfZ2V0X3Z1aV9wYXJhbXNfaXBfdAogI2RlZmluZSBpdmRleHRfY3RsX2dldF92dWlfcGFyYW1zX29wX3QgIGloMjY0ZF9jdGxfZ2V0X3Z1aV9wYXJhbXNfb3BfdAotI2RlZmluZSBBTElHTjMyKHgpICAgICAgICAgICAgICAgICAgICAgICgoKCh4KSArIDMxKSA+PiA1KSA8PCA1KQorI2RlZmluZSBBTElHTjEyOCh4KSAgICAgICAgICAgICAgICAgICAgICgoKCh4KSArIDEyNykgPj4gNykgPDwgNykKICNkZWZpbmUgTUFYX05VTV9DT1JFUyAgICAgICAgICAgICAgICAgICA0CiAjZGVmaW5lIElWREVYVF9DTURfQ1RMX1NFVF9OVU1fQ09SRVMgICAgXAogICAgICAgICAoSVZEX0NPTlRST0xfQVBJX0NPTU1BTkRfVFlQRV9UKUlIMjY0RF9DTURfQ1RMX1NFVF9OVU1fQ09SRVMKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2ZsYWMvQzJTb2Z0RmxhY0VuYy5jcHAgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9mbGFjL0MyU29mdEZsYWNFbmMuY3BwCmluZGV4IDZmZWFkM2EuLjE4MmVkZmIgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2ZsYWMvQzJTb2Z0RmxhY0VuYy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvZmxhYy9DMlNvZnRGbGFjRW5jLmNwcApAQCAtNDM5LDkgKzQzOSw2IEBACiAgICAgfQogICAgIEZMQUNfX2Jvb2wgb2sgPSBGTEFDX19zdHJlYW1fZW5jb2Rlcl9maW5pc2gobUZsYWNTdHJlYW1FbmNvZGVyKTsKICAgICBpZiAoIW9rKSByZXR1cm4gQzJfQ09SUlVQVEVEOwotICAgIG1Jc0ZpcnN0RnJhbWUgPSB0cnVlOwotICAgIG1BbmNob3JUaW1lU3RhbXAgPSAwdWxsOwotICAgIG1Qcm9jZXNzZWRTYW1wbGVzID0gMHU7CiAKICAgICByZXR1cm4gQzJfT0s7CiB9CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9nYXYxL0MyU29mdEdhdjFEZWMuY3BwIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvZ2F2MS9DMlNvZnRHYXYxRGVjLmNwcAppbmRleCBmODU3ZTg3Li43YmQzMzU4IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9nYXYxL0MyU29mdEdhdjFEZWMuY3BwCisrKyBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2dhdjEvQzJTb2Z0R2F2MURlYy5jcHAKQEAgLTIwLDYgKzIwLDcgQEAKIAogI2luY2x1ZGUgPEMyRGVidWcuaD4KICNpbmNsdWRlIDxDMlBsYXRmb3JtU3VwcG9ydC5oPgorI2luY2x1ZGUgPENvZGVjMk1hcHBlci5oPgogI2luY2x1ZGUgPFNpbXBsZUMySW50ZXJmYWNlLmg+CiAjaW5jbHVkZSA8bG9nL2xvZy5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQVV0aWxzLmg+CkBAIC0xNTYsNiArMTU3LDQyIEBACiAgICAgICAgICAgICAud2l0aFNldHRlcihEZWZhdWx0Q29sb3JBc3BlY3RzU2V0dGVyKQogICAgICAgICAgICAgLmJ1aWxkKCkpOwogCisgICAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1Db2RlZENvbG9yQXNwZWN0cywgQzJfUEFSQU1LRVlfVlVJX0NPTE9SX0FTUEVDVFMpCisgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dCgKKyAgICAgICAgICAgICAgICAgICAgICAwdSwgQzJDb2xvcjo6UkFOR0VfTElNSVRFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX1VOU1BFQ0lGSUVELAorICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpNQVRSSVhfVU5TUEVDSUZJRUQpKQorICAgICAgICAgICAgICAud2l0aEZpZWxkcyh7CisgICAgICAgICAgICAgICAgICBDMkYobUNvZGVkQ29sb3JBc3BlY3RzLCByYW5nZSkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCAgICAgQzJDb2xvcjo6UkFOR0VfT1RIRVIpLAorICAgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgcHJpbWFyaWVzKS5pblJhbmdlKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6UFJJTUFSSUVTX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpQUklNQVJJRVNfT1RIRVIpLAorICAgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgdHJhbnNmZXIpLmluUmFuZ2UoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbG9yOjpUUkFOU0ZFUl9VTlNQRUNJRklFRCwgIEMyQ29sb3I6OlRSQU5TRkVSX09USEVSKSwKKyAgICAgICAgICAgICAgICAgIEMyRihtQ29kZWRDb2xvckFzcGVjdHMsIG1hdHJpeCkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCwgICAgQzJDb2xvcjo6TUFUUklYX09USEVSKQorICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgICAud2l0aFNldHRlcihDb2RlZENvbG9yQXNwZWN0c1NldHRlcikKKyAgICAgICAgICAgICAgLmJ1aWxkKCkpOworCisgICAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1Db2xvckFzcGVjdHMsIEMyX1BBUkFNS0VZX0NPTE9SX0FTUEVDVFMpCisgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjpvdXRwdXQoCisgICAgICAgICAgICAgICAgICAgICAgMHUsIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpQUklNQVJJRVNfVU5TUEVDSUZJRUQsCisgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6VFJBTlNGRVJfVU5TUEVDSUZJRUQsIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCkpCisgICAgICAgICAgICAgIC53aXRoRmllbGRzKHsKKyAgICAgICAgICAgICAgICAgIEMyRihtQ29sb3JBc3BlY3RzLCByYW5nZSkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCAgICAgQzJDb2xvcjo6UkFOR0VfT1RIRVIpLAorICAgICAgICAgICAgICAgICAgQzJGKG1Db2xvckFzcGVjdHMsIHByaW1hcmllcykuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSwKKyAgICAgICAgICAgICAgICAgIEMyRihtQ29sb3JBc3BlY3RzLCB0cmFuc2ZlcikuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVELCAgQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVIpLAorICAgICAgICAgICAgICAgICAgQzJGKG1Db2xvckFzcGVjdHMsIG1hdHJpeCkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCwgICAgQzJDb2xvcjo6TUFUUklYX09USEVSKQorICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgICAud2l0aFNldHRlcihDb2xvckFzcGVjdHNTZXR0ZXIsIG1EZWZhdWx0Q29sb3JBc3BlY3RzLCBtQ29kZWRDb2xvckFzcGVjdHMpCisgICAgICAgICAgICAgIC5idWlsZCgpKTsKKwogICAgIC8vIFRPRE86IHN1cHBvcnQgbW9yZSBmb3JtYXRzPwogICAgIGFkZFBhcmFtZXRlcihEZWZpbmVQYXJhbShtUGl4ZWxGb3JtYXQsIEMyX1BBUkFNS0VZX1BJWEVMX0ZPUk1BVCkKICAgICAgICAgICAgICAgICAgICAgIC53aXRoQ29uc3RWYWx1ZShuZXcgQzJTdHJlYW1QaXhlbEZvcm1hdEluZm86Om91dHB1dCgKQEAgLTIxOCw2ICsyNTUsMzcgQEAKICAgICByZXR1cm4gQzJSOjpPaygpOwogICB9CiAKKyAgc3RhdGljIEMyUiBDb2RlZENvbG9yQXNwZWN0c1NldHRlcihib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dD4gJm1lKSB7CisgICAgKHZvaWQpbWF5QmxvY2s7CisgICAgaWYgKG1lLnYucmFuZ2UgPiBDMkNvbG9yOjpSQU5HRV9PVEhFUikgeworICAgICAgbWUuc2V0KCkucmFuZ2UgPSBDMkNvbG9yOjpSQU5HRV9PVEhFUjsKKyAgICB9CisgICAgaWYgKG1lLnYucHJpbWFyaWVzID4gQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSB7CisgICAgICBtZS5zZXQoKS5wcmltYXJpZXMgPSBDMkNvbG9yOjpQUklNQVJJRVNfT1RIRVI7CisgICAgfQorICAgIGlmIChtZS52LnRyYW5zZmVyID4gQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVIpIHsKKyAgICAgIG1lLnNldCgpLnRyYW5zZmVyID0gQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVI7CisgICAgfQorICAgIGlmIChtZS52Lm1hdHJpeCA+IEMyQ29sb3I6Ok1BVFJJWF9PVEhFUikgeworICAgICAgbWUuc2V0KCkubWF0cml4ID0gQzJDb2xvcjo6TUFUUklYX09USEVSOworICAgIH0KKyAgICByZXR1cm4gQzJSOjpPaygpOworICB9CisKKyAgc3RhdGljIEMyUiBDb2xvckFzcGVjdHNTZXR0ZXIoYm9vbCBtYXlCbG9jaywgQzJQPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6b3V0cHV0PiAmbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEMyUDxDMlN0cmVhbUNvbG9yQXNwZWN0c1R1bmluZzo6b3V0cHV0PiAmZGVmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dD4gJmNvZGVkKSB7CisgICAgKHZvaWQpbWF5QmxvY2s7CisgICAgLy8gdGFrZSBkZWZhdWx0IHZhbHVlcyBmb3IgYWxsIHVuc3BlY2lmaWVkIGZpZWxkcywgYW5kIGNvZGVkIHZhbHVlcyBmb3Igc3BlY2lmaWVkIG9uZXMKKyAgICBtZS5zZXQoKS5yYW5nZSA9IGNvZGVkLnYucmFuZ2UgPT0gUkFOR0VfVU5TUEVDSUZJRUQgPyBkZWYudi5yYW5nZSA6IGNvZGVkLnYucmFuZ2U7CisgICAgbWUuc2V0KCkucHJpbWFyaWVzID0gY29kZWQudi5wcmltYXJpZXMgPT0gUFJJTUFSSUVTX1VOU1BFQ0lGSUVECisgICAgICAgID8gZGVmLnYucHJpbWFyaWVzIDogY29kZWQudi5wcmltYXJpZXM7CisgICAgbWUuc2V0KCkudHJhbnNmZXIgPSBjb2RlZC52LnRyYW5zZmVyID09IFRSQU5TRkVSX1VOU1BFQ0lGSUVECisgICAgICAgID8gZGVmLnYudHJhbnNmZXIgOiBjb2RlZC52LnRyYW5zZmVyOworICAgIG1lLnNldCgpLm1hdHJpeCA9IGNvZGVkLnYubWF0cml4ID09IE1BVFJJWF9VTlNQRUNJRklFRCA/IGRlZi52Lm1hdHJpeCA6IGNvZGVkLnYubWF0cml4OworICAgIHJldHVybiBDMlI6Ok9rKCk7CisgIH0KKwogICBzdGF0aWMgQzJSIFByb2ZpbGVMZXZlbFNldHRlcigKICAgICAgIGJvb2wgbWF5QmxvY2ssIEMyUDxDMlN0cmVhbVByb2ZpbGVMZXZlbEluZm86OmlucHV0PiAmbWUsCiAgICAgICBjb25zdCBDMlA8QzJTdHJlYW1QaWN0dXJlU2l6ZUluZm86Om91dHB1dD4gJnNpemUpIHsKQEAgLTIzMiw2ICszMDAsMTAgQEAKICAgICByZXR1cm4gbURlZmF1bHRDb2xvckFzcGVjdHM7CiAgIH0KIAorICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjpvdXRwdXQ+IGdldENvbG9yQXNwZWN0c19sKCkgeworICAgICAgcmV0dXJuIG1Db2xvckFzcGVjdHM7CisgIH0KKwogICBzdGF0aWMgQzJSIEhkcjEwUGx1c0luZm9JbnB1dFNldHRlcihib29sIG1heUJsb2NrLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMlA8QzJTdHJlYW1IZHIxMFBsdXNJbmZvOjppbnB1dD4gJm1lKSB7CiAgICAgKHZvaWQpbWF5QmxvY2s7CkBAIC0yNTQsNiArMzI2LDggQEAKICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQ29sb3JJbmZvOjpvdXRwdXQ+IG1Db2xvckluZm87CiAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVBpeGVsRm9ybWF0SW5mbzo6b3V0cHV0PiBtUGl4ZWxGb3JtYXQ7CiAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUNvbG9yQXNwZWN0c1R1bmluZzo6b3V0cHV0PiBtRGVmYXVsdENvbG9yQXNwZWN0czsKKyAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6aW5wdXQ+IG1Db2RlZENvbG9yQXNwZWN0czsKKyAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6b3V0cHV0PiBtQ29sb3JBc3BlY3RzOwogICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1IZHIxMFBsdXNJbmZvOjppbnB1dD4gbUhkcjEwUGx1c0luZm9JbnB1dDsKICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtSGRyMTBQbHVzSW5mbzo6b3V0cHV0PiBtSGRyMTBQbHVzSW5mb091dHB1dDsKIH07CkBAIC0zNzEsNiArNDQ1LDEwIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjpzaGFyZWRfcHRyPEMyR3JhcGhpY0Jsb2NrPiAmYmxvY2spIHsKICAgc3RkOjpzaGFyZWRfcHRyPEMyQnVmZmVyPiBidWZmZXIgPQogICAgICAgY3JlYXRlR3JhcGhpY0J1ZmZlcihibG9jaywgQzJSZWN0KG1XaWR0aCwgbUhlaWdodCkpOworICB7CisgICAgICBJbnRmSW1wbDo6TG9jayBsb2NrID0gbUludGYtPmxvY2soKTsKKyAgICAgIGJ1ZmZlci0+c2V0SW5mbyhtSW50Zi0+Z2V0Q29sb3JBc3BlY3RzX2woKSk7CisgIH0KICAgYXV0byBmaWxsV29yayA9IFtidWZmZXIsIGluZGV4XShjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8QzJXb3JrPiAmd29yaykgewogICAgIHVpbnQzMl90IGZsYWdzID0gMDsKICAgICBpZiAoKHdvcmstPmlucHV0LmZsYWdzICYgQzJGcmFtZURhdGE6OkZMQUdfRU5EX09GX1NUUkVBTSkgJiYKQEAgLTYwOSw2ICs2ODcsMzggQEAKICAgfQogfQogCit2b2lkIEMyU29mdEdhdjFEZWM6OmdldFZ1aVBhcmFtcyhjb25zdCBsaWJnYXYxOjpEZWNvZGVyQnVmZmVyICpidWZmZXIpIHsKKyAgICBWdWlDb2xvckFzcGVjdHMgdnVpQ29sb3JBc3BlY3RzOworICAgIHZ1aUNvbG9yQXNwZWN0cy5wcmltYXJpZXMgPSBidWZmZXItPmNvbG9yX3ByaW1hcnk7CisgICAgdnVpQ29sb3JBc3BlY3RzLnRyYW5zZmVyID0gYnVmZmVyLT50cmFuc2Zlcl9jaGFyYWN0ZXJpc3RpY3M7CisgICAgdnVpQ29sb3JBc3BlY3RzLmNvZWZmcyA9IGJ1ZmZlci0+bWF0cml4X2NvZWZmaWNpZW50czsKKyAgICB2dWlDb2xvckFzcGVjdHMuZnVsbFJhbmdlID0gYnVmZmVyLT5jb2xvcl9yYW5nZTsKKworICAgIC8vIGNvbnZlcnQgdnVpIGFzcGVjdHMgdG8gQzIgdmFsdWVzIGlmIGNoYW5nZWQKKyAgICBpZiAoISh2dWlDb2xvckFzcGVjdHMgPT0gbUJpdHN0cmVhbUNvbG9yQXNwZWN0cykpIHsKKyAgICAgICAgbUJpdHN0cmVhbUNvbG9yQXNwZWN0cyA9IHZ1aUNvbG9yQXNwZWN0czsKKyAgICAgICAgQ29sb3JBc3BlY3RzIHNmQXNwZWN0czsKKyAgICAgICAgQzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dCBjb2RlZEFzcGVjdHMgPSB7IDB1IH07CisgICAgICAgIENvbG9yVXRpbHM6OmNvbnZlcnRJc29Db2xvckFzcGVjdHNUb0NvZGVjQXNwZWN0cygKKyAgICAgICAgICAgICAgICB2dWlDb2xvckFzcGVjdHMucHJpbWFyaWVzLCB2dWlDb2xvckFzcGVjdHMudHJhbnNmZXIsIHZ1aUNvbG9yQXNwZWN0cy5jb2VmZnMsCisgICAgICAgICAgICAgICAgdnVpQ29sb3JBc3BlY3RzLmZ1bGxSYW5nZSwgc2ZBc3BlY3RzKTsKKyAgICAgICAgaWYgKCFDMk1hcHBlcjo6bWFwKHNmQXNwZWN0cy5tUHJpbWFyaWVzLCAmY29kZWRBc3BlY3RzLnByaW1hcmllcykpIHsKKyAgICAgICAgICAgIGNvZGVkQXNwZWN0cy5wcmltYXJpZXMgPSBDMkNvbG9yOjpQUklNQVJJRVNfVU5TUEVDSUZJRUQ7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFDMk1hcHBlcjo6bWFwKHNmQXNwZWN0cy5tUmFuZ2UsICZjb2RlZEFzcGVjdHMucmFuZ2UpKSB7CisgICAgICAgICAgICBjb2RlZEFzcGVjdHMucmFuZ2UgPSBDMkNvbG9yOjpSQU5HRV9VTlNQRUNJRklFRDsKKyAgICAgICAgfQorICAgICAgICBpZiAoIUMyTWFwcGVyOjptYXAoc2ZBc3BlY3RzLm1NYXRyaXhDb2VmZnMsICZjb2RlZEFzcGVjdHMubWF0cml4KSkgeworICAgICAgICAgICAgY29kZWRBc3BlY3RzLm1hdHJpeCA9IEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRDsKKyAgICAgICAgfQorICAgICAgICBpZiAoIUMyTWFwcGVyOjptYXAoc2ZBc3BlY3RzLm1UcmFuc2ZlciwgJmNvZGVkQXNwZWN0cy50cmFuc2ZlcikpIHsKKyAgICAgICAgICAgIGNvZGVkQXNwZWN0cy50cmFuc2ZlciA9IEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVEOworICAgICAgICB9CisgICAgICAgIHN0ZDo6dmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDMlNldHRpbmdSZXN1bHQ+PiBmYWlsdXJlczsKKyAgICAgICAgbUludGYtPmNvbmZpZyh7JmNvZGVkQXNwZWN0c30sIEMyX01BWV9CTE9DSywgJmZhaWx1cmVzKTsKKyAgICB9Cit9CisKIGJvb2wgQzJTb2Z0R2F2MURlYzo6b3V0cHV0QnVmZmVyKGNvbnN0IHN0ZDo6c2hhcmVkX3B0cjxDMkJsb2NrUG9vbD4gJnBvb2wsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8QzJXb3JrPiAmd29yaykgewogICBpZiAoISh3b3JrICYmIHBvb2wpKSByZXR1cm4gZmFsc2U7CkBAIC02NTEsNiArNzYxLDcgQEAKICAgICB9CiAgIH0KIAorICBnZXRWdWlQYXJhbXMoYnVmZmVyKTsKICAgaWYgKCEoYnVmZmVyLT5pbWFnZV9mb3JtYXQgPT0gbGliZ2F2MTo6a0ltYWdlRm9ybWF0WXV2NDIwIHx8CiAgICAgICAgIGJ1ZmZlci0+aW1hZ2VfZm9ybWF0ID09IGxpYmdhdjE6OmtJbWFnZUZvcm1hdE1vbm9jaHJvbWU0MDApKSB7CiAgICAgQUxPR0UoImltYWdlX2Zvcm1hdCAlZCBub3Qgc3VwcG9ydGVkIiwgYnVmZmVyLT5pbWFnZV9mb3JtYXQpOwpAQCAtNjY2LDEyICs3NzcsMTIgQEAKICAgdWludDMyX3QgZm9ybWF0ID0gSEFMX1BJWEVMX0ZPUk1BVF9ZVjEyOwogICBpZiAoYnVmZmVyLT5iaXRkZXB0aCA9PSAxMCkgewogICAgIEludGZJbXBsOjpMb2NrIGxvY2sgPSBtSW50Zi0+bG9jaygpOwotICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUNvbG9yQXNwZWN0c1R1bmluZzo6b3V0cHV0PiBkZWZhdWx0Q29sb3JBc3BlY3RzID0KLSAgICAgICAgbUludGYtPmdldERlZmF1bHRDb2xvckFzcGVjdHNfbCgpOworICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUNvbG9yQXNwZWN0c0luZm86Om91dHB1dD4gY29kZWRDb2xvckFzcGVjdHMgPQorICAgICAgICBtSW50Zi0+Z2V0Q29sb3JBc3BlY3RzX2woKTsKIAotICAgIGlmIChkZWZhdWx0Q29sb3JBc3BlY3RzLT5wcmltYXJpZXMgPT0gQzJDb2xvcjo6UFJJTUFSSUVTX0JUMjAyMCAmJgotICAgICAgICBkZWZhdWx0Q29sb3JBc3BlY3RzLT5tYXRyaXggPT0gQzJDb2xvcjo6TUFUUklYX0JUMjAyMCAmJgotICAgICAgICBkZWZhdWx0Q29sb3JBc3BlY3RzLT50cmFuc2ZlciA9PSBDMkNvbG9yOjpUUkFOU0ZFUl9TVDIwODQpIHsKKyAgICBpZiAoY29kZWRDb2xvckFzcGVjdHMtPnByaW1hcmllcyA9PSBDMkNvbG9yOjpQUklNQVJJRVNfQlQyMDIwICYmCisgICAgICAgIGNvZGVkQ29sb3JBc3BlY3RzLT5tYXRyaXggPT0gQzJDb2xvcjo6TUFUUklYX0JUMjAyMCAmJgorICAgICAgICBjb2RlZENvbG9yQXNwZWN0cy0+dHJhbnNmZXIgPT0gQzJDb2xvcjo6VFJBTlNGRVJfU1QyMDg0KSB7CiAgICAgICBpZiAoYnVmZmVyLT5pbWFnZV9mb3JtYXQgIT0gbGliZ2F2MTo6a0ltYWdlRm9ybWF0WXV2NDIwKSB7CiAgICAgICAgIEFMT0dFKCJPbmx5IFlVVjQyMCBvdXRwdXQgaXMgc3VwcG9ydGVkIHdoZW4gdGFyZ2V0aW5nIFJHQkFfMTAxMDEwMiIpOwogICAgICAgICBtU2lnbmFsbGVkRXJyb3IgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvZ2F2MS9DMlNvZnRHYXYxRGVjLmggYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9nYXYxL0MyU29mdEdhdjFEZWMuaAppbmRleCA1NTVhZGM5Li4xMzRmYTBkIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9nYXYxL0MyU29mdEdhdjFEZWMuaAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9nYXYxL0MyU29mdEdhdjFEZWMuaApAQCAtMTcsNyArMTcsMTAgQEAKICNpZm5kZWYgQU5EUk9JRF9DMl9TT0ZUX0dBVjFfREVDX0hfCiAjZGVmaW5lIEFORFJPSURfQzJfU09GVF9HQVYxX0RFQ19IXwogCisjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9Db2xvclV0aWxzLmg+CisKICNpbmNsdWRlIDxTaW1wbGVDMkNvbXBvbmVudC5oPgorI2luY2x1ZGUgPEMyQ29uZmlnLmg+CiAjaW5jbHVkZSAibGliZ2F2MS9zcmMvZ2F2MS9kZWNvZGVyLmgiCiAjaW5jbHVkZSAibGliZ2F2MS9zcmMvZ2F2MS9kZWNvZGVyX3NldHRpbmdzLmgiCiAKQEAgLTU2LDEwICs1OSwzMiBAQAogICBib29sIG1TaWduYWxsZWRPdXRwdXRFb3M7CiAgIGJvb2wgbVNpZ25hbGxlZEVycm9yOwogCisgIC8vIENvbG9yIGFzcGVjdHMuIFRoZXNlIGFyZSBJU08gdmFsdWVzIGFuZCBhcmUgbWVhbnQgdG8gZGV0ZWN0IGNoYW5nZXMgaW4gYXNwZWN0cyB0byBhdm9pZAorICAvLyBjb252ZXJ0aW5nIHRoZW0gdG8gQzIgdmFsdWVzIGZvciBlYWNoIGZyYW1lCisgIHN0cnVjdCBWdWlDb2xvckFzcGVjdHMgeworICAgICAgdWludDhfdCBwcmltYXJpZXM7CisgICAgICB1aW50OF90IHRyYW5zZmVyOworICAgICAgdWludDhfdCBjb2VmZnM7CisgICAgICB1aW50OF90IGZ1bGxSYW5nZTsKKworICAgICAgLy8gZGVmYXVsdCBjb2xvciBhc3BlY3RzCisgICAgICBWdWlDb2xvckFzcGVjdHMoKQorICAgICAgICAgIDogcHJpbWFyaWVzKEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCksCisgICAgICAgICAgICB0cmFuc2ZlcihDMkNvbG9yOjpUUkFOU0ZFUl9VTlNQRUNJRklFRCksCisgICAgICAgICAgICBjb2VmZnMoQzJDb2xvcjo6TUFUUklYX1VOU1BFQ0lGSUVEKSwKKyAgICAgICAgICAgIGZ1bGxSYW5nZShDMkNvbG9yOjpSQU5HRV9VTlNQRUNJRklFRCkgeyB9CisKKyAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBWdWlDb2xvckFzcGVjdHMgJm8pIHsKKyAgICAgICAgICByZXR1cm4gcHJpbWFyaWVzID09IG8ucHJpbWFyaWVzICYmIHRyYW5zZmVyID09IG8udHJhbnNmZXIgJiYgY29lZmZzID09IG8uY29lZmZzCisgICAgICAgICAgICAgICAgICAmJiBmdWxsUmFuZ2UgPT0gby5mdWxsUmFuZ2U7CisgICAgICB9CisgIH0gbUJpdHN0cmVhbUNvbG9yQXNwZWN0czsKKwogICBzdHJ1Y3QgdGltZXZhbCBtVGltZVN0YXJ0OyAgLy8gVGltZSBhdCB0aGUgc3RhcnQgb2YgZGVjb2RlKCkKICAgc3RydWN0IHRpbWV2YWwgbVRpbWVFbmQ7ICAgIC8vIFRpbWUgYXQgdGhlIGVuZCBvZiBkZWNvZGUoKQogCiAgIGJvb2wgaW5pdERlY29kZXIoKTsKKyAgdm9pZCBnZXRWdWlQYXJhbXMoY29uc3QgbGliZ2F2MTo6RGVjb2RlckJ1ZmZlciAqYnVmZmVyKTsKICAgdm9pZCBkZXN0cm95RGVjb2RlcigpOwogICB2b2lkIGZpbmlzaFdvcmsodWludDY0X3QgaW5kZXgsIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxDMldvcms+JiB3b3JrLAogICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjpzaGFyZWRfcHRyPEMyR3JhcGhpY0Jsb2NrPiYgYmxvY2spOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvaGV2Yy9DMlNvZnRIZXZjRGVjLmNwcCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0RlYy5jcHAKaW5kZXggNmJjZjNhMi4uNWY1YjJlZiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvaGV2Yy9DMlNvZnRIZXZjRGVjLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9oZXZjL0MyU29mdEhldmNEZWMuY3BwCkBAIC01MDIsNyArNTAyLDcgQEAKIHN0YXR1c190IEMyU29mdEhldmNEZWM6OmluaXREZWNvZGVyKCkgewogICAgIGlmIChPSyAhPSBjcmVhdGVEZWNvZGVyKCkpIHJldHVybiBVTktOT1dOX0VSUk9SOwogICAgIG1OdW1Db3JlcyA9IE1JTihnZXRDcHVDb3JlQ291bnQoKSwgTUFYX05VTV9DT1JFUyk7Ci0gICAgbVN0cmlkZSA9IEFMSUdOMzIobVdpZHRoKTsKKyAgICBtU3RyaWRlID0gQUxJR04xMjgobVdpZHRoKTsKICAgICBtU2lnbmFsbGVkRXJyb3IgPSBmYWxzZTsKICAgICByZXNldFBsdWdpbigpOwogICAgICh2b2lkKSBzZXROdW1Db3JlcygpOwpAQCAtNzY4LDIwICs3NjgsMjAgQEAKICAgICAgICAgcmV0dXJuIEMyX0NPUlJVUFRFRDsKICAgICB9CiAgICAgaWYgKG1PdXRCbG9jayAmJgotICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjMyKG1XaWR0aCkgfHwgbU91dEJsb2NrLT5oZWlnaHQoKSAhPSBtSGVpZ2h0KSkgeworICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjEyOChtV2lkdGgpIHx8IG1PdXRCbG9jay0+aGVpZ2h0KCkgIT0gbUhlaWdodCkpIHsKICAgICAgICAgbU91dEJsb2NrLnJlc2V0KCk7CiAgICAgfQogICAgIGlmICghbU91dEJsb2NrKSB7CiAgICAgICAgIHVpbnQzMl90IGZvcm1hdCA9IEhBTF9QSVhFTF9GT1JNQVRfWVYxMjsKICAgICAgICAgQzJNZW1vcnlVc2FnZSB1c2FnZSA9IHsgQzJNZW1vcnlVc2FnZTo6Q1BVX1JFQUQsIEMyTWVtb3J5VXNhZ2U6OkNQVV9XUklURSB9OwogICAgICAgICBjMl9zdGF0dXNfdCBlcnIgPQotICAgICAgICAgICAgcG9vbC0+ZmV0Y2hHcmFwaGljQmxvY2soQUxJR04zMihtV2lkdGgpLCBtSGVpZ2h0LCBmb3JtYXQsIHVzYWdlLCAmbU91dEJsb2NrKTsKKyAgICAgICAgICAgIHBvb2wtPmZldGNoR3JhcGhpY0Jsb2NrKEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQsIGZvcm1hdCwgdXNhZ2UsICZtT3V0QmxvY2spOwogICAgICAgICBpZiAoZXJyICE9IEMyX09LKSB7CiAgICAgICAgICAgICBBTE9HRSgiZmV0Y2hHcmFwaGljQmxvY2sgZm9yIE91dHB1dCBmYWlsZWQgd2l0aCBzdGF0dXMgJWQiLCBlcnIpOwogICAgICAgICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgICAgICBBTE9HVigicHJvdmlkZWQgKCVkeCVkKSByZXF1aXJlZCAoJWR4JWQpIiwKLSAgICAgICAgICAgICAgbU91dEJsb2NrLT53aWR0aCgpLCBtT3V0QmxvY2stPmhlaWdodCgpLCBBTElHTjMyKG1XaWR0aCksIG1IZWlnaHQpOworICAgICAgICAgICAgICBtT3V0QmxvY2stPndpZHRoKCksIG1PdXRCbG9jay0+aGVpZ2h0KCksIEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQpOwogICAgIH0KIAogICAgIHJldHVybiBDMl9PSzsKQEAgLTkxNyw3ICs5MTcsNyBAQAogICAgICAgICBpZiAoMCA8IHBzX2RlY29kZV9vcC0+dTRfcGljX3dkICYmIDAgPCBwc19kZWNvZGVfb3AtPnU0X3BpY19odCkgewogICAgICAgICAgICAgaWYgKG1IZWFkZXJEZWNvZGVkID09IGZhbHNlKSB7CiAgICAgICAgICAgICAgICAgbUhlYWRlckRlY29kZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgIHNldFBhcmFtcyhBTElHTjMyKHBzX2RlY29kZV9vcC0+dTRfcGljX3dkKSwgSVZEX0RFQ09ERV9GUkFNRSk7CisgICAgICAgICAgICAgICAgc2V0UGFyYW1zKEFMSUdOMTI4KHBzX2RlY29kZV9vcC0+dTRfcGljX3dkKSwgSVZEX0RFQ09ERV9GUkFNRSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAocHNfZGVjb2RlX29wLT51NF9waWNfd2QgIT0gbVdpZHRoIHx8ICBwc19kZWNvZGVfb3AtPnU0X3BpY19odCAhPSBtSGVpZ2h0KSB7CiAgICAgICAgICAgICAgICAgbVdpZHRoID0gcHNfZGVjb2RlX29wLT51NF9waWNfd2Q7CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9oZXZjL0MyU29mdEhldmNEZWMuaCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0RlYy5oCmluZGV4IGI5YjBhNDguLmI5Mjk2ZTkgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0RlYy5oCisrKyBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0RlYy5oCkBAIC0zNiw3ICszNiw3IEBACiAjZGVmaW5lIGl2ZGV4dF9jdGxfc2V0X251bV9jb3Jlc19vcF90ICAgaWhldmNkX2N4YV9jdGxfc2V0X251bV9jb3Jlc19vcF90CiAjZGVmaW5lIGl2ZGV4dF9jdGxfZ2V0X3Z1aV9wYXJhbXNfaXBfdCAgaWhldmNkX2N4YV9jdGxfZ2V0X3Z1aV9wYXJhbXNfaXBfdAogI2RlZmluZSBpdmRleHRfY3RsX2dldF92dWlfcGFyYW1zX29wX3QgIGloZXZjZF9jeGFfY3RsX2dldF92dWlfcGFyYW1zX29wX3QKLSNkZWZpbmUgQUxJR04zMih4KSAgICAgICAgICAgICAgICAgICAgICAoKCgoeCkgKyAzMSkgPj4gNSkgPDwgNSkKKyNkZWZpbmUgQUxJR04xMjgoeCkgICAgICAgICAgICAgICAgICAgICAoKCgoeCkgKyAxMjcpID4+IDcpIDw8IDcpCiAjZGVmaW5lIE1BWF9OVU1fQ09SRVMgICAgICAgICAgICAgICAgICAgNAogI2RlZmluZSBJVkRFWFRfQ01EX0NUTF9TRVRfTlVNX0NPUkVTICAgIFwKICAgICAgICAgKElWRF9DT05UUk9MX0FQSV9DT01NQU5EX1RZUEVfVClJSEVWQ0RfQ1hBX0NNRF9DVExfU0VUX05VTV9DT1JFUwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvaGV2Yy9DMlNvZnRIZXZjRW5jLmNwcCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0VuYy5jcHAKaW5kZXggNGJjMTc3Ny4uYjdhNTY4NiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvaGV2Yy9DMlNvZnRIZXZjRW5jLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9oZXZjL0MyU29mdEhldmNFbmMuY3BwCkBAIC0yNDUsNiArMjQ1LDE5IEBACiAgICAgICAgICAgICAgICAgfSkKICAgICAgICAgICAgICAgICAud2l0aFNldHRlcihDb2RlZENvbG9yQXNwZWN0c1NldHRlciwgbUNvbG9yQXNwZWN0cykKICAgICAgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICAgICAgYWRkUGFyYW1ldGVyKAorICAgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1QaWN0dXJlUXVhbnRpemF0aW9uLCBDMl9QQVJBTUtFWV9QSUNUVVJFX1FVQU5USVpBVElPTikKKyAgICAgICAgICAgICAgICAud2l0aERlZmF1bHQoQzJTdHJlYW1QaWN0dXJlUXVhbnRpemF0aW9uVHVuaW5nOjpvdXRwdXQ6OkFsbG9jU2hhcmVkKAorICAgICAgICAgICAgICAgICAgICAgICAgMCAvKiBmbGV4Q291bnQgKi8sIDB1IC8qIHN0cmVhbSAqLykpCisgICAgICAgICAgICAgICAgLndpdGhGaWVsZHMoe0MyRihtUGljdHVyZVF1YW50aXphdGlvbiwgbS52YWx1ZXNbMF0udHlwZV8pLm9uZU9mKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QzJDb25maWc6OnBpY3R1cmVfdHlwZV90KElfRlJBTUUpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29uZmlnOjpwaWN0dXJlX3R5cGVfdChQX0ZSQU1FKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoQl9GUkFNRSl9KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJGKG1QaWN0dXJlUXVhbnRpemF0aW9uLCBtLnZhbHVlc1swXS5taW4pLmFueSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkYobVBpY3R1cmVRdWFudGl6YXRpb24sIG0udmFsdWVzWzBdLm1heCkuYW55KCl9KQorICAgICAgICAgICAgICAgIC53aXRoU2V0dGVyKFBpY3R1cmVRdWFudGl6YXRpb25TZXR0ZXIpCisgICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwogICAgIH0KIAogICAgIHN0YXRpYyBDMlIgSW5wdXREZWxheVNldHRlcigKQEAgLTQ2NCw5ICs0NzcsNjkgQEAKICAgICAgICAgbWUuc2V0KCkubWF0cml4ID0gY29kZWQudi5tYXRyaXg7CiAgICAgICAgIHJldHVybiBDMlI6Ok9rKCk7CiAgICAgfQorICAgIHN0YXRpYyBDMlIgUGljdHVyZVF1YW50aXphdGlvblNldHRlcihib29sIG1heUJsb2NrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMlA8QzJTdHJlYW1QaWN0dXJlUXVhbnRpemF0aW9uVHVuaW5nOjpvdXRwdXQ+ICZtZSkgeworICAgICAgICAodm9pZCltYXlCbG9jazsKKworICAgICAgICAvLyB0aGVzZSBhcmUgdGhlIG9uZXMgd2UncmUgZ29pbmcgdG8gc2V0LCBzbyB3YW50IHRoZW0gdG8gZGVmYXVsdAorICAgICAgICAvLyB0byB0aGUgREVGQVVMVCB2YWx1ZXMgZm9yIHRoZSBjb2RlYworICAgICAgICBpbnQzMl90IGlNaW4gPSBIRVZDX1FQX01JTiwgcE1pbiA9IEhFVkNfUVBfTUlOLCBiTWluID0gSEVWQ19RUF9NSU47CisgICAgICAgIGludDMyX3QgaU1heCA9IEhFVkNfUVBfTUFYLCBwTWF4ID0gSEVWQ19RUF9NQVgsIGJNYXggPSBIRVZDX1FQX01BWDsKKworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1lLnYuZmxleENvdW50KCk7ICsraSkgeworICAgICAgICAgICAgY29uc3QgQzJQaWN0dXJlUXVhbnRpemF0aW9uU3RydWN0ICZsYXllciA9IG1lLnYubS52YWx1ZXNbaV07CisKKyAgICAgICAgICAgIC8vIGxheWVyTWluIGlzIGNsYW1wZWQgdG8gW0hFVkNfUVBfTUlOLCBsYXllck1heF0gdG8gYXZvaWQgZXJyb3IKKyAgICAgICAgICAgIC8vIGNhc2VzIHdoZXJlIGxheWVyLm1pbiA+IGxheWVyLm1heAorICAgICAgICAgICAgaW50MzJfdCBsYXllck1heCA9IHN0ZDo6Y2xhbXAobGF5ZXIubWF4LCBIRVZDX1FQX01JTiwgSEVWQ19RUF9NQVgpOworICAgICAgICAgICAgaW50MzJfdCBsYXllck1pbiA9IHN0ZDo6Y2xhbXAobGF5ZXIubWluLCBIRVZDX1FQX01JTiwgbGF5ZXJNYXgpOworICAgICAgICAgICAgaWYgKGxheWVyLnR5cGVfID09IEMyQ29uZmlnOjpwaWN0dXJlX3R5cGVfdChJX0ZSQU1FKSkgeworICAgICAgICAgICAgICAgIGlNYXggPSBsYXllck1heDsKKyAgICAgICAgICAgICAgICBpTWluID0gbGF5ZXJNaW47CisgICAgICAgICAgICAgICAgQUxPR1YoImlNaW4gJWQgaU1heCAlZCIsIGlNaW4sIGlNYXgpOworICAgICAgICAgICAgfSBlbHNlIGlmIChsYXllci50eXBlXyA9PSBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoUF9GUkFNRSkpIHsKKyAgICAgICAgICAgICAgICBwTWF4ID0gbGF5ZXJNYXg7CisgICAgICAgICAgICAgICAgcE1pbiA9IGxheWVyTWluOworICAgICAgICAgICAgICAgIEFMT0dWKCJwTWluICVkIHBNYXggJWQiLCBwTWluLCBwTWF4KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5ZXIudHlwZV8gPT0gQzJDb25maWc6OnBpY3R1cmVfdHlwZV90KEJfRlJBTUUpKSB7CisgICAgICAgICAgICAgICAgYk1heCA9IGxheWVyTWF4OworICAgICAgICAgICAgICAgIGJNaW4gPSBsYXllck1pbjsKKyAgICAgICAgICAgICAgICBBTE9HVigiYk1pbiAlZCBiTWF4ICVkIiwgYk1pbiwgYk1heCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBBTE9HVigiUGljdHVyZVF1YW50aXphdGlvblNldHRlcihlbnRyeSk6IGkgJWQtJWQgcCAlZC0lZCBiICVkLSVkIiwKKyAgICAgICAgICAgICAgaU1pbiwgaU1heCwgcE1pbiwgcE1heCwgYk1pbiwgYk1heCk7CisKKyAgICAgICAgaW50MzJfdCBtYXhGcmFtZVFQID0gc3RkOjptaW4oc3RkOjptaW4oaU1heCwgcE1heCksIGJNYXgpOworICAgICAgICBpbnQzMl90IG1pbkZyYW1lUVAgPSBzdGQ6Om1heChzdGQ6Om1heChpTWluLCBwTWluKSwgYk1pbik7CisgICAgICAgIGlmIChtaW5GcmFtZVFQID4gbWF4RnJhbWVRUCkgeworICAgICAgICAgICAgbWluRnJhbWVRUCA9IG1heEZyYW1lUVA7CisgICAgICAgIH0KKworICAgICAgICAvLyBwdXQgdGhlbSBiYWNrIGludG8gdGhlIHN0cnVjdHVyZQorICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1lLnYuZmxleENvdW50KCk7ICsraSkgeworICAgICAgICAgICAgY29uc3QgQzJQaWN0dXJlUXVhbnRpemF0aW9uU3RydWN0ICZsYXllciA9IG1lLnYubS52YWx1ZXNbaV07CisKKyAgICAgICAgICAgIGlmIChsYXllci50eXBlXyA9PSBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoSV9GUkFNRSkgfHwKKyAgICAgICAgICAgICAgICBsYXllci50eXBlXyA9PSBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoUF9GUkFNRSkgfHwKKyAgICAgICAgICAgICAgICBsYXllci50eXBlXyA9PSBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoQl9GUkFNRSkpIHsKKyAgICAgICAgICAgICAgICBtZS5zZXQoKS5tLnZhbHVlc1tpXS5tYXggPSBtYXhGcmFtZVFQOworICAgICAgICAgICAgICAgIG1lLnNldCgpLm0udmFsdWVzW2ldLm1pbiA9IG1pbkZyYW1lUVA7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBBTE9HVigiUGljdHVyZVF1YW50aXphdGlvblNldHRlcihleGl0KTogaSA9IHAgPSBiID0gJWQtJWQiLAorICAgICAgICAgICAgICBtaW5GcmFtZVFQLCBtYXhGcmFtZVFQKTsKKworICAgICAgICByZXR1cm4gQzJSOjpPaygpOworICAgIH0KICAgICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjpvdXRwdXQ+IGdldENvZGVkQ29sb3JBc3BlY3RzX2woKSB7CiAgICAgICAgIHJldHVybiBtQ29kZWRDb2xvckFzcGVjdHM7CiAgICAgfQorICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVBpY3R1cmVRdWFudGl6YXRpb25UdW5pbmc6Om91dHB1dD4gZ2V0UGljdHVyZVF1YW50aXphdGlvbl9sKCkgY29uc3QgeworICAgICAgICByZXR1cm4gbVBpY3R1cmVRdWFudGl6YXRpb247CisgICAgfQogCiAgICBwcml2YXRlOgogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVVzYWdlVHVuaW5nOjppbnB1dD4gbVVzYWdlOwpAQCAtNDgyLDYgKzU1NSw3IEBACiAgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtR29wVHVuaW5nOjpvdXRwdXQ+IG1Hb3A7CiAgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6aW5wdXQ+IG1Db2xvckFzcGVjdHM7CiAgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6b3V0cHV0PiBtQ29kZWRDb2xvckFzcGVjdHM7CisgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtUGljdHVyZVF1YW50aXphdGlvblR1bmluZzo6b3V0cHV0PiBtUGljdHVyZVF1YW50aXphdGlvbjsKIH07CiAKIHN0YXRpYyBzaXplX3QgR2V0Q1BVQ29yZUNvdW50KCkgewpAQCAtNjU0LDEyICs3MjgsNDEgQEAKICAgICAgICAgbUVuY1BhcmFtcy5zX2NvZGluZ190b29sc19wcm1zLmk0X21heF90ZW1wb3JhbF9sYXllcnMgPSAzOwogICAgIH0KIAotICAgIHN3aXRjaCAobUJpdHJhdGVNb2RlLT52YWx1ZSkgewotICAgICAgICBjYXNlIEMyQ29uZmlnOjpCSVRSQVRFX0lHTk9SRToKLSAgICAgICAgICAgIG1FbmNQYXJhbXMuc19jb25maWdfcHJtcy5pNF9yYXRlX2NvbnRyb2xfbW9kZSA9IDM7Ci0gICAgICAgICAgICBtRW5jUGFyYW1zLnNfdGd0X2x5cl9wcm1zLmFzX3RndF9wYXJhbXNbMF0uYWk0X2ZyYW1lX3FwWzBdID0KLSAgICAgICAgICAgICAgICBnZXRRcEZyb21RdWFsaXR5KG1RdWFsaXR5LT52YWx1ZSk7CisgICAgLy8gd2UgcmVzb2x2ZWQgb3V0LW9mLWJvdW5kIGFuZCB1bnNwZWNpZmllZCB2YWx1ZXMgaW4gUGljdHVyZVF1YW50aXphdGlvblNldHRlcigpCisgICAgLy8gc28gd2UgY2FuIHN0YXJ0IHdpdGggZGVmYXVsdHMgdGhhdCBhcmUgb3ZlcnJpZGRlbiBhcyBuZWVkZWQuCisgICAgaW50MzJfdCBtYXhGcmFtZVFQID0gbUVuY1BhcmFtcy5zX2NvbmZpZ19wcm1zLmk0X21heF9mcmFtZV9xcDsKKyAgICBpbnQzMl90IG1pbkZyYW1lUVAgPSBtRW5jUGFyYW1zLnNfY29uZmlnX3BybXMuaTRfbWluX2ZyYW1lX3FwOworCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtUXBCb3VuZHMtPmZsZXhDb3VudCgpOyArK2kpIHsKKyAgICAgICAgY29uc3QgQzJQaWN0dXJlUXVhbnRpemF0aW9uU3RydWN0ICZsYXllciA9IG1RcEJvdW5kcy0+bS52YWx1ZXNbaV07CisKKyAgICAgICAgLy8gbm8gbmVlZCB0byBsb29wLCBoZXZjIGxpYnJhcnkgdGFrZXMgc2FtZSByYW5nZSBmb3IgSS9QL0IgcGljdHVyZSB0eXBlCisgICAgICAgIGlmIChsYXllci50eXBlXyA9PSBDMkNvbmZpZzo6cGljdHVyZV90eXBlX3QoSV9GUkFNRSkgfHwKKyAgICAgICAgICAgIGxheWVyLnR5cGVfID09IEMyQ29uZmlnOjpwaWN0dXJlX3R5cGVfdChQX0ZSQU1FKSB8fAorICAgICAgICAgICAgbGF5ZXIudHlwZV8gPT0gQzJDb25maWc6OnBpY3R1cmVfdHlwZV90KEJfRlJBTUUpKSB7CisKKyAgICAgICAgICAgIG1heEZyYW1lUVAgPSBsYXllci5tYXg7CisgICAgICAgICAgICBtaW5GcmFtZVFQID0gbGF5ZXIubWluOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisgICAgbUVuY1BhcmFtcy5zX2NvbmZpZ19wcm1zLmk0X21heF9mcmFtZV9xcCA9IG1heEZyYW1lUVA7CisgICAgbUVuY1BhcmFtcy5zX2NvbmZpZ19wcm1zLmk0X21pbl9mcmFtZV9xcCA9IG1pbkZyYW1lUVA7CisKKyAgICBBTE9HVigiTWF4RnJhbWVRcDogJWQgTWluRnJhbWVRcDogJWQiLCBtYXhGcmFtZVFQLCBtaW5GcmFtZVFQKTsKKworICAgIG1FbmNQYXJhbXMuc190Z3RfbHlyX3BybXMuYXNfdGd0X3BhcmFtc1swXS5haTRfZnJhbWVfcXBbMF0gPQorICAgICAgICBzdGQ6OmNsYW1wKGtEZWZhdWx0SW5pdFFQLCBtaW5GcmFtZVFQLCBtYXhGcmFtZVFQKTsKKworICAgIHN3aXRjaCAobUJpdHJhdGVNb2RlLT52YWx1ZSkgeworICAgICAgICBjYXNlIEMyQ29uZmlnOjpCSVRSQVRFX0lHTk9SRTogeworICAgICAgICAgICAgbUVuY1BhcmFtcy5zX2NvbmZpZ19wcm1zLmk0X3JhdGVfY29udHJvbF9tb2RlID0gMzsKKyAgICAgICAgICAgIC8vIGVuc3VyZSBpbml0aWFsIHFwIHZhbHVlcyBhcmUgd2l0aGluIG91ciBuZXdseSBjb25maWd1cmVkIGJvdW5kcworICAgICAgICAgICAgaW50MzJfdCBmcmFtZVFwID0gZ2V0UXBGcm9tUXVhbGl0eShtUXVhbGl0eS0+dmFsdWUpOworICAgICAgICAgICAgbUVuY1BhcmFtcy5zX3RndF9seXJfcHJtcy5hc190Z3RfcGFyYW1zWzBdLmFpNF9mcmFtZV9xcFswXSA9CisgICAgICAgICAgICAgICAgc3RkOjpjbGFtcChmcmFtZVFwLCBtaW5GcmFtZVFQLCBtYXhGcmFtZVFQKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAgIGNhc2UgQzJDb25maWc6OkJJVFJBVEVfQ09OU1Q6CiAgICAgICAgICAgICBtRW5jUGFyYW1zLnNfY29uZmlnX3BybXMuaTRfcmF0ZV9jb250cm9sX21vZGUgPSA1OwogICAgICAgICAgICAgYnJlYWs7CkBAIC03MjMsNiArODI2LDcgQEAKICAgICAgICAgbUdvcCA9IG1JbnRmLT5nZXRHb3BfbCgpOwogICAgICAgICBtUmVxdWVzdFN5bmMgPSBtSW50Zi0+Z2V0UmVxdWVzdFN5bmNfbCgpOwogICAgICAgICBtQ29sb3JBc3BlY3RzID0gbUludGYtPmdldENvZGVkQ29sb3JBc3BlY3RzX2woKTsKKyAgICAgICAgbVFwQm91bmRzID0gbUludGYtPmdldFBpY3R1cmVRdWFudGl6YXRpb25fbCgpOzsKICAgICB9CiAKICAgICBjMl9zdGF0dXNfdCBzdGF0dXMgPSBpbml0RW5jUGFyYW1zKCk7CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9oZXZjL0MyU29mdEhldmNFbmMuaCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0VuYy5oCmluZGV4IDlkYmY2ODIuLjQyMTdhOGIgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0VuYy5oCisrKyBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL2hldmMvQzJTb2Z0SGV2Y0VuYy5oCkBAIC00Miw2ICs0MiwxMSBAQAogI2RlZmluZSBERUZBVUxUX0JfRlJBTUVTICAgICAwCiAjZGVmaW5lIERFRkFVTFRfUkNfTE9PS0FIRUFEIDAKIAorI2RlZmluZSBIRVZDX1FQX01JTiAxCisjZGVmaW5lIEhFVkNfUVBfTUFYIDUxCisKK2NvbnN0ZXhwciBpbnQzMl90IGtEZWZhdWx0SW5pdFFQID0gMzI7CisKIHN0cnVjdCBDMlNvZnRIZXZjRW5jIDogcHVibGljIFNpbXBsZUMyQ29tcG9uZW50IHsKICAgICBjbGFzcyBJbnRmSW1wbDsKIApAQCAtOTAsNiArOTUsNyBAQAogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUdvcFR1bmluZzo6b3V0cHV0PiBtR29wOwogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVJlcXVlc3RTeW5jRnJhbWVUdW5pbmc6Om91dHB1dD4gbVJlcXVlc3RTeW5jOwogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUNvbG9yQXNwZWN0c0luZm86Om91dHB1dD4gbUNvbG9yQXNwZWN0czsKKyAgICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1QaWN0dXJlUXVhbnRpemF0aW9uVHVuaW5nOjpvdXRwdXQ+IG1RcEJvdW5kczsKICNpZmRlZiBGSUxFX0RVTVBfRU5BQkxFCiAgICAgY2hhciBtSW5GaWxlWzIwMF07CiAgICAgY2hhciBtT3V0RmlsZVsyMDBdOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXAzL0MyU29mdE1wM0RlYy5jcHAgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcDMvQzJTb2Z0TXAzRGVjLmNwcAppbmRleCBlMzk0NjcwLi4xNDljNmVlIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcDMvQzJTb2Z0TXAzRGVjLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcDMvQzJTb2Z0TXAzRGVjLmNwcApAQCAtMzIxLDYgKzMyMSwxMyBAQAogICAgIHJldHVybiBDMl9PSzsKIH0KIAorc3RhdGljIHZvaWQgZmlsbEVtcHR5V29yayhjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8QzJXb3JrPiAmd29yaykgeworICAgIHdvcmstPndvcmtsZXRzLmZyb250KCktPm91dHB1dC5mbGFncyA9IHdvcmstPmlucHV0LmZsYWdzOworICAgIHdvcmstPndvcmtsZXRzLmZyb250KCktPm91dHB1dC5idWZmZXJzLmNsZWFyKCk7CisgICAgd29yay0+d29ya2xldHMuZnJvbnQoKS0+b3V0cHV0Lm9yZGluYWwgPSB3b3JrLT5pbnB1dC5vcmRpbmFsOworICAgIHdvcmstPndvcmtsZXRzUHJvY2Vzc2VkID0gMXU7Cit9CisKIC8vIFRPRE86IENhbiBvdmVyYWxsIGVycm9yIGNoZWNraW5nIGJlIGltcHJvdmVkPyBBcyBpbiB0aGUgY2hlY2sgZm9yIHZhbGlkaXR5IG9mCiAvLyAgICAgICB3b3JrLCBwb29sIHB0ciwgd29yay0+aW5wdXQuYnVmZmVycy5zaXplKCkgPT0gMSwgLi4uCiAvLyBUT0RPOiBCbGluZCByZW1vdmFsIG9mIDUyOSBzYW1wbGVzIGZyb20gdGhlIG91dHB1dCBtYXkgbm90IHdvcmsuIEJlY2F1c2UKQEAgLTQ4NiwxNyArNDkzLDE3IEBACiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpbnQ2NF90IG91dFRpbWVTdGFtcCA9IG1Qcm9jZXNzZWRTYW1wbGVzICogMTAwMDAwMGxsIC8gc2FtcGxpbmdSYXRlOwotICAgIG1Qcm9jZXNzZWRTYW1wbGVzICs9ICgob3V0U2l6ZSAtIG91dE9mZnNldCkgLyAobnVtQ2hhbm5lbHMgKiBzaXplb2YoaW50MTZfdCkpKTsKLSAgICBBTE9HVigib3V0IGJ1ZmZlciBhdHRyLiBvZmZzZXQgJWQgc2l6ZSAlZCB0aW1lc3RhbXAgJSIgUFJJZDY0ICIgIiwgb3V0T2Zmc2V0LAotICAgICAgICAgIG91dFNpemUgLSBvdXRPZmZzZXQsIG1BbmNob3JUaW1lU3RhbXAgKyBvdXRUaW1lU3RhbXApOwotICAgIGRlY29kZWRTaXplcy5jbGVhcigpOwotICAgIHdvcmstPndvcmtsZXRzLmZyb250KCktPm91dHB1dC5mbGFncyA9IHdvcmstPmlucHV0LmZsYWdzOwotICAgIHdvcmstPndvcmtsZXRzLmZyb250KCktPm91dHB1dC5idWZmZXJzLmNsZWFyKCk7Ci0gICAgd29yay0+d29ya2xldHMuZnJvbnQoKS0+b3V0cHV0LmJ1ZmZlcnMucHVzaF9iYWNrKAotICAgICAgICAgICAgY3JlYXRlTGluZWFyQnVmZmVyKGJsb2NrLCBvdXRPZmZzZXQsIG91dFNpemUgLSBvdXRPZmZzZXQpKTsKLSAgICB3b3JrLT53b3JrbGV0cy5mcm9udCgpLT5vdXRwdXQub3JkaW5hbCA9IHdvcmstPmlucHV0Lm9yZGluYWw7Ci0gICAgd29yay0+d29ya2xldHMuZnJvbnQoKS0+b3V0cHV0Lm9yZGluYWwudGltZXN0YW1wID0gbUFuY2hvclRpbWVTdGFtcCArIG91dFRpbWVTdGFtcDsKKyAgICBmaWxsRW1wdHlXb3JrKHdvcmspOworICAgIGlmIChzYW1wbGluZ1JhdGUgJiYgbnVtQ2hhbm5lbHMpIHsKKyAgICAgICAgaW50NjRfdCBvdXRUaW1lU3RhbXAgPSBtUHJvY2Vzc2VkU2FtcGxlcyAqIDEwMDAwMDBsbCAvIHNhbXBsaW5nUmF0ZTsKKyAgICAgICAgbVByb2Nlc3NlZFNhbXBsZXMgKz0gKChvdXRTaXplIC0gb3V0T2Zmc2V0KSAvIChudW1DaGFubmVscyAqIHNpemVvZihpbnQxNl90KSkpOworICAgICAgICBBTE9HVigib3V0IGJ1ZmZlciBhdHRyLiBvZmZzZXQgJWQgc2l6ZSAlZCB0aW1lc3RhbXAgJSIgUFJJZDY0ICIgIiwgb3V0T2Zmc2V0LAorICAgICAgICAgICAgICAgb3V0U2l6ZSAtIG91dE9mZnNldCwgbUFuY2hvclRpbWVTdGFtcCArIG91dFRpbWVTdGFtcCk7CisgICAgICAgIGRlY29kZWRTaXplcy5jbGVhcigpOworICAgICAgICB3b3JrLT53b3JrbGV0cy5mcm9udCgpLT5vdXRwdXQuYnVmZmVycy5wdXNoX2JhY2soCisgICAgICAgICAgICAgICAgY3JlYXRlTGluZWFyQnVmZmVyKGJsb2NrLCBvdXRPZmZzZXQsIG91dFNpemUgLSBvdXRPZmZzZXQpKTsKKyAgICAgICAgd29yay0+d29ya2xldHMuZnJvbnQoKS0+b3V0cHV0Lm9yZGluYWwudGltZXN0YW1wID0gbUFuY2hvclRpbWVTdGFtcCArIG91dFRpbWVTdGFtcDsKKyAgICB9CiAgICAgaWYgKGVvcykgewogICAgICAgICBtU2lnbmFsbGVkT3V0cHV0RW9zID0gdHJ1ZTsKICAgICAgICAgQUxPR1YoInNpZ25hbGxlZCBFT1MiKTsKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWcyL0MyU29mdE1wZWcyRGVjLmNwcCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWcyL0MyU29mdE1wZWcyRGVjLmNwcAppbmRleCBiMWNmMzg4Li41ZjliMzBiIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnMi9DMlNvZnRNcGVnMkRlYy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzIvQzJTb2Z0TXBlZzJEZWMuY3BwCkBAIC01NzIsNyArNTcyLDcgQEAKICAgICBpZiAoT0sgIT0gY3JlYXRlRGVjb2RlcigpKSByZXR1cm4gVU5LTk9XTl9FUlJPUjsKIAogICAgIG1OdW1Db3JlcyA9IE1JTihnZXRDcHVDb3JlQ291bnQoKSwgTUFYX05VTV9DT1JFUyk7Ci0gICAgbVN0cmlkZSA9IEFMSUdOMzIobVdpZHRoKTsKKyAgICBtU3RyaWRlID0gQUxJR04xMjgobVdpZHRoKTsKICAgICBtU2lnbmFsbGVkRXJyb3IgPSBmYWxzZTsKICAgICByZXNldFBsdWdpbigpOwogICAgICh2b2lkKSBzZXROdW1Db3JlcygpOwpAQCAtODQ1LDIwICs4NDUsMjAgQEAKICAgICAgICAgcmV0dXJuIEMyX0NPUlJVUFRFRDsKICAgICB9CiAgICAgaWYgKG1PdXRCbG9jayAmJgotICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjMyKG1XaWR0aCkgfHwgbU91dEJsb2NrLT5oZWlnaHQoKSAhPSBtSGVpZ2h0KSkgeworICAgICAgICAgICAgKG1PdXRCbG9jay0+d2lkdGgoKSAhPSBBTElHTjEyOChtV2lkdGgpIHx8IG1PdXRCbG9jay0+aGVpZ2h0KCkgIT0gbUhlaWdodCkpIHsKICAgICAgICAgbU91dEJsb2NrLnJlc2V0KCk7CiAgICAgfQogICAgIGlmICghbU91dEJsb2NrKSB7CiAgICAgICAgIHVpbnQzMl90IGZvcm1hdCA9IEhBTF9QSVhFTF9GT1JNQVRfWVYxMjsKICAgICAgICAgQzJNZW1vcnlVc2FnZSB1c2FnZSA9IHsgQzJNZW1vcnlVc2FnZTo6Q1BVX1JFQUQsIEMyTWVtb3J5VXNhZ2U6OkNQVV9XUklURSB9OwogICAgICAgICBjMl9zdGF0dXNfdCBlcnIgPQotICAgICAgICAgICAgcG9vbC0+ZmV0Y2hHcmFwaGljQmxvY2soQUxJR04zMihtV2lkdGgpLCBtSGVpZ2h0LCBmb3JtYXQsIHVzYWdlLCAmbU91dEJsb2NrKTsKKyAgICAgICAgICAgIHBvb2wtPmZldGNoR3JhcGhpY0Jsb2NrKEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQsIGZvcm1hdCwgdXNhZ2UsICZtT3V0QmxvY2spOwogICAgICAgICBpZiAoZXJyICE9IEMyX09LKSB7CiAgICAgICAgICAgICBBTE9HRSgiZmV0Y2hHcmFwaGljQmxvY2sgZm9yIE91dHB1dCBmYWlsZWQgd2l0aCBzdGF0dXMgJWQiLCBlcnIpOwogICAgICAgICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgICAgICBBTE9HVigicHJvdmlkZWQgKCVkeCVkKSByZXF1aXJlZCAoJWR4JWQpIiwKLSAgICAgICAgICAgICAgbU91dEJsb2NrLT53aWR0aCgpLCBtT3V0QmxvY2stPmhlaWdodCgpLCBBTElHTjMyKG1XaWR0aCksIG1IZWlnaHQpOworICAgICAgICAgICAgICBtT3V0QmxvY2stPndpZHRoKCksIG1PdXRCbG9jay0+aGVpZ2h0KCksIEFMSUdOMTI4KG1XaWR0aCksIG1IZWlnaHQpOwogICAgIH0KIAogICAgIHJldHVybiBDMl9PSzsKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWcyL0MyU29mdE1wZWcyRGVjLmggYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnMi9DMlNvZnRNcGVnMkRlYy5oCmluZGV4IGZkNjYzMDRhLi44YTI5YzE0IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnMi9DMlNvZnRNcGVnMkRlYy5oCisrKyBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWcyL0MyU29mdE1wZWcyRGVjLmgKQEAgLTM3LDcgKzM3LDcgQEAKICNkZWZpbmUgaXZkZXh0X2N0bF9zZXRfbnVtX2NvcmVzX29wX3QgICBpbXBlZzJkX2N0bF9zZXRfbnVtX2NvcmVzX29wX3QKICNkZWZpbmUgaXZkZXh0X2N0bF9nZXRfc2VxX2luZm9faXBfdCAgICBpbXBlZzJkX2N0bF9nZXRfc2VxX2luZm9faXBfdAogI2RlZmluZSBpdmRleHRfY3RsX2dldF9zZXFfaW5mb19vcF90ICAgIGltcGVnMmRfY3RsX2dldF9zZXFfaW5mb19vcF90Ci0jZGVmaW5lIEFMSUdOMzIoeCkgICAgICAgICAgICAgICAgICAgICAgKCgoKHgpICsgMzEpID4+IDUpIDw8IDUpCisjZGVmaW5lIEFMSUdOMTI4KHgpICAgICAgICAgICAgICAgICAgICAgKCgoKHgpICsgMTI3KSA+PiA3KSA8PCA3KQogI2RlZmluZSBNQVhfTlVNX0NPUkVTICAgICAgICAgICAgICAgICAgIDQKICNkZWZpbmUgSVZERVhUX0NNRF9DVExfU0VUX05VTV9DT1JFUyAgICBcCiAgICAgICAgIChJVkRfQ09OVFJPTF9BUElfQ09NTUFORF9UWVBFX1QpSU1QRUcyRF9DTURfQ1RMX1NFVF9OVU1fQ09SRVMKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWc0X2gyNjMvQzJTb2Z0TXBlZzREZWMuY3BwIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNERlYy5jcHAKaW5kZXggZGRkMzEyZi4uODFmNDY3OSAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNERlYy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNERlYy5jcHAKQEAgLTIyOCw3ICsyMjgsNiBAQAogICAgICAgICBjb25zdCBzdGQ6OnNoYXJlZF9wdHI8SW50ZkltcGw+ICZpbnRmSW1wbCkKICAgICA6IFNpbXBsZUMyQ29tcG9uZW50KHN0ZDo6bWFrZV9zaGFyZWQ8U2ltcGxlSW50ZXJmYWNlPEludGZJbXBsPj4obmFtZSwgaWQsIGludGZJbXBsKSksCiAgICAgICBtSW50ZihpbnRmSW1wbCksCi0gICAgICBtRGVjSGFuZGxlKG51bGxwdHIpLAogICAgICAgbU91dHB1dEJ1ZmZlcnt9LAogICAgICAgbUluaXRpYWxpemVkKGZhbHNlKSB7CiB9CkBAIC0yNDQsOSArMjQzLDcgQEAKIAogYzJfc3RhdHVzX3QgQzJTb2Z0TXBlZzREZWM6Om9uU3RvcCgpIHsKICAgICBpZiAobUluaXRpYWxpemVkKSB7Ci0gICAgICAgIGlmIChtRGVjSGFuZGxlKSB7Ci0gICAgICAgICAgICBQVkNsZWFuVXBWaWRlb0RlY29kZXIobURlY0hhbmRsZSk7Ci0gICAgICAgIH0KKyAgICAgICAgUFZDbGVhblVwVmlkZW9EZWNvZGVyKCZtVmlkZW9EZWNDb250cm9scyk7CiAgICAgICAgIG1Jbml0aWFsaXplZCA9IGZhbHNlOwogICAgIH0KICAgICBmb3IgKGludDMyX3QgaSA9IDA7IGkgPCBrTnVtT3V0cHV0QnVmZmVyczsgKytpKSB7CkBAIC0yNjksMjggKzI2NiwxNSBAQAogfQogCiB2b2lkIEMyU29mdE1wZWc0RGVjOjpvblJlbGVhc2UoKSB7Ci0gICAgaWYgKG1Jbml0aWFsaXplZCkgewotICAgICAgICBpZiAobURlY0hhbmRsZSkgewotICAgICAgICAgICAgUFZDbGVhblVwVmlkZW9EZWNvZGVyKG1EZWNIYW5kbGUpOwotICAgICAgICAgICAgZGVsZXRlIG1EZWNIYW5kbGU7Ci0gICAgICAgICAgICBtRGVjSGFuZGxlID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgICAgICBtSW5pdGlhbGl6ZWQgPSBmYWxzZTsKLSAgICB9CisgICAgKHZvaWQpb25TdG9wKCk7CiAgICAgaWYgKG1PdXRCbG9jaykgewogICAgICAgICBtT3V0QmxvY2sucmVzZXQoKTsKICAgICB9Ci0gICAgZm9yIChpbnQzMl90IGkgPSAwOyBpIDwga051bU91dHB1dEJ1ZmZlcnM7ICsraSkgewotICAgICAgICBpZiAobU91dHB1dEJ1ZmZlcltpXSkgewotICAgICAgICAgICAgZnJlZShtT3V0cHV0QnVmZmVyW2ldKTsKLSAgICAgICAgICAgIG1PdXRwdXRCdWZmZXJbaV0gPSBudWxscHRyOwotICAgICAgICB9Ci0gICAgfQogfQogCiBjMl9zdGF0dXNfdCBDMlNvZnRNcGVnNERlYzo6b25GbHVzaF9zbSgpIHsKICAgICBpZiAobUluaXRpYWxpemVkKSB7Ci0gICAgICAgIGlmIChQVl9UUlVFICE9IFBWUmVzZXRWaWRlb0RlY29kZXIobURlY0hhbmRsZSkpIHsKKyAgICAgICAgaWYgKFBWX1RSVUUgIT0gUFZSZXNldFZpZGVvRGVjb2RlcigmbVZpZGVvRGVjQ29udHJvbHMpKSB7CiAgICAgICAgICAgICByZXR1cm4gQzJfQ09SUlVQVEVEOwogICAgICAgICB9CiAgICAgfQpAQCAtMzA1LDE0ICsyODksOCBAQAogI2Vsc2UKICAgICBtSXNNcGVnNCA9IGZhbHNlOwogI2VuZGlmCi0gICAgaWYgKCFtRGVjSGFuZGxlKSB7Ci0gICAgICAgIG1EZWNIYW5kbGUgPSBuZXcgdGFndmlkZW9EZWNDb250cm9sczsKLSAgICB9Ci0gICAgaWYgKCFtRGVjSGFuZGxlKSB7Ci0gICAgICAgIEFMT0dFKCJtRGVjSGFuZGxlIGlzIG51bGwiKTsKLSAgICAgICAgcmV0dXJuIE5PX01FTU9SWTsKLSAgICB9Ci0gICAgbWVtc2V0KG1EZWNIYW5kbGUsIDAsIHNpemVvZih0YWd2aWRlb0RlY0NvbnRyb2xzKSk7CisKKyAgICBtZW1zZXQoJm1WaWRlb0RlY0NvbnRyb2xzLCAwLCBzaXplb2YodGFndmlkZW9EZWNDb250cm9scykpOwogCiAgICAgLyogVE9ETzogYnJpbmcgdGhlc2UgdmFsdWVzIHRvIDM1MiBhbmQgMjg4LiBJdCBjYW5ub3QgYmUgZG9uZSBhcyBvZiBub3cKICAgICAgKiBiZWNhdXNlLCBoMjYzIGRvZXNuJ3Qgc2VlbSB0byBhbGxvdyBwb3J0IHJlY29uZmlndXJhdGlvbi4gSW4gT01YLCB0aGUKQEAgLTM2OCwxMCArMzQ2LDYgQEAKIH0KIAogYzJfc3RhdHVzX3QgQzJTb2Z0TXBlZzREZWM6OmVuc3VyZURlY29kZXJTdGF0ZShjb25zdCBzdGQ6OnNoYXJlZF9wdHI8QzJCbG9ja1Bvb2w+ICZwb29sKSB7Ci0gICAgaWYgKCFtRGVjSGFuZGxlKSB7Ci0gICAgICAgIEFMT0dFKCJub3Qgc3VwcG9zZWQgdG8gYmUgaGVyZSwgaW52YWxpZCBkZWNvZGVyIGNvbnRleHQiKTsKLSAgICAgICAgcmV0dXJuIEMyX0NPUlJVUFRFRDsKLSAgICB9CiAKICAgICBtT3V0cHV0QnVmZmVyU2l6ZSA9IGFsaWduKG1JbnRmLT5nZXRNYXhXaWR0aCgpLCAxNikgKiBhbGlnbihtSW50Zi0+Z2V0TWF4SGVpZ2h0KCksIDE2KSAqIDMgLyAyOwogICAgIGZvciAoaW50MzJfdCBpID0gMDsgaSA8IGtOdW1PdXRwdXRCdWZmZXJzOyArK2kpIHsKQEAgLTQwMiwxMCArMzc2LDEwIEBACiAKIGJvb2wgQzJTb2Z0TXBlZzREZWM6OmhhbmRsZVJlc0NoYW5nZShjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8QzJXb3JrPiAmd29yaykgewogICAgIHVpbnQzMl90IGRpc3Bfd2lkdGgsIGRpc3BfaGVpZ2h0OwotICAgIFBWR2V0VmlkZW9EaW1lbnNpb25zKG1EZWNIYW5kbGUsIChpbnQzMiAqKSZkaXNwX3dpZHRoLCAoaW50MzIgKikmZGlzcF9oZWlnaHQpOworICAgIFBWR2V0VmlkZW9EaW1lbnNpb25zKCZtVmlkZW9EZWNDb250cm9scywgKGludDMyICopJmRpc3Bfd2lkdGgsIChpbnQzMiAqKSZkaXNwX2hlaWdodCk7CiAKICAgICB1aW50MzJfdCBidWZfd2lkdGgsIGJ1Zl9oZWlnaHQ7Ci0gICAgUFZHZXRCdWZmZXJEaW1lbnNpb25zKG1EZWNIYW5kbGUsIChpbnQzMiAqKSZidWZfd2lkdGgsIChpbnQzMiAqKSZidWZfaGVpZ2h0KTsKKyAgICBQVkdldEJ1ZmZlckRpbWVuc2lvbnMoJm1WaWRlb0RlY0NvbnRyb2xzLCAoaW50MzIgKikmYnVmX3dpZHRoLCAoaW50MzIgKikmYnVmX2hlaWdodCk7CiAKICAgICBDSEVDS19MRShkaXNwX3dpZHRoLCBidWZfd2lkdGgpOwogICAgIENIRUNLX0xFKGRpc3BfaGVpZ2h0LCBidWZfaGVpZ2h0KTsKQEAgLTQyNiwxMyArNDAwLDE0IEBACiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIW1Jc01wZWc0KSB7Ci0gICAgICAgICAgICBQVkNsZWFuVXBWaWRlb0RlY29kZXIobURlY0hhbmRsZSk7CisgICAgICAgICAgICBQVkNsZWFuVXBWaWRlb0RlY29kZXIoJm1WaWRlb0RlY0NvbnRyb2xzKTsKIAogICAgICAgICAgICAgdWludDhfdCAqdm9sX2RhdGFbMV17fTsKICAgICAgICAgICAgIGludDMyX3Qgdm9sX3NpemUgPSAwOwogCiAgICAgICAgICAgICBpZiAoIVBWSW5pdFZpZGVvRGVjb2RlcigKLSAgICAgICAgICAgICAgICAgICAgbURlY0hhbmRsZSwgdm9sX2RhdGEsICZ2b2xfc2l6ZSwgMSwgbUludGYtPmdldE1heFdpZHRoKCksIG1JbnRmLT5nZXRNYXhIZWlnaHQoKSwgSDI2M19NT0RFKSkgeworICAgICAgICAgICAgICAgICAgICAmbVZpZGVvRGVjQ29udHJvbHMsIHZvbF9kYXRhLCAmdm9sX3NpemUsIDEsIG1JbnRmLT5nZXRNYXhXaWR0aCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtSW50Zi0+Z2V0TWF4SGVpZ2h0KCksIEgyNjNfTU9ERSkpIHsKICAgICAgICAgICAgICAgICBBTE9HRSgiRXJyb3IgaW4gUFZJbml0VmlkZW9EZWNvZGVyIEgyNjNfTU9ERSB3aGlsZSByZXNDaGFuZ2VkIHdhcyBzZXQgdG8gdHJ1ZSIpOwogICAgICAgICAgICAgICAgIG1TaWduYWxsZWRFcnJvciA9IHRydWU7CiAgICAgICAgICAgICAgICAgd29yay0+cmVzdWx0ID0gQzJfQ09SUlVQVEVEOwpAQCAtNTIyLDcgKzQ5Nyw3IEBACiAgICAgdWludDMyX3QgKnN0YXJ0X2NvZGUgPSAodWludDMyX3QgKiliaXRzdHJlYW07CiAgICAgYm9vbCB2b2xIZWFkZXIgPSAqc3RhcnRfY29kZSA9PSAweEIwMDEwMDAwOwogICAgIGlmICh2b2xIZWFkZXIpIHsKLSAgICAgICAgUFZDbGVhblVwVmlkZW9EZWNvZGVyKG1EZWNIYW5kbGUpOworICAgICAgICBQVkNsZWFuVXBWaWRlb0RlY29kZXIoJm1WaWRlb0RlY0NvbnRyb2xzKTsKICAgICAgICAgbUluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgfQogCkBAIC01MzcsNyArNTEyLDcgQEAKICAgICAgICAgfQogICAgICAgICBNUDREZWNvZGluZ01vZGUgbW9kZSA9IChtSXNNcGVnNCkgPyBNUEVHNF9NT0RFIDogSDI2M19NT0RFOwogICAgICAgICBpZiAoIVBWSW5pdFZpZGVvRGVjb2RlcigKLSAgICAgICAgICAgICAgICBtRGVjSGFuZGxlLCB2b2xfZGF0YSwgJnZvbF9zaXplLCAxLAorICAgICAgICAgICAgICAgICZtVmlkZW9EZWNDb250cm9scywgdm9sX2RhdGEsICZ2b2xfc2l6ZSwgMSwKICAgICAgICAgICAgICAgICBtSW50Zi0+Z2V0TWF4V2lkdGgoKSwgbUludGYtPmdldE1heEhlaWdodCgpLCBtb2RlKSkgewogICAgICAgICAgICAgQUxPR0UoIlBWSW5pdFZpZGVvRGVjb2RlciBmYWlsZWQuIFVuc3VwcG9ydGVkIGNvbnRlbnQ/Iik7CiAgICAgICAgICAgICBtU2lnbmFsbGVkRXJyb3IgPSB0cnVlOwpAQCAtNTQ1LDcgKzUyMCw3IEBACiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgbUluaXRpYWxpemVkID0gdHJ1ZTsKLSAgICAgICAgTVA0RGVjb2RpbmdNb2RlIGFjdHVhbE1vZGUgPSBQVkdldERlY0JpdHN0cmVhbU1vZGUobURlY0hhbmRsZSk7CisgICAgICAgIE1QNERlY29kaW5nTW9kZSBhY3R1YWxNb2RlID0gUFZHZXREZWNCaXRzdHJlYW1Nb2RlKCZtVmlkZW9EZWNDb250cm9scyk7CiAgICAgICAgIGlmIChtb2RlICE9IGFjdHVhbE1vZGUpIHsKICAgICAgICAgICAgIEFMT0dFKCJEZWNvZGVkIG1vZGUgbm90IHNhbWUgYXMgYWN0dWFsIG1vZGUgb2YgdGhlIGRlY29kZXIiKTsKICAgICAgICAgICAgIG1TaWduYWxsZWRFcnJvciA9IHRydWU7CkBAIC01NTMsNyArNTI4LDcgQEAKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIFBWU2V0UG9zdFByb2NUeXBlKG1EZWNIYW5kbGUsIDApOworICAgICAgICBQVlNldFBvc3RQcm9jVHlwZSgmbVZpZGVvRGVjQ29udHJvbHMsIDApOwogICAgICAgICBpZiAoaGFuZGxlUmVzQ2hhbmdlKHdvcmspKSB7CiAgICAgICAgICAgICBBTE9HSSgiU2V0dGluZyB3aWR0aCBhbmQgaGVpZ2h0Iik7CiAgICAgICAgICAgICBDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6b3V0cHV0IHNpemUoMHUsIG1XaWR0aCwgbUhlaWdodCk7CkBAIC01OTAsNyArNTY1LDcgQEAKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHVpbnQzMl90IHlGcmFtZVNpemUgPSBzaXplb2YodWludDgpICogbURlY0hhbmRsZS0+c2l6ZTsKKyAgICAgICAgdWludDMyX3QgeUZyYW1lU2l6ZSA9IHNpemVvZih1aW50OCkgKiBtVmlkZW9EZWNDb250cm9scy5zaXplOwogICAgICAgICBpZiAobU91dHB1dEJ1ZmZlclNpemUgPCB5RnJhbWVTaXplICogMyAvIDIpewogICAgICAgICAgICAgQUxPR0UoIlRvbyBzbWFsbCBvdXRwdXQgYnVmZmVyOiAlenUgYnl0ZXMiLCBtT3V0cHV0QnVmZmVyU2l6ZSk7CiAgICAgICAgICAgICBtU2lnbmFsbGVkRXJyb3IgPSB0cnVlOwpAQCAtNTk5LDcgKzU3NCw3IEBACiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIW1GcmFtZXNDb25maWd1cmVkKSB7Ci0gICAgICAgICAgICBQVlNldFJlZmVyZW5jZVlVVihtRGVjSGFuZGxlLG1PdXRwdXRCdWZmZXJbMV0pOworICAgICAgICAgICAgUFZTZXRSZWZlcmVuY2VZVVYoJm1WaWRlb0RlY0NvbnRyb2xzLG1PdXRwdXRCdWZmZXJbMV0pOwogICAgICAgICAgICAgbUZyYW1lc0NvbmZpZ3VyZWQgPSB0cnVlOwogICAgICAgICB9CiAKQEAgLTYxMCw3ICs1ODUsNyBAQAogICAgICAgICB1aW50OF90ICpiaXRzdHJlYW1UbXAgPSBiaXRzdHJlYW07CiAgICAgICAgIHVpbnQzMl90IHRpbWVzdGFtcCA9IHdvcmtJbmRleDsKICAgICAgICAgaWYgKFBWRGVjb2RlVm9wSGVhZGVyKAotICAgICAgICAgICAgICAgICAgICBtRGVjSGFuZGxlLCAmYml0c3RyZWFtVG1wLCAmdGltZXN0YW1wLCAmdG1wSW5TaXplLAorICAgICAgICAgICAgICAgICAgICAmbVZpZGVvRGVjQ29udHJvbHMsICZiaXRzdHJlYW1UbXAsICZ0aW1lc3RhbXAsICZ0bXBJblNpemUsCiAgICAgICAgICAgICAgICAgICAgICZoZWFkZXJfaW5mbywgJnVzZUV4dFRpbWVzdGFtcCwKICAgICAgICAgICAgICAgICAgICAgbU91dHB1dEJ1ZmZlclttTnVtU2FtcGxlc091dHB1dCAmIDFdKSAhPSBQVl9UUlVFKSB7CiAgICAgICAgICAgICBBTE9HRSgiZmFpbGVkIHRvIGRlY29kZSB2b3AgaGVhZGVyLiIpOwpAQCAtNjQyLDcgKzYxNyw3IEBACiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChQVkRlY29kZVZvcEJvZHkobURlY0hhbmRsZSwgJnRtcEluU2l6ZSkgIT0gUFZfVFJVRSkgeworICAgICAgICBpZiAoUFZEZWNvZGVWb3BCb2R5KCZtVmlkZW9EZWNDb250cm9scywgJnRtcEluU2l6ZSkgIT0gUFZfVFJVRSkgewogICAgICAgICAgICAgQUxPR0UoImZhaWxlZCB0byBkZWNvZGUgdmlkZW8gZnJhbWUuIik7CiAgICAgICAgICAgICBtU2lnbmFsbGVkRXJyb3IgPSB0cnVlOwogICAgICAgICAgICAgd29yay0+cmVzdWx0ID0gQzJfQ09SUlVQVEVEOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNERlYy5oIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNERlYy5oCmluZGV4IDcxNmEwOTUuLmZlZDA0YzkgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL21wZWc0X2gyNjMvQzJTb2Z0TXBlZzREZWMuaAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnNF9oMjYzL0MyU29mdE1wZWc0RGVjLmgKQEAgLTE5LDggKzE5LDggQEAKIAogI2luY2x1ZGUgPFNpbXBsZUMyQ29tcG9uZW50Lmg+CiAKKyNpbmNsdWRlIDxtcDRkZWNfYXBpLmg+CiAKLXN0cnVjdCB0YWd2aWRlb0RlY0NvbnRyb2xzOwogCiBuYW1lc3BhY2UgYW5kcm9pZCB7CiAKQEAgLTU0LDcgKzU0LDcgQEAKICAgICBib29sIGhhbmRsZVJlc0NoYW5nZShjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8QzJXb3JrPiAmd29yayk7CiAKICAgICBzdGQ6OnNoYXJlZF9wdHI8SW50ZkltcGw+IG1JbnRmOwotICAgIHRhZ3ZpZGVvRGVjQ29udHJvbHMgKm1EZWNIYW5kbGU7CisgICAgdGFndmlkZW9EZWNDb250cm9scyBtVmlkZW9EZWNDb250cm9sczsKICAgICBzdGQ6OnNoYXJlZF9wdHI8QzJHcmFwaGljQmxvY2s+IG1PdXRCbG9jazsKICAgICB1aW50OF90ICptT3V0cHV0QnVmZmVyW2tOdW1PdXRwdXRCdWZmZXJzXTsKICAgICBzaXplX3QgIG1PdXRwdXRCdWZmZXJTaXplOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvbXBlZzRfaDI2My9DMlNvZnRNcGVnNEVuYy5jcHAgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnNF9oMjYzL0MyU29mdE1wZWc0RW5jLmNwcAppbmRleCAzYzg3NTMxLi4zYmZlYzY2IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnNF9oMjYzL0MyU29mdE1wZWc0RW5jLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy9tcGVnNF9oMjYzL0MyU29mdE1wZWc0RW5jLmNwcApAQCAtNDM2LDE2ICs0MzYsMTggQEAKICAgICAgICAgfQogCiAgICAgICAgICsrbU51bUlucHV0RnJhbWVzOwotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8QzJTdHJlYW1Jbml0RGF0YUluZm86Om91dHB1dD4gY3NkID0KLSAgICAgICAgICAgIEMyU3RyZWFtSW5pdERhdGFJbmZvOjpvdXRwdXQ6OkFsbG9jVW5pcXVlKG91dHB1dFNpemUsIDB1KTsKLSAgICAgICAgaWYgKCFjc2QpIHsKLSAgICAgICAgICAgIEFMT0dFKCJDU0QgYWxsb2NhdGlvbiBmYWlsZWQiKTsKLSAgICAgICAgICAgIG1TaWduYWxsZWRFcnJvciA9IHRydWU7Ci0gICAgICAgICAgICB3b3JrLT5yZXN1bHQgPSBDMl9OT19NRU1PUlk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChvdXRwdXRTaXplKSB7CisgICAgICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8QzJTdHJlYW1Jbml0RGF0YUluZm86Om91dHB1dD4gY3NkID0KKyAgICAgICAgICAgICAgICBDMlN0cmVhbUluaXREYXRhSW5mbzo6b3V0cHV0OjpBbGxvY1VuaXF1ZShvdXRwdXRTaXplLCAwdSk7CisgICAgICAgICAgICBpZiAoIWNzZCkgeworICAgICAgICAgICAgICAgIEFMT0dFKCJDU0QgYWxsb2NhdGlvbiBmYWlsZWQiKTsKKyAgICAgICAgICAgICAgICBtU2lnbmFsbGVkRXJyb3IgPSB0cnVlOworICAgICAgICAgICAgICAgIHdvcmstPnJlc3VsdCA9IEMyX05PX01FTU9SWTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBtZW1jcHkoY3NkLT5tLnZhbHVlLCBvdXRQdHIsIG91dHB1dFNpemUpOworICAgICAgICAgICAgd29yay0+d29ya2xldHMuZnJvbnQoKS0+b3V0cHV0LmNvbmZpZ1VwZGF0ZS5wdXNoX2JhY2soc3RkOjptb3ZlKGNzZCkpOwogICAgICAgICB9Ci0gICAgICAgIG1lbWNweShjc2QtPm0udmFsdWUsIG91dFB0ciwgb3V0cHV0U2l6ZSk7Ci0gICAgICAgIHdvcmstPndvcmtsZXRzLmZyb250KCktPm91dHB1dC5jb25maWdVcGRhdGUucHVzaF9iYWNrKHN0ZDo6bW92ZShjc2QpKTsKICAgICB9CiAKICAgICAvLyBoYW5kbGUgZHluYW1pYyBiaXRyYXRlIGNoYW5nZQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvdnB4L0MyU29mdFZweERlYy5jcHAgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy92cHgvQzJTb2Z0VnB4RGVjLmNwcAppbmRleCAyOTUzZDkwLi40NWUyY2E4IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy92cHgvQzJTb2Z0VnB4RGVjLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy92cHgvQzJTb2Z0VnB4RGVjLmNwcApAQCAtMTQ5LDggKzE0OSwxNiBAQAogI2Vsc2UKICAgICAgICAgYWRkUGFyYW1ldGVyKAogICAgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1Qcm9maWxlTGV2ZWwsIEMyX1BBUkFNS0VZX1BST0ZJTEVfTEVWRUwpCi0gICAgICAgICAgICAgICAgLndpdGhDb25zdFZhbHVlKG5ldyBDMlN0cmVhbVByb2ZpbGVMZXZlbEluZm86OmlucHV0KDB1LAotICAgICAgICAgICAgICAgICAgICAgICAgQzJDb25maWc6OlBST0ZJTEVfVU5VU0VELCBDMkNvbmZpZzo6TEVWRUxfVU5VU0VEKSkKKyAgICAgICAgICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtUHJvZmlsZUxldmVsSW5mbzo6aW5wdXQoMHUsCisgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbmZpZzo6UFJPRklMRV9WUDhfMCwgQzJDb25maWc6OkxFVkVMX1VOVVNFRCkpCisgICAgICAgICAgICAgICAgLndpdGhGaWVsZHMoeworICAgICAgICAgICAgICAgICAgICBDMkYobVByb2ZpbGVMZXZlbCwgcHJvZmlsZSkuZXF1YWxUbygKKyAgICAgICAgICAgICAgICAgICAgICAgIFBST0ZJTEVfVlA4XzAKKyAgICAgICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAgICAgICAgQzJGKG1Qcm9maWxlTGV2ZWwsIGxldmVsKS5lcXVhbFRvKAorICAgICAgICAgICAgICAgICAgICAgICAgTEVWRUxfVU5VU0VEKSwKKyAgICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgICAgIC53aXRoU2V0dGVyKFByb2ZpbGVMZXZlbFNldHRlciwgbVNpemUpCiAgICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL3ZweC9DMlNvZnRWcHhFbmMuY3BwIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvdnB4L0MyU29mdFZweEVuYy5jcHAKaW5kZXggNzQ4NmQyNy4uNjE3NzY5YiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvdnB4L0MyU29mdFZweEVuYy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvdnB4L0MyU29mdFZweEVuYy5jcHAKQEAgLTMxLDYgKzMxLDI1NSBAQAogCiBuYW1lc3BhY2UgYW5kcm9pZCB7CiAKK0MyU29mdFZweEVuYzo6SW50ZkltcGw6OkludGZJbXBsKGNvbnN0IHN0ZDo6c2hhcmVkX3B0cjxDMlJlZmxlY3RvckhlbHBlcj4gJmhlbHBlcikKKyAgICA6IFNpbXBsZUludGVyZmFjZTx2b2lkPjo6QmFzZVBhcmFtcygKKyAgICAgICAgICAgIGhlbHBlciwKKyAgICAgICAgICAgIENPTVBPTkVOVF9OQU1FLAorICAgICAgICAgICAgQzJDb21wb25lbnQ6OktJTkRfRU5DT0RFUiwKKyAgICAgICAgICAgIEMyQ29tcG9uZW50OjpET01BSU5fVklERU8sCisgICAgICAgICAgICBNRURJQV9NSU1FVFlQRV9WSURFTykgeworICAgIG5vUHJpdmF0ZUJ1ZmZlcnMoKTsgLy8gVE9ETzogYWNjb3VudCBmb3Igb3VyIGJ1ZmZlcnMgaGVyZQorICAgIG5vSW5wdXRSZWZlcmVuY2VzKCk7CisgICAgbm9PdXRwdXRSZWZlcmVuY2VzKCk7CisgICAgbm9JbnB1dExhdGVuY3koKTsKKyAgICBub1RpbWVTdHJldGNoKCk7CisgICAgc2V0RGVyaXZlZEluc3RhbmNlKHRoaXMpOworCisgICAgYWRkUGFyYW1ldGVyKAorICAgICAgICAgICAgRGVmaW5lUGFyYW0obUF0dHJpYiwgQzJfUEFSQU1LRVlfQ09NUE9ORU5UX0FUVFJJQlVURVMpCisgICAgICAgICAgICAud2l0aENvbnN0VmFsdWUobmV3IEMyQ29tcG9uZW50QXR0cmlidXRlc1NldHRpbmcoCisgICAgICAgICAgICAgICAgQzJDb21wb25lbnQ6OkFUVFJJQl9JU19URU1QT1JBTCkpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtVXNhZ2UsIEMyX1BBUkFNS0VZX0lOUFVUX1NUUkVBTV9VU0FHRSkKKyAgICAgICAgICAgIC53aXRoQ29uc3RWYWx1ZShuZXcgQzJTdHJlYW1Vc2FnZVR1bmluZzo6aW5wdXQoCisgICAgICAgICAgICAgICAgICAgIDB1LCAodWludDY0X3QpQzJNZW1vcnlVc2FnZTo6Q1BVX1JFQUQpKQorICAgICAgICAgICAgLmJ1aWxkKCkpOworCisgICAgYWRkUGFyYW1ldGVyKAorICAgICAgICBEZWZpbmVQYXJhbShtU2l6ZSwgQzJfUEFSQU1LRVlfUElDVFVSRV9TSVpFKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQoMHUsIDMyMCwgMjQwKSkKKyAgICAgICAgICAgIC53aXRoRmllbGRzKHsKKyAgICAgICAgICAgICAgICBDMkYobVNpemUsIHdpZHRoKS5pblJhbmdlKDIsIDIwNDgsIDIpLAorICAgICAgICAgICAgICAgIEMyRihtU2l6ZSwgaGVpZ2h0KS5pblJhbmdlKDIsIDIwNDgsIDIpLAorICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC53aXRoU2V0dGVyKFNpemVTZXR0ZXIpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgIERlZmluZVBhcmFtKG1CaXRyYXRlTW9kZSwgQzJfUEFSQU1LRVlfQklUUkFURV9NT0RFKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbUJpdHJhdGVNb2RlVHVuaW5nOjpvdXRwdXQoCisgICAgICAgICAgICAgICAgICAgIDB1LCBDMkNvbmZpZzo6QklUUkFURV9WQVJJQUJMRSkpCisgICAgICAgICAgICAud2l0aEZpZWxkcyh7CisgICAgICAgICAgICAgICAgQzJGKG1CaXRyYXRlTW9kZSwgdmFsdWUpLm9uZU9mKHsKKyAgICAgICAgICAgICAgICAgICAgQzJDb25maWc6OkJJVFJBVEVfQ09OU1QsIEMyQ29uZmlnOjpCSVRSQVRFX1ZBUklBQkxFIH0pCisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoCisgICAgICAgICAgICAgICAgU2V0dGVyPGRlY2x0eXBlKCptQml0cmF0ZU1vZGUpPjo6U3RyaWN0VmFsdWVXaXRoTm9EZXBzKQorICAgICAgICAgICAgLmJ1aWxkKCkpOworCisgICAgYWRkUGFyYW1ldGVyKAorICAgICAgICBEZWZpbmVQYXJhbShtRnJhbWVSYXRlLCBDMl9QQVJBTUtFWV9GUkFNRV9SQVRFKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbUZyYW1lUmF0ZUluZm86Om91dHB1dCgwdSwgMzAuKSkKKyAgICAgICAgICAgIC8vIFRPRE86IE1vcmUgcmVzdHJpY3Rpb24/CisgICAgICAgICAgICAud2l0aEZpZWxkcyh7QzJGKG1GcmFtZVJhdGUsIHZhbHVlKS5ncmVhdGVyVGhhbigwLil9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoCisgICAgICAgICAgICAgICAgU2V0dGVyPGRlY2x0eXBlKCptRnJhbWVSYXRlKT46OlN0cmljdFZhbHVlV2l0aE5vRGVwcykKKyAgICAgICAgICAgIC5idWlsZCgpKTsKKworICAgIGFkZFBhcmFtZXRlcigKKyAgICAgICAgRGVmaW5lUGFyYW0obUxheWVyaW5nLCBDMl9QQVJBTUtFWV9URU1QT1JBTF9MQVlFUklORykKKyAgICAgICAgICAgIC53aXRoRGVmYXVsdChDMlN0cmVhbVRlbXBvcmFsTGF5ZXJpbmdUdW5pbmc6Om91dHB1dDo6QWxsb2NTaGFyZWQoMHUsIDAsIDAsIDApKQorICAgICAgICAgICAgLndpdGhGaWVsZHMoeworICAgICAgICAgICAgICAgIEMyRihtTGF5ZXJpbmcsIG0ubGF5ZXJDb3VudCkuaW5SYW5nZSgwLCA0KSwKKyAgICAgICAgICAgICAgICBDMkYobUxheWVyaW5nLCBtLmJMYXllckNvdW50KS5pblJhbmdlKDAsIDApLAorICAgICAgICAgICAgICAgIEMyRihtTGF5ZXJpbmcsIG0uYml0cmF0ZVJhdGlvcykuaW5SYW5nZSgwLiwgMS4pCisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoTGF5ZXJpbmdTZXR0ZXIpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtU3luY0ZyYW1lUGVyaW9kLCBDMl9QQVJBTUtFWV9TWU5DX0ZSQU1FX0lOVEVSVkFMKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbVN5bmNGcmFtZUludGVydmFsVHVuaW5nOjpvdXRwdXQoMHUsIDEwMDAwMDApKQorICAgICAgICAgICAgLndpdGhGaWVsZHMoe0MyRihtU3luY0ZyYW1lUGVyaW9kLCB2YWx1ZSkuYW55KCl9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoU2V0dGVyPGRlY2x0eXBlKCptU3luY0ZyYW1lUGVyaW9kKT46OlN0cmljdFZhbHVlV2l0aE5vRGVwcykKKyAgICAgICAgICAgIC5idWlsZCgpKTsKKworICAgIGFkZFBhcmFtZXRlcigKKyAgICAgICAgRGVmaW5lUGFyYW0obUJpdHJhdGUsIEMyX1BBUkFNS0VZX0JJVFJBVEUpCisgICAgICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtQml0cmF0ZUluZm86Om91dHB1dCgwdSwgNjQwMDApKQorICAgICAgICAgICAgLndpdGhGaWVsZHMoe0MyRihtQml0cmF0ZSwgdmFsdWUpLmluUmFuZ2UoNDA5NiwgNDAwMDAwMDApfSkKKyAgICAgICAgICAgIC53aXRoU2V0dGVyKEJpdHJhdGVTZXR0ZXIpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtSW50cmFSZWZyZXNoLCBDMl9QQVJBTUtFWV9JTlRSQV9SRUZSRVNIKQorICAgICAgICAgICAgLndpdGhDb25zdFZhbHVlKG5ldyBDMlN0cmVhbUludHJhUmVmcmVzaFR1bmluZzo6b3V0cHV0KAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDB1LCBDMkNvbmZpZzo6SU5UUkFfUkVGUkVTSF9ESVNBQkxFRCwgMC4pKQorICAgICAgICAgICAgLmJ1aWxkKCkpOworI2lmZGVmIFZQOQorICAgIGFkZFBhcmFtZXRlcigKKyAgICAgICAgICAgIERlZmluZVBhcmFtKG1Qcm9maWxlTGV2ZWwsIEMyX1BBUkFNS0VZX1BST0ZJTEVfTEVWRUwpCisgICAgICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtUHJvZmlsZUxldmVsSW5mbzo6b3V0cHV0KAorICAgICAgICAgICAgICAgICAgICAwdSwgUFJPRklMRV9WUDlfMCwgTEVWRUxfVlA5XzRfMSkpCisgICAgICAgICAgICAud2l0aEZpZWxkcyh7CisgICAgICAgICAgICAgICAgQzJGKG1Qcm9maWxlTGV2ZWwsIHByb2ZpbGUpLmVxdWFsVG8oCisgICAgICAgICAgICAgICAgICAgIFBST0ZJTEVfVlA5XzAKKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgIEMyRihtUHJvZmlsZUxldmVsLCBsZXZlbCkuZXF1YWxUbygKKyAgICAgICAgICAgICAgICAgICAgTEVWRUxfVlA5XzRfMSksCisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoUHJvZmlsZUxldmVsU2V0dGVyKQorICAgICAgICAgICAgLmJ1aWxkKCkpOworI2Vsc2UKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtUHJvZmlsZUxldmVsLCBDMl9QQVJBTUtFWV9QUk9GSUxFX0xFVkVMKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbVByb2ZpbGVMZXZlbEluZm86Om91dHB1dCgKKyAgICAgICAgICAgICAgICAgICAgMHUsIFBST0ZJTEVfVlA4XzAsIExFVkVMX1VOVVNFRCkpCisgICAgICAgICAgICAud2l0aEZpZWxkcyh7CisgICAgICAgICAgICAgICAgQzJGKG1Qcm9maWxlTGV2ZWwsIHByb2ZpbGUpLmVxdWFsVG8oCisgICAgICAgICAgICAgICAgICAgIFBST0ZJTEVfVlA4XzAKKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgIEMyRihtUHJvZmlsZUxldmVsLCBsZXZlbCkuZXF1YWxUbygKKyAgICAgICAgICAgICAgICAgICAgTEVWRUxfVU5VU0VEKSwKKyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAud2l0aFNldHRlcihQcm9maWxlTGV2ZWxTZXR0ZXIpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisjZW5kaWYKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtUmVxdWVzdFN5bmMsIEMyX1BBUkFNS0VZX1JFUVVFU1RfU1lOQ19GUkFNRSkKKyAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1SZXF1ZXN0U3luY0ZyYW1lVHVuaW5nOjpvdXRwdXQoMHUsIEMyX0ZBTFNFKSkKKyAgICAgICAgICAgIC53aXRoRmllbGRzKHtDMkYobVJlcXVlc3RTeW5jLCB2YWx1ZSkub25lT2YoeyBDMl9GQUxTRSwgQzJfVFJVRSB9KSB9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoU2V0dGVyPGRlY2x0eXBlKCptUmVxdWVzdFN5bmMpPjo6Tm9uU3RyaWN0VmFsdWVXaXRoTm9EZXBzKQorICAgICAgICAgICAgLmJ1aWxkKCkpOworCisgICAgYWRkUGFyYW1ldGVyKAorICAgICAgICAgICAgRGVmaW5lUGFyYW0obUNvbG9yQXNwZWN0cywgQzJfUEFSQU1LRVlfQ09MT1JfQVNQRUNUUykKKyAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dCgKKyAgICAgICAgICAgICAgICAgICAgMHUsIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpQUklNQVJJRVNfVU5TUEVDSUZJRUQsCisgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpNQVRSSVhfVU5TUEVDSUZJRUQpKQorICAgICAgICAgICAgLndpdGhGaWVsZHMoeworICAgICAgICAgICAgICAgIEMyRihtQ29sb3JBc3BlY3RzLCByYW5nZSkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbG9yOjpSQU5HRV9VTlNQRUNJRklFRCwgICAgIEMyQ29sb3I6OlJBTkdFX09USEVSKSwKKyAgICAgICAgICAgICAgICBDMkYobUNvbG9yQXNwZWN0cywgcHJpbWFyaWVzKS5pblJhbmdlKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSwKKyAgICAgICAgICAgICAgICBDMkYobUNvbG9yQXNwZWN0cywgdHJhbnNmZXIpLmluUmFuZ2UoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6VFJBTlNGRVJfVU5TUEVDSUZJRUQsICBDMkNvbG9yOjpUUkFOU0ZFUl9PVEhFUiksCisgICAgICAgICAgICAgICAgQzJGKG1Db2xvckFzcGVjdHMsIG1hdHJpeCkuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbG9yOjpNQVRSSVhfVU5TUEVDSUZJRUQsICAgIEMyQ29sb3I6Ok1BVFJJWF9PVEhFUikKKyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAud2l0aFNldHRlcihDb2xvckFzcGVjdHNTZXR0ZXIpCisgICAgICAgICAgICAuYnVpbGQoKSk7CisKKyAgICBhZGRQYXJhbWV0ZXIoCisgICAgICAgICAgICBEZWZpbmVQYXJhbShtQ29kZWRDb2xvckFzcGVjdHMsIEMyX1BBUkFNS0VZX1ZVSV9DT0xPUl9BU1BFQ1RTKQorICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbUNvbG9yQXNwZWN0c0luZm86Om91dHB1dCgKKyAgICAgICAgICAgICAgICAgICAgMHUsIEMyQ29sb3I6OlJBTkdFX0xJTUlURUQsIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwKKyAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6VFJBTlNGRVJfVU5TUEVDSUZJRUQsIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCkpCisgICAgICAgICAgICAud2l0aEZpZWxkcyh7CisgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgcmFuZ2UpLmluUmFuZ2UoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6UkFOR0VfVU5TUEVDSUZJRUQsICAgICBDMkNvbG9yOjpSQU5HRV9PVEhFUiksCisgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgcHJpbWFyaWVzKS5pblJhbmdlKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSwKKyAgICAgICAgICAgICAgICBDMkYobUNvZGVkQ29sb3JBc3BlY3RzLCB0cmFuc2ZlcikuaW5SYW5nZSgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbG9yOjpUUkFOU0ZFUl9VTlNQRUNJRklFRCwgIEMyQ29sb3I6OlRSQU5TRkVSX09USEVSKSwKKyAgICAgICAgICAgICAgICBDMkYobUNvZGVkQ29sb3JBc3BlY3RzLCBtYXRyaXgpLmluUmFuZ2UoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6TUFUUklYX1VOU1BFQ0lGSUVELCAgICBDMkNvbG9yOjpNQVRSSVhfT1RIRVIpCisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLndpdGhTZXR0ZXIoQ29kZWRDb2xvckFzcGVjdHNTZXR0ZXIsIG1Db2xvckFzcGVjdHMpCisgICAgICAgICAgICAuYnVpbGQoKSk7Cit9CisKK0MyUiBDMlNvZnRWcHhFbmM6OkludGZJbXBsOjpCaXRyYXRlU2V0dGVyKGJvb2wgbWF5QmxvY2ssIEMyUDxDMlN0cmVhbUJpdHJhdGVJbmZvOjpvdXRwdXQ+ICZtZSkgeworICAgICh2b2lkKW1heUJsb2NrOworICAgIEMyUiByZXMgPSBDMlI6Ok9rKCk7CisgICAgaWYgKG1lLnYudmFsdWUgPCA0MDk2KSB7CisgICAgICAgIG1lLnNldCgpLnZhbHVlID0gNDA5NjsKKyAgICB9CisgICAgcmV0dXJuIHJlczsKK30KKworQzJSIEMyU29mdFZweEVuYzo6SW50ZkltcGw6OlNpemVTZXR0ZXIoYm9vbCBtYXlCbG9jaywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEMyUDxDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQ+JiBvbGRNZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyUDxDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQ+JiBtZSkgeworICAgICh2b2lkKW1heUJsb2NrOworICAgIEMyUiByZXMgPSBDMlI6Ok9rKCk7CisgICAgaWYgKCFtZS5GKG1lLnYud2lkdGgpLnN1cHBvcnRzQXRBbGwobWUudi53aWR0aCkpIHsKKyAgICAgICAgcmVzID0gcmVzLnBsdXMoQzJTZXR0aW5nUmVzdWx0QnVpbGRlcjo6QmFkVmFsdWUobWUuRihtZS52LndpZHRoKSkpOworICAgICAgICBtZS5zZXQoKS53aWR0aCA9IG9sZE1lLnYud2lkdGg7CisgICAgfQorICAgIGlmICghbWUuRihtZS52LmhlaWdodCkuc3VwcG9ydHNBdEFsbChtZS52LmhlaWdodCkpIHsKKyAgICAgICAgcmVzID0gcmVzLnBsdXMoQzJTZXR0aW5nUmVzdWx0QnVpbGRlcjo6QmFkVmFsdWUobWUuRihtZS52LmhlaWdodCkpKTsKKyAgICAgICAgbWUuc2V0KCkuaGVpZ2h0ID0gb2xkTWUudi5oZWlnaHQ7CisgICAgfQorICAgIHJldHVybiByZXM7Cit9CisKK0MyUiBDMlNvZnRWcHhFbmM6OkludGZJbXBsOjpQcm9maWxlTGV2ZWxTZXR0ZXIoYm9vbCBtYXlCbG9jaywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJQPEMyU3RyZWFtUHJvZmlsZUxldmVsSW5mbzo6b3V0cHV0PiYgbWUpIHsKKyAgICAodm9pZCltYXlCbG9jazsKKyAgICBpZiAoIW1lLkYobWUudi5wcm9maWxlKS5zdXBwb3J0c0F0QWxsKG1lLnYucHJvZmlsZSkpIHsKKyAgICAgICAgbWUuc2V0KCkucHJvZmlsZSA9IFBST0ZJTEVfVlA5XzA7CisgICAgfQorICAgIGlmICghbWUuRihtZS52LmxldmVsKS5zdXBwb3J0c0F0QWxsKG1lLnYubGV2ZWwpKSB7CisgICAgICAgIG1lLnNldCgpLmxldmVsID0gTEVWRUxfVlA5XzRfMTsKKyAgICB9CisgICAgcmV0dXJuIEMyUjo6T2soKTsKK30KKworQzJSIEMyU29mdFZweEVuYzo6SW50ZkltcGw6OkxheWVyaW5nU2V0dGVyKGJvb2wgbWF5QmxvY2ssCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJQPEMyU3RyZWFtVGVtcG9yYWxMYXllcmluZ1R1bmluZzo6b3V0cHV0PiYgbWUpIHsKKyAgICAodm9pZCltYXlCbG9jazsKKyAgICBDMlIgcmVzID0gQzJSOjpPaygpOworICAgIGlmIChtZS52Lm0ubGF5ZXJDb3VudCA+IDQpIHsKKyAgICAgICAgbWUuc2V0KCkubS5sYXllckNvdW50ID0gNDsKKyAgICB9CisgICAgbWUuc2V0KCkubS5iTGF5ZXJDb3VudCA9IDA7CisgICAgLy8gZW5zdXJlIHJhdGlvcyBhcmUgbW9ub3RvbmljIGFuZCBjbGFtcGVkIGJldHdlZW4gMCBhbmQgMQorICAgIGZvciAoc2l6ZV90IGl4ID0gMDsgaXggPCBtZS52LmZsZXhDb3VudCgpOyArK2l4KSB7CisgICAgICAgIG1lLnNldCgpLm0uYml0cmF0ZVJhdGlvc1tpeF0gPSBjMl9jbGFtcCgKKyAgICAgICAgICAgIGl4ID4gMCA/IG1lLnYubS5iaXRyYXRlUmF0aW9zW2l4IC0gMV0gOiAwLCBtZS52Lm0uYml0cmF0ZVJhdGlvc1tpeF0sIDEuKTsKKyAgICB9CisgICAgQUxPR0koInNldHRpbmcgdGVtcG9yYWwgbGF5ZXJpbmcgJXUgKyAldSIsIG1lLnYubS5sYXllckNvdW50LCBtZS52Lm0uYkxheWVyQ291bnQpOworICAgIHJldHVybiByZXM7Cit9CisKK3VpbnQzMl90IEMyU29mdFZweEVuYzo6SW50ZkltcGw6OmdldFN5bmNGcmFtZVBlcmlvZCgpIGNvbnN0IHsKKyAgICBpZiAobVN5bmNGcmFtZVBlcmlvZC0+dmFsdWUgPCAwIHx8IG1TeW5jRnJhbWVQZXJpb2QtPnZhbHVlID09IElOVDY0X01BWCkgeworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisgICAgZG91YmxlIHBlcmlvZCA9IG1TeW5jRnJhbWVQZXJpb2QtPnZhbHVlIC8gMWU2ICogbUZyYW1lUmF0ZS0+dmFsdWU7CisgICAgcmV0dXJuICh1aW50MzJfdCljMl9tYXgoYzJfbWluKHBlcmlvZCArIDAuNSwgZG91YmxlKFVJTlQzMl9NQVgpKSwgMS4pOworfQorQzJSIEMyU29mdFZweEVuYzo6SW50ZkltcGw6OkNvbG9yQXNwZWN0c1NldHRlcihib29sIG1heUJsb2NrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dD4mIG1lKSB7CisgICAgKHZvaWQpbWF5QmxvY2s7CisgICAgaWYgKG1lLnYucmFuZ2UgPiBDMkNvbG9yOjpSQU5HRV9PVEhFUikgeworICAgICAgICAgICAgbWUuc2V0KCkucmFuZ2UgPSBDMkNvbG9yOjpSQU5HRV9PVEhFUjsKKyAgICB9CisgICAgaWYgKG1lLnYucHJpbWFyaWVzID4gQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSB7CisgICAgICAgICAgICBtZS5zZXQoKS5wcmltYXJpZXMgPSBDMkNvbG9yOjpQUklNQVJJRVNfT1RIRVI7CisgICAgfQorICAgIGlmIChtZS52LnRyYW5zZmVyID4gQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVIpIHsKKyAgICAgICAgICAgIG1lLnNldCgpLnRyYW5zZmVyID0gQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVI7CisgICAgfQorICAgIGlmIChtZS52Lm1hdHJpeCA+IEMyQ29sb3I6Ok1BVFJJWF9PVEhFUikgeworICAgICAgICAgICAgbWUuc2V0KCkubWF0cml4ID0gQzJDb2xvcjo6TUFUUklYX09USEVSOworICAgIH0KKyAgICByZXR1cm4gQzJSOjpPaygpOworfQorQzJSIEMyU29mdFZweEVuYzo6SW50ZkltcGw6OkNvZGVkQ29sb3JBc3BlY3RzU2V0dGVyKAorICAgICAgICBib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjpvdXRwdXQ+JiBtZSwKKyAgICAgICAgY29uc3QgQzJQPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6aW5wdXQ+JiBjb2RlZCkgeworICAgICh2b2lkKW1heUJsb2NrOworICAgIG1lLnNldCgpLnJhbmdlID0gY29kZWQudi5yYW5nZTsKKyAgICBtZS5zZXQoKS5wcmltYXJpZXMgPSBjb2RlZC52LnByaW1hcmllczsKKyAgICBtZS5zZXQoKS50cmFuc2ZlciA9IGNvZGVkLnYudHJhbnNmZXI7CisgICAgbWUuc2V0KCkubWF0cml4ID0gY29kZWQudi5tYXRyaXg7CisgICAgcmV0dXJuIEMyUjo6T2soKTsKK30KKwogI2lmIDAKIHN0YXRpYyBzaXplX3QgZ2V0Q3B1Q29yZUNvdW50KCkgewogICAgIGxvbmcgY3B1Q29yZUNvdW50ID0gMTsKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL3ZweC9DMlNvZnRWcHhFbmMuaCBiL21lZGlhL2NvZGVjMi9jb21wb25lbnRzL3ZweC9DMlNvZnRWcHhFbmMuaAppbmRleCBjOThiODAyLi5lMjk2YzhmIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvY29tcG9uZW50cy92cHgvQzJTb2Z0VnB4RW5jLmgKKysrIGIvbWVkaWEvY29kZWMyL2NvbXBvbmVudHMvdnB4L0MyU29mdFZweEVuYy5oCkBAIC0yMzcsMjQ1ICsyMzcsMzggQEAKIAogY2xhc3MgQzJTb2Z0VnB4RW5jOjpJbnRmSW1wbCA6IHB1YmxpYyBTaW1wbGVJbnRlcmZhY2U8dm9pZD46OkJhc2VQYXJhbXMgewogICAgcHVibGljOgotICAgIGV4cGxpY2l0IEludGZJbXBsKGNvbnN0IHN0ZDo6c2hhcmVkX3B0cjxDMlJlZmxlY3RvckhlbHBlcj4gJmhlbHBlcikKLSAgICAgICAgOiBTaW1wbGVJbnRlcmZhY2U8dm9pZD46OkJhc2VQYXJhbXMoCi0gICAgICAgICAgICAgICAgaGVscGVyLAotICAgICAgICAgICAgICAgIENPTVBPTkVOVF9OQU1FLAotICAgICAgICAgICAgICAgIEMyQ29tcG9uZW50OjpLSU5EX0VOQ09ERVIsCi0gICAgICAgICAgICAgICAgQzJDb21wb25lbnQ6OkRPTUFJTl9WSURFTywKLSAgICAgICAgICAgICAgICBNRURJQV9NSU1FVFlQRV9WSURFTykgewotICAgICAgICBub1ByaXZhdGVCdWZmZXJzKCk7IC8vIFRPRE86IGFjY291bnQgZm9yIG91ciBidWZmZXJzIGhlcmUKLSAgICAgICAgbm9JbnB1dFJlZmVyZW5jZXMoKTsKLSAgICAgICAgbm9PdXRwdXRSZWZlcmVuY2VzKCk7Ci0gICAgICAgIG5vSW5wdXRMYXRlbmN5KCk7Ci0gICAgICAgIG5vVGltZVN0cmV0Y2goKTsKLSAgICAgICAgc2V0RGVyaXZlZEluc3RhbmNlKHRoaXMpOwotCi0gICAgICAgIGFkZFBhcmFtZXRlcigKLSAgICAgICAgICAgICAgICBEZWZpbmVQYXJhbShtQXR0cmliLCBDMl9QQVJBTUtFWV9DT01QT05FTlRfQVRUUklCVVRFUykKLSAgICAgICAgICAgICAgICAud2l0aENvbnN0VmFsdWUobmV3IEMyQ29tcG9uZW50QXR0cmlidXRlc1NldHRpbmcoCi0gICAgICAgICAgICAgICAgICAgIEMyQ29tcG9uZW50OjpBVFRSSUJfSVNfVEVNUE9SQUwpKQotICAgICAgICAgICAgICAgIC5idWlsZCgpKTsKLQotICAgICAgICBhZGRQYXJhbWV0ZXIoCi0gICAgICAgICAgICAgICAgRGVmaW5lUGFyYW0obVVzYWdlLCBDMl9QQVJBTUtFWV9JTlBVVF9TVFJFQU1fVVNBR0UpCi0gICAgICAgICAgICAgICAgLndpdGhDb25zdFZhbHVlKG5ldyBDMlN0cmVhbVVzYWdlVHVuaW5nOjppbnB1dCgKLSAgICAgICAgICAgICAgICAgICAgICAgIDB1LCAodWludDY0X3QpQzJNZW1vcnlVc2FnZTo6Q1BVX1JFQUQpKQotICAgICAgICAgICAgICAgIC5idWlsZCgpKTsKLQotICAgICAgICBhZGRQYXJhbWV0ZXIoCi0gICAgICAgICAgICBEZWZpbmVQYXJhbShtU2l6ZSwgQzJfUEFSQU1LRVlfUElDVFVSRV9TSVpFKQotICAgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1QaWN0dXJlU2l6ZUluZm86OmlucHV0KDB1LCAzMjAsIDI0MCkpCi0gICAgICAgICAgICAgICAgLndpdGhGaWVsZHMoewotICAgICAgICAgICAgICAgICAgICBDMkYobVNpemUsIHdpZHRoKS5pblJhbmdlKDIsIDIwNDgsIDIpLAotICAgICAgICAgICAgICAgICAgICBDMkYobVNpemUsIGhlaWdodCkuaW5SYW5nZSgyLCAyMDQ4LCAyKSwKLSAgICAgICAgICAgICAgICB9KQotICAgICAgICAgICAgICAgIC53aXRoU2V0dGVyKFNpemVTZXR0ZXIpCi0gICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwotCi0gICAgICAgIGFkZFBhcmFtZXRlcigKLSAgICAgICAgICAgIERlZmluZVBhcmFtKG1CaXRyYXRlTW9kZSwgQzJfUEFSQU1LRVlfQklUUkFURV9NT0RFKQotICAgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1CaXRyYXRlTW9kZVR1bmluZzo6b3V0cHV0KAotICAgICAgICAgICAgICAgICAgICAgICAgMHUsIEMyQ29uZmlnOjpCSVRSQVRFX1ZBUklBQkxFKSkKLSAgICAgICAgICAgICAgICAud2l0aEZpZWxkcyh7Ci0gICAgICAgICAgICAgICAgICAgIEMyRihtQml0cmF0ZU1vZGUsIHZhbHVlKS5vbmVPZih7Ci0gICAgICAgICAgICAgICAgICAgICAgICBDMkNvbmZpZzo6QklUUkFURV9DT05TVCwgQzJDb25maWc6OkJJVFJBVEVfVkFSSUFCTEUgfSkKLSAgICAgICAgICAgICAgICB9KQotICAgICAgICAgICAgICAgIC53aXRoU2V0dGVyKAotICAgICAgICAgICAgICAgICAgICBTZXR0ZXI8ZGVjbHR5cGUoKm1CaXRyYXRlTW9kZSk+OjpTdHJpY3RWYWx1ZVdpdGhOb0RlcHMpCi0gICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwotCi0gICAgICAgIGFkZFBhcmFtZXRlcigKLSAgICAgICAgICAgIERlZmluZVBhcmFtKG1GcmFtZVJhdGUsIEMyX1BBUkFNS0VZX0ZSQU1FX1JBVEUpCi0gICAgICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbUZyYW1lUmF0ZUluZm86Om91dHB1dCgwdSwgMzAuKSkKLSAgICAgICAgICAgICAgICAvLyBUT0RPOiBNb3JlIHJlc3RyaWN0aW9uPwotICAgICAgICAgICAgICAgIC53aXRoRmllbGRzKHtDMkYobUZyYW1lUmF0ZSwgdmFsdWUpLmdyZWF0ZXJUaGFuKDAuKX0pCi0gICAgICAgICAgICAgICAgLndpdGhTZXR0ZXIoCi0gICAgICAgICAgICAgICAgICAgIFNldHRlcjxkZWNsdHlwZSgqbUZyYW1lUmF0ZSk+OjpTdHJpY3RWYWx1ZVdpdGhOb0RlcHMpCi0gICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwotCi0gICAgICAgIGFkZFBhcmFtZXRlcigKLSAgICAgICAgICAgIERlZmluZVBhcmFtKG1MYXllcmluZywgQzJfUEFSQU1LRVlfVEVNUE9SQUxfTEFZRVJJTkcpCi0gICAgICAgICAgICAgICAgLndpdGhEZWZhdWx0KEMyU3RyZWFtVGVtcG9yYWxMYXllcmluZ1R1bmluZzo6b3V0cHV0OjpBbGxvY1NoYXJlZCgwdSwgMCwgMCwgMCkpCi0gICAgICAgICAgICAgICAgLndpdGhGaWVsZHMoewotICAgICAgICAgICAgICAgICAgICBDMkYobUxheWVyaW5nLCBtLmxheWVyQ291bnQpLmluUmFuZ2UoMCwgNCksCi0gICAgICAgICAgICAgICAgICAgIEMyRihtTGF5ZXJpbmcsIG0uYkxheWVyQ291bnQpLmluUmFuZ2UoMCwgMCksCi0gICAgICAgICAgICAgICAgICAgIEMyRihtTGF5ZXJpbmcsIG0uYml0cmF0ZVJhdGlvcykuaW5SYW5nZSgwLiwgMS4pCi0gICAgICAgICAgICAgICAgfSkKLSAgICAgICAgICAgICAgICAud2l0aFNldHRlcihMYXllcmluZ1NldHRlcikKLSAgICAgICAgICAgICAgICAuYnVpbGQoKSk7Ci0KLSAgICAgICAgYWRkUGFyYW1ldGVyKAotICAgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1TeW5jRnJhbWVQZXJpb2QsIEMyX1BBUkFNS0VZX1NZTkNfRlJBTUVfSU5URVJWQUwpCi0gICAgICAgICAgICAgICAgLndpdGhEZWZhdWx0KG5ldyBDMlN0cmVhbVN5bmNGcmFtZUludGVydmFsVHVuaW5nOjpvdXRwdXQoMHUsIDEwMDAwMDApKQotICAgICAgICAgICAgICAgIC53aXRoRmllbGRzKHtDMkYobVN5bmNGcmFtZVBlcmlvZCwgdmFsdWUpLmFueSgpfSkKLSAgICAgICAgICAgICAgICAud2l0aFNldHRlcihTZXR0ZXI8ZGVjbHR5cGUoKm1TeW5jRnJhbWVQZXJpb2QpPjo6U3RyaWN0VmFsdWVXaXRoTm9EZXBzKQotICAgICAgICAgICAgICAgIC5idWlsZCgpKTsKLQotICAgICAgICBhZGRQYXJhbWV0ZXIoCi0gICAgICAgICAgICBEZWZpbmVQYXJhbShtQml0cmF0ZSwgQzJfUEFSQU1LRVlfQklUUkFURSkKLSAgICAgICAgICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtQml0cmF0ZUluZm86Om91dHB1dCgwdSwgNjQwMDApKQotICAgICAgICAgICAgICAgIC53aXRoRmllbGRzKHtDMkYobUJpdHJhdGUsIHZhbHVlKS5pblJhbmdlKDQwOTYsIDQwMDAwMDAwKX0pCi0gICAgICAgICAgICAgICAgLndpdGhTZXR0ZXIoQml0cmF0ZVNldHRlcikKLSAgICAgICAgICAgICAgICAuYnVpbGQoKSk7Ci0KLSAgICAgICAgYWRkUGFyYW1ldGVyKAotICAgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1JbnRyYVJlZnJlc2gsIEMyX1BBUkFNS0VZX0lOVFJBX1JFRlJFU0gpCi0gICAgICAgICAgICAgICAgLndpdGhDb25zdFZhbHVlKG5ldyBDMlN0cmVhbUludHJhUmVmcmVzaFR1bmluZzo6b3V0cHV0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwdSwgQzJDb25maWc6OklOVFJBX1JFRlJFU0hfRElTQUJMRUQsIDAuKSkKLSAgICAgICAgICAgICAgICAuYnVpbGQoKSk7Ci0KLSAgICAgICAgYWRkUGFyYW1ldGVyKAotICAgICAgICBEZWZpbmVQYXJhbShtUHJvZmlsZUxldmVsLCBDMl9QQVJBTUtFWV9QUk9GSUxFX0xFVkVMKQotICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtUHJvZmlsZUxldmVsSW5mbzo6b3V0cHV0KAotICAgICAgICAgICAgICAgIDB1LCBQUk9GSUxFX1ZQOV8wLCBMRVZFTF9WUDlfNF8xKSkKLSAgICAgICAgLndpdGhGaWVsZHMoewotICAgICAgICAgICAgQzJGKG1Qcm9maWxlTGV2ZWwsIHByb2ZpbGUpLmVxdWFsVG8oCi0gICAgICAgICAgICAgICAgUFJPRklMRV9WUDlfMAotICAgICAgICAgICAgKSwKLSAgICAgICAgICAgIEMyRihtUHJvZmlsZUxldmVsLCBsZXZlbCkuZXF1YWxUbygKLSAgICAgICAgICAgICAgICBMRVZFTF9WUDlfNF8xKSwKLSAgICAgICAgfSkKLSAgICAgICAgLndpdGhTZXR0ZXIoUHJvZmlsZUxldmVsU2V0dGVyKQotICAgICAgICAuYnVpbGQoKSk7Ci0KLSAgICAgICAgYWRkUGFyYW1ldGVyKAotICAgICAgICAgICAgICAgIERlZmluZVBhcmFtKG1SZXF1ZXN0U3luYywgQzJfUEFSQU1LRVlfUkVRVUVTVF9TWU5DX0ZSQU1FKQotICAgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1SZXF1ZXN0U3luY0ZyYW1lVHVuaW5nOjpvdXRwdXQoMHUsIEMyX0ZBTFNFKSkKLSAgICAgICAgICAgICAgICAud2l0aEZpZWxkcyh7QzJGKG1SZXF1ZXN0U3luYywgdmFsdWUpLm9uZU9mKHsgQzJfRkFMU0UsIEMyX1RSVUUgfSkgfSkKLSAgICAgICAgICAgICAgICAud2l0aFNldHRlcihTZXR0ZXI8ZGVjbHR5cGUoKm1SZXF1ZXN0U3luYyk+OjpOb25TdHJpY3RWYWx1ZVdpdGhOb0RlcHMpCi0gICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwotCi0gICAgICAgIGFkZFBhcmFtZXRlcigKLSAgICAgICAgICAgICAgICBEZWZpbmVQYXJhbShtQ29sb3JBc3BlY3RzLCBDMl9QQVJBTUtFWV9DT0xPUl9BU1BFQ1RTKQotICAgICAgICAgICAgICAgIC53aXRoRGVmYXVsdChuZXcgQzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dCgKLSAgICAgICAgICAgICAgICAgICAgICAgIDB1LCBDMkNvbG9yOjpSQU5HRV9VTlNQRUNJRklFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX1VOU1BFQ0lGSUVELAotICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6VFJBTlNGRVJfVU5TUEVDSUZJRUQsIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCkpCi0gICAgICAgICAgICAgICAgLndpdGhGaWVsZHMoewotICAgICAgICAgICAgICAgICAgICBDMkYobUNvbG9yQXNwZWN0cywgcmFuZ2UpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCAgICAgQzJDb2xvcjo6UkFOR0VfT1RIRVIpLAotICAgICAgICAgICAgICAgICAgICBDMkYobUNvbG9yQXNwZWN0cywgcHJpbWFyaWVzKS5pblJhbmdlKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDMkNvbG9yOjpQUklNQVJJRVNfVU5TUEVDSUZJRUQsIEMyQ29sb3I6OlBSSU1BUklFU19PVEhFUiksCi0gICAgICAgICAgICAgICAgICAgIEMyRihtQ29sb3JBc3BlY3RzLCB0cmFuc2ZlcikuaW5SYW5nZSgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQzJDb2xvcjo6VFJBTlNGRVJfVU5TUEVDSUZJRUQsICBDMkNvbG9yOjpUUkFOU0ZFUl9PVEhFUiksCi0gICAgICAgICAgICAgICAgICAgIEMyRihtQ29sb3JBc3BlY3RzLCBtYXRyaXgpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCwgICAgQzJDb2xvcjo6TUFUUklYX09USEVSKQotICAgICAgICAgICAgICAgIH0pCi0gICAgICAgICAgICAgICAgLndpdGhTZXR0ZXIoQ29sb3JBc3BlY3RzU2V0dGVyKQotICAgICAgICAgICAgICAgIC5idWlsZCgpKTsKLQotICAgICAgICBhZGRQYXJhbWV0ZXIoCi0gICAgICAgICAgICAgICAgRGVmaW5lUGFyYW0obUNvZGVkQ29sb3JBc3BlY3RzLCBDMl9QQVJBTUtFWV9WVUlfQ09MT1JfQVNQRUNUUykKLSAgICAgICAgICAgICAgICAud2l0aERlZmF1bHQobmV3IEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6b3V0cHV0KAotICAgICAgICAgICAgICAgICAgICAgICAgMHUsIEMyQ29sb3I6OlJBTkdFX0xJTUlURUQsIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwKLSAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVELCBDMkNvbG9yOjpNQVRSSVhfVU5TUEVDSUZJRUQpKQotICAgICAgICAgICAgICAgIC53aXRoRmllbGRzKHsKLSAgICAgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgcmFuZ2UpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlJBTkdFX1VOU1BFQ0lGSUVELCAgICAgQzJDb2xvcjo6UkFOR0VfT1RIRVIpLAotICAgICAgICAgICAgICAgICAgICBDMkYobUNvZGVkQ29sb3JBc3BlY3RzLCBwcmltYXJpZXMpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlBSSU1BUklFU19VTlNQRUNJRklFRCwgQzJDb2xvcjo6UFJJTUFSSUVTX09USEVSKSwKLSAgICAgICAgICAgICAgICAgICAgQzJGKG1Db2RlZENvbG9yQXNwZWN0cywgdHJhbnNmZXIpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6OlRSQU5TRkVSX1VOU1BFQ0lGSUVELCAgQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVIpLAotICAgICAgICAgICAgICAgICAgICBDMkYobUNvZGVkQ29sb3JBc3BlY3RzLCBtYXRyaXgpLmluUmFuZ2UoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEMyQ29sb3I6Ok1BVFJJWF9VTlNQRUNJRklFRCwgICAgQzJDb2xvcjo6TUFUUklYX09USEVSKQotICAgICAgICAgICAgICAgIH0pCi0gICAgICAgICAgICAgICAgLndpdGhTZXR0ZXIoQ29kZWRDb2xvckFzcGVjdHNTZXR0ZXIsIG1Db2xvckFzcGVjdHMpCi0gICAgICAgICAgICAgICAgLmJ1aWxkKCkpOwotICAgIH0KLQotICAgIHN0YXRpYyBDMlIgQml0cmF0ZVNldHRlcihib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1CaXRyYXRlSW5mbzo6b3V0cHV0PiAmbWUpIHsKLSAgICAgICAgKHZvaWQpbWF5QmxvY2s7Ci0gICAgICAgIEMyUiByZXMgPSBDMlI6Ok9rKCk7Ci0gICAgICAgIGlmIChtZS52LnZhbHVlIDw9IDQwOTYpIHsKLSAgICAgICAgICAgIG1lLnNldCgpLnZhbHVlID0gNDA5NjsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzOwotICAgIH0KKyAgICBleHBsaWNpdCBJbnRmSW1wbChjb25zdCBzdGQ6OnNoYXJlZF9wdHI8QzJSZWZsZWN0b3JIZWxwZXI+ICZoZWxwZXIpOworICAgIHN0YXRpYyBDMlIgQml0cmF0ZVNldHRlcihib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1CaXRyYXRlSW5mbzo6b3V0cHV0PiAmbWUpOwogCiAgICAgc3RhdGljIEMyUiBTaXplU2V0dGVyKGJvb2wgbWF5QmxvY2ssIGNvbnN0IEMyUDxDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQ+ICZvbGRNZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgQzJQPEMyU3RyZWFtUGljdHVyZVNpemVJbmZvOjppbnB1dD4gJm1lKSB7Ci0gICAgICAgICh2b2lkKW1heUJsb2NrOwotICAgICAgICBDMlIgcmVzID0gQzJSOjpPaygpOwotICAgICAgICBpZiAoIW1lLkYobWUudi53aWR0aCkuc3VwcG9ydHNBdEFsbChtZS52LndpZHRoKSkgewotICAgICAgICAgICAgcmVzID0gcmVzLnBsdXMoQzJTZXR0aW5nUmVzdWx0QnVpbGRlcjo6QmFkVmFsdWUobWUuRihtZS52LndpZHRoKSkpOwotICAgICAgICAgICAgbWUuc2V0KCkud2lkdGggPSBvbGRNZS52LndpZHRoOwotICAgICAgICB9Ci0gICAgICAgIGlmICghbWUuRihtZS52LmhlaWdodCkuc3VwcG9ydHNBdEFsbChtZS52LmhlaWdodCkpIHsKLSAgICAgICAgICAgIHJlcyA9IHJlcy5wbHVzKEMyU2V0dGluZ1Jlc3VsdEJ1aWxkZXI6OkJhZFZhbHVlKG1lLkYobWUudi5oZWlnaHQpKSk7Ci0gICAgICAgICAgICBtZS5zZXQoKS5oZWlnaHQgPSBvbGRNZS52LmhlaWdodDsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzOwotICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgQzJQPEMyU3RyZWFtUGljdHVyZVNpemVJbmZvOjppbnB1dD4gJm1lKTsKIAogICAgIHN0YXRpYyBDMlIgUHJvZmlsZUxldmVsU2V0dGVyKAogICAgICAgICAgICAgYm9vbCBtYXlCbG9jaywKLSAgICAgICAgICAgIEMyUDxDMlN0cmVhbVByb2ZpbGVMZXZlbEluZm86Om91dHB1dD4gJm1lKSB7Ci0gICAgICAgICh2b2lkKW1heUJsb2NrOwotICAgICAgICBpZiAoIW1lLkYobWUudi5wcm9maWxlKS5zdXBwb3J0c0F0QWxsKG1lLnYucHJvZmlsZSkpIHsKLSAgICAgICAgICAgIG1lLnNldCgpLnByb2ZpbGUgPSBQUk9GSUxFX1ZQOV8wOwotICAgICAgICB9Ci0gICAgICAgIGlmICghbWUuRihtZS52LmxldmVsKS5zdXBwb3J0c0F0QWxsKG1lLnYubGV2ZWwpKSB7Ci0gICAgICAgICAgICBtZS5zZXQoKS5sZXZlbCA9IExFVkVMX1ZQOV80XzE7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIEMyUjo6T2soKTsKLSAgICB9CisgICAgICAgICAgICBDMlA8QzJTdHJlYW1Qcm9maWxlTGV2ZWxJbmZvOjpvdXRwdXQ+ICZtZSk7CiAKLSAgICBzdGF0aWMgQzJSIExheWVyaW5nU2V0dGVyKGJvb2wgbWF5QmxvY2ssIEMyUDxDMlN0cmVhbVRlbXBvcmFsTGF5ZXJpbmdUdW5pbmc6Om91dHB1dD4mIG1lKSB7Ci0gICAgICAgICh2b2lkKW1heUJsb2NrOwotICAgICAgICBDMlIgcmVzID0gQzJSOjpPaygpOwotICAgICAgICBpZiAobWUudi5tLmxheWVyQ291bnQgPiA0KSB7Ci0gICAgICAgICAgICBtZS5zZXQoKS5tLmxheWVyQ291bnQgPSA0OwotICAgICAgICB9Ci0gICAgICAgIG1lLnNldCgpLm0uYkxheWVyQ291bnQgPSAwOwotICAgICAgICAvLyBlbnN1cmUgcmF0aW9zIGFyZSBtb25vdG9uaWMgYW5kIGNsYW1wZWQgYmV0d2VlbiAwIGFuZCAxCi0gICAgICAgIGZvciAoc2l6ZV90IGl4ID0gMDsgaXggPCBtZS52LmZsZXhDb3VudCgpOyArK2l4KSB7Ci0gICAgICAgICAgICBtZS5zZXQoKS5tLmJpdHJhdGVSYXRpb3NbaXhdID0gYzJfY2xhbXAoCi0gICAgICAgICAgICAgICAgaXggPiAwID8gbWUudi5tLmJpdHJhdGVSYXRpb3NbaXggLSAxXSA6IDAsIG1lLnYubS5iaXRyYXRlUmF0aW9zW2l4XSwgMS4pOwotICAgICAgICB9Ci0gICAgICAgIEFMT0dJKCJzZXR0aW5nIHRlbXBvcmFsIGxheWVyaW5nICV1ICsgJXUiLCBtZS52Lm0ubGF5ZXJDb3VudCwgbWUudi5tLmJMYXllckNvdW50KTsKLSAgICAgICAgcmV0dXJuIHJlczsKLSAgICB9CisgICAgc3RhdGljIEMyUiBMYXllcmluZ1NldHRlcihib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1UZW1wb3JhbExheWVyaW5nVHVuaW5nOjpvdXRwdXQ+JiBtZSk7CiAKICAgICAvLyB1bnNhZmUgZ2V0dGVycwogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQ+IGdldFNpemVfbCgpIGNvbnN0IHsgcmV0dXJuIG1TaXplOyB9Ci0gICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtSW50cmFSZWZyZXNoVHVuaW5nOjpvdXRwdXQ+IGdldEludHJhUmVmcmVzaF9sKCkgY29uc3QgeyByZXR1cm4gbUludHJhUmVmcmVzaDsgfQorICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUludHJhUmVmcmVzaFR1bmluZzo6b3V0cHV0PiBnZXRJbnRyYVJlZnJlc2hfbCgpIGNvbnN0IHsKKyAgICAgICAgcmV0dXJuIG1JbnRyYVJlZnJlc2g7CisgICAgfQogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbUZyYW1lUmF0ZUluZm86Om91dHB1dD4gZ2V0RnJhbWVSYXRlX2woKSBjb25zdCB7IHJldHVybiBtRnJhbWVSYXRlOyB9CiAgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtQml0cmF0ZUluZm86Om91dHB1dD4gZ2V0Qml0cmF0ZV9sKCkgY29uc3QgeyByZXR1cm4gbUJpdHJhdGU7IH0KLSAgICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1CaXRyYXRlTW9kZVR1bmluZzo6b3V0cHV0PiBnZXRCaXRyYXRlTW9kZV9sKCkgY29uc3QgeyByZXR1cm4gbUJpdHJhdGVNb2RlOyB9Ci0gICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtUmVxdWVzdFN5bmNGcmFtZVR1bmluZzo6b3V0cHV0PiBnZXRSZXF1ZXN0U3luY19sKCkgY29uc3QgeyByZXR1cm4gbVJlcXVlc3RTeW5jOyB9Ci0gICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtVGVtcG9yYWxMYXllcmluZ1R1bmluZzo6b3V0cHV0PiBnZXRUZW1wb3JhbExheWVyc19sKCkgY29uc3QgeyByZXR1cm4gbUxheWVyaW5nOyB9Ci0gICAgdWludDMyX3QgZ2V0U3luY0ZyYW1lUGVyaW9kKCkgY29uc3QgewotICAgICAgICBpZiAobVN5bmNGcmFtZVBlcmlvZC0+dmFsdWUgPCAwIHx8IG1TeW5jRnJhbWVQZXJpb2QtPnZhbHVlID09IElOVDY0X01BWCkgewotICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIH0KLSAgICAgICAgZG91YmxlIHBlcmlvZCA9IG1TeW5jRnJhbWVQZXJpb2QtPnZhbHVlIC8gMWU2ICogbUZyYW1lUmF0ZS0+dmFsdWU7Ci0gICAgICAgIHJldHVybiAodWludDMyX3QpYzJfbWF4KGMyX21pbihwZXJpb2QgKyAwLjUsIGRvdWJsZShVSU5UMzJfTUFYKSksIDEuKTsKKyAgICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1CaXRyYXRlTW9kZVR1bmluZzo6b3V0cHV0PiBnZXRCaXRyYXRlTW9kZV9sKCkgY29uc3QgeworICAgICAgICByZXR1cm4gbUJpdHJhdGVNb2RlOwogICAgIH0KLSAgICBzdGF0aWMgQzJSIENvbG9yQXNwZWN0c1NldHRlcihib29sIG1heUJsb2NrLCBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dD4gJm1lKSB7Ci0gICAgICAgICh2b2lkKW1heUJsb2NrOwotICAgICAgICBpZiAobWUudi5yYW5nZSA+IEMyQ29sb3I6OlJBTkdFX09USEVSKSB7Ci0gICAgICAgICAgICAgICAgbWUuc2V0KCkucmFuZ2UgPSBDMkNvbG9yOjpSQU5HRV9PVEhFUjsKLSAgICAgICAgfQotICAgICAgICBpZiAobWUudi5wcmltYXJpZXMgPiBDMkNvbG9yOjpQUklNQVJJRVNfT1RIRVIpIHsKLSAgICAgICAgICAgICAgICBtZS5zZXQoKS5wcmltYXJpZXMgPSBDMkNvbG9yOjpQUklNQVJJRVNfT1RIRVI7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKG1lLnYudHJhbnNmZXIgPiBDMkNvbG9yOjpUUkFOU0ZFUl9PVEhFUikgewotICAgICAgICAgICAgICAgIG1lLnNldCgpLnRyYW5zZmVyID0gQzJDb2xvcjo6VFJBTlNGRVJfT1RIRVI7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKG1lLnYubWF0cml4ID4gQzJDb2xvcjo6TUFUUklYX09USEVSKSB7Ci0gICAgICAgICAgICAgICAgbWUuc2V0KCkubWF0cml4ID0gQzJDb2xvcjo6TUFUUklYX09USEVSOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBDMlI6Ok9rKCk7CisgICAgc3RkOjpzaGFyZWRfcHRyPEMyU3RyZWFtUmVxdWVzdFN5bmNGcmFtZVR1bmluZzo6b3V0cHV0PiBnZXRSZXF1ZXN0U3luY19sKCkgY29uc3QgeworICAgICAgICByZXR1cm4gbVJlcXVlc3RTeW5jOwogICAgIH0KKyAgICBzdGQ6OnNoYXJlZF9wdHI8QzJTdHJlYW1UZW1wb3JhbExheWVyaW5nVHVuaW5nOjpvdXRwdXQ+IGdldFRlbXBvcmFsTGF5ZXJzX2woKSBjb25zdCB7CisgICAgICAgIHJldHVybiBtTGF5ZXJpbmc7CisgICAgfQorICAgIHVpbnQzMl90IGdldFN5bmNGcmFtZVBlcmlvZCgpIGNvbnN0OworICAgIHN0YXRpYyBDMlIgQ29sb3JBc3BlY3RzU2V0dGVyKGJvb2wgbWF5QmxvY2ssIEMyUDxDMlN0cmVhbUNvbG9yQXNwZWN0c0luZm86OmlucHV0PiAmbWUpOwogICAgIHN0YXRpYyBDMlIgQ29kZWRDb2xvckFzcGVjdHNTZXR0ZXIoYm9vbCBtYXlCbG9jaywgQzJQPEMyU3RyZWFtQ29sb3JBc3BlY3RzSW5mbzo6b3V0cHV0PiAmbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBDMlA8QzJTdHJlYW1Db2xvckFzcGVjdHNJbmZvOjppbnB1dD4gJmNvZGVkKSB7Ci0gICAgICAgICh2b2lkKW1heUJsb2NrOwotICAgICAgICBtZS5zZXQoKS5yYW5nZSA9IGNvZGVkLnYucmFuZ2U7Ci0gICAgICAgIG1lLnNldCgpLnByaW1hcmllcyA9IGNvZGVkLnYucHJpbWFyaWVzOwotICAgICAgICBtZS5zZXQoKS50cmFuc2ZlciA9IGNvZGVkLnYudHJhbnNmZXI7Ci0gICAgICAgIG1lLnNldCgpLm1hdHJpeCA9IGNvZGVkLnYubWF0cml4OwotICAgICAgICByZXR1cm4gQzJSOjpPaygpOwotICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEMyUDxDMlN0cmVhbUNvbG9yQXNwZWN0c0luZm86OmlucHV0PiAmY29kZWQpOwogCiAgICBwcml2YXRlOgogICAgIHN0ZDo6c2hhcmVkX3B0cjxDMlN0cmVhbVVzYWdlVHVuaW5nOjppbnB1dD4gbVVzYWdlOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2NvcmUvaW5jbHVkZS9DMkNvbmZpZy5oIGIvbWVkaWEvY29kZWMyL2NvcmUvaW5jbHVkZS9DMkNvbmZpZy5oCmluZGV4IDJjYzdhYjcuLmZlYWE5OGMgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9jb3JlL2luY2x1ZGUvQzJDb25maWcuaAorKysgYi9tZWRpYS9jb2RlYzIvY29yZS9pbmNsdWRlL0MyQ29uZmlnLmgKQEAgLTE2NzMsNyArMTY3Myw3IEBACiAgICAgU1lOQ19GUkFNRSA9ICgxIDw8IDApLCAgLy8vPCBzeW5jIGZyYW1lLCBlLmcuIElEUgogICAgIElfRlJBTUUgICAgPSAoMSA8PCAxKSwgIC8vLzwgaW50cmEgZnJhbWUgdGhhdCBpcyBjb21wbGV0ZWx5IGVuY29kZWQKICAgICBQX0ZSQU1FICAgID0gKDEgPDwgMiksICAvLy88IGludGVyIHByZWRpY3RlZCBmcmFtZSBmcm9tIHByZXZpb3VzIGZyYW1lcwotICAgIEJfRlJBTUUgICAgPSAoMSA8PCAzKSwgIC8vLzwgYmFja3dhcmQgcHJlZGljdGVkIChvdXQtb2Ytb3JkZXIpIGZyYW1lCisgICAgQl9GUkFNRSAgICA9ICgxIDw8IDMpLCAgLy8vPCBiaWRpcmVjdGlvbmFsIHByZWRpY3RlZCAob3V0LW9mLW9yZGVyKSBmcmFtZQogKQogCiAvKioKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9mdXp6ZXIvQzJGdXp6ZXIuY3BwIGIvbWVkaWEvY29kZWMyL2Z1enplci9DMkZ1enplci5jcHAKaW5kZXggNTFlMTAxMy4uZTQ2OWQ4YiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2Z1enplci9DMkZ1enplci5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2Z1enplci9DMkZ1enplci5jcHAKQEAgLTE5NCwxMiArMTk0LDEyIEBACiAgIH0KIAogICBzdGQ6OnZlY3RvcjxDMlBhcmFtKj4gY29uZmlnUGFyYW1zOworICBDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQgaW5wdXRTaXplKDB1LCBrV2lkdGhPZlZpZGVvLCBrSGVpZ2h0T2ZWaWRlbyk7CisgIEMyU3RyZWFtU2FtcGxlUmF0ZUluZm86Om91dHB1dCBzYW1wbGVSYXRlSW5mbygwdSwga1NhbXBsaW5nUmF0ZU9mQXVkaW8pOworICBDMlN0cmVhbUNoYW5uZWxDb3VudEluZm86Om91dHB1dCBjaGFubmVsQ291bnRJbmZvKDB1LCBrQ2hhbm5lbHNPZkF1ZGlvKTsKICAgaWYgKGRvbWFpbi52YWx1ZSA9PSBET01BSU5fVklERU8pIHsKLSAgICBDMlN0cmVhbVBpY3R1cmVTaXplSW5mbzo6aW5wdXQgaW5wdXRTaXplKDB1LCBrV2lkdGhPZlZpZGVvLCBrSGVpZ2h0T2ZWaWRlbyk7CiAgICAgY29uZmlnUGFyYW1zLnB1c2hfYmFjaygmaW5wdXRTaXplKTsKICAgfSBlbHNlIGlmIChkb21haW4udmFsdWUgPT0gRE9NQUlOX0FVRElPKSB7Ci0gICAgQzJTdHJlYW1TYW1wbGVSYXRlSW5mbzo6b3V0cHV0IHNhbXBsZVJhdGVJbmZvKDB1LCBrU2FtcGxpbmdSYXRlT2ZBdWRpbyk7Ci0gICAgQzJTdHJlYW1DaGFubmVsQ291bnRJbmZvOjpvdXRwdXQgY2hhbm5lbENvdW50SW5mbygwdSwga0NoYW5uZWxzT2ZBdWRpbyk7CiAgICAgY29uZmlnUGFyYW1zLnB1c2hfYmFjaygmc2FtcGxlUmF0ZUluZm8pOwogICAgIGNvbmZpZ1BhcmFtcy5wdXNoX2JhY2soJmNoYW5uZWxDb3VudEluZm8pOwogICB9CkBAIC0yMzksMTcgKzIzOSwxNyBAQAogfQogCiB2b2lkIENvZGVjMkZ1enplcjo6ZGVjb2RlRnJhbWVzKGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBzaXplKSB7Ci0gIG1CdWZmZXJTb3VyY2UgPSBuZXcgQnVmZmVyU291cmNlKGRhdGEsIHNpemUpOwotICBpZiAoIW1CdWZmZXJTb3VyY2UpIHsKKyAgc3RkOjp1bmlxdWVfcHRyPEJ1ZmZlclNvdXJjZT4gYnVmZmVyU291cmNlID0gc3RkOjptYWtlX3VuaXF1ZTxCdWZmZXJTb3VyY2U+KGRhdGEsIHNpemUpOworICBpZiAoIWJ1ZmZlclNvdXJjZSkgewogICAgIHJldHVybjsKICAgfQotICBtQnVmZmVyU291cmNlLT5wYXJzZSgpOworICBidWZmZXJTb3VyY2UtPnBhcnNlKCk7CiAgIGMyX3N0YXR1c190IHN0YXR1cyA9IEMyX09LOwogICBzaXplX3QgbnVtRnJhbWVzID0gMDsKLSAgd2hpbGUgKCFtQnVmZmVyU291cmNlLT5pc0VvcygpKSB7CisgIHdoaWxlICghYnVmZmVyU291cmNlLT5pc0VvcygpKSB7CiAgICAgdWludDhfdCogZnJhbWUgPSBudWxscHRyOwogICAgIHNpemVfdCBmcmFtZVNpemUgPSAwOwotICAgIEZyYW1lRGF0YSBmcmFtZURhdGEgPSBtQnVmZmVyU291cmNlLT5nZXRGcmFtZSgpOworICAgIEZyYW1lRGF0YSBmcmFtZURhdGEgPSBidWZmZXJTb3VyY2UtPmdldEZyYW1lKCk7CiAgICAgZnJhbWUgPSBzdGQ6OmdldDwwPihmcmFtZURhdGEpOwogICAgIGZyYW1lU2l6ZSA9IHN0ZDo6Z2V0PDE+KGZyYW1lRGF0YSk7CiAKQEAgLTI5OCw3ICsyOTgsNiBAQAogICBtQ29uZGl0aW9uYWxWYXJpYWJsZS53YWl0X2Zvcih3YWl0Rm9yRGVjb2RlQ29tcGxldGUsIGtDMkZ1enplclRpbWVPdXQsIFt0aGlzXSB7IHJldHVybiBtRW9zOyB9KTsKICAgc3RkOjpsaXN0PHN0ZDo6dW5pcXVlX3B0cjxDMldvcms+PiBjMmZsdXNoZWRXb3JrczsKICAgbUNvbXBvbmVudC0+Zmx1c2hfc20oQzJDb21wb25lbnQ6OkZMVVNIX0NPTVBPTkVOVCwgJmMyZmx1c2hlZFdvcmtzKTsKLSAgZGVsZXRlIG1CdWZmZXJTb3VyY2U7CiB9CiAKIGV4dGVybiAiQyIgaW50IExMVk1GdXp6ZXJUZXN0T25lSW5wdXQoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUpIHsKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9mdXp6ZXIvQzJGdXp6ZXIuaCBiL21lZGlhL2NvZGVjMi9mdXp6ZXIvQzJGdXp6ZXIuaAppbmRleCBkNWFjODFhLi5kYTc2ODg1IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvZnV6emVyL0MyRnV6emVyLmgKKysrIGIvbWVkaWEvY29kZWMyL2Z1enplci9DMkZ1enplci5oCkBAIC0xMDQsNyArMTA0LDYgQEAKICAgICBzdGF0aWMgY29uc3RleHByIHNpemVfdCBrTWFya2VyU3VmZml4U2l6ZSA9IDM7CiAgIH07CiAKLSAgQnVmZmVyU291cmNlKiBtQnVmZmVyU291cmNlOwogICBib29sIG1Fb3MgPSBmYWxzZTsKICAgQzJCbG9ja1Bvb2w6OmxvY2FsX2lkX3QgbUJsb2NrUG9vbElkOwogCmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvaGlkbC8xLjAvdnRzLy5jbGFuZy1mb3JtYXQgYi9tZWRpYS9jb2RlYzIvaGlkbC8xLjAvdnRzLy5jbGFuZy1mb3JtYXQKZGVsZXRlZCBmaWxlIG1vZGUgMTIwMDAwCmluZGV4IDEzNjI3OWMuLjAwMDAwMDAKLS0tIGEvbWVkaWEvY29kZWMyL2hpZGwvMS4wL3Z0cy8uY2xhbmctZm9ybWF0CisrKyAvZGV2L251bGwKQEAgLTEgKzAsMCBAQAotLi4vLi4vLi4vLi4vLi4vLi4vLi4vYnVpbGQvc29vbmcvc2NyaXB0cy9zeXN0ZW0tY2xhbmctZm9ybWF0ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL2hpZGwvMS4wL3Z0cy9mdW5jdGlvbmFsL2F1ZGlvL1Z0c0hhbE1lZGlhQzJWMV8wVGFyZ2V0QXVkaW9EZWNUZXN0LmNwcCBiL21lZGlhL2NvZGVjMi9oaWRsLzEuMC92dHMvZnVuY3Rpb25hbC9hdWRpby9WdHNIYWxNZWRpYUMyVjFfMFRhcmdldEF1ZGlvRGVjVGVzdC5jcHAKaW5kZXggOWUzYTgyMy4uZDQ3ZWY2NyAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2hpZGwvMS4wL3Z0cy9mdW5jdGlvbmFsL2F1ZGlvL1Z0c0hhbE1lZGlhQzJWMV8wVGFyZ2V0QXVkaW9EZWNUZXN0LmNwcAorKysgYi9tZWRpYS9jb2RlYzIvaGlkbC8xLjAvdnRzL2Z1bmN0aW9uYWwvYXVkaW8vVnRzSGFsTWVkaWFDMlYxXzBUYXJnZXRBdWRpb0RlY1Rlc3QuY3BwCkBAIC00NjUsNiArNDY1LDExIEBACiAgICAgaWYgKG1NaW1lLmZpbmQoInJhdyIpICE9IHN0ZDo6c3RyaW5nOjpucG9zKSB7CiAgICAgICAgIGJpdFN0cmVhbUluZm9bMF0gPSA4MDAwOwogICAgICAgICBiaXRTdHJlYW1JbmZvWzFdID0gMTsKKyAgICB9IGVsc2UgaWYgKChtTWltZS5maW5kKCJnNzExLWFsYXciKSAhPSBzdGQ6OnN0cmluZzo6bnBvcykgfHwKKyAgICAgICAgICAgICAgIChtTWltZS5maW5kKCJnNzExLW1sYXciKSAhPSBzdGQ6OnN0cmluZzo6bnBvcykpIHsKKyAgICAgICAgLy8gZzcxMSB0ZXN0IGRhdGEgaXMgYWxsIDEtY2hhbm5lbCBhbmQgaGFzIG5vIGVtYmVkZGVkIGNvbmZpZyBpbmZvLgorICAgICAgICBiaXRTdHJlYW1JbmZvWzBdID0gODAwMDsKKyAgICAgICAgYml0U3RyZWFtSW5mb1sxXSA9IDE7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUX05PX0ZBVEFMX0ZBSUxVUkUoZ2V0SW5wdXRDaGFubmVsSW5mbyhtQ29tcG9uZW50LCBtTWltZSwgYml0U3RyZWFtSW5mbykpOwogICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9oaWRsLzEuMC92dHMvZnVuY3Rpb25hbC9jb21wb25lbnQvVnRzSGFsTWVkaWFDMlYxXzBUYXJnZXRDb21wb25lbnRUZXN0LmNwcCBiL21lZGlhL2NvZGVjMi9oaWRsLzEuMC92dHMvZnVuY3Rpb25hbC9jb21wb25lbnQvVnRzSGFsTWVkaWFDMlYxXzBUYXJnZXRDb21wb25lbnRUZXN0LmNwcAppbmRleCBmZmVjODk3Li4yNzVhNzIxIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvaGlkbC8xLjAvdnRzL2Z1bmN0aW9uYWwvY29tcG9uZW50L1Z0c0hhbE1lZGlhQzJWMV8wVGFyZ2V0Q29tcG9uZW50VGVzdC5jcHAKKysrIGIvbWVkaWEvY29kZWMyL2hpZGwvMS4wL3Z0cy9mdW5jdGlvbmFsL2NvbXBvbmVudC9WdHNIYWxNZWRpYUMyVjFfMFRhcmdldENvbXBvbmVudFRlc3QuY3BwCkBAIC02MSw2ICs2MSw3IEBACiAgIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgU2V0VXAoKSBvdmVycmlkZSB7CiAgICAgICAgIGdldFBhcmFtcygpOworICAgICAgICBtRGlzYWJsZVRlc3QgPSBmYWxzZTsKICAgICAgICAgbUVvcyA9IGZhbHNlOwogICAgICAgICBtQ2xpZW50ID0gYW5kcm9pZDo6Q29kZWMyQ2xpZW50OjpDcmVhdGVGcm9tU2VydmljZShtSW5zdGFuY2VOYW1lLmNfc3RyKCkpOwogICAgICAgICBBU1NFUlRfTkUobUNsaWVudCwgbnVsbHB0cik7CkBAIC03Myw2ICs3NCwxNCBAQAogICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IE1BWF9JTlBVVF9CVUZGRVJTOyArK2kpIHsKICAgICAgICAgICAgIG1Xb3JrUXVldWUuZW1wbGFjZV9iYWNrKG5ldyBDMldvcmspOwogICAgICAgICB9CisKKyAgICAgICAgQzJTZWN1cmVNb2RlVHVuaW5nIHNlY3VyZU1vZGVUdW5pbmd7fTsKKyAgICAgICAgbUNvbXBvbmVudC0+cXVlcnkoeyZzZWN1cmVNb2RlVHVuaW5nfSwge30sIEMyX01BWV9CTE9DSywgbnVsbHB0cik7CisgICAgICAgIGlmIChzZWN1cmVNb2RlVHVuaW5nLnZhbHVlICE9IEMyQ29uZmlnOjpTTV9VTlBST1RFQ1RFRCkgeworICAgICAgICAgICAgbURpc2FibGVUZXN0ID0gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChtRGlzYWJsZVRlc3QpIHN0ZDo6Y291dCA8PCAiWyAgIFdBUk4gICBdIFRlc3QgRGlzYWJsZWQgXG4iOwogICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCBUZWFyRG93bigpIG92ZXJyaWRlIHsKQEAgLTEwNSw2ICsxMTQsNyBAQAogICAgIHN0ZDo6c3RyaW5nIG1JbnN0YW5jZU5hbWU7CiAgICAgc3RkOjpzdHJpbmcgbUNvbXBvbmVudE5hbWU7CiAgICAgYm9vbCBtRW9zOworICAgIGJvb2wgbURpc2FibGVUZXN0OwogICAgIHN0ZDo6bXV0ZXggbVF1ZXVlTG9jazsKICAgICBzdGQ6OmNvbmRpdGlvbl92YXJpYWJsZSBtUXVldWVDb25kaXRpb247CiAgICAgc3RkOjpsaXN0PHN0ZDo6dW5pcXVlX3B0cjxDMldvcms+PiBtV29ya1F1ZXVlOwpAQCAtMzI0LDYgKzMzNCw3IEBACiB9OwogCiBURVNUX1AoQ29kZWMyQ29tcG9uZW50SW5wdXRUZXN0cywgSW5wdXRCdWZmZXJUZXN0KSB7CisgICAgaWYgKG1EaXNhYmxlVGVzdCkgR1RFU1RfU0tJUCgpIDw8ICJUZXN0IGlzIGRpc2FibGVkIjsKICAgICBkZXNjcmlwdGlvbigiVGVzdHMgZm9yIGRpZmZlcmVudCBpbnB1dHMiKTsKIAogICAgIHVpbnQzMl90IGZsYWdzID0gc3RkOjpnZXQ8Mj4oR2V0UGFyYW0oKSk7CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvaGlkbC9zZXJ2aWNlcy9BbmRyb2lkLmJwIGIvbWVkaWEvY29kZWMyL2hpZGwvc2VydmljZXMvQW5kcm9pZC5icAppbmRleCBiYjlmNTFmLi5iMzZlODBhIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvaGlkbC9zZXJ2aWNlcy9BbmRyb2lkLmJwCisrKyBiL21lZGlhL2NvZGVjMi9oaWRsL3NlcnZpY2VzL0FuZHJvaWQuYnAKQEAgLTUyLDcgKzUyLDcgQEAKIAogICAgIC8vIG1pbmlqYWlsIGlzIHVzZWQgdG8gcHJvdGVjdCBhZ2FpbnN0IHVuZXhwZWN0ZWQgc3lzdGVtIGNhbGxzLgogICAgIHNoYXJlZF9saWJzOiBbCi0gICAgICAgICJsaWJhdnNlcnZpY2VzX21pbmlqYWlsX3ZlbmRvciIsCisgICAgICAgICJsaWJhdnNlcnZpY2VzX21pbmlqYWlsIiwKICAgICAgICAgImxpYmJpbmRlciIsCiAgICAgXSwKICAgICByZXF1aXJlZDogWyJhbmRyb2lkLmhhcmR3YXJlLm1lZGlhLmMyQDEuMi1kZWZhdWx0LXNlY2NvbXBfcG9saWN5Il0sCmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvaGlkbC9zZXJ2aWNlcy9hbmRyb2lkLmhhcmR3YXJlLm1lZGlhLmMyQDEuMi1kZWZhdWx0LXNlcnZpY2UucmMgYi9tZWRpYS9jb2RlYzIvaGlkbC9zZXJ2aWNlcy9hbmRyb2lkLmhhcmR3YXJlLm1lZGlhLmMyQDEuMi1kZWZhdWx0LXNlcnZpY2UucmMKaW5kZXggMDNmNmUzZC4uMTJkYTU5MyAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL2hpZGwvc2VydmljZXMvYW5kcm9pZC5oYXJkd2FyZS5tZWRpYS5jMkAxLjItZGVmYXVsdC1zZXJ2aWNlLnJjCisrKyBiL21lZGlhL2NvZGVjMi9oaWRsL3NlcnZpY2VzL2FuZHJvaWQuaGFyZHdhcmUubWVkaWEuYzJAMS4yLWRlZmF1bHQtc2VydmljZS5yYwpAQCAtMyw1ICszLDUgQEAKICAgICB1c2VyIG1lZGlhY29kZWMKICAgICBncm91cCBjYW1lcmEgbWVkaWFkcm0gZHJtcnBjCiAgICAgaW9wcmlvIHJ0IDQKLSAgICB3cml0ZXBpZCAvZGV2L2NwdXNldC9mb3JlZ3JvdW5kL3Rhc2tzCisgICAgdGFza19wcm9maWxlcyBQcm9jZXNzQ2FwYWNpdHlIaWdoCiAKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWMuY3BwIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlYy5jcHAKaW5kZXggODI0NjBjOS4uNDRhMmM1YiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlYy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlYy5jcHAKQEAgLTEzMzIsOCArMTMzMiw4IEBACiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICAvLyBzZXQgY2hhbm5lbC1tYXNrCiAgICAgICAgIGlmIChjb25maWctPm1Eb21haW4gJiBDb25maWc6OklTX0FVRElPKSB7CisgICAgICAgICAgICAvLyBzZXQgY2hhbm5lbC1tYXNrCiAgICAgICAgICAgICBpbnQzMl90IG1hc2s7CiAgICAgICAgICAgICBpZiAobXNnLT5maW5kSW50MzIoS0VZX0NIQU5ORUxfTUFTSywgJm1hc2spKSB7CiAgICAgICAgICAgICAgICAgaWYgKGNvbmZpZy0+bURvbWFpbiAmIENvbmZpZzo6SVNfRU5DT0RFUikgewpAQCAtMTM0Miw2ICsxMzQyLDE1IEBACiAgICAgICAgICAgICAgICAgICAgIGNvbmZpZy0+bU91dHB1dEZvcm1hdC0+c2V0SW50MzIoS0VZX0NIQU5ORUxfTUFTSywgbWFzayk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBzZXQgUENNIGVuY29kaW5nCisgICAgICAgICAgICBpbnQzMl90IHBjbUVuY29kaW5nID0ga0F1ZGlvRW5jb2RpbmdQY20xNmJpdDsKKyAgICAgICAgICAgIG1zZy0+ZmluZEludDMyKEtFWV9QQ01fRU5DT0RJTkcsICZwY21FbmNvZGluZyk7CisgICAgICAgICAgICBpZiAoZW5jb2RlcikgeworICAgICAgICAgICAgICAgIGNvbmZpZy0+bUlucHV0Rm9ybWF0LT5zZXRJbnQzMigiYW5kcm9pZC5fY29uZmlnLXBjbS1lbmNvZGluZyIsIHBjbUVuY29kaW5nKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgY29uZmlnLT5tT3V0cHV0Rm9ybWF0LT5zZXRJbnQzMigiYW5kcm9pZC5fY29uZmlnLXBjbS1lbmNvZGluZyIsIHBjbUVuY29kaW5nKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxDMlBhcmFtPiBjb2xvclRyYW5zZmVyUmVxdWVzdFBhcmFtOwpAQCAtMTQyMSw2ICsxNDMwLDEwIEBACiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICBpZiAoY29uZmlnLT5tVHVubmVsZWQpIHsKKyAgICAgICAgICAgIGNvbmZpZy0+bU91dHB1dEZvcm1hdC0+c2V0SW50MzIoImFuZHJvaWQuX3R1bm5lbGVkIiwgMSk7CisgICAgICAgIH0KKwogICAgICAgICBBTE9HRCgic2V0dXAgZm9ybWF0cyBpbnB1dDogJXMiLAogICAgICAgICAgICAgICAgIGNvbmZpZy0+bUlucHV0Rm9ybWF0LT5kZWJ1Z1N0cmluZygpLmNfc3RyKCkpOwogICAgICAgICBBTE9HRCgic2V0dXAgZm9ybWF0cyBvdXRwdXQ6ICVzIiwKQEAgLTE4OTYsOSArMTkwOSwxMSBAQAogICAgIHsKICAgICAgICAgTXV0ZXhlZDxzdGQ6OnVuaXF1ZV9wdHI8Q29uZmlnPj46OkxvY2tlZCBjb25maWdMb2NrZWQobUNvbmZpZyk7CiAgICAgICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxDb25maWc+ICZjb25maWcgPSAqY29uZmlnTG9ja2VkOworICAgICAgICBzcDxBTmF0aXZlV2luZG93PiBuYXRpdmVXaW5kb3cgPSBzdGF0aWNfY2FzdDxBTmF0aXZlV2luZG93ICo+KHN1cmZhY2UuZ2V0KCkpOworICAgICAgICBzdGF0dXNfdCBlcnIgPSBPSzsKKwogICAgICAgICBpZiAoY29uZmlnLT5tVHVubmVsZWQgJiYgY29uZmlnLT5tU2lkZWJhbmRIYW5kbGUgIT0gbnVsbHB0cikgewotICAgICAgICAgICAgc3A8QU5hdGl2ZVdpbmRvdz4gbmF0aXZlV2luZG93ID0gc3RhdGljX2Nhc3Q8QU5hdGl2ZVdpbmRvdyAqPihzdXJmYWNlLmdldCgpKTsKLSAgICAgICAgICAgIHN0YXR1c190IGVyciA9IG5hdGl2ZV93aW5kb3dfc2V0X3NpZGViYW5kX3N0cmVhbSgKKyAgICAgICAgICAgIGVyciA9IG5hdGl2ZV93aW5kb3dfc2V0X3NpZGViYW5kX3N0cmVhbSgKICAgICAgICAgICAgICAgICAgICAgbmF0aXZlV2luZG93LmdldCgpLAogICAgICAgICAgICAgICAgICAgICBjb25zdF9jYXN0PG5hdGl2ZV9oYW5kbGVfdCAqPihjb25maWctPm1TaWRlYmFuZEhhbmRsZS0+aGFuZGxlKCkpKTsKICAgICAgICAgICAgIGlmIChlcnIgIT0gT0spIHsKQEAgLTE5MDYsNiArMTkyMSwxNSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgbmF0aXZlV2luZG93LmdldCgpLCBjb25maWctPm1TaWRlYmFuZEhhbmRsZS0+aGFuZGxlKCksIGVycik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIEV4cGxpY2l0bHkgcmVzZXQgdGhlIHNpZGViYW5kIGhhbmRsZSBvZiB0aGUgd2luZG93IGZvcgorICAgICAgICAgICAgLy8gbm9uLXR1bm5lbGVkIHZpZGVvIGluIGNhc2UgdGhlIHdpbmRvdyB3YXMgcHJldmlvdXNseSB1c2VkCisgICAgICAgICAgICAvLyBmb3IgYSB0dW5uZWxlZCB2aWRlbyBwbGF5YmFjay4KKyAgICAgICAgICAgIGVyciA9IG5hdGl2ZV93aW5kb3dfc2V0X3NpZGViYW5kX3N0cmVhbShuYXRpdmVXaW5kb3cuZ2V0KCksIG51bGxwdHIpOworICAgICAgICAgICAgaWYgKGVyciAhPSBPSykgeworICAgICAgICAgICAgICAgIEFMT0dFKCJuYXRpdmVfd2luZG93X3NldF9zaWRlYmFuZF9zdHJlYW0obnVsbHB0cikgZmFpbGVkISAoZXJyICVkKS4iLCBlcnIpOworICAgICAgICAgICAgICAgIHJldHVybiBlcnI7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIG1DaGFubmVsLT5zZXRTdXJmYWNlKHN1cmZhY2UpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlckNoYW5uZWwuY3BwIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlckNoYW5uZWwuY3BwCmluZGV4IDMwNzM5NmIuLjIzYTMyNmYgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWNCdWZmZXJDaGFubmVsLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQnVmZmVyQ2hhbm5lbC5jcHAKQEAgLTI1NCw3ICsyNTQsNyBAQAogICAgICAgICAgICAgICAgIGJvb2wgcmVsZWFzZWQgPSBpbnB1dC0+YnVmZmVycy0+cmVsZWFzZUJ1ZmZlcihidWZmZXIsIG51bGxwdHIsIHRydWUpOwogICAgICAgICAgICAgICAgIEFMT0dWKCJbJXNdIHF1ZXVlSW5wdXRCdWZmZXI6IGJ1ZmZlciBjb3BpZWQ7ICVzcmVsZWFzZWQiLAogICAgICAgICAgICAgICAgICAgICAgIG1OYW1lLCByZWxlYXNlZCA/ICIiIDogIm5vdCAiKTsKLSAgICAgICAgICAgICAgICBidWZmZXIuY2xlYXIoKTsKKyAgICAgICAgICAgICAgICBidWZmZXIgPSBjb3B5OwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBBTE9HVygiWyVzXSBxdWV1ZUlucHV0QnVmZmVyOiBmYWlsZWQgdG8gY29weSBhIGJ1ZmZlcjsgdGhpcyBtYXkgY2F1c2UgaW5wdXQgIgogICAgICAgICAgICAgICAgICAgICAgICJidWZmZXIgc3RhcnZhdGlvbiBvbiBjb21wb25lbnQuIiwgbU5hbWUpOwpAQCAtMjgyLDYgKzI4MiwxMiBAQAogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChlb3MpIHsKKyAgICAgICAgTXV0ZXhlZDxJbnB1dD46OkxvY2tlZCBpbnB1dChtSW5wdXQpOworICAgICAgICBpZiAoaW5wdXQtPmZyYW1lUmVhc3NlbWJsZXIpIHsKKyAgICAgICAgICAgIHVzZXNGcmFtZVJlYXNzZW1ibGVyID0gdHJ1ZTsKKyAgICAgICAgICAgIC8vIGRyYWluIGFueSBwZW5kaW5nIGl0ZW1zIHdpdGggZW9zCisgICAgICAgICAgICBpbnB1dC0+ZnJhbWVSZWFzc2VtYmxlci5wcm9jZXNzKGJ1ZmZlciwgJml0ZW1zKTsKKyAgICAgICAgfQogICAgICAgICBmbGFncyB8PSBDMkZyYW1lRGF0YTo6RkxBR19FTkRfT0ZfU1RSRUFNOwogICAgIH0KICAgICBpZiAodXNlc0ZyYW1lUmVhc3NlbWJsZXIpIHsKQEAgLTM0MSwxMCArMzQ3LDEwIEBACiAgICAgfSBlbHNlIHsKICAgICAgICAgTXV0ZXhlZDxJbnB1dD46OkxvY2tlZCBpbnB1dChtSW5wdXQpOwogICAgICAgICBib29sIHJlbGVhc2VkID0gZmFsc2U7Ci0gICAgICAgIGlmIChidWZmZXIpIHsKLSAgICAgICAgICAgIHJlbGVhc2VkID0gaW5wdXQtPmJ1ZmZlcnMtPnJlbGVhc2VCdWZmZXIoYnVmZmVyLCBudWxscHRyLCB0cnVlKTsKLSAgICAgICAgfSBlbHNlIGlmIChjb3B5KSB7CisgICAgICAgIGlmIChjb3B5KSB7CiAgICAgICAgICAgICByZWxlYXNlZCA9IGlucHV0LT5leHRyYUJ1ZmZlcnMucmVsZWFzZVNsb3QoY29weSwgbnVsbHB0ciwgdHJ1ZSk7CisgICAgICAgIH0gZWxzZSBpZiAoYnVmZmVyKSB7CisgICAgICAgICAgICByZWxlYXNlZCA9IGlucHV0LT5idWZmZXJzLT5yZWxlYXNlQnVmZmVyKGJ1ZmZlciwgbnVsbHB0ciwgdHJ1ZSk7CiAgICAgICAgIH0KICAgICAgICAgQUxPR1YoIlslc10gcXVldWVJbnB1dEJ1ZmZlcjogYnVmZmVyJXMgJXNyZWxlYXNlZCIsCiAgICAgICAgICAgICAgIG1OYW1lLCAoYnVmZmVyID09IG51bGxwdHIpID8gIihjb3B5KSIgOiAiIiwgcmVsZWFzZWQgPyAiIiA6ICJub3QgIik7CkBAIC0xMzgyLDYgKzEzODgsMTIgQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBpbnQzMl90IHR1bm5lbGVkID0gMDsKKyAgICAgICAgaWYgKCFvdXRwdXRGb3JtYXQtPmZpbmRJbnQzMigiYW5kcm9pZC5fdHVubmVsZWQiLCAmdHVubmVsZWQpKSB7CisgICAgICAgICAgICB0dW5uZWxlZCA9IDA7CisgICAgICAgIH0KKyAgICAgICAgbVR1bm5lbGVkID0gKHR1bm5lbGVkICE9IDApOwogICAgIH0KIAogICAgIC8vIFNldCB1cCBwaXBlbGluZSBjb250cm9sLiBUaGlzIGhhcyB0byBiZSBkb25lIGFmdGVyIG1JbnB1dEJ1ZmZlcnMgYW5kCkBAIC0xODkxLDEwICsxOTAzLDIxIEBACiAgICAgICAgIH0KICAgICB9CiAKKyAgICBib29sIGRyb3AgPSBmYWxzZTsKKyAgICBpZiAod29ya2xldC0+b3V0cHV0LmZsYWdzICYgQzJGcmFtZURhdGE6OkZMQUdfRFJPUF9GUkFNRSkgeworICAgICAgICBBTE9HVigiWyVzXSBvbldvcmtEb25lOiBkcm9wIGJ1ZmZlciBidXQga2VlcCBtZXRhZGF0YSIsIG1OYW1lKTsKKyAgICAgICAgZHJvcCA9IHRydWU7CisgICAgfQorCiAgICAgaWYgKG5vdGlmeUNsaWVudCAmJiAhYnVmZmVyICYmICFmbGFncykgewotICAgICAgICBBTE9HVigiWyVzXSBvbldvcmtEb25lOiBOb3QgcmVwb3J0aW5nIG91dHB1dCBidWZmZXIgKCVsbGQpIiwKLSAgICAgICAgICAgICAgbU5hbWUsIHdvcmstPmlucHV0Lm9yZGluYWwuZnJhbWVJbmRleC5wZWVrdWxsKCkpOwotICAgICAgICBub3RpZnlDbGllbnQgPSBmYWxzZTsKKyAgICAgICAgaWYgKG1UdW5uZWxlZCAmJiBkcm9wICYmIG91dHB1dEZvcm1hdCkgeworICAgICAgICAgICAgQUxPR1YoIlslc10gb25Xb3JrRG9uZTogS2VlcCB0dW5uZWxlZCwgZHJvcCBmcmFtZSB3aXRoIGZvcm1hdCBjaGFuZ2UgKCVsbGQpIiwKKyAgICAgICAgICAgICAgICAgIG1OYW1lLCB3b3JrLT5pbnB1dC5vcmRpbmFsLmZyYW1lSW5kZXgucGVla3VsbCgpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIEFMT0dWKCJbJXNdIG9uV29ya0RvbmU6IE5vdCByZXBvcnRpbmcgb3V0cHV0IGJ1ZmZlciAoJWxsZCkiLAorICAgICAgICAgICAgICAgICAgbU5hbWUsIHdvcmstPmlucHV0Lm9yZGluYWwuZnJhbWVJbmRleC5wZWVrdWxsKCkpOworICAgICAgICAgICAgbm90aWZ5Q2xpZW50ID0gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoYnVmZmVyKSB7CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQnVmZmVyQ2hhbm5lbC5oIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlckNoYW5uZWwuaAppbmRleCA0ZGI2OWNiLi4yNmVlZjMwIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQnVmZmVyQ2hhbm5lbC5oCisrKyBiL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWNCdWZmZXJDaGFubmVsLmgKQEAgLTMyNCw2ICszMjQsOCBAQAogICAgICAgICByZXR1cm4gbUNyeXB0byAhPSBudWxscHRyIHx8IG1EZXNjcmFtYmxlciAhPSBudWxscHRyOwogICAgIH0KICAgICBzdGQ6OmF0b21pY19ib29sIG1TZW5kRW5jcnlwdGVkSW5mb0J1ZmZlcjsKKworICAgIHN0ZDo6YXRvbWljX2Jvb2wgbVR1bm5lbGVkOwogfTsKIAogLy8gQ29udmVyc2lvbiBvZiBhIGMyX3N0YXR1c190IHZhbHVlIHRvIGEgc3RhdHVzX3QgdmFsdWUgbWF5IGRlcGVuZCBvbiB0aGUKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWNCdWZmZXJzLmNwcCBiL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWNCdWZmZXJzLmNwcAppbmRleCAzMzNhMmNhLi45N2UxYTAxIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQnVmZmVycy5jcHAKKysrIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlcnMuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSA8QzJQbGF0Zm9ybVN1cHBvcnQuaD4KIAogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQURlYnVnLmg+CisjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9NZWRpYURlZnMuaD4KICNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjLmg+CiAjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0NvbnN0YW50cy5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L1NraXBDdXRCdWZmZXIuaD4KQEAgLTEzMiw2ICsxMzMsNyBAQAogICAgIGlmICghY29weS0+Y29weShjMmJ1ZmZlcikpIHsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQorICAgIGNvcHktPm1ldGEoKS0+ZXh0ZW5kKGJ1ZmZlci0+bWV0YSgpKTsKICAgICByZXR1cm4gY29weTsKIH0KIApAQCAtMTk5LDYgKzIwMSw1NiBAQAogICAgIG1Ta2lwQ3V0QnVmZmVyID0gbmV3IFNraXBDdXRCdWZmZXIoc2tpcCwgY3V0LCBtQ2hhbm5lbENvdW50KTsKIH0KIAorYm9vbCBPdXRwdXRCdWZmZXJzOjpjb252ZXJ0KAorICAgICAgICBjb25zdCBzdGQ6OnNoYXJlZF9wdHI8QzJCdWZmZXI+ICZzcmMsIHNwPENvZGVjMkJ1ZmZlcj4gKmRzdCkgeworICAgIGlmICghc3JjIHx8IHNyYy0+ZGF0YSgpLnR5cGUoKSAhPSBDMkJ1ZmZlckRhdGE6OkxJTkVBUikgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGludDMyX3QgY29uZmlnRW5jb2RpbmcgPSBrQXVkaW9FbmNvZGluZ1BjbTE2Yml0OworICAgIGludDMyX3QgY29kZWNFbmNvZGluZyA9IGtBdWRpb0VuY29kaW5nUGNtMTZiaXQ7CisgICAgaWYgKG1Gb3JtYXQtPmZpbmRJbnQzMigiYW5kcm9pZC5fY29kZWMtcGNtLWVuY29kaW5nIiwgJmNvZGVjRW5jb2RpbmcpCisgICAgICAgICAgICAmJiBtRm9ybWF0LT5maW5kSW50MzIoImFuZHJvaWQuX2NvbmZpZy1wY20tZW5jb2RpbmciLCAmY29uZmlnRW5jb2RpbmcpKSB7CisgICAgICAgIGlmIChtU3JjRW5jb2RpbmcgIT0gY29kZWNFbmNvZGluZyB8fCBtRHN0RW5jb2RpbmcgIT0gY29uZmlnRW5jb2RpbmcpIHsKKyAgICAgICAgICAgIGlmIChjb2RlY0VuY29kaW5nICE9IGNvbmZpZ0VuY29kaW5nKSB7CisgICAgICAgICAgICAgICAgbURhdGFDb252ZXJ0ZXIgPSBBdWRpb0NvbnZlcnRlcjo6Q3JlYXRlKAorICAgICAgICAgICAgICAgICAgICAgICAgKEF1ZGlvRW5jb2RpbmcpY29kZWNFbmNvZGluZywgKEF1ZGlvRW5jb2RpbmcpY29uZmlnRW5jb2RpbmcpOworICAgICAgICAgICAgICAgIEFMT0dEX0lGKG1EYXRhQ29udmVydGVyLCAiWyVzXSBDb252ZXJ0ZXIgY3JlYXRlZCBmcm9tICVkIHRvICVkIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICBtTmFtZSwgY29kZWNFbmNvZGluZywgY29uZmlnRW5jb2RpbmcpOworICAgICAgICAgICAgICAgIG1Gb3JtYXRXaXRoQ29udmVydGVyID0gbUZvcm1hdC0+ZHVwKCk7CisgICAgICAgICAgICAgICAgbUZvcm1hdFdpdGhDb252ZXJ0ZXItPnNldEludDMyKEtFWV9QQ01fRU5DT0RJTkcsIGNvbmZpZ0VuY29kaW5nKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgbURhdGFDb252ZXJ0ZXIgPSBudWxscHRyOworICAgICAgICAgICAgICAgIG1Gb3JtYXRXaXRoQ29udmVydGVyID0gbnVsbHB0cjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIG1TcmNFbmNvZGluZyA9IGNvZGVjRW5jb2Rpbmc7CisgICAgICAgICAgICBtRHN0RW5jb2RpbmcgPSBjb25maWdFbmNvZGluZzsKKyAgICAgICAgfQorICAgICAgICBpZiAoaW50IGVuY29kaW5nOyAhbUZvcm1hdC0+ZmluZEludDMyKEtFWV9QQ01fRU5DT0RJTkcsICZlbmNvZGluZykKKyAgICAgICAgICAgICAgICB8fCBlbmNvZGluZyAhPSBtRHN0RW5jb2RpbmcpIHsKKyAgICAgICAgfQorICAgIH0KKyAgICBpZiAoIW1EYXRhQ29udmVydGVyKSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgc3A8TWVkaWFDb2RlY0J1ZmZlcj4gc3JjQnVmZmVyID0gQ29uc3RMaW5lYXJCbG9ja0J1ZmZlcjo6QWxsb2NhdGUobUZvcm1hdCwgc3JjKTsKKyAgICBpZiAoIXNyY0J1ZmZlcikgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGlmICghKmRzdCkgeworICAgICAgICAqZHN0ID0gbmV3IENvZGVjMkJ1ZmZlcigKKyAgICAgICAgICAgICAgICBtRm9ybWF0LAorICAgICAgICAgICAgICAgIG5ldyBBQnVmZmVyKG1EYXRhQ29udmVydGVyLT50YXJnZXRTaXplKHNyY0J1ZmZlci0+c2l6ZSgpKSkpOworICAgIH0KKyAgICBzcDxNZWRpYUNvZGVjQnVmZmVyPiBkc3RCdWZmZXIgPSAqZHN0OworICAgIHN0YXR1c190IGVyciA9IG1EYXRhQ29udmVydGVyLT5jb252ZXJ0KHNyY0J1ZmZlciwgZHN0QnVmZmVyKTsKKyAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgIEFMT0dEKCJbJXNdIGJ1ZmZlciBjb252ZXJzaW9uIGZhaWxlZDogJWQiLCBtTmFtZSwgZXJyKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBkc3RCdWZmZXItPnNldEZvcm1hdChtRm9ybWF0V2l0aENvbnZlcnRlcik7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHZvaWQgT3V0cHV0QnVmZmVyczo6Y2xlYXJTdGFzaCgpIHsKICAgICBtUGVuZGluZy5jbGVhcigpOwogICAgIG1SZW9yZGVyU3Rhc2guY2xlYXIoKTsKQEAgLTEwNzgsNyArMTEzMCw3IEBACiAgICAgICAgIHJldHVybiBlcnI7CiAgICAgfQogICAgIGMyQnVmZmVyLT5zZXRGb3JtYXQobUZvcm1hdCk7Ci0gICAgaWYgKCFjMkJ1ZmZlci0+Y29weShidWZmZXIpKSB7CisgICAgaWYgKCFjb252ZXJ0KGJ1ZmZlciwgJmMyQnVmZmVyKSAmJiAhYzJCdWZmZXItPmNvcHkoYnVmZmVyKSkgewogICAgICAgICBBTE9HRCgiWyVzXSBjb3B5IGJ1ZmZlciBmYWlsZWQiLCBtTmFtZSk7CiAgICAgICAgIHJldHVybiBXT1VMRF9CTE9DSzsKICAgICB9CkBAIC0xMTk0LDkgKzEyNDYsMTIgQEAKICAgICAgICAgY29uc3Qgc3RkOjpzaGFyZWRfcHRyPEMyQnVmZmVyPiAmYnVmZmVyLAogICAgICAgICBzaXplX3QgKmluZGV4LAogICAgICAgICBzcDxNZWRpYUNvZGVjQnVmZmVyPiAqY2xpZW50QnVmZmVyKSB7Ci0gICAgc3A8Q29kZWMyQnVmZmVyPiBuZXdCdWZmZXIgPSB3cmFwKGJ1ZmZlcik7Ci0gICAgaWYgKG5ld0J1ZmZlciA9PSBudWxscHRyKSB7Ci0gICAgICAgIHJldHVybiBOT19NRU1PUlk7CisgICAgc3A8Q29kZWMyQnVmZmVyPiBuZXdCdWZmZXI7CisgICAgaWYgKCFjb252ZXJ0KGJ1ZmZlciwgJm5ld0J1ZmZlcikpIHsKKyAgICAgICAgbmV3QnVmZmVyID0gd3JhcChidWZmZXIpOworICAgICAgICBpZiAobmV3QnVmZmVyID09IG51bGxwdHIpIHsKKyAgICAgICAgICAgIHJldHVybiBOT19NRU1PUlk7CisgICAgICAgIH0KICAgICB9CiAgICAgbmV3QnVmZmVyLT5zZXRGb3JtYXQobUZvcm1hdCk7CiAgICAgKmluZGV4ID0gbUltcGwuYXNzaWduU2xvdChuZXdCdWZmZXIpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlcnMuaCBiL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9DQ29kZWNCdWZmZXJzLmgKaW5kZXggOTk1ZDNhNC4uYzhlOTkzMCAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0J1ZmZlcnMuaAorKysgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQnVmZmVycy5oCkBAIC0xOCw5ICsxOCwxMSBAQAogCiAjZGVmaW5lIENDT0RFQ19CVUZGRVJTX0hfCiAKKyNpbmNsdWRlIDxvcHRpb25hbD4KICNpbmNsdWRlIDxzdHJpbmc+CiAKICNpbmNsdWRlIDxDMkNvbmZpZy5oPgorI2luY2x1ZGUgPERhdGFDb252ZXJ0ZXIuaD4KICNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9mb3VuZGF0aW9uL0FNZXNzYWdlLmg+CiAjaW5jbHVkZSA8bWVkaWEvTWVkaWFDb2RlY0J1ZmZlci5oPgogCkBAIC0zODIsNiArMzg0LDE0IEBACiAgICAgICovCiAgICAgdm9pZCBzdWJtaXQoY29uc3Qgc3A8TWVkaWFDb2RlY0J1ZmZlcj4gJmJ1ZmZlcik7CiAKKyAgICAvKioKKyAgICAgKiBBcHBseSBEYXRhQ29udmVydGVyIGZyb20gfHNyY3wgdG8gfCpkc3R8IGlmIG5lZWRlZC4gSWYgfCpkc3R8IGlzIG51bGxwdHIsCisgICAgICogYSBuZXcgYnVmZmVyIGlzIGFsbG9jYXRlZC4KKyAgICAgKgorICAgICAqIFJldHVybnMgdHJ1ZSBpZiBjb252ZXJzaW9uIHdhcyBuZWVkZWQgYW5kIGV4ZWN1dGVkOyBmYWxzZSBvdGhlcndpc2UuCisgICAgICovCisgICAgYm9vbCBjb252ZXJ0KGNvbnN0IHN0ZDo6c2hhcmVkX3B0cjxDMkJ1ZmZlcj4gJnNyYywgc3A8Q29kZWMyQnVmZmVyPiAqZHN0KTsKKwogcHJpdmF0ZToKICAgICAvLyBTa2lwQ3V0QnVmZmVyCiAgICAgaW50MzJfdCBtRGVsYXk7CkBAIC0zOTEsNiArNDAxLDEyIEBACiAKICAgICB2b2lkIHNldFNraXBDdXRCdWZmZXIoaW50MzJfdCBza2lwLCBpbnQzMl90IGN1dCk7CiAKKyAgICAvLyBEYXRhQ29udmVydGVyCisgICAgc3A8RGF0YUNvbnZlcnRlcj4gbURhdGFDb252ZXJ0ZXI7CisgICAgc3A8QU1lc3NhZ2U+IG1Gb3JtYXRXaXRoQ29udmVydGVyOworICAgIHN0ZDo6b3B0aW9uYWw8aW50MzJfdD4gbVNyY0VuY29kaW5nOworICAgIHN0ZDo6b3B0aW9uYWw8aW50MzJfdD4gbURzdEVuY29kaW5nOworCiAgICAgLy8gT3V0cHV0IHN0YXNoCiAKICAgICAvLyBTdHJ1Y3QgZm9yIGFuIGVudHJ5IGluIHRoZSBvdXRwdXQgc3Rhc2ggKG1QZW5kaW5nIGFuZCBtUmVvcmRlclN0YXNoKQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NDb2RlY0NvbmZpZy5jcHAgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQ29uZmlnLmNwcAppbmRleCBjMjc1MTg3Li4wMzQxOGQ5IDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQ29uZmlnLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ0NvZGVjQ29uZmlnLmNwcApAQCAtNjU3LDI0ICs2NTcsMjkgQEAKICAgICBhZGQoQ29uZmlnTWFwcGVyKEtFWV9TQU1QTEVfUkFURSwgICBDMl9QQVJBTUtFWV9DT0RFRF9TQU1QTEVfUkFURSwgICJ2YWx1ZSIpCiAgICAgICAgIC5saW1pdFRvKEQ6OkFVRElPICYgRDo6Q09ERUQpKTsKIAotICAgIGFkZChDb25maWdNYXBwZXIoS0VZX1BDTV9FTkNPRElORywgIEMyX1BBUkFNS0VZX1BDTV9FTkNPRElORywgICAgICAgInZhbHVlIikKKyAgICBhdXRvIHBjbUVuY29kaW5nTWFwcGVyID0gW10oQzJWYWx1ZSB2KSAtPiBDMlZhbHVlIHsKKyAgICAgICAgaW50MzJfdCB2YWx1ZTsKKyAgICAgICAgQzJDb25maWc6OnBjbV9lbmNvZGluZ190IHRvOworICAgICAgICBpZiAodi5nZXQoJnZhbHVlKSAmJiBDMk1hcHBlcjo6bWFwKHZhbHVlLCAmdG8pKSB7CisgICAgICAgICAgICByZXR1cm4gdG87CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIEMyVmFsdWUoKTsKKyAgICB9OworICAgIGF1dG8gcGNtRW5jb2RpbmdSZXZlcnNlID0gW10oQzJWYWx1ZSB2KSAtPiBDMlZhbHVlIHsKKyAgICAgICAgQzJDb25maWc6OnBjbV9lbmNvZGluZ190IHZhbHVlOworICAgICAgICBpbnQzMl90IHRvOworICAgICAgICB1c2luZyBDMlZhbHVlVHlwZT10eXBlbmFtZSBfYzJfcmVkdWNlX2VudW1fdG9fdW5kZXJseWluZ190eXBlPGRlY2x0eXBlKHZhbHVlKT46OnR5cGU7CisgICAgICAgIGlmICh2LmdldCgoQzJWYWx1ZVR5cGUqKSZ2YWx1ZSkgJiYgQzJNYXBwZXI6Om1hcCh2YWx1ZSwgJnRvKSkgeworICAgICAgICAgICAgcmV0dXJuIHRvOworICAgICAgICB9CisgICAgICAgIHJldHVybiBDMlZhbHVlKCk7CisgICAgfTsKKyAgICBhZGQoQ29uZmlnTWFwcGVyKEtFWV9QQ01fRU5DT0RJTkcsICAgICAgICAgICAgICBDMl9QQVJBTUtFWV9QQ01fRU5DT0RJTkcsICJ2YWx1ZSIpCiAgICAgICAgIC5saW1pdFRvKEQ6OkFVRElPKQotICAgICAgICAud2l0aE1hcHBlcnMoW10oQzJWYWx1ZSB2KSAtPiBDMlZhbHVlIHsKLSAgICAgICAgICAgIGludDMyX3QgdmFsdWU7Ci0gICAgICAgICAgICBDMkNvbmZpZzo6cGNtX2VuY29kaW5nX3QgdG87Ci0gICAgICAgICAgICBpZiAodi5nZXQoJnZhbHVlKSAmJiBDMk1hcHBlcjo6bWFwKHZhbHVlLCAmdG8pKSB7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRvOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIEMyVmFsdWUoKTsKLSAgICAgICAgfSwgW10oQzJWYWx1ZSB2KSAtPiBDMlZhbHVlIHsKLSAgICAgICAgICAgIEMyQ29uZmlnOjpwY21fZW5jb2RpbmdfdCB2YWx1ZTsKLSAgICAgICAgICAgIGludDMyX3QgdG87Ci0gICAgICAgICAgICB1c2luZyBDMlZhbHVlVHlwZT10eXBlbmFtZSBfYzJfcmVkdWNlX2VudW1fdG9fdW5kZXJseWluZ190eXBlPGRlY2x0eXBlKHZhbHVlKT46OnR5cGU7Ci0gICAgICAgICAgICBpZiAodi5nZXQoKEMyVmFsdWVUeXBlKikmdmFsdWUpICYmIEMyTWFwcGVyOjptYXAodmFsdWUsICZ0bykpIHsKLSAgICAgICAgICAgICAgICByZXR1cm4gdG87Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gQzJWYWx1ZSgpOwotICAgICAgICB9KSk7CisgICAgICAgIC53aXRoTWFwcGVycyhwY21FbmNvZGluZ01hcHBlciwgcGNtRW5jb2RpbmdSZXZlcnNlKSk7CisgICAgYWRkKENvbmZpZ01hcHBlcigiYW5kcm9pZC5fY29kZWMtcGNtLWVuY29kaW5nIiwgQzJfUEFSQU1LRVlfUENNX0VOQ09ESU5HLCAidmFsdWUiKQorICAgICAgICAubGltaXRUbyhEOjpBVURJTyAmIEQ6OlJFQUQpCisgICAgICAgIC53aXRoTWFwcGVycyhwY21FbmNvZGluZ01hcHBlciwgcGNtRW5jb2RpbmdSZXZlcnNlKSk7CiAKICAgICBhZGQoQ29uZmlnTWFwcGVyKEtFWV9JU19BRFRTLCBDMl9QQVJBTUtFWV9BQUNfUEFDS0FHSU5HLCAidmFsdWUiKQogICAgICAgICAubGltaXRUbyhEOjpBVURJTyAmIEQ6OkNPREVEKQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NvZGVjMkluZm9CdWlsZGVyLmNwcCBiL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9Db2RlYzJJbmZvQnVpbGRlci5jcHAKaW5kZXggN2M0YmZiNi4uNjdkN2VkMiAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0NvZGVjMkluZm9CdWlsZGVyLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vQ29kZWMySW5mb0J1aWxkZXIuY3BwCkBAIC05Niw5ICs5NiwxMiBAQAogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgLy8gZGV0ZXJtaW5lIGlmIGNvZGVjIHN1cHBvcnRzIEhEUgorICAgIC8vIGRldGVybWluZSBpZiBjb2RlYyBzdXBwb3J0cyBIRFI7IGltcGx5IDEwLWJpdCBzdXBwb3J0CiAgICAgYm9vbCBzdXBwb3J0c0hkciA9IGZhbHNlOworICAgIC8vIGRldGVybWluZSBpZiBjb2RlYyBzdXBwb3J0cyBIRFIxMFBsdXM7IGltcGx5IDEwLWJpdCBzdXBwb3J0CiAgICAgYm9vbCBzdXBwb3J0c0hkcjEwUGx1cyA9IGZhbHNlOworICAgIC8vIGRldGVybWluZSBpZiBjb2RlYyBzdXBwb3J0cyAxMC1iaXQgZm9ybWF0CisgICAgYm9vbCBzdXBwb3J0czEwQml0ID0gZmFsc2U7CiAKICAgICBzdGQ6OnZlY3RvcjxzdGQ6OnNoYXJlZF9wdHI8QzJQYXJhbURlc2NyaXB0b3I+PiBwYXJhbURlc2NzOwogICAgIGMyX3N0YXR1c190IGVycjEgPSBpbnRmLT5xdWVyeVN1cHBvcnRlZFBhcmFtcygmcGFyYW1EZXNjcyk7CkBAIC0xMjYsNiArMTI5LDEwIEBACiAgICAgc3VwcG9ydHNIZHIgfD0gKG1lZGlhVHlwZSA9PSBNSU1FVFlQRV9WSURFT19WUDkpOwogICAgIHN1cHBvcnRzSGRyIHw9IChtZWRpYVR5cGUgPT0gTUlNRVRZUEVfVklERU9fQVYxKTsKIAorICAgIC8vIEhEUiBzdXBwb3J0IGltcGxpZXMgMTAtYml0IHN1cHBvcnQuCisgICAgLy8gVE9ETzogZGlyZWN0bHkgY2hlY2sgdGhpcyBmcm9tIHRoZSBjb21wb25lbnQgaW50ZXJmYWNlCisgICAgc3VwcG9ydHMxMEJpdCA9IChzdXBwb3J0c0hkciB8fCBzdXBwb3J0c0hkcjEwUGx1cyk7CisKICAgICBib29sIGFkZGVkID0gZmFsc2U7CiAKICAgICBmb3IgKEMyVmFsdWU6OlByaW1pdGl2ZSBwcm9maWxlIDogcHJvZmlsZVF1ZXJ5WzBdLnZhbHVlcy52YWx1ZXMpIHsKQEAgLTE2NSw2ICsxNzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChzdXBwb3J0czEwQml0KSB7CisgICAgICAgICAgICAgICAgYXV0byBiaXRuZXNzTWFwcGVyID0gQzJNYXBwZXI6OkdldEJpdERlcHRoUHJvZmlsZUxldmVsTWFwcGVyKHRyYWl0Lm1lZGlhVHlwZSwgMTApOworICAgICAgICAgICAgICAgIGlmIChiaXRuZXNzTWFwcGVyICYmIGJpdG5lc3NNYXBwZXItPm1hcFByb2ZpbGUocGwucHJvZmlsZSwgJnNka1Byb2ZpbGUpKSB7CisgICAgICAgICAgICAgICAgICAgIGNhcHMtPmFkZFByb2ZpbGVMZXZlbCgodWludDMyX3Qpc2RrUHJvZmlsZSwgKHVpbnQzMl90KXNka0xldmVsKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAoIW1hcHBlcikgewogICAgICAgICAgICAgY2Fwcy0+YWRkUHJvZmlsZUxldmVsKHBsLnByb2ZpbGUsIHBsLmxldmVsKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0ZyYW1lUmVhc3NlbWJsZXIuY3BwIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL0ZyYW1lUmVhc3NlbWJsZXIuY3BwCmluZGV4IGFmMDU0YzcuLmNiOGI2YWIgMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi9GcmFtZVJlYXNzZW1ibGVyLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vRnJhbWVSZWFzc2VtYmxlci5jcHAKQEAgLTg4LDggKzg4LDcgQEAKICAgICAgICAgY29uc3Qgc3A8TWVkaWFDb2RlY0J1ZmZlcj4gJmJ1ZmZlciwKICAgICAgICAgc3RkOjpsaXN0PHN0ZDo6dW5pcXVlX3B0cjxDMldvcms+PiAqaXRlbXMpIHsKICAgICBpbnQ2NF90IHRpbWVVczsKLSAgICBpZiAoYnVmZmVyLT5zaXplKCkgPT0gMHUKLSAgICAgICAgICAgIHx8ICFidWZmZXItPm1ldGEoKS0+ZmluZEludDY0KCJ0aW1lVXMiLCAmdGltZVVzKSkgeworICAgIGlmICghYnVmZmVyLT5tZXRhKCktPmZpbmRJbnQ2NCgidGltZVVzIiwgJnRpbWVVcykpIHsKICAgICAgICAgcmV0dXJuIEMyX0JBRF9WQUxVRTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi90ZXN0cy9GcmFtZVJlYXNzZW1ibGVyX3Rlc3QuY3BwIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3Rlc3RzL0ZyYW1lUmVhc3NlbWJsZXJfdGVzdC5jcHAKaW5kZXggNjczOGVlNy4uMGJlOTM0YSAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3Rlc3RzL0ZyYW1lUmVhc3NlbWJsZXJfdGVzdC5jcHAKKysrIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3Rlc3RzL0ZyYW1lUmVhc3NlbWJsZXJfdGVzdC5jcHAKQEAgLTUzLDcgKzUzLDggQEAKICAgICAgICAgICAgIEMyQ29uZmlnOjpwY21fZW5jb2RpbmdfdCBlbmNvZGluZywKICAgICAgICAgICAgIHNpemVfdCBpbnB1dEZyYW1lU2l6ZUluQnl0ZXMsCiAgICAgICAgICAgICBzaXplX3QgY291bnQsCi0gICAgICAgICAgICBzaXplX3QgZXhwZWN0ZWRPdXRwdXRTaXplKSB7CisgICAgICAgICAgICBzaXplX3QgZXhwZWN0ZWRPdXRwdXRTaXplLAorICAgICAgICAgICAgYm9vbCBzZXBhcmF0ZUVvcykgewogICAgICAgICBGcmFtZVJlYXNzZW1ibGVyIGZyYW1lUmVhc3NlbWJsZXI7CiAgICAgICAgIGZyYW1lUmVhc3NlbWJsZXIuaW5pdCgKICAgICAgICAgICAgICAgICBtUG9vbCwKQEAgLTY3LDcgKzY4LDcgQEAKIAogICAgICAgICBzaXplX3QgaW5wdXRJbmRleCA9IDAsIG91dHB1dEluZGV4ID0gMDsKICAgICAgICAgc2l6ZV90IGV4cGVjdENvdW50ID0gMDsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgKytpKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY291bnQgKyAoc2VwYXJhdGVFb3MgPyAxIDogMCk7ICsraSkgewogICAgICAgICAgICAgc3A8TWVkaWFDb2RlY0J1ZmZlcj4gYnVmZmVyID0gbmV3IE1lZGlhQ29kZWNCdWZmZXIoCiAgICAgICAgICAgICAgICAgICAgIG5ldyBBTWVzc2FnZSwgbmV3IEFCdWZmZXIoaW5wdXRGcmFtZVNpemVJbkJ5dGVzKSk7CiAgICAgICAgICAgICBidWZmZXItPnNldFJhbmdlKDAsIGlucHV0RnJhbWVTaXplSW5CeXRlcyk7CkBAIC03Nyw4ICs3OCwxMiBAQAogICAgICAgICAgICAgaWYgKGkgPT0gY291bnQgLSAxKSB7CiAgICAgICAgICAgICAgICAgYnVmZmVyLT5tZXRhKCktPnNldEludDMyKCJlb3MiLCAxKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgaW5wdXRGcmFtZVNpemVJbkJ5dGVzOyArK2osICsraW5wdXRJbmRleCkgewotICAgICAgICAgICAgICAgIGJ1ZmZlci0+YmFzZSgpW2pdID0gKGlucHV0SW5kZXggJiAweEZGKTsKKyAgICAgICAgICAgIGlmIChpID09IGNvdW50ICYmIHNlcGFyYXRlRW9zKSB7CisgICAgICAgICAgICAgICAgYnVmZmVyLT5zZXRSYW5nZSgwLCAwKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGogPCBpbnB1dEZyYW1lU2l6ZUluQnl0ZXM7ICsraiwgKytpbnB1dEluZGV4KSB7CisgICAgICAgICAgICAgICAgICAgIGJ1ZmZlci0+YmFzZSgpW2pdID0gKGlucHV0SW5kZXggJiAweEZGKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzdGQ6Omxpc3Q8c3RkOjp1bmlxdWVfcHRyPEMyV29yaz4+IGl0ZW1zOwogICAgICAgICAgICAgQVNTRVJUX0VRKEMyX09LLCBmcmFtZVJlYXNzZW1ibGVyLnByb2Nlc3MoYnVmZmVyLCAmaXRlbXMpKTsKQEAgLTEwNSw3ICsxMTAsOCBAQAogICAgICAgICAgICAgICAgIEFTU0VSVF9FUShlbmNvZGVyRnJhbWVTaXplICogQnl0ZXNQZXJTYW1wbGUoZW5jb2RpbmcpLCB2aWV3LmNhcGFjaXR5KCkpOwogICAgICAgICAgICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgdmlldy5jYXBhY2l0eSgpOyArK2osICsrb3V0cHV0SW5kZXgpIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUX1RSVUUob3V0cHV0SW5kZXggPCBpbnB1dEluZGV4Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGlucHV0SW5kZXggPT0gaW5wdXRGcmFtZVNpemVJbkJ5dGVzICogY291bnQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8fCBpbnB1dEluZGV4ID09IGlucHV0RnJhbWVTaXplSW5CeXRlcyAqIGNvdW50KQorICAgICAgICAgICAgICAgICAgICAgICAgPDwgImlucHV0SW5kZXggPSAiIDw8IGlucHV0SW5kZXggPDwgIiBvdXRwdXRJbmRleCA9ICIgPDwgb3V0cHV0SW5kZXg7CiAgICAgICAgICAgICAgICAgICAgIHVpbnQ4X3QgZXhwZWN0ZWQgPSBvdXRwdXRJbmRleCA8IGlucHV0SW5kZXggPyAob3V0cHV0SW5kZXggJiAweEZGKSA6IDA7CiAgICAgICAgICAgICAgICAgICAgIGlmIChleHBlY3RDb3VudCA8IDEwKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICArK2V4cGVjdENvdW50OwpAQCAtMTM3LDIwNCArMTQzLDIzOSBAQAogLy8gUHVzaCBmcmFtZXMgd2l0aCBleGFjdGx5IHRoZSBzYW1lIHNpemUgYXMgdGhlIGVuY29kZXIgcmVxdWVzdGVkLgogVEVTVF9GKEZyYW1lUmVhc3NlbWJsZXJUZXN0LCBQdXNoRXhhY3RGcmFtZVNpemUpIHsKICAgICBBU1NFUlRfRVEoT0ssIGluaXRTdGF0dXMoKSk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fOCwKLSAgICAgICAgICAgIDEwMjQgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMjQgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDEgYnl0ZXMvc2FtcGxlICovLAotICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCi0gICAgICAgICAgICAxMDI0MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDEwICogMTAyNCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fMTYsCi0gICAgICAgICAgICAyMDQ4IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDI0IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAyIGJ5dGVzL3NhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMjA0ODAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMCAqIDIwNDggYnl0ZXMvZnJhbWUgKi8pOwotICAgIHRlc3RQdXNoU2FtZVNpemUoCi0gICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKLSAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAotICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAotICAgICAgICAgICAgUENNX0ZMT0FULAotICAgICAgICAgICAgNDA5NiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAyNCBzYW1wbGVzICogMSBjaGFubmVsICogNCBieXRlcy9zYW1wbGUgKi8sCi0gICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDQwOTYwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTAgKiA0MDk2IGJ5dGVzL2ZyYW1lICovKTsKKyAgICBmb3IgKGJvb2wgc2VwYXJhdGVFb3MgOiB7ZmFsc2UsIHRydWV9KSB7CisgICAgICAgIHRlc3RQdXNoU2FtZVNpemUoCisgICAgICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCisgICAgICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCisgICAgICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAorICAgICAgICAgICAgICAgIFBDTV84LAorICAgICAgICAgICAgICAgIDEwMjQgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMjQgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDEgYnl0ZXMvc2FtcGxlICovLAorICAgICAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAorICAgICAgICAgICAgICAgIDEwMjQwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTAgKiAxMDI0IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzE2LAorICAgICAgICAgICAgICAgIDIwNDggLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMjQgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDIgYnl0ZXMvc2FtcGxlICovLAorICAgICAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAorICAgICAgICAgICAgICAgIDIwNDgwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTAgKiAyMDQ4IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNX0ZMT0FULAorICAgICAgICAgICAgICAgIDQwOTYgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMjQgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDQgYnl0ZXMvc2FtcGxlICovLAorICAgICAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAorICAgICAgICAgICAgICAgIDQwOTYwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTAgKiA0MDk2IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICB9CiB9CiAKIC8vIFB1c2ggZnJhbWVzIHdpdGggaGFsZiB0aGUgc2l6ZSB0aGF0IHRoZSBlbmNvZGVyIHJlcXVlc3RlZC4KIFRFU1RfRihGcmFtZVJlYXNzZW1ibGVyVGVzdCwgUHVzaEhhbGZGcmFtZVNpemUpIHsKICAgICBBU1NFUlRfRVEoT0ssIGluaXRTdGF0dXMoKSk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fOCwKLSAgICAgICAgICAgIDUxMiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gNTEyIHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAxIGJ5dGVzIHBlciBzYW1wbGUgKi8sCi0gICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDUxMjAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA1ICogMTAyNCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fMTYsCi0gICAgICAgICAgICAxMDI0IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSA1MTIgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDIgYnl0ZXMgcGVyIHNhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMTAyNDAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA1ICogMjA0OCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fRkxPQVQsCi0gICAgICAgICAgICAyMDQ4IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSA1MTIgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDQgYnl0ZXMgcGVyIHNhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMjA0ODAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA1ICogNDA5NiBieXRlcy9mcmFtZSAqLyk7CisgICAgZm9yIChib29sIHNlcGFyYXRlRW9zIDoge2ZhbHNlLCB0cnVlfSkgeworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fOCwKKyAgICAgICAgICAgICAgICA1MTIgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDUxMiBzYW1wbGVzICogMSBjaGFubmVsICogMSBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgNTEyMCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDUgKiAxMDI0IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzE2LAorICAgICAgICAgICAgICAgIDEwMjQgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDUxMiBzYW1wbGVzICogMSBjaGFubmVsICogMiBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMTAyNDAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA1ICogMjA0OCBieXRlcy9mcmFtZSAqLywKKyAgICAgICAgICAgICAgICBzZXBhcmF0ZUVvcyk7CisgICAgICAgIHRlc3RQdXNoU2FtZVNpemUoCisgICAgICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCisgICAgICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCisgICAgICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAorICAgICAgICAgICAgICAgIFBDTV9GTE9BVCwKKyAgICAgICAgICAgICAgICAyMDQ4IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSA1MTIgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDQgYnl0ZXMvc2FtcGxlICovLAorICAgICAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAorICAgICAgICAgICAgICAgIDIwNDgwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gNSAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgIH0KIH0KIAogLy8gUHVzaCBmcmFtZXMgd2l0aCB0d2ljZSB0aGUgc2l6ZSB0aGF0IHRoZSBlbmNvZGVyIHJlcXVlc3RlZC4KIFRFU1RfRihGcmFtZVJlYXNzZW1ibGVyVGVzdCwgUHVzaERvdWJsZUZyYW1lU2l6ZSkgewogICAgIEFTU0VSVF9FUShPSywgaW5pdFN0YXR1cygpKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV84LAotICAgICAgICAgICAgMjA0OCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMjA0OCBzYW1wbGVzICogMSBjaGFubmVsICogMSBieXRlcyBwZXIgc2FtcGxlICovLAotICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCi0gICAgICAgICAgICAyMDQ4MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDIwICogMTAyNCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fMTYsCi0gICAgICAgICAgICA0MDk2IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAyMDQ4IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAyIGJ5dGVzIHBlciBzYW1wbGUgKi8sCi0gICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDQwOTYwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMjAgKiAyMDQ4IGJ5dGVzL2ZyYW1lICovKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV9GTE9BVCwKLSAgICAgICAgICAgIDgxOTIgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDIwNDggc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDQgYnl0ZXMgcGVyIHNhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgODE5MjAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyMCAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8pOworICAgIGZvciAoYm9vbCBzZXBhcmF0ZUVvcyA6IHtmYWxzZSwgdHJ1ZX0pIHsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzgsCisgICAgICAgICAgICAgICAgMjA0OCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMjA0OCBzYW1wbGVzICogMSBjaGFubmVsICogMSBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMjA0ODAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyMCAqIDEwMjQgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fMTYsCisgICAgICAgICAgICAgICAgNDA5NiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMjA0OCBzYW1wbGVzICogMSBjaGFubmVsICogMiBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgNDA5NjAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyMCAqIDIwNDggYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fRkxPQVQsCisgICAgICAgICAgICAgICAgODE5MiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMjA0OCBzYW1wbGVzICogMSBjaGFubmVsICogNCBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgODE5MjAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyMCAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgIH0KIH0KIAogLy8gUHVzaCBmcmFtZXMgd2l0aCBhIGxpdHRsZSBiaXQgbGFyZ2VyICgrNSBzYW1wbGVzKSB0aGFuIHRoZSByZXF1ZXN0ZWQgc2l6ZS4KIFRFU1RfRihGcmFtZVJlYXNzZW1ibGVyVGVzdCwgUHVzaExpdHRsZUxhcmdlckZyYW1lU2l6ZSkgewogICAgIEFTU0VSVF9FUShPSywgaW5pdFN0YXR1cygpKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV84LAotICAgICAgICAgICAgMTAyOSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAyOSBzYW1wbGVzICogMSBjaGFubmVsICogMSBieXRlcyBwZXIgc2FtcGxlICovLAotICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCi0gICAgICAgICAgICAxMTI2NCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDExICogMTAyNCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fMTYsCi0gICAgICAgICAgICAyMDU4IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDI5IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAyIGJ5dGVzIHBlciBzYW1wbGUgKi8sCi0gICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDIyNTI4IC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTEgKiAyMDQ4IGJ5dGVzL2ZyYW1lICovKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV9GTE9BVCwKLSAgICAgICAgICAgIDQxMTYgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMjkgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDQgYnl0ZXMgcGVyIHNhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgNDUwNTYgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMSAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8pOworICAgIGZvciAoYm9vbCBzZXBhcmF0ZUVvcyA6IHtmYWxzZSwgdHJ1ZX0pIHsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzgsCisgICAgICAgICAgICAgICAgMTAyOSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAyOSBzYW1wbGVzICogMSBjaGFubmVsICogMSBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMTEyNjQgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMSAqIDEwMjQgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fMTYsCisgICAgICAgICAgICAgICAgMjA1OCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAyOSBzYW1wbGVzICogMSBjaGFubmVsICogMiBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMjI1MjggLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMSAqIDIwNDggYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fRkxPQVQsCisgICAgICAgICAgICAgICAgNDExNiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAyOSBzYW1wbGVzICogMSBjaGFubmVsICogNCBieXRlcy9zYW1wbGUgKi8sCisgICAgICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgNDUwNTYgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMSAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgIH0KIH0KIAogLy8gUHVzaCBmcmFtZXMgd2l0aCBhIGxpdHRsZSBiaXQgc21hbGxlciAoLTUgc2FtcGxlcykgdGhhbiB0aGUgcmVxdWVzdGVkIHNpemUuCiBURVNUX0YoRnJhbWVSZWFzc2VtYmxlclRlc3QsIFB1c2hMaXR0bGVTbWFsbGVyRnJhbWVTaXplKSB7CiAgICAgQVNTRVJUX0VRKE9LLCBpbml0U3RhdHVzKCkpOwotICAgIHRlc3RQdXNoU2FtZVNpemUoCi0gICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKLSAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAotICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAotICAgICAgICAgICAgUENNXzgsCi0gICAgICAgICAgICAxMDE5IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDE5IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAxIGJ5dGVzIHBlciBzYW1wbGUgKi8sCi0gICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDEwMjQwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMTAgKiAxMDI0IGJ5dGVzL2ZyYW1lICovKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV8xNiwKLSAgICAgICAgICAgIDIwMzggLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyA9IDEwMTkgc2FtcGxlcyAqIDEgY2hhbm5lbCAqIDIgYnl0ZXMgcGVyIHNhbXBsZSAqLywKLSAgICAgICAgICAgIDEwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMjA0ODAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAxMCAqIDIwNDggYnl0ZXMvZnJhbWUgKi8pOwotICAgIHRlc3RQdXNoU2FtZVNpemUoCi0gICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKLSAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAotICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAotICAgICAgICAgICAgUENNX0ZMT0FULAotICAgICAgICAgICAgNDA3NiAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzID0gMTAxOSBzYW1wbGVzICogMSBjaGFubmVsICogNCBieXRlcyBwZXIgc2FtcGxlICovLAotICAgICAgICAgICAgMTAgLyogY291bnQgKi8sCi0gICAgICAgICAgICA0MDk2MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDEwICogNDA5NiBieXRlcy9mcmFtZSAqLyk7CisgICAgZm9yIChib29sIHNlcGFyYXRlRW9zIDoge2ZhbHNlLCB0cnVlfSkgeworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fOCwKKyAgICAgICAgICAgICAgICAxMDE5IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDE5IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAxIGJ5dGVzL3NhbXBsZSAqLywKKyAgICAgICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICAxMDI0MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDEwICogMTAyNCBieXRlcy9mcmFtZSAqLywKKyAgICAgICAgICAgICAgICBzZXBhcmF0ZUVvcyk7CisgICAgICAgIHRlc3RQdXNoU2FtZVNpemUoCisgICAgICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCisgICAgICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCisgICAgICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAorICAgICAgICAgICAgICAgIFBDTV8xNiwKKyAgICAgICAgICAgICAgICAyMDM4IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDE5IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiAyIGJ5dGVzL3NhbXBsZSAqLywKKyAgICAgICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICAyMDQ4MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDEwICogMjA0OCBieXRlcy9mcmFtZSAqLywKKyAgICAgICAgICAgICAgICBzZXBhcmF0ZUVvcyk7CisgICAgICAgIHRlc3RQdXNoU2FtZVNpemUoCisgICAgICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCisgICAgICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCisgICAgICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAorICAgICAgICAgICAgICAgIFBDTV9GTE9BVCwKKyAgICAgICAgICAgICAgICA0MDc2IC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgPSAxMDE5IHNhbXBsZXMgKiAxIGNoYW5uZWwgKiA0IGJ5dGVzL3NhbXBsZSAqLywKKyAgICAgICAgICAgICAgICAxMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICA0MDk2MCAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDEwICogNDA5NiBieXRlcy9mcmFtZSAqLywKKyAgICAgICAgICAgICAgICBzZXBhcmF0ZUVvcyk7CisgICAgfQogfQogCiAvLyBQdXNoIHNpbmdsZS1ieXRlIGZyYW1lcwogVEVTVF9GKEZyYW1lUmVhc3NlbWJsZXJUZXN0LCBQdXNoU2luZ2xlQnl0ZSkgewogICAgIEFTU0VSVF9FUShPSywgaW5pdFN0YXR1cygpKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV84LAotICAgICAgICAgICAgMSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAotICAgICAgICAgICAgMTAwMDAwIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMTAwMzUyIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gOTggKiAxMDI0IGJ5dGVzL2ZyYW1lICovKTsKLSAgICB0ZXN0UHVzaFNhbWVTaXplKAotICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCi0gICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKLSAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKLSAgICAgICAgICAgIFBDTV8xNiwKLSAgICAgICAgICAgIDEgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyAqLywKLSAgICAgICAgICAgIDEwMDAwMCAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDEwMDM1MiAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDQ5ICogMjA0OCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fRkxPQVQsCi0gICAgICAgICAgICAxIC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgKi8sCi0gICAgICAgICAgICAxMDAwMDAgLyogY291bnQgKi8sCi0gICAgICAgICAgICAxMDI0MDAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyNSAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8pOworICAgIGZvciAoYm9vbCBzZXBhcmF0ZUVvcyA6IHtmYWxzZSwgdHJ1ZX0pIHsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzgsCisgICAgICAgICAgICAgICAgMSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICAxMDAzNTIgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA5OCAqIDEwMjQgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fMTYsCisgICAgICAgICAgICAgICAgMSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICAxMDAzNTIgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA0OSAqIDIwNDggYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgICAgICB0ZXN0UHVzaFNhbWVTaXplKAorICAgICAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAorICAgICAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAorICAgICAgICAgICAgICAgIDEgLyogY2hhbm5lbCBjb3VudCAqLywKKyAgICAgICAgICAgICAgICBQQ01fRkxPQVQsCisgICAgICAgICAgICAgICAgMSAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBjb3VudCAqLywKKyAgICAgICAgICAgICAgICAxMDI0MDAgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSAyNSAqIDQwOTYgYnl0ZXMvZnJhbWUgKi8sCisgICAgICAgICAgICAgICAgc2VwYXJhdGVFb3MpOworICAgIH0KIH0KIAogLy8gUHVzaCBvbmUgYmlnIGNodW5rLgogVEVTVF9GKEZyYW1lUmVhc3NlbWJsZXJUZXN0LCBQdXNoQmlnQ2h1bmspIHsKICAgICBBU1NFUlRfRVEoT0ssIGluaXRTdGF0dXMoKSk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fOCwKLSAgICAgICAgICAgIDEwMDAwMCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAotICAgICAgICAgICAgMSAvKiBjb3VudCAqLywKLSAgICAgICAgICAgIDEwMDM1MiAvKiBleHBlY3RlZCBvdXRwdXQgc2l6ZSA9IDk4ICogMTAyNCBieXRlcy9mcmFtZSAqLyk7Ci0gICAgdGVzdFB1c2hTYW1lU2l6ZSgKLSAgICAgICAgICAgIDEwMjQgLyogZnJhbWUgc2l6ZSBpbiBzYW1wbGVzICovLAotICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCi0gICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCi0gICAgICAgICAgICBQQ01fMTYsCi0gICAgICAgICAgICAxMDAwMDAgLyogaW5wdXQgZnJhbWUgc2l6ZSBpbiBieXRlcyAqLywKLSAgICAgICAgICAgIDEgLyogY291bnQgKi8sCi0gICAgICAgICAgICAxMDAzNTIgLyogZXhwZWN0ZWQgb3V0cHV0IHNpemUgPSA0OSAqIDIwNDggYnl0ZXMvZnJhbWUgKi8pOwotICAgIHRlc3RQdXNoU2FtZVNpemUoCi0gICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKLSAgICAgICAgICAgIDQ4MDAwIC8qIHNhbXBsZSByYXRlICovLAotICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAotICAgICAgICAgICAgUENNX0ZMT0FULAotICAgICAgICAgICAgMTAwMDAwIC8qIGlucHV0IGZyYW1lIHNpemUgaW4gYnl0ZXMgKi8sCi0gICAgICAgICAgICAxIC8qIGNvdW50ICovLAotICAgICAgICAgICAgMTAyNDAwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMjUgKiA0MDk2IGJ5dGVzL2ZyYW1lICovKTsKKyAgICBmb3IgKGJvb2wgc2VwYXJhdGVFb3MgOiB7ZmFsc2UsIHRydWV9KSB7CisgICAgICAgIHRlc3RQdXNoU2FtZVNpemUoCisgICAgICAgICAgICAgICAgMTAyNCAvKiBmcmFtZSBzaXplIGluIHNhbXBsZXMgKi8sCisgICAgICAgICAgICAgICAgNDgwMDAgLyogc2FtcGxlIHJhdGUgKi8sCisgICAgICAgICAgICAgICAgMSAvKiBjaGFubmVsIGNvdW50ICovLAorICAgICAgICAgICAgICAgIFBDTV84LAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMTAwMzUyIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gOTggKiAxMDI0IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNXzE2LAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMTAwMzUyIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gNDkgKiAyMDQ4IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICAgICAgdGVzdFB1c2hTYW1lU2l6ZSgKKyAgICAgICAgICAgICAgICAxMDI0IC8qIGZyYW1lIHNpemUgaW4gc2FtcGxlcyAqLywKKyAgICAgICAgICAgICAgICA0ODAwMCAvKiBzYW1wbGUgcmF0ZSAqLywKKyAgICAgICAgICAgICAgICAxIC8qIGNoYW5uZWwgY291bnQgKi8sCisgICAgICAgICAgICAgICAgUENNX0ZMT0FULAorICAgICAgICAgICAgICAgIDEwMDAwMCAvKiBpbnB1dCBmcmFtZSBzaXplIGluIGJ5dGVzICovLAorICAgICAgICAgICAgICAgIDEgLyogY291bnQgKi8sCisgICAgICAgICAgICAgICAgMTAyNDAwIC8qIGV4cGVjdGVkIG91dHB1dCBzaXplID0gMjUgKiA0MDk2IGJ5dGVzL2ZyYW1lICovLAorICAgICAgICAgICAgICAgIHNlcGFyYXRlRW9zKTsKKyAgICB9CiB9CiAKIH0gLy8gbmFtZXNwYWNlIGFuZHJvaWQKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjMi9zZnBsdWdpbi91dGlscy9Db2RlYzJNYXBwZXIuY3BwIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3V0aWxzL0NvZGVjMk1hcHBlci5jcHAKaW5kZXggNGQ5MzlmYS4uY2E2YTMyOCAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3V0aWxzL0NvZGVjMk1hcHBlci5jcHAKKysrIGIvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3V0aWxzL0NvZGVjMk1hcHBlci5jcHAKQEAgLTM4MSwxNSArMzgxLDE3IEBACiAgICAgeyBDMkNvbmZpZzo6TEVWRUxfQVYxXzdfMywgIEFWMUxldmVsNzMgfSwKIH07CiAKLQogQUxvb2t1cDxDMkNvbmZpZzo6cHJvZmlsZV90LCBpbnQzMl90PiBzQXYxUHJvZmlsZXMgPSB7Ci0gICAgLy8gVE9ETzogd2lsbCBuZWVkIHRvIGRpc2FtYmlndWF0ZSBiZXR3ZWVuIE1haW44IGFuZCBNYWluMTAKICAgICB7IEMyQ29uZmlnOjpQUk9GSUxFX0FWMV8wLCBBVjFQcm9maWxlTWFpbjggfSwKICAgICB7IEMyQ29uZmlnOjpQUk9GSUxFX0FWMV8wLCBBVjFQcm9maWxlTWFpbjEwIH0sCiAgICAgeyBDMkNvbmZpZzo6UFJPRklMRV9BVjFfMCwgQVYxUHJvZmlsZU1haW4xMEhEUjEwIH0sCiAgICAgeyBDMkNvbmZpZzo6UFJPRklMRV9BVjFfMCwgQVYxUHJvZmlsZU1haW4xMEhEUjEwUGx1cyB9LAogfTsKIAorQUxvb2t1cDxDMkNvbmZpZzo6cHJvZmlsZV90LCBpbnQzMl90PiBzQXYxVGVuYml0UHJvZmlsZXMgPSB7CisgICAgeyBDMkNvbmZpZzo6UFJPRklMRV9BVjFfMCwgQVYxUHJvZmlsZU1haW4xMCB9LAorfTsKKwogQUxvb2t1cDxDMkNvbmZpZzo6cHJvZmlsZV90LCBpbnQzMl90PiBzQXYxSGRyUHJvZmlsZXMgPSB7CiAgICAgeyBDMkNvbmZpZzo6UFJPRklMRV9BVjFfMCwgQVYxUHJvZmlsZU1haW4xMEhEUjEwIH0sCiB9OwpAQCAtNjAzLDkgKzYwNSw5IEBACiB9OwogCiBzdHJ1Y3QgQXYxUHJvZmlsZUxldmVsTWFwcGVyIDogUHJvZmlsZUxldmVsTWFwcGVySGVscGVyIHsKLSAgICBBdjFQcm9maWxlTGV2ZWxNYXBwZXIoYm9vbCBpc0hkciA9IGZhbHNlLCBib29sIGlzSGRyMTBQbHVzID0gZmFsc2UpIDoKKyAgICBBdjFQcm9maWxlTGV2ZWxNYXBwZXIoYm9vbCBpc0hkciA9IGZhbHNlLCBib29sIGlzSGRyMTBQbHVzID0gZmFsc2UsIGludDMyX3QgYml0RGVwdGggPSA4KSA6CiAgICAgICAgIFByb2ZpbGVMZXZlbE1hcHBlckhlbHBlcigpLAotICAgICAgICBtSXNIZHIoaXNIZHIpLCBtSXNIZHIxMFBsdXMoaXNIZHIxMFBsdXMpIHt9CisgICAgICAgIG1Jc0hkcihpc0hkciksIG1Jc0hkcjEwUGx1cyhpc0hkcjEwUGx1cyksIG1CaXREZXB0aChiaXREZXB0aCkge30KIAogICAgIHZpcnR1YWwgYm9vbCBzaW1wbGVNYXAoQzJDb25maWc6OmxldmVsX3QgZnJvbSwgaW50MzJfdCAqdG8pIHsKICAgICAgICAgcmV0dXJuIHNBdjFMZXZlbHMubWFwKGZyb20sIHRvKTsKQEAgLTYxNCwxOSArNjE2LDIyIEBACiAgICAgICAgIHJldHVybiBzQXYxTGV2ZWxzLm1hcChmcm9tLCB0byk7CiAgICAgfQogICAgIHZpcnR1YWwgYm9vbCBzaW1wbGVNYXAoQzJDb25maWc6OnByb2ZpbGVfdCBmcm9tLCBpbnQzMl90ICp0bykgewotICAgICAgICByZXR1cm4gbUlzSGRyMTBQbHVzID8gc0F2MUhkcjEwUGx1c1Byb2ZpbGVzLm1hcChmcm9tLCB0bykgOgotICAgICAgICAgICAgICAgICAgICAgbUlzSGRyID8gc0F2MUhkclByb2ZpbGVzLm1hcChmcm9tLCB0bykgOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc0F2MVByb2ZpbGVzLm1hcChmcm9tLCB0byk7CisgICAgICAgIHJldHVybiAobUJpdERlcHRoID09IDEwKSA/IHNBdjFUZW5iaXRQcm9maWxlcy5tYXAoZnJvbSwgdG8pIDoKKyAgICAgICAgICAgICAgICAgICAgbUlzSGRyMTBQbHVzID8gc0F2MUhkcjEwUGx1c1Byb2ZpbGVzLm1hcChmcm9tLCB0bykgOgorICAgICAgICAgICAgICAgICAgICAgICAgICBtSXNIZHIgPyBzQXYxSGRyUHJvZmlsZXMubWFwKGZyb20sIHRvKSA6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNBdjFQcm9maWxlcy5tYXAoZnJvbSwgdG8pOwogICAgIH0KICAgICB2aXJ0dWFsIGJvb2wgc2ltcGxlTWFwKGludDMyX3QgZnJvbSwgQzJDb25maWc6OnByb2ZpbGVfdCAqdG8pIHsKLSAgICAgICAgcmV0dXJuIG1Jc0hkcjEwUGx1cyA/IHNBdjFIZHIxMFBsdXNQcm9maWxlcy5tYXAoZnJvbSwgdG8pIDoKLSAgICAgICAgICAgICAgICAgICAgIG1Jc0hkciA/IHNBdjFIZHJQcm9maWxlcy5tYXAoZnJvbSwgdG8pIDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNBdjFQcm9maWxlcy5tYXAoZnJvbSwgdG8pOworICAgICAgICByZXR1cm4gKG1CaXREZXB0aCA9PSAxMCkgPyBzQXYxVGVuYml0UHJvZmlsZXMubWFwKGZyb20sIHRvKSA6CisgICAgICAgICAgICAgICAgICAgIG1Jc0hkcjEwUGx1cyA/IHNBdjFIZHIxMFBsdXNQcm9maWxlcy5tYXAoZnJvbSwgdG8pIDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgbUlzSGRyID8gc0F2MUhkclByb2ZpbGVzLm1hcChmcm9tLCB0bykgOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzQXYxUHJvZmlsZXMubWFwKGZyb20sIHRvKTsKICAgICB9CiAKIHByaXZhdGU6CiAgICAgYm9vbCBtSXNIZHI7CiAgICAgYm9vbCBtSXNIZHIxMFBsdXM7CisgICAgaW50MzJfdCBtQml0RGVwdGg7CiB9OwogCiB9IC8vIG5hbWVzcGFjZQpAQCAtNjc0LDYgKzY3OSwxOCBAQAogfQogCiAvLyBzdGF0aWMKK3N0ZDo6c2hhcmVkX3B0cjxDMk1hcHBlcjo6UHJvZmlsZUxldmVsTWFwcGVyPgorQzJNYXBwZXI6OkdldEJpdERlcHRoUHJvZmlsZUxldmVsTWFwcGVyKHN0ZDo6c3RyaW5nIG1lZGlhVHlwZSwgaW50MzJfdCBiaXREZXB0aCkgeworICAgIHN0ZDo6dHJhbnNmb3JtKG1lZGlhVHlwZS5iZWdpbigpLCBtZWRpYVR5cGUuZW5kKCksIG1lZGlhVHlwZS5iZWdpbigpLCA6OnRvbG93ZXIpOworICAgIGlmIChiaXREZXB0aCA9PSA4KSB7CisgICAgICAgIHJldHVybiBHZXRQcm9maWxlTGV2ZWxNYXBwZXIobWVkaWFUeXBlKTsKKyAgICB9IGVsc2UgaWYgKG1lZGlhVHlwZSA9PSBNSU1FVFlQRV9WSURFT19BVjEgJiYgYml0RGVwdGggPT0gMTApIHsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV9zaGFyZWQ8QXYxUHJvZmlsZUxldmVsTWFwcGVyPihmYWxzZSwgZmFsc2UsIGJpdERlcHRoKTsKKyAgICB9CisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisKKy8vIHN0YXRpYwogYm9vbCBDMk1hcHBlcjo6bWFwKEMyQ29uZmlnOjpiaXRyYXRlX21vZGVfdCBmcm9tLCBpbnQzMl90ICp0bykgewogICAgIHJldHVybiBzQml0cmF0ZU1vZGVzLm1hcChmcm9tLCB0byk7CiB9CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vdXRpbHMvQ29kZWMyTWFwcGVyLmggYi9tZWRpYS9jb2RlYzIvc2ZwbHVnaW4vdXRpbHMvQ29kZWMyTWFwcGVyLmgKaW5kZXggNzk3YzhhOC4uMzNkMzA1ZSAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWMyL3NmcGx1Z2luL3V0aWxzL0NvZGVjMk1hcHBlci5oCisrKyBiL21lZGlhL2NvZGVjMi9zZnBsdWdpbi91dGlscy9Db2RlYzJNYXBwZXIuaApAQCAtNDMsNiArNDMsOSBAQAogICAgICAgICBzdGF0aWMgc3RkOjpzaGFyZWRfcHRyPFByb2ZpbGVMZXZlbE1hcHBlcj4KICAgICAgICAgR2V0SGRyUHJvZmlsZUxldmVsTWFwcGVyKHN0ZDo6c3RyaW5nIG1lZGlhVHlwZSwgYm9vbCBpc0hkcjEwUGx1cyA9IGZhbHNlKTsKIAorICAgICAgICBzdGF0aWMgc3RkOjpzaGFyZWRfcHRyPFByb2ZpbGVMZXZlbE1hcHBlcj4KKyAgICAgICAgR2V0Qml0RGVwdGhQcm9maWxlTGV2ZWxNYXBwZXIoc3RkOjpzdHJpbmcgbWVkaWFUeXBlLCBpbnQzMl90IGJpdERlcHRoID0gOCk7CisKICAgICAgICAgLy8gY29udmVydCBiZXR3ZWVuIGJpdHJhdGVzCiAgICAgICAgIHN0YXRpYyBib29sIG1hcChDMkNvbmZpZzo6Yml0cmF0ZV9tb2RlX3QsIGludDMyX3QqKTsKICAgICAgICAgc3RhdGljIGJvb2wgbWFwKGludDMyX3QsIEMyQ29uZmlnOjpiaXRyYXRlX21vZGVfdCopOwpkaWZmIC0tZ2l0IGEvbWVkaWEvY29kZWMyL3ZuZGsvcGxhdGZvcm0vQzJCcUJ1ZmZlci5jcHAgYi9tZWRpYS9jb2RlYzIvdm5kay9wbGF0Zm9ybS9DMkJxQnVmZmVyLmNwcAppbmRleCAxNjlkZTBjLi4wMTk5NWZkIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlYzIvdm5kay9wbGF0Zm9ybS9DMkJxQnVmZmVyLmNwcAorKysgYi9tZWRpYS9jb2RlYzIvdm5kay9wbGF0Zm9ybS9DMkJxQnVmZmVyLmNwcApAQCAtMTYsNiArMTYsNyBAQAogCiAvLyNkZWZpbmUgTE9HX05ERUJVRyAwCiAjZGVmaW5lIExPR19UQUcgIkMyQnFCdWZmZXIiCisjaW5jbHVkZSA8YW5kcm9pZC9oYXJkd2FyZV9idWZmZXIuaD4KICNpbmNsdWRlIDx1dGlscy9Mb2cuaD4KIAogI2luY2x1ZGUgPHVpL0J1ZmZlclF1ZXVlRGVmcy5oPgpAQCAtMTcxLDYgKzE3Miw5MSBAQAogICAgIHJldHVybiBzdGFtcDsKIH0KIAorLy8gRG8gbm90IHJlbHkgb24gQUhhcmR3YXJlQnVmZmVyIG1vZHVsZSBmb3IgR3JhcGhpY0J1ZmZlciBoYW5kbGluZyBzaW5jZSBBSGFyZHdhcmVCdWZmZXIKKy8vIG1vZHVsZSBpcyBsaW5rZWQgdG8gZnJhbWV3b3JrIHdoaWNoIGNvdWxkIGhhdmUgYSBkaWZmZXJlbnQgaW1wbGVtZW50YXRpb24gb2YgR3JhcGhpY0J1ZmZlcgorLy8gdGhhbiBtYWlubGluZS92bmRrIGltcGxlbWVudGF0aW9uLihTZWUgYi8yMDMzNDc0OTQuKQorLy8KKy8vIGIyaC9oMmIgYmV0d2VlbiBIYXJkd2FyZUJ1ZmZlciBhbmQgR3JhcGhpY0J1ZmZlciBjYW5ub3QgYmUgdXNlZC4gKGIyaC9oMmIgZGVwZW5kIG9uCisvLyBBSGFyZHdhcmVCdWZmZXIgbW9kdWxlIGZvciB0aGUgY29udmVyc2lvbiBiZXR3ZWVuIEhhcmR3YXJlQnVmZmVyIGFuZCBHcmFwaGljQnVmZmVyLikKKy8vIGhnYnBfIHByZWZpeGVkIG1ldGhvZHMgYXJlIGFkZGVkIHRvIGJlIHVzZWQgaW5zdGVhZCBvZiBiMmgvaDJiLgorLy8KKy8vIFRPRE86IFJlbW92ZSBkZXBlbmRlbmN5IHdpdGggZXhpc3RpbmcgQUh3QiBtb2R1bGUuIEFsc28gY2xlYW4gdXAgY29udmVyc2lvbnMuKGNvbnZlcnNpb25zIGhlcmUKKy8vIGFuZCBoMmIvYjJoIGNvdmVyc2lvbnMpCitjb25zdCBHcmFwaGljQnVmZmVyKiBoZ2JwX0FIQnVmZmVyX3RvX0dyYXBoaWNCdWZmZXIoY29uc3QgQUhhcmR3YXJlQnVmZmVyKiBidWZmZXIpIHsKKyAgICByZXR1cm4gR3JhcGhpY0J1ZmZlcjo6ZnJvbUFIYXJkd2FyZUJ1ZmZlcihidWZmZXIpOworfQorCitpbnQgaGdicF9jcmVhdGVGcm9tSGFuZGxlKGNvbnN0IEFIYXJkd2FyZUJ1ZmZlcl9EZXNjKiBkZXNjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IG5hdGl2ZV9oYW5kbGVfdCogaGFuZGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNwPEdyYXBoaWNCdWZmZXI+ICpvdXRCdWZmZXIpIHsKKworICAgIGlmICghZGVzYyB8fCAhaGFuZGxlIHx8ICFvdXRCdWZmZXIpIHJldHVybiA6OmFuZHJvaWQ6OkJBRF9WQUxVRTsKKyAgICBpZiAoZGVzYy0+cmZ1MCAhPSAwIHx8IGRlc2MtPnJmdTEgIT0gMCkgcmV0dXJuIDo6YW5kcm9pZDo6QkFEX1ZBTFVFOworICAgIGlmIChkZXNjLT5mb3JtYXQgPT0gQUhBUkRXQVJFQlVGRkVSX0ZPUk1BVF9CTE9CICYmIGRlc2MtPmhlaWdodCAhPSAxKQorICAgICAgICByZXR1cm4gOjphbmRyb2lkOjpCQURfVkFMVUU7CisKKyAgICBjb25zdCBpbnQgZm9ybWF0ID0gdWludDMyX3QoZGVzYy0+Zm9ybWF0KTsKKyAgICBjb25zdCB1aW50NjRfdCB1c2FnZSA9IHVpbnQ2NF90KGRlc2MtPnVzYWdlKTsKKyAgICBzcDxHcmFwaGljQnVmZmVyPiBnYnVmZmVyKG5ldyBHcmFwaGljQnVmZmVyKGhhbmRsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdyYXBoaWNCdWZmZXI6OkhhbmRsZVdyYXBNZXRob2Q6OkNMT05FX0hBTkRMRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlc2MtPndpZHRoLCBkZXNjLT5oZWlnaHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQsIGRlc2MtPmxheWVycywgdXNhZ2UsIGRlc2MtPnN0cmlkZSkpOworICAgIHN0YXR1c190IGVyciA9IGdidWZmZXItPmluaXRDaGVjaygpOworICAgIGlmIChlcnIgIT0gMCB8fCBnYnVmZmVyLT5oYW5kbGUgPT0gMCkgcmV0dXJuIGVycjsKKworICAgICpvdXRCdWZmZXIgPSBnYnVmZmVyOworCisgICAgcmV0dXJuIDo6YW5kcm9pZDo6Tk9fRVJST1I7Cit9CisKK3ZvaWQgaGdicF9kZXNjcmliZShjb25zdCBBSGFyZHdhcmVCdWZmZXIqIGJ1ZmZlciwKKyAgICAgICAgQUhhcmR3YXJlQnVmZmVyX0Rlc2MqIG91dERlc2MpIHsKKyAgICBpZiAoIWJ1ZmZlciB8fCAhb3V0RGVzYykgcmV0dXJuOworCisgICAgY29uc3QgR3JhcGhpY0J1ZmZlciogZ2J1ZmZlciA9IGhnYnBfQUhCdWZmZXJfdG9fR3JhcGhpY0J1ZmZlcihidWZmZXIpOworCisgICAgb3V0RGVzYy0+d2lkdGggPSBnYnVmZmVyLT5nZXRXaWR0aCgpOworICAgIG91dERlc2MtPmhlaWdodCA9IGdidWZmZXItPmdldEhlaWdodCgpOworICAgIG91dERlc2MtPmxheWVycyA9IGdidWZmZXItPmdldExheWVyQ291bnQoKTsKKyAgICBvdXREZXNjLT5mb3JtYXQgPSB1aW50MzJfdChnYnVmZmVyLT5nZXRQaXhlbEZvcm1hdCgpKTsKKyAgICBvdXREZXNjLT51c2FnZSA9IHVpbnQ2NF90KGdidWZmZXItPmdldFVzYWdlKCkpOworICAgIG91dERlc2MtPnN0cmlkZSA9IGdidWZmZXItPmdldFN0cmlkZSgpOworICAgIG91dERlc2MtPnJmdTAgPSAwOworICAgIG91dERlc2MtPnJmdTEgPSAwOworfQorCisKK2Jvb2wgaGdicF9oMmIoSEJ1ZmZlciBjb25zdCYgZnJvbSwgc3A8R3JhcGhpY0J1ZmZlcj4qIHRvKSB7CisgICAgQUhhcmR3YXJlQnVmZmVyX0Rlc2MgY29uc3QqIGRlc2MgPQorICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxBSGFyZHdhcmVCdWZmZXJfRGVzYyBjb25zdCo+KAorICAgICAgICAgICAgZnJvbS5kZXNjcmlwdGlvbi5kYXRhKCkpOworICAgIG5hdGl2ZV9oYW5kbGVfdCBjb25zdCogaGFuZGxlID0gZnJvbS5uYXRpdmVIYW5kbGU7CisgICAgaWYgKGhnYnBfY3JlYXRlRnJvbUhhbmRsZShkZXNjLCBoYW5kbGUsIHRvKSAhPSA6OmFuZHJvaWQ6Ok9LKSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgaGdicF9iMmgoc3A8R3JhcGhpY0J1ZmZlcj4gY29uc3QmIGZyb20sIEhCdWZmZXIqIHRvLAorICAgICAgICAgdWludDMyX3QqIHRvR2VuZXJhdGlvbk51bWJlcikgeworICAgIGlmICghZnJvbSkgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIEFIYXJkd2FyZUJ1ZmZlciogaHdCdWZmZXIgPSBmcm9tLT50b0FIYXJkd2FyZUJ1ZmZlcigpOworICAgIHRvLT5uYXRpdmVIYW5kbGUuc2V0VG8oCisgICAgICAgICAgY29uc3RfY2FzdDxuYXRpdmVfaGFuZGxlX3QqPihmcm9tLT5oYW5kbGUpLAorICAgICAgICAgIGZhbHNlKTsKKyAgICBoZ2JwX2Rlc2NyaWJlKAorICAgICAgICAgICAgaHdCdWZmZXIsCisgICAgICAgICAgICByZWludGVycHJldF9jYXN0PEFIYXJkd2FyZUJ1ZmZlcl9EZXNjKj4odG8tPmRlc2NyaXB0aW9uLmRhdGEoKSkpOworICAgIGlmICh0b0dlbmVyYXRpb25OdW1iZXIpIHsKKyAgICAgICAgKnRvR2VuZXJhdGlvbk51bWJlciA9IGZyb20tPmdldEdlbmVyYXRpb25OdW1iZXIoKTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKKy8vIEVuZCBvZiBoZ2JwIG1ldGhvZHMgZm9yIEdyYXBoaWNCdWZmZXIgY3JlYXRpb24uCisKIGJvb2wgZ2V0R2VuZXJhdGlvbk51bWJlckFuZFVzYWdlKGNvbnN0IHNwPEhHcmFwaGljQnVmZmVyUHJvZHVjZXI+ICZwcm9kdWNlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90ICpnZW5lcmF0aW9uLCB1aW50NjRfdCAqdXNhZ2UpIHsKICAgICBzdGF0dXNfdCBzdGF0dXN7fTsKQEAgLTIxMSw3ICsyOTcsNyBAQAogICAgICAgICAgICAgICAgICAgICBIQnVmZmVyIGNvbnN0JiBoQnVmZmVyLAogICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBnZW5lcmF0aW9uTnVtYmVyKXsKICAgICAgICAgICAgICAgICBpZiAoaDJiKGhTdGF0dXMsICZzdGF0dXMpICYmCi0gICAgICAgICAgICAgICAgICAgICAgICBoMmIoaEJ1ZmZlciwgJnNsb3RCdWZmZXIpICYmCisgICAgICAgICAgICAgICAgICAgICAgICBoZ2JwX2gyYihoQnVmZmVyLCAmc2xvdEJ1ZmZlcikgJiYKICAgICAgICAgICAgICAgICAgICAgICAgIHNsb3RCdWZmZXIpIHsKICAgICAgICAgICAgICAgICAgICAgKmdlbmVyYXRpb24gPSBnZW5lcmF0aW9uTnVtYmVyOwogICAgICAgICAgICAgICAgICAgICAqdXNhZ2UgPSBzbG90QnVmZmVyLT5nZXRVc2FnZSgpOwpAQCAtNDAyLDcgKzQ4OCw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSEJ1ZmZlciBjb25zdCYgaEJ1ZmZlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBnZW5lcmF0aW9uTnVtYmVyKXsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChoMmIoaFN0YXR1cywgJnN0YXR1cykgJiYKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaDJiKGhCdWZmZXIsICZzbG90QnVmZmVyKSAmJgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZ2JwX2gyYihoQnVmZmVyLCAmc2xvdEJ1ZmZlcikgJiYKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2xvdEJ1ZmZlcikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNsb3RCdWZmZXItPnNldEdlbmVyYXRpb25OdW1iZXIoZ2VuZXJhdGlvbk51bWJlcik7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0R2VuZXJhdGlvbiA9IGdlbmVyYXRpb25OdW1iZXI7CkBAIC04MDQsNyArODkwLDcgQEAKIAogICAgIEhCdWZmZXIgaEJ1ZmZlcnt9OwogICAgIHVpbnQzMl90IGhHZW5lcmF0aW9uTnVtYmVye307Ci0gICAgaWYgKCFiMmgoZ3JhcGhpY0J1ZmZlciwgJmhCdWZmZXIsICZoR2VuZXJhdGlvbk51bWJlcikpIHsKKyAgICBpZiAoIWhnYnBfYjJoKGdyYXBoaWNCdWZmZXIsICZoQnVmZmVyLCAmaEdlbmVyYXRpb25OdW1iZXIpKSB7CiAgICAgICAgIEFMT0dEKCJJIHRvIE8gY29udmVyc2lvbiBmYWlsZWQiKTsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjcy9tNHZfaDI2My9lbmMvc3JjL2Zhc3RpZGN0LmNwcCBiL21lZGlhL2NvZGVjcy9tNHZfaDI2My9lbmMvc3JjL2Zhc3RpZGN0LmNwcAppbmRleCA2ODhlZmZjLi5lYzFiMjhmIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlY3MvbTR2X2gyNjMvZW5jL3NyYy9mYXN0aWRjdC5jcHAKKysrIGIvbWVkaWEvY29kZWNzL200dl9oMjYzL2VuYy9zcmMvZmFzdGlkY3QuY3BwCkBAIC03Niw2ICs3Niw4IEBACiAgICAgcmV0dXJuIDsKIH0KIAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9jb2wyKFNob3J0ICpibGspCiB7CiAgICAgaW50MzIgeDAsIHgxLCB4MywgeDUsIHg3Oy8vLCB4ODsKQEAgLTEwMiw2ICsxMDQsOCBAQAogICAgIHJldHVybiA7CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3RfY29sMyhTaG9ydCAqYmxrKQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC0xMzcsNiArMTQxLDggQEAKICAgICByZXR1cm4gOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X2NvbDQoU2hvcnQgKmJsaykKIHsKICAgICBpbnQzMiB4MCwgeDEsIHgyLCB4MywgeDQsIHg1LCB4NiwgeDcsIHg4OwpAQCAtMTgwLDYgKzE4Niw4IEBACiB9CiAKICNpZm5kZWYgU01BTExfRENUCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X2NvbDB4NDAoU2hvcnQgKmJsaykKIHsKICAgICBpbnQzMiB4MSwgeDMsIHg1LCB4NzsvLywgeDg7CkBAIC0yMzAsNiArMjM4LDggQEAKICAgICByZXR1cm4gOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X2NvbDB4MTAoU2hvcnQgKmJsaykKIHsKICAgICBpbnQzMiB4MSwgeDMsIHg1LCAgeDc7CkBAIC0yNTYsNiArMjY2LDggQEAKIAogI2VuZGlmIC8qIFNNQUxMX0RDVCAqLwogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X2NvbChTaG9ydCAqYmxrKQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC0zNjgsNiArMzgwLDggQEAKICAgICByZXR1cm47CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3Rfcm93MkludGVyKFNob3J0ICpibGssIFVDaGFyICpyZWMsIEludCBseCkKIHsKICAgICBpbnQzMiB4MCwgeDEsIHgyLCB4NCwgeDU7CkBAIC00MjcsNiArNDQxLDggQEAKICAgICByZXR1cm4gOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3JvdzNJbnRlcihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDAsIHgxLCB4MiwgeDMsIHg0LCB4NSwgeDYsIHg3LCB4ODsKQEAgLTQ5Nyw2ICs1MTMsOCBAQAogICAgIHJldHVybiA7CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3Rfcm93NEludGVyKFNob3J0ICpibGssIFVDaGFyICpyZWMsIEludCBseCkKIHsKICAgICBpbnQzMiB4MCwgeDEsIHgyLCB4MywgeDQsIHg1LCB4NiwgeDcsIHg4OwpAQCAtNTczLDYgKzU5MSw4IEBACiB9CiAKICNpZm5kZWYgU01BTExfRENUCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3JvdzB4NDBJbnRlcihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDEsIHgyLCB4NCwgeDU7CkBAIC02ODYsNiArNzA2LDggQEAKICAgICByZXR1cm4gOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3JvdzB4MTBJbnRlcihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDEsIHgzLCB4NSwgeDc7CkBAIC03NDEsNiArNzYzLDggQEAKIAogI2VuZGlmIC8qIFNNQUxMX0RDVCAqLwogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3Jvd0ludGVyKFNob3J0ICpibGssIFVDaGFyICpyZWMsIEludCBseCkKIHsKICAgICBpbnQzMiB4MCwgeDEsIHgyLCB4MywgeDQsIHg1LCB4NiwgeDcsIHg4OwpAQCAtODY0LDYgKzg4OCw4IEBACiAgICAgcmV0dXJuOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3JvdzJJbnRyYShTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDAsIHgxLCB4MiwgeDQsIHg1OwpAQCAtOTE5LDYgKzk0NSw4IEBACiAgICAgcmV0dXJuIDsKIH0KIAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3czSW50cmEoU2hvcnQgKmJsaywgVUNoYXIgKnJlYywgSW50IGx4KQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC05ODUsNiArMTAxMyw4IEBACiAgICAgcmV0dXJuIDsKIH0KIAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3c0SW50cmEoU2hvcnQgKmJsaywgVUNoYXIgKnJlYywgSW50IGx4KQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC0xMDU4LDYgKzEwODgsOCBAQAogfQogCiAjaWZuZGVmIFNNQUxMX0RDVAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3cweDQwSW50cmEoU2hvcnQgKmJsaywgVUNoYXIgKnJlYywgSW50IGx4KQogewogICAgIGludDMyICB4MSwgeDIsIHg0LCB4NTsKQEAgLTExNjYsNiArMTE5OCw4IEBACiAgICAgcmV0dXJuIDsKIH0KIAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3cweDEwSW50cmEoU2hvcnQgKmJsaywgVUNoYXIgKnJlYywgSW50IGx4KQogewogICAgIGludDMyIHgxLCB4MywgeDUsIHg3OwpAQCAtMTIxOCw2ICsxMjUyLDggQEAKIH0KIAogI2VuZGlmIC8qIFNNQUxMX0RDVCAqLworLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3dJbnRyYShTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDAsIHgxLCB4MiwgeDMsIHg0LCB4NSwgeDYsIHg3LCB4ODsKQEAgLTEzNjQsNiArMTQwMCw4IEBACiAgICAgcmV0dXJuOwogfQogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3JvdzJ6bXYoU2hvcnQgKmJsaywgVUNoYXIgKnJlYywgVUNoYXIgKnByZWQsIEludCBseCkKIHsKICAgICBpbnQzMiB4MCwgeDEsIHgyLCB4NCwgeDU7CkBAIC0xNDI0LDYgKzE0NjIsOCBAQAogICAgIHJldHVybiA7CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3Rfcm93M3ptdihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBVQ2hhciAqcHJlZCwgSW50IGx4KQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC0xNDk1LDYgKzE1MzUsOCBAQAogICAgIHJldHVybiA7CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3Rfcm93NHptdihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBVQ2hhciAqcHJlZCwgSW50IGx4KQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CkBAIC0xNTcyLDYgKzE2MTQsOCBAQAogfQogCiAjaWZuZGVmIFNNQUxMX0RDVAorLyogSWdub3Jpbmcgb3ZlcmZsb3dzIGFzIGlkY3QgZnVuY3Rpb24gZXhwZWN0cyBhbmQgdXNlcyBvdmVyZmxvd3MgKi8KK19fYXR0cmlidXRlX18oKG5vX3Nhbml0aXplKCJzaWduZWQtaW50ZWdlci1vdmVyZmxvdyIpKSkKIHZvaWQgaWRjdF9yb3cweDQwem12KFNob3J0ICpibGssIFVDaGFyICpyZWMsIFVDaGFyICpwcmVkLCBJbnQgbHgpCiB7CiAgICAgaW50MzIgeDEsIHgyLCB4NCwgeDU7CkBAIC0xNjg3LDYgKzE3MzEsOCBAQAogICAgIHJldHVybiA7CiB9CiAKKy8qIElnbm9yaW5nIG92ZXJmbG93cyBhcyBpZGN0IGZ1bmN0aW9uIGV4cGVjdHMgYW5kIHVzZXMgb3ZlcmZsb3dzICovCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgic2lnbmVkLWludGVnZXItb3ZlcmZsb3ciKSkpCiB2b2lkIGlkY3Rfcm93MHgxMHptdihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBVQ2hhciAqcHJlZCwgSW50IGx4KQogewogICAgIGludDMyIHgxLCB4MywgeDUsIHg3OwpAQCAtMTc0Myw2ICsxNzg5LDggQEAKIAogI2VuZGlmIC8qIFNNQUxMX0RDVCAqLwogCisvKiBJZ25vcmluZyBvdmVyZmxvd3MgYXMgaWRjdCBmdW5jdGlvbiBleHBlY3RzIGFuZCB1c2VzIG92ZXJmbG93cyAqLworX19hdHRyaWJ1dGVfXygobm9fc2FuaXRpemUoInNpZ25lZC1pbnRlZ2VyLW92ZXJmbG93IikpKQogdm9pZCBpZGN0X3Jvd3ptdihTaG9ydCAqYmxrLCBVQ2hhciAqcmVjLCBVQ2hhciAqcHJlZCwgSW50IGx4KQogewogICAgIGludDMyIHgwLCB4MSwgeDIsIHgzLCB4NCwgeDUsIHg2LCB4NywgeDg7CmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlY3MvbTR2X2gyNjMvZW5jL3NyYy9tcDRlbmNfYXBpLmNwcCBiL21lZGlhL2NvZGVjcy9tNHZfaDI2My9lbmMvc3JjL21wNGVuY19hcGkuY3BwCmluZGV4IDAwYjJhYjYuLmIyOTUyNTggMTAwNjQ0Ci0tLSBhL21lZGlhL2NvZGVjcy9tNHZfaDI2My9lbmMvc3JjL21wNGVuY19hcGkuY3BwCisrKyBiL21lZGlhL2NvZGVjcy9tNHZfaDI2My9lbmMvc3JjL21wNGVuY19hcGkuY3BwCkBAIC01MDEsMTMgKzUwMSwxNiBAQAogICAgIC8qIGNoZWNrIGZyYW1lIHJhdGUgKi8KICAgICBmb3IgKGkgPSAwOyBpIDwgZW5jUGFyYW1zLT5uTGF5ZXJzOyBpKyspCiAgICAgeworICAgICAgICBpZiAoZW5jT3B0aW9uLT5lbmNGcmFtZVJhdGVbaV0gPD0gMC4gfHwgZW5jT3B0aW9uLT5lbmNGcmFtZVJhdGVbaV0gPiAxMjApCisgICAgICAgIHsKKyAgICAgICAgICAgIGdvdG8gQ0xFQU5fVVA7CisgICAgICAgIH0KICAgICAgICAgZW5jUGFyYW1zLT5MYXllckZyYW1lUmF0ZVtpXSA9IGVuY09wdGlvbi0+ZW5jRnJhbWVSYXRlW2ldOwogICAgIH0KIAogICAgIGlmIChlbmNQYXJhbXMtPm5MYXllcnMgPiAxKQogICAgIHsKLSAgICAgICAgaWYgKGVuY09wdGlvbi0+ZW5jRnJhbWVSYXRlWzBdID09IGVuY09wdGlvbi0+ZW5jRnJhbWVSYXRlWzFdIHx8Ci0gICAgICAgICAgICAgICAgZW5jT3B0aW9uLT5lbmNGcmFtZVJhdGVbMF0gPT0gMC4gfHwgZW5jT3B0aW9uLT5lbmNGcmFtZVJhdGVbMV0gPT0gMC4pIC8qIDcvMzEvMDMgKi8KKyAgICAgICAgaWYgKGVuY09wdGlvbi0+ZW5jRnJhbWVSYXRlWzBdID09IGVuY09wdGlvbi0+ZW5jRnJhbWVSYXRlWzFdKQogICAgICAgICAgICAgZ290byBDTEVBTl9VUDsKICAgICB9CiAgICAgLyogc2V0IG1heCBmcmFtZSByYXRlICovCmRpZmYgLS1naXQgYS9tZWRpYS9jb2RlY3MvbTR2X2gyNjMvZnV6emVyL21wZWc0X2gyNjNfZGVjX2Z1enplci5jcHAgYi9tZWRpYS9jb2RlY3MvbTR2X2gyNjMvZnV6emVyL21wZWc0X2gyNjNfZGVjX2Z1enplci5jcHAKaW5kZXggOTEyYzgyMS4uNWU2MTNkOSAxMDA2NDQKLS0tIGEvbWVkaWEvY29kZWNzL200dl9oMjYzL2Z1enplci9tcGVnNF9oMjYzX2RlY19mdXp6ZXIuY3BwCisrKyBiL21lZGlhL2NvZGVjcy9tNHZfaDI2My9mdXp6ZXIvbXBlZzRfaDI2M19kZWNfZnV6emVyLmNwcApAQCAtNTAsNyArNTAsNyBAQAogCiAgcHJpdmF0ZToKICAgdGFndmlkZW9EZWNDb250cm9scyAqbURlY0hhbmRsZSA9IG51bGxwdHI7Ci0gIHVpbnQ4X3QgKm1PdXRwdXRCdWZmZXJba051bU91dHB1dEJ1ZmZlcnNdOworICB1aW50OF90ICptT3V0cHV0QnVmZmVyW2tOdW1PdXRwdXRCdWZmZXJzXSA9IHt9OwogICBib29sIG1Jbml0aWFsaXplZCA9IGZhbHNlOwogICBib29sIG1GcmFtZXNDb25maWd1cmVkID0gZmFsc2U7CiAjaWZkZWYgTVBFRzQKZGlmZiAtLWdpdCBhL21lZGlhL2NvZGVjcy9tcDNkZWMvc3JjL3B2bXAzX3N0ZXJlb19wcm9jLmNwcCBiL21lZGlhL2NvZGVjcy9tcDNkZWMvc3JjL3B2bXAzX3N0ZXJlb19wcm9jLmNwcAppbmRleCA0MzM4YzQzLi5jMDRmN2YzIDEwMDY0NAotLS0gYS9tZWRpYS9jb2RlY3MvbXAzZGVjL3NyYy9wdm1wM19zdGVyZW9fcHJvYy5jcHAKKysrIGIvbWVkaWEvY29kZWNzL21wM2RlYy9zcmMvcHZtcDNfc3RlcmVvX3Byb2MuY3BwCkBAIC0yMTksNiArMjE5LDkgQEAKIDsgRlVOQ1RJT04gQ09ERQogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSovCiAKKyNpZiBfX2hhc19hdHRyaWJ1dGUobm9fc2FuaXRpemUpCitfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZSgiaW50ZWdlciIpKSkKKyNlbmRpZgogdm9pZCBwdm1wM19zdF9pbnRlbnNpdHkoaW50MzIgeHJbU1VCQkFORFNfTlVNQkVSKkZJTFRFUkJBTktfQkFORFNdLAogICAgICAgICAgICAgICAgICAgICAgICAgaW50MzIgeGxbU1VCQkFORFNfTlVNQkVSKkZJTFRFUkJBTktfQkFORFNdLAogICAgICAgICAgICAgICAgICAgICAgICAgaW50MzIgaXNfcG9zLApkaWZmIC0tZ2l0IGEvbWVkaWEvZXh0cmFjdG9ycy90ZXN0cy9BbmRyb2lkLmJwIGIvbWVkaWEvZXh0cmFjdG9ycy90ZXN0cy9BbmRyb2lkLmJwCmluZGV4IDVkOTdkOWEuLjIzYzc0ZjcgMTAwNjQ0Ci0tLSBhL21lZGlhL2V4dHJhY3RvcnMvdGVzdHMvQW5kcm9pZC5icAorKysgYi9tZWRpYS9leHRyYWN0b3JzL3Rlc3RzL0FuZHJvaWQuYnAKQEAgLTQ1LDE0ICs0NSwxMSBAQAogICAgICAgICAibGliZGF0YXNvdXJjZSIsCiAgICAgICAgICJsaWJ3YXRjaGRvZyIsCiAKLSAgICAgICAgImxpYnN0YWdlZnJpZ2h0IiwKICAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2lkMyIsCiAgICAgICAgICJsaWJzdGFnZWZyaWdodF9mbGFjZGVjIiwKICAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2VzZHMiLAogICAgICAgICAibGlic3RhZ2VmcmlnaHRfbXBlZzJzdXBwb3J0IiwKLSAgICAgICAgImxpYnN0YWdlZnJpZ2h0X21wZWcyZXh0cmFjdG9yIiwKICAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2ZvdW5kYXRpb25fY29sb3J1dGlsc19uZGsiLAotICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCiAgICAgICAgICJsaWJzdGFnZWZyaWdodF9tZXRhZGF0YXV0aWxzIiwKIAogICAgICAgICAibGlibWVkaWFfbWlkaWlvd3JhcHBlciIsCkBAIC03NCw2ICs3MSw4IEBACiAgICAgICAgICJsaWJjdXRpbHMiLAogICAgICAgICAibGlibWVkaWFuZGsiLAogICAgICAgICAibGlibWVkaWEiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHQiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCiAgICAgICAgICJsaWJjcnlwdG8iLAogICAgICAgICAibGliaGlkbG1lbW9yeSIsCiAgICAgICAgICJsaWJoaWRsYmFzZSIsCmRpZmYgLS1naXQgYS9tZWRpYS9qYW5pdG9ycy9jb2RlY19PV05FUlMgYi9tZWRpYS9qYW5pdG9ycy9jb2RlY19PV05FUlMKaW5kZXggZTIwMTM5OS4uZDRlZTUxYiAxMDA2NDQKLS0tIGEvbWVkaWEvamFuaXRvcnMvY29kZWNfT1dORVJTCisrKyBiL21lZGlhL2phbml0b3JzL2NvZGVjX09XTkVSUwpAQCAtMiw0ICsyLDQgQEAKICMgZGlmZmVyZW50aWF0ZWQgZnJvbSBwbHVnaW5zIGNvbm5lY3RpbmcgdGhvc2UgY29kZWNzIHRvIGVpdGhlciBvbXggb3IgY29kZWMyIGluZnJhc3RydWN0dXJlCiBlc3NpY2tAZ29vZ2xlLmNvbQogbGFqb3NAZ29vZ2xlLmNvbQotbWFyY29uZUBnb29nbGUuY29tCit3b25zaWtAZ29vZ2xlLmNvbQpkaWZmIC0tZ2l0IGEvbWVkaWEvamFuaXRvcnMvcmVsaWFiaWxpdHlfbWFpbmxpbmVfT1dORVJTIGIvbWVkaWEvamFuaXRvcnMvcmVsaWFiaWxpdHlfbWFpbmxpbmVfT1dORVJTCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU0YzRmYzIKLS0tIC9kZXYvbnVsbAorKysgYi9tZWRpYS9qYW5pdG9ycy9yZWxpYWJpbGl0eV9tYWlubGluZV9PV05FUlMKQEAgLTAsMCArMSw1IEBACisjIEJ1ZyBjb21wb25lbnQ6IDEwNTEzMDkKKyMgZ28vYW5kcm9pZC1tZWRpYS1yZWxhaWJpbGl0eQorCitlc3NpY2tAZ29vZ2xlLmNvbQorbmNoYWxrb0Bnb29nbGUuY29tCmRpZmYgLS1naXQgYS9tZWRpYS9saWJhdWRpb2NsaWVudC9BbmRyb2lkLmJwIGIvbWVkaWEvbGliYXVkaW9jbGllbnQvQW5kcm9pZC5icAppbmRleCAzYzNkMzQwLi4wZmFlMDgwIDEwMDY0NAotLS0gYS9tZWRpYS9saWJhdWRpb2NsaWVudC9BbmRyb2lkLmJwCisrKyBiL21lZGlhL2xpYmF1ZGlvY2xpZW50L0FuZHJvaWQuYnAKQEAgLTEzNiw2ICsxMzYsNyBAQAogICAgICAgICAibGlidXRpbHMiLAogICAgICAgICAibGlidmlicmF0b3IiLAogICAgICAgICAiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgIF0sCiAgICAgZXhwb3J0X3NoYXJlZF9saWJfaGVhZGVyczogWwogICAgICAgICAiYXVkaW9mbGluZ2VyLWFpZGwtY3BwIiwKZGlmZiAtLWdpdCBhL21lZGlhL2xpYmF1ZGlvaGFsL0ZhY3RvcnlIYWxIaWRsLmNwcCBiL21lZGlhL2xpYmF1ZGlvaGFsL0ZhY3RvcnlIYWxIaWRsLmNwcAppbmRleCBlNDIwZDA3Li5jMTlkMmMyIDEwMDY0NAotLS0gYS9tZWRpYS9saWJhdWRpb2hhbC9GYWN0b3J5SGFsSGlkbC5jcHAKKysrIGIvbWVkaWEvbGliYXVkaW9oYWwvRmFjdG9yeUhhbEhpZGwuY3BwCkBAIC05NCw3ICs5NCw3IEBACiB9ICAvLyBuYW1lc3BhY2UKIAogdm9pZCogY3JlYXRlUHJlZmVycmVkSW1wbChjb25zdCBzdGQ6OnN0cmluZyYgcGFja2FnZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGludGVyZmFjZSkgewotICAgIGZvciAoYXV0byB2ZXJzaW9uID0gZGV0YWlsOjpzQXVkaW9IQUxWZXJzaW9uczsgdmVyc2lvbiAhPSBudWxscHRyOyArK3ZlcnNpb24pIHsKKyAgICBmb3IgKGF1dG8gdmVyc2lvbiA9IGRldGFpbDo6c0F1ZGlvSEFMVmVyc2lvbnM7ICp2ZXJzaW9uICE9IG51bGxwdHI7ICsrdmVyc2lvbikgewogICAgICAgICB2b2lkKiByYXdJbnRlcmZhY2UgPSBudWxscHRyOwogICAgICAgICBpZiAoaGFzSGFsU2VydmljZShwYWNrYWdlLCAqdmVyc2lvbiwgaW50ZXJmYWNlKQogICAgICAgICAgICAgICAgICYmIGNyZWF0ZUhhbFNlcnZpY2UoKnZlcnNpb24sIGludGVyZmFjZSwgJnJhd0ludGVyZmFjZSkpIHsKZGlmZiAtLWdpdCBhL21lZGlhL2xpYmVmZmVjdHMvbHZtL2xpYi9FcS9zcmMvTFZFUU5CX0NvbnRyb2wuY3BwIGIvbWVkaWEvbGliZWZmZWN0cy9sdm0vbGliL0VxL3NyYy9MVkVRTkJfQ29udHJvbC5jcHAKaW5kZXggMWVhZGQyNy4uY2NlZjVhYiAxMDA2NDQKLS0tIGEvbWVkaWEvbGliZWZmZWN0cy9sdm0vbGliL0VxL3NyYy9MVkVRTkJfQ29udHJvbC5jcHAKKysrIGIvbWVkaWEvbGliZWZmZWN0cy9sdm0vbGliL0VxL3NyYy9MVkVRTkJfQ29udHJvbC5jcHAKQEAgLTEzNSw3ICsxMzUsNiBAQAogICAgIExWTV9VSU5UMzIgZnMgPQogICAgICAgICAgICAgKExWTV9VSU5UMzIpTFZFUU5CX1NhbXBsZVJhdGVUYWJbKExWTV9VSU5UMTYpcFBhcmFtcy0+U2FtcGxlUmF0ZV07IC8qIFNhbXBsZSByYXRlICovCiAgICAgTFZNX1VJTlQzMiBmYzsgICAgIC8qIEZpbHRlciBjZW50cmUgZnJlcXVlbmN5ICovCi0gICAgTFZNX0lOVDE2IFFGYWN0b3I7IC8qIEZpbHRlciBRIGZhY3RvciAqLwogCiAgICAgcEluc3RhbmNlLT5OQmFuZHMgPSBwUGFyYW1zLT5OQmFuZHM7CiAKQEAgLTE0NCw3ICsxNDMsNiBAQAogICAgICAgICAgKiBHZXQgdGhlIGZpbHRlciBzZXR0aW5ncwogICAgICAgICAgKi8KICAgICAgICAgZmMgPSAoTFZNX1VJTlQzMilwUGFyYW1zLT5wQmFuZERlZmluaXRpb25baV0uRnJlcXVlbmN5OyAvKiBHZXQgdGhlIGJhbmQgY2VudHJlIGZyZXF1ZW5jeSAqLwotICAgICAgICBRRmFjdG9yID0gKExWTV9JTlQxNilwUGFyYW1zLT5wQmFuZERlZmluaXRpb25baV0uUUZhY3RvcjsgLyogR2V0IHRoZSBiYW5kIFEgZmFjdG9yICovCiAKICAgICAgICAgcEluc3RhbmNlLT5wQmlxdWFkVHlwZVtpXSA9IExWRVFOQl9TaW5nbGVQcmVjaXNpb25fRmxvYXQ7IC8qIERlZmF1bHQgdG8gc2luZ2xlIHByZWNpc2lvbiAqLwogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJlZmZlY3RzL2x2bS9saWIvU3BlY3RydW1BbmFseXplci9zcmMvTFZQU0FfQ29udHJvbC5jcHAgYi9tZWRpYS9saWJlZmZlY3RzL2x2bS9saWIvU3BlY3RydW1BbmFseXplci9zcmMvTFZQU0FfQ29udHJvbC5jcHAKaW5kZXggOGU2MzUwMi4uZmZlZDZkNCAxMDA2NDQKLS0tIGEvbWVkaWEvbGliZWZmZWN0cy9sdm0vbGliL1NwZWN0cnVtQW5hbHl6ZXIvc3JjL0xWUFNBX0NvbnRyb2wuY3BwCisrKyBiL21lZGlhL2xpYmVmZmVjdHMvbHZtL2xpYi9TcGVjdHJ1bUFuYWx5emVyL3NyYy9MVlBTQV9Db250cm9sLmNwcApAQCAtNDIxLDcgKzQyMSw2IEBACiAgICAgICogSW50ZXJtZWRpYXRlIHZhcmlhYmxlcyBhbmQgdGVtcG9yYXJ5IHZhbHVlcwogICAgICAqLwogICAgIExWTV9GTE9BVCBUMDsKLSAgICBMVk1fRkxPQVQgRDsKICAgICBMVk1fRkxPQVQgQTA7CiAgICAgTFZNX0ZMT0FUIEIxOwogICAgIExWTV9GTE9BVCBCMjsKQEAgLTQ0NCw5ICs0NDMsNiBAQAogICAgICAqIENhbGN1bGF0aW5nIHRoZSBpbnRlcm1lZGlhdGUgdmFsdWVzCiAgICAgICovCiAgICAgVDAgPSBGcmVxdWVuY3kgKiBMVlBTQV9GbG9hdF9Ud29QaU9uRnNUYWJsZVtGc107IC8qIFQwID0gMiAqIFBpICogRmMgLyBGcyAqLwotICAgIEQgPSAzMjAwOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBGbG9hdGluZyBwb2ludCB2YWx1ZSAxLjAwMDAwMCAoMSoxMDAqMl41KSAqLwotICAgIC8qIEZvcmNlIEQgPSAxIDogdGhlIGZ1bmN0aW9uIHdhcyBvcmlnaW5hbGx5IHVzZWQgZm9yIGEgcGVha2luZyBmaWx0ZXIuCi0gICAgICAgVGhlIEQgcGFyYW1ldGVyIGRvIG5vdCBleGlzdCBmb3IgYSBCYW5kUGFzcyBmaWx0ZXIgY29lZmZpY2llbnRzICovCiAKICAgICAvKgogICAgICAqIENhbGN1bGF0ZSB0aGUgQjIgY29lZmZpY2llbnQKQEAgLTUzNSw3ICs1MzEsNiBAQAogICAgICAqIEludGVybWVkaWF0ZSB2YXJpYWJsZXMgYW5kIHRlbXBvcmFyeSB2YWx1ZXMKICAgICAgKi8KICAgICBMVk1fRkxPQVQgVDA7Ci0gICAgTFZNX0ZMT0FUIEQ7CiAgICAgTFZNX0ZMT0FUIEEwOwogICAgIExWTV9GTE9BVCBCMTsKICAgICBMVk1fRkxPQVQgQjI7CkBAIC01NTgsOSArNTUzLDYgQEAKICAgICAgKiBDYWxjdWxhdGluZyB0aGUgaW50ZXJtZWRpYXRlIHZhbHVlcwogICAgICAqLwogICAgIFQwID0gRnJlcXVlbmN5ICogTFZQU0FfRmxvYXRfVHdvUGlPbkZzVGFibGVbRnNdOyAvKiBUMCA9IDIgKiBQaSAqIEZjIC8gRnMgKi8KLSAgICBEID0gMzIwMDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogRmxvYXRpbmcgcG9pbnQgdmFsdWUgMS4wMDAwMDAgKDEqMTAwKjJeNSkgKi8KLSAgICAvKiBGb3JjZSBEID0gMSA6IHRoZSBmdW5jdGlvbiB3YXMgb3JpZ2luYWxseSB1c2VkIGZvciBhIHBlYWtpbmcgZmlsdGVyLgotICAgICAgIFRoZSBEIHBhcmFtZXRlciBkbyBub3QgZXhpc3QgZm9yIGEgQmFuZFBhc3MgZmlsdGVyIGNvZWZmaWNpZW50cyAqLwogCiAgICAgLyoKICAgICAgKiBDYWxjdWxhdGUgdGhlIEIyIGNvZWZmaWNpZW50CmRpZmYgLS1naXQgYS9tZWRpYS9saWJlZmZlY3RzL3ByZXByb2Nlc3NpbmcvLmNsYW5nLWZvcm1hdCBiL21lZGlhL2xpYmVmZmVjdHMvcHJlcHJvY2Vzc2luZy8uY2xhbmctZm9ybWF0CmRlbGV0ZWQgZmlsZSBtb2RlIDEyMDAwMAppbmRleCBmMWI0ZjY5Li4wMDAwMDAwCi0tLSBhL21lZGlhL2xpYmVmZmVjdHMvcHJlcHJvY2Vzc2luZy8uY2xhbmctZm9ybWF0CisrKyAvZGV2L251bGwKQEAgLTEgKzAsMCBAQAotLi4vLi4vLi4vLi4vLi4vYnVpbGQvc29vbmcvc2NyaXB0cy9zeXN0ZW0tY2xhbmctZm9ybWF0ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvbWVkaWEvbGliZWZmZWN0cy9wcmVwcm9jZXNzaW5nL3Rlc3RzL2NvcnJlbGF0aW9uLmNwcCBiL21lZGlhL2xpYmVmZmVjdHMvcHJlcHJvY2Vzc2luZy90ZXN0cy9jb3JyZWxhdGlvbi5jcHAKaW5kZXggZWI1NmZjMy4uMDg1MzY3MyAxMDA2NDQKLS0tIGEvbWVkaWEvbGliZWZmZWN0cy9wcmVwcm9jZXNzaW5nL3Rlc3RzL2NvcnJlbGF0aW9uLmNwcAorKysgYi9tZWRpYS9saWJlZmZlY3RzL3ByZXByb2Nlc3NpbmcvdGVzdHMvY29ycmVsYXRpb24uY3BwCkBAIC0zNiw3ICszNiw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgaW50MTZfdCogc2lnWSwgaW50IGxlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQxNl90IGVuYWJsZUNyb3NzQ29ycikgewogICAgIGZsb2F0IG1heENvcnJWYWwgPSAwLmYsIHByZXZDb3JyVmFsID0gMC5mOwotICAgIGludCBkZWxheSA9IDAsIHBlYWtJbmRleCA9IDAsIGZsYWcgPSAwOworICAgIGludCBwZWFrSW5kZXggPSAwLCBmbGFnID0gMDsKICAgICBpbnQgbG9vcExpbSA9ICgxID09IGVuYWJsZUNyb3NzQ29ycikgPyBsZW4gOiBrTWluTG9vcExpbWl0VmFsdWU7CiAgICAgc3RkOjp2ZWN0b3I8aW50PiBwZWFrSW5kZXhWZWN0KGtOdW1QZWFrcywgMCk7CiAgICAgc3RkOjp2ZWN0b3I8ZmxvYXQ+IHBlYWtWYWx1ZVZlY3Qoa051bVBlYWtzLCAwLmYpOwpAQCAtNDcsNyArNDcsNiBAQAogICAgICAgICB9CiAgICAgICAgIGNvcnJWYWwgLz0gbGVuIC0gaTsKICAgICAgICAgaWYgKGNvcnJWYWwgPiBtYXhDb3JyVmFsKSB7Ci0gICAgICAgICAgICBkZWxheSA9IGk7CiAgICAgICAgICAgICBtYXhDb3JyVmFsID0gY29yclZhbDsKICAgICAgICAgfQogICAgICAgICAvLyBDb3JyZWxhdGlvbiBwZWFrcyBhcmUgZXhwZWN0ZWQgdG8gYmUgb2JzZXJ2ZWQgYXQgZXF1YWwgaW50ZXJ2YWxzLiBUaGUgaW50ZXJ2YWwgbGVuZ3RoIGlzCmRpZmYgLS1naXQgYS9tZWRpYS9saWJoZWlmL0hlaWZEZWNvZGVySW1wbC5jcHAgYi9tZWRpYS9saWJoZWlmL0hlaWZEZWNvZGVySW1wbC5jcHAKaW5kZXggMjczZDkxYy4uZmNhYzU1MSAxMDA2NDQKLS0tIGEvbWVkaWEvbGliaGVpZi9IZWlmRGVjb2RlckltcGwuY3BwCisrKyBiL21lZGlhL2xpYmhlaWYvSGVpZkRlY29kZXJJbXBsLmNwcApAQCAtMTUsNiArMTUsNyBAQAogICovCiAKIC8vI2RlZmluZSBMT0dfTkRFQlVHIDAKKyNpbmNsdWRlICJpbmNsdWRlL0hlaWZEZWNvZGVyQVBJLmgiCiAjZGVmaW5lIExPR19UQUcgIkhlaWZEZWNvZGVySW1wbCIKIAogI2luY2x1ZGUgIkhlaWZEZWNvZGVySW1wbC5oIgpAQCAtNDY0LDcgKzQ2NSw3IEBACiB9CiAKIGJvb2wgSGVpZkRlY29kZXJJbXBsOjpzZXRPdXRwdXRDb2xvcihIZWlmQ29sb3JGb3JtYXQgaGVpZkNvbG9yKSB7Ci0gICAgaWYgKGhlaWZDb2xvciA9PSBtT3V0cHV0Q29sb3IpIHsKKyAgICBpZiAoaGVpZkNvbG9yID09IChIZWlmQ29sb3JGb3JtYXQpbU91dHB1dENvbG9yKSB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlibWVkaWEvQW5kcm9pZC5icCBiL21lZGlhL2xpYm1lZGlhL0FuZHJvaWQuYnAKaW5kZXggZTk4ZDdkOC4uOWMxYjU2MyAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWEvQW5kcm9pZC5icAorKysgYi9tZWRpYS9saWJtZWRpYS9BbmRyb2lkLmJwCkBAIC0zNzgsMTIgKzM3OCwxMiBAQAogICAgIF0sCiAKICAgICBzdGF0aWNfbGliczogWwotICAgICAgICAicmVzb3VyY2VtYW5hZ2VyX2FpZGxfaW50ZXJmYWNlLW5ka19wbGF0Zm9ybSIsCisgICAgICAgICJyZXNvdXJjZW1hbmFnZXJfYWlkbF9pbnRlcmZhY2UtbmRrIiwKICAgICAgICAgImZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwIiwKICAgICBdLAogCiAgICAgZXhwb3J0X3N0YXRpY19saWJfaGVhZGVyczogWwotICAgICAgICAicmVzb3VyY2VtYW5hZ2VyX2FpZGxfaW50ZXJmYWNlLW5ka19wbGF0Zm9ybSIsCisgICAgICAgICJyZXNvdXJjZW1hbmFnZXJfYWlkbF9pbnRlcmZhY2UtbmRrIiwKICAgICAgICAgImZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwIiwKICAgICBdLAogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYS9tZWRpYXBsYXllci5jcHAgYi9tZWRpYS9saWJtZWRpYS9tZWRpYXBsYXllci5jcHAKaW5kZXggMWM5YjllNC4uNTIxNWMxYiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWEvbWVkaWFwbGF5ZXIuY3BwCisrKyBiL21lZGlhL2xpYm1lZGlhL21lZGlhcGxheWVyLmNwcApAQCAtOTQ5LDYgKzk0OSw5IEBACiAgICAgICAgIG1WaWRlb1dpZHRoID0gZXh0MTsKICAgICAgICAgbVZpZGVvSGVpZ2h0ID0gZXh0MjsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBNRURJQV9TVEFSVEVEOgorICAgICAgICBBTE9HVigiUmVjZWl2ZWQgbWVkaWEgc3RhcnRlZCBtZXNzYWdlIik7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTUVESUFfTk9USUZZX1RJTUU6CiAgICAgICAgIEFMT0dWKCJSZWNlaXZlZCBub3RpZnkgdGltZSBtZXNzYWdlIik7CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlibWVkaWEveHNkL3Z0cy9PV05FUlMgYi9tZWRpYS9saWJtZWRpYS94c2QvdnRzL09XTkVSUwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YWYyZWJhCi0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlibWVkaWEveHNkL3Z0cy9PV05FUlMKQEAgLTAsMCArMSwyIEBACisjIEJ1ZyBjb21wb25lbnQ6IDE1MTg2Mgorc3VuZG9uZ2FobkBnb29nbGUuY29tCmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvQW5kcm9pZC5icCBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9BbmRyb2lkLmJwCmluZGV4IGY1NTY3OGQuLmM0MTZhNTEgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9BbmRyb2lkLmJwCisrKyBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9BbmRyb2lkLmJwCkBAIC02NSw2ICs2NSw3IEBACiAgICAgICAgICJsaWJzdGFnZWZyaWdodF9mb3VuZGF0aW9uIiwKICAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlIiwKICAgICAgICAgImxpYnV0aWxzIiwKKyAgICAgICAgInBhY2thZ2VtYW5hZ2VyX2FpZGwtY3BwIiwKICAgICBdLAogCiAgICAgaGVhZGVyX2xpYnM6IFsKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9TdGFnZWZyaWdodE1ldGFkYXRhUmV0cmlldmVyLmNwcCBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9TdGFnZWZyaWdodE1ldGFkYXRhUmV0cmlldmVyLmNwcAppbmRleCAyYWFiZDUzLi44Yzg2ZTE2IDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvU3RhZ2VmcmlnaHRNZXRhZGF0YVJldHJpZXZlci5jcHAKKysrIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL1N0YWdlZnJpZ2h0TWV0YWRhdGFSZXRyaWV2ZXIuY3BwCkBAIC0yMjUsMTAgKzIyNSwyNiBAQAogICAgICAgICAgICAgIm1lZGlhLnN0YWdlZnJpZ2h0LnRodW1ibmFpbC5wcmVmZXJfaHdfY29kZWNzIiwgZmFsc2UpOwogICAgIHVpbnQzMl90IGZsYWdzID0gcHJlZmVyaHcgPyAwIDogTWVkaWFDb2RlY0xpc3Q6OmtQcmVmZXJTb2Z0d2FyZUNvZGVjczsKICAgICBWZWN0b3I8QVN0cmluZz4gbWF0Y2hpbmdDb2RlY3M7CisgICAgc3A8QU1lc3NhZ2U+IGZvcm1hdCA9IG5ldyBBTWVzc2FnZTsKKyAgICBzdGF0dXNfdCBlcnIgPSBjb252ZXJ0TWV0YURhdGFUb01lc3NhZ2UodHJhY2tNZXRhLCAmZm9ybWF0KTsKKyAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgIGZvcm1hdCA9IE5VTEw7CisgICAgfQorCisgICAgLy8gSWYgZGVjb2RpbmcgdGh1bWJuYWlsIGNoZWNrIGRlY29kZXIgc3VwcG9ydHMgdGh1bWJuYWlsIGRpbWVuc2lvbnMgaW5zdGVhZAorICAgIGludDMyX3QgdGh1bWJIZWlnaHQsIHRodW1iV2lkdGg7CisgICAgaWYgKHRodW1ibmFpbCAmJiBmb3JtYXQgIT0gTlVMTAorICAgICAgICAgICAgJiYgdHJhY2tNZXRhLT5maW5kSW50MzIoa0tleVRodW1ibmFpbEhlaWdodCwgJnRodW1iSGVpZ2h0KQorICAgICAgICAgICAgJiYgdHJhY2tNZXRhLT5maW5kSW50MzIoa0tleVRodW1ibmFpbFdpZHRoLCAmdGh1bWJXaWR0aCkpIHsKKyAgICAgICAgZm9ybWF0LT5zZXRJbnQzMigiaGVpZ2h0IiwgdGh1bWJIZWlnaHQpOworICAgICAgICBmb3JtYXQtPnNldEludDMyKCJ3aWR0aCIsIHRodW1iV2lkdGgpOworICAgIH0KKwogICAgIE1lZGlhQ29kZWNMaXN0OjpmaW5kTWF0Y2hpbmdDb2RlY3MoCiAgICAgICAgICAgICBtaW1lLAogICAgICAgICAgICAgZmFsc2UsIC8qIGVuY29kZXIgKi8KICAgICAgICAgICAgIGZsYWdzLAorICAgICAgICAgICAgZm9ybWF0LAogICAgICAgICAgICAgJm1hdGNoaW5nQ29kZWNzKTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWF0Y2hpbmdDb2RlY3Muc2l6ZSgpOyArK2kpIHsKQEAgLTM0OCwxMSArMzY0LDE4IEBACiAgICAgYm9vbCBwcmVmZXJodyA9IHByb3BlcnR5X2dldF9ib29sKAogICAgICAgICAgICAgIm1lZGlhLnN0YWdlZnJpZ2h0LnRodW1ibmFpbC5wcmVmZXJfaHdfY29kZWNzIiwgZmFsc2UpOwogICAgIHVpbnQzMl90IGZsYWdzID0gcHJlZmVyaHcgPyAwIDogTWVkaWFDb2RlY0xpc3Q6OmtQcmVmZXJTb2Z0d2FyZUNvZGVjczsKKyAgICBzcDxBTWVzc2FnZT4gZm9ybWF0ID0gbmV3IEFNZXNzYWdlOworICAgIHN0YXR1c190IGVyciA9IGNvbnZlcnRNZXRhRGF0YVRvTWVzc2FnZSh0cmFja01ldGEsICZmb3JtYXQpOworICAgIGlmIChlcnIgIT0gT0spIHsKKyAgICAgICAgZm9ybWF0ID0gTlVMTDsKKyAgICB9CisKICAgICBWZWN0b3I8QVN0cmluZz4gbWF0Y2hpbmdDb2RlY3M7CiAgICAgTWVkaWFDb2RlY0xpc3Q6OmZpbmRNYXRjaGluZ0NvZGVjcygKICAgICAgICAgICAgIG1pbWUsCiAgICAgICAgICAgICBmYWxzZSwgLyogZW5jb2RlciAqLwogICAgICAgICAgICAgZmxhZ3MsCisgICAgICAgICAgICBmb3JtYXQsCiAgICAgICAgICAgICAmbWF0Y2hpbmdDb2RlY3MpOwogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtYXRjaGluZ0NvZGVjcy5zaXplKCk7ICsraSkgewpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL3Rlc3RzL0FuZHJvaWQuYnAgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvdGVzdHMvQW5kcm9pZC5icAppbmRleCA5ODYyNmZkLi45OTIwMmI4IDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvdGVzdHMvQW5kcm9pZC5icAorKysgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvdGVzdHMvQW5kcm9pZC5icApAQCAtMzAsNyArMzAsNyBAQAogICAgIF0sCiAKICAgICBzdGF0aWNfbGliczogWwotICAgICAgICAicmVzb3VyY2VtYW5hZ2VyX2FpZGxfaW50ZXJmYWNlLW5ka19wbGF0Zm9ybSIsCisgICAgICAgICJyZXNvdXJjZW1hbmFnZXJfYWlkbF9pbnRlcmZhY2UtbmRrIiwKICAgICBdLAogCiAgICAgaW5jbHVkZV9kaXJzOiBbCmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYXRyYW5zY29kaW5nL0FuZHJvaWQuYnAgYi9tZWRpYS9saWJtZWRpYXRyYW5zY29kaW5nL0FuZHJvaWQuYnAKaW5kZXggMDQyODUwYy4uOTM3NjUwZiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWF0cmFuc2NvZGluZy9BbmRyb2lkLmJwCisrKyBiL21lZGlhL2xpYm1lZGlhdHJhbnNjb2RpbmcvQW5kcm9pZC5icApAQCAtMTA2LDggKzEwNiw4IEBACiAgICAgZXhwb3J0X2luY2x1ZGVfZGlyczogWyJpbmNsdWRlIl0sCiAKICAgICBzdGF0aWNfbGliczogWwotICAgICAgICAibWVkaWF0cmFuc2NvZGluZ19haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAotICAgICAgICAicmVzb3VyY2VvYnNlcnZlcl9haWRsX2ludGVyZmFjZS1WMS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAibWVkaWF0cmFuc2NvZGluZ19haWRsX2ludGVyZmFjZS1uZGsiLAorICAgICAgICAicmVzb3VyY2VvYnNlcnZlcl9haWRsX2ludGVyZmFjZS1WMS1uZGsiLAogICAgICAgICAibGlic3RhdHNsb2dfbWVkaWEiLAogICAgIF0sCiAKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhdHJhbnNjb2RpbmcvdGVzdHMvQW5kcm9pZC5icCBiL21lZGlhL2xpYm1lZGlhdHJhbnNjb2RpbmcvdGVzdHMvQW5kcm9pZC5icAppbmRleCA2MDM2MTFhLi43YTY5ODBmIDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXRyYW5zY29kaW5nL3Rlc3RzL0FuZHJvaWQuYnAKKysrIGIvbWVkaWEvbGlibWVkaWF0cmFuc2NvZGluZy90ZXN0cy9BbmRyb2lkLmJwCkBAIC0zMSw3ICszMSw3IEBACiAgICAgXSwKIAogICAgIHN0YXRpY19saWJzOiBbCi0gICAgICAgICJtZWRpYXRyYW5zY29kaW5nX2FpZGxfaW50ZXJmYWNlLW5ka19wbGF0Zm9ybSIsCisgICAgICAgICJtZWRpYXRyYW5zY29kaW5nX2FpZGxfaW50ZXJmYWNlLW5kayIsCiAgICAgICAgICJsaWJtZWRpYXRyYW5zY29kaW5nIiwKICAgICBdLAogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9BQ29kZWMuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvQUNvZGVjLmNwcAppbmRleCAxZTY0NTM4Li5hNGZiYmJjIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9BQ29kZWMuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0FDb2RlYy5jcHAKQEAgLTMzMDQsMTAgKzMzMDQsMTIgQEAKICAgICBpZiAoZXJyICE9IE9LKSB7CiAgICAgICAgIEFMT0dFKCJuYXRpdmVfd2luZG93X3NldF9zaWRlYmFuZF9zdHJlYW0oJXApIGZhaWxlZCEgKGVyciAlZCkuIiwKICAgICAgICAgICAgICAgICBzaWRlYmFuZEhhbmRsZSwgZXJyKTsKLSAgICAgICAgcmV0dXJuIGVycjsKICAgICB9CiAKLSAgICByZXR1cm4gT0s7CisgICAgbmF0aXZlX2hhbmRsZV9jbG9zZShzaWRlYmFuZEhhbmRsZSk7CisgICAgbmF0aXZlX2hhbmRsZV9kZWxldGUoc2lkZWJhbmRIYW5kbGUpOworCisgICAgcmV0dXJuIGVycjsKIH0KIAogc3RhdHVzX3QgQUNvZGVjOjpzZXRWaWRlb1BvcnRGb3JtYXRUeXBlKApAQCAtNTQzMSw2ICs1NDMzLDcgQEAKICAgICAgICAgICAgICAgICAgICAgbm90aWZ5LT5zZXRJbnQzMigiY2hhbm5lbC1jb3VudCIsIHBhcmFtcy5uQ2hhbm5lbHMpOwogICAgICAgICAgICAgICAgICAgICBub3RpZnktPnNldEludDMyKCJzYW1wbGUtcmF0ZSIsIHBhcmFtcy5uU2FtcGxlUmF0ZSk7CiAgICAgICAgICAgICAgICAgICAgIG5vdGlmeS0+c2V0SW50MzIoImJpdHJhdGUiLCBwYXJhbXMubkJpdFJhdGUpOworICAgICAgICAgICAgICAgICAgICBub3RpZnktPnNldEludDMyKCJhYWMtcHJvZmlsZSIsIHBhcmFtcy5lQUFDUHJvZmlsZSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KIApAQCAtOTIwNSw0ICs5MjA4LDE5IEBACiAgICAgcmV0dXJuIE9LOwogfQogCitzdGF0dXNfdCBBQ29kZWM6OnF1ZXJ5U3VwcG9ydGVkUGFyYW1ldGVycyhzdGQ6OnZlY3RvcjxzdGQ6OnN0cmluZz4gKm5hbWVzKSB7CisgICAgaWYgKCFuYW1lcykgeworICAgICAgICByZXR1cm4gQkFEX1ZBTFVFOworICAgIH0KKyAgICByZXR1cm4gT0s7Cit9CisKK3N0YXR1c190IEFDb2RlYzo6c3Vic2NyaWJlVG9QYXJhbWV0ZXJzKFtbbWF5YmVfdW51c2VkXV0gY29uc3Qgc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+ICZuYW1lcykgeworICAgIHJldHVybiBPSzsKK30KKworc3RhdHVzX3QgQUNvZGVjOjp1bnN1YnNjcmliZUZyb21QYXJhbWV0ZXJzKFtbbWF5YmVfdW51c2VkXV0gY29uc3Qgc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+ICZuYW1lcykgeworICAgIHJldHVybiBPSzsKK30KKwogfSAgLy8gbmFtZXNwYWNlIGFuZHJvaWQKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0FuZHJvaWQuYnAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9BbmRyb2lkLmJwCmluZGV4IGEwNTJhNzAuLmU0N2U3ZmYgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0FuZHJvaWQuYnAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvQW5kcm9pZC5icApAQCAtMTA5LDYgKzEwOSw3IEBACiAKICAgICBzcmNzOiBbCiAgICAgICAgICJDb2RlY0Jhc2UuY3BwIiwKKyAgICAgICAgIkRhdGFDb252ZXJ0ZXIuY3BwIiwKICAgICAgICAgIkZyYW1lUmVuZGVyVHJhY2tlci5jcHAiLAogICAgICAgICAiTWVkaWFDb2RlY0xpc3RXcml0ZXIuY3BwIiwKICAgICAgICAgIlNraXBDdXRCdWZmZXIuY3BwIiwKQEAgLTEyNSw2ICsxMjYsNyBAQAogICAgIF0sCiAKICAgICBzaGFyZWRfbGliczogWworICAgICAgICAibGliYXVkaW91dGlscyIsCiAgICAgICAgICJsaWJndWkiLAogICAgICAgICAibGliaGlkbGFsbG9jYXRvcnV0aWxzIiwKICAgICAgICAgImxpYmxvZyIsCkBAIC0yNjYsNyArMjY4LDYgQEAKICAgICAgICAgIkNhbGxiYWNrTWVkaWFTb3VyY2UuY3BwIiwKICAgICAgICAgIkNhbWVyYVNvdXJjZS5jcHAiLAogICAgICAgICAiQ2FtZXJhU291cmNlVGltZUxhcHNlLmNwcCIsCi0gICAgICAgICJEYXRhQ29udmVydGVyLmNwcCIsCiAgICAgICAgICJGcmFtZURlY29kZXIuY3BwIiwKICAgICAgICAgIkhldmNVdGlscy5jcHAiLAogICAgICAgICAiSW50ZXJmYWNlVXRpbHMuY3BwIiwKQEAgLTM0MCw2ICszNDEsNyBAQAogICAgICAgICAiYW5kcm9pZC5oYXJkd2FyZS5tZWRpYS5vbXhAMS4wIiwKICAgICAgICAgImZyYW1ld29yay1wZXJtaXNzaW9uLWFpZGwtY3BwIiwKICAgICAgICAgImxpYmF1ZGlvY2xpZW50X2FpZGxfY29udmVyc2lvbiIsCisgICAgICAgICJwYWNrYWdlbWFuYWdlcl9haWRsLWNwcCIsCiAgICAgXSwKIAogICAgIHN0YXRpY19saWJzOiBbCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9GcmFtZURlY29kZXIuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvRnJhbWVEZWNvZGVyLmNwcAppbmRleCBhMjQxZTI5Li4wMWNiOWIzIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9GcmFtZURlY29kZXIuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0ZyYW1lRGVjb2Rlci5jcHAKQEAgLTI2MiwxMyArMjYyLDEwIEBACiB9CiAKIGJvb2wgaXNIRFIoY29uc3Qgc3A8QU1lc3NhZ2U+ICZmb3JtYXQpIHsKLSAgICB1aW50MzJfdCBzdGFuZGFyZCwgcmFuZ2UsIHRyYW5zZmVyOworICAgIHVpbnQzMl90IHN0YW5kYXJkLCB0cmFuc2ZlcjsKICAgICBpZiAoIWZvcm1hdC0+ZmluZEludDMyKCJjb2xvci1zdGFuZGFyZCIsIChpbnQzMl90Kikmc3RhbmRhcmQpKSB7CiAgICAgICAgIHN0YW5kYXJkID0gMDsKICAgICB9Ci0gICAgaWYgKCFmb3JtYXQtPmZpbmRJbnQzMigiY29sb3ItcmFuZ2UiLCAoaW50MzJfdCopJnJhbmdlKSkgewotICAgICAgICByYW5nZSA9IDA7Ci0gICAgfQogICAgIGlmICghZm9ybWF0LT5maW5kSW50MzIoImNvbG9yLXRyYW5zZmVyIiwgKGludDMyX3QqKSZ0cmFuc2ZlcikpIHsKICAgICAgICAgdHJhbnNmZXIgPSAwOwogICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01lZGlhQ29kZWMuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlYy5jcHAKaW5kZXggZGE1ODFmYi4uNmI1YmExNiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlYy5jcHAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlYy5jcHAKQEAgLTMxODcsOCArMzE4NywxMSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgbWVkaWFtZXRyaWNzX3NldEludDMyKG1NZXRyaWNzSGFuZGxlLCBrQ29kZWNTZWN1cmUsIDApOwogICAgICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICAgICAgaWYgKG1Jc1ZpZGVvKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBhdWRpbyBjb2RlYyBpcyBjdXJyZW50bHkgaWdub3JlZC4KKyAgICAgICAgICAgICAgICAgICAgTWVkaWFDb2RlY0luZm86OkF0dHJpYnV0ZXMgYXR0ciA9IG1Db2RlY0luZm8KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA/IG1Db2RlY0luZm8tPmdldEF0dHJpYnV0ZXMoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogTWVkaWFDb2RlY0luZm86OkF0dHJpYnV0ZXMoMCk7CisgICAgICAgICAgICAgICAgICAgIGlmICghKGF0dHIgJiBNZWRpYUNvZGVjSW5mbzo6a0ZsYWdJc1NvZnR3YXJlT25seSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIHNvZnR3YXJlIGNvZGVjIGlzIGN1cnJlbnRseSBpZ25vcmVkLgogICAgICAgICAgICAgICAgICAgICAgICAgbVJlc291cmNlTWFuYWdlclByb3h5LT5hZGRSZXNvdXJjZSgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVkaWFSZXNvdXJjZTo6Q29kZWNSZXNvdXJjZShtRmxhZ3MgJiBrRmxhZ0lzU2VjdXJlLCBtSXNWaWRlbykpOwogICAgICAgICAgICAgICAgICAgICB9CkBAIC0zNTA0LDYgKzM1MDcsMjAgQEAKIAogICAgICAgICAgICAgICAgIGNhc2Uga1doYXREcmFpblRoaXNCdWZmZXI6CiAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBpZiAoKG1GbGFncyAmIGtGbGFnVXNlQmxvY2tNb2RlbCkgPT0gMCAmJiBtVHVubmVsZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNwPFJlZkJhc2U+IG9iajsKKyAgICAgICAgICAgICAgICAgICAgICAgIENIRUNLKG1zZy0+ZmluZE9iamVjdCgiYnVmZmVyIiwgJm9iaikpOworICAgICAgICAgICAgICAgICAgICAgICAgc3A8TWVkaWFDb2RlY0J1ZmZlcj4gYnVmZmVyID0gc3RhdGljX2Nhc3Q8TWVkaWFDb2RlY0J1ZmZlciAqPihvYmouZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1GbGFncyAmIGtGbGFnSXNBc3luYykgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEluIGFzeW5jaHJvbm91cyBtb2RlLCBvdXRwdXQgZm9ybWF0IGNoYW5nZSBpcyBwcm9jZXNzZWQgaW1tZWRpYXRlbHkuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGFuZGxlT3V0cHV0Rm9ybWF0Q2hhbmdlSWZOZWVkZWQoYnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9zdEFjdGl2aXR5Tm90aWZpY2F0aW9uSWZQb3NzaWJsZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgbUJ1ZmZlckNoYW5uZWwtPmRpc2NhcmRCdWZmZXIoYnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgLyogc2l6ZV90IGluZGV4ID0gKi91cGRhdGVCdWZmZXJzKGtQb3J0SW5kZXhPdXRwdXQsIG1zZyk7CiAKICAgICAgICAgICAgICAgICAgICAgaWYgKG1TdGF0ZSA9PSBGTFVTSElORwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0xpc3QuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0xpc3QuY3BwCmluZGV4IDYyNDM4MjguLjJmZmU3MjggMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01lZGlhQ29kZWNMaXN0LmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9NZWRpYUNvZGVjTGlzdC5jcHAKQEAgLTUwOSw2ICs1MDksMjkgQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBpbnQzMl90IHByb2ZpbGUgPSAtMTsKKyAgICAgICAgaWYgKGZvcm1hdC0+ZmluZEludDMyKCJwcm9maWxlIiwgJnByb2ZpbGUpKSB7CisgICAgICAgICAgICBpbnQzMl90IGxldmVsID0gLTE7CisgICAgICAgICAgICBmb3JtYXQtPmZpbmRJbnQzMigibGV2ZWwiLCAmbGV2ZWwpOworICAgICAgICAgICAgVmVjdG9yPE1lZGlhQ29kZWNJbmZvOjpQcm9maWxlTGV2ZWw+IHByb2ZpbGVMZXZlbHM7CisgICAgICAgICAgICBjYXBhYmlsaXRpZXMtPmdldFN1cHBvcnRlZFByb2ZpbGVMZXZlbHMoJnByb2ZpbGVMZXZlbHMpOworICAgICAgICAgICAgYXV0byBpdCA9IHByb2ZpbGVMZXZlbHMuYmVnaW4oKTsKKyAgICAgICAgICAgIGZvciAoOyBpdCAhPSBwcm9maWxlTGV2ZWxzLmVuZCgpOyArK2l0KSB7CisgICAgICAgICAgICAgICAgaWYgKHByb2ZpbGUgIT0gaXQtPm1Qcm9maWxlKSB7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAobGV2ZWwgPiAtMSAmJiBsZXZlbCA+IGl0LT5tTGV2ZWwpIHsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoaXQgPT0gcHJvZmlsZUxldmVscy5lbmQoKSkgeworICAgICAgICAgICAgICAgIEFMT0dWKCJDb2RlYyBkb2VzIG5vdCBzdXBwb3J0IHByb2ZpbGUgJWQgd2l0aCBsZXZlbCAlZCIsIHByb2ZpbGUsIGxldmVsKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBoYXZlbid0IGZvdW5kIGEgcmVhc29uIHRvIGRpc2NhcmQgdGhpcyBvbmUKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01lZGlhQ29kZWNTb3VyY2UuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY1NvdXJjZS5jcHAKaW5kZXggMDEwN2MzMi4uYjA3ZjhmNyAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY1NvdXJjZS5jcHAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY1NvdXJjZS5jcHAKQEAgLTk0MywxMCArOTQzLDE3IEBACiAKICAgICAgICAgICAgIHNwPE1lZGlhQ29kZWNCdWZmZXI+IG91dGJ1ZjsKICAgICAgICAgICAgIHN0YXR1c190IGVyciA9IG1FbmNvZGVyLT5nZXRPdXRwdXRCdWZmZXIoaW5kZXgsICZvdXRidWYpOwotICAgICAgICAgICAgaWYgKGVyciAhPSBPSyB8fCBvdXRidWYgPT0gTlVMTCB8fCBvdXRidWYtPmRhdGEoKSA9PSBOVUxMCi0gICAgICAgICAgICAgICAgfHwgb3V0YnVmLT5zaXplKCkgPT0gMCkgeworICAgICAgICAgICAgaWYgKGVyciAhPSBPSyB8fCBvdXRidWYgPT0gTlVMTCB8fCBvdXRidWYtPmRhdGEoKSA9PSBOVUxMKSB7CiAgICAgICAgICAgICAgICAgc2lnbmFsRU9TKCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9IGVsc2UgaWYgKG91dGJ1Zi0+c2l6ZSgpID09IDApIHsKKyAgICAgICAgICAgICAgICAvLyBaZXJvIGxlbmd0aCBDU0QgYnVmZmVycyBhcmUgbm90IHRyZWF0ZWQgYXMgYW4gZXJyb3IKKyAgICAgICAgICAgICAgICBpZiAoZmxhZ3MgJiBNZWRpYUNvZGVjOjpCVUZGRVJfRkxBR19DT0RFQ0NPTkZJRykgeworICAgICAgICAgICAgICAgICAgICBtRW5jb2Rlci0+cmVsZWFzZU91dHB1dEJ1ZmZlcihpbmRleCk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgc2lnbmFsRU9TKCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBNZWRpYUJ1ZmZlckJhc2UgKm1idWYgPSBuZXcgTWVkaWFCdWZmZXIob3V0YnVmLT5zaXplKCkpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvU2tpcEN1dEJ1ZmZlci5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9Ta2lwQ3V0QnVmZmVyLmNwcAppbmRleCBlZTkwMTZkLi5kZTkxNTMzIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9Ta2lwQ3V0QnVmZmVyLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9Ta2lwQ3V0QnVmZmVyLmNwcApAQCAtMTQ1LDcgKzE0NSwxOSBAQAogICAgIGlmIChhdmFpbGFibGUgPCBudW0pIHsKICAgICAgICAgaW50MzJfdCBuZXdjYXBhY2l0eSA9IG1DYXBhY2l0eSArIChudW0gLSBhdmFpbGFibGUpOwogICAgICAgICBjaGFyICogbmV3YnVmZmVyID0gbmV3IGNoYXJbbmV3Y2FwYWNpdHldOwotICAgICAgICBtZW1jcHkobmV3YnVmZmVyLCBtQ3V0QnVmZmVyLCBtQ2FwYWNpdHkpOworICAgICAgICBpZiAobVdyaXRlSGVhZCA8IG1SZWFkSGVhZCkgeworICAgICAgICAgICAgLy8gZGF0YSBpc24ndCBjb250aW51b3VzLCBuZWVkIHRvIG1lbWNweSB0d2ljZQorICAgICAgICAgICAgLy8gdG8gbW92ZSBwcmV2aW91cyBkYXRhIHRvIG5ldyBidWZmZXIuCisgICAgICAgICAgICBzaXplX3QgY29weUxlZnQgPSBtQ2FwYWNpdHkgLSBtUmVhZEhlYWQ7CisgICAgICAgICAgICBtZW1jcHkobmV3YnVmZmVyLCBtQ3V0QnVmZmVyICsgbVJlYWRIZWFkLCBjb3B5TGVmdCk7CisgICAgICAgICAgICBtZW1jcHkobmV3YnVmZmVyICsgY29weUxlZnQsIG1DdXRCdWZmZXIsIG1Xcml0ZUhlYWQpOworICAgICAgICAgICAgbVJlYWRIZWFkID0gMDsKKyAgICAgICAgICAgIG1Xcml0ZUhlYWQgKz0gY29weUxlZnQ7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBtZW1jcHkobmV3YnVmZmVyLCBtQ3V0QnVmZmVyICsgbVJlYWRIZWFkLCBtV3JpdGVIZWFkIC0gbVJlYWRIZWFkKTsKKyAgICAgICAgICAgIG1Xcml0ZUhlYWQgLT0gbVJlYWRIZWFkOworICAgICAgICAgICAgbVJlYWRIZWFkID0gMDsKKyAgICAgICAgfQogICAgICAgICBkZWxldGUgW10gbUN1dEJ1ZmZlcjsKICAgICAgICAgbUNhcGFjaXR5ID0gbmV3Y2FwYWNpdHk7CiAgICAgICAgIG1DdXRCdWZmZXIgPSBuZXdidWZmZXI7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9URVNUX01BUFBJTkcgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9URVNUX01BUFBJTkcKaW5kZXggN2NlMjk2OC4uMDk4N2E1YiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvVEVTVF9NQVBQSU5HCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L1RFU1RfTUFQUElORwpAQCAtMjAsMTMgKzIwLDI0IEBACiAgICAgICAgIH0sCiAgICAgICAgIHsKICAgICAgICAgICAiZXhjbHVkZS1hbm5vdGF0aW9uIjogImFuZHJvaWQucGxhdGZvcm0udGVzdC5hbm5vdGF0aW9ucy5SZXF1aXJlc0RldmljZSIKKyAgICAgICAgfQorICAgICAgXQorICAgIH0sCisgICAgeworICAgICAgIm5hbWUiOiAiQ3RzTWVkaWFBdWRpb1Rlc3RDYXNlcyIsCisgICAgICAib3B0aW9ucyI6IFsKKyAgICAgICAgeworICAgICAgICAgICJpbmNsdWRlLWFubm90YXRpb24iOiAiYW5kcm9pZC5wbGF0Zm9ybS50ZXN0LmFubm90YXRpb25zLlByZXN1Ym1pdCIKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICJleGNsdWRlLWFubm90YXRpb24iOiAiYW5kcm9pZC5wbGF0Zm9ybS50ZXN0LmFubm90YXRpb25zLlJlcXVpcmVzRGV2aWNlIgogICAgICAgICB9LAogICAgICAgICAvLyBUT0RPOiBiLzE0OTMxNDQxOQogICAgICAgICB7Ci0gICAgICAgICAgImV4Y2x1ZGUtZmlsdGVyIjogImFuZHJvaWQubWVkaWEuY3RzLkF1ZGlvUGxheWJhY2tDYXB0dXJlVGVzdCIKKyAgICAgICAgICAiZXhjbHVkZS1maWx0ZXIiOiAiYW5kcm9pZC5tZWRpYS5hdWRpby5jdHMuQXVkaW9QbGF5YmFja0NhcHR1cmVUZXN0IgogICAgICAgICB9LAogICAgICAgICB7Ci0gICAgICAgICAgImV4Y2x1ZGUtZmlsdGVyIjogImFuZHJvaWQubWVkaWEuY3RzLkF1ZGlvUmVjb3JkVGVzdCIKKyAgICAgICAgICAiZXhjbHVkZS1maWx0ZXIiOiAiYW5kcm9pZC5tZWRpYS5hdWRpby5jdHMuQXVkaW9SZWNvcmRUZXN0IgogICAgICAgICB9CiAgICAgICBdCiAgICAgfQpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvVXRpbHMuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvVXRpbHMuY3BwCmluZGV4IDRjMThmODcuLmE2ZGY1YmIgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L1V0aWxzLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9VdGlscy5jcHAKQEAgLTE3NTksMjQgKzE3NTksMzkgQEAKICAgICBpZiAobWltZS5zdGFydHNXaXRoKCJ2aWRlby8iKSB8fCBtaW1lLnN0YXJ0c1dpdGgoImltYWdlLyIpKSB7CiAgICAgICAgIGludDMyX3Qgd2lkdGg7CiAgICAgICAgIGludDMyX3QgaGVpZ2h0OwotICAgICAgICBpZiAobXNnLT5maW5kSW50MzIoIndpZHRoIiwgJndpZHRoKSAmJiBtc2ctPmZpbmRJbnQzMigiaGVpZ2h0IiwgJmhlaWdodCkpIHsKLSAgICAgICAgICAgIG1ldGEtPnNldEludDMyKGtLZXlXaWR0aCwgd2lkdGgpOwotICAgICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleUhlaWdodCwgaGVpZ2h0KTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKCFtc2ctPmZpbmRJbnQzMigid2lkdGgiLCAmd2lkdGgpIHx8ICFtc2ctPmZpbmRJbnQzMigiaGVpZ2h0IiwgJmhlaWdodCkpIHsKICAgICAgICAgICAgIEFMT0dWKCJkaWQgbm90IGZpbmQgd2lkdGggYW5kL29yIGhlaWdodCIpOwogICAgICAgICAgICAgcmV0dXJuIEJBRF9WQUxVRTsKICAgICAgICAgfQorICAgICAgICBpZiAod2lkdGggPD0gMCB8fCBoZWlnaHQgPD0gMCkgeworICAgICAgICAgICAgQUxPR0UoIkludmFsaWQgdmFsdWUgb2Ygd2lkdGg6ICVkIGFuZC9vciBoZWlnaHQ6ICVkIiwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICByZXR1cm4gQkFEX1ZBTFVFOworICAgICAgICB9CisgICAgICAgIG1ldGEtPnNldEludDMyKGtLZXlXaWR0aCwgd2lkdGgpOworICAgICAgICBtZXRhLT5zZXRJbnQzMihrS2V5SGVpZ2h0LCBoZWlnaHQpOwogCi0gICAgICAgIGludDMyX3Qgc2FyV2lkdGgsIHNhckhlaWdodDsKLSAgICAgICAgaWYgKG1zZy0+ZmluZEludDMyKCJzYXItd2lkdGgiLCAmc2FyV2lkdGgpCi0gICAgICAgICAgICAgICAgJiYgbXNnLT5maW5kSW50MzIoInNhci1oZWlnaHQiLCAmc2FySGVpZ2h0KSkgeworICAgICAgICBpbnQzMl90IHNhcldpZHRoID0gLTEsIHNhckhlaWdodCA9IC0xOworICAgICAgICBib29sIGZvdW5kV2lkdGgsIGZvdW5kSGVpZ2h0OworICAgICAgICBmb3VuZFdpZHRoID0gbXNnLT5maW5kSW50MzIoInNhci13aWR0aCIsICZzYXJXaWR0aCk7CisgICAgICAgIGZvdW5kSGVpZ2h0ID0gbXNnLT5maW5kSW50MzIoInNhci1oZWlnaHQiLCAmc2FySGVpZ2h0KTsKKyAgICAgICAgaWYgKGZvdW5kV2lkdGggfHwgZm91bmRIZWlnaHQpIHsKKyAgICAgICAgICAgIGlmIChzYXJXaWR0aCA8PSAwIHx8IHNhckhlaWdodCA8PSAwKSB7CisgICAgICAgICAgICAgICAgQUxPR0UoIkludmFsaWQgdmFsdWUgb2Ygc2FyV2lkdGg6ICVkIGFuZC9vciBzYXJIZWlnaHQ6ICVkIiwgc2FyV2lkdGgsIHNhckhlaWdodCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIEJBRF9WQUxVRTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIG1ldGEtPnNldEludDMyKGtLZXlTQVJXaWR0aCwgc2FyV2lkdGgpOwogICAgICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleVNBUkhlaWdodCwgc2FySGVpZ2h0KTsKICAgICAgICAgfQogCi0gICAgICAgIGludDMyX3QgZGlzcGxheVdpZHRoLCBkaXNwbGF5SGVpZ2h0OwotICAgICAgICBpZiAobXNnLT5maW5kSW50MzIoImRpc3BsYXktd2lkdGgiLCAmZGlzcGxheVdpZHRoKQotICAgICAgICAgICAgICAgICYmIG1zZy0+ZmluZEludDMyKCJkaXNwbGF5LWhlaWdodCIsICZkaXNwbGF5SGVpZ2h0KSkgeworICAgICAgICBpbnQzMl90IGRpc3BsYXlXaWR0aCA9IC0xLCBkaXNwbGF5SGVpZ2h0ID0gLTE7CisgICAgICAgIGZvdW5kV2lkdGggPSBtc2ctPmZpbmRJbnQzMigiZGlzcGxheS13aWR0aCIsICZkaXNwbGF5V2lkdGgpOworICAgICAgICBmb3VuZEhlaWdodCA9IG1zZy0+ZmluZEludDMyKCJkaXNwbGF5LWhlaWdodCIsICZkaXNwbGF5SGVpZ2h0KTsKKyAgICAgICAgaWYgKGZvdW5kV2lkdGggfHwgZm91bmRIZWlnaHQpIHsKKyAgICAgICAgICAgIGlmIChkaXNwbGF5V2lkdGggPD0gMCB8fCBkaXNwbGF5SGVpZ2h0IDw9IDApIHsKKyAgICAgICAgICAgICAgICBBTE9HRSgiSW52YWxpZCB2YWx1ZSBvZiBkaXNwbGF5V2lkdGg6ICVkIGFuZC9vciBkaXNwbGF5SGVpZ2h0OiAlZCIsCisgICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5V2lkdGgsIGRpc3BsYXlIZWlnaHQpOworICAgICAgICAgICAgICAgIHJldHVybiBCQURfVkFMVUU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBtZXRhLT5zZXRJbnQzMihrS2V5RGlzcGxheVdpZHRoLCBkaXNwbGF5V2lkdGgpOwogICAgICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleURpc3BsYXlIZWlnaHQsIGRpc3BsYXlIZWlnaHQpOwogICAgICAgICB9CkBAIC0xNzg2LDE3ICsxODAxLDI5IEBACiAgICAgICAgICAgICBpZiAobXNnLT5maW5kSW50MzIoImlzLWRlZmF1bHQiLCAmaXNQcmltYXJ5KSAmJiBpc1ByaW1hcnkpIHsKICAgICAgICAgICAgICAgICBtZXRhLT5zZXRJbnQzMihrS2V5VHJhY2tJc0RlZmF1bHQsIDEpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaW50MzJfdCB0aWxlV2lkdGgsIHRpbGVIZWlnaHQsIGdyaWRSb3dzLCBncmlkQ29sczsKLSAgICAgICAgICAgIGlmIChtc2ctPmZpbmRJbnQzMigidGlsZS13aWR0aCIsICZ0aWxlV2lkdGgpKSB7CisgICAgICAgICAgICBpbnQzMl90IHRpbGVXaWR0aCA9IC0xLCB0aWxlSGVpZ2h0ID0gLTE7CisgICAgICAgICAgICBmb3VuZFdpZHRoID0gbXNnLT5maW5kSW50MzIoInRpbGUtd2lkdGgiLCAmdGlsZVdpZHRoKTsKKyAgICAgICAgICAgIGZvdW5kSGVpZ2h0ID0gbXNnLT5maW5kSW50MzIoInRpbGUtaGVpZ2h0IiwgJnRpbGVIZWlnaHQpOworICAgICAgICAgICAgaWYgKGZvdW5kV2lkdGggfHwgZm91bmRIZWlnaHQpIHsKKyAgICAgICAgICAgICAgICBpZiAodGlsZVdpZHRoIDw9IDAgfHwgdGlsZUhlaWdodCA8PSAwKSB7CisgICAgICAgICAgICAgICAgICAgIEFMT0dFKCJJbnZhbGlkIHZhbHVlIG9mIHRpbGVXaWR0aDogJWQgYW5kL29yIHRpbGVIZWlnaHQ6ICVkIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aWxlV2lkdGgsIHRpbGVIZWlnaHQpOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gQkFEX1ZBTFVFOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBtZXRhLT5zZXRJbnQzMihrS2V5VGlsZVdpZHRoLCB0aWxlV2lkdGgpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKG1zZy0+ZmluZEludDMyKCJ0aWxlLWhlaWdodCIsICZ0aWxlSGVpZ2h0KSkgewogICAgICAgICAgICAgICAgIG1ldGEtPnNldEludDMyKGtLZXlUaWxlSGVpZ2h0LCB0aWxlSGVpZ2h0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChtc2ctPmZpbmRJbnQzMigiZ3JpZC1yb3dzIiwgJmdyaWRSb3dzKSkgeworICAgICAgICAgICAgaW50MzJfdCBncmlkUm93cyA9IC0xLCBncmlkQ29scyA9IC0xOworICAgICAgICAgICAgYm9vbCBmb3VuZFJvd3MsIGZvdW5kQ29sczsKKyAgICAgICAgICAgIGZvdW5kUm93cyA9IG1zZy0+ZmluZEludDMyKCJncmlkLXJvd3MiLCAmZ3JpZFJvd3MpOworICAgICAgICAgICAgZm91bmRDb2xzID0gbXNnLT5maW5kSW50MzIoImdyaWQtY29scyIsICZncmlkQ29scyk7CisgICAgICAgICAgICBpZiAoZm91bmRSb3dzIHx8IGZvdW5kQ29scykgeworICAgICAgICAgICAgICAgIGlmIChncmlkUm93cyA8PSAwIHx8IGdyaWRDb2xzIDw9IDApIHsKKyAgICAgICAgICAgICAgICAgICAgQUxPR0UoIkludmFsaWQgdmFsdWUgb2YgZ3JpZFJvd3M6ICVkIGFuZC9vciBncmlkQ29sczogJWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdyaWRSb3dzLCBncmlkQ29scyk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBCQURfVkFMVUU7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIG1ldGEtPnNldEludDMyKGtLZXlHcmlkUm93cywgZ3JpZFJvd3MpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKG1zZy0+ZmluZEludDMyKCJncmlkLWNvbHMiLCAmZ3JpZENvbHMpKSB7CiAgICAgICAgICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleUdyaWRDb2xzLCBncmlkQ29scyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE4MTIsNiArMTgzOSwxNCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAmY3JvcFRvcCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNyb3BSaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNyb3BCb3R0b20pKSB7CisgICAgICAgICAgICBpZiAoY3JvcExlZnQgPCAwIHx8IGNyb3BMZWZ0ID4gY3JvcFJpZ2h0IHx8IGNyb3BSaWdodCA+PSB3aWR0aCkgeworICAgICAgICAgICAgICAgIEFMT0dFKCJJbnZhbGlkIHZhbHVlIG9mIGNyb3BMZWZ0OiAlZCBhbmQvb3IgY3JvcFJpZ2h0OiAlZCIsIGNyb3BMZWZ0LCBjcm9wUmlnaHQpOworICAgICAgICAgICAgICAgIHJldHVybiBCQURfVkFMVUU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoY3JvcFRvcCA8IDAgfHwgY3JvcFRvcCA+IGNyb3BCb3R0b20gfHwgY3JvcEJvdHRvbSA+PSBoZWlnaHQpIHsKKyAgICAgICAgICAgICAgICBBTE9HRSgiSW52YWxpZCB2YWx1ZSBvZiBjcm9wVG9wOiAlZCBhbmQvb3IgY3JvcEJvdHRvbTogJWQiLCBjcm9wVG9wLCBjcm9wQm90dG9tKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gQkFEX1ZBTFVFOworICAgICAgICAgICAgfQogICAgICAgICAgICAgbWV0YS0+c2V0UmVjdChrS2V5Q3JvcFJlY3QsIGNyb3BMZWZ0LCBjcm9wVG9wLCBjcm9wUmlnaHQsIGNyb3BCb3R0b20pOwogICAgICAgICB9CiAKQEAgLTE4NTUsOSArMTg5MCwxNiBAQAogICAgICAgICAgICAgQUxPR1YoImRpZCBub3QgZmluZCBjaGFubmVsLWNvdW50IGFuZC9vciBzYW1wbGUtcmF0ZSIpOwogICAgICAgICAgICAgcmV0dXJuIEJBRF9WQUxVRTsKICAgICAgICAgfQorICAgICAgICAvLyBjaGFubmVsIGNvdW50IGNhbiBiZSB6ZXJvIGluIHNvbWUgY2FzZXMgbGlrZSBtcGVnIGgKKyAgICAgICAgaWYgKHNhbXBsZVJhdGUgPD0gMCB8fCBudW1DaGFubmVscyA8IDApIHsKKyAgICAgICAgICAgIEFMT0dFKCJJbnZhbGlkIHZhbHVlIG9mIGNoYW5uZWwtY291bnQ6ICVkIGFuZC9vciBzYW1wbGUtcmF0ZTogJWQiLAorICAgICAgICAgICAgICAgICAgIG51bUNoYW5uZWxzLCBzYW1wbGVSYXRlKTsKKyAgICAgICAgICAgIHJldHVybiBCQURfVkFMVUU7CisgICAgICAgIH0KICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleUNoYW5uZWxDb3VudCwgbnVtQ2hhbm5lbHMpOwogICAgICAgICBtZXRhLT5zZXRJbnQzMihrS2V5U2FtcGxlUmF0ZSwgc2FtcGxlUmF0ZSk7CiAgICAgICAgIGludDMyX3QgYml0c1BlclNhbXBsZTsKKyAgICAgICAgLy8gVE9ETzooYi8yMDQ0MzA5NTIpIGFkZCBhcHByb3ByaWF0ZSBib3VuZCBjaGVjayBmb3IgYml0c1BlclNhbXBsZQogICAgICAgICBpZiAobXNnLT5maW5kSW50MzIoImJpdHMtcGVyLXNhbXBsZSIsICZiaXRzUGVyU2FtcGxlKSkgewogICAgICAgICAgICAgbWV0YS0+c2V0SW50MzIoa0tleUJpdHNQZXJTYW1wbGUsIGJpdHNQZXJTYW1wbGUpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9BbmRyb2lkLmJwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvQW5kcm9pZC5icAppbmRleCAwYjBhY2JmLi43YWNmNzM1IDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9BbmRyb2lkLmJwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL0FuZHJvaWQuYnAKQEAgLTI5LDcgKzI5LDYgQEAKICAgICBdLAogCiAgICAgaW5jbHVkZV9kaXJzOiBbCi0gICAgICAgICJmcmFtZXdvcmtzL2F2L21lZGlhL2xpYnN0YWdlZnJpZ2h0IiwKICAgICAgICAgImZyYW1ld29ya3MvbmF0aXZlL2luY2x1ZGUvbWVkaWEvb3Blbm1heCIsCiAgICAgXSwKIApAQCAtNjUsNiArNjQsOCBAQAogCiAgICAgaGVhZGVyX2xpYnM6IFsKICAgICAgICAgImxpYmJhc2VfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9oZWFkZXJzIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlX2hlYWRlcnMiLAogICAgIF0sCiAKICAgICBzdGF0aWNfbGliczogWwpAQCAtNzQsMyArNzUsOCBAQAogICAgIF0sCiAKIH0KKworY2NfbGlicmFyeV9oZWFkZXJzIHsKKyAgICBuYW1lOiAibGlic3RhZ2VmcmlnaHRfaHR0cGxpdmVfaGVhZGVycyIsCisgICAgZXhwb3J0X2luY2x1ZGVfZGlyczogWyIuIl0sCit9CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9MaXZlU2Vzc2lvbi5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9MaXZlU2Vzc2lvbi5jcHAKaW5kZXggM2JhZDAxNS4uMGQ3Y2FkZCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvTGl2ZVNlc3Npb24uY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL0xpdmVTZXNzaW9uLmNwcApAQCAtMjMsNyArMjMsNyBAQAogI2luY2x1ZGUgIk0zVVBhcnNlci5oIgogI2luY2x1ZGUgIlBsYXlsaXN0RmV0Y2hlci5oIgogCi0jaW5jbHVkZSAibXBlZzJ0cy9Bbm90aGVyUGFja2V0U291cmNlLmgiCisjaW5jbHVkZSA8QW5vdGhlclBhY2tldFNvdXJjZS5oPgogCiAjaW5jbHVkZSA8Y3V0aWxzL3Byb3BlcnRpZXMuaD4KICNpbmNsdWRlIDxtZWRpYS9NZWRpYUhUVFBTZXJ2aWNlLmg+CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9MaXZlU2Vzc2lvbi5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvTGl2ZVNlc3Npb24uaAppbmRleCA3YTZkNDg3Li5jZWVhNDFkIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9MaXZlU2Vzc2lvbi5oCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL0xpdmVTZXNzaW9uLmgKQEAgLTI0LDcgKzI0LDcgQEAKIAogI2luY2x1ZGUgPHV0aWxzL1N0cmluZzguaD4KIAotI2luY2x1ZGUgIm1wZWcydHMvQVRTUGFyc2VyLmgiCisjaW5jbHVkZSA8QVRTUGFyc2VyLmg+CiAKIG5hbWVzcGFjZSBhbmRyb2lkIHsKIApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvUGxheWxpc3RGZXRjaGVyLmNwcCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL1BsYXlsaXN0RmV0Y2hlci5jcHAKaW5kZXggYjIzYWE4YS4uOTA3YjMyNiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvUGxheWxpc3RGZXRjaGVyLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9QbGF5bGlzdEZldGNoZXIuY3BwCkBAIC0yNCw5ICsyNCw5IEBACiAjaW5jbHVkZSAiSFRUUERvd25sb2FkZXIuaCIKICNpbmNsdWRlICJMaXZlU2Vzc2lvbi5oIgogI2luY2x1ZGUgIk0zVVBhcnNlci5oIgotI2luY2x1ZGUgImluY2x1ZGUvSUQzLmgiCi0jaW5jbHVkZSAibXBlZzJ0cy9Bbm90aGVyUGFja2V0U291cmNlLmgiCi0jaW5jbHVkZSAibXBlZzJ0cy9IbHNTYW1wbGVEZWNyeXB0b3IuaCIKKyNpbmNsdWRlIDxJRDMuaD4KKyNpbmNsdWRlIDxBbm90aGVyUGFja2V0U291cmNlLmg+CisjaW5jbHVkZSA8SGxzU2FtcGxlRGVjcnlwdG9yLmg+CiAKICNpbmNsdWRlIDxkYXRhc291cmNlL0RhdGFVUklTb3VyY2UuaD4KICNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9mb3VuZGF0aW9uL0FCaXRSZWFkZXIuaD4KZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL1BsYXlsaXN0RmV0Y2hlci5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvUGxheWxpc3RGZXRjaGVyLmgKaW5kZXggNWQzZjljMS4uMmUyODE2NCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvUGxheWxpc3RGZXRjaGVyLmgKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvUGxheWxpc3RGZXRjaGVyLmgKQEAgLTIxLDcgKzIxLDcgQEAKICNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9mb3VuZGF0aW9uL0FIYW5kbGVyLmg+CiAjaW5jbHVkZSA8b3BlbnNzbC9hZXMuaD4KIAotI2luY2x1ZGUgIm1wZWcydHMvQVRTUGFyc2VyLmgiCisjaW5jbHVkZSA8QVRTUGFyc2VyLmg+CiAjaW5jbHVkZSAiTGl2ZVNlc3Npb24uaCIKIAogbmFtZXNwYWNlIGFuZHJvaWQgewpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL0FuZHJvaWQuYnAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvQW5kcm9pZC5icApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xNDA5N2IwCi0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL0FuZHJvaWQuYnAKQEAgLTAsMCArMSw2NiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisgKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisgKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQ6CisgKgorICogaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisgKgorICogVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorICogZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKyAqIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorICogU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorICogbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisgKi8KKworcGFja2FnZSB7CisgICAgLy8gU2VlOiBodHRwOi8vZ28vYW5kcm9pZC1saWNlbnNlLWZhcQorICAgIC8vIEEgbGFyZ2Utc2NhbGUtY2hhbmdlIGFkZGVkICdkZWZhdWx0X2FwcGxpY2FibGVfbGljZW5zZXMnIHRvIGltcG9ydAorICAgIC8vIGFsbCBvZiB0aGUgJ2xpY2Vuc2Vfa2luZHMnIGZyb20gImZyYW1ld29ya3NfYXZfbWVkaWFfbGlic3RhZ2VmcmlnaHRfaHR0cGxpdmVfbGljZW5zZSIKKyAgICAvLyB0byBnZXQgdGhlIGJlbG93IGxpY2Vuc2Uga2luZHM6CisgICAgLy8gICBTUERYLWxpY2Vuc2UtaWRlbnRpZmllci1BcGFjaGUtMi4wCisgICAgZGVmYXVsdF9hcHBsaWNhYmxlX2xpY2Vuc2VzOiBbCisgICAgICAgICJmcmFtZXdvcmtzX2F2X21lZGlhX2xpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlX2xpY2Vuc2UiLAorICAgIF0sCit9CisKK2NjX2Z1enogeworICAgIG5hbWU6ICJodHRwbGl2ZV9mdXp6ZXIiLAorICAgIHNyY3M6IFsKKyAgICAgICAgImh0dHBsaXZlX2Z1enplci5jcHAiLAorICAgIF0sCisgICAgc3RhdGljX2xpYnM6IFsKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X2lkMyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9tZXRhZGF0YXV0aWxzIiwKKyAgICAgICAgImxpYnN0YWdlZnJpZ2h0X21wZWcyc3VwcG9ydCIsCisgICAgICAgICJsaWJsb2ciLAorICAgICAgICAibGliY3V0aWxzIiwKKyAgICAgICAgImxpYmRhdGFzb3VyY2UiLAorICAgICAgICAibGlibWVkaWEiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHQiLAorICAgICAgICAibGlidXRpbHMiLAorICAgIF0sCisgICAgaGVhZGVyX2xpYnM6IFsKKyAgICAgICAgImxpYmJhc2VfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9mb3VuZGF0aW9uX2hlYWRlcnMiLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfaGVhZGVycyIsCisgICAgICAgICJsaWJzdGFnZWZyaWdodF9odHRwbGl2ZV9oZWFkZXJzIiwKKyAgICBdLAorICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJjcnlwdG8iLAorICAgICAgICAibGlic3RhZ2VmcmlnaHRfZm91bmRhdGlvbiIsCisgICAgICAgICJsaWJoaWRsYmFzZSIsCisgICAgICAgICJsaWJoaWRsbWVtb3J5IiwKKyAgICAgICAgImFuZHJvaWQuaGlkbC5hbGxvY2F0b3JAMS4wIiwKKyAgICBdLAorICAgIGNvcnB1czogWyJjb3JwdXMvKiJdLAorICAgIGRpY3Rpb25hcnk6ICJodHRwbGl2ZV9mdXp6ZXIuZGljdCIsCisgICAgZnV6el9jb25maWc6IHsKKyAgICAgICAgY2M6IFsKKyAgICAgICAgICAgICJhbmRyb2lkLW1lZGlhLWZ1enppbmctcmVwb3J0c0Bnb29nbGUuY29tIiwKKyAgICAgICAgXSwKKyAgICAgICAgY29tcG9uZW50aWQ6IDE1NTI3NiwKKyAgICB9LAorfQpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL1JFQURNRS5tZCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9SRUFETUUubWQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uM2E2NGVhNAotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9SRUFETUUubWQKQEAgLTAsMCArMSw1NiBAQAorIyBGdXp6ZXIgZm9yIGxpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlCisKKyMjIFBsdWdpbiBEZXNpZ24gQ29uc2lkZXJhdGlvbnMKK1RoZSBmdXp6ZXIgcGx1Z2luIGZvciBsaWJzdGFnZWZyaWdodF9odHRwbGl2ZSBpcyBkZXNpZ25lZCBiYXNlZCBvbiB0aGUgdW5kZXJzdGFuZGluZyBvZiB0aGUgbGlicmFyeSBhbmQgdHJpZXMgdG8gYWNoaWV2ZSB0aGUgZm9sbG93aW5nOgorCisjIyMjIyBNYXhpbWl6ZSBjb2RlIGNvdmVyYWdlCitUaGUgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXJzIGFyZSBub3QgaGFyZGNvZGVkLCBidXQgaW5zdGVhZCBzZWxlY3RlZCBiYXNlZCBvbgoraW5jb21pbmcgZGF0YS5BbHNvLCBzZXZlcmFsIC5tM3U4IGZpbGVzIGFyZSBoYW5kLWNyYWZ0ZWQgYW5kIGFkZGVkIHRvIHRoZSBjb3JwdXMgZGlyZWN0b3J5IHRvIGluY3JlYXNlIHRoZSBjb2RlIGNvdmVyYWdlLiBUaGlzIGVuc3VyZXMgbW9yZSBjb2RlIHBhdGhzIGFyZSByZWFjaGVkIGJ5IHRoZSBmdXp6ZXIuCisKK2xpYnN0YWdlZnJpZ2h0X2h0dHBsaXZlIHN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVyczoKKzEuIEZpbmFsIFJlc3VsdCAocGFyYW1ldGVyIG5hbWU6IGBmaW5hbFJlc3VsdGApCisyLiBGbGFncyAocGFyYW1ldGVyIG5hbWU6IGBmbGFnc2ApCiszLiBUaW1lIFVzIChwYXJhbWV0ZXIgbmFtZTogYHRpbWVVc2ApCis0LiBUcmFjayBJbmRleCAocGFyYW1ldGVyIG5hbWU6IGB0cmFja0luZGV4YCkKKzUuIEluZGV4IChwYXJhbWV0ZXIgbmFtZTogYGluZGV4YCkKKzYuIFNlbGVjdCAocGFyYW1ldGVyIG5hbWU6IGBzZWxlY3RgKQorCit8IFBhcmFtZXRlcnwgVmFsaWQgVmFsdWVzfCBDb25maWd1cmVkIFZhbHVlfAorfC0tLS0tLS0tLS0tLS0gfC0tLS0tLS0tLS0tLS18IC0tLS0tIHwKK3wgYGZpbmFsUmVzdWx0YCB8IGAtMzRgIHRvIGAtMWAgfCBWYWx1ZSBvYnRhaW5lZCBmcm9tIEZ1enplZERhdGFQcm92aWRlcnwKK3wgYGZsYWdzYCB8IGAwYCB0byBgMWAgfCBWYWx1ZSBvYnRhaW5lZCBmcm9tIEZ1enplZERhdGFQcm92aWRlcnwKK3wgYHRpbWVVc2AgfCBgMGAgdG8gYDEwMDAwMDAwYCB8IFZhbHVlIG9idGFpbmVkIGZyb20gRnV6emVkRGF0YVByb3ZpZGVyfAorfCBgdHJhY2tJbmRleGAgfCBgVUlOVDMyX01JTmAgdG8gYFVJTlQzMl9NQVhgIHwgVmFsdWUgb2J0YWluZWQgZnJvbSBGdXp6ZWREYXRhUHJvdmlkZXJ8Cit8IGBpbmRleGAgfCBgVUlOVDMyX01JTmAgdG8gYFVJTlQzMl9NQVhgIHwgVmFsdWUgb2J0YWluZWQgZnJvbSBGdXp6ZWREYXRhUHJvdmlkZXJ8Cit8IGBzZWxlY3RgIHwgYFRydWVgIHRvIGBGYWxzZWAgfCBWYWx1ZSBvYnRhaW5lZCBmcm9tIEZ1enplZERhdGFQcm92aWRlcnwKKworVGhpcyBhbHNvIGVuc3VyZXMgdGhhdCB0aGUgcGx1Z2luIGlzIGFsd2F5cyBkZXRlcm1pbmlzdGljIGZvciBhbnkgZ2l2ZW4gaW5wdXQuCisKKyMjIyMjIE1heGltaXplIHV0aWxpemF0aW9uIG9mIGlucHV0IGRhdGEKK1RoZSBwbHVnaW4gZmVlZHMgdGhlIGVudGlyZSBpbnB1dCBkYXRhIHRvIHRoZSBodHRwbGl2ZSBtb2R1bGUuCitUaGlzIGVuc3VyZXMgdGhhdCB0aGUgcGx1Z2luIHRvbGVyYXRlcyBhbnkga2luZCBvZiBpbnB1dCAoZW1wdHksIGh1Z2UsCittYWxmb3JtZWQsIGV0YykgYW5kIGRvZXNudCBgZXhpdCgpYCBvbiBhbnkgaW5wdXQgYW5kIHRoZXJlYnkgaW5jcmVhc2luZyB0aGUKK2NoYW5jZSBvZiBpZGVudGlmeWluZyB2dWxuZXJhYmlsaXRpZXMuCisKKyMjIEJ1aWxkCisKK1RoaXMgZGVzY3JpYmVzIHN0ZXBzIHRvIGJ1aWxkIGh0dHBsaXZlX2Z1enplciBiaW5hcnkuCisKKyMjIyBBbmRyb2lkCisKKyMjIyMgU3RlcHMgdG8gYnVpbGQKK0J1aWxkIHRoZSBmdXp6ZXIKK2BgYAorICAkIG1tIC1qJChucHJvYykgaHR0cGxpdmVfZnV6emVyCitgYGAKKyMjIyMgU3RlcHMgdG8gcnVuCitUbyBydW4gb24gZGV2aWNlCitgYGAKKyAgJCBhZGIgcHVzaCAkQU5EUk9JRF9QUk9EVUNUX09VVC9kYXRhL2Z1enovJChUQVJHRVRfQVJDSCkvbGliIC9kYXRhL2Z1enovJChUQVJHRVRfQVJDSCkvbGliCisgICQgYWRiIHB1c2ggJEFORFJPSURfUFJPRFVDVF9PVVQvZGF0YS9mdXp6LyQoVEFSR0VUX0FSQ0gpL2h0dHBsaXZlX2Z1enplciAvZGF0YS9mdXp6LyQoVEFSR0VUX0FSQ0gpL2h0dHBsaXZlX2Z1enplcgorICAkIGFkYiBzaGVsbCAvZGF0YS9mdXp6LyR7VEFSR0VUX0FSQ0h9L2h0dHBsaXZlX2Z1enplci9odHRwbGl2ZV9mdXp6ZXIgL2RhdGEvZnV6ei8ke1RBUkdFVF9BUkNIfS9odHRwbGl2ZV9mdXp6ZXIvY29ycHVzCitgYGAKKworIyMgUmVmZXJlbmNlczoKKyAqIGh0dHA6Ly9sbHZtLm9yZy9kb2NzL0xpYkZ1enplci5odG1sCisgKiBodHRwczovL2dpdGh1Yi5jb20vZ29vZ2xlL29zcy1mdXp6CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2NyeXB0LmtleSBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvY3J5cHQua2V5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY5ZDVkN2YKLS0tIC9kZXYvbnVsbAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2NyeXB0LmtleQpAQCAtMCwwICsxLDIgQEAKK9sKK4HPjPzQNdCJX3jvSM4zCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2VuY3J5cHRlZC5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9lbmNyeXB0ZWQubTN1OApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMmIwZWFjCi0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9lbmNyeXB0ZWQubTN1OApAQCAtMCwwICsxLDEyIEBACisjRVhUTTNVCisjRVhULVgtVEFSR0VURFVSQVRJT046MTAKKyNFWFQtWC1BTExPVy1DQUNIRTpZRVMKKyNFWFQtWC1QTEFZTElTVC1UWVBFOlZPRAorI0VYVC1YLVZFUlNJT046MworI0VYVC1YLU1FRElBLVNFUVVFTkNFOjEKKyNFWFQtWC1LRVk6TUVUSE9EPUFFUy0xMjgsVVJJPSIuLi8uLi9mdXp6L2FybTY0L2h0dHBsaXZlX2Z1enplci9jb3JwdXMvY3J5cHQua2V5IgorI0VYVElORjoxMC4wMDAsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTEudHMKKyNFWFRJTkY6NS4wOTIsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTEudHMKKyNFWFQtWC1FTkRMSVNUCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2hscy5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9obHMubTN1OApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45MzM4ZTA0Ci0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9obHMubTN1OApAQCAtMCwwICsxLDggQEAKKyNFWFRNM1UKKyNFWFQtWC1UQVJHRVREVVJBVElPTjoxMAorI0VYVC1YLU1FRElBLVNFUVVFTkNFOjAKKyNFWFRJTkY6MTAsIG5vIGRlc2MKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMS50cworI0VYVElORjoxMCwgbm8gZGVzYworaHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UyLnRzCisjRVhULVgtRU5ETElTVApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDEubTN1OCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXgxLm0zdTgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTFlZmY1OAotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXgxLm0zdTgKQEAgLTAsMCArMSwxNCBAQAorI0VYVE0zVQorI0VYVC1YLVZFUlNJT046NAorI0VYVC1YLVRBUkdFVERVUkFUSU9OOjUKKyNFWFQtWC1LRVk6TUVUSE9EPU5PTkUKKyNFWFQtWC1ESVNDT05USU5VSVRZLVNFUVVFTkNFOjAKKyNFWFQtWC1QTEFZTElTVC1UWVBFOlZPRAorI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UwLnRzCisjRVhULVgtRElTQ09OVElOVUlUWQorI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UxLnRzCisjRVhUSU5GOjUsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTIudHMKKyNFWFQtWC1FTkRMSVNUCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4Mi5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDIubTN1OApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zN2EwMTg5Ci0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDIubTN1OApAQCAtMCwwICsxLDYgQEAKKyNFWFRNM1UKKyNFWFQtWC1JTkRFUEVOREVOVC1TRUdNRU5UUworI0VYVC1YLVNUUkVBTS1JTkY6Q0xPU0VELUNBUFRJT05TPU5PTkUsQkFORFdJRFRIPTE2NTM0MCxSRVNPTFVUSU9OPTI1NngxNDQsQ09ERUNTPSJtcDRhLjQwLjUsYXZjMS40MmMwMGIiCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL3Byb2dfaW5kZXgubTN1OAorI0VYVC1YLVNUUkVBTS1JTkY6Q0xPU0VELUNBUFRJT05TPU5PTkUsQkFORFdJRFRIPTM0NDM4OCxSRVNPTFVUSU9OPTQyNngyNDAsQ09ERUNTPSJtcDRhLjQwLjUsYXZjMS40ZDQwMTUiCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL3Byb2dfaW5kZXgxLm0zdTgKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXgzLm0zdTggYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4My5tM3U4Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjFiN2Y0ODkKLS0tIC9kZXYvbnVsbAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4My5tM3U4CkBAIC0wLDAgKzEsMTMgQEAKKyNFWFRNM1UKKyNFWFQtWC1WRVJTSU9OOjQKKyNFWFQtWC1UQVJHRVREVVJBVElPTjo1CisjRVhULVgtS0VZOk1FVEhPRD1BRVMtMTI4LFVSST0iaHR0cHM6Ly9kZW1vLnVuaWZpZWQtc3RyZWFtaW5nLmNvbS92aWRlby90ZWFycy1vZi1zdGVlbC9hZXMua2V5IixJVj0wWDk5Yjc0MDA3YjYyNTRlNGJkMWM2ZTAzNjMxY2FkMTViCisjRVhULVgtUExBWUxJU1QtVFlQRTpWT0QKKyNFWFRJTkY6NSwKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMS50cworI0VYVC1YLURJU0NPTlRJTlVJVFkKKyNFWFRJTkY6NSwKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMi50cworI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UzLnRzCisjRVhULVgtRU5ETElTVApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDQubTN1OCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXg0Lm0zdTgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODliYTM3YwotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXg0Lm0zdTgKQEAgLTAsMCArMSwxNSBAQAorI0VYVE0zVQorI0VYVC1YLVZFUlNJT046NAorI0VYVC1YLVRBUkdFVERVUkFUSU9OOjUKKyNFWFQtWC1LRVk6TUVUSE9EPVNBTVBMRS1BRVMsVVJJPSJkYXRhOnRleHQvcGxhaW47Y2hhcnNldD11dGYtOCxhNGNkOTk5NWExYWE5MWUxIixJVj0wWDk5Yjc0MDA3YjYyNTRlNGJkMWM2ZTAzNjMxY2FkMTViCisjRVhULVgtRElTQ09OVElOVUlUWS1TRVFVRU5DRTowCisjRVhULVgtUExBWUxJU1QtVFlQRTpWT0QKKyNFWFQtWC1ESVNDT05USU5VSVRZCisjRVhUSU5GOjUsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTAudHMKKyNFWFRJTkY6NSwKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMS50cworI0VYVC1YLURJU0NPTlRJTlVJVFkKKyNFWFRJTkY6NSwKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMi50cworI0VYVC1YLUVORExJU1QKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXg1Lm0zdTggYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4NS5tM3U4Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIxMjBkZTQKLS0tIC9kZXYvbnVsbAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4NS5tM3U4CkBAIC0wLDAgKzEsMTQgQEAKKyNFWFRNM1UKKyNFWFQtWC1UQVJHRVREVVJBVElPTjoxMQorI0VYVC1YLUtFWTpNRVRIT0Q9Tk9ORQorI0VYVC1YLU1FRElBLVNFUVVFTkNFOjAKKyNFWFQtWC1WRVJTSU9OOjQKKyNFWFRJTkY6MTAuMCwKKyNFWFQtWC1CWVRFUkFOR0U6MTBAMAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UxLnRzCisjRVhUSU5GOjEwLjAsCisjRVhULVgtQllURVJBTkdFOjIwQDEwCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTEudHMKKyNFWFRJTkY6MTAuMCwKKyNFWFQtWC1CWVRFUkFOR0U6ODAKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMS50cwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDYubTN1OCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXg2Lm0zdTgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTg4MzY4YQotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvaW5kZXg2Lm0zdTgKQEAgLTAsMCArMSwxMiBAQAorI0VYVE0zVQorI0VYVC1YLVZFUlNJT046NAorI0VYVC1YLVRBUkdFVERVUkFUSU9OOjUKKyNFWFQtWC1LRVk6TUVUSE9EPUFFUy0xMjgsVVJJPSJkYXRhOnRleHQvcGxhaW47Y2hhcnNldD11dGYtOCxhNGNkOTk5NWExYWE5MWUxIixJVj0weDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwMzAzMDMwCisjRVhULVgtUExBWUxJU1QtVFlQRTpWT0QKKyNFWFRJTkY6NSwKK2h0dHBzOi8vbm9uLmV4aXN0ZW50c2l0ZS5jb20vdGVzdC1kb2VzbnQtZGVyZWZlcmVuY2UtdGhlc2UtcGF0aHMvZmlsZVNlcXVlbmNlMS50cworI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UyLnRzCisjRVhUSU5GOjUsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTMudHMKKyNFWFQtWC1FTkRMSVNUCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4Ny5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDcubTN1OApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iMDk5NDhlCi0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDcubTN1OApAQCAtMCwwICsxLDQ2IEBACisjRVhUTTNVCisjRVhULVgtVkVSU0lPTjo0CisjIyBDcmVhdGVkIHdpdGggVW5pZmllZCBTdHJlYW1pbmcgUGxhdGZvcm0gICh2ZXJzaW9uPTEuMTEuMy0yNDQzOCkKKyNFWFQtWC1TRVNTSU9OLUtFWTpNRVRIT0Q9QUVTLTEyOCxVUkk9Imh0dHBzOi8vZGVtby51bmlmaWVkLXN0cmVhbWluZy5jb20vdmlkZW8vdGVhcnMtb2Ytc3RlZWwvYWVzLmtleSIKKworIyBBVURJTyBncm91cHMKKyNFWFQtWC1NRURJQTpUWVBFPUFVRElPLEdST1VQLUlEPSJhdWRpby1hYWNsLTY0IixMQU5HVUFHRT0iZW4iLE5BTUU9IkVuZ2xpc2giLERFRkFVTFQ9WUVTLEFVVE9TRUxFQ1Q9WUVTLENIQU5ORUxTPSIyIgorI0VYVC1YLU1FRElBOlRZUEU9QVVESU8sR1JPVVAtSUQ9ImF1ZGlvLWFhY2wtMTI4IixMQU5HVUFHRT0iZW4iLE5BTUU9IkVuZ2xpc2giLERFRkFVTFQ9WUVTLEFVVE9TRUxFQ1Q9WUVTLENIQU5ORUxTPSIyIgorCisjIFNVQlRJVExFUyBncm91cHMKKyNFWFQtWC1NRURJQTpUWVBFPVNVQlRJVExFUyxHUk9VUC1JRD0idGV4dHN0cmVhbSIsTEFOR1VBR0U9ImVuIixOQU1FPSJFbmdsaXNoIixERUZBVUxUPVlFUyxBVVRPU0VMRUNUPVlFUyxVUkk9InRlYXJzLW9mLXN0ZWVsLWFlcy10ZXh0c3RyZWFtX2VuZz0xMDAwLm0zdTgiCisjRVhULVgtTUVESUE6VFlQRT1TVUJUSVRMRVMsR1JPVVAtSUQ9InRleHRzdHJlYW0iLExBTkdVQUdFPSJydSIsTkFNRT0iUnVzc2lhbiIsQVVUT1NFTEVDVD1ZRVMsVVJJPSJ0ZWFycy1vZi1zdGVlbC1hZXMtdGV4dHN0cmVhbV9ydXM9MTAwMC5tM3U4IgorCisjIHZhcmlhbnRzCisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9NDk0MDAwLENPREVDUz0ibXA0YS40MC4yLGF2YzEuNDJDMDBEIixSRVNPTFVUSU9OPTIyNHgxMDAsRlJBTUUtUkFURT0yNCxBVURJTz0iYXVkaW8tYWFjbC02NCIsU1VCVElUTEVTPSJ0ZXh0c3RyZWFtIixDTE9TRUQtQ0FQVElPTlM9Tk9ORQordGVhcnMtb2Ytc3RlZWwtYWVzLWF1ZGlvX2VuZz02NDAwOC12aWRlb19lbmc9NDAxMDAwLm0zdTgKKyNFWFQtWC1TVFJFQU0tSU5GOkJBTkRXSURUSD05MzMwMDAsQ09ERUNTPSJtcDRhLjQwLjIsYXZjMS40MkMwMTYiLFJFU09MVVRJT049NDQ4eDIwMCxGUkFNRS1SQVRFPTI0LEFVRElPPSJhdWRpby1hYWNsLTEyOCIsU1VCVElUTEVTPSJ0ZXh0c3RyZWFtIixDTE9TRUQtQ0FQVElPTlM9Tk9ORQordGVhcnMtb2Ytc3RlZWwtYWVzLWF1ZGlvX2VuZz0xMjgwMDItdmlkZW9fZW5nPTc1MTAwMC5tM3U4CisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTE5ODAwMCxDT0RFQ1M9Im1wNGEuNDAuMixhdmMxLjRENDAxRiIsUkVTT0xVVElPTj03ODR4MzUwLEZSQU1FLVJBVEU9MjQsQVVESU89ImF1ZGlvLWFhY2wtMTI4IixTVUJUSVRMRVM9InRleHRzdHJlYW0iLENMT1NFRC1DQVBUSU9OUz1OT05FCit0ZWFycy1vZi1zdGVlbC1hZXMtYXVkaW9fZW5nPTEyODAwMi12aWRlb19lbmc9MTAwMTAwMC5tM3U4CisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTcyODAwMCxDT0RFQ1M9Im1wNGEuNDAuMixhdmMxLjY0MDAyOCIsUkVTT0xVVElPTj0xNjgweDc1MCxGUkFNRS1SQVRFPTI0LFZJREVPLVJBTkdFPVNEUixBVURJTz0iYXVkaW8tYWFjbC0xMjgiLFNVQlRJVExFUz0idGV4dHN0cmVhbSIsQ0xPU0VELUNBUFRJT05TPU5PTkUKK3RlYXJzLW9mLXN0ZWVsLWFlcy1hdWRpb19lbmc9MTI4MDAyLXZpZGVvX2VuZz0xNTAxMDAwLm0zdTgKKyNFWFQtWC1TVFJFQU0tSU5GOkJBTkRXSURUSD0yNDY5MDAwLENPREVDUz0ibXA0YS40MC4yLGF2YzEuNjQwMDI4IixSRVNPTFVUSU9OPTE2ODB4NzUwLEZSQU1FLVJBVEU9MjQsVklERU8tUkFOR0U9U0RSLEFVRElPPSJhdWRpby1hYWNsLTEyOCIsU1VCVElUTEVTPSJ0ZXh0c3RyZWFtIixDTE9TRUQtQ0FQVElPTlM9Tk9ORQordGVhcnMtb2Ytc3RlZWwtYWVzLWF1ZGlvX2VuZz0xMjgwMDItdmlkZW9fZW5nPTIyMDAwMDAubTN1OAorCisjIHZhcmlhbnRzCisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTAyNTAwMCxDT0RFQ1M9Im1wNGEuNDAuMixodmMxLjEuNi5MMTUwLjkwIixSRVNPTFVUSU9OPTE2ODB4NzUwLEZSQU1FLVJBVEU9MjQsVklERU8tUkFOR0U9U0RSLEFVRElPPSJhdWRpby1hYWNsLTY0IixTVUJUSVRMRVM9InRleHRzdHJlYW0iLENMT1NFRC1DQVBUSU9OUz1OT05FCit0ZWFycy1vZi1zdGVlbC1hZXMtYXVkaW9fZW5nPTY0MDA4LXZpZGVvX2VuZ18xPTkwMjAwMC5tM3U4CisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTM2ODAwMCxDT0RFQ1M9Im1wNGEuNDAuMixodmMxLjEuNi5MMTUwLjkwIixSRVNPTFVUSU9OPTI1NzZ4MTE1MCxGUkFNRS1SQVRFPTI0LFZJREVPLVJBTkdFPVNEUixBVURJTz0iYXVkaW8tYWFjbC0xMjgiLFNVQlRJVExFUz0idGV4dHN0cmVhbSIsQ0xPU0VELUNBUFRJT05TPU5PTkUKK3RlYXJzLW9mLXN0ZWVsLWFlcy1hdWRpb19lbmc9MTI4MDAyLXZpZGVvX2VuZ18xPTExNjEwMDAubTN1OAorI0VYVC1YLVNUUkVBTS1JTkY6QkFORFdJRFRIPTE4MTUwMDAsQ09ERUNTPSJtcDRhLjQwLjIsaHZjMS4xLjYuTDE1MC45MCIsUkVTT0xVVElPTj0zMzYweDE1MDAsRlJBTUUtUkFURT0yNCxWSURFTy1SQU5HRT1TRFIsQVVESU89ImF1ZGlvLWFhY2wtMTI4IixTVUJUSVRMRVM9InRleHRzdHJlYW0iLENMT1NFRC1DQVBUSU9OUz1OT05FCit0ZWFycy1vZi1zdGVlbC1hZXMtYXVkaW9fZW5nPTEyODAwMi12aWRlb19lbmdfMT0xNTgzMDAwLm0zdTgKKworIyB2YXJpYW50cworI0VYVC1YLVNUUkVBTS1JTkY6QkFORFdJRFRIPTY5MDAwLENPREVDUz0ibXA0YS40MC4yIixBVURJTz0iYXVkaW8tYWFjbC02NCIsU1VCVElUTEVTPSJ0ZXh0c3RyZWFtIgordGVhcnMtb2Ytc3RlZWwtYWVzLWF1ZGlvX2VuZz02NDAwOC5tM3U4CisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTM3MDAwLENPREVDUz0ibXA0YS40MC4yIixBVURJTz0iYXVkaW8tYWFjbC0xMjgiLFNVQlRJVExFUz0idGV4dHN0cmVhbSIKK3RlYXJzLW9mLXN0ZWVsLWFlcy1hdWRpb19lbmc9MTI4MDAyLm0zdTgKKworIyBrZXlmcmFtZXMKKyNFWFQtWC1JLUZSQU1FLVNUUkVBTS1JTkY6QkFORFdJRFRIPTU0MDAwLENPREVDUz0iYXZjMS40MkMwMEQiLFJFU09MVVRJT049MjI0eDEwMCxVUkk9ImtleWZyYW1lcy90ZWFycy1vZi1zdGVlbC1hZXMtdmlkZW9fZW5nPTQwMTAwMC5tM3U4IgorI0VYVC1YLUktRlJBTUUtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTAwMDAwLENPREVDUz0iYXZjMS40MkMwMTYiLFJFU09MVVRJT049NDQ4eDIwMCxVUkk9ImtleWZyYW1lcy90ZWFycy1vZi1zdGVlbC1hZXMtdmlkZW9fZW5nPTc1MTAwMC5tM3U4IgorI0VYVC1YLUktRlJBTUUtU1RSRUFNLUlORjpCQU5EV0lEVEg9MTMzMDAwLENPREVDUz0iYXZjMS40RDQwMUYiLFJFU09MVVRJT049Nzg0eDM1MCxVUkk9ImtleWZyYW1lcy90ZWFycy1vZi1zdGVlbC1hZXMtdmlkZW9fZW5nPTEwMDEwMDAubTN1OCIKKyNFWFQtWC1JLUZSQU1FLVNUUkVBTS1JTkY6QkFORFdJRFRIPTEyMDAwMCxDT0RFQ1M9Imh2YzEuMS42LkwxNTAuOTAiLFJFU09MVVRJT049MTY4MHg3NTAsVklERU8tUkFOR0U9U0RSLFVSST0ia2V5ZnJhbWVzL3RlYXJzLW9mLXN0ZWVsLWFlcy12aWRlb19lbmdfMT05MDIwMDAubTN1OCIKKyNFWFQtWC1JLUZSQU1FLVNUUkVBTS1JTkY6QkFORFdJRFRIPTE1NDAwMCxDT0RFQ1M9Imh2YzEuMS42LkwxNTAuOTAiLFJFU09MVVRJT049MjU3NngxMTUwLFZJREVPLVJBTkdFPVNEUixVUkk9ImtleWZyYW1lcy90ZWFycy1vZi1zdGVlbC1hZXMtdmlkZW9fZW5nXzE9MTE2MTAwMC5tM3U4IgorI0VYVC1YLUktRlJBTUUtU1RSRUFNLUlORjpCQU5EV0lEVEg9MjEwMDAwLENPREVDUz0iaHZjMS4xLjYuTDE1MC45MCIsUkVTT0xVVElPTj0zMzYweDE1MDAsVklERU8tUkFOR0U9U0RSLFVSST0ia2V5ZnJhbWVzL3RlYXJzLW9mLXN0ZWVsLWFlcy12aWRlb19lbmdfMT0xNTgzMDAwLm0zdTgiCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvY29ycHVzL2luZGV4OC5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDgubTN1OApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNTNkNTg5Ci0tLSAvZGV2L251bGwKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9pbmRleDgubTN1OApAQCAtMCwwICsxLDEzIEBACisjRVhUTTNVCisjRVhULVgtVkVSU0lPTjo1CisKKyNFWFQtWC1NRURJQTpUWVBFPUFVRElPLEdST1VQLUlEPSJhdWRpbyIsTkFNRT0iRW5nbGlzaCBzdGVyZW8iLExBTkdVQUdFPSJlbiIsQVVUT1NFTEVDVD1ZRVMsVVJJPSIuLi8uLi9mdXp6L2FybTY0L2h0dHBsaXZlX2Z1enplci9pbmRleDEubTN1OCIKKworI0VYVC1YLVNUUkVBTS1JTkY6QkFORFdJRFRIPTYyODAwMCxDT0RFQ1M9ImF2YzEuNDJjMDBkLG1wNGEuNDAuMiIsUkVTT0xVVElPTj0zMjB4MTgwLEFVRElPPSJhdWRpbyIKKy4uLy4uL2Z1enovYXJtNjQvaHR0cGxpdmVfZnV6emVyL2luZGV4MS5tM3U4CisjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9OTI4MDAwLENPREVDUz0iYXZjMS40MmMwMGQsbXA0YS40MC4yIixSRVNPTFVUSU9OPTQ4MHgyNzAsQVVESU89ImF1ZGlvIgorLi4vLi4vZnV6ei9hcm02NC9odHRwbGl2ZV9mdXp6ZXIvaW5kZXgyLm0zdTgKKyNFWFQtWC1TVFJFQU0tSU5GOkJBTkRXSURUSD0xNzI4MDAwLENPREVDUz0iYXZjMS40MmMwMGQsbXA0YS40MC4yIixSRVNPTFVUSU9OPTY0MHgzNjAsQVVESU89ImF1ZGlvIgorLi4vLi4vZnV6ei9hcm02NC9odHRwbGl2ZV9mdXp6ZXIvaW5kZXgzLm0zdTgKKyNFWFQtWC1TVFJFQU0tSU5GOkJBTkRXSURUSD0yNTI4MDAwLENPREVDUz0iYXZjMS40MmMwMGQsbXA0YS40MC4yIixSRVNPTFVUSU9OPTk2MHg1NDAsQVVESU89ImF1ZGlvIgorLi4vLi4vZnV6ei9hcm02NC9odHRwbGl2ZV9mdXp6ZXIvaW5kZXgxLm0zdTgKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvcHJvZ19pbmRleC5tM3U4IGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cGxpdmUvZnV6emVyL2NvcnB1cy9wcm9nX2luZGV4Lm0zdTgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWI4ODQyMgotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9jb3JwdXMvcHJvZ19pbmRleC5tM3U4CkBAIC0wLDAgKzEsMTcgQEAKKyNFWFRNM1UKKyNFWFQtWC1NRURJQTpUWVBFPUFVRElPLEdST1VQLUlEPSJhdWRpbyIsTEFOR1VBR0U9ImVuZyIsTkFNRT0iRW5nbGlzaCIsQVVUT1NFTEVDVD1ZRVMsREVGQVVMVD1ZRVMsVVJJPSJjb3JwdXMvaW5kZXgxLm0zdTgiCisjRVhULVgtTUVESUE6VFlQRT1BVURJTyxHUk9VUC1JRD0iYXVkaW8iLExBTkdVQUdFPSJmcmUiLE5BTUU9IkZyYW7Dp2FpcyIsQVVUT1NFTEVDVD1ZRVMsREVGQVVMVD1OTyxVUkk9ImNvcnB1cy9pbmRleDEubTN1OCIKKyNFWFQtWC1NRURJQTpUWVBFPUFVRElPLEdST1VQLUlEPSJhdWRpbyIsTEFOR1VBR0U9InNwIixOQU1FPSJFc3Bhbm9sIixBVVRPU0VMRUNUPVlFUyxERUZBVUxUPU5PLFVSST0iY29ycHVzL2luZGV4MS5tM3U4IgorI0VYVC1YLVZFUlNJT046NAorI0VYVC1YLVRBUkdFVERVUkFUSU9OOjUKKyNFWFQtWC1LRVk6TUVUSE9EPU5PTkUKKyNFWFQtWC1ESVNDT05USU5VSVRZLVNFUVVFTkNFOjAKKyNFWFQtWC1QTEFZTElTVC1UWVBFOlZPRAorI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UxLnRzCisjRVhULVgtRElTQ09OVElOVUlUWQorI0VYVElORjo1LAoraHR0cHM6Ly9ub24uZXhpc3RlbnRzaXRlLmNvbS90ZXN0LWRvZXNudC1kZXJlZmVyZW5jZS10aGVzZS1wYXRocy9maWxlU2VxdWVuY2UxLnRzCisjRVhUSU5GOjUsCitodHRwczovL25vbi5leGlzdGVudHNpdGUuY29tL3Rlc3QtZG9lc250LWRlcmVmZXJlbmNlLXRoZXNlLXBhdGhzL2ZpbGVTZXF1ZW5jZTEudHMKKyNFWFQtWC1FTkRMSVNUCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvaHR0cGxpdmVfZnV6emVyLmNwcCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9odHRwbGl2ZV9mdXp6ZXIuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFhNzc3YjMKLS0tIC9kZXYvbnVsbAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvaHR0cGxpdmVfZnV6emVyLmNwcApAQCAtMCwwICsxLDI5OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisgKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisgKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyAqCisgKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorICoKKyAqIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKyAqIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKyAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorICovCisKKyNpbmNsdWRlIDxmc3RyZWFtPgorI2luY2x1ZGUgPGZ1enplci9GdXp6ZWREYXRhUHJvdmlkZXIuaD4KKyNpbmNsdWRlIDxMaXZlRGF0YVNvdXJjZS5oPgorI2luY2x1ZGUgPExpdmVTZXNzaW9uLmg+CisjaW5jbHVkZSA8bWVkaWEvTWVkaWFIVFRQQ29ubmVjdGlvbi5oPgorI2luY2x1ZGUgPG1lZGlhL01lZGlhSFRUUFNlcnZpY2UuaD4KKyNpbmNsdWRlIDxtZWRpYS9tZWRpYXBsYXllcl9jb21tb24uaD4KKyNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9mb3VuZGF0aW9uL0FCdWZmZXIuaD4KKyNpbmNsdWRlIDxtZWRpYS9zdGFnZWZyaWdodC9mb3VuZGF0aW9uL0FIYW5kbGVyLmg+CisjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9BTG9vcGVyLmg+CisjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9BTG9vcGVyUm9zdGVyLmg+CisjaW5jbHVkZSA8c3RyaW5nPgorI2luY2x1ZGUgPHV0aWxzL0xvZy5oPgorCit1c2luZyBuYW1lc3BhY2Ugc3RkOwordXNpbmcgbmFtZXNwYWNlIGFuZHJvaWQ7CisKK2NvbnN0ZXhwciBjaGFyIGtGaWxlTmFtZVByZWZpeFtdID0gIi9kYXRhL2xvY2FsL3RtcC9odHRwbGl2ZS0iOworY29uc3RleHByIGNoYXIga0ZpbGVOYW1lU3VmZml4W10gPSAiLm0zdTgiOworY29uc3RleHByIGNoYXIga0ZpbGVVcmxQcmVmaXhbXSA9ICJmaWxlOi8vIjsKK2NvbnN0ZXhwciBpbnQ2NF90IGtPZmZTZXQgPSAwOworY29uc3RleHByIGludDMyX3Qga1JlYWR5TWFya01zID0gNTAwMDsKK2NvbnN0ZXhwciBpbnQzMl90IGtQcmVwYXJlTWFya01zID0gMTUwMDsKK2NvbnN0ZXhwciBpbnQzMl90IGtFcnJvck5vTWF4ID0gLTE7Citjb25zdGV4cHIgaW50MzJfdCBrRXJyb3JOb01pbiA9IC0zNDsKK2NvbnN0ZXhwciBpbnQzMl90IGtNYXhUaW1lVXMgPSAxMDAwOworY29uc3RleHByIGludDMyX3Qga1JhbmRvbVN0cmluZ0xlbmd0aCA9IDY0OworY29uc3RleHByIGludDMyX3Qga1JhbmdlTWluID0gMDsKK2NvbnN0ZXhwciBpbnQzMl90IGtSYW5nZU1heCA9IDEwMDA7CisKK2NvbnN0ZXhwciBMaXZlU2Vzc2lvbjo6U3RyZWFtVHlwZSBrVmFsaWRTdHJlYW1UeXBlW10gPSB7CisgICAgTGl2ZVNlc3Npb246OlNUUkVBTVRZUEVfQVVESU8sIExpdmVTZXNzaW9uOjpTVFJFQU1UWVBFX1ZJREVPLAorICAgIExpdmVTZXNzaW9uOjpTVFJFQU1UWVBFX1NVQlRJVExFUywgTGl2ZVNlc3Npb246OlNUUkVBTVRZUEVfTUVUQURBVEF9OworCitjb25zdGV4cHIgTWVkaWFTb3VyY2U6OlJlYWRPcHRpb25zOjpTZWVrTW9kZSBrVmFsaWRTZWVrTW9kZVtdID0geworICAgIE1lZGlhU291cmNlOjpSZWFkT3B0aW9uczo6U2Vla01vZGU6OlNFRUtfUFJFVklPVVNfU1lOQywKKyAgICBNZWRpYVNvdXJjZTo6UmVhZE9wdGlvbnM6OlNlZWtNb2RlOjpTRUVLX05FWFRfU1lOQywKKyAgICBNZWRpYVNvdXJjZTo6UmVhZE9wdGlvbnM6OlNlZWtNb2RlOjpTRUVLX0NMT1NFU1RfU1lOQywKKyAgICBNZWRpYVNvdXJjZTo6UmVhZE9wdGlvbnM6OlNlZWtNb2RlOjpTRUVLX0NMT1NFU1QsCisgICAgTWVkaWFTb3VyY2U6OlJlYWRPcHRpb25zOjpTZWVrTW9kZTo6U0VFS19GUkFNRV9JTkRFWH07CisKK2NvbnN0ZXhwciBtZWRpYV90cmFja190eXBlIGtWYWxpZE1lZGlhVHJhY2tUeXBlW10gPSB7CisgICAgTUVESUFfVFJBQ0tfVFlQRV9VTktOT1dOLCAgTUVESUFfVFJBQ0tfVFlQRV9WSURFTywKKyAgICBNRURJQV9UUkFDS19UWVBFX0FVRElPLCAgICBNRURJQV9UUkFDS19UWVBFX1RJTUVEVEVYVCwKKyAgICBNRURJQV9UUkFDS19UWVBFX1NVQlRJVExFLCBNRURJQV9UUkFDS19UWVBFX01FVEFEQVRBfTsKKworc3RydWN0IFRlc3RBSGFuZGxlciA6IHB1YmxpYyBBSGFuZGxlciB7CitwdWJsaWM6CisgIFRlc3RBSGFuZGxlcihzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gc2lnbmFsRW9zRnVuY3Rpb24pCisgICAgICA6IG1TaWduYWxFb3NGdW5jdGlvbihzaWduYWxFb3NGdW5jdGlvbikge30KKyAgdmlydHVhbCB+VGVzdEFIYW5kbGVyKCkge30KKworcHJvdGVjdGVkOgorICB2b2lkIG9uTWVzc2FnZVJlY2VpdmVkKGNvbnN0IHNwPEFNZXNzYWdlPiAmbXNnKSBvdmVycmlkZSB7CisgICAgaW50MzJfdCB3aGF0ID0gLTE7CisgICAgbXNnLT5maW5kSW50MzIoIndoYXQiLCAmd2hhdCk7CisgICAgc3dpdGNoICh3aGF0KSB7CisgICAgY2FzZSBMaXZlU2Vzc2lvbjo6a1doYXRFcnJvcjoKKyAgICBjYXNlIExpdmVTZXNzaW9uOjprV2hhdFByZXBhcmVkOgorICAgIGNhc2UgTGl2ZVNlc3Npb246OmtXaGF0UHJlcGFyYXRpb25GYWlsZWQ6IHsKKyAgICAgIG1TaWduYWxFb3NGdW5jdGlvbigpOworICAgICAgYnJlYWs7CisgICAgfQorICAgIH0KKyAgICByZXR1cm47CisgIH0KKworcHJpdmF0ZToKKyAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IG1TaWduYWxFb3NGdW5jdGlvbjsKK307CisKK3N0cnVjdCBUZXN0TWVkaWFIVFRQQ29ubmVjdGlvbiA6IHB1YmxpYyBNZWRpYUhUVFBDb25uZWN0aW9uIHsKK3B1YmxpYzoKKyAgVGVzdE1lZGlhSFRUUENvbm5lY3Rpb24oKSB7fQorICB2aXJ0dWFsIH5UZXN0TWVkaWFIVFRQQ29ubmVjdGlvbigpIHt9CisKKyAgdmlydHVhbCBib29sIGNvbm5lY3QoY29uc3QgY2hhciAqIC8qdXJpKi8sCisgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEtleWVkVmVjdG9yPFN0cmluZzgsIFN0cmluZzg+ICogLypoZWFkZXJzKi8pIHsKKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIHZpcnR1YWwgdm9pZCBkaXNjb25uZWN0KCkgeyByZXR1cm47IH0KKworICB2aXJ0dWFsIHNzaXplX3QgcmVhZEF0KG9mZjY0X3QgLypvZmZzZXQqLywgdm9pZCAqIC8qZGF0YSovLCBzaXplX3Qgc2l6ZSkgeworICAgIHJldHVybiBzaXplOworICB9CisKKyAgdmlydHVhbCBvZmY2NF90IGdldFNpemUoKSB7IHJldHVybiAwOyB9CisgIHZpcnR1YWwgc3RhdHVzX3QgZ2V0TUlNRVR5cGUoU3RyaW5nOCAqIC8qbWltZVR5cGUqLykgeyByZXR1cm4gTk9fRVJST1I7IH0KKyAgdmlydHVhbCBzdGF0dXNfdCBnZXRVcmkoU3RyaW5nOCAqIC8qdXJpKi8pIHsgcmV0dXJuIE5PX0VSUk9SOyB9CisKK3ByaXZhdGU6CisgIERJU0FMTE9XX0VWSUxfQ09OU1RSVUNUT1JTKFRlc3RNZWRpYUhUVFBDb25uZWN0aW9uKTsKK307CisKK3N0cnVjdCBUZXN0TWVkaWFIVFRQU2VydmljZSA6IHB1YmxpYyBNZWRpYUhUVFBTZXJ2aWNlIHsKK3B1YmxpYzoKKyAgVGVzdE1lZGlhSFRUUFNlcnZpY2UoKSB7fQorICB+VGVzdE1lZGlhSFRUUFNlcnZpY2UoKXt9OworCisgIHZpcnR1YWwgc3A8TWVkaWFIVFRQQ29ubmVjdGlvbj4gbWFrZUhUVFBDb25uZWN0aW9uKCkgeworICAgIG1lZGlhSFRUUENvbm5lY3Rpb24gPSBzcDxUZXN0TWVkaWFIVFRQQ29ubmVjdGlvbj46Om1ha2UoKTsKKyAgICByZXR1cm4gbWVkaWFIVFRQQ29ubmVjdGlvbjsKKyAgfQorCitwcml2YXRlOgorICBzcDxUZXN0TWVkaWFIVFRQQ29ubmVjdGlvbj4gbWVkaWFIVFRQQ29ubmVjdGlvbiA9IG51bGxwdHI7CisgIERJU0FMTE9XX0VWSUxfQ09OU1RSVUNUT1JTKFRlc3RNZWRpYUhUVFBTZXJ2aWNlKTsKK307CisKK2NsYXNzIEh0dHBMaXZlRnV6emVyIHsKK3B1YmxpYzoKKyAgdm9pZCBwcm9jZXNzKGNvbnN0IHVpbnQ4X3QgKmRhdGEsIHNpemVfdCBzaXplKTsKKyAgdm9pZCBkZUluaXRMaXZlU2Vzc2lvbigpOworICB+SHR0cExpdmVGdXp6ZXIoKSB7IGRlSW5pdExpdmVTZXNzaW9uKCk7IH0KKworcHJpdmF0ZToKKyAgdm9pZCBpbnZva2VMaXZlRGF0YVNvdXJjZSgpOworICB2b2lkIGNyZWF0ZU0zVThGaWxlKGNvbnN0IHVpbnQ4X3QgKmRhdGEsIHNpemVfdCBzaXplKTsKKyAgdm9pZCBpbml0TGl2ZURhdGFTb3VyY2UoKTsKKyAgdm9pZCBpbnZva2VMaXZlU2Vzc2lvbigpOworICB2b2lkIGluaXRMaXZlU2Vzc2lvbigpOworICB2b2lkIGludm9rZURlcXVldWVBY2Nlc3NVbml0KCk7CisgIHZvaWQgaW52b2tlQ29ubmVjdEFzeW5jKCk7CisgIHZvaWQgaW52b2tlU2Vla1RvKCk7CisgIHZvaWQgaW52b2tlR2V0Q29uZmlnKCk7CisgIHZvaWQgc2lnbmFsRW9zKCk7CisgIHN0cmluZyBnZW5lcmF0ZUZpbGVOYW1lKCk7CisgIHNwPExpdmVEYXRhU291cmNlPiBtTGl2ZURhdGFTb3VyY2UgPSBudWxscHRyOworICBzcDxMaXZlU2Vzc2lvbj4gbUxpdmVTZXNzaW9uID0gbnVsbHB0cjsKKyAgc3A8QUxvb3Blcj4gbUxpdmVMb29wZXIgPSBudWxscHRyOworICBzcDxUZXN0TWVkaWFIVFRQU2VydmljZT4gaHR0cFNlcnZpY2UgPSBudWxscHRyOworICBzcDxUZXN0QUhhbmRsZXI+IG1IYW5kbGVyID0gbnVsbHB0cjsKKyAgRnV6emVkRGF0YVByb3ZpZGVyICptRkRQID0gbnVsbHB0cjsKKyAgYm9vbCBtRW9zUmVhY2hlZCA9IGZhbHNlOworICBzdGQ6Om11dGV4IG1Eb3dubG9hZENvbXBsZXRlTXV0ZXg7CisgIHN0ZDo6Y29uZGl0aW9uX3ZhcmlhYmxlIG1Db25kaXRpb25hbFZhcmlhYmxlOworfTsKKworc3RyaW5nIEh0dHBMaXZlRnV6emVyOjpnZW5lcmF0ZUZpbGVOYW1lKCkgeworICByZXR1cm4ga0ZpbGVOYW1lUHJlZml4ICsgdG9fc3RyaW5nKGdldHBpZCgpKSArIGtGaWxlTmFtZVN1ZmZpeDsKK30KKwordm9pZCBIdHRwTGl2ZUZ1enplcjo6Y3JlYXRlTTNVOEZpbGUoY29uc3QgdWludDhfdCAqZGF0YSwgc2l6ZV90IHNpemUpIHsKKyAgb2ZzdHJlYW0gbTN1OEZpbGU7CisgIHN0cmluZyBjdXJyZW50RmlsZU5hbWUgPSBnZW5lcmF0ZUZpbGVOYW1lKCk7CisgIG0zdThGaWxlLm9wZW4oY3VycmVudEZpbGVOYW1lLCBpb3M6Om91dCB8IGlvczo6YmluYXJ5KTsKKyAgbTN1OEZpbGUud3JpdGUoKGNoYXIgKilkYXRhLCBzaXplKTsKKyAgbTN1OEZpbGUuY2xvc2UoKTsKK30KKwordm9pZCBIdHRwTGl2ZUZ1enplcjo6aW5pdExpdmVEYXRhU291cmNlKCkgeworICBtTGl2ZURhdGFTb3VyY2UgPSBzcDxMaXZlRGF0YVNvdXJjZT46Om1ha2UoKTsKK30KKwordm9pZCBIdHRwTGl2ZUZ1enplcjo6aW52b2tlTGl2ZURhdGFTb3VyY2UoKSB7CisgIGluaXRMaXZlRGF0YVNvdXJjZSgpOworICBzaXplX3Qgc2l6ZSA9IG1GRFAtPkNvbnN1bWVJbnRlZ3JhbEluUmFuZ2U8c2l6ZV90PihrUmFuZ2VNaW4sIGtSYW5nZU1heCk7CisgIHNwPEFCdWZmZXI+IGJ1ZmZlciA9IG5ldyBBQnVmZmVyKHNpemUpOworICBtTGl2ZURhdGFTb3VyY2UtPnF1ZXVlQnVmZmVyKGJ1ZmZlcik7CisgIHVpbnQ4X3QgKmRhdGEgPSBuZXcgdWludDhfdFtzaXplXTsKKyAgbUxpdmVEYXRhU291cmNlLT5yZWFkQXROb25CbG9ja2luZyhrT2ZmU2V0LCBkYXRhLCBzaXplKTsKKyAgaW50MzJfdCBmaW5hbFJlc3VsdCA9IG1GRFAtPkNvbnN1bWVJbnRlZ3JhbEluUmFuZ2Uoa0Vycm9yTm9NaW4sIGtFcnJvck5vTWF4KTsKKyAgbUxpdmVEYXRhU291cmNlLT5xdWV1ZUVPUyhmaW5hbFJlc3VsdCk7CisgIG1MaXZlRGF0YVNvdXJjZS0+cmVzZXQoKTsKKyAgbUxpdmVEYXRhU291cmNlLT5jb3VudFF1ZXVlZEJ1ZmZlcnMoKTsKKyAgbUxpdmVEYXRhU291cmNlLT5pbml0Q2hlY2soKTsKKyAgZGVsZXRlW10gZGF0YTsKK30KKwordm9pZCBIdHRwTGl2ZUZ1enplcjo6aW5pdExpdmVTZXNzaW9uKCkgeworICBBTG9vcGVyUm9zdGVyIGxvb3BlclJvc3RlcjsKKyAgbUhhbmRsZXIgPQorICAgICAgc3A8VGVzdEFIYW5kbGVyPjo6bWFrZShzdGQ6OmJpbmQoJkh0dHBMaXZlRnV6emVyOjpzaWduYWxFb3MsIHRoaXMpKTsKKyAgbUxpdmVMb29wZXIgPSBzcDxBTG9vcGVyPjo6bWFrZSgpOworICBtTGl2ZUxvb3Blci0+c2V0TmFtZSgiaHR0cCBsaXZlIik7CisgIG1MaXZlTG9vcGVyLT5zdGFydCgpOworICBzcDxBTWVzc2FnZT4gbm90aWZ5ID0gc3A8QU1lc3NhZ2U+OjptYWtlKDAsIG1IYW5kbGVyKTsKKyAgaHR0cFNlcnZpY2UgPSBuZXcgVGVzdE1lZGlhSFRUUFNlcnZpY2UoKTsKKyAgdWludDMyX3QgZmxhZ3MgPSBtRkRQLT5Db25zdW1lSW50ZWdyYWw8dWludDMyX3Q+KCk7CisgIG1MaXZlU2Vzc2lvbiA9IHNwPExpdmVTZXNzaW9uPjo6bWFrZShub3RpZnksIGZsYWdzLCBodHRwU2VydmljZSk7CisgIG1MaXZlTG9vcGVyLT5yZWdpc3RlckhhbmRsZXIobUxpdmVTZXNzaW9uKTsKKyAgbG9vcGVyUm9zdGVyLnJlZ2lzdGVySGFuZGxlcihtTGl2ZUxvb3BlciwgbUhhbmRsZXIpOworfQorCit2b2lkIEh0dHBMaXZlRnV6emVyOjppbnZva2VEZXF1ZXVlQWNjZXNzVW5pdCgpIHsKKyAgTGl2ZVNlc3Npb246OlN0cmVhbVR5cGUgc3RyZWFtID0gbUZEUC0+UGlja1ZhbHVlSW5BcnJheShrVmFsaWRTdHJlYW1UeXBlKTsKKyAgc3A8QUJ1ZmZlcj4gYnVmZmVyOworICBtTGl2ZVNlc3Npb24tPmRlcXVldWVBY2Nlc3NVbml0KHN0cmVhbSwgJmJ1ZmZlcik7Cit9CisKK3ZvaWQgSHR0cExpdmVGdXp6ZXI6Omludm9rZVNlZWtUbygpIHsKKyAgaW50NjRfdCB0aW1lVXMgPSBtRkRQLT5Db25zdW1lSW50ZWdyYWxJblJhbmdlPGludDY0X3Q+KDAsIGtNYXhUaW1lVXMpOworICBNZWRpYVNvdXJjZTo6UmVhZE9wdGlvbnM6OlNlZWtNb2RlIG1vZGUgPQorICAgICAgbUZEUC0+UGlja1ZhbHVlSW5BcnJheShrVmFsaWRTZWVrTW9kZSk7CisgIG1MaXZlU2Vzc2lvbi0+c2Vla1RvKHRpbWVVcywgbW9kZSk7Cit9CisKK3ZvaWQgSHR0cExpdmVGdXp6ZXI6Omludm9rZUdldENvbmZpZygpIHsKKyAgbUxpdmVTZXNzaW9uLT5nZXRUcmFja0NvdW50KCk7CisgIHNpemVfdCB0cmFja0luZGV4ID0gbUZEUC0+Q29uc3VtZUludGVncmFsPHNpemVfdD4oKTsKKyAgbUxpdmVTZXNzaW9uLT5nZXRUcmFja0luZm8odHJhY2tJbmRleCk7CisgIG1lZGlhX3RyYWNrX3R5cGUgdHlwZSA9IG1GRFAtPlBpY2tWYWx1ZUluQXJyYXkoa1ZhbGlkTWVkaWFUcmFja1R5cGUpOworICBtTGl2ZVNlc3Npb24tPmdldFNlbGVjdGVkVHJhY2sodHlwZSk7CisgIHNwPE1ldGFEYXRhPiBtZXRhOworICBMaXZlU2Vzc2lvbjo6U3RyZWFtVHlwZSBzdHJlYW0gPSBtRkRQLT5QaWNrVmFsdWVJbkFycmF5KGtWYWxpZFN0cmVhbVR5cGUpOworICBtTGl2ZVNlc3Npb24tPmdldFN0cmVhbUZvcm1hdE1ldGEoc3RyZWFtLCAmbWV0YSk7CisgIG1MaXZlU2Vzc2lvbi0+Z2V0S2V5Rm9yU3RyZWFtKHN0cmVhbSk7CisgIGlmIChzdHJlYW0gIT0gTGl2ZVNlc3Npb246OlNUUkVBTVRZUEVfU1VCVElUTEVTKSB7CisgICAgbUxpdmVTZXNzaW9uLT5nZXRTb3VyY2VUeXBlRm9yU3RyZWFtKHN0cmVhbSk7CisgIH0KK30KKwordm9pZCBIdHRwTGl2ZUZ1enplcjo6aW52b2tlQ29ubmVjdEFzeW5jKCkgeworICBzdHJpbmcgY3VycmVudEZpbGVOYW1lID0gZ2VuZXJhdGVGaWxlTmFtZSgpOworICBzdHJpbmcgdXJsID0ga0ZpbGVVcmxQcmVmaXggKyBjdXJyZW50RmlsZU5hbWU7CisgIHN0cmluZyBzdHJfMSA9IG1GRFAtPkNvbnN1bWVSYW5kb21MZW5ndGhTdHJpbmcoa1JhbmRvbVN0cmluZ0xlbmd0aCk7CisgIHN0cmluZyBzdHJfMiA9IG1GRFAtPkNvbnN1bWVSYW5kb21MZW5ndGhTdHJpbmcoa1JhbmRvbVN0cmluZ0xlbmd0aCk7CisKKyAgS2V5ZWRWZWN0b3I8U3RyaW5nOCwgU3RyaW5nOD4gaGVhZGVyczsKKyAgaGVhZGVycy5hZGQoU3RyaW5nOChzdHJfMS5jX3N0cigpKSwgU3RyaW5nOChzdHJfMi5jX3N0cigpKSk7CisgIG1MaXZlU2Vzc2lvbi0+Y29ubmVjdEFzeW5jKHVybC5jX3N0cigpLCAmaGVhZGVycyk7Cit9CisKK3ZvaWQgSHR0cExpdmVGdXp6ZXI6Omludm9rZUxpdmVTZXNzaW9uKCkgeworICBpbml0TGl2ZVNlc3Npb24oKTsKKyAgQnVmZmVyaW5nU2V0dGluZ3MgYnVmZmVyaW5nU2V0dGluZ3M7CisgIGJ1ZmZlcmluZ1NldHRpbmdzLm1Jbml0aWFsTWFya01zID0ga1ByZXBhcmVNYXJrTXM7CisgIGJ1ZmZlcmluZ1NldHRpbmdzLm1SZXN1bWVQbGF5YmFja01hcmtNcyA9IGtSZWFkeU1hcmtNczsKKyAgbUxpdmVTZXNzaW9uLT5zZXRCdWZmZXJpbmdTZXR0aW5ncyhidWZmZXJpbmdTZXR0aW5ncyk7CisgIGludm9rZUNvbm5lY3RBc3luYygpOworICBzdGQ6OnVuaXF1ZV9sb2NrIHdhaXRGb3JEb3dubG9hZENvbXBsZXRlKG1Eb3dubG9hZENvbXBsZXRlTXV0ZXgpOworICBtQ29uZGl0aW9uYWxWYXJpYWJsZS53YWl0KHdhaXRGb3JEb3dubG9hZENvbXBsZXRlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIFt0aGlzXSB7IHJldHVybiBtRW9zUmVhY2hlZDsgfSk7CisgIGlmIChtTGl2ZVNlc3Npb24tPmlzU2Vla2FibGUoKSkgeworICAgIGludm9rZVNlZWtUbygpOworICB9CisgIGludm9rZURlcXVldWVBY2Nlc3NVbml0KCk7CisgIHNpemVfdCBpbmRleCA9IG1GRFAtPkNvbnN1bWVJbnRlZ3JhbDxzaXplX3Q+KCk7CisgIGJvb2wgc2VsZWN0ID0gbUZEUC0+Q29uc3VtZUJvb2woKTsKKyAgbUxpdmVTZXNzaW9uLT5zZWxlY3RUcmFjayhpbmRleCwgc2VsZWN0KTsKKyAgbUxpdmVTZXNzaW9uLT5oYXNEeW5hbWljRHVyYXRpb24oKTsKKyAgaW50NjRfdCBmaXJzdFRpbWVVcyA9CisgICAgICBtRkRQLT5Db25zdW1lSW50ZWdyYWxJblJhbmdlPGludDY0X3Q+KGtSYW5nZU1pbiwga1JhbmdlTWF4KTsKKyAgaW50NjRfdCB0aW1lVXMgPSBtRkRQLT5Db25zdW1lSW50ZWdyYWxJblJhbmdlPGludDY0X3Q+KGtSYW5nZU1pbiwga1JhbmdlTWF4KTsKKyAgaW50MzJfdCBkaXNjb250aW51aXR5U2VxID0gbUZEUC0+Q29uc3VtZUludGVncmFsPGludDMyX3Q+KCk7CisgIG1MaXZlU2Vzc2lvbi0+Y2FsY3VsYXRlTWVkaWFUaW1lVXMoZmlyc3RUaW1lVXMsIHRpbWVVcywgZGlzY29udGludWl0eVNlcSk7CisgIGludm9rZUdldENvbmZpZygpOworfQorCit2b2lkIEh0dHBMaXZlRnV6emVyOjpwcm9jZXNzKGNvbnN0IHVpbnQ4X3QgKmRhdGEsIHNpemVfdCBzaXplKSB7CisgIG1GRFAgPSBuZXcgRnV6emVkRGF0YVByb3ZpZGVyKGRhdGEsIHNpemUpOworICBjcmVhdGVNM1U4RmlsZShkYXRhLCBzaXplKTsKKyAgaW52b2tlTGl2ZURhdGFTb3VyY2UoKTsKKyAgaW52b2tlTGl2ZVNlc3Npb24oKTsKKyAgZGVsZXRlIG1GRFA7Cit9CisKK3ZvaWQgSHR0cExpdmVGdXp6ZXI6OmRlSW5pdExpdmVTZXNzaW9uKCkgeworICBpZiAobUxpdmVTZXNzaW9uICE9IG51bGxwdHIpIHsKKyAgICBtTGl2ZVNlc3Npb24tPmRpc2Nvbm5lY3QoKTsKKyAgICBtTGl2ZUxvb3Blci0+dW5yZWdpc3RlckhhbmRsZXIobUxpdmVTZXNzaW9uLT5pZCgpKTsKKyAgICBtTGl2ZUxvb3Blci0+c3RvcCgpOworICB9CisgIG1MaXZlU2Vzc2lvbi5jbGVhcigpOworICBtTGl2ZUxvb3Blci5jbGVhcigpOworfQorCit2b2lkIEh0dHBMaXZlRnV6emVyOjpzaWduYWxFb3MoKSB7CisgIG1Fb3NSZWFjaGVkID0gdHJ1ZTsKKyAgeworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiB3YWl0Rm9yRG93bmxvYWRDb21wbGV0ZShtRG93bmxvYWRDb21wbGV0ZU11dGV4KTsKKyAgfQorICBtQ29uZGl0aW9uYWxWYXJpYWJsZS5ub3RpZnlfb25lKCk7CisgIHJldHVybjsKK30KKworZXh0ZXJuICJDIiBpbnQgTExWTUZ1enplclRlc3RPbmVJbnB1dChjb25zdCB1aW50OF90ICpkYXRhLCBzaXplX3Qgc2l6ZSkgeworICBIdHRwTGl2ZUZ1enplciBodHRwbGl2ZUZ1enplcjsKKyAgaHR0cGxpdmVGdXp6ZXIucHJvY2VzcyhkYXRhLCBzaXplKTsKKyAgcmV0dXJuIDA7Cit9CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvaHR0cGxpdmVfZnV6emVyLmRpY3QgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwbGl2ZS9mdXp6ZXIvaHR0cGxpdmVfZnV6emVyLmRpY3QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzAzY2M3ZQotLS0gL2Rldi9udWxsCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHBsaXZlL2Z1enplci9odHRwbGl2ZV9mdXp6ZXIuZGljdApAQCAtMCwwICsxLDE1IEBACisjbTN1OC1UYWdzCitrdzE9IiNFWFRNM1UiCitrdzI9IiNFWFQtWC1WRVJTSU9OOiIKK2t3Mz0iI0VYVC1YLVRBUkdFVERVUkFUSU9OOiIKK2t3ND0iI0VYVC1YLVBMQVlMSVNULVRZUEU6Igora3c1PSIjRVhUSU5GOiIKK2t3Nj0iI0VYVC1YLUVORExJU1QiCitrdzc9IiNFWFQtWC1NRURJQS1TRVFVRU5DRToiCitrdzg9IiNFWFQtWC1LRVk6TUVUSE9EPU5PTkUiCitrdzk9IiNFWFQtWC1ESVNDT05USU5VSVRZOiIKK2t3MTA9IiNFWFQtWC1ESVNDT05USU5VSVRZLVNFUVVFTkNFOjAiCitrdzExPSIjRVhULVgtU1RSRUFNLUlORjpCQU5EV0lEVEg9Igora3cxMj0iI0VYVC1YLVNUUkVBTS1JTkY6Q09ERUNTPSIKK2t3MTM9IiNFWFQtWC1CWVRFUkFOR0U6Igora3cxND0iI0VYVC1YLU1FRElBIgpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9BQ29kZWMuaCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvQUNvZGVjLmgKaW5kZXggYzg0Y2MxMC4uNjMyYjMyYyAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9BQ29kZWMuaAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9pbmNsdWRlL21lZGlhL3N0YWdlZnJpZ2h0L0FDb2RlYy5oCkBAIC03MSw2ICs3MSw5IEBACiAgICAgdmlydHVhbCB2b2lkIGluaXRpYXRlU2V0SW5wdXRTdXJmYWNlKGNvbnN0IHNwPFBlcnNpc3RlbnRTdXJmYWNlPiAmc3VyZmFjZSk7CiAgICAgdmlydHVhbCB2b2lkIGluaXRpYXRlU3RhcnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhdGVTaHV0ZG93bihib29sIGtlZXBDb21wb25lbnRBbGxvY2F0ZWQgPSBmYWxzZSk7CisgICAgdmlydHVhbCBzdGF0dXNfdCBxdWVyeVN1cHBvcnRlZFBhcmFtZXRlcnMoc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+ICpuYW1lcykgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBzdGF0dXNfdCBzdWJzY3JpYmVUb1BhcmFtZXRlcnMoY29uc3Qgc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+ICZuYW1lcykgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBzdGF0dXNfdCB1bnN1YnNjcmliZUZyb21QYXJhbWV0ZXJzKGNvbnN0IHN0ZDo6dmVjdG9yPHN0ZDo6c3RyaW5nPiAmbmFtZXMpIG92ZXJyaWRlOwogCiAgICAgc3RhdHVzX3QgcXVlcnlDYXBhYmlsaXRpZXMoCiAgICAgICAgICAgICBjb25zdCBjaGFyKiBvd25lciwgY29uc3QgY2hhciogbmFtZSwKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0NvbnN0YW50cy5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjQ29uc3RhbnRzLmgKaW5kZXggNDIzN2U4Yy4uM2EwMTkyNSAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjQ29uc3RhbnRzLmgKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjQ29uc3RhbnRzLmgKQEAgLTM2NCw3ICszNjQsNyBAQAogaW5saW5lIHN0YXRpYyBjb25zdCBjaGFyICphc1N0cmluZ19BVjFQcm9maWxlKGludDMyX3QgaSwgY29uc3QgY2hhciAqZGVmID0gIj8/IikgewogICAgIHN3aXRjaCAoaSkgewogICAgICAgICBjYXNlIEFWMVByb2ZpbGVNYWluODogICAgICAgICAgIHJldHVybiAiTWFpbjgiOwotICAgICAgICBjYXNlIEFWMVByb2ZpbGVNYWluMTA6ICAgICAgICAgIHJldHVybiAiTWFpbjEwSERSIjsKKyAgICAgICAgY2FzZSBBVjFQcm9maWxlTWFpbjEwOiAgICAgICAgICByZXR1cm4gIk1haW4xMCI7CiAgICAgICAgIGNhc2UgQVYxUHJvZmlsZU1haW4xMEhEUjEwOiAgICAgcmV0dXJuICJNYWluMTBIRFIxMCI7CiAgICAgICAgIGNhc2UgQVYxUHJvZmlsZU1haW4xMEhEUjEwUGx1czogcmV0dXJuICJNYWluMTBIRFJQbHVzIjsKICAgICAgICAgZGVmYXVsdDogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZGVmOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvdGVzdHMvZnV6emVycy9BbmRyb2lkLmJwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvdGVzdHMvZnV6emVycy9BbmRyb2lkLmJwCmluZGV4IDAwOTc4MzAuLmVhMTdhNGQgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L3Rlc3RzL2Z1enplcnMvQW5kcm9pZC5icAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC90ZXN0cy9mdXp6ZXJzL0FuZHJvaWQuYnAKQEAgLTg2LDkgKzg2LDYgQEAKICAgICBkaWN0aW9uYXJ5OiAiZGljdGlvbmFyaWVzL2Zvcm1hdHMuZGljdCIsCiAgICAgZGVmYXVsdHM6IFsibGlic3RhZ2VmcmlnaHRfZnV6emVyX2RlZmF1bHRzIl0sCiAgICAgc3RhdGljX2xpYnM6IFsKLSAgICAgICAgImxpYnN0YWdlZnJpZ2h0X3dlYm0iLAogICAgICAgICAibGliZGF0YXNvdXJjZSIsCi0gICAgICAgICJsaWJzdGFnZWZyaWdodF9lc2RzIiwKLSAgICAgICAgImxpYm9nZyIsCiAgICAgXSwKIH0KZGlmZiAtLWdpdCBhL21lZGlhL210cC9PV05FUlMgYi9tZWRpYS9tdHAvT1dORVJTCmluZGV4IDE5MjhiYTguLjU0ZDNkNGEgMTAwNjQ0Ci0tLSBhL21lZGlhL210cC9PV05FUlMKKysrIGIvbWVkaWEvbXRwL09XTkVSUwpAQCAtMSw2ICsxLDUgQEAKIHNldCBub3BhcmVudAogCi1tYXJjb25lQGdvb2dsZS5jb20KIGpzaGFya2V5QGFuZHJvaWQuY29tCiBqYW1lc3dlaUBnb29nbGUuY29tCiBybW9qdW1kZXJAZ29vZ2xlLmNvbQpkaWZmIC0tZ2l0IGEvbWVkaWEvbmRrL05ka01lZGlhQ29kZWMuY3BwIGIvbWVkaWEvbmRrL05ka01lZGlhQ29kZWMuY3BwCmluZGV4IDFhZTJiNDQuLjBlMmRlNGUgMTAwNjQ0Ci0tLSBhL21lZGlhL25kay9OZGtNZWRpYUNvZGVjLmNwcAorKysgYi9tZWRpYS9uZGsvTmRrTWVkaWFDb2RlYy5jcHAKQEAgLTQ1MiwxNyArNDUyLDE5IEBACiAgICAgICAgIHVpbnQzMl90IGZsYWdzKSB7CiAgICAgc3A8QU1lc3NhZ2U+IG5hdGl2ZUZvcm1hdDsKICAgICBBTWVkaWFGb3JtYXRfZ2V0Rm9ybWF0KGZvcm1hdCwgJm5hdGl2ZUZvcm1hdCk7Ci0gICAgQUxPR1YoImNvbmZpZ3VyZSB3aXRoIGZvcm1hdDogJXMiLCBuYXRpdmVGb3JtYXQtPmRlYnVnU3RyaW5nKDApLmNfc3RyKCkpOworICAgIC8vIGNyZWF0ZSBvdXIgc2hhbGxvdyBjb3B5LCBzbyB3ZSBhcmVuJ3QgdmljdGltIHRvIGFueSBsYXRlciBjaGFuZ2VzLgorICAgIHNwPEFNZXNzYWdlPiBkdXBOYXRpdmVGb3JtYXQgPSBuYXRpdmVGb3JtYXQtPmR1cCgpOworICAgIEFMT0dWKCJjb25maWd1cmUgd2l0aCBmb3JtYXQ6ICVzIiwgZHVwTmF0aXZlRm9ybWF0LT5kZWJ1Z1N0cmluZygwKS5jX3N0cigpKTsKICAgICBzcDxTdXJmYWNlPiBzdXJmYWNlID0gTlVMTDsKICAgICBpZiAod2luZG93ICE9IE5VTEwpIHsKICAgICAgICAgc3VyZmFjZSA9IChTdXJmYWNlKikgd2luZG93OwogICAgIH0KIAotICAgIHN0YXR1c190IGVyciA9IG1EYXRhLT5tQ29kZWMtPmNvbmZpZ3VyZShuYXRpdmVGb3JtYXQsIHN1cmZhY2UsCisgICAgc3RhdHVzX3QgZXJyID0gbURhdGEtPm1Db2RlYy0+Y29uZmlndXJlKGR1cE5hdGl2ZUZvcm1hdCwgc3VyZmFjZSwKICAgICAgICAgICAgIGNyeXB0byA/IGNyeXB0by0+bUNyeXB0byA6IE5VTEwsIGZsYWdzKTsKICAgICBpZiAoZXJyICE9IE9LKSB7CiAgICAgICAgIEFMT0dFKCJjb25maWd1cmU6IGVyciglZCksIGZhaWxlZCB3aXRoIGZvcm1hdDogJXMiLAotICAgICAgICAgICAgICBlcnIsIG5hdGl2ZUZvcm1hdC0+ZGVidWdTdHJpbmcoMCkuY19zdHIoKSk7CisgICAgICAgICAgICAgIGVyciwgZHVwTmF0aXZlRm9ybWF0LT5kZWJ1Z1N0cmluZygwKS5jX3N0cigpKTsKICAgICB9CiAgICAgcmV0dXJuIHRyYW5zbGF0ZV9lcnJvcihlcnIpOwogfQpkaWZmIC0tZ2l0IGEvbWVkaWEvbmRrL09XTkVSUyBiL21lZGlhL25kay9PV05FUlMKaW5kZXggOWRjNDQxZS4uODM2NDRmMCAxMDA2NDQKLS0tIGEvbWVkaWEvbmRrL09XTkVSUworKysgYi9tZWRpYS9uZGsvT1dORVJTCkBAIC0xLDMgKzEsNCBAQAotbWFyY29uZUBnb29nbGUuY29tCitlc3NpY2tAZ29vZ2xlLmNvbQorbGFqb3NAZ29vZ2xlLmNvbQogIyBGb3IgQUltYWdlL0FJbWFnZVJlYWRlcgogaW5jbHVkZSBwbGF0Zm9ybS9mcmFtZXdvcmtzL2F2Oi9jYW1lcmEvT1dORVJTCmRpZmYgLS1naXQgYS9tZWRpYS90ZXN0cy9TYW1wbGVWaWRlb0VuY29kZXIvYXBwL3NyYy9tYWluL0FuZHJvaWRNYW5pZmVzdC54bWwgYi9tZWRpYS90ZXN0cy9TYW1wbGVWaWRlb0VuY29kZXIvYXBwL3NyYy9tYWluL0FuZHJvaWRNYW5pZmVzdC54bWwKaW5kZXggYjE3NTQxZC4uNzVkNzNiZiAxMDA2NDQKLS0tIGEvbWVkaWEvdGVzdHMvU2FtcGxlVmlkZW9FbmNvZGVyL2FwcC9zcmMvbWFpbi9BbmRyb2lkTWFuaWZlc3QueG1sCisrKyBiL21lZGlhL3Rlc3RzL1NhbXBsZVZpZGVvRW5jb2Rlci9hcHAvc3JjL21haW4vQW5kcm9pZE1hbmlmZXN0LnhtbApAQCAtMzAsNyArMzAsOCBAQAogICAgICAgICBhbmRyb2lkOnJvdW5kSWNvbj0iQG1pcG1hcC9pY19sYXVuY2hlcl9yb3VuZCIKICAgICAgICAgYW5kcm9pZDpzdXBwb3J0c1J0bD0idHJ1ZSIKICAgICAgICAgYW5kcm9pZDp0aGVtZT0iQHN0eWxlL0FwcFRoZW1lIj4KLSAgICAgICAgPGFjdGl2aXR5IGFuZHJvaWQ6bmFtZT0iY29tLmFuZHJvaWQubWVkaWEuc2FtcGxldmlkZW9lbmNvZGVyLk1haW5BY3Rpdml0eSI+CisgICAgICAgIDxhY3Rpdml0eSBhbmRyb2lkOm5hbWU9ImNvbS5hbmRyb2lkLm1lZGlhLnNhbXBsZXZpZGVvZW5jb2Rlci5NYWluQWN0aXZpdHkiCisgICAgICAgICAgICBhbmRyb2lkOmV4cG9ydGVkPSJ0cnVlIj4KICAgICAgICAgICAgIDxpbnRlbnQtZmlsdGVyPgogICAgICAgICAgICAgICAgIDxhY3Rpb24gYW5kcm9pZDpuYW1lPSJhbmRyb2lkLmludGVudC5hY3Rpb24uTUFJTiIgLz4KICAgICAgICAgICAgICAgICA8Y2F0ZWdvcnkgYW5kcm9pZDpuYW1lPSJhbmRyb2lkLmludGVudC5jYXRlZ29yeS5MQVVOQ0hFUiIgLz4KQEAgLTQyLDQgKzQzLDQgQEAKICAgICAgICAgYW5kcm9pZDp0YXJnZXRQYWNrYWdlPSJjb20uYW5kcm9pZC5tZWRpYS5zYW1wbGV2aWRlb2VuY29kZXIiCiAgICAgICAgIGFuZHJvaWQ6bGFiZWw9IlNhbXBsZVZpZGVvRW5jb2RlciBUZXN0Ii8+CiAKLTwvbWFuaWZlc3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9tYW5pZmVzdD4KZGlmZiAtLWdpdCBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3QvQW5kcm9pZC5icCBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3QvQW5kcm9pZC5icAppbmRleCAyZTA2ZGE1Li40YjQ0ZGNmIDEwMDY0NAotLS0gYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvTWVkaWFCZW5jaG1hcmtUZXN0L0FuZHJvaWQuYnAKKysrIGIvbWVkaWEvdGVzdHMvYmVuY2htYXJrL01lZGlhQmVuY2htYXJrVGVzdC9BbmRyb2lkLmJwCkBAIC02OSw3ICs2OSw2IEBACiBqYXZhX2RlZmF1bHRzIHsKICAgICBuYW1lOiAiTWVkaWFCZW5jaG1hcmstZGVmYXVsdHMiLAogCi0gICAgc2RrX3ZlcnNpb246ICJzeXN0ZW1fY3VycmVudCIsCiAgICAgbWluX3Nka192ZXJzaW9uOiAiMjgiLAotICAgIHRhcmdldF9zZGtfdmVyc2lvbjogIjI5IiwKKyAgICB0YXJnZXRfc2RrX3ZlcnNpb246ICIzMCIsCiB9CmRpZmYgLS1naXQgYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvTWVkaWFCZW5jaG1hcmtUZXN0L2J1aWxkLmdyYWRsZSBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3QvYnVpbGQuZ3JhZGxlCmluZGV4IGIyYWVlMWEuLmIyMjJkNDcgMTAwNjQ0Ci0tLSBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3QvYnVpbGQuZ3JhZGxlCisrKyBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3QvYnVpbGQuZ3JhZGxlCkBAIC0xNywyMSArMTcsMjEgQEAKIGJ1aWxkc2NyaXB0IHsKICAgICByZXBvc2l0b3JpZXMgewogICAgICAgICBnb29nbGUoKQotICAgICAgICBqY2VudGVyKCkKKyAgICAgICAgbWF2ZW5DZW50cmFsKCkKICAgICB9CiAgICAgZGVwZW5kZW5jaWVzIHsKLSAgICAgICAgY2xhc3NwYXRoICdjb20uYW5kcm9pZC50b29scy5idWlsZDpncmFkbGU6My41LjAnCisgICAgICAgIGNsYXNzcGF0aCAnY29tLmFuZHJvaWQudG9vbHMuYnVpbGQ6Z3JhZGxlOjQuMi4xJwogICAgIH0KIH0KIAogYXBwbHkgcGx1Z2luOiAnY29tLmFuZHJvaWQuYXBwbGljYXRpb24nCiAKIGFuZHJvaWQgewotICAgIGNvbXBpbGVTZGtWZXJzaW9uIDI5CisgICAgY29tcGlsZVNka1ZlcnNpb24gMzAKICAgICBkZWZhdWx0Q29uZmlnIHsKICAgICAgICAgYXBwbGljYXRpb25JZCAiY29tLmFuZHJvaWQubWVkaWEuYmVuY2htYXJrIgogICAgICAgICBtaW5TZGtWZXJzaW9uIDI4Ci0gICAgICAgIHRhcmdldFNka1ZlcnNpb24gMjkKKyAgICAgICAgdGFyZ2V0U2RrVmVyc2lvbiAzMAogICAgICAgICB2ZXJzaW9uQ29kZSAxCiAgICAgICAgIHZlcnNpb25OYW1lICIxLjAiCiAgICAgICAgIHRlc3RJbnN0cnVtZW50YXRpb25SdW5uZXIgImFuZHJvaWR4LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lciIKQEAgLTU3LDIwICs1NywyMCBAQAogICAgIGV4dGVybmFsTmF0aXZlQnVpbGQgewogICAgICAgICBjbWFrZSB7CiAgICAgICAgICAgICBwYXRoICJzcmMvbWFpbi9jcHAvQ01ha2VMaXN0cy50eHQiCi0gICAgICAgICAgICB2ZXJzaW9uICIzLjEwLjIiCisgICAgICAgICAgICB2ZXJzaW9uICIzLjE4LjEiCiAgICAgICAgIH0KICAgICB9CiB9CiAKIHJlcG9zaXRvcmllcyB7CiAgICAgZ29vZ2xlKCkKLSAgICBqY2VudGVyKCkKKyAgICBtYXZlbkNlbnRyYWwoKQogfQogCiBkZXBlbmRlbmNpZXMgewogICAgIGltcGxlbWVudGF0aW9uIGZpbGVUcmVlKGRpcjogJ2xpYnMnLCBpbmNsdWRlOiBbJyouamFyJ10pCi0gICAgaW1wbGVtZW50YXRpb24gJ2FuZHJvaWR4LmFwcGNvbXBhdDphcHBjb21wYXQ6MS4xLjAnCi0gICAgdGVzdEltcGxlbWVudGF0aW9uICdqdW5pdDpqdW5pdDo0LjEyJwotICAgIGFuZHJvaWRUZXN0SW1wbGVtZW50YXRpb24gJ2FuZHJvaWR4LnRlc3Q6cnVubmVyOjEuMi4wJwotICAgIGFuZHJvaWRUZXN0SW1wbGVtZW50YXRpb24gJ2FuZHJvaWR4LnRlc3QuZXh0Omp1bml0OjEuMS4xJworICAgIGltcGxlbWVudGF0aW9uICdhbmRyb2lkeC5hcHBjb21wYXQ6YXBwY29tcGF0OjEuMy4wJworICAgIHRlc3RJbXBsZW1lbnRhdGlvbiAnanVuaXQ6anVuaXQ6NC4xMy4yJworICAgIGFuZHJvaWRUZXN0SW1wbGVtZW50YXRpb24gJ2FuZHJvaWR4LnRlc3Q6cnVubmVyOjEuMy4wJworICAgIGFuZHJvaWRUZXN0SW1wbGVtZW50YXRpb24gJ2FuZHJvaWR4LnRlc3QuZXh0Omp1bml0OjEuMS4yJwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3Qvc3JjL21haW4vY3BwL0FuZHJvaWQuYnAgYi9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvTWVkaWFCZW5jaG1hcmtUZXN0L3NyYy9tYWluL2NwcC9BbmRyb2lkLmJwCmluZGV4IGFmOTI0MjQuLjAxOTJkNjggMTAwNjQ0Ci0tLSBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay9NZWRpYUJlbmNobWFya1Rlc3Qvc3JjL21haW4vY3BwL0FuZHJvaWQuYnAKKysrIGIvbWVkaWEvdGVzdHMvYmVuY2htYXJrL01lZGlhQmVuY2htYXJrVGVzdC9zcmMvbWFpbi9jcHAvQW5kcm9pZC5icApAQCAtOSw3ICs5LDYgQEAKIAogY2NfdGVzdF9saWJyYXJ5IHsKICAgICBuYW1lOiAibGlibWVkaWFiZW5jaG1hcmtfam5pIiwKLSAgICBzZGtfdmVyc2lvbjogImN1cnJlbnQiLAogCiAgICAgZGVmYXVsdHM6IFsKICAgICAgICAgImxpYm1lZGlhYmVuY2htYXJrX2NvbW1vbi1kZWZhdWx0cyIsCmRpZmYgLS1naXQgYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvc3JjL25hdGl2ZS9jb21tb24vQW5kcm9pZC5icCBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay9zcmMvbmF0aXZlL2NvbW1vbi9BbmRyb2lkLmJwCmluZGV4IDZiNTRjNmEuLjcxOGQyMTcgMTAwNjQ0Ci0tLSBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay9zcmMvbmF0aXZlL2NvbW1vbi9BbmRyb2lkLmJwCisrKyBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay9zcmMvbmF0aXZlL2NvbW1vbi9BbmRyb2lkLmJwCkBAIC01NSw3ICs1NSw2IEBACiAKIGNjX2RlZmF1bHRzIHsKICAgICBuYW1lOiAibGlibWVkaWFiZW5jaG1hcmstZGVmYXVsdHMiLAotICAgIHNka192ZXJzaW9uOiAiY3VycmVudCIsCiAgICAgc3RsOiAiYysrX3NoYXJlZCIsCiAKICAgICBzaGFyZWRfbGliczogWwpkaWZmIC0tZ2l0IGEvbWVkaWEvdGVzdHMvYmVuY2htYXJrL3NyYy9uYXRpdmUvZXh0cmFjdG9yL0V4dHJhY3Rvci5jcHAgYi9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvc3JjL25hdGl2ZS9leHRyYWN0b3IvRXh0cmFjdG9yLmNwcAppbmRleCBmMGJiM2I5Li4zYmRmYmFkIDEwMDY0NAotLS0gYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvc3JjL25hdGl2ZS9leHRyYWN0b3IvRXh0cmFjdG9yLmNwcAorKysgYi9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvc3JjL25hdGl2ZS9leHRyYWN0b3IvRXh0cmFjdG9yLmNwcApAQCAtMTI0LDkgKzEyNCw3IEBACiAKICAgICBpbnQ2NF90IHNUaW1lID0gbVN0YXRzLT5nZXRDdXJUaW1lKCk7CiAgICAgaWYgKG1FeHRyYWN0b3IpIHsKLSAgICAgICAgLy8gVE9ETzogKGIvMTQwMTI4NTA1KSBNdWx0aXBsZSBjYWxscyByZXN1bHQgaW4gRG9TLgotICAgICAgICAvLyBVbmNvbW1lbnQgY2FsbCB0byBBTWVkaWFFeHRyYWN0b3JfZGVsZXRlKCkgb25jZSB0aGlzIGlzIHJlc29sdmVkCi0gICAgICAgIC8vIEFNZWRpYUV4dHJhY3Rvcl9kZWxldGUobUV4dHJhY3Rvcik7CisgICAgICAgIEFNZWRpYUV4dHJhY3Rvcl9kZWxldGUobUV4dHJhY3Rvcik7CiAgICAgICAgIG1FeHRyYWN0b3IgPSBudWxscHRyOwogICAgIH0KICAgICBpbnQ2NF90IGVUaW1lID0gbVN0YXRzLT5nZXRDdXJUaW1lKCk7CmRpZmYgLS1naXQgYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvdGVzdHMvQW5kcm9pZC5icCBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay90ZXN0cy9BbmRyb2lkLmJwCmluZGV4IDBmYmQyMGQuLjlhOGNhYTMgMTAwNjQ0Ci0tLSBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay90ZXN0cy9BbmRyb2lkLmJwCisrKyBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay90ZXN0cy9BbmRyb2lkLmJwCkBAIC0zMyw3ICszMywxMiBAQAogCiAgICAgc3JjczogWyJFeHRyYWN0b3JUZXN0LmNwcCJdLAogCi0gICAgc3RhdGljX2xpYnM6IFsibGlibWVkaWFiZW5jaG1hcmtfZXh0cmFjdG9yIl0KKyAgICBzdGF0aWNfbGliczogWyJsaWJtZWRpYWJlbmNobWFya19leHRyYWN0b3IiXSwKKworICAgIHNoYXJlZF9saWJzOiBbCisgICAgICAgICJsaWJiYXNlIiwKKyAgICAgICAgImxpYmJpbmRlcl9uZGsiLAorICAgIF0sCiB9CiAKIGNjX3Rlc3QgewpAQCAtNTAsNiArNTUsMTEgQEAKICAgICAgICAgImxpYm1lZGlhYmVuY2htYXJrX2V4dHJhY3RvciIsCiAgICAgICAgICJsaWJtZWRpYWJlbmNobWFya19kZWNvZGVyIiwKICAgICBdLAorCisgICAgc2hhcmVkX2xpYnM6IFsKKyAgICAgICAgImxpYmJhc2UiLAorICAgICAgICAibGliYmluZGVyX25kayIsCisgICAgXSwKIH0KIAogY2NfdGVzdCB7CmRpZmYgLS1naXQgYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvdGVzdHMvRGVjb2RlclRlc3QuY3BwIGIvbWVkaWEvdGVzdHMvYmVuY2htYXJrL3Rlc3RzL0RlY29kZXJUZXN0LmNwcAppbmRleCA4MWVmMDJhLi4zNjY2NzI0IDEwMDY0NAotLS0gYS9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvdGVzdHMvRGVjb2RlclRlc3QuY3BwCisrKyBiL21lZGlhL3Rlc3RzL2JlbmNobWFyay90ZXN0cy9EZWNvZGVyVGVzdC5jcHAKQEAgLTIxLDYgKzIxLDggQEAKICNpbmNsdWRlIDxpb3N0cmVhbT4KICNpbmNsdWRlIDxsaW1pdHM+CiAKKyNpbmNsdWRlIDxhbmRyb2lkL2JpbmRlcl9wcm9jZXNzLmg+CisKICNpbmNsdWRlICJCZW5jaG1hcmtUZXN0RW52aXJvbm1lbnQuaCIKICNpbmNsdWRlICJEZWNvZGVyLmgiCiAKQEAgLTE3NSw2ICsxNzcsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYzIuYW5kcm9pZC5oZXZjLmRlY29kZXIiLCB0cnVlKSkpOwogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpIHsKKyAgICBBQmluZGVyUHJvY2Vzc19zdGFydFRocmVhZFBvb2woKTsKICAgICBnRW52ID0gbmV3IEJlbmNobWFya1Rlc3RFbnZpcm9ubWVudCgpOwogICAgIDo6dGVzdGluZzo6QWRkR2xvYmFsVGVzdEVudmlyb25tZW50KGdFbnYpOwogICAgIDo6dGVzdGluZzo6SW5pdEdvb2dsZVRlc3QoJmFyZ2MsIGFyZ3YpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvdGVzdHMvYmVuY2htYXJrL3Rlc3RzL0V4dHJhY3RvclRlc3QuY3BwIGIvbWVkaWEvdGVzdHMvYmVuY2htYXJrL3Rlc3RzL0V4dHJhY3RvclRlc3QuY3BwCmluZGV4IGQxNGQxNWIuLjI3ZWU5YmEgMTAwNjQ0Ci0tLSBhL21lZGlhL3Rlc3RzL2JlbmNobWFyay90ZXN0cy9FeHRyYWN0b3JUZXN0LmNwcAorKysgYi9tZWRpYS90ZXN0cy9iZW5jaG1hcmsvdGVzdHMvRXh0cmFjdG9yVGVzdC5jcHAKQEAgLTE5LDYgKzE5LDggQEAKIAogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CiAKKyNpbmNsdWRlIDxhbmRyb2lkL2JpbmRlcl9wcm9jZXNzLmg+CisKICNpbmNsdWRlICJCZW5jaG1hcmtUZXN0RW52aXJvbm1lbnQuaCIKICNpbmNsdWRlICJFeHRyYWN0b3IuaCIKIApAQCAtNzMsNiArNzUsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwKSkpOwogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpIHsKKyAgICBBQmluZGVyUHJvY2Vzc19zdGFydFRocmVhZFBvb2woKTsKICAgICBnRW52ID0gbmV3IEJlbmNobWFya1Rlc3RFbnZpcm9ubWVudCgpOwogICAgIDo6dGVzdGluZzo6QWRkR2xvYmFsVGVzdEVudmlyb25tZW50KGdFbnYpOwogICAgIDo6dGVzdGluZzo6SW5pdEdvb2dsZVRlc3QoJmFyZ2MsIGFyZ3YpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvdXRpbHMvQW5kcm9pZC5icCBiL21lZGlhL3V0aWxzL0FuZHJvaWQuYnAKaW5kZXggNzNjNGUzYi4uODhiODIyZCAxMDA2NDQKLS0tIGEvbWVkaWEvdXRpbHMvQW5kcm9pZC5icAorKysgYi9tZWRpYS91dGlscy9BbmRyb2lkLmJwCkBAIC01MSw2ICs1MSw3IEBACiAgICAgICAgICJsaWJwZXJtaXNzaW9uIiwKICAgICAgICAgImFuZHJvaWQuaGFyZHdhcmUuZ3JhcGhpY3MuYnVmZmVycXVldWVAMS4wIiwKICAgICAgICAgImFuZHJvaWQuaGlkbC50b2tlbkAxLjAtdXRpbHMiLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgIF0sCiAgICAgZXhwb3J0X3N0YXRpY19saWJfaGVhZGVyczogWwogICAgICAgICAibGliYmF0dGVyeXN0YXRzX2FpZGwiLApkaWZmIC0tZ2l0IGEvbWVkaWEvdXRpbHMvU2VydmljZVV0aWxpdGllcy5jcHAgYi9tZWRpYS91dGlscy9TZXJ2aWNlVXRpbGl0aWVzLmNwcAppbmRleCA5YzdiODYzLi40MmY0OGE1IDEwMDY0NAotLS0gYS9tZWRpYS91dGlscy9TZXJ2aWNlVXRpbGl0aWVzLmNwcAorKysgYi9tZWRpYS91dGlscy9TZXJ2aWNlVXRpbGl0aWVzLmNwcApAQCAtMTAxLDcgKzEwMSwxMSBAQAogICAgIEF0dHJpYnV0aW9uU291cmNlU3RhdGUgbXlBdHRyaWJ1dGlvblNvdXJjZTsKICAgICBteUF0dHJpYnV0aW9uU291cmNlLnVpZCA9IFZBTFVFX09SX0ZBVEFMKGFuZHJvaWQ6OmxlZ2FjeTJhaWRsX3VpZF90X2ludDMyX3QoZ2V0dWlkKCkpKTsKICAgICBteUF0dHJpYnV0aW9uU291cmNlLnBpZCA9IFZBTFVFX09SX0ZBVEFMKGFuZHJvaWQ6OmxlZ2FjeTJhaWRsX3BpZF90X2ludDMyX3QoZ2V0cGlkKCkpKTsKLSAgICBteUF0dHJpYnV0aW9uU291cmNlLnRva2VuID0gc3A8QkJpbmRlcj46Om1ha2UoKTsKKyAgICBpZiAoY2FsbGVyQXR0cmlidXRpb25Tb3VyY2UudG9rZW4gIT0gbnVsbHB0cikgeworICAgICAgICBteUF0dHJpYnV0aW9uU291cmNlLnRva2VuID0gY2FsbGVyQXR0cmlidXRpb25Tb3VyY2UudG9rZW47CisgICAgfSBlbHNlIHsKKyAgICAgICAgbXlBdHRyaWJ1dGlvblNvdXJjZS50b2tlbiA9IHNwPEJCaW5kZXI+OjptYWtlKCk7CisgICAgfQogICAgIG15QXR0cmlidXRpb25Tb3VyY2UubmV4dC5wdXNoX2JhY2sobmV4dEF0dHJpYnV0aW9uU291cmNlKTsKIAogICAgIHJldHVybiBzdGQ6Om9wdGlvbmFsPEF0dHJpYnV0aW9uU291cmNlU3RhdGU+e215QXR0cmlidXRpb25Tb3VyY2V9OwpkaWZmIC0tZ2l0IGEvbWVkaWEvdXRpbHMvZnV6emVycy9BbmRyb2lkLmJwIGIvbWVkaWEvdXRpbHMvZnV6emVycy9BbmRyb2lkLmJwCmluZGV4IGMxNjk4ZGMuLmM0ZGMyNGYgMTAwNjQ0Ci0tLSBhL21lZGlhL3V0aWxzL2Z1enplcnMvQW5kcm9pZC5icAorKysgYi9tZWRpYS91dGlscy9mdXp6ZXJzL0FuZHJvaWQuYnAKQEAgLTE4LDYgKzE4LDcgQEAKICAgICAgICAgImxpYnV0aWxzIiwKICAgICAgICAgImxpYmJpbmRlciIsCiAgICAgICAgICJmcmFtZXdvcmstcGVybWlzc2lvbi1haWRsLWNwcCIsCisgICAgICAgICJwYWNrYWdlbWFuYWdlcl9haWRsLWNwcCIsCiAgICAgXSwKIAogICAgIGNmbGFnczogWwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvT1dORVJTIGIvc2VydmljZXMvT1dORVJTCmluZGV4IGYwYjVlMmYuLjE3ZTYwNWQgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL09XTkVSUworKysgYi9zZXJ2aWNlcy9PV05FUlMKQEAgLTEsOSArMSw2IEBACi1jaHpAZ29vZ2xlLmNvbQogZWxhdXJlbnRAZ29vZ2xlLmNvbQogZXNzaWNrQGdvb2dsZS5jb20KIGV0YWx2YWxhQGdvb2dsZS5jb20KLWdrYXN0ZW5AZ29vZ2xlLmNvbQogaHVuZ2FAZ29vZ2xlLmNvbQotbWFyY29uZUBnb29nbGUuY29tCiBuY2hhbGtvQGdvb2dsZS5jb20KIHF1eGlhbmdmYW5nQGdvb2dsZS5jb20KZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9BbmRyb2lkLmJwIGIvc2VydmljZXMvYXVkaW9mbGluZ2VyL0FuZHJvaWQuYnAKaW5kZXggYjkxZjMwMi4uZmVjYzE4MyAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9mbGluZ2VyL0FuZHJvaWQuYnAKKysrIGIvc2VydmljZXMvYXVkaW9mbGluZ2VyL0FuZHJvaWQuYnAKQEAgLTgxLDYgKzgxLDcgQEAKICAgICAgICAgImxpYm1lZGlhX2hlbHBlciIsCiAgICAgICAgICJsaWJzaG1lbWNvbXBhdCIsCiAgICAgICAgICJsaWJ2aWJyYXRvciIsCisgICAgICAgICJwYWNrYWdlbWFuYWdlcl9haWRsLWNwcCIsCiAgICAgXSwKIAogICAgIHN0YXRpY19saWJzOiBbCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9hdWRpb2ZsaW5nZXIvQXVkaW9GbGluZ2VyLmNwcCBiL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9BdWRpb0ZsaW5nZXIuY3BwCmluZGV4IDNhM2ZiNWUuLjA3MTg2NDMgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9BdWRpb0ZsaW5nZXIuY3BwCisrKyBiL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9BdWRpb0ZsaW5nZXIuY3BwCkBAIC05OTgsOCArOTk4LDkgQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLQotICAgICAgICBzZXRBdWRpb0h3U3luY0ZvclNlc3Npb25fbCh0aHJlYWQsIHNlc3Npb25JZCk7CisgICAgICAgIGlmICgob3V0cHV0LmZsYWdzICYgQVVESU9fT1VUUFVUX0ZMQUdfSFdfQVZfU1lOQykgPT0gQVVESU9fT1VUUFVUX0ZMQUdfSFdfQVZfU1lOQykgeworICAgICAgICAgICAgc2V0QXVkaW9Id1N5bmNGb3JTZXNzaW9uX2wodGhyZWFkLCBzZXNzaW9uSWQpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKGxTdGF0dXMgIT0gTk9fRVJST1IpIHsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9UcmFja3MuY3BwIGIvc2VydmljZXMvYXVkaW9mbGluZ2VyL1RyYWNrcy5jcHAKaW5kZXggZTBjNWZhNS4uNjE2ZmQ3OCAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9mbGluZ2VyL1RyYWNrcy5jcHAKKysrIGIvc2VydmljZXMvYXVkaW9mbGluZ2VyL1RyYWNrcy5jcHAKQEAgLTE0MDUsNiArMTQwNSw2MCBAQAogICAgICAgICAgICAgLmNvbnRlbnRfdHlwZSA9IG1BdHRyLmNvbnRlbnRfdHlwZSwKICAgICAgICAgICAgIC5nYWluID0gbUZpbmFsVm9sdW1lLAogICAgIH07CisKKyAgICAvLyBXaGVuIGF0dHJpYnV0ZXMgYXJlIHVuZGVmaW5lZCwgZGVyaXZlIGRlZmF1bHQgdmFsdWVzIGZyb20gc3RyZWFtIHR5cGUuCisgICAgLy8gU2VlIEF1ZGlvQXR0cmlidXRlcy5qYXZhLCB1c2FnZUZvclN0cmVhbVR5cGUoKSBhbmQgQnVpbGRlci5zZXRJbnRlcm5hbExlZ2FjeVN0cmVhbVR5cGUoKQorICAgIGlmIChtQXR0ci51c2FnZSA9PSBBVURJT19VU0FHRV9VTktOT1dOKSB7CisgICAgICAgIHN3aXRjaCAobVN0cmVhbVR5cGUpIHsKKyAgICAgICAgY2FzZSBBVURJT19TVFJFQU1fVk9JQ0VfQ0FMTDoKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UudXNhZ2UgPSBBVURJT19VU0FHRV9WT0lDRV9DT01NVU5JQ0FUSU9OOworICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS5jb250ZW50X3R5cGUgPSBBVURJT19DT05URU5UX1RZUEVfU1BFRUNIOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVVESU9fU1RSRUFNX1NZU1RFTToKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UudXNhZ2UgPSBBVURJT19VU0FHRV9BU1NJU1RBTkNFX1NPTklGSUNBVElPTjsKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UuY29udGVudF90eXBlID0gQVVESU9fQ09OVEVOVF9UWVBFX1NPTklGSUNBVElPTjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFVRElPX1NUUkVBTV9SSU5HOgorICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS51c2FnZSA9IEFVRElPX1VTQUdFX05PVElGSUNBVElPTl9URUxFUEhPTllfUklOR1RPTkU7CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLmNvbnRlbnRfdHlwZSA9IEFVRElPX0NPTlRFTlRfVFlQRV9TT05JRklDQVRJT047CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBBVURJT19TVFJFQU1fTVVTSUM6CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLnVzYWdlID0gQVVESU9fVVNBR0VfTUVESUE7CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLmNvbnRlbnRfdHlwZSA9IEFVRElPX0NPTlRFTlRfVFlQRV9NVVNJQzsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFVRElPX1NUUkVBTV9BTEFSTToKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UudXNhZ2UgPSBBVURJT19VU0FHRV9BTEFSTTsKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UuY29udGVudF90eXBlID0gQVVESU9fQ09OVEVOVF9UWVBFX1NPTklGSUNBVElPTjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFVRElPX1NUUkVBTV9OT1RJRklDQVRJT046CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLnVzYWdlID0gQVVESU9fVVNBR0VfTk9USUZJQ0FUSU9OOworICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS5jb250ZW50X3R5cGUgPSBBVURJT19DT05URU5UX1RZUEVfU09OSUZJQ0FUSU9OOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVVESU9fU1RSRUFNX0RUTUY6CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLnVzYWdlID0gQVVESU9fVVNBR0VfVk9JQ0VfQ09NTVVOSUNBVElPTl9TSUdOQUxMSU5HOworICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS5jb250ZW50X3R5cGUgPSBBVURJT19DT05URU5UX1RZUEVfU09OSUZJQ0FUSU9OOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVVESU9fU1RSRUFNX0FDQ0VTU0lCSUxJVFk6CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLnVzYWdlID0gQVVESU9fVVNBR0VfQVNTSVNUQU5DRV9BQ0NFU1NJQklMSVRZOworICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS5jb250ZW50X3R5cGUgPSBBVURJT19DT05URU5UX1RZUEVfU1BFRUNIOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVVESU9fU1RSRUFNX0FTU0lTVEFOVDoKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UudXNhZ2UgPSBBVURJT19VU0FHRV9BU1NJU1RBTlQ7CisgICAgICAgICAgICBtZXRhZGF0YS5iYXNlLmNvbnRlbnRfdHlwZSA9IEFVRElPX0NPTlRFTlRfVFlQRV9TUEVFQ0g7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBBVURJT19TVFJFQU1fUkVST1VUSU5HOgorICAgICAgICAgICAgbWV0YWRhdGEuYmFzZS51c2FnZSA9IEFVRElPX1VTQUdFX1ZJUlRVQUxfU09VUkNFOworICAgICAgICAgICAgLy8gdW5rbm93biBjb250ZW50IHR5cGUKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFVRElPX1NUUkVBTV9DQUxMX0FTU0lTVEFOVDoKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UudXNhZ2UgPSBBVURJT19VU0FHRV9DQUxMX0FTU0lTVEFOVDsKKyAgICAgICAgICAgIG1ldGFkYXRhLmJhc2UuY29udGVudF90eXBlID0gQVVESU9fQ09OVEVOVF9UWVBFX1NQRUVDSDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtZXRhZGF0YS5jaGFubmVsX21hc2sgPSBtQ2hhbm5lbE1hc2ssCiAgICAgc3RybmNweShtZXRhZGF0YS50YWdzLCBtQXR0ci50YWdzLCBBVURJT19BVFRSSUJVVEVTX1RBR1NfTUFYX1NJWkUpOwogICAgICpiYWNrSW5zZXJ0ZXIrKyA9IG1ldGFkYXRhOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9pbmNsdWRlL0h3TW9kdWxlLmggYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb21tb24vbWFuYWdlcmRlZmluaXRpb25zL2luY2x1ZGUvSHdNb2R1bGUuaAppbmRleCA5YmE3NDVhLi41NGIzNDA4IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb21tb24vbWFuYWdlcmRlZmluaXRpb25zL2luY2x1ZGUvSHdNb2R1bGUuaAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb21tb24vbWFuYWdlcmRlZmluaXRpb25zL2luY2x1ZGUvSHdNb2R1bGUuaApAQCAtODAsNiArODAsNyBAQAogCiAgICAgc3A8RGV2aWNlRGVzY3JpcHRvcj4gZ2V0Um91dGVTaW5rRGV2aWNlKGNvbnN0IHNwPEF1ZGlvUm91dGU+ICZyb3V0ZSkgY29uc3Q7CiAgICAgRGV2aWNlVmVjdG9yIGdldFJvdXRlU291cmNlRGV2aWNlcyhjb25zdCBzcDxBdWRpb1JvdXRlPiAmcm91dGUpIGNvbnN0OworICAgIGNvbnN0IEF1ZGlvUm91dGVWZWN0b3ImIGdldFJvdXRlcygpIGNvbnN0IHsgcmV0dXJuIG1Sb3V0ZXM7IH0KICAgICB2b2lkIHNldFJvdXRlcyhjb25zdCBBdWRpb1JvdXRlVmVjdG9yICZyb3V0ZXMpOwogCiAgICAgc3RhdHVzX3QgYWRkT3V0cHV0UHJvZmlsZShjb25zdCBzcDxJT1Byb2ZpbGU+ICZwcm9maWxlKTsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L2NvbW1vbi9tYW5hZ2VyZGVmaW5pdGlvbnMvc3JjL0RldmljZURlc2NyaXB0b3IuY3BwIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9zcmMvRGV2aWNlRGVzY3JpcHRvci5jcHAKaW5kZXggMTcyMjAzMi4uYzljOGVkZSAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9zcmMvRGV2aWNlRGVzY3JpcHRvci5jcHAKKysrIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9zcmMvRGV2aWNlRGVzY3JpcHRvci5jcHAKQEAgLTU4LDE1ICs1OCw2IEBACiAgICAgICAgIG1EZWNsYXJlZEFkZHJlc3MoRGV2aWNlRGVzY3JpcHRvckJhc2U6OmFkZHJlc3MoKSkKIHsKICAgICBtQ3VycmVudEVuY29kZWRGb3JtYXQgPSBBVURJT19GT1JNQVRfREVGQVVMVDsKLSAgICAvKiBJZiBmcmFtZXdvcmsgcnVucyBhZ2FpbnN0IGEgcHJlIDUuMCBBdWRpbyBIQUwsIGVuY29kZWQgZm9ybWF0cyBhcmUgYWJzZW50IGZyb20gdGhlIGNvbmZpZy4KLSAgICAgKiBGSVhNRTogQVBNIHNob3VsZCBrbm93IHRoZSB2ZXJzaW9uIG9mIHRoZSBIQUwgYW5kIGRvbid0IGFkZCB0aGUgZm9ybWF0cyBmb3IgVjUuMC4KLSAgICAgKiBGb3Igbm93LCB0aGUgd29ya2Fyb3VuZCB0byByZW1vdmUgQUMzIGFuZCBJRUM2MTkzNyBzdXBwb3J0IG9uIEhETUkgaXMgdG8gZGVjbGFyZQotICAgICAqIHNvbWV0aGluZyBsaWtlICdlbmNvZGVkRm9ybWF0cz0iQVVESU9fRk9STUFUX1BDTV8xNl9CSVQiJyBvbiB0aGUgSERNSSBkZXZpY2VQb3J0LgotICAgICAqLwotICAgIGlmIChtRGV2aWNlVHlwZUFkZHIubVR5cGUgPT0gQVVESU9fREVWSUNFX09VVF9IRE1JICYmIG1FbmNvZGVkRm9ybWF0cy5lbXB0eSgpKSB7Ci0gICAgICAgIG1FbmNvZGVkRm9ybWF0cy5wdXNoX2JhY2soQVVESU9fRk9STUFUX0FDMyk7Ci0gICAgICAgIG1FbmNvZGVkRm9ybWF0cy5wdXNoX2JhY2soQVVESU9fRk9STUFUX0lFQzYxOTM3KTsKLSAgICB9CiB9CiAKIHZvaWQgRGV2aWNlRGVzY3JpcHRvcjo6YXR0YWNoKGNvbnN0IHNwPEh3TW9kdWxlPiYgbW9kdWxlKQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9zcmMvUG9saWN5QXVkaW9Qb3J0LmNwcCBiL3NlcnZpY2VzL2F1ZGlvcG9saWN5L2NvbW1vbi9tYW5hZ2VyZGVmaW5pdGlvbnMvc3JjL1BvbGljeUF1ZGlvUG9ydC5jcHAKaW5kZXggOGM2MWI5MC4uNTk4NjA2OSAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29tbW9uL21hbmFnZXJkZWZpbml0aW9ucy9zcmMvUG9saWN5QXVkaW9Qb3J0LmNwcAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb21tb24vbWFuYWdlcmRlZmluaXRpb25zL3NyYy9Qb2xpY3lBdWRpb1BvcnQuY3BwCkBAIC0zMCw5ICszMCw5IEBACiAvLyAtLS0gUG9saWN5QXVkaW9Qb3J0IGNsYXNzIGltcGxlbWVudGF0aW9uCiB2b2lkIFBvbGljeUF1ZGlvUG9ydDo6YXR0YWNoKGNvbnN0IHNwPEh3TW9kdWxlPiYgbW9kdWxlKQogeworICAgIG1Nb2R1bGUgPSBtb2R1bGU7CiAgICAgQUxPR1YoIiVzOiBhdHRhY2hpbmcgbW9kdWxlICVzIHRvIHBvcnQgJXMiLAogICAgICAgICAgICAgX19GVU5DVElPTl9fLCBnZXRNb2R1bGVOYW1lKCksIGFzQXVkaW9Qb3J0KCktPmdldE5hbWUoKS5jX3N0cigpKTsKLSAgICBtTW9kdWxlID0gbW9kdWxlOwogfQogCiB2b2lkIFBvbGljeUF1ZGlvUG9ydDo6ZGV0YWNoKCkKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L2NvbmZpZy9ibHVldG9vdGhfYXVkaW9fcG9saWN5X2NvbmZpZ3VyYXRpb24ueG1sIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2JsdWV0b290aF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbi54bWwKaW5kZXggOTg0MTViNy4uMjJmZjk1NCAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2JsdWV0b290aF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbi54bWwKKysrIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2JsdWV0b290aF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbi54bWwKQEAgLTIyLDYgKzIyLDE3IEBACiAgICAgICAgICAgICAgICAgICAgICBzYW1wbGluZ1JhdGVzPSI4MDAwLDE2MDAwLDI0MDAwLDMyMDAwLDQ0MTAwLDQ4MDAwIgogICAgICAgICAgICAgICAgICAgICAgY2hhbm5lbE1hc2tzPSJBVURJT19DSEFOTkVMX09VVF9NT05PLEFVRElPX0NIQU5ORUxfT1VUX1NURVJFTyIvPgogICAgICAgICA8L21peFBvcnQ+CisgICAgICAgIDxtaXhQb3J0IG5hbWU9ImxlIGF1ZGlvIGlucHV0IiByb2xlPSJzaW5rIj4KKyAgICAgICAgICAgIDxwcm9maWxlIG5hbWU9IiIgZm9ybWF0PSJBVURJT19GT1JNQVRfUENNXzE2X0JJVCIKKyAgICAgICAgICAgICAgICAgICAgIHNhbXBsaW5nUmF0ZXM9IjgwMDAsMTYwMDAsMjQwMDAsMzIwMDAsNDQxMDAsNDgwMDAiCisgICAgICAgICAgICAgICAgICAgICBjaGFubmVsTWFza3M9IkFVRElPX0NIQU5ORUxfSU5fTU9OTyxBVURJT19DSEFOTkVMX0lOX1NURVJFTyIvPgorICAgICAgICAgICAgPHByb2ZpbGUgbmFtZT0iIiBmb3JtYXQ9IkFVRElPX0ZPUk1BVF9QQ01fMjRfQklUX1BBQ0tFRCIKKyAgICAgICAgICAgICAgICAgICAgIHNhbXBsaW5nUmF0ZXM9IjgwMDAsMTYwMDAsMjQwMDAsMzIwMDAsNDQxMDAsNDgwMDAiCisgICAgICAgICAgICAgICAgICAgICBjaGFubmVsTWFza3M9IkFVRElPX0NIQU5ORUxfSU5fTU9OTyxBVURJT19DSEFOTkVMX0lOX1NURVJFTyIvPgorICAgICAgICAgICAgPHByb2ZpbGUgbmFtZT0iIiBmb3JtYXQ9IkFVRElPX0ZPUk1BVF9QQ01fMzJfQklUIgorICAgICAgICAgICAgICAgICAgICAgc2FtcGxpbmdSYXRlcz0iODAwMCwxNjAwMCwyNDAwMCwzMjAwMCw0NDEwMCw0ODAwMCIKKyAgICAgICAgICAgICAgICAgICAgIGNoYW5uZWxNYXNrcz0iQVVESU9fQ0hBTk5FTF9JTl9NT05PLEFVRElPX0NIQU5ORUxfSU5fU1RFUkVPIi8+CisgICAgICAgIDwvbWl4UG9ydD4KICAgICA8L21peFBvcnRzPgogICAgIDxkZXZpY2VQb3J0cz4KICAgICAgICAgPCEtLSBBMkRQIEF1ZGlvIFBvcnRzIC0tPgpAQCAtNDksNiArNjAsNyBAQAogICAgICAgICAtLT4KICAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iQkxFIEhlYWRzZXQgT3V0IiB0eXBlPSJBVURJT19ERVZJQ0VfT1VUX0JMRV9IRUFEU0VUIiByb2xlPSJzaW5rIi8+CiAgICAgICAgIDxkZXZpY2VQb3J0IHRhZ05hbWU9IkJMRSBTcGVha2VyIE91dCIgdHlwZT0iQVVESU9fREVWSUNFX09VVF9CTEVfU1BFQUtFUiIgcm9sZT0ic2luayIvPgorICAgICAgICA8ZGV2aWNlUG9ydCB0YWdOYW1lPSJCTEUgSGVhZHNldCBJbiIgdHlwZT0iQVVESU9fREVWSUNFX0lOX0JMRV9IRUFEU0VUIiByb2xlPSJzb3VyY2UiLz4KICAgICA8L2RldmljZVBvcnRzPgogICAgIDxyb3V0ZXM+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJUIEEyRFAgT3V0IgpAQCAtNjEsNiArNzMsOCBAQAogICAgICAgICAgICAgICAgc291cmNlcz0iaGVhcmluZyBhaWQgb3V0cHV0Ii8+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJMRSBIZWFkc2V0IE91dCIKICAgICAgICAgICAgICAgIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgorICAgICAgICA8cm91dGUgdHlwZT0ibWl4IiBzaW5rPSJsZSBhdWRpbyBpbnB1dCIKKyAgICAgICAgICAgICAgIHNvdXJjZXM9IkJMRSBIZWFkc2V0IEluIi8+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJMRSBTcGVha2VyIE91dCIKICAgICAgICAgICAgICAgIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgogICAgIDwvcm91dGVzPgpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2JsdWV0b290aF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbl83XzAueG1sIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2JsdWV0b290aF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbl83XzAueG1sCmluZGV4IGZiZTc1NzEuLmFhZDAwZDYgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L2NvbmZpZy9ibHVldG9vdGhfYXVkaW9fcG9saWN5X2NvbmZpZ3VyYXRpb25fN18wLnhtbAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb25maWcvYmx1ZXRvb3RoX2F1ZGlvX3BvbGljeV9jb25maWd1cmF0aW9uXzdfMC54bWwKQEAgLTIyLDYgKzIyLDE3IEBACiAgICAgICAgICAgICAgICAgICAgICBzYW1wbGluZ1JhdGVzPSI4MDAwIDE2MDAwIDI0MDAwIDMyMDAwIDQ0MTAwIDQ4MDAwIgogICAgICAgICAgICAgICAgICAgICAgY2hhbm5lbE1hc2tzPSJBVURJT19DSEFOTkVMX09VVF9NT05PIEFVRElPX0NIQU5ORUxfT1VUX1NURVJFTyIvPgogICAgICAgICA8L21peFBvcnQ+CisgICAgICAgIDxtaXhQb3J0IG5hbWU9ImxlIGF1ZGlvIGlucHV0IiByb2xlPSJzaW5rIj4KKyAgICAgICAgICAgIDxwcm9maWxlIG5hbWU9IiIgZm9ybWF0PSJBVURJT19GT1JNQVRfUENNXzE2X0JJVCIKKyAgICAgICAgICAgICAgICAgICAgIHNhbXBsaW5nUmF0ZXM9IjgwMDAgMTYwMDAgMjQwMDAgMzIwMDAgNDQxMDAgNDgwMDAiCisgICAgICAgICAgICAgICAgICAgICBjaGFubmVsTWFza3M9IkFVRElPX0NIQU5ORUxfSU5fTU9OTyBBVURJT19DSEFOTkVMX0lOX1NURVJFTyIvPgorICAgICAgICAgICAgPHByb2ZpbGUgbmFtZT0iIiBmb3JtYXQ9IkFVRElPX0ZPUk1BVF9QQ01fMjRfQklUX1BBQ0tFRCIKKyAgICAgICAgICAgICAgICAgICAgIHNhbXBsaW5nUmF0ZXM9IjgwMDAgMTYwMDAgMjQwMDAgMzIwMDAgNDQxMDAgNDgwMDAiCisgICAgICAgICAgICAgICAgICAgICBjaGFubmVsTWFza3M9IkFVRElPX0NIQU5ORUxfSU5fTU9OTyBBVURJT19DSEFOTkVMX0lOX1NURVJFTyIvPgorICAgICAgICAgICAgPHByb2ZpbGUgbmFtZT0iIiBmb3JtYXQ9IkFVRElPX0ZPUk1BVF9QQ01fMzJfQklUIgorICAgICAgICAgICAgICAgICAgICAgc2FtcGxpbmdSYXRlcz0iODAwMCAxNjAwMCAyNDAwMCAzMjAwMCA0NDEwMCA0ODAwMCIKKyAgICAgICAgICAgICAgICAgICAgIGNoYW5uZWxNYXNrcz0iQVVESU9fQ0hBTk5FTF9JTl9NT05PIEFVRElPX0NIQU5ORUxfSU5fU1RFUkVPIi8+CisgICAgICAgIDwvbWl4UG9ydD4KICAgICA8L21peFBvcnRzPgogICAgIDxkZXZpY2VQb3J0cz4KICAgICAgICAgPCEtLSBBMkRQIEF1ZGlvIFBvcnRzIC0tPgpAQCAtNDUsNiArNTYsNyBAQAogICAgICAgICA8IS0tIEJMRSBBdWRpbyBQb3J0cyAtLT4KICAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iQkxFIEhlYWRzZXQgT3V0IiB0eXBlPSJBVURJT19ERVZJQ0VfT1VUX0JMRV9IRUFEU0VUIiByb2xlPSJzaW5rIi8+CiAgICAgICAgIDxkZXZpY2VQb3J0IHRhZ05hbWU9IkJMRSBTcGVha2VyIE91dCIgdHlwZT0iQVVESU9fREVWSUNFX09VVF9CTEVfU1BFQUtFUiIgcm9sZT0ic2luayIvPgorICAgICAgICA8ZGV2aWNlUG9ydCB0YWdOYW1lPSJCTEUgSGVhZHNldCBJbiIgdHlwZT0iQVVESU9fREVWSUNFX0lOX0JMRV9IRUFEU0VUIiByb2xlPSJzb3VyY2UiLz4KICAgICA8L2RldmljZVBvcnRzPgogICAgIDxyb3V0ZXM+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJUIEEyRFAgT3V0IgpAQCAtNTcsNiArNjksOCBAQAogICAgICAgICAgICAgICAgc291cmNlcz0iaGVhcmluZyBhaWQgb3V0cHV0Ii8+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJMRSBIZWFkc2V0IE91dCIKICAgICAgICAgICAgICAgIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgorICAgICAgICA8cm91dGUgdHlwZT0ibWl4IiBzaW5rPSJsZSBhdWRpbyBpbnB1dCIKKyAgICAgICAgICAgICAgIHNvdXJjZXM9IkJMRSBIZWFkc2V0IEluIi8+CiAgICAgICAgIDxyb3V0ZSB0eXBlPSJtaXgiIHNpbms9IkJMRSBTcGVha2VyIE91dCIKICAgICAgICAgICAgICAgIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgogICAgIDwvcm91dGVzPgpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2xlX2F1ZGlvX3BvbGljeV9jb25maWd1cmF0aW9uLnhtbCBiL3NlcnZpY2VzL2F1ZGlvcG9saWN5L2NvbmZpZy9sZV9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbi54bWwKaW5kZXggYTNkYzcyYi4uZGNkZDgwNSAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9wb2xpY3kvY29uZmlnL2xlX2F1ZGlvX3BvbGljeV9jb25maWd1cmF0aW9uLnhtbAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9jb25maWcvbGVfYXVkaW9fcG9saWN5X2NvbmZpZ3VyYXRpb24ueG1sCkBAIC03LDEzICs3LDIwIEBACiAgICAgICAgICAgICAgICAgICAgICBzYW1wbGluZ1JhdGVzPSI4MDAwLDE2MDAwLDI0MDAwLDMyMDAwLDQ0MTAwLDQ4MDAwIgogICAgICAgICAgICAgICAgICAgICAgY2hhbm5lbE1hc2tzPSJBVURJT19DSEFOTkVMX09VVF9NT05PLEFVRElPX0NIQU5ORUxfT1VUX1NURVJFTyIvPgogICAgICAgICA8L21peFBvcnQ+CisgICAgICAgIDxtaXhQb3J0IG5hbWU9ImxlIGF1ZGlvIGlucHV0IiByb2xlPSJzaW5rIj4KKyAgICAgICAgICAgIDxwcm9maWxlIG5hbWU9IiIgZm9ybWF0PSJBVURJT19GT1JNQVRfUENNXzE2X0JJVCxBVURJT19GT1JNQVRfUENNXzI0X0JJVCxBVURJT19GT1JNQVRfUENNXzMyX0JJVCIKKyAgICAgICAgICAgICAgICAgICAgIHNhbXBsaW5nUmF0ZXM9IjgwMDAsMTYwMDAsMjQwMDAsMzIwMDAsNDQxMDAsNDgwMDAiCisgICAgICAgICAgICAgICAgICAgICBjaGFubmVsTWFza3M9IkFVRElPX0NIQU5ORUxfSU5fTU9OTyxBVURJT19DSEFOTkVMX0lOX1NURVJFTyIvPgorICAgICAgICA8L21peFBvcnQ+CiAgICAgPC9taXhQb3J0cz4KICAgICA8ZGV2aWNlUG9ydHM+CiAgICAgICAgIDxkZXZpY2VQb3J0IHRhZ05hbWU9IkJMRSBIZWFkc2V0IE91dCIgdHlwZT0iQVVESU9fREVWSUNFX09VVF9CTEVfSEVBRFNFVCIgcm9sZT0ic2luayIvPgogICAgICAgICA8ZGV2aWNlUG9ydCB0YWdOYW1lPSJCTEUgU3BlYWtlciBPdXQiIHR5cGU9IkFVRElPX0RFVklDRV9PVVRfQkxFX1NQRUFLRVIiIHJvbGU9InNpbmsiLz4KKyAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iQkxFIEhlYWRzZXQgSW4iIHR5cGU9IkFVRElPX0RFVklDRV9JTl9CTEVfSEVBRFNFVCIgcm9sZT0ic291cmNlIi8+CiAgICAgPC9kZXZpY2VQb3J0cz4KICAgICA8cm91dGVzPgogICAgICAgICA8cm91dGUgdHlwZT0ibWl4IiBzaW5rPSJCTEUgSGVhZHNldCBPdXQiIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgogICAgICAgICA8cm91dGUgdHlwZT0ibWl4IiBzaW5rPSJCTEUgU3BlYWtlciBPdXQiIHNvdXJjZXM9ImxlIGF1ZGlvIG91dHB1dCIvPgorICAgICAgICA8cm91dGUgdHlwZT0ibWl4IiBzaW5rPSJsZSBhdWRpbyBpbnB1dCIgc291cmNlcz0iQkxFIEhlYWRzZXQgSW4iLz4KICAgICA8L3JvdXRlcz4KIDwvbW9kdWxlPgpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvbWFuYWdlcmRlZmF1bHQvQXVkaW9Qb2xpY3lNYW5hZ2VyLmNwcCBiL3NlcnZpY2VzL2F1ZGlvcG9saWN5L21hbmFnZXJkZWZhdWx0L0F1ZGlvUG9saWN5TWFuYWdlci5jcHAKaW5kZXggZTMzNDUzMi4uNmY4MDk1MCAxMDA2NDQKLS0tIGEvc2VydmljZXMvYXVkaW9wb2xpY3kvbWFuYWdlcmRlZmF1bHQvQXVkaW9Qb2xpY3lNYW5hZ2VyLmNwcAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9tYW5hZ2VyZGVmYXVsdC9BdWRpb1BvbGljeU1hbmFnZXIuY3BwCkBAIC01MTg5LDkgKzUxODksOCBAQAogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgbUh3TW9kdWxlcy5wdXNoX2JhY2soaHdNb2R1bGUpOwotICAgICAgICAvLyBvcGVuIGFsbCBvdXRwdXQgc3RyZWFtcyBuZWVkZWQgdG8gYWNjZXNzIGF0dGFjaGVkIGRldmljZXMKLSAgICAgICAgLy8gZXhjZXB0IGZvciBkaXJlY3Qgb3V0cHV0IHN0cmVhbXMgdGhhdCBhcmUgb25seSBvcGVuZWQgd2hlbiB0aGV5IGFyZSBhY3R1YWxseQotICAgICAgICAvLyByZXF1aXJlZCBieSBhbiBhcHAuCisgICAgICAgIC8vIG9wZW4gYWxsIG91dHB1dCBzdHJlYW1zIG5lZWRlZCB0byBhY2Nlc3MgYXR0YWNoZWQgZGV2aWNlcy4KKyAgICAgICAgLy8gZGlyZWN0IG91dHB1dHMgYXJlIGNsb3NlZCBpbW1lZGlhdGVseSBhZnRlciBjaGVja2luZyB0aGUgYXZhaWxhYmlsaXR5IG9mIGF0dGFjaGVkIGRldmljZXMKICAgICAgICAgLy8gVGhpcyBhbHNvIHZhbGlkYXRlcyBtQXZhaWxhYmxlT3V0cHV0RGV2aWNlcyBsaXN0CiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgb3V0UHJvZmlsZSA6IGh3TW9kdWxlLT5nZXRPdXRwdXRQcm9maWxlcygpKSB7CiAgICAgICAgICAgICBpZiAoIW91dFByb2ZpbGUtPmNhbk9wZW5OZXdJbygpKSB7CkBAIC01NDU2LDcgKzU0NTUsOCBAQAogICAgICAgICAgICAgaWYgKCFkZXNjLT5pc0R1cGxpY2F0ZWQoKSkgewogICAgICAgICAgICAgICAgIC8vIGV4YWN0IG1hdGNoIG9uIGRldmljZQogICAgICAgICAgICAgICAgIGlmIChkZXZpY2VfZGlzdGluZ3Vpc2hlc19vbl9hZGRyZXNzKGRldmljZVR5cGUpICYmIGRlc2MtPnN1cHBvcnRzRGV2aWNlKGRldmljZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICYmIGRlc2MtPmNvbnRhaW5zU2luZ2xlRGV2aWNlU3VwcG9ydGluZ0VuY29kZWRGb3JtYXRzKGRldmljZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICYmIGRlc2MtPmNvbnRhaW5zU2luZ2xlRGV2aWNlU3VwcG9ydGluZ0VuY29kZWRGb3JtYXRzKGRldmljZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICYmICFtQXZhaWxhYmxlT3V0cHV0RGV2aWNlcy5jb250YWluc0F0TGVhc3RPbmUoZGVzYy0+c3VwcG9ydGVkRGV2aWNlcygpKSkgewogICAgICAgICAgICAgICAgICAgICBvdXRwdXRzLmFkZChtT3V0cHV0cy5rZXlBdChpKSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICghbUF2YWlsYWJsZU91dHB1dERldmljZXMuY29udGFpbnNBdExlYXN0T25lKGRlc2MtPnN1cHBvcnRlZERldmljZXMoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgQUxPR1YoImNoZWNrT3V0cHV0c0ZvckRldmljZSgpOiBkaXNjb25uZWN0aW5nIGFkZGluZyBvdXRwdXQgJWQiLApkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvc2VydmljZS9BbmRyb2lkLmJwIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvc2VydmljZS9BbmRyb2lkLmJwCmluZGV4IDE5N2YxODMuLmYzZDRmMmYgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L3NlcnZpY2UvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS9zZXJ2aWNlL0FuZHJvaWQuYnAKQEAgLTU1LDYgKzU1LDcgQEAKICAgICAgICAgImF1ZGlvcG9saWN5LXR5cGVzLWFpZGwtY3BwIiwKICAgICAgICAgImNhcHR1cmVfc3RhdGVfbGlzdGVuZXItYWlkbC1jcHAiLAogICAgICAgICAiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgICAgICAic3BhdGlhbGl6ZXItYWlkbC1jcHAiLAogICAgIF0sCiAKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L3Rlc3RzL2F1ZGlvcG9saWN5bWFuYWdlcl90ZXN0cy5jcHAgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS90ZXN0cy9hdWRpb3BvbGljeW1hbmFnZXJfdGVzdHMuY3BwCmluZGV4IGExNmFiN2QuLjlkMmQyYjMgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L3Rlc3RzL2F1ZGlvcG9saWN5bWFuYWdlcl90ZXN0cy5jcHAKKysrIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvdGVzdHMvYXVkaW9wb2xpY3ltYW5hZ2VyX3Rlc3RzLmNwcApAQCAtMTM3NSw3ICsxMzc1LDggQEAKICAgICBpZiAodHlwZSA9PSBBVURJT19ERVZJQ0VfT1VUX0hETUkpIHsKICAgICAgICAgLy8gU2V0IGRldmljZSBjb25uZWN0aW9uIHN0YXRlIGZhaWxlZCBkdWUgdG8gbm8gZGV2aWNlIGRlc2NyaXB0b3IgZm91bmQKICAgICAgICAgLy8gRm9yIEhETUkgY2FzZSwgaXQgaXMgZWFzaWVyIHRvIHNpbXVsYXRlIGRldmljZSBkZXNjcmlwdG9yIG5vdCBmb3VuZCBlcnJvcgotICAgICAgICAvLyBieSB1c2luZyBhIHVuZGVjbGFyZWQgZW5jb2RlZCBmb3JtYXQuCisgICAgICAgIC8vIGJ5IHVzaW5nIGFuIGVuY29kZWQgZm9ybWF0IHdoaWNoIGlzbid0IGxpc3RlZCBpbiB0aGUgJ2VuY29kZWRGb3JtYXRzJworICAgICAgICAvLyBhdHRyaWJ1dGUgZm9yIHRoaXMgZGV2aWNlUG9ydC4KICAgICAgICAgQVNTRVJUX0VRKElOVkFMSURfT1BFUkFUSU9OLCBtTWFuYWdlci0+c2V0RGV2aWNlQ29ubmVjdGlvblN0YXRlKAogICAgICAgICAgICAgICAgIHR5cGUsIEFVRElPX1BPTElDWV9ERVZJQ0VfU1RBVEVfQVZBSUxBQkxFLAogICAgICAgICAgICAgICAgIGFkZHJlc3MuY19zdHIoKSwgbmFtZS5jX3N0cigpLCBBVURJT19GT1JNQVRfTUFUXzJfMSkpOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9wb2xpY3kvdGVzdHMvcmVzb3VyY2VzL3Rlc3RfYXVkaW9fcG9saWN5X2NvbmZpZ3VyYXRpb24ueG1sIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvdGVzdHMvcmVzb3VyY2VzL3Rlc3RfYXVkaW9fcG9saWN5X2NvbmZpZ3VyYXRpb24ueG1sCmluZGV4IDg3ZjBhYjkuLjQxZWQ3MGMgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvcG9saWN5L3Rlc3RzL3Jlc291cmNlcy90ZXN0X2F1ZGlvX3BvbGljeV9jb25maWd1cmF0aW9uLnhtbAorKysgYi9zZXJ2aWNlcy9hdWRpb3BvbGljeS90ZXN0cy9yZXNvdXJjZXMvdGVzdF9hdWRpb19wb2xpY3lfY29uZmlndXJhdGlvbi54bWwKQEAgLTUwLDcgKzUwLDggQEAKICAgICAgICAgICAgICAgICA8L2RldmljZVBvcnQ+CiAgICAgICAgICAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iQnVpbHQtSW4gTWljIiB0eXBlPSJBVURJT19ERVZJQ0VfSU5fQlVJTFRJTl9NSUMiIHJvbGU9InNvdXJjZSI+CiAgICAgICAgICAgICAgICAgPC9kZXZpY2VQb3J0PgotICAgICAgICAgICAgICAgIDxkZXZpY2VQb3J0IHRhZ05hbWU9IkhkbWkiIHR5cGU9IkFVRElPX0RFVklDRV9PVVRfSERNSSIgcm9sZT0ic2luayI+CisgICAgICAgICAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iSGRtaSIgdHlwZT0iQVVESU9fREVWSUNFX09VVF9IRE1JIiByb2xlPSJzaW5rIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuY29kZWRGb3JtYXRzPSJBVURJT19GT1JNQVRfQUMzIj4KICAgICAgICAgICAgICAgICA8L2RldmljZVBvcnQ+CiAgICAgICAgICAgICAgICAgPGRldmljZVBvcnQgdGFnTmFtZT0iSGRtaS1JbiBNaWMiIHR5cGU9IkFVRElPX0RFVklDRV9JTl9IRE1JIiByb2xlPSJzb3VyY2UiPgogICAgICAgICAgICAgICAgIDwvZGV2aWNlUG9ydD4KZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuY3BwIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQ2FtZXJhU2VydmljZS5jcHAKaW5kZXggN2RkODM3NC4uNGQ1NWEwNyAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQ2FtZXJhU2VydmljZS5jcHAKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQ2FtZXJhU2VydmljZS5jcHAKQEAgLTU2MCw2ICs1NjAsMTMgQEAKICAgICBvblRvcmNoU3RhdHVzQ2hhbmdlZExvY2tlZChjYW1lcmFJZCwgbmV3U3RhdHVzLCBzeXN0ZW1DYW1lcmFLaW5kKTsKIH0KIAorCit2b2lkIENhbWVyYVNlcnZpY2U6Om9uVG9yY2hTdGF0dXNDaGFuZ2VkKGNvbnN0IFN0cmluZzgmIGNhbWVyYUlkLAorICAgICAgICBUb3JjaE1vZGVTdGF0dXMgbmV3U3RhdHVzLCBTeXN0ZW1DYW1lcmFLaW5kIHN5c3RlbUNhbWVyYUtpbmQpIHsKKyAgICBNdXRleDo6QXV0b2xvY2sgYWwobVRvcmNoU3RhdHVzTXV0ZXgpOworICAgIG9uVG9yY2hTdGF0dXNDaGFuZ2VkTG9ja2VkKGNhbWVyYUlkLCBuZXdTdGF0dXMsIHN5c3RlbUNhbWVyYUtpbmQpOworfQorCiB2b2lkIENhbWVyYVNlcnZpY2U6Om9uVG9yY2hTdGF0dXNDaGFuZ2VkTG9ja2VkKGNvbnN0IFN0cmluZzgmIGNhbWVyYUlkLAogICAgICAgICBUb3JjaE1vZGVTdGF0dXMgbmV3U3RhdHVzLCBTeXN0ZW1DYW1lcmFLaW5kIHN5c3RlbUNhbWVyYUtpbmQpIHsKICAgICBBTE9HSSgiJXM6IFRvcmNoIHN0YXR1cyBjaGFuZ2VkIGZvciBjYW1lcmFJZD0lcywgbmV3U3RhdHVzPSVkIiwKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuaCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuaAppbmRleCBiYzJlMzQ3Li42OWU3NTNiIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9DYW1lcmFTZXJ2aWNlLmgKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQ2FtZXJhU2VydmljZS5oCkBAIC0xMTAsOCArMTEwLDE2IEBACiAgICAgdmlydHVhbCB2b2lkICAgICAgICBvbkRldmljZVN0YXR1c0NoYW5nZWQoY29uc3QgU3RyaW5nOCAmY2FtZXJhSWQsCiAgICAgICAgICAgICBjb25zdCBTdHJpbmc4ICZwaHlzaWNhbENhbWVyYUlkLAogICAgICAgICAgICAgaGFyZHdhcmU6OmNhbWVyYTo6Y29tbW9uOjpWMV8wOjpDYW1lcmFEZXZpY2VTdGF0dXMgbmV3SGFsU3RhdHVzKSBvdmVycmlkZTsKKyAgICAvLyBUaGlzIG1ldGhvZCBtYXkgaG9sZCBDYW1lcmFQcm92aWRlck1hbmFnZXI6Om1JbnRlcmZhY2VNdXRleCBhcyBhIHBhcnQKKyAgICAvLyBvZiBjYWxsaW5nIGdldFN5c3RlbUNhbWVyYUtpbmQoKSBpbnRlcm5hbGx5LiBDYXJlIHNob3VsZCBiZSB0YWtlbiBub3QgdG8KKyAgICAvLyBkaXJlY3RseSAvIGluZGlyZWN0bHkgY2FsbCB0aGlzIGZyb20gY2FsbGVycyB3aG8gYWxzbyBob2xkCisgICAgLy8gbUludGVyZmFjZU11dGV4LgogICAgIHZpcnR1YWwgdm9pZCAgICAgICAgb25Ub3JjaFN0YXR1c0NoYW5nZWQoY29uc3QgU3RyaW5nOCYgY2FtZXJhSWQsCiAgICAgICAgICAgICBoYXJkd2FyZTo6Y2FtZXJhOjpjb21tb246OlYxXzA6OlRvcmNoTW9kZVN0YXR1cyBuZXdTdGF0dXMpIG92ZXJyaWRlOworICAgIC8vIERvZXMgbm90IGhvbGQgQ2FtZXJhUHJvdmlkZXJNYW5hZ2VyOjptSW50ZXJmYWNlTXV0ZXguCisgICAgdmlydHVhbCB2b2lkICAgICAgICBvblRvcmNoU3RhdHVzQ2hhbmdlZChjb25zdCBTdHJpbmc4JiBjYW1lcmFJZCwKKyAgICAgICAgICAgIGhhcmR3YXJlOjpjYW1lcmE6OmNvbW1vbjo6VjFfMDo6VG9yY2hNb2RlU3RhdHVzIG5ld1N0YXR1cywKKyAgICAgICAgICAgIFN5c3RlbUNhbWVyYUtpbmQga2luZCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkICAgICAgICBvbk5ld1Byb3ZpZGVyUmVnaXN0ZXJlZCgpIG92ZXJyaWRlOwogCiAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9jb21tb24vQ2FtZXJhUHJvdmlkZXJNYW5hZ2VyLmNwcCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFQcm92aWRlck1hbmFnZXIuY3BwCmluZGV4IDJmNzRkZjkuLjBjY2UyY2EgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFQcm92aWRlck1hbmFnZXIuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFQcm92aWRlck1hbmFnZXIuY3BwCkBAIC0xOTYwLDE2ICsxOTYwLDE5IEBACiAgICAgICAgIGNvbnN0IGhhcmR3YXJlOjpoaWRsX3N0cmluZyYgY2FtZXJhRGV2aWNlTmFtZSwKICAgICAgICAgVG9yY2hNb2RlU3RhdHVzIG5ld1N0YXR1cykgewogICAgIHNwPFN0YXR1c0xpc3RlbmVyPiBsaXN0ZW5lcjsKKyAgICBTeXN0ZW1DYW1lcmFLaW5kIHN5c3RlbUNhbWVyYUtpbmQgPSBTeXN0ZW1DYW1lcmFLaW5kOjpQVUJMSUM7CiAgICAgc3RkOjpzdHJpbmcgaWQ7CisgICAgYm9vbCBrbm93biA9IGZhbHNlOwogICAgIHsKLSAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobU1hbmFnZXItPm1TdGF0dXNMaXN0ZW5lck11dGV4KTsKLSAgICAgICAgYm9vbCBrbm93biA9IGZhbHNlOworICAgICAgICAvLyBIb2xkIG1Mb2NrIGZvciBhY2Nlc3NpbmcgbURldmljZXMKKyAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobUxvY2spOwogICAgICAgICBmb3IgKGF1dG8mIGRldmljZUluZm8gOiBtRGV2aWNlcykgewogICAgICAgICAgICAgaWYgKGRldmljZUluZm8tPm1OYW1lID09IGNhbWVyYURldmljZU5hbWUpIHsKICAgICAgICAgICAgICAgICBBTE9HSSgiQ2FtZXJhIGRldmljZSAlcyB0b3JjaCBzdGF0dXMgaXMgbm93ICVzIiwgY2FtZXJhRGV2aWNlTmFtZS5jX3N0cigpLAogICAgICAgICAgICAgICAgICAgICAgICAgdG9yY2hTdGF0dXNUb1N0cmluZyhuZXdTdGF0dXMpKTsKICAgICAgICAgICAgICAgICBpZCA9IGRldmljZUluZm8tPm1JZDsKICAgICAgICAgICAgICAgICBrbm93biA9IHRydWU7CisgICAgICAgICAgICAgICAgc3lzdGVtQ2FtZXJhS2luZCA9IGRldmljZUluZm8tPm1TeXN0ZW1DYW1lcmFLaW5kOwogICAgICAgICAgICAgICAgIGlmIChUb3JjaE1vZGVTdGF0dXM6OkFWQUlMQUJMRV9PTiAhPSBuZXdTdGF0dXMpIHsKICAgICAgICAgICAgICAgICAgICAgbU1hbmFnZXItPnJlbW92ZVJlZihEZXZpY2VNb2RlOjpUT1JDSCwgaWQpOwogICAgICAgICAgICAgICAgIH0KQEAgLTE5ODEsMTEgKzE5ODQsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgbVByb3ZpZGVyTmFtZS5jX3N0cigpLCBjYW1lcmFEZXZpY2VOYW1lLmNfc3RyKCksIG5ld1N0YXR1cyk7CiAgICAgICAgICAgICByZXR1cm4gaGFyZHdhcmU6OlZvaWQoKTsKICAgICAgICAgfQorICAgICAgICAvLyBubyBsb2NrIG5lZWRlZCBzaW5jZSBsaXN0ZW5lciBpcyBzZXQgdXAgb25seSBvbmNlIGR1cmluZworICAgICAgICAvLyBDYW1lcmFQcm92aWRlck1hbmFnZXIgaW5pdGlhbGl6YXRpb24gYW5kIHRoZW4gbmV2ZXIgY2hhbmdlZCB0aWxsIGl0IGlzCisgICAgICAgIC8vIGRlc3RydWN0ZWQuCiAgICAgICAgIGxpc3RlbmVyID0gbU1hbmFnZXItPmdldFN0YXR1c0xpc3RlbmVyKCk7Ci0gICAgfQorICAgICB9CiAgICAgLy8gQ2FsbCB3aXRob3V0IGxvY2sgaGVsZCB0byBhbGxvdyByZWVudHJhbmN5IGludG8gcHJvdmlkZXIgbWFuYWdlcgorICAgIC8vIFRoZSBwcm9ibGVtIHdpdGggaG9sZGluZyBtTG9jayBoZXJlIGlzIHRoYXQgd2UKKyAgICAvLyBtaWdodCBiZSBsaW1pdGluZyByZS1lbnRyYW5jeSA6IENhbWVyYVNlcnZpY2U6Om9uVG9yY2hTdGF0dXNDaGFuZ2VkIGNhbGxzCisgICAgLy8gYmFjayBpbnRvIENhbWVyYVByb3ZpZGVyTWFuYWdlciB3aGljaCBtaWdodCB0cnkgdG8gaG9sZCBtTG9jayBhZ2FpbiAoZWc6CisgICAgLy8gZmluZERldmljZUluZm8sIHdoaWNoIHNob3VsZCBiZSBob2xkaW5nIG1Mb2NrIHdoaWxlIGl0ZXJhdGluZyB0aHJvdWdoCisgICAgLy8gZWFjaCBwcm92aWRlcidzIGRldmljZXMpLgogICAgIGlmIChsaXN0ZW5lciAhPSBudWxscHRyKSB7Ci0gICAgICAgIGxpc3RlbmVyLT5vblRvcmNoU3RhdHVzQ2hhbmdlZChTdHJpbmc4KGlkLmNfc3RyKCkpLCBuZXdTdGF0dXMpOworICAgICAgICBsaXN0ZW5lci0+b25Ub3JjaFN0YXR1c0NoYW5nZWQoU3RyaW5nOChpZC5jX3N0cigpKSwgbmV3U3RhdHVzLCBzeXN0ZW1DYW1lcmFLaW5kKTsKICAgICB9CiAgICAgcmV0dXJuIGhhcmR3YXJlOjpWb2lkKCk7CiB9CmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9jb21tb24vQ2FtZXJhUHJvdmlkZXJNYW5hZ2VyLmggYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9jb21tb24vQ2FtZXJhUHJvdmlkZXJNYW5hZ2VyLmgKaW5kZXggZTM3NjNhMS4uZmRiMjY3MyAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvY29tbW9uL0NhbWVyYVByb3ZpZGVyTWFuYWdlci5oCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFQcm92aWRlck1hbmFnZXIuaApAQCAtMTU1LDYgKzE1NSw5IEBACiAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nOCAmcGh5c2ljYWxDYW1lcmFJZCwKICAgICAgICAgICAgICAgICBoYXJkd2FyZTo6Y2FtZXJhOjpjb21tb246OlYxXzA6OkNhbWVyYURldmljZVN0YXR1cyBuZXdTdGF0dXMpID0gMDsKICAgICAgICAgdmlydHVhbCB2b2lkIG9uVG9yY2hTdGF0dXNDaGFuZ2VkKGNvbnN0IFN0cmluZzggJmNhbWVyYUlkLAorICAgICAgICAgICAgICAgIGhhcmR3YXJlOjpjYW1lcmE6OmNvbW1vbjo6VjFfMDo6VG9yY2hNb2RlU3RhdHVzIG5ld1N0YXR1cywKKyAgICAgICAgICAgICAgICBTeXN0ZW1DYW1lcmFLaW5kIGtpbmQpID0gMDsKKyAgICAgICAgdmlydHVhbCB2b2lkIG9uVG9yY2hTdGF0dXNDaGFuZ2VkKGNvbnN0IFN0cmluZzggJmNhbWVyYUlkLAogICAgICAgICAgICAgICAgIGhhcmR3YXJlOjpjYW1lcmE6OmNvbW1vbjo6VjFfMDo6VG9yY2hNb2RlU3RhdHVzIG5ld1N0YXR1cykgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgb25OZXdQcm92aWRlclJlZ2lzdGVyZWQoKSA9IDA7CiAgICAgfTsKQEAgLTMyOSw4ICszMzIsNiBAQAogICAgIC8vIEFsbCBwcml2YXRlIG1lbWJlcnMsIHVubGVzcyBvdGhlcndpc2Ugbm90ZWQsIGV4cGVjdCBtSW50ZXJmYWNlTXV0ZXggdG8gYmUgbG9ja2VkIGJlZm9yZSB1c2UKICAgICBtdXRhYmxlIHN0ZDo6bXV0ZXggbUludGVyZmFjZU11dGV4OwogCi0gICAgLy8gdGhlIHN0YXR1cyBsaXN0ZW5lciB1cGRhdGUgY2FsbGJhY2tzIHdpbGwgbG9jayBtU3RhdHVzTXV0ZXgKLSAgICBtdXRhYmxlIHN0ZDo6bXV0ZXggbVN0YXR1c0xpc3RlbmVyTXV0ZXg7CiAgICAgd3A8U3RhdHVzTGlzdGVuZXI+IG1MaXN0ZW5lcjsKICAgICBTZXJ2aWNlSW50ZXJhY3Rpb25Qcm94eSogbVNlcnZpY2VQcm94eTsKIApkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvdGVzdHMvQ2FtZXJhUHJvdmlkZXJNYW5hZ2VyVGVzdC5jcHAgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS90ZXN0cy9DYW1lcmFQcm92aWRlck1hbmFnZXJUZXN0LmNwcAppbmRleCBhNzRmZDlkLi5jOGE2YjMyIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS90ZXN0cy9DYW1lcmFQcm92aWRlck1hbmFnZXJUZXN0LmNwcAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS90ZXN0cy9DYW1lcmFQcm92aWRlck1hbmFnZXJUZXN0LmNwcApAQCAtMjc0LDYgKzI3NCw4IEBACiAgICAgICAgICAgICBoYXJkd2FyZTo6Y2FtZXJhOjpjb21tb246OlYxXzA6OkNhbWVyYURldmljZVN0YXR1cykgb3ZlcnJpZGUge30KICAgICB2b2lkIG9uVG9yY2hTdGF0dXNDaGFuZ2VkKGNvbnN0IFN0cmluZzggJiwKICAgICAgICAgICAgIGhhcmR3YXJlOjpjYW1lcmE6OmNvbW1vbjo6VjFfMDo6VG9yY2hNb2RlU3RhdHVzKSBvdmVycmlkZSB7fQorICAgIHZvaWQgb25Ub3JjaFN0YXR1c0NoYW5nZWQoY29uc3QgU3RyaW5nOCAmLAorICAgICAgICAgICAgaGFyZHdhcmU6OmNhbWVyYTo6Y29tbW9uOjpWMV8wOjpUb3JjaE1vZGVTdGF0dXMsIFN5c3RlbUNhbWVyYUtpbmQpIG92ZXJyaWRlIHt9CiAgICAgdm9pZCBvbk5ld1Byb3ZpZGVyUmVnaXN0ZXJlZCgpIG92ZXJyaWRlIHt9CiB9OwogCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9tZWRpYWNvZGVjL09XTkVSUyBiL3NlcnZpY2VzL21lZGlhY29kZWMvT1dORVJTCmluZGV4IGM3MTZjY2UuLjM0NTNhNzYgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhY29kZWMvT1dORVJTCisrKyBiL3NlcnZpY2VzL21lZGlhY29kZWMvT1dORVJTCkBAIC0xLDIgKzEsMyBAQAogamVmZnZAZ29vZ2xlLmNvbQotbWFyY29uZUBnb29nbGUuY29tCitlc3NpY2tAZ29vZ2xlLmNvbQord29uc2lrQGdvb2dsZS5jb20KZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhY29kZWMvYW5kcm9pZC5oYXJkd2FyZS5tZWRpYS5vbXhAMS4wLXNlcnZpY2UucmMgYi9zZXJ2aWNlcy9tZWRpYWNvZGVjL2FuZHJvaWQuaGFyZHdhcmUubWVkaWEub214QDEuMC1zZXJ2aWNlLnJjCmluZGV4IDNlZjlhODUuLjg0NWU1Y2MgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhY29kZWMvYW5kcm9pZC5oYXJkd2FyZS5tZWRpYS5vbXhAMS4wLXNlcnZpY2UucmMKKysrIGIvc2VydmljZXMvbWVkaWFjb2RlYy9hbmRyb2lkLmhhcmR3YXJlLm1lZGlhLm9teEAxLjAtc2VydmljZS5yYwpAQCAtMyw0ICszLDQgQEAKICAgICB1c2VyIG1lZGlhY29kZWMKICAgICBncm91cCBjYW1lcmEgZHJtcnBjIG1lZGlhZHJtCiAgICAgaW9wcmlvIHJ0IDQKLSAgICB3cml0ZXBpZCAvZGV2L2NwdXNldC9mb3JlZ3JvdW5kL3Rhc2tzCisgICAgdGFza19wcm9maWxlcyBQcm9jZXNzQ2FwYWNpdHlIaWdoCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9tZWRpYWNvZGVjL3JlZ2lzdHJhbnQvQW5kcm9pZC5icCBiL3NlcnZpY2VzL21lZGlhY29kZWMvcmVnaXN0cmFudC9BbmRyb2lkLmJwCmluZGV4IDY5NmI5NjcuLmQxMGUzMzkgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhY29kZWMvcmVnaXN0cmFudC9BbmRyb2lkLmJwCisrKyBiL3NlcnZpY2VzL21lZGlhY29kZWMvcmVnaXN0cmFudC9BbmRyb2lkLmJwCkBAIC03LDcgKzcsNyBAQAogICAgIGRlZmF1bHRfYXBwbGljYWJsZV9saWNlbnNlczogWyJmcmFtZXdvcmtzX2F2X3NlcnZpY2VzX21lZGlhY29kZWNfbGljZW5zZSJdLAogfQogCi1jY19saWJyYXJ5X3NoYXJlZCB7CitjY19saWJyYXJ5IHsKICAgICBuYW1lOiAibGlibWVkaWFfY29kZWNzZXJ2aWNlcmVnaXN0cmFudCIsCiAgICAgdmVuZG9yX2F2YWlsYWJsZTogdHJ1ZSwKICAgICBzcmNzOiBbCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9tZWRpYWNvZGVjL3JlZ2lzdHJhbnQvZnV6emVyL0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYWNvZGVjL3JlZ2lzdHJhbnQvZnV6emVyL0FuZHJvaWQuYnAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDNhZmJmMQotLS0gL2Rldi9udWxsCisrKyBiL3NlcnZpY2VzL21lZGlhY29kZWMvcmVnaXN0cmFudC9mdXp6ZXIvQW5kcm9pZC5icApAQCAtMCwwICsxLDQ2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDIxIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyAqCisgKiBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyAqIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyAqIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdDoKKyAqCisgKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworCitwYWNrYWdlIHsKKyAgICAvLyBTZWU6IGh0dHA6Ly9nby9hbmRyb2lkLWxpY2Vuc2UtZmFxCisgICAgLy8gQSBsYXJnZS1zY2FsZS1jaGFuZ2UgYWRkZWQgJ2RlZmF1bHRfYXBwbGljYWJsZV9saWNlbnNlcycgdG8gaW1wb3J0CisgICAgLy8gYWxsIG9mIHRoZSAnbGljZW5zZV9raW5kcycgZnJvbSAiZnJhbWV3b3Jrc19hdl9zZXJ2aWNlc19tZWRpYWNvZGVjX2xpY2Vuc2UiCisgICAgLy8gdG8gZ2V0IHRoZSBiZWxvdyBsaWNlbnNlIGtpbmRzOgorICAgIC8vICAgU1BEWC1saWNlbnNlLWlkZW50aWZpZXItQXBhY2hlLTIuMAorICAgIGRlZmF1bHRfYXBwbGljYWJsZV9saWNlbnNlczogWyJmcmFtZXdvcmtzX2F2X3NlcnZpY2VzX21lZGlhY29kZWNfbGljZW5zZSJdLAorfQorCitjY19mdXp6IHsKKyAgICBuYW1lOiAiY29kZWNTZXJ2aWNlUmVnaXN0cmFudF9mdXp6ZXIiLAorICAgIHNyY3M6IFsKKyAgICAgICAgImNvZGVjU2VydmljZVJlZ2lzdHJhbnRfZnV6emVyLmNwcCIsCisgICAgXSwKKyAgICBzdGF0aWNfbGliczogWworICAgICAgICAibGlibWVkaWFfY29kZWNzZXJ2aWNlcmVnaXN0cmFudCIsCisgICAgXSwKKyAgICBoZWFkZXJfbGliczogWworICAgICAgICAibGlibWVkaWFfaGVhZGVycyIsCisgICAgXSwKKyAgICBkZWZhdWx0czogWworICAgICAgICAibGliY29kZWMyLWhpZGwtZGVmYXVsdHMiLAorICAgIF0sCisgICAgZnV6el9jb25maWc6IHsKKyAgICAgICAgY2M6IFsKKyAgICAgICAgICAgICJhbmRyb2lkLW1lZGlhLWZ1enppbmctcmVwb3J0c0Bnb29nbGUuY29tIiwKKyAgICAgICAgXSwKKyAgICAgICAgY29tcG9uZW50aWQ6IDE1NTI3NiwKKyAgICB9LAorfQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFjb2RlYy9yZWdpc3RyYW50L2Z1enplci9SRUFETUUubWQgYi9zZXJ2aWNlcy9tZWRpYWNvZGVjL3JlZ2lzdHJhbnQvZnV6emVyL1JFQURNRS5tZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZmZhMDYzCi0tLSAvZGV2L251bGwKKysrIGIvc2VydmljZXMvbWVkaWFjb2RlYy9yZWdpc3RyYW50L2Z1enplci9SRUFETUUubWQKQEAgLTAsMCArMSw1NiBAQAorIyBGdXp6ZXIgZm9yIGxpYm1lZGlhX2NvZGVjc2VydmljZXJlZ2lzdHJhbnQKKworIyMgUGx1Z2luIERlc2lnbiBDb25zaWRlcmF0aW9ucworVGhlIGZ1enplciBwbHVnaW4gZm9yIGxpYm1lZGlhX2NvZGVjc2VydmljZXJlZ2lzdHJhbnQgaXMgZGVzaWduZWQgYmFzZWQgb24gdGhlIHVuZGVyc3RhbmRpbmcgb2YgdGhlIGxpYnJhcnkgYW5kIHRyaWVzIHRvIGFjaGlldmUgdGhlIGZvbGxvd2luZzoKKworIyMjIyMgTWF4aW1pemUgY29kZSBjb3ZlcmFnZQorVGhlIGNvbmZpZ3VyYXRpb24gcGFyYW1ldGVycyBhcmUgbm90IGhhcmRjb2RlZCwgYnV0IGluc3RlYWQgc2VsZWN0ZWQgYmFzZWQgb24KK2luY29taW5nIGRhdGEuIFRoaXMgZW5zdXJlcyBtb3JlIGNvZGUgcGF0aHMgYXJlIHJlYWNoZWQgYnkgdGhlIGZ1enplci4KKworbGlibWVkaWFfY29kZWNzZXJ2aWNlcmVnaXN0cmFudCBzdXBwb3J0cyB0aGUgZm9sbG93aW5nIHBhcmFtZXRlcnM6CisxLiBDMlN0cmluZyAocGFyYW1ldGVyIG5hbWU6IGBjMlN0cmluZ2ApCisyLiBXaWR0aCAocGFyYW1ldGVyIG5hbWU6IGB3aWR0aGApCiszLiBIZWlnaHQgKHBhcmFtZXRlciBuYW1lOiBgaGVpZ2h0YCkKKzQuIFNhbXBsaW5nUmF0ZSAocGFyYW1ldGVyIG5hbWU6IGBzYW1wbGluZ1JhdGVgKQorNS4gQ2hhbm5lbHMgKHBhcmFtZXRlciBuYW1lOiBgY2hhbm5lbHNgKQorNi4gU3RyZWFtIChwYXJhbWV0ZXIgbmFtZTogYHN0cmVhbWApCisKK3wgUGFyYW1ldGVyfCBWYWxpZCBWYWx1ZXN8IENvbmZpZ3VyZWQgVmFsdWV8Cit8LS0tLS0tLS0tLS0tLSB8LS0tLS0tLS0tLS0tLXwgLS0tLS0gfAorfCBgYzJTdHJpbmdgIHxgU3RyaW5nYCB8IFZhbHVlIG9idGFpbmVkIGZyb20gRnV6emVkRGF0YVByb3ZpZGVyfAorfCBgd2lkdGhgIHxgVUlOVDMyX01JTmAgdG8gYFVJTlQzMl9NQVhgIHwgVmFsdWUgb2J0YWluZWQgZnJvbSBGdXp6ZWREYXRhUHJvdmlkZXJ8Cit8IGBoZWlnaHRgIHxgVUlOVDMyX01JTmAgdG8gYFVJTlQzMl9NQVhgIHwgVmFsdWUgb2J0YWluZWQgZnJvbSBGdXp6ZWREYXRhUHJvdmlkZXJ8Cit8IGBzYW1wbGluZ1JhdGVgIHxgVUlOVDMyX01JTmAgdG8gYFVJTlQzMl9NQVhgIHwgVmFsdWUgb2J0YWluZWQgZnJvbSBGdXp6ZWREYXRhUHJvdmlkZXJ8Cit8IGBjaGFubmVsc2AgfGBVSU5UMzJfTUlOYCB0byBgVUlOVDMyX01BWGAgfCBWYWx1ZSBvYnRhaW5lZCBmcm9tIEZ1enplZERhdGFQcm92aWRlcnwKK3wgYHN0cmVhbWAgfGBVSU5UMzJfTUlOYCB0byBgVUlOVDMyX01BWGAgfCBWYWx1ZSBvYnRhaW5lZCBmcm9tIEZ1enplZERhdGFQcm92aWRlcnwKKworVGhpcyBhbHNvIGVuc3VyZXMgdGhhdCB0aGUgcGx1Z2luIGlzIGFsd2F5cyBkZXRlcm1pbmlzdGljIGZvciBhbnkgZ2l2ZW4gaW5wdXQuCisKKyMjIyMjIE1heGltaXplIHV0aWxpemF0aW9uIG9mIGlucHV0IGRhdGEKK1RoZSBwbHVnaW4gZmVlZHMgdGhlIGVudGlyZSBpbnB1dCBkYXRhIHRvIHRoZSBsaWJtZWRpYV9jb2RlY3NlcnZpY2VyZWdpc3RyYW50IG1vZHVsZS4KK1RoaXMgZW5zdXJlcyB0aGF0IHRoZSBwbHVnaW4gdG9sZXJhdGVzIGFueSBraW5kIG9mIGlucHV0IChlbXB0eSwgaHVnZSwKK21hbGZvcm1lZCwgZXRjKSBhbmQgZG9lc250IGBleGl0KClgIG9uIGFueSBpbnB1dCBhbmQgdGhlcmVieSBpbmNyZWFzaW5nIHRoZQorY2hhbmNlIG9mIGlkZW50aWZ5aW5nIHZ1bG5lcmFiaWxpdGllcy4KKworIyMgQnVpbGQKKworVGhpcyBkZXNjcmliZXMgc3RlcHMgdG8gYnVpbGQgY29kZWNTZXJ2aWNlUmVnaXN0cmFudF9mdXp6ZXIgYmluYXJ5LgorCisjIyMgQW5kcm9pZAorCisjIyMjIFN0ZXBzIHRvIGJ1aWxkCitCdWlsZCB0aGUgZnV6emVyCitgYGAKKyAgJCBtbSAtaiQobnByb2MpIGNvZGVjU2VydmljZVJlZ2lzdHJhbnRfZnV6emVyCitgYGAKKyMjIyMgU3RlcHMgdG8gcnVuCisKK1RvIHJ1biBvbiBkZXZpY2UKK2BgYAorICAkIGFkYiBzeW5jIGRhdGEKKyAgJCBhZGIgc2hlbGwgL2RhdGEvZnV6ei8ke1RBUkdFVF9BUkNIfS9jb2RlY1NlcnZpY2VSZWdpc3RyYW50X2Z1enplci9jb2RlY1NlcnZpY2VSZWdpc3RyYW50X2Z1enplcgorYGBgCisKKyMjIFJlZmVyZW5jZXM6CisgKiBodHRwOi8vbGx2bS5vcmcvZG9jcy9MaWJGdXp6ZXIuaHRtbAorICogaHR0cHM6Ly9naXRodWIuY29tL2dvb2dsZS9vc3MtZnV6egpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFjb2RlYy9yZWdpc3RyYW50L2Z1enplci9jb2RlY1NlcnZpY2VSZWdpc3RyYW50X2Z1enplci5jcHAgYi9zZXJ2aWNlcy9tZWRpYWNvZGVjL3JlZ2lzdHJhbnQvZnV6emVyL2NvZGVjU2VydmljZVJlZ2lzdHJhbnRfZnV6emVyLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNTk4M2U0Ci0tLSAvZGV2L251bGwKKysrIGIvc2VydmljZXMvbWVkaWFjb2RlYy9yZWdpc3RyYW50L2Z1enplci9jb2RlY1NlcnZpY2VSZWdpc3RyYW50X2Z1enplci5jcHAKQEAgLTAsMCArMSwxNTggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorICoKKyAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisgKgorICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworI2luY2x1ZGUgIi4uL0NvZGVjU2VydmljZVJlZ2lzdHJhbnQuY3BwIgorI2luY2x1ZGUgImZ1enplci9GdXp6ZWREYXRhUHJvdmlkZXIuaCIKKyNpbmNsdWRlIDxDMkNvbmZpZy5oPgorI2luY2x1ZGUgPEMyUGFyYW0uaD4KKwordXNpbmcgbmFtZXNwYWNlIHN0ZDsKKworY29uc3RleHByIGNoYXIga1NlcnZpY2VOYW1lW10gPSAic29mdHdhcmUiOworCitjbGFzcyBDb2RlY1NlcnZpY2VSZWdpc3RyYW50RnV6emVyIHsKK3B1YmxpYzoKKyAgdm9pZCBwcm9jZXNzKGNvbnN0IHVpbnQ4X3QgKmRhdGEsIHNpemVfdCBzaXplKTsKKyAgfkNvZGVjU2VydmljZVJlZ2lzdHJhbnRGdXp6ZXIoKSB7CisgICAgZGVsZXRlIG1IMkMyOworICAgIGlmIChtSW5wdXRTaXplKSB7CisgICAgICBkZWxldGUgbUlucHV0U2l6ZTsKKyAgICB9CisgICAgaWYgKG1TYW1wbGVSYXRlSW5mbykgeworICAgICAgZGVsZXRlIG1TYW1wbGVSYXRlSW5mbzsKKyAgICB9CisgICAgaWYgKG1DaGFubmVsQ291bnRJbmZvKSB7CisgICAgICBkZWxldGUgbUNoYW5uZWxDb3VudEluZm87CisgICAgfQorICB9CisKK3ByaXZhdGU6CisgIHZvaWQgaW5pdEgyQzJDb21wb25lbnRTdG9yZSgpOworICB2b2lkIGludm9rZUgyQzJDb21wb25lbnRTdG9yZSgpOworICB2b2lkIGludm9rZUNvbmZpZ1NNKCk7CisgIHZvaWQgaW52b2tlUXVlcnlTTSgpOworICBIMkMyQ29tcG9uZW50U3RvcmUgKm1IMkMyID0gbnVsbHB0cjsKKyAgQzJTdHJlYW1QaWN0dXJlU2l6ZUluZm86OmlucHV0ICptSW5wdXRTaXplID0gbnVsbHB0cjsKKyAgQzJTdHJlYW1TYW1wbGVSYXRlSW5mbzo6b3V0cHV0ICptU2FtcGxlUmF0ZUluZm8gPSBudWxscHRyOworICBDMlN0cmVhbUNoYW5uZWxDb3VudEluZm86Om91dHB1dCAqbUNoYW5uZWxDb3VudEluZm8gPSBudWxscHRyOworICBDMlBhcmFtOjpJbmRleCBtSW5kZXggPSBDMlN0cmVhbVByb2ZpbGVMZXZlbEluZm86Om91dHB1dDo6UEFSQU1fVFlQRTsKKyAgQzJTdHJlYW1GcmFtZVJhdGVJbmZvOjpvdXRwdXQgbUZyYW1lUmF0ZTsKKyAgRnV6emVkRGF0YVByb3ZpZGVyICptRkRQID0gbnVsbHB0cjsKK307CisKK3ZvaWQgQ29kZWNTZXJ2aWNlUmVnaXN0cmFudEZ1enplcjo6aW5pdEgyQzJDb21wb25lbnRTdG9yZSgpIHsKKyAgdXNpbmcgbmFtZXNwYWNlIDo6YW5kcm9pZDo6aGFyZHdhcmU6Om1lZGlhOjpjMjsKKyAgc2hhcmVkX3B0cjxDMkNvbXBvbmVudFN0b3JlPiBzdG9yZSA9CisgICAgICBhbmRyb2lkOjpHZXRDb2RlYzJQbGF0Zm9ybUNvbXBvbmVudFN0b3JlKCk7CisgIGlmICghc3RvcmUpIHsKKyAgICByZXR1cm47CisgIH0KKyAgYW5kcm9pZDo6c3A8VjFfMTo6SUNvbXBvbmVudFN0b3JlPiBzdG9yZVYxXzEgPQorICAgICAgbmV3IFYxXzE6OnV0aWxzOjpDb21wb25lbnRTdG9yZShzdG9yZSk7CisgIGlmIChzdG9yZVYxXzEtPnJlZ2lzdGVyQXNTZXJ2aWNlKHN0cmluZyhrU2VydmljZU5hbWUpKSAhPSBhbmRyb2lkOjpPSykgeworICAgIHJldHVybjsKKyAgfQorICBzdHJpbmcgY29uc3QgcHJlZmVycmVkU3RvcmVOYW1lID0gc3RyaW5nKGtTZXJ2aWNlTmFtZSk7CisgIHNwPElDb21wb25lbnRTdG9yZT4gcHJlZmVycmVkU3RvcmUgPQorICAgICAgSUNvbXBvbmVudFN0b3JlOjpnZXRTZXJ2aWNlKHByZWZlcnJlZFN0b3JlTmFtZS5jX3N0cigpKTsKKyAgbUgyQzIgPSBuZXcgSDJDMkNvbXBvbmVudFN0b3JlKHByZWZlcnJlZFN0b3JlKTsKK30KKwordm9pZCBDb2RlY1NlcnZpY2VSZWdpc3RyYW50RnV6emVyOjppbnZva2VDb25maWdTTSgpIHsKKyAgdmVjdG9yPEMyUGFyYW0gKj4gY29uZmlnUGFyYW1zOworICB1aW50MzJfdCB3aWR0aCA9IG1GRFAtPkNvbnN1bWVJbnRlZ3JhbDx1aW50MzJfdD4oKTsKKyAgdWludDMyX3QgaGVpZ2h0ID0gbUZEUC0+Q29uc3VtZUludGVncmFsPHVpbnQzMl90PigpOworICB1aW50MzJfdCBzYW1wbGluZ1JhdGUgPSBtRkRQLT5Db25zdW1lSW50ZWdyYWw8dWludDMyX3Q+KCk7CisgIHVpbnQzMl90IGNoYW5uZWxzID0gbUZEUC0+Q29uc3VtZUludGVncmFsPHVpbnQzMl90PigpOworICBpZiAobUZEUC0+Q29uc3VtZUJvb2woKSkgeworICAgIG1JbnB1dFNpemUgPSBuZXcgQzJTdHJlYW1QaWN0dXJlU2l6ZUluZm86OmlucHV0KDB1LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBjb25maWdQYXJhbXMucHVzaF9iYWNrKG1JbnB1dFNpemUpOworICB9IGVsc2UgeworICAgIGlmIChtRkRQLT5Db25zdW1lQm9vbCgpKSB7CisgICAgICBtU2FtcGxlUmF0ZUluZm8gPSBuZXcgQzJTdHJlYW1TYW1wbGVSYXRlSW5mbzo6b3V0cHV0KDB1LCBzYW1wbGluZ1JhdGUpOworICAgICAgY29uZmlnUGFyYW1zLnB1c2hfYmFjayhtU2FtcGxlUmF0ZUluZm8pOworICAgIH0KKyAgICBpZiAobUZEUC0+Q29uc3VtZUJvb2woKSkgeworICAgICAgbUNoYW5uZWxDb3VudEluZm8gPSBuZXcgQzJTdHJlYW1DaGFubmVsQ291bnRJbmZvOjpvdXRwdXQoMHUsIGNoYW5uZWxzKTsKKyAgICAgIGNvbmZpZ1BhcmFtcy5wdXNoX2JhY2sobUNoYW5uZWxDb3VudEluZm8pOworICAgIH0KKyAgfQorICB2ZWN0b3I8dW5pcXVlX3B0cjxDMlNldHRpbmdSZXN1bHQ+PiBmYWlsdXJlczsKKyAgbUgyQzItPmNvbmZpZ19zbShjb25maWdQYXJhbXMsICZmYWlsdXJlcyk7Cit9CisKK3ZvaWQgQ29kZWNTZXJ2aWNlUmVnaXN0cmFudEZ1enplcjo6aW52b2tlUXVlcnlTTSgpIHsKKyAgdmVjdG9yPEMyUGFyYW0gKj4gc3RhY2tQYXJhbXM7CisgIHZlY3RvcjxDMlBhcmFtOjpJbmRleD4gaGVhcFBhcmFtSW5kaWNlczsKKyAgaWYgKG1GRFAtPkNvbnN1bWVCb29sKCkpIHsKKyAgICBzdGFja1BhcmFtcyA9IHt9OworICAgIGhlYXBQYXJhbUluZGljZXMgPSB7fTsKKyAgfSBlbHNlIHsKKyAgICB1aW50MzJfdCBzdHJlYW0gPSBtRkRQLT5Db25zdW1lSW50ZWdyYWw8dWludDMyX3Q+KCk7CisgICAgbUZyYW1lUmF0ZS5zZXRTdHJlYW0oc3RyZWFtKTsKKyAgICBzdGFja1BhcmFtcy5wdXNoX2JhY2soJm1GcmFtZVJhdGUpOworICAgIGhlYXBQYXJhbUluZGljZXMucHVzaF9iYWNrKG1JbmRleCk7CisgIH0KKyAgdmVjdG9yPHVuaXF1ZV9wdHI8QzJQYXJhbT4+IGhlYXBQYXJhbXM7CisgIG1IMkMyLT5xdWVyeV9zbShzdGFja1BhcmFtcywgaGVhcFBhcmFtSW5kaWNlcywgJmhlYXBQYXJhbXMpOworfQorCit2b2lkIENvZGVjU2VydmljZVJlZ2lzdHJhbnRGdXp6ZXI6Omludm9rZUgyQzJDb21wb25lbnRTdG9yZSgpIHsKKyAgaW5pdEgyQzJDb21wb25lbnRTdG9yZSgpOworICBzaGFyZWRfcHRyPEMyQ29tcG9uZW50PiBjb21wb25lbnQ7CisgIHNoYXJlZF9wdHI8QzJDb21wb25lbnRJbnRlcmZhY2U+IGludGVyZmFjZTsKKyAgc3RyaW5nIGMyU3RyaW5nID0gbUZEUC0+Q29uc3VtZVJhbmRvbUxlbmd0aFN0cmluZygpOworICBtSDJDMi0+Y3JlYXRlQ29tcG9uZW50KGMyU3RyaW5nLCAmY29tcG9uZW50KTsKKyAgbUgyQzItPmNyZWF0ZUludGVyZmFjZShjMlN0cmluZywgJmludGVyZmFjZSk7CisgIGludm9rZUNvbmZpZ1NNKCk7CisgIGludm9rZVF1ZXJ5U00oKTsKKworICB2ZWN0b3I8c2hhcmVkX3B0cjxDMlBhcmFtRGVzY3JpcHRvcj4+IHBhcmFtczsKKyAgbUgyQzItPnF1ZXJ5U3VwcG9ydGVkUGFyYW1zX25iKCZwYXJhbXMpOworCisgIEMyU3RvcmVJb25Vc2FnZUluZm8gdXNhZ2VJbmZvOworICBzdGQ6OnZlY3RvcjxDMkZpZWxkU3VwcG9ydGVkVmFsdWVzUXVlcnk+IHF1ZXJ5ID0geworICAgICAgQzJGaWVsZFN1cHBvcnRlZFZhbHVlc1F1ZXJ5OjpQb3NzaWJsZSgKKyAgICAgICAgICBDMlBhcmFtRmllbGQ6Ok1ha2UodXNhZ2VJbmZvLCB1c2FnZUluZm8udXNhZ2UpKSwKKyAgICAgIEMyRmllbGRTdXBwb3J0ZWRWYWx1ZXNRdWVyeTo6UG9zc2libGUoCisgICAgICAgICAgQzJQYXJhbUZpZWxkOjpNYWtlKHVzYWdlSW5mbywgdXNhZ2VJbmZvLmNhcGFjaXR5KSksCisgIH07CisgIG1IMkMyLT5xdWVyeVN1cHBvcnRlZFZhbHVlc19zbShxdWVyeSk7CisKKyAgbUgyQzItPmdldE5hbWUoKTsKKyAgc2hhcmVkX3B0cjxDMlBhcmFtUmVmbGVjdG9yPiBwYXJhbVJlZmxlY3RvciA9IG1IMkMyLT5nZXRQYXJhbVJlZmxlY3RvcigpOworICBpZiAocGFyYW1SZWZsZWN0b3IpIHsKKyAgICBwYXJhbVJlZmxlY3Rvci0+ZGVzY3JpYmUoQzJDb21wb25lbnREb21haW5TZXR0aW5nOjpDT1JFX0lOREVYKTsKKyAgfQorICBtSDJDMi0+bGlzdENvbXBvbmVudHMoKTsKKyAgc2hhcmVkX3B0cjxDMkdyYXBoaWNCdWZmZXI+IHNyYzsKKyAgc2hhcmVkX3B0cjxDMkdyYXBoaWNCdWZmZXI+IGRzdDsKKyAgbUgyQzItPmNvcHlCdWZmZXIoc3JjLCBkc3QpOworfQorCit2b2lkIENvZGVjU2VydmljZVJlZ2lzdHJhbnRGdXp6ZXI6OnByb2Nlc3MoY29uc3QgdWludDhfdCAqZGF0YSwgc2l6ZV90IHNpemUpIHsKKyAgbUZEUCA9IG5ldyBGdXp6ZWREYXRhUHJvdmlkZXIoZGF0YSwgc2l6ZSk7CisgIGludm9rZUgyQzJDb21wb25lbnRTdG9yZSgpOworICAvKiogUmVnaXN0ZXJDb2RlY1NlcnZpY2VzIGlzIGNhbGxlZCBoZXJlIHRvIGltcHJvdmUgY29kZSBjb3ZlcmFnZSAqLworICAvKiogYXMgY3VycmVudGx5IGl0IGlzIG5vdCBjYWxsZWQgYnkgY29kZWNTZXJ2aWNlUmVnaXN0cmFudCAgICAgICAqLworICBSZWdpc3RlckNvZGVjU2VydmljZXMoKTsKKyAgZGVsZXRlIG1GRFA7Cit9CisKK2V4dGVybiAiQyIgaW50IExMVk1GdXp6ZXJUZXN0T25lSW5wdXQoY29uc3QgdWludDhfdCAqZGF0YSwgc2l6ZV90IHNpemUpIHsKKyAgQ29kZWNTZXJ2aWNlUmVnaXN0cmFudEZ1enplciBjb2RlY1NlcnZpY2VSZWdpc3RyYW50RnV6emVyOworICBjb2RlY1NlcnZpY2VSZWdpc3RyYW50RnV6emVyLnByb2Nlc3MoZGF0YSwgc2l6ZSk7CisgIHJldHVybiAwOworfQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFjb2RlYy9zZWNjb21wX3BvbGljeS9tZWRpYXN3Y29kZWMtYXJtLnBvbGljeSBiL3NlcnZpY2VzL21lZGlhY29kZWMvc2VjY29tcF9wb2xpY3kvbWVkaWFzd2NvZGVjLWFybS5wb2xpY3kKaW5kZXggOTA1OGYxMC4uNDFlZmNlMCAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWVkaWFjb2RlYy9zZWNjb21wX3BvbGljeS9tZWRpYXN3Y29kZWMtYXJtLnBvbGljeQorKysgYi9zZXJ2aWNlcy9tZWRpYWNvZGVjL3NlY2NvbXBfcG9saWN5L21lZGlhc3djb2RlYy1hcm0ucG9saWN5CkBAIC04NCw1ICs4NCw2IEBACiBnZXRnaWQzMjogMQogZ2V0ZWdpZDMyOiAxCiBnZXRncm91cHMzMjogMQorc3lzaW5mbzogMQogCiBAaW5jbHVkZSAvYXBleC9jb20uYW5kcm9pZC5tZWRpYS5zd2NvZGVjL2V0Yy9zZWNjb21wX3BvbGljeS9jb2RlX2NvdmVyYWdlLmFybS5wb2xpY3kKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhY29kZWMvc2VjY29tcF9wb2xpY3kvbWVkaWFzd2NvZGVjLWFybTY0LnBvbGljeSBiL3NlcnZpY2VzL21lZGlhY29kZWMvc2VjY29tcF9wb2xpY3kvbWVkaWFzd2NvZGVjLWFybTY0LnBvbGljeQppbmRleCA0YzUxYTljLi5lMTUxYTA2IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9tZWRpYWNvZGVjL3NlY2NvbXBfcG9saWN5L21lZGlhc3djb2RlYy1hcm02NC5wb2xpY3kKKysrIGIvc2VydmljZXMvbWVkaWFjb2RlYy9zZWNjb21wX3BvbGljeS9tZWRpYXN3Y29kZWMtYXJtNjQucG9saWN5CkBAIC03OCw1ICs3OCw2IEBACiBnZXRnaWQ6IDEKIGdldGVnaWQ6IDEKIGdldGdyb3VwczogMQorc3lzaW5mbzogMQogCiBAaW5jbHVkZSAvYXBleC9jb20uYW5kcm9pZC5tZWRpYS5zd2NvZGVjL2V0Yy9zZWNjb21wX3BvbGljeS9jb2RlX2NvdmVyYWdlLmFybTY0LnBvbGljeQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFleHRyYWN0b3IvT1dORVJTIGIvc2VydmljZXMvbWVkaWFleHRyYWN0b3IvT1dORVJTCmluZGV4IGM3MTZjY2UuLjJhNzc5YzIgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhZXh0cmFjdG9yL09XTkVSUworKysgYi9zZXJ2aWNlcy9tZWRpYWV4dHJhY3Rvci9PV05FUlMKQEAgLTEsMiArMSwzIEBACiBqZWZmdkBnb29nbGUuY29tCi1tYXJjb25lQGdvb2dsZS5jb20KK2Vzc2lja0Bnb29nbGUuY29tCithcXVpbGVzY2FudGFAZ29vZ2xlLmNvbQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFleHRyYWN0b3IvbWVkaWFleHRyYWN0b3IucmMgYi9zZXJ2aWNlcy9tZWRpYWV4dHJhY3Rvci9tZWRpYWV4dHJhY3Rvci5yYwppbmRleCA1ZmMyOTQxLi40ZmI1MGQwIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9tZWRpYWV4dHJhY3Rvci9tZWRpYWV4dHJhY3Rvci5yYworKysgYi9zZXJ2aWNlcy9tZWRpYWV4dHJhY3Rvci9tZWRpYWV4dHJhY3Rvci5yYwpAQCAtMyw0ICszLDQgQEAKICAgICB1c2VyIG1lZGlhZXgKICAgICBncm91cCBkcm1ycGMgbWVkaWFkcm0KICAgICBpb3ByaW8gcnQgNAotICAgIHdyaXRlcGlkIC9kZXYvY3B1c2V0L2ZvcmVncm91bmQvdGFza3MKKyAgICB0YXNrX3Byb2ZpbGVzIFByb2Nlc3NDYXBhY2l0eUhpZ2gKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhbG9nL0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYWxvZy9BbmRyb2lkLmJwCmluZGV4IGNmYzRjNDAuLjgwODhlZjAgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhbG9nL0FuZHJvaWQuYnAKKysrIGIvc2VydmljZXMvbWVkaWFsb2cvQW5kcm9pZC5icApAQCAtMjYsNiArMjYsNyBAQAogICAgICAgICAibGlibWVkaWF1dGlscyIsCiAgICAgICAgICJsaWJuYmxvZyIsCiAgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJwYWNrYWdlbWFuYWdlcl9haWRsLWNwcCIsCiAgICAgXSwKIAogICAgIGNmbGFnczogWwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFtZXRyaWNzL0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvQW5kcm9pZC5icAppbmRleCAwMzUxZDJkLi43NGU0NzE1IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvQW5kcm9pZC5icApAQCAtMTE0LDYgKzExNCw3IEBACiAgICAgICAgICJsaWJtZWRpYXV0aWxzIiwKICAgICAgICAgImxpYnV0aWxzIiwKICAgICAgICAgIm1lZGlhbWV0cmljc3NlcnZpY2UtYWlkbC1jcHAiLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgIF0sCiAgICAgaGVhZGVyX2xpYnM6IFsKICAgICAgICAgImxpYmF1ZGlvdXRpbHNfaGVhZGVycyIsCkBAIC0xNzIsNiArMTczLDcgQEAKICAgICAgICAgImxpYnN0YXRzcHVsbCIsCiAgICAgICAgICJsaWJzdGF0c3NvY2tldCIsCiAgICAgICAgICJsaWJ1dGlscyIsCisgICAgICAgICJwYWNrYWdlbWFuYWdlcl9haWRsLWNwcCIsCiAgICAgXSwKIAogICAgIGV4cG9ydF9zaGFyZWRfbGliX2hlYWRlcnM6IFsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhbWV0cmljcy9UcmFuc2FjdGlvbkxvZy5oIGIvc2VydmljZXMvbWVkaWFtZXRyaWNzL1RyYW5zYWN0aW9uTG9nLmgKaW5kZXggMGNhNDYzOS4uZmQ0MjUxOCAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWVkaWFtZXRyaWNzL1RyYW5zYWN0aW9uTG9nLmgKKysrIGIvc2VydmljZXMvbWVkaWFtZXRyaWNzL1RyYW5zYWN0aW9uTG9nLmgKQEAgLTE1OCw3ICsxNTgsNyBAQAogICAgICAgICAgICAgICAgICsraXQpIHsKICAgICAgICAgICAgIGlmIChsbCA8PSAwKSBicmVhazsKICAgICAgICAgICAgIGlmIChwcmVmaXggIT0gbnVsbHB0ciAmJiAhc3RhcnRzV2l0aChpdC0+Zmlyc3QsIHByZWZpeCkpIGJyZWFrOwotICAgICAgICAgICAgYXV0byBbcywgbF0gPSBkdW1wTWFwVGltZUl0ZW0oaXQtPnNlY29uZCwgbGwgLSAxLCBzaW5jZU5zLCBwcmVmaXgpOworICAgICAgICAgICAgc3RkOjp0aWUocywgbCkgPSBkdW1wTWFwVGltZUl0ZW0oaXQtPnNlY29uZCwgbGwgLSAxLCBzaW5jZU5zLCBwcmVmaXgpOwogICAgICAgICAgICAgaWYgKGwgPT0gMCkgY29udGludWU7IC8vIGRvbid0IHNob3cgZW1wdHkgZ3JvdXBzIChkdWUgdG8gc2luY2VOcykuCiAgICAgICAgICAgICBzcyA8PCAiICIgPDwgaXQtPmZpcnN0IDw8ICJcbiIgPDwgczsKICAgICAgICAgICAgIGxsIC09IGwgKyAxOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFtZXRyaWNzL2Z1enplci9BbmRyb2lkLmJwIGIvc2VydmljZXMvbWVkaWFtZXRyaWNzL2Z1enplci9BbmRyb2lkLmJwCmluZGV4IGIwM2U1MTguLjlkYTcyODIgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhbWV0cmljcy9mdXp6ZXIvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvZnV6emVyL0FuZHJvaWQuYnAKQEAgLTU2LDYgKzU2LDcgQEAKICAgICAgICAgImxpYnN0YXRzc29ja2V0IiwKICAgICAgICAgImxpYnV0aWxzIiwKICAgICAgICAgIm1lZGlhbWV0cmljc3NlcnZpY2UtYWlkbC1jcHAiLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAogICAgIF0sCiAKICAgICBpbmNsdWRlX2RpcnM6IFsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhbWV0cmljcy9mdXp6ZXIvbWVkaWFtZXRyaWNzX3NlcnZpY2VfZnV6emVyLmNwcCBiL3NlcnZpY2VzL21lZGlhbWV0cmljcy9mdXp6ZXIvbWVkaWFtZXRyaWNzX3NlcnZpY2VfZnV6emVyLmNwcAppbmRleCA4YjBiNDc5Li4wNmFiMTZlIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvZnV6emVyL21lZGlhbWV0cmljc19zZXJ2aWNlX2Z1enplci5jcHAKKysrIGIvc2VydmljZXMvbWVkaWFtZXRyaWNzL2Z1enplci9tZWRpYW1ldHJpY3Nfc2VydmljZV9mdXp6ZXIuY3BwCkBAIC00OCw2ICs0OCw3IEBACiAgICAgdm9pZCBpbnZva2VBdWRpb0FuYWx5dGljcyhjb25zdCB1aW50OF90ICpkYXRhLCBzaXplX3Qgc2l6ZSk7CiAgICAgdm9pZCBpbnZva2VUaW1lZEFjdGlvbihjb25zdCB1aW50OF90ICpkYXRhLCBzaXplX3Qgc2l6ZSk7CiAgICAgdm9pZCBwcm9jZXNzKGNvbnN0IHVpbnQ4X3QgKmRhdGEsIHNpemVfdCBzaXplKTsKKyAgICBzdGQ6OmF0b21pY19pbnQgbVZhbHVlID0gMDsKIH07CiAKIHZvaWQgTWVkaWFNZXRyaWNzU2VydmljZUZ1enplcjo6aW52b2tlU3RhcnRzV2l0aChjb25zdCB1aW50OF90ICpkYXRhLCBzaXplX3Qgc2l6ZSkgewpAQCAtMzQyLDExICszNDMsMTAgQEAKIHZvaWQgTWVkaWFNZXRyaWNzU2VydmljZUZ1enplcjo6aW52b2tlVGltZWRBY3Rpb24oY29uc3QgdWludDhfdCAqZGF0YSwgc2l6ZV90IHNpemUpIHsKICAgICBGdXp6ZWREYXRhUHJvdmlkZXIgZmRwID0gRnV6emVkRGF0YVByb3ZpZGVyKGRhdGEsIHNpemUpOwogICAgIGFuZHJvaWQ6Om1lZGlhbWV0cmljczo6VGltZWRBY3Rpb24gdGltZWRBY3Rpb247Ci0gICAgc3RkOjphdG9taWNfaW50IHZhbHVlID0gMDsKIAogICAgIHdoaWxlIChmZHAucmVtYWluaW5nX2J5dGVzKCkpIHsKICAgICAgICAgdGltZWRBY3Rpb24ucG9zdEluKHN0ZDo6Y2hyb25vOjpzZWNvbmRzKGZkcC5Db25zdW1lSW50ZWdyYWw8aW50MzJfdD4oKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBbJnZhbHVlXSB7ICsrdmFsdWU7IH0pOworICAgICAgICAgICAgICAgICAgICAgICAgICAgW3RoaXNdIHsgKyttVmFsdWU7IH0pOwogICAgICAgICB0aW1lZEFjdGlvbi5zaXplKCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWFtZXRyaWNzL3Rlc3RzL0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvdGVzdHMvQW5kcm9pZC5icAppbmRleCAzYmFmNzM5Li5mNDZmYmFkIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvdGVzdHMvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9tZWRpYW1ldHJpY3MvdGVzdHMvQW5kcm9pZC5icApAQCAtMzMsNiArMzMsNyBAQAogICAgICAgICAibGlibWVkaWF1dGlscyIsCiAgICAgICAgICJsaWJ1dGlscyIsCiAgICAgICAgICJtZWRpYW1ldHJpY3NzZXJ2aWNlLWFpZGwtY3BwIiwKKyAgICAgICAgInBhY2thZ2VtYW5hZ2VyX2FpZGwtY3BwIiwKICAgICBdLAogCiAgICAgaGVhZGVyX2xpYnM6IFsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL21lZGlhcmVzb3VyY2VtYW5hZ2VyL0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYXJlc291cmNlbWFuYWdlci9BbmRyb2lkLmJwCmluZGV4IGYzMTIwMmIuLjVkODA3NDQgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhcmVzb3VyY2VtYW5hZ2VyL0FuZHJvaWQuYnAKKysrIGIvc2VydmljZXMvbWVkaWFyZXNvdXJjZW1hbmFnZXIvQW5kcm9pZC5icApAQCAtOTAsNyArOTAsNyBAQAogICAgIF0sCiAKICAgICBzdGF0aWNfbGliczogWwotICAgICAgICAicmVzb3VyY2VvYnNlcnZlcl9haWRsX2ludGVyZmFjZS1WMS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAicmVzb3VyY2VvYnNlcnZlcl9haWRsX2ludGVyZmFjZS1WMS1uZGsiLAogICAgIF0sCiAKICAgICBpbmNsdWRlX2RpcnM6IFsiZnJhbWV3b3Jrcy9hdi9pbmNsdWRlIl0sCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9tZWRpYXJlc291cmNlbWFuYWdlci90ZXN0L0FuZHJvaWQuYnAgYi9zZXJ2aWNlcy9tZWRpYXJlc291cmNlbWFuYWdlci90ZXN0L0FuZHJvaWQuYnAKaW5kZXggZWM0YmE1OC4uNjE4NjI2ZiAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWVkaWFyZXNvdXJjZW1hbmFnZXIvdGVzdC9BbmRyb2lkLmJwCisrKyBiL3NlcnZpY2VzL21lZGlhcmVzb3VyY2VtYW5hZ2VyL3Rlc3QvQW5kcm9pZC5icApAQCAtNTYsNyArNTYsNyBAQAogICAgIHRlc3Rfc3VpdGVzOiBbImRldmljZS10ZXN0cyJdLAogICAgIHN0YXRpY19saWJzOiBbCiAgICAgICAgICJsaWJyZXNvdXJjZW1hbmFnZXJzZXJ2aWNlIiwKLSAgICAgICAgInJlc291cmNlb2JzZXJ2ZXJfYWlkbF9pbnRlcmZhY2UtVjEtbmRrX3BsYXRmb3JtIiwKKyAgICAgICAgInJlc291cmNlb2JzZXJ2ZXJfYWlkbF9pbnRlcmZhY2UtVjEtbmRrIiwKICAgICBdLAogICAgIHNoYXJlZF9saWJzOiBbCiAgICAgICAgICJsaWJiaW5kZXIiLApkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy9BbmRyb2lkLmJwIGIvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy9BbmRyb2lkLmJwCmluZGV4IGE5ZmQxNGYuLmZhNWViNGUgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhdHJhbnNjb2RpbmcvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9tZWRpYXRyYW5zY29kaW5nL0FuZHJvaWQuYnAKQEAgLTQ3LDcgKzQ3LDcgQEAKICAgICBdLAogCiAgICAgc3RhdGljX2xpYnM6IFsKLSAgICAgICAgIm1lZGlhdHJhbnNjb2RpbmdfYWlkbF9pbnRlcmZhY2UtbmRrX3BsYXRmb3JtIiwKKyAgICAgICAgIm1lZGlhdHJhbnNjb2RpbmdfYWlkbF9pbnRlcmZhY2UtbmRrIiwKICAgICBdLAogCiAgICAgY2ZsYWdzOiBbCkBAIC04MCw3ICs4MCw3IEBACiAgICAgXSwKIAogICAgIHN0YXRpY19saWJzOiBbCi0gICAgICAgICJtZWRpYXRyYW5zY29kaW5nX2FpZGxfaW50ZXJmYWNlLW5ka19wbGF0Zm9ybSIsCisgICAgICAgICJtZWRpYXRyYW5zY29kaW5nX2FpZGxfaW50ZXJmYWNlLW5kayIsCiAgICAgXSwKIAogICAgIGNmbGFnczogWwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy90ZXN0cy9BbmRyb2lkLmJwIGIvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy90ZXN0cy9BbmRyb2lkLmJwCmluZGV4IGNiMTgwZWMuLmFlMTM2NTYgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL21lZGlhdHJhbnNjb2RpbmcvdGVzdHMvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9tZWRpYXRyYW5zY29kaW5nL3Rlc3RzL0FuZHJvaWQuYnAKQEAgLTM0LDggKzM0LDggQEAKICAgICBdLAogCiAgICAgc3RhdGljX2xpYnM6IFsKLSAgICAgICAgIm1lZGlhdHJhbnNjb2RpbmdfYWlkbF9pbnRlcmZhY2UtbmRrX3BsYXRmb3JtIiwKLSAgICAgICAgInJlc291cmNlbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAibWVkaWF0cmFuc2NvZGluZ19haWRsX2ludGVyZmFjZS1uZGsiLAorICAgICAgICAicmVzb3VyY2VtYW5hZ2VyX2FpZGxfaW50ZXJmYWNlLW5kayIsCiAgICAgICAgICJsaWJtZWRpYXRyYW5zY29kaW5nc2VydmljZSIsCiAgICAgXSwKIApkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy90ZXN0cy9NZWRpYVRyYW5zY29kaW5nU2VydmljZVRlc3RIZWxwZXIuaCBiL3NlcnZpY2VzL21lZGlhdHJhbnNjb2RpbmcvdGVzdHMvTWVkaWFUcmFuc2NvZGluZ1NlcnZpY2VUZXN0SGVscGVyLmgKaW5kZXggMGNiMmZhZC4uOGUxN2Y1NSAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWVkaWF0cmFuc2NvZGluZy90ZXN0cy9NZWRpYVRyYW5zY29kaW5nU2VydmljZVRlc3RIZWxwZXIuaAorKysgYi9zZXJ2aWNlcy9tZWRpYXRyYW5zY29kaW5nL3Rlc3RzL01lZGlhVHJhbnNjb2RpbmdTZXJ2aWNlVGVzdEhlbHBlci5oCkBAIC0yNTksOSArMjU5LDcgQEAKIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBzdWNjZXNzID0gdHJ1ZTsKIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBmYWlsID0gZmFsc2U7CiAKLXN0cnVjdCBUZXN0Q2xpZW50Q2FsbGJhY2sgOiBwdWJsaWMgQm5UcmFuc2NvZGluZ0NsaWVudENhbGxiYWNrLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1YmxpYyBFdmVudFRyYWNrZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVibGljIHN0ZDo6ZW5hYmxlX3NoYXJlZF9mcm9tX3RoaXM8VGVzdENsaWVudENhbGxiYWNrPiB7CitzdHJ1Y3QgVGVzdENsaWVudENhbGxiYWNrIDogcHVibGljIEJuVHJhbnNjb2RpbmdDbGllbnRDYWxsYmFjaywgcHVibGljIEV2ZW50VHJhY2tlciB7CiAgICAgVGVzdENsaWVudENhbGxiYWNrKGNvbnN0IGNoYXIqIHBhY2thZ2VOYW1lLCBpbnQzMl90IGlkKQogICAgICAgICAgIDogbUNsaWVudElkKGlkKSwgbUNsaWVudFBpZChQSUQoaWQpKSwgbUNsaWVudFVpZChVSUQoaWQpKSwgbVBhY2thZ2VOYW1lKHBhY2thZ2VOYW1lKSB7CiAgICAgICAgIEFMT0dJKCJUZXN0Q2xpZW50Q2FsbGJhY2sgJWQgY3JlYXRlZDogcGlkICVkLCB1aWQgJWQiLCBpZCwgUElEKGlkKSwgVUlEKGlkKSk7CkBAIC0zNDgsOCArMzQ2LDggQEAKICAgICAgICAgQUxPR0QoInJlZ2lzdGVyaW5nICVzIHdpdGggdWlkICVkIiwgcGFja2FnZU5hbWUsIG1DbGllbnRVaWQpOwogCiAgICAgICAgIHN0ZDo6c2hhcmVkX3B0cjxJVHJhbnNjb2RpbmdDbGllbnQ+IGNsaWVudDsKLSAgICAgICAgU3RhdHVzIHN0YXR1cyA9Ci0gICAgICAgICAgICAgICAgc2VydmljZS0+cmVnaXN0ZXJDbGllbnQoc2hhcmVkX2Zyb21fdGhpcygpLCBrQ2xpZW50TmFtZSwgcGFja2FnZU5hbWUsICZjbGllbnQpOworICAgICAgICBTdGF0dXMgc3RhdHVzID0gc2VydmljZS0+cmVnaXN0ZXJDbGllbnQocmVmPFRlc3RDbGllbnRDYWxsYmFjaz4oKSwga0NsaWVudE5hbWUsIHBhY2thZ2VOYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNsaWVudCk7CiAKICAgICAgICAgbUNsaWVudCA9IHN0YXR1cy5pc09rKCkgPyBjbGllbnQgOiBudWxscHRyOwogICAgICAgICByZXR1cm4gc3RhdHVzOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvbWluaWphaWwvQW5kcm9pZC5icCBiL3NlcnZpY2VzL21pbmlqYWlsL0FuZHJvaWQuYnAKaW5kZXggM2E4OWUxMi4uMDM4MTk3ZiAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWluaWphaWwvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9taW5pamFpbC9BbmRyb2lkLmJwCkBAIC0zMSwxNyArMzEsNiBAQAogICAgIGV4cG9ydF9pbmNsdWRlX2RpcnM6IFsiLiJdLAogfQogCi0vLyBCeSBhZGRpbmcgInZlbmRvcl9hdmFpbGFibGU6IHRydWUiIHRvICJsaWJhdnNlcnZpY2VzX21pbmlqYWlsIiwgd2UgZG9uJ3QKLS8vIG5lZWQgdG8gaGF2ZSAibGliYXZzZXJ2aWNlc19taW5pamFpbF92ZW5kb3IiIGFueSBsb25nZXIuCi0vLyAibGliYXZzZXJ2aWNlc19taW5pamFpbF92ZW5kb3IiIHdpbGwgYmUgcmVtb3ZlZCwgb25jZSB3ZSByZXBsYWNlIGl0IHdpdGgKLS8vICJsaWJhdnNlcnZpY2VzX21pbmlqYWlsIiBpbiBhbGwgdmVuZG9yIG1vZHVsZXMuIChiLzE0NjMxMzcxMCkKLWNjX2xpYnJhcnlfc2hhcmVkIHsKLSAgICBuYW1lOiAibGliYXZzZXJ2aWNlc19taW5pamFpbF92ZW5kb3IiLAotICAgIHZlbmRvcjogdHJ1ZSwKLSAgICBkZWZhdWx0czogWyJsaWJhdnNlcnZpY2VzX21pbmlqYWlsX2RlZmF1bHRzIl0sCi0gICAgZXhwb3J0X2luY2x1ZGVfZGlyczogWyIuIl0sCi19Ci0KIC8vIFVuaXQgdGVzdHMuCiBjY190ZXN0IHsKICAgICBuYW1lOiAibGliYXZzZXJ2aWNlc19taW5pamFpbF91bml0dGVzdCIsCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9taW5pamFpbC9PV05FUlMgYi9zZXJ2aWNlcy9taW5pamFpbC9PV05FUlMKaW5kZXggMTlmNGY5Zi4uOWViZjQxZSAxMDA2NDQKLS0tIGEvc2VydmljZXMvbWluaWphaWwvT1dORVJTCisrKyBiL3NlcnZpY2VzL21pbmlqYWlsL09XTkVSUwpAQCAtMSwyICsxLDIgQEAKIGpvcmdlbG9AZ29vZ2xlLmNvbQotbWFyY29uZUBnb29nbGUuY29tCitlc3NpY2tAZ29vZ2xlLmNvbQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvb2JvZXNlcnZpY2UvQW5kcm9pZC5icCBiL3NlcnZpY2VzL29ib2VzZXJ2aWNlL0FuZHJvaWQuYnAKaW5kZXggNGM1ODA0MC4uMzU2M2Q2NiAxMDA2NDQKLS0tIGEvc2VydmljZXMvb2JvZXNlcnZpY2UvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy9vYm9lc2VydmljZS9BbmRyb2lkLmJwCkBAIC02OCw2ICs2OCw3IEBACiAgICAgICAgICJhYXVkaW8tYWlkbC1jcHAiLAogICAgICAgICAiZnJhbWV3b3JrLXBlcm1pc3Npb24tYWlkbC1jcHAiLAogICAgICAgICAibGliYXVkaW9jbGllbnRfYWlkbF9jb252ZXJzaW9uIiwKKyAgICAgICAgInBhY2thZ2VtYW5hZ2VyX2FpZGwtY3BwIiwKICAgICBdLAogCiAgICAgZXhwb3J0X3NoYXJlZF9saWJfaGVhZGVyczogWwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvdHVuZXIvQW5kcm9pZC5icCBiL3NlcnZpY2VzL3R1bmVyL0FuZHJvaWQuYnAKaW5kZXggY2QxMWM4OC4uMWRjZmU1MyAxMDA2NDQKLS0tIGEvc2VydmljZXMvdHVuZXIvQW5kcm9pZC5icAorKysgYi9zZXJ2aWNlcy90dW5lci9BbmRyb2lkLmJwCkBAIC04OSwxMyArODksMTQgQEAKICAgICAgICAgImxpYmxvZyIsCiAgICAgICAgICJsaWJtZWRpYSIsCiAgICAgICAgICJsaWJ1dGlscyIsCi0gICAgICAgICJ0dl90dW5lcl9haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAotICAgICAgICAidHZfdHVuZXJfcmVzb3VyY2VfbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAicGFja2FnZW1hbmFnZXJfYWlkbC1jcHAiLAorICAgICAgICAidHZfdHVuZXJfYWlkbF9pbnRlcmZhY2UtbmRrIiwKKyAgICAgICAgInR2X3R1bmVyX3Jlc291cmNlX21hbmFnZXJfYWlkbF9pbnRlcmZhY2UtbmRrIiwKICAgICAgICAgInR2X3R1bmVyX3Jlc291cmNlX21hbmFnZXJfYWlkbF9pbnRlcmZhY2UtY3BwIiwKICAgICBdLAogCiAgICAgc3RhdGljX2xpYnM6IFsKLSAgICAgICAgImFuZHJvaWQuaGFyZHdhcmUuY29tbW9uLmZtcS1WMS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAiYW5kcm9pZC5oYXJkd2FyZS5jb21tb24uZm1xLVYxLW5kayIsCiAgICAgICAgICJsaWJhaWRsY29tbW9uc3VwcG9ydCIsCiAgICAgXSwKIApAQCAtMTI4LDEyICsxMjksMTIgQEAKICAgICAgICAgImxpYmxvZyIsCiAgICAgICAgICJsaWJ0dW5lcnNlcnZpY2UiLAogICAgICAgICAibGlidXRpbHMiLAotICAgICAgICAidHZfdHVuZXJfcmVzb3VyY2VfbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGtfcGxhdGZvcm0iLAorICAgICAgICAidHZfdHVuZXJfcmVzb3VyY2VfbWFuYWdlcl9haWRsX2ludGVyZmFjZS1uZGsiLAogICAgICAgICAidHZfdHVuZXJfcmVzb3VyY2VfbWFuYWdlcl9haWRsX2ludGVyZmFjZS1jcHAiLAogICAgIF0sCiAKICAgICBzdGF0aWNfbGliczogWwotICAgICAgICAidHZfdHVuZXJfYWlkbF9pbnRlcmZhY2UtbmRrX3BsYXRmb3JtIiwKKyAgICAgICAgInR2X3R1bmVyX2FpZGxfaW50ZXJmYWNlLW5kayIsCiAgICAgXSwKIAogICAgIGluaXRfcmM6IFsibWVkaWF0dW5lci5yYyJdLAo=