185535 2018-05-10 16:45:13 -0700 [EME][GStreamer] Handle the protection event in MediaPlayerPrivate 2018-05-11 03:51:19 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 185245 1 bandou.yacine webkit-unassigned calvaris commit-queue olivier.blin webkit-bug-importer oldest_to_newest 1422943 0 bandou.yacine 2018-05-10 16:45:13 -0700 The patch is based on this calvaris's commit https://github.com/WebPlatformForEmbedded/WPEWebKit/commit/d966168b0d2b65f9ca9415426e26d3752c78b03e it adds a handler for the protection event in MediaPalyerPrivate and it extracts the InitData from the event and sends the encrypted event to JS via HTMLMediaElement. 1422955 1 340149 bandou.yacine 2018-05-10 17:03:56 -0700 Created attachment 340149 Patch 1423061 2 340149 calvaris 2018-05-10 23:14:02 -0700 Comment on attachment 340149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340149&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:1217 > + if (m_cdmInstance && strcmp(GStreamerEMEUtilities::keySystemToUuid(m_cdmInstance->keySystem()), eventKeySystemUUID)) Better to use g_strcmp0. It would be interesting to add a GST_TRACE or DEBUG comment for the bail out here. 1423094 3 340182 bandou.yacine 2018-05-11 02:39:46 -0700 Created attachment 340182 Patch 1423095 4 340182 calvaris 2018-05-11 02:57:33 -0700 Comment on attachment 340182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340182&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:1216 > + // Palyread, so we ignore this event. PlayReady 1423096 5 340182 calvaris 2018-05-11 02:58:30 -0700 Comment on attachment 340182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340182&action=review > Source/WebCore/ChangeLog:11 > + It adds a handler for the protection event in MediaPalyerPrivate, it extracts the InitData from the event MediaPlayerPrivateGStreamerBase. 1423100 6 340184 bandou.yacine 2018-05-11 03:12:15 -0700 Created attachment 340184 Patch 1423105 7 340184 commit-queue 2018-05-11 03:50:43 -0700 Comment on attachment 340184 Patch Clearing flags on attachment: 340184 Committed r231699: <https://trac.webkit.org/changeset/231699> 1423106 8 commit-queue 2018-05-11 03:50:45 -0700 All reviewed patches have been landed. Closing bug. 1423107 9 webkit-bug-importer 2018-05-11 03:51:19 -0700 <rdar://problem/40159171> 340149 2018-05-10 17:03:56 -0700 2018-05-11 02:39:42 -0700 Patch bug-185535-20180511020400.patch text/plain 6104 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q3OTRlNGQ0YzllYTJl NjYyOWQ1ZWRjNjAyOWM1M2RmYmRjYjcyNi4uZGFjZTE3NjU1NDIyZDRmMWM0YzI0M2U4N2U0ZDcy MWRkYmNjMDVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTEwICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV1bR1N0cmVhbWVyXSBIYW5kbGUgdGhlIHByb3RlY3Rpb24gZXZlbnQgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODU1MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIHRoaXMgY2FsdmFyaXMncyBjb21taXQKKyAgICAgICAg aHR0cHM6Ly9naXRodWIuY29tL1dlYlBsYXRmb3JtRm9yRW1iZWRkZWQvV1BFV2ViS2l0L2NvbW1p dC9kOTY2MTY4YjBkMmI2NWY5Y2E5NDE1NDI2ZTI2ZDM3NTJjNzhiMDNlCisKKyAgICAgICAgSXQg YWRkcyBhIGhhbmRsZXIgZm9yIHRoZSBwcm90ZWN0aW9uIGV2ZW50IGluIE1lZGlhUGFseWVyUHJp dmF0ZSwgaXQgZXh0cmFjdHMgdGhlIEluaXREYXRhIGZyb20gdGhlIGV2ZW50CisgICAgICAgIGFu ZCBzZW5kcyB0aGUgZW5jcnlwdGVkIGV2ZW50IHRvIEpTIHZpYSBIVE1MTWVkaWFFbGVtZW50Lgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVByb3RlY3Rpb25F dmVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oOiBBZGQgYSBuZXcgdHlwZSBJbml0RGF0 YS4KKwogMjAxOC0wNS0xMCAgWWFjaW5lIEJhbmRvdSAgPHlhY2luZS5iYW5kb3VfZXh0QHNvZnRh dGhvbWUuY29tPgogCiAgICAgICAgIFtFTUVdW0dTdHJlYW1lcl0gQWRkIGEgaGFuZGxlciBmb3Ig R1N0cmVhbWVyIHByb3RlY3Rpb24gZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCAyNzRmMDcwYjY0MTIzNDMwNDRlZTEy NWE0MTJiNTE3NDJiYWM4MjQzLi4wZTQ5MDAzMzQ4YzRjN2RkYjI2MGMwZTg4YmRiYThjOGIyMGZi OWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2UuY3BwCkBAIC0xMjA0LDYgKzEyMDQsNDEgQEAgdW5zaWduZWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZTo6dmlkZW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3QKIH0KIAogI2lm IEVOQUJMRShFTkNSWVBURURfTUVESUEpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEdzdEV2ZW50KiBldmVudCkKK3sK KyAgICAvLyBGSVhNRTogSW5mb3JtIHRoYXQgd2UgYXJlIHdhaXRpbmcgZm9yIGEga2V5LgorICAg IGNvbnN0IGNoYXIqIGV2ZW50S2V5U3lzdGVtVVVJRCA9IG51bGxwdHI7CisgICAgR3N0QnVmZmVy KiBkYXRhID0gbnVsbHB0cjsKKyAgICBnc3RfZXZlbnRfcGFyc2VfcHJvdGVjdGlvbihldmVudCwg JmV2ZW50S2V5U3lzdGVtVVVJRCwgJmRhdGEsIG51bGxwdHIpOworCisgICAgLy8gQ2hlY2sgaWYg dGhlIHN5c3RlbSBrZXkgb2YgdGhlIHByb3RlY3Rpb24gZXZlbnQgaXMgdGhlIHNhbWUgb2YgdGhl IENETSBpbnN0YW5jZS4KKyAgICAvLyBGb3IgZXhhbXBsZTogd2UgY2FuIHJlY2VpdmUgYSBuZXcg YSBXaWRldmluZSBwcm90ZWN0aW9uIGV2ZW50IGJ1dCB0aGUgQ0RNIGluc3RhbmNlIGluaXRpYWxp emVkIHdpdGgKKyAgICAvLyBQYWx5cmVhZCwgc28gd2UgaWdub3JlIHRoaXMgZXZlbnQuCisgICAg aWYgKG1fY2RtSW5zdGFuY2UgJiYgc3RyY21wKEdTdHJlYW1lckVNRVV0aWxpdGllczo6a2V5U3lz dGVtVG9VdWlkKG1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpKSwgZXZlbnRLZXlTeXN0ZW1VVUlE KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgR3N0TWFwSW5mbyBtYXBJbmZvOworICAgIGlmICgh Z3N0X2J1ZmZlcl9tYXAoZGF0YSwgJm1hcEluZm8sIEdTVF9NQVBfUkVBRCkpIHsKKyAgICAgICAg R1NUX1dBUk5JTkcoImNhbm5vdCBtYXAgJXMgcHJvdGVjdGlvbiBkYXRhIiwgZXZlbnRLZXlTeXN0 ZW1VVUlEKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEdTVF9UUkFDRSgiaW5pdCBk YXRhIGVuY291bnRlcmVkIGZvciAlcyBvZiBzaXplICUiIEdfR1NJWkVfRk9STUFULCBldmVudEtl eVN5c3RlbVVVSUQsIG1hcEluZm8uc2l6ZSk7CisgICAgR1NUX01FTURVTVAoImluaXQgZGF0YSIs IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KG1hcEluZm8uZGF0YSksIG1hcEluZm8u c2l6ZSk7CisgICAgSW5pdERhdGEgaW5pdERhdGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50 OF90Kj4obWFwSW5mby5kYXRhKSwgbWFwSW5mby5zaXplKTsKKyAgICBnc3RfYnVmZmVyX3VubWFw KGRhdGEsICZtYXBJbmZvKTsKKworICAgIFN0cmluZyBldmVudEtleVN5c3RlbVVVSURTdHJpbmcg PSBldmVudEtleVN5c3RlbVVVSUQ7CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt3ZWFr VGhpcyA9IG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigqdGhpcyksIGV2ZW50S2V5U3lz dGVtVVVJRCA9IGV2ZW50S2V5U3lzdGVtVVVJRFN0cmluZywgaW5pdERhdGFdIHsKKyAgICAgICAg aWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBHU1RfREVCVUco InNjaGVkdWxpbmcgaW5pdGlhbGl6YXRpb25EYXRhRW5jb3VudGVyZWQgZXZlbnQgZm9yICVzIHdp dGggaW5pdCBkYXRhIHNpemUgb2YgJSIgR19HU0laRV9GT1JNQVQsIGV2ZW50S2V5U3lzdGVtVVVJ RC51dGY4KCkuZGF0YSgpLCBpbml0RGF0YS5zaXplSW5CeXRlcygpKTsKKyAgICAgICAgR1NUX01F TURVTVAoImluaXQgZGF0YXMiLCByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihpbml0 RGF0YS5jaGFyYWN0ZXJzOCgpKSwgaW5pdERhdGEuc2l6ZUluQnl0ZXMoKSk7CisgICAgICAgIHdl YWtUaGlzLT5tX3BsYXllci0+aW5pdGlhbGl6YXRpb25EYXRhRW5jb3VudGVyZWQoQVNDSUlMaXRl cmFsKCJjZW5jIiksIEFycmF5QnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1 aW50OF90Kj4oaW5pdERhdGEuY2hhcmFjdGVyczgoKSksIGluaXREYXRhLnNpemVJbkJ5dGVzKCkp KTsKKyAgICB9KTsKK30KKwogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpj ZG1JbnN0YW5jZUF0dGFjaGVkKENETUluc3RhbmNlJiBpbnN0YW5jZSkKIHsKICAgICBpZiAobV9j ZG1JbnN0YW5jZSAhPSAmaW5zdGFuY2UpIHsKQEAgLTEyNTYsMTggKzEyOTEsOSBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVByb3RlY3Rpb25FdmVudChHc3RF dmVudCogZXZlbnQpCiB7CiAgICAgaWYgKG1faGFuZGxlZFByb3RlY3Rpb25FdmVudHMuY29udGFp bnMoR1NUX0VWRU5UX1NFUU5VTShldmVudCkpKSB7CiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qo cGlwZWxpbmUoKSwgImV2ZW50ICV1IGFscmVhZHkgaGFuZGxlZCIsIEdTVF9FVkVOVF9TRVFOVU0o ZXZlbnQpKTsKLSAgICAgICAgbV9oYW5kbGVkUHJvdGVjdGlvbkV2ZW50cy5yZW1vdmUoR1NUX0VW RU5UX1NFUU5VTShldmVudCkpOwotICAgICAgICBpZiAobV9uZWVkVG9SZXNlbmRDcmVkZW50aWFs cykgewotICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAicmVzZW5kaW5n IGNyZWRlbnRpYWxzIik7Ci0gICAgICAgICAgICBhdHRlbXB0VG9EZWNyeXB0V2l0aExvY2FsSW5z dGFuY2UoKTsKLSAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgY29uc3Qg Z2NoYXIqIGV2ZW50S2V5U3lzdGVtSWQgPSBudWxscHRyOwotICAgIGdzdF9ldmVudF9wYXJzZV9w cm90ZWN0aW9uKGV2ZW50LCAmZXZlbnRLZXlTeXN0ZW1JZCwgbnVsbHB0ciwgbnVsbHB0cik7Ci0g ICAgR1NUX1dBUk5JTkcoIkZJWE1FOiB1bmhhbmRsZWQgcHJvdGVjdGlvbiBldmVudCBmb3IgJXMi LCBldmVudEtleVN5c3RlbUlkKTsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBpbml0 aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChldmVudCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKaW5kZXggNjRmZmI4 ZGVmM2RlNWExZmZkMWRmNTEwYzMzYmQ3NThmMDkxNmVhYS4uMzQyZTc5NTliN2M4ZDU4ZjQ2Y2Yw ZDdlZGQzZjIyMWI5NWQ0MjNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyQmFzZS5oCkBAIC0xNDQsNiArMTQ0LDcgQEAgcHVibGljOgogICAgIHZv aWQgYXR0ZW1wdFRvRGVjcnlwdFdpdGhMb2NhbEluc3RhbmNlKCk7CiAgICAgdm9pZCBhdHRlbXB0 VG9EZWNyeXB0V2l0aEluc3RhbmNlKENETUluc3RhbmNlJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBk aXNwYXRjaENETUluc3RhbmNlKCk7CisgICAgdm9pZCBpbml0aWFsaXphdGlvbkRhdGFFbmNvdW50 ZXJlZChHc3RFdmVudCopOwogI2VuZGlmCiAKICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c0tleVN5 c3RlbShjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1l L0dTdHJlYW1lckVNRVV0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL2VtZS9HU3RyZWFtZXJFTUVVdGlsaXRpZXMuaAppbmRleCA1NDEwY2IyMjk2 YTMyMjVkMmMxNWE4MzE1MDVjMWY3ZjQ0OGEyMDI5Li4wY2ZmNTM5YjIwZTk2NTNmZjkyMzdkMDcx NWZhY2QwYzQzOWViZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvR1N0cmVhbWVyRU1FVXRpbGl0 aWVzLmgKQEAgLTMxLDYgKzMxLDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit1c2luZyBJ bml0RGF0YSA9IFN0cmluZzsKKwogY2xhc3MgR1N0cmVhbWVyRU1FVXRpbGl0aWVzIHsKIAogcHVi bGljOgo= 340182 2018-05-11 02:39:46 -0700 2018-05-11 03:12:11 -0700 Patch bug-185535-20180511113950.patch text/plain 6287 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q3OTRlNGQ0YzllYTJl NjYyOWQ1ZWRjNjAyOWM1M2RmYmRjYjcyNi4uZGFjZTE3NjU1NDIyZDRmMWM0YzI0M2U4N2U0ZDcy MWRkYmNjMDVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTEwICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV1bR1N0cmVhbWVyXSBIYW5kbGUgdGhlIHByb3RlY3Rpb24gZXZlbnQgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODU1MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIHRoaXMgY2FsdmFyaXMncyBjb21taXQKKyAgICAgICAg aHR0cHM6Ly9naXRodWIuY29tL1dlYlBsYXRmb3JtRm9yRW1iZWRkZWQvV1BFV2ViS2l0L2NvbW1p dC9kOTY2MTY4YjBkMmI2NWY5Y2E5NDE1NDI2ZTI2ZDM3NTJjNzhiMDNlCisKKyAgICAgICAgSXQg YWRkcyBhIGhhbmRsZXIgZm9yIHRoZSBwcm90ZWN0aW9uIGV2ZW50IGluIE1lZGlhUGFseWVyUHJp dmF0ZSwgaXQgZXh0cmFjdHMgdGhlIEluaXREYXRhIGZyb20gdGhlIGV2ZW50CisgICAgICAgIGFu ZCBzZW5kcyB0aGUgZW5jcnlwdGVkIGV2ZW50IHRvIEpTIHZpYSBIVE1MTWVkaWFFbGVtZW50Lgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVByb3RlY3Rpb25F dmVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oOiBBZGQgYSBuZXcgdHlwZSBJbml0RGF0 YS4KKwogMjAxOC0wNS0xMCAgWWFjaW5lIEJhbmRvdSAgPHlhY2luZS5iYW5kb3VfZXh0QHNvZnRh dGhvbWUuY29tPgogCiAgICAgICAgIFtFTUVdW0dTdHJlYW1lcl0gQWRkIGEgaGFuZGxlciBmb3Ig R1N0cmVhbWVyIHByb3RlY3Rpb24gZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCAyNzRmMDcwYjY0MTIzNDMwNDRlZTEy NWE0MTJiNTE3NDJiYWM4MjQzLi4xZDIzM2UyN2Y0Nzg4ZDUzODA0NDg3OTVhYmFjZTI2MTAxYzEx NDE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2UuY3BwCkBAIC0xMjA0LDYgKzEyMDQsNDMgQEAgdW5zaWduZWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZTo6dmlkZW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3QKIH0KIAogI2lm IEVOQUJMRShFTkNSWVBURURfTUVESUEpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEdzdEV2ZW50KiBldmVudCkKK3sK KyAgICAvLyBGSVhNRTogSW5mb3JtIHRoYXQgd2UgYXJlIHdhaXRpbmcgZm9yIGEga2V5LgorICAg IGNvbnN0IGNoYXIqIGV2ZW50S2V5U3lzdGVtVVVJRCA9IG51bGxwdHI7CisgICAgR3N0QnVmZmVy KiBkYXRhID0gbnVsbHB0cjsKKyAgICBnc3RfZXZlbnRfcGFyc2VfcHJvdGVjdGlvbihldmVudCwg JmV2ZW50S2V5U3lzdGVtVVVJRCwgJmRhdGEsIG51bGxwdHIpOworCisgICAgLy8gQ2hlY2sgaWYg dGhlIHN5c3RlbSBrZXkgb2YgdGhlIHByb3RlY3Rpb24gZXZlbnQgaXMgdGhlIHNhbWUgb2YgdGhl IENETSBpbnN0YW5jZS4KKyAgICAvLyBGb3IgZXhhbXBsZTogd2UgY2FuIHJlY2VpdmUgYSBuZXcg YSBXaWRldmluZSBwcm90ZWN0aW9uIGV2ZW50IGJ1dCB0aGUgQ0RNIGluc3RhbmNlIGluaXRpYWxp emVkIHdpdGgKKyAgICAvLyBQYWx5cmVhZCwgc28gd2UgaWdub3JlIHRoaXMgZXZlbnQuCisgICAg aWYgKG1fY2RtSW5zdGFuY2UgJiYgZ19zdHJjbXAwKEdTdHJlYW1lckVNRVV0aWxpdGllczo6a2V5 U3lzdGVtVG9VdWlkKG1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpKSwgZXZlbnRLZXlTeXN0ZW1V VUlEKSkgeworICAgICAgICBHU1RfREVCVUcoIlRoZSBwcm90ZWN0aW9uIGV2ZW50IHdpdGggVVVJ RCAlcyBpcyBpZ25vcmVkIGJlY2F1c2UgaXQgaXNuJ3Qgc3VwcG9ydGVkIGJ5IHRoZSBDRE0gJXMi LCBldmVudEtleVN5c3RlbVVVSUQsIG1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpLnV0ZjgoKS5k YXRhKCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgR3N0TWFwSW5mbyBtYXBJbmZv OworICAgIGlmICghZ3N0X2J1ZmZlcl9tYXAoZGF0YSwgJm1hcEluZm8sIEdTVF9NQVBfUkVBRCkp IHsKKyAgICAgICAgR1NUX1dBUk5JTkcoImNhbm5vdCBtYXAgJXMgcHJvdGVjdGlvbiBkYXRhIiwg ZXZlbnRLZXlTeXN0ZW1VVUlEKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEdTVF9U UkFDRSgiaW5pdCBkYXRhIGVuY291bnRlcmVkIGZvciAlcyBvZiBzaXplICUiIEdfR1NJWkVfRk9S TUFULCBldmVudEtleVN5c3RlbVVVSUQsIG1hcEluZm8uc2l6ZSk7CisgICAgR1NUX01FTURVTVAo ImluaXQgZGF0YSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KG1hcEluZm8uZGF0 YSksIG1hcEluZm8uc2l6ZSk7CisgICAgSW5pdERhdGEgaW5pdERhdGEocmVpbnRlcnByZXRfY2Fz dDxjb25zdCB1aW50OF90Kj4obWFwSW5mby5kYXRhKSwgbWFwSW5mby5zaXplKTsKKyAgICBnc3Rf YnVmZmVyX3VubWFwKGRhdGEsICZtYXBJbmZvKTsKKworICAgIFN0cmluZyBldmVudEtleVN5c3Rl bVVVSURTdHJpbmcgPSBldmVudEtleVN5c3RlbVVVSUQ7CisgICAgUnVuTG9vcDo6bWFpbigpLmRp c3BhdGNoKFt3ZWFrVGhpcyA9IG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigqdGhpcyks IGV2ZW50S2V5U3lzdGVtVVVJRCA9IGV2ZW50S2V5U3lzdGVtVVVJRFN0cmluZywgaW5pdERhdGFd IHsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICBHU1RfREVCVUcoInNjaGVkdWxpbmcgaW5pdGlhbGl6YXRpb25EYXRhRW5jb3VudGVyZWQgZXZl bnQgZm9yICVzIHdpdGggaW5pdCBkYXRhIHNpemUgb2YgJSIgR19HU0laRV9GT1JNQVQsIGV2ZW50 S2V5U3lzdGVtVVVJRC51dGY4KCkuZGF0YSgpLCBpbml0RGF0YS5zaXplSW5CeXRlcygpKTsKKyAg ICAgICAgR1NUX01FTURVTVAoImluaXQgZGF0YXMiLCByZWludGVycHJldF9jYXN0PGNvbnN0IHVp bnQ4X3QqPihpbml0RGF0YS5jaGFyYWN0ZXJzOCgpKSwgaW5pdERhdGEuc2l6ZUluQnl0ZXMoKSk7 CisgICAgICAgIHdlYWtUaGlzLT5tX3BsYXllci0+aW5pdGlhbGl6YXRpb25EYXRhRW5jb3VudGVy ZWQoQVNDSUlMaXRlcmFsKCJjZW5jIiksIEFycmF5QnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRf Y2FzdDxjb25zdCB1aW50OF90Kj4oaW5pdERhdGEuY2hhcmFjdGVyczgoKSksIGluaXREYXRhLnNp emVJbkJ5dGVzKCkpKTsKKyAgICB9KTsKK30KKwogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjpjZG1JbnN0YW5jZUF0dGFjaGVkKENETUluc3RhbmNlJiBpbnN0YW5jZSkKIHsK ICAgICBpZiAobV9jZG1JbnN0YW5jZSAhPSAmaW5zdGFuY2UpIHsKQEAgLTEyNTYsMTggKzEyOTMs OSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVByb3RlY3Rp b25FdmVudChHc3RFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKG1faGFuZGxlZFByb3RlY3Rpb25F dmVudHMuY29udGFpbnMoR1NUX0VWRU5UX1NFUU5VTShldmVudCkpKSB7CiAgICAgICAgIEdTVF9E RUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgImV2ZW50ICV1IGFscmVhZHkgaGFuZGxlZCIsIEdTVF9F VkVOVF9TRVFOVU0oZXZlbnQpKTsKLSAgICAgICAgbV9oYW5kbGVkUHJvdGVjdGlvbkV2ZW50cy5y ZW1vdmUoR1NUX0VWRU5UX1NFUU5VTShldmVudCkpOwotICAgICAgICBpZiAobV9uZWVkVG9SZXNl bmRDcmVkZW50aWFscykgewotICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgp LCAicmVzZW5kaW5nIGNyZWRlbnRpYWxzIik7Ci0gICAgICAgICAgICBhdHRlbXB0VG9EZWNyeXB0 V2l0aExvY2FsSW5zdGFuY2UoKTsKLSAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQot Ci0gICAgY29uc3QgZ2NoYXIqIGV2ZW50S2V5U3lzdGVtSWQgPSBudWxscHRyOwotICAgIGdzdF9l dmVudF9wYXJzZV9wcm90ZWN0aW9uKGV2ZW50LCAmZXZlbnRLZXlTeXN0ZW1JZCwgbnVsbHB0ciwg bnVsbHB0cik7Ci0gICAgR1NUX1dBUk5JTkcoIkZJWE1FOiB1bmhhbmRsZWQgcHJvdGVjdGlvbiBl dmVudCBmb3IgJXMiLCBldmVudEtleVN5c3RlbUlkKTsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICBpbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChldmVudCk7CiB9CiAjZW5kaWYK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgK aW5kZXggNjRmZmI4ZGVmM2RlNWExZmZkMWRmNTEwYzMzYmQ3NThmMDkxNmVhYS4uMzQyZTc5NTli N2M4ZDU4ZjQ2Y2YwZDdlZGQzZjIyMWI5NWQ0MjNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCkBAIC0xNDQsNiArMTQ0LDcgQEAgcHVi bGljOgogICAgIHZvaWQgYXR0ZW1wdFRvRGVjcnlwdFdpdGhMb2NhbEluc3RhbmNlKCk7CiAgICAg dm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aEluc3RhbmNlKENETUluc3RhbmNlJikgb3ZlcnJpZGU7 CiAgICAgdm9pZCBkaXNwYXRjaENETUluc3RhbmNlKCk7CisgICAgdm9pZCBpbml0aWFsaXphdGlv bkRhdGFFbmNvdW50ZXJlZChHc3RFdmVudCopOwogI2VuZGlmCiAKICAgICBzdGF0aWMgYm9vbCBz dXBwb3J0c0tleVN5c3RlbShjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgU3RyaW5nJiBt aW1lVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9HU3RyZWFtZXJFTUVVdGlsaXRpZXMuaAppbmRl eCA1NDEwY2IyMjk2YTMyMjVkMmMxNWE4MzE1MDVjMWY3ZjQ0OGEyMDI5Li4wY2ZmNTM5YjIwZTk2 NTNmZjkyMzdkMDcxNWZhY2QwYzQzOWViZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvR1N0cmVh bWVyRU1FVXRpbGl0aWVzLmgKQEAgLTMxLDYgKzMxLDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCit1c2luZyBJbml0RGF0YSA9IFN0cmluZzsKKwogY2xhc3MgR1N0cmVhbWVyRU1FVXRpbGl0 aWVzIHsKIAogcHVibGljOgo= 340184 2018-05-11 03:12:15 -0700 2018-05-11 03:50:43 -0700 Patch bug-185535-20180511121219.patch text/plain 6299 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q3OTRlNGQ0YzllYTJl NjYyOWQ1ZWRjNjAyOWM1M2RmYmRjYjcyNi4uNWI2NGNhODYzYzExY2VhYTY2NzExMDk1MDhiOGNl NmZiYjBjZTZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTEwICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV1bR1N0cmVhbWVyXSBIYW5kbGUgdGhlIHByb3RlY3Rpb24gZXZlbnQgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODU1MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIHRoaXMgY2FsdmFyaXMncyBjb21taXQKKyAgICAgICAg aHR0cHM6Ly9naXRodWIuY29tL1dlYlBsYXRmb3JtRm9yRW1iZWRkZWQvV1BFV2ViS2l0L2NvbW1p dC9kOTY2MTY4YjBkMmI2NWY5Y2E5NDE1NDI2ZTI2ZDM3NTJjNzhiMDNlCisKKyAgICAgICAgSXQg YWRkcyBhIGhhbmRsZXIgZm9yIHRoZSBwcm90ZWN0aW9uIGV2ZW50IGluIE1lZGlhUGFseWVyUHJp dmF0ZUdTdHJlYW1lckJhc2UsIGl0IGV4dHJhY3RzIHRoZSBJbml0RGF0YSBmcm9tIHRoZSBldmVu dAorICAgICAgICBhbmQgc2VuZHMgdGhlIGVuY3J5cHRlZCBldmVudCB0byBKUyB2aWEgSFRNTE1l ZGlhRWxlbWVudC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZCk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpoYW5k bGVQcm90ZWN0aW9uRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9HU3RyZWFtZXJFTUVVdGlsaXRpZXMuaDogQWRkIGEgbmV3 IHR5cGUgSW5pdERhdGEuCisKIDIwMTgtMDUtMTAgIFlhY2luZSBCYW5kb3UgIDx5YWNpbmUuYmFu ZG91X2V4dEBzb2Z0YXRob21lLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIEFkZCBh IGhhbmRsZXIgZm9yIEdTdHJlYW1lciBwcm90ZWN0aW9uIGV2ZW50CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggMjc0ZjA3MGI2 NDEyMzQzMDQ0ZWUxMjVhNDEyYjUxNzQyYmFjODI0My4uNjZkZmM3MmE5OWExMmY1ZDg3OTZhNjRl MjRiMGU0ZjhmMDViM2IyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMTIwNCw2ICsxMjA0LDQzIEBAIHVuc2lnbmVkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnZpZGVvRGVjb2RlZEJ5dGVDb3VudCgpIGNv bnN0CiB9CiAKICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQordm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChHc3RFdmVu dCogZXZlbnQpCit7CisgICAgLy8gRklYTUU6IEluZm9ybSB0aGF0IHdlIGFyZSB3YWl0aW5nIGZv ciBhIGtleS4KKyAgICBjb25zdCBjaGFyKiBldmVudEtleVN5c3RlbVVVSUQgPSBudWxscHRyOwor ICAgIEdzdEJ1ZmZlciogZGF0YSA9IG51bGxwdHI7CisgICAgZ3N0X2V2ZW50X3BhcnNlX3Byb3Rl Y3Rpb24oZXZlbnQsICZldmVudEtleVN5c3RlbVVVSUQsICZkYXRhLCBudWxscHRyKTsKKworICAg IC8vIENoZWNrIGlmIHRoZSBzeXN0ZW0ga2V5IG9mIHRoZSBwcm90ZWN0aW9uIGV2ZW50IGlzIHRo ZSBzYW1lIG9mIHRoZSBDRE0gaW5zdGFuY2UuCisgICAgLy8gRm9yIGV4YW1wbGU6IHdlIGNhbiBy ZWNlaXZlIGEgbmV3IFdpZGV2aW5lIHByb3RlY3Rpb24gZXZlbnQgYnV0IHRoZSBDRE0gaW5zdGFu Y2UgaW5pdGlhbGl6ZWQgd2l0aAorICAgIC8vIFBsYXlyZWFkeSwgc28gd2UgaWdub3JlIHRoaXMg ZXZlbnQuCisgICAgaWYgKG1fY2RtSW5zdGFuY2UgJiYgZ19zdHJjbXAwKEdTdHJlYW1lckVNRVV0 aWxpdGllczo6a2V5U3lzdGVtVG9VdWlkKG1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpKSwgZXZl bnRLZXlTeXN0ZW1VVUlEKSkgeworICAgICAgICBHU1RfREVCVUcoIlRoZSBwcm90ZWN0aW9uIGV2 ZW50IHdpdGggVVVJRCAlcyBpcyBpZ25vcmVkIGJlY2F1c2UgaXQgaXNuJ3Qgc3VwcG9ydGVkIGJ5 IHRoZSBDRE0gJXMiLCBldmVudEtleVN5c3RlbVVVSUQsIG1fY2RtSW5zdGFuY2UtPmtleVN5c3Rl bSgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgR3N0TWFw SW5mbyBtYXBJbmZvOworICAgIGlmICghZ3N0X2J1ZmZlcl9tYXAoZGF0YSwgJm1hcEluZm8sIEdT VF9NQVBfUkVBRCkpIHsKKyAgICAgICAgR1NUX1dBUk5JTkcoImNhbm5vdCBtYXAgJXMgcHJvdGVj dGlvbiBkYXRhIiwgZXZlbnRLZXlTeXN0ZW1VVUlEKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIEdTVF9UUkFDRSgiaW5pdCBkYXRhIGVuY291bnRlcmVkIGZvciAlcyBvZiBzaXplICUi IEdfR1NJWkVfRk9STUFULCBldmVudEtleVN5c3RlbVVVSUQsIG1hcEluZm8uc2l6ZSk7CisgICAg R1NUX01FTURVTVAoImluaXQgZGF0YSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+ KG1hcEluZm8uZGF0YSksIG1hcEluZm8uc2l6ZSk7CisgICAgSW5pdERhdGEgaW5pdERhdGEocmVp bnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4obWFwSW5mby5kYXRhKSwgbWFwSW5mby5zaXpl KTsKKyAgICBnc3RfYnVmZmVyX3VubWFwKGRhdGEsICZtYXBJbmZvKTsKKworICAgIFN0cmluZyBl dmVudEtleVN5c3RlbVVVSURTdHJpbmcgPSBldmVudEtleVN5c3RlbVVVSUQ7CisgICAgUnVuTG9v cDo6bWFpbigpLmRpc3BhdGNoKFt3ZWFrVGhpcyA9IG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vh a1B0cigqdGhpcyksIGV2ZW50S2V5U3lzdGVtVVVJRCA9IGV2ZW50S2V5U3lzdGVtVVVJRFN0cmlu ZywgaW5pdERhdGFdIHsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBHU1RfREVCVUcoInNjaGVkdWxpbmcgaW5pdGlhbGl6YXRpb25EYXRhRW5j b3VudGVyZWQgZXZlbnQgZm9yICVzIHdpdGggaW5pdCBkYXRhIHNpemUgb2YgJSIgR19HU0laRV9G T1JNQVQsIGV2ZW50S2V5U3lzdGVtVVVJRC51dGY4KCkuZGF0YSgpLCBpbml0RGF0YS5zaXplSW5C eXRlcygpKTsKKyAgICAgICAgR1NUX01FTURVTVAoImluaXQgZGF0YXMiLCByZWludGVycHJldF9j YXN0PGNvbnN0IHVpbnQ4X3QqPihpbml0RGF0YS5jaGFyYWN0ZXJzOCgpKSwgaW5pdERhdGEuc2l6 ZUluQnl0ZXMoKSk7CisgICAgICAgIHdlYWtUaGlzLT5tX3BsYXllci0+aW5pdGlhbGl6YXRpb25E YXRhRW5jb3VudGVyZWQoQVNDSUlMaXRlcmFsKCJjZW5jIiksIEFycmF5QnVmZmVyOjpjcmVhdGUo cmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oaW5pdERhdGEuY2hhcmFjdGVyczgoKSks IGluaXREYXRhLnNpemVJbkJ5dGVzKCkpKTsKKyAgICB9KTsKK30KKwogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlOjpjZG1JbnN0YW5jZUF0dGFjaGVkKENETUluc3RhbmNlJiBp bnN0YW5jZSkKIHsKICAgICBpZiAobV9jZG1JbnN0YW5jZSAhPSAmaW5zdGFuY2UpIHsKQEAgLTEy NTYsMTggKzEyOTMsOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Omhh bmRsZVByb3RlY3Rpb25FdmVudChHc3RFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKG1faGFuZGxl ZFByb3RlY3Rpb25FdmVudHMuY29udGFpbnMoR1NUX0VWRU5UX1NFUU5VTShldmVudCkpKSB7CiAg ICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgImV2ZW50ICV1IGFscmVhZHkgaGFu ZGxlZCIsIEdTVF9FVkVOVF9TRVFOVU0oZXZlbnQpKTsKLSAgICAgICAgbV9oYW5kbGVkUHJvdGVj dGlvbkV2ZW50cy5yZW1vdmUoR1NUX0VWRU5UX1NFUU5VTShldmVudCkpOwotICAgICAgICBpZiAo bV9uZWVkVG9SZXNlbmRDcmVkZW50aWFscykgewotICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVD VChwaXBlbGluZSgpLCAicmVzZW5kaW5nIGNyZWRlbnRpYWxzIik7Ci0gICAgICAgICAgICBhdHRl bXB0VG9EZWNyeXB0V2l0aExvY2FsSW5zdGFuY2UoKTsKLSAgICAgICAgfQogICAgICAgICByZXR1 cm47CiAgICAgfQotCi0gICAgY29uc3QgZ2NoYXIqIGV2ZW50S2V5U3lzdGVtSWQgPSBudWxscHRy OwotICAgIGdzdF9ldmVudF9wYXJzZV9wcm90ZWN0aW9uKGV2ZW50LCAmZXZlbnRLZXlTeXN0ZW1J ZCwgbnVsbHB0ciwgbnVsbHB0cik7Ci0gICAgR1NUX1dBUk5JTkcoIkZJWE1FOiB1bmhhbmRsZWQg cHJvdGVjdGlvbiBldmVudCBmb3IgJXMiLCBldmVudEtleVN5c3RlbUlkKTsKLSAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICBpbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChldmVudCk7 CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlLmgKaW5kZXggNjRmZmI4ZGVmM2RlNWExZmZkMWRmNTEwYzMzYmQ3NThmMDkxNmVh YS4uMzQyZTc5NTliN2M4ZDU4ZjQ2Y2YwZDdlZGQzZjIyMWI5NWQ0MjNjNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCkBAIC0xNDQsNiAr MTQ0LDcgQEAgcHVibGljOgogICAgIHZvaWQgYXR0ZW1wdFRvRGVjcnlwdFdpdGhMb2NhbEluc3Rh bmNlKCk7CiAgICAgdm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aEluc3RhbmNlKENETUluc3RhbmNl Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaENETUluc3RhbmNlKCk7CisgICAgdm9pZCBp bml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChHc3RFdmVudCopOwogI2VuZGlmCiAKICAgICBz dGF0aWMgYm9vbCBzdXBwb3J0c0tleVN5c3RlbShjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0aWxpdGllcy5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9HU3RyZWFtZXJFTUVVdGls aXRpZXMuaAppbmRleCA1NDEwY2IyMjk2YTMyMjVkMmMxNWE4MzE1MDVjMWY3ZjQ0OGEyMDI5Li4w Y2ZmNTM5YjIwZTk2NTNmZjkyMzdkMDcxNWZhY2QwYzQzOWViZjY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0dTdHJlYW1lckVNRVV0 aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9lbWUvR1N0cmVhbWVyRU1FVXRpbGl0aWVzLmgKQEAgLTMxLDYgKzMxLDggQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCit1c2luZyBJbml0RGF0YSA9IFN0cmluZzsKKwogY2xhc3MgR1N0cmVh bWVyRU1FVXRpbGl0aWVzIHsKIAogcHVibGljOgo=