ZGlmZiAtLWdpdCBhL2NhbWVyYS9DYW1lcmEuY3BwIGIvY2FtZXJhL0NhbWVyYS5jcHAKaW5kZXggM2E5ZmI0Yy4uOWJmMzEzNCAxMDA2NDQKLS0tIGEvY2FtZXJhL0NhbWVyYS5jcHAKKysrIGIvY2FtZXJhL0NhbWVyYS5jcHAKQEAgLTk3LDcgKzk3LDggQEAKICAgICAgICAgYy0+bVN0YXR1cyA9IE5PX0VSUk9SOwogICAgICAgICBjYW1lcmEgPSBjOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIEFMT0dXKCJBbiBlcnJvciBvY2N1cnJlZCB3aGlsZSBjb25uZWN0aW5nIHRvIGNhbWVyYTogJWQiLCBjYW1lcmFJZCk7CisgICAgICAgIEFMT0dXKCJBbiBlcnJvciBvY2N1cnJlZCB3aGlsZSBjb25uZWN0aW5nIHRvIGNhbWVyYSAlZDogJWQgKCVzKSIsCisgICAgICAgICAgICAgICAgY2FtZXJhSWQsIHN0YXR1cywgc3RyZXJyb3IoLXN0YXR1cykpOwogICAgICAgICBjLmNsZWFyKCk7CiAgICAgfQogICAgIHJldHVybiBzdGF0dXM7CmRpZmYgLS1naXQgYS9jYW1lcmEvQ2FtZXJhTWV0YWRhdGEuY3BwIGIvY2FtZXJhL0NhbWVyYU1ldGFkYXRhLmNwcAppbmRleCBlMjE2ZDI2Li5iOTZhODhmIDEwMDY0NAotLS0gYS9jYW1lcmEvQ2FtZXJhTWV0YWRhdGEuY3BwCisrKyBiL2NhbWVyYS9DYW1lcmFNZXRhZGF0YS5jcHAKQEAgLTU4Myw3ICs1ODMsNyBAQAogICAgICAqLwogICAgIFdyaXRhYmxlQmxvYiBibG9iOwogICAgIGRvIHsKLSAgICAgICAgcmVzID0gZGF0YS53cml0ZUJsb2IoYmxvYlNpemUsICZibG9iKTsKKyAgICAgICAgcmVzID0gZGF0YS53cml0ZUJsb2IoYmxvYlNpemUsIGZhbHNlLCAmYmxvYik7CiAgICAgICAgIGlmIChyZXMgIT0gT0spIHsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9jYW1lcmEvSUNhbWVyYVNlcnZpY2UuY3BwIGIvY2FtZXJhL0lDYW1lcmFTZXJ2aWNlLmNwcAppbmRleCAwMDcxZTcwLi43YmIyNGVlIDEwMDY0NAotLS0gYS9jYW1lcmEvSUNhbWVyYVNlcnZpY2UuY3BwCisrKyBiL2NhbWVyYS9JQ2FtZXJhU2VydmljZS5jcHAKQEAgLTE3NSwxMCArMTc1LDEzIEBACiAgICAgICAgIGRhdGEud3JpdGVJbnQzMihjYW1lcmFJZCk7CiAgICAgICAgIGRhdGEud3JpdGVTdHJpbmcxNihjbGllbnRQYWNrYWdlTmFtZSk7CiAgICAgICAgIGRhdGEud3JpdGVJbnQzMihjbGllbnRVaWQpOwotICAgICAgICByZW1vdGUoKS0+dHJhbnNhY3QoQm5DYW1lcmFTZXJ2aWNlOjpDT05ORUNULCBkYXRhLCAmcmVwbHkpOworCisgICAgICAgIHN0YXR1c190IHN0YXR1czsKKyAgICAgICAgc3RhdHVzID0gcmVtb3RlKCktPnRyYW5zYWN0KEJuQ2FtZXJhU2VydmljZTo6Q09OTkVDVCwgZGF0YSwgJnJlcGx5KTsKKyAgICAgICAgaWYgKHN0YXR1cyAhPSBPSykgcmV0dXJuIHN0YXR1czsKIAogICAgICAgICBpZiAocmVhZEV4Y2VwdGlvbkNvZGUocmVwbHkpKSByZXR1cm4gLUVQUk9UTzsKLSAgICAgICAgc3RhdHVzX3Qgc3RhdHVzID0gcmVwbHkucmVhZEludDMyKCk7CisgICAgICAgIHN0YXR1cyA9IHJlcGx5LnJlYWRJbnQzMigpOwogICAgICAgICBpZiAocmVwbHkucmVhZEludDMyKCkgIT0gMCkgewogICAgICAgICAgICAgZGV2aWNlID0gaW50ZXJmYWNlX2Nhc3Q8SUNhbWVyYT4ocmVwbHkucmVhZFN0cm9uZ0JpbmRlcigpKTsKICAgICAgICAgfQpAQCAtMTk4LDEwICsyMDEsMTMgQEAKICAgICAgICAgZGF0YS53cml0ZUludDMyKGhhbFZlcnNpb24pOwogICAgICAgICBkYXRhLndyaXRlU3RyaW5nMTYoY2xpZW50UGFja2FnZU5hbWUpOwogICAgICAgICBkYXRhLndyaXRlSW50MzIoY2xpZW50VWlkKTsKLSAgICAgICAgcmVtb3RlKCktPnRyYW5zYWN0KEJuQ2FtZXJhU2VydmljZTo6Q09OTkVDVF9MRUdBQ1ksIGRhdGEsICZyZXBseSk7CisKKyAgICAgICAgc3RhdHVzX3Qgc3RhdHVzOworICAgICAgICBzdGF0dXMgPSByZW1vdGUoKS0+dHJhbnNhY3QoQm5DYW1lcmFTZXJ2aWNlOjpDT05ORUNUX0xFR0FDWSwgZGF0YSwgJnJlcGx5KTsKKyAgICAgICAgaWYgKHN0YXR1cyAhPSBPSykgcmV0dXJuIHN0YXR1czsKIAogICAgICAgICBpZiAocmVhZEV4Y2VwdGlvbkNvZGUocmVwbHkpKSByZXR1cm4gLUVQUk9UTzsKLSAgICAgICAgc3RhdHVzX3Qgc3RhdHVzID0gcmVwbHkucmVhZEludDMyKCk7CisgICAgICAgIHN0YXR1cyA9IHJlcGx5LnJlYWRJbnQzMigpOwogICAgICAgICBpZiAocmVwbHkucmVhZEludDMyKCkgIT0gMCkgewogICAgICAgICAgICAgZGV2aWNlID0gaW50ZXJmYWNlX2Nhc3Q8SUNhbWVyYT4ocmVwbHkucmVhZFN0cm9uZ0JpbmRlcigpKTsKICAgICAgICAgfQpAQCAtMjM3LDEwICsyNDMsMTMgQEAKICAgICAgICAgZGF0YS53cml0ZUludDMyKGNhbWVyYUlkKTsKICAgICAgICAgZGF0YS53cml0ZVN0cmluZzE2KGNsaWVudFBhY2thZ2VOYW1lKTsKICAgICAgICAgZGF0YS53cml0ZUludDMyKGNsaWVudFVpZCk7Ci0gICAgICAgIHJlbW90ZSgpLT50cmFuc2FjdChCbkNhbWVyYVNlcnZpY2U6OkNPTk5FQ1RfREVWSUNFLCBkYXRhLCAmcmVwbHkpOworCisgICAgICAgIHN0YXR1c190IHN0YXR1czsKKyAgICAgICAgc3RhdHVzID0gcmVtb3RlKCktPnRyYW5zYWN0KEJuQ2FtZXJhU2VydmljZTo6Q09OTkVDVF9ERVZJQ0UsIGRhdGEsICZyZXBseSk7CisgICAgICAgIGlmIChzdGF0dXMgIT0gT0spIHJldHVybiBzdGF0dXM7CiAKICAgICAgICAgaWYgKHJlYWRFeGNlcHRpb25Db2RlKHJlcGx5KSkgcmV0dXJuIC1FUFJPVE87Ci0gICAgICAgIHN0YXR1c190IHN0YXR1cyA9IHJlcGx5LnJlYWRJbnQzMigpOworICAgICAgICBzdGF0dXMgPSByZXBseS5yZWFkSW50MzIoKTsKICAgICAgICAgaWYgKHJlcGx5LnJlYWRJbnQzMigpICE9IDApIHsKICAgICAgICAgICAgIGRldmljZSA9IGludGVyZmFjZV9jYXN0PElDYW1lcmFEZXZpY2VVc2VyPihyZXBseS5yZWFkU3Ryb25nQmluZGVyKCkpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9jYW1lcmEvY2FtZXJhMi9JQ2FtZXJhRGV2aWNlVXNlci5jcHAgYi9jYW1lcmEvY2FtZXJhMi9JQ2FtZXJhRGV2aWNlVXNlci5jcHAKaW5kZXggOTcwMDI1OC4uYTc1NDlmMiAxMDA2NDQKLS0tIGEvY2FtZXJhL2NhbWVyYTIvSUNhbWVyYURldmljZVVzZXIuY3BwCisrKyBiL2NhbWVyYS9jYW1lcmEyL0lDYW1lcmFEZXZpY2VVc2VyLmNwcApAQCAtMTkwLDExICsxOTAsMTMgQEAKICAgICAgICAgcmV0dXJuIHJlcGx5LnJlYWRJbnQzMigpOwogICAgIH0KIAotICAgIHZpcnR1YWwgc3RhdHVzX3QgZW5kQ29uZmlndXJlKCkKKyAgICB2aXJ0dWFsIHN0YXR1c190IGVuZENvbmZpZ3VyZShib29sIGlzQ29uc3RyYWluZWRIaWdoU3BlZWQpCiAgICAgewogICAgICAgICBBTE9HVigiZW5kQ29uZmlndXJlIik7CiAgICAgICAgIFBhcmNlbCBkYXRhLCByZXBseTsKICAgICAgICAgZGF0YS53cml0ZUludGVyZmFjZVRva2VuKElDYW1lcmFEZXZpY2VVc2VyOjpnZXRJbnRlcmZhY2VEZXNjcmlwdG9yKCkpOworICAgICAgICBkYXRhLndyaXRlSW50MzIoaXNDb25zdHJhaW5lZEhpZ2hTcGVlZCk7CisKICAgICAgICAgcmVtb3RlKCktPnRyYW5zYWN0KEVORF9DT05GSUdVUkUsIGRhdGEsICZyZXBseSk7CiAgICAgICAgIHJlcGx5LnJlYWRFeGNlcHRpb25Db2RlKCk7CiAgICAgICAgIHJldHVybiByZXBseS5yZWFkSW50MzIoKTsKQEAgLTU1Niw4ICs1NTgsOSBAQAogICAgICAgICB9IGJyZWFrOwogICAgICAgICBjYXNlIEVORF9DT05GSUdVUkU6IHsKICAgICAgICAgICAgIENIRUNLX0lOVEVSRkFDRShJQ2FtZXJhRGV2aWNlVXNlciwgZGF0YSwgcmVwbHkpOworICAgICAgICAgICAgYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkID0gZGF0YS5yZWFkSW50MzIoKTsKICAgICAgICAgICAgIHJlcGx5LT53cml0ZU5vRXhjZXB0aW9uKCk7Ci0gICAgICAgICAgICByZXBseS0+d3JpdGVJbnQzMihlbmRDb25maWd1cmUoKSk7CisgICAgICAgICAgICByZXBseS0+d3JpdGVJbnQzMihlbmRDb25maWd1cmUoaXNDb25zdHJhaW5lZEhpZ2hTcGVlZCkpOwogICAgICAgICAgICAgcmV0dXJuIE5PX0VSUk9SOwogICAgICAgICB9IGJyZWFrOwogICAgICAgICBjYXNlIFBSRVBBUkU6IHsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvY2FtZXJhL2NhbWVyYTIvSUNhbWVyYURldmljZVVzZXIuaCBiL2luY2x1ZGUvY2FtZXJhL2NhbWVyYTIvSUNhbWVyYURldmljZVVzZXIuaAppbmRleCA2MTliMTYxLi5iM2RkMTQwIDEwMDY0NAotLS0gYS9pbmNsdWRlL2NhbWVyYS9jYW1lcmEyL0lDYW1lcmFEZXZpY2VVc2VyLmgKKysrIGIvaW5jbHVkZS9jYW1lcmEvY2FtZXJhMi9JQ2FtZXJhRGV2aWNlVXNlci5oCkBAIC05Nyw3ICs5Nyw3IEBACiAgICAgICogbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGFueSByZXF1ZXN0cyBjYW4gYmUgc3VibWl0dGVkLgogICAgICAqIDxwPgogICAgICAqLwotICAgIHZpcnR1YWwgc3RhdHVzX3QgICAgICAgIGVuZENvbmZpZ3VyZSgpID0gMDsKKyAgICB2aXJ0dWFsIHN0YXR1c190ICAgICAgICBlbmRDb25maWd1cmUoYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkID0gZmFsc2UpID0gMDsKIAogICAgIHZpcnR1YWwgc3RhdHVzX3QgICAgICAgIGRlbGV0ZVN0cmVhbShpbnQgc3RyZWFtSWQpID0gMDsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9tZWRpYS9BdWRpb0VmZmVjdC5oIGIvaW5jbHVkZS9tZWRpYS9BdWRpb0VmZmVjdC5oCmluZGV4IDYxZGE0ZjIuLjVhZjZjMTAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbWVkaWEvQXVkaW9FZmZlY3QuaAorKysgYi9pbmNsdWRlL21lZGlhL0F1ZGlvRWZmZWN0LmgKQEAgLTQyOSw3ICs0MjksOCBAQAogcHJpdmF0ZToKIAogICAgICAvLyBJbXBsZW1lbnRzIHRoZSBJRWZmZWN0Q2xpZW50IGludGVyZmFjZQotICAgIGNsYXNzIEVmZmVjdENsaWVudCA6IHB1YmxpYyBhbmRyb2lkOjpCbkVmZmVjdENsaWVudCwgIHB1YmxpYyBhbmRyb2lkOjpJQmluZGVyOjpEZWF0aFJlY2lwaWVudAorICAgIGNsYXNzIEVmZmVjdENsaWVudCA6CisgICAgICAgIHB1YmxpYyBhbmRyb2lkOjpCbkVmZmVjdENsaWVudCwgcHVibGljIGFuZHJvaWQ6OklCaW5kZXI6OkRlYXRoUmVjaXBpZW50CiAgICAgewogICAgIHB1YmxpYzoKIApAQCAtNDM3LDI0ICs0MzgsMzkgQEAKIAogICAgICAgICAvLyBJRWZmZWN0Q2xpZW50CiAgICAgICAgIHZpcnR1YWwgdm9pZCBjb250cm9sU3RhdHVzQ2hhbmdlZChib29sIGNvbnRyb2xHcmFudGVkKSB7Ci0gICAgICAgICAgICBtRWZmZWN0LT5jb250cm9sU3RhdHVzQ2hhbmdlZChjb250cm9sR3JhbnRlZCk7CisgICAgICAgICAgICBzcDxBdWRpb0VmZmVjdD4gZWZmZWN0ID0gbUVmZmVjdC5wcm9tb3RlKCk7CisgICAgICAgICAgICBpZiAoZWZmZWN0ICE9IDApIHsKKyAgICAgICAgICAgICAgICBlZmZlY3QtPmNvbnRyb2xTdGF0dXNDaGFuZ2VkKGNvbnRyb2xHcmFudGVkKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgZW5hYmxlU3RhdHVzQ2hhbmdlZChib29sIGVuYWJsZWQpIHsKLSAgICAgICAgICAgIG1FZmZlY3QtPmVuYWJsZVN0YXR1c0NoYW5nZWQoZW5hYmxlZCk7CisgICAgICAgICAgICBzcDxBdWRpb0VmZmVjdD4gZWZmZWN0ID0gbUVmZmVjdC5wcm9tb3RlKCk7CisgICAgICAgICAgICBpZiAoZWZmZWN0ICE9IDApIHsKKyAgICAgICAgICAgICAgICBlZmZlY3QtPmVuYWJsZVN0YXR1c0NoYW5nZWQoZW5hYmxlZCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgdmlydHVhbCB2b2lkIGNvbW1hbmRFeGVjdXRlZCh1aW50MzJfdCBjbWRDb2RlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGNtZFNpemUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqcENtZERhdGEsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgcmVwbHlTaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKnBSZXBseURhdGEpIHsKLSAgICAgICAgICAgIG1FZmZlY3QtPmNvbW1hbmRFeGVjdXRlZChjbWRDb2RlLCBjbWRTaXplLCBwQ21kRGF0YSwgcmVwbHlTaXplLCBwUmVwbHlEYXRhKTsKKyAgICAgICAgICAgIHNwPEF1ZGlvRWZmZWN0PiBlZmZlY3QgPSBtRWZmZWN0LnByb21vdGUoKTsKKyAgICAgICAgICAgIGlmIChlZmZlY3QgIT0gMCkgeworICAgICAgICAgICAgICAgIGVmZmVjdC0+Y29tbWFuZEV4ZWN1dGVkKAorICAgICAgICAgICAgICAgICAgICBjbWRDb2RlLCBjbWRTaXplLCBwQ21kRGF0YSwgcmVwbHlTaXplLCBwUmVwbHlEYXRhKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8vIElCaW5kZXI6OkRlYXRoUmVjaXBpZW50Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBiaW5kZXJEaWVkKGNvbnN0IHdwPElCaW5kZXI+JiB3aG8pIHttRWZmZWN0LT5iaW5kZXJEaWVkKCk7fQorICAgICAgICB2aXJ0dWFsIHZvaWQgYmluZGVyRGllZChjb25zdCB3cDxJQmluZGVyPiYgd2hvKSB7CisgICAgICAgICAgICBzcDxBdWRpb0VmZmVjdD4gZWZmZWN0ID0gbUVmZmVjdC5wcm9tb3RlKCk7CisgICAgICAgICAgICBpZiAoZWZmZWN0ICE9IDApIHsKKyAgICAgICAgICAgICAgICBlZmZlY3QtPmJpbmRlckRpZWQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgQXVkaW9FZmZlY3QgKm1FZmZlY3Q7CisgICAgICAgIHdwPEF1ZGlvRWZmZWN0PiBtRWZmZWN0OwogICAgIH07CiAKICAgICB2b2lkIGJpbmRlckRpZWQoKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbWVkaWEvQXVkaW9UcmFjay5oIGIvaW5jbHVkZS9tZWRpYS9BdWRpb1RyYWNrLmgKaW5kZXggM2VmYTc0Yy4uYzBiYzUxNiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9tZWRpYS9BdWRpb1RyYWNrLmgKKysrIGIvaW5jbHVkZS9tZWRpYS9BdWRpb1RyYWNrLmgKQEAgLTQzLDIyICs0MywzMCBAQAogICAgICAqLwogICAgIGVudW0gZXZlbnRfdHlwZSB7CiAgICAgICAgIEVWRU5UX01PUkVfREFUQSA9IDAsICAgICAgICAvLyBSZXF1ZXN0IHRvIHdyaXRlIG1vcmUgZGF0YSB0byBidWZmZXIuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGV2ZW50IG9ubHkgb2NjdXJzIGZvciBUUkFOU0ZFUl9DQUxMQkFDSy4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIElmIHRoaXMgZXZlbnQgaXMgZGVsaXZlcmVkIGJ1dCB0aGUgY2FsbGJhY2sgaGFuZGxlcgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZG9lcyBub3Qgd2FudCB0byB3cml0ZSBtb3JlIGRhdGEsIHRoZSBoYW5kbGVyIG11c3QgZXhwbGljaXRseQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZG9lcyBub3Qgd2FudCB0byB3cml0ZSBtb3JlIGRhdGEsIHRoZSBoYW5kbGVyIG11c3QKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGlnbm9yZSB0aGUgZXZlbnQgYnkgc2V0dGluZyBmcmFtZUNvdW50IHRvIHplcm8uCi0gICAgICAgIEVWRU5UX1VOREVSUlVOID0gMSwgICAgICAgICAvLyBCdWZmZXIgdW5kZXJydW4gb2NjdXJyZWQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIG1pZ2h0IG9jY3VyLCBmb3IgZXhhbXBsZSwgaWYgdGhlIGFwcGxpY2F0aW9uIGlzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3YWl0aW5nIGZvciBzb3VyY2UgZGF0YSBvciBpcyBhdCB0aGUgZW5kIG9mIHN0cmVhbS4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBGb3IgZGF0YSBmaWxsaW5nLCBpdCBpcyBwcmVmZXJyZWQgdGhhdCB0aGUgY2FsbGJhY2sKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGRvZXMgbm90IGJsb2NrIGFuZCBpbnN0ZWFkIHJldHVybnMgYSBzaG9ydCBjb3VudCBvbgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gdGhlIGFtb3VudCBvZiBkYXRhIGFjdHVhbGx5IGRlbGl2ZXJlZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gKG9yIDAsIGlmIG5vIGRhdGEgaXMgY3VycmVudGx5IGF2YWlsYWJsZSkuCisgICAgICAgIEVWRU5UX1VOREVSUlVOID0gMSwgICAgICAgICAvLyBCdWZmZXIgdW5kZXJydW4gb2NjdXJyZWQuIFRoaXMgd2lsbCBub3Qgb2NjdXIgZm9yCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBzdGF0aWMgdHJhY2tzLgogICAgICAgICBFVkVOVF9MT09QX0VORCA9IDIsICAgICAgICAgLy8gU2FtcGxlIGxvb3AgZW5kIHdhcyByZWFjaGVkOyBwbGF5YmFjayByZXN0YXJ0ZWQgZnJvbQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbG9vcCBzdGFydCBpZiBsb29wIGNvdW50IHdhcyBub3QgMC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGxvb3Agc3RhcnQgaWYgbG9vcCBjb3VudCB3YXMgbm90IDAgZm9yIGEgc3RhdGljIHRyYWNrLgogICAgICAgICBFVkVOVF9NQVJLRVIgPSAzLCAgICAgICAgICAgLy8gUGxheWJhY2sgaGVhZCBpcyBhdCB0aGUgc3BlY2lmaWVkIG1hcmtlciBwb3NpdGlvbgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gKFNlZSBzZXRNYXJrZXJQb3NpdGlvbigpKS4KICAgICAgICAgRVZFTlRfTkVXX1BPUyA9IDQsICAgICAgICAgIC8vIFBsYXliYWNrIGhlYWQgaXMgYXQgYSBuZXcgcG9zaXRpb24KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIChTZWUgc2V0UG9zaXRpb25VcGRhdGVQZXJpb2QoKSkuCi0gICAgICAgIEVWRU5UX0JVRkZFUl9FTkQgPSA1LCAgICAgICAvLyBQbGF5YmFjayBoZWFkIGlzIGF0IHRoZSBlbmQgb2YgdGhlIGJ1ZmZlci4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIE5vdCBjdXJyZW50bHkgdXNlZCBieSBhbmRyb2lkLm1lZGlhLkF1ZGlvVHJhY2suCisgICAgICAgIEVWRU5UX0JVRkZFUl9FTkQgPSA1LCAgICAgICAvLyBQbGF5YmFjayBoYXMgY29tcGxldGVkIGZvciBhIHN0YXRpYyB0cmFjay4KICAgICAgICAgRVZFTlRfTkVXX0lBVURJT1RSQUNLID0gNiwgIC8vIElBdWRpb1RyYWNrIHdhcyByZS1jcmVhdGVkLCBlaXRoZXIgZHVlIHRvIHJlLXJvdXRpbmcgYW5kCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB2b2x1bnRhcnkgaW52YWxpZGF0aW9uIGJ5IG1lZGlhc2VydmVyLCBvciBtZWRpYXNlcnZlciBjcmFzaC4KICAgICAgICAgRVZFTlRfU1RSRUFNX0VORCA9IDcsICAgICAgIC8vIFNlbnQgYWZ0ZXIgYWxsIHRoZSBidWZmZXJzIHF1ZXVlZCBpbiBBRiBhbmQgSFcgYXJlIHBsYXllZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYmFjayAoYWZ0ZXIgc3RvcCBpcyBjYWxsZWQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBiYWNrIChhZnRlciBzdG9wIGlzIGNhbGxlZCkgZm9yIGFuIG9mZmxvYWRlZCB0cmFjay4KICNpZiAwICAgLy8gRklYTUUgbm90IHlldCBpbXBsZW1lbnRlZAogICAgICAgICBFVkVOVF9ORVdfVElNRVNUQU1QID0gOCwgICAgLy8gRGVsaXZlcmVkIHBlcmlvZGljYWxseSBhbmQgd2hlbiB0aGVyZSdzIGEgc2lnbmlmaWNhbnQgY2hhbmdlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBpbiB0aGUgbWFwcGluZyBmcm9tIGZyYW1lIHBvc2l0aW9uIHRvIHByZXNlbnRhdGlvbiB0aW1lLgpAQCAtODg2LDYgKzg5NCw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gb25seSB1c2VkIGZvciBvZmZsb2FkZWQgYW5kIGRpcmVjdCB0cmFja3MuCiAKICAgICBib29sICAgICAgICAgICAgICAgICAgICBtUHJldmlvdXNUaW1lc3RhbXBWYWxpZDsvLyB0cnVlIGlmIG1QcmV2aW91c1RpbWVzdGFtcCBpcyB2YWxpZAorICAgIGJvb2wgICAgICAgICAgICAgICAgICAgIG1UaW1lc3RhbXBTdGFydHVwR2xpdGNoUmVwb3J0ZWQ7IC8vIHJlZHVjZSBsb2cgc3BhbQogICAgIGJvb2wgICAgICAgICAgICAgICAgICAgIG1SZXRyb2dyYWRlTW90aW9uUmVwb3J0ZWQ7IC8vIHJlZHVjZSBsb2cgc3BhbQogICAgIEF1ZGlvVGltZXN0YW1wICAgICAgICAgIG1QcmV2aW91c1RpbWVzdGFtcDsgICAgIC8vIHVzZWQgdG8gZGV0ZWN0IHJldHJvZ3JhZGUgbW90aW9uCiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbWVkaWEvSU9NWC5oIGIvaW5jbHVkZS9tZWRpYS9JT01YLmgKaW5kZXggODRmZGY4My4uNzAyMzQ1MyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9tZWRpYS9JT01YLmgKKysrIGIvaW5jbHVkZS9tZWRpYS9JT01YLmgKQEAgLTI1LDYgKzI1LDggQEAKICNpbmNsdWRlIDx1dGlscy9MaXN0Lmg+CiAjaW5jbHVkZSA8dXRpbHMvU3RyaW5nOC5oPgogCisjaW5jbHVkZSA8bGlzdD4KKwogI2luY2x1ZGUgPG1lZGlhL2hhcmR3YXJlL01ldGFkYXRhQnVmZmVyVHlwZS5oPgogCiAjaW5jbHVkZSA8T01YX0NvcmUuaD4KQEAgLTIzMSw3ICsyMzMsOCBAQAogcHVibGljOgogICAgIERFQ0xBUkVfTUVUQV9JTlRFUkZBQ0UoT01YT2JzZXJ2ZXIpOwogCi0gICAgdmlydHVhbCB2b2lkIG9uTWVzc2FnZShjb25zdCBvbXhfbWVzc2FnZSAmbXNnKSA9IDA7CisgICAgLy8gSGFuZGxlIChsaXN0IG9mKSBtZXNzYWdlcy4KKyAgICB2aXJ0dWFsIHZvaWQgb25NZXNzYWdlcyhjb25zdCBzdGQ6Omxpc3Q8b214X21lc3NhZ2U+ICZtZXNzYWdlcykgPSAwOwogfTsKIAogLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KZGlmZiAtLWdpdCBhL2luY2x1ZGUvbWVkaWEvTWVkaWFQbGF5ZXJJbnRlcmZhY2UuaCBiL2luY2x1ZGUvbWVkaWEvTWVkaWFQbGF5ZXJJbnRlcmZhY2UuaAppbmRleCA0NmY5MDBlLi5kZTgyNTU0IDEwMDY0NAotLS0gYS9pbmNsdWRlL21lZGlhL01lZGlhUGxheWVySW50ZXJmYWNlLmgKKysrIGIvaW5jbHVkZS9tZWRpYS9NZWRpYVBsYXllckludGVyZmFjZS5oCkBAIC0xMTQsNyArMTE0LDggQEAKICAgICAgICAgICAgICAgICB2b2lkICpjb29raWUgPSBOVUxMLAogICAgICAgICAgICAgICAgIGF1ZGlvX291dHB1dF9mbGFnc190IGZsYWdzID0gQVVESU9fT1VUUFVUX0ZMQUdfTk9ORSwKICAgICAgICAgICAgICAgICBjb25zdCBhdWRpb19vZmZsb2FkX2luZm9fdCAqb2ZmbG9hZEluZm8gPSBOVUxMLAotICAgICAgICAgICAgICAgIGJvb2wgZG9Ob3RSZWNvbm5lY3QgPSBmYWxzZSkgPSAwOworICAgICAgICAgICAgICAgIGJvb2wgZG9Ob3RSZWNvbm5lY3QgPSBmYWxzZSwKKyAgICAgICAgICAgICAgICB1aW50MzJfdCBzdWdnZXN0ZWRGcmFtZUNvdW50ID0gMCkgPSAwOwogCiAgICAgICAgIHZpcnR1YWwgc3RhdHVzX3QgICAgc3RhcnQoKSA9IDA7CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvQUNvZGVjLmggYi9pbmNsdWRlL21lZGlhL3N0YWdlZnJpZ2h0L0FDb2RlYy5oCmluZGV4IGY3YTNkZjcuLmQ0ODkxYTEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvQUNvZGVjLmgKKysrIGIvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9BQ29kZWMuaApAQCAtMTA5LDYgKzEwOSw3IEBACiAgICAgZW51bSB7CiAgICAgICAgIGtXaGF0U2V0dXAgICAgICAgICAgICAgICAgICAgPSAnc2V0dScsCiAgICAgICAgIGtXaGF0T01YTWVzc2FnZSAgICAgICAgICAgICAgPSAnb214ICcsCisgICAgICAgIGtXaGF0T01YTWVzc2FnZUxpc3QgICAgICAgICAgPSAnb214TCcsCiAgICAgICAgIGtXaGF0SW5wdXRCdWZmZXJGaWxsZWQgICAgICAgPSAnaW5wRicsCiAgICAgICAgIGtXaGF0T3V0cHV0QnVmZmVyRHJhaW5lZCAgICAgPSAnb3V0RCcsCiAgICAgICAgIGtXaGF0U2h1dGRvd24gICAgICAgICAgICAgICAgPSAnc2h1dCcsCmRpZmYgLS1naXQgYS9pbmNsdWRlL21lZGlhL3N0YWdlZnJpZ2h0L0NhbWVyYVNvdXJjZS5oIGIvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9DYW1lcmFTb3VyY2UuaAppbmRleCA5NmRmZDdlLi4wNjllODk3IDEwMDY0NAotLS0gYS9pbmNsdWRlL21lZGlhL3N0YWdlZnJpZ2h0L0NhbWVyYVNvdXJjZS5oCisrKyBiL2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvQ2FtZXJhU291cmNlLmgKQEAgLTgzLDcgKzgzLDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNpemUgdmlkZW9TaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50MzJfdCBmcmFtZVJhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzcDxJR3JhcGhpY0J1ZmZlclByb2R1Y2VyPiYgc3VyZmFjZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc3RvcmVNZXRhRGF0YUluVmlkZW9CdWZmZXJzID0gZmFsc2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzdG9yZU1ldGFEYXRhSW5WaWRlb0J1ZmZlcnMgPSB0cnVlKTsKIAogICAgIHZpcnR1YWwgfkNhbWVyYVNvdXJjZSgpOwogCkBAIC0xNDksNiArMTQ5LDggQEAKICAgICBpbnQzMl90ICBtTnVtSW5wdXRCdWZmZXJzOwogICAgIGludDMyX3QgIG1WaWRlb0ZyYW1lUmF0ZTsKICAgICBpbnQzMl90ICBtQ29sb3JGb3JtYXQ7CisgICAgaW50MzJfdCAgbUVuY29kZXJGb3JtYXQ7CisgICAgaW50MzJfdCAgbUVuY29kZXJEYXRhU3BhY2U7CiAgICAgc3RhdHVzX3QgbUluaXRDaGVjazsKIAogICAgIHNwPENhbWVyYT4gICBtQ2FtZXJhOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjTGlzdC5oIGIvaW5jbHVkZS9tZWRpYS9zdGFnZWZyaWdodC9NZWRpYUNvZGVjTGlzdC5oCmluZGV4IGRmNWU1MTkuLjNhYWEwMzIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbWVkaWEvc3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0xpc3QuaAorKysgYi9pbmNsdWRlL21lZGlhL3N0YWdlZnJpZ2h0L01lZGlhQ29kZWNMaXN0LmgKQEAgLTU1LDcgKzU1LDEwIEBACiAgICAgLy8gdG8gYmUgdXNlZCBieSBNZWRpYVBsYXllclNlcnZpY2UgYWxvbmUKICAgICBzdGF0aWMgc3A8SU1lZGlhQ29kZWNMaXN0PiBnZXRMb2NhbEluc3RhbmNlKCk7CiAKLSAgICAvLyBvbmx5IHRvIGJlIHVzZWQgaW4gZ2V0TG9jYWxJbnN0YW5jZQorICAgIC8vIG9ubHkgdG8gYmUgdXNlZCBieSBnZXRMb2NhbEluc3RhbmNlCisgICAgc3RhdGljIHZvaWQgKnByb2ZpbGVyVGhyZWFkV3JhcHBlcih2b2lkICogLyphcmcqLyk7CisKKyAgICAvLyBvbmx5IHRvIGJlIHVzZWQgYnkgTWVkaWFQbGF5ZXJTZXJ2aWNlCiAgICAgdm9pZCBwYXJzZVRvcExldmVsWE1MRmlsZShjb25zdCBjaGFyICpwYXRoLCBib29sIGlnbm9yZV9lcnJvcnMgPSBmYWxzZSk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYS9BdWRpb0VmZmVjdC5jcHAgYi9tZWRpYS9saWJtZWRpYS9BdWRpb0VmZmVjdC5jcHAKaW5kZXggYmJlYjg1NC4uZmY4MjU0NCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWEvQXVkaW9FZmZlY3QuY3BwCisrKyBiL21lZGlhL2xpYm1lZGlhL0F1ZGlvRWZmZWN0LmNwcApAQCAtMTM0LDEyICsxMzQsMTQgQEAKIAogICAgIGlmIChpRWZmZWN0ID09IDAgfHwgKG1TdGF0dXMgIT0gTk9fRVJST1IgJiYgbVN0YXR1cyAhPSBBTFJFQURZX0VYSVNUUykpIHsKICAgICAgICAgQUxPR0UoInNldCgpOiBBdWRpb0ZsaW5nZXIgY291bGQgbm90IGNyZWF0ZSBlZmZlY3QsIHN0YXR1czogJWQiLCBtU3RhdHVzKTsKKyAgICAgICAgaWYgKGlFZmZlY3QgPT0gMCkgeworICAgICAgICAgICAgbVN0YXR1cyA9IE5PX0lOSVQ7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG1TdGF0dXM7CiAgICAgfQogCiAgICAgbUVuYWJsZWQgPSAodm9sYXRpbGUgaW50MzJfdCllbmFibGVkOwogCi0gICAgbUlFZmZlY3QgPSBpRWZmZWN0OwogICAgIGNibGsgPSBpRWZmZWN0LT5nZXRDYmxrKCk7CiAgICAgaWYgKGNibGsgPT0gMCkgewogICAgICAgICBtU3RhdHVzID0gTk9fSU5JVDsKQEAgLTE0Nyw2ICsxNDksNyBAQAogICAgICAgICByZXR1cm4gbVN0YXR1czsKICAgICB9CiAKKyAgICBtSUVmZmVjdCA9IGlFZmZlY3Q7CiAgICAgbUNibGtNZW1vcnkgPSBjYmxrOwogICAgIG1DYmxrID0gc3RhdGljX2Nhc3Q8ZWZmZWN0X3BhcmFtX2NibGtfdCo+KGNibGstPnBvaW50ZXIoKSk7CiAgICAgaW50IGJ1Zk9mZnNldCA9ICgoc2l6ZW9mKGVmZmVjdF9wYXJhbV9jYmxrX3QpIC0gMSkgLyBzaXplb2YoaW50KSArIDEpICogc2l6ZW9mKGludCk7CkBAIC0xNzcsMTEgKzE4MCwxMSBAQAogICAgICAgICAgICAgbUlFZmZlY3QtPmRpc2Nvbm5lY3QoKTsKICAgICAgICAgICAgIElJbnRlcmZhY2U6OmFzQmluZGVyKG1JRWZmZWN0KS0+dW5saW5rVG9EZWF0aChtSUVmZmVjdENsaWVudCk7CiAgICAgICAgIH0KKyAgICAgICAgbUlFZmZlY3QuY2xlYXIoKTsKKyAgICAgICAgbUNibGtNZW1vcnkuY2xlYXIoKTsKKyAgICAgICAgbUlFZmZlY3RDbGllbnQuY2xlYXIoKTsKICAgICAgICAgSVBDVGhyZWFkU3RhdGU6OnNlbGYoKS0+Zmx1c2hDb21tYW5kcygpOwogICAgIH0KLSAgICBtSUVmZmVjdC5jbGVhcigpOwotICAgIG1JRWZmZWN0Q2xpZW50LmNsZWFyKCk7Ci0gICAgbUNibGtNZW1vcnkuY2xlYXIoKTsKIH0KIAogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYS9BdWRpb1RyYWNrLmNwcCBiL21lZGlhL2xpYm1lZGlhL0F1ZGlvVHJhY2suY3BwCmluZGV4IDA3MGJhYTEuLjgxYWU2ZDcgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYm1lZGlhL0F1ZGlvVHJhY2suY3BwCisrKyBiL21lZGlhL2xpYm1lZGlhL0F1ZGlvVHJhY2suY3BwCkBAIC0zOCwxMSArMzgsMjMgQEAKIG5hbWVzcGFjZSBhbmRyb2lkIHsKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCisvLyBUT0RPOiBNb3ZlIHRvIGEgc2VwYXJhdGUgLmgKKwogdGVtcGxhdGUgPHR5cGVuYW1lIFQ+Ci1jb25zdCBUICZtaW4oY29uc3QgVCAmeCwgY29uc3QgVCAmeSkgeworc3RhdGljIGlubGluZSBjb25zdCBUICZtaW4oY29uc3QgVCAmeCwgY29uc3QgVCAmeSkgewogICAgIHJldHVybiB4IDwgeSA/IHggOiB5OwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK3N0YXRpYyBpbmxpbmUgY29uc3QgVCAmbWF4KGNvbnN0IFQgJngsIGNvbnN0IFQgJnkpIHsKKyAgICByZXR1cm4geCA+IHkgPyB4IDogeTsKK30KKworc3RhdGljIGlubGluZSBuc2Vjc190IGZyYW1lc1RvTmFub3NlY29uZHMoc3NpemVfdCBmcmFtZXMsIHVpbnQzMl90IHNhbXBsZVJhdGUsIGZsb2F0IHNwZWVkKQoreworICAgIHJldHVybiAoKGRvdWJsZSlmcmFtZXMgKiAxMDAwMDAwMDAwKSAvICgoZG91YmxlKXNhbXBsZVJhdGUgKiBzcGVlZCk7Cit9CisKIHN0YXRpYyBpbnQ2NF90IGNvbnZlcnRUaW1lc3BlY1RvVXMoY29uc3Qgc3RydWN0IHRpbWVzcGVjICZ0dikKIHsKICAgICByZXR1cm4gdHYudHZfc2VjICogMTAwMDAwMGxsICsgdHYudHZfbnNlYyAvIDEwMDA7CkBAIC00ODAsNiArNDkyLDggQEAKICAgICBtT2JzZXJ2ZWRTZXF1ZW5jZSA9IG1TZXF1ZW5jZTsKICAgICBtSW5VbmRlcnJ1biA9IGZhbHNlOwogICAgIG1QcmV2aW91c1RpbWVzdGFtcFZhbGlkID0gZmFsc2U7CisgICAgbVRpbWVzdGFtcFN0YXJ0dXBHbGl0Y2hSZXBvcnRlZCA9IGZhbHNlOworICAgIG1SZXRyb2dyYWRlTW90aW9uUmVwb3J0ZWQgPSBmYWxzZTsKIAogICAgIHJldHVybiBOT19FUlJPUjsKIH0KQEAgLTUwNyw2ICs1MjEsOCBAQAogICAgICAgICAvLyByZXNldCBjdXJyZW50IHBvc2l0aW9uIGFzIHNlZW4gYnkgY2xpZW50IHRvIDAKICAgICAgICAgbVBvc2l0aW9uID0gMDsKICAgICAgICAgbVByZXZpb3VzVGltZXN0YW1wVmFsaWQgPSBmYWxzZTsKKyAgICAgICAgbVRpbWVzdGFtcFN0YXJ0dXBHbGl0Y2hSZXBvcnRlZCA9IGZhbHNlOworICAgICAgICBtUmV0cm9ncmFkZU1vdGlvblJlcG9ydGVkID0gZmFsc2U7CiAKICAgICAgICAgLy8gRm9yIG9mZmxvYWRlZCB0cmFja3MsIHdlIGRvbid0IGtub3cgaWYgdGhlIGhhcmR3YXJlIGNvdW50ZXJzIGFyZSByZWFsbHkgemVybyBoZXJlLAogICAgICAgICAvLyBzaW5jZSB0aGUgZmx1c2ggaXMgYXN5bmNocm9ub3VzIGFuZCBzdG9wIG1heSBub3QgZnVsbHkgZHJhaW4uCkBAIC0xNzU5LDcgKzE3NzUsNyBAQAogICAgIC8vIENhY2hlIG90aGVyIGZpZWxkcyB0aGF0IHdpbGwgYmUgbmVlZGVkIHNvb24KICAgICB1aW50MzJfdCBzYW1wbGVSYXRlID0gbVNhbXBsZVJhdGU7CiAgICAgZmxvYXQgc3BlZWQgPSBtUGxheWJhY2tSYXRlLm1TcGVlZDsKLSAgICB1aW50MzJfdCBub3RpZmljYXRpb25GcmFtZXMgPSBtTm90aWZpY2F0aW9uRnJhbWVzQWN0OworICAgIGNvbnN0IHVpbnQzMl90IG5vdGlmaWNhdGlvbkZyYW1lcyA9IG1Ob3RpZmljYXRpb25GcmFtZXNBY3Q7CiAgICAgaWYgKG1SZWZyZXNoUmVtYWluaW5nKSB7CiAgICAgICAgIG1SZWZyZXNoUmVtYWluaW5nID0gZmFsc2U7CiAgICAgICAgIG1SZW1haW5pbmdGcmFtZXMgPSBub3RpZmljYXRpb25GcmFtZXM7CkBAIC0xNzk3LDcgKzE4MTMsMTQgQEAKIAogICAgIG1Mb2NrLnVubG9jaygpOwogCisgICAgLy8gZ2V0IGFuY2hvciB0aW1lIHRvIGFjY291bnQgZm9yIGNhbGxiYWNrcy4KKyAgICBjb25zdCBuc2Vjc190IHRpbWVCZWZvcmVDYWxsYmFja3MgPSBzeXN0ZW1UaW1lKCk7CisKICAgICBpZiAod2FpdFN0cmVhbUVuZCkgeworICAgICAgICAvLyBGSVhNRTogIEluc3RlYWQgb2YgYmxvY2tpbmcgaW4gcHJveHktPndhaXRTdHJlYW1FbmREb25lKCksIENhbGxiYWNrIHRocmVhZAorICAgICAgICAvLyBzaG91bGQgd2FpdCBvbiBwcm94eSBmdXRleCBhbmQgaGFuZGxlIENCTEtfU1RSRUFNX0VORF9ET05FIHdpdGhpbiB0aGlzIGZ1bmN0aW9uCisgICAgICAgIC8vIChhbmQgbWFrZSBzdXJlIHdlIGRvbid0IGNhbGxiYWNrIGZvciBtb3JlIGRhdGEgd2hpbGUgd2UncmUgc3RvcHBpbmcpLgorICAgICAgICAvLyBUaGlzIGhlbHBzIHdpdGggcG9zaXRpb24sIG1hcmtlciBub3RpZmljYXRpb25zLCBhbmQgdHJhY2sgaW52YWxpZGF0aW9uLgogICAgICAgICBzdHJ1Y3QgdGltZXNwZWMgdGltZW91dDsKICAgICAgICAgdGltZW91dC50dl9zZWMgPSBXQUlUX1NUUkVBTV9FTkRfVElNRU9VVF9TRUM7CiAgICAgICAgIHRpbWVvdXQudHZfbnNlYyA9IDA7CkBAIC0xODgyLDEyICsxOTA1LDE3IEBACiAgICAgICAgIG1pbkZyYW1lcyA9IGtQb2xsICogbm90aWZpY2F0aW9uRnJhbWVzOwogICAgIH0KIAorICAgIC8vIFRoaXMgImZ1ZGdlIGZhY3RvciIgYXZvaWRzIHNvYWtpbmcgQ1BVLCBhbmQgY29tcGVuc2F0ZXMgZm9yIGxhdGUgcHJvZ3Jlc3MgYnkgc2VydmVyCisgICAgc3RhdGljIGNvbnN0IG5zZWNzX3Qga1dhaXRQZXJpb2ROcyA9IFdBSVRfUEVSSU9EX01TICogMTAwMDAwMExMOworICAgIGNvbnN0IG5zZWNzX3QgdGltZUFmdGVyQ2FsbGJhY2tzID0gc3lzdGVtVGltZSgpOworCiAgICAgLy8gQ29udmVydCBmcmFtZSB1bml0cyB0byB0aW1lIHVuaXRzCiAgICAgbnNlY3NfdCBucyA9IE5TX1dIRU5FVkVSOwogICAgIGlmIChtaW5GcmFtZXMgIT0gKHVpbnQzMl90KSB+MCkgewotICAgICAgICAvLyBUaGlzICJmdWRnZSBmYWN0b3IiIGF2b2lkcyBzb2FraW5nIENQVSwgYW5kIGNvbXBlbnNhdGVzIGZvciBsYXRlIHByb2dyZXNzIGJ5IHNlcnZlcgotICAgICAgICBzdGF0aWMgY29uc3QgbnNlY3NfdCBrRnVkZ2VOcyA9IDEwMDAwMDAwTEw7IC8vIDEwIG1zCi0gICAgICAgIG5zID0gKChkb3VibGUpbWluRnJhbWVzICogMTAwMDAwMDAwMCkgLyAoKGRvdWJsZSlzYW1wbGVSYXRlICogc3BlZWQpICsga0Z1ZGdlTnM7CisgICAgICAgIG5zID0gZnJhbWVzVG9OYW5vc2Vjb25kcyhtaW5GcmFtZXMsIHNhbXBsZVJhdGUsIHNwZWVkKSArIGtXYWl0UGVyaW9kTnM7CisgICAgICAgIG5zIC09ICh0aW1lQWZ0ZXJDYWxsYmFja3MgLSB0aW1lQmVmb3JlQ2FsbGJhY2tzKTsgIC8vIGFjY291bnQgZm9yIGNhbGxiYWNrIHRpbWUKKyAgICAgICAgLy8gVE9ETzogU2hvdWxkIHdlIHdhcm4gaWYgdGhlIGNhbGxiYWNrIHRpbWUgaXMgdG9vIGxvbmc/CisgICAgICAgIGlmIChucyA8IDApIG5zID0gMDsKICAgICB9CiAKICAgICAvLyBJZiBub3Qgc3VwcGx5aW5nIGRhdGEgYnkgRVZFTlRfTU9SRV9EQVRBLCB0aGVuIHdlJ3JlIGRvbmUKQEAgLTE4OTUsNiArMTkyMywxMyBAQAogICAgICAgICByZXR1cm4gbnM7CiAgICAgfQogCisgICAgLy8gRVZFTlRfTU9SRV9EQVRBIGNhbGxiYWNrIGhhbmRsaW5nLgorICAgIC8vIFRpbWluZyBmb3IgbGluZWFyIHBjbSBhdWRpbyBkYXRhIGZvcm1hdHMgY2FuIGJlIGRlcml2ZWQgZGlyZWN0bHkgZnJvbSB0aGUKKyAgICAvLyBidWZmZXIgZmlsbCBsZXZlbC4KKyAgICAvLyBUaW1pbmcgZm9yIGNvbXByZXNzZWQgZGF0YSBpcyBub3QgZGlyZWN0bHkgYXZhaWxhYmxlIGZyb20gdGhlIGJ1ZmZlciBmaWxsIGxldmVsLAorICAgIC8vIHJhdGhlciBpbmRpcmVjdGx5IGZyb20gd2FpdGluZyBmb3IgYmxvY2tpbmcgbW9kZSBjYWxsYmFja3Mgb3Igd2FpdGluZyBmb3Igb2J0YWluKCkKKyAgICAvLyB0byByZXR1cm4gYSBjZXJ0YWluIGZpbGwgbGV2ZWwuCisKICAgICBzdHJ1Y3QgdGltZXNwZWMgdGltZW91dDsKICAgICBjb25zdCBzdHJ1Y3QgdGltZXNwZWMgKnJlcXVlc3RlZCA9ICZDbGllbnRQcm94eTo6a0ZvcmV2ZXI7CiAgICAgaWYgKG5zICE9IE5TX1dIRU5FVkVSKSB7CkBAIC0xOTI1LDEyICsxOTYwLDE1IEBACiAgICAgICAgICAgICByZXR1cm4gTlNfTkVWRVI7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobVJldHJ5T25QYXJ0aWFsQnVmZmVyICYmICFpc09mZmxvYWRlZCgpKSB7CisgICAgICAgIGlmIChtUmV0cnlPblBhcnRpYWxCdWZmZXIgJiYgYXVkaW9faXNfbGluZWFyX3BjbShtRm9ybWF0KSkgewogICAgICAgICAgICAgbVJldHJ5T25QYXJ0aWFsQnVmZmVyID0gZmFsc2U7CiAgICAgICAgICAgICBpZiAoYXZhaWwgPCBtUmVtYWluaW5nRnJhbWVzKSB7Ci0gICAgICAgICAgICAgICAgaW50NjRfdCBteW5zID0gKChkb3VibGUpKG1SZW1haW5pbmdGcmFtZXMgLSBhdmFpbCkgKiAxMTAwMDAwMDAwKQotICAgICAgICAgICAgICAgICAgICAgICAgLyAoKGRvdWJsZSlzYW1wbGVSYXRlICogc3BlZWQpOwotICAgICAgICAgICAgICAgIGlmIChucyA8IDAgfHwgbXlucyA8IG5zKSB7CisgICAgICAgICAgICAgICAgaWYgKG5zID4gMCkgeyAvLyBhY2NvdW50IGZvciBvYnRhaW4gdGltZQorICAgICAgICAgICAgICAgICAgICBjb25zdCBuc2Vjc190IHRpbWVOb3cgPSBzeXN0ZW1UaW1lKCk7CisgICAgICAgICAgICAgICAgICAgIG5zID0gbWF4KChuc2Vjc190KTAsIG5zIC0gKHRpbWVOb3cgLSB0aW1lQWZ0ZXJDYWxsYmFja3MpKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgbnNlY3NfdCBteW5zID0gZnJhbWVzVG9OYW5vc2Vjb25kcyhtUmVtYWluaW5nRnJhbWVzIC0gYXZhaWwsIHNhbXBsZVJhdGUsIHNwZWVkKTsKKyAgICAgICAgICAgICAgICBpZiAobnMgPCAwIC8qIE5TX1dIRU5FVkVSICovIHx8IG15bnMgPCBucykgewogICAgICAgICAgICAgICAgICAgICBucyA9IG15bnM7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJldHVybiBuczsKQEAgLTE5NTMsNyArMTk5MSw0MiBAQAogICAgICAgICAgICAgLy8gS2VlcCB0aGlzIHRocmVhZCBnb2luZyB0byBoYW5kbGUgdGltZWQgZXZlbnRzIGFuZAogICAgICAgICAgICAgLy8gc3RpbGwgdHJ5IHRvIGdldCBtb3JlIGRhdGEgaW4gaW50ZXJ2YWxzIG9mIFdBSVRfUEVSSU9EX01TCiAgICAgICAgICAgICAvLyBidXQgZG9uJ3QganVzdCBsb29wIGFuZCBibG9jayB0aGUgQ1BVLCBzbyB3YWl0Ci0gICAgICAgICAgICByZXR1cm4gV0FJVF9QRVJJT0RfTVMgKiAxMDAwMDAwTEw7CisKKyAgICAgICAgICAgIC8vIG1DYmYoRVZFTlRfTU9SRV9EQVRBLCAuLi4pIG1pZ2h0IGVpdGhlcgorICAgICAgICAgICAgLy8gKDEpIEJsb2NrIHVudGlsIGl0IGNhbiBmaWxsIHRoZSBidWZmZXIsIHJldHVybmluZyAwIHNpemUgb24gRU9TLgorICAgICAgICAgICAgLy8gKDIpIEJsb2NrIHVudGlsIGl0IGNhbiBmaWxsIHRoZSBidWZmZXIsIHJldHVybmluZyAwIGRhdGEgKHNpbGVuY2UpIG9uIEVPUy4KKyAgICAgICAgICAgIC8vICgzKSBSZXR1cm4gMCBzaXplIHdoZW4gbm8gZGF0YSBpcyBhdmFpbGFibGUsIGRvZXMgbm90IHdhaXQgZm9yIG1vcmUgZGF0YS4KKyAgICAgICAgICAgIC8vCisgICAgICAgICAgICAvLyAoMSkgYW5kICgyKSBvY2N1cnMgd2l0aCBBdWRpb1BsYXllci9Bd2Vzb21lUGxheWVyOyAoMykgb2NjdXJzIHdpdGggTnVQbGF5ZXIuCisgICAgICAgICAgICAvLyBXZSB0cnkgdG8gY29tcHV0ZSB0aGUgd2FpdCB0aW1lIHRvIGF2b2lkIGEgdGlnaHQgc2xlZXAtd2FpdCBjeWNsZSwKKyAgICAgICAgICAgIC8vIGVzcGVjaWFsbHkgZm9yIGNhc2UgKDMpLgorICAgICAgICAgICAgLy8KKyAgICAgICAgICAgIC8vIFRoZSBkZWNpc2lvbiB0byBzdXBwb3J0ICgxKSBhbmQgKDIpIGFmZmVjdCB0aGUgc2l6aW5nIG9mIG1SZW1haW5pbmdGcmFtZXMKKyAgICAgICAgICAgIC8vIGFuZCB0aGlzIGxvb3A7IHdoZXJlYXMgZm9yIGNhc2UgKDMpIHdlIGNvdWxkIHNpbXBseSBjaGVjayBvbmNlIHdpdGggdGhlIGZ1bGwKKyAgICAgICAgICAgIC8vIGJ1ZmZlciBzaXplIGFuZCBza2lwIHRoZSBsb29wIGVudGlyZWx5LgorCisgICAgICAgICAgICBuc2Vjc190IG15bnM7CisgICAgICAgICAgICBpZiAoYXVkaW9faXNfbGluZWFyX3BjbShtRm9ybWF0KSkgeworICAgICAgICAgICAgICAgIC8vIHRpbWUgdG8gd2FpdCBiYXNlZCBvbiBidWZmZXIgb2NjdXBhbmN5CisgICAgICAgICAgICAgICAgY29uc3QgbnNlY3NfdCBkYXRhbnMgPSBtUmVtYWluaW5nRnJhbWVzIDw9IGF2YWlsID8gMCA6CisgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZXNUb05hbm9zZWNvbmRzKG1SZW1haW5pbmdGcmFtZXMgLSBhdmFpbCwgc2FtcGxlUmF0ZSwgc3BlZWQpOworICAgICAgICAgICAgICAgIC8vIGF1ZGlvIGZsaW5nZXIgdGhyZWFkIGJ1ZmZlciBzaXplIChUT0RPOiBhZGp1c3QgZm9yIGZhc3QgdHJhY2tzKQorICAgICAgICAgICAgICAgIGNvbnN0IG5zZWNzX3QgYWZucyA9IGZyYW1lc1RvTmFub3NlY29uZHMobUFmRnJhbWVDb3VudCwgbUFmU2FtcGxlUmF0ZSwgc3BlZWQpOworICAgICAgICAgICAgICAgIC8vIGFkZCBhIGhhbGYgdGhlIEF1ZGlvRmxpbmdlciBidWZmZXIgdGltZSB0byBhdm9pZCBzb2FraW5nIENQVSBpZiBkYXRhbnMgaXMgMC4KKyAgICAgICAgICAgICAgICBteW5zID0gZGF0YW5zICsgKGFmbnMgLyAyKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgY291bGQgcGluZyBxdWl0ZSBhIGJpdCBpZiB0aGUgYnVmZmVyIGlzbid0IGZ1bGwuCisgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdoZW4gbVN0YXRlIGlzIHN0b3BwaW5nIHdlIHdhaXRTdHJlYW1FbmQsIHNvIGl0IG5ldmVyIGdldHMgaGVyZS4KKyAgICAgICAgICAgICAgICBteW5zID0ga1dhaXRQZXJpb2ROczsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChucyA+IDApIHsgLy8gYWNjb3VudCBmb3Igb2J0YWluIGFuZCBjYWxsYmFjayB0aW1lCisgICAgICAgICAgICAgICAgY29uc3QgbnNlY3NfdCB0aW1lTm93ID0gc3lzdGVtVGltZSgpOworICAgICAgICAgICAgICAgIG5zID0gbWF4KChuc2Vjc190KTAsIG5zIC0gKHRpbWVOb3cgLSB0aW1lQWZ0ZXJDYWxsYmFja3MpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChucyA8IDAgLyogTlNfV0hFTkVWRVIgKi8gfHwgbXlucyA8IG5zKSB7CisgICAgICAgICAgICAgICAgbnMgPSBteW5zOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIG5zOwogICAgICAgICB9CiAKICAgICAgICAgc2l6ZV90IHJlbGVhc2VkRnJhbWVzID0gd3JpdHRlblNpemUgLyBtRnJhbWVTaXplOwpAQCAtMjE0OSw3ICsyMjIyLDEyIEBACiAgICAgICAgIH0KIAogICAgICAgICAvLyBDaGVjayB3aGV0aGVyIGEgcGVuZGluZyBmbHVzaCBvciBzdG9wIGhhcyBjb21wbGV0ZWQsIGFzIHRob3NlIGNvbW1hbmRzIG1heQotICAgICAgICAvLyBiZSBhc3luY2hyb25vdXMgb3IgcmV0dXJuIG5lYXIgZmluaXNoLgorICAgICAgICAvLyBiZSBhc3luY2hyb25vdXMgb3IgcmV0dXJuIG5lYXIgZmluaXNoIG9yIGV4aGliaXQgZ2xpdGNoeSBiZWhhdmlvci4KKyAgICAgICAgLy8KKyAgICAgICAgLy8gT3JpZ2luYWxseSB0aGlzIHNob3dlZCB1cCBhcyB0aGUgZmlyc3QgdGltZXN0YW1wIGJlaW5nIGEgY29udGludWF0aW9uIG9mCisgICAgICAgIC8vIHRoZSBwcmV2aW91cyBzb25nIHVuZGVyIGdhcGxlc3MgcGxheWJhY2suCisgICAgICAgIC8vIEhvd2V2ZXIsIHdlIHNvbWV0aW1lcyBzZWUgemVybyB0aW1lc3RhbXBzLCB0aGVuIGEgZ2xpdGNoIG9mCisgICAgICAgIC8vIHRoZSBwcmV2aW91cyBzb25nJ3MgcG9zaXRpb24sIGFuZCB0aGVuIGNvcnJlY3QgdGltZXN0YW1wcyBhZnRlcndhcmRzLgogICAgICAgICBpZiAobVN0YXJ0VXMgIT0gMCAmJiBtU2FtcGxlUmF0ZSAhPSAwKSB7CiAgICAgICAgICAgICBzdGF0aWMgY29uc3QgaW50IGtUaW1lSml0dGVyVXMgPSAxMDAwMDA7IC8vIDEwMCBtcwogICAgICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrMVNlY1VzID0gMTAwMDAwMDsKQEAgLTIxNjcsMTYgKzIyNDUsMjkgQEAKIAogICAgICAgICAgICAgICAgIGlmIChkZWx0YVBvc2l0aW9uQnlVcyA+IGRlbHRhVGltZVVzICsga1RpbWVKaXR0ZXJVcykgewogICAgICAgICAgICAgICAgICAgICAvLyBWZXJpZnkgdGhhdCB0aGUgY291bnRlciBjYW4ndCBjb3VudCBmYXN0ZXIgdGhhbiB0aGUgc2FtcGxlIHJhdGUKLSAgICAgICAgICAgICAgICAgICAgLy8gc2luY2UgdGhlIHN0YXJ0IHRpbWUuICBJZiBncmVhdGVyLCB0aGVuIHRoYXQgbWVhbnMgd2UgaGF2ZSBmYWlsZWQKKyAgICAgICAgICAgICAgICAgICAgLy8gc2luY2UgdGhlIHN0YXJ0IHRpbWUuICBJZiBncmVhdGVyLCB0aGVuIHRoYXQgbWVhbnMgd2UgbWF5IGhhdmUgZmFpbGVkCiAgICAgICAgICAgICAgICAgICAgIC8vIHRvIGNvbXBsZXRlbHkgZmx1c2ggb3Igc3RvcCB0aGUgcHJldmlvdXMgcGxheWluZyB0cmFjay4KLSAgICAgICAgICAgICAgICAgICAgQUxPR1coImluY29tcGxldGUgZmx1c2ggb3Igc3RvcDoiCisgICAgICAgICAgICAgICAgICAgIEFMT0dXX0lGKCFtVGltZXN0YW1wU3RhcnR1cEdsaXRjaFJlcG9ydGVkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJnZXRUaW1lc3RhbXAgc3RhcnR1cCBnbGl0Y2ggZGV0ZWN0ZWQiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBkZWx0YVRpbWVVcyglbGxkKSBkZWx0YVBvc2l0aW9uVXMoJWxsZCkgdHNtUG9zaXRpb24oJXUpIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobG9uZyBsb25nKWRlbHRhVGltZVVzLCAobG9uZyBsb25nKWRlbHRhUG9zaXRpb25CeVVzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGFtcC5tUG9zaXRpb24pOworICAgICAgICAgICAgICAgICAgICBtVGltZXN0YW1wU3RhcnR1cEdsaXRjaFJlcG9ydGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHByZXZpb3VzVGltZXN0YW1wVmFsaWQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBtUHJldmlvdXNUaW1lc3RhbXAubVBvc2l0aW9uID09IDAgLyogc2hvdWxkIGJlIHRydWUgaWYgdmFsaWQgKi8pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGFtcCA9IG1QcmV2aW91c1RpbWVzdGFtcDsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1QcmV2aW91c1RpbWVzdGFtcFZhbGlkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBOT19FUlJPUjsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gV09VTERfQkxPQ0s7CiAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChkZWx0YVBvc2l0aW9uQnlVcyAhPSAwKSB7CisgICAgICAgICAgICAgICAgICAgIG1TdGFydFVzID0gMDsgLy8gZG9uJ3QgY2hlY2sgYWdhaW4sIHdlIGdvdCB2YWxpZCBub256ZXJvIHBvc2l0aW9uLgorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgbVN0YXJ0VXMgPSAwOyAvLyBkb24ndCBjaGVjayBhZ2Fpbiwgc3RhcnQgdGltZSBleHBpcmVkLgogICAgICAgICAgICAgfQotICAgICAgICAgICAgbVN0YXJ0VXMgPSAwOyAvLyBubyBuZWVkIHRvIGNoZWNrIGFnYWluLCBzdGFydCB0aW1lc3RhbXAgaGFzIGVpdGhlciBleHBpcmVkIG9yIHVubmVlZGVkLgorICAgICAgICAgICAgbVRpbWVzdGFtcFN0YXJ0dXBHbGl0Y2hSZXBvcnRlZCA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gVXBkYXRlIHRoZSBtYXBwaW5nIGJldHdlZW4gbG9jYWwgY29uc3VtZWQgKG1Qb3NpdGlvbikgYW5kIHNlcnZlciBjb25zdW1lZCAobVNlcnZlcikKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhL0lPTVguY3BwIGIvbWVkaWEvbGlibWVkaWEvSU9NWC5jcHAKaW5kZXggY2ExY2RjNy4uMTZkYTY1ZSAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWEvSU9NWC5jcHAKKysrIGIvbWVkaWEvbGlibWVkaWEvSU9NWC5jcHAKQEAgLTEwNzcsMTYgKzEwNzcsMjkgQEAKICAgICAgICAgOiBCcEludGVyZmFjZTxJT01YT2JzZXJ2ZXI+KGltcGwpIHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgb25NZXNzYWdlKGNvbnN0IG9teF9tZXNzYWdlICZtc2cpIHsKKyAgICB2aXJ0dWFsIHZvaWQgb25NZXNzYWdlcyhjb25zdCBzdGQ6Omxpc3Q8b214X21lc3NhZ2U+ICZtZXNzYWdlcykgewogICAgICAgICBQYXJjZWwgZGF0YSwgcmVwbHk7Ci0gICAgICAgIGRhdGEud3JpdGVJbnRlcmZhY2VUb2tlbihJT01YT2JzZXJ2ZXI6OmdldEludGVyZmFjZURlc2NyaXB0b3IoKSk7Ci0gICAgICAgIGRhdGEud3JpdGUoJm1zZywgc2l6ZW9mKG1zZykpOwotICAgICAgICBpZiAobXNnLmZlbmNlRmQgPj0gMCkgewotICAgICAgICAgICAgZGF0YS53cml0ZUZpbGVEZXNjcmlwdG9yKG1zZy5mZW5jZUZkLCB0cnVlIC8qIHRha2VPd25lcnNoaXAgKi8pOworICAgICAgICBzdGQ6Omxpc3Q8b214X21lc3NhZ2U+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1lc3NhZ2VzLmNiZWdpbigpOworICAgICAgICBib29sIGZpcnN0ID0gdHJ1ZTsKKyAgICAgICAgd2hpbGUgKGl0ICE9IG1lc3NhZ2VzLmNlbmQoKSkgeworICAgICAgICAgICAgY29uc3Qgb214X21lc3NhZ2UgJm1zZyA9ICppdCsrOworICAgICAgICAgICAgaWYgKGZpcnN0KSB7CisgICAgICAgICAgICAgICAgZGF0YS53cml0ZUludGVyZmFjZVRva2VuKElPTVhPYnNlcnZlcjo6Z2V0SW50ZXJmYWNlRGVzY3JpcHRvcigpKTsKKyAgICAgICAgICAgICAgICBkYXRhLndyaXRlSW50MzIobXNnLm5vZGUpOworICAgICAgICAgICAgICAgIGZpcnN0ID0gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBkYXRhLndyaXRlSW50MzIobXNnLmZlbmNlRmQgPj0gMCk7CisgICAgICAgICAgICBpZiAobXNnLmZlbmNlRmQgPj0gMCkgeworICAgICAgICAgICAgICAgIGRhdGEud3JpdGVGaWxlRGVzY3JpcHRvcihtc2cuZmVuY2VGZCwgdHJ1ZSAvKiB0YWtlT3duZXJzaGlwICovKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGRhdGEud3JpdGVJbnQzMihtc2cudHlwZSk7CisgICAgICAgICAgICBkYXRhLndyaXRlKCZtc2cudSwgc2l6ZW9mKG1zZy51KSk7CisgICAgICAgICAgICBBTE9HVigib25NZXNzYWdlIHdyaXRpbmcgbWVzc2FnZSAlZCwgc2l6ZSAlenUiLCBtc2cudHlwZSwgc2l6ZW9mKG1zZykpOwogICAgICAgICB9Ci0gICAgICAgIEFMT0dWKCJvbk1lc3NhZ2Ugd3JpdGluZyBtZXNzYWdlICVkLCBzaXplICV6dSIsIG1zZy50eXBlLCBzaXplb2YobXNnKSk7Ci0KLSAgICAgICAgcmVtb3RlKCktPnRyYW5zYWN0KE9CU0VSVkVSX09OX01TRywgZGF0YSwgJnJlcGx5LCBJQmluZGVyOjpGTEFHX09ORVdBWSk7CisgICAgICAgIGlmICghZmlyc3QpIHsKKyAgICAgICAgICAgIGRhdGEud3JpdGVJbnQzMigtMSk7IC8vIG1hcmsgZW5kCisgICAgICAgICAgICByZW1vdGUoKS0+dHJhbnNhY3QoT0JTRVJWRVJfT05fTVNHLCBkYXRhLCAmcmVwbHksIElCaW5kZXI6OkZMQUdfT05FV0FZKTsKKyAgICAgICAgfQogICAgIH0KIH07CiAKQEAgLTEwOTgsMTkgKzExMTEsMjggQEAKICAgICAgICAgY2FzZSBPQlNFUlZFUl9PTl9NU0c6CiAgICAgICAgIHsKICAgICAgICAgICAgIENIRUNLX09NWF9JTlRFUkZBQ0UoSU9NWE9ic2VydmVyLCBkYXRhLCByZXBseSk7CisgICAgICAgICAgICBJT01YOjpub2RlX2lkIG5vZGUgPSBkYXRhLnJlYWRJbnQzMigpOworICAgICAgICAgICAgc3RkOjpsaXN0PG9teF9tZXNzYWdlPiBtZXNzYWdlczsKKyAgICAgICAgICAgIHN0YXR1c190IGVyciA9IEZBSUxFRF9UUkFOU0FDVElPTjsgLy8gbXVzdCByZWNlaXZlIGF0IGxlYXN0IG9uZSBtZXNzYWdlCisgICAgICAgICAgICBkbyB7CisgICAgICAgICAgICAgICAgaW50IGhhdmVGZW5jZSA9IGRhdGEucmVhZEludDMyKCk7CisgICAgICAgICAgICAgICAgaWYgKGhhdmVGZW5jZSA8IDApIHsgLy8gd2UgdXNlIC0xIHRvIG1hcmsgZW5kIG9mIG1lc3NhZ2VzCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBvbXhfbWVzc2FnZSBtc2c7CisgICAgICAgICAgICAgICAgbXNnLm5vZGUgPSBub2RlOworICAgICAgICAgICAgICAgIG1zZy5mZW5jZUZkID0gaGF2ZUZlbmNlID8gOjpkdXAoZGF0YS5yZWFkRmlsZURlc2NyaXB0b3IoKSkgOiAtMTsKKyAgICAgICAgICAgICAgICBtc2cudHlwZSA9ICh0eXBlb2YobXNnLnR5cGUpKWRhdGEucmVhZEludDMyKCk7CisgICAgICAgICAgICAgICAgZXJyID0gZGF0YS5yZWFkKCZtc2cudSwgc2l6ZW9mKG1zZy51KSk7CisgICAgICAgICAgICAgICAgQUxPR1YoIm9uVHJhbnNhY3QgcmVhZGluZyBtZXNzYWdlICVkLCBzaXplICV6dSIsIG1zZy50eXBlLCBzaXplb2YobXNnKSk7CisgICAgICAgICAgICAgICAgbWVzc2FnZXMucHVzaF9iYWNrKG1zZyk7CisgICAgICAgICAgICB9IHdoaWxlIChlcnIgPT0gT0spOwogCi0gICAgICAgICAgICBvbXhfbWVzc2FnZSBtc2c7Ci0gICAgICAgICAgICBkYXRhLnJlYWQoJm1zZywgc2l6ZW9mKG1zZykpOwotICAgICAgICAgICAgaWYgKG1zZy5mZW5jZUZkID49IDApIHsKLSAgICAgICAgICAgICAgICBtc2cuZmVuY2VGZCA9IDo6ZHVwKGRhdGEucmVhZEZpbGVEZXNjcmlwdG9yKCkpOworICAgICAgICAgICAgaWYgKGVyciA9PSBPSykgeworICAgICAgICAgICAgICAgIG9uTWVzc2FnZXMobWVzc2FnZXMpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBBTE9HVigib25UcmFuc2FjdCByZWFkaW5nIG1lc3NhZ2UgJWQsIHNpemUgJXp1IiwgbXNnLnR5cGUsIHNpemVvZihtc2cpKTsKLQotICAgICAgICAgICAgLy8gWFhYIENvdWxkIHVzZSByZWFkSW5wbGFjZSBtYXliZT8KLSAgICAgICAgICAgIG9uTWVzc2FnZShtc2cpOwotCi0gICAgICAgICAgICByZXR1cm4gTk9fRVJST1I7CisgICAgICAgICAgICByZXR1cm4gZXJyOwogICAgICAgICB9CiAKICAgICAgICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9NZWRpYVBsYXllclNlcnZpY2UuY3BwIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL01lZGlhUGxheWVyU2VydmljZS5jcHAKaW5kZXggNGU1NzgxMy4uYWU4NjlkNiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL01lZGlhUGxheWVyU2VydmljZS5jcHAKKysrIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL01lZGlhUGxheWVyU2VydmljZS5jcHAKQEAgLTE0ODIsMjAgKzE0ODIsMTEgQEAKICAgICAgICAgQXVkaW9DYWxsYmFjayBjYiwgdm9pZCAqY29va2llLAogICAgICAgICBhdWRpb19vdXRwdXRfZmxhZ3NfdCBmbGFncywKICAgICAgICAgY29uc3QgYXVkaW9fb2ZmbG9hZF9pbmZvX3QgKm9mZmxvYWRJbmZvLAotICAgICAgICBib29sIGRvTm90UmVjb25uZWN0KQorICAgICAgICBib29sIGRvTm90UmVjb25uZWN0LAorICAgICAgICB1aW50MzJfdCBzdWdnZXN0ZWRGcmFtZUNvdW50KQogewotICAgIG1DYWxsYmFjayA9IGNiOwotICAgIG1DYWxsYmFja0Nvb2tpZSA9IGNvb2tpZTsKLQotICAgIC8vIENoZWNrIGFyZ3VtZW50ICJidWZmZXJDb3VudCIgYWdhaW5zdCB0aGUgbWluaW51bSBidWZmZXIgY291bnQKLSAgICBpZiAoYnVmZmVyQ291bnQgPCBtTWluQnVmZmVyQ291bnQpIHsKLSAgICAgICAgQUxPR0QoImJ1ZmZlckNvdW50ICglZCkgaXMgdG9vIHNtYWxsIGFuZCBpbmNyZWFzZWQgdG8gJWQiLCBidWZmZXJDb3VudCwgbU1pbkJ1ZmZlckNvdW50KTsKLSAgICAgICAgYnVmZmVyQ291bnQgPSBtTWluQnVmZmVyQ291bnQ7Ci0KLSAgICB9CiAgICAgQUxPR1YoIm9wZW4oJXUsICVkLCAweCV4LCAweCV4LCAlZCwgJWQgMHgleCkiLCBzYW1wbGVSYXRlLCBjaGFubmVsQ291bnQsIGNoYW5uZWxNYXNrLAogICAgICAgICAgICAgICAgIGZvcm1hdCwgYnVmZmVyQ291bnQsIG1TZXNzaW9uSWQsIGZsYWdzKTsKLSAgICBzaXplX3QgZnJhbWVDb3VudDsKIAogICAgIC8vIG9mZmxvYWRpbmcgaXMgb25seSBzdXBwb3J0ZWQgaW4gY2FsbGJhY2sgbW9kZSBmb3Igbm93LgogICAgIC8vIG9mZmxvYWRJbmZvIG11c3QgYmUgcHJlc2VudCBpZiBvZmZsb2FkIGZsYWcgaXMgc2V0CkBAIC0xNTA0LDIwICsxNDk1LDM2IEBACiAgICAgICAgIHJldHVybiBCQURfVkFMVUU7CiAgICAgfQogCisgICAgLy8gY29tcHV0ZSBmcmFtZSBjb3VudCBmb3IgdGhlIEF1ZGlvVHJhY2sgaW50ZXJuYWwgYnVmZmVyCisgICAgc2l6ZV90IGZyYW1lQ291bnQ7CiAgICAgaWYgKChmbGFncyAmIEFVRElPX09VVFBVVF9GTEFHX0NPTVBSRVNTX09GRkxPQUQpICE9IDApIHsKICAgICAgICAgZnJhbWVDb3VudCA9IDA7IC8vIEF1ZGlvVHJhY2sgd2lsbCBnZXQgZnJhbWUgY291bnQgZnJvbSBBdWRpb0ZsaW5nZXIKICAgICB9IGVsc2UgeworICAgICAgICAvLyB0cnkgdG8gZXN0aW1hdGUgdGhlIGJ1ZmZlciBwcm9jZXNzaW5nIGZldGNoIHNpemUgZnJvbSBBdWRpb0ZsaW5nZXIuCisgICAgICAgIC8vIGZyYW1lc1BlckJ1ZmZlciBpcyBhcHByb3hpbWF0ZSBhbmQgZ2VuZXJhbGx5IGNvcnJlY3QsIGV4Y2VwdCB3aGVuIGl0J3Mgbm90IDotKS4KICAgICAgICAgdWludDMyX3QgYWZTYW1wbGVSYXRlOwogICAgICAgICBzaXplX3QgYWZGcmFtZUNvdW50OwotCiAgICAgICAgIGlmIChBdWRpb1N5c3RlbTo6Z2V0T3V0cHV0RnJhbWVDb3VudCgmYWZGcmFtZUNvdW50LCBtU3RyZWFtVHlwZSkgIT0gTk9fRVJST1IpIHsKICAgICAgICAgICAgIHJldHVybiBOT19JTklUOwogICAgICAgICB9CiAgICAgICAgIGlmIChBdWRpb1N5c3RlbTo6Z2V0T3V0cHV0U2FtcGxpbmdSYXRlKCZhZlNhbXBsZVJhdGUsIG1TdHJlYW1UeXBlKSAhPSBOT19FUlJPUikgewogICAgICAgICAgICAgcmV0dXJuIE5PX0lOSVQ7CiAgICAgICAgIH0KKyAgICAgICAgY29uc3Qgc2l6ZV90IGZyYW1lc1BlckJ1ZmZlciA9CisgICAgICAgICAgICAgICAgKHVuc2lnbmVkIGxvbmcgbG9uZylzYW1wbGVSYXRlICogYWZGcmFtZUNvdW50IC8gYWZTYW1wbGVSYXRlOwogCi0gICAgICAgIGZyYW1lQ291bnQgPSAoc2FtcGxlUmF0ZSphZkZyYW1lQ291bnQqYnVmZmVyQ291bnQpL2FmU2FtcGxlUmF0ZTsKKyAgICAgICAgaWYgKGJ1ZmZlckNvdW50ID09IDApIHsKKyAgICAgICAgICAgIC8vIHVzZSBzdWdnZXN0ZWRGcmFtZUNvdW50CisgICAgICAgICAgICBidWZmZXJDb3VudCA9IChzdWdnZXN0ZWRGcmFtZUNvdW50ICsgZnJhbWVzUGVyQnVmZmVyIC0gMSkgLyBmcmFtZXNQZXJCdWZmZXI7CisgICAgICAgIH0KKyAgICAgICAgLy8gQ2hlY2sgYXJndW1lbnQgYnVmZmVyQ291bnQgYWdhaW5zdCB0aGUgbWluaW51bSBidWZmZXIgY291bnQKKyAgICAgICAgaWYgKGJ1ZmZlckNvdW50ICE9IDAgJiYgYnVmZmVyQ291bnQgPCBtTWluQnVmZmVyQ291bnQpIHsKKyAgICAgICAgICAgIEFMT0dWKCJidWZmZXJDb3VudCAoJWQpIGluY3JlYXNlZCB0byAlZCIsIGJ1ZmZlckNvdW50LCBtTWluQnVmZmVyQ291bnQpOworICAgICAgICAgICAgYnVmZmVyQ291bnQgPSBtTWluQnVmZmVyQ291bnQ7CisgICAgICAgIH0KKyAgICAgICAgLy8gaWYgZnJhbWVDb3VudCBpcyAwLCB0aGVuIEF1ZGlvVHJhY2sgd2lsbCBnZXQgZnJhbWUgY291bnQgZnJvbSBBdWRpb0ZsaW5nZXIKKyAgICAgICAgLy8gd2hpY2ggd2lsbCBiZSB0aGUgbWluaW11bSBzaXplIHBlcm1pdHRlZC4KKyAgICAgICAgZnJhbWVDb3VudCA9IGJ1ZmZlckNvdW50ICogZnJhbWVzUGVyQnVmZmVyOwogICAgIH0KIAogICAgIGlmIChjaGFubmVsTWFzayA9PSBDSEFOTkVMX01BU0tfVVNFX0NIQU5ORUxfT1JERVIpIHsKQEAgLTE1MjgsNiArMTUzNSw5IEBACiAgICAgICAgIH0KICAgICB9CiAKKyAgICBtQ2FsbGJhY2sgPSBjYjsKKyAgICBtQ2FsbGJhY2tDb29raWUgPSBjb29raWU7CisKICAgICAvLyBDaGVjayB3aGV0aGVyIHdlIGNhbiByZWN5Y2xlIHRoZSB0cmFjawogICAgIGJvb2wgcmV1c2UgPSBmYWxzZTsKICAgICBib29sIGJvdGhPZmZsb2FkZWQgPSBmYWxzZTsKQEAgLTE3NDYsMTIgKzE3NTYsMTQgQEAKIHZvaWQgTWVkaWFQbGF5ZXJTZXJ2aWNlOjpBdWRpb091dHB1dDo6c3RvcCgpCiB7CiAgICAgQUxPR1YoInN0b3AiKTsKKyAgICBtQnl0ZXNXcml0dGVuID0gMDsKICAgICBpZiAobVRyYWNrICE9IDApIG1UcmFjay0+c3RvcCgpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyU2VydmljZTo6QXVkaW9PdXRwdXQ6OmZsdXNoKCkKIHsKICAgICBBTE9HVigiZmx1c2giKTsKKyAgICBtQnl0ZXNXcml0dGVuID0gMDsKICAgICBpZiAobVRyYWNrICE9IDApIG1UcmFjay0+Zmx1c2goKTsKIH0KIApAQCAtMTg1MywyMCArMTg2NSwyMyBAQAogICAgICAgICAgICAgICAgIG1lLCBidWZmZXItPnJhdywgYnVmZmVyLT5zaXplLCBtZS0+bUNhbGxiYWNrQ29va2llLAogICAgICAgICAgICAgICAgIENCX0VWRU5UX0ZJTExfQlVGRkVSKTsKIAotICAgICAgICBpZiAoKG1lLT5tRmxhZ3MgJiBBVURJT19PVVRQVVRfRkxBR19DT01QUkVTU19PRkZMT0FEKSA9PSAwICYmCi0gICAgICAgICAgICBhY3R1YWxTaXplID09IDAgJiYgYnVmZmVyLT5zaXplID4gMCAmJiBtZS0+bU5leHRPdXRwdXQgPT0gTlVMTCkgewotICAgICAgICAgICAgLy8gV2UndmUgcmVhY2hlZCBFT1MgYnV0IHRoZSBhdWRpbyB0cmFjayBpcyBub3Qgc3RvcHBlZCB5ZXQsCi0gICAgICAgICAgICAvLyBrZWVwIHBsYXlpbmcgc2lsZW5jZS4KKyAgICAgICAgLy8gTG9nIHdoZW4gbm8gZGF0YSBpcyByZXR1cm5lZCBmcm9tIHRoZSBjYWxsYmFjay4KKyAgICAgICAgLy8gKDEpIFdlIG1heSBoYXZlIG5vIGRhdGEgKGVzcGVjaWFsbHkgd2l0aCBuZXR3b3JrIHN0cmVhbWluZyBzb3VyY2VzKS4KKyAgICAgICAgLy8gKDIpIFdlIG1heSBoYXZlIHJlYWNoZWQgdGhlIEVPUyBhbmQgdGhlIGF1ZGlvIHRyYWNrIGlzIG5vdCBzdG9wcGVkIHlldC4KKyAgICAgICAgLy8gTm90ZSB0aGF0IEF3ZXNvbWVQbGF5ZXIvQXVkaW9QbGF5ZXIgd2lsbCBvbmx5IHJldHVybiB6ZXJvIHNpemUgd2hlbiBpdCByZWFjaGVzIHRoZSBFT1MuCisgICAgICAgIC8vIE51UGxheWVyUmVuZGVyZXIgd2lsbCByZXR1cm4gemVybyB3aGVuIGl0IGRvZXNuJ3QgaGF2ZSBkYXRhIChpdCBkb2Vzbid0IGJsb2NrIHRvIGZpbGwpLgorICAgICAgICAvLworICAgICAgICAvLyBUaGlzIGlzIGEgYmVuaWduIGJ1c3ktd2FpdCwgd2l0aCB0aGUgbmV4dCBkYXRhIHJlcXVlc3QgZ2VuZXJhdGVkIDEwIG1zIG9yIG1vcmUgbGF0ZXI7CisgICAgICAgIC8vIG5ldmVydGhlbGVzcyBmb3IgcG93ZXIgcmVhc29ucywgd2UgZG9uJ3Qgd2FudCB0byBzZWUgdG9vIG1hbnkgb2YgdGhlc2UuCiAKLSAgICAgICAgICAgIG1lbXNldChidWZmZXItPnJhdywgMCwgYnVmZmVyLT5zaXplKTsKLSAgICAgICAgICAgIGFjdHVhbFNpemUgPSBidWZmZXItPnNpemU7Ci0gICAgICAgIH0KKyAgICAgICAgQUxPR1ZfSUYoYWN0dWFsU2l6ZSA9PSAwICYmIGJ1ZmZlci0+c2l6ZSA+IDAsICJjYWxsYmFja3dyYXBwZXI6IGVtcHR5IGJ1ZmZlciByZXR1cm5lZCIpOwogCisgICAgICAgIG1lLT5tQnl0ZXNXcml0dGVuICs9IGFjdHVhbFNpemU7ICAvLyBiZW5pZ24gcmFjZSB3aXRoIHJlYWRlci4KICAgICAgICAgYnVmZmVyLT5zaXplID0gYWN0dWFsU2l6ZTsKICAgICAgICAgfSBicmVhazsKIAotCiAgICAgY2FzZSBBdWRpb1RyYWNrOjpFVkVOVF9TVFJFQU1fRU5EOgorICAgICAgICAvLyBjdXJyZW50bHkgb25seSBvY2N1cnMgZm9yIG9mZmxvYWRlZCBjYWxsYmFja3MKICAgICAgICAgQUxPR1YoImNhbGxiYWNrd3JhcHBlcjogZGVsaXZlciBFVkVOVF9TVFJFQU1fRU5EIik7CiAgICAgICAgICgqbWUtPm1DYWxsYmFjaykobWUsIE5VTEwgLyogYnVmZmVyICovLCAwIC8qIHNpemUgKi8sCiAgICAgICAgICAgICAgICAgbWUtPm1DYWxsYmFja0Nvb2tpZSwgQ0JfRVZFTlRfU1RSRUFNX0VORCk7CkBAIC0xODc5LDExICsxODk0LDE1IEBACiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBBdWRpb1RyYWNrOjpFVkVOVF9VTkRFUlJVTjoKLSAgICAgICAgLy8gVGhpcyBvY2N1cnMgd2hlbiB0aGVyZSBpcyBubyBkYXRhIGF2YWlsYWJsZSwgdHlwaWNhbGx5IG9jY3VycmluZworICAgICAgICAvLyBUaGlzIG9jY3VycyB3aGVuIHRoZXJlIGlzIG5vIGRhdGEgYXZhaWxhYmxlLCB0eXBpY2FsbHkKICAgICAgICAgLy8gd2hlbiB0aGVyZSBpcyBhIGZhaWx1cmUgdG8gc3VwcGx5IGRhdGEgdG8gdGhlIEF1ZGlvVHJhY2suICBJdCBjYW4gYWxzbwogICAgICAgICAvLyBvY2N1ciBpbiBub24tb2ZmbG9hZGVkIG1vZGUgd2hlbiB0aGUgYXVkaW8gZGV2aWNlIGNvbWVzIG91dCBvZiBzdGFuZGJ5LgogICAgICAgICAvLwotICAgICAgICAvLyBJZiB5b3Ugc2VlIHRoaXMgYXQgdGhlIHN0YXJ0IG9mIHBsYXliYWNrLCB0aGVyZSBwcm9iYWJseSB3YXMgYSBnbGl0Y2guCisgICAgICAgIC8vIElmIGFuIEF1ZGlvVHJhY2sgdW5kZXJydW5zIGl0IG91dHB1dHMgc2lsZW5jZS4gU2luY2UgdGhpcyBoYXBwZW5zIHN1ZGRlbmx5CisgICAgICAgIC8vIGl0IG1heSBzb3VuZCBsaWtlIGFuIGF1ZGlibGUgcG9wIG9yIGdsaXRjaC4KKyAgICAgICAgLy8KKyAgICAgICAgLy8gVGhlIHVuZGVycnVuIGV2ZW50IGlzIHNlbnQgb25jZSBwZXIgdHJhY2sgdW5kZXJydW47IHRoZSBjb25kaXRpb24gaXMgcmVzZXQKKyAgICAgICAgLy8gd2hlbiBtb3JlIGRhdGEgaXMgc2VudCB0byB0aGUgQXVkaW9UcmFjay4KICAgICAgICAgQUxPR0koImNhbGxiYWNrd3JhcHBlcjogRVZFTlRfVU5ERVJSVU4gKGRpc2NhcmRlZCkiKTsKICAgICAgICAgYnJlYWs7CiAKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9NZWRpYVBsYXllclNlcnZpY2UuaCBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9NZWRpYVBsYXllclNlcnZpY2UuaAppbmRleCBlOWY3MmI4Li43NTI3NTA2IDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvTWVkaWFQbGF5ZXJTZXJ2aWNlLmgKKysrIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL01lZGlhUGxheWVyU2VydmljZS5oCkBAIC05OCw3ICs5OCw4IEBACiAgICAgICAgICAgICAgICAgQXVkaW9DYWxsYmFjayBjYiwgdm9pZCAqY29va2llLAogICAgICAgICAgICAgICAgIGF1ZGlvX291dHB1dF9mbGFnc190IGZsYWdzID0gQVVESU9fT1VUUFVUX0ZMQUdfTk9ORSwKICAgICAgICAgICAgICAgICBjb25zdCBhdWRpb19vZmZsb2FkX2luZm9fdCAqb2ZmbG9hZEluZm8gPSBOVUxMLAotICAgICAgICAgICAgICAgIGJvb2wgZG9Ob3RSZWNvbm5lY3QgPSBmYWxzZSk7CisgICAgICAgICAgICAgICAgYm9vbCBkb05vdFJlY29ubmVjdCA9IGZhbHNlLAorICAgICAgICAgICAgICAgIHVpbnQzMl90IHN1Z2dlc3RlZEZyYW1lQ291bnQgPSAwKTsKIAogICAgICAgICB2aXJ0dWFsIHN0YXR1c190ICAgICAgICBzdGFydCgpOwogICAgICAgICB2aXJ0dWFsIHNzaXplX3QgICAgICAgICB3cml0ZShjb25zdCB2b2lkKiBidWZmZXIsIHNpemVfdCBzaXplLCBib29sIGJsb2NraW5nID0gdHJ1ZSk7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvU3RhZ2VmcmlnaHRSZWNvcmRlci5jcHAgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvU3RhZ2VmcmlnaHRSZWNvcmRlci5jcHAKaW5kZXggZTE2YTRiNS4uOThhYmU5YyAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL1N0YWdlZnJpZ2h0UmVjb3JkZXIuY3BwCisrKyBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9TdGFnZWZyaWdodFJlY29yZGVyLmNwcApAQCAtMTE5NCw4ICsxMTk0LDcgQEAKICAgICB9CiB9CiAKLXN0YXR1c190IFN0YWdlZnJpZ2h0UmVjb3JkZXI6OmNoZWNrVmlkZW9FbmNvZGVyQ2FwYWJpbGl0aWVzKAotICAgICAgICBib29sICpzdXBwb3J0c0NhbWVyYVNvdXJjZU1ldGFEYXRhTW9kZSkgeworc3RhdHVzX3QgU3RhZ2VmcmlnaHRSZWNvcmRlcjo6Y2hlY2tWaWRlb0VuY29kZXJDYXBhYmlsaXRpZXMoKSB7CiAgICAgLyogaGFyZHdhcmUgY29kZWNzIG11c3Qgc3VwcG9ydCBjYW1lcmEgc291cmNlIG1ldGEgZGF0YSBtb2RlICovCiAgICAgVmVjdG9yPENvZGVjQ2FwYWJpbGl0aWVzPiBjb2RlY3M7CiAgICAgT01YQ2xpZW50IGNsaWVudDsKQEAgLTEyMDcsOSArMTIwNiw2IEBACiAgICAgICAgICAgICAgbVZpZGVvRW5jb2RlciA9PSBWSURFT19FTkNPREVSX1ZQOCA/IE1FRElBX01JTUVUWVBFX1ZJREVPX1ZQOCA6CiAgICAgICAgICAgICAgbVZpZGVvRW5jb2RlciA9PSBWSURFT19FTkNPREVSX0gyNjQgPyBNRURJQV9NSU1FVFlQRV9WSURFT19BVkMgOiAiIiksCiAgICAgICAgICAgICBmYWxzZSAvKiBkZWNvZGVyICovLCB0cnVlIC8qIGh3Q29kZWMgKi8sICZjb2RlY3MpOwotICAgICpzdXBwb3J0c0NhbWVyYVNvdXJjZU1ldGFEYXRhTW9kZSA9IGNvZGVjcy5zaXplKCkgPiAwOwotICAgIEFMT0dWKCJlbmNvZGVyICVzIGNhbWVyYSBzb3VyY2UgbWV0YS1kYXRhIG1vZGUiLAotICAgICAgICAgICAgKnN1cHBvcnRzQ2FtZXJhU291cmNlTWV0YURhdGFNb2RlID8gInN1cHBvcnRzIiA6ICJET0VTIE5PVCBTVVBQT1JUIik7CiAKICAgICBpZiAoIW1DYXB0dXJlVGltZUxhcHNlKSB7CiAgICAgICAgIC8vIERvbnQgY2xpcCBmb3IgdGltZSBsYXBzZSBjYXB0dXJlIGFzIGVuY29kZXIgd2lsbCBoYXZlIGVub3VnaApAQCAtMTQxOCw5ICsxNDE0LDcgQEAKIHN0YXR1c190IFN0YWdlZnJpZ2h0UmVjb3JkZXI6OnNldHVwQ2FtZXJhU291cmNlKAogICAgICAgICBzcDxDYW1lcmFTb3VyY2U+ICpjYW1lcmFTb3VyY2UpIHsKICAgICBzdGF0dXNfdCBlcnIgPSBPSzsKLSAgICBib29sIGVuY29kZXJTdXBwb3J0c0NhbWVyYVNvdXJjZU1ldGFEYXRhTW9kZTsKLSAgICBpZiAoKGVyciA9IGNoZWNrVmlkZW9FbmNvZGVyQ2FwYWJpbGl0aWVzKAotICAgICAgICAgICAgICAgICZlbmNvZGVyU3VwcG9ydHNDYW1lcmFTb3VyY2VNZXRhRGF0YU1vZGUpKSAhPSBPSykgeworICAgIGlmICgoZXJyID0gY2hlY2tWaWRlb0VuY29kZXJDYXBhYmlsaXRpZXMoKSkgIT0gT0spIHsKICAgICAgICAgcmV0dXJuIGVycjsKICAgICB9CiAgICAgU2l6ZSB2aWRlb1NpemU7CkBAIC0xNDM2LDE0ICsxNDMwLDEzIEBACiAgICAgICAgIG1DYW1lcmFTb3VyY2VUaW1lTGFwc2UgPSBDYW1lcmFTb3VyY2VUaW1lTGFwc2U6OkNyZWF0ZUZyb21DYW1lcmEoCiAgICAgICAgICAgICAgICAgbUNhbWVyYSwgbUNhbWVyYVByb3h5LCBtQ2FtZXJhSWQsIG1DbGllbnROYW1lLCBtQ2xpZW50VWlkLAogICAgICAgICAgICAgICAgIHZpZGVvU2l6ZSwgbUZyYW1lUmF0ZSwgbVByZXZpZXdTdXJmYWNlLAotICAgICAgICAgICAgICAgIG1UaW1lQmV0d2VlblRpbWVMYXBzZUZyYW1lQ2FwdHVyZVVzLAotICAgICAgICAgICAgICAgIGVuY29kZXJTdXBwb3J0c0NhbWVyYVNvdXJjZU1ldGFEYXRhTW9kZSk7CisgICAgICAgICAgICAgICAgbVRpbWVCZXR3ZWVuVGltZUxhcHNlRnJhbWVDYXB0dXJlVXMpOwogICAgICAgICAqY2FtZXJhU291cmNlID0gbUNhbWVyYVNvdXJjZVRpbWVMYXBzZTsKICAgICB9IGVsc2UgewogICAgICAgICAqY2FtZXJhU291cmNlID0gQ2FtZXJhU291cmNlOjpDcmVhdGVGcm9tQ2FtZXJhKAogICAgICAgICAgICAgICAgIG1DYW1lcmEsIG1DYW1lcmFQcm94eSwgbUNhbWVyYUlkLCBtQ2xpZW50TmFtZSwgbUNsaWVudFVpZCwKICAgICAgICAgICAgICAgICB2aWRlb1NpemUsIG1GcmFtZVJhdGUsCi0gICAgICAgICAgICAgICAgbVByZXZpZXdTdXJmYWNlLCBlbmNvZGVyU3VwcG9ydHNDYW1lcmFTb3VyY2VNZXRhRGF0YU1vZGUpOworICAgICAgICAgICAgICAgIG1QcmV2aWV3U3VyZmFjZSk7CiAgICAgfQogICAgIG1DYW1lcmEuY2xlYXIoKTsKICAgICBtQ2FtZXJhUHJveHkuY2xlYXIoKTsKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9TdGFnZWZyaWdodFJlY29yZGVyLmggYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvU3RhZ2VmcmlnaHRSZWNvcmRlci5oCmluZGV4IDc0NzNmNDIuLjhhZjkyNzggMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9TdGFnZWZyaWdodFJlY29yZGVyLmgKKysrIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL1N0YWdlZnJpZ2h0UmVjb3JkZXIuaApAQCAtMTQxLDggKzE0MSw3IEBACiAgICAgc3RhdHVzX3Qgc2V0dXBSVFBSZWNvcmRpbmcoKTsKICAgICBzdGF0dXNfdCBzZXR1cE1QRUcyVFNSZWNvcmRpbmcoKTsKICAgICBzcDxNZWRpYVNvdXJjZT4gY3JlYXRlQXVkaW9Tb3VyY2UoKTsKLSAgICBzdGF0dXNfdCBjaGVja1ZpZGVvRW5jb2RlckNhcGFiaWxpdGllcygKLSAgICAgICAgICAgIGJvb2wgKnN1cHBvcnRzQ2FtZXJhU291cmNlTWV0YURhdGFNb2RlKTsKKyAgICBzdGF0dXNfdCBjaGVja1ZpZGVvRW5jb2RlckNhcGFiaWxpdGllcygpOwogICAgIHN0YXR1c190IGNoZWNrQXVkaW9FbmNvZGVyQ2FwYWJpbGl0aWVzKCk7CiAgICAgLy8gR2VuZXJpYyBNZWRpYVNvdXJjZSBzZXQtdXAuIFJldHVybnMgdGhlIGFwcHJvcHJpYXRlCiAgICAgLy8gc291cmNlIChDYW1lcmFTb3VyY2Ugb3IgU3VyZmFjZU1lZGlhU291cmNlKQpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL251cGxheWVyL051UGxheWVyRGVjb2Rlci5jcHAgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvbnVwbGF5ZXIvTnVQbGF5ZXJEZWNvZGVyLmNwcAppbmRleCA2YWJjODFjLi5jNjQ5YzYyIDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvbnVwbGF5ZXIvTnVQbGF5ZXJEZWNvZGVyLmNwcAorKysgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvbnVwbGF5ZXIvTnVQbGF5ZXJEZWNvZGVyLmNwcApAQCAtMjQsNiArMjQsNyBAQAogI2luY2x1ZGUgIk51UGxheWVyUmVuZGVyZXIuaCIKICNpbmNsdWRlICJOdVBsYXllclNvdXJjZS5oIgogCisjaW5jbHVkZSA8Y3V0aWxzL3Byb3BlcnRpZXMuaD4KICNpbmNsdWRlIDxtZWRpYS9JQ3J5cHRvLmg+CiAjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9BQnVmZmVyLmg+CiAjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9BRGVidWcuaD4KQEAgLTQwLDYgKzQxLDEwIEBACiAKIG5hbWVzcGFjZSBhbmRyb2lkIHsKIAorc3RhdGljIGlubGluZSBib29sIGdldEF1ZGlvRGVlcEJ1ZmZlclNldHRpbmcoKSB7CisgICAgcmV0dXJuIHByb3BlcnR5X2dldF9ib29sKCJtZWRpYS5zdGFnZWZyaWdodC5hdWRpby5kZWVwIiwgZmFsc2UgLyogZGVmYXVsdF92YWx1ZSAqLyk7Cit9CisKIE51UGxheWVyOjpEZWNvZGVyOjpEZWNvZGVyKAogICAgICAgICBjb25zdCBzcDxBTWVzc2FnZT4gJm5vdGlmeSwKICAgICAgICAgY29uc3Qgc3A8U291cmNlPiAmc291cmNlLApAQCAtNTM5LDkgKzU0NCwxMCBAQAogICAgICAgICB1aW50MzJfdCBmbGFnczsKICAgICAgICAgaW50NjRfdCBkdXJhdGlvblVzOwogICAgICAgICBib29sIGhhc1ZpZGVvID0gKG1Tb3VyY2UtPmdldEZvcm1hdChmYWxzZSAvKiBhdWRpbyAqLykgIT0gTlVMTCk7Ci0gICAgICAgIGlmICghaGFzVmlkZW8gJiYKLSAgICAgICAgICAgICAgICBtU291cmNlLT5nZXREdXJhdGlvbigmZHVyYXRpb25VcykgPT0gT0sgJiYKLSAgICAgICAgICAgICAgICBkdXJhdGlvblVzID4gQVVESU9fU0lOS19NSU5fREVFUF9CVUZGRVJfRFVSQVRJT05fVVMpIHsKKyAgICAgICAgaWYgKGdldEF1ZGlvRGVlcEJ1ZmZlclNldHRpbmcoKSAvLyBvdmVycmlkZSByZWdhcmRsZXNzIG9mIHNvdXJjZSBkdXJhdGlvbgorICAgICAgICAgICAgICAgIHx8ICghaGFzVmlkZW8KKyAgICAgICAgICAgICAgICAgICAgICAgICYmIG1Tb3VyY2UtPmdldER1cmF0aW9uKCZkdXJhdGlvblVzKSA9PSBPSworICAgICAgICAgICAgICAgICAgICAgICAgJiYgZHVyYXRpb25VcyA+IEFVRElPX1NJTktfTUlOX0RFRVBfQlVGRkVSX0RVUkFUSU9OX1VTKSkgewogICAgICAgICAgICAgZmxhZ3MgPSBBVURJT19PVVRQVVRfRkxBR19ERUVQX0JVRkZFUjsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGZsYWdzID0gQVVESU9fT1VUUFVUX0ZMQUdfTk9ORTsKZGlmZiAtLWdpdCBhL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9udXBsYXllci9OdVBsYXllclJlbmRlcmVyLmNwcCBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9udXBsYXllci9OdVBsYXllclJlbmRlcmVyLmNwcAppbmRleCA0MDlkZWRmLi5mN2UzMTE3IDEwMDY0NAotLS0gYS9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvbnVwbGF5ZXIvTnVQbGF5ZXJSZW5kZXJlci5jcHAKKysrIGIvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL251cGxheWVyL051UGxheWVyUmVuZGVyZXIuY3BwCkBAIC0xOSw3ICsxOSw3IEBACiAjaW5jbHVkZSA8dXRpbHMvTG9nLmg+CiAKICNpbmNsdWRlICJOdVBsYXllclJlbmRlcmVyLmgiCi0KKyNpbmNsdWRlIDxjdXRpbHMvcHJvcGVydGllcy5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQUJ1ZmZlci5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQURlYnVnLmg+CiAjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvZm91bmRhdGlvbi9BTWVzc2FnZS5oPgpAQCAtMzYsNiArMzYsMzYgQEAKIAogbmFtZXNwYWNlIGFuZHJvaWQgewogCisvKgorICogRXhhbXBsZSBvZiBjb21tb24gY29uZmlndXJhdGlvbiBzZXR0aW5ncyBpbiBzaGVsbCBzY3JpcHQgZm9ybQorCisgICAjVHVybiBvZmZsb2FkIGF1ZGlvIG9mZiAodXNlIFBDTSBmb3IgUGxheSBNdXNpYykgLS0gQXVkaW9Qb2xpY3lNYW5hZ2VyCisgICBhZGIgc2hlbGwgc2V0cHJvcCBhdWRpby5vZmZsb2FkLmRpc2FibGUgMQorCisgICAjQWxsb3cgb2ZmbG9hZCBhdWRpbyB3aXRoIHZpZGVvIChyZXF1aXJlcyBvZmZsb2FkaW5nIHRvIGJlIGVuYWJsZWQpIC0tIEF1ZGlvUG9saWN5TWFuYWdlcgorICAgYWRiIHNoZWxsIHNldHByb3AgYXVkaW8ub2ZmbG9hZC52aWRlbyAxCisKKyAgICNVc2UgYXVkaW8gY2FsbGJhY2tzIGZvciBQQ00gZGF0YQorICAgYWRiIHNoZWxsIHNldHByb3AgbWVkaWEuc3RhZ2VmcmlnaHQuYXVkaW8uY2JrIDEKKworICAgI1VzZSBkZWVwIGJ1ZmZlciBmb3IgUENNIGRhdGEgd2l0aCB2aWRlbyAoaXQgaXMgZ2VuZXJhbGx5IGVuYWJsZWQgZm9yIGF1ZGlvLW9ubHkpCisgICBhZGIgc2hlbGwgc2V0cHJvcCBtZWRpYS5zdGFnZWZyaWdodC5hdWRpby5kZWVwIDEKKworICAgI1NldCBzaXplIG9mIGJ1ZmZlcnMgZm9yIHBjbSBhdWRpbyBzaW5rIGluIG1zZWMgKGV4YW1wbGU6IDEwMDAgbXNlYykKKyAgIGFkYiBzaGVsbCBzZXRwcm9wIG1lZGlhLnN0YWdlZnJpZ2h0LmF1ZGlvLnNpbmsgMTAwMAorCisgKiBUaGVzZSBjb25maWd1cmF0aW9ucyB0YWtlIGVmZmVjdCBmb3IgdGhlIG5leHQgdHJhY2sgcGxheWVkIChub3QgdGhlIGN1cnJlbnQgdHJhY2spLgorICovCisKK3N0YXRpYyBpbmxpbmUgYm9vbCBnZXRVc2VBdWRpb0NhbGxiYWNrU2V0dGluZygpIHsKKyAgICByZXR1cm4gcHJvcGVydHlfZ2V0X2Jvb2woIm1lZGlhLnN0YWdlZnJpZ2h0LmF1ZGlvLmNiayIsIGZhbHNlIC8qIGRlZmF1bHRfdmFsdWUgKi8pOworfQorCitzdGF0aWMgaW5saW5lIGludDMyX3QgZ2V0QXVkaW9TaW5rUGNtTXNTZXR0aW5nKCkgeworICAgIHJldHVybiBwcm9wZXJ0eV9nZXRfaW50MzIoCisgICAgICAgICAgICAibWVkaWEuc3RhZ2VmcmlnaHQuYXVkaW8uc2luayIsIDUwMCAvKiBkZWZhdWx0X3ZhbHVlICovKTsKK30KKwogLy8gTWF4aW11bSB0aW1lIGluIHBhdXNlZCBzdGF0ZSB3aGVuIG9mZmxvYWRpbmcgYXVkaW8gZGVjb21wcmVzc2lvbi4gV2hlbiBlbGFwc2VkLCB0aGUgQXVkaW9TaW5rCiAvLyBpcyBjbG9zZWQgdG8gYWxsb3cgdGhlIGF1ZGlvIERTUCB0byBwb3dlciBkb3duLgogc3RhdGljIGNvbnN0IGludDY0X3Qga09mZmxvYWRQYXVzZU1heFVzID0gMTAwMDAwMDBsbDsKQEAgLTg3LDYgKzExNyw3IEBACiAgICAgICBtQ3VycmVudFBjbUluZm8oQVVESU9fUENNSU5GT19JTklUSUFMSVpFUiksCiAgICAgICBtVG90YWxCdWZmZXJzUXVldWVkKDApLAogICAgICAgbUxhc3RBdWRpb0J1ZmZlckRyYWluZWQoMCksCisgICAgICBtVXNlQXVkaW9DYWxsYmFjayhmYWxzZSksCiAgICAgICBtV2FrZUxvY2sobmV3IEFXYWtlTG9jaygpKSB7CiAgICAgbU1lZGlhQ2xvY2sgPSBuZXcgTWVkaWFDbG9jazsKICAgICBtUGxheWJhY2tSYXRlID0gbVBsYXliYWNrU2V0dGluZ3MubVNwZWVkOwpAQCAtNTkyLDggKzYyMyw3IEBACiB9CiAKIHZvaWQgTnVQbGF5ZXI6OlJlbmRlcmVyOjpwb3N0RHJhaW5BdWRpb1F1ZXVlX2woaW50NjRfdCBkZWxheVVzKSB7Ci0gICAgaWYgKG1EcmFpbkF1ZGlvUXVldWVQZW5kaW5nIHx8IG1TeW5jUXVldWVzIHx8IG1QYXVzZWQKLSAgICAgICAgICAgIHx8IG9mZmxvYWRpbmdBdWRpbygpKSB7CisgICAgaWYgKG1EcmFpbkF1ZGlvUXVldWVQZW5kaW5nIHx8IG1TeW5jUXVldWVzIHx8IG1Vc2VBdWRpb0NhbGxiYWNrKSB7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTY0MiwxMiArNjcyLDE0IEBACiAKICAgICAgICAgY2FzZSBNZWRpYVBsYXllckJhc2U6OkF1ZGlvU2luazo6Q0JfRVZFTlRfU1RSRUFNX0VORDoKICAgICAgICAgeworICAgICAgICAgICAgQUxPR1YoIkF1ZGlvU2luazo6Q0JfRVZFTlRfU1RSRUFNX0VORCIpOwogICAgICAgICAgICAgbWUtPm5vdGlmeUVPUyh0cnVlIC8qIGF1ZGlvICovLCBFUlJPUl9FTkRfT0ZfU1RSRUFNKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBNZWRpYVBsYXllckJhc2U6OkF1ZGlvU2luazo6Q0JfRVZFTlRfVEVBUl9ET1dOOgogICAgICAgICB7CisgICAgICAgICAgICBBTE9HVigiQXVkaW9TaW5rOjpDQl9FVkVOVF9URUFSX0RPV04iKTsKICAgICAgICAgICAgIG1lLT5ub3RpZnlBdWRpb1RlYXJEb3duKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtNjU5LDcgKzY5MSw3IEBACiBzaXplX3QgTnVQbGF5ZXI6OlJlbmRlcmVyOjpmaWxsQXVkaW9CdWZmZXIodm9pZCAqYnVmZmVyLCBzaXplX3Qgc2l6ZSkgewogICAgIE11dGV4OjpBdXRvbG9jayBhdXRvTG9jayhtTG9jayk7CiAKLSAgICBpZiAoIW9mZmxvYWRpbmdBdWRpbygpIHx8IG1QYXVzZWQpIHsKKyAgICBpZiAoIW1Vc2VBdWRpb0NhbGxiYWNrKSB7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIApAQCAtNjY3LDEzICs2OTksMTMgQEAKIAogICAgIHNpemVfdCBzaXplQ29waWVkID0gMDsKICAgICBib29sIGZpcnN0RW50cnkgPSB0cnVlOworICAgIFF1ZXVlRW50cnkgKmVudHJ5OyAgLy8gd2lsbCBiZSB2YWxpZCBhZnRlciB3aGlsZSBsb29wIGlmIGhhc0VPUyBpcyBzZXQuCiAgICAgd2hpbGUgKHNpemVDb3BpZWQgPCBzaXplICYmICFtQXVkaW9RdWV1ZS5lbXB0eSgpKSB7Ci0gICAgICAgIFF1ZXVlRW50cnkgKmVudHJ5ID0gJiptQXVkaW9RdWV1ZS5iZWdpbigpOworICAgICAgICBlbnRyeSA9ICYqbUF1ZGlvUXVldWUuYmVnaW4oKTsKIAogICAgICAgICBpZiAoZW50cnktPm1CdWZmZXIgPT0gTlVMTCkgeyAvLyBFT1MKICAgICAgICAgICAgIGhhc0VPUyA9IHRydWU7CiAgICAgICAgICAgICBtQXVkaW9RdWV1ZS5lcmFzZShtQXVkaW9RdWV1ZS5iZWdpbigpKTsKLSAgICAgICAgICAgIGVudHJ5ID0gTlVMTDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKQEAgLTY4MSw3ICs3MTMsNyBAQAogICAgICAgICAgICAgZmlyc3RFbnRyeSA9IGZhbHNlOwogICAgICAgICAgICAgaW50NjRfdCBtZWRpYVRpbWVVczsKICAgICAgICAgICAgIENIRUNLKGVudHJ5LT5tQnVmZmVyLT5tZXRhKCktPmZpbmRJbnQ2NCgidGltZVVzIiwgJm1lZGlhVGltZVVzKSk7Ci0gICAgICAgICAgICBBTE9HVigicmVuZGVyaW5nIGF1ZGlvIGF0IG1lZGlhIHRpbWUgJS4yZiBzZWNzIiwgbWVkaWFUaW1lVXMgLyAxRTYpOworICAgICAgICAgICAgQUxPR1YoImZpbGxBdWRpb0J1ZmZlcjogcmVuZGVyaW5nIGF1ZGlvIGF0IG1lZGlhIHRpbWUgJS4yZiBzZWNzIiwgbWVkaWFUaW1lVXMgLyAxRTYpOwogICAgICAgICAgICAgc2V0QXVkaW9GaXJzdEFuY2hvclRpbWVJZk5lZWRlZF9sKG1lZGlhVGltZVVzKTsKICAgICAgICAgfQogCkBAIC03MTQsMTAgKzc0NiwyOCBAQAogICAgICAgICBtTWVkaWFDbG9jay0+dXBkYXRlQW5jaG9yKG5vd01lZGlhVXMsIG5vd1VzLCBJTlQ2NF9NQVgpOwogICAgIH0KIAotICAgIGlmIChoYXNFT1MpIHsKLSAgICAgICAgKG5ldyBBTWVzc2FnZShrV2hhdFN0b3BBdWRpb1NpbmssIHRoaXMpKS0+cG9zdCgpOworICAgIC8vIGZvciBub24tb2ZmbG9hZGVkIGF1ZGlvLCB3ZSBuZWVkIHRvIGNvbXB1dGUgdGhlIGZyYW1lcyB3cml0dGVuIGJlY2F1c2UKKyAgICAvLyB0aGVyZSBpcyBubyBFVkVOVF9TVFJFQU1fRU5EIG5vdGlmaWNhdGlvbi4gVGhlIGZyYW1lcyB3cml0dGVuIGdpdmVzCisgICAgLy8gYW4gZXN0aW1hdGUgb24gdGhlIHBlbmRpbmcgcGxheWVkIG91dCBkdXJhdGlvbi4KKyAgICBpZiAoIW9mZmxvYWRpbmdBdWRpbygpKSB7CisgICAgICAgIG1OdW1GcmFtZXNXcml0dGVuICs9IHNpemVDb3BpZWQgLyBtQXVkaW9TaW5rLT5mcmFtZVNpemUoKTsKICAgICB9CiAKKyAgICBpZiAoaGFzRU9TKSB7CisgICAgICAgIChuZXcgQU1lc3NhZ2Uoa1doYXRTdG9wQXVkaW9TaW5rLCB0aGlzKSktPnBvc3QoKTsKKyAgICAgICAgLy8gQXMgdGhlcmUgaXMgY3VycmVudGx5IG5vIEVWRU5UX1NUUkVBTV9FTkQgY2FsbGJhY2sgbm90aWZpY2F0aW9uIGZvcgorICAgICAgICAvLyBub24tb2ZmbG9hZGVkIGF1ZGlvIHRyYWNrcywgd2UgbmVlZCB0byBwb3N0IHRoZSBFT1Mgb3Vyc2VsdmVzLgorICAgICAgICBpZiAoIW9mZmxvYWRpbmdBdWRpbygpKSB7CisgICAgICAgICAgICBpbnQ2NF90IHBvc3RFT1NEZWxheVVzID0gMDsKKyAgICAgICAgICAgIGlmIChtQXVkaW9TaW5rLT5uZWVkc1RyYWlsaW5nUGFkZGluZygpKSB7CisgICAgICAgICAgICAgICAgcG9zdEVPU0RlbGF5VXMgPSBnZXRQZW5kaW5nQXVkaW9QbGF5b3V0RHVyYXRpb25VcyhBTG9vcGVyOjpHZXROb3dVcygpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIEFMT0dWKCJmaWxsQXVkaW9CdWZmZXI6IG5vdGlmeUVPUyAiCisgICAgICAgICAgICAgICAgICAgICJtTnVtRnJhbWVzV3JpdHRlbjoldSAgZmluYWxSZXN1bHQ6JWQgIHBvc3RFT1NEZWxheTolbGxkIiwKKyAgICAgICAgICAgICAgICAgICAgbU51bUZyYW1lc1dyaXR0ZW4sIGVudHJ5LT5tRmluYWxSZXN1bHQsIChsb25nIGxvbmcpcG9zdEVPU0RlbGF5VXMpOworICAgICAgICAgICAgbm90aWZ5RU9TKHRydWUgLyogYXVkaW8gKi8sIGVudHJ5LT5tRmluYWxSZXN1bHQsIHBvc3RFT1NEZWxheVVzKTsKKyAgICAgICAgfQorICAgIH0KICAgICByZXR1cm4gc2l6ZUNvcGllZDsKIH0KIApAQCAtNzQ5LDYgKzc5OSw3IEBACiAgICAgfQogI2VuZGlmCiAKKyAgICB1aW50MzJfdCBwcmV2RnJhbWVzV3JpdHRlbiA9IG1OdW1GcmFtZXNXcml0dGVuOwogICAgIHdoaWxlICghbUF1ZGlvUXVldWUuZW1wdHkoKSkgewogICAgICAgICBRdWV1ZUVudHJ5ICplbnRyeSA9ICYqbUF1ZGlvUXVldWUuYmVnaW4oKTsKIApAQCAtNzc4LDcgKzgyOSw4IEBACiAgICAgICAgIGlmIChlbnRyeS0+bU9mZnNldCA9PSAwICYmIGVudHJ5LT5tQnVmZmVyLT5zaXplKCkgPiAwKSB7CiAgICAgICAgICAgICBpbnQ2NF90IG1lZGlhVGltZVVzOwogICAgICAgICAgICAgQ0hFQ0soZW50cnktPm1CdWZmZXItPm1ldGEoKS0+ZmluZEludDY0KCJ0aW1lVXMiLCAmbWVkaWFUaW1lVXMpKTsKLSAgICAgICAgICAgIEFMT0dWKCJyZW5kZXJpbmcgYXVkaW8gYXQgbWVkaWEgdGltZSAlLjJmIHNlY3MiLCBtZWRpYVRpbWVVcyAvIDFFNik7CisgICAgICAgICAgICBBTE9HVigib25EcmFpbkF1ZGlvUXVldWU6IHJlbmRlcmluZyBhdWRpbyBhdCBtZWRpYSB0aW1lICUuMmYgc2VjcyIsCisgICAgICAgICAgICAgICAgICAgIG1lZGlhVGltZVVzIC8gMUU2KTsKICAgICAgICAgICAgIG9uTmV3QXVkaW9NZWRpYVRpbWUobWVkaWFUaW1lVXMpOwogICAgICAgICB9CiAKQEAgLTg0Niw3ICs4OTgsMTMgQEAKICAgICB9CiAgICAgbU1lZGlhQ2xvY2stPnVwZGF0ZU1heFRpbWVNZWRpYShtYXhUaW1lTWVkaWEpOwogCi0gICAgcmV0dXJuICFtQXVkaW9RdWV1ZS5lbXB0eSgpOworICAgIC8vIGNhbGN1bGF0ZSB3aGV0aGVyIHdlIG5lZWQgdG8gcmVzY2hlZHVsZSBhbm90aGVyIHdyaXRlLgorICAgIGJvb2wgcmVzY2hlZHVsZSA9ICFtQXVkaW9RdWV1ZS5lbXB0eSgpCisgICAgICAgICAgICAmJiAoIW1QYXVzZWQKKyAgICAgICAgICAgICAgICB8fCBwcmV2RnJhbWVzV3JpdHRlbiAhPSBtTnVtRnJhbWVzV3JpdHRlbik7IC8vIHBlcm1pdCBwYXVzZSB0byBmaWxsIGJ1ZmZlcnMKKyAgICAvL0FMT0dEKCJyZXNjaGVkdWxlOiVkICBlbXB0eTolZCAgbVBhdXNlZDolZCAgcHJldkZyYW1lc1dyaXR0ZW46JXUgIG1OdW1GcmFtZXNXcml0dGVuOiV1IiwKKyAgICAvLyAgICAgICAgcmVzY2hlZHVsZSwgbUF1ZGlvUXVldWUuZW1wdHkoKSwgbVBhdXNlZCwgcHJldkZyYW1lc1dyaXR0ZW4sIG1OdW1GcmFtZXNXcml0dGVuKTsKKyAgICByZXR1cm4gcmVzY2hlZHVsZTsKIH0KIAogaW50NjRfdCBOdVBsYXllcjo6UmVuZGVyZXI6OmdldER1cmF0aW9uVXNJZlBsYXllZEF0U2FtcGxlUmF0ZSh1aW50MzJfdCBudW1GcmFtZXMpIHsKQEAgLTEyMzAsOSArMTI4OCw4IEBACiAgICAgICAgICAgICArK21BdWRpb0RyYWluR2VuZXJhdGlvbjsKICAgICAgICAgICAgIHByZXBhcmVGb3JNZWRpYVJlbmRlcmluZ1N0YXJ0X2woKTsKIAotICAgICAgICAgICAgaWYgKG9mZmxvYWRpbmdBdWRpbygpKSB7Ci0gICAgICAgICAgICAgICAgY2xlYXJBdWRpb0ZpcnN0QW5jaG9yVGltZV9sKCk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICAvLyB0aGUgZnJhbWUgY291bnQgd2lsbCBiZSByZXNldCBhZnRlciBmbHVzaC4KKyAgICAgICAgICAgIGNsZWFyQXVkaW9GaXJzdEFuY2hvclRpbWVfbCgpOwogICAgICAgICB9CiAKICAgICAgICAgbURyYWluQXVkaW9RdWV1ZVBlbmRpbmcgPSBmYWxzZTsKQEAgLTEyNDAsNyArMTI5Nyw5IEBACiAgICAgICAgIGlmIChvZmZsb2FkaW5nQXVkaW8oKSkgewogICAgICAgICAgICAgbUF1ZGlvU2luay0+cGF1c2UoKTsKICAgICAgICAgICAgIG1BdWRpb1NpbmstPmZsdXNoKCk7Ci0gICAgICAgICAgICBtQXVkaW9TaW5rLT5zdGFydCgpOworICAgICAgICAgICAgaWYgKCFtUGF1c2VkKSB7CisgICAgICAgICAgICAgICAgbUF1ZGlvU2luay0+c3RhcnQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1BdWRpb1NpbmstPnBhdXNlKCk7CiAgICAgICAgICAgICBtQXVkaW9TaW5rLT5mbHVzaCgpOwpAQCAtMTM0NSw3ICsxNDA0LDcgQEAKIAogICAgIHsKICAgICAgICAgTXV0ZXg6OkF1dG9sb2NrIGF1dG9Mb2NrKG1Mb2NrKTsKLSAgICAgICAgKyttQXVkaW9EcmFpbkdlbmVyYXRpb247CisgICAgICAgIC8vIHdlIGRvIG5vdCBpbmNyZW1lbnQgYXVkaW8gZHJhaW4gZ2VuZXJhdGlvbiBzbyB0aGF0IHdlIGZpbGwgYXVkaW8gYnVmZmVyIGR1cmluZyBwYXVzZS4KICAgICAgICAgKyttVmlkZW9EcmFpbkdlbmVyYXRpb247CiAgICAgICAgIHByZXBhcmVGb3JNZWRpYVJlbmRlcmluZ1N0YXJ0X2woKTsKICAgICAgICAgbVBhdXNlZCA9IHRydWU7CkBAIC0xNTkwLDEyICsxNjQ5LDEzIEBACiAgICAgICAgICAgICBvZmZsb2FkRmxhZ3MgJj0gfkFVRElPX09VVFBVVF9GTEFHX0RFRVBfQlVGRkVSOwogICAgICAgICAgICAgYXVkaW9TaW5rQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgICAgICBtQXVkaW9TaW5rLT5jbG9zZSgpOworCiAgICAgICAgICAgICBlcnIgPSBtQXVkaW9TaW5rLT5vcGVuKAogICAgICAgICAgICAgICAgICAgICBzYW1wbGVSYXRlLAogICAgICAgICAgICAgICAgICAgICBudW1DaGFubmVscywKICAgICAgICAgICAgICAgICAgICAgKGF1ZGlvX2NoYW5uZWxfbWFza190KWNoYW5uZWxNYXNrLAogICAgICAgICAgICAgICAgICAgICBhdWRpb0Zvcm1hdCwKLSAgICAgICAgICAgICAgICAgICAgOCAvKiBidWZmZXJDb3VudCAqLywKKyAgICAgICAgICAgICAgICAgICAgMCAvKiBidWZmZXJDb3VudCAtIHVudXNlZCAqLywKICAgICAgICAgICAgICAgICAgICAgJk51UGxheWVyOjpSZW5kZXJlcjo6QXVkaW9TaW5rQ2FsbGJhY2ssCiAgICAgICAgICAgICAgICAgICAgIHRoaXMsCiAgICAgICAgICAgICAgICAgICAgIChhdWRpb19vdXRwdXRfZmxhZ3NfdClvZmZsb2FkRmxhZ3MsCkBAIC0xNjEzLDcgKzE2NzMsOSBAQAogICAgICAgICAgICAgICAgIC8vIGJlZm9yZSByZWFjaGluZyB0aGUgaGFyZHdhcmUuCiAgICAgICAgICAgICAgICAgLy8gVE9ETwogICAgICAgICAgICAgICAgIG1DdXJyZW50T2ZmbG9hZEluZm8gPSBvZmZsb2FkSW5mbzsKLSAgICAgICAgICAgICAgICBlcnIgPSBtQXVkaW9TaW5rLT5zdGFydCgpOworICAgICAgICAgICAgICAgIGlmICghbVBhdXNlZCkgeyAvLyBmb3IgcHJldmlldyBtb2RlLCBkb24ndCBzdGFydCBpZiBwYXVzZWQKKyAgICAgICAgICAgICAgICAgICAgZXJyID0gbUF1ZGlvU2luay0+c3RhcnQoKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgQUxPR1ZfSUYoZXJyID09IE9LLCAib3BlbkF1ZGlvU2luazogb2ZmbG9hZCBzdWNjZWVkZWQiKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChlcnIgIT0gT0spIHsKQEAgLTE2MjMsNiArMTY4NSw3IEBACiAgICAgICAgICAgICAgICAgbUN1cnJlbnRPZmZsb2FkSW5mbyA9IEFVRElPX0lORk9fSU5JVElBTElaRVI7CiAgICAgICAgICAgICAgICAgQUxPR1YoIm9wZW5BdWRpb1Npbms6IG9mZmxvYWQgZmFpbGVkIik7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBtVXNlQXVkaW9DYWxsYmFjayA9IHRydWU7ICAvLyBvZmZsb2FkIG1vZGUgdHJhbnNmZXJzIGRhdGEgdGhyb3VnaCBjYWxsYmFjawogICAgICAgICB9CiAgICAgfQogICAgIGlmICghb2ZmbG9hZE9ubHkgJiYgIW9mZmxvYWRpbmdBdWRpbygpKSB7CkBAIC0xNjQ2LDE3ICsxNzA5LDI3IEBACiAgICAgICAgIGF1ZGlvU2lua0NoYW5nZWQgPSB0cnVlOwogICAgICAgICBtQXVkaW9TaW5rLT5jbG9zZSgpOwogICAgICAgICBtQ3VycmVudE9mZmxvYWRJbmZvID0gQVVESU9fSU5GT19JTklUSUFMSVpFUjsKKyAgICAgICAgLy8gTm90ZTogSXQgaXMgcG9zc2libGUgdG8gc2V0IHVwIHRoZSBjYWxsYmFjaywgYnV0IG5vdCB1c2UgaXQgdG8gc2VuZCBhdWRpbyBkYXRhLgorICAgICAgICAvLyBUaGlzIHJlcXVpcmVzIGEgZml4IGluIEF1ZGlvU2luayB0byBleHBsaWNpdGx5IHNwZWNpZnkgdGhlIHRyYW5zZmVyIG1vZGUuCisgICAgICAgIG1Vc2VBdWRpb0NhbGxiYWNrID0gZ2V0VXNlQXVkaW9DYWxsYmFja1NldHRpbmcoKTsKKworICAgICAgICAvLyBDb21wdXRlIHRoZSBkZXNpcmVkIGJ1ZmZlciBzaXplLgorICAgICAgICAvLyBGb3IgY2FsbGJhY2sgbW9kZSwgdGhlIGFtb3VudCBvZiB0aW1lIGJlZm9yZSB3YWtldXAgaXMgYWJvdXQgaGFsZiB0aGUgYnVmZmVyIHNpemUuCisgICAgICAgIGNvbnN0IHVpbnQzMl90IGZyYW1lQ291bnQgPQorICAgICAgICAgICAgICAgICh1bnNpZ25lZCBsb25nIGxvbmcpc2FtcGxlUmF0ZSAqIGdldEF1ZGlvU2lua1BjbU1zU2V0dGluZygpIC8gMTAwMDsKKwogICAgICAgICBzdGF0dXNfdCBlcnIgPSBtQXVkaW9TaW5rLT5vcGVuKAogICAgICAgICAgICAgICAgICAgICBzYW1wbGVSYXRlLAogICAgICAgICAgICAgICAgICAgICBudW1DaGFubmVscywKICAgICAgICAgICAgICAgICAgICAgKGF1ZGlvX2NoYW5uZWxfbWFza190KWNoYW5uZWxNYXNrLAogICAgICAgICAgICAgICAgICAgICBBVURJT19GT1JNQVRfUENNXzE2X0JJVCwKLSAgICAgICAgICAgICAgICAgICAgOCAvKiBidWZmZXJDb3VudCAqLywKLSAgICAgICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgMCAvKiBidWZmZXJDb3VudCAtIHVudXNlZCAqLywKKyAgICAgICAgICAgICAgICAgICAgbVVzZUF1ZGlvQ2FsbGJhY2sgPyAmTnVQbGF5ZXI6OlJlbmRlcmVyOjpBdWRpb1NpbmtDYWxsYmFjayA6IE5VTEwsCisgICAgICAgICAgICAgICAgICAgIG1Vc2VBdWRpb0NhbGxiYWNrID8gdGhpcyA6IE5VTEwsCiAgICAgICAgICAgICAgICAgICAgIChhdWRpb19vdXRwdXRfZmxhZ3NfdClwY21GbGFncywKICAgICAgICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgdHJ1ZSAvKiBkb05vdFJlY29ubmVjdCAqLyk7CisgICAgICAgICAgICAgICAgICAgIHRydWUgLyogZG9Ob3RSZWNvbm5lY3QgKi8sCisgICAgICAgICAgICAgICAgICAgIGZyYW1lQ291bnQpOwogICAgICAgICBpZiAoZXJyID09IE9LKSB7CiAgICAgICAgICAgICBlcnIgPSBtQXVkaW9TaW5rLT5zZXRQbGF5YmFja1JhdGUobVBsYXliYWNrU2V0dGluZ3MpOwogICAgICAgICB9CkBAIC0xNjY2LDcgKzE3MzksOSBAQAogICAgICAgICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgICAgICBtQ3VycmVudFBjbUluZm8gPSBpbmZvOwotICAgICAgICBtQXVkaW9TaW5rLT5zdGFydCgpOworICAgICAgICBpZiAoIW1QYXVzZWQpIHsgLy8gZm9yIHByZXZpZXcgbW9kZSwgZG9uJ3Qgc3RhcnQgaWYgcGF1c2VkCisgICAgICAgICAgICBtQXVkaW9TaW5rLT5zdGFydCgpOworICAgICAgICB9CiAgICAgfQogICAgIGlmIChhdWRpb1NpbmtDaGFuZ2VkKSB7CiAgICAgICAgIG9uQXVkaW9TaW5rQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL251cGxheWVyL051UGxheWVyUmVuZGVyZXIuaCBiL21lZGlhL2xpYm1lZGlhcGxheWVyc2VydmljZS9udXBsYXllci9OdVBsYXllclJlbmRlcmVyLmgKaW5kZXggZmJkZjViZi4uYzJmZWE0MCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlibWVkaWFwbGF5ZXJzZXJ2aWNlL251cGxheWVyL051UGxheWVyUmVuZGVyZXIuaAorKysgYi9tZWRpYS9saWJtZWRpYXBsYXllcnNlcnZpY2UvbnVwbGF5ZXIvTnVQbGF5ZXJSZW5kZXJlci5oCkBAIC0xOTQsNiArMTk0LDcgQEAKIAogICAgIGludDMyX3QgbVRvdGFsQnVmZmVyc1F1ZXVlZDsKICAgICBpbnQzMl90IG1MYXN0QXVkaW9CdWZmZXJEcmFpbmVkOworICAgIGJvb2wgbVVzZUF1ZGlvQ2FsbGJhY2s7CiAKICAgICBzcDxBV2FrZUxvY2s+IG1XYWtlTG9jazsKIApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvQUNvZGVjLmNwcCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0FDb2RlYy5jcHAKaW5kZXggM2E5OGU4Yy4uMTcyZTE5YyAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvQUNvZGVjLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9BQ29kZWMuY3BwCkBAIC0xMDYsNiArMTA2LDE2IEBACiAgICAgcGFyYW1zLT5uVmVyc2lvbi5zLm5TdGVwID0gMDsKIH0KIAorc3RydWN0IE1lc3NhZ2VMaXN0IDogcHVibGljIFJlZkJhc2UgeworICAgIE1lc3NhZ2VMaXN0KCkgeworICAgIH0KKyAgICBzdGQ6Omxpc3Q8c3A8QU1lc3NhZ2U+ID4gJmdldExpc3QoKSB7IHJldHVybiBtTGlzdDsgfQorcHJpdmF0ZToKKyAgICBzdGQ6Omxpc3Q8c3A8QU1lc3NhZ2U+ID4gbUxpc3Q7CisKKyAgICBESVNBTExPV19FVklMX0NPTlNUUlVDVE9SUyhNZXNzYWdlTGlzdCk7Cit9OworCiBzdHJ1Y3QgQ29kZWNPYnNlcnZlciA6IHB1YmxpYyBCbk9NWE9ic2VydmVyIHsKICAgICBDb2RlY09ic2VydmVyKCkge30KIApAQCAtMTE0LDU1ICsxMjQsNjUgQEAKICAgICB9CiAKICAgICAvLyBmcm9tIElPTVhPYnNlcnZlcgotICAgIHZpcnR1YWwgdm9pZCBvbk1lc3NhZ2UoY29uc3Qgb214X21lc3NhZ2UgJm9teF9tc2cpIHsKLSAgICAgICAgc3A8QU1lc3NhZ2U+IG1zZyA9IG1Ob3RpZnktPmR1cCgpOwotCi0gICAgICAgIG1zZy0+c2V0SW50MzIoInR5cGUiLCBvbXhfbXNnLnR5cGUpOwotICAgICAgICBtc2ctPnNldEludDMyKCJub2RlIiwgb214X21zZy5ub2RlKTsKLQotICAgICAgICBzd2l0Y2ggKG9teF9tc2cudHlwZSkgewotICAgICAgICAgICAgY2FzZSBvbXhfbWVzc2FnZTo6RVZFTlQ6Ci0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigiZXZlbnQiLCBvbXhfbXNnLnUuZXZlbnRfZGF0YS5ldmVudCk7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigiZGF0YTEiLCBvbXhfbXNnLnUuZXZlbnRfZGF0YS5kYXRhMSk7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigiZGF0YTIiLCBvbXhfbXNnLnUuZXZlbnRfZGF0YS5kYXRhMik7Ci0gICAgICAgICAgICAgICAgYnJlYWs7CisgICAgdmlydHVhbCB2b2lkIG9uTWVzc2FnZXMoY29uc3Qgc3RkOjpsaXN0PG9teF9tZXNzYWdlPiAmbWVzc2FnZXMpIHsKKyAgICAgICAgc3A8QU1lc3NhZ2U+IG5vdGlmeTsKKyAgICAgICAgYm9vbCBmaXJzdCA9IHRydWU7CisgICAgICAgIHNwPE1lc3NhZ2VMaXN0PiBtc2dMaXN0ID0gbmV3IE1lc3NhZ2VMaXN0KCk7CisgICAgICAgIGZvciAoc3RkOjpsaXN0PG9teF9tZXNzYWdlPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtZXNzYWdlcy5jYmVnaW4oKTsKKyAgICAgICAgICAgICAgaXQgIT0gbWVzc2FnZXMuY2VuZCgpOyArK2l0KSB7CisgICAgICAgICAgICBjb25zdCBvbXhfbWVzc2FnZSAmb214X21zZyA9ICppdDsKKyAgICAgICAgICAgIGlmIChmaXJzdCkgeworICAgICAgICAgICAgICAgIG5vdGlmeSA9IG1Ob3RpZnktPmR1cCgpOworICAgICAgICAgICAgICAgIG5vdGlmeS0+c2V0SW50MzIoIm5vZGUiLCBvbXhfbXNnLm5vZGUpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBjYXNlIG9teF9tZXNzYWdlOjpFTVBUWV9CVUZGRVJfRE9ORToKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKCJidWZmZXIiLCBvbXhfbXNnLnUuYnVmZmVyX2RhdGEuYnVmZmVyKTsKLSAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKCJmZW5jZV9mZCIsIG9teF9tc2cuZmVuY2VGZCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBzcDxBTWVzc2FnZT4gbXNnID0gbmV3IEFNZXNzYWdlOworICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigidHlwZSIsIG9teF9tc2cudHlwZSk7CisgICAgICAgICAgICBzd2l0Y2ggKG9teF9tc2cudHlwZSkgeworICAgICAgICAgICAgICAgIGNhc2Ugb214X21lc3NhZ2U6OkVWRU5UOgorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigiZXZlbnQiLCBvbXhfbXNnLnUuZXZlbnRfZGF0YS5ldmVudCk7CisgICAgICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50MzIoImRhdGExIiwgb214X21zZy51LmV2ZW50X2RhdGEuZGF0YTEpOworICAgICAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKCJkYXRhMiIsIG9teF9tc2cudS5ldmVudF9kYXRhLmRhdGEyKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBjYXNlIG9teF9tZXNzYWdlOjpGSUxMX0JVRkZFUl9ET05FOgotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50MzIoCi0gICAgICAgICAgICAgICAgICAgICAgICAiYnVmZmVyIiwgb214X21zZy51LmV4dGVuZGVkX2J1ZmZlcl9kYXRhLmJ1ZmZlcik7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigKLSAgICAgICAgICAgICAgICAgICAgICAgICJyYW5nZV9vZmZzZXQiLAotICAgICAgICAgICAgICAgICAgICAgICAgb214X21zZy51LmV4dGVuZGVkX2J1ZmZlcl9kYXRhLnJhbmdlX29mZnNldCk7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigKLSAgICAgICAgICAgICAgICAgICAgICAgICJyYW5nZV9sZW5ndGgiLAotICAgICAgICAgICAgICAgICAgICAgICAgb214X21zZy51LmV4dGVuZGVkX2J1ZmZlcl9kYXRhLnJhbmdlX2xlbmd0aCk7Ci0gICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigKLSAgICAgICAgICAgICAgICAgICAgICAgICJmbGFncyIsCi0gICAgICAgICAgICAgICAgICAgICAgICBvbXhfbXNnLnUuZXh0ZW5kZWRfYnVmZmVyX2RhdGEuZmxhZ3MpOwotICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50NjQoCi0gICAgICAgICAgICAgICAgICAgICAgICAidGltZXN0YW1wIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIG9teF9tc2cudS5leHRlbmRlZF9idWZmZXJfZGF0YS50aW1lc3RhbXApOwotICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50MzIoCi0gICAgICAgICAgICAgICAgICAgICAgICAiZmVuY2VfZmQiLCBvbXhfbXNnLmZlbmNlRmQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGNhc2Ugb214X21lc3NhZ2U6OkVNUFRZX0JVRkZFUl9ET05FOgorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigiYnVmZmVyIiwgb214X21zZy51LmJ1ZmZlcl9kYXRhLmJ1ZmZlcik7CisgICAgICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50MzIoImZlbmNlX2ZkIiwgb214X21zZy5mZW5jZUZkKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIEFMT0dFKCJVbnJlY29nbml6ZWQgbWVzc2FnZSB0eXBlOiAlZCIsIG9teF9tc2cudHlwZSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBvbXhfbWVzc2FnZTo6RklMTF9CVUZGRVJfRE9ORToKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIG1zZy0+c2V0SW50MzIoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJ1ZmZlciIsIG9teF9tc2cudS5leHRlbmRlZF9idWZmZXJfZGF0YS5idWZmZXIpOworICAgICAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJyYW5nZV9vZmZzZXQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9teF9tc2cudS5leHRlbmRlZF9idWZmZXJfZGF0YS5yYW5nZV9vZmZzZXQpOworICAgICAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJyYW5nZV9sZW5ndGgiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9teF9tc2cudS5leHRlbmRlZF9idWZmZXJfZGF0YS5yYW5nZV9sZW5ndGgpOworICAgICAgICAgICAgICAgICAgICBtc2ctPnNldEludDMyKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJmbGFncyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb214X21zZy51LmV4dGVuZGVkX2J1ZmZlcl9kYXRhLmZsYWdzKTsKKyAgICAgICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQ2NCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGltZXN0YW1wIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbXhfbXNnLnUuZXh0ZW5kZWRfYnVmZmVyX2RhdGEudGltZXN0YW1wKTsKKyAgICAgICAgICAgICAgICAgICAgbXNnLT5zZXRJbnQzMigKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZmVuY2VfZmQiLCBvbXhfbXNnLmZlbmNlRmQpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICBBTE9HRSgiVW5yZWNvZ25pemVkIG1lc3NhZ2UgdHlwZTogJWQiLCBvbXhfbXNnLnR5cGUpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIG1zZ0xpc3QtPmdldExpc3QoKS5wdXNoX2JhY2sobXNnKTsKICAgICAgICAgfQotCi0gICAgICAgIG1zZy0+cG9zdCgpOworICAgICAgICBub3RpZnktPnNldE9iamVjdCgibWVzc2FnZXMiLCBtc2dMaXN0KTsKKyAgICAgICAgbm90aWZ5LT5wb3N0KCk7CiAgICAgfQogCiBwcm90ZWN0ZWQ6CkBAIC0yMDAsOCArMjIwLDE1IEBACiAgICAgdm9pZCBwb3N0RmlsbFRoaXNCdWZmZXIoQnVmZmVySW5mbyAqaW5mbyk7CiAKIHByaXZhdGU6CisgICAgLy8gSGFuZGxlcyBhbiBPTVggbWVzc2FnZS4gUmV0dXJucyB0cnVlIGlmZiBtZXNzYWdlIHdhcyBoYW5kbGVkLgogICAgIGJvb2wgb25PTVhNZXNzYWdlKGNvbnN0IHNwPEFNZXNzYWdlPiAmbXNnKTsKIAorICAgIC8vIEhhbmRsZXMgYSBsaXN0IG9mIG1lc3NhZ2VzLiBSZXR1cm5zIHRydWUgaWZmIG1lc3NhZ2VzIHdlcmUgaGFuZGxlZC4KKyAgICBib29sIG9uT01YTWVzc2FnZUxpc3QoY29uc3Qgc3A8QU1lc3NhZ2U+ICZtc2cpOworCisgICAgLy8gcmV0dXJucyB0cnVlIGlmZiB0aGlzIG1lc3NhZ2UgaXMgZm9yIHRoaXMgY29tcG9uZW50IGFuZCB0aGUgY29tcG9uZW50IGlzIGFsaXZlCisgICAgYm9vbCBjaGVja09NWE1lc3NhZ2UoY29uc3Qgc3A8QU1lc3NhZ2U+ICZtc2cpOworCiAgICAgYm9vbCBvbk9NWEVtcHR5QnVmZmVyRG9uZShJT01YOjpidWZmZXJfaWQgYnVmZmVySUQsIGludCBmZW5jZUZkKTsKIAogICAgIGJvb2wgb25PTVhGaWxsQnVmZmVyRG9uZSgKQEAgLTQ0MDIsOSArNDQyOSwxNCBAQAogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAorICAgICAgICBjYXNlIEFDb2RlYzo6a1doYXRPTVhNZXNzYWdlTGlzdDoKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIGNoZWNrT01YTWVzc2FnZShtc2cpID8gb25PTVhNZXNzYWdlTGlzdChtc2cpIDogdHJ1ZTsKKyAgICAgICAgfQorCiAgICAgICAgIGNhc2UgQUNvZGVjOjprV2hhdE9NWE1lc3NhZ2U6CiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBvbk9NWE1lc3NhZ2UobXNnKTsKKyAgICAgICAgICAgIHJldHVybiBjaGVja09NWE1lc3NhZ2UobXNnKSA/IG9uT01YTWVzc2FnZShtc2cpIDogdHJ1ZTsKICAgICAgICAgfQogCiAgICAgICAgIGNhc2UgQUNvZGVjOjprV2hhdFNldFN1cmZhY2U6CkBAIC00NDYzLDE2ICs0NDk1LDEzIEBACiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgQUNvZGVjOjpCYXNlU3RhdGU6Om9uT01YTWVzc2FnZShjb25zdCBzcDxBTWVzc2FnZT4gJm1zZykgewotICAgIGludDMyX3QgdHlwZTsKLSAgICBDSEVDSyhtc2ctPmZpbmRJbnQzMigidHlwZSIsICZ0eXBlKSk7Ci0KK2Jvb2wgQUNvZGVjOjpCYXNlU3RhdGU6OmNoZWNrT01YTWVzc2FnZShjb25zdCBzcDxBTWVzc2FnZT4gJm1zZykgewogICAgIC8vIHRoZXJlIGlzIGEgcG9zc2liaWxpdHkgdGhhdCB0aGlzIGlzIGFuIG91dHN0YW5kaW5nIG1lc3NhZ2UgZm9yIGEKICAgICAvLyBjb2RlYyB0aGF0IHdlIGhhdmUgYWxyZWFkeSBkZXN0cm95ZWQKICAgICBpZiAobUNvZGVjLT5tTm9kZSA9PSAwKSB7CiAgICAgICAgIEFMT0dJKCJpZ25vcmluZyBtZXNzYWdlIGFzIGFscmVhZHkgZnJlZWQgY29tcG9uZW50OiAlcyIsCiAgICAgICAgICAgICAgICAgbXNnLT5kZWJ1Z1N0cmluZygpLmNfc3RyKCkpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIElPTVg6Om5vZGVfaWQgbm9kZUlEOwpAQCAtNDQ4MSw2ICs0NTEwLDI0IEBACiAgICAgICAgIEFMT0dFKCJVbmV4cGVjdGVkIG1lc3NhZ2UgZm9yIG5vZGVJRDogJXUsIHNob3VsZCBoYXZlIGJlZW4gJXUiLCBub2RlSUQsIG1Db2RlYy0+bU5vZGUpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitib29sIEFDb2RlYzo6QmFzZVN0YXRlOjpvbk9NWE1lc3NhZ2VMaXN0KGNvbnN0IHNwPEFNZXNzYWdlPiAmbXNnKSB7CisgICAgc3A8UmVmQmFzZT4gb2JqOworICAgIENIRUNLKG1zZy0+ZmluZE9iamVjdCgibWVzc2FnZXMiLCAmb2JqKSk7CisgICAgc3A8TWVzc2FnZUxpc3Q+IG1zZ0xpc3QgPSBzdGF0aWNfY2FzdDxNZXNzYWdlTGlzdCAqPihvYmouZ2V0KCkpOworCisgICAgZm9yIChzdGQ6Omxpc3Q8c3A8QU1lc3NhZ2U+Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtc2dMaXN0LT5nZXRMaXN0KCkuY2JlZ2luKCk7CisgICAgICAgICAgaXQgIT0gbXNnTGlzdC0+Z2V0TGlzdCgpLmNlbmQoKTsgKytpdCkgeworICAgICAgICBvbk9NWE1lc3NhZ2UoKml0KTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgQUNvZGVjOjpCYXNlU3RhdGU6Om9uT01YTWVzc2FnZShjb25zdCBzcDxBTWVzc2FnZT4gJm1zZykgeworICAgIGludDMyX3QgdHlwZTsKKyAgICBDSEVDSyhtc2ctPmZpbmRJbnQzMigidHlwZSIsICZ0eXBlKSk7CiAKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICAgICAgY2FzZSBvbXhfbWVzc2FnZTo6RVZFTlQ6CkBAIC01MzE2LDcgKzUzNjMsNyBAQAogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgbm90aWZ5ID0gbmV3IEFNZXNzYWdlKGtXaGF0T01YTWVzc2FnZSwgbUNvZGVjKTsKKyAgICBub3RpZnkgPSBuZXcgQU1lc3NhZ2Uoa1doYXRPTVhNZXNzYWdlTGlzdCwgbUNvZGVjKTsKICAgICBvYnNlcnZlci0+c2V0Tm90aWZpY2F0aW9uTWVzc2FnZShub3RpZnkpOwogCiAgICAgbUNvZGVjLT5tQ29tcG9uZW50TmFtZSA9IGNvbXBvbmVudE5hbWU7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9DYW1lcmFTb3VyY2UuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvQ2FtZXJhU291cmNlLmNwcAppbmRleCAxYjc4OGYzLi4yNjA2ZTQ0IDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9DYW1lcmFTb3VyY2UuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L0NhbWVyYVNvdXJjZS5jcHAKQEAgLTYwOCw2ICs2MDgsMTYgQEAKICAgICAgICAgfQogICAgIH0KIAorICAgIGVyciA9IG1DYW1lcmEtPnNlbmRDb21tYW5kKAorICAgICAgICBDQU1FUkFfQ01EX1NFVF9WSURFT19GT1JNQVQsIG1FbmNvZGVyRm9ybWF0LCBtRW5jb2RlckRhdGFTcGFjZSk7CisKKyAgICAvLyBUaGlzIGNvdWxkIGhhcHBlbiBmb3IgQ2FtZXJhSEFMMSBjbGllbnRzOyB0aHVzIHRoZSBmYWlsdXJlIGlzCisgICAgLy8gbm90IGEgZmF0YWwgZXJyb3IKKyAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgIEFMT0dXKCJGYWlsZWQgdG8gc2V0IHZpZGVvIGVuY29kZXIgZm9ybWF0L2RhdGFzcGFjZSB0byAlZCwgJWQgZHVlIHRvICVkIiwKKyAgICAgICAgICAgICAgICBtRW5jb2RlckZvcm1hdCwgbUVuY29kZXJEYXRhU3BhY2UsIGVycik7CisgICAgfQorCiAgICAgZXJyID0gT0s7CiAgICAgaWYgKG1DYW1lcmFGbGFncyAmIEZMQUdTX0hPVF9DQU1FUkEpIHsKICAgICAgICAgbUNhbWVyYS0+dW5sb2NrKCk7CkBAIC02NDUsNiArNjU1LDkgQEAKIAogICAgIG1TdGFydFRpbWVVcyA9IDA7CiAgICAgbU51bUlucHV0QnVmZmVycyA9IDA7CisgICAgbUVuY29kZXJGb3JtYXQgPSBIQUxfUElYRUxfRk9STUFUX0lNUExFTUVOVEFUSU9OX0RFRklORUQ7CisgICAgbUVuY29kZXJEYXRhU3BhY2UgPSBIQUxfREFUQVNQQUNFX0JUNzA5OworCiAgICAgaWYgKG1ldGEpIHsKICAgICAgICAgaW50NjRfdCBzdGFydFRpbWVVczsKICAgICAgICAgaWYgKG1ldGEtPmZpbmRJbnQ2NChrS2V5VGltZSwgJnN0YXJ0VGltZVVzKSkgewpAQCAtNjU2LDYgKzY2OSwxMCBAQAogICAgICAgICAgICAgQ0hFQ0tfR1QobkJ1ZmZlcnMsIDApOwogICAgICAgICAgICAgbU51bUlucHV0QnVmZmVycyA9IG5CdWZmZXJzOwogICAgICAgICB9CisKKyAgICAgICAgLy8gVE9ETzogUmVhZCBpbiBmb3JtYXQvZGF0YXNwYWNlIGZyb20gc29tZXdoZXJlCisgICAgICAgIC8vIFVuY29tbWVudCB0byB0ZXN0IFNXIGVuY29kZXJzIHVudGlsIFRPRE8gaXMgcmVzb2x2ZWQKKyAgICAgICAgLy8gbUVuY29kZXJGb3JtYXQgPSBIQUxfUElYRUxfRk9STUFUX1lDYkNyXzQyMF84ODg7CiAgICAgfQogCiAgICAgc3RhdHVzX3QgZXJyOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTVBFRzRFeHRyYWN0b3IuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTVBFRzRFeHRyYWN0b3IuY3BwCmluZGV4IDY1ZDhhMDQuLjYyNjEyYzcgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01QRUc0RXh0cmFjdG9yLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9NUEVHNEV4dHJhY3Rvci5jcHAKQEAgLTE1ODYsMTMgKzE1ODYsMTMgQEAKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gqXh5egorICAgICAgICAvLyBceEE5eHl6CiAgICAgICAgIGNhc2UgRk9VUkNDKDB4QTksICd4JywgJ3knLCAneicpOgogICAgICAgICB7CiAgICAgICAgICAgICAqb2Zmc2V0ICs9IGNodW5rX3NpemU7CiAKLSAgICAgICAgICAgIC8vIEJlc3QgY2FzZSB0aGUgdG90YWwgZGF0YSBsZW5ndGggaW5zaWRlICKpeHl6IiBib3gKLSAgICAgICAgICAgIC8vIHdvdWxkIGJlIDgsIGZvciBpbnN0YW5jZSAiqXh5eiIgKyAiXHgwMFx4MDRceDE1XHhjNyIgKyAiMCswLyIsCisgICAgICAgICAgICAvLyBCZXN0IGNhc2UgdGhlIHRvdGFsIGRhdGEgbGVuZ3RoIGluc2lkZSAiXHhBOXh5eiIgYm94CisgICAgICAgICAgICAvLyB3b3VsZCBiZSA4LCBmb3IgaW5zdGFuY2UgIlx4QTl4eXoiICsgIlx4MDBceDA0XHgxNVx4YzciICsgIjArMC8iLAogICAgICAgICAgICAgLy8gd2hlcmUgIlx4MDBceDA0IiBpcyB0aGUgdGV4dCBzdHJpbmcgbGVuZ3RoIHdpdGggdmFsdWUgPSA0LAogICAgICAgICAgICAgLy8gIlwweDE1XHhjNyIgaXMgdGhlIGxhbmd1YWdlIGNvZGUgPSBlbiwgYW5kICIwKzAiIGlzIGEKICAgICAgICAgICAgIC8vIGxvY2F0aW9uIChzdHJpbmcpIHZhbHVlIHdpdGggbG9uZ2l0dWRlID0gMCBhbmQgbGF0aXR1ZGUgPSAwLgpAQCAtMzI5NCwxNiArMzI5NCwyNCBAQAogICAgICAgICBtV2FudHNOQUxGcmFnbWVudHMgPSBmYWxzZTsKICAgICB9CiAKKyAgICBpbnQzMl90IHRtcDsKKyAgICBDSEVDSyhtRm9ybWF0LT5maW5kSW50MzIoa0tleU1heElucHV0U2l6ZSwgJnRtcCkpOworICAgIHNpemVfdCBtYXhfc2l6ZSA9IHRtcDsKKworICAgIC8vIEEgc29tZXdoYXQgYXJiaXRyYXJ5IGxpbWl0IHRoYXQgc2hvdWxkIGJlIHN1ZmZpY2llbnQgZm9yIDhrIHZpZGVvIGZyYW1lcworICAgIC8vIElmIHlvdSBzZWUgdGhlIG1lc3NhZ2UgYmVsb3cgZm9yIGEgdmFsaWQgaW5wdXQgc3RyZWFtOiBpbmNyZWFzZSB0aGUgbGltaXQKKyAgICBpZiAobWF4X3NpemUgPiA2NCAqIDEwMjQgKiAxMDI0KSB7CisgICAgICAgIEFMT0dFKCJib2d1cyBtYXggaW5wdXQgc2l6ZTogJXp1IiwgbWF4X3NpemUpOworICAgICAgICByZXR1cm4gRVJST1JfTUFMRk9STUVEOworICAgIH0KICAgICBtR3JvdXAgPSBuZXcgTWVkaWFCdWZmZXJHcm91cDsKLQotICAgIGludDMyX3QgbWF4X3NpemU7Ci0gICAgQ0hFQ0sobUZvcm1hdC0+ZmluZEludDMyKGtLZXlNYXhJbnB1dFNpemUsICZtYXhfc2l6ZSkpOwotCiAgICAgbUdyb3VwLT5hZGRfYnVmZmVyKG5ldyBNZWRpYUJ1ZmZlcihtYXhfc2l6ZSkpOwogCiAgICAgbVNyY0J1ZmZlciA9IG5ldyAoc3RkOjpub3Rocm93KSB1aW50OF90W21heF9zaXplXTsKICAgICBpZiAobVNyY0J1ZmZlciA9PSBOVUxMKSB7CiAgICAgICAgIC8vIGZpbGUgcHJvYmFibHkgc3BlY2lmaWVkIGEgYmFkIG1heCBzaXplCisgICAgICAgIGRlbGV0ZSBtR3JvdXA7CisgICAgICAgIG1Hcm91cCA9IE5VTEw7CiAgICAgICAgIHJldHVybiBFUlJPUl9NQUxGT1JNRUQ7CiAgICAgfQogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9NUEVHNFdyaXRlci5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9NUEVHNFdyaXRlci5jcHAKaW5kZXggOTVmMzYxZS4uNDdmMTE0YSAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTVBFRzRXcml0ZXIuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01QRUc0V3JpdGVyLmNwcApAQCAtMTEzLDYgKzExMyw4IEBACiAgICAgICAgICAgICBtQ3VyclRhYmxlRW50cmllc0VsZW1lbnQoTlVMTCkgewogICAgICAgICAgICAgQ0hFQ0tfR1QobUVsZW1lbnRDYXBhY2l0eSwgMCk7CiAgICAgICAgICAgICBDSEVDS19HVChtRW50cnlDYXBhY2l0eSwgMCk7CisgICAgICAgICAgICAvLyBFbnN1cmUgbm8gaW50ZWdlciBvdmVyZmxvdyBvbiBhbGxvY2F0aW9uIGluIGFkZCgpLgorICAgICAgICAgICAgQ0hFQ0tfTFQobUVudHJ5Q2FwYWNpdHksIFVJTlQzMl9NQVggLyBtRWxlbWVudENhcGFjaXR5KTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEZyZWUgdGhlIGFsbG9jYXRlZCBtZW1vcnkuCkBAIC0zODUsNiArMzg3LDEzIEBACiAgICAgICBtU3RhcnRUaW1lT2Zmc2V0TXMoLTEpLAogICAgICAgbU1ldGFLZXlzKG5ldyBBTWVzc2FnZSgpKSB7CiAgICAgYWRkRGV2aWNlTWV0YSgpOworCisgICAgLy8gVmVyaWZ5IG1GZCBpcyBzZWVrYWJsZQorICAgIG9mZjY0X3Qgb2ZmID0gbHNlZWs2NChtRmQsIDAsIFNFRUtfU0VUKTsKKyAgICBpZiAob2ZmIDwgMCkgeworICAgICAgICBBTE9HRSgiY2Fubm90IHNlZWsgbUZkOiAlcyAoJWQpIiwgc3RyZXJyb3IoZXJybm8pLCBlcnJubyk7CisgICAgICAgIHJlbGVhc2UoKTsKKyAgICB9CiB9CiAKIE1QRUc0V3JpdGVyOjp+TVBFRzRXcml0ZXIoKSB7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9NZWRpYUNvZGVjTGlzdC5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9NZWRpYUNvZGVjTGlzdC5jcHAKaW5kZXggZjM2NmIxZi4uZDQ4ZWRlOSAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvTWVkaWFDb2RlY0xpc3QuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L01lZGlhQ29kZWNMaXN0LmNwcApAQCAtNDYsOCArNDYsNiBAQAogCiBzdGF0aWMgTXV0ZXggc0luaXRNdXRleDsKIAotc3RhdGljIE1lZGlhQ29kZWNMaXN0ICpnQ29kZWNMaXN0ID0gTlVMTDsKLQogc3RhdGljIGJvb2wgcGFyc2VCb29sZWFuKGNvbnN0IGNoYXIgKnMpIHsKICAgICBpZiAoIXN0cmNhc2VjbXAocywgInRydWUiKSB8fCAhc3RyY2FzZWNtcChzLCAieWVzIikgfHwgIXN0cmNhc2VjbXAocywgInkiKSkgewogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTU3LDY0ICs1NSw3NiBAQAogICAgIHJldHVybiAqcyAhPSAnXDAnICYmICplbmQgPT0gJ1wwJyAmJiByZXMgPiAwOwogfQogCitzdGF0aWMgYm9vbCBpc1Byb2ZpbGluZ05lZWRlZCgpIHsKKyAgICBib29sIHByb2ZpbGluZ05lZWRlZCA9IHRydWU7CisgICAgRklMRSAqcmVzdWx0c0ZpbGUgPSBmb3BlbihrUHJvZmlsaW5nUmVzdWx0cywgInIiKTsKKyAgICBpZiAocmVzdWx0c0ZpbGUpIHsKKyAgICAgICAgQVN0cmluZyBjdXJyZW50VmVyc2lvbiA9IGdldFByb2ZpbGluZ1ZlcnNpb25TdHJpbmcoKTsKKyAgICAgICAgc2l6ZV90IGN1cnJlbnRWZXJzaW9uU2l6ZSA9IGN1cnJlbnRWZXJzaW9uLnNpemUoKTsKKyAgICAgICAgY2hhciAqdmVyc2lvblN0cmluZyA9IG5ldyBjaGFyW2N1cnJlbnRWZXJzaW9uU2l6ZSArIDFdOworICAgICAgICBmZ2V0cyh2ZXJzaW9uU3RyaW5nLCBjdXJyZW50VmVyc2lvblNpemUgKyAxLCByZXN1bHRzRmlsZSk7CisgICAgICAgIGlmIChzdHJjbXAodmVyc2lvblN0cmluZywgY3VycmVudFZlcnNpb24uY19zdHIoKSkgPT0gMCkgeworICAgICAgICAgICAgLy8gcHJvZmlsaW5nIHJlc3VsdCB1cCB0byBkYXRlCisgICAgICAgICAgICBwcm9maWxpbmdOZWVkZWQgPSBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICBmY2xvc2UocmVzdWx0c0ZpbGUpOworICAgICAgICBkZWxldGVbXSB2ZXJzaW9uU3RyaW5nOworICAgIH0KKyAgICByZXR1cm4gcHJvZmlsaW5nTmVlZGVkOworfQorCiAvLyBzdGF0aWMKIHNwPElNZWRpYUNvZGVjTGlzdD4gTWVkaWFDb2RlY0xpc3Q6OnNDb2RlY0xpc3Q7CiAKIC8vIHN0YXRpYwotc3A8SU1lZGlhQ29kZWNMaXN0PiBNZWRpYUNvZGVjTGlzdDo6Z2V0TG9jYWxJbnN0YW5jZSgpIHsKLSAgICBib29sIHByb2ZpbGluZ05lZWRlZCA9IGZhbHNlOwordm9pZCAqTWVkaWFDb2RlY0xpc3Q6OnByb2ZpbGVyVGhyZWFkV3JhcHBlcih2b2lkICogLyphcmcqLykgeworICAgIEFMT0dWKCJFbnRlciBwcm9maWxlclRocmVhZFdyYXBwZXIuIik7CisgICAgTWVkaWFDb2RlY0xpc3QgKmNvZGVjTGlzdCA9IG5ldyBNZWRpYUNvZGVjTGlzdCgpOworICAgIGlmIChjb2RlY0xpc3QtPmluaXRDaGVjaygpICE9IE9LKSB7CisgICAgICAgIEFMT0dXKCJGYWlsZWQgdG8gY3JlYXRlIGEgbmV3IE1lZGlhQ29kZWNMaXN0LCBza2lwcGluZyBjb2RlYyBwcm9maWxpbmcuIik7CisgICAgICAgIGRlbGV0ZSBjb2RlY0xpc3Q7CisgICAgICAgIHJldHVybiBOVUxMOworICAgIH0KKwogICAgIFZlY3RvcjxzcDxNZWRpYUNvZGVjSW5mbz4+IGluZm9zOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29kZWNMaXN0LT5jb3VudENvZGVjcygpOyArK2kpIHsKKyAgICAgICAgaW5mb3MucHVzaF9iYWNrKGNvZGVjTGlzdC0+Z2V0Q29kZWNJbmZvKGkpKTsKKyAgICB9CisgICAgQUxPR1YoIkNvZGVjIHByb2ZpbGluZyBzdGFydGVkLiIpOworICAgIHByb2ZpbGVDb2RlY3MoaW5mb3MpOworICAgIEFMT0dWKCJDb2RlYyBwcm9maWxpbmcgY29tcGxldGVkLiIpOworICAgIGNvZGVjTGlzdC0+cGFyc2VUb3BMZXZlbFhNTEZpbGUoa1Byb2ZpbGluZ1Jlc3VsdHMsIHRydWUgLyogaWdub3JlX2Vycm9ycyAqLyk7CiAKICAgICB7CiAgICAgICAgIE11dGV4OjpBdXRvbG9jayBhdXRvTG9jayhzSW5pdE11dGV4KTsKKyAgICAgICAgc0NvZGVjTGlzdCA9IGNvZGVjTGlzdDsKKyAgICB9CisgICAgcmV0dXJuIE5VTEw7Cit9CiAKLSAgICAgICAgaWYgKGdDb2RlY0xpc3QgPT0gTlVMTCkgewotICAgICAgICAgICAgZ0NvZGVjTGlzdCA9IG5ldyBNZWRpYUNvZGVjTGlzdDsKLSAgICAgICAgICAgIGlmIChnQ29kZWNMaXN0LT5pbml0Q2hlY2soKSA9PSBPSykgewotICAgICAgICAgICAgICAgIHNDb2RlY0xpc3QgPSBnQ29kZWNMaXN0OworLy8gc3RhdGljCitzcDxJTWVkaWFDb2RlY0xpc3Q+IE1lZGlhQ29kZWNMaXN0OjpnZXRMb2NhbEluc3RhbmNlKCkgeworICAgIE11dGV4OjpBdXRvbG9jayBhdXRvTG9jayhzSW5pdE11dGV4KTsKIAotICAgICAgICAgICAgICAgIEZJTEUgKnJlc3VsdHNGaWxlID0gZm9wZW4oa1Byb2ZpbGluZ1Jlc3VsdHMsICJyIik7Ci0gICAgICAgICAgICAgICAgaWYgKHJlc3VsdHNGaWxlKSB7Ci0gICAgICAgICAgICAgICAgICAgIEFTdHJpbmcgY3VycmVudFZlcnNpb24gPSBnZXRQcm9maWxpbmdWZXJzaW9uU3RyaW5nKCk7Ci0gICAgICAgICAgICAgICAgICAgIHNpemVfdCBjdXJyZW50VmVyc2lvblNpemUgPSBjdXJyZW50VmVyc2lvbi5zaXplKCk7Ci0gICAgICAgICAgICAgICAgICAgIGNoYXIgKnZlcnNpb25TdHJpbmcgPSBuZXcgY2hhcltjdXJyZW50VmVyc2lvblNpemVdOwotICAgICAgICAgICAgICAgICAgICBmZ2V0cyh2ZXJzaW9uU3RyaW5nLCBjdXJyZW50VmVyc2lvblNpemUsIHJlc3VsdHNGaWxlKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHN0cm5jbXAodmVyc2lvblN0cmluZywgY3VycmVudFZlcnNpb24uY19zdHIoKSwgY3VycmVudFZlcnNpb25TaXplKSAhPSAwKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBwcm9maWxpbmcgcmVzdWx0IG91dCBvZiBkYXRlCi0gICAgICAgICAgICAgICAgICAgICAgICBwcm9maWxpbmdOZWVkZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIGZjbG9zZShyZXN1bHRzRmlsZSk7Ci0gICAgICAgICAgICAgICAgICAgIGRlbGV0ZVtdIHZlcnNpb25TdHJpbmc7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gcHJvZmlsaW5nIHJlc3VsdHMgZG9lc24ndCBleGlzdGVkCi0gICAgICAgICAgICAgICAgICAgIHByb2ZpbGluZ05lZWRlZCA9IHRydWU7CisgICAgaWYgKHNDb2RlY0xpc3QgPT0gTlVMTCkgeworICAgICAgICBNZWRpYUNvZGVjTGlzdCAqY29kZWNMaXN0ID0gbmV3IE1lZGlhQ29kZWNMaXN0OworICAgICAgICBpZiAoY29kZWNMaXN0LT5pbml0Q2hlY2soKSA9PSBPSykgeworICAgICAgICAgICAgc0NvZGVjTGlzdCA9IGNvZGVjTGlzdDsKKworICAgICAgICAgICAgaWYgKGlzUHJvZmlsaW5nTmVlZGVkKCkpIHsKKyAgICAgICAgICAgICAgICBBTE9HVigiQ29kZWMgcHJvZmlsaW5nIG5lZWRlZCwgd2lsbCBiZSBydW4gaW4gc2VwYXJhdGVkIHRocmVhZC4iKTsKKyAgICAgICAgICAgICAgICBwdGhyZWFkX3QgcHJvZmlsZXI7CisgICAgICAgICAgICAgICAgaWYgKHB0aHJlYWRfY3JlYXRlKCZwcm9maWxlciwgTlVMTCwgcHJvZmlsZXJUaHJlYWRXcmFwcGVyLCBOVUxMKSAhPSAwKSB7CisgICAgICAgICAgICAgICAgICAgIEFMT0dXKCJGYWlsZWQgdG8gY3JlYXRlIHRocmVhZCBmb3IgY29kZWMgcHJvZmlsaW5nLiIpOwogICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIGlmIChwcm9maWxpbmdOZWVkZWQpIHsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBnQ29kZWNMaXN0LT5jb3VudENvZGVjcygpOyArK2kpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGluZm9zLnB1c2hfYmFjayhnQ29kZWNMaXN0LT5nZXRDb2RlY0luZm8oaSkpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBmYWlsdXJlIHRvIGluaXRpYWxpemUgbWF5IGJlIHRlbXBvcmFyeS4gcmV0cnkgb24gbmV4dCBjYWxsLgotICAgICAgICAgICAgICAgIGRlbGV0ZSBnQ29kZWNMaXN0OwotICAgICAgICAgICAgICAgIGdDb2RlY0xpc3QgPSBOVUxMOwogICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gZmFpbHVyZSB0byBpbml0aWFsaXplIG1heSBiZSB0ZW1wb3JhcnkuIHJldHJ5IG9uIG5leHQgY2FsbC4KKyAgICAgICAgICAgIGRlbGV0ZSBjb2RlY0xpc3Q7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAocHJvZmlsaW5nTmVlZGVkKSB7Ci0gICAgICAgIHByb2ZpbGVDb2RlY3MoaW5mb3MpOwotICAgIH0KLQotICAgIHsKLSAgICAgICAgTXV0ZXg6OkF1dG9sb2NrIGF1dG9Mb2NrKHNJbml0TXV0ZXgpOwotICAgICAgICBpZiAocHJvZmlsaW5nTmVlZGVkKSB7Ci0gICAgICAgICAgICBnQ29kZWNMaXN0LT5wYXJzZVRvcExldmVsWE1MRmlsZShrUHJvZmlsaW5nUmVzdWx0cywgdHJ1ZSAvKiBpZ25vcmVfZXJyb3JzICovKTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBzQ29kZWNMaXN0OwotICAgIH0KKyAgICByZXR1cm4gc0NvZGVjTGlzdDsKIH0KIAogc3RhdGljIE11dGV4IHNSZW1vdGVJbml0TXV0ZXg7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9PTVhDb2RlYy5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9PTVhDb2RlYy5jcHAKaW5kZXggOTI3Y2M2Yy4uOTZhYTgwOCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvT01YQ29kZWMuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L09NWENvZGVjLmNwcApAQCAtMTE2LDEyICsxMTYsMTUgQEAKICAgICB9CiAKICAgICAvLyBmcm9tIElPTVhPYnNlcnZlcgotICAgIHZpcnR1YWwgdm9pZCBvbk1lc3NhZ2UoY29uc3Qgb214X21lc3NhZ2UgJm1zZykgeworICAgIHZpcnR1YWwgdm9pZCBvbk1lc3NhZ2VzKGNvbnN0IHN0ZDo6bGlzdDxvbXhfbWVzc2FnZT4gJm1lc3NhZ2VzKSB7CiAgICAgICAgIHNwPE9NWENvZGVjPiBjb2RlYyA9IG1UYXJnZXQucHJvbW90ZSgpOwogCiAgICAgICAgIGlmIChjb2RlYy5nZXQoKSAhPSBOVUxMKSB7CiAgICAgICAgICAgICBNdXRleDo6QXV0b2xvY2sgYXV0b0xvY2soY29kZWMtPm1Mb2NrKTsKLSAgICAgICAgICAgIGNvZGVjLT5vbl9tZXNzYWdlKG1zZyk7CisgICAgICAgICAgICBmb3IgKHN0ZDo6bGlzdDxvbXhfbWVzc2FnZT46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbWVzc2FnZXMuY2JlZ2luKCk7CisgICAgICAgICAgICAgICAgICBpdCAhPSBtZXNzYWdlcy5jZW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAgICAgICBjb2RlYy0+b25fbWVzc2FnZSgqaXQpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgY29kZWMuY2xlYXIoKTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L09nZ0V4dHJhY3Rvci5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9PZ2dFeHRyYWN0b3IuY3BwCmluZGV4IDQyOTc1NDkuLjFjNjYzYTMgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L09nZ0V4dHJhY3Rvci5jcHAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvT2dnRXh0cmFjdG9yLmNwcApAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgImluY2x1ZGUvT2dnRXh0cmFjdG9yLmgiCiAKICNpbmNsdWRlIDxjdXRpbHMvcHJvcGVydGllcy5oPgorI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQUJ1ZmZlci5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L2ZvdW5kYXRpb24vQURlYnVnLmg+CiAjaW5jbHVkZSA8bWVkaWEvc3RhZ2VmcmlnaHQvRGF0YVNvdXJjZS5oPgogI2luY2x1ZGUgPG1lZGlhL3N0YWdlZnJpZ2h0L01lZGlhQnVmZmVyLmg+CkBAIC02NSwyNCArNjYsMjggQEAKICAgICBPZ2dTb3VyY2UgJm9wZXJhdG9yPShjb25zdCBPZ2dTb3VyY2UgJik7CiB9OwogCi1zdHJ1Y3QgTXlWb3JiaXNFeHRyYWN0b3IgewotICAgIE15Vm9yYmlzRXh0cmFjdG9yKGNvbnN0IHNwPERhdGFTb3VyY2U+ICZzb3VyY2UpOwotICAgIHZpcnR1YWwgfk15Vm9yYmlzRXh0cmFjdG9yKCk7CitzdHJ1Y3QgTXlPZ2dFeHRyYWN0b3IgeworICAgIE15T2dnRXh0cmFjdG9yKAorICAgICAgICAgICAgY29uc3Qgc3A8RGF0YVNvdXJjZT4gJnNvdXJjZSwKKyAgICAgICAgICAgIGNvbnN0IGNoYXIgKm1pbWVUeXBlLAorICAgICAgICAgICAgc2l6ZV90IG51bUhlYWRlcnMsCisgICAgICAgICAgICBpbnQ2NF90IHNlZWtQcmVSb2xsVXMpOworICAgIHZpcnR1YWwgfk15T2dnRXh0cmFjdG9yKCk7CiAKICAgICBzcDxNZXRhRGF0YT4gZ2V0Rm9ybWF0KCkgY29uc3Q7CiAKICAgICAvLyBSZXR1cm5zIGFuIGFwcHJveGltYXRlIGJpdHJhdGUgaW4gYml0cyBwZXIgc2Vjb25kLgotICAgIHVpbnQ2NF90IGFwcHJveEJpdHJhdGUoKTsKKyAgICB2aXJ0dWFsIHVpbnQ2NF90IGFwcHJveEJpdHJhdGUoKSBjb25zdCA9IDA7CiAKICAgICBzdGF0dXNfdCBzZWVrVG9UaW1lKGludDY0X3QgdGltZVVzKTsKICAgICBzdGF0dXNfdCBzZWVrVG9PZmZzZXQob2ZmNjRfdCBvZmZzZXQpOwotICAgIHN0YXR1c190IHJlYWROZXh0UGFja2V0KE1lZGlhQnVmZmVyICoqYnVmZmVyLCBib29sIGNvbmYpOworICAgIHZpcnR1YWwgc3RhdHVzX3QgcmVhZE5leHRQYWNrZXQoTWVkaWFCdWZmZXIgKipidWZmZXIpID0gMDsKIAogICAgIHN0YXR1c190IGluaXQoKTsKIAogICAgIHNwPE1ldGFEYXRhPiBnZXRGaWxlTWV0YURhdGEoKSB7IHJldHVybiBtRmlsZU1ldGE7IH0KIAotcHJpdmF0ZToKK3Byb3RlY3RlZDoKICAgICBzdHJ1Y3QgUGFnZSB7CiAgICAgICAgIHVpbnQ2NF90IG1HcmFudWxlUG9zaXRpb247CiAgICAgICAgIGludDMyX3QgbVByZXZQYWNrZXRTaXplOwpAQCAtMTAyLDEyICsxMDcsMTcgQEAKICAgICBzcDxEYXRhU291cmNlPiBtU291cmNlOwogICAgIG9mZjY0X3QgbU9mZnNldDsKICAgICBQYWdlIG1DdXJyZW50UGFnZTsKKyAgICB1aW50NjRfdCBtQ3VyR3JhbnVsZVBvc2l0aW9uOwogICAgIHVpbnQ2NF90IG1QcmV2R3JhbnVsZVBvc2l0aW9uOwogICAgIHNpemVfdCBtQ3VycmVudFBhZ2VTaXplOwogICAgIGJvb2wgbUZpcnN0UGFja2V0SW5QYWdlOwogICAgIHVpbnQ2NF90IG1DdXJyZW50UGFnZVNhbXBsZXM7CiAgICAgc2l6ZV90IG1OZXh0TGFjZUluZGV4OwogCisgICAgY29uc3QgY2hhciAqbU1pbWVUeXBlOworICAgIHNpemVfdCBtTnVtSGVhZGVyczsKKyAgICBpbnQ2NF90IG1TZWVrUHJlUm9sbFVzOworCiAgICAgb2ZmNjRfdCBtRmlyc3REYXRhT2Zmc2V0OwogCiAgICAgdm9yYmlzX2luZm8gbVZpOwpAQCAtMTIxLDEwICsxMzEsMjYgQEAKICAgICBzc2l6ZV90IHJlYWRQYWdlKG9mZjY0X3Qgb2Zmc2V0LCBQYWdlICpwYWdlKTsKICAgICBzdGF0dXNfdCBmaW5kTmV4dFBhZ2Uob2ZmNjRfdCBzdGFydE9mZnNldCwgb2ZmNjRfdCAqcGFnZU9mZnNldCk7CiAKLSAgICBzdGF0dXNfdCB2ZXJpZnlIZWFkZXIoCi0gICAgICAgICAgICBNZWRpYUJ1ZmZlciAqYnVmZmVyLCB1aW50OF90IHR5cGUpOworICAgIHZpcnR1YWwgaW50NjRfdCBnZXRUaW1lVXNPZkdyYW51bGUodWludDY0X3QgZ3JhbnVsZVBvcykgY29uc3QgPSAwOwogCi0gICAgaW50MzJfdCBwYWNrZXRCbG9ja1NpemUoTWVkaWFCdWZmZXIgKmJ1ZmZlcik7CisgICAgLy8gRXh0cmFjdCBjb2RlYyBmb3JtYXQsIG1ldGFkYXRhIHRhZ3MsIGFuZCB2YXJpb3VzIGNvZGVjIHNwZWNpZmljIGRhdGE7CisgICAgLy8gdGhlIGZvcm1hdCBhbmQgQ1NEJ3MgYXJlIHJlcXVpcmVkIHRvIHNldHVwIHRoZSBkZWNvZGVycyBmb3IgdGhlIGVuY2xvc2VkIG1lZGlhIGNvbnRlbnQuCisgICAgLy8KKyAgICAvLyBWYWxpZCB2YWx1ZXMgZm9yIGB0eXBlYCBhcmU6CisgICAgLy8gMSAtIGJpdHN0cmVhbSBpZGVudGlmaWNhdGlvbiBoZWFkZXIKKyAgICAvLyAzIC0gY29tbWVudCBoZWFkZXIKKyAgICAvLyA1IC0gY29kZWMgc2V0dXAgaGVhZGVyIChWb3JiaXMgb25seSkKKyAgICB2aXJ0dWFsIHN0YXR1c190IHZlcmlmeUhlYWRlcihNZWRpYUJ1ZmZlciAqYnVmZmVyLCB1aW50OF90IHR5cGUpID0gMDsKKworICAgIC8vIFJlYWQgdGhlIG5leHQgb2dnIHBhY2tldCBmcm9tIHRoZSB1bmRlcmx5aW5nIGRhdGEgc291cmNlOyBvcHRpb25hbGx5CisgICAgLy8gY2FsY3VsYXRlIHRoZSB0aW1lc3RhbXAgZm9yIHRoZSBvdXRwdXQgcGFja2V0IHdoaWxzdCBwcmV0ZW5kaW5nCisgICAgLy8gdGhhdCB3ZSBhcmUgcGFyc2luZyBhbiBPZ2cgVm9yYmlzIHN0cmVhbS4KKyAgICAvLworICAgIC8vICpidWZmZXIgaXMgTlVMTCdlZCBvdXQgaW1tZWRpYXRlbHkgdXBvbiBlbnRyeSwgYW5kIGlmIHN1Y2Nlc3NmdWwgYSBuZXcgYnVmZmVyIGlzIGFsbG9jYXRlZDsKKyAgICAvLyBjbGllbnRzIGFyZSByZXNwb25zaWJsZSBmb3IgcmVsZWFzaW5nIHRoZSBvcmlnaW5hbCBidWZmZXIuCisgICAgc3RhdHVzX3QgX3JlYWROZXh0UGFja2V0KE1lZGlhQnVmZmVyICoqYnVmZmVyLCBib29sIGNhbGNWb3JiaXNUaW1lc3RhbXApOworCisgICAgaW50MzJfdCBnZXRQYWNrZXRCbG9ja1NpemUoTWVkaWFCdWZmZXIgKmJ1ZmZlcik7CiAKICAgICB2b2lkIHBhcnNlRmlsZU1ldGFEYXRhKCk7CiAKQEAgLTEzMiw4ICsxNTgsNjEgQEAKIAogICAgIHZvaWQgYnVpbGRUYWJsZU9mQ29udGVudHMoKTsKIAotICAgIE15Vm9yYmlzRXh0cmFjdG9yKGNvbnN0IE15Vm9yYmlzRXh0cmFjdG9yICYpOwotICAgIE15Vm9yYmlzRXh0cmFjdG9yICZvcGVyYXRvcj0oY29uc3QgTXlWb3JiaXNFeHRyYWN0b3IgJik7CisgICAgTXlPZ2dFeHRyYWN0b3IoY29uc3QgTXlPZ2dFeHRyYWN0b3IgJik7CisgICAgTXlPZ2dFeHRyYWN0b3IgJm9wZXJhdG9yPShjb25zdCBNeU9nZ0V4dHJhY3RvciAmKTsKK307CisKK3N0cnVjdCBNeVZvcmJpc0V4dHJhY3RvciA6IHB1YmxpYyBNeU9nZ0V4dHJhY3RvciB7CisgICAgTXlWb3JiaXNFeHRyYWN0b3IoY29uc3Qgc3A8RGF0YVNvdXJjZT4gJnNvdXJjZSkKKyAgICAgICAgOiBNeU9nZ0V4dHJhY3Rvcihzb3VyY2UsCisgICAgICAgICAgICAgICAgTUVESUFfTUlNRVRZUEVfQVVESU9fVk9SQklTLAorICAgICAgICAgICAgICAgIC8qIG51bUhlYWRlcnMgKi8gMywKKyAgICAgICAgICAgICAgICAvKiBzZWVrUHJlUm9sbFVzICovIDApIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHVpbnQ2NF90IGFwcHJveEJpdHJhdGUoKSBjb25zdDsKKworICAgIHZpcnR1YWwgc3RhdHVzX3QgcmVhZE5leHRQYWNrZXQoTWVkaWFCdWZmZXIgKipidWZmZXIpIHsKKyAgICAgICAgcmV0dXJuIF9yZWFkTmV4dFBhY2tldChidWZmZXIsIC8qIGNhbGNWb3JiaXNUaW1lc3RhbXAgPSAqLyB0cnVlKTsKKyAgICB9CisKK3Byb3RlY3RlZDoKKyAgICB2aXJ0dWFsIGludDY0X3QgZ2V0VGltZVVzT2ZHcmFudWxlKHVpbnQ2NF90IGdyYW51bGVQb3MpIGNvbnN0IHsKKyAgICAgICAgcmV0dXJuIGdyYW51bGVQb3MgKiAxMDAwMDAwbGwgLyBtVmkucmF0ZTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHN0YXR1c190IHZlcmlmeUhlYWRlcihNZWRpYUJ1ZmZlciAqYnVmZmVyLCB1aW50OF90IHR5cGUpOworfTsKKworc3RydWN0IE15T3B1c0V4dHJhY3RvciA6IHB1YmxpYyBNeU9nZ0V4dHJhY3RvciB7CisgICAgc3RhdGljIGNvbnN0IGludDMyX3Qga09wdXNTYW1wbGVSYXRlID0gNDgwMDA7CisgICAgc3RhdGljIGNvbnN0IGludDY0X3Qga09wdXNTZWVrUHJlUm9sbFVzID0gODAwMDA7IC8vIDgwIG1zCisKKyAgICBNeU9wdXNFeHRyYWN0b3IoY29uc3Qgc3A8RGF0YVNvdXJjZT4gJnNvdXJjZSkKKyAgICAgICAgOiBNeU9nZ0V4dHJhY3Rvcihzb3VyY2UsIE1FRElBX01JTUVUWVBFX0FVRElPX09QVVMsIC8qbnVtSGVhZGVycyovIDIsIGtPcHVzU2Vla1ByZVJvbGxVcyksCisgICAgICAgICAgbUNoYW5uZWxDb3VudCgwKSwKKyAgICAgICAgICBtQ29kZWNEZWxheSgwKSwKKyAgICAgICAgICBtU3RhcnRHcmFudWxlUG9zaXRpb24oLTEpIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHVpbnQ2NF90IGFwcHJveEJpdHJhdGUoKSBjb25zdCB7CisgICAgICAgIHJldHVybiAwOworICAgIH0KKworICAgIHZpcnR1YWwgc3RhdHVzX3QgcmVhZE5leHRQYWNrZXQoTWVkaWFCdWZmZXIgKipidWZmZXIpOworCitwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCBpbnQ2NF90IGdldFRpbWVVc09mR3JhbnVsZSh1aW50NjRfdCBncmFudWxlUG9zKSBjb25zdDsKKyAgICB2aXJ0dWFsIHN0YXR1c190IHZlcmlmeUhlYWRlcihNZWRpYUJ1ZmZlciAqYnVmZmVyLCB1aW50OF90IHR5cGUpOworCitwcml2YXRlOgorICAgIHN0YXR1c190IHZlcmlmeU9wdXNIZWFkZXIoTWVkaWFCdWZmZXIgKmJ1ZmZlcik7CisgICAgc3RhdHVzX3QgdmVyaWZ5T3B1c0NvbW1lbnRzKE1lZGlhQnVmZmVyICpidWZmZXIpOworICAgIHVpbnQzMl90IGdldE51bVNhbXBsZXNJblBhY2tldChNZWRpYUJ1ZmZlciAqYnVmZmVyKSBjb25zdDsKKworICAgIHVpbnQ4X3QgbUNoYW5uZWxDb3VudDsKKyAgICB1aW50MTZfdCBtQ29kZWNEZWxheTsKKyAgICBpbnQ2NF90IG1TdGFydEdyYW51bGVQb3NpdGlvbjsKIH07CiAKIHN0YXRpYyB2b2lkIGV4dHJhY3RBbGJ1bUFydCgKQEAgLTE3OSwxMyArMjU4LDE0IEBACiAgICAgaW50NjRfdCBzZWVrVGltZVVzOwogICAgIFJlYWRPcHRpb25zOjpTZWVrTW9kZSBtb2RlOwogICAgIGlmIChvcHRpb25zICYmIG9wdGlvbnMtPmdldFNlZWtUbygmc2Vla1RpbWVVcywgJm1vZGUpKSB7Ci0gICAgICAgIGlmIChtRXh0cmFjdG9yLT5tSW1wbC0+c2Vla1RvVGltZShzZWVrVGltZVVzKSAhPSBPSykgewotICAgICAgICAgICAgcmV0dXJuIEVSUk9SX0VORF9PRl9TVFJFQU07CisgICAgICAgIHN0YXR1c190IGVyciA9IG1FeHRyYWN0b3ItPm1JbXBsLT5zZWVrVG9UaW1lKHNlZWtUaW1lVXMpOworICAgICAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgICAgICByZXR1cm4gZXJyOwogICAgICAgICB9CiAgICAgfQogCiAgICAgTWVkaWFCdWZmZXIgKnBhY2tldDsKLSAgICBzdGF0dXNfdCBlcnIgPSBtRXh0cmFjdG9yLT5tSW1wbC0+cmVhZE5leHRQYWNrZXQoJnBhY2tldCwgLyogY29uZiA9ICovIGZhbHNlKTsKKyAgICBzdGF0dXNfdCBlcnIgPSBtRXh0cmFjdG9yLT5tSW1wbC0+cmVhZE5leHRQYWNrZXQoJnBhY2tldCk7CiAKICAgICBpZiAoZXJyICE9IE9LKSB7CiAgICAgICAgIHJldHVybiBlcnI7CkBAIC0yMDksMTQgKzI4OSwyMiBAQAogCiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwogCi1NeVZvcmJpc0V4dHJhY3Rvcjo6TXlWb3JiaXNFeHRyYWN0b3IoY29uc3Qgc3A8RGF0YVNvdXJjZT4gJnNvdXJjZSkKK015T2dnRXh0cmFjdG9yOjpNeU9nZ0V4dHJhY3RvcigKKyAgICAgICAgY29uc3Qgc3A8RGF0YVNvdXJjZT4gJnNvdXJjZSwKKyAgICAgICAgY29uc3QgY2hhciAqbWltZVR5cGUsCisgICAgICAgIHNpemVfdCBudW1IZWFkZXJzLAorICAgICAgICBpbnQ2NF90IHNlZWtQcmVSb2xsVXMpCiAgICAgOiBtU291cmNlKHNvdXJjZSksCiAgICAgICBtT2Zmc2V0KDApLAorICAgICAgbUN1ckdyYW51bGVQb3NpdGlvbigwKSwKICAgICAgIG1QcmV2R3JhbnVsZVBvc2l0aW9uKDApLAogICAgICAgbUN1cnJlbnRQYWdlU2l6ZSgwKSwKICAgICAgIG1GaXJzdFBhY2tldEluUGFnZSh0cnVlKSwKICAgICAgIG1DdXJyZW50UGFnZVNhbXBsZXMoMCksCiAgICAgICBtTmV4dExhY2VJbmRleCgwKSwKKyAgICAgIG1NaW1lVHlwZShtaW1lVHlwZSksCisgICAgICBtTnVtSGVhZGVycyhudW1IZWFkZXJzKSwKKyAgICAgIG1TZWVrUHJlUm9sbFVzKHNlZWtQcmVSb2xsVXMpLAogICAgICAgbUZpcnN0RGF0YU9mZnNldCgtMSkgewogICAgIG1DdXJyZW50UGFnZS5tTnVtU2VnbWVudHMgPSAwOwogCkBAIC0yMjQsMTYgKzMxMiwxNiBAQAogICAgIHZvcmJpc19jb21tZW50X2luaXQoJm1WYyk7CiB9CiAKLU15Vm9yYmlzRXh0cmFjdG9yOjp+TXlWb3JiaXNFeHRyYWN0b3IoKSB7CitNeU9nZ0V4dHJhY3Rvcjo6fk15T2dnRXh0cmFjdG9yKCkgewogICAgIHZvcmJpc19jb21tZW50X2NsZWFyKCZtVmMpOwogICAgIHZvcmJpc19pbmZvX2NsZWFyKCZtVmkpOwogfQogCi1zcDxNZXRhRGF0YT4gTXlWb3JiaXNFeHRyYWN0b3I6OmdldEZvcm1hdCgpIGNvbnN0IHsKK3NwPE1ldGFEYXRhPiBNeU9nZ0V4dHJhY3Rvcjo6Z2V0Rm9ybWF0KCkgY29uc3QgewogICAgIHJldHVybiBtTWV0YTsKIH0KIAotc3RhdHVzX3QgTXlWb3JiaXNFeHRyYWN0b3I6OmZpbmROZXh0UGFnZSgKK3N0YXR1c190IE15T2dnRXh0cmFjdG9yOjpmaW5kTmV4dFBhZ2UoCiAgICAgICAgIG9mZjY0X3Qgc3RhcnRPZmZzZXQsIG9mZjY0X3QgKnBhZ2VPZmZzZXQpIHsKICAgICAqcGFnZU9mZnNldCA9IHN0YXJ0T2Zmc2V0OwogCkBAIC0yNjQsNyArMzUyLDcgQEAKIC8vIGl0IChpZiBhbnkpIGFuZCByZXR1cm4gaXRzIGdyYW51bGUgcG9zaXRpb24uCiAvLyBUbyBkbyB0aGlzIHdlIGJhY2sgdXAgZnJvbSB0aGUgImN1cnJlbnQiIHBhZ2UncyBvZmZzZXQgdW50aWwgd2UgZmluZCBhbnkKIC8vIHBhZ2UgcHJlY2VkaW5nIGl0IGFuZCB0aGVuIHNjYW4gZm9yd2FyZCB0byBqdXN0IGJlZm9yZSB0aGUgY3VycmVudCBwYWdlLgotc3RhdHVzX3QgTXlWb3JiaXNFeHRyYWN0b3I6OmZpbmRQcmV2R3JhbnVsZVBvc2l0aW9uKAorc3RhdHVzX3QgTXlPZ2dFeHRyYWN0b3I6OmZpbmRQcmV2R3JhbnVsZVBvc2l0aW9uKAogICAgICAgICBvZmY2NF90IHBhZ2VPZmZzZXQsIHVpbnQ2NF90ICpncmFudWxlUG9zKSB7CiAgICAgKmdyYW51bGVQb3MgPSAwOwogCkBAIC0yODAsNyArMzY4LDExIEBACiAgICAgICAgIEFMT0dWKCJiYWNraW5nIHVwICVsbGQgYnl0ZXMiLCAobG9uZyBsb25nKShwYWdlT2Zmc2V0IC0gcHJldkd1ZXNzKSk7CiAKICAgICAgICAgc3RhdHVzX3QgZXJyID0gZmluZE5leHRQYWdlKHByZXZHdWVzcywgJnByZXZQYWdlT2Zmc2V0KTsKLSAgICAgICAgaWYgKGVyciAhPSBPSykgeworICAgICAgICBpZiAoZXJyID09IEVSUk9SX0VORF9PRl9TVFJFQU0pIHsKKyAgICAgICAgICAgIC8vIFdlIGFyZSBhdCB0aGUgbGFzdCBwYWdlIGFuZCBkaWRuJ3QgYmFjayBvZmYgZW5vdWdoOworICAgICAgICAgICAgLy8gYmFjayBvZmYgNTAwMCBieXRlcyBtb3JlIGFuZCB0cnkgYWdhaW4uCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfSBlbHNlIGlmIChlcnIgIT0gT0spIHsKICAgICAgICAgICAgIHJldHVybiBlcnI7CiAgICAgICAgIH0KIApAQCAtMzE0LDExICs0MDYsMjAgQEAKICAgICB9CiB9CiAKLXN0YXR1c190IE15Vm9yYmlzRXh0cmFjdG9yOjpzZWVrVG9UaW1lKGludDY0X3QgdGltZVVzKSB7CitzdGF0dXNfdCBNeU9nZ0V4dHJhY3Rvcjo6c2Vla1RvVGltZShpbnQ2NF90IHRpbWVVcykgeworICAgIHRpbWVVcyAtPSBtU2Vla1ByZVJvbGxVczsKKyAgICBpZiAodGltZVVzIDwgMCkgeworICAgICAgICB0aW1lVXMgPSAwOworICAgIH0KKwogICAgIGlmIChtVGFibGVPZkNvbnRlbnRzLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBQZXJmb3JtIGFwcHJveGltYXRlIHNlZWtpbmcgYmFzZWQgb24gYXZnLiBiaXRyYXRlLgorICAgICAgICB1aW50NjRfdCBicHMgPSBhcHByb3hCaXRyYXRlKCk7CisgICAgICAgIGlmIChicHMgPD0gMCkgeworICAgICAgICAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOworICAgICAgICB9CiAKLSAgICAgICAgb2ZmNjRfdCBwb3MgPSB0aW1lVXMgKiBhcHByb3hCaXRyYXRlKCkgLyA4MDAwMDAwbGw7CisgICAgICAgIG9mZjY0X3QgcG9zID0gdGltZVVzICogYnBzIC8gODAwMDAwMGxsOwogCiAgICAgICAgIEFMT0dWKCJzZWVraW5nIHRvIG9mZnNldCAlbGxkIiwgKGxvbmcgbG9uZylwb3MpOwogICAgICAgICByZXR1cm4gc2Vla1RvT2Zmc2V0KHBvcyk7CkBAIC0zNTMsNyArNDU0LDcgQEAKICAgICByZXR1cm4gc2Vla1RvT2Zmc2V0KGVudHJ5Lm1QYWdlT2Zmc2V0KTsKIH0KIAotc3RhdHVzX3QgTXlWb3JiaXNFeHRyYWN0b3I6OnNlZWtUb09mZnNldChvZmY2NF90IG9mZnNldCkgeworc3RhdHVzX3QgTXlPZ2dFeHRyYWN0b3I6OnNlZWtUb09mZnNldChvZmY2NF90IG9mZnNldCkgewogICAgIGlmIChtRmlyc3REYXRhT2Zmc2V0ID49IDAgJiYgb2Zmc2V0IDwgbUZpcnN0RGF0YU9mZnNldCkgewogICAgICAgICAvLyBPbmNlIHdlIGtub3cgd2hlcmUgdGhlIGFjdHVhbCBhdWRpbyBkYXRhIHN0YXJ0cyAocGFzdCB0aGUgaGVhZGVycykKICAgICAgICAgLy8gZG9uJ3QgZXZlciBzZWVrIHRvIGFueXdoZXJlIGJlZm9yZSB0aGF0LgpAQCAtMzg2LDcgKzQ4Nyw3IEBACiAgICAgcmV0dXJuIE9LOwogfQogCi1zc2l6ZV90IE15Vm9yYmlzRXh0cmFjdG9yOjpyZWFkUGFnZShvZmY2NF90IG9mZnNldCwgUGFnZSAqcGFnZSkgeworc3NpemVfdCBNeU9nZ0V4dHJhY3Rvcjo6cmVhZFBhZ2Uob2ZmNjRfdCBvZmZzZXQsIFBhZ2UgKnBhZ2UpIHsKICAgICB1aW50OF90IGhlYWRlclsyN107CiAgICAgc3NpemVfdCBuOwogICAgIGlmICgobiA9IG1Tb3VyY2UtPnJlYWRBdChvZmZzZXQsIGhlYWRlciwgc2l6ZW9mKGhlYWRlcikpKQpAQCAtNDU3LDcgKzU1OCwxMTAgQEAKICAgICByZXR1cm4gc2l6ZW9mKGhlYWRlcikgKyBwYWdlLT5tTnVtU2VnbWVudHMgKyB0b3RhbFNpemU7CiB9CiAKLXN0YXR1c190IE15Vm9yYmlzRXh0cmFjdG9yOjpyZWFkTmV4dFBhY2tldChNZWRpYUJ1ZmZlciAqKm91dCwgYm9vbCBjb25mKSB7CitzdGF0dXNfdCBNeU9wdXNFeHRyYWN0b3I6OnJlYWROZXh0UGFja2V0KE1lZGlhQnVmZmVyICoqb3V0KSB7CisgICAgaWYgKG1PZmZzZXQgPD0gbUZpcnN0RGF0YU9mZnNldCAmJiBtU3RhcnRHcmFudWxlUG9zaXRpb24gPCAwKSB7CisgICAgICAgIC8vIFRoZSBmaXJzdCBzYW1wbGUgbWlnaHQgbm90IHN0YXJ0IGF0IHRpbWUgMDsgZmluZCBvdXQgd2hlcmUgYnkgc3VidHJhY3RpbmcKKyAgICAgICAgLy8gdGhlIG51bWJlciBvZiBzYW1wbGVzIG9uIHRoZSBmaXJzdCBwYWdlIGZyb20gdGhlIGdyYW51bGUgcG9zaXRpb24KKyAgICAgICAgLy8gKHBvc2l0aW9uIG9mIGxhc3QgY29tcGxldGUgc2FtcGxlKSBvZiB0aGUgZmlyc3QgcGFnZS4gVGhpcyBoYXBwZW5zCisgICAgICAgIC8vIHRoZSBmaXJzdCB0aW1lIGJlZm9yZSB3ZSBhdHRlbXB0IHRvIHJlYWQgYSBwYWNrZXQgZnJvbSB0aGUgZmlyc3QgcGFnZS4KKyAgICAgICAgTWVkaWFCdWZmZXIgKm1CdWY7CisgICAgICAgIHVpbnQzMl90IG51bVNhbXBsZXMgPSAwOworICAgICAgICB1aW50NjRfdCBjdXJHcmFudWxlUG9zaXRpb24gPSAwOworICAgICAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICAgICAgc3RhdHVzX3QgZXJyID0gX3JlYWROZXh0UGFja2V0KCZtQnVmLCAvKiBjYWxjVm9yYmlzVGltZXN0YW1wID0gKi9mYWxzZSk7CisgICAgICAgICAgICBpZiAoZXJyICE9IE9LICYmIGVyciAhPSBFUlJPUl9FTkRfT0ZfU1RSRUFNKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIGVycjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8vIEZpcnN0IHR3byBwYWdlcyBhcmUgaGVhZGVyIHBhZ2VzLgorICAgICAgICAgICAgaWYgKGVyciA9PSBFUlJPUl9FTkRfT0ZfU1RSRUFNIHx8IG1DdXJyZW50UGFnZS5tUGFnZU5vID4gMikgeworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY3VyR3JhbnVsZVBvc2l0aW9uID0gbUN1cnJlbnRQYWdlLm1HcmFudWxlUG9zaXRpb247CisgICAgICAgICAgICBudW1TYW1wbGVzICs9IGdldE51bVNhbXBsZXNJblBhY2tldChtQnVmKTsKKyAgICAgICAgICAgIG1CdWYtPnJlbGVhc2UoKTsKKyAgICAgICAgICAgIG1CdWYgPSBOVUxMOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGN1ckdyYW51bGVQb3NpdGlvbiA+IG51bVNhbXBsZXMpIHsKKyAgICAgICAgICAgIG1TdGFydEdyYW51bGVQb3NpdGlvbiA9IGN1ckdyYW51bGVQb3NpdGlvbiAtIG51bVNhbXBsZXM7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBtU3RhcnRHcmFudWxlUG9zaXRpb24gPSAwOworICAgICAgICB9CisgICAgICAgIHNlZWtUb09mZnNldCgwKTsKKyAgICB9CisKKyAgICBzdGF0dXNfdCBlcnIgPSBfcmVhZE5leHRQYWNrZXQob3V0LCAvKiBjYWxjVm9yYmlzVGltZXN0YW1wID0gKi9mYWxzZSk7CisgICAgaWYgKGVyciAhPSBPSykgeworICAgICAgICByZXR1cm4gZXJyOworICAgIH0KKworICAgIGludDMyX3QgY3VycmVudFBhZ2VTYW1wbGVzOworICAgIC8vIENhbGN1bGF0ZSB0aW1lc3RhbXBzIGJ5IGFjY3VtdWxhdGluZyBkdXJhdGlvbnMgc3RhcnRpbmcgZnJvbSB0aGUgZmlyc3Qgc2FtcGxlIG9mIGEgcGFnZTsKKyAgICAvLyBXZSBhc3N1bWUgdGhhdCB3ZSBvbmx5IHNlZWsgdG8gcGFnZSBib3VuZGFyaWVzLgorICAgIGlmICgoKm91dCktPm1ldGFfZGF0YSgpLT5maW5kSW50MzIoa0tleVZhbGlkU2FtcGxlcywgJmN1cnJlbnRQYWdlU2FtcGxlcykpIHsKKyAgICAgICAgLy8gZmlyc3QgcGFja2V0IGluIHBhZ2UKKyAgICAgICAgaWYgKG1PZmZzZXQgPT0gbUZpcnN0RGF0YU9mZnNldCkgeworICAgICAgICAgICAgY3VycmVudFBhZ2VTYW1wbGVzIC09IG1TdGFydEdyYW51bGVQb3NpdGlvbjsKKyAgICAgICAgICAgICgqb3V0KS0+bWV0YV9kYXRhKCktPnNldEludDMyKGtLZXlWYWxpZFNhbXBsZXMsIGN1cnJlbnRQYWdlU2FtcGxlcyk7CisgICAgICAgIH0KKyAgICAgICAgbUN1ckdyYW51bGVQb3NpdGlvbiA9IG1DdXJyZW50UGFnZS5tR3JhbnVsZVBvc2l0aW9uIC0gY3VycmVudFBhZ2VTYW1wbGVzOworICAgIH0KKworICAgIGludDY0X3QgdGltZVVzID0gZ2V0VGltZVVzT2ZHcmFudWxlKG1DdXJHcmFudWxlUG9zaXRpb24pOworICAgICgqb3V0KS0+bWV0YV9kYXRhKCktPnNldEludDY0KGtLZXlUaW1lLCB0aW1lVXMpOworCisgICAgdWludDMyX3QgZnJhbWVzID0gZ2V0TnVtU2FtcGxlc0luUGFja2V0KCpvdXQpOworICAgIG1DdXJHcmFudWxlUG9zaXRpb24gKz0gZnJhbWVzOworICAgIHJldHVybiBPSzsKK30KKwordWludDMyX3QgTXlPcHVzRXh0cmFjdG9yOjpnZXROdW1TYW1wbGVzSW5QYWNrZXQoTWVkaWFCdWZmZXIgKmJ1ZmZlcikgY29uc3QgeworICAgIGlmIChidWZmZXIgPT0gTlVMTCB8fCBidWZmZXItPnJhbmdlX2xlbmd0aCgpIDwgMSkgeworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICB1aW50OF90ICpkYXRhID0gKHVpbnQ4X3QgKilidWZmZXItPmRhdGEoKSArIGJ1ZmZlci0+cmFuZ2Vfb2Zmc2V0KCk7CisgICAgdWludDhfdCB0b2MgPSBkYXRhWzBdOworICAgIHVpbnQ4X3QgY29uZmlnID0gKHRvYyA+PiAzKSAmIDB4MWY7CisgICAgdWludDMyX3QgZnJhbWVTaXplc1VzW10gPSB7CisgICAgICAgIDEwMDAwLCAyMDAwMCwgNDAwMDAsIDYwMDAwLCAvLyAwLi4uMworICAgICAgICAxMDAwMCwgMjAwMDAsIDQwMDAwLCA2MDAwMCwgLy8gNC4uLjcKKyAgICAgICAgMTAwMDAsIDIwMDAwLCA0MDAwMCwgNjAwMDAsIC8vIDguLi4xMQorICAgICAgICAxMDAwMCwgMjAwMDAsICAgICAgICAgICAgICAgLy8gMTIuLi4xMworICAgICAgICAxMDAwMCwgMjAwMDAsICAgICAgICAgICAgICAgLy8gMTQuLi4xNQorICAgICAgICAyNTAwLCA1MDAwLCAxMDAwMCwgMjAwMDAsICAgLy8gMTYuLi4xOQorICAgICAgICAyNTAwLCA1MDAwLCAxMDAwMCwgMjAwMDAsICAgLy8gMjAuLi4yMworICAgICAgICAyNTAwLCA1MDAwLCAxMDAwMCwgMjAwMDAsICAgLy8gMjQuLi4yNworICAgICAgICAyNTAwLCA1MDAwLCAxMDAwMCwgMjAwMDAgICAgLy8gMjguLi4zMQorICAgIH07CisgICAgdWludDMyX3QgZnJhbWVTaXplVXMgPSBmcmFtZVNpemVzVXNbY29uZmlnXTsKKworICAgIHVpbnQzMl90IG51bUZyYW1lczsKKyAgICB1aW50OF90IGMgPSB0b2MgJiAzOworICAgIHN3aXRjaCAoYykgeworICAgIGNhc2UgMDoKKyAgICAgICAgbnVtRnJhbWVzID0gMTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSAxOgorICAgIGNhc2UgMjoKKyAgICAgICAgbnVtRnJhbWVzID0gMjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSAzOgorICAgICAgICBpZiAoYnVmZmVyLT5yYW5nZV9sZW5ndGgoKSA8IDMpIHsKKyAgICAgICAgICAgIG51bUZyYW1lcyA9IDA7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBudW1GcmFtZXMgPSBkYXRhWzJdICYgMHgzZjsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBUUkVTUEFTUygpOworICAgIH0KKworICAgIHVpbnQzMl90IG51bVNhbXBsZXMgPSBmcmFtZVNpemVVcyAqIG51bUZyYW1lcyAqIGtPcHVzU2FtcGxlUmF0ZSAvIDEwMDAwMDA7CisgICAgcmV0dXJuIG51bVNhbXBsZXM7Cit9CisKK3N0YXR1c190IE15T2dnRXh0cmFjdG9yOjpfcmVhZE5leHRQYWNrZXQoTWVkaWFCdWZmZXIgKipvdXQsIGJvb2wgY2FsY1ZvcmJpc1RpbWVzdGFtcCkgewogICAgICpvdXQgPSBOVUxMOwogCiAgICAgTWVkaWFCdWZmZXIgKmJ1ZmZlciA9IE5VTEw7CkBAIC01MjMsOSArNzI3LDggQEAKICAgICAgICAgICAgICAgICAgICAgbUZpcnN0UGFja2V0SW5QYWdlID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgLy8gaWdub3JlIHRpbWVzdGFtcCBmb3IgY29uZmlndXJhdGlvbiBwYWNrZXRzCi0gICAgICAgICAgICAgICAgaWYgKCFjb25mKSB7Ci0gICAgICAgICAgICAgICAgICAgIGludDMyX3QgY3VyQmxvY2tTaXplID0gcGFja2V0QmxvY2tTaXplKGJ1ZmZlcik7CisgICAgICAgICAgICAgICAgaWYgKGNhbGNWb3JiaXNUaW1lc3RhbXApIHsKKyAgICAgICAgICAgICAgICAgICAgaW50MzJfdCBjdXJCbG9ja1NpemUgPSBnZXRQYWNrZXRCbG9ja1NpemUoYnVmZmVyKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKG1DdXJyZW50UGFnZS5tUHJldlBhY2tldFNpemUgPCAwKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBtQ3VycmVudFBhZ2UubVByZXZQYWNrZXRTaXplID0gY3VyQmxvY2tTaXplOwogICAgICAgICAgICAgICAgICAgICAgICAgbUN1cnJlbnRQYWdlLm1QcmV2UGFja2V0UG9zID0KQEAgLTU5Nyw0MyArODAwLDI0IEBACiAgICAgfQogfQogCi1zdGF0dXNfdCBNeVZvcmJpc0V4dHJhY3Rvcjo6aW5pdCgpIHsKK3N0YXR1c190IE15T2dnRXh0cmFjdG9yOjppbml0KCkgewogICAgIG1NZXRhID0gbmV3IE1ldGFEYXRhOwotICAgIG1NZXRhLT5zZXRDU3RyaW5nKGtLZXlNSU1FVHlwZSwgTUVESUFfTUlNRVRZUEVfQVVESU9fVk9SQklTKTsKKyAgICBtTWV0YS0+c2V0Q1N0cmluZyhrS2V5TUlNRVR5cGUsIG1NaW1lVHlwZSk7CiAKLSAgICBNZWRpYUJ1ZmZlciAqcGFja2V0OwogICAgIHN0YXR1c190IGVycjsKLSAgICBpZiAoKGVyciA9IHJlYWROZXh0UGFja2V0KCZwYWNrZXQsIC8qIGNvbmYgPSAqLyB0cnVlKSkgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKLSAgICB9Ci0gICAgQUxPR1YoInJlYWQgcGFja2V0IG9mIHNpemUgJXp1XG4iLCBwYWNrZXQtPnJhbmdlX2xlbmd0aCgpKTsKLSAgICBlcnIgPSB2ZXJpZnlIZWFkZXIocGFja2V0LCAxKTsKLSAgICBwYWNrZXQtPnJlbGVhc2UoKTsKLSAgICBwYWNrZXQgPSBOVUxMOwotICAgIGlmIChlcnIgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKLSAgICB9Ci0KLSAgICBpZiAoKGVyciA9IHJlYWROZXh0UGFja2V0KCZwYWNrZXQsIC8qIGNvbmYgPSAqLyB0cnVlKSkgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKLSAgICB9Ci0gICAgQUxPR1YoInJlYWQgcGFja2V0IG9mIHNpemUgJXp1XG4iLCBwYWNrZXQtPnJhbmdlX2xlbmd0aCgpKTsKLSAgICBlcnIgPSB2ZXJpZnlIZWFkZXIocGFja2V0LCAzKTsKLSAgICBwYWNrZXQtPnJlbGVhc2UoKTsKLSAgICBwYWNrZXQgPSBOVUxMOwotICAgIGlmIChlcnIgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKLSAgICB9Ci0KLSAgICBpZiAoKGVyciA9IHJlYWROZXh0UGFja2V0KCZwYWNrZXQsIC8qIGNvbmYgPSAqLyB0cnVlKSkgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKLSAgICB9Ci0gICAgQUxPR1YoInJlYWQgcGFja2V0IG9mIHNpemUgJXp1XG4iLCBwYWNrZXQtPnJhbmdlX2xlbmd0aCgpKTsKLSAgICBlcnIgPSB2ZXJpZnlIZWFkZXIocGFja2V0LCA1KTsKLSAgICBwYWNrZXQtPnJlbGVhc2UoKTsKLSAgICBwYWNrZXQgPSBOVUxMOwotICAgIGlmIChlcnIgIT0gT0spIHsKLSAgICAgICAgcmV0dXJuIGVycjsKKyAgICBNZWRpYUJ1ZmZlciAqcGFja2V0OworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbU51bUhlYWRlcnM7ICsraSkgeworICAgICAgICAvLyBpZ25vcmUgdGltZXN0YW1wIGZvciBjb25maWd1cmF0aW9uIHBhY2tldHMKKyAgICAgICAgaWYgKChlcnIgPSBfcmVhZE5leHRQYWNrZXQoJnBhY2tldCwgLyogY2FsY1ZvcmJpc1RpbWVzdGFtcCA9ICovIGZhbHNlKSkgIT0gT0spIHsKKyAgICAgICAgICAgIHJldHVybiBlcnI7CisgICAgICAgIH0KKyAgICAgICAgQUxPR1YoInJlYWQgcGFja2V0IG9mIHNpemUgJXp1XG4iLCBwYWNrZXQtPnJhbmdlX2xlbmd0aCgpKTsKKyAgICAgICAgZXJyID0gdmVyaWZ5SGVhZGVyKHBhY2tldCwgLyogdHlwZSA9ICovIGkgKiAyICsgMSk7CisgICAgICAgIHBhY2tldC0+cmVsZWFzZSgpOworICAgICAgICBwYWNrZXQgPSBOVUxMOworICAgICAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgICAgICByZXR1cm4gZXJyOworICAgICAgICB9CiAgICAgfQogCiAgICAgbUZpcnN0RGF0YU9mZnNldCA9IG1PZmZzZXQgKyBtQ3VycmVudFBhZ2VTaXplOwpAQCAtNjQ5LDcgKzgzMyw3IEBACiAgICAgICAgIC8vIHdlIGNhbiBvbmx5IGFwcHJveGltYXRlIHVzaW5nIGF2Zy4gYml0cmF0ZSBpZiBzZWVraW5nIHRvCiAgICAgICAgIC8vIHRoZSBlbmQgaXMgdG9vIGV4cGVuc2l2ZSBvciBpbXBvc3NpYmxlIChsaXZlIHN0cmVhbWluZykuCiAKLSAgICAgICAgaW50NjRfdCBkdXJhdGlvblVzID0gbGFzdEdyYW51bGVQb3NpdGlvbiAqIDEwMDAwMDBsbCAvIG1WaS5yYXRlOworICAgICAgICBpbnQ2NF90IGR1cmF0aW9uVXMgPSBnZXRUaW1lVXNPZkdyYW51bGUobGFzdEdyYW51bGVQb3NpdGlvbik7CiAKICAgICAgICAgbU1ldGEtPnNldEludDY0KGtLZXlEdXJhdGlvbiwgZHVyYXRpb25Vcyk7CiAKQEAgLTY1OSw3ICs4NDMsNyBAQAogICAgIHJldHVybiBPSzsKIH0KIAotdm9pZCBNeVZvcmJpc0V4dHJhY3Rvcjo6YnVpbGRUYWJsZU9mQ29udGVudHMoKSB7Cit2b2lkIE15T2dnRXh0cmFjdG9yOjpidWlsZFRhYmxlT2ZDb250ZW50cygpIHsKICAgICBvZmY2NF90IG9mZnNldCA9IG1GaXJzdERhdGFPZmZzZXQ7CiAgICAgUGFnZSBwYWdlOwogICAgIHNzaXplX3QgcGFnZVNpemU7CkBAIC02NzAsNyArODU0LDcgQEAKICAgICAgICAgICAgIG1UYWJsZU9mQ29udGVudHMuZWRpdEl0ZW1BdChtVGFibGVPZkNvbnRlbnRzLnNpemUoKSAtIDEpOwogCiAgICAgICAgIGVudHJ5Lm1QYWdlT2Zmc2V0ID0gb2Zmc2V0OwotICAgICAgICBlbnRyeS5tVGltZVVzID0gcGFnZS5tR3JhbnVsZVBvc2l0aW9uICogMTAwMDAwMGxsIC8gbVZpLnJhdGU7CisgICAgICAgIGVudHJ5Lm1UaW1lVXMgPSBnZXRUaW1lVXNPZkdyYW51bGUocGFnZS5tR3JhbnVsZVBvc2l0aW9uKTsKIAogICAgICAgICBvZmZzZXQgKz0gKHNpemVfdClwYWdlU2l6ZTsKICAgICB9CkBAIC02OTgsNyArODgyLDcgQEAKICAgICB9CiB9CiAKLWludDMyX3QgTXlWb3JiaXNFeHRyYWN0b3I6OnBhY2tldEJsb2NrU2l6ZShNZWRpYUJ1ZmZlciAqYnVmZmVyKSB7CitpbnQzMl90IE15T2dnRXh0cmFjdG9yOjpnZXRQYWNrZXRCbG9ja1NpemUoTWVkaWFCdWZmZXIgKmJ1ZmZlcikgewogICAgIGNvbnN0IHVpbnQ4X3QgKmRhdGEgPQogICAgICAgICAoY29uc3QgdWludDhfdCAqKWJ1ZmZlci0+ZGF0YSgpICsgYnVmZmVyLT5yYW5nZV9vZmZzZXQoKTsKIApAQCAtNzI3LDYgKzkxMSwxNDQgQEAKICAgICByZXR1cm4gdm9yYmlzX3BhY2tldF9ibG9ja3NpemUoJm1WaSwgJnBhY2spOwogfQogCitpbnQ2NF90IE15T3B1c0V4dHJhY3Rvcjo6Z2V0VGltZVVzT2ZHcmFudWxlKHVpbnQ2NF90IGdyYW51bGVQb3MpIGNvbnN0IHsKKyAgICB1aW50NjRfdCBwY21TYW1wbGVQb3NpdGlvbiA9IDA7CisgICAgaWYgKGdyYW51bGVQb3MgPiBtQ29kZWNEZWxheSkgeworICAgICAgICBwY21TYW1wbGVQb3NpdGlvbiA9IGdyYW51bGVQb3MgLSBtQ29kZWNEZWxheTsKKyAgICB9CisgICAgcmV0dXJuIHBjbVNhbXBsZVBvc2l0aW9uICogMTAwMDAwMGxsIC8ga09wdXNTYW1wbGVSYXRlOworfQorCitzdGF0dXNfdCBNeU9wdXNFeHRyYWN0b3I6OnZlcmlmeUhlYWRlcihNZWRpYUJ1ZmZlciAqYnVmZmVyLCB1aW50OF90IHR5cGUpIHsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgICAgLy8gdGhlcmUgYXJlIGFjdHVhbGx5IG5vIGhlYWRlciB0eXBlcyBkZWZpbmVkIGluIHRoZSBPcHVzIHNwZWM7IHdlIGNob29zZSAxIGFuZCAzIHRvIG1lYW4KKyAgICAgICAgLy8gaGVhZGVyIGFuZCBjb21tZW50cyBzdWNoIHRoYXQgd2UgY2FuIHNoYXJlIGNvZGUgd2l0aCBNeVZvcmJpc0V4dHJhY3Rvci4KKyAgICAgICAgY2FzZSAxOgorICAgICAgICAgICAgcmV0dXJuIHZlcmlmeU9wdXNIZWFkZXIoYnVmZmVyKTsKKyAgICAgICAgY2FzZSAzOgorICAgICAgICAgICAgcmV0dXJuIHZlcmlmeU9wdXNDb21tZW50cyhidWZmZXIpOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOworICAgIH0KK30KKworc3RhdHVzX3QgTXlPcHVzRXh0cmFjdG9yOjp2ZXJpZnlPcHVzSGVhZGVyKE1lZGlhQnVmZmVyICpidWZmZXIpIHsKKyAgICBjb25zdCBzaXplX3Qga09wdXNIZWFkZXJTaXplID0gMTk7CisgICAgY29uc3QgdWludDhfdCAqZGF0YSA9CisgICAgICAgIChjb25zdCB1aW50OF90ICopYnVmZmVyLT5kYXRhKCkgKyBidWZmZXItPnJhbmdlX29mZnNldCgpOworCisgICAgc2l6ZV90IHNpemUgPSBidWZmZXItPnJhbmdlX2xlbmd0aCgpOworCisgICAgaWYgKHNpemUgPCBrT3B1c0hlYWRlclNpemUKKyAgICAgICAgICAgIHx8IG1lbWNtcChkYXRhLCAiT3B1c0hlYWQiLCA4KQorICAgICAgICAgICAgfHwgLyogdmVyc2lvbiA9ICovIGRhdGFbOF0gIT0gMSkgeworICAgICAgICByZXR1cm4gRVJST1JfTUFMRk9STUVEOworICAgIH0KKworICAgIG1DaGFubmVsQ291bnQgPSBkYXRhWzldOworICAgIG1Db2RlY0RlbGF5ID0gVTE2TEVfQVQoJmRhdGFbMTBdKTsKKworICAgIG1NZXRhLT5zZXREYXRhKGtLZXlPcHVzSGVhZGVyLCAwLCBkYXRhLCBzaXplKTsKKyAgICBtTWV0YS0+c2V0SW50MzIoa0tleVNhbXBsZVJhdGUsIGtPcHVzU2FtcGxlUmF0ZSk7CisgICAgbU1ldGEtPnNldEludDMyKGtLZXlDaGFubmVsQ291bnQsIG1DaGFubmVsQ291bnQpOworICAgIG1NZXRhLT5zZXRJbnQ2NChrS2V5T3B1c1NlZWtQcmVSb2xsIC8qIG5zICovLCBrT3B1c1NlZWtQcmVSb2xsVXMgKiAxMDAwIC8qID0gODAgbXMqLyk7CisgICAgbU1ldGEtPnNldEludDY0KGtLZXlPcHVzQ29kZWNEZWxheSAvKiBucyAqLywKKyAgICAgICAgICAgIG1Db2RlY0RlbGF5IC8qIHNhbXBsZS9zICovICogMTAwMDAwMDAwMCAvIGtPcHVzU2FtcGxlUmF0ZSk7CisKKyAgICByZXR1cm4gT0s7Cit9CisKK3N0YXR1c190IE15T3B1c0V4dHJhY3Rvcjo6dmVyaWZ5T3B1c0NvbW1lbnRzKE1lZGlhQnVmZmVyICpidWZmZXIpIHsKKyAgICAvLyBhZGQgYXJ0aWZpY2lhbCBmcmFtaW5nIGJpdCBzbyB3ZSBjYW4gcmV1c2UgX3ZvcmJpc191bnBhY2tfY29tbWVudAorICAgIGludDMyX3QgY29tbWVudFNpemUgPSBidWZmZXItPnJhbmdlX2xlbmd0aCgpICsgMTsKKyAgICBzcDxBQnVmZmVyPiBhQnVmID0gbmV3IEFCdWZmZXIoY29tbWVudFNpemUpOworICAgIGlmIChhQnVmLT5jYXBhY2l0eSgpIDw9IGJ1ZmZlci0+cmFuZ2VfbGVuZ3RoKCkpIHsKKyAgICAgICAgcmV0dXJuIEVSUk9SX01BTEZPUk1FRDsKKyAgICB9CisKKyAgICB1aW50OF90KiBjb21tZW50RGF0YSA9IGFCdWYtPmRhdGEoKTsKKyAgICBtZW1jcHkoY29tbWVudERhdGEsCisgICAgICAgICAgICAodWludDhfdCAqKWJ1ZmZlci0+ZGF0YSgpICsgYnVmZmVyLT5yYW5nZV9vZmZzZXQoKSwKKyAgICAgICAgICAgIGJ1ZmZlci0+cmFuZ2VfbGVuZ3RoKCkpOworCisgICAgb2dnX2J1ZmZlciBidWY7CisgICAgYnVmLmRhdGEgPSBjb21tZW50RGF0YTsKKyAgICBidWYuc2l6ZSA9IGNvbW1lbnRTaXplOworICAgIGJ1Zi5yZWZjb3VudCA9IDE7CisgICAgYnVmLnB0ci5vd25lciA9IE5VTEw7CisKKyAgICBvZ2dfcmVmZXJlbmNlIHJlZjsKKyAgICByZWYuYnVmZmVyID0gJmJ1ZjsKKyAgICByZWYuYmVnaW4gPSAwOworICAgIHJlZi5sZW5ndGggPSBjb21tZW50U2l6ZTsKKyAgICByZWYubmV4dCA9IE5VTEw7CisKKyAgICBvZ2dwYWNrX2J1ZmZlciBiaXRzOworICAgIG9nZ3BhY2tfcmVhZGluaXQoJmJpdHMsICZyZWYpOworCisgICAgLy8gc2tpcCAnT3B1c1RhZ3MnCisgICAgY29uc3QgY2hhciAqT3B1c1RhZ3MgPSAiT3B1c1RhZ3MiOworICAgIGNvbnN0IGludDMyX3QgaGVhZGVyTGVuID0gc3RybGVuKE9wdXNUYWdzKTsKKyAgICBpbnQzMl90IGZyYW1pbmdCaXRPZmZzZXQgPSBoZWFkZXJMZW47CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBoZWFkZXJMZW47ICsraSkgeworICAgICAgICBjaGFyIGNociA9IG9nZ3BhY2tfcmVhZCgmYml0cywgOCk7CisgICAgICAgIGlmIChjaHIgIT0gT3B1c1RhZ3NbaV0pIHsKKyAgICAgICAgICAgIHJldHVybiBFUlJPUl9NQUxGT1JNRUQ7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpbnQzMl90IHZlbmRvckxlbiA9IG9nZ3BhY2tfcmVhZCgmYml0cywgMzIpOworICAgIGZyYW1pbmdCaXRPZmZzZXQgKz0gNDsKKyAgICBpZiAodmVuZG9yTGVuIDwgMCB8fCB2ZW5kb3JMZW4gPiBjb21tZW50U2l6ZSAtIDgpIHsKKyAgICAgICAgcmV0dXJuIEVSUk9SX01BTEZPUk1FRDsKKyAgICB9CisgICAgLy8gc2tpcCB2ZW5kb3Igc3RyaW5nCisgICAgZnJhbWluZ0JpdE9mZnNldCArPSB2ZW5kb3JMZW47CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCB2ZW5kb3JMZW47ICsraSkgeworICAgICAgICBvZ2dwYWNrX3JlYWQoJmJpdHMsIDgpOworICAgIH0KKworICAgIGludDMyX3QgbiA9IG9nZ3BhY2tfcmVhZCgmYml0cywgMzIpOworICAgIGZyYW1pbmdCaXRPZmZzZXQgKz0gNDsKKyAgICBpZiAobiA8IDAgfHwgbiA+ICgoY29tbWVudFNpemUgLSBvZ2dwYWNrX2J5dGVzKCZiaXRzKSkgPj4gMikpIHsKKyAgICAgICAgcmV0dXJuIEVSUk9SX01BTEZPUk1FRDsKKyAgICB9CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBuOyArK2kpIHsKKyAgICAgICAgaW50MzJfdCBsZW4gPSBvZ2dwYWNrX3JlYWQoJmJpdHMsIDMyKTsKKyAgICAgICAgZnJhbWluZ0JpdE9mZnNldCArPSA0OworICAgICAgICBpZiAobGVuICA8IDAgfHwgbGVuICA+IChjb21tZW50U2l6ZSAtIG9nZ3BhY2tfYnl0ZXMoJmJpdHMpKSkgeworICAgICAgICAgICAgcmV0dXJuIEVSUk9SX01BTEZPUk1FRDsKKyAgICAgICAgfQorICAgICAgICBmcmFtaW5nQml0T2Zmc2V0ICs9IGxlbjsKKyAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBsZW47ICsraikgeworICAgICAgICAgICAgb2dncGFja19yZWFkKCZiaXRzLCA4KTsKKyAgICAgICAgfQorICAgIH0KKyAgICBpZiAoZnJhbWluZ0JpdE9mZnNldCA8IDAgfHwgZnJhbWluZ0JpdE9mZnNldCA+PSBjb21tZW50U2l6ZSkgeworICAgICAgICByZXR1cm4gRVJST1JfTUFMRk9STUVEOworICAgIH0KKyAgICBjb21tZW50RGF0YVtmcmFtaW5nQml0T2Zmc2V0XSA9IDE7CisKKyAgICBidWYuZGF0YSA9IGNvbW1lbnREYXRhICsgaGVhZGVyTGVuOworICAgIGJ1Zi5zaXplID0gY29tbWVudFNpemUgLSBoZWFkZXJMZW47CisgICAgYnVmLnJlZmNvdW50ID0gMTsKKyAgICBidWYucHRyLm93bmVyID0gTlVMTDsKKworICAgIHJlZi5idWZmZXIgPSAmYnVmOworICAgIHJlZi5iZWdpbiA9IDA7CisgICAgcmVmLmxlbmd0aCA9IGNvbW1lbnRTaXplIC0gaGVhZGVyTGVuOworICAgIHJlZi5uZXh0ID0gTlVMTDsKKworICAgIG9nZ3BhY2tfcmVhZGluaXQoJmJpdHMsICZyZWYpOworICAgIGludCBlcnIgPSBfdm9yYmlzX3VucGFja19jb21tZW50KCZtVmMsICZiaXRzKTsKKyAgICBpZiAoMCAhPSBlcnIpIHsKKyAgICAgICAgcmV0dXJuIEVSUk9SX01BTEZPUk1FRDsKKyAgICB9CisKKyAgICBwYXJzZUZpbGVNZXRhRGF0YSgpOworICAgIHJldHVybiBPSzsKK30KKwogc3RhdHVzX3QgTXlWb3JiaXNFeHRyYWN0b3I6OnZlcmlmeUhlYWRlcigKICAgICAgICAgTWVkaWFCdWZmZXIgKmJ1ZmZlciwgdWludDhfdCB0eXBlKSB7CiAgICAgY29uc3QgdWludDhfdCAqZGF0YSA9CkBAIC04MTQsNyArMTEzNiw3IEBACiAgICAgcmV0dXJuIE9LOwogfQogCi11aW50NjRfdCBNeVZvcmJpc0V4dHJhY3Rvcjo6YXBwcm94Qml0cmF0ZSgpIHsKK3VpbnQ2NF90IE15Vm9yYmlzRXh0cmFjdG9yOjphcHByb3hCaXRyYXRlKCkgY29uc3QgewogICAgIGlmIChtVmkuYml0cmF0ZV9ub21pbmFsICE9IDApIHsKICAgICAgICAgcmV0dXJuIG1WaS5iaXRyYXRlX25vbWluYWw7CiAgICAgfQpAQCAtODIyLDcgKzExNDQsNyBAQAogICAgIHJldHVybiAobVZpLmJpdHJhdGVfbG93ZXIgKyBtVmkuYml0cmF0ZV91cHBlcikgLyAyOwogfQogCi12b2lkIE15Vm9yYmlzRXh0cmFjdG9yOjpwYXJzZUZpbGVNZXRhRGF0YSgpIHsKK3ZvaWQgTXlPZ2dFeHRyYWN0b3I6OnBhcnNlRmlsZU1ldGFEYXRhKCkgewogICAgIG1GaWxlTWV0YSA9IG5ldyBNZXRhRGF0YTsKICAgICBtRmlsZU1ldGEtPnNldENTdHJpbmcoa0tleU1JTUVUeXBlLCBNRURJQV9NSU1FVFlQRV9DT05UQUlORVJfT0dHKTsKIApAQCAtMTAyNiwxMSArMTM0OCwyMyBAQAogICAgIDogbURhdGFTb3VyY2Uoc291cmNlKSwKICAgICAgIG1Jbml0Q2hlY2soTk9fSU5JVCksCiAgICAgICBtSW1wbChOVUxMKSB7Ci0gICAgbUltcGwgPSBuZXcgTXlWb3JiaXNFeHRyYWN0b3IobURhdGFTb3VyY2UpOwotICAgIG1Jbml0Q2hlY2sgPSBtSW1wbC0+c2Vla1RvT2Zmc2V0KDApOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgMjsgKytpKSB7CisgICAgICAgIGlmIChtSW1wbCAhPSBOVUxMKSB7CisgICAgICAgICAgICBkZWxldGUgbUltcGw7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGkgPT0gMCkgeworICAgICAgICAgICAgbUltcGwgPSBuZXcgTXlWb3JiaXNFeHRyYWN0b3IobURhdGFTb3VyY2UpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgbUltcGwgPSBuZXcgTXlPcHVzRXh0cmFjdG9yKG1EYXRhU291cmNlKTsKKyAgICAgICAgfQorICAgICAgICBtSW5pdENoZWNrID0gbUltcGwtPnNlZWtUb09mZnNldCgwKTsKIAotICAgIGlmIChtSW5pdENoZWNrID09IE9LKSB7Ci0gICAgICAgIG1Jbml0Q2hlY2sgPSBtSW1wbC0+aW5pdCgpOworICAgICAgICBpZiAobUluaXRDaGVjayA9PSBPSykgeworICAgICAgICAgICAgbUluaXRDaGVjayA9IG1JbXBsLT5pbml0KCk7CisgICAgICAgICAgICBpZiAobUluaXRDaGVjayA9PSBPSykgeworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9TYW1wbGVUYWJsZS5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9TYW1wbGVUYWJsZS5jcHAKaW5kZXggN2Y5ODQ4NS4uNDBkZjM0ZCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvU2FtcGxlVGFibGUuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L1NhbXBsZVRhYmxlLmNwcApAQCAtMzM1LDcgKzMzNSw3IEBACiAgICAgfQogCiAgICAgbVRpbWVUb1NhbXBsZUNvdW50ID0gVTMyX0FUKCZoZWFkZXJbNF0pOwotICAgIHVpbnQ2NF90IGFsbG9jU2l6ZSA9IG1UaW1lVG9TYW1wbGVDb3VudCAqIDIgKiAodWludDY0X3Qpc2l6ZW9mKHVpbnQzMl90KTsKKyAgICB1aW50NjRfdCBhbGxvY1NpemUgPSAodWludDY0X3QpbVRpbWVUb1NhbXBsZUNvdW50ICogMiAqIHNpemVvZih1aW50MzJfdCk7CiAgICAgaWYgKGFsbG9jU2l6ZSA+IFNJWkVfTUFYKSB7CiAgICAgICAgIHJldHVybiBFUlJPUl9PVVRfT0ZfUkFOR0U7CiAgICAgfQpAQCAtMzgzLDcgKzM4Myw3IEBACiAgICAgfQogCiAgICAgbU51bUNvbXBvc2l0aW9uVGltZURlbHRhRW50cmllcyA9IG51bUVudHJpZXM7Ci0gICAgdWludDY0X3QgYWxsb2NTaXplID0gbnVtRW50cmllcyAqIDIgKiAodWludDY0X3Qpc2l6ZW9mKHVpbnQzMl90KTsKKyAgICB1aW50NjRfdCBhbGxvY1NpemUgPSAodWludDY0X3QpbnVtRW50cmllcyAqIDIgKiBzaXplb2YodWludDMyX3QpOwogICAgIGlmIChhbGxvY1NpemUgPiBTSVpFX01BWCkgewogICAgICAgICByZXR1cm4gRVJST1JfT1VUX09GX1JBTkdFOwogICAgIH0KZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2NvZGVjcy9hdmNlbmMvU29mdEFWQ0VuYy5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvYXZjZW5jL1NvZnRBVkNFbmMuY3BwCmluZGV4IDQ0OWQxOTUuLmEwMGYzMjQgMTAwNzU1Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2NvZGVjcy9hdmNlbmMvU29mdEFWQ0VuYy5jcHAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvY29kZWNzL2F2Y2VuYy9Tb2Z0QVZDRW5jLmNwcApAQCAtNjM0LDYgKzYzNCwxMCBAQAogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1Db252ZXJzaW9uQnVmZmVyID09IE5VTEwpIHsKKyAgICAgICAgICAgIGlmICgoKHVpbnQ2NF90KW1TdHJpZGUgKiBtSGVpZ2h0KSA+ICgoKHVpbnQ2NF90KUlOVDMyX01BWCAvIDMpICogMikpIHsKKyAgICAgICAgICAgICAgICBBTE9HRSgiQnVmZmVyIHNpemUgaXMgdG9vIGJpZy4iKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gT01YX0Vycm9yVW5kZWZpbmVkOworICAgICAgICAgICAgfQogICAgICAgICAgICAgbUNvbnZlcnNpb25CdWZmZXIgPSAodWludDhfdCAqKW1hbGxvYyhtU3RyaWRlICogbUhlaWdodCAqIDMgLyAyKTsKICAgICAgICAgICAgIGlmIChtQ29udmVyc2lvbkJ1ZmZlciA9PSBOVUxMKSB7CiAgICAgICAgICAgICAgICAgQUxPR0UoIkFsbG9jYXRpbmcgY29udmVyc2lvbiBidWZmZXIgZmFpbGVkLiIpOwpAQCAtNjc5LDYgKzY4MywxMCBAQAogICAgIH0KIAogICAgIC8qIEFsbG9jYXRlIGFycmF5IHRvIGhvbGQgbWVtb3J5IHJlY29yZHMgKi8KKyAgICBpZiAobU51bU1lbVJlY29yZHMgPiBTSVpFX01BWCAvIHNpemVvZihpdl9tZW1fcmVjX3QpKSB7CisgICAgICAgIEFMT0dFKCJyZXF1ZXN0ZWQgbWVtb3J5IHNpemUgaXMgdG9vIGJpZy4iKTsKKyAgICAgICAgcmV0dXJuIE9NWF9FcnJvclVuZGVmaW5lZDsKKyAgICB9CiAgICAgbU1lbVJlY29yZHMgPSAoaXZfbWVtX3JlY190ICopbWFsbG9jKG1OdW1NZW1SZWNvcmRzICogc2l6ZW9mKGl2X21lbV9yZWNfdCkpOwogICAgIGlmIChOVUxMID09IG1NZW1SZWNvcmRzKSB7CiAgICAgICAgIEFMT0dFKCJVbmFibGUgdG8gYWxsb2NhdGUgbWVtb3J5IGZvciBob2xkIG1lbW9yeSByZWNvcmRzOiBTaXplICV6dSIsCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvbTR2X2gyNjMvZGVjL3NyYy9wdmRlY19hcGkuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvY29kZWNzL200dl9oMjYzL2RlYy9zcmMvcHZkZWNfYXBpLmNwcAppbmRleCA5MGQ3YzZiLi5hZjE5YmZlIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvbTR2X2gyNjMvZGVjL3NyYy9wdmRlY19hcGkuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2NvZGVjcy9tNHZfaDI2My9kZWMvc3JjL3B2ZGVjX2FwaS5jcHAKQEAgLTk1LDYgKzk1LDExIEBACiAjaWZkZWYgREVDX0lOVEVSTkFMX01FTU9SWV9PUFQKICAgICAgICAgdmlkZW8tPnZvbCA9IChWb2wgKiopIElNRU1fVk9MOwogI2Vsc2UKKyAgICAgICAgaWYgKChzaXplX3QpbkxheWVycyA+IFNJWkVfTUFYIC8gc2l6ZW9mKFZvbCAqKSkgeworICAgICAgICAgICAgc3RhdHVzID0gUFZfRkFMU0U7CisgICAgICAgICAgICBnb3RvIGZhaWw7CisgICAgICAgIH0KKwogICAgICAgICB2aWRlby0+dm9sID0gKFZvbCAqKikgb3NjbF9tYWxsb2MobkxheWVycyAqIHNpemVvZihWb2wgKikpOwogI2VuZGlmCiAgICAgICAgIGlmICh2aWRlby0+dm9sID09IE5VTEwpIHN0YXR1cyA9IFBWX0ZBTFNFOwpAQCAtMTI4LDYgKzEzMywxMSBAQAogICAgICAgICBlbHNlIG9zY2xfbWVtc2V0KHZpZGVvLT5wcmV2Vm9wLCAwLCBzaXplb2YoVm9wKSk7CiAgICAgICAgIHZpZGVvLT5tZW1vcnlVc2FnZSArPSAoc2l6ZW9mKFZvcCkgKiAyKTsKIAorICAgICAgICBpZiAoKHNpemVfdCluTGF5ZXJzID4gU0laRV9NQVggLyBzaXplb2YoVm9wICopKSB7CisgICAgICAgICAgICBzdGF0dXMgPSBQVl9GQUxTRTsKKyAgICAgICAgICAgIGdvdG8gZmFpbDsKKyAgICAgICAgfQorCiAgICAgICAgIHZpZGVvLT52b3BIZWFkZXIgPSAoVm9wICoqKSBvc2NsX21hbGxvYyhzaXplb2YoVm9wICopICogbkxheWVycyk7CiAjZW5kaWYKICAgICAgICAgaWYgKHZpZGVvLT52b3BIZWFkZXIgPT0gTlVMTCkgc3RhdHVzID0gUFZfRkFMU0U7CkBAIC0yNzcsNiArMjg3LDcgQEAKICAgICAgICAgc3RhdHVzID0gUFZfRkFMU0U7CiAgICAgfQogCitmYWlsOgogICAgIGlmIChzdGF0dXMgPT0gUFZfRkFMU0UpIFBWQ2xlYW5VcFZpZGVvRGVjb2RlcihkZWNDdHJsKTsKIAogICAgIHJldHVybiBzdGF0dXM7CkBAIC0zMDUsNiArMzE2LDEwIEBACiAgICAgICAgICAgICB2aWRlby0+bk1CUGVyUm93ICogdmlkZW8tPm5NQlBlckNvbDsKICAgICB9CiAKKyAgICBpZiAoKCh1aW50NjRfdCl2aWRlby0+d2lkdGggKiB2aWRlby0+aGVpZ2h0KSA+ICh1aW50NjRfdClJTlQzMl9NQVggLyBzaXplb2YoUElYRUwpKSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CisKICAgICBzaXplID0gKGludDMyKXNpemVvZihQSVhFTCkgKiB2aWRlby0+d2lkdGggKiB2aWRlby0+aGVpZ2h0OwogI2lmZGVmIFBWX01FTU9SWV9QT09MCiAgICAgZGVjQ3RybC0+c2l6ZSA9IHNpemU7CkBAIC0zMjAsNiArMzM1LDkgQEAKICAgICB2aWRlby0+cHJldlZvcC0+dUNoYW4gPSB2aWRlby0+cHJldlZvcC0+eUNoYW4gKyBzaXplOwogICAgIHZpZGVvLT5wcmV2Vm9wLT52Q2hhbiA9IHZpZGVvLT5wcmV2Vm9wLT51Q2hhbiArIChzaXplID4+IDIpOwogI2Vsc2UKKyAgICBpZiAoc2l6ZSA+IElOVDMyX01BWCAvIDMgKiAyKSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CiAgICAgdmlkZW8tPmN1cnJWb3AtPnlDaGFuID0gKFBJWEVMICopIG9zY2xfbWFsbG9jKHNpemUgKiAzIC8gMik7IC8qIEFsbG9jYXRlIG1lbW9yeSBmb3IgYWxsIFZPUCBPS0EgMy8yLzEqLwogICAgIGlmICh2aWRlby0+Y3VyclZvcC0+eUNoYW4gPT0gTlVMTCkgc3RhdHVzID0gUFZfRkFMU0U7CiAKQEAgLTM0Nyw2ICszNjUsMTAgQEAKICAgICAgICAgewogICAgICAgICAgICAgb3NjbF9tZW1zZXQodmlkZW8tPnByZXZFbmhjVm9wLCAwLCBzaXplb2YoVm9wKSk7CiAjaWZuZGVmIFBWX01FTU9SWV9QT09MCisgICAgICAgICAgICBpZiAoc2l6ZSA+IElOVDMyX01BWCAvIDMgKiAyKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFBWX0ZBTFNFOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB2aWRlby0+cHJldkVuaGNWb3AtPnlDaGFuID0gKFBJWEVMICopIG9zY2xfbWFsbG9jKHNpemUgKiAzIC8gMik7IC8qIEFsbG9jYXRlIG1lbW9yeSBmb3IgYWxsIFZPUCBPS0EgMy8yLzEqLwogICAgICAgICAgICAgaWYgKHZpZGVvLT5wcmV2RW5oY1ZvcC0+eUNoYW4gPT0gTlVMTCkgc3RhdHVzID0gUFZfRkFMU0U7CiAgICAgICAgICAgICB2aWRlby0+cHJldkVuaGNWb3AtPnVDaGFuID0gdmlkZW8tPnByZXZFbmhjVm9wLT55Q2hhbiArIHNpemU7CkBAIC00MDMsMTAgKzQyNSwxNyBAQAogICAgIGlmICh2aWRlby0+YWNQcmVkRmxhZyA9PSBOVUxMKSBzdGF0dXMgPSBQVl9GQUxTRTsKICAgICB2aWRlby0+bWVtb3J5VXNhZ2UgKz0gKG5Ub3RhbE1CKTsKIAorICAgIGlmICgoc2l6ZV90KW5Ub3RhbE1CID4gU0laRV9NQVggLyBzaXplb2YodHlwZURDU3RvcmUpKSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CiAgICAgdmlkZW8tPnByZWREQyA9ICh0eXBlRENTdG9yZSAqKSBvc2NsX21hbGxvYyhuVG90YWxNQiAqIHNpemVvZih0eXBlRENTdG9yZSkpOwogICAgIGlmICh2aWRlby0+cHJlZERDID09IE5VTEwpIHN0YXR1cyA9IFBWX0ZBTFNFOwogICAgIHZpZGVvLT5tZW1vcnlVc2FnZSArPSAoblRvdGFsTUIgKiBzaXplb2YodHlwZURDU3RvcmUpKTsKIAorICAgIGlmIChuTUJQZXJSb3cgPiBJTlQzMl9NQVggLSAxCisgICAgICAgICAgICB8fCAoc2l6ZV90KShuTUJQZXJSb3cgKyAxKSA+IFNJWkVfTUFYIC8gc2l6ZW9mKHR5cGVEQ0FDU3RvcmUpKSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CiAgICAgdmlkZW8tPnByZWREQ0FDX2NvbCA9ICh0eXBlRENBQ1N0b3JlICopIG9zY2xfbWFsbG9jKChuTUJQZXJSb3cgKyAxKSAqIHNpemVvZih0eXBlRENBQ1N0b3JlKSk7CiAgICAgaWYgKHZpZGVvLT5wcmVkRENBQ19jb2wgPT0gTlVMTCkgc3RhdHVzID0gUFZfRkFMU0U7CiAgICAgdmlkZW8tPm1lbW9yeVVzYWdlICs9ICgobk1CUGVyUm93ICsgMSkgKiBzaXplb2YodHlwZURDQUNTdG9yZSkpOwpAQCAtNDIyLDYgKzQ1MSwxMCBAQAogICAgIHZpZGVvLT5oZWFkZXJJbmZvLkNCUCA9ICh1aW50OCAqKSBvc2NsX21hbGxvYyhuVG90YWxNQik7CiAgICAgaWYgKHZpZGVvLT5oZWFkZXJJbmZvLkNCUCA9PSBOVUxMKSBzdGF0dXMgPSBQVl9GQUxTRTsKICAgICB2aWRlby0+bWVtb3J5VXNhZ2UgKz0gblRvdGFsTUI7CisKKyAgICBpZiAoKHNpemVfdCluVG90YWxNQiA+IFNJWkVfTUFYIC8gc2l6ZW9mKGludDE2KSkgeworICAgICAgICByZXR1cm4gUFZfRkFMU0U7CisgICAgfQogICAgIHZpZGVvLT5RUE1CID0gKGludDE2ICopIG9zY2xfbWFsbG9jKG5Ub3RhbE1CICogc2l6ZW9mKGludDE2KSk7CiAgICAgaWYgKHZpZGVvLT5RUE1CID09IE5VTEwpIHN0YXR1cyA9IFBWX0ZBTFNFOwogICAgIHZpZGVvLT5tZW1vcnlVc2FnZSArPSAoblRvdGFsTUIgKiBzaXplb2YoaW50KSk7CkBAIC00MzksNiArNDcyLDkgQEAKICAgICAgICAgdmlkZW8tPm1lbW9yeVVzYWdlICs9IHNpemVvZihNYWNyb0Jsb2NrKTsKICAgICB9CiAgICAgLyogQWxsb2NhdGluZyBtb3Rpb24gdmVjdG9yIHNwYWNlICovCisgICAgaWYgKChzaXplX3QpblRvdGFsTUIgPiBTSVpFX01BWCAvIChzaXplb2YoTU9UKSAqIDQpKSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CiAgICAgdmlkZW8tPm1vdFggPSAoTU9UICopIG9zY2xfbWFsbG9jKHNpemVvZihNT1QpICogNCAqIG5Ub3RhbE1CKTsKICAgICBpZiAodmlkZW8tPm1vdFggPT0gTlVMTCkgc3RhdHVzID0gUFZfRkFMU0U7CiAgICAgdmlkZW8tPm1vdFkgPSAoTU9UICopIG9zY2xfbWFsbG9jKHNpemVvZihNT1QpICogNCAqIG5Ub3RhbE1CKTsKQEAgLTQ3Miw2ICs1MDgsOSBAQAogICAgIH0KIAogI2Vsc2UKKyAgICBpZiAoblRvdGFsTUIgPiBJTlQzMl9NQVggLyA2KSB7CisgICAgICAgIHJldHVybiBQVl9GQUxTRTsKKyAgICB9CiAgICAgdmlkZW8tPnBzdHByY1R5cEN1ciA9ICh1aW50OCAqKSBvc2NsX21hbGxvYyhuVG90YWxNQiAqIDYpOwogICAgIHZpZGVvLT5tZW1vcnlVc2FnZSArPSAoblRvdGFsTUIgKiA2KTsKICAgICBpZiAodmlkZW8tPnBzdHByY1R5cEN1ciA9PSBOVUxMKQpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvY29kZWNzL200dl9oMjYzL2VuYy9zcmMvbXA0ZW5jX2FwaS5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvbTR2X2gyNjMvZW5jL3NyYy9tcDRlbmNfYXBpLmNwcAppbmRleCA5NDZlM2QwLi5kYTI3Mzc3IDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvbTR2X2gyNjMvZW5jL3NyYy9tcDRlbmNfYXBpLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2RlY3MvbTR2X2gyNjMvZW5jL3NyYy9tcDRlbmNfYXBpLmNwcApAQCAtNjEwLDYgKzYxMCwxMCBAQAogICAgICAgICAgICAgbWF4ID0gdGVtcF93ICogdGVtcF9oOwogICAgICAgICAgICAgbWF4X3dpZHRoID0gKCh0ZW1wX3cgKyAxNSkgPj4gNCkgPDwgNDsKICAgICAgICAgICAgIG1heF9oZWlnaHQgPSAoKHRlbXBfaCArIDE1KSA+PiA0KSA8PCA0OworICAgICAgICAgICAgaWYgKCgodWludDY0X3QpbWF4X3dpZHRoICogbWF4X2hlaWdodCkgPiAodWludDY0X3QpSU5UMzJfTUFYCisgICAgICAgICAgICAgICAgICAgIHx8IHRlbXBfdyA+IElOVDMyX01BWCAtIDE1IHx8IHRlbXBfaCA+IElOVDMyX01BWCAtIDE1KSB7CisgICAgICAgICAgICAgICAgZ290byBDTEVBTl9VUDsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIG5Ub3RhbE1CID0gKChtYXhfd2lkdGggKiBtYXhfaGVpZ2h0KSA+PiA4KTsKICAgICAgICAgfQogCkBAIC02NTQsNiArNjU4LDkgQEAKIAogICAgIC8qIEFsbG9jYXRpbmcgbW90aW9uIHZlY3RvciBzcGFjZSBhbmQgaW50ZXJwb2xhdGlvbiBtZW1vcnkqLwogCisgICAgaWYgKChzaXplX3QpblRvdGFsTUIgPiBTSVpFX01BWCAvIHNpemVvZihNT1QgKikpIHsKKyAgICAgICAgZ290byBDTEVBTl9VUDsKKyAgICB9CiAgICAgdmlkZW8tPm1vdCA9IChNT1QgKiopTTRWRU5DX01BTExPQyhzaXplb2YoTU9UICopICogblRvdGFsTUIpOwogICAgIGlmICh2aWRlby0+bW90ID09IE5VTEwpIGdvdG8gQ0xFQU5fVVA7CiAKQEAgLTY3NiwxMSArNjgzLDE3IEBACiAgICAgLyogICAgc28gdGhhdCBjb21waWxlcnMgY2FuIGdlbmVyYXRlIGZhc3RlciBjb2RlIHRvIGluZGV4aW5nIHRoZSAgICAgKi8KICAgICAvKiAgICBkYXRhIGluc2lkZSAoYnkgdXNpbmcgPDwgaW5zdGVhZCBvZiAqKS4gICAgICAgICAwNC8xNC8yMDAwLiAqLwogICAgIC8qIDUvMjkvMDEsIHVzZSAgZGVjb2RlciBsaWIgQUNEQyBwcmVkaWN0aW9uIG1lbW9yeSBzY2hlbWUuICAqLworICAgIGlmICgoc2l6ZV90KW5Ub3RhbE1CID4gU0laRV9NQVggLyBzaXplb2YodHlwZURDU3RvcmUpKSB7CisgICAgICAgIGdvdG8gQ0xFQU5fVVA7CisgICAgfQogICAgIHZpZGVvLT5wcmVkREMgPSAodHlwZURDU3RvcmUgKikgTTRWRU5DX01BTExPQyhuVG90YWxNQiAqIHNpemVvZih0eXBlRENTdG9yZSkpOwogICAgIGlmICh2aWRlby0+cHJlZERDID09IE5VTEwpIGdvdG8gQ0xFQU5fVVA7CiAKICAgICBpZiAoIXZpZGVvLT5lbmNQYXJhbXMtPkgyNjNfRW5hYmxlZCkKICAgICB7CisgICAgICAgIGlmICgoc2l6ZV90KSgobWF4X3dpZHRoID4+IDQpICsgMSkgPiBTSVpFX01BWCAvIHNpemVvZih0eXBlRENBQ1N0b3JlKSkgeworICAgICAgICAgICAgZ290byBDTEVBTl9VUDsKKyAgICAgICAgfQogICAgICAgICB2aWRlby0+cHJlZERDQUNfY29sID0gKHR5cGVEQ0FDU3RvcmUgKikgTTRWRU5DX01BTExPQygoKG1heF93aWR0aCA+PiA0KSArIDEpICogc2l6ZW9mKHR5cGVEQ0FDU3RvcmUpKTsKICAgICAgICAgaWYgKHZpZGVvLT5wcmVkRENBQ19jb2wgPT0gTlVMTCkgZ290byBDTEVBTl9VUDsKIApAQCAtNjg4LDYgKzcwMSw5IEBACiAgICAgICAgIC8qICB0aGUgcmVzdCB3aWxsIGJlIHVzZWQgZm9yIHN0b3JpbmcgaG9yaXpvbnRhbCAocm93KSBBQyBjb2VmZmljaWVudHMgICovCiAgICAgICAgIHZpZGVvLT5wcmVkRENBQ19yb3cgPSB2aWRlby0+cHJlZERDQUNfY29sICsgMTsgICAgICAgIC8qICBBQ0RDICovCiAKKyAgICAgICAgaWYgKChzaXplX3QpblRvdGFsTUIgPiBTSVpFX01BWCAvIHNpemVvZihJbnQpKSB7CisgICAgICAgICAgICBnb3RvIENMRUFOX1VQOworICAgICAgICB9CiAgICAgICAgIHZpZGVvLT5hY1ByZWRGbGFnID0gKEludCAqKSBNNFZFTkNfTUFMTE9DKG5Ub3RhbE1CICogc2l6ZW9mKEludCkpOyAvKiBNZW1vcnkgZm9yIGFjUHJlZEZsYWcgKi8KICAgICAgICAgaWYgKHZpZGVvLT5hY1ByZWRGbGFnID09IE5VTEwpIGdvdG8gQ0xFQU5fVVA7CiAgICAgfQpAQCAtNzQxLDggKzc1NywxNSBAQAogICAgICAgICBvZmZzZXQgPSAocGl0Y2ggPDwgNCkgKyAxNjsKICAgICAgICAgbWF4X2hlaWdodCArPSAzMjsKICAgICB9CisgICAgaWYgKCgodWludDY0X3QpcGl0Y2ggKiBtYXhfaGVpZ2h0KSA+ICh1aW50NjRfdClJTlQzMl9NQVgpIHsKKyAgICAgICAgZ290byBDTEVBTl9VUDsKKyAgICB9CiAgICAgc2l6ZSA9IHBpdGNoICogbWF4X2hlaWdodDsKIAorICAgIGlmIChzaXplID4gSU5UMzJfTUFYIC0gKHNpemUgPj4gMSkKKyAgICAgICAgICAgIHx8IChzaXplX3QpKHNpemUgKyAoc2l6ZSA+PiAxKSkgPiBTSVpFX01BWCAvIHNpemVvZihQSVhFTCkpIHsKKyAgICAgICAgZ290byBDTEVBTl9VUDsKKyAgICB9CiAgICAgdmlkZW8tPmN1cnJWb3AtPnlDaGFuID0gKFBJWEVMICopTTRWRU5DX01BTExPQyhzaXplb2YoUElYRUwpICogKHNpemUgKyAoc2l6ZSA+PiAxKSkpOyAvKiBNZW1vcnkgZm9yIGN1cnJWb3AgWSAqLwogICAgIGlmICh2aWRlby0+Y3VyclZvcC0+eUNoYW4gPT0gTlVMTCkgZ290byBDTEVBTl9VUDsKICAgICB2aWRlby0+Y3VyclZvcC0+dUNoYW4gPSB2aWRlby0+Y3VyclZvcC0+eUNoYW4gKyBzaXplOy8qIE1lbW9yeSBmb3IgY3VyclZvcCBVICovCkBAIC04NDEsNiArODY0LDkgQEAKICAgICAvKiAvLy8gRW5kIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLyAqLwogCiAKKyAgICBpZiAoKHNpemVfdCluTGF5ZXJzID4gU0laRV9NQVggLyBzaXplb2YoVm9sICopKSB7CisgICAgICAgIGdvdG8gQ0xFQU5fVVA7CisgICAgfQogICAgIHZpZGVvLT52b2wgPSAoVm9sICoqKU00VkVOQ19NQUxMT0MobkxheWVycyAqIHNpemVvZihWb2wgKikpOyAvKiBNZW1vcnkgZm9yIFZPTCBwb2ludGVycyAqLwogCiAgICAgLyogTWVtb3J5IGFsbG9jYXRpb24gYW5kIEluaXRpYWxpemF0aW9uIG9mIFZvbHMgYW5kIHdyaXRpbmcgb2YgaGVhZGVycyAqLwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvY29sb3Jjb252ZXJzaW9uL1NvZnR3YXJlUmVuZGVyZXIuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvY29sb3Jjb252ZXJzaW9uL1NvZnR3YXJlUmVuZGVyZXIuY3BwCmluZGV4IDIxZGE3MDcuLjY5NWNmYzggMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2NvbG9yY29udmVyc2lvbi9Tb2Z0d2FyZVJlbmRlcmVyLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9jb2xvcmNvbnZlcnNpb24vU29mdHdhcmVSZW5kZXJlci5jcHAKQEAgLTE5Nyw3ICsxOTcsNyBAQAogfQogCiB2b2lkIFNvZnR3YXJlUmVuZGVyZXI6OnJlbmRlcigKLSAgICAgICAgY29uc3Qgdm9pZCAqZGF0YSwgc2l6ZV90IC8qc2l6ZSovLCBpbnQ2NF90IHRpbWVzdGFtcE5zLAorICAgICAgICBjb25zdCB2b2lkICpkYXRhLCBzaXplX3Qgc2l6ZSwgaW50NjRfdCB0aW1lc3RhbXBOcywKICAgICAgICAgdm9pZCogLypwbGF0Zm9ybVByaXZhdGUqLywgY29uc3Qgc3A8QU1lc3NhZ2U+JiBmb3JtYXQpIHsKICAgICByZXNldEZvcm1hdElmQ2hhbmdlZChmb3JtYXQpOwogCkBAIC0yMjgsNiArMjI4LDkgQEAKICAgICAgICAgICAgICAgICBidWYtPnN0cmlkZSwgYnVmLT5oZWlnaHQsCiAgICAgICAgICAgICAgICAgMCwgMCwgbUNyb3BXaWR0aCAtIDEsIG1Dcm9wSGVpZ2h0IC0gMSk7CiAgICAgfSBlbHNlIGlmIChtQ29sb3JGb3JtYXQgPT0gT01YX0NPTE9SX0Zvcm1hdFlVVjQyMFBsYW5hcikgeworICAgICAgICBpZiAoKHNpemVfdCltV2lkdGggKiBtSGVpZ2h0ICogMyAvIDIgPiBzaXplKSB7CisgICAgICAgICAgICBnb3RvIHNraXBfY29weWluZzsKKyAgICAgICAgfQogICAgICAgICBjb25zdCB1aW50OF90ICpzcmNfeSA9IChjb25zdCB1aW50OF90ICopZGF0YTsKICAgICAgICAgY29uc3QgdWludDhfdCAqc3JjX3UgPQogICAgICAgICAgICAgICAgIChjb25zdCB1aW50OF90ICopZGF0YSArIG1XaWR0aCAqIG1IZWlnaHQ7CkBAIC0yNTgsNiArMjYxLDkgQEAKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAobUNvbG9yRm9ybWF0ID09IE9NWF9USV9DT0xPUl9Gb3JtYXRZVVY0MjBQYWNrZWRTZW1pUGxhbmFyCiAgICAgICAgICAgICB8fCBtQ29sb3JGb3JtYXQgPT0gT01YX0NPTE9SX0Zvcm1hdFlVVjQyMFNlbWlQbGFuYXIpIHsKKyAgICAgICAgaWYgKChzaXplX3QpbVdpZHRoICogbUhlaWdodCAqIDMgLyAyID4gc2l6ZSkgeworICAgICAgICAgICAgZ290byBza2lwX2NvcHlpbmc7CisgICAgICAgIH0KICAgICAgICAgY29uc3QgdWludDhfdCAqc3JjX3kgPSAoY29uc3QgdWludDhfdCAqKWRhdGE7CiAgICAgICAgIGNvbnN0IHVpbnQ4X3QgKnNyY191diA9IChjb25zdCB1aW50OF90ICopZGF0YQogICAgICAgICAgICAgICAgICsgbVdpZHRoICogKG1IZWlnaHQgLSBtQ3JvcFRvcCAvIDIpOwpAQCAtMjg5LDYgKzI5NSw5IEBACiAgICAgICAgICAgICBkc3RfdiArPSBkc3RfY19zdHJpZGU7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG1Db2xvckZvcm1hdCA9PSBPTVhfQ09MT1JfRm9ybWF0MjRiaXRSR0I4ODgpIHsKKyAgICAgICAgaWYgKChzaXplX3QpbVdpZHRoICogbUhlaWdodCAqIDMgPiBzaXplKSB7CisgICAgICAgICAgICBnb3RvIHNraXBfY29weWluZzsKKyAgICAgICAgfQogICAgICAgICB1aW50OF90KiBzcmNQdHIgPSAodWludDhfdCopZGF0YTsKICAgICAgICAgdWludDhfdCogZHN0UHRyID0gKHVpbnQ4X3QqKWRzdDsKIApAQCAtMjk4LDYgKzMwNyw5IEBACiAgICAgICAgICAgICBkc3RQdHIgKz0gYnVmLT5zdHJpZGUgKiAzOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtQ29sb3JGb3JtYXQgPT0gT01YX0NPTE9SX0Zvcm1hdDMyYml0QVJHQjg4ODgpIHsKKyAgICAgICAgaWYgKChzaXplX3QpbVdpZHRoICogbUhlaWdodCAqIDQgPiBzaXplKSB7CisgICAgICAgICAgICBnb3RvIHNraXBfY29weWluZzsKKyAgICAgICAgfQogICAgICAgICB1aW50OF90ICpzcmNQdHIsICpkc3RQdHI7CiAKICAgICAgICAgZm9yIChzaXplX3QgeSA9IDA7IHkgPCAoc2l6ZV90KW1Dcm9wSGVpZ2h0OyArK3kpIHsKQEAgLTMxMiw2ICszMjQsOSBAQAogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtQ29sb3JGb3JtYXQgPT0gT01YX0NPTE9SX0Zvcm1hdDMyQml0UkdCQTg4ODgpIHsKKyAgICAgICAgaWYgKChzaXplX3QpbVdpZHRoICogbUhlaWdodCAqIDQgPiBzaXplKSB7CisgICAgICAgICAgICBnb3RvIHNraXBfY29weWluZzsKKyAgICAgICAgfQogICAgICAgICB1aW50OF90KiBzcmNQdHIgPSAodWludDhfdCopZGF0YTsKICAgICAgICAgdWludDhfdCogZHN0UHRyID0gKHVpbnQ4X3QqKWRzdDsKIApAQCAtMzI0LDYgKzMzOSw3IEBACiAgICAgICAgIExPR19BTFdBWVNfRkFUQUwoImJhZCBjb2xvciBmb3JtYXQgJSN4IiwgbUNvbG9yRm9ybWF0KTsKICAgICB9CiAKK3NraXBfY29weWluZzoKICAgICBDSEVDS19FUSgwLCBtYXBwZXIudW5sb2NrKGJ1Zi0+aGFuZGxlKSk7CiAKICAgICBpZiAoKGVyciA9IG5hdGl2ZV93aW5kb3dfc2V0X2J1ZmZlcnNfdGltZXN0YW1wKG1OYXRpdmVXaW5kb3cuZ2V0KCksCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwL01lZGlhSFRUUC5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9odHRwL01lZGlhSFRUUC5jcHAKaW5kZXggMmQ5YjNkNC4uODAxZmYyNiAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaHR0cC9NZWRpYUhUVFAuY3BwCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2h0dHAvTWVkaWFIVFRQLmNwcApAQCAtNTMsNyArNTMsMTAgQEAKICAgICBpZiAoaGVhZGVycyAhPSBOVUxMKSB7CiAgICAgICAgIGV4dEhlYWRlcnMgPSAqaGVhZGVyczsKICAgICB9Ci0gICAgZXh0SGVhZGVycy5hZGQoU3RyaW5nOCgiVXNlci1BZ2VudCIpLCBTdHJpbmc4KE1ha2VVc2VyQWdlbnQoKS5jX3N0cigpKSk7CisKKyAgICBpZiAoZXh0SGVhZGVycy5pbmRleE9mS2V5KFN0cmluZzgoIlVzZXItQWdlbnQiKSkgPCAwKSB7CisgICAgICAgIGV4dEhlYWRlcnMuYWRkKFN0cmluZzgoIlVzZXItQWdlbnQiKSwgU3RyaW5nOChNYWtlVXNlckFnZW50KCkuY19zdHIoKSkpOworICAgIH0KIAogICAgIGJvb2wgc3VjY2VzcyA9IG1IVFRQQ29ubmVjdGlvbi0+Y29ubmVjdCh1cmksICZleHRIZWFkZXJzKTsKIApkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9PTVhOb2RlSW5zdGFuY2UuaCBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2luY2x1ZGUvT01YTm9kZUluc3RhbmNlLmgKaW5kZXggNzZkZjgxNS4uZjY4ZTBhOSAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9PTVhOb2RlSW5zdGFuY2UuaAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9pbmNsdWRlL09NWE5vZGVJbnN0YW5jZS5oCkBAIC0xMjUsNiArMTI1LDggQEAKICAgICAgICAgICAgIGNvbnN0IHZvaWQgKmRhdGEsCiAgICAgICAgICAgICBzaXplX3Qgc2l6ZSk7CiAKKyAgICAvLyBoYW5kbGVzIG1lc3NhZ2VzIGFuZCByZW1vdmVzIHRoZW0gZnJvbSB0aGUgbGlzdAorICAgIHZvaWQgb25NZXNzYWdlcyhzdGQ6Omxpc3Q8b214X21lc3NhZ2U+ICZtZXNzYWdlcyk7CiAgICAgdm9pZCBvbk1lc3NhZ2UoY29uc3Qgb214X21lc3NhZ2UgJm1zZyk7CiAgICAgdm9pZCBvbk9ic2VydmVyRGllZChPTVhNYXN0ZXIgKm1hc3Rlcik7CiAgICAgdm9pZCBvbkdldEhhbmRsZUZhaWxlZCgpOwpAQCAtMjMxLDYgKzIzMywxMCBAQAogICAgIHNwPEdyYXBoaWNCdWZmZXJTb3VyY2U+IGdldEdyYXBoaWNCdWZmZXJTb3VyY2UoKTsKICAgICB2b2lkIHNldEdyYXBoaWNCdWZmZXJTb3VyY2UoY29uc3Qgc3A8R3JhcGhpY0J1ZmZlclNvdXJjZT4mIGJ1ZmZlclNvdXJjZSk7CiAKKyAgICAvLyBIYW5kbGVzIHxtc2d8LCBhbmQgbWF5IG1vZGlmeSBpdC4gUmV0dXJucyB0cnVlIGlmZiBjb21wbGV0ZWx5IGhhbmRsZWQgaXQgYW5kCisgICAgLy8gfG1zZ3wgZG9lcyBub3QgbmVlZCB0byBiZSBzZW50IHRvIHRoZSBldmVudCBsaXN0ZW5lci4KKyAgICBib29sIGhhbmRsZU1lc3NhZ2Uob214X21lc3NhZ2UgJm1zZyk7CisKICAgICBPTVhOb2RlSW5zdGFuY2UoY29uc3QgT01YTm9kZUluc3RhbmNlICYpOwogICAgIE9NWE5vZGVJbnN0YW5jZSAmb3BlcmF0b3I9KGNvbnN0IE9NWE5vZGVJbnN0YW5jZSAmKTsKIH07CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9pbmNsdWRlL09nZ0V4dHJhY3Rvci5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvaW5jbHVkZS9PZ2dFeHRyYWN0b3IuaAppbmRleCBlOTdjOGNkLi5jNjQ3Y2JiIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9pbmNsdWRlL09nZ0V4dHJhY3Rvci5oCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L2luY2x1ZGUvT2dnRXh0cmFjdG9yLmgKQEAgLTI3LDcgKzI3LDcgQEAKIGNsYXNzIERhdGFTb3VyY2U7CiBjbGFzcyBTdHJpbmc4OwogCi1zdHJ1Y3QgTXlWb3JiaXNFeHRyYWN0b3I7CitzdHJ1Y3QgTXlPZ2dFeHRyYWN0b3I7CiBzdHJ1Y3QgT2dnU291cmNlOwogCiBzdHJ1Y3QgT2dnRXh0cmFjdG9yIDogcHVibGljIE1lZGlhRXh0cmFjdG9yIHsKQEAgLTQ4LDcgKzQ4LDcgQEAKICAgICBzcDxEYXRhU291cmNlPiBtRGF0YVNvdXJjZTsKICAgICBzdGF0dXNfdCBtSW5pdENoZWNrOwogCi0gICAgTXlWb3JiaXNFeHRyYWN0b3IgKm1JbXBsOworICAgIE15T2dnRXh0cmFjdG9yICptSW1wbDsKIAogICAgIE9nZ0V4dHJhY3Rvcihjb25zdCBPZ2dFeHRyYWN0b3IgJik7CiAgICAgT2dnRXh0cmFjdG9yICZvcGVyYXRvcj0oY29uc3QgT2dnRXh0cmFjdG9yICYpOwpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvbXBlZzJ0cy9BVFNQYXJzZXIuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvbXBlZzJ0cy9BVFNQYXJzZXIuY3BwCmluZGV4IDUzNDIzZWMuLmRiNDI5ZjYgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L21wZWcydHMvQVRTUGFyc2VyLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9tcGVnMnRzL0FUU1BhcnNlci5jcHAKQEAgLTEzOTcsNiArMTM5NywxMSBAQAogICAgIHVuc2lnbmVkIGFkYXB0YXRpb25fZmllbGRfbGVuZ3RoID0gYnItPmdldEJpdHMoOCk7CiAKICAgICBpZiAoYWRhcHRhdGlvbl9maWVsZF9sZW5ndGggPiAwKSB7CisgICAgICAgIGlmIChhZGFwdGF0aW9uX2ZpZWxkX2xlbmd0aCAqIDggPiBici0+bnVtQml0c0xlZnQoKSkgeworICAgICAgICAgICAgQUxPR1YoIkFkYXB0YXRpb24gZmllbGQgc2hvdWxkIGJlIGluY2x1ZGVkIGluIGEgc2luZ2xlIFRTIHBhY2tldC4iKTsKKyAgICAgICAgICAgIHJldHVybiBFUlJPUl9NQUxGT1JNRUQ7CisgICAgICAgIH0KKwogICAgICAgICB1bnNpZ25lZCBkaXNjb250aW51aXR5X2luZGljYXRvciA9IGJyLT5nZXRCaXRzKDEpOwogCiAgICAgICAgIGlmIChkaXNjb250aW51aXR5X2luZGljYXRvcikgewpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L0dyYXBoaWNCdWZmZXJTb3VyY2UuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L0dyYXBoaWNCdWZmZXJTb3VyY2UuY3BwCmluZGV4IGQzMGJiYTUuLmFjNmJmMGQgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L29teC9HcmFwaGljQnVmZmVyU291cmNlLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvR3JhcGhpY0J1ZmZlclNvdXJjZS5jcHAKQEAgLTM4LDYgKzM4LDcyIEBACiAKIHN0YXRpYyBjb25zdCBib29sIEVYVFJBX0NIRUNLID0gdHJ1ZTsKIAorR3JhcGhpY0J1ZmZlclNvdXJjZTo6UGVyc2lzdGVudFByb3h5TGlzdGVuZXI6OlBlcnNpc3RlbnRQcm94eUxpc3RlbmVyKAorICAgICAgICBjb25zdCB3cDxJR3JhcGhpY0J1ZmZlckNvbnN1bWVyPiAmY29uc3VtZXIsCisgICAgICAgIGNvbnN0IHdwPENvbnN1bWVyTGlzdGVuZXI+JiBjb25zdW1lckxpc3RlbmVyKSA6CisgICAgbUNvbnN1bWVyTGlzdGVuZXIoY29uc3VtZXJMaXN0ZW5lciksCisgICAgbUNvbnN1bWVyKGNvbnN1bWVyKSB7fQorCitHcmFwaGljQnVmZmVyU291cmNlOjpQZXJzaXN0ZW50UHJveHlMaXN0ZW5lcjo6flBlcnNpc3RlbnRQcm94eUxpc3RlbmVyKCkge30KKwordm9pZCBHcmFwaGljQnVmZmVyU291cmNlOjpQZXJzaXN0ZW50UHJveHlMaXN0ZW5lcjo6b25GcmFtZUF2YWlsYWJsZSgKKyAgICAgICAgY29uc3QgQnVmZmVySXRlbSYgaXRlbSkgeworICAgIHNwPENvbnN1bWVyTGlzdGVuZXI+IGxpc3RlbmVyKG1Db25zdW1lckxpc3RlbmVyLnByb21vdGUoKSk7CisgICAgaWYgKGxpc3RlbmVyICE9IE5VTEwpIHsKKyAgICAgICAgbGlzdGVuZXItPm9uRnJhbWVBdmFpbGFibGUoaXRlbSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc3A8SUdyYXBoaWNCdWZmZXJDb25zdW1lcj4gY29uc3VtZXIobUNvbnN1bWVyLnByb21vdGUoKSk7CisgICAgICAgIGlmIChjb25zdW1lciA9PSBOVUxMKSB7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgQnVmZmVySXRlbSBiaTsKKyAgICAgICAgc3RhdHVzX3QgZXJyID0gY29uc3VtZXItPmFjcXVpcmVCdWZmZXIoJmJpLCAwKTsKKyAgICAgICAgaWYgKGVyciAhPSBPSykgeworICAgICAgICAgICAgQUxPR0UoIlBlcnNpc3RlbnRQcm94eUxpc3RlbmVyOiBhY3F1aXJlQnVmZmVyIGZhaWxlZCAoJWQpIiwgZXJyKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGVyciA9IGNvbnN1bWVyLT5kZXRhY2hCdWZmZXIoYmkubUJ1Zik7CisgICAgICAgIGlmIChlcnIgIT0gT0spIHsKKyAgICAgICAgICAgIEFMT0dFKCJQZXJzaXN0ZW50UHJveHlMaXN0ZW5lcjogZGV0YWNoQnVmZmVyIGZhaWxlZCAoJWQpIiwgZXJyKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGVyciA9IGNvbnN1bWVyLT5hdHRhY2hCdWZmZXIoJmJpLm1CdWYsIGJpLm1HcmFwaGljQnVmZmVyKTsKKyAgICAgICAgaWYgKGVyciAhPSBPSykgeworICAgICAgICAgICAgQUxPR0UoIlBlcnNpc3RlbnRQcm94eUxpc3RlbmVyOiBhdHRhY2hCdWZmZXIgZmFpbGVkICglZCkiLCBlcnIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgZXJyID0gY29uc3VtZXItPnJlbGVhc2VCdWZmZXIoYmkubUJ1ZiwgMCwKKyAgICAgICAgICAgICAgICBFR0xfTk9fRElTUExBWSwgRUdMX05PX1NZTkNfS0hSLCBiaS5tRmVuY2UpOworICAgICAgICBpZiAoZXJyICE9IE9LKSB7CisgICAgICAgICAgICBBTE9HRSgiUGVyc2lzdGVudFByb3h5TGlzdGVuZXI6IHJlbGVhc2VCdWZmZXIgZmFpbGVkICglZCkiLCBlcnIpOworICAgICAgICB9CisgICAgfQorfQorCit2b2lkIEdyYXBoaWNCdWZmZXJTb3VyY2U6OlBlcnNpc3RlbnRQcm94eUxpc3RlbmVyOjpvbkZyYW1lUmVwbGFjZWQoCisgICAgICAgIGNvbnN0IEJ1ZmZlckl0ZW0mIGl0ZW0pIHsKKyAgICBzcDxDb25zdW1lckxpc3RlbmVyPiBsaXN0ZW5lcihtQ29uc3VtZXJMaXN0ZW5lci5wcm9tb3RlKCkpOworICAgIGlmIChsaXN0ZW5lciAhPSBOVUxMKSB7CisgICAgICAgIGxpc3RlbmVyLT5vbkZyYW1lUmVwbGFjZWQoaXRlbSk7CisgICAgfQorfQorCit2b2lkIEdyYXBoaWNCdWZmZXJTb3VyY2U6OlBlcnNpc3RlbnRQcm94eUxpc3RlbmVyOjpvbkJ1ZmZlcnNSZWxlYXNlZCgpIHsKKyAgICBzcDxDb25zdW1lckxpc3RlbmVyPiBsaXN0ZW5lcihtQ29uc3VtZXJMaXN0ZW5lci5wcm9tb3RlKCkpOworICAgIGlmIChsaXN0ZW5lciAhPSBOVUxMKSB7CisgICAgICAgIGxpc3RlbmVyLT5vbkJ1ZmZlcnNSZWxlYXNlZCgpOworICAgIH0KK30KKwordm9pZCBHcmFwaGljQnVmZmVyU291cmNlOjpQZXJzaXN0ZW50UHJveHlMaXN0ZW5lcjo6b25TaWRlYmFuZFN0cmVhbUNoYW5nZWQoKSB7CisgICAgc3A8Q29uc3VtZXJMaXN0ZW5lcj4gbGlzdGVuZXIobUNvbnN1bWVyTGlzdGVuZXIucHJvbW90ZSgpKTsKKyAgICBpZiAobGlzdGVuZXIgIT0gTlVMTCkgeworICAgICAgICBsaXN0ZW5lci0+b25TaWRlYmFuZFN0cmVhbUNoYW5nZWQoKTsKKyAgICB9Cit9CiAKIEdyYXBoaWNCdWZmZXJTb3VyY2U6OkdyYXBoaWNCdWZmZXJTb3VyY2UoCiAgICAgICAgIE9NWE5vZGVJbnN0YW5jZSogbm9kZUluc3RhbmNlLApAQCAtMTAxLDcgKzE2NywxMiBAQAogICAgIC8vIGRyb3BwaW5nIHRvIDAgYXQgdGhlIGVuZCBvZiB0aGUgY3Rvci4gIFNpbmNlIGFsbCB3ZSBuZWVkIGlzIGEgd3A8Li4uPgogICAgIC8vIHRoYXQncyB3aGF0IHdlIGNyZWF0ZS4KICAgICB3cDxCdWZmZXJRdWV1ZTo6Q29uc3VtZXJMaXN0ZW5lcj4gbGlzdGVuZXIgPSBzdGF0aWNfY2FzdDxCdWZmZXJRdWV1ZTo6Q29uc3VtZXJMaXN0ZW5lcio+KHRoaXMpOwotICAgIHNwPEJ1ZmZlclF1ZXVlOjpQcm94eUNvbnN1bWVyTGlzdGVuZXI+IHByb3h5ID0gbmV3IEJ1ZmZlclF1ZXVlOjpQcm94eUNvbnN1bWVyTGlzdGVuZXIobGlzdGVuZXIpOworICAgIHNwPElDb25zdW1lckxpc3RlbmVyPiBwcm94eTsKKyAgICBpZiAoIW1Jc1BlcnNpc3RlbnQpIHsKKyAgICAgICAgcHJveHkgPSBuZXcgQnVmZmVyUXVldWU6OlByb3h5Q29uc3VtZXJMaXN0ZW5lcihsaXN0ZW5lcik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgcHJveHkgPSBuZXcgUGVyc2lzdGVudFByb3h5TGlzdGVuZXIobUNvbnN1bWVyLCBsaXN0ZW5lcik7CisgICAgfQogCiAgICAgbUluaXRDaGVjayA9IG1Db25zdW1lci0+Y29uc3VtZXJDb25uZWN0KHByb3h5LCBmYWxzZSk7CiAgICAgaWYgKG1Jbml0Q2hlY2sgIT0gTk9fRVJST1IpIHsKQEAgLTMxMiw2ICszODMsNyBAQAogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+YXR0YWNoQnVmZmVyKCZvdXRTbG90LCBtQnVmZmVyU2xvdFtpZF0pOwogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+cmVsZWFzZUJ1ZmZlcihvdXRTbG90LCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgRUdMX05PX0RJU1BMQVksIEVHTF9OT19TWU5DX0tIUiwgZmVuY2UpOworICAgICAgICAgICAgICAgIG1CdWZmZXJTbG90W2lkXSA9IE5VTEw7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+cmVsZWFzZUJ1ZmZlcihpZCwgY29kZWNCdWZmZXIubUZyYW1lTnVtYmVyLAogICAgICAgICAgICAgICAgICAgICAgICAgRUdMX05PX0RJU1BMQVksIEVHTF9OT19TWU5DX0tIUiwgZmVuY2UpOwpAQCAtNDAwLDYgKzQ3Miw3IEBACiAKICAgICAgICAgICAgIGlmIChtSXNQZXJzaXN0ZW50KSB7CiAgICAgICAgICAgICAgICAgbUNvbnN1bWVyLT5kZXRhY2hCdWZmZXIoaXRlbS5tQnVmKTsKKyAgICAgICAgICAgICAgICBtQnVmZmVyU2xvdFtpdGVtLm1CdWZdID0gTlVMTDsKICAgICAgICAgICAgICAgICBtQ29uc3VtZXItPmF0dGFjaEJ1ZmZlcigmaXRlbS5tQnVmLCBpdGVtLm1HcmFwaGljQnVmZmVyKTsKICAgICAgICAgICAgICAgICBtQ29uc3VtZXItPnJlbGVhc2VCdWZmZXIoaXRlbS5tQnVmLCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgRUdMX05PX0RJU1BMQVksIEVHTF9OT19TWU5DX0tIUiwgaXRlbS5tRmVuY2UpOwpAQCAtNDg4LDYgKzU2MSw3IEBACiAgICAgICAgIEFMT0dWKCJzdWJtaXRCdWZmZXJfbCBmYWlsZWQsIHJlbGVhc2luZyBicSBidWYgJWQiLCBpdGVtLm1CdWYpOwogICAgICAgICBpZiAobUlzUGVyc2lzdGVudCkgewogICAgICAgICAgICAgbUNvbnN1bWVyLT5kZXRhY2hCdWZmZXIoaXRlbS5tQnVmKTsKKyAgICAgICAgICAgIG1CdWZmZXJTbG90W2l0ZW0ubUJ1Zl0gPSBOVUxMOwogICAgICAgICAgICAgbUNvbnN1bWVyLT5hdHRhY2hCdWZmZXIoJml0ZW0ubUJ1ZiwgaXRlbS5tR3JhcGhpY0J1ZmZlcik7CiAgICAgICAgICAgICBtQ29uc3VtZXItPnJlbGVhc2VCdWZmZXIoaXRlbS5tQnVmLCAwLAogICAgICAgICAgICAgICAgICAgICBFR0xfTk9fRElTUExBWSwgRUdMX05PX1NZTkNfS0hSLCBpdGVtLm1GZW5jZSk7CkBAIC01NzgsOSArNjUyLDkgQEAKIAogICAgICAgICAgICAgICAgIGludCBvdXRTbG90OwogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+YXR0YWNoQnVmZmVyKCZvdXRTbG90LCBtQnVmZmVyU2xvdFttTGF0ZXN0QnVmZmVySWRdKTsKLQogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+cmVsZWFzZUJ1ZmZlcihvdXRTbG90LCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgRUdMX05PX0RJU1BMQVksIEVHTF9OT19TWU5DX0tIUiwgbUxhdGVzdEJ1ZmZlckZlbmNlKTsKKyAgICAgICAgICAgICAgICBtQnVmZmVyU2xvdFttTGF0ZXN0QnVmZmVySWRdID0gTlVMTDsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgbUNvbnN1bWVyLT5yZWxlYXNlQnVmZmVyKAogICAgICAgICAgICAgICAgICAgICAgICAgbUxhdGVzdEJ1ZmZlcklkLCBtTGF0ZXN0QnVmZmVyRnJhbWVOdW0sCkBAIC04MDMsNiArODc3LDcgQEAKIAogICAgICAgICAgICAgaWYgKG1Jc1BlcnNpc3RlbnQpIHsKICAgICAgICAgICAgICAgICBtQ29uc3VtZXItPmRldGFjaEJ1ZmZlcihpdGVtLm1CdWYpOworICAgICAgICAgICAgICAgIG1CdWZmZXJTbG90W2l0ZW0ubUJ1Zl0gPSBOVUxMOwogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+YXR0YWNoQnVmZmVyKCZpdGVtLm1CdWYsIGl0ZW0ubUdyYXBoaWNCdWZmZXIpOwogICAgICAgICAgICAgICAgIG1Db25zdW1lci0+cmVsZWFzZUJ1ZmZlcihpdGVtLm1CdWYsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICBFR0xfTk9fRElTUExBWSwgRUdMX05PX1NZTkNfS0hSLCBpdGVtLm1GZW5jZSk7CmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvR3JhcGhpY0J1ZmZlclNvdXJjZS5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L0dyYXBoaWNCdWZmZXJTb3VyY2UuaAppbmRleCA1NTViYmVjLi4yYThjMjE4IDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvR3JhcGhpY0J1ZmZlclNvdXJjZS5oCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L29teC9HcmFwaGljQnVmZmVyU291cmNlLmgKQEAgLTE2MCw2ICsxNjAsMzEgQEAKICAgICB2aXJ0dWFsIHZvaWQgb25TaWRlYmFuZFN0cmVhbUNoYW5nZWQoKTsKIAogcHJpdmF0ZToKKyAgICAvLyBQZXJzaXN0ZW50UHJveHlMaXN0ZW5lciBpcyBzaW1pbGFyIHRvIEJ1ZmZlclF1ZXVlOjpQcm94eUNvbnN1bWVyTGlzdGVuZXIKKyAgICAvLyBleGNlcHQgdGhhdCBpdCByZXR1cm5zIChhY3F1aXJlL2RldGFjaC9yZS1hdHRhY2hlL3JlbGVhc2UpIGJ1ZmZlcnMKKyAgICAvLyBpbiBvbkZyYW1lQXZhaWxhYmxlKCkgaWYgdGhlIGFjdHVhbCBjb25zdW1lciBvYmplY3QgaXMgbm8gbG9uZ2VyIHZhbGlkLgorICAgIC8vCisgICAgLy8gVGhpcyBjbGFzcyBpcyB1c2VkIGluIHBlcnNpc3RlbnQgaW5wdXQgc3VyZmFjZSBjYXNlIHRvIHByZXZlbnQgYnVmZmVyCisgICAgLy8gbG9zcyB3aGVuIG9uRnJhbWVBdmFpbGFibGUoKSBpcyByZWNlaXZlZCB3aGlsZSB3ZSBkb24ndCBoYXZlIGEgdmFsaWQKKyAgICAvLyBjb25zdW1lciBhcm91bmQuCisgICAgY2xhc3MgUGVyc2lzdGVudFByb3h5TGlzdGVuZXIgOiBwdWJsaWMgQm5Db25zdW1lckxpc3RlbmVyIHsKKyAgICAgICAgcHVibGljOgorICAgICAgICAgICAgUGVyc2lzdGVudFByb3h5TGlzdGVuZXIoCisgICAgICAgICAgICAgICAgICAgIGNvbnN0IHdwPElHcmFwaGljQnVmZmVyQ29uc3VtZXI+ICZjb25zdW1lciwKKyAgICAgICAgICAgICAgICAgICAgY29uc3Qgd3A8Q29uc3VtZXJMaXN0ZW5lcj4mIGNvbnN1bWVyTGlzdGVuZXIpOworICAgICAgICAgICAgdmlydHVhbCB+UGVyc2lzdGVudFByb3h5TGlzdGVuZXIoKTsKKyAgICAgICAgICAgIHZpcnR1YWwgdm9pZCBvbkZyYW1lQXZhaWxhYmxlKGNvbnN0IEJ1ZmZlckl0ZW0mIGl0ZW0pIG92ZXJyaWRlOworICAgICAgICAgICAgdmlydHVhbCB2b2lkIG9uRnJhbWVSZXBsYWNlZChjb25zdCBCdWZmZXJJdGVtJiBpdGVtKSBvdmVycmlkZTsKKyAgICAgICAgICAgIHZpcnR1YWwgdm9pZCBvbkJ1ZmZlcnNSZWxlYXNlZCgpIG92ZXJyaWRlOworICAgICAgICAgICAgdmlydHVhbCB2b2lkIG9uU2lkZWJhbmRTdHJlYW1DaGFuZ2VkKCkgb3ZlcnJpZGU7CisgICAgICAgICBwcml2YXRlOgorICAgICAgICAgICAgLy8gbUNvbnN1bWVyTGlzdGVuZXIgaXMgYSB3ZWFrIHJlZmVyZW5jZSB0byB0aGUgSUNvbnN1bWVyTGlzdGVuZXIuCisgICAgICAgICAgICB3cDxDb25zdW1lckxpc3RlbmVyPiBtQ29uc3VtZXJMaXN0ZW5lcjsKKyAgICAgICAgICAgIC8vIG1Db25zdW1lciBpcyBhIHdlYWsgcmVmZXJlbmNlIHRvIHRoZSBJR3JhcGhpY0J1ZmZlckNvbnN1bWVyLCB1c2UKKyAgICAgICAgICAgIC8vIGEgd2VhayByZWYgdG8gYXZvaWQgY2lyY3VsYXIgcmVmIGJldHdlZW4gbUNvbnN1bWVyIGFuZCB0aGlzIGNsYXNzCisgICAgICAgICAgICB3cDxJR3JhcGhpY0J1ZmZlckNvbnN1bWVyPiBtQ29uc3VtZXI7CisgICAgfTsKKwogICAgIC8vIEtlZXAgdHJhY2sgb2YgY29kZWMgaW5wdXQgYnVmZmVycy4gIFRoZXkgbWF5IGVpdGhlciBiZSBhdmFpbGFibGUKICAgICAvLyAobUdyYXBoaWNCdWZmZXIgPT0gTlVMTCkgb3IgaW4gdXNlIGJ5IHRoZSBjb2RlYy4KICAgICBzdHJ1Y3QgQ29kZWNCdWZmZXIgewpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L09NWC5jcHAgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvT01YLmNwcAppbmRleCA3NjIxN2VjLi5lOTRhZGJkIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvT01YLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvT01YLmNwcApAQCAtNjEsNyArNjEsMTEgQEAKIHN0cnVjdCBPTVg6OkNhbGxiYWNrRGlzcGF0Y2hlciA6IHB1YmxpYyBSZWZCYXNlIHsKICAgICBDYWxsYmFja0Rpc3BhdGNoZXIoT01YTm9kZUluc3RhbmNlICpvd25lcik7CiAKLSAgICB2b2lkIHBvc3QoY29uc3Qgb214X21lc3NhZ2UgJm1zZyk7CisgICAgLy8gUG9zdHMgfG1zZ3wgdG8gdGhlIGxpc3RlbmVyJ3MgcXVldWUuIElmIHxyZWFsVGltZXwgaXMgdHJ1ZSwgdGhlIGxpc3RlbmVyIHRocmVhZCBpcyBub3RpZmllZAorICAgIC8vIHRoYXQgYSBuZXcgbWVzc2FnZSBpcyBhdmFpbGFibGUgb24gdGhlIHF1ZXVlLiBPdGhlcndpc2UsIHRoZSBtZXNzYWdlIHN0YXlzIG9uIHRoZSBxdWV1ZSwgYnV0CisgICAgLy8gdGhlIGxpc3RlbmVyIGlzIG5vdCBub3RpZmllZCBvZiBpdC4gSXQgd2lsbCBwcm9jZXNzIHRoaXMgbWVzc2FnZSB3aGVuIGEgc3Vic2VxdWVudCBtZXNzYWdlCisgICAgLy8gaXMgcG9zdGVkIHdpdGggfHJlYWxUaW1lfCBzZXQgdG8gdHJ1ZS4KKyAgICB2b2lkIHBvc3QoY29uc3Qgb214X21lc3NhZ2UgJm1zZywgYm9vbCByZWFsVGltZSA9IHRydWUpOwogCiAgICAgYm9vbCBsb29wKCk7CiAKQEAgLTc0LDExICs3OCwxMSBAQAogICAgIE9NWE5vZGVJbnN0YW5jZSAqbU93bmVyOwogICAgIGJvb2wgbURvbmU7CiAgICAgQ29uZGl0aW9uIG1RdWV1ZUNoYW5nZWQ7Ci0gICAgTGlzdDxvbXhfbWVzc2FnZT4gbVF1ZXVlOworICAgIHN0ZDo6bGlzdDxvbXhfbWVzc2FnZT4gbVF1ZXVlOwogCiAgICAgc3A8Q2FsbGJhY2tEaXNwYXRjaGVyVGhyZWFkPiBtVGhyZWFkOwogCi0gICAgdm9pZCBkaXNwYXRjaChjb25zdCBvbXhfbWVzc2FnZSAmbXNnKTsKKyAgICB2b2lkIGRpc3BhdGNoKHN0ZDo6bGlzdDxvbXhfbWVzc2FnZT4gJm1lc3NhZ2VzKTsKIAogICAgIENhbGxiYWNrRGlzcGF0Y2hlcihjb25zdCBDYWxsYmFja0Rpc3BhdGNoZXIgJik7CiAgICAgQ2FsbGJhY2tEaXNwYXRjaGVyICZvcGVyYXRvcj0oY29uc3QgQ2FsbGJhY2tEaXNwYXRjaGVyICYpOwpAQCAtMTA5LDI0ICsxMTMsMjYgQEAKICAgICB9CiB9CiAKLXZvaWQgT01YOjpDYWxsYmFja0Rpc3BhdGNoZXI6OnBvc3QoY29uc3Qgb214X21lc3NhZ2UgJm1zZykgewordm9pZCBPTVg6OkNhbGxiYWNrRGlzcGF0Y2hlcjo6cG9zdChjb25zdCBvbXhfbWVzc2FnZSAmbXNnLCBib29sIHJlYWxUaW1lKSB7CiAgICAgTXV0ZXg6OkF1dG9sb2NrIGF1dG9Mb2NrKG1Mb2NrKTsKIAogICAgIG1RdWV1ZS5wdXNoX2JhY2sobXNnKTsKLSAgICBtUXVldWVDaGFuZ2VkLnNpZ25hbCgpOworICAgIGlmIChyZWFsVGltZSkgeworICAgICAgICBtUXVldWVDaGFuZ2VkLnNpZ25hbCgpOworICAgIH0KIH0KIAotdm9pZCBPTVg6OkNhbGxiYWNrRGlzcGF0Y2hlcjo6ZGlzcGF0Y2goY29uc3Qgb214X21lc3NhZ2UgJm1zZykgewordm9pZCBPTVg6OkNhbGxiYWNrRGlzcGF0Y2hlcjo6ZGlzcGF0Y2goc3RkOjpsaXN0PG9teF9tZXNzYWdlPiAmbWVzc2FnZXMpIHsKICAgICBpZiAobU93bmVyID09IE5VTEwpIHsKICAgICAgICAgQUxPR1YoIldvdWxkIGhhdmUgZGlzcGF0Y2hlZCBhIG1lc3NhZ2UgdG8gYSBub2RlIHRoYXQncyBhbHJlYWR5IGdvbmUuIik7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgbU93bmVyLT5vbk1lc3NhZ2UobXNnKTsKKyAgICBtT3duZXItPm9uTWVzc2FnZXMobWVzc2FnZXMpOwogfQogCiBib29sIE9NWDo6Q2FsbGJhY2tEaXNwYXRjaGVyOjpsb29wKCkgewogICAgIGZvciAoOzspIHsKLSAgICAgICAgb214X21lc3NhZ2UgbXNnOworICAgICAgICBzdGQ6Omxpc3Q8b214X21lc3NhZ2U+IG1lc3NhZ2VzOwogCiAgICAgICAgIHsKICAgICAgICAgICAgIE11dGV4OjpBdXRvbG9jayBhdXRvTG9jayhtTG9jayk7CkBAIC0xMzgsMTEgKzE0NCwxMCBAQAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBtc2cgPSAqbVF1ZXVlLmJlZ2luKCk7Ci0gICAgICAgICAgICBtUXVldWUuZXJhc2UobVF1ZXVlLmJlZ2luKCkpOworICAgICAgICAgICAgbWVzc2FnZXMuc3dhcChtUXVldWUpOwogICAgICAgICB9CiAKLSAgICAgICAgZGlzcGF0Y2gobXNnKTsKKyAgICAgICAgZGlzcGF0Y2gobWVzc2FnZXMpOwogICAgIH0KIAogICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L29teC9PTVhOb2RlSW5zdGFuY2UuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L09NWE5vZGVJbnN0YW5jZS5jcHAKaW5kZXggOWUzOTlmOS4uN2U5MmRhOCAxMDA2NDQKLS0tIGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L09NWE5vZGVJbnN0YW5jZS5jcHAKKysrIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L09NWE5vZGVJbnN0YW5jZS5jcHAKQEAgLTEzNTcsNyArMTM1Nyw3IEBACiAgICAgfQogfQogCi12b2lkIE9NWE5vZGVJbnN0YW5jZTo6b25NZXNzYWdlKGNvbnN0IG9teF9tZXNzYWdlICZtc2cpIHsKK2Jvb2wgT01YTm9kZUluc3RhbmNlOjpoYW5kbGVNZXNzYWdlKG9teF9tZXNzYWdlICZtc2cpIHsKICAgICBjb25zdCBzcDxHcmFwaGljQnVmZmVyU291cmNlPiYgYnVmZmVyU291cmNlKGdldEdyYXBoaWNCdWZmZXJTb3VyY2UoKSk7CiAKICAgICBpZiAobXNnLnR5cGUgPT0gb214X21lc3NhZ2U6OkZJTExfQlVGRkVSX0RPTkUpIHsKQEAgLTEzODQsMTAgKzEzODQsNyBAQAogICAgICAgICAgICAgLy8gZml4IHVwIHRoZSBidWZmZXIgaW5mbyAoZXNwZWNpYWxseSB0aW1lc3RhbXApIGlmIG5lZWRlZAogICAgICAgICAgICAgYnVmZmVyU291cmNlLT5jb2RlY0J1ZmZlckZpbGxlZChidWZmZXIpOwogCi0gICAgICAgICAgICBvbXhfbWVzc2FnZSBuZXdNc2cgPSBtc2c7Ci0gICAgICAgICAgICBuZXdNc2cudS5leHRlbmRlZF9idWZmZXJfZGF0YS50aW1lc3RhbXAgPSBidWZmZXItPm5UaW1lU3RhbXA7Ci0gICAgICAgICAgICBtT2JzZXJ2ZXItPm9uTWVzc2FnZShuZXdNc2cpOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbXNnLnUuZXh0ZW5kZWRfYnVmZmVyX2RhdGEudGltZXN0YW1wID0gYnVmZmVyLT5uVGltZVN0YW1wOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtc2cudHlwZSA9PSBvbXhfbWVzc2FnZTo6RU1QVFlfQlVGRkVSX0RPTkUpIHsKICAgICAgICAgT01YX0JVRkZFUkhFQURFUlRZUEUgKmJ1ZmZlciA9CkBAIC0xNDA4LDExICsxNDA1LDIzIEBACiAgICAgICAgICAgICAvLyBrbm93IHRoYXQgYW55b25lIGFza2VkIHRvIGhhdmUgdGhlIGJ1ZmZlciBlbXB0aWVkIGFuZCB3aWxsCiAgICAgICAgICAgICAvLyBiZSB2ZXJ5IGNvbmZ1c2VkLgogICAgICAgICAgICAgYnVmZmVyU291cmNlLT5jb2RlY0J1ZmZlckVtcHRpZWQoYnVmZmVyLCBtc2cuZmVuY2VGZCk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KIAotICAgIG1PYnNlcnZlci0+b25NZXNzYWdlKG1zZyk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIE9NWE5vZGVJbnN0YW5jZTo6b25NZXNzYWdlcyhzdGQ6Omxpc3Q8b214X21lc3NhZ2U+ICZtZXNzYWdlcykgeworICAgIGZvciAoc3RkOjpsaXN0PG9teF9tZXNzYWdlPjo6aXRlcmF0b3IgaXQgPSBtZXNzYWdlcy5iZWdpbigpOyBpdCAhPSBtZXNzYWdlcy5lbmQoKTsgKSB7CisgICAgICAgIGlmIChoYW5kbGVNZXNzYWdlKCppdCkpIHsKKyAgICAgICAgICAgIG1lc3NhZ2VzLmVyYXNlKGl0KyspOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgKytpdDsKKyAgICAgICAgfQorICAgIH0KKworICAgIG1PYnNlcnZlci0+b25NZXNzYWdlcyhtZXNzYWdlcyk7CiB9CiAKIHZvaWQgT01YTm9kZUluc3RhbmNlOjpvbk9ic2VydmVyRGllZChPTVhNYXN0ZXIgKm1hc3RlcikgewpkaWZmIC0tZ2l0IGEvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L3Rlc3RzL09NWEhhcm5lc3MuY3BwIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L3Rlc3RzL09NWEhhcm5lc3MuY3BwCmluZGV4IDI5NGIyZWQuLjY0NGI2ZWQgMTAwNjQ0Ci0tLSBhL21lZGlhL2xpYnN0YWdlZnJpZ2h0L29teC90ZXN0cy9PTVhIYXJuZXNzLmNwcAorKysgYi9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvdGVzdHMvT01YSGFybmVzcy5jcHAKQEAgLTY0LDkgKzY0LDExIEBACiAgICAgcmV0dXJuIG1PTVggIT0gMCA/IE9LIDogTk9fSU5JVDsKIH0KIAotdm9pZCBIYXJuZXNzOjpvbk1lc3NhZ2UoY29uc3Qgb214X21lc3NhZ2UgJm1zZykgewordm9pZCBIYXJuZXNzOjpvbk1lc3NhZ2VzKGNvbnN0IHN0ZDo6bGlzdDxvbXhfbWVzc2FnZT4gJm1lc3NhZ2VzKSB7CiAgICAgTXV0ZXg6OkF1dG9sb2NrIGF1dG9Mb2NrKG1Mb2NrKTsKLSAgICBtTWVzc2FnZVF1ZXVlLnB1c2hfYmFjayhtc2cpOworICAgIGZvciAoc3RkOjpsaXN0PG9teF9tZXNzYWdlPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtZXNzYWdlcy5jYmVnaW4oKTsgaXQgIT0gbWVzc2FnZXMuY2VuZCgpOyApIHsKKyAgICAgICAgbU1lc3NhZ2VRdWV1ZS5wdXNoX2JhY2soKml0KyspOworICAgIH0KICAgICBtTWVzc2FnZUFkZGVkQ29uZGl0aW9uLnNpZ25hbCgpOwogfQogCmRpZmYgLS1naXQgYS9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvdGVzdHMvT01YSGFybmVzcy5oIGIvbWVkaWEvbGlic3RhZ2VmcmlnaHQvb214L3Rlc3RzL09NWEhhcm5lc3MuaAppbmRleCBiYjhmZDBjLi4xZWJmM2FhIDEwMDY0NAotLS0gYS9tZWRpYS9saWJzdGFnZWZyaWdodC9vbXgvdGVzdHMvT01YSGFybmVzcy5oCisrKyBiL21lZGlhL2xpYnN0YWdlZnJpZ2h0L29teC90ZXN0cy9PTVhIYXJuZXNzLmgKQEAgLTc0LDcgKzc0LDcgQEAKIAogICAgIHN0YXR1c190IHRlc3RBbGwoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBvbk1lc3NhZ2UoY29uc3Qgb214X21lc3NhZ2UgJm1zZyk7CisgICAgdmlydHVhbCB2b2lkIG9uTWVzc2FnZXMoY29uc3Qgc3RkOjpsaXN0PG9teF9tZXNzYWdlPiAmbWVzc2FnZXMpOwogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+SGFybmVzcygpOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvYXVkaW9mbGluZ2VyL1RocmVhZHMuY3BwIGIvc2VydmljZXMvYXVkaW9mbGluZ2VyL1RocmVhZHMuY3BwCmluZGV4IGRjNjcxMGYuLmFkNDQ1YTUgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2F1ZGlvZmxpbmdlci9UaHJlYWRzLmNwcAorKysgYi9zZXJ2aWNlcy9hdWRpb2ZsaW5nZXIvVGhyZWFkcy5jcHAKQEAgLTc0Myw3ICs3NDMsOCBAQAogCiBTdHJpbmc4IGNoYW5uZWxNYXNrVG9TdHJpbmcoYXVkaW9fY2hhbm5lbF9tYXNrX3QgbWFzaywgYm9vbCBvdXRwdXQpIHsKICAgICBTdHJpbmc4IHM7Ci0gICAgY29uc3QgYXVkaW9fY2hhbm5lbF9yZXByZXNlbnRhdGlvbl90IHJlcHJlc2VudGF0aW9uID0gYXVkaW9fY2hhbm5lbF9tYXNrX2dldF9yZXByZXNlbnRhdGlvbihtYXNrKTsKKyAgICBjb25zdCBhdWRpb19jaGFubmVsX3JlcHJlc2VudGF0aW9uX3QgcmVwcmVzZW50YXRpb24gPQorICAgICAgICAgICAgYXVkaW9fY2hhbm5lbF9tYXNrX2dldF9yZXByZXNlbnRhdGlvbihtYXNrKTsKIAogICAgIHN3aXRjaCAocmVwcmVzZW50YXRpb24pIHsKICAgICBjYXNlIEFVRElPX0NIQU5ORUxfUkVQUkVTRU5UQVRJT05fUE9TSVRJT046IHsKQEAgLTY3MDksMTEgKzY3MTAsOCBAQAogCiAgICAgYXVkaW9fZm9ybWF0X3QgcmVxRm9ybWF0ID0gbUZvcm1hdDsKICAgICB1aW50MzJfdCBzYW1wbGluZ1JhdGUgPSBtU2FtcGxlUmF0ZTsKKyAgICAvLyBUT0RPIHRoaXMgbWF5IGNoYW5nZSBpZiB3ZSB3YW50IHRvIHN1cHBvcnQgY2FwdHVyZSBmcm9tIEhETUkgUENNIG11bHRpIGNoYW5uZWwgKGUuZyBvbiBUVnMpLgogICAgIGF1ZGlvX2NoYW5uZWxfbWFza190IGNoYW5uZWxNYXNrID0gYXVkaW9fY2hhbm5lbF9pbl9tYXNrX2Zyb21fY291bnQobUNoYW5uZWxDb3VudCk7Ci0gICAgLy8gcG9zc2libGUgdGhhdCB3ZSBhcmUgPiAyIGNoYW5uZWxzLCB1c2UgY2hhbm5lbCBpbmRleCBtYXNrCi0gICAgaWYgKGNoYW5uZWxNYXNrID09IEFVRElPX0NIQU5ORUxfSU5WQUxJRCAmJiBtQ2hhbm5lbENvdW50IDw9IEZDQ184KSB7Ci0gICAgICAgIGF1ZGlvX2NoYW5uZWxfbWFza19mb3JfaW5kZXhfYXNzaWdubWVudF9mcm9tX2NvdW50KG1DaGFubmVsQ291bnQpOwotICAgIH0KIAogICAgIEF1ZGlvUGFyYW1ldGVyIHBhcmFtID0gQXVkaW9QYXJhbWV0ZXIoa2V5VmFsdWVQYWlyKTsKICAgICBpbnQgdmFsdWU7CmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9hdWRpb3BvbGljeS9tYW5hZ2VyZGVmYXVsdC9BdWRpb1BvbGljeU1hbmFnZXIuY3BwIGIvc2VydmljZXMvYXVkaW9wb2xpY3kvbWFuYWdlcmRlZmF1bHQvQXVkaW9Qb2xpY3lNYW5hZ2VyLmNwcAppbmRleCA4MmM5ZTU1Li4wYWRhYWM5IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9hdWRpb3BvbGljeS9tYW5hZ2VyZGVmYXVsdC9BdWRpb1BvbGljeU1hbmFnZXIuY3BwCisrKyBiL3NlcnZpY2VzL2F1ZGlvcG9saWN5L21hbmFnZXJkZWZhdWx0L0F1ZGlvUG9saWN5TWFuYWdlci5jcHAKQEAgLTQ1ODUsNyArNDU4NSw4IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgZGVsYXlNcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF1ZGlvX2RldmljZXNfdCBkZXZpY2UpCiB7Ci0gICAgQUxPR1ZWKCJzZXRTdHJhdGVneU11dGUoKSBzdHJhdGVneSAlZCwgbXV0ZSAlZCwgb3V0cHV0ICVkIiwgc3RyYXRlZ3ksIG9uLCBvdXRwdXQpOworICAgIEFMT0dWVigic2V0U3RyYXRlZ3lNdXRlKCkgc3RyYXRlZ3kgJWQsIG11dGUgJWQsIG91dHB1dCBJRCAlZCIsCisgICAgICAgICAgIHN0cmF0ZWd5LCBvbiwgb3V0cHV0RGVzYy0+Z2V0SWQoKSk7CiAgICAgZm9yIChpbnQgc3RyZWFtID0gMDsgc3RyZWFtIDwgQVVESU9fU1RSRUFNX0NOVDsgc3RyZWFtKyspIHsKICAgICAgICAgaWYgKHN0cmVhbSA9PSBBVURJT19TVFJFQU1fUEFUQ0gpIHsKICAgICAgICAgICAgIGNvbnRpbnVlOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQW5kcm9pZC5tayBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0FuZHJvaWQubWsKaW5kZXggY2JlYWQzMi4uZThlZjI0ZSAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvQW5kcm9pZC5taworKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9BbmRyb2lkLm1rCkBAIC03Myw2ICs3Myw3IEBACiBMT0NBTF9DX0lOQ0xVREVTICs9IFwKICAgICBzeXN0ZW0vbWVkaWEvY2FtZXJhL2luY2x1ZGUgXAogICAgIHN5c3RlbS9tZWRpYS9wcml2YXRlL2NhbWVyYS9pbmNsdWRlIFwKKyAgICBmcmFtZXdvcmtzL25hdGl2ZS9pbmNsdWRlL21lZGlhL29wZW5tYXggXAogICAgIGV4dGVybmFsL2pwZWcKIAogCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9DYW1lcmFTZXJ2aWNlLmNwcCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuY3BwCmluZGV4IDZmMDczZWQuLmY0MmZhZGEgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL0NhbWVyYVNlcnZpY2UuY3BwCkBAIC0xODY0LDcgKzE4NjQsOCBAQAogICAgIGlmIChyZXMgPT0gQXBwT3BzTWFuYWdlcjo6TU9ERV9JR05PUkVEKSB7CiAgICAgICAgIEFMT0dJKCJDYW1lcmEgJWQ6IEFjY2VzcyBmb3IgXCIlc1wiIGhhcyBiZWVuIHJlc3RyaWN0ZWQiLAogICAgICAgICAgICAgICAgIG1DYW1lcmFJZCwgU3RyaW5nOChtQ2xpZW50UGFja2FnZU5hbWUpLnN0cmluZygpKTsKLSAgICAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOworICAgICAgICAvLyBSZXR1cm4gdGhlIHNhbWUgZXJyb3IgYXMgZm9yIGRldmljZSBwb2xpY3kgbWFuYWdlciByZWplY3Rpb24KKyAgICAgICAgcmV0dXJuIC1FQUNDRVM7CiAgICAgfQogCiAgICAgbU9wc0FjdGl2ZSA9IHRydWU7CmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL0NhbWVyYTJDbGllbnQuY3BwIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9DYW1lcmEyQ2xpZW50LmNwcAppbmRleCBmMmQ2YWIyLi5jYTE0Y2RiIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL0NhbWVyYTJDbGllbnQuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvQ2FtZXJhMkNsaWVudC5jcHAKQEAgLTE1NTksNiArMTU1OSw5IEBACiAgICAgICAgICAgICByZXR1cm4gY29tbWFuZFBpbmdMKCk7CiAgICAgICAgIGNhc2UgQ0FNRVJBX0NNRF9TRVRfVklERU9fQlVGRkVSX0NPVU5UOgogICAgICAgICAgICAgcmV0dXJuIGNvbW1hbmRTZXRWaWRlb0J1ZmZlckNvdW50TChhcmcxKTsKKyAgICAgICAgY2FzZSBDQU1FUkFfQ01EX1NFVF9WSURFT19GT1JNQVQ6CisgICAgICAgICAgICByZXR1cm4gY29tbWFuZFNldFZpZGVvRm9ybWF0TChhcmcxLAorICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxhbmRyb2lkX2RhdGFzcGFjZT4oYXJnMikpOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgQUxPR0UoIiVzOiBVbmtub3duIGNvbW1hbmQgJWQgKGFyZ3VtZW50cyAlZCwgJWQpIiwKICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBjbWQsIGFyZzEsIGFyZzIpOwpAQCAtMTcxMCw2ICsxNzEzLDE3IEBACiAgICAgcmV0dXJuIG1TdHJlYW1pbmdQcm9jZXNzb3ItPnNldFJlY29yZGluZ0J1ZmZlckNvdW50KGNvdW50KTsKIH0KIAorc3RhdHVzX3QgQ2FtZXJhMkNsaWVudDo6Y29tbWFuZFNldFZpZGVvRm9ybWF0TChpbnQgZm9ybWF0LAorICAgICAgICBhbmRyb2lkX2RhdGFzcGFjZSBkYXRhc3BhY2UpIHsKKyAgICBpZiAocmVjb3JkaW5nRW5hYmxlZEwoKSkgeworICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogRXJyb3Igc2V0dGluZyB2aWRlbyBmb3JtYXQgYWZ0ZXIgIgorICAgICAgICAgICAgICAgICJyZWNvcmRpbmcgd2FzIHN0YXJ0ZWQiLCBfX0ZVTkNUSU9OX18sIG1DYW1lcmFJZCk7CisgICAgICAgIHJldHVybiBJTlZBTElEX09QRVJBVElPTjsKKyAgICB9CisKKyAgICByZXR1cm4gbVN0cmVhbWluZ1Byb2Nlc3Nvci0+c2V0UmVjb3JkaW5nRm9ybWF0KGZvcm1hdCwgZGF0YXNwYWNlKTsKK30KKwogdm9pZCBDYW1lcmEyQ2xpZW50Ojpub3RpZnlFcnJvcihJQ2FtZXJhRGV2aWNlQ2FsbGJhY2tzOjpDYW1lcmFFcnJvckNvZGUgZXJyb3JDb2RlLAogICAgICAgICBjb25zdCBDYXB0dXJlUmVzdWx0RXh0cmFzJiByZXN1bHRFeHRyYXMpIHsKICAgICBpbnQzMl90IGVyciA9IENBTUVSQV9FUlJPUl9VTktOT1dOOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9DYW1lcmEyQ2xpZW50LmggYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL0NhbWVyYTJDbGllbnQuaAppbmRleCAzNzg0YWFiLi5jNmRmMjI4IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL0NhbWVyYTJDbGllbnQuaAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL0NhbWVyYTJDbGllbnQuaApAQCAtMTY3LDYgKzE2Nyw3IEBACiAgICAgc3RhdHVzX3QgY29tbWFuZEVuYWJsZUZvY3VzTW92ZU1zZ0woYm9vbCBlbmFibGUpOwogICAgIHN0YXR1c190IGNvbW1hbmRQaW5nTCgpOwogICAgIHN0YXR1c190IGNvbW1hbmRTZXRWaWRlb0J1ZmZlckNvdW50TChzaXplX3QgY291bnQpOworICAgIHN0YXR1c190IGNvbW1hbmRTZXRWaWRlb0Zvcm1hdEwoaW50IGZvcm1hdCwgYW5kcm9pZF9kYXRhc3BhY2UgZGF0YVNwYWNlKTsKIAogICAgIC8vIEN1cnJlbnQgY2FtZXJhIGRldmljZSBjb25maWd1cmF0aW9uCiAgICAgY2FtZXJhMjo6U2hhcmVkUGFyYW1ldGVycyBtUGFyYW1ldGVyczsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9DYWxsYmFja1Byb2Nlc3Nvci5jcHAgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvQ2FsbGJhY2tQcm9jZXNzb3IuY3BwCmluZGV4IDg4YzU4MTEuLjE0M2NjNjEgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9DYWxsYmFja1Byb2Nlc3Nvci5jcHAKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL0NhbGxiYWNrUHJvY2Vzc29yLmNwcApAQCAtMTIzLDcgKzEyMyw3IEBACiAgICAgICAgIC8vIENoZWNrIGlmIHN0cmVhbSBwYXJhbWV0ZXJzIGhhdmUgdG8gY2hhbmdlCiAgICAgICAgIHVpbnQzMl90IGN1cnJlbnRXaWR0aCwgY3VycmVudEhlaWdodCwgY3VycmVudEZvcm1hdDsKICAgICAgICAgcmVzID0gZGV2aWNlLT5nZXRTdHJlYW1JbmZvKG1DYWxsYmFja1N0cmVhbUlkLAotICAgICAgICAgICAgICAgICZjdXJyZW50V2lkdGgsICZjdXJyZW50SGVpZ2h0LCAmY3VycmVudEZvcm1hdCk7CisgICAgICAgICAgICAgICAgJmN1cnJlbnRXaWR0aCwgJmN1cnJlbnRIZWlnaHQsICZjdXJyZW50Rm9ybWF0LCAwKTsKICAgICAgICAgaWYgKHJlcyAhPSBPSykgewogICAgICAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IEVycm9yIHF1ZXJ5aW5nIGNhbGxiYWNrIG91dHB1dCBzdHJlYW0gaW5mbzogIgogICAgICAgICAgICAgICAgICAgICAiJXMgKCVkKSIsIF9fRlVOQ1RJT05fXywgbUlkLApkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL0pwZWdQcm9jZXNzb3IuY3BwIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL0pwZWdQcm9jZXNzb3IuY3BwCmluZGV4IDM0Nzk4YmYuLjg4OTg3ZjkgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9KcGVnUHJvY2Vzc29yLmNwcAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvSnBlZ1Byb2Nlc3Nvci5jcHAKQEAgLTExNSw3ICsxMTUsNyBAQAogICAgICAgICAvLyBDaGVjayBpZiBzdHJlYW0gcGFyYW1ldGVycyBoYXZlIHRvIGNoYW5nZQogICAgICAgICB1aW50MzJfdCBjdXJyZW50V2lkdGgsIGN1cnJlbnRIZWlnaHQ7CiAgICAgICAgIHJlcyA9IGRldmljZS0+Z2V0U3RyZWFtSW5mbyhtQ2FwdHVyZVN0cmVhbUlkLAotICAgICAgICAgICAgICAgICZjdXJyZW50V2lkdGgsICZjdXJyZW50SGVpZ2h0LCAwKTsKKyAgICAgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgMCwgMCk7CiAgICAgICAgIGlmIChyZXMgIT0gT0spIHsKICAgICAgICAgICAgIEFMT0dFKCIlczogQ2FtZXJhICVkOiBFcnJvciBxdWVyeWluZyBjYXB0dXJlIG91dHB1dCBzdHJlYW0gaW5mbzogIgogICAgICAgICAgICAgICAgICAgICAiJXMgKCVkKSIsIF9fRlVOQ1RJT05fXywKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9TdHJlYW1pbmdQcm9jZXNzb3IuY3BwIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1N0cmVhbWluZ1Byb2Nlc3Nvci5jcHAKaW5kZXggYjYwNzFmNi4uMzZkMTQzYiAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1N0cmVhbWluZ1Byb2Nlc3Nvci5jcHAKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1N0cmVhbWluZ1Byb2Nlc3Nvci5jcHAKQEAgLTI1LDExICsyNSwxMiBAQAogI2RlZmluZSBBTE9HVlYoLi4uKSAoKHZvaWQpMCkKICNlbmRpZgogCisjaW5jbHVkZSA8Y3V0aWxzL3Byb3BlcnRpZXMuaD4KICNpbmNsdWRlIDx1dGlscy9Mb2cuaD4KICNpbmNsdWRlIDx1dGlscy9UcmFjZS5oPgogI2luY2x1ZGUgPGd1aS9CdWZmZXJJdGVtLmg+CiAjaW5jbHVkZSA8Z3VpL1N1cmZhY2UuaD4KLSNpbmNsdWRlIDxtZWRpYS9oYXJkd2FyZS9NZXRhZGF0YUJ1ZmZlclR5cGUuaD4KKyNpbmNsdWRlIDxtZWRpYS9oYXJkd2FyZS9IYXJkd2FyZUFQSS5oPgogCiAjaW5jbHVkZSAiY29tbW9uL0NhbWVyYURldmljZUJhc2UuaCIKICNpbmNsdWRlICJhcGkxL0NhbWVyYTJDbGllbnQuaCIKQEAgLTUxLDcgKzUyLDEwIEBACiAgICAgICAgIG1SZWNvcmRpbmdTdHJlYW1JZChOT19TVFJFQU0pLAogICAgICAgICBtUmVjb3JkaW5nRnJhbWVBdmFpbGFibGUoZmFsc2UpLAogICAgICAgICBtUmVjb3JkaW5nSGVhcENvdW50KGtEZWZhdWx0UmVjb3JkaW5nSGVhcENvdW50KSwKLSAgICAgICAgbVJlY29yZGluZ0hlYXBGcmVlKGtEZWZhdWx0UmVjb3JkaW5nSGVhcENvdW50KQorICAgICAgICBtUmVjb3JkaW5nSGVhcEZyZWUoa0RlZmF1bHRSZWNvcmRpbmdIZWFwQ291bnQpLAorICAgICAgICBtUmVjb3JkaW5nRm9ybWF0KGtEZWZhdWx0UmVjb3JkaW5nRm9ybWF0KSwKKyAgICAgICAgbVJlY29yZGluZ0RhdGFTcGFjZShrRGVmYXVsdFJlY29yZGluZ0RhdGFTcGFjZSksCisgICAgICAgIG1SZWNvcmRpbmdHcmFsbG9jVXNhZ2Uoa0RlZmF1bHRSZWNvcmRpbmdHcmFsbG9jVXNhZ2UpCiB7CiB9CiAKQEAgLTE1MSw3ICsxNTUsNyBAQAogICAgICAgICAvLyBDaGVjayBpZiBzdHJlYW0gcGFyYW1ldGVycyBoYXZlIHRvIGNoYW5nZQogICAgICAgICB1aW50MzJfdCBjdXJyZW50V2lkdGgsIGN1cnJlbnRIZWlnaHQ7CiAgICAgICAgIHJlcyA9IGRldmljZS0+Z2V0U3RyZWFtSW5mbyhtUHJldmlld1N0cmVhbUlkLAotICAgICAgICAgICAgICAgICZjdXJyZW50V2lkdGgsICZjdXJyZW50SGVpZ2h0LCAwKTsKKyAgICAgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgMCwgMCk7CiAgICAgICAgIGlmIChyZXMgIT0gT0spIHsKICAgICAgICAgICAgIEFMT0dFKCIlczogQ2FtZXJhICVkOiBFcnJvciBxdWVyeWluZyBwcmV2aWV3IHN0cmVhbSBpbmZvOiAiCiAgICAgICAgICAgICAgICAgICAgICIlcyAoJWQpIiwgX19GVU5DVElPTl9fLCBtSWQsIHN0cmVycm9yKC1yZXMpLCByZXMpOwpAQCAtMjgwLDYgKzI4NCw0NiBAQAogICAgIHJldHVybiBPSzsKIH0KIAorc3RhdHVzX3QgU3RyZWFtaW5nUHJvY2Vzc29yOjpzZXRSZWNvcmRpbmdGb3JtYXQoaW50IGZvcm1hdCwKKyAgICAgICAgYW5kcm9pZF9kYXRhc3BhY2UgZGF0YVNwYWNlKSB7CisgICAgQVRSQUNFX0NBTEwoKTsKKworICAgIE11dGV4OjpBdXRvbG9jayBtKG1NdXRleCk7CisKKyAgICBBTE9HVigiJXM6IENhbWVyYSAlZDogTmV3IHJlY29yZGluZyBmb3JtYXQvZGF0YXNwYWNlIGZyb20gZW5jb2RlcjogJVgsICVYIiwKKyAgICAgICAgICAgIF9fRlVOQ1RJT05fXywgbUlkLCBmb3JtYXQsIGRhdGFTcGFjZSk7CisKKyAgICBtUmVjb3JkaW5nRm9ybWF0ID0gZm9ybWF0OworICAgIG1SZWNvcmRpbmdEYXRhU3BhY2UgPSBkYXRhU3BhY2U7CisgICAgaW50IHByZXZHcmFsbG9jVXNhZ2UgPSBtUmVjb3JkaW5nR3JhbGxvY1VzYWdlOworICAgIGlmIChtUmVjb3JkaW5nRm9ybWF0ID09IEhBTF9QSVhFTF9GT1JNQVRfSU1QTEVNRU5UQVRJT05fREVGSU5FRCkgeworICAgICAgICBtUmVjb3JkaW5nR3JhbGxvY1VzYWdlID0gR1JBTExPQ19VU0FHRV9IV19WSURFT19FTkNPREVSOworICAgIH0gZWxzZSB7CisgICAgICAgIG1SZWNvcmRpbmdHcmFsbG9jVXNhZ2UgPSBHUkFMTE9DX1VTQUdFX1NXX1JFQURfT0ZURU47CisgICAgfQorCisgICAgQUxPR1YoIiVzOiBDYW1lcmEgJWQ6IE5ldyByZWNvcmRpbmcgZ3JhbGxvYyB1c2FnZTogJTA4WCIsIF9fRlVOQ1RJT05fXywgbUlkLAorICAgICAgICAgICAgbVJlY29yZGluZ0dyYWxsb2NVc2FnZSk7CisKKyAgICBpZiAocHJldkdyYWxsb2NVc2FnZSAhPSBtUmVjb3JkaW5nR3JhbGxvY1VzYWdlKSB7CisgICAgICAgIEFMT0dWKCIlczogQ2FtZXJhICVkOiBSZXNldHRpbmcgcmVjb3JkaW5nIGNvbnN1bWVyIGZvciBuZXcgdXNhZ2UiLAorICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtSWQpOworCisgICAgICAgIGlmIChpc1N0cmVhbUFjdGl2ZShtQWN0aXZlU3RyZWFtSWRzLCBtUmVjb3JkaW5nU3RyZWFtSWQpKSB7CisgICAgICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogQ2hhbmdpbmcgcmVjb3JkaW5nIGZvcm1hdCB3aGVuICIKKyAgICAgICAgICAgICAgICAgICAgInJlY29yZGluZyBzdHJlYW0gaXMgYWxyZWFkeSBhY3RpdmUhIiwgX19GVU5DVElPTl9fLAorICAgICAgICAgICAgICAgICAgICBtSWQpOworICAgICAgICAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOworICAgICAgICB9CisKKyAgICAgICAgcmVsZWFzZUFsbFJlY29yZGluZ0ZyYW1lc0xvY2tlZCgpOworCisgICAgICAgIG1SZWNvcmRpbmdDb25zdW1lci5jbGVhcigpOworICAgIH0KKworICAgIHJldHVybiBPSzsKK30KKwogc3RhdHVzX3QgU3RyZWFtaW5nUHJvY2Vzc29yOjp1cGRhdGVSZWNvcmRpbmdSZXF1ZXN0KGNvbnN0IFBhcmFtZXRlcnMgJnBhcmFtcykgewogICAgIEFUUkFDRV9DQUxMKCk7CiAgICAgc3RhdHVzX3QgcmVzOwpAQCAtMzQwLDkgKzM4NCwxMCBAQAogICAgICAgICByZXR1cm4gSU5WQUxJRF9PUEVSQVRJT047CiAgICAgfQogCi0gICAgdWludDMyX3QgY3VycmVudFdpZHRoLCBjdXJyZW50SGVpZ2h0OworICAgIHVpbnQzMl90IGN1cnJlbnRXaWR0aCwgY3VycmVudEhlaWdodCwgY3VycmVudEZvcm1hdDsKKyAgICBhbmRyb2lkX2RhdGFzcGFjZSBjdXJyZW50RGF0YVNwYWNlOwogICAgIHJlcyA9IGRldmljZS0+Z2V0U3RyZWFtSW5mbyhtUmVjb3JkaW5nU3RyZWFtSWQsCi0gICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgMCk7CisgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgJmN1cnJlbnRGb3JtYXQsICZjdXJyZW50RGF0YVNwYWNlKTsKICAgICBpZiAocmVzICE9IE9LKSB7CiAgICAgICAgIEFMT0dFKCIlczogQ2FtZXJhICVkOiBFcnJvciBxdWVyeWluZyByZWNvcmRpbmcgb3V0cHV0IHN0cmVhbSBpbmZvOiAiCiAgICAgICAgICAgICAgICAgIiVzICglZCkiLCBfX0ZVTkNUSU9OX18sIG1JZCwKQEAgLTM1MCw4ICszOTUsMTEgQEAKICAgICAgICAgcmV0dXJuIHJlczsKICAgICB9CiAKLSAgICBpZiAobVJlY29yZGluZ0NvbnN1bWVyID09IDAgfHwgY3VycmVudFdpZHRoICE9ICh1aW50MzJfdClwYXJhbXMudmlkZW9XaWR0aCB8fAotICAgICAgICAgICAgY3VycmVudEhlaWdodCAhPSAodWludDMyX3QpcGFyYW1zLnZpZGVvSGVpZ2h0KSB7CisgICAgaWYgKG1SZWNvcmRpbmdDb25zdW1lciA9PSAwIHx8CisgICAgICAgICAgICBjdXJyZW50V2lkdGggIT0gKHVpbnQzMl90KXBhcmFtcy52aWRlb1dpZHRoIHx8CisgICAgICAgICAgICBjdXJyZW50SGVpZ2h0ICE9ICh1aW50MzJfdClwYXJhbXMudmlkZW9IZWlnaHQgfHwKKyAgICAgICAgICAgIGN1cnJlbnRGb3JtYXQgIT0gKHVpbnQzMl90KW1SZWNvcmRpbmdGb3JtYXQgfHwKKyAgICAgICAgICAgIGN1cnJlbnREYXRhU3BhY2UgIT0gbVJlY29yZGluZ0RhdGFTcGFjZSkgewogICAgICAgICAqbmVlZHNVcGRhdGUgPSB0cnVlOwogICAgIH0KICAgICAqbmVlZHNVcGRhdGUgPSBmYWxzZTsKQEAgLTM4MCw3ICs0MjgsNyBAQAogICAgICAgICBzcDxJR3JhcGhpY0J1ZmZlckNvbnN1bWVyPiBjb25zdW1lcjsKICAgICAgICAgQnVmZmVyUXVldWU6OmNyZWF0ZUJ1ZmZlclF1ZXVlKCZwcm9kdWNlciwgJmNvbnN1bWVyKTsKICAgICAgICAgbVJlY29yZGluZ0NvbnN1bWVyID0gbmV3IEJ1ZmZlckl0ZW1Db25zdW1lcihjb25zdW1lciwKLSAgICAgICAgICAgICAgICBHUkFMTE9DX1VTQUdFX0hXX1ZJREVPX0VOQ09ERVIsCisgICAgICAgICAgICAgICAgbVJlY29yZGluZ0dyYWxsb2NVc2FnZSwKICAgICAgICAgICAgICAgICBtUmVjb3JkaW5nSGVhcENvdW50ICsgMSk7CiAgICAgICAgIG1SZWNvcmRpbmdDb25zdW1lci0+c2V0RnJhbWVBdmFpbGFibGVMaXN0ZW5lcih0aGlzKTsKICAgICAgICAgbVJlY29yZGluZ0NvbnN1bWVyLT5zZXROYW1lKFN0cmluZzgoIkNhbWVyYTItUmVjb3JkaW5nQ29uc3VtZXIiKSk7CkBAIC0zOTIsOCArNDQwLDExIEBACiAgICAgaWYgKG1SZWNvcmRpbmdTdHJlYW1JZCAhPSBOT19TVFJFQU0pIHsKICAgICAgICAgLy8gQ2hlY2sgaWYgc3RyZWFtIHBhcmFtZXRlcnMgaGF2ZSB0byBjaGFuZ2UKICAgICAgICAgdWludDMyX3QgY3VycmVudFdpZHRoLCBjdXJyZW50SGVpZ2h0OworICAgICAgICB1aW50MzJfdCBjdXJyZW50Rm9ybWF0OworICAgICAgICBhbmRyb2lkX2RhdGFzcGFjZSBjdXJyZW50RGF0YVNwYWNlOwogICAgICAgICByZXMgPSBkZXZpY2UtPmdldFN0cmVhbUluZm8obVJlY29yZGluZ1N0cmVhbUlkLAotICAgICAgICAgICAgICAgICZjdXJyZW50V2lkdGgsICZjdXJyZW50SGVpZ2h0LCAwKTsKKyAgICAgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwKKyAgICAgICAgICAgICAgICAmY3VycmVudEZvcm1hdCwgJmN1cnJlbnREYXRhU3BhY2UpOwogICAgICAgICBpZiAocmVzICE9IE9LKSB7CiAgICAgICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogRXJyb3IgcXVlcnlpbmcgcmVjb3JkaW5nIG91dHB1dCBzdHJlYW0gaW5mbzogIgogICAgICAgICAgICAgICAgICAgICAiJXMgKCVkKSIsIF9fRlVOQ1RJT05fXywgbUlkLApAQCAtNDAxLDcgKzQ1MiwxMCBAQAogICAgICAgICAgICAgcmV0dXJuIHJlczsKICAgICAgICAgfQogICAgICAgICBpZiAoY3VycmVudFdpZHRoICE9ICh1aW50MzJfdClwYXJhbXMudmlkZW9XaWR0aCB8fAotICAgICAgICAgICAgICAgIGN1cnJlbnRIZWlnaHQgIT0gKHVpbnQzMl90KXBhcmFtcy52aWRlb0hlaWdodCB8fCBuZXdDb25zdW1lcikgeworICAgICAgICAgICAgICAgIGN1cnJlbnRIZWlnaHQgIT0gKHVpbnQzMl90KXBhcmFtcy52aWRlb0hlaWdodCB8fAorICAgICAgICAgICAgICAgIGN1cnJlbnRGb3JtYXQgIT0gKHVpbnQzMl90KW1SZWNvcmRpbmdGb3JtYXQgfHwKKyAgICAgICAgICAgICAgICBjdXJyZW50RGF0YVNwYWNlICE9IG1SZWNvcmRpbmdEYXRhU3BhY2UgfHwKKyAgICAgICAgICAgICAgICBuZXdDb25zdW1lcikgewogICAgICAgICAgICAgLy8gVE9ETzogU2hvdWxkIHdhaXQgdG8gYmUgc3VyZSBwcmV2aW91cyByZWNvcmRpbmcgaGFzIGZpbmlzaGVkCiAgICAgICAgICAgICByZXMgPSBkZXZpY2UtPmRlbGV0ZVN0cmVhbShtUmVjb3JkaW5nU3RyZWFtSWQpOwogCkBAIC00MjIsMTEgKzQ3Niw5IEBACiAKICAgICBpZiAobVJlY29yZGluZ1N0cmVhbUlkID09IE5PX1NUUkVBTSkgewogICAgICAgICBtUmVjb3JkaW5nRnJhbWVDb3VudCA9IDA7Ci0gICAgICAgIC8vIFNlbGVjdGluZyBCVC43MDkgY29sb3JzcGFjZSBieSBkZWZhdWx0Ci0gICAgICAgIC8vIFRPRE86IFdpcmUgdGhpcyBpbiBmcm9tIGVuY29kZXIgc2lkZQogICAgICAgICByZXMgPSBkZXZpY2UtPmNyZWF0ZVN0cmVhbShtUmVjb3JkaW5nV2luZG93LAogICAgICAgICAgICAgICAgIHBhcmFtcy52aWRlb1dpZHRoLCBwYXJhbXMudmlkZW9IZWlnaHQsCi0gICAgICAgICAgICAgICAgQ0FNRVJBMl9IQUxfUElYRUxfRk9STUFUX09QQVFVRSwgSEFMX0RBVEFTUEFDRV9CVDcwOSwKKyAgICAgICAgICAgICAgICBtUmVjb3JkaW5nRm9ybWF0LCBtUmVjb3JkaW5nRGF0YVNwYWNlLAogICAgICAgICAgICAgICAgIENBTUVSQTNfU1RSRUFNX1JPVEFUSU9OXzAsICZtUmVjb3JkaW5nU3RyZWFtSWQpOwogICAgICAgICBpZiAocmVzICE9IE9LKSB7CiAgICAgICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogQ2FuJ3QgY3JlYXRlIG91dHB1dCBzdHJlYW0gZm9yIHJlY29yZGluZzogIgpAQCAtNzIyLDEyICs3NzQsMTIgQEAKICAgICAgICAgfQogCiAgICAgICAgIGlmIChtUmVjb3JkaW5nSGVhcCA9PSAwKSB7Ci0gICAgICAgICAgICBjb25zdCBzaXplX3QgYnVmZmVyU2l6ZSA9IDQgKyBzaXplb2YoYnVmZmVyX2hhbmRsZV90KTsKKyAgICAgICAgICAgIHNpemVfdCBwYXlsb2FkU2l6ZSA9IHNpemVvZihWaWRlb05hdGl2ZU1ldGFkYXRhKTsKICAgICAgICAgICAgIEFMT0dWKCIlczogQ2FtZXJhICVkOiBDcmVhdGluZyByZWNvcmRpbmcgaGVhcCB3aXRoICV6dSBidWZmZXJzIG9mICIKICAgICAgICAgICAgICAgICAgICAgInNpemUgJXp1IGJ5dGVzIiwgX19GVU5DVElPTl9fLCBtSWQsCi0gICAgICAgICAgICAgICAgICAgIG1SZWNvcmRpbmdIZWFwQ291bnQsIGJ1ZmZlclNpemUpOworICAgICAgICAgICAgICAgICAgICBtUmVjb3JkaW5nSGVhcENvdW50LCBwYXlsb2FkU2l6ZSk7CiAKLSAgICAgICAgICAgIG1SZWNvcmRpbmdIZWFwID0gbmV3IENhbWVyYTJIZWFwKGJ1ZmZlclNpemUsIG1SZWNvcmRpbmdIZWFwQ291bnQsCisgICAgICAgICAgICBtUmVjb3JkaW5nSGVhcCA9IG5ldyBDYW1lcmEySGVhcChwYXlsb2FkU2l6ZSwgbVJlY29yZGluZ0hlYXBDb3VudCwKICAgICAgICAgICAgICAgICAgICAgIkNhbWVyYTJDbGllbnQ6OlJlY29yZGluZ0hlYXAiKTsKICAgICAgICAgICAgIGlmIChtUmVjb3JkaW5nSGVhcC0+bUhlYXAtPmdldFNpemUoKSA9PSAwKSB7CiAgICAgICAgICAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IFVuYWJsZSB0byBhbGxvY2F0ZSBtZW1vcnkgZm9yIHJlY29yZGluZyIsCkBAIC03NTAsNyArODAyLDcgQEAKICAgICAgICAgICAgIG1SZWNvcmRpbmdIZWFwRnJlZSA9IG1SZWNvcmRpbmdIZWFwQ291bnQ7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIG1SZWNvcmRpbmdIZWFwRnJlZSA9PSAwKSB7CisgICAgICAgIGlmIChtUmVjb3JkaW5nSGVhcEZyZWUgPT0gMCkgewogICAgICAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IE5vIGZyZWUgcmVjb3JkaW5nIGJ1ZmZlcnMsIGRyb3BwaW5nIGZyYW1lIiwKICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtSWQpOwogICAgICAgICAgICAgbVJlY29yZGluZ0NvbnN1bWVyLT5yZWxlYXNlQnVmZmVyKGltZ0J1ZmZlcik7CkBAIC03NzAsMTMgKzgyMiwxNSBAQAogICAgICAgICAgICAgICAgIG1SZWNvcmRpbmdIZWFwLT5tQnVmZmVyc1toZWFwSWR4XS0+Z2V0TWVtb3J5KCZvZmZzZXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAmc2l6ZSk7CiAKLSAgICAgICAgdWludDhfdCAqZGF0YSA9ICh1aW50OF90KiloZWFwLT5nZXRCYXNlKCkgKyBvZmZzZXQ7Ci0gICAgICAgIHVpbnQzMl90IHR5cGUgPSBrTWV0YWRhdGFCdWZmZXJUeXBlR3JhbGxvY1NvdXJjZTsKLSAgICAgICAgKigodWludDMyX3QqKWRhdGEpID0gdHlwZTsKLSAgICAgICAgKigoYnVmZmVyX2hhbmRsZV90KikoZGF0YSArIDQpKSA9IGltZ0J1ZmZlci5tR3JhcGhpY0J1ZmZlci0+aGFuZGxlOwotICAgICAgICBBTE9HVlYoIiVzOiBDYW1lcmEgJWQ6IFNlbmRpbmcgb3V0IGJ1ZmZlcl9oYW5kbGVfdCAlcCIsCi0gICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtSWQsCi0gICAgICAgICAgICAgICAgaW1nQnVmZmVyLm1HcmFwaGljQnVmZmVyLT5oYW5kbGUpOworICAgICAgICBWaWRlb05hdGl2ZU1ldGFkYXRhICpwYXlsb2FkID0gcmVpbnRlcnByZXRfY2FzdDxWaWRlb05hdGl2ZU1ldGFkYXRhKj4oCisgICAgICAgICAgICAodWludDhfdCopaGVhcC0+Z2V0QmFzZSgpICsgb2Zmc2V0KTsKKyAgICAgICAgcGF5bG9hZC0+ZVR5cGUgPSBrTWV0YWRhdGFCdWZmZXJUeXBlQU5XQnVmZmVyOworICAgICAgICBwYXlsb2FkLT5wQnVmZmVyID0gaW1nQnVmZmVyLm1HcmFwaGljQnVmZmVyLT5nZXROYXRpdmVCdWZmZXIoKTsKKyAgICAgICAgcGF5bG9hZC0+bkZlbmNlRmQgPSAtMTsKKworICAgICAgICBBTE9HVlYoIiVzOiBDYW1lcmEgJWQ6IFNlbmRpbmcgb3V0IEFOV0J1ZmZlciAlcCIsCisgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtSWQsIHBheWxvYWQtPnBCdWZmZXIpOworCiAgICAgICAgIG1SZWNvcmRpbmdCdWZmZXJzLnJlcGxhY2VBdChpbWdCdWZmZXIsIGhlYXBJZHgpOwogICAgICAgICByZWNvcmRpbmdIZWFwID0gbVJlY29yZGluZ0hlYXA7CiAgICAgfQpAQCAtODA5LDQyICs4NjMsNDIgQEAKICAgICAgICAgICAgICAgICBoZWFwLT5nZXRIZWFwSUQoKSwgbVJlY29yZGluZ0hlYXAtPm1IZWFwLT5nZXRIZWFwSUQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgdWludDhfdCAqZGF0YSA9ICh1aW50OF90KiloZWFwLT5nZXRCYXNlKCkgKyBvZmZzZXQ7Ci0gICAgdWludDMyX3QgdHlwZSA9ICoodWludDMyX3QqKWRhdGE7Ci0gICAgaWYgKHR5cGUgIT0ga01ldGFkYXRhQnVmZmVyVHlwZUdyYWxsb2NTb3VyY2UpIHsKKworICAgIFZpZGVvTmF0aXZlTWV0YWRhdGEgKnBheWxvYWQgPSByZWludGVycHJldF9jYXN0PFZpZGVvTmF0aXZlTWV0YWRhdGEqPigKKyAgICAgICAgKHVpbnQ4X3QqKWhlYXAtPmdldEJhc2UoKSArIG9mZnNldCk7CisKKyAgICBpZiAocGF5bG9hZC0+ZVR5cGUgIT0ga01ldGFkYXRhQnVmZmVyVHlwZUFOV0J1ZmZlcikgewogICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogUmVjb3JkaW5nIGZyYW1lIHR5cGUgaW52YWxpZCAoZ290ICV4LCBleHBlY3RlZCAleCkiLAotICAgICAgICAgICAgICAgIF9fRlVOQ1RJT05fXywgbUlkLCB0eXBlLAotICAgICAgICAgICAgICAgIGtNZXRhZGF0YUJ1ZmZlclR5cGVHcmFsbG9jU291cmNlKTsKKyAgICAgICAgICAgICAgICBfX0ZVTkNUSU9OX18sIG1JZCwgcGF5bG9hZC0+ZVR5cGUsCisgICAgICAgICAgICAgICAga01ldGFkYXRhQnVmZmVyVHlwZUFOV0J1ZmZlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICAvLyBSZWxlYXNlIHRoZSBidWZmZXIgYmFjayB0byB0aGUgcmVjb3JkaW5nIHF1ZXVlCi0KLSAgICBidWZmZXJfaGFuZGxlX3QgaW1nSGFuZGxlID0gKihidWZmZXJfaGFuZGxlX3QqKShkYXRhICsgNCk7Ci0KICAgICBzaXplX3QgaXRlbUluZGV4OwogICAgIGZvciAoaXRlbUluZGV4ID0gMDsgaXRlbUluZGV4IDwgbVJlY29yZGluZ0J1ZmZlcnMuc2l6ZSgpOyBpdGVtSW5kZXgrKykgewogICAgICAgICBjb25zdCBCdWZmZXJJdGVtIGl0ZW0gPSBtUmVjb3JkaW5nQnVmZmVyc1tpdGVtSW5kZXhdOwogICAgICAgICBpZiAoaXRlbS5tQnVmICE9IEJ1ZmZlckl0ZW1Db25zdW1lcjo6SU5WQUxJRF9CVUZGRVJfU0xPVCAmJgotICAgICAgICAgICAgICAgIGl0ZW0ubUdyYXBoaWNCdWZmZXItPmhhbmRsZSA9PSBpbWdIYW5kbGUpIHsKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGl0ZW0ubUdyYXBoaWNCdWZmZXItPmdldE5hdGl2ZUJ1ZmZlcigpID09IHBheWxvYWQtPnBCdWZmZXIpIHsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KKwogICAgIGlmIChpdGVtSW5kZXggPT0gbVJlY29yZGluZ0J1ZmZlcnMuc2l6ZSgpKSB7Ci0gICAgICAgIEFMT0dFKCIlczogQ2FtZXJhICVkOiBDYW4ndCBmaW5kIGJ1ZmZlcl9oYW5kbGVfdCAlcCBpbiBsaXN0IG9mICIKKyAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IENhbid0IGZpbmQgcmV0dXJuZWQgQU5XIEJ1ZmZlciAlcCBpbiBsaXN0IG9mICIKICAgICAgICAgICAgICAgICAib3V0c3RhbmRpbmcgYnVmZmVycyIsIF9fRlVOQ1RJT05fXywgbUlkLAotICAgICAgICAgICAgICAgIGltZ0hhbmRsZSk7CisgICAgICAgICAgICAgICAgcGF5bG9hZC0+cEJ1ZmZlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBBTE9HVlYoIiVzOiBDYW1lcmEgJWQ6IEZyZWVpbmcgYnVmZmVyX2hhbmRsZV90ICVwIiwgX19GVU5DVElPTl9fLAotICAgICAgICAgICAgbUlkLCBpbWdIYW5kbGUpOworICAgIEFMT0dWVigiJXM6IENhbWVyYSAlZDogRnJlZWluZyByZXR1cm5lZCBBTlcgYnVmZmVyICVwIGluZGV4ICVkIiwgX19GVU5DVElPTl9fLAorICAgICAgICAgICAgbUlkLCBwYXlsb2FkLT5wQnVmZmVyLCBpdGVtSW5kZXgpOwogCiAgICAgcmVzID0gbVJlY29yZGluZ0NvbnN1bWVyLT5yZWxlYXNlQnVmZmVyKG1SZWNvcmRpbmdCdWZmZXJzW2l0ZW1JbmRleF0pOwogICAgIGlmIChyZXMgIT0gT0spIHsKICAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IFVuYWJsZSB0byBmcmVlIHJlY29yZGluZyBmcmFtZSAiCi0gICAgICAgICAgICAgICAgIihidWZmZXJfaGFuZGxlX3Q6ICVwKTogJXMgKCVkKSIsIF9fRlVOQ1RJT05fXywKLSAgICAgICAgICAgICAgICBtSWQsIGltZ0hhbmRsZSwgc3RyZXJyb3IoLXJlcyksIHJlcyk7CisgICAgICAgICAgICAgICAgIihSZXR1cm5lZCBBTlcgYnVmZmVyOiAlcCk6ICVzICglZCkiLCBfX0ZVTkNUSU9OX18sCisgICAgICAgICAgICAgICAgbUlkLCBwYXlsb2FkLT5wQnVmZmVyLCBzdHJlcnJvcigtcmVzKSwgcmVzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtUmVjb3JkaW5nQnVmZmVycy5yZXBsYWNlQXQoaXRlbUluZGV4KTsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9TdHJlYW1pbmdQcm9jZXNzb3IuaCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9TdHJlYW1pbmdQcm9jZXNzb3IuaAppbmRleCAyNDc0MDYyLi40MmU5ZTdhIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvU3RyZWFtaW5nUHJvY2Vzc29yLmgKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1N0cmVhbWluZ1Byb2Nlc3Nvci5oCkBAIC01Myw2ICs1Myw4IEBACiAgICAgaW50IGdldFByZXZpZXdTdHJlYW1JZCgpIGNvbnN0OwogCiAgICAgc3RhdHVzX3Qgc2V0UmVjb3JkaW5nQnVmZmVyQ291bnQoc2l6ZV90IGNvdW50KTsKKyAgICBzdGF0dXNfdCBzZXRSZWNvcmRpbmdGb3JtYXQoaW50IGZvcm1hdCwgYW5kcm9pZF9kYXRhc3BhY2VfdCBkYXRhc3BhY2UpOworCiAgICAgc3RhdHVzX3QgdXBkYXRlUmVjb3JkaW5nUmVxdWVzdChjb25zdCBQYXJhbWV0ZXJzICZwYXJhbXMpOwogICAgIC8vIElmIG5lZWRzVXBkYXRlIGlzIHNldCB0byB0cnVlLCBhIHVwZGF0ZVJlY29yZGluZ1N0cmVhbSBjYWxsIHdpdGggcGFyYW1zIHdpbGwgcmVjcmVhdGUKICAgICAvLyByZWNvcmRpbmcgc3RyZWFtCkBAIC0xMjcsNiArMTI5LDE4IEBACiAgICAgVmVjdG9yPEJ1ZmZlckl0ZW0+IG1SZWNvcmRpbmdCdWZmZXJzOwogICAgIHNpemVfdCBtUmVjb3JkaW5nSGVhcEhlYWQsIG1SZWNvcmRpbmdIZWFwRnJlZTsKIAorICAgIHN0YXRpYyBjb25zdCBpbnQga0RlZmF1bHRSZWNvcmRpbmdGb3JtYXQgPQorICAgICAgICAgICAgSEFMX1BJWEVMX0ZPUk1BVF9JTVBMRU1FTlRBVElPTl9ERUZJTkVEOworICAgIGludCBtUmVjb3JkaW5nRm9ybWF0OworCisgICAgc3RhdGljIGNvbnN0IGFuZHJvaWRfZGF0YXNwYWNlIGtEZWZhdWx0UmVjb3JkaW5nRGF0YVNwYWNlID0KKyAgICAgICAgICAgIEhBTF9EQVRBU1BBQ0VfQlQ3MDk7CisgICAgYW5kcm9pZF9kYXRhc3BhY2UgbVJlY29yZGluZ0RhdGFTcGFjZTsKKworICAgIHN0YXRpYyBjb25zdCBpbnQga0RlZmF1bHRSZWNvcmRpbmdHcmFsbG9jVXNhZ2UgPQorICAgICAgICAgICAgR1JBTExPQ19VU0FHRV9IV19WSURFT19FTkNPREVSOworICAgIGludCBtUmVjb3JkaW5nR3JhbGxvY1VzYWdlOworCiAgICAgdmlydHVhbCBib29sIHRocmVhZExvb3AoKTsKIAogICAgIHN0YXR1c190IHByb2Nlc3NSZWNvcmRpbmdGcmFtZSgpOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1pzbFByb2Nlc3Nvci5jcHAgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvWnNsUHJvY2Vzc29yLmNwcAppbmRleCBhMDNmOWM3Li5kODUwMGRmIDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvWnNsUHJvY2Vzc29yLmNwcAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvWnNsUHJvY2Vzc29yLmNwcApAQCAtMTQ3LDcgKzE0Nyw3IEBACiAgICAgICAgIC8vIENoZWNrIGlmIHN0cmVhbSBwYXJhbWV0ZXJzIGhhdmUgdG8gY2hhbmdlCiAgICAgICAgIHVpbnQzMl90IGN1cnJlbnRXaWR0aCwgY3VycmVudEhlaWdodDsKICAgICAgICAgcmVzID0gZGV2aWNlLT5nZXRTdHJlYW1JbmZvKG1ac2xTdHJlYW1JZCwKLSAgICAgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgMCk7CisgICAgICAgICAgICAgICAgJmN1cnJlbnRXaWR0aCwgJmN1cnJlbnRIZWlnaHQsIDAsIDApOwogICAgICAgICBpZiAocmVzICE9IE9LKSB7CiAgICAgICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogRXJyb3IgcXVlcnlpbmcgY2FwdHVyZSBvdXRwdXQgc3RyZWFtIGluZm86ICIKICAgICAgICAgICAgICAgICAgICAgIiVzICglZCkiLCBfX0ZVTkNUSU9OX18sCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvWnNsUHJvY2Vzc29yMy5jcHAgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkxL2NsaWVudDIvWnNsUHJvY2Vzc29yMy5jcHAKaW5kZXggNDcwYTZkNi4uNjk2MjBhYyAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMS9jbGllbnQyL1pzbFByb2Nlc3NvcjMuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTEvY2xpZW50Mi9ac2xQcm9jZXNzb3IzLmNwcApAQCAtMTUwLDcgKzE1MCw3IEBACiAgICAgICAgIC8vIENoZWNrIGlmIHN0cmVhbSBwYXJhbWV0ZXJzIGhhdmUgdG8gY2hhbmdlCiAgICAgICAgIHVpbnQzMl90IGN1cnJlbnRXaWR0aCwgY3VycmVudEhlaWdodDsKICAgICAgICAgcmVzID0gZGV2aWNlLT5nZXRTdHJlYW1JbmZvKG1ac2xTdHJlYW1JZCwKLSAgICAgICAgICAgICAgICAmY3VycmVudFdpZHRoLCAmY3VycmVudEhlaWdodCwgMCk7CisgICAgICAgICAgICAgICAgJmN1cnJlbnRXaWR0aCwgJmN1cnJlbnRIZWlnaHQsIDAsIDApOwogICAgICAgICBpZiAocmVzICE9IE9LKSB7CiAgICAgICAgICAgICBBTE9HRSgiJXM6IENhbWVyYSAlZDogRXJyb3IgcXVlcnlpbmcgY2FwdHVyZSBvdXRwdXQgc3RyZWFtIGluZm86ICIKICAgICAgICAgICAgICAgICAgICAgIiVzICglZCkiLCBfX0ZVTkNUSU9OX18sCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkyL0NhbWVyYURldmljZUNsaWVudC5jcHAgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkyL0NhbWVyYURldmljZUNsaWVudC5jcHAKaW5kZXggYjZmNjY3Ny4uNGQyNzZiZSAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMi9DYW1lcmFEZXZpY2VDbGllbnQuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTIvQ2FtZXJhRGV2aWNlQ2xpZW50LmNwcApAQCAtMjY5LDE0ICsyNjksMzQgQEAKIAogc3RhdHVzX3QgQ2FtZXJhRGV2aWNlQ2xpZW50OjpiZWdpbkNvbmZpZ3VyZSgpIHsKICAgICAvLyBUT0RPOiBJbXBsZW1lbnQgdGhpcy4KLSAgICBBTE9HRSgiJXM6IE5vdCBpbXBsZW1lbnRlZCB5ZXQuIiwgX19GVU5DVElPTl9fKTsKKyAgICBBTE9HVigiJXM6IE5vdCBpbXBsZW1lbnRlZCB5ZXQuIiwgX19GVU5DVElPTl9fKTsKICAgICByZXR1cm4gT0s7CiB9CiAKLXN0YXR1c190IENhbWVyYURldmljZUNsaWVudDo6ZW5kQ29uZmlndXJlKCkgeworc3RhdHVzX3QgQ2FtZXJhRGV2aWNlQ2xpZW50OjplbmRDb25maWd1cmUoYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkKSB7CiAgICAgQUxPR1YoIiVzOiBlbmRpbmcgY29uZmlndXJlICglZCBpbnB1dCBzdHJlYW0sICV6dSBvdXRwdXQgc3RyZWFtcykiLAogICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtSW5wdXRTdHJlYW0uY29uZmlndXJlZCA/IDEgOiAwLCBtU3RyZWFtTWFwLnNpemUoKSk7CiAKKyAgICAvLyBTYW5pdGl6ZSB0aGUgaGlnaCBzcGVlZCBzZXNzaW9uIGFnYWluc3QgbmVjZXNzYXJ5IGNhcGFiaWxpdHkgYml0LgorICAgIGlmIChpc0NvbnN0cmFpbmVkSGlnaFNwZWVkKSB7CisgICAgICAgIENhbWVyYU1ldGFkYXRhIHN0YXRpY0luZm8gPSBtRGV2aWNlLT5pbmZvKCk7CisgICAgICAgIGNhbWVyYV9tZXRhZGF0YV9lbnRyeV90IGVudHJ5ID0gc3RhdGljSW5mby5maW5kKEFORFJPSURfUkVRVUVTVF9BVkFJTEFCTEVfQ0FQQUJJTElUSUVTKTsKKyAgICAgICAgYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkU3VwcG9ydGVkID0gZmFsc2U7CisgICAgICAgIGZvcihzaXplX3QgaSA9IDA7IGkgPCBlbnRyeS5jb3VudDsgKytpKSB7CisgICAgICAgICAgICB1aW50OF90IGNhcGFiaWxpdHkgPSBlbnRyeS5kYXRhLnU4W2ldOworICAgICAgICAgICAgaWYgKGNhcGFiaWxpdHkgPT0gQU5EUk9JRF9SRVFVRVNUX0FWQUlMQUJMRV9DQVBBQklMSVRJRVNfQ09OU1RSQUlORURfSElHSF9TUEVFRF9WSURFTykgeworICAgICAgICAgICAgICAgIGlzQ29uc3RyYWluZWRIaWdoU3BlZWRTdXBwb3J0ZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlmICghaXNDb25zdHJhaW5lZEhpZ2hTcGVlZFN1cHBvcnRlZCkgeworICAgICAgICAgICAgQUxPR0UoIiVzOiBDYW1lcmEgJWQ6IFRyeSB0byBjcmVhdGUgYSBjb25zdHJhaW5lZCBoaWdoIHNwZWVkIGNvbmZpZ3VyYXRpb24gb24gYSBkZXZpY2UiCisgICAgICAgICAgICAgICAgICAgICIgdGhhdCBkb2Vzbid0IHN1cHBvcnQgaXQuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBtQ2FtZXJhSWQpOworICAgICAgICAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOworICAgICAgICB9CisgICAgfQorCiAgICAgc3RhdHVzX3QgcmVzOwogICAgIGlmICggKHJlcyA9IGNoZWNrUGlkKF9fRlVOQ1RJT05fXykgKSAhPSBPSykgcmV0dXJuIHJlczsKIApAQCAtMjg0LDcgKzMwNCw3IEBACiAKICAgICBpZiAoIW1EZXZpY2UuZ2V0KCkpIHJldHVybiBERUFEX09CSkVDVDsKIAotICAgIHJldHVybiBtRGV2aWNlLT5jb25maWd1cmVTdHJlYW1zKCk7CisgICAgcmV0dXJuIG1EZXZpY2UtPmNvbmZpZ3VyZVN0cmVhbXMoaXNDb25zdHJhaW5lZEhpZ2hTcGVlZCk7CiB9CiAKIHN0YXR1c190IENhbWVyYURldmljZUNsaWVudDo6ZGVsZXRlU3RyZWFtKGludCBzdHJlYW1JZCkgewpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMi9DYW1lcmFEZXZpY2VDbGllbnQuaCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2FwaTIvQ2FtZXJhRGV2aWNlQ2xpZW50LmgKaW5kZXggYjhkOGJlYS4uM2JkYTcwYyAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvYXBpMi9DYW1lcmFEZXZpY2VDbGllbnQuaAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9hcGkyL0NhbWVyYURldmljZUNsaWVudC5oCkBAIC03OSw3ICs3OSw3IEBACiAKICAgICB2aXJ0dWFsIHN0YXR1c190IGJlZ2luQ29uZmlndXJlKCk7CiAKLSAgICB2aXJ0dWFsIHN0YXR1c190IGVuZENvbmZpZ3VyZSgpOworICAgIHZpcnR1YWwgc3RhdHVzX3QgZW5kQ29uZmlndXJlKGJvb2wgaXNDb25zdHJhaW5lZEhpZ2hTcGVlZCA9IGZhbHNlKTsKIAogICAgIC8vIFJldHVybnMgLUVCVVNZIGlmIGRldmljZSBpcyBub3QgaWRsZQogICAgIHZpcnR1YWwgc3RhdHVzX3QgICAgICBkZWxldGVTdHJlYW0oaW50IHN0cmVhbUlkKTsKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFEZXZpY2VCYXNlLmggYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9jb21tb24vQ2FtZXJhRGV2aWNlQmFzZS5oCmluZGV4IGYwMmZjMzIuLjI3YzMzYTMgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFEZXZpY2VCYXNlLmgKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvY29tbW9uL0NhbWVyYURldmljZUJhc2UuaApAQCAtMTI4LDcgKzEyOCw4IEBACiAgICAgICogR2V0IGluZm9ybWF0aW9uIGFib3V0IGEgZ2l2ZW4gc3RyZWFtLgogICAgICAqLwogICAgIHZpcnR1YWwgc3RhdHVzX3QgZ2V0U3RyZWFtSW5mbyhpbnQgaWQsCi0gICAgICAgICAgICB1aW50MzJfdCAqd2lkdGgsIHVpbnQzMl90ICpoZWlnaHQsIHVpbnQzMl90ICpmb3JtYXQpID0gMDsKKyAgICAgICAgICAgIHVpbnQzMl90ICp3aWR0aCwgdWludDMyX3QgKmhlaWdodCwKKyAgICAgICAgICAgIHVpbnQzMl90ICpmb3JtYXQsIGFuZHJvaWRfZGF0YXNwYWNlICpkYXRhU3BhY2UpID0gMDsKIAogICAgIC8qKgogICAgICAqIFNldCBzdHJlYW0gZ3JhbGxvYyBidWZmZXIgdHJhbnNmb3JtCkBAIC0xNTcsNyArMTU4LDcgQEAKICAgICAgKiAtIEJBRF9WQUxVRSBpZiB0aGUgc2V0IG9mIHN0cmVhbXMgd2FzIGludmFsaWQgKGUuZy4gZm10cyBvciBzaXplcykKICAgICAgKiAtIElOVkFMSURfT1BFUkFUSU9OIGlmIHRoZSBkZXZpY2Ugd2FzIGluIHRoZSB3cm9uZyBzdGF0ZQogICAgICAqLwotICAgIHZpcnR1YWwgc3RhdHVzX3QgY29uZmlndXJlU3RyZWFtcygpID0gMDsKKyAgICB2aXJ0dWFsIHN0YXR1c190IGNvbmZpZ3VyZVN0cmVhbXMoYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkID0gZmFsc2UpID0gMDsKIAogICAgIC8vIGdldCB0aGUgYnVmZmVyIHByb2R1Y2VyIG9mIHRoZSBpbnB1dCBzdHJlYW0KICAgICB2aXJ0dWFsIHN0YXR1c190IGdldElucHV0QnVmZmVyUHJvZHVjZXIoCmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9jb21tb24vQ2FtZXJhTW9kdWxlLmNwcCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFNb2R1bGUuY3BwCmluZGV4IDJmMDExN2QuLmZjYmY5NTggMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFNb2R1bGUuY3BwCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2NvbW1vbi9DYW1lcmFNb2R1bGUuY3BwCkBAIC0xMTYsNiArMTE2LDIxIEBACiAgICAgICAgIGF2YWlsYWJsZUNoYXJzS2V5cy5wdXNoKEFORFJPSURfU1RBVElTVElDU19JTkZPX0FWQUlMQUJMRV9MRU5TX1NIQURJTkdfTUFQX01PREVTKTsKICAgICAgICAgY2hhcnMudXBkYXRlKEFORFJPSURfUkVRVUVTVF9BVkFJTEFCTEVfQ0hBUkFDVEVSSVNUSUNTX0tFWVMsIGF2YWlsYWJsZUNoYXJzS2V5cyk7CiAKKyAgICAgICAgLy8gTmVlZCB1cGRhdGUgYW5kcm9pZC5jb250cm9sLmF2YWlsYWJsZUhpZ2hTcGVlZFZpZGVvQ29uZmlndXJhdGlvbnMgc2luY2UgSEFMMy4zCisgICAgICAgIC8vIGFkZHMgYmF0Y2ggc2l6ZSB0byB0aGlzIGFycmF5LgorICAgICAgICBlbnRyeSA9IGNoYXJzLmZpbmQoQU5EUk9JRF9DT05UUk9MX0FWQUlMQUJMRV9ISUdIX1NQRUVEX1ZJREVPX0NPTkZJR1VSQVRJT05TKTsKKyAgICAgICAgaWYgKGVudHJ5LmNvdW50ID4gMCkgeworICAgICAgICAgICAgVmVjdG9yPGludDMyX3Q+IGhpZ2hTcGVlZENvbmZpZzsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZW50cnkuY291bnQ7IGkgKz0gNCkgeworICAgICAgICAgICAgICAgIGhpZ2hTcGVlZENvbmZpZy5hZGQoZW50cnkuZGF0YS5pMzJbaV0pOyAvLyB3aWR0aAorICAgICAgICAgICAgICAgIGhpZ2hTcGVlZENvbmZpZy5hZGQoZW50cnkuZGF0YS5pMzJbaSArIDFdKTsgLy8gaGVpZ2h0CisgICAgICAgICAgICAgICAgaGlnaFNwZWVkQ29uZmlnLmFkZChlbnRyeS5kYXRhLmkzMltpICsgMl0pOyAvLyBmcHNfbWluCisgICAgICAgICAgICAgICAgaGlnaFNwZWVkQ29uZmlnLmFkZChlbnRyeS5kYXRhLmkzMltpICsgM10pOyAvLyBmcHNfbWF4CisgICAgICAgICAgICAgICAgaGlnaFNwZWVkQ29uZmlnLmFkZCgxKTsgLy8gYmF0Y2hTaXplX21heC4gZGVmYXVsdCB0byAxIGZvciBIQUwzLjIKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNoYXJzLnVwZGF0ZShBTkRST0lEX0NPTlRST0xfQVZBSUxBQkxFX0hJR0hfU1BFRURfVklERU9fQ09ORklHVVJBVElPTlMsCisgICAgICAgICAgICAgICAgICAgIGhpZ2hTcGVlZENvbmZpZyk7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuOwogfQpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMi9DYW1lcmEyRGV2aWNlLmNwcCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTIvQ2FtZXJhMkRldmljZS5jcHAKaW5kZXggZjY2NDVmMy4uODhmNTU1YiAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMi9DYW1lcmEyRGV2aWNlLmNwcAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UyL0NhbWVyYTJEZXZpY2UuY3BwCkBAIC0zMTUsNyArMzE1LDggQEAKIAogCiBzdGF0dXNfdCBDYW1lcmEyRGV2aWNlOjpnZXRTdHJlYW1JbmZvKGludCBpZCwKLSAgICAgICAgdWludDMyX3QgKndpZHRoLCB1aW50MzJfdCAqaGVpZ2h0LCB1aW50MzJfdCAqZm9ybWF0KSB7CisgICAgICAgIHVpbnQzMl90ICp3aWR0aCwgdWludDMyX3QgKmhlaWdodCwKKyAgICAgICAgdWludDMyX3QgKmZvcm1hdCwgYW5kcm9pZF9kYXRhc3BhY2UgKmRhdGFTcGFjZSkgewogICAgIEFUUkFDRV9DQUxMKCk7CiAgICAgQUxPR1YoIiVzOiBFIiwgX19GVU5DVElPTl9fKTsKICAgICBib29sIGZvdW5kID0gZmFsc2U7CkBAIC0zMzYsNiArMzM3LDcgQEAKICAgICBpZiAod2lkdGgpICp3aWR0aCA9ICgqc3RyZWFtSSktPmdldFdpZHRoKCk7CiAgICAgaWYgKGhlaWdodCkgKmhlaWdodCA9ICgqc3RyZWFtSSktPmdldEhlaWdodCgpOwogICAgIGlmIChmb3JtYXQpICpmb3JtYXQgPSAoKnN0cmVhbUkpLT5nZXRGb3JtYXQoKTsKKyAgICBpZiAoZGF0YVNwYWNlKSAqZGF0YVNwYWNlID0gSEFMX0RBVEFTUEFDRV9VTktOT1dOOwogCiAgICAgcmV0dXJuIE9LOwogfQpAQCAtNDE1LDcgKzQxNyw3IEBACiAgICAgcmV0dXJuIE9LOwogfQogCi1zdGF0dXNfdCBDYW1lcmEyRGV2aWNlOjpjb25maWd1cmVTdHJlYW1zKCkgeworc3RhdHVzX3QgQ2FtZXJhMkRldmljZTo6Y29uZmlndXJlU3RyZWFtcyhib29sIGlzQ29uc3RyYWluZWRIaWdoU3BlZWQpIHsKICAgICBBVFJBQ0VfQ0FMTCgpOwogICAgIEFMT0dWKCIlczogRSIsIF9fRlVOQ1RJT05fXyk7CiAKZGlmZiAtLWdpdCBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTIvQ2FtZXJhMkRldmljZS5oIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMi9DYW1lcmEyRGV2aWNlLmgKaW5kZXggZmQxMjQwYS4uYTAwMWE5MSAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMi9DYW1lcmEyRGV2aWNlLmgKKysrIGIvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMi9DYW1lcmEyRGV2aWNlLmgKQEAgLTYzLDEyICs2MywxMyBAQAogICAgICAgICAgICAgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCwgaW50IGZvcm1hdCwgaW50ICppZCk7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBjcmVhdGVSZXByb2Nlc3NTdHJlYW1Gcm9tU3RyZWFtKGludCBvdXRwdXRJZCwgaW50ICppZCk7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBnZXRTdHJlYW1JbmZvKGludCBpZCwKLSAgICAgICAgICAgIHVpbnQzMl90ICp3aWR0aCwgdWludDMyX3QgKmhlaWdodCwgdWludDMyX3QgKmZvcm1hdCk7CisgICAgICAgICAgICB1aW50MzJfdCAqd2lkdGgsIHVpbnQzMl90ICpoZWlnaHQsCisgICAgICAgICAgICB1aW50MzJfdCAqZm9ybWF0LCBhbmRyb2lkX2RhdGFzcGFjZSAqZGF0YVNwYWNlKTsKICAgICB2aXJ0dWFsIHN0YXR1c190IHNldFN0cmVhbVRyYW5zZm9ybShpbnQgaWQsIGludCB0cmFuc2Zvcm0pOwogICAgIHZpcnR1YWwgc3RhdHVzX3QgZGVsZXRlU3RyZWFtKGludCBpZCk7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBkZWxldGVSZXByb2Nlc3NTdHJlYW0oaW50IGlkKTsKICAgICAvLyBOby1vcCBvbiBIQUwyIGRldmljZXMKLSAgICB2aXJ0dWFsIHN0YXR1c190IGNvbmZpZ3VyZVN0cmVhbXMoKTsKKyAgICB2aXJ0dWFsIHN0YXR1c190IGNvbmZpZ3VyZVN0cmVhbXMoYm9vbCBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkID0gZmFsc2UpOwogICAgIHZpcnR1YWwgc3RhdHVzX3QgZ2V0SW5wdXRCdWZmZXJQcm9kdWNlcigKICAgICAgICAgICAgIHNwPElHcmFwaGljQnVmZmVyUHJvZHVjZXI+ICpwcm9kdWNlcik7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBjcmVhdGVEZWZhdWx0UmVxdWVzdChpbnQgdGVtcGxhdGVJZCwgQ2FtZXJhTWV0YWRhdGEgKnJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMy9DYW1lcmEzRGV2aWNlLmNwcCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTMvQ2FtZXJhM0RldmljZS5jcHAKaW5kZXggNDVkOTQyMS4uYjE2Yjg4MSAxMDA2NDQKLS0tIGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMy9DYW1lcmEzRGV2aWNlLmNwcAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UzL0NhbWVyYTNEZXZpY2UuY3BwCkBAIC01Nyw2ICs1Nyw3IEBACiAKIENhbWVyYTNEZXZpY2U6OkNhbWVyYTNEZXZpY2UoaW50IGlkKToKICAgICAgICAgbUlkKGlkKSwKKyAgICAgICAgbUlzQ29uc3RyYWluZWRIaWdoU3BlZWRDb25maWd1cmF0aW9uKGZhbHNlKSwKICAgICAgICAgbUhhbDNEZXZpY2UoTlVMTCksCiAgICAgICAgIG1TdGF0dXMoU1RBVFVTX1VOSU5JVElBTElaRUQpLAogICAgICAgICBtVXNlUGFydGlhbFJlc3VsdChmYWxzZSksCkBAIC00MTksNiArNDIwLDggQEAKICAgICAgICAgbGluZXMuYXBwZW5kRm9ybWF0KCIgICAgRXJyb3IgY2F1c2U6ICVzXG4iLCBtRXJyb3JDYXVzZS5zdHJpbmcoKSk7CiAgICAgfQogICAgIGxpbmVzLmFwcGVuZEZvcm1hdCgiICAgIFN0cmVhbSBjb25maWd1cmF0aW9uOlxuIik7CisgICAgbGluZXMuYXBwZW5kRm9ybWF0KCIgICAgT3BlcmF0aW9uIG1vZGU6ICVzIFxuIiwgbUlzQ29uc3RyYWluZWRIaWdoU3BlZWRDb25maWd1cmF0aW9uID8KKyAgICAgICAgICAgICJDT05TVFJBSU5FRCBISUdIIFNQRUVEIFZJREVPIiA6ICJOT1JNQUwiKTsKIAogICAgIGlmIChtSW5wdXRTdHJlYW0gIT0gTlVMTCkgewogICAgICAgICB3cml0ZShmZCwgbGluZXMuc3RyaW5nKCksIGxpbmVzLnNpemUoKSk7CkBAIC05MDIsNyArOTA1LDggQEAKIAogCiBzdGF0dXNfdCBDYW1lcmEzRGV2aWNlOjpnZXRTdHJlYW1JbmZvKGludCBpZCwKLSAgICAgICAgdWludDMyX3QgKndpZHRoLCB1aW50MzJfdCAqaGVpZ2h0LCB1aW50MzJfdCAqZm9ybWF0KSB7CisgICAgICAgIHVpbnQzMl90ICp3aWR0aCwgdWludDMyX3QgKmhlaWdodCwKKyAgICAgICAgdWludDMyX3QgKmZvcm1hdCwgYW5kcm9pZF9kYXRhc3BhY2UgKmRhdGFTcGFjZSkgewogICAgIEFUUkFDRV9DQUxMKCk7CiAgICAgTXV0ZXg6OkF1dG9sb2NrIGlsKG1JbnRlcmZhY2VMb2NrKTsKICAgICBNdXRleDo6QXV0b2xvY2sgbChtTG9jayk7CkBAIC05MzMsNyArOTM3LDcgQEAKICAgICBpZiAod2lkdGgpICp3aWR0aCAgPSBtT3V0cHV0U3RyZWFtc1tpZHhdLT5nZXRXaWR0aCgpOwogICAgIGlmIChoZWlnaHQpICpoZWlnaHQgPSBtT3V0cHV0U3RyZWFtc1tpZHhdLT5nZXRIZWlnaHQoKTsKICAgICBpZiAoZm9ybWF0KSAqZm9ybWF0ID0gbU91dHB1dFN0cmVhbXNbaWR4XS0+Z2V0Rm9ybWF0KCk7Ci0KKyAgICBpZiAoZGF0YVNwYWNlKSAqZGF0YVNwYWNlID0gbU91dHB1dFN0cmVhbXNbaWR4XS0+Z2V0RGF0YVNwYWNlKCk7CiAgICAgcmV0dXJuIE9LOwogfQogCkBAIC0xMDIzLDEyICsxMDI3LDEzIEBACiAgICAgcmV0dXJuIElOVkFMSURfT1BFUkFUSU9OOwogfQogCi1zdGF0dXNfdCBDYW1lcmEzRGV2aWNlOjpjb25maWd1cmVTdHJlYW1zKCkgeworc3RhdHVzX3QgQ2FtZXJhM0RldmljZTo6Y29uZmlndXJlU3RyZWFtcyhib29sIGlzQ29uc3RyYWluZWRIaWdoU3BlZWQpIHsKICAgICBBVFJBQ0VfQ0FMTCgpOwogICAgIEFMT0dWKCIlczogRSIsIF9fRlVOQ1RJT05fXyk7CiAKICAgICBNdXRleDo6QXV0b2xvY2sgaWwobUludGVyZmFjZUxvY2spOwogICAgIE11dGV4OjpBdXRvbG9jayBsKG1Mb2NrKTsKKyAgICBtSXNDb25zdHJhaW5lZEhpZ2hTcGVlZENvbmZpZ3VyYXRpb24gPSBpc0NvbnN0cmFpbmVkSGlnaFNwZWVkOwogCiAgICAgcmV0dXJuIGNvbmZpZ3VyZVN0cmVhbXNMb2NrZWQoKTsKIH0KQEAgLTE1MjgsNyArMTUzMyw5IEBACiAgICAgQUxPR1YoIiVzOiBDYW1lcmEgJWQ6IFN0YXJ0aW5nIHN0cmVhbSBjb25maWd1cmF0aW9uIiwgX19GVU5DVElPTl9fLCBtSWQpOwogCiAgICAgY2FtZXJhM19zdHJlYW1fY29uZmlndXJhdGlvbiBjb25maWc7Ci0KKyAgICBjb25maWcub3BlcmF0aW9uX21vZGUgPSBtSXNDb25zdHJhaW5lZEhpZ2hTcGVlZENvbmZpZ3VyYXRpb24gPworICAgICAgICAgICAgQ0FNRVJBM19TVFJFQU1fQ09ORklHVVJBVElPTl9DT05TVFJBSU5FRF9ISUdIX1NQRUVEX01PREUgOgorICAgICAgICAgICAgQ0FNRVJBM19TVFJFQU1fQ09ORklHVVJBVElPTl9OT1JNQUxfTU9ERTsKICAgICBjb25maWcubnVtX3N0cmVhbXMgPSAobUlucHV0U3RyZWFtICE9IE5VTEwpICsgbU91dHB1dFN0cmVhbXMuc2l6ZSgpOwogCiAgICAgVmVjdG9yPGNhbWVyYTNfc3RyZWFtX3QqPiBzdHJlYW1zOwpkaWZmIC0tZ2l0IGEvc2VydmljZXMvY2FtZXJhL2xpYmNhbWVyYXNlcnZpY2UvZGV2aWNlMy9DYW1lcmEzRGV2aWNlLmggYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UzL0NhbWVyYTNEZXZpY2UuaAppbmRleCBiOTMxM2ZjLi4xODBiMWY4IDEwMDY0NAotLS0gYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UzL0NhbWVyYTNEZXZpY2UuaAorKysgYi9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UzL0NhbWVyYTNEZXZpY2UuaApAQCAtMTA5LDEzICsxMDksMTQgQEAKICAgICB2aXJ0dWFsIHN0YXR1c190IGNyZWF0ZVJlcHJvY2Vzc1N0cmVhbUZyb21TdHJlYW0oaW50IG91dHB1dElkLCBpbnQgKmlkKTsKIAogICAgIHZpcnR1YWwgc3RhdHVzX3QgZ2V0U3RyZWFtSW5mbyhpbnQgaWQsCi0gICAgICAgICAgICB1aW50MzJfdCAqd2lkdGgsIHVpbnQzMl90ICpoZWlnaHQsIHVpbnQzMl90ICpmb3JtYXQpOworICAgICAgICAgICAgdWludDMyX3QgKndpZHRoLCB1aW50MzJfdCAqaGVpZ2h0LAorICAgICAgICAgICAgdWludDMyX3QgKmZvcm1hdCwgYW5kcm9pZF9kYXRhc3BhY2UgKmRhdGFTcGFjZSk7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBzZXRTdHJlYW1UcmFuc2Zvcm0oaW50IGlkLCBpbnQgdHJhbnNmb3JtKTsKIAogICAgIHZpcnR1YWwgc3RhdHVzX3QgZGVsZXRlU3RyZWFtKGludCBpZCk7CiAgICAgdmlydHVhbCBzdGF0dXNfdCBkZWxldGVSZXByb2Nlc3NTdHJlYW0oaW50IGlkKTsKIAotICAgIHZpcnR1YWwgc3RhdHVzX3QgY29uZmlndXJlU3RyZWFtcygpOworICAgIHZpcnR1YWwgc3RhdHVzX3QgY29uZmlndXJlU3RyZWFtcyhib29sIGlzQ29uc3RyYWllZEhpZ2hTcGVlZCA9IGZhbHNlKTsKICAgICB2aXJ0dWFsIHN0YXR1c190IGdldElucHV0QnVmZmVyUHJvZHVjZXIoCiAgICAgICAgICAgICBzcDxJR3JhcGhpY0J1ZmZlclByb2R1Y2VyPiAqcHJvZHVjZXIpOwogCkBAIC0xNzMsNiArMTc0LDkgQEAKICAgICAvLyBDYW1lcmEgZGV2aWNlIElECiAgICAgY29uc3QgaW50ICAgICAgICAgICAgICAgICAgbUlkOwogCisgICAgLy8gRmxhZyBpbmRpY2F0aW5nIGlzIHRoZSBjdXJyZW50IGFjdGl2ZSBzdHJlYW0gY29uZmlndXJhdGlvbiBpcyBjb25zdHJhaW5lZCBoaWdoIHNwZWVkLgorICAgIGJvb2wgICAgICAgICAgICAgICAgICAgICAgIG1Jc0NvbnN0cmFpbmVkSGlnaFNwZWVkQ29uZmlndXJhdGlvbjsKKwogICAgIC8qKioqIFNjb3BlIGZvciBtTG9jayAqKioqLwogCiAgICAgY2FtZXJhM19kZXZpY2VfdCAgICAgICAgICAqbUhhbDNEZXZpY2U7CmRpZmYgLS1naXQgYS9zZXJ2aWNlcy9jYW1lcmEvbGliY2FtZXJhc2VydmljZS9kZXZpY2UzL0NhbWVyYTNTdHJlYW1JbnRlcmZhY2UuaCBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTMvQ2FtZXJhM1N0cmVhbUludGVyZmFjZS5oCmluZGV4IGQxNzdiNTcuLjZjODdhNDUgMTAwNjQ0Ci0tLSBhL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTMvQ2FtZXJhM1N0cmVhbUludGVyZmFjZS5oCisrKyBiL3NlcnZpY2VzL2NhbWVyYS9saWJjYW1lcmFzZXJ2aWNlL2RldmljZTMvQ2FtZXJhM1N0cmVhbUludGVyZmFjZS5oCkBAIC00NSw2ICs0NSw3IEBACiAgICAgdmlydHVhbCB1aW50MzJfdCBnZXRXaWR0aCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHVpbnQzMl90IGdldEhlaWdodCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGludCAgICAgIGdldEZvcm1hdCgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGFuZHJvaWRfZGF0YXNwYWNlIGdldERhdGFTcGFjZSgpIGNvbnN0ID0gMDsKIAogICAgIC8qKgogICAgICAqIFN0YXJ0IHRoZSBzdHJlYW0gY29uZmlndXJhdGlvbiBwcm9jZXNzLiBSZXR1cm5zIGEgaGFuZGxlIHRvIHRoZSBzdHJlYW0ncwo=