202029 2019-09-19 22:33:30 -0700 Deprecate unused C API aliases for WebsiteDataStore 2019-09-20 13:30:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1572647 0 achristensen 2019-09-19 22:33:30 -0700 Deprecate unused C API aliases for WebsiteDataStore 1572648 1 379207 achristensen 2019-09-19 22:33:55 -0700 Created attachment 379207 Patch 1572853 2 achristensen 2019-09-20 13:29:42 -0700 http://trac.webkit.org/r250146 1572855 3 webkit-bug-importer 2019-09-20 13:30:18 -0700 <rdar://problem/55570192> 379207 2019-09-19 22:33:55 -0700 2019-09-20 08:20:48 -0700 Patch bug-202029-20190919223354.patch text/plain 19458 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAxMjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDE5LTA5LTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGVwcmVjYXRlIHVu dXNlZCBDIEFQSSBhbGlhc2VzIGZvciBXZWJzaXRlRGF0YVN0b3JlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwMjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgcGllY2Ugb2YgcjI0OTc2 OC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJHZXRUeXBlSUQpOgorICAg ICAgICAoV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5z KToKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJEZWxldGVFbnRyaWVzRm9yT3Jp Z2luKToKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJEZWxldGVBbGxFbnRyaWVz KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0tleVZhbHVlU3RvcmFnZU1hbmFnZXIuY3Bw OgorICAgICAgICAoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0VHlwZUlEKToKKyAgICAgICAg KFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldE9yaWdpbktleSk6CisgICAgICAgIChXS0tleVZh bHVlU3RvcmFnZU1hbmFnZXJHZXRDcmVhdGlvblRpbWVLZXkpOgorICAgICAgICAoV0tLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyR2V0TW9kaWZpY2F0aW9uVGltZUtleSk6CisgICAgICAgIChXS0tleVZh bHVlU3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgKFdL S2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4pOgorICAgICAg ICAoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyRGVsZXRlRW50cmllc0Zvck9yaWdpbik6CisgICAg ICAgIChXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJEZWxldGVBbGxFbnRyaWVzKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0MvV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwOgorICAgICAgICAoV0tS ZXNvdXJjZUNhY2hlTWFuYWdlckdldFR5cGVJRCk6CisgICAgICAgIChXS1Jlc291cmNlQ2FjaGVN YW5hZ2VyR2V0Q2FjaGVPcmlnaW5zKToKKyAgICAgICAgKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJD bGVhckNhY2hlRm9yT3JpZ2luKToKKyAgICAgICAgKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJDbGVh ckNhY2hlRm9yQWxsT3JpZ2lucyk6CisgICAgICAgICh0b1dlYnNpdGVEYXRhVHlwZXMpOiBEZWxl dGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1Jlc291cmNlQ2FjaGVNYW5hZ2VyLmg6 CisKIDIwMTktMDktMTkgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgW0ZUVywgV2luQ2Fpcm9dIFN1cHBvcnQgcnVubmluZyB0ZXN0cyBpbiBSZWxlYXNlIG1v ZGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLQXBwbGljYXRpb25DYWNoZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAyNTAwMTkpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjYsNDIgKzI2LDE5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5oIgogCi0jaW5jbHVkZSAiQVBJQXJy YXkuaCIKLSNpbmNsdWRlICJBUElXZWJzaXRlRGF0YVN0b3JlLmgiCi0jaW5jbHVkZSAiV0tBUElD YXN0LmgiCi0jaW5jbHVkZSAiV2Vic2l0ZURhdGFSZWNvcmQuaCIKLQogV0tUeXBlSUQgV0tBcHBs aWNhdGlvbkNhY2hlTWFuYWdlckdldFR5cGVJRCgpCiB7Ci0gICAgcmV0dXJuIFdlYktpdDo6dG9B UEkoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpBUElUeXBlKTsKKyAgICByZXR1cm4gMDsKIH0KIAot dm9pZCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyR2V0QXBwbGljYXRpb25DYWNoZU9yaWdpbnMo V0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZiBhcHBsaWNhdGlvbkNhY2hlTWFuYWdlciwgdm9p ZCogY29udGV4dCwgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldEFwcGxpY2F0aW9uQ2FjaGVP cmlnaW5zRnVuY3Rpb24gY2FsbGJhY2spCit2b2lkIFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJH ZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lucyhXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUmVmLCB2 b2lkKiwgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5z RnVuY3Rpb24pCiB7Ci0gICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9IFdlYktpdDo6dG9JbXBs KHJlaW50ZXJwcmV0X2Nhc3Q8V0tXZWJzaXRlRGF0YVN0b3JlUmVmPihhcHBsaWNhdGlvbkNhY2hl TWFuYWdlcikpLT53ZWJzaXRlRGF0YVN0b3JlKCk7Ci0gICAgd2Vic2l0ZURhdGFTdG9yZS5mZXRj aERhdGEoV2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hl LCB7IH0sIFtjb250ZXh0LCBjYWxsYmFja10oYXV0byBkYXRhUmVjb3JkcykgewotICAgICAgICBW ZWN0b3I8UmVmUHRyPEFQSTo6T2JqZWN0Pj4gc2VjdXJpdHlPcmlnaW5zOwotICAgICAgICBmb3Ig KGNvbnN0IGF1dG8mIGRhdGFSZWNvcmQgOiBkYXRhUmVjb3JkcykgewotICAgICAgICAgICAgZm9y IChjb25zdCBhdXRvJiBvcmlnaW4gOiBkYXRhUmVjb3JkLm9yaWdpbnMpCi0gICAgICAgICAgICAg ICAgc2VjdXJpdHlPcmlnaW5zLmFwcGVuZChBUEk6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUob3Jp Z2luLnNlY3VyaXR5T3JpZ2luKCkpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGNhbGxiYWNrKFdl YktpdDo6dG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdURk1vdmUoc2VjdXJpdHlPcmlnaW5zKSku cHRyKCkpLCBudWxscHRyLCBjb250ZXh0KTsKLSAgICB9KTsKIH0KIAotdm9pZCBXS0FwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyRGVsZXRlRW50cmllc0Zvck9yaWdpbihXS0FwcGxpY2F0aW9uQ2FjaGVN YW5hZ2VyUmVmIGFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9y aWdpbikKK3ZvaWQgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckRlbGV0ZUVudHJpZXNGb3JPcmln aW4oV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZiwgV0tTZWN1cml0eU9yaWdpblJlZikKIHsK LSAgICBhdXRvJiB3ZWJzaXRlRGF0YVN0b3JlID0gV2ViS2l0Ojp0b0ltcGwocmVpbnRlcnByZXRf Y2FzdDxXS1dlYnNpdGVEYXRhU3RvcmVSZWY+KGFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKSktPndl YnNpdGVEYXRhU3RvcmUoKTsKLQotICAgIFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQgZGF0YVJl Y29yZDsKLSAgICBkYXRhUmVjb3JkLmFkZChXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZTo6T2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGUsIFdlYktpdDo6dG9JbXBsKG9yaWdpbiktPnNlY3VyaXR5T3Jp Z2luKCkuZGF0YSgpKTsKLQotICAgIHdlYnNpdGVEYXRhU3RvcmUucmVtb3ZlRGF0YShXZWJLaXQ6 OldlYnNpdGVEYXRhVHlwZTo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUsIHsgZGF0YVJlY29y ZCB9LCBbXSB7IH0pOwogfQogCi12b2lkIFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJEZWxldGVB bGxFbnRyaWVzKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYgYXBwbGljYXRpb25DYWNoZU1h bmFnZXIpCit2b2lkIFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJEZWxldGVBbGxFbnRyaWVzKFdL QXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYpCiB7Ci0gICAgYXV0byYgd2Vic2l0ZURhdGFTdG9y ZSA9IFdlYktpdDo6dG9JbXBsKHJlaW50ZXJwcmV0X2Nhc3Q8V0tXZWJzaXRlRGF0YVN0b3JlUmVm PihhcHBsaWNhdGlvbkNhY2hlTWFuYWdlcikpLT53ZWJzaXRlRGF0YVN0b3JlKCk7Ci0gICAgd2Vi c2l0ZURhdGFTdG9yZS5yZW1vdmVEYXRhKFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlOjpPZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZSwgLVdhbGxUaW1lOjppbmZpbml0eSgpLCBbXSB7IH0pOwogfQpJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tBcHBsaWNhdGlvbkNhY2hlTWFu YWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQXBw bGljYXRpb25DYWNoZU1hbmFnZXIuaAkocmV2aXNpb24gMjUwMDE5KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0MvV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNywxOCArMjcsMTkgQEAKICNkZWZpbmUgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdl cl9oCiAKICNpbmNsdWRlIDxXZWJLaXQvV0tCYXNlLmg+CisjaW5jbHVkZSA8V2ViS2l0L1dLRGVw cmVjYXRlZC5oPgogCiAjaWZkZWYgX19jcGx1c3BsdXMKIGV4dGVybiAiQyIgewogI2VuZGlmCiAK LVdLX0VYUE9SVCBXS1R5cGVJRCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyR2V0VHlwZUlEKCk7 CitXS19FWFBPUlQgV0tUeXBlSUQgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldFR5cGVJRCgp IFdLX0NfQVBJX0RFUFJFQ0FURUQ7CiAKIHR5cGVkZWYgdm9pZCAoKldLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXJHZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luc0Z1bmN0aW9uKShXS0FycmF5UmVmLCBX S0Vycm9yUmVmLCB2b2lkKik7Ci1XS19FWFBPUlQgdm9pZCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5h Z2VyR2V0QXBwbGljYXRpb25DYWNoZU9yaWdpbnMoV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJl ZiBhcHBsaWNhdGlvbkNhY2hlTWFuYWdlciwgdm9pZCogY29udGV4dCwgV0tBcHBsaWNhdGlvbkNh Y2hlTWFuYWdlckdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5zRnVuY3Rpb24gZnVuY3Rpb24pOwor V0tfRVhQT1JUIHZvaWQgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldEFwcGxpY2F0aW9uQ2Fj aGVPcmlnaW5zKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYgYXBwbGljYXRpb25DYWNoZU1h bmFnZXIsIHZvaWQqIGNvbnRleHQsIFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJHZXRBcHBsaWNh dGlvbkNhY2hlT3JpZ2luc0Z1bmN0aW9uIGZ1bmN0aW9uKSBXS19DX0FQSV9ERVBSRUNBVEVEOwog Ci1XS19FWFBPUlQgdm9pZCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyRGVsZXRlRW50cmllc0Zv ck9yaWdpbihXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUmVmIGFwcGxpY2F0aW9uQ2FjaGVNYW5h Z2VyLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdpbik7Ci1XS19FWFBPUlQgdm9pZCBXS0FwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyRGVsZXRlQWxsRW50cmllcyhXS0FwcGxpY2F0aW9uQ2FjaGVNYW5h Z2VyUmVmIGFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKTsKK1dLX0VYUE9SVCB2b2lkIFdLQXBwbGlj YXRpb25DYWNoZU1hbmFnZXJEZWxldGVFbnRyaWVzRm9yT3JpZ2luKFdLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXJSZWYgYXBwbGljYXRpb25DYWNoZU1hbmFnZXIsIFdLU2VjdXJpdHlPcmlnaW5SZWYg b3JpZ2luKSBXS19DX0FQSV9ERVBSRUNBVEVEOworV0tfRVhQT1JUIHZvaWQgV0tBcHBsaWNhdGlv bkNhY2hlTWFuYWdlckRlbGV0ZUFsbEVudHJpZXMoV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJl ZiBhcHBsaWNhdGlvbkNhY2hlTWFuYWdlcikgV0tfQ19BUElfREVQUkVDQVRFRDsKIAogI2lmZGVm IF9fY3BsdXNwbHVzCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0tl eVZhbHVlU3RvcmFnZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAJKHJldmlzaW9uIDI1MDAx OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLS2V5VmFsdWVTdG9yYWdlTWFu YWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDkwICsyNiwzOCBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIldLS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5oIgogCi0jaW5jbHVk ZSAiQVBJQXJyYXkuaCIKLSNpbmNsdWRlICJBUElEaWN0aW9uYXJ5LmgiCi0jaW5jbHVkZSAiQVBJ V2Vic2l0ZURhdGFTdG9yZS5oIgotI2luY2x1ZGUgIlN0b3JhZ2VNYW5hZ2VyLmgiCi0jaW5jbHVk ZSAiV0tBUElDYXN0LmgiCi0jaW5jbHVkZSAiV2Vic2l0ZURhdGFSZWNvcmQuaCIKLSNpbmNsdWRl ICJXZWJzaXRlRGF0YVN0b3JlLmgiCi0jaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KLQotdXNpbmcg bmFtZXNwYWNlIFdlYktpdDsKLQogV0tUeXBlSUQgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0 VHlwZUlEKCkKIHsKLSAgICByZXR1cm4gdG9BUEkoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpBUElU eXBlKTsKKyAgICByZXR1cm4gMDsKIH0KIAogV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyR2V0T3JpZ2luS2V5KCkKIHsKLSAgICBzdGF0aWMgQVBJOjpTdHJpbmcmIGtleSA9IEFQ STo6U3RyaW5nOjpjcmVhdGUoIldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJTdG9yYWdlRGV0YWls c09yaWdpbktleSIpLmxlYWtSZWYoKTsKLSAgICByZXR1cm4gdG9BUEkoJmtleSk7CisgICAgcmV0 dXJuIG51bGxwdHI7CiB9CiAKIFdLU3RyaW5nUmVmIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdl dENyZWF0aW9uVGltZUtleSgpCiB7Ci0gICAgc3RhdGljIEFQSTo6U3RyaW5nJiBrZXkgPSBBUEk6 OlN0cmluZzo6Y3JlYXRlKCJXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyU3RvcmFnZURldGFpbHND cmVhdGlvblRpbWVLZXkiKS5sZWFrUmVmKCk7Ci0gICAgcmV0dXJuIHRvQVBJKCZrZXkpOworICAg IHJldHVybiBudWxscHRyOwogfQogCiBXS1N0cmluZ1JlZiBXS0tleVZhbHVlU3RvcmFnZU1hbmFn ZXJHZXRNb2RpZmljYXRpb25UaW1lS2V5KCkKIHsKLSAgICBzdGF0aWMgQVBJOjpTdHJpbmcmIGtl eSA9IEFQSTo6U3RyaW5nOjpjcmVhdGUoIldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJTdG9yYWdl RGV0YWlsc01vZGlmaWNhdGlvblRpbWVLZXkiKS5sZWFrUmVmKCk7Ci0gICAgcmV0dXJuIHRvQVBJ KCZrZXkpOworICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lkIFdLS2V5VmFsdWVTdG9yYWdl TWFuYWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy UmVmIGtleVZhbHVlU3RvcmFnZU1hbmFnZXIsIHZvaWQqIGNvbnRleHQsIFdLS2V5VmFsdWVTdG9y YWdlTWFuYWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnNGdW5jdGlvbiBjYWxsYmFjaykKLQor dm9pZCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKFdL S2V5VmFsdWVTdG9yYWdlTWFuYWdlclJlZiwgdm9pZCosIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdl ckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnNGdW5jdGlvbikKIHsKLSAgICBhdXRvJiB3ZWJzaXRl RGF0YVN0b3JlID0gdG9JbXBsKHJlaW50ZXJwcmV0X2Nhc3Q8V0tXZWJzaXRlRGF0YVN0b3JlUmVm PihrZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyKSktPndlYnNpdGVEYXRhU3RvcmUoKTsKLSAgICB3ZWJz aXRlRGF0YVN0b3JlLmZldGNoRGF0YSh7IFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdlLCBX ZWJzaXRlRGF0YVR5cGU6OlNlc3Npb25TdG9yYWdlIH0sIHsgfSwgW2NvbnRleHQsIGNhbGxiYWNr XShhdXRvIGRhdGFSZWNvcmRzKSB7Ci0gICAgICAgIFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+ PiBzZWN1cml0eU9yaWdpbnM7Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgZGF0YVJlY29yZCA6 IGRhdGFSZWNvcmRzKSB7Ci0gICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IGRh dGFSZWNvcmQub3JpZ2lucykKLSAgICAgICAgICAgICAgICBzZWN1cml0eU9yaWdpbnMuYXBwZW5k KEFQSTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShvcmlnaW4uc2VjdXJpdHlPcmlnaW4oKSkpOwot ICAgICAgICB9Ci0KLSAgICAgICAgY2FsbGJhY2sodG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdU Rk1vdmUoc2VjdXJpdHlPcmlnaW5zKSkucHRyKCkpLCBudWxscHRyLCBjb250ZXh0KTsKLSAgICB9 KTsKIH0KIAotdm9pZCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRTdG9yYWdlRGV0YWlsc0J5 T3JpZ2luKFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlclJlZiBrZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy LCB2b2lkKiBjb250ZXh0LCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRTdG9yYWdlRGV0YWls c0J5T3JpZ2luRnVuY3Rpb24gY2FsbGJhY2spCit2b2lkIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdl ckdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmLCB2 b2lkKiwgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbkZ1 bmN0aW9uKQogewotICAgIGF1dG8mIHdlYnNpdGVEYXRhU3RvcmUgPSB0b0ltcGwocmVpbnRlcnBy ZXRfY2FzdDxXS1dlYnNpdGVEYXRhU3RvcmVSZWY+KGtleVZhbHVlU3RvcmFnZU1hbmFnZXIpKS0+ d2Vic2l0ZURhdGFTdG9yZSgpOwotICAgIHdlYnNpdGVEYXRhU3RvcmUuZ2V0TG9jYWxTdG9yYWdl RGV0YWlscyhbY29udGV4dCwgY2FsbGJhY2tdKGF1dG8mJiBkZXRhaWxzKSB7Ci0gICAgICAgIFZl Y3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiByZXN1bHQ7Ci0gICAgICAgIHJlc3VsdC5yZXNlcnZl SW5pdGlhbENhcGFjaXR5KGRldGFpbHMuc2l6ZSgpKTsKLQotICAgICAgICBmb3IgKGNvbnN0IGF1 dG8mIGRldGFpbCA6IGRldGFpbHMpIHsKLSAgICAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQ dHI8QVBJOjpPYmplY3Q+PiBkZXRhaWxNYXA7Ci0gICAgICAgICAgICBSZWZQdHI8QVBJOjpPYmpl Y3Q+IG9yaWdpbiA9IEFQSTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbkRhdGE6OmZyb21EYXRhYmFzZUlkZW50aWZpZXIoZGV0YWlsLm9yaWdpbklkZW50aWZp ZXIpLT5zZWN1cml0eU9yaWdpbigpKTsKLQotICAgICAgICAgICAgZGV0YWlsTWFwLnNldCh0b0lt cGwoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0T3JpZ2luS2V5KCkpLT5zdHJpbmcoKSwgb3Jp Z2luKTsKLSAgICAgICAgICAgIGlmIChkZXRhaWwuY3JlYXRpb25UaW1lKQotICAgICAgICAgICAg ICAgIGRldGFpbE1hcC5zZXQodG9JbXBsKFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldENyZWF0 aW9uVGltZUtleSgpKS0+c3RyaW5nKCksIEFQSTo6RG91YmxlOjpjcmVhdGUoZGV0YWlsLmNyZWF0 aW9uVGltZS0+c2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpKSk7Ci0gICAgICAgICAgICBpZiAo ZGV0YWlsLm1vZGlmaWNhdGlvblRpbWUpCi0gICAgICAgICAgICAgICAgZGV0YWlsTWFwLnNldCh0 b0ltcGwoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0TW9kaWZpY2F0aW9uVGltZUtleSgpKS0+ c3RyaW5nKCksIEFQSTo6RG91YmxlOjpjcmVhdGUoZGV0YWlsLm1vZGlmaWNhdGlvblRpbWUtPnNl Y29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKSkpOwotCi0gICAgICAgICAgICByZXN1bHQudW5jaGVj a2VkQXBwZW5kKEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUoZGV0YWlsTWFwKSkpOwot ICAgICAgICB9Ci0KLSAgICAgICAgY2FsbGJhY2sodG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdU Rk1vdmUocmVzdWx0KSkucHRyKCkpLCBudWxscHRyLCBjb250ZXh0KTsKLSAgICB9KTsKIH0KIAot dm9pZCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJEZWxldGVFbnRyaWVzRm9yT3JpZ2luKFdLS2V5 VmFsdWVTdG9yYWdlTWFuYWdlclJlZiBrZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLCBXS1NlY3VyaXR5 T3JpZ2luUmVmIG9yaWdpbikKK3ZvaWQgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyRGVsZXRlRW50 cmllc0Zvck9yaWdpbihXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJSZWYsIFdLU2VjdXJpdHlPcmln aW5SZWYpCiB7Ci0gICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1wbChyZWludGVycHJl dF9jYXN0PFdLV2Vic2l0ZURhdGFTdG9yZVJlZj4oa2V5VmFsdWVTdG9yYWdlTWFuYWdlcikpLT53 ZWJzaXRlRGF0YVN0b3JlKCk7Ci0gICAgV2Vic2l0ZURhdGFSZWNvcmQgZGF0YVJlY29yZDsKLSAg ICBkYXRhUmVjb3JkLmFkZChXZWJzaXRlRGF0YVR5cGU6OkxvY2FsU3RvcmFnZSwgdG9JbXBsKG9y aWdpbiktPnNlY3VyaXR5T3JpZ2luKCkuZGF0YSgpKTsKLSAgICBkYXRhUmVjb3JkLmFkZChXZWJz aXRlRGF0YVR5cGU6OlNlc3Npb25TdG9yYWdlLCB0b0ltcGwob3JpZ2luKS0+c2VjdXJpdHlPcmln aW4oKS5kYXRhKCkpOwotICAgIHdlYnNpdGVEYXRhU3RvcmUucmVtb3ZlRGF0YSh7IFdlYnNpdGVE YXRhVHlwZTo6TG9jYWxTdG9yYWdlLCBXZWJzaXRlRGF0YVR5cGU6OlNlc3Npb25TdG9yYWdlIH0s IHsgZGF0YVJlY29yZCB9LCBbXSB7IH0pOwogfQogCi12b2lkIFdLS2V5VmFsdWVTdG9yYWdlTWFu YWdlckRlbGV0ZUFsbEVudHJpZXMoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmIGtleVZhbHVl U3RvcmFnZU1hbmFnZXIpCit2b2lkIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckRlbGV0ZUFsbEVu dHJpZXMoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmKQogewotICAgIGF1dG8mIHdlYnNpdGVE YXRhU3RvcmUgPSB0b0ltcGwocmVpbnRlcnByZXRfY2FzdDxXS1dlYnNpdGVEYXRhU3RvcmVSZWY+ KGtleVZhbHVlU3RvcmFnZU1hbmFnZXIpKS0+d2Vic2l0ZURhdGFTdG9yZSgpOwotICAgIHdlYnNp dGVEYXRhU3RvcmUucmVtb3ZlRGF0YSh7IFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdlLCBX ZWJzaXRlRGF0YVR5cGU6OlNlc3Npb25TdG9yYWdlIH0sIC1XYWxsVGltZTo6aW5maW5pdHkoKSwg W10geyB9KTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLS2V5VmFs dWVTdG9yYWdlTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5oCShyZXZpc2lvbiAyNTAwMTkpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0tleVZhbHVlU3RvcmFnZU1hbmFnZXIuaAko d29ya2luZyBjb3B5KQpAQCAtMjcsMzAgKzI3LDMxIEBACiAjZGVmaW5lIFdLS2V5VmFsdWVTdG9y YWdlTWFuYWdlcl9oCiAKICNpbmNsdWRlIDxXZWJLaXQvV0tCYXNlLmg+CisjaW5jbHVkZSA8V2Vi S2l0L1dLRGVwcmVjYXRlZC5oPgogCiAjaWZkZWYgX19jcGx1c3BsdXMKIGV4dGVybiAiQyIgewog I2VuZGlmCiAKLVdLX0VYUE9SVCBXS1R5cGVJRCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRU eXBlSUQoKTsKK1dLX0VYUE9SVCBXS1R5cGVJRCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRU eXBlSUQoKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogCiAvKiBWYWx1ZSB0eXBlOiBXS1NlY3VyaXR5 T3JpZ2luUmVmICovCi1XS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyR2V0T3JpZ2luS2V5KCk7CitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3Jh Z2VNYW5hZ2VyR2V0T3JpZ2luS2V5KCkgV0tfQ19BUElfREVQUkVDQVRFRDsKIAogLyogVmFsdWUg dHlwZTogV0tEb3VibGVSZWYsIHNlY29uZHMgc2luY2UgSmFudWFyeSAxc3QsIDE5NzAgVVRDICov Ci1XS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0Q3JlYXRp b25UaW1lS2V5KCk7CitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyR2V0Q3JlYXRpb25UaW1lS2V5KCkgV0tfQ19BUElfREVQUkVDQVRFRDsKIAogLyogVmFsdWUg dHlwZTogV0tEb3VibGVSZWYsIHNlY29uZHMgc2luY2UgSmFudWFyeSAxc3QsIDE5NzAgVVRDICov Ci1XS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0TW9kaWZp Y2F0aW9uVGltZUtleSgpOworV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLS2V5VmFsdWVTdG9yYWdl TWFuYWdlckdldE1vZGlmaWNhdGlvblRpbWVLZXkoKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogCiB0 eXBlZGVmIHZvaWQgKCpXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VP cmlnaW5zRnVuY3Rpb24pKFdLQXJyYXlSZWYsIFdLRXJyb3JSZWYsIHZvaWQqKTsKLVdLX0VYUE9S VCB2b2lkIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMo V0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmIGtleVZhbHVlU3RvcmFnZU1hbmFnZXIsIHZvaWQq IGNvbnRleHQsIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdp bnNGdW5jdGlvbiBmdW5jdGlvbik7CitXS19FWFBPUlQgdm9pZCBXS0tleVZhbHVlU3RvcmFnZU1h bmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlclJl ZiBrZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLCB2b2lkKiBjb250ZXh0LCBXS0tleVZhbHVlU3RvcmFn ZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zRnVuY3Rpb24gZnVuY3Rpb24pIFdLX0Nf QVBJX0RFUFJFQ0FURUQ7CiAKIHR5cGVkZWYgdm9pZCAoKldLS2V5VmFsdWVTdG9yYWdlTWFuYWdl ckdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW5GdW5jdGlvbikoV0tBcnJheVJlZiwgV0tFcnJvclJl Ziwgdm9pZCopOwotV0tfRVhQT1JUIHZvaWQgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0U3Rv cmFnZURldGFpbHNCeU9yaWdpbihXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJSZWYga2V5VmFsdWVT dG9yYWdlTWFuYWdlciwgdm9pZCogY29udGV4dCwgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0 U3RvcmFnZURldGFpbHNCeU9yaWdpbkZ1bmN0aW9uIGZ1bmN0aW9uKTsKK1dLX0VYUE9SVCB2b2lk IFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oV0tLZXlW YWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmIGtleVZhbHVlU3RvcmFnZU1hbmFnZXIsIHZvaWQqIGNvbnRl eHQsIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW5GdW5j dGlvbiBmdW5jdGlvbikgV0tfQ19BUElfREVQUkVDQVRFRDsKIAotV0tfRVhQT1JUIHZvaWQgV0tL ZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyRGVsZXRlRW50cmllc0Zvck9yaWdpbihXS0tleVZhbHVlU3Rv cmFnZU1hbmFnZXJSZWYga2V5VmFsdWVTdG9yYWdlTWFuYWdlciwgV0tTZWN1cml0eU9yaWdpblJl ZiBvcmlnaW4pOwotV0tfRVhQT1JUIHZvaWQgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyRGVsZXRl QWxsRW50cmllcyhXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJSZWYga2V5VmFsdWVTdG9yYWdlTWFu YWdlcik7CitXS19FWFBPUlQgdm9pZCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJEZWxldGVFbnRy aWVzRm9yT3JpZ2luKFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlclJlZiBrZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdpbikgV0tfQ19BUElfREVQUkVDQVRFRDsK K1dLX0VYUE9SVCB2b2lkIFdLS2V5VmFsdWVTdG9yYWdlTWFuYWdlckRlbGV0ZUFsbEVudHJpZXMo V0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmIGtleVZhbHVlU3RvcmFnZU1hbmFnZXIpIFdLX0Nf QVBJX0RFUFJFQ0FURUQ7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0MvV0tSZXNvdXJjZUNhY2hlTWFuYWdlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tSZXNvdXJjZUNhY2hlTWFuYWdl ci5jcHAJKHJldmlzaW9uIDI1MDAxOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLUmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2NyArMjYs MTkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXS1Jlc291cmNlQ2FjaGVNYW5h Z2VyLmgiCiAKLSNpbmNsdWRlICJBUElBcnJheS5oIgotI2luY2x1ZGUgIkFQSVdlYnNpdGVEYXRh U3RvcmUuaCIKLSNpbmNsdWRlICJXS0FQSUNhc3QuaCIKLSNpbmNsdWRlICJXZWJzaXRlRGF0YVJl Y29yZC5oIgotCi11c2luZyBuYW1lc3BhY2UgV2ViS2l0OwotCiBXS1R5cGVJRCBXS1Jlc291cmNl Q2FjaGVNYW5hZ2VyR2V0VHlwZUlEKCkKIHsKLSAgICByZXR1cm4gdG9BUEkoQVBJOjpXZWJzaXRl RGF0YVN0b3JlOjpBUElUeXBlKTsKLX0KLQotc3RhdGljIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5 cGU+IHRvV2Vic2l0ZURhdGFUeXBlcyhXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNUb0Ns ZWFyKQotewotICAgIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IHdlYnNpdGVEYXRhVHlwZXMg eyBXZWJzaXRlRGF0YVR5cGU6Ok1lbW9yeUNhY2hlIH07Ci0KLSAgICBpZiAoY2FjaGVzVG9DbGVh ciA9PSBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhckFsbCkKLSAgICAgICAgd2Vic2l0ZURhdGFUeXBl cy5hZGQoV2Vic2l0ZURhdGFUeXBlOjpEaXNrQ2FjaGUpOwotCi0gICAgcmV0dXJuIHdlYnNpdGVE YXRhVHlwZXM7CisgICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdl ckdldENhY2hlT3JpZ2lucyhXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyUmVmIGNhY2hlTWFuYWdlciwg dm9pZCogY29udGV4dCwgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckdldENhY2hlT3JpZ2luc0Z1bmN0 aW9uIGNhbGxiYWNrKQordm9pZCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyR2V0Q2FjaGVPcmlnaW5z KFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJSZWYsIHZvaWQqLCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2Vy R2V0Q2FjaGVPcmlnaW5zRnVuY3Rpb24pCiB7Ci0gICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9 IHRvSW1wbChyZWludGVycHJldF9jYXN0PFdLV2Vic2l0ZURhdGFTdG9yZVJlZj4oY2FjaGVNYW5h Z2VyKSktPndlYnNpdGVEYXRhU3RvcmUoKTsKLSAgICB3ZWJzaXRlRGF0YVN0b3JlLmZldGNoRGF0 YSh0b1dlYnNpdGVEYXRhVHlwZXMoV0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXJBbGwpLCB7IH0sIFtj b250ZXh0LCBjYWxsYmFja10oYXV0byBkYXRhUmVjb3JkcykgewotICAgICAgICBWZWN0b3I8UmVm UHRyPEFQSTo6T2JqZWN0Pj4gc2VjdXJpdHlPcmlnaW5zOwotICAgICAgICBmb3IgKGNvbnN0IGF1 dG8mIGRhdGFSZWNvcmQgOiBkYXRhUmVjb3JkcykgewotICAgICAgICAgICAgZm9yIChjb25zdCBh dXRvJiBvcmlnaW4gOiBkYXRhUmVjb3JkLm9yaWdpbnMpCi0gICAgICAgICAgICAgICAgc2VjdXJp dHlPcmlnaW5zLmFwcGVuZChBUEk6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUob3JpZ2luLnNlY3Vy aXR5T3JpZ2luKCkpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGNhbGxiYWNrKHRvQVBJKEFQSTo6 QXJyYXk6OmNyZWF0ZShXVEZNb3ZlKHNlY3VyaXR5T3JpZ2lucykpLnB0cigpKSwgbnVsbHB0ciwg Y29udGV4dCk7Ci0gICAgfSk7CiB9CiAKLXZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFy Q2FjaGVGb3JPcmlnaW4oV0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBjYWNoZU1hbmFnZXIsIFdL U2VjdXJpdHlPcmlnaW5SZWYgb3JpZ2luLCBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNU b0NsZWFyKQordm9pZCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyQ2xlYXJDYWNoZUZvck9yaWdpbihX S1Jlc291cmNlQ2FjaGVNYW5hZ2VyUmVmLCBXS1NlY3VyaXR5T3JpZ2luUmVmLCBXS1Jlc291cmNl Q2FjaGVzVG9DbGVhcikKIHsKLSAgICBhdXRvJiB3ZWJzaXRlRGF0YVN0b3JlID0gdG9JbXBsKHJl aW50ZXJwcmV0X2Nhc3Q8V0tXZWJzaXRlRGF0YVN0b3JlUmVmPihjYWNoZU1hbmFnZXIpKS0+d2Vi c2l0ZURhdGFTdG9yZSgpOwotCi0gICAgVmVjdG9yPFdlYnNpdGVEYXRhUmVjb3JkPiBkYXRhUmVj b3JkczsKLQotICAgIHsKLSAgICAgICAgV2Vic2l0ZURhdGFSZWNvcmQgZGF0YVJlY29yZDsKLSAg ICAgICAgZGF0YVJlY29yZC5hZGQoV2Vic2l0ZURhdGFUeXBlOjpNZW1vcnlDYWNoZSwgdG9JbXBs KG9yaWdpbiktPnNlY3VyaXR5T3JpZ2luKCkuZGF0YSgpKTsKLQotICAgICAgICBkYXRhUmVjb3Jk cy5hcHBlbmQoZGF0YVJlY29yZCk7Ci0gICAgfQotCi0gICAgaWYgKGNhY2hlc1RvQ2xlYXIgPT0g V0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXJBbGwpIHsKLSAgICAgICAgV2Vic2l0ZURhdGFSZWNvcmQg ZGF0YVJlY29yZDsKLSAgICAgICAgZGF0YVJlY29yZC5hZGQoV2Vic2l0ZURhdGFUeXBlOjpEaXNr Q2FjaGUsIHRvSW1wbChvcmlnaW4pLT5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSk7Ci0KLSAgICAg ICAgZGF0YVJlY29yZHMuYXBwZW5kKGRhdGFSZWNvcmQpOwotICAgIH0KLQotICAgIHdlYnNpdGVE YXRhU3RvcmUucmVtb3ZlRGF0YSh0b1dlYnNpdGVEYXRhVHlwZXMoY2FjaGVzVG9DbGVhciksIGRh dGFSZWNvcmRzLCBbXSB7IH0pOwogfQogCi12b2lkIFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJDbGVh ckNhY2hlRm9yQWxsT3JpZ2lucyhXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyUmVmIGNhY2hlTWFuYWdl ciwgV0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXIgY2FjaGVzVG9DbGVhcikKK3ZvaWQgV0tSZXNvdXJj ZUNhY2hlTWFuYWdlckNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKFdLUmVzb3VyY2VDYWNoZU1hbmFn ZXJSZWYsIFdLUmVzb3VyY2VDYWNoZXNUb0NsZWFyKQogewotICAgIGF1dG8mIHdlYnNpdGVEYXRh U3RvcmUgPSB0b0ltcGwocmVpbnRlcnByZXRfY2FzdDxXS1dlYnNpdGVEYXRhU3RvcmVSZWY+KGNh Y2hlTWFuYWdlcikpLT53ZWJzaXRlRGF0YVN0b3JlKCk7Ci0gICAgd2Vic2l0ZURhdGFTdG9yZS5y ZW1vdmVEYXRhKHRvV2Vic2l0ZURhdGFUeXBlcyhjYWNoZXNUb0NsZWFyKSwgLVdhbGxUaW1lOjpp bmZpbml0eSgpLCBbXSB7IH0pOwogfQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0MvV0tSZXNvdXJjZUNhY2hlTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VDYWNoZU1hbmFnZXIuaAkocmV2aXNpb24gMjUwMDE5 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tSZXNvdXJjZUNhY2hlTWFuYWdl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw3IEBACiAjZGVmaW5lIFdLUmVzb3VyY2VD YWNoZU1hbmFnZXJfaAogCiAjaW5jbHVkZSA8V2ViS2l0L1dLQmFzZS5oPgorI2luY2x1ZGUgPFdl YktpdC9XS0RlcHJlY2F0ZWQuaD4KIAogI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4gIkMiIHsK QEAgLTM4LDEzICszOSwxMyBAQCBlbnVtIHsKIH07CiB0eXBlZGVmIHVpbnQzMl90IFdLUmVzb3Vy Y2VDYWNoZXNUb0NsZWFyOwogCi1XS19FWFBPUlQgV0tUeXBlSUQgV0tSZXNvdXJjZUNhY2hlTWFu YWdlckdldFR5cGVJRCgpOworV0tfRVhQT1JUIFdLVHlwZUlEIFdLUmVzb3VyY2VDYWNoZU1hbmFn ZXJHZXRUeXBlSUQoKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogCiB0eXBlZGVmIHZvaWQgKCpXS1Jl c291cmNlQ2FjaGVNYW5hZ2VyR2V0Q2FjaGVPcmlnaW5zRnVuY3Rpb24pKFdLQXJyYXlSZWYsIFdL RXJyb3JSZWYsIHZvaWQqKTsKLVdLX0VYUE9SVCB2b2lkIFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJH ZXRDYWNoZU9yaWdpbnMoV0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBjb250ZXh0UmVmLCB2b2lk KiBjb250ZXh0LCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyR2V0Q2FjaGVPcmlnaW5zRnVuY3Rpb24g ZnVuY3Rpb24pOworV0tfRVhQT1JUIHZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckdldENhY2hl T3JpZ2lucyhXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyUmVmIGNvbnRleHRSZWYsIHZvaWQqIGNvbnRl eHQsIFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJHZXRDYWNoZU9yaWdpbnNGdW5jdGlvbiBmdW5jdGlv bikgV0tfQ19BUElfREVQUkVDQVRFRDsKIAotV0tfRVhQT1JUIHZvaWQgV0tSZXNvdXJjZUNhY2hl TWFuYWdlckNsZWFyQ2FjaGVGb3JPcmlnaW4oV0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBjYWNo ZU1hbmdlciwgV0tTZWN1cml0eU9yaWdpblJlZiBvcmlnaW4sIFdLUmVzb3VyY2VDYWNoZXNUb0Ns ZWFyIGNhY2hlc1RvQ2xlYXIpOwotV0tfRVhQT1JUIHZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdl ckNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJSZWYgY2FjaGVN YW5hZ2VyLCBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNUb0NsZWFyKTsKK1dLX0VYUE9S VCB2b2lkIFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJDbGVhckNhY2hlRm9yT3JpZ2luKFdLUmVzb3Vy Y2VDYWNoZU1hbmFnZXJSZWYgY2FjaGVNYW5nZXIsIFdLU2VjdXJpdHlPcmlnaW5SZWYgb3JpZ2lu LCBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNUb0NsZWFyKSBXS19DX0FQSV9ERVBSRUNB VEVEOworV0tfRVhQT1JUIHZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFyQ2FjaGVGb3JB bGxPcmlnaW5zKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJSZWYgY2FjaGVNYW5hZ2VyLCBXS1Jlc291 cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNUb0NsZWFyKSBXS19DX0FQSV9ERVBSRUNBVEVEOwogCiAj aWZkZWYgX19jcGx1c3BsdXMKIH0K