218182 2020-10-26 06:05:30 -0700 [GStreamer][EME][Thunder] Do not sanitize CENC init data 2021-11-30 03:58:43 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 233630 1 calvaris calvaris cgarcia commit-queue eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez webkit-bug-importer oldest_to_newest 1701418 0 calvaris 2020-10-26 06:05:30 -0700 [GStreamer][EME][Thunder] Do not sanitize CENC init data 1701419 1 412311 calvaris 2020-10-26 06:07:36 -0700 Created attachment 412311 Patch 1701474 2 412322 calvaris 2020-10-26 09:33:27 -0700 Created attachment 412322 Patch 1701500 3 412322 pnormand 2020-10-26 10:13:44 -0700 Comment on attachment 412322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412322&action=review > Source/WebCore/platform/encryptedmedia/CDMPrivate.h:77 > + WEBCORE_EXPORT virtual RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const; Why the WEBCORE_EXPORT? 1701838 4 calvaris 2020-10-27 05:34:57 -0700 Because the former patch failed to build without it when linking with the Mock in the tests. 1701882 5 pnormand 2020-10-27 08:27:57 -0700 Failed how? 1702235 6 calvaris 2020-10-27 23:57:56 -0700 Link error cause the mock is in the tests and that is not in WebCore 1702314 7 calvaris 2020-10-28 08:24:52 -0700 Committed r269103: <https://trac.webkit.org/changeset/269103> 1702315 8 webkit-bug-importer 2020-10-28 08:25:23 -0700 <rdar://problem/70764876> 1818036 9 pnormand 2021-11-27 09:03:33 -0800 I'm afraid this actually goes against the spec: https://www.w3.org/TR/encrypted-media/#dom-mediakeysession-generaterequest (step 10.2 quoted below) --- Let sanitized init data be a validated and sanitized version of init data. The user agent must thoroughly validate the Initialization Data before passing it to the CDM. This includes verifying that the length and values of fields are reasonable, verifying that values are within reasonable limits, and stripping irrelevant, unsupported, or unknown data or fields. It is recommended that user agents pre-parse, sanitize, and/or generate a fully sanitized version of the Initialization Data. If the Initialization Data format specified by initDataType supports multiple entries, the user agent should remove entries that are not needed by the CDM. The user agent must not re-order entries within the Initialization Data. --- I think the real issue is in the app side. Let's revert this patch? 1818678 10 commit-queue 2021-11-30 03:47:12 -0800 Re-opened since this is blocked by bug 233630 412311 2020-10-26 06:07:36 -0700 2020-10-26 09:33:22 -0700 Patch bug-218182-20201026140735.patch text/plain 5789 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDVkNTc1ZDNiMDc5MDc2 MDRhY2RjM2ExNDRhMTkxOTg2ZmQwMDg0Yy4uZDZkZDc5NWM2MmYwYjI1YjA2ZmM0M2YwN2Y4N2Nk MGUyZWEyZjY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEwLTI2ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl1bRU1FXVtUaHVuZGVyXSBEbyBub3Qgc2FuaXRpemUgQ0VOQyBpbml0IGRhdGEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODE4MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNlcnRhaW4g Y2FzZXMsIGxpa2Ugc21vb3Roc3RyZWFtaW5nIHdpdGggUGxheVJlYWR5LCB0aGUgaW5pdAorICAg ICAgICBkYXRhcyB3ZSBhcmUgZ2V0dGluZyBhcmUgY29ycmVjdCBidXQgYXJlIG5vdCBpbiBQU1NI IGJveCBmb3JtYXQKKyAgICAgICAgdGhleSB3b3VsZCBiZSAic2FuaXRpemVkIGF3YXkiLiBJbiB0 aGlzIHBhdGNoIHlvdSBjYW4gZW5hYmxlCisgICAgICAgIHNhbml0aXphdGlvbiBjdXN0b21pemF0 aW9uIGRlcGVuZGluZyBvbiB0aGUgQ0RNIHlvdSdyZSB1c2luZy4KKworICAgICAgICAqIE1vZHVs ZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNETTo6c2FuaXRp emVJbml0RGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1Qcml2YXRlOjpzYW5pdGl6ZUluaXREYXRhIGNv bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVUaHVuZGVyOjpzYW5pdGl6ZUluaXREYXRhIGNv bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5k ZXIuaDoKKwogMjAyMC0xMC0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDIERpc3BsYXldIEltcGxlbWVudCBiYWNrZ3JvdW5kIGltYWdlIHBh aW50aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlh L0NETS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5jcHAK aW5kZXggOTBiMTczZjM3NWRjMzJjZTFlYmM5MGE0NzUxY2I4OTcxMzcxZTY1ZC4uYjRkZTFhZWNm MjNlYWYyYjFkYmU5YTRlMjU5ZThjYzVlZjJkZTdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcApAQCAtMTM3LDcgKzEzNyw5IEBAIGJvb2wgQ0RN OjpzdXBwb3J0c0luaXREYXRhVHlwZShjb25zdCBBdG9tU3RyaW5nJiBpbml0RGF0YVR5cGUpIGNv bnN0CiAKIFJlZlB0cjxTaGFyZWRCdWZmZXI+IENETTo6c2FuaXRpemVJbml0RGF0YShjb25zdCBB dG9tU3RyaW5nJiBpbml0RGF0YVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYgaW5pdERhdGEpCiB7 Ci0gICAgcmV0dXJuIEluaXREYXRhUmVnaXN0cnk6OnNoYXJlZCgpLnNhbml0aXplSW5pdERhdGEo aW5pdERhdGFUeXBlLCBpbml0RGF0YSk7CisgICAgaWYgKCFtX3ByaXZhdGUpCisgICAgICAgIHJl dHVybiBudWxscHRyOworICAgIHJldHVybiBtX3ByaXZhdGUtPnNhbml0aXplSW5pdERhdGEoaW5p dERhdGFUeXBlLCBpbml0RGF0YSk7CiB9CiAKIGJvb2wgQ0RNOjpzdXBwb3J0c0luaXREYXRhKGNv bnN0IEF0b21TdHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJiBpbml0RGF0 YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL0NE TVByaXZhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RN UHJpdmF0ZS5jcHAKaW5kZXggMTY0YmE0OWU0MDYwYWZkNzllOGMyMDIwNDEyOGQ3YzQ0YjlhYmY1 YS4uNmQ0NTg5MmZjMzFhZDE4Y2JjMjQ4OTMzMjgxOWJhYTBlNDcxNzUxOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5jcHAK QEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJDRE1NZWRpYUNhcGFiaWxpdHkuaCIKICNpbmNs dWRlICJDRE1SZXF1aXJlbWVudC5oIgogI2luY2x1ZGUgIkNETVJlc3RyaWN0aW9ucy5oIgorI2lu Y2x1ZGUgIkluaXREYXRhUmVnaXN0cnkuaCIKICNpbmNsdWRlICJNZWRpYVBsYXllci5oIgogI2lu Y2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAiUGFyc2VkQ29udGVudFR5cGUuaCIK QEAgLTUxNCw2ICs1MTUsMTEgQEAgdm9pZCBDRE1Qcml2YXRlOjpnZXRDb25zZW50U3RhdHVzKENE TUtleVN5c3RlbUNvbmZpZ3VyYXRpb24mJiBhY2N1bXVsYXRlZENvbmZpZ3UKICAgICBjYWxsYmFj ayhDb25zZW50U3RhdHVzOjpBbGxvd2VkLCBXVEZNb3ZlKGFjY3VtdWxhdGVkQ29uZmlndXJhdGlv biksIFdURk1vdmUocmVzdHJpY3Rpb25zKSk7CiB9CiAKK1JlZlB0cjxTaGFyZWRCdWZmZXI+IENE TVByaXZhdGU6OnNhbml0aXplSW5pdERhdGEoY29uc3QgQXRvbVN0cmluZyYgaW5pdERhdGFUeXBl LCBjb25zdCBTaGFyZWRCdWZmZXImIGluaXREYXRhKSBjb25zdAoreworICAgIHJldHVybiBJbml0 RGF0YVJlZ2lzdHJ5OjpzaGFyZWQoKS5zYW5pdGl6ZUluaXREYXRhKGluaXREYXRhVHlwZSwgaW5p dERhdGEpOworfQorCiAKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v ZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5j cnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5oCmluZGV4IDFjM2U4YmVmOWUwZmRlNWIxZDFlMjg1N2Zj MDQzZmY1ODc0MWQ2ZTYuLjFjZDVjMDNhZWFjZGU1YjFlODJjYjUyMDQ0ZGVlZDJkMTE3ZGUyODYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL0NETVBy aXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Q cml2YXRlLmgKQEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzdXBw b3J0c1NlcnZlckNlcnRpZmljYXRlcygpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgc3Vw cG9ydHNTZXNzaW9ucygpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNJbml0 RGF0YShjb25zdCBBdG9tU3RyaW5nJiwgY29uc3QgU2hhcmVkQnVmZmVyJikgY29uc3QgPSAwOwor ICAgIHZpcnR1YWwgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2FuaXRpemVJbml0RGF0YShjb25zdCBB dG9tU3RyaW5nJiBpbml0RGF0YVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYgaW5pdERhdGEpIGNv bnN0OwogICAgIHZpcnR1YWwgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2FuaXRpemVSZXNwb25zZShj b25zdCBTaGFyZWRCdWZmZXImKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBPcHRpb25hbDxTdHJp bmc+IHNhbml0aXplU2Vzc2lvbklkKGNvbnN0IFN0cmluZyYpIGNvbnN0ID0gMDsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1U aHVuZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9l bWUvQ0RNVGh1bmRlci5jcHAKaW5kZXggMTUyYWY0ZjdjMzY5YjBkODRiYjI3YjY5NWQzM2RkNjI1 NmRmMDhjNi4uNjg1YTgwNTIyYzA5YWMyY2JkZjUxYzAzMjZmMjA0ZmEwYWUzYmQ2MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1U aHVuZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvZW1lL0NETVRodW5kZXIuY3BwCkBAIC0yMTgsNiArMjE4LDE1IEBAIGJvb2wgQ0RNUHJpdmF0 ZVRodW5kZXI6OnN1cHBvcnRzSW5pdERhdGEoY29uc3QgQXRvbVN0cmluZyYgaW5pdERhdGFUeXBl LCBjb25zdCBTCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitSZWZQdHI8U2hhcmVkQnVmZmVyPiBD RE1Qcml2YXRlVGh1bmRlcjo6c2FuaXRpemVJbml0RGF0YShjb25zdCBBdG9tU3RyaW5nJiBpbml0 RGF0YVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYgaW5pdERhdGEpIGNvbnN0Cit7CisgICAgLy8g VmFsaWRhdGUgdGhlIGluaXREYXRhIGJ1ZmZlciBhcyBDRU5DIGluaXREYXRhLiBGSVhNRTogVmFs aWRhdGUgaXQgaXMgYWN0dWFsbHkgQ0VOQy4KKyAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdB U0NJSUNhc2UoaW5pdERhdGFUeXBlLCAiY2VuYyIpICYmICFpbml0RGF0YS5pc0VtcHR5KCkpCisg ICAgICAgIHJldHVybiBpbml0RGF0YS5jb3B5KCk7CisKKyAgICByZXR1cm4gQ0RNUHJpdmF0ZTo6 c2FuaXRpemVJbml0RGF0YShpbml0RGF0YVR5cGUsIGluaXREYXRhKTsKK30KKwogUmVmUHRyPFNo YXJlZEJ1ZmZlcj4gQ0RNUHJpdmF0ZVRodW5kZXI6OnNhbml0aXplUmVzcG9uc2UoY29uc3QgU2hh cmVkQnVmZmVyJiByZXNwb25zZSkgY29uc3QKIHsKICAgICByZXR1cm4gcmVzcG9uc2UuY29weSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L2VtZS9DRE1UaHVuZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvZW1lL0NETVRodW5kZXIuaAppbmRleCBlMjVkMjY0NDgyZDQ4ZWZmNDk0YjYyZTBmMjI3 OTcwY2E1MDY2OTRjLi4xNmVlY2EyMWMzOTExYTJjMDQ2MjI2ZjZlNDAzMzdlMDVkY2IzYjFlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1l L0NETVRodW5kZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvZW1lL0NETVRodW5kZXIuaApAQCAtOTUsNiArOTUsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBzdXBwb3J0c1NlcnZlckNlcnRpZmljYXRlcygpIGNvbnN0IGZpbmFsOwogICAgIGJvb2wgc3Vw cG9ydHNTZXNzaW9ucygpIGNvbnN0IGZpbmFsOwogICAgIGJvb2wgc3VwcG9ydHNJbml0RGF0YShj b25zdCBBdG9tU3RyaW5nJiwgY29uc3QgU2hhcmVkQnVmZmVyJikgY29uc3QgZmluYWw7CisgICAg UmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2FuaXRpemVJbml0RGF0YShjb25zdCBBdG9tU3RyaW5nJiBp bml0RGF0YVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYgaW5pdERhdGEpIGNvbnN0IGZpbmFsOwog ICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNhbml0aXplUmVzcG9uc2UoY29uc3QgU2hhcmVkQnVm ZmVyJikgY29uc3QgZmluYWw7CiAgICAgT3B0aW9uYWw8U3RyaW5nPiBzYW5pdGl6ZVNlc3Npb25J ZChjb25zdCBTdHJpbmcmKSBjb25zdCBmaW5hbDsKIAo= 412322 2020-10-26 09:33:27 -0700 2020-10-28 08:19:44 -0700 Patch bug-218182-20201026173325.patch text/plain 5821 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDBhN2M2MDQ5ZWJhZTYw ODU0OWJkNWFlMDVjZWI3ZTk0YzkzMjZiMS4uOTRlODlmMGYzNzA2ODQ1M2VkNTE3M2NhYjE1NWEy ZjdkZWRjNTdkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEwLTI2ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl1bRU1FXVtUaHVuZGVyXSBEbyBub3Qgc2FuaXRpemUgQ0VOQyBpbml0IGRhdGEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODE4MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNlcnRhaW4g Y2FzZXMsIGxpa2Ugc21vb3Roc3RyZWFtaW5nIHdpdGggUGxheVJlYWR5LCB0aGUgaW5pdAorICAg ICAgICBkYXRhcyB3ZSBhcmUgZ2V0dGluZyBhcmUgY29ycmVjdCBidXQgYXJlIG5vdCBpbiBQU1NI IGJveCBmb3JtYXQKKyAgICAgICAgdGhleSB3b3VsZCBiZSAic2FuaXRpemVkIGF3YXkiLiBJbiB0 aGlzIHBhdGNoIHlvdSBjYW4gZW5hYmxlCisgICAgICAgIHNhbml0aXphdGlvbiBjdXN0b21pemF0 aW9uIGRlcGVuZGluZyBvbiB0aGUgQ0RNIHlvdSdyZSB1c2luZy4KKworICAgICAgICAqIE1vZHVs ZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNETTo6c2FuaXRp emVJbml0RGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1Qcml2YXRlOjpzYW5pdGl6ZUluaXREYXRhIGNv bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVUaHVuZGVyOjpzYW5pdGl6ZUluaXREYXRhIGNv bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5k ZXIuaDoKKwogMjAyMC0xMC0yNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFrZSB1c2Ugb2Ygc2lnbmFsbGluZyB0aHJlYWQgd2hlbiBjcmVhdGluZyB0aGUg cGVlciBjb25uZWN0aW9uIGZhY3RvcnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlw dGVkbWVkaWEvQ0RNLmNwcAppbmRleCA5MGIxNzNmMzc1ZGMzMmNlMWViYzkwYTQ3NTFjYjg5NzEz NzFlNjVkLi5iNGRlMWFlY2YyM2VhZjJiMWRiZTlhNGUyNTllOGNjNWVmMmRlN2UzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0uY3BwCkBAIC0xMzcsNyAr MTM3LDkgQEAgYm9vbCBDRE06OnN1cHBvcnRzSW5pdERhdGFUeXBlKGNvbnN0IEF0b21TdHJpbmcm IGluaXREYXRhVHlwZSkgY29uc3QKIAogUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gQ0RNOjpzYW5pdGl6 ZUluaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgU2hhcmVkQnVm ZmVyJiBpbml0RGF0YSkKIHsKLSAgICByZXR1cm4gSW5pdERhdGFSZWdpc3RyeTo6c2hhcmVkKCku c2FuaXRpemVJbml0RGF0YShpbml0RGF0YVR5cGUsIGluaXREYXRhKTsKKyAgICBpZiAoIW1fcHJp dmF0ZSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+c2Fu aXRpemVJbml0RGF0YShpbml0RGF0YVR5cGUsIGluaXREYXRhKTsKIH0KIAogYm9vbCBDRE06OnN1 cHBvcnRzSW5pdERhdGEoY29uc3QgQXRvbVN0cmluZyYgaW5pdERhdGFUeXBlLCBjb25zdCBTaGFy ZWRCdWZmZXImIGluaXREYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v ZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9l bmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlLmNwcAppbmRleCAxNjRiYTQ5ZTQwNjBhZmQ3OWU4YzIw MjA0MTI4ZDdjNDRiOWFiZjVhLi42ZDQ1ODkyZmMzMWFkMThjYmMyNDg5MzMyODE5YmFhMGU0NzE3 NTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9D RE1Qcml2YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRp YS9DRE1Qcml2YXRlLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIkNETU1lZGlhQ2Fw YWJpbGl0eS5oIgogI2luY2x1ZGUgIkNETVJlcXVpcmVtZW50LmgiCiAjaW5jbHVkZSAiQ0RNUmVz dHJpY3Rpb25zLmgiCisjaW5jbHVkZSAiSW5pdERhdGFSZWdpc3RyeS5oIgogI2luY2x1ZGUgIk1l ZGlhUGxheWVyLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQYXJz ZWRDb250ZW50VHlwZS5oIgpAQCAtNTE0LDYgKzUxNSwxMSBAQCB2b2lkIENETVByaXZhdGU6Omdl dENvbnNlbnRTdGF0dXMoQ0RNS2V5U3lzdGVtQ29uZmlndXJhdGlvbiYmIGFjY3VtdWxhdGVkQ29u ZmlndQogICAgIGNhbGxiYWNrKENvbnNlbnRTdGF0dXM6OkFsbG93ZWQsIFdURk1vdmUoYWNjdW11 bGF0ZWRDb25maWd1cmF0aW9uKSwgV1RGTW92ZShyZXN0cmljdGlvbnMpKTsKIH0KIAorUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gQ0RNUHJpdmF0ZTo6c2FuaXRpemVJbml0RGF0YShjb25zdCBBdG9tU3Ry aW5nJiBpbml0RGF0YVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYgaW5pdERhdGEpIGNvbnN0Cit7 CisgICAgcmV0dXJuIEluaXREYXRhUmVnaXN0cnk6OnNoYXJlZCgpLnNhbml0aXplSW5pdERhdGEo aW5pdERhdGFUeXBlLCBpbml0RGF0YSk7Cit9CisKIAogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlLmgKaW5kZXggMWMzZThiZWY5 ZTBmZGU1YjFkMWUyODU3ZmMwNDNmZjU4NzQxZDZlNi4uM2I5NmViNzQ4NGRjYTE3OTc2M2I1YzZm MzJjNTgxNTY0YzE1OGRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5j cnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Vu Y3J5cHRlZG1lZGlhL0NETVByaXZhdGUuaApAQCAtNzQsNiArNzQsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCBib29sIHN1cHBvcnRzU2VydmVyQ2VydGlmaWNhdGVzKCkgY29uc3QgPSAwOwogICAg IHZpcnR1YWwgYm9vbCBzdXBwb3J0c1Nlc3Npb25zKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwg Ym9vbCBzdXBwb3J0c0luaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmLCBjb25zdCBTaGFyZWRCdWZm ZXImKSBjb25zdCA9IDA7CisgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCBSZWZQdHI8U2hhcmVk QnVmZmVyPiBzYW5pdGl6ZUluaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmIGluaXREYXRhVHlwZSwg Y29uc3QgU2hhcmVkQnVmZmVyJiBpbml0RGF0YSkgY29uc3Q7CiAgICAgdmlydHVhbCBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBzYW5pdGl6ZVJlc3BvbnNlKGNvbnN0IFNoYXJlZEJ1ZmZlciYpIGNvbnN0 ID0gMDsKICAgICB2aXJ0dWFsIE9wdGlvbmFsPFN0cmluZz4gc2FuaXRpemVTZXNzaW9uSWQoY29u c3QgU3RyaW5nJikgY29uc3QgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcAppbmRleCBh YjY3NjBmZTE2MzU0YjNjYWI3Y2Q1YjA1MzkyYzAxYjE3NDNiODA2Li5jYTdiMTZhOGRmZTQxYjcy YTQzZTg3NWJjNDIxMjFmYzllNDNjYzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5jcHAKQEAg LTIxOCw2ICsyMTgsMTUgQEAgYm9vbCBDRE1Qcml2YXRlVGh1bmRlcjo6c3VwcG9ydHNJbml0RGF0 YShjb25zdCBBdG9tU3RyaW5nJiBpbml0RGF0YVR5cGUsIGNvbnN0IFMKICAgICByZXR1cm4gZmFs c2U7CiB9CiAKK1JlZlB0cjxTaGFyZWRCdWZmZXI+IENETVByaXZhdGVUaHVuZGVyOjpzYW5pdGl6 ZUluaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgU2hhcmVkQnVm ZmVyJiBpbml0RGF0YSkgY29uc3QKK3sKKyAgICAvLyBWYWxpZGF0ZSB0aGUgaW5pdERhdGEgYnVm ZmVyIGFzIENFTkMgaW5pdERhdGEuIEZJWE1FOiBWYWxpZGF0ZSBpdCBpcyBhY3R1YWxseSBDRU5D LgorICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShpbml0RGF0YVR5cGUsICJj ZW5jIikgJiYgIWluaXREYXRhLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGluaXREYXRhLmNv cHkoKTsKKworICAgIHJldHVybiBDRE1Qcml2YXRlOjpzYW5pdGl6ZUluaXREYXRhKGluaXREYXRh VHlwZSwgaW5pdERhdGEpOworfQorCiBSZWZQdHI8U2hhcmVkQnVmZmVyPiBDRE1Qcml2YXRlVGh1 bmRlcjo6c2FuaXRpemVSZXNwb25zZShjb25zdCBTaGFyZWRCdWZmZXImIHJlc3BvbnNlKSBjb25z dAogewogICAgIHJldHVybiByZXNwb25zZS5jb3B5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5oCmlu ZGV4IGUyNWQyNjQ0ODJkNDhlZmY0OTRiNjJlMGYyMjc5NzBjYTUwNjY5NGMuLjE2ZWVjYTIxYzM5 MTFhMmMwNDYyMjZmNmU0MDMzN2UwNWRjYjNiMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5oCkBA IC05NSw2ICs5NSw3IEBAIHB1YmxpYzoKICAgICBib29sIHN1cHBvcnRzU2VydmVyQ2VydGlmaWNh dGVzKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBzdXBwb3J0c1Nlc3Npb25zKCkgY29uc3QgZmlu YWw7CiAgICAgYm9vbCBzdXBwb3J0c0luaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmLCBjb25zdCBT aGFyZWRCdWZmZXImKSBjb25zdCBmaW5hbDsKKyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzYW5p dGl6ZUluaXREYXRhKGNvbnN0IEF0b21TdHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgU2hhcmVk QnVmZmVyJiBpbml0RGF0YSkgY29uc3QgZmluYWw7CiAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4g c2FuaXRpemVSZXNwb25zZShjb25zdCBTaGFyZWRCdWZmZXImKSBjb25zdCBmaW5hbDsKICAgICBP cHRpb25hbDxTdHJpbmc+IHNhbml0aXplU2Vzc2lvbklkKGNvbnN0IFN0cmluZyYpIGNvbnN0IGZp bmFsOwogCg==