225188 2021-04-29 05:50:38 -0700 REGRESSION(r276689): Broke platform/ios/ios/storage/domstorage/5mb-quota.html 2021-04-29 07:28:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225123 225160 225164 1 commit-queue commit-queue aakash_jain achristensen cdumez webkit-bug-importer oldest_to_newest 1755354 0 commit-queue 2021-04-29 05:50:38 -0700 https://trac.webkit.org/changeset/276689 broke the build: Broke platform/ios/ios/storage/domstorage/5mb-quota.html This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1755358 1 427340 commit-queue 2021-04-29 05:50:50 -0700 Created attachment 427340 REVERT of r276689 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1755374 2 ews-feeder 2021-04-29 07:27:32 -0700 Committed r276773 (237157@main): <https://commits.webkit.org/237157@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427340. 1755375 3 webkit-bug-importer 2021-04-29 07:28:22 -0700 <rdar://problem/77320280> 427340 2021-04-29 05:50:50 -0700 2021-04-29 07:27:33 -0700 REVERT of r276689 bug-225188-20210429125050.patch text/plain 14817 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVjOWJiYjMxNDJkYjU1 NGQ5MzAwNDg3ZWI5MTc1N2E4ZDVkOWUwNS4uYWZkMmFlNjdjNTNmNWUwNjdhOWVmMDI4Yzk0ZTI2 ZGYzNmZhNTk1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA0LTI5ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI3NjY4OSwgcjI3NjczNiwgYW5kIHIyNzY3MzcuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxODgKKworICAgICAgICBCcm9r ZSBwbGF0Zm9ybS9pb3MvaW9zL3N0b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbAorCisg ICAgICAgIFJldmVydGVkIGNoYW5nZXNldHM6CisKKyAgICAgICAgIkltcHJvdmUgbG9jYWwgc3Rv cmFnZSBzaXplIGVzdGltYXRpb24gZm9yIHF1b3RhIGxpbWl0YXRpb24iCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxMjMKKyAgICAgICAgaHR0cHM6 Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI3NjY4OQorCisgICAgICAgICJSRUdSRVNTSU9O KHIyNzY2ODkpOiBbIGlPUyB3azIgXQorICAgICAgICBwbGF0Zm9ybS9pb3MvaW9zL3N0b3JhZ2Uv ZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbCBpcyBhCisgICAgICAgIGNvbnN0YW50IHRleHQgZmFp bHVyZSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NTE2MAorICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjc2NzM2CisK KyAgICAgICAgIk1ha2Ugc3VyZSB3ZSBpbnZhbGlkYXRlIHRoZSBpdGVyYXRvciBpbiBTdG9yYWdl TWFwOjpjbGVhcigpIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI1MTY0CisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8y NzY3MzcKKwogMjAyMS0wNC0yOSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4K IAogICAgICAgICBbR1BVIFByb2Nlc3NdIFJFR1JFU1NJT04ocjI3Mjg4OCk6IERvbid0IGFzc2Vy dCB0aGUgdmFsaWRpdHkgb2YgdGhlIGRhdGFVUkwgbWltZVR5cGUgaW5zaWRlIEdQVSBQcm9jZXNz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCmluZGV4IGM1MTAxMGFmOTA0ODJiZTJhYjE1OTgyOWM0NDgxNTY2NTY5NGVhYTcuLmRl NjYyODRhZDY1YjEyYTJjMTFkOGQ0MTZmMDVlMzhiMGU1Y2E5NTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjYgQEAKKzIwMjEtMDQtMjkgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc2Njg5LCByMjc2NzM2LCBh bmQgcjI3NjczNy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyNTE4OAorCisgICAgICAgIEJyb2tlIHBsYXRmb3JtL2lvcy9pb3Mvc3RvcmFnZS9kb21z dG9yYWdlLzVtYi1xdW90YS5odG1sCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0czoKKwor ICAgICAgICAiSW1wcm92ZSBsb2NhbCBzdG9yYWdlIHNpemUgZXN0aW1hdGlvbiBmb3IgcXVvdGEg bGltaXRhdGlvbiIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyNTEyMworICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjc2 Njg5CisKKyAgICAgICAgIlJFR1JFU1NJT04ocjI3NjY4OSk6IFsgaU9TIHdrMiBdCisgICAgICAg IHBsYXRmb3JtL2lvcy9pb3Mvc3RvcmFnZS9kb21zdG9yYWdlLzVtYi1xdW90YS5odG1sIGlzIGEK KyAgICAgICAgY29uc3RhbnQgdGV4dCBmYWlsdXJlIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTYwCisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8yNzY3MzYKKworICAgICAgICAiTWFrZSBzdXJlIHdlIGludmFsaWRh dGUgdGhlIGl0ZXJhdG9yIGluIFN0b3JhZ2VNYXA6OmNsZWFyKCkiCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxNjQKKyAgICAgICAgaHR0cHM6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI3NjczNworCiAyMDIxLTA0LTI5ICBTYWlkIEFib3Ut SGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBidWlsZCBicmVhayBhZnRl ciByMjc2NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAu Y3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcAppbmRleCAzMDQ1YzQ0 ODU3OGVlM2NjM2VlYmFiMjVlY2Y2ZjNkMGZlMGVmNThiLi43MmExMTE5ZGZlZGNkMTVhY2E4MTA3 NDNhODAxYzc1ZmUxNTQ0NmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2VNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5jcHAK QEAgLTI2LDcgKzI2LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTdG9yYWdl TWFwLmgiCiAKLSNpbmNsdWRlIDx3dGYvQ2hlY2tlZEFyaXRobWV0aWMuaD4KICNpbmNsdWRlIDx3 dGYvU2V0Rm9yU2NvcGUuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtOTQsMTkgKzkzLDI2 IEBAIHZvaWQgU3RvcmFnZU1hcDo6c2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3Ry aW5nJiB2YWx1ZSwgU3RyaW5nJiBvbGRWYWx1CiAgICAgaWYgKG1faW1wbC0+cmVmQ291bnQoKSA+ IDEpCiAgICAgICAgIG1faW1wbCA9IG1faW1wbC0+Y29weSgpOwogCisgICAgLy8gUXVvdGEgdHJh Y2tpbmcuICBUaGlzIGlzIGRvbmUgaW4gYSBjb3VwbGUgb2Ygc3RlcHMgdG8ga2VlcCB0aGUgb3Zl cmZsb3cgdHJhY2tpbmcgc2ltcGxlLgorICAgIHVuc2lnbmVkIG5ld0xlbmd0aCA9IG1faW1wbC0+ Y3VycmVudExlbmd0aDsKKyAgICBib29sIG92ZXJmbG93ID0gbmV3TGVuZ3RoICsgdmFsdWUubGVu Z3RoKCkgPCBuZXdMZW5ndGg7CisgICAgbmV3TGVuZ3RoICs9IHZhbHVlLmxlbmd0aCgpOworCiAg ICAgb2xkVmFsdWUgPSBtX2ltcGwtPm1hcC5nZXQoa2V5KTsKKyAgICBvdmVyZmxvdyB8PSBuZXdM ZW5ndGggLSBvbGRWYWx1ZS5sZW5ndGgoKSA+IG5ld0xlbmd0aDsKKyAgICBuZXdMZW5ndGggLT0g b2xkVmFsdWUubGVuZ3RoKCk7CisKKyAgICB1bnNpZ25lZCBhZGp1c3RlZEtleUxlbmd0aCA9IG9s ZFZhbHVlLmlzTnVsbCgpID8ga2V5Lmxlbmd0aCgpIDogMDsKKyAgICBvdmVyZmxvdyB8PSBuZXdM ZW5ndGggKyBhZGp1c3RlZEtleUxlbmd0aCA8IG5ld0xlbmd0aDsKKyAgICBuZXdMZW5ndGggKz0g YWRqdXN0ZWRLZXlMZW5ndGg7CiAKLSAgICAvLyBRdW90YSB0cmFja2luZy4gVGhpcyBpcyBkb25l IGluIGEgY291cGxlIG9mIHN0ZXBzIHRvIGtlZXAgdGhlIG92ZXJmbG93IHRyYWNraW5nIHNpbXBs ZS4KLSAgICBDaGVja2VkVWludDMyIG5ld1NpemUgPSBtX2ltcGwtPmN1cnJlbnRTaXplOwotICAg IG5ld1NpemUgLT0gb2xkVmFsdWUuc2l6ZUluQnl0ZXMoKTsKLSAgICBuZXdTaXplICs9IHZhbHVl LnNpemVJbkJ5dGVzKCk7Ci0gICAgaWYgKG9sZFZhbHVlLmlzTnVsbCgpKQotICAgICAgICBuZXdT aXplICs9IGtleS5zaXplSW5CeXRlcygpOwotICAgIGlmIChtX3F1b3RhU2l6ZSAhPSBub1F1b3Rh ICYmIChuZXdTaXplLmhhc092ZXJmbG93ZWQoKSB8fCBuZXdTaXplLnVuc2FmZUdldCgpID4gbV9x dW90YVNpemUpKSB7CisgICAgQVNTRVJUKCFvdmVyZmxvdyk7ICAvLyBPdmVyZmxvdyBpcyBiYWQu Li5ldmVuIGlmIHF1b3RhcyBhcmUgb2ZmLgorICAgIGJvb2wgb3ZlclF1b3RhID0gbmV3TGVuZ3Ro ID4gbV9xdW90YVNpemUgLyBzaXplb2YoVUNoYXIpOworICAgIGlmIChtX3F1b3RhU2l6ZSAhPSBu b1F1b3RhICYmIChvdmVyZmxvdyB8fCBvdmVyUXVvdGEpKSB7CiAgICAgICAgIHF1b3RhRXhjZXB0 aW9uID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX2ltcGwtPmN1cnJlbnRT aXplID0gbmV3U2l6ZS51bnNhZmVHZXQoKTsKKyAgICBtX2ltcGwtPmN1cnJlbnRMZW5ndGggPSBu ZXdMZW5ndGg7CiAKICAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPjo6QWRkUmVzdWx0IGFkZFJl c3VsdCA9IG1faW1wbC0+bWFwLmFkZChrZXksIHZhbHVlKTsKICAgICBpZiAoIWFkZFJlc3VsdC5p c05ld0VudHJ5KQpAQCAtMTE3LDcgKzEyMyw3IEBAIHZvaWQgU3RvcmFnZU1hcDo6c2V0SXRlbShj b25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU3RyaW5nJiBvbGRWYWx1CiAK IHZvaWQgU3RvcmFnZU1hcDo6c2V0SXRlbUlnbm9yaW5nUXVvdGEoY29uc3QgU3RyaW5nJiBrZXks IGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7Ci0gICAgU2V0Rm9yU2NvcGU8dW5zaWduZWQ+IHF1b3Rh U2l6ZUNoYW5nZShtX3F1b3RhU2l6ZSwgbm9RdW90YSk7CisgICAgU2V0Rm9yU2NvcGU8dW5zaWdu ZWQ+IHF1b3RhU2l6ZUNoYW5nZShtX3F1b3RhU2l6ZSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG5v UXVvdGEpKTsKIAogICAgIFN0cmluZyBvbGRWYWx1ZTsKICAgICBib29sIHF1b3RhRXhjZXB0aW9u OwpAQCAtMTMyLDE0ICsxMzgsMTMgQEAgdm9pZCBTdG9yYWdlTWFwOjpyZW1vdmVJdGVtKGNvbnN0 IFN0cmluZyYga2V5LCBTdHJpbmcmIG9sZFZhbHVlKQogICAgICAgICBtX2ltcGwgPSBtX2ltcGwt PmNvcHkoKTsKIAogICAgIG9sZFZhbHVlID0gbV9pbXBsLT5tYXAudGFrZShrZXkpOwotICAgIGlm IChvbGRWYWx1ZS5pc051bGwoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaW52YWxpZGF0ZUl0 ZXJhdG9yKCk7Ci0gICAgQVNTRVJUKG1faW1wbC0+Y3VycmVudFNpemUgLSBrZXkuc2l6ZUluQnl0 ZXMoKSA8PSBtX2ltcGwtPmN1cnJlbnRTaXplKTsKLSAgICBtX2ltcGwtPmN1cnJlbnRTaXplIC09 IGtleS5zaXplSW5CeXRlcygpOwotICAgIEFTU0VSVChtX2ltcGwtPmN1cnJlbnRTaXplIC0gb2xk VmFsdWUuc2l6ZUluQnl0ZXMoKSA8PSBtX2ltcGwtPmN1cnJlbnRTaXplKTsKLSAgICBtX2ltcGwt PmN1cnJlbnRTaXplIC09IG9sZFZhbHVlLnNpemVJbkJ5dGVzKCk7CisgICAgaWYgKCFvbGRWYWx1 ZS5pc051bGwoKSkgeworICAgICAgICBpbnZhbGlkYXRlSXRlcmF0b3IoKTsKKyAgICAgICAgQVNT RVJUKG1faW1wbC0+Y3VycmVudExlbmd0aCAtIGtleS5sZW5ndGgoKSA8PSBtX2ltcGwtPmN1cnJl bnRMZW5ndGgpOworICAgICAgICBtX2ltcGwtPmN1cnJlbnRMZW5ndGggLT0ga2V5Lmxlbmd0aCgp OworICAgIH0KKyAgICBBU1NFUlQobV9pbXBsLT5jdXJyZW50TGVuZ3RoIC0gb2xkVmFsdWUubGVu Z3RoKCkgPD0gbV9pbXBsLT5jdXJyZW50TGVuZ3RoKTsKKyAgICBtX2ltcGwtPmN1cnJlbnRMZW5n dGggLT0gb2xkVmFsdWUubGVuZ3RoKCk7CiB9CiAKIHZvaWQgU3RvcmFnZU1hcDo6Y2xlYXIoKQpA QCAtMTQ5LDggKzE1NCw3IEBAIHZvaWQgU3RvcmFnZU1hcDo6Y2xlYXIoKQogICAgICAgICByZXR1 cm47CiAgICAgfQogICAgIG1faW1wbC0+bWFwLmNsZWFyKCk7Ci0gICAgbV9pbXBsLT5jdXJyZW50 U2l6ZSA9IDA7Ci0gICAgaW52YWxpZGF0ZUl0ZXJhdG9yKCk7CisgICAgbV9pbXBsLT5jdXJyZW50 TGVuZ3RoID0gMDsKIH0KIAogYm9vbCBTdG9yYWdlTWFwOjpjb250YWlucyhjb25zdCBTdHJpbmcm IGtleSkgY29uc3QKQEAgLTE2NCw4ICsxNjgsOCBAQCB2b2lkIFN0b3JhZ2VNYXA6OmltcG9ydEl0 ZW1zKEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiYgaXRlbXMpCiAgICAgICAgIC8vIEZhc3QgcGF0 aC4KICAgICAgICAgbV9pbXBsLT5tYXAgPSBXVEZNb3ZlKGl0ZW1zKTsKICAgICAgICAgZm9yIChh dXRvJiBwYWlyIDogbV9pbXBsLT5tYXApIHsKLSAgICAgICAgICAgIEFTU0VSVChtX2ltcGwtPmN1 cnJlbnRTaXplICsgcGFpci5rZXkuc2l6ZUluQnl0ZXMoKSArIHBhaXIudmFsdWUuc2l6ZUluQnl0 ZXMoKSA+PSBtX2ltcGwtPmN1cnJlbnRTaXplKTsKLSAgICAgICAgICAgIG1faW1wbC0+Y3VycmVu dFNpemUgKz0gKHBhaXIua2V5LnNpemVJbkJ5dGVzKCkgKyBwYWlyLnZhbHVlLnNpemVJbkJ5dGVz KCkpOworICAgICAgICAgICAgQVNTRVJUKG1faW1wbC0+Y3VycmVudExlbmd0aCArIHBhaXIua2V5 Lmxlbmd0aCgpICsgcGFpci52YWx1ZS5sZW5ndGgoKSA+PSBtX2ltcGwtPmN1cnJlbnRMZW5ndGgp OworICAgICAgICAgICAgbV9pbXBsLT5jdXJyZW50TGVuZ3RoICs9IChwYWlyLmtleS5sZW5ndGgo KSArIHBhaXIudmFsdWUubGVuZ3RoKCkpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybjsKICAg ICB9CkBAIC0xNzQsOSArMTc4LDkgQEAgdm9pZCBTdG9yYWdlTWFwOjppbXBvcnRJdGVtcyhIYXNo TWFwPFN0cmluZywgU3RyaW5nPiYmIGl0ZW1zKQogICAgICAgICBhdXRvJiBrZXkgPSBpdGVtLmtl eTsKICAgICAgICAgYXV0byYgdmFsdWUgPSBpdGVtLnZhbHVlOwogCi0gICAgICAgIEFTU0VSVCht X2ltcGwtPmN1cnJlbnRTaXplICsga2V5LnNpemVJbkJ5dGVzKCkgKyB2YWx1ZS5zaXplSW5CeXRl cygpID49IG1faW1wbC0+Y3VycmVudFNpemUpOwotICAgICAgICBtX2ltcGwtPmN1cnJlbnRTaXpl ICs9IChrZXkuc2l6ZUluQnl0ZXMoKSArIHZhbHVlLnNpemVJbkJ5dGVzKCkpOwotCisgICAgICAg IEFTU0VSVChtX2ltcGwtPmN1cnJlbnRMZW5ndGggKyBrZXkubGVuZ3RoKCkgKyB2YWx1ZS5sZW5n dGgoKSA+PSBtX2ltcGwtPmN1cnJlbnRMZW5ndGgpOworICAgICAgICBtX2ltcGwtPmN1cnJlbnRM ZW5ndGggKz0gKGtleS5sZW5ndGgoKSArIHZhbHVlLmxlbmd0aCgpKTsKKyAgICAgICAgCiAgICAg ICAgIGF1dG8gcmVzdWx0ID0gbV9pbXBsLT5tYXAuYWRkKFdURk1vdmUoa2V5KSwgV1RGTW92ZSh2 YWx1ZSkpOwogICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVzdWx0LmlzTmV3RW50cnkp OyAvLyBUcnVlIGlmIHRoZSBrZXkgZGlkbid0IGV4aXN0IHByZXZpb3VzbHkuCiAgICAgfQpAQCAt MTg2LDcgKzE5MCw3IEBAIFJlZjxTdG9yYWdlTWFwOjpJbXBsPiBTdG9yYWdlTWFwOjpJbXBsOjpj b3B5KCkgY29uc3QKIHsKICAgICBhdXRvIGNvcHkgPSBJbXBsOjpjcmVhdGUoKTsKICAgICBjb3B5 LT5tYXAgPSBtYXA7Ci0gICAgY29weS0+Y3VycmVudFNpemUgPSBjdXJyZW50U2l6ZTsKKyAgICBj b3B5LT5jdXJyZW50TGVuZ3RoID0gY3VycmVudExlbmd0aDsKICAgICByZXR1cm4gY29weTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmggYi9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuaAppbmRleCA1YWQ0ZmQyNWIyNzBmM2M5NzM4 ZTcwNDNlODAwOGE1NzJjNTBlNWNmLi42MzY1ZDA2NGFiYjJjODc5OTI0ZTA0MWE5ZDgwODU5NzUx MDMzOTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuaApAQCAtNTYsNyArNTYsNyBA QCBwdWJsaWM6CiAKICAgICBib29sIGlzU2hhcmVkKCkgY29uc3QgeyByZXR1cm4gIW1faW1wbC0+ aGFzT25lUmVmKCk7IH0KIAotICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbm9RdW90YSA9 IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKTsKKyAgICBzdGF0aWMgY29uc3Rl eHByIHVuc2lnbmVkIG5vUXVvdGEgPSBVSU5UX01BWDsKIAogcHJpdmF0ZToKICAgICB2b2lkIGlu dmFsaWRhdGVJdGVyYXRvcigpOwpAQCAtNzMsNyArNzMsNyBAQCBwcml2YXRlOgogICAgICAgICBI YXNoTWFwPFN0cmluZywgU3RyaW5nPiBtYXA7CiAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+OjppdGVyYXRvciBpdGVyYXRvciB7IG1hcC5lbmQoKSB9OwogICAgICAgICB1bnNpZ25lZCBp dGVyYXRvckluZGV4IHsgc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpIH07Ci0g ICAgICAgIHVuc2lnbmVkIGN1cnJlbnRTaXplIHsgMCB9OworICAgICAgICB1bnNpZ25lZCBjdXJy ZW50TGVuZ3RoIHsgMCB9OyAvLyBNZWFzdXJlZCBpbiBVQ2hhcnMuCiAgICAgfTsKIAogICAgIFJl ZjxJbXBsPiBtX2ltcGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcAppbmRleCA3NGM2 NzQ1MzJmZjg1NzcyY2RhYmFiMjUyZjRkNjhhZGFhNTRiMzc3Li45ZmJmYTI2YmVlN2I5MDY3MzJj NjZhZWZkZWFjNzIyODRjNmU0MjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAK QEAgLTQ3LDYgKzQ3LDE0IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBzdGF0aWMgY29u c3QgY2hhciBnZXRJdGVtc1F1ZXJ5U3RyaW5nW10gPSAiU0VMRUNUIGtleSwgdmFsdWUgRlJPTSBJ dGVtVGFibGUiOwogCitzdGF0aWMgQ2hlY2tlZFVpbnQ2NCBlc3RpbWF0ZUVudHJ5U2l6ZShjb25z dCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3sKKyAgICBDaGVja2VkVWludDY0 IGVudHJ5U2l6ZTsKKyAgICBlbnRyeVNpemUgKz0ga2V5Lmxlbmd0aCgpICogc2l6ZW9mKFVDaGFy KTsKKyAgICBlbnRyeVNpemUgKz0gdmFsdWUubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpOworICAg IHJldHVybiBlbnRyeVNpemU7Cit9CisKIFJlZjxMb2NhbFN0b3JhZ2VEYXRhYmFzZT4gTG9jYWxT dG9yYWdlRGF0YWJhc2U6OmNyZWF0ZShSZWY8V29ya1F1ZXVlPiYmIHF1ZXVlLCBSZWY8TG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyPiYmIHRyYWNrZXIsIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0 YSYgc2VjdXJpdHlPcmlnaW4sIHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKIHsKICAgICByZXR1cm4g YWRvcHRSZWYoKm5ldyBMb2NhbFN0b3JhZ2VEYXRhYmFzZShXVEZNb3ZlKHF1ZXVlKSwgV1RGTW92 ZSh0cmFja2VyKSwgc2VjdXJpdHlPcmlnaW4sIHF1b3RhSW5CeXRlcykpOwpAQCAtMjA5LDExICsy MTcsMTEgQEAgdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6cmVtb3ZlSXRlbShjb25zdCBTdHJp bmcmIGtleSwgU3RyaW5nJiBvbGRWYWx1ZSkKICAgICB9CiAKICAgICBpZiAobV9kYXRhYmFzZVNp emUpIHsKLSAgICAgICAgYXV0byBzaXplRGVjcmVhc2UgPSBrZXkuc2l6ZUluQnl0ZXMoKSArIG9s ZFZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgIGlmIChzaXplRGVjcmVhc2UgPj0gKm1fZGF0 YWJhc2VTaXplKQorICAgICAgICBDaGVja2VkVWludDY0IGVudHJ5U2l6ZSA9IGVzdGltYXRlRW50 cnlTaXplKGtleSwgb2xkVmFsdWUpOworICAgICAgICBpZiAoZW50cnlTaXplLmhhc092ZXJmbG93 ZWQoKSB8fCBlbnRyeVNpemUudW5zYWZlR2V0KCkgPj0gKm1fZGF0YWJhc2VTaXplKQogICAgICAg ICAgICAgKm1fZGF0YWJhc2VTaXplID0gMDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgKm1f ZGF0YWJhc2VTaXplIC09IHNpemVEZWNyZWFzZTsKKyAgICAgICAgICAgICptX2RhdGFiYXNlU2l6 ZSAtPSBlbnRyeVNpemUudW5zYWZlR2V0KCk7CiAgICAgfQogfQogCkBAIC0yNDYsMTYgKzI1NCwx NSBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlOjpzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5 LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBTdHJpbgogICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4o KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgb2xkVmFsdWUgPSBpdGVtKGtleSk7Ci0KICAgICBp ZiAobV9xdW90YUluQnl0ZXMgIT0gV2ViQ29yZTo6U3RvcmFnZU1hcDo6bm9RdW90YSkgewogICAg ICAgICBpZiAoIW1fZGF0YWJhc2VTaXplKQogICAgICAgICAgICAgbV9kYXRhYmFzZVNpemUgPSBT UUxpdGVGaWxlU3lzdGVtOjpnZXREYXRhYmFzZUZpbGVTaXplKG1fZGF0YWJhc2VQYXRoKTsKLSAg ICAgICAgQ2hlY2tlZFVpbnQzMiBuZXdEYXRhYmFzZVNpemUgPSAqbV9kYXRhYmFzZVNpemU7Ci0g ICAgICAgIG5ld0RhdGFiYXNlU2l6ZSAtPSBvbGRWYWx1ZS5zaXplSW5CeXRlcygpOwotICAgICAg ICBuZXdEYXRhYmFzZVNpemUgKz0gdmFsdWUuc2l6ZUluQnl0ZXMoKTsKLSAgICAgICAgaWYgKG9s ZFZhbHVlLmlzTnVsbCgpKQotICAgICAgICAgICAgbmV3RGF0YWJhc2VTaXplICs9IGtleS5zaXpl SW5CeXRlcygpOworICAgICAgICBpZiAoKm1fZGF0YWJhc2VTaXplID49IG1fcXVvdGFJbkJ5dGVz KSB7CisgICAgICAgICAgICBxdW90YUV4Y2VwdGlvbiA9IHRydWU7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICAgICAgQ2hlY2tlZFVpbnQ2NCBuZXdEYXRhYmFzZVNpemUgPSAq bV9kYXRhYmFzZVNpemU7CisgICAgICAgIG5ld0RhdGFiYXNlU2l6ZSArPSBlc3RpbWF0ZUVudHJ5 U2l6ZShrZXksIHZhbHVlKTsKICAgICAgICAgaWYgKG5ld0RhdGFiYXNlU2l6ZS5oYXNPdmVyZmxv d2VkKCkgfHwgbmV3RGF0YWJhc2VTaXplLnVuc2FmZUdldCgpID4gbV9xdW90YUluQnl0ZXMpIHsK ICAgICAgICAgICAgIHF1b3RhRXhjZXB0aW9uID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybjsK QEAgLTI2Myw2ICsyNzAsOCBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlOjpzZXRJdGVtKGNv bnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBTdHJpbgogICAgICAgICBtX2Rh dGFiYXNlU2l6ZSA9IG5ld0RhdGFiYXNlU2l6ZS51bnNhZmVHZXQoKTsKICAgICB9CiAKKyAgICBv bGRWYWx1ZSA9IGl0ZW0oa2V5KTsKKwogICAgIGF1dG8gaW5zZXJ0U3RhdGVtZW50ID0gc2NvcGVk U3RhdGVtZW50KG1faW5zZXJ0U3RhdGVtZW50LCAiSU5TRVJUIElOVE8gSXRlbVRhYmxlIFZBTFVF UyAoPywgPykiX3MpOwogICAgIGlmICghaW5zZXJ0U3RhdGVtZW50KSB7CiAgICAgICAgIExPR19F UlJPUigiRmFpbGVkIHRvIHByZXBhcmUgaW5zZXJ0IHN0YXRlbWVudCAtIGNhbm5vdCB3cml0ZSB0 byBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuaCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oCmlu ZGV4IDA5NWU2NzY0MmE3N2Q3NzU4YTRkMDgzYzdlNDc2MDNkMWI3ZDE4ODUuLjE0N2E2ZWNiMGIz OTg4MzFhZGNlN2I5NzdiZmNlMjlkMzY0M2Y1NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFz ZS5oCkBAIC03NSwxMCArNzUsMTAgQEAgcHJpdmF0ZToKIAogICAgIFN0cmluZyBtX2RhdGFiYXNl UGF0aDsKICAgICBtdXRhYmxlIFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlIG1fZGF0YWJhc2U7Ci0g ICAgY29uc3QgdW5zaWduZWQgbV9xdW90YUluQnl0ZXMgeyAwIH07CisgICAgdW5zaWduZWQgbV9x dW90YUluQnl0ZXMgeyAwIH07CiAgICAgYm9vbCBtX2ZhaWxlZFRvT3BlbkRhdGFiYXNlIHsgZmFs c2UgfTsKICAgICBib29sIG1faXNDbG9zZWQgeyBmYWxzZSB9OwotICAgIE9wdGlvbmFsPHVuc2ln bmVkPiBtX2RhdGFiYXNlU2l6ZTsKKyAgICBPcHRpb25hbDx1aW50NjRfdD4gbV9kYXRhYmFzZVNp emU7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6U3VkZGVuVGVybWluYXRpb25EaXNh Ymxlcj4gbV9kaXNhYmxlU3VkZGVuVGVybWluYXRpb25XaGlsZVdyaXRpbmdUb0xvY2FsU3RvcmFn ZTsKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+ IG1fY2xlYXJTdGF0ZW1lbnQ7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmMzOWMyNDhlN2I1MTdiMWI5NjIwYzVkNWMzNTYy Mjg2MTU4YTJhMy4uNTFiMzNmMjhiZjVlNmMwYzFkMTk3ZmY0OTYzNWNiMzE0NDc5NjFlNyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA0LTI5ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVl dWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NjY4OSwg cjI3NjczNiwgYW5kIHIyNzY3MzcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjUxODgKKworICAgICAgICBCcm9rZSBwbGF0Zm9ybS9pb3MvaW9zL3N0 b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbAorCisgICAgICAgIFJldmVydGVkIGNoYW5n ZXNldHM6CisKKyAgICAgICAgIkltcHJvdmUgbG9jYWwgc3RvcmFnZSBzaXplIGVzdGltYXRpb24g Zm9yIHF1b3RhIGxpbWl0YXRpb24iCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjUxMjMKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzI3NjY4OQorCisgICAgICAgICJSRUdSRVNTSU9OKHIyNzY2ODkpOiBbIGlPUyB3azIg XQorICAgICAgICBwbGF0Zm9ybS9pb3MvaW9zL3N0b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEu aHRtbCBpcyBhCisgICAgICAgIGNvbnN0YW50IHRleHQgZmFpbHVyZSIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE2MAorICAgICAgICBodHRwczov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjc2NzM2CisKKyAgICAgICAgIk1ha2Ugc3VyZSB3 ZSBpbnZhbGlkYXRlIHRoZSBpdGVyYXRvciBpbiBTdG9yYWdlTWFwOjpjbGVhcigpIgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTY0CisgICAgICAg IGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNzY3MzcKKwogMjAyMS0wNC0yOCAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBD b2FsZXNjZSBhZGphY2VudCBzZWxlY3Rpb24gZ2VvbWV0cmllcyB3aGVuIHJlbmRlcmluZyBpbmRp dmlkdWFsIHNlbGVjdGlvbiBxdWFkcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v aW9zL2lvcy9zdG9yYWdlL2RvbXN0b3JhZ2UvNW1iLXF1b3RhLmh0bWwgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3MvaW9zL3N0b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbAppbmRleCBj MmNlZDQ3ZDcxOWFjZTFjMDM4MGFjM2M3ZmM2NmJlZTU1NGQ0YTFlLi43OTEyNTc4NGJjNzNkMDM3 MDNiYjNjZWY2OTFkZmYyNjk3MmYxNGJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9pb3MvaW9zL3N0b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9pb3MvaW9zL3N0b3JhZ2UvZG9tc3RvcmFnZS81bWItcXVvdGEuaHRtbApA QCAtMjIsNyArMjIsNyBAQCBmdW5jdGlvbiB0ZXN0UXVvdGEoc3RvcmFnZVN0cmluZykKICAgICBz aG91bGRCZSgic3RvcmFnZS5sZW5ndGgiLCAiMCIpOwogCiAgICAgZGVidWcoIkNyZWF0aW5nICdk YXRhJyB3aGljaCBjb250YWlucyA2NEsgb2YgZGF0YSIpOwotICAgIGRhdGEgPSAiXHUwM0JCIjsK KyAgICBkYXRhID0gIlgiOwogICAgIGZvciAodmFyIGk9MDsgaTwxNjsgaSsrKQogICAgICAgICBk YXRhICs9IGRhdGE7CiAgICAgc2hvdWxkQmUoImRhdGEubGVuZ3RoIiwgIjY1NTM2Iik7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2RvbXN0b3JhZ2UvcXVvdGEuaHRtbCBiL0xheW91 dFRlc3RzL3N0b3JhZ2UvZG9tc3RvcmFnZS9xdW90YS5odG1sCmluZGV4IGM2YzVhYTRiYjIwYjJm OGUzZWE2NDEzODI3YTNmOWVlZjgwNTVkMDMuLjU5MWI1NGM4ODZjN2U0Y2JkMjA2MmM0OTNkNmE2 ZWY3NzA0YTZjM2UgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N0b3JhZ2UvZG9tc3RvcmFnZS9x dW90YS5odG1sCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvZG9tc3RvcmFnZS9xdW90YS5odG1s CkBAIC0yMiw3ICsyMiw3IEBAIGZ1bmN0aW9uIHRlc3RRdW90YShzdG9yYWdlU3RyaW5nKQogICAg IHNob3VsZEJlKCJzdG9yYWdlLmxlbmd0aCIsICIwIik7CiAKICAgICBkZWJ1ZygiQ3JlYXRpbmcg J2RhdGEnIHdoaWNoIGNvbnRhaW5zIDY0SyBvZiBkYXRhIik7Ci0gICAgZGF0YSA9ICJcdTAzQkIi OworICAgIGRhdGEgPSAiWCI7CiAgICAgZm9yICh2YXIgaT0wOyBpPDE2OyBpKyspCiAgICAgICAg IGRhdGEgKz0gZGF0YTsKICAgICBzaG91bGRCZSgiZGF0YS5sZW5ndGgiLCAiNjU1MzYiKTsK