111370 2013-03-04 15:35:24 -0800 More work on UI side storage 2013-03-04 15:49:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 846930 0 andersca 2013-03-04 15:35:24 -0800 More work on UI side storage 846940 1 191330 andersca 2013-03-04 15:40:48 -0800 Created attachment 191330 Patch 846953 2 andersca 2013-03-04 15:49:48 -0800 Committed r144691: <http://trac.webkit.org/changeset/144691> 191330 2013-03-04 15:40:48 -0800 2013-03-04 15:48:09 -0800 Patch bug-111370-20130304153655.patch text/plain 10436 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTU4YTNiZjc0NzNiODc1 MWRmY2NiMGU1ODExZTJmOGZjZTJiYzY2MS4uM2FhZDM3MzU1ZjA0ZmU3Yzk2MTg1Yzg2ZDU5YjRl YTI3MDY2MTFiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAzLTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9yZSB3b3JrIG9u IFVJIHNpZGUgc3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTExMzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIGEgRGlzcGF0Y2hTdG9yYWdlRXZlbnQgbWVzc2FnZSBhbmQgYmVnaW4gaG9v a2luZyBpdCB1cC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYSk6CisgICAgICAgIChX ZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6c2V0SXRlbSk6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmRp c3BhdGNoRXZlbnRzKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OnNldEl0ZW0p OgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZmluZFN0b3JhZ2VBcmVhKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oOgorICAgICAgICAoU3Rv cmFnZU1hbmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2Vy Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94eTo6c2V0SXRlbSk6Cisg ICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhUHJveHk6OmRpc3BhdGNoU3RvcmFnZUV2ZW50KToK KyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VB cmVhUHJveHkuaDoKKyAgICAgICAgKFN0b3JhZ2VBcmVhUHJveHkpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5Lm1lc3NhZ2VzLmluOgorCiAyMDEzLTAzLTA0 ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQg YnVpbGQgZml4OiB3cmFwIHJlZmVyZW5jZXMgdG8gUGx1Z2luSW5mb1N0b3JlIHdpdGggCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAK aW5kZXggMWU4NTE0OTQzYzMwZjI0MzhkMDU2MzYyNjdiOTdhNDA2NDdhMjNiNC4uMThkMzU0YzNm NGE0ZWU4MWFiNjJmYTNiYTU1YmI3YjE4NTEwOWIyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNDUsOSArNDUsMTMg QEAgcHVibGljOgogICAgIHZvaWQgYWRkTGlzdGVuZXIoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVp bnQ2NF90IHN0b3JhZ2VBcmVhSUQpOwogICAgIHZvaWQgcmVtb3ZlTGlzdGVuZXIoQ29yZUlQQzo6 Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQpOwogCisgICAgYm9vbCBzZXRJdGVt KENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlQXJlYUlELCBjb25zdCBTdHJp bmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwor CiBwcml2YXRlOgogICAgIFN0b3JhZ2VBcmVhKCk7CiAKKyAgICB2b2lkIGRpc3BhdGNoRXZlbnRz KENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlQXJlYUlELCBjb25zdCBTdHJp bmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwg Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpIGNvbnN0OworCiAgICAgSGFzaFNldDxzdGQ6OnBhaXI8 UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4+IG1fZXZlbnRMaXN0ZW5lcnM7 CiB9OwogCkBAIC03Nyw2ICs4MSwyOCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJl YTo6cmVtb3ZlTGlzdGVuZXIoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbgogICAgIG1f ZXZlbnRMaXN0ZW5lcnMucmVtb3ZlKHN0ZDo6bWFrZV9wYWlyKGNvbm5lY3Rpb24sIHN0b3JhZ2VB cmVhSUQpKTsKIH0KIAorYm9vbCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnNldEl0ZW0o Q29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZUFyZWFJRCwg Y29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIGNvbnN0IFN0cmluZyYgdXJs U3RyaW5nKQoreworICAgIC8vIEZJWE1FOiBBY3R1YWxseSBzZXQgdGhlIGl0ZW0uCisKKyAgICBT dHJpbmcgb2xkVmFsdWU7CisgICAgZGlzcGF0Y2hFdmVudHMoY29ubmVjdGlvbiwgc3RvcmFnZUFy ZWFJRCwga2V5LCBvbGRWYWx1ZSwgdmFsdWUsIHVybFN0cmluZyk7CisgICAgCisgICAgcmV0dXJu IHRydWU7Cit9CisKK3ZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpkaXNwYXRjaEV2 ZW50cyhDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdlQXJl YUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3Ry aW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpIGNvbnN0Cit7CisgICAgZm9y IChIYXNoU2V0PHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90 PiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZXZlbnRMaXN0ZW5lcnMuYmVnaW4oKSwgZW5kID0g bV9ldmVudExpc3RlbmVycy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIGlmIChp dC0+Zmlyc3QgPT0gY29ubmVjdGlvbiAmJiBpdC0+c2Vjb25kID09IHN0b3JhZ2VBcmVhSUQpIHsK KyAgICAgICAgICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gZGlzcGF0Y2ggZXZlbnRzIHRvIHRoZSBz dG9yYWdlIGFyZWEgdGhhdCBvcmlnaW5hdGVkIHRoZSBldmVudC4KKyAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICB9CisKKyAgICAgICAgaXQtPmZpcnN0LT5zZW5kKE1lc3NhZ2VzOjpTdG9y YWdlQXJlYVByb3h5OjpEaXNwYXRjaFN0b3JhZ2VFdmVudChrZXksIG9sZFZhbHVlLCBuZXdWYWx1 ZSwgdXJsU3RyaW5nKSwgaXQtPnNlY29uZCk7CisgICAgfQorfQorCiBjbGFzcyBTdG9yYWdlTWFu YWdlcjo6U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50 ZWQ8U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2U+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZT4gY3JlYXRlKENvcmVJUEM6OkNvbm5lY3Rpb24q IGFsbG93ZWRDb25uZWN0aW9uKTsKQEAgLTIzMSwxMiArMjU3LDE1IEBAIHZvaWQgU3RvcmFnZU1h bmFnZXI6OmdldFZhbHVlcyhDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3QsIEhhc2hNYXA8 U3RyaW5nLCBTCiAgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgogfQogCi12b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2 NF90IHN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVl KQordm9pZCBTdG9yYWdlTWFuYWdlcjo6c2V0SXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25u ZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qg U3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCiB7Ci0gICAgLy8gRklYTUU6 IEZpbmQgdGhlIHJpZ2h0IHN0b3JhZ2UgYXJlYSBhbmQgc2V0IHRoZSBpdGVtLgotICAgIC8vIEZJ WE1FOiBTZW5kIG91dCBzdG9yYWdlIGNoYW5nZWQgZXZlbnRzLgorICAgIFN0b3JhZ2VBcmVhKiBz dG9yYWdlQXJlYSA9IGZpbmRTdG9yYWdlQXJlYShjb25uZWN0aW9uLCBzdG9yYWdlQXJlYUlEKTsK KworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCisgICAgQVNT RVJUKHN0b3JhZ2VBcmVhKTsKKworICAgIGJvb2wgcXVvdGFFcnJvciA9IHN0b3JhZ2VBcmVhLT5z ZXRJdGVtKGNvbm5lY3Rpb24sIHN0b3JhZ2VBcmVhSUQsIGtleSwgdmFsdWUsIHVybFN0cmluZyk7 CiAKLSAgICBib29sIHF1b3RhRXJyb3IgPSBmYWxzZTsKICAgICBjb25uZWN0aW9uLT5zZW5kKE1l c3NhZ2VzOjpTdG9yYWdlQXJlYVByb3h5OjpEaWRTZXRJdGVtKGtleSwgcXVvdGFFcnJvciksIHN0 b3JhZ2VBcmVhSUQpOwogfQogCkBAIC0yNzIsNCArMzAxLDEzIEBAIHZvaWQgU3RvcmFnZU1hbmFn ZXI6OmNsb25lU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdl TmFtZXNwCiAgICAgc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UtPmNsb25lVG8oKm5ld1Nlc3Npb25T dG9yYWdlTmFtZXNwYWNlKTsKIH0KIAorU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhKiBTdG9y YWdlTWFuYWdlcjo6ZmluZFN0b3JhZ2VBcmVhKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rp b24sIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQpIGNvbnN0Cit7CisgICAgc3RkOjpwYWlyPENvcmVJ UEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VBcmVhSURQYWly KGNvbm5lY3Rpb24sIHN0b3JhZ2VBcmVhSUQpOworICAgIGlmICghSGFzaE1hcDxzdGQ6OnBhaXI8 UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4sIFJlZlB0cjxTdG9yYWdlQXJl YT4gPjo6aXNWYWxpZEtleShjb25uZWN0aW9uQW5kU3RvcmFnZUFyZWFJRFBhaXIpKQorICAgICAg ICByZXR1cm4gMDsKKworICAgIHJldHVybiBtX3N0b3JhZ2VBcmVhcy5nZXQoY29ubmVjdGlvbkFu ZFN0b3JhZ2VBcmVhSURQYWlyKS5nZXQoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdl ci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaApp bmRleCA1MWM2OWJhMmRhYzAxNDBjNjhkMWY1MGVjODE3ZDAwMTJmYzE2YWJjLi5kMjcyNzUyOWJj YjZkNjA5Njg4MjNkYmVhNWYwMWUxOTBlNjNlOWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTYyLDE5ICs2MiwyMSBAQCBw cml2YXRlOgogICAgIHZvaWQgY3JlYXRlU3RvcmFnZUFyZWEoQ29yZUlQQzo6Q29ubmVjdGlvbios IHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQsIHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgY29u c3QgU2VjdXJpdHlPcmlnaW5EYXRhJik7CiAgICAgdm9pZCBkZXN0cm95U3RvcmFnZUFyZWEoQ29y ZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQpOwogICAgIHZvaWQgZ2V0 VmFsdWVzKENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBzdG9yYWdlQXJlYUlELCBIYXNo TWFwPFN0cmluZywgU3RyaW5nPiYgdmFsdWVzKTsKLSAgICB2b2lkIHNldEl0ZW0oQ29yZUlQQzo6 Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBj b25zdCBTdHJpbmcmIHZhbHVlKTsKKyAgICB2b2lkIHNldEl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlv biosIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJp bmcmIHZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZyk7CiAKICAgICB2b2lkIGNyZWF0ZVNl c3Npb25TdG9yYWdlTmFtZXNwYWNlSW50ZXJuYWwodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlE LCBDb3JlSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbik7CiAgICAgdm9pZCBkZXN0 cm95U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdlTmFtZXNw YWNlSUQpOwogICAgIHZvaWQgc2V0QWxsb3dlZFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlQ29ubmVj dGlvbkludGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgQ29yZUlQQzo6Q29ubmVj dGlvbiogYWxsb3dlZENvbm5lY3Rpb24pOwogICAgIHZvaWQgY2xvbmVTZXNzaW9uU3RvcmFnZU5h bWVzcGFjZUludGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgdWludDY0X3QgbmV3 U3RvcmFnZU5hbWVzcGFjZUlEKTsKIAorICAgIGNsYXNzIFN0b3JhZ2VBcmVhOworICAgIFN0b3Jh Z2VBcmVhKiBmaW5kU3RvcmFnZUFyZWEoQ29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90KSBj b25zdDsKKwogICAgIFJlZlB0cjxXb3JrUXVldWU+IG1fcXVldWU7CiAKICAgICBjbGFzcyBTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZTsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8U2Vzc2lv blN0b3JhZ2VOYW1lc3BhY2U+ID4gbV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXM7CiAKLSAgICBj bGFzcyBTdG9yYWdlQXJlYTsKICAgICBIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6 Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+IG1fc3RvcmFnZUFy ZWFzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZU1hbmFnZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgppbmRleCA0YTNiOTI5ODMwZWRkMzdhOTEy NmMxNmExMGFlMGYzNTRhMzY0MGI2Li4zZWIwYmIzYThhYjUzZDYxODJjYmU2YWE2ZjA3YmM3MGNk OGNmYzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlTWFuYWdlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlTWFuYWdlci5tZXNzYWdlcy5pbgpAQCAtMjYsNSArMjYsNSBAQCBtZXNzYWdl cyAtPiBTdG9yYWdlTWFuYWdlciB7CiAKICAgICBHZXRWYWx1ZXModWludDY0X3Qgc3RvcmFnZUFy ZWFJRCkgLT4gKFdURjo6SGFzaE1hcDxXVEY6OlN0cmluZywgV1RGOjpTdHJpbmc+IHZhbHVlcykg V2FudHNDb25uZWN0aW9uCiAKLSAgICBTZXRJdGVtKHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQsIFdU Rjo6U3RyaW5nIGtleSwgV1RGOjpTdHJpbmcgdmFsdWUpIFdhbnRzQ29ubmVjdGlvbgorICAgIFNl dEl0ZW0odWludDY0X3Qgc3RvcmFnZUFyZWFJRCwgV1RGOjpTdHJpbmcga2V5LCBXVEY6OlN0cmlu ZyB2YWx1ZSwgV1RGOjpTdHJpbmcgdXJsU3RyaW5nKSBXYW50c0Nvbm5lY3Rpb24KIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5 LmNwcAppbmRleCA1ZGYwOWU2ZTcwYzFkYWM2ZjZjMDNhMzAwNTc2YzU5N2ZhZjEzYTczLi5mZjgw MjU1NjkzN2VhMjFlZjdlNTBkZjY5ZjVjOGEwMGNmMzgzZDhiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuY3BwCkBAIC0x NDIsNyArMTQyLDcgQEAgdm9pZCBTdG9yYWdlQXJlYVByb3h5OjpzZXRJdGVtKGNvbnN0IFN0cmlu ZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb24KICAgICBpZiAob2xkVmFsdWUg PT0gdmFsdWUpCiAgICAgICAgIHJldHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNv bm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6U3RvcmFnZU1hbmFnZXI6OlNldEl0ZW0obV9zdG9y YWdlQXJlYUlELCBrZXksIHZhbHVlKSwgMCk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29u bmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6U2V0SXRlbShtX3N0b3Jh Z2VBcmVhSUQsIGtleSwgdmFsdWUsIHNvdXJjZUZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSksIDAp OwogfQogCiB2b2lkIFN0b3JhZ2VBcmVhUHJveHk6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBr ZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpCkBAIC0yMDQsNiArMjA0LDEx IEBAIHZvaWQgU3RvcmFnZUFyZWFQcm94eTo6ZGlkU2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwg Ym9vbCBxdW90YUVycm9yKQogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgdGhpcy4KIH0KIAordm9p ZCBTdG9yYWdlQXJlYVByb3h5OjpkaXNwYXRjaFN0b3JhZ2VFdmVudChjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3Qg U3RyaW5nJiB1cmxTdHJpbmcpCit7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgorfQor CiBib29sIFN0b3JhZ2VBcmVhUHJveHk6OmRpc2FibGVkQnlQcml2YXRlQnJvd3NpbmdJbkZyYW1l KGNvbnN0IEZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3QKIHsKICAgICBpZiAoIXNvdXJjZUZyYW1l LT5wYWdlKCktPnNldHRpbmdzKCktPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5oCmlu ZGV4IDBlZDY2YWJkYmViNDk3NjFmM2JlNWFlNDhhYWNiMGQ5YTgzYTQ1ZGQuLmJmNTEwNzk1NjY3 NDNjZjNhM2NlMDEwOWM2ODFkNmU3NDY2NWNiZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuaApAQCAtNjQsNiArNjQsNyBA QCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpD b25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKSBPVkVSUklERTsKIAogICAgIHZv aWQgZGlkU2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgYm9vbCBxdW90YUVycm9yKTsKKyAgICB2 b2lkIGRpc3BhdGNoU3RvcmFnZUV2ZW50KGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmlu Zyk7CiAKICAgICBib29sIGRpc2FibGVkQnlQcml2YXRlQnJvd3NpbmdJbkZyYW1lKGNvbnN0IFdl YkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5Lm1lc3NhZ2VzLmluIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkubWVzc2Fn ZXMuaW4KaW5kZXggN2Q1MDJlYzNlNWNkYWRiZTllMTJlNjllOGIwYzQyZjQ2MDllZmZhYi4uYWU3 NzQzZmZlZGViMzljMmU2MDAwZjFiMTZkZmE5YWZlYzlkZDM4MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkubWVzc2FnZXMuaW4K KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHku bWVzc2FnZXMuaW4KQEAgLTIyLDQgKzIyLDYgQEAKIAogbWVzc2FnZXMgLT4gU3RvcmFnZUFyZWFQ cm94eSB7CiAgICAgRGlkU2V0SXRlbShXVEY6OlN0cmluZyBrZXksIGJvb2wgcXVvdGFFeGNlcHRp b24pCisKKyAgICBEaXNwYXRjaFN0b3JhZ2VFdmVudChXVEY6OlN0cmluZyBrZXksIFdURjo6U3Ry aW5nIG9sZFZhbHVlLCBXVEY6OlN0cmluZyBuZXdWYWx1ZSwgV1RGOjpTdHJpbmcgdXJsU3RyaW5n KQogfQo=