153561 2016-01-27 14:47:02 -0800 Modern IDB: Fix many Index tests 2022-03-01 02:44:45 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 153021 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1159447 0 beidson 2016-01-27 14:47:02 -0800 Modern IDB: Fix many Index tests 1 - Getting an Index record could return null instead of undefined 2 - We almost always entered the exact same index record into the database twice 1159453 1 270049 beidson 2016-01-27 14:55:35 -0800 Created attachment 270049 Patch v1 1159456 2 270050 beidson 2016-01-27 14:58:09 -0800 Created attachment 270050 Patch v1 1159457 3 commit-queue 2016-01-27 14:59:24 -0800 Attachment 270050 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:1242: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1159458 4 270050 achristensen 2016-01-27 15:00:43 -0800 Comment on attachment 270050 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=270050&action=review r=me > Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:1240 > + if (cursor->didComplete()) { { not necessary. 1159459 5 beidson 2016-01-27 15:04:02 -0800 http://trac.webkit.org/changeset/195697 270049 2016-01-27 14:55:35 -0800 2016-01-27 14:58:09 -0800 Patch v1 patch text/plain 10455 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDczYmI2Li5mMmUxMDlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IEZpeCBtYW55IEluZGV4IHRlc3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNTYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnM6CisK KzIwMTYtMDEtMjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAg IE1vZGVybiBJREI6IEN1cnNvcnMgYXJlIHV0dGVybHkgYnJva2VuIGluIHRoZSBTUUxpdGUgYmFj a2VuZC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MzU1OAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBl Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMzliZTVmNS4uZWFlYWZkNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU0LDI0ICs0NTQsMTUgQEAgaW1wb3J0ZWQvdzNjL2lu ZGV4ZWRkYi92YWx1ZV9yZWN1cnNpdmUuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5k ZXhlZGRiL3dyaXRlci1zdGFydmF0aW9uLmh0bSBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVk ZGIvY3Vyc29yLWFkdmFuY2UuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLWNvbnRpbnVlLXZhbGlkaXR5Lmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRi L2N1cnNvci1jb250aW51ZS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9jdXJz b3ItaW5kZXgtZGVsZXRlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNv ci1wcmltYXJ5LWtleS1vcmRlci5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9j dXJzb3Itc2tpcC1kZWxldGVkLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1 cnNvci11cGRhdGUuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvZGVsZXRlLXJh bmdlLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL2R1cGxpY2F0ZXMuaHRtbCBb IEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvZ2V0LWtleXJhbmdlLmh0bWwgWyBGYWlsdXJl IF0KLXN0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sIFsgRmFpbHVyZSBdCi1zdG9y YWdlL2luZGV4ZWRkYi9pbmRleC1jb3VudC5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4 ZWRkYi9pbmRleC1jdXJzb3IuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvaW5k ZXgtZHVwbGljYXRlLWtleXBhdGhzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRi L2luZGV4LW11bHRpZW50cnkuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvaW5k ZXgtcG9wdWxhdGlvbi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9pbmRleC11 bmlxdWUuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci5o dG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXlwYXRoLWFycmF5cy5odG1sIFsg RmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXlwYXRoLWludHJpbnNpYy1wcm9wZXJ0aWVz Lmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2xhenktaW5kZXgtcG9wdWxhdGlv bi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9sYXp5LWluZGV4LXR5cGVzLmh0 bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9jdXJzb3ItMy5odG1sIFsg RmFpbHVyZSBdCkBAIC00ODEsMzggKzQ3MiwyMiBAQCBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v ZGVsZXRlaW5kZXgtMS5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v ZGVsZXRlaW5kZXgtMi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v Z2V0LWtleXJhbmdlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9p ZGJvYmplY3RzdG9yZS1kZWxldGUtMS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRk Yi9tb2Rlcm4vaW5kZXgtMS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rl cm4vaW5kZXgtMi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5k ZXgtMy5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtNC5o dG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtY3Vyc29yLTEu aHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL2luZGV4LWN1cnNvci0y Lmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC1jdXJzb3It My5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtZ2V0LWNv dW50LWJhc2ljLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvY3Vy c29yLW11dGF0aW9uLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEv Y3Vyc29yLXVwZGF0ZS11cGRhdGVzLWluZGV4ZXMuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9p bmRleGVkZGIvbW96aWxsYS9jdXJzb3JzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhl ZGRiL21vemlsbGEvaW5kZXgtcHJldi1uby1kdXBsaWNhdGUuaHRtbCBbIEZhaWx1cmUgXQogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleGVzLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2Uv aW5kZXhlZGRiL21vemlsbGEvb2JqZWN0LWN1cnNvcnMuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFn ZS9pbmRleGVkZGIvb2JqZWN0c3RvcmUtYXV0b2luY3JlbWVudC5odG1sIFsgRmFpbHVyZSBdCiBz dG9yYWdlL2luZGV4ZWRkYi9vYmplY3RzdG9yZS1iYXNpY3MuaHRtbCBbIEZhaWx1cmUgXQogc3Rv cmFnZS9pbmRleGVkZGIvb3BlbmN1cnNvci1rZXkuaHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9p bmRleGVkZGIvb3B0aW9uYWwtYXJndW1lbnRzLmh0bWwgWyBGYWlsdXJlIF0KIAogIyBTUUxpdGUg YmFja2VuZCB0ZXN0cyB0aGF0IHRpbWVvdXQKLWNyeXB0by9zdWJ0bGUvcnNhLWluZGV4ZWRkYi5o dG1sIFsgU2tpcCBdCi1pbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjEyLmh0 bSBbIFNraXAgXQotaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJvYmplY3RzdG9yZV9vcGVuQ3Vy c29yX2ludmFsaWQuaHRtIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9jdXJzb3ItY2FzdC5o dG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vdHJhbnNhY3Rpb24tc2NoZWR1 bGVyLTEuaHRtbCBbIFNraXAgXQogc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3RyYW5zYWN0aW9u LXNjaGVkdWxlci0yLmh0bWwgWyBTa2lwIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi90cmFu c2FjdGlvbi1zY2hlZHVsZXItNS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rl cm4vdHJhbnNhY3Rpb24tc2NoZWR1bGVyLTYuaHRtbCBbIFNraXAgXQotc3RvcmFnZS9pbmRleGVk ZGIvcGVuZGluZy1hY3Rpdml0eS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9wcmVm ZXRjaC1pbnZhbGlkYXRpb24uaHRtbCBbIFNraXAgXQotc3RvcmFnZS9pbmRleGVkZGIvcHJlZmV0 Y2gtcmFjZS5odG1sIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9yZXF1ZXN0LXJlc3VsdC1j YWNoZS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi90cmFuc2FjdGlvbi1jb29yZGlu YXRpb24td2l0aGluLWRhdGFiYXNlLmh0bWwgWyBTa2lwIF0KIAogIyBTUUxpdGUgYmFja2VuZCB0 ZXN0cyB0aGF0IGNyYXNoIG9yIEFTU0VSVApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGUwYTQyNmIuLjU3OGIzZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxNi0wMS0yNyAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTW9kZXJuIElEQjogRml4IG1hbnkgSW5kZXgg dGVzdHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTM1NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgKE1hbnkgZmFpbGluZyB0ZXN0cyBub3cgcGFzcykuCisKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SURCU2VydmVyOjpNZW1vcnlJbmRleDo6Z2V0UmVzdWx0Rm9yS2V5UmFuZ2UpOgorICAgICAg ICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0 b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0 b3JlOjp1bmNoZWNrZWRQdXRJbmRleEtleSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6 OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5jaGVja2VkUHV0SW5kZXhSZWNvcmQpOgorICAgICAg ICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldEluZGV4UmVj b3JkKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3Jl OjppdGVyYXRlQ3Vyc29yKToKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1NRTGl0ZUlEQkN1cnNvci5oOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpT UUxpdGVJREJDdXJzb3I6OmRpZENvbXBsZXRlKToKKworMjAxNi0wMS0yNyAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgTW9kZXJuIElEQjogQ3Vyc29ycyBhcmUg dXR0ZXJseSBicm9rZW4gaW4gdGhlIFNRTGl0ZSBiYWNrZW5kLgogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNTU4CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJbmRleC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguY3BwCmluZGV4 IGNmNzkxYzguLmQyNTlmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9NZW1vcnlJbmRleC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUluZGV4LmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZv aWQgTWVtb3J5SW5kZXg6OnJlcGxhY2VJbmRleFZhbHVlU3RvcmUoc3RkOjp1bmlxdWVfcHRyPElu ZGV4VmFsdWVTdG9yZT4mJiB2YWx1CiAKIElEQkdldFJlc3VsdCBNZW1vcnlJbmRleDo6Z2V0UmVz dWx0Rm9yS2V5UmFuZ2UoSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgdHlwZSwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiByYW5nZSkgY29uc3QKIHsKLSAgICBMT0coSW5kZXhlZERCLCAiTWVtb3J5 SW5kZXg6OmdldFJlc3VsdEZvcktleVJhbmdlIik7CisgICAgTE9HKEluZGV4ZWREQiwgIk1lbW9y eUluZGV4OjpnZXRSZXN1bHRGb3JLZXlSYW5nZSAtICVzIiwgcmFuZ2UubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgaWYgKCFtX3JlY29yZHMpCiAgICAgICAgIHJldHVybiB7 IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv U1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IGNkNjUxNTYuLmZlNzIy ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9T UUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBAIC04MzgsMTAgKzgzOCwx MCBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hlY2tlZFB1dEluZGV4S2V5 KGNvbnN0IElEQkluZGV4SW5mbyYgaW5mbywgYwogewogICAgIGlmICghaW5mby5tdWx0aUVudHJ5 KCkpIHsKICAgICAgICAgYXV0byBlcnJvciA9IHVuY2hlY2tlZFB1dEluZGV4UmVjb3JkKGluZm8u b2JqZWN0U3RvcmVJZGVudGlmaWVyKCksIGluZm8uaWRlbnRpZmllcigpLCBrZXksIGluZGV4S2V5 LmFzT25lS2V5KCkpOwotICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgIGlm ICghZXJyb3IuaXNOdWxsKCkpCiAgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBwdXQg aW5kZXggcmVjb3JkIGZvciBuZXdseSBjcmVhdGVkIGluZGV4Iik7Ci0gICAgICAgICAgICByZXR1 cm4gZXJyb3I7Ci0gICAgICAgIH0KKworICAgICAgICByZXR1cm4gZXJyb3I7CiAgICAgfQogCiAg ICAgVmVjdG9yPElEQktleURhdGE+IGluZGV4S2V5cyA9IGluZGV4S2V5Lm11bHRpRW50cnkoKTsK QEAgLTg3MSw2ICs4NzEsOCBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hl Y2tlZFB1dEluZGV4S2V5KGNvbnN0IElEQkluZGV4SW5mbyYgaW5mbywgYwogCiBJREJFcnJvciBT UUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hlY2tlZFB1dEluZGV4UmVjb3JkKGludDY0X3Qgb2Jq ZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiBr ZXlWYWx1ZSwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYgaW5kZXhLZXkpCiB7CisgICAgTE9H KEluZGV4ZWREQiwgIlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5jaGVja2VkUHV0SW5kZXhSZWNv cmQgLSAlcywgJXMiLCBrZXlWYWx1ZS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgaW5k ZXhLZXkubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgUmVmUHRyPFNoYXJl ZEJ1ZmZlcj4gaW5kZXhLZXlCdWZmZXIgPSBzZXJpYWxpemVJREJLZXlEYXRhKGluZGV4S2V5KTsK ICAgICBpZiAoIWluZGV4S2V5QnVmZmVyKSB7CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRv IHNlcmlhbGl6ZSBpbmRleCBrZXkgdG8gYmUgc3RvcmVkIGluIHRoZSBkYXRhYmFzZSIpOwpAQCAt MTIxMyw3ICsxMjE1LDggQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRSZWNv cmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGkKIAogSURCRXJyb3IgU1FM aXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRleFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJRCwgdWlu dDY0X3QgaW5kZXhJRCwgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgdHlwZSwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiByYW5nZSwgSURCR2V0UmVzdWx0JiBnZXRSZXN1bHQpCiB7Ci0gICAgTE9H KEluZGV4ZWREQiwgIlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0SW5kZXhSZWNvcmQiKTsKKyAg ICBMT0coSW5kZXhlZERCLCAiU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRleFJlY29yZCAt ICVzIiwgcmFuZ2UubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgQVNTRVJU KG1fc3FsaXRlREIpOwogICAgIEFTU0VSVChtX3NxbGl0ZURCLT5pc09wZW4oKSk7CiAKQEAgLTEy MjksMTEgKzEyMzIsMjAgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRl eFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW4KICAgICAgICAgcmV0dXJu IHsgSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJDYW5u b3Qgb3BlbiBjdXJzb3IgdG8gcGVyZm9ybSBpbmRleCBnZXQgaW4gZGF0YWJhc2UiKSB9OwogICAg IH0KIAotICAgIGlmICh0eXBlID09IEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlOjpLZXkpCi0g ICAgICAgIGdldFJlc3VsdCA9IHsgY3Vyc29yLT5jdXJyZW50UHJpbWFyeUtleSgpIH07Ci0gICAg ZWxzZSB7Ci0gICAgICAgIGdldFJlc3VsdCA9IHsgU2hhcmVkQnVmZmVyOjpjcmVhdGUoY3Vyc29y LT5jdXJyZW50VmFsdWVCdWZmZXIoKS5kYXRhKCksIGN1cnNvci0+Y3VycmVudFZhbHVlQnVmZmVy KCkuc2l6ZSgpKSB9OwotICAgICAgICBnZXRSZXN1bHQuc2V0S2V5RGF0YShjdXJzb3ItPmN1cnJl bnRQcmltYXJ5S2V5KCkpOworICAgIGlmIChjdXJzb3ItPmRpZEVycm9yKCkpIHsKKyAgICAgICAg TE9HX0VSUk9SKCJDdXJzb3IgZmFpbGVkIHdoaWxlIGxvb2tpbmcgdXAgaW5kZXggcmVjb3JkIGlu IGRhdGFiYXNlIik7CisgICAgICAgIHJldHVybiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtu b3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiQ3Vyc29yIGZhaWxlZCB3aGlsZSBsb29raW5nIHVwIGlu ZGV4IHJlY29yZCBpbiBkYXRhYmFzZSIpIH07CisgICAgfQorCisgICAgaWYgKGN1cnNvci0+ZGlk Q29tcGxldGUoKSkgeworICAgICAgICBnZXRSZXN1bHQgPSB7IH07CisgICAgfSBlbHNlIHsKKyAg ICAgICAgaWYgKHR5cGUgPT0gSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGU6OktleSkKKyAgICAg ICAgICAgIGdldFJlc3VsdCA9IHsgY3Vyc29yLT5jdXJyZW50UHJpbWFyeUtleSgpIH07CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgZ2V0UmVzdWx0ID0geyBTaGFyZWRCdWZmZXI6OmNyZWF0 ZShjdXJzb3ItPmN1cnJlbnRWYWx1ZUJ1ZmZlcigpLmRhdGEoKSwgY3Vyc29yLT5jdXJyZW50VmFs dWVCdWZmZXIoKS5zaXplKCkpIH07CisgICAgICAgICAgICBnZXRSZXN1bHQuc2V0S2V5RGF0YShj dXJzb3ItPmN1cnJlbnRQcmltYXJ5S2V5KCkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0 dXJuIHsgfTsKQEAgLTE0MTIsNiArMTQyNCw4IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdT dG9yZTo6b3BlbkN1cnNvcihjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0CiAK IElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6aXRlcmF0ZUN1cnNvcihjb25zdCBJREJS ZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURCUmVzb3Vy Y2VJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBjb25zdCBJREJLZXlEYXRhJiBrZXksIHVp bnQzMl90IGNvdW50LCBJREJHZXRSZXN1bHQmIHJlc3VsdCkKIHsKKyAgICBMT0coSW5kZXhlZERC LCAiU1FMaXRlSURCQmFja2luZ1N0b3JlOjppdGVyYXRlQ3Vyc29yIik7CisKICAgICBBU1NFUlQo bV9zcWxpdGVEQik7CiAgICAgQVNTRVJUKG1fc3FsaXRlREItPmlzT3BlbigpKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1 cnNvci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlE QkN1cnNvci5oCmluZGV4IDFlN2M2YjkuLjM3YjExYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJDdXJzb3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQ3Vyc29yLmgKQEAg LTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWR2YW5jZSh1aW50NjRfdCBjb3VudCk7 CiAgICAgYm9vbCBpdGVyYXRlKGNvbnN0IElEQktleURhdGEmIHRhcmdldEtleSk7CiAKKyAgICBi b29sIGRpZENvbXBsZXRlKCkgY29uc3QgeyByZXR1cm4gbV9jb21wbGV0ZWQ7IH0KICAgICBib29s IGRpZEVycm9yKCkgY29uc3QgeyByZXR1cm4gbV9lcnJvcmVkOyB9CiAKICAgICB2b2lkIG9iamVj dFN0b3JlUmVjb3Jkc0NoYW5nZWQoKTsK 270050 2016-01-27 14:58:09 -0800 2022-03-01 02:44:45 -0800 Patch v1 patch text/plain 10455 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDczYmI2Li5mMmUxMDlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IEZpeCBtYW55IEluZGV4IHRlc3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNTYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnM6CisK KzIwMTYtMDEtMjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAg IE1vZGVybiBJREI6IEN1cnNvcnMgYXJlIHV0dGVybHkgYnJva2VuIGluIHRoZSBTUUxpdGUgYmFj a2VuZC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MzU1OAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBl Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMzliZTVmNS4uZWFlYWZkNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU0LDI0ICs0NTQsMTUgQEAgaW1wb3J0ZWQvdzNjL2lu ZGV4ZWRkYi92YWx1ZV9yZWN1cnNpdmUuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5k ZXhlZGRiL3dyaXRlci1zdGFydmF0aW9uLmh0bSBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVk ZGIvY3Vyc29yLWFkdmFuY2UuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLWNvbnRpbnVlLXZhbGlkaXR5Lmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRi L2N1cnNvci1jb250aW51ZS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9jdXJz b3ItaW5kZXgtZGVsZXRlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNv ci1wcmltYXJ5LWtleS1vcmRlci5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9j dXJzb3Itc2tpcC1kZWxldGVkLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2N1 cnNvci11cGRhdGUuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvZGVsZXRlLXJh bmdlLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL2R1cGxpY2F0ZXMuaHRtbCBb IEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvZ2V0LWtleXJhbmdlLmh0bWwgWyBGYWlsdXJl IF0KLXN0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sIFsgRmFpbHVyZSBdCi1zdG9y YWdlL2luZGV4ZWRkYi9pbmRleC1jb3VudC5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4 ZWRkYi9pbmRleC1jdXJzb3IuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvaW5k ZXgtZHVwbGljYXRlLWtleXBhdGhzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRi L2luZGV4LW11bHRpZW50cnkuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvaW5k ZXgtcG9wdWxhdGlvbi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9pbmRleC11 bmlxdWUuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIva2V5LWdlbmVyYXRvci5o dG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXlwYXRoLWFycmF5cy5odG1sIFsg RmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXlwYXRoLWludHJpbnNpYy1wcm9wZXJ0aWVz Lmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2xhenktaW5kZXgtcG9wdWxhdGlv bi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9sYXp5LWluZGV4LXR5cGVzLmh0 bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9jdXJzb3ItMy5odG1sIFsg RmFpbHVyZSBdCkBAIC00ODEsMzggKzQ3MiwyMiBAQCBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v ZGVsZXRlaW5kZXgtMS5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v ZGVsZXRlaW5kZXgtMi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v Z2V0LWtleXJhbmdlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9p ZGJvYmplY3RzdG9yZS1kZWxldGUtMS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRk Yi9tb2Rlcm4vaW5kZXgtMS5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rl cm4vaW5kZXgtMi5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5k ZXgtMy5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtNC5o dG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtY3Vyc29yLTEu aHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL2luZGV4LWN1cnNvci0y Lmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9pbmRleC1jdXJzb3It My5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vaW5kZXgtZ2V0LWNv dW50LWJhc2ljLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvY3Vy c29yLW11dGF0aW9uLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEv Y3Vyc29yLXVwZGF0ZS11cGRhdGVzLWluZGV4ZXMuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9p bmRleGVkZGIvbW96aWxsYS9jdXJzb3JzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhl ZGRiL21vemlsbGEvaW5kZXgtcHJldi1uby1kdXBsaWNhdGUuaHRtbCBbIEZhaWx1cmUgXQogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleGVzLmh0bWwgWyBGYWlsdXJlIF0KLXN0b3JhZ2Uv aW5kZXhlZGRiL21vemlsbGEvb2JqZWN0LWN1cnNvcnMuaHRtbCBbIEZhaWx1cmUgXQogc3RvcmFn ZS9pbmRleGVkZGIvb2JqZWN0c3RvcmUtYXV0b2luY3JlbWVudC5odG1sIFsgRmFpbHVyZSBdCiBz dG9yYWdlL2luZGV4ZWRkYi9vYmplY3RzdG9yZS1iYXNpY3MuaHRtbCBbIEZhaWx1cmUgXQogc3Rv cmFnZS9pbmRleGVkZGIvb3BlbmN1cnNvci1rZXkuaHRtbCBbIEZhaWx1cmUgXQotc3RvcmFnZS9p bmRleGVkZGIvb3B0aW9uYWwtYXJndW1lbnRzLmh0bWwgWyBGYWlsdXJlIF0KIAogIyBTUUxpdGUg YmFja2VuZCB0ZXN0cyB0aGF0IHRpbWVvdXQKLWNyeXB0by9zdWJ0bGUvcnNhLWluZGV4ZWRkYi5o dG1sIFsgU2tpcCBdCi1pbXBvcnRlZC93M2MvaW5kZXhlZGRiL2lkYmZhY3Rvcnlfb3BlbjEyLmh0 bSBbIFNraXAgXQotaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJvYmplY3RzdG9yZV9vcGVuQ3Vy c29yX2ludmFsaWQuaHRtIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9jdXJzb3ItY2FzdC5o dG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vdHJhbnNhY3Rpb24tc2NoZWR1 bGVyLTEuaHRtbCBbIFNraXAgXQogc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3RyYW5zYWN0aW9u LXNjaGVkdWxlci0yLmh0bWwgWyBTa2lwIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi90cmFu c2FjdGlvbi1zY2hlZHVsZXItNS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rl cm4vdHJhbnNhY3Rpb24tc2NoZWR1bGVyLTYuaHRtbCBbIFNraXAgXQotc3RvcmFnZS9pbmRleGVk ZGIvcGVuZGluZy1hY3Rpdml0eS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi9wcmVm ZXRjaC1pbnZhbGlkYXRpb24uaHRtbCBbIFNraXAgXQotc3RvcmFnZS9pbmRleGVkZGIvcHJlZmV0 Y2gtcmFjZS5odG1sIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9yZXF1ZXN0LXJlc3VsdC1j YWNoZS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRkYi90cmFuc2FjdGlvbi1jb29yZGlu YXRpb24td2l0aGluLWRhdGFiYXNlLmh0bWwgWyBTa2lwIF0KIAogIyBTUUxpdGUgYmFja2VuZCB0 ZXN0cyB0aGF0IGNyYXNoIG9yIEFTU0VSVApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGUwYTQyNmIuLjU3OGIzZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxNi0wMS0yNyAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTW9kZXJuIElEQjogRml4IG1hbnkgSW5kZXgg dGVzdHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTM1NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgKE1hbnkgZmFpbGluZyB0ZXN0cyBub3cgcGFzcykuCisKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SURCU2VydmVyOjpNZW1vcnlJbmRleDo6Z2V0UmVzdWx0Rm9yS2V5UmFuZ2UpOgorICAgICAg ICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0 b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0 b3JlOjp1bmNoZWNrZWRQdXRJbmRleEtleSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6 OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5jaGVja2VkUHV0SW5kZXhSZWNvcmQpOgorICAgICAg ICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldEluZGV4UmVj b3JkKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3Jl OjppdGVyYXRlQ3Vyc29yKToKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1NRTGl0ZUlEQkN1cnNvci5oOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpT UUxpdGVJREJDdXJzb3I6OmRpZENvbXBsZXRlKToKKworMjAxNi0wMS0yNyAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgTW9kZXJuIElEQjogQ3Vyc29ycyBhcmUg dXR0ZXJseSBicm9rZW4gaW4gdGhlIFNRTGl0ZSBiYWNrZW5kLgogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNTU4CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJbmRleC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguY3BwCmluZGV4 IGNmNzkxYzguLmQyNTlmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9NZW1vcnlJbmRleC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUluZGV4LmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZv aWQgTWVtb3J5SW5kZXg6OnJlcGxhY2VJbmRleFZhbHVlU3RvcmUoc3RkOjp1bmlxdWVfcHRyPElu ZGV4VmFsdWVTdG9yZT4mJiB2YWx1CiAKIElEQkdldFJlc3VsdCBNZW1vcnlJbmRleDo6Z2V0UmVz dWx0Rm9yS2V5UmFuZ2UoSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgdHlwZSwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiByYW5nZSkgY29uc3QKIHsKLSAgICBMT0coSW5kZXhlZERCLCAiTWVtb3J5 SW5kZXg6OmdldFJlc3VsdEZvcktleVJhbmdlIik7CisgICAgTE9HKEluZGV4ZWREQiwgIk1lbW9y eUluZGV4OjpnZXRSZXN1bHRGb3JLZXlSYW5nZSAtICVzIiwgcmFuZ2UubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgaWYgKCFtX3JlY29yZHMpCiAgICAgICAgIHJldHVybiB7 IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv U1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IGNkNjUxNTYuLmZlNzIy ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9T UUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBAIC04MzgsMTAgKzgzOCwx MCBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hlY2tlZFB1dEluZGV4S2V5 KGNvbnN0IElEQkluZGV4SW5mbyYgaW5mbywgYwogewogICAgIGlmICghaW5mby5tdWx0aUVudHJ5 KCkpIHsKICAgICAgICAgYXV0byBlcnJvciA9IHVuY2hlY2tlZFB1dEluZGV4UmVjb3JkKGluZm8u b2JqZWN0U3RvcmVJZGVudGlmaWVyKCksIGluZm8uaWRlbnRpZmllcigpLCBrZXksIGluZGV4S2V5 LmFzT25lS2V5KCkpOwotICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgIGlm ICghZXJyb3IuaXNOdWxsKCkpCiAgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBwdXQg aW5kZXggcmVjb3JkIGZvciBuZXdseSBjcmVhdGVkIGluZGV4Iik7Ci0gICAgICAgICAgICByZXR1 cm4gZXJyb3I7Ci0gICAgICAgIH0KKworICAgICAgICByZXR1cm4gZXJyb3I7CiAgICAgfQogCiAg ICAgVmVjdG9yPElEQktleURhdGE+IGluZGV4S2V5cyA9IGluZGV4S2V5Lm11bHRpRW50cnkoKTsK QEAgLTg3MSw2ICs4NzEsOCBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hl Y2tlZFB1dEluZGV4S2V5KGNvbnN0IElEQkluZGV4SW5mbyYgaW5mbywgYwogCiBJREJFcnJvciBT UUxpdGVJREJCYWNraW5nU3RvcmU6OnVuY2hlY2tlZFB1dEluZGV4UmVjb3JkKGludDY0X3Qgb2Jq ZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiBr ZXlWYWx1ZSwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYgaW5kZXhLZXkpCiB7CisgICAgTE9H KEluZGV4ZWREQiwgIlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dW5jaGVja2VkUHV0SW5kZXhSZWNv cmQgLSAlcywgJXMiLCBrZXlWYWx1ZS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgaW5k ZXhLZXkubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgUmVmUHRyPFNoYXJl ZEJ1ZmZlcj4gaW5kZXhLZXlCdWZmZXIgPSBzZXJpYWxpemVJREJLZXlEYXRhKGluZGV4S2V5KTsK ICAgICBpZiAoIWluZGV4S2V5QnVmZmVyKSB7CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRv IHNlcmlhbGl6ZSBpbmRleCBrZXkgdG8gYmUgc3RvcmVkIGluIHRoZSBkYXRhYmFzZSIpOwpAQCAt MTIxMyw3ICsxMjE1LDggQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRSZWNv cmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGkKIAogSURCRXJyb3IgU1FM aXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRleFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJRCwgdWlu dDY0X3QgaW5kZXhJRCwgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgdHlwZSwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiByYW5nZSwgSURCR2V0UmVzdWx0JiBnZXRSZXN1bHQpCiB7Ci0gICAgTE9H KEluZGV4ZWREQiwgIlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0SW5kZXhSZWNvcmQiKTsKKyAg ICBMT0coSW5kZXhlZERCLCAiU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRleFJlY29yZCAt ICVzIiwgcmFuZ2UubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgQVNTRVJU KG1fc3FsaXRlREIpOwogICAgIEFTU0VSVChtX3NxbGl0ZURCLT5pc09wZW4oKSk7CiAKQEAgLTEy MjksMTEgKzEyMzIsMjAgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRJbmRl eFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW4KICAgICAgICAgcmV0dXJu IHsgSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJDYW5u b3Qgb3BlbiBjdXJzb3IgdG8gcGVyZm9ybSBpbmRleCBnZXQgaW4gZGF0YWJhc2UiKSB9OwogICAg IH0KIAotICAgIGlmICh0eXBlID09IEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlOjpLZXkpCi0g ICAgICAgIGdldFJlc3VsdCA9IHsgY3Vyc29yLT5jdXJyZW50UHJpbWFyeUtleSgpIH07Ci0gICAg ZWxzZSB7Ci0gICAgICAgIGdldFJlc3VsdCA9IHsgU2hhcmVkQnVmZmVyOjpjcmVhdGUoY3Vyc29y LT5jdXJyZW50VmFsdWVCdWZmZXIoKS5kYXRhKCksIGN1cnNvci0+Y3VycmVudFZhbHVlQnVmZmVy KCkuc2l6ZSgpKSB9OwotICAgICAgICBnZXRSZXN1bHQuc2V0S2V5RGF0YShjdXJzb3ItPmN1cnJl bnRQcmltYXJ5S2V5KCkpOworICAgIGlmIChjdXJzb3ItPmRpZEVycm9yKCkpIHsKKyAgICAgICAg TE9HX0VSUk9SKCJDdXJzb3IgZmFpbGVkIHdoaWxlIGxvb2tpbmcgdXAgaW5kZXggcmVjb3JkIGlu IGRhdGFiYXNlIik7CisgICAgICAgIHJldHVybiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtu b3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiQ3Vyc29yIGZhaWxlZCB3aGlsZSBsb29raW5nIHVwIGlu ZGV4IHJlY29yZCBpbiBkYXRhYmFzZSIpIH07CisgICAgfQorCisgICAgaWYgKGN1cnNvci0+ZGlk Q29tcGxldGUoKSkgeworICAgICAgICBnZXRSZXN1bHQgPSB7IH07CisgICAgfSBlbHNlIHsKKyAg ICAgICAgaWYgKHR5cGUgPT0gSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGU6OktleSkKKyAgICAg ICAgICAgIGdldFJlc3VsdCA9IHsgY3Vyc29yLT5jdXJyZW50UHJpbWFyeUtleSgpIH07CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgZ2V0UmVzdWx0ID0geyBTaGFyZWRCdWZmZXI6OmNyZWF0 ZShjdXJzb3ItPmN1cnJlbnRWYWx1ZUJ1ZmZlcigpLmRhdGEoKSwgY3Vyc29yLT5jdXJyZW50VmFs dWVCdWZmZXIoKS5zaXplKCkpIH07CisgICAgICAgICAgICBnZXRSZXN1bHQuc2V0S2V5RGF0YShj dXJzb3ItPmN1cnJlbnRQcmltYXJ5S2V5KCkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0 dXJuIHsgfTsKQEAgLTE0MTIsNiArMTQyNCw4IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdT dG9yZTo6b3BlbkN1cnNvcihjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0CiAK IElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6aXRlcmF0ZUN1cnNvcihjb25zdCBJREJS ZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURCUmVzb3Vy Y2VJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBjb25zdCBJREJLZXlEYXRhJiBrZXksIHVp bnQzMl90IGNvdW50LCBJREJHZXRSZXN1bHQmIHJlc3VsdCkKIHsKKyAgICBMT0coSW5kZXhlZERC LCAiU1FMaXRlSURCQmFja2luZ1N0b3JlOjppdGVyYXRlQ3Vyc29yIik7CisKICAgICBBU1NFUlQo bV9zcWxpdGVEQik7CiAgICAgQVNTRVJUKG1fc3FsaXRlREItPmlzT3BlbigpKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkN1 cnNvci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlE QkN1cnNvci5oCmluZGV4IDFlN2M2YjkuLjM3YjExYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJDdXJzb3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQ3Vyc29yLmgKQEAg LTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWR2YW5jZSh1aW50NjRfdCBjb3VudCk7 CiAgICAgYm9vbCBpdGVyYXRlKGNvbnN0IElEQktleURhdGEmIHRhcmdldEtleSk7CiAKKyAgICBi b29sIGRpZENvbXBsZXRlKCkgY29uc3QgeyByZXR1cm4gbV9jb21wbGV0ZWQ7IH0KICAgICBib29s IGRpZEVycm9yKCkgY29uc3QgeyByZXR1cm4gbV9lcnJvcmVkOyB9CiAKICAgICB2b2lkIG9iamVj dFN0b3JlUmVjb3Jkc0NoYW5nZWQoKTsK