225262 2021-04-30 17:45:38 -0700 [Cocoa] Cache the value of MediaPlayerPrivateAVFoundationObjC::assetStatus() 2021-05-04 13:44:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225254 1 jer.noble jer.noble eric.carlson ews-watchlist glenn jean-yves.avenard peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1755882 0 jer.noble 2021-04-30 17:45:38 -0700 [Cocoa] Cache the value of MediaPlayerPrivateAVFoundationObjC::assetStatus() 1755883 1 427473 jer.noble 2021-04-30 17:49:52 -0700 Created attachment 427473 Patch 1755909 2 427484 jer.noble 2021-04-30 20:15:00 -0700 Created attachment 427484 Patch 1755920 3 webkit-bug-importer 2021-04-30 21:22:47 -0700 <rdar://problem/77410135> 1756652 4 ews-feeder 2021-05-04 13:44:49 -0700 Committed r276981 (237307@main): <https://commits.webkit.org/237307@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427484. 427473 2021-04-30 17:49:52 -0700 2021-04-30 20:14:58 -0700 Patch bug-225262-20210430174951.patch text/plain 5507 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUyOWJjZThmODhiZWRi ODZlODM4NzVmMTZhNTllYmI5ZTdiY2I1YS4uNjY3M2JlMzZhY2MwZGJjMGIxOWM5NmM1NTZmMTE3 ZDYyZWI3YmQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTMwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gQ2FjaGUgdGhl IHZhbHVlIG9mIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmFzc2V0U3RhdHVz KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTI2 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbGxp bmcgaW50byBhc3NldFN0YXR1cygpIHJlcXVpcmVzIHF1ZXJ5aW5nIHRoZSBsb2FkIHN0YXRlIGFu ZCB2YWx1ZSBvZiBuaW5lIGRpZmZlcmVudAorICAgICAgICBBVkFzc2V0IHByb3BlcnRpZXMsIHdo aWNoIGFkZHMgdXAgaWYgYXNzZXRTdGF0dXMoKSBpcyBjYWxsZWQgb2Z0ZW4uIE9uY2UgdGhlIGFz c2V0U3RhdHVzKCkKKyAgICAgICAgdmFsdWUgcmVhY2hlcyB0aGUgTG9hZGVkIHN0YXRlLCBjYWNo ZSB0aGF0IHByb3BlcnR5LCBhbmQgdGhhdCBvZiB0aGUgQVZBc3NldC5wbGF5YWJsZQorICAgICAg ICBwcm9wZXJ0eSwgc28gc3Vic2VxdWVudCBxdWVyaWVzIGFyZSBqdXN0IGFuIGl2YXIgbG9va3Vw LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD Ojphc3NldFN0YXR1cyBjb25zdCk6CisKIDIwMjEtMDQtMzAgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDYWxsaW5nIGludG8gLVtBVlBsYXllckl0 ZW0gY3VycmVudFRpbWVdIGlzIHZlcnkgZXhwZW5zaXZlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKaW5k ZXggZWMyYmEwZGZiODI1OWRlNzVmNDU5YzRkZWMwYjlhMTEyODMwZWVlZC4uNDFhNjMzNjcyYWI0 MjA1MjVkNDkyYjBjMDA0NWY0OGUyYWRlN2RhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaApAQCAt NDE1LDYgKzQxNSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhdmVCZWVuQXNrZWRUb0NyZWF0 ZUxheWVyIHsgZmFsc2UgfTsKICAgICBib29sIG1fY2FjaGVkQ2FuUGxheUZhc3RGb3J3YXJkIHsg ZmFsc2UgfTsKICAgICBib29sIG1fY2FjaGVkQ2FuUGxheUZhc3RSZXZlcnNlIHsgZmFsc2UgfTsK KyAgICBtdXRhYmxlIGJvb2wgbV9jYWNoZWRBc3NldElzTG9hZGVkIHsgZmFsc2UgfTsKKyAgICBt dXRhYmxlIE9wdGlvbmFsPGJvb2w+IG1fY2FjaGVkQXNzZXRJc1BsYXlhYmxlOwogICAgIGJvb2wg bV9tdXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3Nob3VsZE9ic2VydmVUaW1lQ29udHJvbFN0 YXR1cyB7IGZhbHNlIH07CiAgICAgbXV0YWJsZSBPcHRpb25hbDxib29sPiBtX3RyYWNrc0FyZVBs YXlhYmxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggNmJhMDQzNDUwNjE4MzVhMDQxNmUw OTJiYmYyMGQxYWU2NmJiOGVlMS4uY2VmZTFjNTA1MzI4Njg5MGIwYjdmMjQwOGMzNzE5OTFlZDY0 MGMyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0xMTA2LDYgKzExMDYsNyBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZUFWUGxheWVyKCkKICNl bmRpZgogCiAgICAgQVNTRVJUKCFtX2N1cnJlbnRUaW1lT2JzZXJ2ZXIpOworICAgIGF1dG8gY3Vy cmVudFRpbWVJbnRlcnZhbCA9IENNVGltZU1ha2UoMSwgMTApOwogICAgIG1fY3VycmVudFRpbWVP YnNlcnZlciA9IFttX2F2UGxheWVyIGFkZFBlcmlvZGljVGltZU9ic2VydmVyRm9ySW50ZXJ2YWw6 Q01UaW1lTWFrZSgxLCAxMCkgcXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSB1c2luZ0Js b2NrOlt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0gKENNVGltZSB0aW1lKSB7CiAgICAg ICAgIGlmICh3ZWFrVGhpcykKICAgICAgICAgICAgIHdlYWtUaGlzLT5jdXJyZW50TWVkaWFUaW1l RGlkQ2hhbmdlKFBBTDo6dG9NZWRpYVRpbWUodGltZSkpOwpAQCAtMTY5MSwyMSArMTY5MiwyNCBA QCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OkFzc2V0U3RhdHVzIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OgogICAgIGlmICghbV9hdkFzc2V0KQogICAgICAgICBy ZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzRG9lc05vdEV4aXN0OwogCi0gICAgZm9yIChO U1N0cmluZyAqa2V5TmFtZSBpbiBhc3NldE1ldGFkYXRhS2V5TmFtZXMoKSkgewotICAgICAgICBO U0Vycm9yICplcnJvciA9IG5pbDsKLSAgICAgICAgQVZLZXlWYWx1ZVN0YXR1cyBrZXlTdGF0dXMg PSBbbV9hdkFzc2V0LmdldCgpIHN0YXR1c09mVmFsdWVGb3JLZXk6a2V5TmFtZSBlcnJvcjomZXJy b3JdOworICAgIGlmICghbV9jYWNoZWRBc3NldElzTG9hZGVkKSB7CisgICAgICAgIGZvciAoTlNT dHJpbmcgKmtleU5hbWUgaW4gYXNzZXRNZXRhZGF0YUtleU5hbWVzKCkpIHsKKyAgICAgICAgICAg IE5TRXJyb3IgKmVycm9yID0gbmlsOworICAgICAgICAgICAgQVZLZXlWYWx1ZVN0YXR1cyBrZXlT dGF0dXMgPSBbbV9hdkFzc2V0LmdldCgpIHN0YXR1c09mVmFsdWVGb3JLZXk6a2V5TmFtZSBlcnJv cjomZXJyb3JdOwogCi0gICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAgIEVSUk9SX0xPRyhM T0dJREVOVElGSUVSLCAiZmFpbGVkIGZvciAiLCBba2V5TmFtZSBVVEY4U3RyaW5nXSwgIiwgZXJy b3IgPSAiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7CisgICAg ICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJ RVIsICJmYWlsZWQgZm9yICIsIFtrZXlOYW1lIFVURjhTdHJpbmddLCAiLCBlcnJvciA9ICIsIFtb ZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKIAotICAgICAgICBpZiAo a2V5U3RhdHVzIDwgQVZLZXlWYWx1ZVN0YXR1c0xvYWRlZCkKLSAgICAgICAgICAgIHJldHVybiBN ZWRpYVBsYXllckFWQXNzZXRTdGF0dXNMb2FkaW5nOy8vIEF0IGxlYXN0IG9uZSBrZXkgaXMgbm90 IGxvYWRlZCB5ZXQuCi0gICAgICAgIAotICAgICAgICBpZiAoa2V5U3RhdHVzID09IEFWS2V5VmFs dWVTdGF0dXNGYWlsZWQpCi0gICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3Rh dHVzRmFpbGVkOyAvLyBBdCBsZWFzdCBvbmUga2V5IGNvdWxkIG5vdCBiZSBsb2FkZWQuCisgICAg ICAgICAgICBpZiAoa2V5U3RhdHVzIDwgQVZLZXlWYWx1ZVN0YXR1c0xvYWRlZCkKKyAgICAgICAg ICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzTG9hZGluZzsgLy8gQXQgbGVh c3Qgb25lIGtleSBpcyBub3QgbG9hZGVkIHlldC4KKworICAgICAgICAgICAgaWYgKGtleVN0YXR1 cyA9PSBBVktleVZhbHVlU3RhdHVzRmFpbGVkKQorICAgICAgICAgICAgICAgIHJldHVybiBNZWRp YVBsYXllckFWQXNzZXRTdGF0dXNGYWlsZWQ7IC8vIEF0IGxlYXN0IG9uZSBrZXkgY291bGQgbm90 IGJlIGxvYWRlZC4KIAotICAgICAgICBpZiAoa2V5U3RhdHVzID09IEFWS2V5VmFsdWVTdGF0dXND YW5jZWxsZWQpCi0gICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzQ2Fu Y2VsbGVkOyAvLyBMb2FkaW5nIG9mIGF0IGxlYXN0IG9uZSBrZXkgd2FzIGNhbmNlbGxlZC4KKyAg ICAgICAgICAgIGlmIChrZXlTdGF0dXMgPT0gQVZLZXlWYWx1ZVN0YXR1c0NhbmNlbGxlZCkKKyAg ICAgICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzQ2FuY2VsbGVkOyAv LyBMb2FkaW5nIG9mIGF0IGxlYXN0IG9uZSBrZXkgd2FzIGNhbmNlbGxlZC4KKyAgICAgICAgfQor ICAgICAgICBtX2NhY2hlZEFzc2V0SXNMb2FkZWQgPSB0cnVlOwogICAgIH0KIAogICAgIGlmICgh cGxheWVyKCktPnNob3VsZENoZWNrSGFyZHdhcmVTdXBwb3J0KCkpCkBAIC0xNzIxLDcgKzE3MjUs MTAgQEAgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpBc3NldFN0YXR1cyBNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjoKICAgICAgICAgfQogICAgIH0KIAotICAgIGlm IChbW21fYXZBc3NldC5nZXQoKSB2YWx1ZUZvcktleTpAInBsYXlhYmxlIl0gYm9vbFZhbHVlXSAm JiBtX3RyYWNrc0FyZVBsYXlhYmxlLnZhbHVlKCkpCisgICAgaWYgKCFtX2NhY2hlZEFzc2V0SXNQ bGF5YWJsZSkKKyAgICAgICAgbV9jYWNoZWRBc3NldElzUGxheWFibGUgPSBbW21fYXZBc3NldC5n ZXQoKSB2YWx1ZUZvcktleTpAInBsYXlhYmxlIl0gYm9vbFZhbHVlXTsKKworICAgIGlmICgqbV9j YWNoZWRBc3NldElzUGxheWFibGUgJiYgbV90cmFja3NBcmVQbGF5YWJsZS52YWx1ZSgpKQogICAg ICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzUGxheWFibGU7CiAKICAgICByZXR1 cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzTG9hZGVkOwo= 427484 2021-04-30 20:15:00 -0700 2021-05-04 13:44:50 -0700 Patch bug-225262-20210430201459.patch text/plain 5047 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUyOWJjZThmODhiZWRi ODZlODM4NzVmMTZhNTllYmI5ZTdiY2I1YS4uNjY3M2JlMzZhY2MwZGJjMGIxOWM5NmM1NTZmMTE3 ZDYyZWI3YmQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTMwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gQ2FjaGUgdGhl IHZhbHVlIG9mIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmFzc2V0U3RhdHVz KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTI2 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbGxp bmcgaW50byBhc3NldFN0YXR1cygpIHJlcXVpcmVzIHF1ZXJ5aW5nIHRoZSBsb2FkIHN0YXRlIGFu ZCB2YWx1ZSBvZiBuaW5lIGRpZmZlcmVudAorICAgICAgICBBVkFzc2V0IHByb3BlcnRpZXMsIHdo aWNoIGFkZHMgdXAgaWYgYXNzZXRTdGF0dXMoKSBpcyBjYWxsZWQgb2Z0ZW4uIE9uY2UgdGhlIGFz c2V0U3RhdHVzKCkKKyAgICAgICAgdmFsdWUgcmVhY2hlcyB0aGUgTG9hZGVkIHN0YXRlLCBjYWNo ZSB0aGF0IHByb3BlcnR5LCBhbmQgdGhhdCBvZiB0aGUgQVZBc3NldC5wbGF5YWJsZQorICAgICAg ICBwcm9wZXJ0eSwgc28gc3Vic2VxdWVudCBxdWVyaWVzIGFyZSBqdXN0IGFuIGl2YXIgbG9va3Vw LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD Ojphc3NldFN0YXR1cyBjb25zdCk6CisKIDIwMjEtMDQtMzAgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDYWxsaW5nIGludG8gLVtBVlBsYXllckl0 ZW0gY3VycmVudFRpbWVdIGlzIHZlcnkgZXhwZW5zaXZlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKaW5k ZXggZWMyYmEwZGZiODI1OWRlNzVmNDU5YzRkZWMwYjlhMTEyODMwZWVlZC4uNDFhNjMzNjcyYWI0 MjA1MjVkNDkyYjBjMDA0NWY0OGUyYWRlN2RhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaApAQCAt NDE1LDYgKzQxNSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhdmVCZWVuQXNrZWRUb0NyZWF0 ZUxheWVyIHsgZmFsc2UgfTsKICAgICBib29sIG1fY2FjaGVkQ2FuUGxheUZhc3RGb3J3YXJkIHsg ZmFsc2UgfTsKICAgICBib29sIG1fY2FjaGVkQ2FuUGxheUZhc3RSZXZlcnNlIHsgZmFsc2UgfTsK KyAgICBtdXRhYmxlIGJvb2wgbV9jYWNoZWRBc3NldElzTG9hZGVkIHsgZmFsc2UgfTsKKyAgICBt dXRhYmxlIE9wdGlvbmFsPGJvb2w+IG1fY2FjaGVkQXNzZXRJc1BsYXlhYmxlOwogICAgIGJvb2wg bV9tdXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3Nob3VsZE9ic2VydmVUaW1lQ29udHJvbFN0 YXR1cyB7IGZhbHNlIH07CiAgICAgbXV0YWJsZSBPcHRpb25hbDxib29sPiBtX3RyYWNrc0FyZVBs YXlhYmxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggNmJhMDQzNDUwNjE4MzVhMDQxNmUw OTJiYmYyMGQxYWU2NmJiOGVlMS4uNmZjNmRjYzQzNzViMjNjYmFhNTNiMTQ2NWNkMzU5NTYyMTBj NjQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0xNjkxLDIxICsxNjkxLDI0IEBAIE1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6QXNzZXRTdGF0dXMgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6CiAgICAgaWYgKCFtX2F2QXNzZXQpCiAgICAgICAgIHJldHVy biBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNEb2VzTm90RXhpc3Q7CiAKLSAgICBmb3IgKE5TU3Ry aW5nICprZXlOYW1lIGluIGFzc2V0TWV0YWRhdGFLZXlOYW1lcygpKSB7Ci0gICAgICAgIE5TRXJy b3IgKmVycm9yID0gbmlsOwotICAgICAgICBBVktleVZhbHVlU3RhdHVzIGtleVN0YXR1cyA9IFtt X2F2QXNzZXQuZ2V0KCkgc3RhdHVzT2ZWYWx1ZUZvcktleTprZXlOYW1lIGVycm9yOiZlcnJvcl07 CisgICAgaWYgKCFtX2NhY2hlZEFzc2V0SXNMb2FkZWQpIHsKKyAgICAgICAgZm9yIChOU1N0cmlu ZyAqa2V5TmFtZSBpbiBhc3NldE1ldGFkYXRhS2V5TmFtZXMoKSkgeworICAgICAgICAgICAgTlNF cnJvciAqZXJyb3IgPSBuaWw7CisgICAgICAgICAgICBBVktleVZhbHVlU3RhdHVzIGtleVN0YXR1 cyA9IFttX2F2QXNzZXQuZ2V0KCkgc3RhdHVzT2ZWYWx1ZUZvcktleTprZXlOYW1lIGVycm9yOiZl cnJvcl07CiAKLSAgICAgICAgaWYgKGVycm9yKQotICAgICAgICAgICAgRVJST1JfTE9HKExPR0lE RU5USUZJRVIsICJmYWlsZWQgZm9yICIsIFtrZXlOYW1lIFVURjhTdHJpbmddLCAiLCBlcnJvciA9 ICIsIFtbZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKKyAgICAgICAg ICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICBFUlJPUl9MT0coTE9HSURFTlRJRklFUiwg ImZhaWxlZCBmb3IgIiwgW2tleU5hbWUgVVRGOFN0cmluZ10sICIsIGVycm9yID0gIiwgW1tlcnJv ciBsb2NhbGl6ZWREZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10pOwogCi0gICAgICAgIGlmIChrZXlT dGF0dXMgPCBBVktleVZhbHVlU3RhdHVzTG9hZGVkKQotICAgICAgICAgICAgcmV0dXJuIE1lZGlh UGxheWVyQVZBc3NldFN0YXR1c0xvYWRpbmc7Ly8gQXQgbGVhc3Qgb25lIGtleSBpcyBub3QgbG9h ZGVkIHlldC4KLSAgICAgICAgCi0gICAgICAgIGlmIChrZXlTdGF0dXMgPT0gQVZLZXlWYWx1ZVN0 YXR1c0ZhaWxlZCkKLSAgICAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNG YWlsZWQ7IC8vIEF0IGxlYXN0IG9uZSBrZXkgY291bGQgbm90IGJlIGxvYWRlZC4KKyAgICAgICAg ICAgIGlmIChrZXlTdGF0dXMgPCBBVktleVZhbHVlU3RhdHVzTG9hZGVkKQorICAgICAgICAgICAg ICAgIHJldHVybiBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNMb2FkaW5nOyAvLyBBdCBsZWFzdCBv bmUga2V5IGlzIG5vdCBsb2FkZWQgeWV0LgorCisgICAgICAgICAgICBpZiAoa2V5U3RhdHVzID09 IEFWS2V5VmFsdWVTdGF0dXNGYWlsZWQpCisgICAgICAgICAgICAgICAgcmV0dXJuIE1lZGlhUGxh eWVyQVZBc3NldFN0YXR1c0ZhaWxlZDsgLy8gQXQgbGVhc3Qgb25lIGtleSBjb3VsZCBub3QgYmUg bG9hZGVkLgogCi0gICAgICAgIGlmIChrZXlTdGF0dXMgPT0gQVZLZXlWYWx1ZVN0YXR1c0NhbmNl bGxlZCkKLSAgICAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNDYW5jZWxs ZWQ7IC8vIExvYWRpbmcgb2YgYXQgbGVhc3Qgb25lIGtleSB3YXMgY2FuY2VsbGVkLgorICAgICAg ICAgICAgaWYgKGtleVN0YXR1cyA9PSBBVktleVZhbHVlU3RhdHVzQ2FuY2VsbGVkKQorICAgICAg ICAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNDYW5jZWxsZWQ7IC8vIExv YWRpbmcgb2YgYXQgbGVhc3Qgb25lIGtleSB3YXMgY2FuY2VsbGVkLgorICAgICAgICB9CisgICAg ICAgIG1fY2FjaGVkQXNzZXRJc0xvYWRlZCA9IHRydWU7CiAgICAgfQogCiAgICAgaWYgKCFwbGF5 ZXIoKS0+c2hvdWxkQ2hlY2tIYXJkd2FyZVN1cHBvcnQoKSkKQEAgLTE3MjEsNyArMTcyNCwxMCBA QCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OkFzc2V0U3RhdHVzIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OgogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKFtb bV9hdkFzc2V0LmdldCgpIHZhbHVlRm9yS2V5OkAicGxheWFibGUiXSBib29sVmFsdWVdICYmIG1f dHJhY2tzQXJlUGxheWFibGUudmFsdWUoKSkKKyAgICBpZiAoIW1fY2FjaGVkQXNzZXRJc1BsYXlh YmxlKQorICAgICAgICBtX2NhY2hlZEFzc2V0SXNQbGF5YWJsZSA9IFtbbV9hdkFzc2V0LmdldCgp IHZhbHVlRm9yS2V5OkAicGxheWFibGUiXSBib29sVmFsdWVdOworCisgICAgaWYgKCptX2NhY2hl ZEFzc2V0SXNQbGF5YWJsZSAmJiBtX3RyYWNrc0FyZVBsYXlhYmxlLnZhbHVlKCkpCiAgICAgICAg IHJldHVybiBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNQbGF5YWJsZTsKIAogICAgIHJldHVybiBN ZWRpYVBsYXllckFWQXNzZXRTdGF0dXNMb2FkZWQ7Cg==