228242 2021-07-23 12:17:15 -0700 Fix nested resource load tracepoint intervals 2021-08-10 11:53:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham achristensen cdumez ews-watchlist japhet nham webkit-bug-importer zalan oldest_to_newest 1779131 0 nham 2021-07-23 12:17:15 -0700 Fix nested subresource load tracepoints 1779140 1 434111 nham 2021-07-23 12:32:00 -0700 Created attachment 434111 Patch 1779143 2 webkit-bug-importer 2021-07-23 12:32:56 -0700 <rdar://problem/81031829> 1779149 3 434111 achristensen 2021-07-23 12:49:02 -0700 Comment on attachment 434111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434111&action=review > Source/WebCore/loader/FrameLoader.cpp:2561 > + tracePoint(MainResourceLoadDidEnd, reinterpret_cast<uint64_t>(this)); The page ID and frame ID should be sufficient here. Why didn't you include them at all? > Source/WebCore/loader/SubresourceLoader.cpp:745 > + tracePoint(SubresourceLoadDidEnd, reinterpret_cast<uint64_t>(this)); SubresourceLoader has .identifier() which is probably even more reliable than this because our allocator can reuse slots of memory. 1781748 4 nham 2021-08-03 14:56:56 -0700 (In reply to Alex Christensen from comment #3) > Comment on attachment 434111 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=434111&action=review > > > Source/WebCore/loader/FrameLoader.cpp:2561 > > + tracePoint(MainResourceLoadDidEnd, reinterpret_cast<uint64_t>(this)); > > The page ID and frame ID should be sufficient here. Why didn't you include > them at all? They're already passed to the beginning tracePoint call (MainResourceLoadDidStartProvisional). The reason why we pass the pageID and frameID there is so that the tracing UI displays those arguments in a nice fashion. There's no need to pass the pageID and frameID to the MainResourceLoadDidEnd tracePoint since they were already passed to the MainResourceLoadDidStartProvisional that marks the beginning of the interval. The only state you need to pass to the end tracepoint is whatever data you need for disambiguating nested intervals, which is the loader address in this case. > > Source/WebCore/loader/SubresourceLoader.cpp:745 > > + tracePoint(SubresourceLoadDidEnd, reinterpret_cast<uint64_t>(this)); > > SubresourceLoader has .identifier() which is probably even more reliable > than this because our allocator can reuse slots of memory. It's okay if the loader address is reused as long as there aren't two subresource loads in flight at the same time in the same process that use the same loader, which as far as I can tell isn't possible. Using the subresource loader address instead of the (pageID, resourceID) tuple for disambiguating nested intervals means one less argument to pass to the SubresourceLoadDidEnd tracePoint call (not that that's a big deal one way or the other). 1781819 5 achristensen 2021-08-03 20:44:02 -0700 I still don't think it's great practice to cast a pointer to an integer identifier, especially when that object already has a unique integer identifier. 1781828 6 434885 nham 2021-08-03 22:13:41 -0700 Created attachment 434885 Patch 1782605 7 435098 nham 2021-08-06 16:38:48 -0700 Created attachment 435098 Patch 1783239 8 ews-feeder 2021-08-10 11:53:02 -0700 Committed r280859 (240400@main): <https://commits.webkit.org/240400@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435098. 434111 2021-07-23 12:32:00 -0700 2021-08-03 22:13:39 -0700 Patch bug-228242-20210723123159.patch text/plain 8900 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmU5NTcxZDZjZTliNjgz NzU3YjZlMjYxNWFmMTlhYmI4MDZkYzQxMy4uZWFkMTE4ZWEwMzcwYWU4MGU0MmRlMzU5ZDJkOWE0 NDYzNjcwMmQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTA3LTIzICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBuZXN0ZWQgcmVzb3VyY2UgbG9h ZCB0cmFjZXBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIG1haW4gcmVzb3VyY2UgYW5kIHN1YnJlc291cmNlIGxvYWQgdHJhY2Vwb2ludHMg YXJlbid0IGludGVycHJldGVkIGNvcnJlY3RseSBpZiB0aGVyZSBhcmUKKyAgICAgICAgbXVsdGlw bGUgcmVzb3VyY2UgbG9hZHMgaW4gZmxpZ2h0IGF0IHRoZSBzYW1lIHRpbWUuIFRvIGZpeCB0aGlz LCB3ZSBwYXNzIHRoZSBwb2ludGVyIHRvIHRoZQorICAgICAgICBGcmFtZUxvYWRlciBvciBTdWJy ZXNvdXJjZUxvYWRlciB0byBrdHJhY2Ugc28gdGhhdCB0aGUgdHJhY2luZyB0b29sIGNhbiB1c2Ug dGhhdCBwb2ludGVyIHRvCisgICAgICAgIHByb3Blcmx5IG5lc3Qgb3ZlcmxhcHBpbmcgcmVzb3Vy Y2UgbG9hZGluZyB0cmFjZSBpbnRlcnZhbHMuCisKKyAgICAgICAgT25lIGFkZGl0aW9uYWwgY2hh bmdlIEkgbWFkZSBpcyB0byBtb3ZlIHRoZSBTdWJyZXNvdXJjZUxvYWRXaWxsU3RhcnQgdHJhY2Vw b2ludCB0byBhZnRlciB0aGUKKyAgICAgICAgY2FsbCB0byB3aWxsU2VuZFJlcXVlc3RJbnRlcm5h bC4gVGhlIHJlYXNvbiBmb3IgdGhpcyBpcyBiZWNhdXNlIEkgd2FudGVkIHRvIGxvZyB0aGUgcmVz b3VyY2UKKyAgICAgICAgSUQgYXNzb2NpYXRlZCB3aXRoIHRoZSBzdWJyZXNvdXJjZSByZXF1ZXN0 LCBidXQgd2Ugb25seSBnZW5lcmF0ZSB0aGF0IElEIGFmdGVyIHRoZSBjYWxsIHRvCisgICAgICAg IHdpbGxTZW5kUmVxdWVzdEludGVybmFsLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpwcm92aXNpb25hbExvYWRTdGFy dGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZv clRoaXNGcmFtZSk6CisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3RJbnRlcm5h bCk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbCk6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkQ2FuY2VsKToKKwogMjAyMS0wNy0y MSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCBsaW5rZWRPbk9yQWZ0ZXIgY2hlY2sgZm9yIHIyNjkxNjIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwCmluZGV4IGJlYzI5NzkzNDAwMmJiMGU4OWU1ZjRiMzhjNTkyODE5Njli MGYwYWYuLjAyYWI5Nzk2ZTk1YTEzZGE2Y2NmNzcyY2M1NGRlZjdjOTgzZGM1ZTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTA1OCw3ICsxMDU4LDcgQEAgdm9pZCBG cmFtZUxvYWRlcjo6cHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpCiAgICAgbV9jbGllbnQtPnByb3Zp c2lvbmFsTG9hZFN0YXJ0ZWQoKTsKIAogICAgIGlmIChtX2ZyYW1lLmlzTWFpbkZyYW1lKCkpIHsK LSAgICAgICAgdHJhY2VQb2ludChNYWluUmVzb3VyY2VMb2FkRGlkU3RhcnRQcm92aXNpb25hbCk7 CisgICAgICAgIHRyYWNlUG9pbnQoTWFpblJlc291cmNlTG9hZERpZFN0YXJ0UHJvdmlzaW9uYWws IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHRoaXMpLCBQQUdFX0lELCBGUkFNRV9JRCk7CiAK ICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKSkKICAgICAgICAgICAgIHBh Z2UtPmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCk7CkBAIC0yNTU4LDcgKzI1NTgsNyBAQCB2b2lk IEZyYW1lTG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZvclRoaXNGcmFtZSgpCiAgICAgICAgIFBh Z2UqIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKICAgICAgICAgaWYgKHBhZ2UpIHsKICAgICAgICAg ICAgIGlmIChtX2ZyYW1lLmlzTWFpbkZyYW1lKCkpIHsKLSAgICAgICAgICAgICAgICB0cmFjZVBv aW50KE1haW5SZXNvdXJjZUxvYWREaWRFbmQpOworICAgICAgICAgICAgICAgIHRyYWNlUG9pbnQo TWFpblJlc291cmNlTG9hZERpZEVuZCwgcmVpbnRlcnByZXRfY2FzdDx1aW50NjRfdD4odGhpcykp OwogICAgICAgICAgICAgICAgIHBhZ2UtPmRpZEZpbmlzaExvYWQoKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNl TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAK aW5kZXggYTI2MWVhZWY0ZjI0ZDE2ZjE5NDU0ZGE1YTBiZjk1M2U3ZmJiMjJmOS4uNTA2NDlmOGJk NDIwMGJlMjI1ZGZiODU4NDZlMjBmZDVlOGMzMTkxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xOTYsNyArMTk2LDYgQEAgdm9pZCBTdWJyZXNv dXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiYgbmV3 UmVxdWVzdCwgY28KICAgICB9CiAKICAgICBpZiAobmV3UmVxdWVzdC5yZXF1ZXN0ZXIoKSAhPSBS ZXNvdXJjZVJlcXVlc3RCYXNlOjpSZXF1ZXN0ZXI6Ok1haW4pIHsKLSAgICAgICAgdHJhY2VQb2lu dChTdWJyZXNvdXJjZUxvYWRXaWxsU3RhcnQpOwogICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZl cjo6c2hhcmVkKCkubG9nU3VicmVzb3VyY2VMb2FkaW5nKG1fZnJhbWUuZ2V0KCksIG5ld1JlcXVl c3QsIHJlZGlyZWN0UmVzcG9uc2UsCiAgICAgICAgICAgICAoaXNTY3JpcHRMaWtlRGVzdGluYXRp b24ob3B0aW9ucygpLmRlc3RpbmF0aW9uKSA/IFJlc291cmNlTG9hZE9ic2VydmVyOjpGZXRjaERl c3RpbmF0aW9uSXNTY3JpcHRMaWtlOjpZZXMgOiBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6RmV0Y2hE ZXN0aW5hdGlvbklzU2NyaXB0TGlrZTo6Tm8pKTsKICAgICB9CkBAIC0yMTEsNiArMjEwLDkgQEAg dm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VS ZXF1ZXN0JiYgbmV3UmVxdWVzdCwgY28KICAgICAgICAgfQogCiAgICAgICAgIFJlc291cmNlTG9h ZGVyOjp3aWxsU2VuZFJlcXVlc3RJbnRlcm5hbChXVEZNb3ZlKG5ld1JlcXVlc3QpLCByZWRpcmVj dFJlc3BvbnNlLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyks IGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIHJlZGlyZWN0 UmVzcG9uc2VdIChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0KSBtdXRhYmxlIHsKKyAgICAgICAg ICAgIGlmIChtX3Jlc291cmNlLT50eXBlKCkgIT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1haW5S ZXNvdXJjZSkKKyAgICAgICAgICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291cmNlTG9hZFdpbGxT dGFydCwgcmVpbnRlcnByZXRfY2FzdDx1aW50NjRfdD4odGhpcyksIFBBR0VfSUQsIEZSQU1FX0lE LCBpZGVudGlmaWVyKCkpOworCiAgICAgICAgICAgICBpZiAocmVhY2hlZFRlcm1pbmFsU3RhdGUo KSkgewogICAgICAgICAgICAgICAgIFNVQlJFU09VUkNFTE9BREVSX1JFTEVBU0VfTE9HKCJ3aWxs U2VuZFJlcXVlc3RJbnRlcm5hbDogcmVhY2hlZCB0ZXJtaW5hbCBzdGF0ZTsgY2FsbGluZyBjb21w bGV0aW9uIGhhbmRsZXIiKTsKICAgICAgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRs ZXIoV1RGTW92ZShyZXF1ZXN0KSk7CkBAIC03NDAsNyArNzQyLDcgQEAgdm9pZCBTdWJyZXNvdXJj ZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZyhjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmIG5ldHdv cmtMb2FkTWUKICAgICB9CiAKICAgICBpZiAobV9yZXNvdXJjZS0+dHlwZSgpICE9IENhY2hlZFJl c291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpCi0gICAgICAgIHRyYWNlUG9pbnQoU3VicmVzb3Vy Y2VMb2FkRGlkRW5kKTsKKyAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWREaWRFbmQs IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHRoaXMpKTsKIAogICAgIG1fc3RhdGUgPSBGaW5p c2hpbmc7CiAgICAgbV9yZXNvdXJjZS0+ZmluaXNoTG9hZGluZyhyZXNvdXJjZURhdGEoKSwgbmV0 d29ya0xvYWRNZXRyaWNzKTsKQEAgLTc4Niw3ICs3ODgsNyBAQCB2b2lkIFN1YnJlc291cmNlTG9h ZGVyOjpkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAgIG1fc3RhdGUgPSBG aW5pc2hpbmc7CiAKICAgICBpZiAobV9yZXNvdXJjZS0+dHlwZSgpICE9IENhY2hlZFJlc291cmNl OjpUeXBlOjpNYWluUmVzb3VyY2UpCi0gICAgICAgIHRyYWNlUG9pbnQoU3VicmVzb3VyY2VMb2Fk RGlkRW5kKTsKKyAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWREaWRFbmQsIHJlaW50 ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHRoaXMpKTsKIAogICAgIGlmIChtX3Jlc291cmNlLT5yZXNv dXJjZVRvUmV2YWxpZGF0ZSgpKQogICAgICAgICBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCkucmV2 YWxpZGF0aW9uRmFpbGVkKCptX3Jlc291cmNlKTsKQEAgLTgzOSw3ICs4NDEsNyBAQCB2b2lkIFN1 YnJlc291cmNlTG9hZGVyOjpkaWRDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJvciYpCiAgICAgQVNT RVJUKG1fcmVzb3VyY2UpOwogCiAgICAgaWYgKG1fcmVzb3VyY2UtPnR5cGUoKSAhPSBDYWNoZWRS ZXNvdXJjZTo6VHlwZTo6TWFpblJlc291cmNlKQotICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291 cmNlTG9hZERpZEVuZCk7CisgICAgICAgIHRyYWNlUG9pbnQoU3VicmVzb3VyY2VMb2FkRGlkRW5k LCByZWludGVycHJldF9jYXN0PHVpbnQ2NF90Pih0aGlzKSk7CiAKICAgICBtX3Jlc291cmNlLT5j YW5jZWxMb2FkKCk7CiAgICAgbm90aWZ5RG9uZShMb2FkQ29tcGxldGlvblR5cGU6OkNhbmNlbCk7 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDI5 YjBhYjQxZmU0YmFhMDQ2OTNkY2Q0YWQ0ZDI4MDc4N2NkNzUzMS4uMTE1ZGNmOWM5OTRiMGUzNjFl YWRiYmI1ZjY5MDZmNjZmYTRjZDBjZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA3LTIzICBCZW4gTmhhbSAg PG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBuZXN0ZWQgcmVzb3VyY2UgbG9hZCB0cmFj ZXBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXNlIHRoZSBGcmFtZUxvYWRlciBhbmQgU3VicmVzb3VyY2VMb2FkZXIgcG9pbnRlcnMgdG8gcHJv cGVybHkgbmVzdCBvdmVybGFwcGluZyBtYWluCisgICAgICAgIHJlc291cmNlIGFuZCBzdWJyZXNv dXJjZSBsb2FkIHRyYWNlcG9pbnRzLgorCisgICAgICAgICogVHJhY2luZy9TeXN0ZW1UcmFjZVBv aW50cy5wbGlzdDoKKwogMjAyMS0wNy0yMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxl LmNvbT4KIAogICAgICAgICBNaW5pQnJvd3NlciB4Y2NvbmZpZyBzaG91bGQgaW5jbHVkZSBjY2Fj aGUueGNjb25maWcgY29uZGl0aW9uYWxseQpkaWZmIC0tZ2l0IGEvVG9vbHMvVHJhY2luZy9TeXN0 ZW1UcmFjZVBvaW50cy5wbGlzdCBiL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxp c3QKaW5kZXggMDdjNDM3ZTNkMjEwNjNkNGYzZmJkZjlhNWFmYWM2NTQ5MzMxMDJkOS4uMGI2OTZh N2FlOTVmYTU2Y2RjOThlZjg4MTUzZDg2NzJmYzU3ZDg4YSAxMDA2NDQKLS0tIGEvVG9vbHMvVHJh Y2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdAorKysgYi9Ub29scy9UcmFjaW5nL1N5c3RlbVRy YWNlUG9pbnRzLnBsaXN0CkBAIC02Niw2ICs2NiwyOSBAQAogICAgICAgICAgICAgICAgICA8c3Ry aW5nPjUwMDE8L3N0cmluZz4KICAgICAgICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9rZXk+CiAg ICAgICAgICAgICAgICAgIDxzdHJpbmc+NTAwMjwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8 a2V5PkFyZ05hbWVzQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAg ICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJp bmc+RnJhbWVMb2FkZXI8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwv a2V5PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5QYWdlIElEPC9zdHJpbmc+CisgICAg ICAgICAgICAgICAgICAgICA8a2V5PkFyZzM8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxz dHJpbmc+RnJhbWUgSUQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAg ICAgICAgICAgICA8a2V5PkFyZ1ZhbHVlVHlwZXNCZWdpbjwva2V5PgorICAgICAgICAgICAgICAg ICA8ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAg ICAgICAgICAgICAgPHN0cmluZz5IZXg8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgIDxr ZXk+QXJnMjwva2V5PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5VSW50NjQ8L3N0cmlu Zz4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMzwva2V5PgorICAgICAgICAgICAgICAg ICAgICAgPHN0cmluZz5VSW50NjQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0Pgor ICAgICAgICAgICAgICAgICA8a2V5PkV2ZW50c01hdGNoZWRCeTwva2V5PgorICAgICAgICAgICAg ICAgICA8YXJyYXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlRocmVhZDwvc3RyaW5n PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5BcmcxPC9zdHJpbmc+CisgICAgICAgICAg ICAgICAgIDwvYXJyYXk+CiAgICAgICAgICAgICAgPC9kaWN0PgogICAgICAgICAgICAgIDxkaWN0 PgogICAgICAgICAgICAgICAgICA8a2V5Pk5hbWU8L2tleT4KQEAgLTc4LDYgKzEwMSwzMyBAQAog ICAgICAgICAgICAgICAgICA8c3RyaW5nPjUwMDM8L3N0cmluZz4KICAgICAgICAgICAgICAgICAg PGtleT5Db2RlRW5kPC9rZXk+CiAgICAgICAgICAgICAgICAgIDxzdHJpbmc+NTAwNDwvc3RyaW5n PgorICAgICAgICAgICAgICAgICA8a2V5PkFyZ05hbWVzQmVnaW48L2tleT4KKyAgICAgICAgICAg ICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAg ICAgICAgICAgICAgICAgIDxzdHJpbmc+U3VicmVzb3VyY2VMb2FkZXI8L3N0cmluZz4KKyAgICAg ICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwva2V5PgorICAgICAgICAgICAgICAgICAgICAgPHN0 cmluZz5QYWdlIElEPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzM8L2tl eT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+RnJhbWUgSUQ8L3N0cmluZz4KKyAgICAg ICAgICAgICAgICAgICAgIDxrZXk+QXJnNDwva2V5PgorICAgICAgICAgICAgICAgICAgICAgPHN0 cmluZz5SZXNvdXJjZSBJRDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2RpY3Q+CisgICAg ICAgICAgICAgICAgIDxrZXk+QXJnVmFsdWVUeXBlc0JlZ2luPC9rZXk+CisgICAgICAgICAgICAg ICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAg ICAgICAgICAgICAgICA8c3RyaW5nPkhleDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAgICAg PGtleT5BcmcyPC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlVJbnQ2NDwvc3Ry aW5nPgorICAgICAgICAgICAgICAgICAgICAgPGtleT5BcmczPC9rZXk+CisgICAgICAgICAgICAg ICAgICAgICA8c3RyaW5nPlVJbnQ2NDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAgICAgPGtl eT5Bcmc0PC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlVJbnQ2NDwvc3RyaW5n PgorICAgICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+RXZlbnRz TWF0Y2hlZEJ5PC9rZXk+CisgICAgICAgICAgICAgICAgIDxhcnJheT4KKyAgICAgICAgICAgICAg ICAgICAgIDxzdHJpbmc+VGhyZWFkPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8c3Ry aW5nPkFyZzE8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9hcnJheT4KICAgICAgICAgICAg ICA8L2RpY3Q+CiAgICAgICAgICAgICAgPGRpY3Q+CiAgICAgICAgICAgICAgICAgIDxrZXk+TmFt ZTwva2V5Pgo= 434885 2021-08-03 22:13:41 -0700 2021-08-06 16:38:46 -0700 Patch bug-228242-20210803221340.patch text/plain 7981 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWNhNjdhYzNlN2ViMWZm NTA5Mzg3MGI1ZWJlMWE2YmU3ZWEyZmZjNy4uYmMwM2UyZTRkODk5OGVmYThlMmQwZjc2ZWVkMjYz NzcxNDdiZjc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA4LTAzICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBuZXN0ZWQgcmVzb3VyY2UgbG9h ZCB0cmFjZXBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIG1haW4gcmVzb3VyY2UgYW5kIHN1YnJlc291cmNlIGxvYWQgdHJhY2Vwb2ludHMg YXJlbid0IGludGVycHJldGVkIGNvcnJlY3RseSBpZiB0aGVyZSBhcmUKKyAgICAgICAgbXVsdGlw bGUgcmVzb3VyY2UgbG9hZHMgaW4gZmxpZ2h0IGF0IHRoZSBzYW1lIHRpbWUuIFRvIGZpeCB0aGlz LCB3ZSBwYXNzIHRoZSBwb2ludGVyIHRvIHRoZQorICAgICAgICBGcmFtZUxvYWRlciBvciBTdWJy ZXNvdXJjZUxvYWRlciB0byBrdHJhY2Ugc28gdGhhdCB0aGUgdHJhY2luZyB0b29sIGNhbiB1c2Ug dGhhdCBwb2ludGVyIHRvCisgICAgICAgIHByb3Blcmx5IG5lc3Qgb3ZlcmxhcHBpbmcgcmVzb3Vy Y2UgbG9hZGluZyB0cmFjZSBpbnRlcnZhbHMuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnByb3Zpc2lvbmFsTG9hZFN0 YXJ0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNoZWNrTG9hZENvbXBsZXRl Rm9yVGhpc0ZyYW1lKToKKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdEludGVy bmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2Fk aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpkaWRGYWlsKToKKyAg ICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpkaWRDYW5jZWwpOgorCiAyMDIxLTA4 LTAzICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jh c2ggd2hpbGUgcmVhZGluZyBXZWJHTCBkcmF3aW5nIGJ1ZmZlciBpZiBjYW52YXMgaW1hZ2UgYnVm ZmVyIGFsbG9jYXRpb24gZmFpbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmlu ZGV4IDgzOTgzYzZhMzA1M2JmN2M0ZWUzNzM3YmNiY2QxODkxMDE5MTg2ODIuLjUxYjI1YTlmZTAz OTg3OWE0MGU1MDJiMGQ3NDE0ZjEyOGFiMTU1NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcApAQCAtMTA2Myw3ICsxMDYzLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6cHJvdmlz aW9uYWxMb2FkU3RhcnRlZCgpCiAgICAgbV9jbGllbnQtPnByb3Zpc2lvbmFsTG9hZFN0YXJ0ZWQo KTsKIAogICAgIGlmIChtX2ZyYW1lLmlzTWFpbkZyYW1lKCkpIHsKLSAgICAgICAgdHJhY2VQb2lu dChNYWluUmVzb3VyY2VMb2FkRGlkU3RhcnRQcm92aXNpb25hbCk7CisgICAgICAgIHRyYWNlUG9p bnQoTWFpblJlc291cmNlTG9hZERpZFN0YXJ0UHJvdmlzaW9uYWwsIHJlaW50ZXJwcmV0X2Nhc3Q8 dWludDY0X3Q+KHRoaXMpLCBQQUdFX0lELCBGUkFNRV9JRCk7CiAKICAgICAgICAgaWYgKGF1dG8q IHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKSkKICAgICAgICAgICAgIHBhZ2UtPmRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkKCk7CkBAIC0yNTcwLDcgKzI1NzAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjaGVj a0xvYWRDb21wbGV0ZUZvclRoaXNGcmFtZSgpCiAgICAgICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1l LnBhZ2UoKTsKICAgICAgICAgaWYgKHBhZ2UpIHsKICAgICAgICAgICAgIGlmIChtX2ZyYW1lLmlz TWFpbkZyYW1lKCkpIHsKLSAgICAgICAgICAgICAgICB0cmFjZVBvaW50KE1haW5SZXNvdXJjZUxv YWREaWRFbmQpOworICAgICAgICAgICAgICAgIHRyYWNlUG9pbnQoTWFpblJlc291cmNlTG9hZERp ZEVuZCwgcmVpbnRlcnByZXRfY2FzdDx1aW50NjRfdD4odGhpcykpOwogICAgICAgICAgICAgICAg IHBhZ2UtPmRpZEZpbmlzaExvYWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYTI2MWVhZWY0ZjI0 ZDE2ZjE5NDU0ZGE1YTBiZjk1M2U3ZmJiMjJmOS4uZTA5YWE5ZTJiOTI5NmNjYWRmZjM5MDc3N2Yy OGYyYjQwOGJkNmFkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbFNl bmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiYgbmV3UmVxdWVzdCwgY28KICAgICB9 CiAKICAgICBpZiAobmV3UmVxdWVzdC5yZXF1ZXN0ZXIoKSAhPSBSZXNvdXJjZVJlcXVlc3RCYXNl OjpSZXF1ZXN0ZXI6Ok1haW4pIHsKLSAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWRX aWxsU3RhcnQpOworICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291cmNlTG9hZFdpbGxTdGFydCwg cmVpbnRlcnByZXRfY2FzdDx1aW50NjRfdD4odGhpcykpOwogICAgICAgICBSZXNvdXJjZUxvYWRP YnNlcnZlcjo6c2hhcmVkKCkubG9nU3VicmVzb3VyY2VMb2FkaW5nKG1fZnJhbWUuZ2V0KCksIG5l d1JlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UsCiAgICAgICAgICAgICAoaXNTY3JpcHRMaWtlRGVz dGluYXRpb24ob3B0aW9ucygpLmRlc3RpbmF0aW9uKSA/IFJlc291cmNlTG9hZE9ic2VydmVyOjpG ZXRjaERlc3RpbmF0aW9uSXNTY3JpcHRMaWtlOjpZZXMgOiBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6 RmV0Y2hEZXN0aW5hdGlvbklzU2NyaXB0TGlrZTo6Tm8pKTsKICAgICB9CkBAIC03NDAsNyArNzQw LDcgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZyhjb25zdCBOZXR3 b3JrTG9hZE1ldHJpY3MmIG5ldHdvcmtMb2FkTWUKICAgICB9CiAKICAgICBpZiAobV9yZXNvdXJj ZS0+dHlwZSgpICE9IENhY2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpCi0gICAgICAg IHRyYWNlUG9pbnQoU3VicmVzb3VyY2VMb2FkRGlkRW5kKTsKKyAgICAgICAgdHJhY2VQb2ludChT dWJyZXNvdXJjZUxvYWREaWRFbmQsIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHRoaXMpLCBQ QUdFX0lELCBGUkFNRV9JRCwgaWRlbnRpZmllcigpKTsKIAogICAgIG1fc3RhdGUgPSBGaW5pc2hp bmc7CiAgICAgbV9yZXNvdXJjZS0+ZmluaXNoTG9hZGluZyhyZXNvdXJjZURhdGEoKSwgbmV0d29y a0xvYWRNZXRyaWNzKTsKQEAgLTc4Niw3ICs3ODYsNyBAQCB2b2lkIFN1YnJlc291cmNlTG9hZGVy OjpkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAgIG1fc3RhdGUgPSBGaW5p c2hpbmc7CiAKICAgICBpZiAobV9yZXNvdXJjZS0+dHlwZSgpICE9IENhY2hlZFJlc291cmNlOjpU eXBlOjpNYWluUmVzb3VyY2UpCi0gICAgICAgIHRyYWNlUG9pbnQoU3VicmVzb3VyY2VMb2FkRGlk RW5kKTsKKyAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWREaWRFbmQsIHJlaW50ZXJw cmV0X2Nhc3Q8dWludDY0X3Q+KHRoaXMpLCBQQUdFX0lELCBGUkFNRV9JRCwgaWRlbnRpZmllcigp KTsKIAogICAgIGlmIChtX3Jlc291cmNlLT5yZXNvdXJjZVRvUmV2YWxpZGF0ZSgpKQogICAgICAg ICBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCkucmV2YWxpZGF0aW9uRmFpbGVkKCptX3Jlc291cmNl KTsKQEAgLTgzOSw3ICs4MzksNyBAQCB2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpkaWRDYW5jZWwo Y29uc3QgUmVzb3VyY2VFcnJvciYpCiAgICAgQVNTRVJUKG1fcmVzb3VyY2UpOwogCiAgICAgaWYg KG1fcmVzb3VyY2UtPnR5cGUoKSAhPSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6TWFpblJlc291cmNl KQotICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291cmNlTG9hZERpZEVuZCk7CisgICAgICAgIHRy YWNlUG9pbnQoU3VicmVzb3VyY2VMb2FkRGlkRW5kLCByZWludGVycHJldF9jYXN0PHVpbnQ2NF90 Pih0aGlzKSwgUEFHRV9JRCwgRlJBTUVfSUQsIGlkZW50aWZpZXIoKSk7CiAKICAgICBtX3Jlc291 cmNlLT5jYW5jZWxMb2FkKCk7CiAgICAgbm90aWZ5RG9uZShMb2FkQ29tcGxldGlvblR5cGU6OkNh bmNlbCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggNzFkM2NmMWZjMTg4NTFjNzY5YTQ3ZDAxYjEwZGI5M2RhZmQ4NTgwNS4uMDdiMzU1NDQ0ZTE1 OWYwY2RhNWM1ODNkNGRlZjRhNWZiNzY0MTRiNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA4LTAzICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBuZXN0ZWQgcmVzb3VyY2UgbG9h ZCB0cmFjZXBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXNlIHRoZSBGcmFtZUxvYWRlciBhbmQgU3VicmVzb3VyY2VMb2FkZXIgcG9pbnRlcnMg dG8gcHJvcGVybHkgbmVzdCBvdmVybGFwcGluZyBtYWluCisgICAgICAgIHJlc291cmNlIGFuZCBz dWJyZXNvdXJjZSBsb2FkIHRyYWNlcG9pbnRzLgorCisgICAgICAgICogVHJhY2luZy9TeXN0ZW1U cmFjZVBvaW50cy5wbGlzdDoKKwogMjAyMS0wOC0wMyAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFy ZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3dlYmtpdHB5XSBOYXJyb3cgc2V0IG9mIHRlcm1pbmF0 ZWQgc2ltdWxhdG9yIHByb2Nlc3NlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvVHJhY2luZy9TeXN0ZW1U cmFjZVBvaW50cy5wbGlzdCBiL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QK aW5kZXggMDdjNDM3ZTNkMjEwNjNkNGYzZmJkZjlhNWFmYWM2NTQ5MzMxMDJkOS4uMGI2ZTRkNGQ2 MDI3MzkyN2ZkMDZkZGRmNTNiM2YyMDE1Y2IzMjM1NiAxMDA2NDQKLS0tIGEvVG9vbHMvVHJhY2lu Zy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdAorKysgYi9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNl UG9pbnRzLnBsaXN0CkBAIC02Niw2ICs2NiwyOSBAQAogICAgICAgICAgICAgICAgICA8c3RyaW5n PjUwMDE8L3N0cmluZz4KICAgICAgICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9rZXk+CiAgICAg ICAgICAgICAgICAgIDxzdHJpbmc+NTAwMjwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5 PkFyZ05hbWVzQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAgICAg ICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+ RnJhbWVMb2FkZXI8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwva2V5 PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5QYWdlIElEPC9zdHJpbmc+CisgICAgICAg ICAgICAgICAgICAgICA8a2V5PkFyZzM8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJp bmc+RnJhbWUgSUQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAg ICAgICAgICA8a2V5PkFyZ1ZhbHVlVHlwZXNCZWdpbjwva2V5PgorICAgICAgICAgICAgICAgICA8 ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAg ICAgICAgICAgPHN0cmluZz5IZXg8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+ QXJnMjwva2V5PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5VSW50NjQ8L3N0cmluZz4K KyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMzwva2V5PgorICAgICAgICAgICAgICAgICAg ICAgPHN0cmluZz5VSW50NjQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAg ICAgICAgICAgICAgICA8a2V5PkV2ZW50c01hdGNoZWRCeTwva2V5PgorICAgICAgICAgICAgICAg ICA8YXJyYXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlRocmVhZDwvc3RyaW5nPgor ICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5BcmcxPC9zdHJpbmc+CisgICAgICAgICAgICAg ICAgIDwvYXJyYXk+CiAgICAgICAgICAgICAgPC9kaWN0PgogICAgICAgICAgICAgIDxkaWN0Pgog ICAgICAgICAgICAgICAgICA8a2V5Pk5hbWU8L2tleT4KQEAgLTc4LDYgKzEwMSwzMyBAQAogICAg ICAgICAgICAgICAgICA8c3RyaW5nPjUwMDM8L3N0cmluZz4KICAgICAgICAgICAgICAgICAgPGtl eT5Db2RlRW5kPC9rZXk+CiAgICAgICAgICAgICAgICAgIDxzdHJpbmc+NTAwNDwvc3RyaW5nPgor ICAgICAgICAgICAgICAgICA8a2V5PkFyZ05hbWVzRW5kPC9rZXk+CisgICAgICAgICAgICAgICAg IDxkaWN0PgorICAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAgICAg ICAgICAgICAgICA8c3RyaW5nPlN1YnJlc291cmNlTG9hZGVyPC9zdHJpbmc+CisgICAgICAgICAg ICAgICAgICAgICA8a2V5PkFyZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+ UGFnZSBJRDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAgICAgPGtleT5BcmczPC9rZXk+Cisg ICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPkZyYW1lIElEPC9zdHJpbmc+CisgICAgICAgICAg ICAgICAgICAgICA8a2V5PkFyZzQ8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+ UmVzb3VyY2UgSUQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAg ICAgICAgICA8a2V5PkFyZ1ZhbHVlVHlwZXNFbmQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPGRp Y3Q+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAg ICAgICAgIDxzdHJpbmc+SGV4PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFy ZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+VUludDY0PC9zdHJpbmc+Cisg ICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzM8L2tleT4KKyAgICAgICAgICAgICAgICAgICAg IDxzdHJpbmc+VUludDY0PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzQ8 L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+VUludDY0PC9zdHJpbmc+CisgICAg ICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICAgICAgPGtleT5FdmVudHNNYXRjaGVk Qnk8L2tleT4KKyAgICAgICAgICAgICAgICAgPGFycmF5PgorICAgICAgICAgICAgICAgICAgICAg PHN0cmluZz5UaHJlYWQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+QXJn MTwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2FycmF5PgogICAgICAgICAgICAgIDwvZGlj dD4KICAgICAgICAgICAgICA8ZGljdD4KICAgICAgICAgICAgICAgICAgPGtleT5OYW1lPC9rZXk+ Cg== 435098 2021-08-06 16:38:48 -0700 2021-08-10 11:53:03 -0700 Patch bug-228242-20210806163847.patch text/plain 8131 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjMzZGUxZDRhNDFkOTcx YWZiYjBkZWNlNjViYzNiOGExNzk1ZTlhMC4uNmI2M2JlNjU4NmEzZmIxY2FmZmJiMTIwZThjYTkz YjNhZjhjZDY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTA4LTA2ICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBuZXN0ZWQgcmVzb3VyY2UgbG9h ZCB0cmFjZXBvaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI4MjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIG1haW4gcmVzb3VyY2UgYW5kIHN1YnJlc291cmNlIGxvYWQgdHJhY2Vwb2ludHMg YXJlbid0IGludGVycHJldGVkIGNvcnJlY3RseSBpZiB0aGVyZSBhcmUKKyAgICAgICAgbXVsdGlw bGUgcmVzb3VyY2UgbG9hZHMgaW4gZmxpZ2h0IGF0IHRoZSBzYW1lIHRpbWUuIFRvIGZpeCB0aGlz LCB3ZSBwYXNzIHRoZSBwb2ludGVyIHRvIHRoZQorICAgICAgICBGcmFtZUxvYWRlciBvciBTdWJy ZXNvdXJjZUxvYWRlciB0byBrdHJhY2Ugc28gdGhhdCB0aGUgdHJhY2luZyB0b29sIGNhbiB1c2Ug dGhhdCBwb2ludGVyIHRvCisgICAgICAgIHByb3Blcmx5IG5lc3Qgb3ZlcmxhcHBpbmcgcmVzb3Vy Y2UgbG9hZGluZyB0cmFjZSBpbnRlcnZhbHMuCisKKyAgICAgICAgT25lIGFkZGl0aW9uYWwgY2hh bmdlIEkgbWFkZSBpcyB0byBtb3ZlIHRoZSBTdWJyZXNvdXJjZUxvYWRXaWxsU3RhcnQgdHJhY2Vw b2ludCB0byBhZnRlciB0aGUKKyAgICAgICAgY2FsbCB0byB3aWxsU2VuZFJlcXVlc3RJbnRlcm5h bC4gVGhlIHJlYXNvbiBmb3IgdGhpcyBpcyBiZWNhdXNlIEkgd2FudGVkIHRvIGxvZyB0aGUgcmVz b3VyY2UKKyAgICAgICAgSUQgYXNzb2NpYXRlZCB3aXRoIHRoZSBzdWJyZXNvdXJjZSByZXF1ZXN0 LCBidXQgd2Ugb25seSBnZW5lcmF0ZSB0aGF0IElEIGFmdGVyIHRoZSBjYWxsIHRvCisgICAgICAg IHdpbGxTZW5kUmVxdWVzdEludGVybmFsLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpwcm92aXNpb25hbExvYWRTdGFy dGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZUZv clRoaXNGcmFtZSk6CisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3RJbnRlcm5h bCk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbCk6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkQ2FuY2VsKToKKwogMjAyMS0wOC0w NiAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jh c2ggYXQgV2ViS2l0OjpXZWJQYWdlOjpyZXF1ZXN0VGV4dFJlY29nbml0aW9uIGNhdXNlZCBieSBh Y2Nlc3NpYmlsaXR5IGludm9jYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cAppbmRleCA4Mzk4M2M2YTMwNTNiZjdjNGVlMzczN2JjYmNkMTg5MTAxOTE4NjgyLi4zYWE5NzBl MjUzYjA3M2U1NDA4MGY2MDkzYmI0ZmQ0MmUyYmFiZDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKQEAgLTEwNjMsNyArMTA2Myw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnBy b3Zpc2lvbmFsTG9hZFN0YXJ0ZWQoKQogICAgIG1fY2xpZW50LT5wcm92aXNpb25hbExvYWRTdGFy dGVkKCk7CiAKICAgICBpZiAobV9mcmFtZS5pc01haW5GcmFtZSgpKSB7Ci0gICAgICAgIHRyYWNl UG9pbnQoTWFpblJlc291cmNlTG9hZERpZFN0YXJ0UHJvdmlzaW9uYWwpOworICAgICAgICB0cmFj ZVBvaW50KE1haW5SZXNvdXJjZUxvYWREaWRTdGFydFByb3Zpc2lvbmFsLCBQQUdFX0lEKTsKIAog ICAgICAgICBpZiAoYXV0byogcGFnZSA9IG1fZnJhbWUucGFnZSgpKQogICAgICAgICAgICAgcGFn ZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQoKTsKQEAgLTI1NzAsNyArMjU3MCw3IEBAIHZvaWQg RnJhbWVMb2FkZXI6OmNoZWNrTG9hZENvbXBsZXRlRm9yVGhpc0ZyYW1lKCkKICAgICAgICAgUGFn ZSogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwogICAgICAgICBpZiAocGFnZSkgewogICAgICAgICAg ICAgaWYgKG1fZnJhbWUuaXNNYWluRnJhbWUoKSkgewotICAgICAgICAgICAgICAgIHRyYWNlUG9p bnQoTWFpblJlc291cmNlTG9hZERpZEVuZCk7CisgICAgICAgICAgICAgICAgdHJhY2VQb2ludChN YWluUmVzb3VyY2VMb2FkRGlkRW5kLCBQQUdFX0lEKTsKICAgICAgICAgICAgICAgICBwYWdlLT5k aWRGaW5pc2hMb2FkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGEyNjFlYWVmNGYyNGQxNmYxOTQ1 NGRhNWEwYmY5NTNlN2ZiYjIyZjkuLjU4NjY4NDRhOTNiOTJhNDRmZDc1NzM5NzVlMzkzNGJkOTUw ODJmYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApA QCAtMTk2LDcgKzE5Niw2IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVz dEludGVybmFsKFJlc291cmNlUmVxdWVzdCYmIG5ld1JlcXVlc3QsIGNvCiAgICAgfQogCiAgICAg aWYgKG5ld1JlcXVlc3QucmVxdWVzdGVyKCkgIT0gUmVzb3VyY2VSZXF1ZXN0QmFzZTo6UmVxdWVz dGVyOjpNYWluKSB7Ci0gICAgICAgIHRyYWNlUG9pbnQoU3VicmVzb3VyY2VMb2FkV2lsbFN0YXJ0 KTsKICAgICAgICAgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpLmxvZ1N1YnJlc291cmNl TG9hZGluZyhtX2ZyYW1lLmdldCgpLCBuZXdSZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlLAogICAg ICAgICAgICAgKGlzU2NyaXB0TGlrZURlc3RpbmF0aW9uKG9wdGlvbnMoKS5kZXN0aW5hdGlvbikg PyBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6RmV0Y2hEZXN0aW5hdGlvbklzU2NyaXB0TGlrZTo6WWVz IDogUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OkZldGNoRGVzdGluYXRpb25Jc1NjcmlwdExpa2U6Ok5v KSk7CiAgICAgfQpAQCAtMjExLDYgKzIxMCw4IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6Ondp bGxTZW5kUmVxdWVzdEludGVybmFsKFJlc291cmNlUmVxdWVzdCYmIG5ld1JlcXVlc3QsIGNvCiAg ICAgICAgIH0KIAogICAgICAgICBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJu YWwoV1RGTW92ZShuZXdSZXF1ZXN0KSwgcmVkaXJlY3RSZXNwb25zZSwgW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpLCByZWRpcmVjdFJlc3BvbnNlXSAoUmVzb3VyY2VSZXF1ZXN0 JiYgcmVxdWVzdCkgbXV0YWJsZSB7CisgICAgICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291cmNl TG9hZFdpbGxTdGFydCwgaWRlbnRpZmllcigpLCBQQUdFX0lELCBGUkFNRV9JRCk7CisKICAgICAg ICAgICAgIGlmIChyZWFjaGVkVGVybWluYWxTdGF0ZSgpKSB7CiAgICAgICAgICAgICAgICAgU1VC UkVTT1VSQ0VMT0FERVJfUkVMRUFTRV9MT0coIndpbGxTZW5kUmVxdWVzdEludGVybmFsOiByZWFj aGVkIHRlcm1pbmFsIHN0YXRlOyBjYWxsaW5nIGNvbXBsZXRpb24gaGFuZGxlciIpOwogICAgICAg ICAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHJlcXVlc3QpKTsKQEAg LTc0MCw3ICs3NDEsNyBAQCB2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5n KGNvbnN0IE5ldHdvcmtMb2FkTWV0cmljcyYgbmV0d29ya0xvYWRNZQogICAgIH0KIAogICAgIGlm IChtX3Jlc291cmNlLT50eXBlKCkgIT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1haW5SZXNvdXJj ZSkKLSAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWREaWRFbmQpOworICAgICAgICB0 cmFjZVBvaW50KFN1YnJlc291cmNlTG9hZERpZEVuZCwgaWRlbnRpZmllcigpKTsKIAogICAgIG1f c3RhdGUgPSBGaW5pc2hpbmc7CiAgICAgbV9yZXNvdXJjZS0+ZmluaXNoTG9hZGluZyhyZXNvdXJj ZURhdGEoKSwgbmV0d29ya0xvYWRNZXRyaWNzKTsKQEAgLTc4Niw3ICs3ODcsNyBAQCB2b2lkIFN1 YnJlc291cmNlTG9hZGVyOjpkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAg IG1fc3RhdGUgPSBGaW5pc2hpbmc7CiAKICAgICBpZiAobV9yZXNvdXJjZS0+dHlwZSgpICE9IENh Y2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpCi0gICAgICAgIHRyYWNlUG9pbnQoU3Vi cmVzb3VyY2VMb2FkRGlkRW5kKTsKKyAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWRE aWRFbmQsIGlkZW50aWZpZXIoKSk7CiAKICAgICBpZiAobV9yZXNvdXJjZS0+cmVzb3VyY2VUb1Jl dmFsaWRhdGUoKSkKICAgICAgICAgTWVtb3J5Q2FjaGU6OnNpbmdsZXRvbigpLnJldmFsaWRhdGlv bkZhaWxlZCgqbV9yZXNvdXJjZSk7CkBAIC04MzksNyArODQwLDcgQEAgdm9pZCBTdWJyZXNvdXJj ZUxvYWRlcjo6ZGlkQ2FuY2VsKGNvbnN0IFJlc291cmNlRXJyb3ImKQogICAgIEFTU0VSVChtX3Jl c291cmNlKTsKIAogICAgIGlmIChtX3Jlc291cmNlLT50eXBlKCkgIT0gQ2FjaGVkUmVzb3VyY2U6 OlR5cGU6Ok1haW5SZXNvdXJjZSkKLSAgICAgICAgdHJhY2VQb2ludChTdWJyZXNvdXJjZUxvYWRE aWRFbmQpOworICAgICAgICB0cmFjZVBvaW50KFN1YnJlc291cmNlTG9hZERpZEVuZCwgaWRlbnRp ZmllcigpKTsKIAogICAgIG1fcmVzb3VyY2UtPmNhbmNlbExvYWQoKTsKICAgICBub3RpZnlEb25l KExvYWRDb21wbGV0aW9uVHlwZTo6Q2FuY2VsKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2OWVlMTczNmMzOTI4ZTgwMzE5NTVmYjY5YzYwZmY3 MGYyNTJmNzVjLi44NDI3YWIxYzg3ZTdhNWYyNTdiZTZkYjdjYzQ1MGQxNzA1NTJmNDRjIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMjEtMDgtMDYgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAg Rml4IG5lc3RlZCByZXNvdXJjZSBsb2FkIHRyYWNlcG9pbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyNDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgcGFnZSBhbmQgcmVzb3VyY2UgaWRzIHRv IHByb3Blcmx5IGhhbmRsZSBuZXN0ZWQgbWFpbiByZXNvdXJjZSBhbmQgc3VicmVzb3VyY2UgbG9h ZAorICAgICAgICB0cmFjZXBvaW50IGludGVydmFscy4KKworICAgICAgICAqIFRyYWNpbmcvU3lz dGVtVHJhY2VQb2ludHMucGxpc3Q6CisKIDIwMjEtMDgtMDYgIEFha2FzaCBKYWluICA8YWFrYXNo X2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3NdIE1ha2UgY29uZmlnLmpzb24gY29tcGFj dApkaWZmIC0tZ2l0IGEvVG9vbHMvVHJhY2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdCBiL1Rv b2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QKaW5kZXggMDdjNDM3ZTNkMjEwNjNk NGYzZmJkZjlhNWFmYWM2NTQ5MzMxMDJkOS4uODM4YWIxMzAzOWZhYThkMDQwZjEzOWU5Y2I3ZDI4 NGMxMzBjMGYzMyAxMDA2NDQKLS0tIGEvVG9vbHMvVHJhY2luZy9TeXN0ZW1UcmFjZVBvaW50cy5w bGlzdAorKysgYi9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0CkBAIC02Niw2 ICs2NiwyMSBAQAogICAgICAgICAgICAgICAgICA8c3RyaW5nPjUwMDE8L3N0cmluZz4KICAgICAg ICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9rZXk+CiAgICAgICAgICAgICAgICAgIDxzdHJpbmc+ NTAwMjwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PkFyZ05hbWVzQmVnaW48L2tleT4K KyAgICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8 L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+UGFnZSBJRDwvc3RyaW5nPgorICAg ICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+QXJnVmFsdWVUeXBl c0JlZ2luPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICAg ICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlVJbnQ2NDwv c3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+ RXZlbnRzTWF0Y2hlZEJ5PC9rZXk+CisgICAgICAgICAgICAgICAgIDxhcnJheT4KKyAgICAgICAg ICAgICAgICAgICAgIDxzdHJpbmc+VGhyZWFkPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAg ICA8c3RyaW5nPkFyZzE8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9hcnJheT4KICAgICAg ICAgICAgICA8L2RpY3Q+CiAgICAgICAgICAgICAgPGRpY3Q+CiAgICAgICAgICAgICAgICAgIDxr ZXk+TmFtZTwva2V5PgpAQCAtNzgsNiArOTMsMjkgQEAKICAgICAgICAgICAgICAgICAgPHN0cmlu Zz41MDAzPC9zdHJpbmc+CiAgICAgICAgICAgICAgICAgIDxrZXk+Q29kZUVuZDwva2V5PgogICAg ICAgICAgICAgICAgICA8c3RyaW5nPjUwMDQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtl eT5BcmdOYW1lc0JlZ2luPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAg ICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5n PlJlc291cmNlIElEPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzI8L2tl eT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+UGFnZSBJRDwvc3RyaW5nPgorICAgICAg ICAgICAgICAgICAgICAgPGtleT5BcmczPC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3Ry aW5nPkZyYW1lIElEPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAg ICAgICAgICAgPGtleT5BcmdWYWx1ZVR5cGVzQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAg PGRpY3Q+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAg ICAgICAgICAgIDxzdHJpbmc+VUludDY0PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgICA8 a2V5PkFyZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+VUludDY0PC9zdHJp bmc+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzM8L2tleT4KKyAgICAgICAgICAgICAg ICAgICAgIDxzdHJpbmc+VUludDY0PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDwvZGljdD4K KyAgICAgICAgICAgICAgICAgPGtleT5FdmVudHNNYXRjaGVkQnk8L2tleT4KKyAgICAgICAgICAg ICAgICAgPGFycmF5PgorICAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5UaHJlYWQ8L3N0cmlu Zz4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+QXJnMTwvc3RyaW5nPgorICAgICAgICAg ICAgICAgICA8L2FycmF5PgogICAgICAgICAgICAgIDwvZGljdD4KICAgICAgICAgICAgICA8ZGlj dD4KICAgICAgICAgICAgICAgICAgPGtleT5OYW1lPC9rZXk+Cg==