189240 2018-09-03 03:14:13 -0700 [EME] Add the WebM initData support in ClearKey CDM 2018-09-04 03:28:50 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189238 1 bandou.yacine webkit-unassigned aboya calvaris commit-queue olivier.blin webkit-bug-importer oldest_to_newest 1456138 0 bandou.yacine 2018-09-03 03:14:13 -0700 Add the "webm" initDataType support in ClearKey CDM. Read the WebM initData by following the W3C spec https://www.w3.org/TR/eme-initdata-webm/#common-system 1456169 1 348770 bandou.yacine 2018-09-03 06:53:59 -0700 Created attachment 348770 Patch 1456270 2 348770 calvaris 2018-09-04 01:24:24 -0700 Comment on attachment 348770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348770&action=review > Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp:266 > +static Ref<SharedBuffer> getKeyidFromWebMInitData(const SharedBuffer& initData) To be coherent with the rest of the file this should be called extractKeyIdFrom... (please, mind the capital I of KeyId). 1456278 3 348809 bandou.yacine 2018-09-04 02:09:30 -0700 Created attachment 348809 Patch 1456283 4 348809 commit-queue 2018-09-04 03:27:37 -0700 Comment on attachment 348809 Patch Clearing flags on attachment: 348809 Committed r235610: <https://trac.webkit.org/changeset/235610> 1456284 5 commit-queue 2018-09-04 03:27:38 -0700 All reviewed patches have been landed. Closing bug. 1456285 6 webkit-bug-importer 2018-09-04 03:28:50 -0700 <rdar://problem/44092389> 348770 2018-09-03 06:53:59 -0700 2018-09-04 02:09:26 -0700 Patch bug-189240-20180903155358.patch text/plain 4741 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjMzNlZDJkMzFmYmI3 N2VlMTViNjE4NzZmMzUyNWFiMmE1ZTllMS4uMTY2MzhjOTI2MWEwZGJiNGI1OWJmZWFmNzczOWZl OWM1ZmQ2YjNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA5LTAzICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV0gQWRkIHRoZSBXZWJNIGluaXREYXRhIHN1cHBvcnQgaW4gQ2xlYXJLZXkgQ0RNCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODkyNDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlICJ3ZWJt IiBpbml0RGF0YVR5cGUgc3VwcG9ydCBpbiBDbGVhcktleSBDRE0uCisgICAgICAgIFJlYWQgdGhl IFdlYk0gaW5pdERhdGEgYnkgZm9sbG93aW5nIHRoZSBXM0Mgc3BlYyBodHRwczovL3d3dy53My5v cmcvVFIvZW1lLWluaXRkYXRhLXdlYm0vI2NvbW1vbi1zeXN0ZW0sCisgICAgICAgIGFuZCBwdXQg aXQgaW4gSlNPTiBvYmplY3QgZm9ybWF0IGxpa2UgaXMgc3BlY2lmaWVkIGluIGh0dHBzOi8vd3d3 LnczLm9yZy9UUi9lbmNyeXB0ZWQtbWVkaWEvI2NsZWFyLWtleS1yZXF1ZXN0LWZvcm1hdC4KKwor ICAgICAgICBUZXN0czogbWVkaWEvZW5jcnlwdGVkLW1lZGlhL2NsZWFyS2V5L2NsZWFyS2V5LWVu Y3J5cHRlZC13ZWJtLWV2ZW50LW1zZS5odG1sCisgICAgICAgICAgICAgICBtZWRpYS9lbmNyeXB0 ZWQtbWVkaWEvY2xlYXJLZXkvY2xlYXJLZXktd2VibS12aWRlby1wbGF5YmFjay1tc2UuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0S2V5aWRGcm9tV2ViTUluaXREYXRhKToKKyAgICAg ICAgKFdlYkNvcmU6OkNETVByaXZhdGVDbGVhcktleTo6c3VwcG9ydHNJbml0RGF0YVR5cGUgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNUHJpdmF0ZUNsZWFyS2V5OjpzdXBwb3J0c0luaXRE YXRhIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlQ2xlYXJLZXk6OnJlcXVl c3RMaWNlbnNlKToKKwogMjAxOC0wOS0wMyAgWWFjaW5lIEJhbmRvdSAgPHlhY2luZS5iYW5kb3Vf ZXh0QHNvZnRhdGhvbWUuY29tPgogCiAgICAgICAgIFtFTUVdW0dTdHJlYW1lcl0gQWRkIHN1cHBv cnQgZm9yIFdlYk0gZW5jcnlwdGVkIGNhcHMgImFwcGxpY2F0aW9uL3gtd2VibS1lbmMiCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9D RE1DbGVhcktleS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9j bGVhcmtleS9DRE1DbGVhcktleS5jcHAKaW5kZXggYjQ1Mjc4MGQxMTE3MzAwMDY2N2MyOGFiM2Fl ZjhhNjlkOTg0YzY0Ni4uY2M2ODNjZDQyNmU1NDNkOTQxYTYzNjRjZTA0MGFmZmU2ZTg1MjFlZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJr ZXkvQ0RNQ2xlYXJLZXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRl ZG1lZGlhL2NsZWFya2V5L0NETUNsZWFyS2V5LmNwcApAQCAtMjYzLDYgKzI2MywzMiBAQCBzdGF0 aWMgUmVmPFNoYXJlZEJ1ZmZlcj4gZXh0cmFjdEtleWlkc0Zyb21DZW5jSW5pdERhdGEoY29uc3Qg U2hhcmVkQnVmZmVyJiBpbml0RAogICAgIHJldHVybiBrZXlJZHM7CiB9CiAKK3N0YXRpYyBSZWY8 U2hhcmVkQnVmZmVyPiBnZXRLZXlpZEZyb21XZWJNSW5pdERhdGEoY29uc3QgU2hhcmVkQnVmZmVy JiBpbml0RGF0YSkKK3sKKyAgICBSZWY8U2hhcmVkQnVmZmVyPiBrZXlJZHMgPSBTaGFyZWRCdWZm ZXI6OmNyZWF0ZSgpOworCisgICAgLy8gQ2hlY2sgaWYgaW5pdERhdGEgaXMgYSB2YWxpZCBXZWJN IGluaXREYXRhLgorICAgIGlmIChpbml0RGF0YS5pc0VtcHR5KCkgfHwgaW5pdERhdGEuc2l6ZSgp ID4gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQorICAgICAgICByZXR1cm4g a2V5SWRzOworCisgICAgYXV0byBvYmplY3QgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgpOworICAg IGF1dG8ga2V5SWRzQXJyYXkgPSBKU09OOjpBcnJheTo6Y3JlYXRlKCk7CisKKyAgICAvLyBSZWFk IHRoZSBLZXlJZAorICAgIC8vIDkuMS4zIExpY2Vuc2UgUmVxdWVzdCBGb3JtYXQKKyAgICAvLyBU aGlzIHNlY3Rpb24gZGVzY3JpYmVzIHRoZSBmb3JtYXQgb2YgdGhlIGxpY2Vuc2UgcmVxdWVzdCBw cm92aWRlZCB0byB0aGUgYXBwbGljYXRpb24gdmlhIHRoZSBtZXNzYWdlIGF0dHJpYnV0ZSBvZiB0 aGUgbWVzc2FnZSBldmVudC4KKyAgICAvLyBUaGUgZm9ybWF0IGlzIGEgSlNPTiBvYmplY3QgY29u dGFpbmluZyB0aGUgZm9sbG93aW5nIG1lbWJlcnM6CisgICAgLy8gImtpZHMiCisgICAgLy8gQW4g YXJyYXkgb2Yga2V5IElEcy4gRWFjaCBlbGVtZW50IG9mIHRoZSBhcnJheSBpcyB0aGUgYmFzZTY0 dXJsIGVuY29kaW5nIG9mIHRoZSBvY3RldCBzZXF1ZW5jZSBjb250YWluaW5nIHRoZSBrZXkgSUQg dmFsdWUuCisgICAgU3RyaW5nIGtleUlkID0gV1RGOjpiYXNlNjRVUkxFbmNvZGUoaW5pdERhdGEu ZGF0YSgpLCBpbml0RGF0YS5zaXplKCkpOworICAgIGtleUlkc0FycmF5LT5wdXNoU3RyaW5nKGtl eUlkKTsKKworICAgIG9iamVjdC0+c2V0QXJyYXkoImtpZHMiLCBXVEZNb3ZlKGtleUlkc0FycmF5 KSk7CisgICAgQ1N0cmluZyBqc29uRGF0YSA9IG9iamVjdC0+dG9KU09OU3RyaW5nKCkudXRmOCgp OworICAgIGtleUlkcy0+YXBwZW5kKGpzb25EYXRhLmRhdGEoKSwganNvbkRhdGEubGVuZ3RoKCkp OworICAgIHJldHVybiBrZXlJZHM7Cit9CisKIENETUZhY3RvcnlDbGVhcktleSYgQ0RNRmFjdG9y eUNsZWFyS2V5OjpzaW5nbGV0b24oKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxDRE1G YWN0b3J5Q2xlYXJLZXk+IHNfZmFjdG9yeTsKQEAgLTI5NCw3ICszMjAsNyBAQCBDRE1Qcml2YXRl Q2xlYXJLZXk6On5DRE1Qcml2YXRlQ2xlYXJLZXkoKSA9IGRlZmF1bHQ7CiBib29sIENETVByaXZh dGVDbGVhcktleTo6c3VwcG9ydHNJbml0RGF0YVR5cGUoY29uc3QgQXRvbWljU3RyaW5nJiBpbml0 RGF0YVR5cGUpIGNvbnN0CiB7CiAgICAgLy8gYGtleWlkc2AgYW5kICdjZW5jJyBhcmUgdGhlIG9u bHkgc3VwcG9ydGVkIGluaXQgZGF0YSB0eXBlLgotICAgIHJldHVybiAoZXF1YWxMZXR0ZXJzSWdu b3JpbmdBU0NJSUNhc2UoaW5pdERhdGFUeXBlLCAia2V5aWRzIikgfHwgZXF1YWxMZXR0ZXJzSWdu b3JpbmdBU0NJSUNhc2UoaW5pdERhdGFUeXBlLCAiY2VuYyIpKTsKKyAgICByZXR1cm4gKGVxdWFs TGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGluaXREYXRhVHlwZSwgImtleWlkcyIpIHx8IGVxdWFs TGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGluaXREYXRhVHlwZSwgImNlbmMiKSB8fCBlcXVhbExl dHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShpbml0RGF0YVR5cGUsICJ3ZWJtIikpOwogfQogCiBzdGF0 aWMgYm9vbCBjb250YWluc1BlcnNpc3RlbnRMaWNlbnNlVHlwZShjb25zdCBWZWN0b3I8Q0RNU2Vz c2lvblR5cGU+JiB0eXBlcykKQEAgLTQwNSw2ICs0MzEsMTAgQEAgYm9vbCBDRE1Qcml2YXRlQ2xl YXJLZXk6OnN1cHBvcnRzSW5pdERhdGEoY29uc3QgQXRvbWljU3RyaW5nJiBpbml0RGF0YVR5cGUs IGNvbnMKICAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoaW5pdERhdGFUeXBl LCAiY2VuYyIpICYmIGlzQ2VuY0luaXREYXRhKGluaXREYXRhKSkKICAgICAgICAgcmV0dXJuIHRy dWU7CiAKKyAgICAvLyBWYWxpZGF0ZSB0aGUgaW5pdERhdGEgYnVmZmVyIGFzIFdlYk0gaW5pdERh dGEuCisgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGluaXREYXRhVHlwZSwg IndlYm0iKSAmJiAhaW5pdERhdGEuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwog ICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAtNDcxLDYgKzUwMSw5IEBAIHZvaWQgQ0RNSW5zdGFu Y2VDbGVhcktleTo6cmVxdWVzdExpY2Vuc2UoTGljZW5zZVR5cGUsIGNvbnN0IEF0b21pY1N0cmlu ZyYgaW5pdERhCiAgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGluaXREYXRh VHlwZSwgImNlbmMiKSkKICAgICAgICAgaW5pdERhdGEgPSBleHRyYWN0S2V5aWRzRnJvbUNlbmNJ bml0RGF0YShpbml0RGF0YS5nZXQoKSk7CiAKKyAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdB U0NJSUNhc2UoaW5pdERhdGFUeXBlLCAid2VibSIpKQorICAgICAgICBpbml0RGF0YSA9IGdldEtl eWlkRnJvbVdlYk1Jbml0RGF0YShpbml0RGF0YS5nZXQoKSk7CisKICAgICBjYWxsT25NYWluVGhy ZWFkKAogICAgICAgICBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIGNhbGxiYWNrID0g V1RGTW92ZShjYWxsYmFjayksIGluaXREYXRhID0gV1RGTW92ZShpbml0RGF0YSksIHNlc3Npb25J ZFZhbHVlID0gc19zZXNzaW9uSWRWYWx1ZV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmICgh d2Vha1RoaXMpCg== 348809 2018-09-04 02:09:30 -0700 2018-09-04 03:27:37 -0700 Patch bug-189240-20180904110929.patch text/plain 4753 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjMzNlZDJkMzFmYmI3 N2VlMTViNjE4NzZmMzUyNWFiMmE1ZTllMS4uMjYxZTAxNjVkYTQ2NmQzYjMxMzQyYmM3ZDc4ODBh MTIwYWUzNjZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA5LTAzICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV0gQWRkIHRoZSBXZWJNIGluaXREYXRhIHN1cHBvcnQgaW4gQ2xlYXJLZXkgQ0RNCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODkyNDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlICJ3ZWJt IiBpbml0RGF0YVR5cGUgc3VwcG9ydCBpbiBDbGVhcktleSBDRE0uCisgICAgICAgIFJlYWQgdGhl IFdlYk0gaW5pdERhdGEgYnkgZm9sbG93aW5nIHRoZSBXM0Mgc3BlYyBodHRwczovL3d3dy53My5v cmcvVFIvZW1lLWluaXRkYXRhLXdlYm0vI2NvbW1vbi1zeXN0ZW0sCisgICAgICAgIGFuZCBwdXQg aXQgaW4gSlNPTiBvYmplY3QgZm9ybWF0IGxpa2UgaXMgc3BlY2lmaWVkIGluIGh0dHBzOi8vd3d3 LnczLm9yZy9UUi9lbmNyeXB0ZWQtbWVkaWEvI2NsZWFyLWtleS1yZXF1ZXN0LWZvcm1hdC4KKwor ICAgICAgICBUZXN0czogbWVkaWEvZW5jcnlwdGVkLW1lZGlhL2NsZWFyS2V5L2NsZWFyS2V5LWVu Y3J5cHRlZC13ZWJtLWV2ZW50LW1zZS5odG1sCisgICAgICAgICAgICAgICBtZWRpYS9lbmNyeXB0 ZWQtbWVkaWEvY2xlYXJLZXkvY2xlYXJLZXktd2VibS12aWRlby1wbGF5YmFjay1tc2UuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdEtleUlkRnJvbVdlYk1Jbml0RGF0YSk6Cisg ICAgICAgIChXZWJDb3JlOjpDRE1Qcml2YXRlQ2xlYXJLZXk6OnN1cHBvcnRzSW5pdERhdGFUeXBl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNETVByaXZhdGVDbGVhcktleTo6c3VwcG9ydHNJ bml0RGF0YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZUNsZWFyS2V5Ojpy ZXF1ZXN0TGljZW5zZSk6CisKIDIwMTgtMDktMDMgIFlhY2luZSBCYW5kb3UgIDx5YWNpbmUuYmFu ZG91X2V4dEBzb2Z0YXRob21lLmNvbT4KIAogICAgICAgICBbRU1FXVtHU3RyZWFtZXJdIEFkZCBz dXBwb3J0IGZvciBXZWJNIGVuY3J5cHRlZCBjYXBzICJhcHBsaWNhdGlvbi94LXdlYm0tZW5jIgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJr ZXkvQ0RNQ2xlYXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVk aWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IGI0NTI3ODBkMTExNzMwMDA2NjdjMjhh YjNhZWY4YTY5ZDk4NGM2NDYuLmVmYWQ2YzE2YzAxNmU0YTFkMmUxNWY1NDhiNDI1MThmZTg0Zjdh OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2Ns ZWFya2V5L0NETUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNy eXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTI2Myw2ICsyNjMsMzIgQEAg c3RhdGljIFJlZjxTaGFyZWRCdWZmZXI+IGV4dHJhY3RLZXlpZHNGcm9tQ2VuY0luaXREYXRhKGNv bnN0IFNoYXJlZEJ1ZmZlciYgaW5pdEQKICAgICByZXR1cm4ga2V5SWRzOwogfQogCitzdGF0aWMg UmVmPFNoYXJlZEJ1ZmZlcj4gZXh0cmFjdEtleUlkRnJvbVdlYk1Jbml0RGF0YShjb25zdCBTaGFy ZWRCdWZmZXImIGluaXREYXRhKQoreworICAgIFJlZjxTaGFyZWRCdWZmZXI+IGtleUlkcyA9IFNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7CisKKyAgICAvLyBDaGVjayBpZiBpbml0RGF0YSBpcyBhIHZh bGlkIFdlYk0gaW5pdERhdGEuCisgICAgaWYgKGluaXREYXRhLmlzRW1wdHkoKSB8fCBpbml0RGF0 YS5zaXplKCkgPiBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpCisgICAgICAg IHJldHVybiBrZXlJZHM7CisKKyAgICBhdXRvIG9iamVjdCA9IEpTT046Ok9iamVjdDo6Y3JlYXRl KCk7CisgICAgYXV0byBrZXlJZHNBcnJheSA9IEpTT046OkFycmF5OjpjcmVhdGUoKTsKKworICAg IC8vIFJlYWQgdGhlIEtleUlkCisgICAgLy8gOS4xLjMgTGljZW5zZSBSZXF1ZXN0IEZvcm1hdAor ICAgIC8vIFRoaXMgc2VjdGlvbiBkZXNjcmliZXMgdGhlIGZvcm1hdCBvZiB0aGUgbGljZW5zZSBy ZXF1ZXN0IHByb3ZpZGVkIHRvIHRoZSBhcHBsaWNhdGlvbiB2aWEgdGhlIG1lc3NhZ2UgYXR0cmli dXRlIG9mIHRoZSBtZXNzYWdlIGV2ZW50LgorICAgIC8vIFRoZSBmb3JtYXQgaXMgYSBKU09OIG9i amVjdCBjb250YWluaW5nIHRoZSBmb2xsb3dpbmcgbWVtYmVyczoKKyAgICAvLyAia2lkcyIKKyAg ICAvLyBBbiBhcnJheSBvZiBrZXkgSURzLiBFYWNoIGVsZW1lbnQgb2YgdGhlIGFycmF5IGlzIHRo ZSBiYXNlNjR1cmwgZW5jb2Rpbmcgb2YgdGhlIG9jdGV0IHNlcXVlbmNlIGNvbnRhaW5pbmcgdGhl IGtleSBJRCB2YWx1ZS4KKyAgICBTdHJpbmcga2V5SWQgPSBXVEY6OmJhc2U2NFVSTEVuY29kZShp bml0RGF0YS5kYXRhKCksIGluaXREYXRhLnNpemUoKSk7CisgICAga2V5SWRzQXJyYXktPnB1c2hT dHJpbmcoa2V5SWQpOworCisgICAgb2JqZWN0LT5zZXRBcnJheSgia2lkcyIsIFdURk1vdmUoa2V5 SWRzQXJyYXkpKTsKKyAgICBDU3RyaW5nIGpzb25EYXRhID0gb2JqZWN0LT50b0pTT05TdHJpbmco KS51dGY4KCk7CisgICAga2V5SWRzLT5hcHBlbmQoanNvbkRhdGEuZGF0YSgpLCBqc29uRGF0YS5s ZW5ndGgoKSk7CisgICAgcmV0dXJuIGtleUlkczsKK30KKwogQ0RNRmFjdG9yeUNsZWFyS2V5JiBD RE1GYWN0b3J5Q2xlYXJLZXk6OnNpbmdsZXRvbigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJv eWVkPENETUZhY3RvcnlDbGVhcktleT4gc19mYWN0b3J5OwpAQCAtMjk0LDcgKzMyMCw3IEBAIENE TVByaXZhdGVDbGVhcktleTo6fkNETVByaXZhdGVDbGVhcktleSgpID0gZGVmYXVsdDsKIGJvb2wg Q0RNUHJpdmF0ZUNsZWFyS2V5OjpzdXBwb3J0c0luaXREYXRhVHlwZShjb25zdCBBdG9taWNTdHJp bmcmIGluaXREYXRhVHlwZSkgY29uc3QKIHsKICAgICAvLyBga2V5aWRzYCBhbmQgJ2NlbmMnIGFy ZSB0aGUgb25seSBzdXBwb3J0ZWQgaW5pdCBkYXRhIHR5cGUuCi0gICAgcmV0dXJuIChlcXVhbExl dHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShpbml0RGF0YVR5cGUsICJrZXlpZHMiKSB8fCBlcXVhbExl dHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShpbml0RGF0YVR5cGUsICJjZW5jIikpOworICAgIHJldHVy biAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoaW5pdERhdGFUeXBlLCAia2V5aWRzIikg fHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoaW5pdERhdGFUeXBlLCAiY2VuYyIpIHx8 IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGluaXREYXRhVHlwZSwgIndlYm0iKSk7CiB9 CiAKIHN0YXRpYyBib29sIGNvbnRhaW5zUGVyc2lzdGVudExpY2Vuc2VUeXBlKGNvbnN0IFZlY3Rv cjxDRE1TZXNzaW9uVHlwZT4mIHR5cGVzKQpAQCAtNDA1LDYgKzQzMSwxMCBAQCBib29sIENETVBy aXZhdGVDbGVhcktleTo6c3VwcG9ydHNJbml0RGF0YShjb25zdCBBdG9taWNTdHJpbmcmIGluaXRE YXRhVHlwZSwgY29ucwogICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShpbml0 RGF0YVR5cGUsICJjZW5jIikgJiYgaXNDZW5jSW5pdERhdGEoaW5pdERhdGEpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAorICAgIC8vIFZhbGlkYXRlIHRoZSBpbml0RGF0YSBidWZmZXIgYXMgV2Vi TSBpbml0RGF0YS4KKyAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoaW5pdERh dGFUeXBlLCAid2VibSIpICYmICFpbml0RGF0YS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiB0 cnVlOworCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC00NzEsNiArNTAxLDkgQEAgdm9pZCBD RE1JbnN0YW5jZUNsZWFyS2V5OjpyZXF1ZXN0TGljZW5zZShMaWNlbnNlVHlwZSwgY29uc3QgQXRv bWljU3RyaW5nJiBpbml0RGEKICAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2Uo aW5pdERhdGFUeXBlLCAiY2VuYyIpKQogICAgICAgICBpbml0RGF0YSA9IGV4dHJhY3RLZXlpZHNG cm9tQ2VuY0luaXREYXRhKGluaXREYXRhLmdldCgpKTsKIAorICAgIGlmIChlcXVhbExldHRlcnNJ Z25vcmluZ0FTQ0lJQ2FzZShpbml0RGF0YVR5cGUsICJ3ZWJtIikpCisgICAgICAgIGluaXREYXRh ID0gZXh0cmFjdEtleUlkRnJvbVdlYk1Jbml0RGF0YShpbml0RGF0YS5nZXQoKSk7CisKICAgICBj YWxsT25NYWluVGhyZWFkKAogICAgICAgICBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyks IGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGluaXREYXRhID0gV1RGTW92ZShpbml0RGF0 YSksIHNlc3Npb25JZFZhbHVlID0gc19zZXNzaW9uSWRWYWx1ZV0oKSBtdXRhYmxlIHsKICAgICAg ICAgICAgIGlmICghd2Vha1RoaXMpCg==