190471 2018-10-11 08:30:28 -0700 [GStreamer] Fix EME build for GStreamer 1.14.x 2018-10-15 04:59:22 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand bandou.yacine calvaris tsaunier webkit-bug-importer oldest_to_newest 1468030 0 pnormand 2018-10-11 08:30:28 -0700 . 1468032 1 352046 pnormand 2018-10-11 08:35:07 -0700 Created attachment 352046 Patch 1468039 2 352046 bandou.yacine 2018-10-11 08:58:40 -0700 Comment on attachment 352046 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352046&action=review > Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:168 > } If it is necessary to add the flag, I suggest like this: gst_structure_set_name(outgoingStructure.get(), #if GST_CHECK_VERSION(1, 15, 0) !g_strcmp0(klass->protectionSystemId, GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" : "application/x-cenc"); #else "application/x-cenc"); #endif 1468041 3 352047 pnormand 2018-10-11 09:05:27 -0700 Created attachment 352047 Patch 1468130 4 352047 tsaunier 2018-10-11 13:19:36 -0700 Comment on attachment 352047 Patch There is another occurence of `GST_PROTECTION_UNSPECIFIED_SYSTEM_ID` in MediaPlayerPrivateGStreamerBase.cpp - I guess you missed a part of your patch. 1468131 5 352047 pnormand 2018-10-11 13:23:38 -0700 Comment on attachment 352047 Patch Oops. Will update the patch. Thanks! 1468463 6 352177 pnormand 2018-10-12 10:00:29 -0700 Created attachment 352177 Patch 1468465 7 352177 tsaunier 2018-10-12 10:07:10 -0700 Comment on attachment 352177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352177&action=review Lgtm, though I believe that code should be reworked :-) Informal r+ > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:1305 > + if (eventKeySystemUUID == GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) I know this patch doesn't change the semantics but the assumption that `GST_PROTECTION_UNSPECIFIED_SYSTEM_ID` implies `webm` sounds dangerous/not future proof. 1469140 8 352177 calvaris 2018-10-14 22:17:11 -0700 Comment on attachment 352177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352177&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:1305 >> + if (eventKeySystemUUID == GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) > > I know this patch doesn't change the semantics but the assumption that `GST_PROTECTION_UNSPECIFIED_SYSTEM_ID` implies `webm` sounds dangerous/not future proof. I agree and I already commented it on the original bug. I'll buy it for the moment as in cenc the sys id is mandatory and we only suppory either webm or cenc. 1469161 9 pnormand 2018-10-15 04:44:49 -0700 Committed r237092: <https://trac.webkit.org/changeset/237092> 1469162 10 webkit-bug-importer 2018-10-15 04:45:42 -0700 <rdar://problem/45268472> 1469165 11 tsaunier 2018-10-15 04:49:57 -0700 I am afraid that will actually make the patches that backported that feature in jhbuild useless. 1469170 12 pnormand 2018-10-15 04:59:22 -0700 (In reply to Thibault Saunier from comment #11) > I am afraid that will actually make the patches that backported that feature > in jhbuild useless. Yes you're right. See also https://bugs.webkit.org/show_bug.cgi?id=189238#c9 and following comments. 352046 2018-10-11 08:35:07 -0700 2018-10-11 09:05:23 -0700 Patch bug-190471-20181011163506.patch text/plain 2230 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBmNDM0NzgzOGNiZjZj OTViM2VkYmM5MTRhZDI5MDM0YzU3MWNkYy4uOGFmZmVjNDAxMzI3Mzc3MDIxYjIwOWYyMTUzZThi Yzk5MDk5MDU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTEwLTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBGaXggRU1FIGJ1aWxkIGZvciBHU3RyZWFtZXIgMS4xNC54CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA0NzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJraXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0VHJhbnNmb3JtQ2Fwcyk6IFRo ZQorICAgICAgICBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklFRF9TWVNURU1fSUQgI2RlZmluZSB3 b24ndCBiZSBzaGlwcGVkCisgICAgICAgIHVudGlsIHRoZSBHU3RyZWFtZXIgMS4xNi4wIHJlbGVh c2UsIHNvIGl0cyB1c2UgbmVlZHMgdG8gYmUgd3JhcHBlZAorICAgICAgICBiZXR3ZWVuIGEgdmVy c2lvbiBjaGVjay4KKwogMjAxOC0xMC0xMSAgRW5yaXF1ZSBPY2HDsWEgR29uesOhbGV6ICA8ZW9j YW5oYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW01TRV0gRml4IGhlaWdodCBj YWxjdWxhdGlvbiBmb3Igc3RyZWFtcyB3aXRoIHNvdXJjZSBhc3BlY3QgcmF0aW8KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0 Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNy eXB0b3JHU3RyZWFtZXIuY3BwCmluZGV4IDdlNzExYzY3ZTBjNzA2OTdlNDMwY2I0YjRmZGM2ZDM3 ZTM0NTNlNmQuLmJlNWIxMTVjZjU4ZDhmNTYyNTg4MDU4MTAwN2E5MjkxNzI4MmI0NjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2Vi S2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0 aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcApAQCAtMTU5LDggKzE1OSwxMiBAQCBzdGF0aWMgR3N0 Q2Fwcyogd2Via2l0TWVkaWFDb21tb25FbmNyeXB0aW9uRGVjcnlwdFRyYW5zZm9ybUNhcHMoR3N0 QmFzZVRyYW5zZm9ybQogICAgICAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQob3V0Z29pbmdTdHJ1 Y3R1cmUuZ2V0KCksICJwcm90ZWN0aW9uLXN5c3RlbSIsIEdfVFlQRV9TVFJJTkcsIGtsYXNzLT5w cm90ZWN0aW9uU3lzdGVtSWQsCiAgICAgICAgICAgICAgICAgIm9yaWdpbmFsLW1lZGlhLXR5cGUi LCBHX1RZUEVfU1RSSU5HLCBnc3Rfc3RydWN0dXJlX2dldF9uYW1lKGluY29taW5nU3RydWN0dXJl KSwgbnVsbHB0cik7CiAKKyAgICAgICAgICAgIC8vIEdTVF9QUk9URUNUSU9OX1VOU1BFQ0lGSUVE X1NZU1RFTV9JRCB3YXMgYWRkZWQgaW4gdGhlIEdTdHJlYW1lcgorICAgICAgICAgICAgLy8gZGV2 ZWxvcGVtZW50IGdpdCBtYXN0ZXIgd2hpY2ggd2lsbCBzaGlwIGFzIHZlcnNpb24gMS4xNi4wLgor I2lmIEdTVF9DSEVDS19WRVJTSU9OKDEsIDE1LCAwKQogICAgICAgICAgICAgZ3N0X3N0cnVjdHVy ZV9zZXRfbmFtZShvdXRnb2luZ1N0cnVjdHVyZS5nZXQoKSwKICAgICAgICAgICAgICAgICAhZ19z dHJjbXAwKGtsYXNzLT5wcm90ZWN0aW9uU3lzdGVtSWQsIEdTVF9QUk9URUNUSU9OX1VOU1BFQ0lG SUVEX1NZU1RFTV9JRCkgPyAiYXBwbGljYXRpb24veC13ZWJtLWVuYyIgOiAiYXBwbGljYXRpb24v eC1jZW5jIik7CisjZW5kaWYKICAgICAgICAgfQogCiAgICAgICAgIGJvb2wgZHVwbGljYXRlID0g ZmFsc2U7Cg== 352047 2018-10-11 09:05:27 -0700 2018-10-12 10:00:25 -0700 Patch bug-190471-20181011170525.patch text/plain 2392 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBmNDM0NzgzOGNiZjZj OTViM2VkYmM5MTRhZDI5MDM0YzU3MWNkYy4uOGFmZmVjNDAxMzI3Mzc3MDIxYjIwOWYyMTUzZThi Yzk5MDk5MDU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTEwLTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBGaXggRU1FIGJ1aWxkIGZvciBHU3RyZWFtZXIgMS4xNC54CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA0NzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJraXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0VHJhbnNmb3JtQ2Fwcyk6IFRo ZQorICAgICAgICBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklFRF9TWVNURU1fSUQgI2RlZmluZSB3 b24ndCBiZSBzaGlwcGVkCisgICAgICAgIHVudGlsIHRoZSBHU3RyZWFtZXIgMS4xNi4wIHJlbGVh c2UsIHNvIGl0cyB1c2UgbmVlZHMgdG8gYmUgd3JhcHBlZAorICAgICAgICBiZXR3ZWVuIGEgdmVy c2lvbiBjaGVjay4KKwogMjAxOC0xMC0xMSAgRW5yaXF1ZSBPY2HDsWEgR29uesOhbGV6ICA8ZW9j YW5oYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW01TRV0gRml4IGhlaWdodCBj YWxjdWxhdGlvbiBmb3Igc3RyZWFtcyB3aXRoIHNvdXJjZSBhc3BlY3QgcmF0aW8KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0 Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNy eXB0b3JHU3RyZWFtZXIuY3BwCmluZGV4IDdlNzExYzY3ZTBjNzA2OTdlNDMwY2I0YjRmZGM2ZDM3 ZTM0NTNlNmQuLjNkNGQ4N2U3NjFhMTY4NzJkMzk4MzQ2MTgxMzUwZDhmYmVjOGM2YjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2Vi S2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0 aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcApAQCAtMTU5LDggKzE1OSwxMyBAQCBzdGF0aWMgR3N0 Q2Fwcyogd2Via2l0TWVkaWFDb21tb25FbmNyeXB0aW9uRGVjcnlwdFRyYW5zZm9ybUNhcHMoR3N0 QmFzZVRyYW5zZm9ybQogICAgICAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQob3V0Z29pbmdTdHJ1 Y3R1cmUuZ2V0KCksICJwcm90ZWN0aW9uLXN5c3RlbSIsIEdfVFlQRV9TVFJJTkcsIGtsYXNzLT5w cm90ZWN0aW9uU3lzdGVtSWQsCiAgICAgICAgICAgICAgICAgIm9yaWdpbmFsLW1lZGlhLXR5cGUi LCBHX1RZUEVfU1RSSU5HLCBnc3Rfc3RydWN0dXJlX2dldF9uYW1lKGluY29taW5nU3RydWN0dXJl KSwgbnVsbHB0cik7CiAKKyAgICAgICAgICAgIC8vIEdTVF9QUk9URUNUSU9OX1VOU1BFQ0lGSUVE X1NZU1RFTV9JRCB3YXMgYWRkZWQgaW4gdGhlIEdTdHJlYW1lcgorICAgICAgICAgICAgLy8gZGV2 ZWxvcGVtZW50IGdpdCBtYXN0ZXIgd2hpY2ggd2lsbCBzaGlwIGFzIHZlcnNpb24gMS4xNi4wLgog ICAgICAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXRfbmFtZShvdXRnb2luZ1N0cnVjdHVyZS5nZXQo KSwKLSAgICAgICAgICAgICAgICAhZ19zdHJjbXAwKGtsYXNzLT5wcm90ZWN0aW9uU3lzdGVtSWQs IEdTVF9QUk9URUNUSU9OX1VOU1BFQ0lGSUVEX1NZU1RFTV9JRCkgPyAiYXBwbGljYXRpb24veC13 ZWJtLWVuYyIgOiAiYXBwbGljYXRpb24veC1jZW5jIik7CisjaWYgR1NUX0NIRUNLX1ZFUlNJT04o MSwgMTUsIDApCisgICAgICAgICAgICAgICAgIWdfc3RyY21wMChrbGFzcy0+cHJvdGVjdGlvblN5 c3RlbUlkLCBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklFRF9TWVNURU1fSUQpID8gImFwcGxpY2F0 aW9uL3gtd2VibS1lbmMiIDoKKyNlbmRpZgorICAgICAgICAgICAgICAgICJhcHBsaWNhdGlvbi94 LWNlbmMiKTsKICAgICAgICAgfQogCiAgICAgICAgIGJvb2wgZHVwbGljYXRlID0gZmFsc2U7Cg== 352177 2018-10-12 10:00:29 -0700 2018-10-14 22:17:11 -0700 Patch bug-190471-20181012180028.patch text/plain 4882 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTExMGQyZGMwOTBiMWFi NThkNjAzZmRhMzczMzEwOTM0NDU4ZTEwMS4uY2UzODJhMjA4OTY2ZjMwMzNmYmJjMGEzZmE0NjM3 YzZmZjkxNmU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTEwLTEyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBGaXggRU1FIGJ1aWxkIGZvciBHU3RyZWFtZXIgMS4xNC54CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA0NzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJraXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0VHJhbnNmb3JtQ2Fwcyk6IFRo ZQorICAgICAgICBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklFRF9TWVNURU1fSUQgI2RlZmluZSB3 b24ndCBiZSBzaGlwcGVkCisgICAgICAgIHVudGlsIHRoZSBHU3RyZWFtZXIgMS4xNi4wIHJlbGVh c2UsIHNvIGl0cyB1c2UgbmVlZHMgdG8gYmUgd3JhcHBlZAorICAgICAgICBiZXR3ZWVuIGEgdmVy c2lvbiBjaGVjay4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZCk6 IERpdHRvLgorCiAyMDE4LTEwLTEyICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgog CiAgICAgICAgIENSQVNIIGluIFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bjo6c2V0UHJlbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2UuY3BwCmluZGV4IGQ5NGM3MGQ1MWJjNWZmNmFiYmQ1OTg4ODljY2JmMWFjMDI5 ODg4NmUuLjFiOWU0YTJjMWI2ZWQ0MTI1ZGZlYjk3NjVjMDU0YzZkNTBhOGQ2NGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKQEAg LTEyNzQsNyArMTI3NCwxMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6 OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEdzdEV2ZW50KiBldgogICAgIC8vIENoZWNr IGlmIHRoZSBzeXN0ZW0ga2V5IG9mIHRoZSBwcm90ZWN0aW9uIGV2ZW50IGlzIHRoZSBzYW1lIG9m IHRoZSBDRE0gaW5zdGFuY2UuCiAgICAgLy8gRm9yIGV4YW1wbGU6IHdlIGNhbiByZWNlaXZlIGEg bmV3IFdpZGV2aW5lIHByb3RlY3Rpb24gZXZlbnQgYnV0IHRoZSBDRE0gaW5zdGFuY2UgaW5pdGlh bGl6ZWQgd2l0aAogICAgIC8vIFBsYXlyZWFkeSwgc28gd2UgaWdub3JlIHRoaXMgZXZlbnQuCi0g ICAgaWYgKG1fY2RtSW5zdGFuY2UgJiYgZ19zdHJjbXAwKGV2ZW50S2V5U3lzdGVtVVVJRCwgR1NU X1BST1RFQ1RJT05fVU5TUEVDSUZJRURfU1lTVEVNX0lEKSAmJiBnX3N0cmNtcDAoR1N0cmVhbWVy RU1FVXRpbGl0aWVzOjprZXlTeXN0ZW1Ub1V1aWQobV9jZG1JbnN0YW5jZS0+a2V5U3lzdGVtKCkp LCBldmVudEtleVN5c3RlbVVVSUQpKSB7CisgICAgaWYgKG1fY2RtSW5zdGFuY2UKKyNpZiBHU1Rf Q0hFQ0tfVkVSU0lPTigxLCAxNSwgMCkKKyAgICAgICAgJiYgZ19zdHJjbXAwKGV2ZW50S2V5U3lz dGVtVVVJRCwgR1NUX1BST1RFQ1RJT05fVU5TUEVDSUZJRURfU1lTVEVNX0lEKQorI2VuZGlmCisg ICAgICAgICYmIGdfc3RyY21wMChHU3RyZWFtZXJFTUVVdGlsaXRpZXM6OmtleVN5c3RlbVRvVXVp ZChtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKSksIGV2ZW50S2V5U3lzdGVtVVVJRCkpIHsKICAg ICAgICAgR1NUX0RFQlVHKCJUaGUgcHJvdGVjdGlvbiBldmVudCB3aXRoIFVVSUQgJXMgaXMgaWdu b3JlZCBiZWNhdXNlIGl0IGlzbid0IHN1cHBvcnRlZCBieSB0aGUgQ0RNICVzIiwgZXZlbnRLZXlT eXN0ZW1VVUlELCBtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEyOTYsNyArMTMwMCwxMiBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEdz dEV2ZW50KiBldgogCiAgICAgICAgIEdTVF9ERUJVRygic2NoZWR1bGluZyBpbml0aWFsaXphdGlv bkRhdGFFbmNvdW50ZXJlZCBldmVudCBmb3IgJXMgd2l0aCBpbml0IGRhdGEgc2l6ZSBvZiAldSIs IGV2ZW50S2V5U3lzdGVtVVVJRC51dGY4KCkuZGF0YSgpLCBpbml0RGF0YS5zaXplSW5CeXRlcygp KTsKICAgICAgICAgR1NUX01FTURVTVAoImluaXQgZGF0YXMiLCByZWludGVycHJldF9jYXN0PGNv bnN0IHVpbnQ4X3QqPihpbml0RGF0YS5jaGFyYWN0ZXJzOCgpKSwgaW5pdERhdGEuc2l6ZUluQnl0 ZXMoKSk7Ci0gICAgICAgIHdlYWtUaGlzLT5tX3BsYXllci0+aW5pdGlhbGl6YXRpb25EYXRhRW5j b3VudGVyZWQoKGV2ZW50S2V5U3lzdGVtVVVJRCA9PSBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklF RF9TWVNURU1fSUQpID8gIndlYm0iX3MgOiAiY2VuYyJfcywKKyAgICAgICAgYXV0byBpbml0RGF0 YVR5cGUgPSAiY2VuYyJfczsKKyNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxNSwgMCkKKyAgICAg ICAgaWYgKGV2ZW50S2V5U3lzdGVtVVVJRCA9PSBHU1RfUFJPVEVDVElPTl9VTlNQRUNJRklFRF9T WVNURU1fSUQpCisgICAgICAgICAgICBpbml0RGF0YVR5cGUgPSAid2VibSJfczsKKyNlbmRpZgor ICAgICAgICB3ZWFrVGhpcy0+bV9wbGF5ZXItPmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVk KGluaXREYXRhVHlwZSwKICAgICAgICAgICAgIEFycmF5QnVmZmVyOjpjcmVhdGUocmVpbnRlcnBy ZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oaW5pdERhdGEuY2hhcmFjdGVyczgoKSksIGluaXREYXRh LnNpemVJbkJ5dGVzKCkpKTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRl Y3J5cHRvckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIuY3Bw CmluZGV4IDdlNzExYzY3ZTBjNzA2OTdlNDMwY2I0YjRmZGM2ZDM3ZTM0NTNlNmQuLjNkNGQ4N2U3 NjFhMTY4NzJkMzk4MzQ2MTgxMzUwZDhmYmVjOGM2YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlv bkRlY3J5cHRvckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVh bWVyLmNwcApAQCAtMTU5LDggKzE1OSwxMyBAQCBzdGF0aWMgR3N0Q2Fwcyogd2Via2l0TWVkaWFD b21tb25FbmNyeXB0aW9uRGVjcnlwdFRyYW5zZm9ybUNhcHMoR3N0QmFzZVRyYW5zZm9ybQogICAg ICAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQob3V0Z29pbmdTdHJ1Y3R1cmUuZ2V0KCksICJwcm90 ZWN0aW9uLXN5c3RlbSIsIEdfVFlQRV9TVFJJTkcsIGtsYXNzLT5wcm90ZWN0aW9uU3lzdGVtSWQs CiAgICAgICAgICAgICAgICAgIm9yaWdpbmFsLW1lZGlhLXR5cGUiLCBHX1RZUEVfU1RSSU5HLCBn c3Rfc3RydWN0dXJlX2dldF9uYW1lKGluY29taW5nU3RydWN0dXJlKSwgbnVsbHB0cik7CiAKKyAg ICAgICAgICAgIC8vIEdTVF9QUk9URUNUSU9OX1VOU1BFQ0lGSUVEX1NZU1RFTV9JRCB3YXMgYWRk ZWQgaW4gdGhlIEdTdHJlYW1lcgorICAgICAgICAgICAgLy8gZGV2ZWxvcGVtZW50IGdpdCBtYXN0 ZXIgd2hpY2ggd2lsbCBzaGlwIGFzIHZlcnNpb24gMS4xNi4wLgogICAgICAgICAgICAgZ3N0X3N0 cnVjdHVyZV9zZXRfbmFtZShvdXRnb2luZ1N0cnVjdHVyZS5nZXQoKSwKLSAgICAgICAgICAgICAg ICAhZ19zdHJjbXAwKGtsYXNzLT5wcm90ZWN0aW9uU3lzdGVtSWQsIEdTVF9QUk9URUNUSU9OX1VO U1BFQ0lGSUVEX1NZU1RFTV9JRCkgPyAiYXBwbGljYXRpb24veC13ZWJtLWVuYyIgOiAiYXBwbGlj YXRpb24veC1jZW5jIik7CisjaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTUsIDApCisgICAgICAg ICAgICAgICAgIWdfc3RyY21wMChrbGFzcy0+cHJvdGVjdGlvblN5c3RlbUlkLCBHU1RfUFJPVEVD VElPTl9VTlNQRUNJRklFRF9TWVNURU1fSUQpID8gImFwcGxpY2F0aW9uL3gtd2VibS1lbmMiIDoK KyNlbmRpZgorICAgICAgICAgICAgICAgICJhcHBsaWNhdGlvbi94LWNlbmMiKTsKICAgICAgICAg fQogCiAgICAgICAgIGJvb2wgZHVwbGljYXRlID0gZmFsc2U7Cg==