114472 2013-04-11 16:00:47 -0700 Implement removing storage area items 2013-04-11 16:25:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 874239 0 andersca 2013-04-11 16:00:47 -0700 Implement removing storage area items 874248 1 197689 andersca 2013-04-11 16:05:51 -0700 Created attachment 197689 Patch 874265 2 197689 bdakin 2013-04-11 16:22:31 -0700 Comment on attachment 197689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197689&action=review > Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp:169 > + printf("did remove!\n"); printf! 874272 3 andersca 2013-04-11 16:25:31 -0700 Committed r148245: <http://trac.webkit.org/changeset/148245> 197689 2013-04-11 16:05:51 -0700 2013-04-11 16:22:30 -0700 Patch bug-114472-20130411160531.patch text/plain 13017 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E3YjNiMmU2OTkyYWMz ODhkZGVmOGM0MDhmMzAwZDdiYTIxYTU4ZS4uYTZjNmJkMzk2ZjNjY2VlMjczOTM4NTYwNjg5NDVj ZTM4ZGUxOWIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEzLTA0LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IHJl bW92aW5nIHN0b3JhZ2UgYXJlYSBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRXhwb3J0IFN0b3JhZ2VNYXA6OnJlbW92ZUl0ZW0uCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKKworMjAxMy0wNC0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEltcGxlbWVudCBTdG9yYWdlTWFuYWdlcjo6Z2V0 VmFsdWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTQ0NjEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IGYyNDdhMWNkZGQzY2ZiMGQ2ZGY2ZTU5YTg0MWNlMWIwMDVl MDczZjUuLjAxZjM1YTM3NThlM2Q1N2FkN2YxOWU1YmRkMjhhZTkyZWE2OWIyYjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsNSArMSw0MCBAQAogMjAxMy0wNC0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgogCisgICAgICAgIEltcGxlbWVudCByZW1vdmluZyBzdG9yYWdlIGFyZWEg aXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NDQ3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoU3RvcmFnZU1h bmFnZXI6OlN0b3JhZ2VBcmVhKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0 b3JhZ2VBcmVhOjpzZXRJdGVtKToKKyAgICAgICAgUmVuYW1lIGNvbm5lY3Rpb24gdG8gc291cmNl Q29ubmVjdGlvbi4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFy ZWE6OnJlbW92ZUl0ZW0pOgorICAgICAgICBSZW1vdmUgdGhlIGl0ZW0gZnJvbSB0aGUgbWFwIGFu ZCBkaXNwYXRjaCBldmVudHMgaWYgbmVlZGVkLgorCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpyZW1vdmVJdGVtKToKKyAgICAgICAgRmluZCB0aGUgcmlnaHQgc3RvcmFnZSBhcmVh LCByZW1vdmUgdGhlIGl0ZW0gYW5kIHNlbmQgYmFjayBhIERpZFJlbW92ZUl0ZW0gbWVzc2FnZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLm1lc3NhZ2VzLmlu OgorICAgICAgICBBZGQgUmVtb3ZlSXRlbSBtZXNzYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VB cmVhSW1wbDo6cmVtb3ZlSXRlbSk6CisgICAgICAgIENhbGwgU3RvcmFnZUFyZWFNYXA6OnJlbW92 ZUl0ZW0uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3Bw OgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlQXJlYU1hcDo6cmVtb3ZlSXRlbSk6CisgICAgICAg IFNlbmQgYSBSZW1vdmVJdGVtIG1lc3NhZ2UgdG8gdGhlIHN0b3JhZ2UgbWFuYWdlci4KKyAgICAg ICAgCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpkaWRSZW1vdmVJdGVtKToKKyAg ICAgICAgQWRkIGVtcHR5IHN0dWIuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZUFyZWFNYXAubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBEaWRSZW1vdmVJdGVtIG1lc3Nh Z2UuCisKKzIwMTMtMDQtMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBJbXBsZW1lbnQgU3RvcmFnZU1hbmFnZXI6OmdldFZhbHVlcwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDYxCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KaW5kZXggYTMyMjkzYWQyODQzN2FiYWEwZjVjODNmZjc0ZDA1MTM3Njc2NjIwZC4u NDA5ZGM2MjQ2ZjY2NWFkMmU5NTAwNGYzNTIzZmVmNzkwZGQ1M2ZlYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KQEAgLTg0LDYgKzg0LDcgQEAgX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjFzZXREZWxl Z2F0ZXNTY3JvbGxpbmdFYgogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjNzZXRTY3JvbGxiYXJz U3VwcHJlc3NlZEViYgogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjR3aW5kb3dSZXNpemVyUmVj dENoYW5nZWRFdgogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3OGFkZENoaWxkRU4zV1RGMTBQYXNz UmVmUHRySU5TXzZXaWRnZXRFRUUKK19fWk43V2ViQ29yZTEwU3RvcmFnZU1hcDEwcmVtb3ZlSXRl bUVSS04zV1RGNlN0cmluZ0VSUzJfCiBfX1pON1dlYkNvcmUxMFN0b3JhZ2VNYXAxMWltcG9ydEl0 ZW1zRVJLTjNXVEY3SGFzaE1hcElOUzFfNlN0cmluZ0VTM19OUzFfMTBTdHJpbmdIYXNoRU5TMV8x MEhhc2hUcmFpdHNJUzNfRUVTNl9FRQogX19aTjdXZWJDb3JlMTBTdG9yYWdlTWFwMjBzZXRJdGVt SWdub3JpbmdRdW90YUVSS04zV1RGNlN0cmluZ0VTNF8KIF9fWk43V2ViQ29yZTEwU3RvcmFnZU1h cDNrZXlFagpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZU1hbmFnZXIuY3BwCmluZGV4IGQ0ODUwN2MwNmFhYmQ0ODQyZGU4ZDNkMDVlNTlmYmQxOWRhMTdk Y2YuLmU4MWEyYzJjNDUyY2E5ZDU3YWFhNWIxMDUyMjVhODRjODZjNTU5NTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKQEAg LTQ2LDcgKzQ2LDkgQEAgcHVibGljOgogICAgIHZvaWQgYWRkTGlzdGVuZXIoQ29yZUlQQzo6Q29u bmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCk7CiAgICAgdm9pZCByZW1vdmVMaXN0ZW5l cihDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1hcElEKTsKIAotICAgIHZv aWQgc2V0SXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFy ZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nLCBib29sJiBxdW90YUV4Y2VwdGlvbik7CisgICAgdm9pZCBzZXRJdGVtKENv cmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3Jh Z2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25zdCBT dHJpbmcmIHVybFN0cmluZywgYm9vbCYgcXVvdGFFeGNlcHRpb24pOworICAgIHZvaWQgcmVtb3Zl SXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1aW50NjRfdCBzb3Vy Y2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB1cmxTdHJp bmcpOworCiAgICAgY29uc3QgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIGl0ZW1zKCkgY29uc3Qg eyByZXR1cm4gbV9zdG9yYWdlTWFwLT5pdGVtcygpOyB9CiAKIHByaXZhdGU6CkBAIC04NSw3ICs4 Nyw3IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpyZW1vdmVMaXN0ZW5lcihD b3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uCiAgICAgbV9ldmVudExpc3RlbmVycy5yZW1v dmUoc3RkOjptYWtlX3BhaXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKSk7CiB9CiAKLXZvaWQg U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYg a2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZywgYm9vbCYg cXVvdGFFeGNlcHRpb24pCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6c2V0SXRl bShDb3JlSVBDOjpDb25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1aW50NjRfdCBzb3VyY2VT dG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcsIGJvb2wmIHF1b3RhRXhjZXB0aW9uKQogewogICAgIEFTU0VS VChtX3N0b3JhZ2VNYXAtPmhhc09uZVJlZigpKTsKIApAQCAtOTMsNyArOTUsMTggQEAgdm9pZCBT dG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnNldEl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiog Y29ubmVjdGlvbiwgdWludDYKICAgICBtX3N0b3JhZ2VNYXAtPnNldEl0ZW0oa2V5LCB2YWx1ZSwg b2xkVmFsdWUsIHF1b3RhRXhjZXB0aW9uKTsKIAogICAgIGlmICghcXVvdGFFeGNlcHRpb24pCi0g ICAgICAgIGRpc3BhdGNoRXZlbnRzKGNvbm5lY3Rpb24sIHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGtl eSwgb2xkVmFsdWUsIHZhbHVlLCB1cmxTdHJpbmcpOworICAgICAgICBkaXNwYXRjaEV2ZW50cyhz b3VyY2VDb25uZWN0aW9uLCBzb3VyY2VTdG9yYWdlQXJlYUlELCBrZXksIG9sZFZhbHVlLCB2YWx1 ZSwgdXJsU3RyaW5nKTsKK30KKwordm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnJl bW92ZUl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qg c291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdXJs U3RyaW5nKQoreworICAgIFN0cmluZyBvbGRWYWx1ZTsKKyAgICBtX3N0b3JhZ2VNYXAtPnJlbW92 ZUl0ZW0oa2V5LCBvbGRWYWx1ZSk7CisKKyAgICBpZiAob2xkVmFsdWUuaXNOdWxsKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIGRpc3BhdGNoRXZlbnRzKHNvdXJjZUNvbm5lY3Rpb24sIHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGtleSwgb2xkVmFsdWUsIFN0cmluZygpLCB1cmxTdHJpbmcpOwogfQog CiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6ZGlzcGF0Y2hFdmVudHMoQ29yZUlQ Qzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFy ZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0 cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKSBjb25zdApAQCAtMjc5LDYg KzI5MiwxNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYQogICAgIGNvbm5lY3Rpb24tPnNlbmQo TWVzc2FnZXM6OlN0b3JhZ2VBcmVhTWFwOjpEaWRTZXRJdGVtKGtleSwgcXVvdGFFcnJvciksIHN0 b3JhZ2VNYXBJRCk7CiB9CiAKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OnJlbW92ZUl0ZW0oQ29yZUlQ Qzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRf dCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB1 cmxTdHJpbmcpCit7CisgICAgU3RvcmFnZUFyZWEqIHN0b3JhZ2VBcmVhID0gZmluZFN0b3JhZ2VB cmVhKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7CisKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgorICAgIEFTU0VSVChzdG9yYWdlQXJlYSk7CisKKyAgICBz dG9yYWdlQXJlYS0+cmVtb3ZlSXRlbShjb25uZWN0aW9uLCBzb3VyY2VTdG9yYWdlQXJlYUlELCBr ZXksIHVybFN0cmluZyk7CisgICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6U3RvcmFnZUFy ZWFNYXA6OkRpZFJlbW92ZUl0ZW0oa2V5KSwgc3RvcmFnZU1hcElEKTsKK30KKwogdm9pZCBTdG9y YWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRf dCBzdG9yYWdlTmFtZXNwYWNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb24qIGFsbG93ZWRDb25uZWN0 aW9uLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCiB7CiAgICAgQVNTRVJUKCFtX3Nlc3Npb25TdG9y YWdlTmFtZXNwYWNlcy5jb250YWlucyhzdG9yYWdlTmFtZXNwYWNlSUQpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IGRlNTc1 MmY0YWNkZTE4M2Y1ZWNhODgxMTc3MWVmMDlkMDNjNzExNTcuLjZkODdiMDkzMjU0Yjk1YmIxNDVk ODZmNDUxNjIwYjhiM2VhMmY0MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaApAQCAtNjMsNiArNjMsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgZGVzdHJveVN0b3JhZ2VNYXAoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0 b3JhZ2VNYXBJRCk7CiAgICAgdm9pZCBnZXRWYWx1ZXMoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVp bnQ2NF90IHN0b3JhZ2VNYXBJRCwgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIHZhbHVlcyk7CiAg ICAgdm9pZCBzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlQXJl YUlELCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOworICAgIHZvaWQgcmVt b3ZlSXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50 NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcpOwogCiAgICAgdm9pZCBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUlu dGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgQ29yZUlQQzo6Q29ubmVjdGlvbiog YWxsb3dlZENvbm5lY3Rpb24sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7CiAgICAgdm9pZCBkZXN0 cm95U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdlTmFtZXNw YWNlSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgppbmRleCA0M2YzMGZiOTY4Y2ExNGM1YjA5MzU5 ZDg3MDM1MDUwYTdkOTFjNmU4Li40YzVkNTlmYTNiMDhmZGE3YzQzNDQ0MmNkZGU3MjYzODg5MDcy NmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdl TWFuYWdlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgpAQCAtMjcsNCArMjcsNSBAQCBtZXNzYWdlcyAt PiBTdG9yYWdlTWFuYWdlciB7CiAgICAgR2V0VmFsdWVzKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCkg LT4gKFdURjo6SGFzaE1hcDxXVEY6OlN0cmluZywgV1RGOjpTdHJpbmc+IHZhbHVlcykgV2FudHND b25uZWN0aW9uCiAKICAgICBTZXRJdGVtKHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qg c291cmNlU3RvcmFnZUFyZWFJRCwgV1RGOjpTdHJpbmcga2V5LCBXVEY6OlN0cmluZyB2YWx1ZSwg V1RGOjpTdHJpbmcgdXJsU3RyaW5nKSBXYW50c0Nvbm5lY3Rpb24KKyAgICBSZW1vdmVJdGVtKHVp bnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgV1RGOjpT dHJpbmcga2V5LCBXVEY6OlN0cmluZyB1cmxTdHJpbmcpIFdhbnRzQ29ubmVjdGlvbgogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcAppbmRleCBiMmZmYzQ5MDhhMGUyMDkyODI2Yzk0MDc1M2FjOWZjYjdiMjc4NGJiLi5kNTJm ZTQyMmE5NWVlMDljMGU4ZjgxNzA0OTI1NTdjYmYwYWM2ZjYwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcApAQCAtMTI3 LDEyICsxMjcsMTggQEAgdm9pZCBTdG9yYWdlQXJlYUltcGw6OnNldEl0ZW0oY29uc3QgU3RyaW5n JiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkMKICAgICAgICAgZWMgPSBRVU9U QV9FWENFRURFRF9FUlI7CiB9CiAKLXZvaWQgU3RvcmFnZUFyZWFJbXBsOjpyZW1vdmVJdGVtKGNv bnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKQordm9p ZCBTdG9yYWdlQXJlYUltcGw6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlv bkNvZGUmIGVjLCBGcmFtZSogc291cmNlRnJhbWUpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVu dCB0aGlzLgotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIFVOVVNFRF9QQVJBTShrZXkp OwotICAgIFVOVVNFRF9QQVJBTShzb3VyY2VGcmFtZSk7CisgICAgZWMgPSAwOworICAgIGlmICgh Y2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsKKyAgICAgICAgZWMgPSBTRUNVUklUWV9F UlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVC cm93c2luZ0luRnJhbWUoc291cmNlRnJhbWUpKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3N0 b3JhZ2VBcmVhTWFwLT5yZW1vdmVJdGVtKHNvdXJjZUZyYW1lLCB0aGlzLCBrZXkpOwogfQogCiB2 b2lkIFN0b3JhZ2VBcmVhSW1wbDo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VG cmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlQXJlYU1hcC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZUFyZWFNYXAuY3BwCmluZGV4IDMwM2NlM2Y3YTRiYjFjNDk1MDk5YTk3YjFjNzIwZTljMjQwMzA0 NTguLmM1MzNkZGM0ZGQ5N2I4NmYyMzZmN2Q0NWI5YzNkOTQ1NzJmOWU1MDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcApA QCAtMTIwLDYgKzEyMCwyMiBAQCB2b2lkIFN0b3JhZ2VBcmVhTWFwOjpzZXRJdGVtKEZyYW1lKiBz b3VyY2VGcmFtZSwgU3RvcmFnZUFyZWFJbXBsKiBzb3VyY2VBcmVhLCBjbwogICAgIFdlYlByb2Nl c3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6U3RvcmFnZU1hbmFnZXI6 OlNldEl0ZW0obV9zdG9yYWdlTWFwSUQsIHNvdXJjZUFyZWEtPnN0b3JhZ2VBcmVhSUQoKSwga2V5 LCB2YWx1ZSwgc291cmNlRnJhbWUtPmRvY3VtZW50KCktPnVybCgpKSwgMCk7CiB9CiAKK3ZvaWQg U3RvcmFnZUFyZWFNYXA6OnJlbW92ZUl0ZW0oV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZyYW1lLCBT dG9yYWdlQXJlYUltcGwqIHNvdXJjZUFyZWEsIGNvbnN0IFN0cmluZyYga2V5KQoreworICAgIGxv YWRWYWx1ZXNJZk5lZWRlZCgpOworICAgIEFTU0VSVChtX3N0b3JhZ2VNYXAtPmhhc09uZVJlZigp KTsKKworICAgIFN0cmluZyBvbGRWYWx1ZTsKKyAgICBtX3N0b3JhZ2VNYXAtPnJlbW92ZUl0ZW0o a2V5LCBvbGRWYWx1ZSk7CisKKyAgICBpZiAob2xkVmFsdWUuaXNOdWxsKCkpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fcGVuZGluZ1ZhbHVlQ2hhbmdlcy5hZGQoa2V5KTsKKworICAgIFdlYlBy b2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6U3RvcmFnZU1hbmFn ZXI6OlJlbW92ZUl0ZW0obV9zdG9yYWdlTWFwSUQsIHNvdXJjZUFyZWEtPnN0b3JhZ2VBcmVhSUQo KSwga2V5LCBzb3VyY2VGcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkpLCAwKTsKK30KKwogYm9vbCBT dG9yYWdlQXJlYU1hcDo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXkpCiB7CiAgICAgbG9hZFZh bHVlc0lmTmVlZGVkKCk7CkBAIC0xNDcsNiArMTYzLDEyIEBAIHZvaWQgU3RvcmFnZUFyZWFNYXA6 OmRpZFNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGJvb2wgcXVvdGFFcnJvcikKICAgICAvLyBG SVhNRTogSW1wbGVtZW50LgogfQogCit2b2lkIFN0b3JhZ2VBcmVhTWFwOjpkaWRSZW1vdmVJdGVt KGNvbnN0IFN0cmluZyYga2V5KQoreworICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgcHJp bnRmKCJkaWQgcmVtb3ZlIVxuIik7Cit9CisKIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNo U3RvcmFnZUV2ZW50KHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYg a2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25z dCBTdHJpbmcmIHVybFN0cmluZykKIHsKICAgICBpZiAoc3RvcmFnZVR5cGUoKSA9PSBTZXNzaW9u U3RvcmFnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlQXJlYU1hcC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhTWFwLmgKaW5kZXggOWQ1NTYwNjUwNmY3ODMwZDkzMGYyNTdmMTM2OTdmZmQ4NjhkODU3 ZC4uNTJiZWFmMGNiYjY4MTBmZWYxMThiYjcwZDE1ZDBiNDc1ZjQ2MTFiOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKQEAgLTU1 LDYgKzU1LDcgQEAgcHVibGljOgogICAgIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgpOwogICAg IFN0cmluZyBpdGVtKGNvbnN0IFN0cmluZyYga2V5KTsKICAgICB2b2lkIHNldEl0ZW0oV2ViQ29y ZTo6RnJhbWUqIHNvdXJjZUZyYW1lLCBTdG9yYWdlQXJlYUltcGwqIHNvdXJjZUFyZWEsIGNvbnN0 IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sJiBxdW90YUV4Y2VwdGlvbik7 CisgICAgdm9pZCByZW1vdmVJdGVtKFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSwgU3RvcmFn ZUFyZWFJbXBsKiBzb3VyY2VBcmVhLCBjb25zdCBTdHJpbmcmIGtleSk7CiAgICAgYm9vbCBjb250 YWlucyhjb25zdCBTdHJpbmcmIGtleSk7CiAKIHByaXZhdGU6CkBAIC02NCw2ICs2NSw4IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5l Y3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpIE9WRVJSSURFOwogCiAgICAgdm9pZCBk aWRTZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBib29sIHF1b3RhRXJyb3IpOworICAgIHZvaWQg ZGlkUmVtb3ZlSXRlbShjb25zdCBTdHJpbmcmIGtleSk7CisKICAgICB2b2lkIGRpc3BhdGNoU3Rv cmFnZUV2ZW50KHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5 LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBT dHJpbmcmIHVybFN0cmluZyk7CiAKICAgICB2b2lkIGxvYWRWYWx1ZXNJZk5lZWRlZCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFw Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VB cmVhTWFwLm1lc3NhZ2VzLmluCmluZGV4IDE3ODZhMTZhZGNjMTZlMmViNzUzYjY5OWU2YTU1YzA2 OWI2ZTJhN2MuLjQxYzI5NjkyNDU2NjUyYmM1MGE5NDViOGI0MDRhZTI1MjIzMTc1NDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5t ZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZUFyZWFNYXAubWVzc2FnZXMuaW4KQEAgLTIyLDYgKzIyLDcgQEAKIAogbWVzc2FnZXMgLT4gU3Rv cmFnZUFyZWFNYXAgewogICAgIERpZFNldEl0ZW0oV1RGOjpTdHJpbmcga2V5LCBib29sIHF1b3Rh RXhjZXB0aW9uKQorICAgIERpZFJlbW92ZUl0ZW0oV1RGOjpTdHJpbmcga2V5KQogCiAgICAgRGlz cGF0Y2hTdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgV1RGOjpTdHJp bmcga2V5LCBXVEY6OlN0cmluZyBvbGRWYWx1ZSwgV1RGOjpTdHJpbmcgbmV3VmFsdWUsIFdURjo6 U3RyaW5nIHVybFN0cmluZykKIH0K