224221 2021-04-05 21:00:25 -0700 Shrink some IndexedDB-related classes 2021-04-06 14:55:08 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser alecflett beidson darin ews-watchlist ggaren jsbell sihui_liu simon.fraser webkit-bug-importer oldest_to_newest 1747263 0 simon.fraser 2021-04-05 21:00:25 -0700 Shrink some IndexedDB-related classes 1747264 1 425237 simon.fraser 2021-04-05 21:02:44 -0700 Created attachment 425237 Patch 1747564 2 425237 ggaren 2021-04-06 12:18:01 -0700 Comment on attachment 425237 Patch r=me iOS-wk2 EWS failures seem unrelated 1747615 3 ews-feeder 2021-04-06 13:43:06 -0700 Committed r275547: <https://commits.webkit.org/r275547> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425237. 1747616 4 webkit-bug-importer 2021-04-06 13:44:17 -0700 <rdar://problem/76282457> 1747641 5 425237 darin 2021-04-06 14:30:58 -0700 Comment on attachment 425237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425237&action=review > Source/WebCore/Modules/indexeddb/IndexedDB.h:62 > +enum class VersionNullness : uint8_t { Why not bool? > Source/WebCore/Modules/indexeddb/IndexedDB.h:78 > +enum class ObjectStoreRecordType : uint8_t { Why not bool? > Source/WebCore/Modules/indexeddb/IndexedDB.h:101 > +enum class GetAllType : uint8_t { Why not bool? 1747655 6 simon.fraser 2021-04-06 14:48:55 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 425237 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=425237&action=review > > > Source/WebCore/Modules/indexeddb/IndexedDB.h:62 > > +enum class VersionNullness : uint8_t { > > Why not bool? Do we prefer bool over uint8_t? Both are common in the code. If so, we should put this in the coding guidelines and update the style checker. 1747656 7 darin 2021-04-06 14:55:08 -0700 (In reply to Simon Fraser (smfr) from comment #6) > Do we prefer bool over uint8_t? Both are common in the code. If so, we > should put this in the coding guidelines and update the style checker. I certainly do for things that are obviously "Yes/No". And I prefer them for anything where there are only two states. But maybe we don’t have consensus. Makes sense that both are common. Having no type at all is also common. 425237 2021-04-05 21:02:44 -0700 2021-04-06 13:43:07 -0700 Patch bug-224221-20210405210243.patch text/plain 19397 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YwMTc0YTA0NzlhODlm YmFlODRkMjYzMDU2YWZiNzllZWFhYjkyMC4uNDYzMjgwMzdkNTdkYTZlYTNjZWI5NTVlMzcxYmFi ODZjNTBlMDE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIxLTA0LTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNocmluayBzb21l IEluZGV4ZWREQi1yZWxhdGVkIGNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNDIyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNocmluayBzb21lIGVudW0gY2xhc3NlcywgYW5kIHJlLW9yZGVy IGRhdGEgbWVtYmVycyB0byBvcHRpbWl6ZSBwYWNraW5nIGluIAorICAgICAgICBJREJSZXF1ZXN0 IGFuZCBJREJLZXlSYW5nZURhdGEuCisKKyAgICAgICAgQSBjb3VwbGUgb2YgZGF0YSBtZW1iZXJz IG9mIElEQlJlcXVlc3Qgd2VyZSBtYWRlIHByaXZhdGUgd2l0aCBwcm90ZWN0ZWQgc2V0dGVycy4K KworICAgICAgICBUaGlzIHNocmlua3MgSURCUmVxdWVzdCBmcm9tIDQ5NiBieXRlcyB0byA0NDgg Ynl0ZXMsIGFuZCBJREJLZXlSYW5nZURhdGEgZnJvbSA5NgorICAgICAgICB0byA3MiBieXRlcyBv biB4ODZfNjQuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmg6Cisg ICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2VEYXRhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OklEQktleVJhbmdlRGF0YTo6SURCS2V5UmFuZ2VEYXRhKToKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZURhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OklE QktleVJhbmdlRGF0YTo6SURCS2V5UmFuZ2VEYXRhKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9JREJPYmplY3RTdG9yZS5oOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQk9w ZW5EQlJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCT3BlbkRCUmVxdWVzdDo6SURC T3BlbkRCUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJPcGVuREJSZXF1ZXN0Ojp2ZXJz aW9uQ2hhbmdlVHJhbnNhY3Rpb25EaWRGaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6SURCT3Bl bkRCUmVxdWVzdDo6b25TdWNjZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OklEQk9wZW5EQlJlcXVl c3Q6Om9uVXBncmFkZU5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpJREJPcGVuREJSZXF1ZXN0 OjpvbkRlbGV0ZURhdGFiYXNlU3VjY2Vzcyk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv SURCUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJSZXF1ZXN0OjpJREJSZXF1ZXN0 KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0Lmg6CisgICAgICAgIChX ZWJDb3JlOjpJREJSZXF1ZXN0OjpzZXRSZWFkeVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OklE QlJlcXVlc3Q6OnNldFNob3VsZEV4cG9zZVRyYW5zYWN0aW9uVG9ET00pOgorICAgICAgICAqIE1v ZHVsZXMvaW5kZXhlZGRiL0luZGV4ZWREQi5oOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRi L2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0ZS5oOgorICAgICAgICAqIE1vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJbmRleC5oOgorICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5oOgorICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL3NoYXJlZC9JREJDdXJzb3JJbmZvLmg6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVk ZGIvc2hhcmVkL0lEQkdldEFsbFJlY29yZHNEYXRhLmg6CisKIDIwMjEtMDQtMDIgIEFsZXhleSBT aHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92ZSBbUmVwbGFj ZWFibGVdIGV4dGVuZGVkIGF0dHJpYnV0ZSBmcm9tIGBkb2N1bWVudC5hbGxgCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmggYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmgKaW5kZXggNmY1MGM0NzE1MmZi NjAwNzEwYjU4NTJkMGRlZGI2ODk1NzExYTI2MS4uNDM5YzRiMDc0MDE2ZDliMjUyMzdmNjlkZThi YmU2NWM1M2ViMjkwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCS2V5RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QktleURhdGEuaApAQCAtMTkxLDEwICsxOTEsMTAgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9p ZCBpc29sYXRlZENvcHkoY29uc3QgSURCS2V5RGF0YSYgc291cmNlLCBJREJLZXlEYXRhJiBkZXN0 aW5hdGlvbik7CiAKICAgICBJbmRleGVkREI6OktleVR5cGUgbV90eXBlOwotICAgIFZhcmlhbnQ8 VmVjdG9yPElEQktleURhdGE+LCBTdHJpbmcsIGRvdWJsZSwgVGhyZWFkU2FmZURhdGFCdWZmZXI+ IG1fdmFsdWU7Ci0KICAgICBib29sIG1faXNOdWxsIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNE ZWxldGVkVmFsdWUgeyBmYWxzZSB9OworCisgICAgVmFyaWFudDxWZWN0b3I8SURCS2V5RGF0YT4s IFN0cmluZywgZG91YmxlLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlcj4gbV92YWx1ZTsKIH07CiAKIHN0 cnVjdCBJREJLZXlEYXRhSGFzaCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJLZXlSYW5nZURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCS2V5UmFuZ2VEYXRhLmNwcAppbmRleCAyNTUzMmJkNTVkNjVjOGM1OThkZjE2 ZWM3M2IzM2E2NTRhYjRlZWY0Li43YzJhODFlMjQ2NGQ0YWM2ZjY5MWY2ZjdhY2Y5YjZiYWFjYmUy MTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlS YW5nZURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktl eVJhbmdlRGF0YS5jcHAKQEAgLTMxLDIwICszMSwxNiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBJREJLZXlSYW5nZURhdGE6OklEQktleVJhbmdlRGF0YShJREJLZXkqIGtleSkKLSAgICA6IGlz TnVsbCgha2V5KQotICAgICwgbG93ZXJLZXkoa2V5KQorICAgIDogbG93ZXJLZXkoa2V5KQogICAg ICwgdXBwZXJLZXkoa2V5KQotICAgICwgbG93ZXJPcGVuKGZhbHNlKQotICAgICwgdXBwZXJPcGVu KGZhbHNlKQorICAgICwgaXNOdWxsKCFrZXkpCiB7CiB9CiAKIElEQktleVJhbmdlRGF0YTo6SURC S2V5UmFuZ2VEYXRhKGNvbnN0IElEQktleURhdGEmIGtleURhdGEpCi0gICAgOiBpc051bGwoa2V5 RGF0YS5pc051bGwoKSkKLSAgICAsIGxvd2VyS2V5KGtleURhdGEpCisgICAgOiBsb3dlcktleShr ZXlEYXRhKQogICAgICwgdXBwZXJLZXkoa2V5RGF0YSkKLSAgICAsIGxvd2VyT3BlbihmYWxzZSkK LSAgICAsIHVwcGVyT3BlbihmYWxzZSkKKyAgICAsIGlzTnVsbChrZXlEYXRhLmlzTnVsbCgpKQog ewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJL ZXlSYW5nZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJh bmdlRGF0YS5oCmluZGV4IGJlODUxYzViYzJjMGIxMThlMjJlNjU2MDRiYjkzMjBjZjNkMmIwYWIu LmYzMDVjMGVmODg2NzllODMyOWY3NTgwZmU3MTk4YmMzMWE0ZTBkYzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlRGF0YS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlRGF0YS5oCkBAIC0zNSw4 ICszNSw2IEBAIGNsYXNzIElEQktleTsKIHN0cnVjdCBJREJLZXlSYW5nZURhdGEgewogICAgIElE QktleVJhbmdlRGF0YSgpCiAgICAgICAgIDogaXNOdWxsKHRydWUpCi0gICAgICAgICwgbG93ZXJP cGVuKGZhbHNlKQotICAgICAgICAsIHVwcGVyT3BlbihmYWxzZSkKICAgICB7CiAgICAgfQogCkBA IC01NCw4ICs1Miw2IEBAIHN0cnVjdCBJREJLZXlSYW5nZURhdGEgewogCiAgICAgSURCS2V5UmFu Z2VEYXRhKElEQktleVJhbmdlKiBrZXlSYW5nZSkKICAgICAgICAgOiBpc051bGwoIWtleVJhbmdl KQotICAgICAgICAsIGxvd2VyT3BlbihmYWxzZSkKLSAgICAgICAgLCB1cHBlck9wZW4oZmFsc2Up CiAgICAgewogICAgICAgICBpZiAoaXNOdWxsKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtNzcs MTMgKzczLDEzIEBAIHN0cnVjdCBJREJLZXlSYW5nZURhdGEgewogICAgIHRlbXBsYXRlPGNsYXNz IEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKICAgICB0ZW1wbGF0ZTxjbGFz cyBEZWNvZGVyPiBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJvb2wgZGVjb2RlKERlY29kZXIm LCBJREJLZXlSYW5nZURhdGEmKTsKIAotICAgIGJvb2wgaXNOdWxsOwotCiAgICAgSURCS2V5RGF0 YSBsb3dlcktleTsKICAgICBJREJLZXlEYXRhIHVwcGVyS2V5OwogCi0gICAgYm9vbCBsb3dlck9w ZW47Ci0gICAgYm9vbCB1cHBlck9wZW47CisgICAgYm9vbCBsb3dlck9wZW4geyBmYWxzZSB9Owor ICAgIGJvb2wgdXBwZXJPcGVuIHsgZmFsc2UgfTsKKworICAgIGJvb2wgaXNOdWxsOwogCiAjaWYg IUxPR19ESVNBQkxFRAogICAgIFN0cmluZyBsb2dnaW5nU3RyaW5nKCkgY29uc3Q7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaAppbmRleCA3 MjVhN2U1YmVkMDhlOWQ4ZWRiM2Y1MmEzZjQ0MjVhMTFiYmU5YTdjLi5kMmQ1NTNhODY4OWNhNjM3 ZDg4ZTM1YTc1MjI0ZjI3ZDY1OWU5NWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmgKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgSURC VHJhbnNhY3Rpb247CiBzdHJ1Y3QgSURCS2V5UmFuZ2VEYXRhOwogCiBuYW1lc3BhY2UgSW5kZXhl ZERCIHsKLWVudW0gY2xhc3MgT2JqZWN0U3RvcmVPdmVyd3JpdGVNb2RlOworZW51bSBjbGFzcyBP YmplY3RTdG9yZU92ZXJ3cml0ZU1vZGUgOiB1aW50OF90OwogfQogCiBjbGFzcyBJREJPYmplY3RT dG9yZSBmaW5hbCA6IHB1YmxpYyBBY3RpdmVET01PYmplY3QgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT3BlbkRCUmVxdWVzdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmNwcAppbmRleCA0OWI3 ZGRiN2IzYjNiYzg1NGZlZWM4YWJiODZkY2ZlZTA2OTkzYzE4Li4wNDFlYzcyMTljMTY0YjBlODhk Njg3ZTQ1NmUxMDEyODlhODNjZThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmNwcApAQCAtNTUsMTEgKzU1LDEwIEBAIFJl ZjxJREJPcGVuREJSZXF1ZXN0PiBJREJPcGVuREJSZXF1ZXN0OjpjcmVhdGVPcGVuUmVxdWVzdChT Y3JpcHRFeGVjdXRpb25Db250ZXh0CiB9CiAgICAgCiBJREJPcGVuREJSZXF1ZXN0OjpJREJPcGVu REJSZXF1ZXN0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIElEQkNsaWVudDo6SURC Q29ubmVjdGlvblByb3h5JiBjb25uZWN0aW9uUHJveHksIGNvbnN0IElEQkRhdGFiYXNlSWRlbnRp ZmllciYgZGF0YWJhc2VJZGVudGlmaWVyLCB1aW50NjRfdCB2ZXJzaW9uLCBJbmRleGVkREI6OlJl cXVlc3RUeXBlIHJlcXVlc3RUeXBlKQotICAgIDogSURCUmVxdWVzdChjb250ZXh0LCBjb25uZWN0 aW9uUHJveHkpCisgICAgOiBJREJSZXF1ZXN0KGNvbnRleHQsIGNvbm5lY3Rpb25Qcm94eSwgcmVx dWVzdFR5cGUpCiAgICAgLCBtX2RhdGFiYXNlSWRlbnRpZmllcihkYXRhYmFzZUlkZW50aWZpZXIp CiAgICAgLCBtX3ZlcnNpb24odmVyc2lvbikKIHsKLSAgICBtX3JlcXVlc3RUeXBlID0gcmVxdWVz dFR5cGU7CiB9CiAKIElEQk9wZW5EQlJlcXVlc3Q6On5JREJPcGVuREJSZXF1ZXN0KCkKQEAgLTgx LDcgKzgwLDcgQEAgdm9pZCBJREJPcGVuREJSZXF1ZXN0Ojp2ZXJzaW9uQ2hhbmdlVHJhbnNhY3Rp b25EaWRGaW5pc2goKQogCiAgICAgLy8gMy4zLjcgInZlcnNpb25jaGFuZ2UiIHRyYW5zYWN0aW9u IHN0ZXBzCiAgICAgLy8gV2hlbiB0aGUgdHJhbnNhY3Rpb24gaXMgZmluaXNoZWQsIGFmdGVyIGZp cmluZyBjb21wbGV0ZS9hYm9ydCBvbiB0aGUgdHJhbnNhY3Rpb24sIGltbWVkaWF0ZWx5IHNldCBy ZXF1ZXN0J3MgdHJhbnNhY3Rpb24gcHJvcGVydHkgdG8gbnVsbC4KLSAgICBtX3Nob3VsZEV4cG9z ZVRyYW5zYWN0aW9uVG9ET00gPSBmYWxzZTsKKyAgICBzZXRTaG91bGRFeHBvc2VUcmFuc2FjdGlv blRvRE9NKGZhbHNlKTsKIH0KIAogdm9pZCBJREJPcGVuREJSZXF1ZXN0OjpmaXJlU3VjY2Vzc0Fm dGVyVmVyc2lvbkNoYW5nZUNvbW1pdCgpCkBAIC0xMzcsNyArMTM2LDcgQEAgdm9pZCBJREJPcGVu REJSZXF1ZXN0OjpvblN1Y2Nlc3MoY29uc3QgSURCUmVzdWx0RGF0YSYgcmVzdWx0RGF0YSkKICAg ICBBU1NFUlQoY2FuQ3VycmVudFRocmVhZEFjY2Vzc1RocmVhZExvY2FsRGF0YShvcmlnaW5UaHJl YWQoKSkpOwogCiAgICAgc2V0UmVzdWx0KElEQkRhdGFiYXNlOjpjcmVhdGUoKnNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSwgY29ubmVjdGlvblByb3h5KCksIHJlc3VsdERhdGEpKTsKLSAgICBtX3Jl YWR5U3RhdGUgPSBSZWFkeVN0YXRlOjpEb25lOworICAgIHNldFJlYWR5U3RhdGUoUmVhZHlTdGF0 ZTo6RG9uZSk7CiAKICAgICBlbnF1ZXVlRXZlbnQoSURCUmVxdWVzdENvbXBsZXRpb25FdmVudDo6 Y3JlYXRlKGV2ZW50TmFtZXMoKS5zdWNjZXNzRXZlbnQsIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBF dmVudDo6SXNDYW5jZWxhYmxlOjpObywgKnRoaXMpKTsKIH0KQEAgLTE1OCw3ICsxNTcsNyBAQCB2 b2lkIElEQk9wZW5EQlJlcXVlc3Q6Om9uVXBncmFkZU5lZWRlZChjb25zdCBJREJSZXN1bHREYXRh JiByZXN1bHREYXRhKQogICAgIExPRyhJbmRleGVkREIsICJJREJPcGVuREJSZXF1ZXN0OjpvblVw Z3JhZGVOZWVkZWQoKSAtIGN1cnJlbnQgdmVyc2lvbiBpcyAlIiBQUkl1NjQgIiwgbmV3IGlzICUi IFBSSXU2NCwgb2xkVmVyc2lvbiwgbmV3VmVyc2lvbik7CiAKICAgICBzZXRSZXN1bHQoV1RGTW92 ZShkYXRhYmFzZSkpOwotICAgIG1fcmVhZHlTdGF0ZSA9IFJlYWR5U3RhdGU6OkRvbmU7CisgICAg c2V0UmVhZHlTdGF0ZShSZWFkeVN0YXRlOjpEb25lKTsKICAgICBtX3RyYW5zYWN0aW9uID0gV1RG TW92ZSh0cmFuc2FjdGlvbik7CiAgICAgbV90cmFuc2FjdGlvbi0+YWRkUmVxdWVzdCgqdGhpcyk7 CiAKQEAgLTE3Myw3ICsxNzIsNyBAQCB2b2lkIElEQk9wZW5EQlJlcXVlc3Q6Om9uRGVsZXRlRGF0 YWJhc2VTdWNjZXNzKGNvbnN0IElEQlJlc3VsdERhdGEmIHJlc3VsdERhdGEpCiAKICAgICBMT0co SW5kZXhlZERCLCAiSURCT3BlbkRCUmVxdWVzdDo6b25EZWxldGVEYXRhYmFzZVN1Y2Nlc3MoKSAt IGN1cnJlbnQgdmVyc2lvbiBpcyAlIiBQUkl1NjQsIG9sZFZlcnNpb24pOwogCi0gICAgbV9yZWFk eVN0YXRlID0gUmVhZHlTdGF0ZTo6RG9uZTsKKyAgICBzZXRSZWFkeVN0YXRlKFJlYWR5U3RhdGU6 OkRvbmUpOwogICAgIHNldFJlc3VsdFRvVW5kZWZpbmVkKCk7CiAKICAgICBlbnF1ZXVlRXZlbnQo SURCVmVyc2lvbkNoYW5nZUV2ZW50OjpjcmVhdGUob2xkVmVyc2lvbiwgMCwgZXZlbnROYW1lcygp LnN1Y2Nlc3NFdmVudCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9J REJSZXF1ZXN0LmNwcAppbmRleCBmODU5MDRlYWVmMDlkMGJkZjdjY2Y3ZGRhMWQzY2JmZWExMDE0 NzBkLi4wMDBlZDVlZjMwNGY3MTczYjFkNGUyY2FiYmVkYmRkZDZkYzkxN2M2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmNwcApAQCAtODEsMTIg KzgxLDEzIEBAIFJlZjxJREJSZXF1ZXN0PiBJREJSZXF1ZXN0OjpjcmVhdGVJbmRleEdldChTY3Jp cHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBJREJJCiAgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgSURCUmVxdWVzdChjb250ZXh0LCBpbmRleCwgcmVxdWVzdGVkUmVjb3JkVHlwZSwgdHJhbnNh Y3Rpb24pKTsKIH0KIAotSURCUmVxdWVzdDo6SURCUmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250 ZXh0JiBjb250ZXh0LCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSYgY29ubmVjdGlvblBy b3h5KQorSURCUmVxdWVzdDo6SURCUmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250 ZXh0LCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSYgY29ubmVjdGlvblByb3h5LCBJbmRl eGVkREI6OlJlcXVlc3RUeXBlIHJlcXVlc3RUeXBlKQogICAgIDogSURCQWN0aXZlRE9NT2JqZWN0 KCZjb250ZXh0KQogICAgICwgbV9yZXNvdXJjZUlkZW50aWZpZXIoY29ubmVjdGlvblByb3h5KQor ICAgICwgbV9yZXN1bHQoTnVsbFJlc3VsdFR5cGU6OlVuZGVmaW5lZCkKICAgICAsIG1fY29ubmVj dGlvblByb3h5KGNvbm5lY3Rpb25Qcm94eSkKKyAgICAsIG1fcmVxdWVzdFR5cGUocmVxdWVzdFR5 cGUpCiB7Ci0gICAgbV9yZXN1bHQgPSBOdWxsUmVzdWx0VHlwZTo6VW5kZWZpbmVkOwogICAgIHN1 c3BlbmRJZk5lZWRlZCgpOwogfQogCkBAIC05NCwxMCArOTUsMTAgQEAgSURCUmVxdWVzdDo6SURC UmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBJREJPYmplY3RTdG9yZSYg b2JqZWN0U3QKICAgICA6IElEQkFjdGl2ZURPTU9iamVjdCgmY29udGV4dCkKICAgICAsIG1fdHJh bnNhY3Rpb24oJnRyYW5zYWN0aW9uKQogICAgICwgbV9yZXNvdXJjZUlkZW50aWZpZXIodHJhbnNh Y3Rpb24uY29ubmVjdGlvblByb3h5KCkpCisgICAgLCBtX3Jlc3VsdChOdWxsUmVzdWx0VHlwZTo6 VW5kZWZpbmVkKQogICAgICwgbV9zb3VyY2UoJm9iamVjdFN0b3JlKQogICAgICwgbV9jb25uZWN0 aW9uUHJveHkodHJhbnNhY3Rpb24uZGF0YWJhc2UoKS5jb25uZWN0aW9uUHJveHkoKSkKIHsKLSAg ICBtX3Jlc3VsdCA9IE51bGxSZXN1bHRUeXBlOjpVbmRlZmluZWQ7CiAgICAgc3VzcGVuZElmTmVl ZGVkKCk7CiB9CiAKQEAgLTEwNSw2ICsxMDYsNyBAQCBJREJSZXF1ZXN0OjpJREJSZXF1ZXN0KFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIElEQkN1cnNvciYgY3Vyc29yLCBJREJUcgog ICAgIDogSURCQWN0aXZlRE9NT2JqZWN0KCZjb250ZXh0KQogICAgICwgbV90cmFuc2FjdGlvbigm dHJhbnNhY3Rpb24pCiAgICAgLCBtX3Jlc291cmNlSWRlbnRpZmllcih0cmFuc2FjdGlvbi5jb25u ZWN0aW9uUHJveHkoKSkKKyAgICAsIG1fcmVzdWx0KE51bGxSZXN1bHRUeXBlOjpVbmRlZmluZWQp CiAgICAgLCBtX3BlbmRpbmdDdXJzb3IoJmN1cnNvcikKICAgICAsIG1fY29ubmVjdGlvblByb3h5 KHRyYW5zYWN0aW9uLmRhdGFiYXNlKCkuY29ubmVjdGlvblByb3h5KCkpCiB7CkBAIC0xMTQsNyAr MTE2LDYgQEAgSURCUmVxdWVzdDo6SURCUmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj b250ZXh0LCBJREJDdXJzb3ImIGN1cnNvciwgSURCVHIKICAgICAgICAgW3RoaXNdIChjb25zdCBh dXRvJiB2YWx1ZSkgeyB0aGlzLT5tX3NvdXJjZSA9IElEQlJlcXVlc3Q6OlNvdXJjZSB7IHZhbHVl IH07IH0KICAgICApOwogCi0gICAgbV9yZXN1bHQgPSBOdWxsUmVzdWx0VHlwZTo6VW5kZWZpbmVk OwogICAgIGN1cnNvci5zZXRSZXF1ZXN0KCp0aGlzKTsKIH0KIApAQCAtMTIyLDEwICsxMjMsMTAg QEAgSURCUmVxdWVzdDo6SURCUmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0 LCBJREJJbmRleCYgaW5kZXgsIElEQlRyYW4KICAgICA6IElEQkFjdGl2ZURPTU9iamVjdCgmY29u dGV4dCkKICAgICAsIG1fdHJhbnNhY3Rpb24oJnRyYW5zYWN0aW9uKQogICAgICwgbV9yZXNvdXJj ZUlkZW50aWZpZXIodHJhbnNhY3Rpb24uY29ubmVjdGlvblByb3h5KCkpCisgICAgLCBtX3Jlc3Vs dChOdWxsUmVzdWx0VHlwZTo6VW5kZWZpbmVkKQogICAgICwgbV9zb3VyY2UoJmluZGV4KQogICAg ICwgbV9jb25uZWN0aW9uUHJveHkodHJhbnNhY3Rpb24uZGF0YWJhc2UoKS5jb25uZWN0aW9uUHJv eHkoKSkKIHsKLSAgICBtX3Jlc3VsdCA9IE51bGxSZXN1bHRUeXBlOjpVbmRlZmluZWQ7CiAgICAg c3VzcGVuZElmTmVlZGVkKCk7CiB9CiAKQEAgLTEzMywxOCArMTM0LDE3IEBAIElEQlJlcXVlc3Q6 OklEQlJlcXVlc3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgSURCT2JqZWN0U3Rv cmUmIG9iamVjdFN0CiAgICAgOiBJREJBY3RpdmVET01PYmplY3QoJmNvbnRleHQpCiAgICAgLCBt X3RyYW5zYWN0aW9uKCZ0cmFuc2FjdGlvbikKICAgICAsIG1fcmVzb3VyY2VJZGVudGlmaWVyKHRy YW5zYWN0aW9uLmNvbm5lY3Rpb25Qcm94eSgpKQorICAgICwgbV9yZXN1bHQoTnVsbFJlc3VsdFR5 cGU6OlVuZGVmaW5lZCkKICAgICAsIG1fc291cmNlKCZvYmplY3RTdG9yZSkKLSAgICAsIG1fcmVx dWVzdGVkT2JqZWN0U3RvcmVSZWNvcmRUeXBlKHR5cGUpCiAgICAgLCBtX2Nvbm5lY3Rpb25Qcm94 eSh0cmFuc2FjdGlvbi5kYXRhYmFzZSgpLmNvbm5lY3Rpb25Qcm94eSgpKQorICAgICwgbV9yZXF1 ZXN0ZWRPYmplY3RTdG9yZVJlY29yZFR5cGUodHlwZSkKIHsKLSAgICBtX3Jlc3VsdCA9IE51bGxS ZXN1bHRUeXBlOjpVbmRlZmluZWQ7CiAgICAgc3VzcGVuZElmTmVlZGVkKCk7CiB9CiAKIElEQlJl cXVlc3Q6OklEQlJlcXVlc3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgSURCSW5k ZXgmIGluZGV4LCBJbmRleGVkREI6OkluZGV4UmVjb3JkVHlwZSByZXF1ZXN0ZWRSZWNvcmRUeXBl LCBJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24pCiAgICAgOiBJREJSZXF1ZXN0KGNvbnRleHQs IGluZGV4LCB0cmFuc2FjdGlvbikKIHsKLSAgICBtX3Jlc3VsdCA9IE51bGxSZXN1bHRUeXBlOjpV bmRlZmluZWQ7CiAgICAgbV9yZXF1ZXN0ZWRJbmRleFJlY29yZFR5cGUgPSByZXF1ZXN0ZWRSZWNv cmRUeXBlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1 ZXN0LmgKaW5kZXggZjk1NzFiM2QwNmM5Yzk1MjhlZmNjMzkwY2YzMTkyYTA0YjgzYmRhNy4uODEx NGE3Mjc5NTQ0YTk1NTVlODEwYmMwYjU0NDYxYTY1Zjg0ZmM0NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3QuaApAQCAtMTI2LDI0ICsxMjYsMTggQEAg cHVibGljOgogICAgIHZvaWQgc2V0VHJhbnNhY3Rpb25PcGVyYXRpb25JRCh1aW50NjRfdCB0cmFu c2FjdGlvbk9wZXJhdGlvbklEKSB7IG1fY3VycmVudFRyYW5zYWN0aW9uT3BlcmF0aW9uSUQgPSB0 cmFuc2FjdGlvbk9wZXJhdGlvbklEOyB9CiAKIHByb3RlY3RlZDoKLSAgICBJREJSZXF1ZXN0KFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSYpOwor ICAgIElEQlJlcXVlc3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIElEQkNsaWVudDo6SURCQ29u bmVjdGlvblByb3h5JiwgSW5kZXhlZERCOjpSZXF1ZXN0VHlwZSk7CiAKICAgICB2b2lkIGVucXVl dWVFdmVudChSZWY8RXZlbnQ+JiYpOwogICAgIHZvaWQgZGlzcGF0Y2hFdmVudChFdmVudCYpIG92 ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRSZXN1bHQoUmVmPElEQkRhdGFiYXNlPiYmKTsKKyAgICB2 b2lkIHNldFJlYWR5U3RhdGUoUmVhZHlTdGF0ZSBzdGF0ZSkgeyBtX3JlYWR5U3RhdGUgPSBzdGF0 ZTsgfQorICAgIAorICAgIHZvaWQgc2V0U2hvdWxkRXhwb3NlVHJhbnNhY3Rpb25Ub0RPTShib29s IHNob3VsZEV4cG9zZVRyYW5zYWN0aW9uVG9ET00pIHsgbV9zaG91bGRFeHBvc2VUcmFuc2FjdGlv blRvRE9NID0gc2hvdWxkRXhwb3NlVHJhbnNhY3Rpb25Ub0RPTTsgfQogCiAgICAgSURCQ2xpZW50 OjpJREJDb25uZWN0aW9uUHJveHkmIGNvbm5lY3Rpb25Qcm94eSgpIHsgcmV0dXJuIG1fY29ubmVj dGlvblByb3h5LmdldCgpOyB9CiAKLSAgICAvLyBGSVhNRTogUHJvdGVjdGVkIGRhdGEgbWVtYmVy cyBhcmVuJ3QgZ3JlYXQgZm9yIG1haW50YWluYWJpbGl0eS4KLSAgICAvLyBDb25zaWRlciBhZGRp bmcgcHJvdGVjdGVkIGhlbHBlciBmdW5jdGlvbnMgYW5kIG1ha2luZyB0aGVzZSBwcml2YXRlLgot ICAgIFJlYWR5U3RhdGUgbV9yZWFkeVN0YXRlIHsgUmVhZHlTdGF0ZTo6UGVuZGluZyB9OwotICAg IFJlZlB0cjxJREJUcmFuc2FjdGlvbj4gbV90cmFuc2FjdGlvbjsKLSAgICBib29sIG1fc2hvdWxk RXhwb3NlVHJhbnNhY3Rpb25Ub0RPTSB7IHRydWUgfTsKLSAgICBSZWZQdHI8RE9NRXhjZXB0aW9u PiBtX2RvbUVycm9yOwotICAgIEluZGV4ZWREQjo6UmVxdWVzdFR5cGUgbV9yZXF1ZXN0VHlwZSB7 IEluZGV4ZWREQjo6UmVxdWVzdFR5cGU6Ok90aGVyIH07Ci0gICAgRXZlbnQqIG1fb3BlbkRhdGFi YXNlU3VjY2Vzc0V2ZW50IHsgbnVsbHB0ciB9OwotCiBwcml2YXRlOgogICAgIElEQlJlcXVlc3Qo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIElEQk9iamVjdFN0b3JlJiwgSURCVHJhbnNhY3Rpb24m KTsKICAgICBJREJSZXF1ZXN0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBJREJDdXJzb3ImLCBJ REJUcmFuc2FjdGlvbiYpOwpAQCAtMTcxLDYgKzE2NSwxNCBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCBjbGVhcldyYXBwZXJzKCk7CiAKK3Byb3RlY3RlZDoKKyAgICAvLyBGSVhNRTogUHJvdGVjdGVk IGRhdGEgbWVtYmVycyBhcmVuJ3QgZ3JlYXQgZm9yIG1haW50YWluYWJpbGl0eS4KKyAgICAvLyBD b25zaWRlciBhZGRpbmcgcHJvdGVjdGVkIGhlbHBlciBmdW5jdGlvbnMgYW5kIG1ha2luZyB0aGVz ZSBwcml2YXRlLgorICAgIFJlZlB0cjxJREJUcmFuc2FjdGlvbj4gbV90cmFuc2FjdGlvbjsKKyAg ICBSZWZQdHI8RE9NRXhjZXB0aW9uPiBtX2RvbUVycm9yOworICAgIEV2ZW50KiBtX29wZW5EYXRh YmFzZVN1Y2Nlc3NFdmVudCB7IG51bGxwdHIgfTsKKworcHJpdmF0ZToKICAgICBJREJDdXJzb3Iq IHJlc3VsdEN1cnNvcigpOwogCiAgICAgSURCRXJyb3IgbV9pZGJFcnJvcjsKQEAgLTE3OCwyMSAr MTgwLDI0IEBAIHByaXZhdGU6CiAKICAgICBKU1ZhbHVlSW5XcmFwcGVkT2JqZWN0IG1fcmVzdWx0 V3JhcHBlcjsKICAgICBKU1ZhbHVlSW5XcmFwcGVkT2JqZWN0IG1fY3Vyc29yV3JhcHBlcjsKKwor ICAgIHVpbnQ2NF90IG1fY3VycmVudFRyYW5zYWN0aW9uT3BlcmF0aW9uSUQgeyAwIH07CisKICAg ICBSZXN1bHQgbV9yZXN1bHQ7CiAgICAgT3B0aW9uYWw8U291cmNlPiBtX3NvdXJjZTsKIAotICAg IGJvb2wgbV9oYXNQZW5kaW5nQWN0aXZpdHkgeyB0cnVlIH07Ci0gICAgSW5kZXhlZERCOjpPYmpl Y3RTdG9yZVJlY29yZFR5cGUgbV9yZXF1ZXN0ZWRPYmplY3RTdG9yZVJlY29yZFR5cGUgeyBJbmRl eGVkREI6Ok9iamVjdFN0b3JlUmVjb3JkVHlwZTo6VmFsdWVPbmx5IH07Ci0gICAgSW5kZXhlZERC OjpJbmRleFJlY29yZFR5cGUgbV9yZXF1ZXN0ZWRJbmRleFJlY29yZFR5cGUgeyBJbmRleGVkREI6 OkluZGV4UmVjb3JkVHlwZTo6S2V5IH07Ci0KICAgICBSZWZQdHI8SURCQ3Vyc29yPiBtX3BlbmRp bmdDdXJzb3I7Ci0KICAgICBSZWY8SURCQ2xpZW50OjpJREJDb25uZWN0aW9uUHJveHk+IG1fY29u bmVjdGlvblByb3h5OwogCisgICAgUmVhZHlTdGF0ZSBtX3JlYWR5U3RhdGUgeyBSZWFkeVN0YXRl OjpQZW5kaW5nIH07CisgICAgSW5kZXhlZERCOjpSZXF1ZXN0VHlwZSBtX3JlcXVlc3RUeXBlIHsg SW5kZXhlZERCOjpSZXF1ZXN0VHlwZTo6T3RoZXIgfTsKKyAgICBJbmRleGVkREI6Ok9iamVjdFN0 b3JlUmVjb3JkVHlwZSBtX3JlcXVlc3RlZE9iamVjdFN0b3JlUmVjb3JkVHlwZSB7IEluZGV4ZWRE Qjo6T2JqZWN0U3RvcmVSZWNvcmRUeXBlOjpWYWx1ZU9ubHkgfTsKKyAgICBJbmRleGVkREI6Oklu ZGV4UmVjb3JkVHlwZSBtX3JlcXVlc3RlZEluZGV4UmVjb3JkVHlwZSB7IEluZGV4ZWREQjo6SW5k ZXhSZWNvcmRUeXBlOjpLZXkgfTsKKworICAgIGJvb2wgbV9zaG91bGRFeHBvc2VUcmFuc2FjdGlv blRvRE9NIHsgdHJ1ZSB9OworICAgIGJvb2wgbV9oYXNQZW5kaW5nQWN0aXZpdHkgeyB0cnVlIH07 CiAgICAgYm9vbCBtX2Rpc3BhdGNoaW5nRXZlbnQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNV bmNhdWdodEV4Y2VwdGlvbiB7IGZhbHNlIH07Ci0KLSAgICB1aW50NjRfdCBtX2N1cnJlbnRUcmFu c2FjdGlvbk9wZXJhdGlvbklEIHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSW5kZXhlZERCLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JbmRleGVkREIuaAppbmRleCA4OWJj OGFhZGQ0NDQ0ZDJjMDc0MGYyMTMxYWQ4ODQ5MjgzMTU4NTlhLi5kNWM1MDRlMDBlY2EwOWZjZDY5 YjM5YTQzOTViZmRjYzE0MzZmMzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JbmRleGVkREIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JbmRleGVkREIuaApAQCAtMzIsNyArMzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IG5hbWVzcGFjZSBJbmRleGVkREIgewogCi1lbnVtIGNsYXNzIFRyYW5zYWN0aW9uU3RhdGUgewor ZW51bSBjbGFzcyBUcmFuc2FjdGlvblN0YXRlIDogdWludDhfdCB7CiAgICAgQWN0aXZlLAogICAg IEluYWN0aXZlLAogICAgIENvbW1pdHRpbmcsCkBAIC00MCw3ICs0MCw3IEBAIGVudW0gY2xhc3Mg VHJhbnNhY3Rpb25TdGF0ZSB7CiAgICAgRmluaXNoZWQsCiB9OwogCi1lbnVtIGNsYXNzIEN1cnNv ckRpcmVjdGlvbiB7CitlbnVtIGNsYXNzIEN1cnNvckRpcmVjdGlvbiA6IHVpbnQ4X3QgewogICAg IE5leHQsCiAgICAgTmV4dHVuaXF1ZSwKICAgICBQcmV2LApAQCAtNDksOCArNDksOCBAQCBlbnVt IGNsYXNzIEN1cnNvckRpcmVjdGlvbiB7CiBjb25zdCB1bnNpZ25lZCBDdXJzb3JEaXJlY3Rpb25N YXhpbXVtID0gMzsKIAogZW51bSBjbGFzcyBDdXJzb3JUeXBlIDogYm9vbCB7Ci0gICAgS2V5QW5k VmFsdWUgPSAwLAotICAgIEtleU9ubHkgPSAxLAorICAgIEtleUFuZFZhbHVlLAorICAgIEtleU9u bHksCiB9OwogY29uc3QgdW5zaWduZWQgQ3Vyc29yVHlwZU1heGltdW0gPSAxOwogCkBAIC01OSwx MiArNTksMTIgQEAgZW51bSBjbGFzcyBDdXJzb3JTb3VyY2UgOiBib29sIHsKICAgICBPYmplY3RT dG9yZSwKIH07CiAKLWVudW0gY2xhc3MgVmVyc2lvbk51bGxuZXNzIHsKK2VudW0gY2xhc3MgVmVy c2lvbk51bGxuZXNzIDogdWludDhfdCB7CiAgICAgTnVsbCwKICAgICBOb25OdWxsLAogfTsKIAot ZW51bSBjbGFzcyBPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGUgeworZW51bSBjbGFzcyBPYmplY3RT dG9yZU92ZXJ3cml0ZU1vZGUgOiB1aW50OF90IHsKICAgICBPdmVyd3JpdGUsCiAgICAgT3Zlcndy aXRlRm9yQ3Vyc29yLAogICAgIE5vT3ZlcndyaXRlLApAQCAtNzUsNyArNzUsNyBAQCBlbnVtIGNs YXNzIEluZGV4UmVjb3JkVHlwZSA6IGJvb2wgewogICAgIFZhbHVlLAogfTsKIAotZW51bSBjbGFz cyBPYmplY3RTdG9yZVJlY29yZFR5cGUgeworZW51bSBjbGFzcyBPYmplY3RTdG9yZVJlY29yZFR5 cGUgOiB1aW50OF90IHsKICAgICBWYWx1ZU9ubHksCiAgICAgS2V5T25seSwKIH07CkBAIC05Miwx MyArOTIsMTMgQEAgZW51bSBLZXlUeXBlIHsKICAgICBNaW4sCiB9OwogCi1lbnVtIGNsYXNzIFJl cXVlc3RUeXBlIHsKK2VudW0gY2xhc3MgUmVxdWVzdFR5cGUgOiB1aW50OF90IHsKICAgICBPcGVu LAogICAgIERlbGV0ZSwKICAgICBPdGhlciwKIH07CiAKLWVudW0gY2xhc3MgR2V0QWxsVHlwZSB7 CitlbnVtIGNsYXNzIEdldEFsbFR5cGUgOiB1aW50OF90IHsKICAgICBLZXlzLAogICAgIFZhbHVl cywKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCQ29ubmVjdGlvblRvU2VydmVyRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0ZS5oCmluZGV4 IDVkNjIwZGRjNWI0MmM5OGM2MmU3MmNjYTcyMWE2MjlmNTIyYjgzMjIuLjdhODE5NDI5NzM3ZWZj MjVlOGExNTRhNzRiNGE3ZTJiNzNiYTMyNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0ZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9u VG9TZXJ2ZXJEZWxlZ2F0ZS5oCkBAIC00Niw3ICs0Niw3IEBAIHN0cnVjdCBJREJJdGVyYXRlQ3Vy c29yRGF0YTsKIHN0cnVjdCBTZWN1cml0eU9yaWdpbkRhdGE7CiAKIG5hbWVzcGFjZSBJbmRleGVk REIgewotZW51bSBjbGFzcyBPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU7CitlbnVtIGNsYXNzIE9i amVjdFN0b3JlT3ZlcndyaXRlTW9kZSA6IHVpbnQ4X3Q7CiBlbnVtIGNsYXNzIENvbm5lY3Rpb25D bG9zZWRPbkJlaGFsZk9mU2VydmVyIDogYm9vbDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUluZGV4LmggYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguaAppbmRleCBiMGFjZjFl MTBhNmZkMDBiYzA5YjJlN2Y0MTYzZDI3YjI5M2I1ZTRiLi5iMTQ5YjZiOTgyMzdjNjEwNjM4MDBi OWMyYTkxOGIxMWIzOGJhMGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SW5kZXguaApAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBU aHJlYWRTYWZlRGF0YUJ1ZmZlcjsKIHN0cnVjdCBJREJLZXlSYW5nZURhdGE7CiAKIG5hbWVzcGFj ZSBJbmRleGVkREIgewotZW51bSBjbGFzcyBHZXRBbGxUeXBlOworZW51bSBjbGFzcyBHZXRBbGxU eXBlIDogdWludDhfdDsKIGVudW0gY2xhc3MgSW5kZXhSZWNvcmRUeXBlIDogYm9vbDsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9y eU9iamVjdFN0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv TWVtb3J5T2JqZWN0U3RvcmUuaAppbmRleCA3NzkzYjI0MDBhMjMwMjI2YTZkM2JlMzJjYTMyNGQ0 ZjhiYzE3NzUxLi40MzQ5OWQ1YmNiZWM2MjZhZDExYzQ1ODJiNmFiNjY0ZGEyNmRkMDE4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2Jq ZWN0U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv TWVtb3J5T2JqZWN0U3RvcmUuaApAQCAtNDksNyArNDksNyBAQCBjbGFzcyBJREJWYWx1ZTsKIHN0 cnVjdCBJREJLZXlSYW5nZURhdGE7CiAKIG5hbWVzcGFjZSBJbmRleGVkREIgewotZW51bSBjbGFz cyBHZXRBbGxUeXBlOworZW51bSBjbGFzcyBHZXRBbGxUeXBlIDogdWludDhfdDsKIGVudW0gY2xh c3MgSW5kZXhSZWNvcmRUeXBlIDogYm9vbDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQkN1cnNvckluZm8uaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJDdXJzb3JJbmZvLmgKaW5kZXggZGRlM2Zh OTEwNjM0YjEwZTZiNTNmOGQ2ZmYzMjgyYTA5MjdkNGMwMy4uNjM5NWVlMmQ4ZjZkZTAxZTJlMTcw Y2UyODBiZDBhM2U5OTFmN2EyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2hhcmVkL0lEQkN1cnNvckluZm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCQ3Vyc29ySW5mby5oCkBAIC0zMyw3ICszMyw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIElEQlRyYW5zYWN0aW9uOwogCiBuYW1lc3BhY2UgSW5k ZXhlZERCIHsKLWVudW0gY2xhc3MgQ3Vyc29yRGlyZWN0aW9uOworZW51bSBjbGFzcyBDdXJzb3JE aXJlY3Rpb24gOiB1aW50OF90OwogZW51bSBjbGFzcyBDdXJzb3JTb3VyY2UgOiBib29sOwogZW51 bSBjbGFzcyBDdXJzb3JUeXBlIDogYm9vbDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJHZXRBbGxSZWNvcmRzRGF0YS5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQkdldEFsbFJlY29yZHNEYXRhLmgK aW5kZXggNGJkNWZmY2Y2NDU1MWJiZWIzYTQxM2VmNDE1ZGI5MWQ1ZDM5NjRhNy4uYzYxMjgzZGEy ZTdlNjI4NzNiYzhjZWY3ZjRkOTBjMDQ5NzQwYmE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQkdldEFsbFJlY29yZHNEYXRhLmgKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQkdldEFsbFJlY29yZHNE YXRhLmgKQEAgLTMxLDggKzMxLDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNwYWNl IEluZGV4ZWREQiB7Ci1lbnVtIGNsYXNzIERhdGFTb3VyY2U7Ci1lbnVtIGNsYXNzIEdldEFsbFR5 cGU7CitlbnVtIGNsYXNzIEdldEFsbFR5cGUgOiB1aW50OF90OwogfQogCiBzdHJ1Y3QgSURCR2V0 QWxsUmVjb3Jkc0RhdGEgewo=