116358 2013-05-17 15:14:54 -0700 Use the UI process storage manager for deleting local storage data 2013-05-17 15:58:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 890699 0 andersca 2013-05-17 15:14:54 -0700 Use the UI process storage manager for deleting local storage data 890701 1 202165 andersca 2013-05-17 15:20:04 -0700 Created attachment 202165 Patch 890712 2 andersca 2013-05-17 15:58:59 -0700 Committed r150304: <http://trac.webkit.org/changeset/150304> 202165 2013-05-17 15:20:04 -0700 2013-05-17 15:50:22 -0700 Patch bug-116358-20130517151857.patch text/plain 18474 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDM3ZmY5Yjg2OTYwMWY4 NDc3MDkzZmM5MTkyZjFiNTNjMzc3ZTJlNy4uOTQ4NDhjZGYxNDc3ZDU0NmFhYWI0YjM3OWM1ZTYz ODIzNjdhOWI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcwIEBACiAyMDEzLTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIHRoZSBVSSBw cm9jZXNzIHN0b3JhZ2UgbWFuYWdlciBmb3IgZGVsZXRpbmcgbG9jYWwgc3RvcmFnZSBkYXRhCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzNTgKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzODUyODI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlNlY3VyaXR5T3JpZ2luLmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNlY3VyaXR5T3JpZ2luOjpwcm90b2NvbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlNlY3VyaXR5T3JpZ2luOjpob3N0KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2Vj dXJpdHlPcmlnaW46OmRhdGFiYXNlSWRlbnRpZmllcik6CisgICAgICAgIChXZWJLaXQ6OldlYlNl Y3VyaXR5T3JpZ2luOjp0b1N0cmluZyk6CisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBjb25zdHMu CisKKyAgICAgICAgKFdlYktpdDo6V2ViU2VjdXJpdHlPcmlnaW46OnNlY3VyaXR5T3JpZ2luKToK KyAgICAgICAgQWRkIGdldHRlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2Fs U3RvcmFnZURhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJh c2U6OmNsb3NlKToKKyAgICAgICAgZGVsZXRlRW1wdHlEYXRhYmFzZVdpdGhPcmlnaW4gaGFzIGJl ZW4gcmVuYW1lZCB0byBkZWxldGVEYXRhYmFzZVdpdGhPcmlnaW4uCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlV2l0aE9y aWdpbik6CisgICAgICAgIFJlbmFtZSBzaW5jZSB0aGlzIGlzIG5vIGxvbmdlciB1c2VkIG9ubHkg Zm9yIGVtcHR5IGRhdGFiYXNlcy4KKworICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXI6OmRlbGV0ZUFsbERhdGFiYXNlcyk6CisgICAgICAgIExvb3Agb3ZlciB0aGUg dHJhY2tlciBkYXRhYmFzZSBhbmQgZGVsZXRlIGFsbCBkYXRhYmFzZSBmaWxlcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpjbGVhcik6CisgICAgICAgIENsZWFyIHRo ZSBtYXAsIGNsb3NlIHRoZSBkYXRhYmFzZSBhbmQgdGVsbCBhbGwgZXZlbnQgbGlzdGVuZXJzIHRv IHJlc2V0IHRoZWlyIGNhY2hlcy4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6 TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpjbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKToK KyAgICAgICAgTG9vcCBvdmVyIGFsbCBzdG9yYWdlIGFyZWFzIGFuZCBjYWxsIGNsZWFyIG9uIHRo b3NlIG1hdGNoaW5nIHRoZSBzZWN1cml0eSBvcmlnaW4uCisKKyAgICAgICAgKFdlYktpdDo6U3Rv cmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZTo6Y2xlYXJBbGxTdG9yYWdlQXJlYXMp OgorICAgICAgICBMb29wIG92ZXIgYWxsIHN0b3JhZ2UgYXJlYXMgYW5kIGNhbGwgY2xlYXIgb24g dGhlbS4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVF bnRyaWVzRm9yT3JpZ2luKToKKyAgICAgICAgRGlzcGF0Y2ggZGVsZXRlRW50cmllc0Zvck9yaWdp bkludGVybmFsIG9uIHRoZSB3b3JrIHF1ZXVlLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpkZWxldGVBbGxFbnRyaWVzKToKKyAgICAgICAgRGlzcGF0Y2ggZGVsZXRlQWxsRW50 cmllc0ludGVybmFsIG9uIHRoZSB3b3JrIHF1ZXVlLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luSW50ZXJuYWwpOgorICAgICAgICBDYWxs IGNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4gb24gYWxsIGxvY2FsIHN0b3JhZ2UgbmFt ZXNwYWNlcyBhbmQgdGhlbiBkZWxldGUgdGhlIGRhdGFiYXNlLgorCisgICAgICAgIChXZWJLaXQ6 OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVBbGxFbnRyaWVzSW50ZXJuYWwpOgorICAgICAgICBDYWxs IGNsZWFyQWxsU3RvcmFnZUFyZWFzIG9uIGFsbCBsb2NhbCBzdG9yYWdlIG5hbWVzcGFjZXMgYW5k IHRoZW4gZGVsZXRlIGFsbCBkYXRhYmFzZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViS2V5 VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViS2V5VmFs dWVTdG9yYWdlTWFuYWdlclByb3h5OjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKToKKyAgICAgICAg Q2FsbCBvdXQgdG8gdGhlIHN0b3JhZ2UgbWFuYWdlci4KKworICAgICAgICAoV2ViS2l0OjpXZWJL ZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbEVudHJpZXMpOgorICAgICAgICBE aXR0by4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpjbGVhckNhY2hlKToKKyAgICAgICAg Q2FsbCByZXNldFZhbHVlcyB3aGljaCB3aWxsIG51bGwgb3V0IHRoZSBzdG9yYWdlIG1hcC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5tZXNzYWdlcy5pbjoK KyAgICAgICAgQWRkIENsZWFyQ2FjaGUgbWVzc2FnZS4KKworMjAxMy0wNS0xNyAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE9ubHkgaW1wb3J0IGxvY2Fs IHN0b3JhZ2UgaXRlbXMgZnJvbSB0aGUgZGF0YWJhc2Ugb25jZQogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MzU0CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJTZWN1cml0eU9yaWdpbi5oIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlNlY3VyaXR5T3JpZ2luLmgKaW5kZXggZjI0MzM3Mjc1MjEyYzFkNWRhZTRmMjJhNjU3 ZTJlY2NkNjQ2NmM3OC4uYzg5MWI3YTc2YWNhNzQyMzc2ZmNiN2ViNjgxNDE1NDE0MWU2YTkxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlNlY3VyaXR5T3JpZ2luLmgKKysr IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlNlY3VyaXR5T3JpZ2luLmgKQEAgLTU2LDEyICs1 NiwxNCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViU2VjdXJpdHlP cmlnaW4oc2VjdXJpdHlPcmlnaW4pKTsKICAgICB9CiAKLSAgICBjb25zdCBTdHJpbmcgcHJvdG9j b2woKSBjb25zdCB7IHJldHVybiBtX3NlY3VyaXR5T3JpZ2luLT5wcm90b2NvbCgpOyB9Ci0gICAg Y29uc3QgU3RyaW5nIGhvc3QoKSBjb25zdCB7IHJldHVybiBtX3NlY3VyaXR5T3JpZ2luLT5ob3N0 KCk7IH0KKyAgICBTdHJpbmcgcHJvdG9jb2woKSBjb25zdCB7IHJldHVybiBtX3NlY3VyaXR5T3Jp Z2luLT5wcm90b2NvbCgpOyB9CisgICAgU3RyaW5nIGhvc3QoKSBjb25zdCB7IHJldHVybiBtX3Nl Y3VyaXR5T3JpZ2luLT5ob3N0KCk7IH0KICAgICB1bnNpZ25lZCBzaG9ydCBwb3J0KCkgY29uc3Qg eyByZXR1cm4gbV9zZWN1cml0eU9yaWdpbi0+cG9ydCgpOyB9CiAKLSAgICBjb25zdCBTdHJpbmcg ZGF0YWJhc2VJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9zZWN1cml0eU9yaWdpbi0+ZGF0 YWJhc2VJZGVudGlmaWVyKCk7IH0KLSAgICBjb25zdCBTdHJpbmcgdG9TdHJpbmcoKSBjb25zdCB7 IHJldHVybiBtX3NlY3VyaXR5T3JpZ2luLT50b1N0cmluZygpOyB9CisgICAgU3RyaW5nIGRhdGFi YXNlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2VjdXJpdHlPcmlnaW4tPmRhdGFiYXNl SWRlbnRpZmllcigpOyB9CisgICAgU3RyaW5nIHRvU3RyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9z ZWN1cml0eU9yaWdpbi0+dG9TdHJpbmcoKTsgfQorCisgICAgV2ViQ29yZTo6U2VjdXJpdHlPcmln aW4qIHNlY3VyaXR5T3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9zZWN1cml0eU9yaWdpbi5nZXQo KTsgfQogCiBwcml2YXRlOgogICAgIFdlYlNlY3VyaXR5T3JpZ2luKFBhc3NSZWZQdHI8V2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwCmluZGV4 IDEwMTk0MWQ5ZjM5MDIzZDkxNWU2NGQ5MjkxYTI5NmMzOWVmN2FjNDAuLjdjNTg1NzhlYmNiZmM3 NTRiMTZlMzJiZTI4OTkxNmM4MTQzNWQ1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKQEAgLTIyNiw3 ICsyMjYsNyBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlOjpjbG9zZSgpCiAgICAgICAgIG1f ZGF0YWJhc2UuY2xvc2UoKTsKIAogICAgIGlmIChpc0VtcHR5KQotICAgICAgICBtX3RyYWNrZXIt PmRlbGV0ZUVtcHR5RGF0YWJhc2VXaXRoT3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpOwor ICAgICAgICBtX3RyYWNrZXItPmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihtX3NlY3VyaXR5T3Jp Z2luLmdldCgpKTsKIH0KIAogdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6aXRlbURpZENoYW5n ZShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXIuY3BwCmluZGV4IDYwYmNmZTExM2UxN2M3NzQ3ZDZkZTE4YmZhYzFkZWM0YTY3 Y2Q1OTAuLjAwNDBhNWYzYTNiNzQ1Yjk4N2JhMTI4MzQ5OWVhYjRiMDAxMDU2ZWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcApAQCAtNjUsMTEgKzY1LDU5IEBAIHZvaWQgTG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkaWRPcGVuRGF0YWJhc2VXaXRoT3JpZ2luKFNlY3VyaXR5 T3JpZ2luKiBzZWN1CiAgICAgYWRkRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihzZWN1cml0 eU9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCksIGRhdGFiYXNlUGF0aChzZWN1cml0eU9yaWdp bikpOwogfQogCi12b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRW1wdHlE YXRhYmFzZVdpdGhPcmlnaW4oU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQordm9pZCBM b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihTZWN1 cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4pCiB7CiAgICAgcmVtb3ZlRGF0YWJhc2VXaXRoT3Jp Z2luSWRlbnRpZmllcihzZWN1cml0eU9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpOwogfQog Cit2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlQWxsRGF0YWJhc2VzKCkK K3sKKyAgICBtX29yaWdpbnMuY2xlYXIoKTsKKworICAgIG9wZW5UcmFja2VyRGF0YWJhc2UoU2tp cElmTm9uRXhpc3RlbnQpOworICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgU1FMaXRlU3RhdGVtZW50IHN0YXRlbWVudChtX2RhdGFiYXNlLCAiU0VM RUNUIG9yaWdpbiwgcGF0aCBGUk9NIE9yaWdpbnMiKTsKKyAgICBpZiAoc3RhdGVtZW50LnByZXBh cmUoKSAhPSBTUUxSZXN1bHRPaykgeworICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBwcmVw YXJlIHN0YXRlbWVudC4iKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGludCByZXN1 bHQ7CisgICAgd2hpbGUgKChyZXN1bHQgPSBzdGF0ZW1lbnQuc3RlcCgpKSA9PSBTUUxSZXN1bHRS b3cpIHsKKyAgICAgICAgZGVsZXRlRmlsZShzdGF0ZW1lbnQuZ2V0Q29sdW1uVGV4dCgxKSk7CisK KyAgICAgICAgLy8gRklYTUU6IENhbGwgb3V0IHRvIHRoZSBjbGllbnQuCisgICAgfQorCisgICAg aWYgKHJlc3VsdCAhPSBTUUxSZXN1bHREb25lKQorICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0 byByZWFkIGluIGFsbCBvcmlnaW5zIGZyb20gdGhlIGRhdGFiYXNlLiIpOworCisgICAgaWYgKG1f ZGF0YWJhc2UuaXNPcGVuKCkpCisgICAgICAgIG1fZGF0YWJhc2UuY2xvc2UoKTsKKworICAgIGlm ICghZGVsZXRlRmlsZSh0cmFja2VyRGF0YWJhc2VQYXRoKCkpKSB7CisgICAgICAgIC8vIEluIHRo ZSBjYXNlIHdoZXJlIGl0IGlzIG5vdCBwb3NzaWJsZSB0byBkZWxldGUgdGhlIGRhdGFiYXNlIGZp bGUgKGUuZyBzb21lIG90aGVyIHByb2dyYW0KKyAgICAgICAgLy8gbGlrZSBhIHZpcnVzIHNjYW5u ZXIgaXMgYWNjZXNzaW5nIGl0KSwgbWFrZSBzdXJlIHRvIHJlbW92ZSBhbGwgZW50cmllcy4KKyAg ICAgICAgb3BlblRyYWNrZXJEYXRhYmFzZShTa2lwSWZOb25FeGlzdGVudCk7CisgICAgICAgIGlm ICghbV9kYXRhYmFzZS5pc09wZW4oKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBT UUxpdGVTdGF0ZW1lbnQgZGVsZXRlU3RhdGVtZW50KG1fZGF0YWJhc2UsICJERUxFVEUgRlJPTSBP cmlnaW5zIik7CisgICAgICAgIGlmIChkZWxldGVTdGF0ZW1lbnQucHJlcGFyZSgpICE9IFNRTFJl c3VsdE9rKSB7CisgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBwcmVwYXJlIGRlbGV0 aW9uIG9mIGFsbCBvcmlnaW5zIik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgaWYgKCFkZWxldGVTdGF0ZW1lbnQuZXhlY3V0ZUNvbW1hbmQoKSkgeworICAgICAgICAg ICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gZXhlY3V0ZSBkZWxldGlvbiBvZiBhbGwgb3JpZ2lucyIp OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQorCisgICAgZGVsZXRlRW1w dHlEaXJlY3RvcnkobV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOworfQorCiBWZWN0b3I8UmVmUHRy PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpv cmlnaW5zKCkgY29uc3QKIHsKICAgICBWZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3Jp Z2luczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3Jh Z2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKaW5kZXggNzRjN2M1YTYxOGJjMzJiMWE5 NTM0ZWIxODc4NmM2Y2RlM2YwNThhZi4uMjI0OTg0M2I4OTg4ODE1ZjY5YjM2ZGVmOTJlZWRiYzQ4 ZTVjZjNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmgKQEAgLTUxLDcgKzUxLDggQEAg cHVibGljOgogICAgIFN0cmluZyBkYXRhYmFzZVBhdGgoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4q KSBjb25zdDsKIAogICAgIHZvaWQgZGlkT3BlbkRhdGFiYXNlV2l0aE9yaWdpbihXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbiopOwotICAgIHZvaWQgZGVsZXRlRW1wdHlEYXRhYmFzZVdpdGhPcmlnaW4o V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKKyAgICB2b2lkIGRlbGV0ZURhdGFiYXNlV2l0aE9y aWdpbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiopOworICAgIHZvaWQgZGVsZXRlQWxsRGF0YWJh c2VzKCk7CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gb3Jp Z2lucygpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggODYxNmZhODI5YzI3MzhiMDZhNGYyZDZiNzQ5ZWEz YWE1M2M5YWYzMi4uYzJhZWQyNjRhOTNiMGNlMzVhMWI3NjI5ZGVjYWVlYjViZjQwYjc5MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2Vy LmNwcApAQCAtNTgsNiArNTgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhcihDb3JlSVBDOjpD b25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlE LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZyk7CiAKICAgICBjb25zdCBIYXNoTWFwPFN0cmluZywg U3RyaW5nPiYgaXRlbXMoKTsKKyAgICB2b2lkIGNsZWFyKCk7CiAKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgU3RvcmFnZUFyZWEoTG9jYWxTdG9yYWdlTmFtZXNwYWNlKiwgUGFzc1JlZlB0cjxTZWN1 cml0eU9yaWdpbj4sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7CkBAIC04OCw2ICs4OSw5IEBAIHB1 YmxpYzoKICAgICBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhPiBnZXRPckNyZWF0ZVN0b3JhZ2VBcmVh KFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+KTsKICAgICB2b2lkIGRpZERlc3Ryb3lTdG9yYWdl QXJlYShTdG9yYWdlQXJlYSopOwogCisgICAgdm9pZCBjbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5n T3JpZ2luKFNlY3VyaXR5T3JpZ2luKik7CisgICAgdm9pZCBjbGVhckFsbFN0b3JhZ2VBcmVhcygp OworCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IExvY2FsU3RvcmFnZU5hbWVzcGFjZShTdG9yYWdl TWFuYWdlciosIHVpbnQ2NF90IHN0b3JhZ2VNYW5hZ2VySUQpOwogCkBAIC0yMDUsNiArMjA5LDE5 IEBAIGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFn ZUFyZWE6Oml0ZW1zKCkKICAgICByZXR1cm4gbV9zdG9yYWdlTWFwLT5pdGVtcygpOwogfQogCit2 b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xlYXIoKQoreworICAgIG1fc3RvcmFn ZU1hcCA9IFN0b3JhZ2VNYXA6OmNyZWF0ZShtX3F1b3RhSW5CeXRlcyk7CisKKyAgICBpZiAobV9s b2NhbFN0b3JhZ2VEYXRhYmFzZSkgeworICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlLT5j bG9zZSgpOworICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlID0gbnVsbHB0cjsKKyAgICB9 CisKKyAgICBmb3IgKGF1dG8gaXQgPSBtX2V2ZW50TGlzdGVuZXJzLmJlZ2luKCksIGVuZCA9IG1f ZXZlbnRMaXN0ZW5lcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAgaXQtPmZpcnN0 LT5zZW5kKE1lc3NhZ2VzOjpTdG9yYWdlQXJlYU1hcDo6Q2xlYXJDYWNoZSgpLCBpdC0+c2Vjb25k KTsKK30KKwogdm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6Om9wZW5EYXRhYmFzZUFu ZEltcG9ydEl0ZW1zSWZOZWVkZWQoKQogewogICAgIGlmICghbV9sb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UpCkBAIC0yNzMsNiArMjkwLDIwIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFn ZU5hbWVzcGFjZTo6ZGlkRGVzdHJveVN0b3JhZ2VBcmVhKFN0b3JhZ2VBcmVhKiBzCiAgICAgbV9z dG9yYWdlTWFuYWdlci0+bV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnJlbW92ZShtX3N0b3JhZ2VO YW1lc3BhY2VJRCk7CiB9CiAKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVz cGFjZTo6Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihTZWN1cml0eU9yaWdpbiogc2Vj dXJpdHlPcmlnaW4pCit7CisgICAgZm9yIChhdXRvIGl0ID0gbV9zdG9yYWdlQXJlYU1hcC5iZWdp bigpLCBlbmQgPSBtX3N0b3JhZ2VBcmVhTWFwLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAg ICAgICAgaWYgKGl0LT5rZXktPmVxdWFsKHNlY3VyaXR5T3JpZ2luKSkKKyAgICAgICAgICAgIGl0 LT52YWx1ZS0+Y2xlYXIoKTsKKyAgICB9Cit9CisKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OkxvY2Fs U3RvcmFnZU5hbWVzcGFjZTo6Y2xlYXJBbGxTdG9yYWdlQXJlYXMoKQoreworICAgIGZvciAoYXV0 byBpdCA9IG1fc3RvcmFnZUFyZWFNYXAuYmVnaW4oKSwgZW5kID0gbV9zdG9yYWdlQXJlYU1hcC5l bmQoKTsgaXQgIT0gZW5kOyArK2l0KQorICAgICAgICBpdC0+dmFsdWUtPmNsZWFyKCk7Cit9CisK IGNsYXNzIFN0b3JhZ2VNYW5hZ2VyOjpTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSA6IHB1YmxpYyBU aHJlYWRTYWZlUmVmQ291bnRlZDxTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZT4gewogcHVibGljOgog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlPiBjcmVhdGUoQ29y ZUlQQzo6Q29ubmVjdGlvbiogYWxsb3dlZENvbm5lY3Rpb24sIHVuc2lnbmVkIHF1b3RhSW5CeXRl cyk7CkBAIC0zOTQsNiArNDI1LDE2IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldE9yaWdpbnMo RnVuY3Rpb25EaXNwYXRjaGVyKiBjYWxsYmFja0Rpc3BhdGNoZXIsIHZvaWQqIGNvCiAgICAgbV9x dWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmdldE9yaWdpbnNJbnRlcm5hbCwg dGhpcywgUmVmUHRyPEZ1bmN0aW9uRGlzcGF0Y2hlcj4oY2FsbGJhY2tEaXNwYXRjaGVyKSwgY29u dGV4dCwgY2FsbGJhY2spKTsKIH0KIAordm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmll c0Zvck9yaWdpbihTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4pCit7CisgICAgbV9xdWV1 ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUVudHJpZXNGb3JPcmlnaW5J bnRlcm5hbCwgdGhpcywgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPihzZWN1cml0eU9yaWdpbikpKTsK K30KKwordm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllcygpCit7CisgICAgbV9x dWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXNJbnRl cm5hbCwgdGhpcykpOworfQorCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVMb2NhbFN0b3Jh Z2VNYXAoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1h cElELCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0 YSYgc2VjdXJpdHlPcmlnaW5EYXRhKQogewogICAgIHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6 Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiBjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcihjb25u ZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwpAQCAtNDY3LDcgKzUwOCw2IEBAIHZvaWQgU3RvcmFnZU1h bmFnZXI6OmdldFZhbHVlcyhDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRf dCBzdG9yYWdlCiAgICAgQVNTRVJUKHN0b3JhZ2VBcmVhKTsKIAogICAgIHZhbHVlcyA9IHN0b3Jh Z2VBcmVhLT5pdGVtcygpOwotCiAgICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6U3RvcmFn ZUFyZWFNYXA6OkRpZEdldFZhbHVlcyhzdG9yYWdlTWFwU2VlZCksIHN0b3JhZ2VNYXBJRCk7CiB9 CiAKQEAgLTU4Niw0ICs2MjYsMjEgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JpZ2luc0lu dGVybmFsKEZ1bmN0aW9uRGlzcGF0Y2hlciogZGlzcGF0Y2hlciwgdm9pZCogY28KICAgICBkaXNw YXRjaGVyLT5kaXNwYXRjaChiaW5kKGNhbGxDYWxsYmFja0Z1bmN0aW9uLCBjb250ZXh0LCBjYWxs YmFja0Z1bmN0aW9uLCBzZWN1cml0eU9yaWdpbnMubGVha1B0cigpKSk7CiB9CiAKK3ZvaWQgU3Rv cmFnZU1hbmFnZXI6OmRlbGV0ZUVudHJpZXNGb3JPcmlnaW5JbnRlcm5hbChTZWN1cml0eU9yaWdp biogc2VjdXJpdHlPcmlnaW4pCit7CisgICAgZm9yIChhdXRvIGl0ID0gbV9sb2NhbFN0b3JhZ2VO YW1lc3BhY2VzLmJlZ2luKCksIGVuZCA9IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KQorICAgICAgICBpdC0+dmFsdWUtPmNsZWFyU3RvcmFnZUFyZWFzTWF0 Y2hpbmdPcmlnaW4oc2VjdXJpdHlPcmlnaW4pOworCisgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXItPmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihzZWN1cml0eU9yaWdpbik7Cit9CisK K3ZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXNJbnRlcm5hbCgpCit7CisgICAg Zm9yIChhdXRvIGl0ID0gbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLmJlZ2luKCksIGVuZCA9IG1f bG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQorICAgICAgICBp dC0+dmFsdWUtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CisKKyAgICBtX2xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlci0+ZGVsZXRlQWxsRGF0YWJhc2VzKCk7Cit9CisKKwogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuaAppbmRleCAxYzk3Y2RlMDRkZDZiNGVhZDAxNzNhMTIyZWU0N2U1MzIyOTM3ODkz Li41ZmM1MjYxZTRjYWJlNGMzNjkzNDM2ZTlmMTg2OWY5ODBjODM5MmI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTYyLDYg KzYyLDggQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBJbnN0ZWFkIG9mIGEgY29udGV4dCArIEMg ZnVuY3Rpb24sIHRoaXMgc2hvdWxkIHRha2UgYSBXVEY6OkZ1bmN0aW9uLCBidXQgd2UgY3VycmVu dGx5IGRvbid0CiAgICAgLy8gc3VwcG9ydCBhcmd1bWVudHMgaW4gZnVuY3Rpb25zLgogICAgIHZv aWQgZ2V0T3JpZ2lucyhGdW5jdGlvbkRpc3BhdGNoZXIqIGNhbGxiYWNrRGlzcGF0Y2hlciwgdm9p ZCogY29udGV4dCwgdm9pZCAoKmNhbGxiYWNrKShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luPj4mIHNlY3VyaXR5T3JpZ2lucywgdm9pZCogY29udGV4dCkpOworICAg IHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdpbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiopOwor ICAgIHZvaWQgZGVsZXRlQWxsRW50cmllcygpOwogCiBwcml2YXRlOgogICAgIFN0b3JhZ2VNYW5h Z2VyKCk7CkBAIC05NCw2ICs5Niw4IEBAIHByaXZhdGU6CiAgICAgTG9jYWxTdG9yYWdlTmFtZXNw YWNlKiBnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBzdG9yYWdlTmFt ZXNwYWNlSUQpOwogCiAgICAgdm9pZCBnZXRPcmlnaW5zSW50ZXJuYWwoRnVuY3Rpb25EaXNwYXRj aGVyKiBjYWxsYmFja0Rpc3BhdGNoZXIsIHZvaWQqIGNvbnRleHQsIHZvaWQgKCpjYWxsYmFjayko Y29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+JiBzZWN1cml0eU9y aWdpbnMsIHZvaWQqIGNvbnRleHQpKTsKKyAgICB2b2lkIGRlbGV0ZUVudHJpZXNGb3JPcmlnaW5J bnRlcm5hbChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiopOworICAgIHZvaWQgZGVsZXRlQWxsRW50 cmllc0ludGVybmFsKCk7CiAKICAgICBSZWZQdHI8V29ya1F1ZXVlPiBtX3F1ZXVlOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdl clByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyUHJveHkuY3BwCmluZGV4IDFiNmI3YTBlMDhiNDY2M2VkMzY2ZDIyN2U3ZTMyMzA2ZWU0 ZDcxYmIuLmQ4MmZhMDFmZGYyZTU2OGQwMGVhZmMyNTM4MjQ2ZmViYjhhNzdmZmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyUHJveHkuY3BwCkBAIC0xMDksMTkgKzEwOSwxMiBAQCB2b2lkIFdlYktleVZhbHVlU3Rv cmFnZU1hbmFnZXJQcm94eTo6ZGlkR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyhjb25zdCBWZWN0 b3I8UwogCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6ZGVsZXRlRW50cmll c0Zvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAgIFNlY3VyaXR5T3Jp Z2luRGF0YSBzZWN1cml0eU9yaWdpbkRhdGE7Ci0gICAgc2VjdXJpdHlPcmlnaW5EYXRhLnByb3Rv Y29sID0gb3JpZ2luLT5wcm90b2NvbCgpOwotICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5ob3N0ID0g b3JpZ2luLT5ob3N0KCk7Ci0gICAgc2VjdXJpdHlPcmlnaW5EYXRhLnBvcnQgPSBvcmlnaW4tPnBv cnQoKTsKLQotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVt LzEyMjM5NzY1PiBTaG91bGQga2V5LXZhbHVlIHN0b3JhZ2UgYmUgaGFuZGxlZCBpbiB0aGUgd2Vi IHByb2Nlc3M/Ci0gICAgY29udGV4dCgpLT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1Ro ZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6RGVsZXRl RW50cmllc0Zvck9yaWdpbihzZWN1cml0eU9yaWdpbkRhdGEpKTsKKyAgICBjb250ZXh0KCktPnN0 b3JhZ2VNYW5hZ2VyKCkuZGVsZXRlRW50cmllc0Zvck9yaWdpbihvcmlnaW4tPnNlY3VyaXR5T3Jp Z2luKCkpOwogfQogCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6ZGVsZXRl QWxsRW50cmllcygpCiB7Ci0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjov L3Byb2JsZW0vMTIyMzk3NjU+IFNob3VsZCBrZXktdmFsdWUgc3RvcmFnZSBiZSBoYW5kbGVkIGlu IHRoZSB3ZWIgcHJvY2Vzcz8KLSAgICBjb250ZXh0KCktPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1 bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy OjpEZWxldGVBbGxFbnRyaWVzKCkpOworICAgIGNvbnRleHQoKS0+c3RvcmFnZU1hbmFnZXIoKS5k ZWxldGVBbGxFbnRyaWVzKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKaW5k ZXggZTU2MDE2M2MzZjZlNWI0MDVlYWU1OGYwMzBhYjQyMjVlZGJkNjYzOS4uMGJkNDIyYmFhNDcw YmNjMjQwOTNiYWJmOTUxMWM2MDBmNWQwZGEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3BwCkBAIC0yOTMsNiArMjkzLDEx IEBAIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU3RvcmFnZUV2ZW50KHVpbnQ2NF90IHNv dXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0CiAgICAgICAgIGRpc3BhdGNoTG9jYWxTdG9yYWdl RXZlbnQoc291cmNlU3RvcmFnZUFyZWFJRCwga2V5LCBvbGRWYWx1ZSwgbmV3VmFsdWUsIHVybFN0 cmluZyk7CiB9CiAKK3ZvaWQgU3RvcmFnZUFyZWFNYXA6OmNsZWFyQ2FjaGUoKQoreworICAgIHJl c2V0VmFsdWVzKCk7Cit9CisKIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU2Vzc2lvblN0 b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3Qg U3RyaW5nJiB1cmxTdHJpbmcpCiB7CiAgICAgQVNTRVJUKHN0b3JhZ2VUeXBlKCkgPT0gU2Vzc2lv blN0b3JhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VBcmVhTWFwLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZUFyZWFNYXAuaAppbmRleCA0MGEyZTJkMmVkNTQ1ODA5YTNjNmM5N2E2ZGI5NWIyOGUwNzBi OGUzLi43NGNjNTM4MDNkMjQwNTk4MTcxMWIxZjViMTdhYmE2MTEzMDg3YjkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuaApAQCAt NzAsMTQgKzcwLDE1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRSZW1vdmVJdGVtKHVpbnQ2NF90 IHN0b3JhZ2VNYXBTZWVkLCBjb25zdCBTdHJpbmcmIGtleSk7CiAgICAgdm9pZCBkaWRDbGVhcih1 aW50NjRfdCBzdG9yYWdlTWFwU2VlZCk7CiAKKyAgICB2b2lkIGRpc3BhdGNoU3RvcmFnZUV2ZW50 KHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBT dHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVy bFN0cmluZyk7CisgICAgdm9pZCBjbGVhckNhY2hlKCk7CisKICAgICB2b2lkIHJlc2V0VmFsdWVz KCk7CiAgICAgdm9pZCBsb2FkVmFsdWVzSWZOZWVkZWQoKTsKIAogICAgIGJvb2wgc2hvdWxkQXBw bHlDaGFuZ2VGb3JLZXkoY29uc3QgU3RyaW5nJiBrZXkpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlD aGFuZ2UoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUpOwogCi0gICAg dm9pZCBkaXNwYXRjaFN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBj b25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBu ZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwotCiAgICAgdm9pZCBkaXNwYXRjaFNl c3Npb25TdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3Ry aW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUs IGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKICAgICB2b2lkIGRpc3BhdGNoTG9jYWxTdG9yYWdl RXZlbnQodWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNv bnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VBcmVhTWFwLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLm1lc3NhZ2VzLmluCmluZGV4IDJiNTZjNzdkODNk NmRmYjdkYWMyZWM2ZTZkMWI0NzhhZjcxNGQwMTMuLjA2ZGRlOTQyNTUyNGQxZjA4YTRjYWI1MjE5 YmI1YjFjZjE2YWZjYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlQXJlYU1hcC5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAubWVzc2FnZXMuaW4KQEAgLTI3LDQgKzI3LDUg QEAgbWVzc2FnZXMgLT4gU3RvcmFnZUFyZWFNYXAgewogICAgIERpZENsZWFyKHVpbnQ2NF90IHN0 b3JhZ2VNYXBTZWVkKQogCiAgICAgRGlzcGF0Y2hTdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNl U3RvcmFnZUFyZWFJRCwgV1RGOjpTdHJpbmcga2V5LCBXVEY6OlN0cmluZyBvbGRWYWx1ZSwgV1RG OjpTdHJpbmcgbmV3VmFsdWUsIFdURjo6U3RyaW5nIHVybFN0cmluZykKKyAgICBDbGVhckNhY2hl KCkKIH0K