116402 2013-05-18 15:40:46 -0700 Simplify the StorageArea setter functions 2013-05-18 17:06:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 890962 0 andersca 2013-05-18 15:40:46 -0700 Simplify the StorageArea setter functions 890965 1 202221 andersca 2013-05-18 15:42:42 -0700 Created attachment 202221 Patch 890977 2 202221 commit-queue 2013-05-18 17:06:16 -0700 Comment on attachment 202221 Patch Clearing flags on attachment: 202221 Committed r150346: <http://trac.webkit.org/changeset/150346> 890978 3 commit-queue 2013-05-18 17:06:18 -0700 All reviewed patches have been landed. Closing bug. 202221 2013-05-18 15:42:42 -0700 2013-05-18 17:06:16 -0700 Patch bug-116402-20130518154134.patch text/plain 16059 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBlZDJmNGMxMmQ3NjAw NDAxMGQyMzUwYzQzYmI5ZWRkMzNkNzY4MC4uYzE1NGU2Nzg1Njk0NWE3OGU4NTlhYzk2ZjUwMTg0 NjBkN2ZmOWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEzLTA1LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgdGhl IFN0b3JhZ2VBcmVhIHNldHRlciBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjQwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgbW9yZSBzZWN1cml0eSBjaGVja2luZyBjb2RlIHRv IFN0b3JhZ2Ugc28gbW9yZSBjb2RlIGNhbiBiZSBzaGFyZWQgYmV0d2VlbiBXZWJLaXQxIGFuZCBX ZWJLaXQyLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OnNldERPTVN0 b3JhZ2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6 cmVtb3ZlRE9NU3RvcmFnZUl0ZW0pOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdG9yYWdlOjpzZXRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 b3JhZ2U6OnJlbW92ZUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6Y2xlYXIpOgor ICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWEuaDoKKyAgICAgICAgKFN0b3JhZ2VBcmVhKToK KyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdG9yYWdlQXJlYUltcGw6OnNldEl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFy ZWFJbXBsOjpyZW1vdmVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhSW1wbDo6 Y2xlYXIpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmg6CisgICAgICAgIChT dG9yYWdlQXJlYUltcGwpOgorCisyMDEzLTA1LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CisKICAgICAgICAgU2ltcGxpZnkgU3RvcmFnZUFyZWEgZ2V0dGVyIGZ1bmN0 aW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2 Mzk5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwppbmRleCA4ZmE0ZWMwOTYyMDAxMzc0YjJjMThlMzNmZmY3MjkxM2U5NjMy MWQ2Li5mZTRmYWQ1ZDQ0ZDI5MzZiNGFjZGYzN2MxYTdlNDZjNmY3MmU4NmRmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMjAgQEAKIDIwMTMtMDUtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAorICAgICAgICBTaW1wbGlmeSB0aGUgU3RvcmFnZUFyZWEgc2V0dGVyIGZ1 bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE2NDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIHNlY3VyaXR5IGNoZWNraW5nIGNvZGUgdGhhdCBsaXZlcyBpbiBTdG9yYWdlIG5vdy4K KworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpTdG9yYWdlQXJlYUltcGw6OnNldEl0ZW0pOgorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlQXJlYUltcGw6OnJlbW92ZUl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdl QXJlYUltcGw6OmNsZWFyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFy ZWFJbXBsLmg6CisKKzIwMTMtMDUtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKwogICAgICAgICBTaW1wbGlmeSBTdG9yYWdlQXJlYSBnZXR0ZXIgZnVuY3Rpb25zCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzOTkKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VB Z2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50LmNwcAppbmRleCA1ZTcwNGJhNzkxYzdkOTc0NTc5ODRhMTA2ZWZhNmEyOTJmZWQ0NGJiLi41 OGFhZDQ5YTQ2NGYxMjdjNzMzMGE2OGFkOGFkOGY4ZDM1N2E5MjE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcApAQCAt MTI1LDE1ICsxMjUsNiBAQCB2b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3Rv cmFnZUl0ZW1zKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29ucwogICAgIGl0ZW1zID0gc3Rv cmFnZUl0ZW1zLnJlbGVhc2UoKTsKIH0KIAotc3RhdGljIFN0cmluZyB0b0Vycm9yU3RyaW5nKGNv bnN0IEV4Y2VwdGlvbkNvZGUmIGVjKQotewotICAgIGlmIChlYykgewotICAgICAgICBFeGNlcHRp b25Db2RlRGVzY3JpcHRpb24gZGVzY3JpcHRpb24oZWMpOwotICAgICAgICByZXR1cm4gZGVzY3Jp cHRpb24ubmFtZTsKLSAgICB9Ci0gICAgcmV0dXJuICIiOwotfQotCiB2b2lkIEluc3BlY3RvckRP TVN0b3JhZ2VBZ2VudDo6c2V0RE9NU3RvcmFnZUl0ZW0oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5n LCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcm IGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAgICBGcmFtZSogZnJhbWU7CkBAIC0xNDMs OSArMTM0LDEwIEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpzZXRET01TdG9yYWdl SXRlbShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBFeGNlcHRpb25Db2RlIGV4Y2VwdGlvbiA9IDA7Ci0gICAgc3RvcmFnZUFyZWEt PnNldEl0ZW0oa2V5LCB2YWx1ZSwgZXhjZXB0aW9uLCBmcmFtZSk7Ci0gICAgKmVycm9yU3RyaW5n ID0gdG9FcnJvclN0cmluZyhleGNlcHRpb24pOworICAgIGJvb2wgcXVvdGFFeGNlcHRpb24gPSBm YWxzZTsKKyAgICBzdG9yYWdlQXJlYS0+c2V0SXRlbShmcmFtZSwga2V5LCB2YWx1ZSwgcXVvdGFF eGNlcHRpb24pOworICAgIGlmIChxdW90YUV4Y2VwdGlvbikKKyAgICAgICAgKmVycm9yU3RyaW5n ID0gRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uKFFVT1RBX0VYQ0VFREVEX0VSUikubmFtZTsKIH0K IAogdm9pZCBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OnJlbW92ZURPTVN0b3JhZ2VJdGVtKEVy cm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIHN0 b3JhZ2VJZCwgY29uc3QgU3RyaW5nJiBrZXkpCkBAIC0xNTcsOSArMTQ5LDcgQEAgdm9pZCBJbnNw ZWN0b3JET01TdG9yYWdlQWdlbnQ6OnJlbW92ZURPTVN0b3JhZ2VJdGVtKEVycm9yU3RyaW5nKiBl cnJvclN0cmluZywgY28KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIEV4Y2VwdGlvbkNv ZGUgZXhjZXB0aW9uID0gMDsKLSAgICBzdG9yYWdlQXJlYS0+cmVtb3ZlSXRlbShrZXksIGV4Y2Vw dGlvbiwgZnJhbWUpOwotICAgICplcnJvclN0cmluZyA9IHRvRXJyb3JTdHJpbmcoZXhjZXB0aW9u KTsKKyAgICBzdG9yYWdlQXJlYS0+cmVtb3ZlSXRlbShmcmFtZSwga2V5KTsKIH0KIAogU3RyaW5n IEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6c3RvcmFnZUlkKFN0b3JhZ2UqIHN0b3JhZ2UpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwIGIvU291cmNlL1dl YkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcAppbmRleCA2Y2NkNGVhNGJlYTUwNjkzMWY5NThkZjU5 YTMzNGM1NDliMWZlOGU4Li41ZGIxN2ExZDhjYTcwMDhlZjhhNjc4ZWFhY2ZkOGZiZTQ1YjliOWZh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZS5jcHAKQEAgLTEwMCwxNyArMTAwLDQ3IEBAIFN0 cmluZyBTdG9yYWdlOjpnZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBl YykgY29uc3QKIAogdm9pZCBTdG9yYWdlOjpzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25z dCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBtX3N0b3JhZ2VBcmVh LT5zZXRJdGVtKGtleSwgdmFsdWUsIGVjLCBtX2ZyYW1lKTsKKyAgICBpZiAoIW1fc3RvcmFnZUFy ZWEtPmNhbkFjY2Vzc1N0b3JhZ2UobV9mcmFtZSkpIHsKKyAgICAgICAgZWMgPSBTRUNVUklUWV9F UlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoaXNEaXNhYmxlZEJ5UHJpdmF0 ZUJyb3dzaW5nKCkpIHsKKyAgICAgICAgZWMgPSBRVU9UQV9FWENFRURFRF9FUlI7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBib29sIHF1b3RhRXhjZXB0aW9uID0gZmFsc2U7CisgICAg bV9zdG9yYWdlQXJlYS0+c2V0SXRlbShtX2ZyYW1lLCBrZXksIHZhbHVlLCBxdW90YUV4Y2VwdGlv bik7CisKKyAgICBpZiAocXVvdGFFeGNlcHRpb24pCisgICAgICAgIGVjID0gUVVPVEFfRVhDRUVE RURfRVJSOwogfQogCiB2b2lkIFN0b3JhZ2U6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXks IEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIG1fc3RvcmFnZUFyZWEtPnJlbW92ZUl0ZW0oa2V5 LCBlYywgbV9mcmFtZSk7CisgICAgaWYgKCFtX3N0b3JhZ2VBcmVhLT5jYW5BY2Nlc3NTdG9yYWdl KG1fZnJhbWUpKSB7CisgICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaWYgKGlzRGlzYWJsZWRCeVByaXZhdGVCcm93c2luZygpKQorICAgICAg ICByZXR1cm47CisKKyAgICBtX3N0b3JhZ2VBcmVhLT5yZW1vdmVJdGVtKG1fZnJhbWUsIGtleSk7 CiB9CiAKIHZvaWQgU3RvcmFnZTo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgbV9z dG9yYWdlQXJlYS0+Y2xlYXIoZWMsIG1fZnJhbWUpOworICAgIGlmICghbV9zdG9yYWdlQXJlYS0+ Y2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkgeworICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChpc0Rpc2FibGVkQnlQcml2YXRlQnJv d3NpbmcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zdG9yYWdlQXJlYS0+Y2xlYXIobV9m cmFtZSk7CiB9CiAKIGJvb2wgU3RvcmFnZTo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4 Y2VwdGlvbkNvZGUmIGVjKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oCmlu ZGV4IDY1NzMyYzgzN2FlMWU3NWJiMzQ0ZDhkNTgxODVkZTNkMTczYTJjYjIuLjg2ZTljMjA1MWY1 YTEwODEyYWUwY2M0YjdkZjhmMTc1YTY4MDk0YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZUFyZWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhLmgKQEAgLTQyLDE0ICs0MiwxMiBAQCBjbGFzcyBTdG9yYWdlQXJlYSA6IHB1YmxpYyBS ZWZDb3VudGVkPFN0b3JhZ2VBcmVhPiB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+U3RvcmFnZUFy ZWEoKSB7IH0KIAotICAgIC8vIFRoZSBIVE1MNSBET00gU3RvcmFnZSBBUEkKLSAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIHBhc3MgRG9jdW1lbnQgaW5zdGVhZCBvZiBGcmFtZS4gQWxzbywgdGhhdCBw YXJhbWV0ZXIgc2hvdWxkIGdvIGZpcnN0LgogICAgIHZpcnR1YWwgdW5zaWduZWQgbGVuZ3RoKCkg PSAwOwogICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCkgPSAwOwogICAgIHZp cnR1YWwgU3RyaW5nIGl0ZW0oY29uc3QgU3RyaW5nJiBrZXkpID0gMDsKLSAgICB2aXJ0dWFsIHZv aWQgc2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgRXhjZXB0 aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCByZW1v dmVJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZy YW1lKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGNsZWFyKEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSog c291cmNlRnJhbWUpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0SXRlbShGcmFtZSogc291cmNl RnJhbWUsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sJiBxdW90 YUV4Y2VwdGlvbikgPSAwOworICAgIHZpcnR1YWwgdm9pZCByZW1vdmVJdGVtKEZyYW1lKiBzb3Vy Y2VGcmFtZSwgY29uc3QgU3RyaW5nJiBrZXkpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgY2xlYXIo RnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGNvbnRhaW5zKGNvbnN0 IFN0cmluZyYga2V5KSA9IDA7CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShG cmFtZSopID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFy ZWFJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcApp bmRleCA5YTUzNmE5ODYwOTE3ZWNiMDZjMWU5YmU0MDMwOWM3OTA4MTY1NzJlLi43NGUyYzgxZmY3 NDlhNTg0YTRmNTZlYmM3M2NhZDZkOTAwNWQzYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlQXJlYUltcGwuY3BwCkBAIC0xMTQsMTUgKzExNCw2IEBAIFN0b3JhZ2VUeXBlIFN0 b3JhZ2VBcmVhSW1wbDo6c3RvcmFnZVR5cGUoKSBjb25zdAogICAgIHJldHVybiBtX3N0b3JhZ2VU eXBlOwogfQogCi1ib29sIFN0b3JhZ2VBcmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2lu Z0luRnJhbWUoY29uc3QgRnJhbWUqIGZyYW1lKSBjb25zdAotewotICAgIGlmICghZnJhbWUtPnBh Z2UoKS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgaWYgKG1fc3RvcmFnZVR5cGUgIT0gTG9jYWxTdG9yYWdlKQotICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICByZXR1cm4gIVNjaGVtZVJlZ2lzdHJ5OjphbGxvd3NMb2NhbFN0 b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93c2luZyhmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlP cmlnaW4oKS0+cHJvdG9jb2woKSk7Ci19Ci0KIHVuc2lnbmVkIFN0b3JhZ2VBcmVhSW1wbDo6bGVu Z3RoKCkKIHsKICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CkBAIC0xNDcsMzMgKzEzOCwxOSBA QCBTdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjppdGVtKGNvbnN0IFN0cmluZyYga2V5KQogICAgIHJl dHVybiBtX3N0b3JhZ2VNYXAtPmdldEl0ZW0oa2V5KTsKIH0KIAotdm9pZCBTdG9yYWdlQXJlYUlt cGw6OnNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2Vw dGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCit2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6c2V0SXRl bShGcmFtZSogc291cmNlRnJhbWUsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZh bHVlLCBib29sJiBxdW90YUV4Y2VwdGlvbikKIHsKLSAgICBlYyA9IDA7Ci0gICAgaWYgKCFjYW5B Y2Nlc3NTdG9yYWdlKGZyYW1lKSkgewotICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQogICAgIEFTU0VSVCghbV9pc1NodXRkb3duKTsKICAgICBBU1NF UlQoIXZhbHVlLmlzTnVsbCgpKTsKICAgICBibG9ja1VudGlsSW1wb3J0Q29tcGxldGUoKTsKIAot ICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShmcmFtZSkpIHsKLSAgICAg ICAgZWMgPSBRVU9UQV9FWENFRURFRF9FUlI7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAg ICBTdHJpbmcgb2xkVmFsdWU7Ci0gICAgYm9vbCBxdW90YUV4Y2VwdGlvbjsKICAgICBSZWZQdHI8 U3RvcmFnZU1hcD4gbmV3TWFwID0gbV9zdG9yYWdlTWFwLT5zZXRJdGVtKGtleSwgdmFsdWUsIG9s ZFZhbHVlLCBxdW90YUV4Y2VwdGlvbik7CiAgICAgaWYgKG5ld01hcCkKICAgICAgICAgbV9zdG9y YWdlTWFwID0gbmV3TWFwLnJlbGVhc2UoKTsKIAotICAgIGlmIChxdW90YUV4Y2VwdGlvbikgewot ICAgICAgICBlYyA9IFFVT1RBX0VYQ0VFREVEX0VSUjsKKyAgICBpZiAocXVvdGFFeGNlcHRpb24p CiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBpZiAob2xkVmFsdWUgPT0gdmFsdWUpCiAg ICAgICAgIHJldHVybjsKQEAgLTE4MSwyMyArMTU4LDE0IEBAIHZvaWQgU3RvcmFnZUFyZWFJbXBs OjpzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRp b25DCiAgICAgaWYgKG1fc3RvcmFnZUFyZWFTeW5jKQogICAgICAgICBtX3N0b3JhZ2VBcmVhU3lu Yy0+c2NoZWR1bGVJdGVtRm9yU3luYyhrZXksIHZhbHVlKTsKIAotICAgIGRpc3BhdGNoU3RvcmFn ZUV2ZW50KGtleSwgb2xkVmFsdWUsIHZhbHVlLCBmcmFtZSk7CisgICAgZGlzcGF0Y2hTdG9yYWdl RXZlbnQoa2V5LCBvbGRWYWx1ZSwgdmFsdWUsIHNvdXJjZUZyYW1lKTsKIH0KIAotdm9pZCBTdG9y YWdlQXJlYUltcGw6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUm IGVjLCBGcmFtZSogZnJhbWUpCit2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6cmVtb3ZlSXRlbShGcmFt ZSogc291cmNlRnJhbWUsIGNvbnN0IFN0cmluZyYga2V5KQogewotICAgIGVjID0gMDsKLSAgICBp ZiAoIWNhbkFjY2Vzc1N0b3JhZ2UoZnJhbWUpKSB7Ci0gICAgICAgIGVjID0gU0VDVVJJVFlfRVJS OwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgQVNTRVJUKCFtX2lzU2h1dGRvd24pOwog ICAgIGJsb2NrVW50aWxJbXBvcnRDb21wbGV0ZSgpOwogCi0gICAgaWYgKGRpc2FibGVkQnlQcml2 YXRlQnJvd3NpbmdJbkZyYW1lKGZyYW1lKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgU3RyaW5n IG9sZFZhbHVlOwogICAgIFJlZlB0cjxTdG9yYWdlTWFwPiBuZXdNYXAgPSBtX3N0b3JhZ2VNYXAt PnJlbW92ZUl0ZW0oa2V5LCBvbGRWYWx1ZSk7CiAgICAgaWYgKG5ld01hcCkKQEAgLTIwOCwyMyAr MTc2LDE1IEBAIHZvaWQgU3RvcmFnZUFyZWFJbXBsOjpyZW1vdmVJdGVtKGNvbnN0IFN0cmluZyYg a2V5LCBFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZyCiAKICAgICBpZiAobV9zdG9yYWdlQXJl YVN5bmMpCiAgICAgICAgIG1fc3RvcmFnZUFyZWFTeW5jLT5zY2hlZHVsZUl0ZW1Gb3JTeW5jKGtl eSwgU3RyaW5nKCkpOwotICAgIGRpc3BhdGNoU3RvcmFnZUV2ZW50KGtleSwgb2xkVmFsdWUsIFN0 cmluZygpLCBmcmFtZSk7CisKKyAgICBkaXNwYXRjaFN0b3JhZ2VFdmVudChrZXksIG9sZFZhbHVl LCBTdHJpbmcoKSwgc291cmNlRnJhbWUpOwogfQogCi12b2lkIFN0b3JhZ2VBcmVhSW1wbDo6Y2xl YXIoRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkKK3ZvaWQgU3RvcmFnZUFyZWFJbXBs OjpjbGVhcihGcmFtZSogc291cmNlRnJhbWUpCiB7Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2Fu QWNjZXNzU3RvcmFnZShmcmFtZSkpIHsKLSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CiAgICAgYmxv Y2tVbnRpbEltcG9ydENvbXBsZXRlKCk7CiAKLSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93 c2luZ0luRnJhbWUoZnJhbWUpKQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAoIW1fc3RvcmFn ZU1hcC0+bGVuZ3RoKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMjMzLDcgKzE5Myw4IEBAIHZv aWQgU3RvcmFnZUFyZWFJbXBsOjpjbGVhcihFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZyYW1l KQogCiAgICAgaWYgKG1fc3RvcmFnZUFyZWFTeW5jKQogICAgICAgICBtX3N0b3JhZ2VBcmVhU3lu Yy0+c2NoZWR1bGVDbGVhcigpOwotICAgIGRpc3BhdGNoU3RvcmFnZUV2ZW50KFN0cmluZygpLCBT dHJpbmcoKSwgU3RyaW5nKCksIGZyYW1lKTsKKworICAgIGRpc3BhdGNoU3RvcmFnZUV2ZW50KFN0 cmluZygpLCBTdHJpbmcoKSwgU3RyaW5nKCksIHNvdXJjZUZyYW1lKTsKIH0KIAogYm9vbCBTdG9y YWdlQXJlYUltcGw6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKaW5kZXggNTQ0N2Y3Y2EyMTVmNzA4NzQ1NWJhZTNiZmQ0 NmRiNjlhMWU5OWY5ZS4uOGUxNTVhNjQ1MWMzMGVlYzg4ZmU1MGY2NTk2YmVkZGQ1ZjFhMWU3YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCkBAIC00Nyw5ICs0Nyw5 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgpIE9WRVJSSURFOwogICAg IHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCkgT1ZFUlJJREU7CiAgICAgdmlydHVh bCBTdHJpbmcgaXRlbShjb25zdCBTdHJpbmcmIGtleSkgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2 b2lkIHNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2Vw dGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9p ZCByZW1vdmVJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNv dXJjZUZyYW1lKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgY2xlYXIoRXhjZXB0aW9uQ29k ZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHNldEl0 ZW0oRnJhbWUqIHNvdXJjZUZyYW1lLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2 YWx1ZSwgYm9vbCYgcXVvdGFFeGNlcHRpb24pIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBy ZW1vdmVJdGVtKEZyYW1lKiBzb3VyY2VGcmFtZSwgY29uc3QgU3RyaW5nJiBrZXkpIE9WRVJSSURF OworICAgIHZpcnR1YWwgdm9pZCBjbGVhcihGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwog ICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSkgT1ZFUlJJREU7CiAK ICAgICB2aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShGcmFtZSogc291cmNlRnJhbWUpIE9W RVJSSURFOwpAQCAtNzgsNyArNzgsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBibG9ja1VudGls SW1wb3J0Q29tcGxldGUoKSBjb25zdDsKICAgICB2b2lkIGNsb3NlRGF0YWJhc2VUaW1lckZpcmVk KFRpbWVyPFN0b3JhZ2VBcmVhSW1wbD4qKTsKLSAgICBib29sIGRpc2FibGVkQnlQcml2YXRlQnJv d3NpbmdJbkZyYW1lKGNvbnN0IEZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3Q7CiAKICAgICB2b2lk IGRpc3BhdGNoU3RvcmFnZUV2ZW50KGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9s ZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBGcmFtZSogc291cmNlRnJhbWUpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUlt cGwuY3BwCmluZGV4IGQ3MGI1N2ZkM2JmMTkzYTdkY2ExYzI4NTdhMzg5ZGU5ODFhMmQ4Y2UuLjEw MDJjMjE0MTgyNDlhMGVkN2IxZWZhZDYyMDljYjI3MTQ0OTA1MWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwCkBAIC03 NCw1MyArNzQsMjAgQEAgU3RyaW5nIFN0b3JhZ2VBcmVhSW1wbDo6aXRlbShjb25zdCBTdHJpbmcm IGtleSkKICAgICByZXR1cm4gbV9zdG9yYWdlQXJlYU1hcC0+aXRlbShrZXkpOwogfQogCi12b2lk IFN0b3JhZ2VBcmVhSW1wbDo6c2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBzb3VyY2VGcmFtZSkKK3ZvaWQgU3Rv cmFnZUFyZWFJbXBsOjpzZXRJdGVtKEZyYW1lKiBzb3VyY2VGcmFtZSwgY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIGJvb2wmIHF1b3RhRXhjZXB0aW9uKQogewotICAgIGVj ID0gMDsKLSAgICBpZiAoIWNhbkFjY2Vzc1N0b3JhZ2Uoc291cmNlRnJhbWUpKSB7Ci0gICAgICAg IGVjID0gU0VDVVJJVFlfRVJSOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgQVNTRVJU KCF2YWx1ZS5pc051bGwoKSk7CiAKLSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0lu RnJhbWUoc291cmNlRnJhbWUpKSB7Ci0gICAgICAgIGVjID0gUVVPVEFfRVhDRUVERURfRVJSOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgYm9vbCBxdW90YUV4Y2VwdGlvbjsKICAgICBt X3N0b3JhZ2VBcmVhTWFwLT5zZXRJdGVtKHNvdXJjZUZyYW1lLCB0aGlzLCBrZXksIHZhbHVlLCBx dW90YUV4Y2VwdGlvbik7Ci0KLSAgICBpZiAocXVvdGFFeGNlcHRpb24pCi0gICAgICAgIGVjID0g UVVPVEFfRVhDRUVERURfRVJSOwogfQogCi12b2lkIFN0b3JhZ2VBcmVhSW1wbDo6cmVtb3ZlSXRl bShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBzb3VyY2VGcmFt ZSkKK3ZvaWQgU3RvcmFnZUFyZWFJbXBsOjpyZW1vdmVJdGVtKEZyYW1lKiBzb3VyY2VGcmFtZSwg Y29uc3QgU3RyaW5nJiBrZXkpCiB7Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3Rv cmFnZShzb3VyY2VGcmFtZSkpIHsKLSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJh bWUoc291cmNlRnJhbWUpKQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3N0b3JhZ2VBcmVhTWFw LT5yZW1vdmVJdGVtKHNvdXJjZUZyYW1lLCB0aGlzLCBrZXkpOwogfQogCi12b2lkIFN0b3JhZ2VB cmVhSW1wbDo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBzb3VyY2VGcmFtZSkKK3Zv aWQgU3RvcmFnZUFyZWFJbXBsOjpjbGVhcihGcmFtZSogc291cmNlRnJhbWUpCiB7Ci0gICAgZWMg PSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsKLSAgICAgICAg ZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBpZiAoZGlz YWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoc291cmNlRnJhbWUpKQotICAgICAgICByZXR1 cm47Ci0KICAgICBtX3N0b3JhZ2VBcmVhTWFwLT5jbGVhcihzb3VyY2VGcmFtZSwgdGhpcyk7CiB9 CiAKQEAgLTE2MCwxNSArMTI3LDQgQEAgdm9pZCBTdG9yYWdlQXJlYUltcGw6OmNsb3NlRGF0YWJh c2VJZklkbGUoKQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi1ib29sIFN0b3JhZ2VB cmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUqIHNv dXJjZUZyYW1lKSBjb25zdAotewotICAgIGlmICghc291cmNlRnJhbWUtPnBhZ2UoKS0+c2V0dGlu Z3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICBpZiAoc3RvcmFnZVR5cGUoKSAhPSBMb2NhbFN0b3JhZ2UpCi0gICAgICAgIHJldHVybiB0 cnVlOwotCi0gICAgcmV0dXJuICFTY2hlbWVSZWdpc3RyeTo6YWxsb3dzTG9jYWxTdG9yYWdlQWNj ZXNzSW5Qcml2YXRlQnJvd3Npbmcoc291cmNlRnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3Jp Z2luKCktPnByb3RvY29sKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAppbmRl eCA5YWQ4NDIzZDE5NmU5YjY2YjgwZDIxNDA2NDA3ZjViNjMwYWQ4MTgxLi4zZmQ1MzY3NDk2MzJh NDU1ZDZkNGJlZTJiZjU4NGRjMzhiMmJmNzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCkBAIC00OSw5ICs0OSw5IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3Ry aW5nIGl0ZW0oY29uc3QgU3RyaW5nJiBrZXkpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCBz ZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBXZWJDb3JlOjpF eGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKLSAg ICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSXRlbShjb25zdCBTdHJpbmcmIGtleSwgV2ViQ29yZTo6RXhj ZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7Ci0gICAg dmlydHVhbCB2b2lkIGNsZWFyKFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFt ZSogc291cmNlRnJhbWUpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVtKFdlYkNv cmU6OkZyYW1lKiBzb3VyY2VGcmFtZSwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYg dmFsdWUsIGJvb2wmIHF1b3RhRXhjZXB0aW9uKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQg cmVtb3ZlSXRlbShXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUsIGNvbnN0IFN0cmluZyYga2V5 KSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgY2xlYXIoV2ViQ29yZTo6RnJhbWUqIHNvdXJj ZUZyYW1lKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5n JiBrZXkpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKFdlYkNv cmU6OkZyYW1lKikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpTdG9yYWdlVHlwZSBz dG9yYWdlVHlwZSgpIGNvbnN0IE9WRVJSSURFOwpAQCAtNjAsOCArNjAsNiBAQCBwcml2YXRlOgog ICAgIHZpcnR1YWwgdm9pZCBkZWNyZW1lbnRBY2Nlc3NDb3VudCgpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCBjbG9zZURhdGFiYXNlSWZJZGxlKCkgT1ZFUlJJREU7CiAKLSAgICBib29sIGRp c2FibGVkQnlQcml2YXRlQnJvd3NpbmdJbkZyYW1lKGNvbnN0IFdlYkNvcmU6OkZyYW1lKiBzb3Vy Y2VGcmFtZSkgY29uc3Q7Ci0KICAgICB1aW50NjRfdCBtX3N0b3JhZ2VBcmVhSUQ7CiAgICAgUmVm UHRyPFN0b3JhZ2VBcmVhTWFwPiBtX3N0b3JhZ2VBcmVhTWFwOwogfTsK