114479 2013-04-11 16:43:07 -0700 Add support for clearing storage areas 2013-04-11 16:53:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 874284 0 andersca 2013-04-11 16:43:07 -0700 Add support for clearing storage areas 874288 1 197699 andersca 2013-04-11 16:45:23 -0700 Created attachment 197699 Patch 874290 2 andersca 2013-04-11 16:53:35 -0700 Committed r148250: <http://trac.webkit.org/changeset/148250> 197699 2013-04-11 16:45:23 -0700 2013-04-11 16:49:07 -0700 Patch bug-114479-20130411164502.patch text/plain 11567 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDA1NmRkNzI5Y2FmNjZi ODkyOTlhOGExMWM0ZDUzY2U5Zjc0ODc3ZC4uNGFiZWI4OTkwNGExOTFmNmEzNGIwZGU2OTcxMjA2 NGY3YWQ3ODJhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDEzLTA0LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIGNsZWFyaW5nIHN0b3JhZ2UgYXJlYXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDQ3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VB cmVhKToKKyAgICAgICAgU3RvcmUgdGhlIHF1b3RhIHNpemUgc28gd2UgY2FuIHJlY3JlYXRlIHRo ZSB1bmRlcmx5aW5nIFN0b3JhZ2VNYXAgd2hlbiBjbGVhcmluZy4KKyAgICAgICAgCisgICAgICAg IChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xlYXIpOgorICAgICAgICBD cmVhdGUgYSBuZXcgc3RvcmFnZSBtYXAgYW5kIGRpc3BhdGNoIGV2ZW50cy4KKworICAgICAgICAo V2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y2xlYXIpOgorICAgICAgICBGaW5kIHRoZSByaWdodCBz dG9yYWdlIGFyZWEgYW5kIGNhbGwgY2xlYXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIENsZWFyIG1lc3NhZ2Uu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjpjbGVhcik6CisgICAgICAgIENhbGwgdGhl IHN0b3JhZ2UgbWFwLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh TWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFNYXA6OmNsZWFyKToKKyAgICAg ICAgUmVzZXQgdGhlIGNhY2hlZCB2YWx1ZXMgYW5kIHNlbmQgYSBjbGVhciBtZXNzYWdlLgorCisg ICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpyZXNldFZhbHVlcyk6CisgICAgICAgIE5l dyBoZWxwZXIgZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFNYXA6OmRp ZENsZWFyKToKKyAgICAgICAgTmV3IHN0dWIuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZUFyZWFNYXAubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBEaWRDbGVhciBtZXNz YWdlLgorCisyMDEzLTA0LTExICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CisKICAgICAgICAgSW1wbGVtZW50IHJlbW92aW5nIHN0b3JhZ2UgYXJlYSBpdGVtcwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDcyCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApp bmRleCBlODFhMmMyYzQ1MmNhOWQ1N2FhYTViMTA1MjI1YTg0Yzg2YzU1OTUxLi4wYjE3MDBhMzQ0 Y2YyNDk2YjFlMTE0YjQ2NzE3MDY3OTU0NWQwMzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC00OCw2ICs0OCw3IEBA IHB1YmxpYzoKIAogICAgIHZvaWQgc2V0SXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiBzb3VyY2VD b25uZWN0aW9uLCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGJvb2wmIHF1 b3RhRXhjZXB0aW9uKTsKICAgICB2b2lkIHJlbW92ZUl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiog c291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3Ry aW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKKyAgICB2b2lkIGNsZWFyKENvcmVJ UEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VB cmVhSUQsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKIAogICAgIGNvbnN0IEhhc2hNYXA8U3Ry aW5nLCBTdHJpbmc+JiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1fc3RvcmFnZU1hcC0+aXRlbXMo KTsgfQogCkBAIC01Niw2ICs1Nyw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpc3BhdGNoRXZl bnRzKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVl LCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykgY29uc3Q7 CiAKKyAgICB1bnNpZ25lZCBtX3F1b3RhSW5CeXRlczsKICAgICBSZWZQdHI8U3RvcmFnZU1hcD4g bV9zdG9yYWdlTWFwOwogICAgIEhhc2hTZXQ8c3RkOjpwYWlyPFJlZlB0cjxDb3JlSVBDOjpDb25u ZWN0aW9uPiwgdWludDY0X3Q+ID4gbV9ldmVudExpc3RlbmVyczsKIH07CkBAIC02Niw3ICs2OCw4 IEBAIFBhc3NSZWZQdHI8U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhPiBTdG9yYWdlTWFuYWdl cjo6U3RvcmFnZUFyZWE6OmNyZWF0ZSh1bnNpCiB9CiAKIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdl QXJlYTo6U3RvcmFnZUFyZWEodW5zaWduZWQgcXVvdGFJbkJ5dGVzKQotICAgIDogbV9zdG9yYWdl TWFwKFN0b3JhZ2VNYXA6OmNyZWF0ZShxdW90YUluQnl0ZXMpKQorICAgIDogbV9xdW90YUluQnl0 ZXMocXVvdGFJbkJ5dGVzKQorICAgICwgbV9zdG9yYWdlTWFwKFN0b3JhZ2VNYXA6OmNyZWF0ZSht X3F1b3RhSW5CeXRlcykpCiB7CiB9CiAKQEAgLTEwOSw2ICsxMTIsMTYgQEAgdm9pZCBTdG9yYWdl TWFuYWdlcjo6U3RvcmFnZUFyZWE6OnJlbW92ZUl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiogc291 cmNlQ29ubmVjdGkKICAgICBkaXNwYXRjaEV2ZW50cyhzb3VyY2VDb25uZWN0aW9uLCBzb3VyY2VT dG9yYWdlQXJlYUlELCBrZXksIG9sZFZhbHVlLCBTdHJpbmcoKSwgdXJsU3RyaW5nKTsKIH0KIAor dm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmNsZWFyKENvcmVJUEM6OkNvbm5lY3Rp b24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0 IFN0cmluZyYgdXJsU3RyaW5nKQoreworICAgIGlmICghbV9zdG9yYWdlTWFwLT5sZW5ndGgoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9zdG9yYWdlTWFwID0gU3RvcmFnZU1hcDo6Y3JlYXRl KG1fcXVvdGFJbkJ5dGVzKTsKKworICAgIGRpc3BhdGNoRXZlbnRzKHNvdXJjZUNvbm5lY3Rpb24s IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIFN0cmluZygpLCBTdHJpbmcoKSwgU3RyaW5nKCksIHVybFN0 cmluZyk7Cit9CisKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpkaXNwYXRjaEV2 ZW50cyhDb3JlSVBDOjpDb25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1aW50NjRfdCBzb3Vy Y2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1 ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpIGNvbnN0 CiB7CiAgICAgZm9yIChIYXNoU2V0PHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlv bj4sIHVpbnQ2NF90PiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZXZlbnRMaXN0ZW5lcnMuYmVn aW4oKSwgZW5kID0gbV9ldmVudExpc3RlbmVycy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CkBA IC0zMDMsNiArMzE2LDE3IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OnJlbW92ZUl0ZW0oQ29yZUlQ Qzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnCiAgICAgY29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6U3RvcmFnZUFyZWFNYXA6OkRpZFJlbW92ZUl0ZW0oa2V5KSwgc3Rv cmFnZU1hcElEKTsKIH0KIAordm9pZCBTdG9yYWdlTWFuYWdlcjo6Y2xlYXIoQ29yZUlQQzo6Q29u bmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzb3Vy Y2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKK3sKKyAgICBTdG9yYWdl QXJlYSogc3RvcmFnZUFyZWEgPSBmaW5kU3RvcmFnZUFyZWEoY29ubmVjdGlvbiwgc3RvcmFnZU1h cElEKTsKKworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCisg ICAgQVNTRVJUKHN0b3JhZ2VBcmVhKTsKKworICAgIHN0b3JhZ2VBcmVhLT5jbGVhcihjb25uZWN0 aW9uLCBzb3VyY2VTdG9yYWdlQXJlYUlELCB1cmxTdHJpbmcpOworICAgIGNvbm5lY3Rpb24tPnNl bmQoTWVzc2FnZXM6OlN0b3JhZ2VBcmVhTWFwOjpEaWRDbGVhcigpLCBzdG9yYWdlTWFwSUQpOwor fQorCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUlu dGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgQ29yZUlQQzo6Q29ubmVjdGlvbiog YWxsb3dlZENvbm5lY3Rpb24sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKIHsKICAgICBBU1NFUlQo IW1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLmNvbnRhaW5zKHN0b3JhZ2VOYW1lc3BhY2VJRCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2Vy LmgKaW5kZXggNmQ4N2IwOTMyNTRiOTViYjE0NWQ4NmY0NTE2MjBiOGIzZWEyZjQyNi4uMWVmZWQ4 NWE5MjM2NWRhZDYyZWY5MTRkYWYwZjgxMDFkNzA3ZGNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCkBAIC02NCw2ICs2NCw3IEBA IHByaXZhdGU6CiAgICAgdm9pZCBnZXRWYWx1ZXMoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2 NF90IHN0b3JhZ2VNYXBJRCwgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIHZhbHVlcyk7CiAgICAg dm9pZCBzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlQXJlYUlE LCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qg U3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogICAgIHZvaWQgcmVtb3Zl SXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRf dCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB1 cmxTdHJpbmcpOworICAgIHZvaWQgY2xlYXIoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90 IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcpOwogCiAgICAgdm9pZCBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUlu dGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgQ29yZUlQQzo6Q29ubmVjdGlvbiog YWxsb3dlZENvbm5lY3Rpb24sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7CiAgICAgdm9pZCBkZXN0 cm95U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdlTmFtZXNw YWNlSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgppbmRleCA0YzVkNTlmYTNiMDhmZGE3YzQzNDQ0 MmNkZGU3MjYzODg5MDcyNmI1Li43OWFjMzYxNGU1ZWEwMmIzNDBhYjJhYjk4NmJjOWYyZTFkYThm OTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdl TWFuYWdlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgpAQCAtMjgsNCArMjgsNSBAQCBtZXNzYWdlcyAt PiBTdG9yYWdlTWFuYWdlciB7CiAKICAgICBTZXRJdGVtKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwg dWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgV1RGOjpTdHJpbmcga2V5LCBXVEY6OlN0cmlu ZyB2YWx1ZSwgV1RGOjpTdHJpbmcgdXJsU3RyaW5nKSBXYW50c0Nvbm5lY3Rpb24KICAgICBSZW1v dmVJdGVtKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJ RCwgV1RGOjpTdHJpbmcga2V5LCBXVEY6OlN0cmluZyB1cmxTdHJpbmcpIFdhbnRzQ29ubmVjdGlv bgorICAgIENsZWFyKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291cmNlU3RvcmFn ZUFyZWFJRCwgV1RGOjpTdHJpbmcgdXJsU3RyaW5nKSBXYW50c0Nvbm5lY3Rpb24KIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5j cHAKaW5kZXggZDUyZmU0MjJhOTVlZTA5YzBlOGY4MTcwNDkyNTU3Y2JmMGFjNmY2MC4uOWEwMDNh MWMzMjE3Mjc5MzU3ZDE5ZTc5Y2Y1Nzk3NGZhZDllOTY1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKQEAgLTE0MSwx MSArMTQxLDE4IEBAIHZvaWQgU3RvcmFnZUFyZWFJbXBsOjpyZW1vdmVJdGVtKGNvbnN0IFN0cmlu ZyYga2V5LCBFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIHNvCiAgICAgbV9zdG9yYWdlQXJlYU1h cC0+cmVtb3ZlSXRlbShzb3VyY2VGcmFtZSwgdGhpcywga2V5KTsKIH0KIAotdm9pZCBTdG9yYWdl QXJlYUltcGw6OmNsZWFyKEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpCit2b2lk IFN0b3JhZ2VBcmVhSW1wbDo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBzb3VyY2VG cmFtZSkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMuCi0gICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgVU5VU0VEX1BBUkFNKHNvdXJjZUZyYW1lKTsKKyAgICBlYyA9IDA7Cisg ICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKHNvdXJjZUZyYW1lKSkgeworICAgICAgICBlYyA9IFNF Q1VSSVRZX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkaXNhYmxlZEJ5 UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShzb3VyY2VGcmFtZSkpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fc3RvcmFnZUFyZWFNYXAtPmNsZWFyKHNvdXJjZUZyYW1lLCB0aGlzKTsKIH0KIAogYm9v bCBTdG9yYWdlQXJlYUltcGw6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25D b2RlJiBlYywgRnJhbWUqIHNvdXJjZUZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKaW5kZXggODk3OTJkYmYzMjk2MTUy ZjJhYzUxN2VjODYxNWQzYWQyOGM4NDAwZi4uYjFkM2E0ODA0MDFmNmRlZjRmZmZmMTRlOTk2MDQx NjdkMTUyNjYxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VBcmVhTWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZUFyZWFNYXAuY3BwCkBAIC0xMzYsNiArMTM2LDE0IEBAIHZvaWQgU3RvcmFnZUFy ZWFNYXA6OnJlbW92ZUl0ZW0oV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZyYW1lLCBTdG9yYWdlQXJl YUltcGwqIHNvCiAgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1l c3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6UmVtb3ZlSXRlbShtX3N0b3JhZ2VNYXBJRCwgc291cmNl QXJlYS0+c3RvcmFnZUFyZWFJRCgpLCBrZXksIHNvdXJjZUZyYW1lLT5kb2N1bWVudCgpLT51cmwo KSksIDApOwogfQogCit2b2lkIFN0b3JhZ2VBcmVhTWFwOjpjbGVhcihXZWJDb3JlOjpGcmFtZSog c291cmNlRnJhbWUsIFN0b3JhZ2VBcmVhSW1wbCogc291cmNlQXJlYSkKK3sKKyAgICByZXNldFZh bHVlcygpOworCisgICAgbV9zdG9yYWdlTWFwID0gU3RvcmFnZU1hcDo6Y3JlYXRlKG1fcXVvdGFJ bkJ5dGVzKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6OlN0b3JhZ2VNYW5hZ2VyOjpDbGVhcihtX3N0b3JhZ2VNYXBJRCwgc291cmNlQXJlYS0+ c3RvcmFnZUFyZWFJRCgpLCBzb3VyY2VGcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkpLCAwKTsKK30K KwogYm9vbCBTdG9yYWdlQXJlYU1hcDo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXkpCiB7CiAg ICAgbG9hZFZhbHVlc0lmTmVlZGVkKCk7CkBAIC0xNDMsNiArMTUxLDExIEBAIGJvb2wgU3RvcmFn ZUFyZWFNYXA6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KQogICAgIHJldHVybiBtX3N0b3Jh Z2VNYXAtPmNvbnRhaW5zKGtleSk7CiB9CiAKK3ZvaWQgU3RvcmFnZUFyZWFNYXA6OnJlc2V0VmFs dWVzKCkKK3sKKyAgICBtX3N0b3JhZ2VNYXAgPSBudWxscHRyOworfQorCiB2b2lkIFN0b3JhZ2VB cmVhTWFwOjpsb2FkVmFsdWVzSWZOZWVkZWQoKQogewogICAgIGlmIChtX3N0b3JhZ2VNYXApCkBA IC0xNjgsNiArMTgxLDExIEBAIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpZFJlbW92ZUl0ZW0oY29u c3QgU3RyaW5nJiBrZXkpCiAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KIH0KIAordm9pZCBTdG9y YWdlQXJlYU1hcDo6ZGlkQ2xlYXIoKQoreworICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCit9CisK IHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU3RvcmFnZUV2ZW50KHVpbnQ2NF90IHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVl LCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKICAg ICBpZiAoc3RvcmFnZVR5cGUoKSA9PSBTZXNzaW9uU3RvcmFnZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKaW5kZXggNTJiZWFmMGNi YjY4MTBmZWYxMThiYjcwZDE1ZDBiNDc1ZjQ2MTFiOC4uODlhMGNmMjc2YjA0MmFiNzkwZTE0MmRl NGNmMmQ3MzA2MmFkNzI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKQEAgLTU2LDYgKzU2LDcgQEAgcHVibGljOgogICAgIFN0 cmluZyBpdGVtKGNvbnN0IFN0cmluZyYga2V5KTsKICAgICB2b2lkIHNldEl0ZW0oV2ViQ29yZTo6 RnJhbWUqIHNvdXJjZUZyYW1lLCBTdG9yYWdlQXJlYUltcGwqIHNvdXJjZUFyZWEsIGNvbnN0IFN0 cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sJiBxdW90YUV4Y2VwdGlvbik7CiAg ICAgdm9pZCByZW1vdmVJdGVtKFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSwgU3RvcmFnZUFy ZWFJbXBsKiBzb3VyY2VBcmVhLCBjb25zdCBTdHJpbmcmIGtleSk7CisgICAgdm9pZCBjbGVhcihX ZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUsIFN0b3JhZ2VBcmVhSW1wbCogc291cmNlQXJlYSk7 CiAgICAgYm9vbCBjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSk7CiAKIHByaXZhdGU6CkBAIC02 Niw5ICs2NywxMSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWRTZXRJdGVtKGNvbnN0IFN0cmlu ZyYga2V5LCBib29sIHF1b3RhRXJyb3IpOwogICAgIHZvaWQgZGlkUmVtb3ZlSXRlbShjb25zdCBT dHJpbmcmIGtleSk7CisgICAgdm9pZCBkaWRDbGVhcigpOwogCiAgICAgdm9pZCBkaXNwYXRjaFN0 b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3Qg U3RyaW5nJiB1cmxTdHJpbmcpOwogCisgICAgdm9pZCByZXNldFZhbHVlcygpOwogICAgIHZvaWQg bG9hZFZhbHVlc0lmTmVlZGVkKCk7CiAKICAgICB2b2lkIGRpc3BhdGNoU2Vzc2lvblN0b3JhZ2VF dmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VBcmVhTWFwLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLm1lc3NhZ2VzLmluCmluZGV4IDQxYzI5NjkyNDU2NjUy YmM1MGE5NDViOGI0MDRhZTI1MjIzMTc1NDcuLmNmZTJjOThkNWJlYmMzNjNjNTFjMzQ1MzIwNmUz YjVlNTVlNzI1MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlQXJlYU1hcC5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAubWVzc2FnZXMuaW4KQEAgLTIzLDYgKzIzLDcgQEAK IG1lc3NhZ2VzIC0+IFN0b3JhZ2VBcmVhTWFwIHsKICAgICBEaWRTZXRJdGVtKFdURjo6U3RyaW5n IGtleSwgYm9vbCBxdW90YUV4Y2VwdGlvbikKICAgICBEaWRSZW1vdmVJdGVtKFdURjo6U3RyaW5n IGtleSkKKyAgICBEaWRDbGVhcigpCiAKICAgICBEaXNwYXRjaFN0b3JhZ2VFdmVudCh1aW50NjRf dCBzb3VyY2VTdG9yYWdlQXJlYUlELCBXVEY6OlN0cmluZyBrZXksIFdURjo6U3RyaW5nIG9sZFZh bHVlLCBXVEY6OlN0cmluZyBuZXdWYWx1ZSwgV1RGOjpTdHJpbmcgdXJsU3RyaW5nKQogfQo=