55812 2011-03-04 18:34:52 -0800 Add source to IDBIndex, objectStore to IDBIndex, and remove storeName 2011-03-07 09:34:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow andreip dgrogan hans steveblock oldest_to_newest 362846 0 jorlow 2011-03-04 18:34:52 -0800 Add source to IDBIndex, objectStore to IDBIndex, and remove storeName 362847 1 84839 jorlow 2011-03-04 18:38:07 -0800 Created attachment 84839 Patch 362849 2 jorlow 2011-03-04 18:41:09 -0800 Please review asap....want to get this in for chrome 11. 363287 3 84839 steveblock 2011-03-07 03:33:48 -0800 Comment on attachment 84839 Patch r=me 363288 4 andreip 2011-03-07 03:35:17 -0800 The Changelog is wrong, you're adding 'source' to IDBCursor, not IDBIndex. Other than that, LGTM. 84839 2011-03-04 18:38:07 -0800 2011-03-07 03:33:48 -0800 Patch bug-55812-20110304183806.patch text/plain 19560 jorlow U3VidmVyc2lvbiBSZXZpc2lvbjogODAzOTcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMjBhMDRhODk1ZmExYjAzMzE5NWIx ODg1MWY4NDIzNjUzY2VmNDU3Li45YWI4YmZlYTlmMjk3NzJkZDUzMWYyZTdmMzVlMTFjZmYwMzY2 MGI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMDQgIEplcmVteSBPcmxvdyAgPGpv cmxvd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHNvdXJjZSB0byBJREJJbmRleCwgb2JqZWN0U3RvcmUgdG8gSURCSW5k ZXgsIGFuZCByZW1vdmUgc3RvcmVOYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NTgxMgorCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLXVwZGF0ZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLXVwZGF0ZS5odG1sOgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2lj cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvaW5kZXgtYmFzaWNz Lmh0bWw6CisKIDIwMTEtMDMtMDQgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIEZhaWwgbmV3IHRlc3QgZm9yIEpTQyBmZWF0dXJlIGlu dHJvZHVjZWQgYnkgcjgwMzc4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4 ZWRkYi9jdXJzb3ItdXBkYXRlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k ZXhlZGRiL2N1cnNvci11cGRhdGUtZXhwZWN0ZWQudHh0CmluZGV4IGYyNzNiNTIzMWNiZTZlYWI5 YWFjMzY1MDI5Zjc1ZjczMDVhNTFiZWMuLjk1NWJjZjkxOGVkZWQ0OGJkMTFiZmFhZTRhNGRhYjk2 YWI1M2Q3MmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNv ci11cGRhdGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRi L2N1cnNvci11cGRhdGUtZXhwZWN0ZWQudHh0CkBAIC0yOCwyMCArMjgsMjYgQEAgb2JqZWN0U3Rv cmUuYWRkKHtudW1iZXI6IDMsIGlkOiAzfSkub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxi YWNrCiBvYmplY3RTdG9yZS5hZGQoe251bWJlcjogNCwgaWQ6IDR9KS5vbmVycm9yID0gdW5leHBl Y3RlZEVycm9yQ2FsbGJhY2sKIG9wZW5CYXNpY0N1cnNvcigpCiB0cmFucyA9IGRiLnRyYW5zYWN0 aW9uKFtdLCB3ZWJraXRJREJUcmFuc2FjdGlvbi5SRUFEX1dSSVRFKQotdHJhbnMub2JqZWN0U3Rv cmUoJ2Jhc2ljU3RvcmUnKS5vcGVuQ3Vyc29yKGtleVJhbmdlKQordHJhbnMub2JqZWN0U3RvcmUo J2Jhc2ljU3RvcmUnKQorb2JqZWN0U3RvcmUub3BlbkN1cnNvcihrZXlSYW5nZSkKIGJhc2ljVXBk YXRlQ3Vyc29yKCkKK1BBU1MgZXZlbnQudGFyZ2V0LnNvdXJjZSBpcyBvYmplY3RTdG9yZQogZXZl bnQudGFyZ2V0LnJlc3VsdC51cGRhdGUoJ215VXBkYXRlZFZhbHVlJyArIGNvdW50ZXIrKykKIGV2 ZW50LnRhcmdldC5zb3VyY2UuY29udGludWUoKQogYmFzaWNVcGRhdGVDdXJzb3IoKQorUEFTUyBl dmVudC50YXJnZXQuc291cmNlIGlzIG9iamVjdFN0b3JlCiBldmVudC50YXJnZXQucmVzdWx0LnVw ZGF0ZSgnbXlVcGRhdGVkVmFsdWUnICsgY291bnRlcisrKQogZXZlbnQudGFyZ2V0LnNvdXJjZS5j b250aW51ZSgpCiBiYXNpY1VwZGF0ZUN1cnNvcigpCitQQVNTIGV2ZW50LnRhcmdldC5zb3VyY2Ug aXMgb2JqZWN0U3RvcmUKIGV2ZW50LnRhcmdldC5yZXN1bHQudXBkYXRlKCdteVVwZGF0ZWRWYWx1 ZScgKyBjb3VudGVyKyspCiBldmVudC50YXJnZXQuc291cmNlLmNvbnRpbnVlKCkKIGJhc2ljVXBk YXRlQ3Vyc29yKCkKK1BBU1MgZXZlbnQudGFyZ2V0LnNvdXJjZSBpcyBvYmplY3RTdG9yZQogZXZl bnQudGFyZ2V0LnJlc3VsdC51cGRhdGUoJ215VXBkYXRlZFZhbHVlJyArIGNvdW50ZXIrKykKIGV2 ZW50LnRhcmdldC5zb3VyY2UuY29udGludWUoKQogYmFzaWNVcGRhdGVDdXJzb3IoKQorUEFTUyBl dmVudC50YXJnZXQuc291cmNlIGlzIG9iamVjdFN0b3JlCiBQQVNTIGNvdW50ZXIgaXMgNQogdHJh bnMub2JqZWN0U3RvcmUoJ2Jhc2ljU3RvcmUnKS5vcGVuQ3Vyc29yKGtleVJhbmdlKQogYmFzaWND aGVja0N1cnNvcigpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9j dXJzb3ItdXBkYXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9jdXJzb3It dXBkYXRlLmh0bWwKaW5kZXggOGQ1NTQxNjIzYTY5MDFjZWYyMDI1MDYwNzM0MGI3N2Y0MWI2MDM4 MS4uNzgzYTg4YzAxN2VjNDU5NTQzNjM5NWM1ODA3ODQ0NGFhODRkNDczMSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLXVwZGF0ZS5odG1sCisrKyBiL0xh eW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci11cGRhdGUuaHRtbApAQCAtNzAsNyAr NzAsOCBAQCBmdW5jdGlvbiBvcGVuQmFzaWNDdXJzb3IoKQogICAgIHRyYW5zLm9uY29tcGxldGUg PSB0cmFuc2FjdGlvbkNvbXBsZXRlOwogCiAgICAga2V5UmFuZ2UgPSB3ZWJraXRJREJLZXlSYW5n ZS5sb3dlckJvdW5kKCJteUtleTEiKTsKLSAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygidHJhbnMu b2JqZWN0U3RvcmUoJ2Jhc2ljU3RvcmUnKS5vcGVuQ3Vyc29yKGtleVJhbmdlKSIpOworICAgIHdp bmRvdy5vYmplY3RTdG9yZSA9IGV2YWxBbmRMb2coInRyYW5zLm9iamVjdFN0b3JlKCdiYXNpY1N0 b3JlJykiKTsKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygib2JqZWN0U3RvcmUub3BlbkN1cnNv cihrZXlSYW5nZSkiKTsKICAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IGJhc2ljVXBkYXRlQ3Vyc29y OwogICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOwogICAgIGNv dW50ZXIgPSAxOwpAQCAtNzksNiArODAsNyBAQCBmdW5jdGlvbiBvcGVuQmFzaWNDdXJzb3IoKQog ZnVuY3Rpb24gYmFzaWNVcGRhdGVDdXJzb3IoKQogewogICAgIGRlYnVnKCJiYXNpY1VwZGF0ZUN1 cnNvcigpIik7CisgICAgc2hvdWxkQmUoImV2ZW50LnRhcmdldC5zb3VyY2UiLCAib2JqZWN0U3Rv cmUiKTsKICAgICBpZiAoZXZlbnQudGFyZ2V0LnJlc3VsdCA9PSBudWxsKSB7CiAgICAgICAgIHNo b3VsZEJlKCJjb3VudGVyIiwgIjUiKTsKICAgICAgICAgY291bnRlciA9IDE7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9pbmRleC1iYXNpY3MtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvaW5kZXgtYmFzaWNzLWV4cGVjdGVkLnR4 dAppbmRleCAwMWYwZGUzZTYwMjI4NzZjOGMxNDFhOTRjMzE3YjU5YTIwNzVlZTIzLi41Y2YxYzli ZTRjNmEzZDgyYjE2MGFkN2VjYTNmMWIyZmYxYTBmODA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9zdG9yYWdlL2luZGV4ZWRkYi9pbmRleC1iYXNpY3MtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy1leHBlY3RlZC50eHQKQEAgLTE2 LDggKzE2LDggQEAgc3RvcmUuY3JlYXRlSW5kZXgoJ2luZGV4TmFtZTInLCAneScsIGZhbHNlKQog c3RvcmUuY3JlYXRlSW5kZXgoJ3pJbmRleCcsICd6JywgdHJ1ZSkKIFBBU1MgJ25hbWUnIGluIGlu ZGV4T2JqZWN0IGlzIHRydWUKIFBBU1MgaW5kZXhPYmplY3QubmFtZSBpcyAiaW5kZXhOYW1lIgot UEFTUyAnc3RvcmVOYW1lJyBpbiBpbmRleE9iamVjdCBpcyB0cnVlCi1QQVNTIGluZGV4T2JqZWN0 LnN0b3JlTmFtZSBpcyAic3RvcmVOYW1lIgorUEFTUyAnb2JqZWN0U3RvcmUnIGluIGluZGV4T2Jq ZWN0IGlzIHRydWUKK1BBU1MgaW5kZXhPYmplY3Qub2JqZWN0U3RvcmUubmFtZSBpcyAic3RvcmVO YW1lIgogUEFTUyAna2V5UGF0aCcgaW4gaW5kZXhPYmplY3QgaXMgdHJ1ZQogUEFTUyBpbmRleE9i amVjdC5rZXlQYXRoIGlzICJ4IgogUEFTUyAndW5pcXVlJyBpbiBpbmRleE9iamVjdCBpcyB0cnVl CkBAIC00Nyw2ICs0Nyw3IEBAIGV2ZW50LnByZXZlbnREZWZhdWx0KCkKIGluZGV4T2JqZWN0NC5n ZXRLZXkoJ3ZhbHVlMicpCiBQQVNTIGV2ZW50LnRhcmdldC5yZXN1bHQgaXMgImtleTIiCiBpbmRl eE9iamVjdC5vcGVuS2V5Q3Vyc29yKCkKK1BBU1MgZXZlbnQudGFyZ2V0LnNvdXJjZSBpcyBpbmRl eE9iamVjdAogUEFTUyBldmVudC50YXJnZXQucmVzdWx0ID09PSBudWxsIGlzIGZhbHNlCiBQQVNT IGV2ZW50LnRhcmdldC5yZXN1bHQua2V5IGlzICJ2YWx1ZSIKIFBBU1MgZXZlbnQudGFyZ2V0LnJl c3VsdC5wcmltYXJ5S2V5IGlzICJrZXkiCkBAIC01Nyw2ICs1OCw3IEBAIFBBU1MgZXZlbnQudGFy Z2V0LnJlc3VsdC5wcmltYXJ5S2V5IGlzICJrZXkyIgogZXZlbnQudGFyZ2V0LnJlc3VsdC5jb250 aW51ZSgpCiBQQVNTIGV2ZW50LnRhcmdldC5yZXN1bHQgPT09IG51bGwgaXMgdHJ1ZQogaW5kZXhP YmplY3Qub3BlbkN1cnNvcigpCitQQVNTIGV2ZW50LnRhcmdldC5zb3VyY2UgaXMgaW5kZXhPYmpl Y3QKIFBBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdCA9PT0gbnVsbCBpcyBmYWxzZQogUEFTUyBldmVu dC50YXJnZXQucmVzdWx0LmtleSBpcyAidmFsdWUiCiBQQVNTIGV2ZW50LnRhcmdldC5yZXN1bHQu dmFsdWUueCBpcyAidmFsdWUiCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4 ZWRkYi9pbmRleC1iYXNpY3MuaHRtbCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2lu ZGV4LWJhc2ljcy5odG1sCmluZGV4IDM5ZDFkZTE1ZGUwZmUyMTMzNDAzYjdhMDJmNTYzNmUxMWIz Nzc3ZmEuLjEyOGYzNjQzOTIwMWJmZDk1YTZlYjcxZGFmMjY0ZWY2NmNiNDBmNzIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sCisrKyBi L0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sCkBAIC01MCw4 ICs1MCw4IEBAIGZ1bmN0aW9uIGFkZERhdGEoKQogewogICAgIHNob3VsZEJlVHJ1ZSgiJ25hbWUn IGluIGluZGV4T2JqZWN0Iik7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJpbmRleE9iamVj dC5uYW1lIiwgImluZGV4TmFtZSIpOwotICAgIHNob3VsZEJlVHJ1ZSgiJ3N0b3JlTmFtZScgaW4g aW5kZXhPYmplY3QiKTsKLSAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImluZGV4T2JqZWN0LnN0 b3JlTmFtZSIsICJzdG9yZU5hbWUiKTsKKyAgICBzaG91bGRCZVRydWUoIidvYmplY3RTdG9yZScg aW4gaW5kZXhPYmplY3QiKTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImluZGV4T2JqZWN0 Lm9iamVjdFN0b3JlLm5hbWUiLCAic3RvcmVOYW1lIik7CiAgICAgc2hvdWxkQmVUcnVlKCIna2V5 UGF0aCcgaW4gaW5kZXhPYmplY3QiKTsKICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImluZGV4 T2JqZWN0LmtleVBhdGgiLCAieCIpOwogICAgIHNob3VsZEJlVHJ1ZSgiJ3VuaXF1ZScgaW4gaW5k ZXhPYmplY3QiKTsKQEAgLTE1MCw2ICsxNTAsNyBAQCBmdW5jdGlvbiBvcGVuS2V5Q3Vyc29yKCkK IAogZnVuY3Rpb24gY3Vyc29yMUNvbnRpbnVlKCkKIHsKKyAgICBzaG91bGRCZSgiZXZlbnQudGFy Z2V0LnNvdXJjZSIsICJpbmRleE9iamVjdCIpOwogICAgIHNob3VsZEJlRmFsc2UoImV2ZW50LnRh cmdldC5yZXN1bHQgPT09IG51bGwiKTsKICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImV2ZW50 LnRhcmdldC5yZXN1bHQua2V5IiwgInZhbHVlIik7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5n KCJldmVudC50YXJnZXQucmVzdWx0LnByaW1hcnlLZXkiLCAia2V5Iik7CkBAIC0xODEsNiArMTgy LDcgQEAgZnVuY3Rpb24gb3Blbk9iamVjdEN1cnNvcigpCiAKIGZ1bmN0aW9uIGN1cnNvcjJDb250 aW51ZSgpCiB7CisgICAgc2hvdWxkQmUoImV2ZW50LnRhcmdldC5zb3VyY2UiLCAiaW5kZXhPYmpl Y3QiKTsKICAgICBzaG91bGRCZUZhbHNlKCJldmVudC50YXJnZXQucmVzdWx0ID09PSBudWxsIik7 CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJldmVudC50YXJnZXQucmVzdWx0LmtleSIsICJ2 YWx1ZSIpOwogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZXZlbnQudGFyZ2V0LnJlc3VsdC52 YWx1ZS54IiwgInZhbHVlIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ5MWRjMjgzYjBhYzc4OTkzYTU4MmY5 N2E3N2VmYTM0MzM2MjFjMC4uOGNjMzY4OTkwMjFhZTA1ZjkyOGZjMjE5ZDA1MDA0ZWQxODJmMzQ4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDExLTAzLTA0ICBKZXJlbXkgT3Jsb3cg IDxqb3Jsb3dAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBzb3VyY2UgdG8gSURCSW5kZXgsIG9iamVjdFN0b3JlIHRvIElE QkluZGV4LCBhbmQgcmVtb3ZlIHN0b3JlTmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4MTIKKworICAgICAgICBUaGlzIGJyaW5ncyB1cyBpbiBs aW5lIHdpdGggd2hhdCdzIGluIHRoZSBzcGVjOgorICAgICAgICBodHRwOi8vZHZjcy53My5vcmcv aGcvSW5kZXhlZERCL3Jhdy1maWxlL3RpcC9PdmVydmlldy5odG1sCisKKyAgICAgICAgKiBzdG9y YWdlL0lEQkN1cnNvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJDdXJzb3I6OmNyZWF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpJREJDdXJzb3I6OklEQkN1cnNvcik6CisgICAgICAgIChXZWJD b3JlOjpJREJDdXJzb3I6OnNvdXJjZSk6CisgICAgICAgICogc3RvcmFnZS9JREJDdXJzb3IuaDoK KyAgICAgICAgKiBzdG9yYWdlL0lEQkN1cnNvci5pZGw6CisgICAgICAgICogc3RvcmFnZS9JREJD dXJzb3JXaXRoVmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yV2l0aFZhbHVl OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yV2l0aFZhbHVlOjpJREJDdXJz b3JXaXRoVmFsdWUpOgorICAgICAgICAqIHN0b3JhZ2UvSURCQ3Vyc29yV2l0aFZhbHVlLmg6Cisg ICAgICAgICogc3RvcmFnZS9JREJJbmRleC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJJbmRl eDo6SURCSW5kZXgpOgorICAgICAgICAqIHN0b3JhZ2UvSURCSW5kZXguaDoKKyAgICAgICAgKFdl YkNvcmU6OklEQkluZGV4OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SURCSW5kZXg6Om9i amVjdFN0b3JlKToKKyAgICAgICAgKiBzdG9yYWdlL0lEQkluZGV4LmlkbDoKKyAgICAgICAgKiBz dG9yYWdlL0lEQk9iamVjdFN0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0 b3JlOjpjcmVhdGVJbmRleCk6CisgICAgICAgIChXZWJDb3JlOjpJREJPYmplY3RTdG9yZTo6aW5k ZXgpOgorICAgICAgICAqIHN0b3JhZ2UvSURCUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJSZXF1ZXN0OjpvblN1Y2Nlc3MpOgorCiAyMDExLTAzLTA0ICBEaW1pdHJpIEdsYXprb3Yg IDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmNwcAppbmRleCA1OWE5NzA5ZGFlNzJiZGM1 NTYyMjZkNjRlMTUyMTBlMTE1YWEwYmVhLi45YjFlYmY2ZDk4ZmJmN2E0YTE1YWJkZDQ2NDcyNzIw NTE5YzkyY2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJzb3IuY3BwCkBAIC0zOSwxOCAr MzksMjAgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPElEQkN1cnNvcj4g SURCQ3Vyc29yOjpjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBi YWNrZW5kLCBJREJSZXF1ZXN0KiByZXF1ZXN0LCBJREJUcmFuc2FjdGlvbiogdHJhbnNhY3Rpb24p CitQYXNzUmVmUHRyPElEQkN1cnNvcj4gSURCQ3Vyc29yOjpjcmVhdGUoUGFzc1JlZlB0cjxJREJD dXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBiYWNrZW5kLCBJREJSZXF1ZXN0KiByZXF1ZXN0LCBJREJB bnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qIHRyYW5zYWN0aW9uKQogewotICAgIHJldHVybiBh ZG9wdFJlZihuZXcgSURCQ3Vyc29yKGJhY2tlbmQsIHJlcXVlc3QsIHRyYW5zYWN0aW9uKSk7Cisg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJREJDdXJzb3IoYmFja2VuZCwgcmVxdWVzdCwgc291cmNl LCB0cmFuc2FjdGlvbikpOwogfQogCi1JREJDdXJzb3I6OklEQkN1cnNvcihQYXNzUmVmUHRyPElE QkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGJhY2tlbmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElE QlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbikKK0lEQkN1cnNvcjo6SURCQ3Vyc29yKFBhc3NSZWZQ dHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4gYmFja2VuZCwgSURCUmVxdWVzdCogcmVxdWVz dCwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbikKICAgICA6IG1f YmFja2VuZChiYWNrZW5kKQogICAgICwgbV9yZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX3NvdXJj ZShzb3VyY2UpCiAgICAgLCBtX3RyYW5zYWN0aW9uKHRyYW5zYWN0aW9uKQogewogICAgIEFTU0VS VChtX2JhY2tlbmQpOwogICAgIEFTU0VSVChtX3JlcXVlc3QpOworICAgIEFTU0VSVChtX3NvdXJj ZS0+dHlwZSgpID09IElEQkFueTo6SURCT2JqZWN0U3RvcmVUeXBlIHx8IG1fc291cmNlLT50eXBl KCkgPT0gSURCQW55OjpJREJJbmRleFR5cGUpOwogICAgIEFTU0VSVChtX3RyYW5zYWN0aW9uKTsK IH0KIApAQCAtNzgsNiArODAsMTEgQEAgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+ IElEQkN1cnNvcjo6dmFsdWUoKSBjb25zdAogICAgIHJldHVybiBtX2JhY2tlbmQtPnZhbHVlKCk7 CiB9CiAKK0lEQkFueSogSURCQ3Vyc29yOjpzb3VyY2UoKSBjb25zdAoreworICAgIHJldHVybiBt X3NvdXJjZS5nZXQoKTsKK30KKwogUGFzc1JlZlB0cjxJREJSZXF1ZXN0PiBJREJDdXJzb3I6OnVw ZGF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRyPFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZT4gdmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIFJlZlB0cjxJ REJSZXF1ZXN0PiByZXF1ZXN0ID0gSURCUmVxdWVzdDo6Y3JlYXRlKGNvbnRleHQsIElEQkFueTo6 Y3JlYXRlKHRoaXMpLCBtX3RyYW5zYWN0aW9uLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1 cnNvci5oCmluZGV4IDJmODAzZjQwMDEwN2Y0MzRiZDcwMzVhMDgwODUxNGZkZDBjNDNhMmEuLjlh ZGU5YzhiZDRkYjE3ZjJkZGEwMDdhZGE1YzE0MjZlY2Y2Y2ZmZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9JREJDdXJzb3IuaApAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIFBSRVYgPSAy LAogICAgICAgICBQUkVWX05PX0RVUExJQ0FURSA9IDMsCiAgICAgfTsKLSAgICBzdGF0aWMgUGFz c1JlZlB0cjxJREJDdXJzb3I+IGNyZWF0ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRl cmZhY2U+LCBJREJSZXF1ZXN0KiwgSURCVHJhbnNhY3Rpb24qKTsKKyAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxJREJDdXJzb3I+IGNyZWF0ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZh Y2U+LCBJREJSZXF1ZXN0KiwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0aW9uKik7CiAgICAg dmlydHVhbCB+SURCQ3Vyc29yKCk7CiAKICAgICAvLyBGSVhNRTogVHJ5IHRvIG1vZGlmeSB0aGUg Y29kZSBnZW5lcmF0b3Igc28gdGhpcyBpcyB1bm5lZWRlZC4KQEAgLTYzLDE2ICs2MywxOSBAQCBw dWJsaWM6CiAgICAgUGFzc1JlZlB0cjxJREJLZXk+IGtleSgpIGNvbnN0OwogICAgIFBhc3NSZWZQ dHI8SURCS2V5PiBwcmltYXJ5S2V5KCkgY29uc3Q7CiAgICAgUGFzc1JlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IHZhbHVlKCkgY29uc3Q7CisgICAgSURCQW55KiBzb3VyY2UoKSBjb25zdDsK KwogICAgIFBhc3NSZWZQdHI8SURCUmVxdWVzdD4gdXBkYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqLCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4sIEV4Y2VwdGlvbkNvZGUmKTsK ICAgICB2b2lkIGNvbnRpbnVlRnVuY3Rpb24oUGFzc1JlZlB0cjxJREJLZXk+LCBFeGNlcHRpb25D b2RlJik7CiAgICAgUGFzc1JlZlB0cjxJREJSZXF1ZXN0PiBkZWxldGVGdW5jdGlvbihTY3JpcHRF eGVjdXRpb25Db250ZXh0KiwgRXhjZXB0aW9uQ29kZSYpOwogCiBwcm90ZWN0ZWQ6Ci0gICAgZXhw bGljaXQgSURCQ3Vyc29yKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4sIElE QlJlcXVlc3QqLCBJREJUcmFuc2FjdGlvbiopOworICAgIElEQkN1cnNvcihQYXNzUmVmUHRyPElE QkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+LCBJREJSZXF1ZXN0KiwgSURCQW55KiBzb3VyY2UsIElE QlRyYW5zYWN0aW9uKik7CiAKIHByaXZhdGU6CiAgICAgUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJ bnRlcmZhY2U+IG1fYmFja2VuZDsKICAgICBSZWZQdHI8SURCUmVxdWVzdD4gbV9yZXF1ZXN0Owor ICAgIFJlZlB0cjxJREJBbnk+IG1fc291cmNlOwogICAgIFJlZlB0cjxJREJUcmFuc2FjdGlvbj4g bV90cmFuc2FjdGlvbjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2Uv SURCQ3Vyc29yLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmlkbAppbmRl eCBiNTgzOGVmYTdiZjRkYjZhY2FjYjA5MjEzY2MxM2Y2ZjA4MTQ4M2YwLi4xZjQ0Y2QyNGQxOGFi YTNjZDdkZDk1MjQ2NDc2M2IyYjIzNjM4ZWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL0lEQkN1cnNvci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJz b3IuaWRsCkBAIC0zNiw2ICszNiw3IEBAIG1vZHVsZSBzdG9yYWdlIHsKICAgICAgICAgcmVhZG9u bHkgYXR0cmlidXRlIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbjsKICAgICAgICAgcmVhZG9ubHkg YXR0cmlidXRlIElEQktleSBrZXk7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBJREJLZXkg cHJpbWFyeUtleTsKKyAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIElEQkFueSBzb3VyY2U7CiAK ICAgICAgICAgW0NhbGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHRdIElEQlJlcXVlc3QgdXBk YXRlKGluIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSB2YWx1ZSkKICAgICAgICAgICAgIHJhaXNlcyAo SURCRGF0YWJhc2VFeGNlcHRpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9JREJDdXJzb3JXaXRoVmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJz b3JXaXRoVmFsdWUuY3BwCmluZGV4IDQwNmMxYjZlNjY5MmQxMjA1MDAzNzYyZGNmNGMxYzlhMWQ2 NjViNzEuLmQzYzNiZDhjYTlhNjY0NzZkYmQyMjQ5NDhkMDcwNGM1NGQ3ZmY1ZjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yV2l0aFZhbHVlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvcldpdGhWYWx1ZS5jcHAKQEAgLTMzLDEzICsz MywxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NSZWZQdHI8SURCQ3Vyc29yV2l0 aFZhbHVlPiBJREJDdXJzb3JXaXRoVmFsdWU6OmNyZWF0ZShQYXNzUmVmUHRyPElEQkN1cnNvckJh Y2tlbmRJbnRlcmZhY2U+IGJhY2tlbmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElEQlRyYW5zYWN0 aW9uKiB0cmFuc2FjdGlvbikKK1Bhc3NSZWZQdHI8SURCQ3Vyc29yV2l0aFZhbHVlPiBJREJDdXJz b3JXaXRoVmFsdWU6OmNyZWF0ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+ IGJhY2tlbmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElEQkFueSogc291cmNlLCBJREJUcmFuc2Fj dGlvbiogdHJhbnNhY3Rpb24pCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJREJDdXJzb3JX aXRoVmFsdWUoYmFja2VuZCwgcmVxdWVzdCwgdHJhbnNhY3Rpb24pKTsKKyAgICByZXR1cm4gYWRv cHRSZWYobmV3IElEQkN1cnNvcldpdGhWYWx1ZShiYWNrZW5kLCByZXF1ZXN0LCBzb3VyY2UsIHRy YW5zYWN0aW9uKSk7CiB9CiAKLUlEQkN1cnNvcldpdGhWYWx1ZTo6SURCQ3Vyc29yV2l0aFZhbHVl KFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4gYmFja2VuZCwgSURCUmVxdWVz dCogcmVxdWVzdCwgSURCVHJhbnNhY3Rpb24qIHRyYW5zYWN0aW9uKQotICAgIDogSURCQ3Vyc29y KGJhY2tlbmQsIHJlcXVlc3QsIHRyYW5zYWN0aW9uKQorSURCQ3Vyc29yV2l0aFZhbHVlOjpJREJD dXJzb3JXaXRoVmFsdWUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBiYWNr ZW5kLCBJREJSZXF1ZXN0KiByZXF1ZXN0LCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24q IHRyYW5zYWN0aW9uKQorICAgIDogSURCQ3Vyc29yKGJhY2tlbmQsIHJlcXVlc3QsIHNvdXJjZSwg dHJhbnNhY3Rpb24pCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2Uv SURCQ3Vyc29yV2l0aFZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvcldp dGhWYWx1ZS5oCmluZGV4IDIxMjMwNmVlOTk3YjUyODMyMjRkMTYwMmQ2YmE5MzIzMGZmOGQ3ZTIu LmQwNjEwYmQ5OWUzOGQwMGNkZGE2NjIyMTQxZmMwMjY1ZjQwMjZiYTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yV2l0aFZhbHVlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvc3RvcmFnZS9JREJDdXJzb3JXaXRoVmFsdWUuaApAQCAtMzQsMTQgKzM0LDE0IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgSURCQ3Vyc29yV2l0aFZhbHVlIDogcHVibGljIElE QkN1cnNvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8SURCQ3Vyc29yV2l0aFZh bHVlPiBjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwgSURCUmVx dWVzdCosIElEQlRyYW5zYWN0aW9uKik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8SURCQ3Vyc29y V2l0aFZhbHVlPiBjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwg SURCUmVxdWVzdCosIElEQkFueSogc291cmNlLCBJREJUcmFuc2FjdGlvbiopOwogICAgIHZpcnR1 YWwgfklEQkN1cnNvcldpdGhWYWx1ZSgpOwogCiAgICAgLy8gVGhlIHZhbHVlIGF0dHJpYnV0ZSBk ZWZpbmVkIGluIHRoZSBJREwgaXMgc2ltcGx5IGltcGxlbWVudGVkIGluIElEQkN1cnNvciAoYnV0 IG5vdCBleHBvc2VkIHZpYQogICAgIC8vIGl0cyBJREwpLiBUaGlzIGlzIHRvIG1ha2UgdGhlIGlt cGxlbWVudGF0aW9uIG1vcmUgc2ltcGxlIHdoaWxlIG1hdGNoaW5nIHdoYXQgdGhlIHNwZWMgc2F5 cy4KIAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBJREJDdXJzb3JXaXRoVmFsdWUoUGFzc1JlZlB0 cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwgSURCUmVxdWVzdCosIElEQlRyYW5zYWN0aW9u Kik7CisgICAgSURCQ3Vyc29yV2l0aFZhbHVlKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZElu dGVyZmFjZT4sIElEQlJlcXVlc3QqLCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qKTsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvSURCSW5kZXguY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJJbmRleC5j cHAKaW5kZXggMjk3NmQ0ODAxZjZjZWFlZDUyOTc2NjhlYmRiNWU4YTVjNWFjMzEyNy4uNWYyZWNm MjY4NzRkNjlhMTYzNDA2NDMxMjBjYWUxM2JmN2VhYjczYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3RvcmFnZS9JREJJbmRleC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9J REJJbmRleC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJJREJJbmRleEJhY2tlbmRJ bnRlcmZhY2UuaCIKICNpbmNsdWRlICJJREJLZXkuaCIKICNpbmNsdWRlICJJREJLZXlSYW5nZS5o IgorI2luY2x1ZGUgIklEQk9iamVjdFN0b3JlLmgiCiAjaW5jbHVkZSAiSURCUmVxdWVzdC5oIgog I2luY2x1ZGUgIklEQlRyYW5zYWN0aW9uLmgiCiAKQEAgLTQwLDExICs0MSwxMyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBzaG9ydCBkZWZhdWx0RGlyZWN0 aW9uID0gSURCQ3Vyc29yOjpORVhUOwogCi1JREJJbmRleDo6SURCSW5kZXgoUGFzc1JlZlB0cjxJ REJJbmRleEJhY2tlbmRJbnRlcmZhY2U+IGJhY2tlbmQsIElEQlRyYW5zYWN0aW9uKiB0cmFuc2Fj dGlvbikKK0lEQkluZGV4OjpJREJJbmRleChQYXNzUmVmUHRyPElEQkluZGV4QmFja2VuZEludGVy ZmFjZT4gYmFja2VuZCwgSURCT2JqZWN0U3RvcmUqIG9iamVjdFN0b3JlLCBJREJUcmFuc2FjdGlv biogdHJhbnNhY3Rpb24pCiAgICAgOiBtX2JhY2tlbmQoYmFja2VuZCkKKyAgICAsIG1fb2JqZWN0 U3RvcmUob2JqZWN0U3RvcmUpCiAgICAgLCBtX3RyYW5zYWN0aW9uKHRyYW5zYWN0aW9uKQogewog ICAgIEFTU0VSVChtX2JhY2tlbmQpOworICAgIEFTU0VSVChtX29iamVjdFN0b3JlKTsKICAgICBB U1NFUlQobV90cmFuc2FjdGlvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvSURCSW5kZXguaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCSW5kZXguaAppbmRl eCAxMGI0NmYxZjA0NTQ2MmNjY2I5MWZkNGJjZmFiNGMxODE5NjQ1NjNiLi4yYWYxODA1M2QwMzZk ZWZlMjVhZTQwNjJhOTk1MGJlZDYyZTVmYTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL0lEQkluZGV4LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJJbmRleC5o CkBAIC0zNywxNyArMzcsMTkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBJREJP YmplY3RTdG9yZTsKKwogY2xhc3MgSURCSW5kZXggOiBwdWJsaWMgUmVmQ291bnRlZDxJREJJbmRl eD4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPElEQkluZGV4PiBjcmVhdGUoUGFz c1JlZlB0cjxJREJJbmRleEJhY2tlbmRJbnRlcmZhY2U+IGJhY2tlbmQsIElEQlRyYW5zYWN0aW9u KiB0cmFuc2FjdGlvbikKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJJbmRleD4gY3JlYXRlKFBh c3NSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW50ZXJmYWNlPiBiYWNrZW5kLCBJREJPYmplY3RTdG9y ZSogb2JqZWN0U3RvcmUsIElEQlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbikKICAgICB7Ci0gICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgSURCSW5kZXgoYmFja2VuZCwgdHJhbnNhY3Rpb24pKTsK KyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJREJJbmRleChiYWNrZW5kLCBvYmplY3RTdG9y ZSwgdHJhbnNhY3Rpb24pKTsKICAgICB9CiAgICAgfklEQkluZGV4KCk7CiAKICAgICAvLyBJbXBs ZW1lbnQgdGhlIElETAogICAgIFN0cmluZyBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZW5k LT5uYW1lKCk7IH0KLSAgICBTdHJpbmcgc3RvcmVOYW1lKCkgY29uc3QgeyByZXR1cm4gbV9iYWNr ZW5kLT5zdG9yZU5hbWUoKTsgfQorICAgIElEQk9iamVjdFN0b3JlKiBvYmplY3RTdG9yZSgpIGNv bnN0IHsgcmV0dXJuIG1fb2JqZWN0U3RvcmUuZ2V0KCk7IH0KICAgICBTdHJpbmcga2V5UGF0aCgp IGNvbnN0IHsgcmV0dXJuIG1fYmFja2VuZC0+a2V5UGF0aCgpOyB9CiAgICAgYm9vbCB1bmlxdWUo KSBjb25zdCB7IHJldHVybiBtX2JhY2tlbmQtPnVuaXF1ZSgpOyB9CiAKQEAgLTY0LDkgKzY2LDEw IEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPElEQlJlcXVlc3Q+IGdldEtleShTY3JpcHRFeGVj dXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxJREJLZXk+LCBFeGNlcHRpb25Db2RlJik7CiAKIHBy aXZhdGU6Ci0gICAgSURCSW5kZXgoUGFzc1JlZlB0cjxJREJJbmRleEJhY2tlbmRJbnRlcmZhY2U+ LCBJREJUcmFuc2FjdGlvbiopOworICAgIElEQkluZGV4KFBhc3NSZWZQdHI8SURCSW5kZXhCYWNr ZW5kSW50ZXJmYWNlPiwgSURCT2JqZWN0U3RvcmUqLCBJREJUcmFuc2FjdGlvbiopOwogCiAgICAg UmVmUHRyPElEQkluZGV4QmFja2VuZEludGVyZmFjZT4gbV9iYWNrZW5kOworICAgIFJlZlB0cjxJ REJPYmplY3RTdG9yZT4gbV9vYmplY3RTdG9yZTsKICAgICBSZWZQdHI8SURCVHJhbnNhY3Rpb24+ IG1fdHJhbnNhY3Rpb247CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdl L0lEQkluZGV4LmlkbCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCSW5kZXguaWRsCmluZGV4 IDEzMDg5Y2M2ODNjZTM3ZTNkNGE5NmM0ZmEyNDU3OWYyZDRhYTAxMmYuLjZkYjUwZTFiZTJjNDNh YzQ1ZGFiYWMwM2M3MTBjZGM3NWExM2FlZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvSURCSW5kZXguaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCSW5kZXgu aWRsCkBAIC0yOSw3ICsyOSw3IEBAIG1vZHVsZSBzdG9yYWdlIHsKICAgICAgICAgQ29uZGl0aW9u YWw9SU5ERVhFRF9EQVRBQkFTRQogICAgIF0gSURCSW5kZXggewogICAgICAgICByZWFkb25seSBh dHRyaWJ1dGUgRE9NU3RyaW5nIG5hbWU7Ci0gICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01T dHJpbmcgc3RvcmVOYW1lOworICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgSURCT2JqZWN0U3Rv cmUgb2JqZWN0U3RvcmU7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcga2V5 UGF0aDsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4gdW5pcXVlOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQk9iamVjdFN0b3JlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvSURCT2JqZWN0U3RvcmUuY3BwCmluZGV4IGYwZWMyMzRkMzJkNTA1 Y2IzMGE3MjgxNDA0MmU1NDE2Y2E4ZGJjYWUuLjFhM2U3NDE0YjI5ZWY1NzczYzZhZDg2YTY5NTg4 ZDliYTYwYWFmZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCT2JqZWN0 U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCT2JqZWN0U3RvcmUuY3Bw CkBAIC0xMzEsNyArMTMxLDcgQEAgUGFzc1JlZlB0cjxJREJJbmRleD4gSURCT2JqZWN0U3RvcmU6 OmNyZWF0ZUluZGV4KGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW4KICAgICBBU1NFUlQo IWluZGV4ICE9ICFlYyk7IC8vIElmIHdlIGRpZG4ndCBnZXQgYW4gaW5kZXgsIHdlIHNob3VsZCBo YXZlIGdvdHRlbiBhbiBleGNlcHRpb24gY29kZS4gQW5kIHZpY2UgdmVyc2EuCiAgICAgaWYgKCFp bmRleCkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIElEQkluZGV4OjpjcmVhdGUoaW5k ZXgucmVsZWFzZSgpLCBtX3RyYW5zYWN0aW9uLmdldCgpKTsKKyAgICByZXR1cm4gSURCSW5kZXg6 OmNyZWF0ZShpbmRleC5yZWxlYXNlKCksIHRoaXMsIG1fdHJhbnNhY3Rpb24uZ2V0KCkpOwogfQog CiBQYXNzUmVmUHRyPElEQkluZGV4PiBJREJPYmplY3RTdG9yZTo6aW5kZXgoY29uc3QgU3RyaW5n JiBuYW1lLCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTE0MCw3ICsxNDAsNyBAQCBQYXNzUmVmUHRy PElEQkluZGV4PiBJREJPYmplY3RTdG9yZTo6aW5kZXgoY29uc3QgU3RyaW5nJiBuYW1lLCBFeGNl cHRpb25Db2RlJiBlYwogICAgIEFTU0VSVCghaW5kZXggIT0gIWVjKTsgLy8gSWYgd2UgZGlkbid0 IGdldCBhbiBpbmRleCwgd2Ugc2hvdWxkIGhhdmUgZ290dGVuIGFuIGV4Y2VwdGlvbiBjb2RlLiBB bmQgdmljZSB2ZXJzYS4KICAgICBpZiAoIWluZGV4KQogICAgICAgICByZXR1cm4gMDsKLSAgICBy ZXR1cm4gSURCSW5kZXg6OmNyZWF0ZShpbmRleC5yZWxlYXNlKCksIG1fdHJhbnNhY3Rpb24uZ2V0 KCkpOworICAgIHJldHVybiBJREJJbmRleDo6Y3JlYXRlKGluZGV4LnJlbGVhc2UoKSwgdGhpcywg bV90cmFuc2FjdGlvbi5nZXQoKSk7CiB9CiAKIHZvaWQgSURCT2JqZWN0U3RvcmU6OmRlbGV0ZUlu ZGV4KGNvbnN0IFN0cmluZyYgbmFtZSwgRXhjZXB0aW9uQ29kZSYgZWMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQlJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9JREJSZXF1ZXN0LmNwcAppbmRleCBjNWE5YmEwNDA2MGVkNWYxYzQ3Y2UwMTEwZDlmMTlk NGNjZDczZDM5Li5mMmMyNGQ3M2NiMzcxN2Q3Y2M3NTc2NGFlMzdiNzk1ZDAyNDcwZWZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQlJlcXVlc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvSURCUmVxdWVzdC5jcHAKQEAgLTE5MCw5ICsxOTAsOSBAQCB2b2lk IElEQlJlcXVlc3Q6Om9uU3VjY2VzcyhQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZh Y2U+IGJhY2tlbmQpCiAgICAgQVNTRVJUKCFtX2Vycm9yQ29kZSAmJiBtX2Vycm9yTWVzc2FnZS5p c051bGwoKSAmJiAhbV9yZXN1bHQpOwogICAgIEFTU0VSVChtX2N1cnNvclR5cGUgIT0gSURCQ3Vy c29yQmFja2VuZEludGVyZmFjZTo6SW52YWxpZEN1cnNvclR5cGUpOwogICAgIGlmIChtX2N1cnNv clR5cGUgPT0gSURCQ3Vyc29yQmFja2VuZEludGVyZmFjZTo6SW5kZXhLZXlDdXJzb3IpCi0gICAg ICAgIG1fcmVzdWx0ID0gSURCQW55OjpjcmVhdGUoSURCQ3Vyc29yOjpjcmVhdGUoYmFja2VuZCwg dGhpcywgbV90cmFuc2FjdGlvbi5nZXQoKSkpOworICAgICAgICBtX3Jlc3VsdCA9IElEQkFueTo6 Y3JlYXRlKElEQkN1cnNvcjo6Y3JlYXRlKGJhY2tlbmQsIHRoaXMsIG1fc291cmNlLmdldCgpLCBt X3RyYW5zYWN0aW9uLmdldCgpKSk7CiAgICAgZWxzZQotICAgICAgICBtX3Jlc3VsdCA9IElEQkFu eTo6Y3JlYXRlKElEQkN1cnNvcldpdGhWYWx1ZTo6Y3JlYXRlKGJhY2tlbmQsIHRoaXMsIG1fdHJh bnNhY3Rpb24uZ2V0KCkpKTsKKyAgICAgICAgbV9yZXN1bHQgPSBJREJBbnk6OmNyZWF0ZShJREJD dXJzb3JXaXRoVmFsdWU6OmNyZWF0ZShiYWNrZW5kLCB0aGlzLCBtX3NvdXJjZS5nZXQoKSwgbV90 cmFuc2FjdGlvbi5nZXQoKSkpOwogICAgIGVucXVldWVFdmVudChjcmVhdGVTdWNjZXNzRXZlbnQo KSk7CiB9CiAK