165929 2016-12-15 16:27:00 -0800 IndexedDB: Add an "IDBCursorRecord" struct 2016-12-15 17:21:05 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 160306 165928 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1260358 0 beidson 2016-12-15 16:27:00 -0800 IndexedDB: Add an "IDBCursorRecord" struct It will encapsulate a key, primaryKey, and optional value. This will be used to help prefetching records (https://bugs.webkit.org/show_bug.cgi?id=165928) 1260366 1 297252 beidson 2016-12-15 16:36:52 -0800 Created attachment 297252 Patch 1260403 2 297252 commit-queue 2016-12-15 17:21:01 -0800 Comment on attachment 297252 Patch Clearing flags on attachment: 297252 Committed r209893: <http://trac.webkit.org/changeset/209893> 1260404 3 commit-queue 2016-12-15 17:21:05 -0800 All reviewed patches have been landed. Closing bug. 297252 2016-12-15 16:36:52 -0800 2016-12-15 17:21:01 -0800 Patch bug-165929-20161215163559.patch text/plain 16720 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRiNjk5NGI3NmZkNDUx Mjc4ZmRiMmNjYjgxYWQ4MzRmZTIzZTk2MS4uMTY1NzQ4YTExNmYzN2JiMDg2OTE0YjgzMGMxMTk5 NzI4YmU1NTNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2LTEyLTE1ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBJbmRleGVkREI6IEFkZCBh biAiSURCQ3Vyc29yUmVjb3JkIiBzdHJ1Y3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU5MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKFJlZmFjdG9yLCBubyBiZWhhdmlvciBj aGFuZ2UpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1 cnNvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkN1cnNvcjo6 Y3VycmVudERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJDdXJz b3I6OnJlc2V0QW5kUmViaW5kU3RhdGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZl cjo6U1FMaXRlSURCQ3Vyc29yOjphZHZhbmNlVW5pcXVlKToKKyAgICAgICAgKFdlYkNvcmU6OklE QlNlcnZlcjo6U1FMaXRlSURCQ3Vyc29yOjppbnRlcm5hbEFkdmFuY2VPbmNlKToKKyAgICAgICAg KFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQ3Vyc29yOjppdGVyYXRlKToKKyAgICAgICAg CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1cnNvci5oOgor ICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJDdXJzb3I6OmN1cnJlbnRLZXkp OgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJDdXJzb3I6OmN1cnJlbnRQ cmltYXJ5S2V5KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQ3Vyc29y OjpjdXJyZW50VmFsdWUpOgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lE QkN1cnNvclJlY29yZC5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OklEQkN1cnNvclJlY29y ZDo6ZW5jb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQkN1cnNvclJlY29yZDo6ZGVjb2RlKToK KyAgICAgICAgCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor CiAyMDE2LTEyLTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmVtb3ZlIGZsZXggYW5kIGJpc29uIGJ1aWxkIGRlcGVuZGVuY2llczsgY29t bWl0IGdlbmVyYXRlZCBYUGF0aCBwYXJzZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJDdXJzb3IuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1cnNvci5jcHAKaW5kZXggOTVj ODllOGNjMWRjMWI4ZWM5MDVhMTM0YzMyYzZiMDhmYTVjODFlNi4uMTQwZTYxZDgzODI2ODNjYzk0 ZWY2ZTgxNTRkY2M2ZjRjMWJmNDEzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1cnNvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1cnNvci5jcHAKQEAgLTEwNyw3 ICsxMDcsNyBAQCB2b2lkIFNRTGl0ZUlEQkN1cnNvcjo6Y3VycmVudERhdGEoSURCR2V0UmVzdWx0 JiByZXN1bHQpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICByZXN1bHQgPSB7IG1fY3Vy cmVudEtleSwgbV9jdXJyZW50UHJpbWFyeUtleSwgbV9jdXJyZW50VmFsdWUgPyAqbV9jdXJyZW50 VmFsdWUgOiBJREJWYWx1ZSgpIH07CisgICAgcmVzdWx0ID0geyBtX2N1cnJlbnRSZWNvcmQua2V5 LCBtX2N1cnJlbnRSZWNvcmQucHJpbWFyeUtleSwgbV9jdXJyZW50UmVjb3JkLnZhbHVlID8gKm1f Y3VycmVudFJlY29yZC52YWx1ZSA6IElEQlZhbHVlKCkgfTsKIH0KIAogc3RhdGljIFN0cmluZyBi dWlsZEluZGV4U3RhdGVtZW50KGNvbnN0IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2UsIEluZGV4 ZWREQjo6Q3Vyc29yRGlyZWN0aW9uIGN1cnNvckRpcmVjdGlvbikKQEAgLTIyMywyMSArMjIzLDIx IEBAIHZvaWQgU1FMaXRlSURCQ3Vyc29yOjpyZXNldEFuZFJlYmluZFN0YXRlbWVudCgpCiAgICAg bV9zdGF0ZW1lbnROZWVkc1Jlc2V0ID0gZmFsc2U7CiAKICAgICAvLyBJZiB0aGlzIGN1cnNvciBu ZXZlciBmZXRjaGVkIGFueSByZWNvcmRzLCB3ZSBkb24ndCBuZWVkIHRvIHJlc2V0IHRoZSBzdGF0 ZW1lbnQuCi0gICAgaWYgKG1fY3VycmVudEtleS5pc051bGwoKSkKKyAgICBpZiAobV9jdXJyZW50 UmVjb3JkLmtleS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gT3RoZXJ3aXNl IHVwZGF0ZSB0aGUgbG93ZXIga2V5IG9yIHVwcGVyIGtleSB1c2VkIGZvciB0aGUgY3Vyc29yIHJh bmdlLgogICAgIC8vIFRoaXMgaXMgc28gdGhlIGN1cnNvciBjYW4gcGljayB1cCB3aGVyZSB3ZSBs ZWZ0IG9mZi4KICAgICAvLyBXZSBtaWdodCBhbHNvIGhhdmUgdG8gY2hhbmdlIHRoZSBzdGF0ZW1l bnQgZnJvbSBjbG9zZWQgdG8gb3BlbiBzbyB3ZSBkb24ndCByZWZldGNoIHRoZSBjdXJyZW50IGtl eSBhIHNlY29uZCB0aW1lLgogICAgIGlmIChtX2N1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6 OkN1cnNvckRpcmVjdGlvbjo6TmV4dCB8fCBtX2N1cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6 OkN1cnNvckRpcmVjdGlvbjo6TmV4dE5vRHVwbGljYXRlKSB7Ci0gICAgICAgIG1fY3VycmVudExv d2VyS2V5ID0gbV9jdXJyZW50S2V5OworICAgICAgICBtX2N1cnJlbnRMb3dlcktleSA9IG1fY3Vy cmVudFJlY29yZC5rZXk7CiAgICAgICAgIGlmICghbV9rZXlSYW5nZS5sb3dlck9wZW4pIHsKICAg ICAgICAgICAgIG1fa2V5UmFuZ2UubG93ZXJPcGVuID0gdHJ1ZTsKICAgICAgICAgICAgIG1fa2V5 UmFuZ2UubG93ZXJLZXkgPSBtX2N1cnJlbnRMb3dlcktleTsKICAgICAgICAgICAgIG1fc3RhdGVt ZW50ID0gbnVsbHB0cjsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fY3VycmVu dFVwcGVyS2V5ID0gbV9jdXJyZW50S2V5OworICAgICAgICBtX2N1cnJlbnRVcHBlcktleSA9IG1f Y3VycmVudFJlY29yZC5rZXk7CiAgICAgICAgIGlmICghbV9rZXlSYW5nZS51cHBlck9wZW4pIHsK ICAgICAgICAgICAgIG1fa2V5UmFuZ2UudXBwZXJPcGVuID0gdHJ1ZTsKICAgICAgICAgICAgIG1f a2V5UmFuZ2UudXBwZXJLZXkgPSBtX2N1cnJlbnRVcHBlcktleTsKQEAgLTMxNiwxNCArMzE2LDE0 IEBAIGJvb2wgU1FMaXRlSURCQ3Vyc29yOjphZHZhbmNlKHVpbnQ2NF90IGNvdW50KQogCiBib29s IFNRTGl0ZUlEQkN1cnNvcjo6YWR2YW5jZVVuaXF1ZSgpCiB7Ci0gICAgSURCS2V5RGF0YSBjdXJy ZW50S2V5ID0gbV9jdXJyZW50S2V5OworICAgIElEQktleURhdGEgY3VycmVudEtleSA9IG1fY3Vy cmVudFJlY29yZC5rZXk7CiAKICAgICB3aGlsZSAoIW1fY29tcGxldGVkKSB7CiAgICAgICAgIGlm ICghYWR2YW5jZU9uY2UoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAv LyBJZiB0aGUgbmV3IGN1cnJlbnQga2V5IGlzIGRpZmZlcmVudCBmcm9tIHRoZSBvbGQgY3VycmVu dCBrZXksIHdlJ3JlIGRvbmUuCi0gICAgICAgIGlmIChjdXJyZW50S2V5LmNvbXBhcmUobV9jdXJy ZW50S2V5KSkKKyAgICAgICAgaWYgKGN1cnJlbnRLZXkuY29tcGFyZShtX2N1cnJlbnRSZWNvcmQu a2V5KSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtMzU2LDE2ICszNTYs MTQgQEAgU1FMaXRlSURCQ3Vyc29yOjpBZHZhbmNlUmVzdWx0IFNRTGl0ZUlEQkN1cnNvcjo6aW50 ZXJuYWxBZHZhbmNlT25jZSgpCiAgICAgQVNTRVJUKG1fc3RhdGVtZW50KTsKICAgICBBU1NFUlQo IW1fY29tcGxldGVkKTsKIAotICAgIG1fY3VycmVudFZhbHVlID0gbnVsbHB0cjsKKyAgICBtX2N1 cnJlbnRSZWNvcmQudmFsdWUgPSBudWxscHRyOwogCiAgICAgaW50IHJlc3VsdCA9IG1fc3RhdGVt ZW50LT5zdGVwKCk7CiAgICAgaWYgKHJlc3VsdCA9PSBTUUxJVEVfRE9ORSkgewogICAgICAgICBt X2NvbXBsZXRlZCA9IHRydWU7CiAKICAgICAgICAgLy8gV2hlbiBhIGN1cnNvciByZWFjaGVzIGl0 cyBlbmQsIHRoYXQgaXMgaW5kaWNhdGVkIGJ5IGhhdmluZyB1bmRlZmluZWQga2V5cy92YWx1ZXMK LSAgICAgICAgbV9jdXJyZW50S2V5ID0gSURCS2V5RGF0YSgpOwotICAgICAgICBtX2N1cnJlbnRQ cmltYXJ5S2V5ID0gSURCS2V5RGF0YSgpOwotICAgICAgICBtX2N1cnJlbnRWYWx1ZSA9IG51bGxw dHI7CisgICAgICAgIG1fY3VycmVudFJlY29yZCA9IHsgfTsKICAgICAgICAgbV9jdXJyZW50UmVj b3JkUm93SUQgPSAwOwogCiAgICAgICAgIHJldHVybiBBZHZhbmNlUmVzdWx0OjpTdWNjZXNzOwpA QCAtMzgzLDcgKzM4MSw3IEBAIFNRTGl0ZUlEQkN1cnNvcjo6QWR2YW5jZVJlc3VsdCBTUUxpdGVJ REJDdXJzb3I6OmludGVybmFsQWR2YW5jZU9uY2UoKQogICAgIFZlY3Rvcjx1aW50OF90PiBrZXlE YXRhOwogICAgIG1fc3RhdGVtZW50LT5nZXRDb2x1bW5CbG9iQXNWZWN0b3IoMSwga2V5RGF0YSk7 CiAKLSAgICBpZiAoIWRlc2VyaWFsaXplSURCS2V5RGF0YShrZXlEYXRhLmRhdGEoKSwga2V5RGF0 YS5zaXplKCksIG1fY3VycmVudEtleSkpIHsKKyAgICBpZiAoIWRlc2VyaWFsaXplSURCS2V5RGF0 YShrZXlEYXRhLmRhdGEoKSwga2V5RGF0YS5zaXplKCksIG1fY3VycmVudFJlY29yZC5rZXkpKSB7 CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGRlc2VyaWFsaXplIGtleSBkYXRhIGZyb20g ZGF0YWJhc2Ugd2hpbGUgYWR2YW5jaW5nIGN1cnNvciIpOwogICAgICAgICBtYXJrQXNFcnJvcmVk KCk7CiAgICAgICAgIHJldHVybiBBZHZhbmNlUmVzdWx0OjpGYWlsdXJlOwpAQCAtMzkzLDcgKzM5 MSw3IEBAIFNRTGl0ZUlEQkN1cnNvcjo6QWR2YW5jZVJlc3VsdCBTUUxpdGVJREJDdXJzb3I6Omlu dGVybmFsQWR2YW5jZU9uY2UoKQogCiAgICAgLy8gVGhlIHByaW1hcnlLZXkgb2YgYW4gT2JqZWN0 U3RvcmUgY3Vyc29yIGlzIHRoZSBzYW1lIGFzIGl0cyBrZXkuCiAgICAgaWYgKG1faW5kZXhJRCA9 PSBJREJJbmRleEluZm86OkludmFsaWRJZCkgewotICAgICAgICBtX2N1cnJlbnRQcmltYXJ5S2V5 ID0gbV9jdXJyZW50S2V5OworICAgICAgICBtX2N1cnJlbnRSZWNvcmQucHJpbWFyeUtleSA9IG1f Y3VycmVudFJlY29yZC5rZXk7CiAKICAgICAgICAgVmVjdG9yPFN0cmluZz4gYmxvYlVSTHMsIGJs b2JGaWxlUGF0aHM7CiAgICAgICAgIGF1dG8gZXJyb3IgPSBtX3RyYW5zYWN0aW9uLT5iYWNraW5n U3RvcmUoKS5nZXRCbG9iUmVjb3Jkc0Zvck9iamVjdFN0b3JlUmVjb3JkKG1fY3VycmVudFJlY29y ZFJvd0lELCBibG9iVVJMcywgYmxvYkZpbGVQYXRocyk7CkBAIC00MDQsOSArNDAyLDkgQEAgU1FM aXRlSURCQ3Vyc29yOjpBZHZhbmNlUmVzdWx0IFNRTGl0ZUlEQkN1cnNvcjo6aW50ZXJuYWxBZHZh bmNlT25jZSgpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAobV9jdXJzb3JUeXBlID09IEluZGV4 ZWREQjo6Q3Vyc29yVHlwZTo6S2V5QW5kVmFsdWUpCi0gICAgICAgICAgICBtX2N1cnJlbnRWYWx1 ZSA9IHN0ZDo6bWFrZV91bmlxdWU8SURCVmFsdWU+KFRocmVhZFNhZmVEYXRhQnVmZmVyOjphZG9w dFZlY3RvcihrZXlEYXRhKSwgYmxvYlVSTHMsIGJsb2JGaWxlUGF0aHMpOworICAgICAgICAgICAg bV9jdXJyZW50UmVjb3JkLnZhbHVlID0gc3RkOjptYWtlX3VuaXF1ZTxJREJWYWx1ZT4oVGhyZWFk U2FmZURhdGFCdWZmZXI6OmFkb3B0VmVjdG9yKGtleURhdGEpLCBibG9iVVJMcywgYmxvYkZpbGVQ YXRocyk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKCFkZXNlcmlhbGl6ZUlEQktleURhdGEo a2V5RGF0YS5kYXRhKCksIGtleURhdGEuc2l6ZSgpLCBtX2N1cnJlbnRQcmltYXJ5S2V5KSkgewor ICAgICAgICBpZiAoIWRlc2VyaWFsaXplSURCS2V5RGF0YShrZXlEYXRhLmRhdGEoKSwga2V5RGF0 YS5zaXplKCksIG1fY3VycmVudFJlY29yZC5wcmltYXJ5S2V5KSkgewogICAgICAgICAgICAgTE9H X0VSUk9SKCJVbmFibGUgdG8gZGVzZXJpYWxpemUgdmFsdWUgZGF0YSBmcm9tIGRhdGFiYXNlIHdo aWxlIGFkdmFuY2luZyBpbmRleCBjdXJzb3IiKTsKICAgICAgICAgICAgIG1hcmtBc0Vycm9yZWQo KTsKICAgICAgICAgICAgIHJldHVybiBBZHZhbmNlUmVzdWx0OjpGYWlsdXJlOwpAQCAtNDI2LDcg KzQyNCw3IEBAIFNRTGl0ZUlEQkN1cnNvcjo6QWR2YW5jZVJlc3VsdCBTUUxpdGVJREJDdXJzb3I6 OmludGVybmFsQWR2YW5jZU9uY2UoKQogCiAgICAgICAgIGlmIChyZXN1bHQgPT0gU1FMSVRFX1JP VykgewogICAgICAgICAgICAgb2JqZWN0U3RvcmVTdGF0ZW1lbnQuZ2V0Q29sdW1uQmxvYkFzVmVj dG9yKDAsIGtleURhdGEpOwotICAgICAgICAgICAgbV9jdXJyZW50VmFsdWUgPSBzdGQ6Om1ha2Vf dW5pcXVlPElEQlZhbHVlPihUaHJlYWRTYWZlRGF0YUJ1ZmZlcjo6YWRvcHRWZWN0b3Ioa2V5RGF0 YSkpOworICAgICAgICAgICAgbV9jdXJyZW50UmVjb3JkLnZhbHVlID0gc3RkOjptYWtlX3VuaXF1 ZTxJREJWYWx1ZT4oVGhyZWFkU2FmZURhdGFCdWZmZXI6OmFkb3B0VmVjdG9yKGtleURhdGEpKTsK ICAgICAgICAgfSBlbHNlIGlmIChyZXN1bHQgPT0gU1FMSVRFX0RPTkUpIHsKICAgICAgICAgICAg IC8vIFRoaXMgaW5kaWNhdGVzIHRoYXQgdGhlIHJlY29yZCB3ZSdyZSB0cnlpbmcgdG8gcmV0cmll dmUgaGFzIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSBvYmplY3Qgc3RvcmUuCiAgICAgICAgICAgICAv LyBTa2lwIG92ZXIgaXQuCkBAIC00NTksMjQgKzQ1NywyNCBAQCBib29sIFNRTGl0ZUlEQkN1cnNv cjo6aXRlcmF0ZShjb25zdCBJREJLZXlEYXRhJiB0YXJnZXRLZXksIGNvbnN0IElEQktleURhdGEm IHRhcgogCiAgICAgICAgIC8vIFNlYXJjaCBmb3IgdGhlIG5leHQga2V5ID49IHRoZSB0YXJnZXQg aWYgdGhlIGN1cnNvciBpcyBhIE5leHQgY3Vyc29yLCBvciB0aGUgbmV4dCBrZXkgPD0gaWYgdGhl IGN1cnNvciBpcyBhIFByZXZpb3VzIGN1cnNvci4KICAgICAgICAgaWYgKG1fY3Vyc29yRGlyZWN0 aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpOZXh0IHx8IG1fY3Vyc29yRGlyZWN0 aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpOZXh0Tm9EdXBsaWNhdGUpIHsKLSAg ICAgICAgICAgIGlmIChtX2N1cnJlbnRLZXkuY29tcGFyZSh0YXJnZXRLZXkpID49IDApCisgICAg ICAgICAgICBpZiAobV9jdXJyZW50UmVjb3JkLmtleS5jb21wYXJlKHRhcmdldEtleSkgPj0gMCkK ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgfSBlbHNlIGlmIChtX2N1cnJlbnRLZXku Y29tcGFyZSh0YXJnZXRLZXkpIDw9IDApCisgICAgICAgIH0gZWxzZSBpZiAobV9jdXJyZW50UmVj b3JkLmtleS5jb21wYXJlKHRhcmdldEtleSkgPD0gMCkKICAgICAgICAgICAgIGJyZWFrOwogCiAg ICAgICAgIHJlc3VsdCA9IGFkdmFuY2UoMSk7CiAgICAgfQogCiAgICAgaWYgKHRhcmdldFByaW1h cnlLZXkuaXNWYWxpZCgpKSB7Ci0gICAgICAgIHdoaWxlICghbV9jb21wbGV0ZWQgJiYgIW1fY3Vy cmVudEtleS5jb21wYXJlKHRhcmdldEtleSkpIHsKKyAgICAgICAgd2hpbGUgKCFtX2NvbXBsZXRl ZCAmJiAhbV9jdXJyZW50UmVjb3JkLmtleS5jb21wYXJlKHRhcmdldEtleSkpIHsKICAgICAgICAg ICAgIGlmICghcmVzdWx0KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAg ICAgICAgLy8gU2VhcmNoIGZvciB0aGUgbmV4dCBwcmltYXJ5IGtleSA+PSB0aGUgcHJpbWFyeSB0 YXJnZXQgaWYgdGhlIGN1cnNvciBpcyBhIE5leHQgY3Vyc29yLCBvciB0aGUgbmV4dCBrZXkgPD0g aWYgdGhlIGN1cnNvciBpcyBhIFByZXZpb3VzIGN1cnNvci4KICAgICAgICAgICAgIGlmIChtX2N1 cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6TmV4dCB8fCBtX2N1 cnNvckRpcmVjdGlvbiA9PSBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbjo6TmV4dE5vRHVwbGlj YXRlKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG1fY3VycmVudFByaW1hcnlLZXkuY29tcGFyZSh0 YXJnZXRQcmltYXJ5S2V5KSA+PSAwKQorICAgICAgICAgICAgICAgIGlmIChtX2N1cnJlbnRSZWNv cmQucHJpbWFyeUtleS5jb21wYXJlKHRhcmdldFByaW1hcnlLZXkpID49IDApCiAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfSBlbHNlIGlmIChtX2N1cnJlbnRQcmltYXJ5 S2V5LmNvbXBhcmUodGFyZ2V0UHJpbWFyeUtleSkgPD0gMCkKKyAgICAgICAgICAgIH0gZWxzZSBp ZiAobV9jdXJyZW50UmVjb3JkLnByaW1hcnlLZXkuY29tcGFyZSh0YXJnZXRQcmltYXJ5S2V5KSA8 PSAwKQogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICByZXN1bHQgPSBhZHZh bmNlKDEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1NRTGl0ZUlEQkN1cnNvci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1NRTGl0ZUlEQkN1cnNvci5oCmluZGV4IDZjNTZhOTVjNzc5YTg4YWFjNmNjMDczYTA0 OGNkYzJjZTI2OTEyYjEuLjBjNWUyYmMyNDc1N2JlMGExNGFjYjgwMWZmMGNiYmZmOTU0NjE4Y2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxp dGVJREJDdXJzb3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvU1FMaXRlSURCQ3Vyc29yLmgKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2lmIEVOQUJMRShJTkRF WEVEX0RBVEFCQVNFKQogCisjaW5jbHVkZSAiSURCQ3Vyc29yUmVjb3JkLmgiCiAjaW5jbHVkZSAi SURCSW5kZXhJbmZvLmgiCiAjaW5jbHVkZSAiSURCS2V5RGF0YS5oIgogI2luY2x1ZGUgIklEQktl eVJhbmdlRGF0YS5oIgpAQCAtNjEsOSArNjIsOSBAQCBwdWJsaWM6CiAgICAgaW50NjRfdCBvYmpl Y3RTdG9yZUlEKCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3RTdG9yZUlEOyB9CiAgICAgaW50NjRf dCBjdXJyZW50UmVjb3JkUm93SUQoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRSZWNvcmRSb3dJ RDsgfQogCi0gICAgY29uc3QgSURCS2V5RGF0YSYgY3VycmVudEtleSgpIGNvbnN0IHsgcmV0dXJu IG1fY3VycmVudEtleTsgfQotICAgIGNvbnN0IElEQktleURhdGEmIGN1cnJlbnRQcmltYXJ5S2V5 KCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50UHJpbWFyeUtleTsgfQotICAgIElEQlZhbHVlKiBj dXJyZW50VmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRWYWx1ZS5nZXQoKTsgfQorICAg IGNvbnN0IElEQktleURhdGEmIGN1cnJlbnRLZXkoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRS ZWNvcmQua2V5OyB9CisgICAgY29uc3QgSURCS2V5RGF0YSYgY3VycmVudFByaW1hcnlLZXkoKSBj b25zdCB7IHJldHVybiBtX2N1cnJlbnRSZWNvcmQucHJpbWFyeUtleTsgfQorICAgIElEQlZhbHVl KiBjdXJyZW50VmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRSZWNvcmQudmFsdWUuZ2V0 KCk7IH0KIAogICAgIGJvb2wgYWR2YW5jZSh1aW50NjRfdCBjb3VudCk7CiAgICAgYm9vbCBpdGVy YXRlKGNvbnN0IElEQktleURhdGEmIHRhcmdldEtleSwgY29uc3QgSURCS2V5RGF0YSYgdGFyZ2V0 UHJpbWFyeUtleSk7CkBAIC0xMDUsOSArMTA2LDcgQEAgcHJpdmF0ZToKICAgICBJREJLZXlEYXRh IG1fY3VycmVudExvd2VyS2V5OwogICAgIElEQktleURhdGEgbV9jdXJyZW50VXBwZXJLZXk7CiAK LSAgICBJREJLZXlEYXRhIG1fY3VycmVudEtleTsKLSAgICBJREJLZXlEYXRhIG1fY3VycmVudFBy aW1hcnlLZXk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPElEQlZhbHVlPiBtX2N1cnJlbnRWYWx1ZTsK KyAgICBJREJDdXJzb3JSZWNvcmQgbV9jdXJyZW50UmVjb3JkOwogCiAgICAgc3RkOjp1bmlxdWVf cHRyPFNRTGl0ZVN0YXRlbWVudD4gbV9zdGF0ZW1lbnQ7CiAgICAgYm9vbCBtX3N0YXRlbWVudE5l ZWRzUmVzZXQgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2hhcmVkL0lEQkN1cnNvclJlY29yZC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2hhcmVkL0lEQkN1cnNvclJlY29yZC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI0ZjU1ZmQ2 NmI0YWExZmMyZjgxZjRhNzQ5Mzk2OTFjMDA5NjI0ZTEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCQ3Vyc29yUmVjb3JkLmgKQEAg LTAsMCArMSw2NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaWYgRU5BQkxFKElO REVYRURfREFUQUJBU0UpCisKKyNpbmNsdWRlICJJREJLZXlEYXRhLmgiCisjaW5jbHVkZSAiSURC VmFsdWUuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitzdHJ1Y3QgSURCQ3Vyc29yUmVjb3Jk IHsKKyAgICBJREJLZXlEYXRhIGtleTsKKyAgICBJREJLZXlEYXRhIHByaW1hcnlLZXk7CisgICAg c3RkOjp1bmlxdWVfcHRyPElEQlZhbHVlPiB2YWx1ZTsKKworICAgIHRlbXBsYXRlPGNsYXNzIEVu Y29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBE ZWNvZGVyPiBzdGF0aWMgYm9vbCBkZWNvZGUoRGVjb2RlciYsIElEQkN1cnNvclJlY29yZCYpOwor fTsKKwordGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KK3ZvaWQgSURCQ3Vyc29yUmVjb3JkOjplbmNv ZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKK3sKKyAgICBlbmNvZGVyIDw8IGtleSA8PCBwcmlt YXJ5S2V5IDw8IHZhbHVlOworfQorCit0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPgorYm9vbCBJREJD dXJzb3JSZWNvcmQ6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBJREJDdXJzb3JSZWNvcmQmIHJl Y29yZCkKK3sKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlY29yZC5rZXkpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlY29yZC5wcmltYXJ5S2V5 KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZWNv cmQudmFsdWUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30K KworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCisjZW5kaWYgLy8gRU5BQkxFKElOREVYRURfREFU QUJBU0UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKaW5kZXggYjU3ODdiODhjYmE3ZDMyNDZiNGZjNGQyYmMwYzNmZjNhM2I3ZGUxZS4uZTdk MTJkYWU0NTAwYzQ4NzZhOTBhMDE3MmEyYmVjYjNhNzhkZmVlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTk5Miw2ICsxOTky LDcgQEAKIAkJNTEwRDRBMzYxMDMxNjVFRTAwNDlFQTU0IC8qIFNvY2tldFN0cmVhbUhhbmRsZS5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTBENEEz MDEwMzE2NUVFMDA0OUVBNTQgLyogU29ja2V0U3RyZWFtSGFuZGxlLmNwcCAqLzsgfTsKIAkJNTEw RDRBMzcxMDMxNjVFRTAwNDlFQTU0IC8qIFNvY2tldFN0cmVhbUhhbmRsZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTEwRDRBMzExMDMxNjVFRTAwNDlF QTU0IC8qIFNvY2tldFN0cmVhbUhhbmRsZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CiAJCTUxMEQ0QTM4MTAzMTY1RUUwMDQ5RUE1NCAvKiBTb2NrZXRT dHJlYW1IYW5kbGVDbGllbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDUxMEQ0QTMyMTAzMTY1RUUwMDQ5RUE1NCAvKiBTb2NrZXRTdHJlYW1IYW5kbGVD bGllbnQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9Owor CQk1MTEwRkNGQzFFMDM2NDFEMDA2RjhEMEIgLyogSURCQ3Vyc29yUmVjb3JkLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTEwRkNGQjFFMDM2MkE1MDA2 RjhEMEIgLyogSURCQ3Vyc29yUmVjb3JkLmggKi87IH07CiAJCTUxMUVDMTI3MUM1MEFBQ0EwMDMy Rjk4MyAvKiBJREJTZXJpYWxpemF0aW9uLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDUxMUVDMTI1MUM1MEFBNTcwMDMyRjk4MyAvKiBJREJTZXJpYWxp emF0aW9uLmNwcCAqLzsgfTsKIAkJNTExRUMxMjgxQzUwQUFDQTAwMzJGOTgzIC8qIElEQlNlcmlh bGl6YXRpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDUxMUVDMTI2MUM1MEFBNTcwMDMyRjk4MyAvKiBJREJTZXJpYWxpemF0aW9uLmggKi87IH07CiAJ CTUxMUVDMTJCMUM1MEFCQkYwMDMyRjk4MyAvKiBTUUxpdGVJREJUcmFuc2FjdGlvbi5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTFFQzEyOTFDNTBB QkJBMDAzMkY5ODMgLyogU1FMaXRlSURCVHJhbnNhY3Rpb24uY3BwICovOyB9OwpAQCAtOTE4NCw2 ICs5MTg1LDcgQEAKIAkJNTEwRDRBMzAxMDMxNjVFRTAwNDlFQTU0IC8qIFNvY2tldFN0cmVhbUhh bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTb2NrZXRTdHJl YW1IYW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTBENEEzMTEwMzE2 NUVFMDA0OUVBNTQgLyogU29ja2V0U3RyZWFtSGFuZGxlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IFNvY2tldFN0cmVhbUhhbmRsZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk1MTBENEEzMjEwMzE2NUVFMDA0OUVBNTQgLyogU29ja2V0U3RyZWFtSGFuZGxlQ2xp ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNvY2tldFN0cmVhbUhhbmRs ZUNsaWVudC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk1MTEwRkNGQjFFMDM2MkE1 MDA2RjhEMEIgLyogSURCQ3Vyc29yUmVjb3JkLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IElEQkN1cnNvclJlY29yZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1 MTFFQzEyNTFDNTBBQTU3MDAzMkY5ODMgLyogSURCU2VyaWFsaXphdGlvbi5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJREJTZXJpYWxpemF0aW9uLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTExRUMxMjYxQzUwQUE1NzAwMzJGOTgzIC8qIElEQlNl cmlhbGl6YXRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSURCU2VyaWFs aXphdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTFFQzEyOTFDNTBBQkJB MDAzMkY5ODMgLyogU1FMaXRlSURCVHJhbnNhY3Rpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gU1FMaXRlSURCVHJhbnNhY3Rpb24uY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwpAQCAtMTcwMDQsNiArMTcwMDYsNyBAQAogCQkJY2hpbGRyZW4gPSAoCiAJ CQkJNTE3MTM4RjkxQkYzQURBQzAwMEQ1RjAxIC8qIElEQkN1cnNvckluZm8uY3BwICovLAogCQkJ CTUxNzEzOEZBMUJGM0FEQUMwMDBENUYwMSAvKiBJREJDdXJzb3JJbmZvLmggKi8sCisJCQkJNTEx MEZDRkIxRTAzNjJBNTAwNkY4RDBCIC8qIElEQkN1cnNvclJlY29yZC5oICovLAogCQkJCTUxQkE0 QUMxMUJCQjVDQkYwMERGM0Q2RCAvKiBJREJEYXRhYmFzZUluZm8uY3BwICovLAogCQkJCTUxQkE0 QUMyMUJCQjVDQkYwMERGM0Q2RCAvKiBJREJEYXRhYmFzZUluZm8uaCAqLywKIAkJCQk1MTQ4NDUz QzFCQjlEMDc2MDA2QTcyRUQgLyogSURCRXJyb3IuY3BwICovLApAQCAtMjcyMDUsNiArMjcyMDgs NyBAQAogCQkJCUFCMjQ3QTZEMEFGRDYzODMwMDNGQTVGRCAvKiBSZW5kZXJTbGlkZXIuaCBpbiBI ZWFkZXJzICovLAogCQkJCTMxOTU1QTg4MTYwRDE5OTIwMDg1ODAyNSAvKiBSZW5kZXJTbmFwc2hv dHRlZFBsdWdJbi5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkM4QzhGQUUwRERDRDMxQjAwQjU5MkY0 IC8qIFJlbmRlclN0eWxlLmggaW4gSGVhZGVycyAqLywKKwkJCQk1MTEwRkNGQzFFMDM2NDFEMDA2 RjhEMEIgLyogSURCQ3Vyc29yUmVjb3JkLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzVFQjY2ODBF ODFDQjcxMDBCMjU5NjUgLyogUmVuZGVyU3R5bGVDb25zdGFudHMuaCBpbiBIZWFkZXJzICovLAog CQkJCTQzNjcwOEMxMTJEOUNBNEIwMDA0NDIzNCAvKiBSZW5kZXJTVkdCbG9jay5oIGluIEhlYWRl cnMgKi8sCiAJCQkJNDM2NzA4QzMxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFJlbmRlclNWR0NvbnRhaW5l ci5oIGluIEhlYWRlcnMgKi8sCg==