176876 2017-09-13 14:08:18 -0700 [JSC] Move class/struct used in other class' member out of anonymous namespace 2017-09-27 12:31:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki buildbot cgarcia clopez commit-queue keith_miller mark.lam mcatanzaro msaboff saam webkit-bug-importer oldest_to_newest 1348494 0 ysuzuki 2017-09-13 14:08:18 -0700 [JSC] Move class/struct used in other class' member out of anonymous namespace 1348495 1 320691 ysuzuki 2017-09-13 14:15:01 -0700 Created attachment 320691 Patch 1348496 2 320692 ysuzuki 2017-09-13 14:17:54 -0700 Created attachment 320692 Patch 1348619 3 320692 commit-queue 2017-09-13 20:32:52 -0700 Comment on attachment 320692 Patch Clearing flags on attachment: 320692 Committed r222007: <http://trac.webkit.org/changeset/222007> 1348620 4 commit-queue 2017-09-13 20:32:54 -0700 All reviewed patches have been landed. Closing bug. 1348625 5 mcatanzaro 2017-09-13 20:45:01 -0700 *** Bug 176869 has been marked as a duplicate of this bug. *** 1353447 6 webkit-bug-importer 2017-09-27 12:31:39 -0700 <rdar://problem/34693427> 320691 2017-09-13 14:15:01 -0700 2017-09-13 14:17:52 -0700 Patch bug-176876-20170914061500.patch text/plain 9782 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxOTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NDdiM2U3MTM0NzRmNjQzODQ3NDY1YjdjNWMwMGU4MzczMmU2NDYyLi4wODI2NWRjM2M1MmNmN2Mw YzYxMzhjMjc0N2JkMDEzMDk4YjY0MTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNiBAQAogMjAxNy0wOS0xMyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbSlNDXSBNb3ZlIGNsYXNzL3N0cnVjdCB1c2VkIGluIG90aGVyIGNs YXNzJyBtZW1iZXIgb3V0IG9mIGFub255bW91cyBuYW1lc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Njg3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdDQyB3YXJucyBpZiBhIGNsYXNzIGhhcyBh IGJhc2Ugb3IgZmllbGQgd2hvc2UgdHlwZSB1c2VzIHRoZSBhbm9ueW1vdXMgbmFtZXNwYWNlCisg ICAgICAgIGFuZCBpdCBpcyBkZWZpbmVkIGluIGFuIGluY2x1ZGVkIGZpbGUuIFRoaXMgaXMgYmVj YXVzZSB0aGlzIHBvc3NpYmx5IHZpb2xhdGVzCisgICAgICAgIG9uZSBkZWZpbml0aW9uIHJ1bGUg KE9EUik6IGlmIHRoZSBmaWxlIGluY2x1ZGluZyB0aGUgYW5vbnltb3VzIG5hbWVzcGFjZSwgZWFj aAorICAgICAgICB0cmFuc2xhdGlvbiB1bml0IGNyZWF0ZXMgaXRzIHByaXZhdGUgYW5vbnltb3Vz IG5hbWVzcGFjZS4gVGh1cywgZWFjaCB0eXBlCisgICAgICAgIGJlY29tZXMgZGlmZmVyZW50Lgor CisgICAgICAgIFdoaWxlIHRoZSBjdXJyZW50IHVzZSBpbiBKU0MgaXMgbm90IHZpb2xhdGluZyBP RFIgc2luY2UgdGhlc2UgY3BwIGZpbGVzIGFyZSBpbmNsdWRlZAorICAgICAgICBvbmx5IG9uY2Ug Zm9yIHVuaWZpZWQgc291cmNlcywgc3BlY2lmeWluZyBgLVduby1zdWJvYmplY3QtbGlua2FnZWAg Y291bGQgbWlzcworICAgICAgICB0aGUgYWN0dWFsIGJ1Z3MuIFNvLCBpbiB0aGlzIHBhdGNoLCB3 ZSBqdXN0IG1vdmUgcmVsYXRlZCBjbGFzc2VzL3N0cnVjdHMgb3V0IG9mCisgICAgICAgIHRoZSBh bm9ueW1vdXMgbmFtZXNwYWNlLgorCisgICAgICAgICogZGZnL0RGR0ludGVnZXJDaGVja0NvbWJp bmluZ1BoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQ aGFzZTo6UmFuZ2VLZXk6OmFkZGl0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpJbnRlZ2VyQ2hl Y2tDb21iaW5pbmdQaGFzZTo6UmFuZ2VLZXk6OmFycmF5Qm91bmRzKToKKyAgICAgICAgKEpTQzo6 REZHOjpJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQaGFzZTo6UmFuZ2VLZXk6Om9wZXJhdG9yISBjb25z dCk6CisgICAgICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNrQ29tYmluaW5nUGhhc2U6OlJhbmdl S2V5OjpoYXNoIGNvbnN0KToKKyAgICAgICAgKEpTQzo6REZHOjpJbnRlZ2VyQ2hlY2tDb21iaW5p bmdQaGFzZTo6UmFuZ2VLZXk6Om9wZXJhdG9yPT0gY29uc3QpOgorICAgICAgICAoSlNDOjpERkc6 OkludGVnZXJDaGVja0NvbWJpbmluZ1BoYXNlOjpSYW5nZUtleTo6ZHVtcCBjb25zdCk6CisgICAg ICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNrQ29tYmluaW5nUGhhc2U6OlJhbmdlS2V5QW5kQWRk ZW5kOjpSYW5nZUtleUFuZEFkZGVuZCk6CisgICAgICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNr Q29tYmluaW5nUGhhc2U6OlJhbmdlS2V5QW5kQWRkZW5kOjpvcGVyYXRvciEgY29uc3QpOgorICAg ICAgICAoSlNDOjpERkc6OkludGVnZXJDaGVja0NvbWJpbmluZ1BoYXNlOjpSYW5nZUtleUFuZEFk ZGVuZDo6ZHVtcCBjb25zdCk6CisgICAgICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNrQ29tYmlu aW5nUGhhc2U6OlJhbmdlOjpkdW1wIGNvbnN0KToKKyAgICAgICAgKiBkZmcvREZHTElDTVBoYXNl LmNwcDoKKworMjAxNy0wOS0xMyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNv bT4KKwogICAgICAgICBbSlNDXSBGaXggQXJyYXkgYWxsb2NhdGlvbiBpbiBPYmplY3Qua2V5cwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2ODI2CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSW50ZWdlckNoZWNrQ29t YmluaW5nUGhhc2UuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdJbnRlZ2VyQ2hl Y2tDb21iaW5pbmdQaGFzZS5jcHAKaW5kZXggOThlMGY2ZmRmMjg4MTQ3YTgxZTljYjdmOWYxYjg5 OTY1NmZkOTFlMi4uNzA4NWRmYjk3Zjg3MmZjNDA1ZWNjNWYzNjEwNjFkZWIwYzljMDdmMiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdJbnRlZ2VyQ2hlY2tDb21iaW5p bmdQaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdJbnRlZ2VyQ2hl Y2tDb21iaW5pbmdQaGFzZS5jcHAKQEAgLTM5LDE0MCArMzksMTE5IEBACiAKIG5hbWVzcGFjZSBK U0MgeyBuYW1lc3BhY2UgREZHIHsKIAotbmFtZXNwYWNlIHsKLQogbmFtZXNwYWNlIERGR0ludGVn ZXJDaGVja0NvbWJpbmluZ1BoYXNlSW50ZXJuYWwgewogc3RhdGljIGNvbnN0IGJvb2wgdmVyYm9z ZSA9IGZhbHNlOwogfQogCi1lbnVtIFJhbmdlS2luZCB7Ci0gICAgSW52YWxpZFJhbmdlS2luZCwK LSAgICAKLSAgICAvLyBUaGlzIG1lYW5zIHdlIGRpZCBBcml0aEFkZCB3aXRoIENoZWNrT3ZlcmZs b3cuCi0gICAgQWRkaXRpb24sCi0gICAgCi0gICAgLy8gVGhpcyBtZWFucyB3ZSBkaWQgQ2hlY2tJ bkJvdW5kcyBvbiBzb21lIGxlbmd0aC4KLSAgICBBcnJheUJvdW5kcwotfTsKK2NsYXNzIEludGVn ZXJDaGVja0NvbWJpbmluZ1BoYXNlIDogcHVibGljIFBoYXNlIHsKK3B1YmxpYzoKKyAgICBlbnVt IFJhbmdlS2luZCB7CisgICAgICAgIEludmFsaWRSYW5nZUtpbmQsCisgICAgICAgIAorICAgICAg ICAvLyBUaGlzIG1lYW5zIHdlIGRpZCBBcml0aEFkZCB3aXRoIENoZWNrT3ZlcmZsb3cuCisgICAg ICAgIEFkZGl0aW9uLAorICAgICAgICAKKyAgICAgICAgLy8gVGhpcyBtZWFucyB3ZSBkaWQgQ2hl Y2tJbkJvdW5kcyBvbiBzb21lIGxlbmd0aC4KKyAgICAgICAgQXJyYXlCb3VuZHMKKyAgICB9Owog Ci1zdHJ1Y3QgUmFuZ2VLZXkgewotICAgIFJhbmdlS2V5KCkKLSAgICAgICAgOiBtX2tpbmQoSW52 YWxpZFJhbmdlS2luZCkKLSAgICAgICAgLCBtX2tleShudWxscHRyKQotICAgIHsKLSAgICB9Ci0g ICAgCi0gICAgc3RhdGljIFJhbmdlS2V5IGFkZGl0aW9uKEVkZ2UgZWRnZSkKLSAgICB7Ci0gICAg ICAgIFJhbmdlS2V5IHJlc3VsdDsKLSAgICAgICAgcmVzdWx0Lm1fa2luZCA9IEFkZGl0aW9uOwot ICAgICAgICByZXN1bHQubV9zb3VyY2UgPSBlZGdlLnNhbml0aXplZCgpOwotICAgICAgICByZXN1 bHQubV9rZXkgPSAwOwotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0KLSAgICAKLSAgICBz dGF0aWMgUmFuZ2VLZXkgYXJyYXlCb3VuZHMoRWRnZSBlZGdlLCBOb2RlKiBrZXkpCi0gICAgewot ICAgICAgICBSYW5nZUtleSByZXN1bHQ7Ci0gICAgICAgIHJlc3VsdC5tX2tpbmQgPSBBcnJheUJv dW5kczsKLSAgICAgICAgcmVzdWx0Lm1fc291cmNlID0gZWRnZS5zYW5pdGl6ZWQoKTsKLSAgICAg ICAgcmVzdWx0Lm1fa2V5ID0ga2V5OwotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0KLSAg ICAKLSAgICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuIG1fa2luZCA9PSBJbnZhbGlk UmFuZ2VLaW5kOyB9Ci0gICAgCi0gICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0Ci0gICAgewotICAg ICAgICByZXR1cm4gbV9raW5kICsgbV9zb3VyY2UuaGFzaCgpICsgUHRySGFzaDxOb2RlKj46Omhh c2gobV9rZXkpOwotICAgIH0KLSAgICAKLSAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgUmFuZ2VL ZXkmIG90aGVyKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fa2luZCA9PSBvdGhlci5t X2tpbmQKLSAgICAgICAgICAgICYmIG1fc291cmNlID09IG90aGVyLm1fc291cmNlCi0gICAgICAg ICAgICAmJiBtX2tleSA9PSBvdGhlci5tX2tleTsKLSAgICB9Ci0gICAgCi0gICAgdm9pZCBkdW1w KFByaW50U3RyZWFtJiBvdXQpIGNvbnN0Ci0gICAgewotICAgICAgICBzd2l0Y2ggKG1fa2luZCkg ewotICAgICAgICBjYXNlIEludmFsaWRSYW5nZUtpbmQ6Ci0gICAgICAgICAgICBvdXQucHJpbnQo IkludmFsaWRSYW5nZUtpbmQoIik7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBB ZGRpdGlvbjoKLSAgICAgICAgICAgIG91dC5wcmludCgiQWRkaXRpb24oIik7Ci0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgY2FzZSBBcnJheUJvdW5kczoKLSAgICAgICAgICAgIG91dC5wcmlu dCgiQXJyYXlCb3VuZHMoIik7Ci0gICAgICAgICAgICBicmVhazsKKyAgICBzdHJ1Y3QgUmFuZ2VL ZXkgeworICAgICAgICBzdGF0aWMgUmFuZ2VLZXkgYWRkaXRpb24oRWRnZSBlZGdlKQorICAgICAg ICB7CisgICAgICAgICAgICBSYW5nZUtleSByZXN1bHQ7CisgICAgICAgICAgICByZXN1bHQubV9r aW5kID0gQWRkaXRpb247CisgICAgICAgICAgICByZXN1bHQubV9zb3VyY2UgPSBlZGdlLnNhbml0 aXplZCgpOworICAgICAgICAgICAgcmVzdWx0Lm1fa2V5ID0gMDsKKyAgICAgICAgICAgIHJldHVy biByZXN1bHQ7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKG1fc291cmNlKQotICAgICAgICAgICAg b3V0LnByaW50KG1fc291cmNlKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgb3V0LnByaW50 KCJudWxsIik7Ci0gICAgICAgIG91dC5wcmludCgiLCAiKTsKLSAgICAgICAgaWYgKG1fa2V5KQot ICAgICAgICAgICAgb3V0LnByaW50KG1fa2V5KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAg b3V0LnByaW50KCJudWxsIik7Ci0gICAgICAgIG91dC5wcmludCgiKSIpOwotICAgIH0KLSAgICAK LSAgICBSYW5nZUtpbmQgbV9raW5kOwotICAgIEVkZ2UgbV9zb3VyY2U7Ci0gICAgTm9kZSogbV9r ZXk7Ci19OwotCi1zdHJ1Y3QgUmFuZ2VLZXlBbmRBZGRlbmQgewotICAgIFJhbmdlS2V5QW5kQWRk ZW5kKCkKLSAgICAgICAgOiBtX2FkZGVuZCgwKQotICAgIHsKLSAgICB9Ci0gICAgCi0gICAgUmFu Z2VLZXlBbmRBZGRlbmQoUmFuZ2VLZXkga2V5LCBpbnQzMl90IGFkZGVuZCkKLSAgICAgICAgOiBt X2tleShrZXkpCi0gICAgICAgICwgbV9hZGRlbmQoYWRkZW5kKQotICAgIHsKLSAgICB9Ci0gICAg Ci0gICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiAhbV9rZXkgJiYgIW1fYWRkZW5k OyB9Ci0gICAgCi0gICAgdm9pZCBkdW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0Ci0gICAgewot ICAgICAgICBvdXQucHJpbnQobV9rZXksICIgKyAiLCBtX2FkZGVuZCk7Ci0gICAgfQotICAgIAot ICAgIFJhbmdlS2V5IG1fa2V5OwotICAgIGludDMyX3QgbV9hZGRlbmQ7Ci19OworICAgICAgICAK KyAgICAgICAgc3RhdGljIFJhbmdlS2V5IGFycmF5Qm91bmRzKEVkZ2UgZWRnZSwgTm9kZSoga2V5 KQorICAgICAgICB7CisgICAgICAgICAgICBSYW5nZUtleSByZXN1bHQ7CisgICAgICAgICAgICBy ZXN1bHQubV9raW5kID0gQXJyYXlCb3VuZHM7CisgICAgICAgICAgICByZXN1bHQubV9zb3VyY2Ug PSBlZGdlLnNhbml0aXplZCgpOworICAgICAgICAgICAgcmVzdWx0Lm1fa2V5ID0ga2V5OworICAg ICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgYm9v bCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiBtX2tpbmQgPT0gSW52YWxpZFJhbmdlS2luZDsg fQorICAgICAgICAKKyAgICAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0CisgICAgICAgIHsKKyAg ICAgICAgICAgIHJldHVybiBtX2tpbmQgKyBtX3NvdXJjZS5oYXNoKCkgKyBQdHJIYXNoPE5vZGUq Pjo6aGFzaChtX2tleSk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGJvb2wgb3BlcmF0 b3I9PShjb25zdCBSYW5nZUtleSYgb3RoZXIpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiBtX2tpbmQgPT0gb3RoZXIubV9raW5kCisgICAgICAgICAgICAgICAgJiYgbV9zb3Vy Y2UgPT0gb3RoZXIubV9zb3VyY2UKKyAgICAgICAgICAgICAgICAmJiBtX2tleSA9PSBvdGhlci5t X2tleTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgdm9pZCBkdW1wKFByaW50U3RyZWFt JiBvdXQpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIHN3aXRjaCAobV9raW5kKSB7Cisg ICAgICAgICAgICBjYXNlIEludmFsaWRSYW5nZUtpbmQ6CisgICAgICAgICAgICAgICAgb3V0LnBy aW50KCJJbnZhbGlkUmFuZ2VLaW5kKCIpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgY2FzZSBBZGRpdGlvbjoKKyAgICAgICAgICAgICAgICBvdXQucHJpbnQoIkFkZGl0aW9u KCIpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBBcnJheUJvdW5k czoKKyAgICAgICAgICAgICAgICBvdXQucHJpbnQoIkFycmF5Qm91bmRzKCIpOworICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKG1fc291cmNlKQor ICAgICAgICAgICAgICAgIG91dC5wcmludChtX3NvdXJjZSk7CisgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgb3V0LnByaW50KCJudWxsIik7CisgICAgICAgICAgICBvdXQucHJpbnQo IiwgIik7CisgICAgICAgICAgICBpZiAobV9rZXkpCisgICAgICAgICAgICAgICAgb3V0LnByaW50 KG1fa2V5KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBvdXQucHJpbnQoIm51 bGwiKTsKKyAgICAgICAgICAgIG91dC5wcmludCgiKSIpOworICAgICAgICB9CisgICAgICAgIAor ICAgICAgICBSYW5nZUtpbmQgbV9raW5kIHsgSW52YWxpZFJhbmdlS2luZCB9OworICAgICAgICBF ZGdlIG1fc291cmNlOworICAgICAgICBOb2RlKiBtX2tleSB7IG51bGxwdHIgfTsKKyAgICB9Owog Ci1zdHJ1Y3QgUmFuZ2UgewotICAgIFJhbmdlKCkKLSAgICAgICAgOiBtX21pbkJvdW5kKDApCi0g ICAgICAgICwgbV9tYXhCb3VuZCgwKQotICAgICAgICAsIG1fY291bnQoMCkKLSAgICAgICAgLCBt X2hvaXN0ZWQoZmFsc2UpCi0gICAgewotICAgIH0KLSAgICAKLSAgICB2b2lkIGR1bXAoUHJpbnRT dHJlYW0mIG91dCkgY29uc3QKLSAgICB7Ci0gICAgICAgIG91dC5wcmludCgiKCIsIG1fbWluQm91 bmQsICIgQCIsIG1fbWluT3JpZ2luLCAiKSAuLiAoIiwgbV9tYXhCb3VuZCwgIiBAIiwgbV9tYXhP cmlnaW4sICIpLCBjb3VudCA9ICIsIG1fY291bnQsICIsIGhvaXN0ZWQgPSAiLCBtX2hvaXN0ZWQp OwotICAgIH0KLSAgICAKLSAgICBpbnQzMl90IG1fbWluQm91bmQ7Ci0gICAgQ29kZU9yaWdpbiBt X21pbk9yaWdpbjsKLSAgICBpbnQzMl90IG1fbWF4Qm91bmQ7Ci0gICAgQ29kZU9yaWdpbiBtX21h eE9yaWdpbjsKLSAgICB1bnNpZ25lZCBtX2NvdW50OyAvLyBJZiB0aGlzIGlzIHplcm8gdGhlbiB0 aGUgYm91bmRzIHdvbid0IG5lY2Vzc2FyaWx5IG1ha2Ugc2Vuc2UuCi0gICAgYm9vbCBtX2hvaXN0 ZWQ7Ci19OworICAgIHN0cnVjdCBSYW5nZUtleUFuZEFkZGVuZCB7CisgICAgICAgIFJhbmdlS2V5 QW5kQWRkZW5kKCkgPSBkZWZhdWx0OworICAgICAgICAKKyAgICAgICAgUmFuZ2VLZXlBbmRBZGRl bmQoUmFuZ2VLZXkga2V5LCBpbnQzMl90IGFkZGVuZCkKKyAgICAgICAgICAgIDogbV9rZXkoa2V5 KQorICAgICAgICAgICAgLCBtX2FkZGVuZChhZGRlbmQpCisgICAgICAgIHsKKyAgICAgICAgfQor ICAgICAgICAKKyAgICAgICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiAhbV9rZXkg JiYgIW1fYWRkZW5kOyB9CisgICAgICAgIAorICAgICAgICB2b2lkIGR1bXAoUHJpbnRTdHJlYW0m IG91dCkgY29uc3QKKyAgICAgICAgeworICAgICAgICAgICAgb3V0LnByaW50KG1fa2V5LCAiICsg IiwgbV9hZGRlbmQpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBSYW5nZUtleSBtX2tl eTsKKyAgICAgICAgaW50MzJfdCBtX2FkZGVuZCB7IDAgfTsKKyAgICB9OwogCi19IC8vIGFub255 bW91cyBuYW1lc3BhY2UKKyAgICBzdHJ1Y3QgUmFuZ2UgeworICAgICAgICB2b2lkIGR1bXAoUHJp bnRTdHJlYW0mIG91dCkgY29uc3QKKyAgICAgICAgeworICAgICAgICAgICAgb3V0LnByaW50KCIo IiwgbV9taW5Cb3VuZCwgIiBAIiwgbV9taW5PcmlnaW4sICIpIC4uICgiLCBtX21heEJvdW5kLCAi IEAiLCBtX21heE9yaWdpbiwgIiksIGNvdW50ID0gIiwgbV9jb3VudCwgIiwgaG9pc3RlZCA9ICIs IG1faG9pc3RlZCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGludDMyX3QgbV9taW5C b3VuZCB7IDAgfTsKKyAgICAgICAgQ29kZU9yaWdpbiBtX21pbk9yaWdpbjsKKyAgICAgICAgaW50 MzJfdCBtX21heEJvdW5kIHsgMCB9OworICAgICAgICBDb2RlT3JpZ2luIG1fbWF4T3JpZ2luOwor ICAgICAgICB1bnNpZ25lZCBtX2NvdW50IHsgMCB9OyAvLyBJZiB0aGlzIGlzIHplcm8gdGhlbiB0 aGUgYm91bmRzIHdvbid0IG5lY2Vzc2FyaWx5IG1ha2Ugc2Vuc2UuCisgICAgICAgIGJvb2wgbV9o b2lzdGVkIHsgZmFsc2UgfTsKKyAgICB9OwogCi1jbGFzcyBJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQ aGFzZSA6IHB1YmxpYyBQaGFzZSB7Ci1wdWJsaWM6CiAgICAgSW50ZWdlckNoZWNrQ29tYmluaW5n UGhhc2UoR3JhcGgmIGdyYXBoKQogICAgICAgICA6IFBoYXNlKGdyYXBoLCAiaW50ZWdlciBjaGVj ayBjb21iaW5pbmciKQogICAgICAgICAsIG1faW5zZXJ0aW9uU2V0KGdyYXBoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdMSUNNUGhhc2UuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdMSUNNUGhhc2UuY3BwCmluZGV4IDQ4YzQ0MjI5MjkzZmNlMzBm NDFjMmM2NjMxZGQ5YTcxYzllNDAyYmIuLmEyODEyN2ZmZjBhYjA3ZTljMzE1OTRhNDQyZmVmYzA0 YjFhMGZlYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTElDTVBo YXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0xJQ01QaGFzZS5jcHAK QEAgLTQ1LDI0ICs0NSwxNSBAQAogCiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CiAK LW5hbWVzcGFjZSB7Ci0KLXVzaW5nIE5hdHVyYWxMb29wID0gU1NBTmF0dXJhbExvb3A7Ci0KLXN0 cnVjdCBMb29wRGF0YSB7Ci0gICAgTG9vcERhdGEoKQotICAgICAgICA6IHByZUhlYWRlcihudWxs cHRyKQotICAgIHsKLSAgICB9Ci0gICAgCi0gICAgQ2xvYmJlclNldCB3cml0ZXM7Ci0gICAgQmFz aWNCbG9jayogcHJlSGVhZGVyOwotfTsKLQotfSAvLyBhbm9ueW1vdXMgbmFtZXNwYWNlCi0KIGNs YXNzIExJQ01QaGFzZSA6IHB1YmxpYyBQaGFzZSB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgdmVy Ym9zZSA9IGZhbHNlOworCisgICAgdXNpbmcgTmF0dXJhbExvb3AgPSBTU0FOYXR1cmFsTG9vcDsK KworICAgIHN0cnVjdCBMb29wRGF0YSB7CisgICAgICAgIENsb2JiZXJTZXQgd3JpdGVzOworICAg ICAgICBCYXNpY0Jsb2NrKiBwcmVIZWFkZXIgeyBudWxscHRyIH07CisgICAgfTsKICAgICAKIHB1 YmxpYzoKICAgICBMSUNNUGhhc2UoR3JhcGgmIGdyYXBoKQo= 320692 2017-09-13 14:17:54 -0700 2017-09-13 20:32:52 -0700 Patch bug-176876-20170914061753.patch text/plain 9903 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxOTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NDdiM2U3MTM0NzRmNjQzODQ3NDY1YjdjNWMwMGU4MzczMmU2NDYyLi4zMjhkNjFhY2JhYTMyNjJl ZDdkMGVhZDAxNGUzODM5ODJmMTE1NTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNyBAQAogMjAxNy0wOS0xMyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbSlNDXSBNb3ZlIGNsYXNzL3N0cnVjdCB1c2VkIGluIG90aGVyIGNs YXNzJyBtZW1iZXIgb3V0IG9mIGFub255bW91cyBuYW1lc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Njg3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdDQyB3YXJucyBpZiBhIGNsYXNzIGhhcyBh IGJhc2Ugb3IgZmllbGQgd2hvc2UgdHlwZSB1c2VzIHRoZSBhbm9ueW1vdXMgbmFtZXNwYWNlCisg ICAgICAgIGFuZCBpdCBpcyBkZWZpbmVkIGluIGFuIGluY2x1ZGVkIGZpbGUuIFRoaXMgaXMgYmVj YXVzZSB0aGlzIHBvc3NpYmx5IHZpb2xhdGVzCisgICAgICAgIG9uZSBkZWZpbml0aW9uIHJ1bGUg KE9EUik6IGlmIGFuIGluY2x1ZGVkIGZpbGUgaGFzIHRoZSBhbm9ueW1vdXMgbmFtZXNwYWNlLCBl YWNoCisgICAgICAgIHRyYW5zbGF0aW9uIHVuaXQgY3JlYXRlcyBpdHMgcHJpdmF0ZSBhbm9ueW1v dXMgbmFtZXNwYWNlLiBUaHVzLCBlYWNoIHR5cGUKKyAgICAgICAgaW5zaWRlIHRoZSBhbm9ueW1v dXMgbmFtZXNwYWNlIGJlY29tZXMgZGlmZmVyZW50IGluIGVhY2ggdHJhbnNsYXRpb24gdW5pdCBp ZgorICAgICAgICB0aGUgZmlsZSBpcyBpbmNsdWRlZCBpbiBtdWx0aXBsZSB0cmFuc2xhdGlvbiB1 bml0cy4KKworICAgICAgICBXaGlsZSB0aGUgY3VycmVudCB1c2UgaW4gSlNDIGlzIG5vdCB2aW9s YXRpbmcgT0RSIHNpbmNlIHRoZXNlIGNwcCBmaWxlcyBhcmUgaW5jbHVkZWQKKyAgICAgICAgb25s eSBvbmNlIGZvciB1bmlmaWVkIHNvdXJjZXMsIHNwZWNpZnlpbmcgYC1Xbm8tc3Vib2JqZWN0LWxp bmthZ2VgIGNvdWxkIG1pc3MKKyAgICAgICAgdGhlIGFjdHVhbCBidWdzLiBTbywgaW4gdGhpcyBw YXRjaCwgd2UganVzdCBtb3ZlIHJlbGF0ZWQgY2xhc3Nlcy9zdHJ1Y3RzIG91dCBvZgorICAgICAg ICB0aGUgYW5vbnltb3VzIG5hbWVzcGFjZS4KKworICAgICAgICAqIGRmZy9ERkdJbnRlZ2VyQ2hl Y2tDb21iaW5pbmdQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNrQ29t YmluaW5nUGhhc2U6OlJhbmdlS2V5OjphZGRpdGlvbik6CisgICAgICAgIChKU0M6OkRGRzo6SW50 ZWdlckNoZWNrQ29tYmluaW5nUGhhc2U6OlJhbmdlS2V5OjphcnJheUJvdW5kcyk6CisgICAgICAg IChKU0M6OkRGRzo6SW50ZWdlckNoZWNrQ29tYmluaW5nUGhhc2U6OlJhbmdlS2V5OjpvcGVyYXRv ciEgY29uc3QpOgorICAgICAgICAoSlNDOjpERkc6OkludGVnZXJDaGVja0NvbWJpbmluZ1BoYXNl OjpSYW5nZUtleTo6aGFzaCBjb25zdCk6CisgICAgICAgIChKU0M6OkRGRzo6SW50ZWdlckNoZWNr Q29tYmluaW5nUGhhc2U6OlJhbmdlS2V5OjpvcGVyYXRvcj09IGNvbnN0KToKKyAgICAgICAgKEpT Qzo6REZHOjpJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQaGFzZTo6UmFuZ2VLZXk6OmR1bXAgY29uc3Qp OgorICAgICAgICAoSlNDOjpERkc6OkludGVnZXJDaGVja0NvbWJpbmluZ1BoYXNlOjpSYW5nZUtl eUFuZEFkZGVuZDo6UmFuZ2VLZXlBbmRBZGRlbmQpOgorICAgICAgICAoSlNDOjpERkc6OkludGVn ZXJDaGVja0NvbWJpbmluZ1BoYXNlOjpSYW5nZUtleUFuZEFkZGVuZDo6b3BlcmF0b3IhIGNvbnN0 KToKKyAgICAgICAgKEpTQzo6REZHOjpJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQaGFzZTo6UmFuZ2VL ZXlBbmRBZGRlbmQ6OmR1bXAgY29uc3QpOgorICAgICAgICAoSlNDOjpERkc6OkludGVnZXJDaGVj a0NvbWJpbmluZ1BoYXNlOjpSYW5nZTo6ZHVtcCBjb25zdCk6CisgICAgICAgICogZGZnL0RGR0xJ Q01QaGFzZS5jcHA6CisKKzIwMTctMDktMTMgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBn bWFpbC5jb20+CisKICAgICAgICAgW0pTQ10gRml4IEFycmF5IGFsbG9jYXRpb24gaW4gT2JqZWN0 LmtleXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NjgyNgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ludGVnZXJD aGVja0NvbWJpbmluZ1BoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSW50 ZWdlckNoZWNrQ29tYmluaW5nUGhhc2UuY3BwCmluZGV4IDk4ZTBmNmZkZjI4ODE0N2E4MWU5Y2I3 ZjlmMWI4OTk2NTZmZDkxZTIuLjcwODVkZmI5N2Y4NzJmYzQwNWVjYzVmMzYxMDYxZGViMGM5YzA3 ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSW50ZWdlckNoZWNr Q29tYmluaW5nUGhhc2UuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSW50 ZWdlckNoZWNrQ29tYmluaW5nUGhhc2UuY3BwCkBAIC0zOSwxNDAgKzM5LDExOSBAQAogCiBuYW1l c3BhY2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CiAKLW5hbWVzcGFjZSB7Ci0KIG5hbWVzcGFjZSBE RkdJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQaGFzZUludGVybmFsIHsKIHN0YXRpYyBjb25zdCBib29s IHZlcmJvc2UgPSBmYWxzZTsKIH0KIAotZW51bSBSYW5nZUtpbmQgewotICAgIEludmFsaWRSYW5n ZUtpbmQsCi0gICAgCi0gICAgLy8gVGhpcyBtZWFucyB3ZSBkaWQgQXJpdGhBZGQgd2l0aCBDaGVj a092ZXJmbG93LgotICAgIEFkZGl0aW9uLAotICAgIAotICAgIC8vIFRoaXMgbWVhbnMgd2UgZGlk IENoZWNrSW5Cb3VuZHMgb24gc29tZSBsZW5ndGguCi0gICAgQXJyYXlCb3VuZHMKLX07CitjbGFz cyBJbnRlZ2VyQ2hlY2tDb21iaW5pbmdQaGFzZSA6IHB1YmxpYyBQaGFzZSB7CitwdWJsaWM6Cisg ICAgZW51bSBSYW5nZUtpbmQgeworICAgICAgICBJbnZhbGlkUmFuZ2VLaW5kLAorICAgICAgICAK KyAgICAgICAgLy8gVGhpcyBtZWFucyB3ZSBkaWQgQXJpdGhBZGQgd2l0aCBDaGVja092ZXJmbG93 LgorICAgICAgICBBZGRpdGlvbiwKKyAgICAgICAgCisgICAgICAgIC8vIFRoaXMgbWVhbnMgd2Ug ZGlkIENoZWNrSW5Cb3VuZHMgb24gc29tZSBsZW5ndGguCisgICAgICAgIEFycmF5Qm91bmRzCisg ICAgfTsKIAotc3RydWN0IFJhbmdlS2V5IHsKLSAgICBSYW5nZUtleSgpCi0gICAgICAgIDogbV9r aW5kKEludmFsaWRSYW5nZUtpbmQpCi0gICAgICAgICwgbV9rZXkobnVsbHB0cikKLSAgICB7Ci0g ICAgfQotICAgIAotICAgIHN0YXRpYyBSYW5nZUtleSBhZGRpdGlvbihFZGdlIGVkZ2UpCi0gICAg ewotICAgICAgICBSYW5nZUtleSByZXN1bHQ7Ci0gICAgICAgIHJlc3VsdC5tX2tpbmQgPSBBZGRp dGlvbjsKLSAgICAgICAgcmVzdWx0Lm1fc291cmNlID0gZWRnZS5zYW5pdGl6ZWQoKTsKLSAgICAg ICAgcmVzdWx0Lm1fa2V5ID0gMDsKLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0gICAg Ci0gICAgc3RhdGljIFJhbmdlS2V5IGFycmF5Qm91bmRzKEVkZ2UgZWRnZSwgTm9kZSoga2V5KQot ICAgIHsKLSAgICAgICAgUmFuZ2VLZXkgcmVzdWx0OwotICAgICAgICByZXN1bHQubV9raW5kID0g QXJyYXlCb3VuZHM7Ci0gICAgICAgIHJlc3VsdC5tX3NvdXJjZSA9IGVkZ2Uuc2FuaXRpemVkKCk7 Ci0gICAgICAgIHJlc3VsdC5tX2tleSA9IGtleTsKLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAg ICB9Ci0gICAgCi0gICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiBtX2tpbmQgPT0g SW52YWxpZFJhbmdlS2luZDsgfQotICAgIAotICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdAotICAg IHsKLSAgICAgICAgcmV0dXJuIG1fa2luZCArIG1fc291cmNlLmhhc2goKSArIFB0ckhhc2g8Tm9k ZSo+OjpoYXNoKG1fa2V5KTsKLSAgICB9Ci0gICAgCi0gICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0 IFJhbmdlS2V5JiBvdGhlcikgY29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiBtX2tpbmQgPT0g b3RoZXIubV9raW5kCi0gICAgICAgICAgICAmJiBtX3NvdXJjZSA9PSBvdGhlci5tX3NvdXJjZQot ICAgICAgICAgICAgJiYgbV9rZXkgPT0gb3RoZXIubV9rZXk7Ci0gICAgfQotICAgIAotICAgIHZv aWQgZHVtcChQcmludFN0cmVhbSYgb3V0KSBjb25zdAotICAgIHsKLSAgICAgICAgc3dpdGNoICht X2tpbmQpIHsKLSAgICAgICAgY2FzZSBJbnZhbGlkUmFuZ2VLaW5kOgotICAgICAgICAgICAgb3V0 LnByaW50KCJJbnZhbGlkUmFuZ2VLaW5kKCIpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgQWRkaXRpb246Ci0gICAgICAgICAgICBvdXQucHJpbnQoIkFkZGl0aW9uKCIpOwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgQXJyYXlCb3VuZHM6Ci0gICAgICAgICAgICBv dXQucHJpbnQoIkFycmF5Qm91bmRzKCIpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgc3RydWN0 IFJhbmdlS2V5IHsKKyAgICAgICAgc3RhdGljIFJhbmdlS2V5IGFkZGl0aW9uKEVkZ2UgZWRnZSkK KyAgICAgICAgeworICAgICAgICAgICAgUmFuZ2VLZXkgcmVzdWx0OworICAgICAgICAgICAgcmVz dWx0Lm1fa2luZCA9IEFkZGl0aW9uOworICAgICAgICAgICAgcmVzdWx0Lm1fc291cmNlID0gZWRn ZS5zYW5pdGl6ZWQoKTsKKyAgICAgICAgICAgIHJlc3VsdC5tX2tleSA9IDA7CisgICAgICAgICAg ICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9Ci0gICAgICAgIGlmIChtX3NvdXJjZSkKLSAgICAg ICAgICAgIG91dC5wcmludChtX3NvdXJjZSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG91 dC5wcmludCgibnVsbCIpOwotICAgICAgICBvdXQucHJpbnQoIiwgIik7Ci0gICAgICAgIGlmICht X2tleSkKLSAgICAgICAgICAgIG91dC5wcmludChtX2tleSk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIG91dC5wcmludCgibnVsbCIpOwotICAgICAgICBvdXQucHJpbnQoIikiKTsKLSAgICB9 Ci0gICAgCi0gICAgUmFuZ2VLaW5kIG1fa2luZDsKLSAgICBFZGdlIG1fc291cmNlOwotICAgIE5v ZGUqIG1fa2V5OwotfTsKLQotc3RydWN0IFJhbmdlS2V5QW5kQWRkZW5kIHsKLSAgICBSYW5nZUtl eUFuZEFkZGVuZCgpCi0gICAgICAgIDogbV9hZGRlbmQoMCkKLSAgICB7Ci0gICAgfQotICAgIAot ICAgIFJhbmdlS2V5QW5kQWRkZW5kKFJhbmdlS2V5IGtleSwgaW50MzJfdCBhZGRlbmQpCi0gICAg ICAgIDogbV9rZXkoa2V5KQotICAgICAgICAsIG1fYWRkZW5kKGFkZGVuZCkKLSAgICB7Ci0gICAg fQotICAgIAotICAgIGJvb2wgb3BlcmF0b3IhKCkgY29uc3QgeyByZXR1cm4gIW1fa2V5ICYmICFt X2FkZGVuZDsgfQotICAgIAotICAgIHZvaWQgZHVtcChQcmludFN0cmVhbSYgb3V0KSBjb25zdAot ICAgIHsKLSAgICAgICAgb3V0LnByaW50KG1fa2V5LCAiICsgIiwgbV9hZGRlbmQpOwotICAgIH0K LSAgICAKLSAgICBSYW5nZUtleSBtX2tleTsKLSAgICBpbnQzMl90IG1fYWRkZW5kOwotfTsKKyAg ICAgICAgCisgICAgICAgIHN0YXRpYyBSYW5nZUtleSBhcnJheUJvdW5kcyhFZGdlIGVkZ2UsIE5v ZGUqIGtleSkKKyAgICAgICAgeworICAgICAgICAgICAgUmFuZ2VLZXkgcmVzdWx0OworICAgICAg ICAgICAgcmVzdWx0Lm1fa2luZCA9IEFycmF5Qm91bmRzOworICAgICAgICAgICAgcmVzdWx0Lm1f c291cmNlID0gZWRnZS5zYW5pdGl6ZWQoKTsKKyAgICAgICAgICAgIHJlc3VsdC5tX2tleSA9IGtl eTsKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgIH0KKyAgICAgICAgCisgICAg ICAgIGJvb2wgb3BlcmF0b3IhKCkgY29uc3QgeyByZXR1cm4gbV9raW5kID09IEludmFsaWRSYW5n ZUtpbmQ7IH0KKyAgICAgICAgCisgICAgICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdAorICAgICAg ICB7CisgICAgICAgICAgICByZXR1cm4gbV9raW5kICsgbV9zb3VyY2UuaGFzaCgpICsgUHRySGFz aDxOb2RlKj46Omhhc2gobV9rZXkpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBib29s IG9wZXJhdG9yPT0oY29uc3QgUmFuZ2VLZXkmIG90aGVyKSBjb25zdAorICAgICAgICB7CisgICAg ICAgICAgICByZXR1cm4gbV9raW5kID09IG90aGVyLm1fa2luZAorICAgICAgICAgICAgICAgICYm IG1fc291cmNlID09IG90aGVyLm1fc291cmNlCisgICAgICAgICAgICAgICAgJiYgbV9rZXkgPT0g b3RoZXIubV9rZXk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIHZvaWQgZHVtcChQcmlu dFN0cmVhbSYgb3V0KSBjb25zdAorICAgICAgICB7CisgICAgICAgICAgICBzd2l0Y2ggKG1fa2lu ZCkgeworICAgICAgICAgICAgY2FzZSBJbnZhbGlkUmFuZ2VLaW5kOgorICAgICAgICAgICAgICAg IG91dC5wcmludCgiSW52YWxpZFJhbmdlS2luZCgiKTsKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIGNhc2UgQWRkaXRpb246CisgICAgICAgICAgICAgICAgb3V0LnByaW50KCJB ZGRpdGlvbigiKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQXJy YXlCb3VuZHM6CisgICAgICAgICAgICAgICAgb3V0LnByaW50KCJBcnJheUJvdW5kcygiKTsKKyAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChtX3Nv dXJjZSkKKyAgICAgICAgICAgICAgICBvdXQucHJpbnQobV9zb3VyY2UpOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIG91dC5wcmludCgibnVsbCIpOworICAgICAgICAgICAgb3V0 LnByaW50KCIsICIpOworICAgICAgICAgICAgaWYgKG1fa2V5KQorICAgICAgICAgICAgICAgIG91 dC5wcmludChtX2tleSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgb3V0LnBy aW50KCJudWxsIik7CisgICAgICAgICAgICBvdXQucHJpbnQoIikiKTsKKyAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgUmFuZ2VLaW5kIG1fa2luZCB7IEludmFsaWRSYW5nZUtpbmQgfTsKKyAg ICAgICAgRWRnZSBtX3NvdXJjZTsKKyAgICAgICAgTm9kZSogbV9rZXkgeyBudWxscHRyIH07Cisg ICAgfTsKIAotc3RydWN0IFJhbmdlIHsKLSAgICBSYW5nZSgpCi0gICAgICAgIDogbV9taW5Cb3Vu ZCgwKQotICAgICAgICAsIG1fbWF4Qm91bmQoMCkKLSAgICAgICAgLCBtX2NvdW50KDApCi0gICAg ICAgICwgbV9ob2lzdGVkKGZhbHNlKQotICAgIHsKLSAgICB9Ci0gICAgCi0gICAgdm9pZCBkdW1w KFByaW50U3RyZWFtJiBvdXQpIGNvbnN0Ci0gICAgewotICAgICAgICBvdXQucHJpbnQoIigiLCBt X21pbkJvdW5kLCAiIEAiLCBtX21pbk9yaWdpbiwgIikgLi4gKCIsIG1fbWF4Qm91bmQsICIgQCIs IG1fbWF4T3JpZ2luLCAiKSwgY291bnQgPSAiLCBtX2NvdW50LCAiLCBob2lzdGVkID0gIiwgbV9o b2lzdGVkKTsKLSAgICB9Ci0gICAgCi0gICAgaW50MzJfdCBtX21pbkJvdW5kOwotICAgIENvZGVP cmlnaW4gbV9taW5PcmlnaW47Ci0gICAgaW50MzJfdCBtX21heEJvdW5kOwotICAgIENvZGVPcmln aW4gbV9tYXhPcmlnaW47Ci0gICAgdW5zaWduZWQgbV9jb3VudDsgLy8gSWYgdGhpcyBpcyB6ZXJv IHRoZW4gdGhlIGJvdW5kcyB3b24ndCBuZWNlc3NhcmlseSBtYWtlIHNlbnNlLgotICAgIGJvb2wg bV9ob2lzdGVkOwotfTsKKyAgICBzdHJ1Y3QgUmFuZ2VLZXlBbmRBZGRlbmQgeworICAgICAgICBS YW5nZUtleUFuZEFkZGVuZCgpID0gZGVmYXVsdDsKKyAgICAgICAgCisgICAgICAgIFJhbmdlS2V5 QW5kQWRkZW5kKFJhbmdlS2V5IGtleSwgaW50MzJfdCBhZGRlbmQpCisgICAgICAgICAgICA6IG1f a2V5KGtleSkKKyAgICAgICAgICAgICwgbV9hZGRlbmQoYWRkZW5kKQorICAgICAgICB7CisgICAg ICAgIH0KKyAgICAgICAgCisgICAgICAgIGJvb2wgb3BlcmF0b3IhKCkgY29uc3QgeyByZXR1cm4g IW1fa2V5ICYmICFtX2FkZGVuZDsgfQorICAgICAgICAKKyAgICAgICAgdm9pZCBkdW1wKFByaW50 U3RyZWFtJiBvdXQpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIG91dC5wcmludChtX2tl eSwgIiArICIsIG1fYWRkZW5kKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgUmFuZ2VL ZXkgbV9rZXk7CisgICAgICAgIGludDMyX3QgbV9hZGRlbmQgeyAwIH07CisgICAgfTsKIAotfSAv LyBhbm9ueW1vdXMgbmFtZXNwYWNlCisgICAgc3RydWN0IFJhbmdlIHsKKyAgICAgICAgdm9pZCBk dW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIG91dC5w cmludCgiKCIsIG1fbWluQm91bmQsICIgQCIsIG1fbWluT3JpZ2luLCAiKSAuLiAoIiwgbV9tYXhC b3VuZCwgIiBAIiwgbV9tYXhPcmlnaW4sICIpLCBjb3VudCA9ICIsIG1fY291bnQsICIsIGhvaXN0 ZWQgPSAiLCBtX2hvaXN0ZWQpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBpbnQzMl90 IG1fbWluQm91bmQgeyAwIH07CisgICAgICAgIENvZGVPcmlnaW4gbV9taW5PcmlnaW47CisgICAg ICAgIGludDMyX3QgbV9tYXhCb3VuZCB7IDAgfTsKKyAgICAgICAgQ29kZU9yaWdpbiBtX21heE9y aWdpbjsKKyAgICAgICAgdW5zaWduZWQgbV9jb3VudCB7IDAgfTsgLy8gSWYgdGhpcyBpcyB6ZXJv IHRoZW4gdGhlIGJvdW5kcyB3b24ndCBuZWNlc3NhcmlseSBtYWtlIHNlbnNlLgorICAgICAgICBi b29sIG1faG9pc3RlZCB7IGZhbHNlIH07CisgICAgfTsKIAotY2xhc3MgSW50ZWdlckNoZWNrQ29t YmluaW5nUGhhc2UgOiBwdWJsaWMgUGhhc2UgewotcHVibGljOgogICAgIEludGVnZXJDaGVja0Nv bWJpbmluZ1BoYXNlKEdyYXBoJiBncmFwaCkKICAgICAgICAgOiBQaGFzZShncmFwaCwgImludGVn ZXIgY2hlY2sgY29tYmluaW5nIikKICAgICAgICAgLCBtX2luc2VydGlvblNldChncmFwaCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTElDTVBoYXNlLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTElDTVBoYXNlLmNwcAppbmRleCA0OGM0NDIyOTI5 M2ZjZTMwZjQxYzJjNjYzMWRkOWE3MWM5ZTQwMmJiLi5hMjgxMjdmZmYwYWIwN2U5YzMxNTk0YTQ0 MmZlZmMwNGIxYTBmZWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0xJQ01QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdMSUNNUGhh c2UuY3BwCkBAIC00NSwyNCArNDUsMTUgQEAKIAogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBE RkcgewogCi1uYW1lc3BhY2UgewotCi11c2luZyBOYXR1cmFsTG9vcCA9IFNTQU5hdHVyYWxMb29w OwotCi1zdHJ1Y3QgTG9vcERhdGEgewotICAgIExvb3BEYXRhKCkKLSAgICAgICAgOiBwcmVIZWFk ZXIobnVsbHB0cikKLSAgICB7Ci0gICAgfQotICAgIAotICAgIENsb2JiZXJTZXQgd3JpdGVzOwot ICAgIEJhc2ljQmxvY2sqIHByZUhlYWRlcjsKLX07Ci0KLX0gLy8gYW5vbnltb3VzIG5hbWVzcGFj ZQotCiBjbGFzcyBMSUNNUGhhc2UgOiBwdWJsaWMgUGhhc2UgewogICAgIHN0YXRpYyBjb25zdCBi b29sIHZlcmJvc2UgPSBmYWxzZTsKKworICAgIHVzaW5nIE5hdHVyYWxMb29wID0gU1NBTmF0dXJh bExvb3A7CisKKyAgICBzdHJ1Y3QgTG9vcERhdGEgeworICAgICAgICBDbG9iYmVyU2V0IHdyaXRl czsKKyAgICAgICAgQmFzaWNCbG9jayogcHJlSGVhZGVyIHsgbnVsbHB0ciB9OworICAgIH07CiAg ICAgCiBwdWJsaWM6CiAgICAgTElDTVBoYXNlKEdyYXBoJiBncmFwaCkK