177442 2017-09-25 11:08:30 -0700 [EME] Add ClearKey support for persistent session data load and removal 2017-09-27 12:17:57 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan calvaris jer.noble webkit-bug-importer oldest_to_newest 1352266 0 zan 2017-09-25 11:08:30 -0700 [EME] Add ClearKey support for persistent session data load and removal 1352273 1 321706 zan 2017-09-25 11:18:22 -0700 Created attachment 321706 Patch 1352620 2 321706 calvaris 2017-09-26 02:24:04 -0700 Comment on attachment 321706 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321706&action=review > Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp:458 > + // Use a helper functor that schedules the callback dispatch, avoiding > + // duplicated callOnMainThread() calls. You can have this in a single line. > Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp:503 > + // Use a helper functor that schedules the callback dispatch, avoiding > + // duplicated callOnMainThread() calls. You can have this in a single line. 1352624 3 zan 2017-09-26 02:48:26 -0700 Committed r222498: <http://trac.webkit.org/changeset/222498> 1353269 4 webkit-bug-importer 2017-09-27 12:17:57 -0700 <rdar://problem/34692978> 321706 2017-09-25 11:18:22 -0700 2017-09-26 02:24:04 -0700 Patch bug-177442-20170925201820.patch text/plain 13394 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTUxZTgyNmE3YTIzMmVm NjJmNTNiZmYzNTQwNDg3NWM4YWUzZWYwZC4uZjA2MzAwNjBlODUwMGQ5NzY4MmFhYzdhOTJhZGY1 OTNjNzQ3YzNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE3LTA5LTI1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBBZGQgQ2xl YXJLZXkgc3VwcG9ydCBmb3IgcGVyc2lzdGVudCBzZXNzaW9uIGRhdGEgbG9hZCBhbmQgcmVtb3Zh bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NDQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVt ZW50IHRoZSBzZXNzaW9uIGRhdGEgbG9hZCBhbmQgcmVtb3ZhbCBmb3IgcGVyc2lzdGVudCBzZXNz aW9ucworICAgICAgICBpbiB0aGUgQ2xlYXJLZXkgaW1wbGVtZW50YXRpb24gb2YgdGhlIENETUlu c3RhbmNlIGludGVyZmFjZS4KKworICAgICAgICBDRE1JbnN0YW5jZUNsZWFyS2V5Ojpsb2FkU2Vz c2lvbigpIGZpbmRzIGRhdGEgZm9yIHRoZSBzcGVjaWZpZWQgc2Vzc2lvbgorICAgICAgICBuYW1l LCBpZiBhbnksIGFuZCBjb25zdHJ1Y3RzIGEgY29ycmVzcG9uZGluZyBLZXlTdGF0dXNWZWN0b3Ig b2JqZWN0IHRoYXQKKyAgICAgICAgaG9sZHMgaW5mb3JtYXRpb24gYWJvdXQgYWxsIGtub3duIGtl eXMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgc2Vzc2lvbiBiZWZvcmUKKyAgICAgICAgZGlzcGF0Y2hp bmcgdGhlIExvYWRTZXNzaW9uQ2FsbGJhY2sgYXN5bmNocm9ub3VzbHkuCisKKyAgICAgICAgQ0RN SW5zdGFuY2VDbGVhcktleTo6cmVtb3ZlU2Vzc2lvbkRhdGEoKSBzaW1pbGFybHkgZmluZHMgdGhl IHNlc3Npb24gZGF0YSwKKyAgICAgICAgaWYgYW55LCBhbmQgdGhlbiByZW1vdmVzIGl0IGZyb20g dGhlIHN0YXRlIHRyYWNrZXIuIFRoZSBrZXkgZGF0YSBpcyBzdGlsbAorICAgICAgICByZXVzZWQg dG8gY29uc3RydWN0IHRoZSBLZXlTdGF0dXNWZWN0b3Igb2JqZWN0IHRoYXQgaG9sZHMgaW5mb3Jt YXRpb24KKyAgICAgICAgYWJvdXQgYWxsIHRoZSBrZXlzIHRoYXQgd2VyZSBzdG9yZWQgZm9yIHRo aXMgc2Vzc2lvbi4gVGhlIGtleSBpbmZvcm1hdGlvbgorICAgICAgICBpcyBhbHNvIGVtYmVkZGVk IGluIHRoZSAnbGljZW5zZSByZWxlYXNlJyBKU09OIG1lc3NhZ2UuIEJvdGgga2V5IHN0YXR1cwor ICAgICAgICB2ZWN0b3IgYW5kIG1lc3NhZ2UgYXJlIHRoZW4gdXNlZCBpbiB0aGUgUmVtb3ZlU2Vz c2lvbkRhdGFDYWxsYmFjayBkaXNwYXRjaAorICAgICAgICB0aGF0IGlzIGFnYWluIGRvbmUgYXN5 bmNocm9ub3VzbHkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIGFmZmVjdGVkIHRlc3RzIGhh dmUgdGhlaXIgYmFzZWxpbmVzIHVwZGF0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0 ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1J bnN0YW5jZUNsZWFyS2V5Ojpsb2FkU2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0 YW5jZUNsZWFyS2V5OjpyZW1vdmVTZXNzaW9uRGF0YSk6CisKIDIwMTctMDktMjUgIE1zMmdlciAg PE1zMmdlckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVwZGF0ZSB3YWl0U3luYyBhbmQgdGhlIFRJ TUVPVVRfSUdOT1JFRCBjb25zdGFudCB0byB1c2Ugc2lnbmVkIGludGVnZXJzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xl YXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJr ZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IDQwOTIxNzczMjRhNWYwZmEzMWMwZWI5NzkyZDEzNDVh YTZiNWJjNmIuLjdiYzAyMmQ3Y2NiYzEyNjE3NzU1N2MwYmJmMWZkOTRhNGM2YjA2ZTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFya2V5L0NE TUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRp YS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTQ1MiwxNSArNDUyLDM4IEBAIHZvaWQgQ0RN SW5zdGFuY2VDbGVhcktleTo6dXBkYXRlTGljZW5zZShjb25zdCBTdHJpbmcmIHNlc3Npb25JZCwg TGljZW5zZVR5cGUsIGNvCiAgICAgZGlzcGF0Y2hDYWxsYmFjayhmYWxzZSwgc3RkOjpudWxsb3B0 LCBTdWNjZXNzVmFsdWU6OkZhaWxlZCk7CiB9CiAKLXZvaWQgQ0RNSW5zdGFuY2VDbGVhcktleTo6 bG9hZFNlc3Npb24oTGljZW5zZVR5cGUsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIExv YWRTZXNzaW9uQ2FsbGJhY2sgY2FsbGJhY2spCit2b2lkIENETUluc3RhbmNlQ2xlYXJLZXk6Omxv YWRTZXNzaW9uKExpY2Vuc2VUeXBlLCBjb25zdCBTdHJpbmcmIHNlc3Npb25JZCwgY29uc3QgU3Ry aW5nJiwgTG9hZFNlc3Npb25DYWxsYmFjayBjYWxsYmFjaykKIHsKLSAgICBjYWxsT25NYWluVGhy ZWFkKAotICAgICAgICBbd2Vha1RoaXMgPSBtX3dlYWtQdHJGYWN0b3J5LmNyZWF0ZVdlYWtQdHIo KnRoaXMpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSB7Ci0gICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAvLyBVc2UgYSBoZWxwZXIg ZnVuY3RvciB0aGF0IHNjaGVkdWxlcyB0aGUgY2FsbGJhY2sgZGlzcGF0Y2gsIGF2b2lkaW5nCisg ICAgLy8gZHVwbGljYXRlZCBjYWxsT25NYWluVGhyZWFkKCkgY2FsbHMuCisgICAgYXV0byBkaXNw YXRjaENhbGxiYWNrID0KKyAgICAgICAgW3RoaXMsICZjYWxsYmFja10oc3RkOjpvcHRpb25hbDxL ZXlTdGF0dXNWZWN0b3I+JiYgZXhpc3RpbmdLZXlzLCBTdWNjZXNzVmFsdWUgc3VjY2VzcywgU2Vz c2lvbkxvYWRGYWlsdXJlIGxvYWRGYWlsdXJlKSB7CisgICAgICAgICAgICBjYWxsT25NYWluVGhy ZWFkKAorICAgICAgICAgICAgICAgIFt3ZWFrVGhpcyA9IG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRl V2Vha1B0cigqdGhpcyksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGV4aXN0aW5nS2V5 cyA9IFdURk1vdmUoZXhpc3RpbmdLZXlzKSwgc3VjY2VzcywgbG9hZEZhaWx1cmVdKCkgbXV0YWJs ZSB7CisgICAgICAgICAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGNhbGxiYWNrKHN0ZDo6bnVsbG9wdCwgc3Rk OjpudWxsb3B0LCBzdGQ6Om51bGxvcHQsIEZhaWxlZCwgU2Vzc2lvbkxvYWRGYWlsdXJlOjpPdGhl cik7Ci0gICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKGV4 aXN0aW5nS2V5cyksIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBzdWNjZXNzLCBsb2FkRmFp bHVyZSk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgIH07CisKKyAgICAvLyBDb25zdHJ1 Y3QgdGhlIEtleVN0YXR1c1ZlY3RvciBvYmplY3QsIHJlcHJlc2VudGluZyBhbGwgdGhlIGtub3du IGtleXMgZm9yIHRoaXMgc2Vzc2lvbi4KKyAgICBLZXlTdGF0dXNWZWN0b3Iga2V5U3RhdHVzVmVj dG9yOworICAgIHsKKyAgICAgICAgYXV0byYga2V5cyA9IENsZWFyS2V5U3RhdGU6OnNpbmdsZXRv bigpLmtleXMoKTsKKyAgICAgICAgYXV0byBpdCA9IGtleXMuZmluZChzZXNzaW9uSWQpOworICAg ICAgICBpZiAoaXQgPT0ga2V5cy5lbmQoKSkgeworICAgICAgICAgICAgZGlzcGF0Y2hDYWxsYmFj ayhzdGQ6Om51bGxvcHQsIEZhaWxlZCwgU2Vzc2lvbkxvYWRGYWlsdXJlOjpOb1Nlc3Npb25EYXRh KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGF1dG8mIGtleVZl Y3RvciA9IGl0LT52YWx1ZTsKKyAgICAgICAga2V5U3RhdHVzVmVjdG9yLnJlc2VydmVJbml0aWFs Q2FwYWNpdHkoa2V5VmVjdG9yLnNpemUoKSk7CisgICAgICAgIGZvciAoYXV0byYga2V5IDoga2V5 VmVjdG9yKQorICAgICAgICAgICAga2V5U3RhdHVzVmVjdG9yLnVuY2hlY2tlZEFwcGVuZChzdGQ6 OnBhaXI8UmVmPFNoYXJlZEJ1ZmZlcj4sIEtleVN0YXR1cz4geyAqa2V5LmtleUlERGF0YSwga2V5 LnN0YXR1cyB9KTsKKyAgICB9CisKKyAgICBkaXNwYXRjaENhbGxiYWNrKFdURk1vdmUoa2V5U3Rh dHVzVmVjdG9yKSwgU3VjY2VlZGVkLCBTZXNzaW9uTG9hZEZhaWx1cmU6Ok5vbmUpOwogfQogCiB2 b2lkIENETUluc3RhbmNlQ2xlYXJLZXk6OmNsb3NlU2Vzc2lvbihjb25zdCBTdHJpbmcmLCBDbG9z ZVNlc3Npb25DYWxsYmFjayBjYWxsYmFjaykKQEAgLTQ3NCwxNSArNDk3LDYzIEBAIHZvaWQgQ0RN SW5zdGFuY2VDbGVhcktleTo6Y2xvc2VTZXNzaW9uKGNvbnN0IFN0cmluZyYsIENsb3NlU2Vzc2lv bkNhbGxiYWNrIGNhbGxiCiAgICAgICAgIH0pOwogfQogCi12b2lkIENETUluc3RhbmNlQ2xlYXJL ZXk6OnJlbW92ZVNlc3Npb25EYXRhKGNvbnN0IFN0cmluZyYsIExpY2Vuc2VUeXBlLCBSZW1vdmVT ZXNzaW9uRGF0YUNhbGxiYWNrIGNhbGxiYWNrKQordm9pZCBDRE1JbnN0YW5jZUNsZWFyS2V5Ojpy ZW1vdmVTZXNzaW9uRGF0YShjb25zdCBTdHJpbmcmIHNlc3Npb25JZCwgTGljZW5zZVR5cGUsIFJl bW92ZVNlc3Npb25EYXRhQ2FsbGJhY2sgY2FsbGJhY2spCiB7Ci0gICAgY2FsbE9uTWFpblRocmVh ZCgKLSAgICAgICAgW3dlYWtUaGlzID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCp0 aGlzKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0gewotICAgICAgICAgICAgaWYgKCF3 ZWFrVGhpcykKLSAgICAgICAgICAgICAgICByZXR1cm47CisgICAgLy8gVXNlIGEgaGVscGVyIGZ1 bmN0b3IgdGhhdCBzY2hlZHVsZXMgdGhlIGNhbGxiYWNrIGRpc3BhdGNoLCBhdm9pZGluZworICAg IC8vIGR1cGxpY2F0ZWQgY2FsbE9uTWFpblRocmVhZCgpIGNhbGxzLgorICAgIGF1dG8gZGlzcGF0 Y2hDYWxsYmFjayA9CisgICAgICAgIFt0aGlzLCAmY2FsbGJhY2tdKEtleVN0YXR1c1ZlY3RvciYm IGtleVN0YXR1c1ZlY3Rvciwgc3RkOjpvcHRpb25hbDxSZWY8U2hhcmVkQnVmZmVyPj4mJiBtZXNz YWdlLCBTdWNjZXNzVmFsdWUgc3VjY2VzcykgeworICAgICAgICAgICAgY2FsbE9uTWFpblRocmVh ZCgKKyAgICAgICAgICAgICAgICBbd2Vha1RoaXMgPSBtX3dlYWtQdHJGYWN0b3J5LmNyZWF0ZVdl YWtQdHIoKnRoaXMpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBrZXlTdGF0dXNWZWN0 b3IgPSBXVEZNb3ZlKGtleVN0YXR1c1ZlY3RvciksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2Up LCBzdWNjZXNzXSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlz KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICBjYWxsYmFj ayh7IH0sIHN0ZDo6bnVsbG9wdCwgRmFpbGVkKTsKLSAgICAgICAgfSk7CisgICAgICAgICAgICAg ICAgICAgIGNhbGxiYWNrKFdURk1vdmUoa2V5U3RhdHVzVmVjdG9yKSwgV1RGTW92ZShtZXNzYWdl KSwgc3VjY2Vzcyk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgIH07CisKKyAgICAvLyBD b25zdHJ1Y3QgdGhlIEtleVN0YXR1c1ZlY3RvciBvYmplY3QsIHJlcHJlc2VudGluZyByZWxlYXNl ZCBrZXlzLCBhbmQgdGhlCisgICAgLy8gbWVzc2FnZSBpbiB0aGUgJ2xpY2Vuc2UgcmVsZWFzZScg Zm9ybWF0LgorICAgIEtleVN0YXR1c1ZlY3RvciBrZXlTdGF0dXNWZWN0b3I7CisgICAgUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gbWVzc2FnZTsKKyAgICB7CisgICAgICAgIC8vIFJldHJpZXZlIGluZm9y bWF0aW9uIGZvciB0aGUgZ2l2ZW4gc2Vzc2lvbiBJRCwgYmFpbGluZyBpZiBub25lIGlzIGZvdW5k LgorICAgICAgICBhdXRvJiBrZXlzID0gQ2xlYXJLZXlTdGF0ZTo6c2luZ2xldG9uKCkua2V5cygp OworICAgICAgICBhdXRvIGl0ID0ga2V5cy5maW5kKHNlc3Npb25JZCk7CisgICAgICAgIGlmIChp dCA9PSBrZXlzLmVuZCgpKSB7CisgICAgICAgICAgICBkaXNwYXRjaENhbGxiYWNrKEtleVN0YXR1 c1ZlY3RvciB7IH0sIHN0ZDo6bnVsbG9wdCwgU3VjY2Vzc1ZhbHVlOjpGYWlsZWQpOworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgLy8gUmV0cmlldmUgdGhlIEtleSB2 ZWN0b3IsIGNvbnRhaW5pbmcgYWxsIHRoZSBrZXlzIGZvciB0aGlzIHNlc3Npb24sIGFuZAorICAg ICAgICAvLyB0aGVuIHJlbW92ZSB0aGUga2V5IG1hcCBlbnRyeSBmb3IgdGhpcyBzZXNzaW9uLgor ICAgICAgICBhdXRvIGtleVZlY3RvciA9IFdURk1vdmUoaXQtPnZhbHVlKTsKKyAgICAgICAga2V5 cy5yZW1vdmUoaXQpOworCisgICAgICAgIC8vIENvbnN0cnVjdCB0aGUgS2V5U3RhdHVzVmVjdG9y IG9iamVjdCwgcGFpcmluZyBrZXkgSURzIHdpdGggdGhlICdyZWxlYXNlZCcgc3RhdHVzLgorICAg ICAgICBrZXlTdGF0dXNWZWN0b3IucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShrZXlWZWN0b3Iuc2l6 ZSgpKTsKKyAgICAgICAgZm9yIChhdXRvJiBrZXkgOiBrZXlWZWN0b3IpCisgICAgICAgICAgICBr ZXlTdGF0dXNWZWN0b3IudW5jaGVja2VkQXBwZW5kKHN0ZDo6cGFpcjxSZWY8U2hhcmVkQnVmZmVy PiwgS2V5U3RhdHVzPiB7ICprZXkua2V5SUREYXRhLCBLZXlTdGF0dXM6OlJlbGVhc2VkIH0pOwor CisgICAgICAgIC8vIENvbnN0cnVjdCBKU09OIHRoYXQgcmVwcmVzZW50cyB0aGUgJ2xpY2Vuc2Ug cmVsZWFzZScgZm9ybWF0LCBjcmVhdGluZyBhICdraWRzJyBhcnJheQorICAgICAgICAvLyBvZiBi YXNlNjRVUkwtZW5jb2RlZCBrZXkgSURzIGZvciBhbGwga2V5cyB0aGF0IHdlcmUgYXNzb2NpYXRl ZCB3aXRoIHRoaXMgc2Vzc2lvbi4KKyAgICAgICAgYXV0byByb290T2JqZWN0ID0gSW5zcGVjdG9y T2JqZWN0OjpjcmVhdGUoKTsKKyAgICAgICAgeworICAgICAgICAgICAgYXV0byBhcnJheSA9IElu c3BlY3RvckFycmF5OjpjcmVhdGUoKTsKKyAgICAgICAgICAgIGZvciAoYXV0byYga2V5IDoga2V5 VmVjdG9yKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGtleS5rZXlJRERhdGEtPnNpemUoKSA8 PSBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpOworICAgICAgICAgICAgICAg IGFycmF5LT5wdXNoU3RyaW5nKFdURjo6YmFzZTY0VVJMRW5jb2RlKGtleS5rZXlJRERhdGEtPmRh dGEoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGtleS5rZXlJRERhdGEtPnNpemUoKSkpKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIHJvb3RPYmplY3QtPnNldEFycmF5KCJraWRzIiwgV1RG TW92ZShhcnJheSkpOworICAgICAgICB9CisKKyAgICAgICAgLy8gQ29weSB0aGUgSlNPTiBkYXRh IGludG8gYSBTaGFyZWRCdWZmZXIgb2JqZWN0LgorICAgICAgICBTdHJpbmcgbWVzc2FnZVN0cmlu ZyA9IHJvb3RPYmplY3QtPnRvSlNPTlN0cmluZygpOworICAgICAgICBDU3RyaW5nIG1lc3NhZ2VD U3RyaW5nID0gbWVzc2FnZVN0cmluZy51dGY4KCk7CisgICAgICAgIG1lc3NhZ2UgPSBTaGFyZWRC dWZmZXI6OmNyZWF0ZShtZXNzYWdlQ1N0cmluZy5kYXRhKCksIG1lc3NhZ2VDU3RyaW5nLmxlbmd0 aCgpKTsKKyAgICB9CisKKyAgICBkaXNwYXRjaENhbGxiYWNrKFdURk1vdmUoa2V5U3RhdHVzVmVj dG9yKSwgUmVmPFNoYXJlZEJ1ZmZlcj4oKm1lc3NhZ2UpLCBTdWNjZXNzVmFsdWU6OlN1Y2NlZWRl ZCk7CiB9CiAKIHZvaWQgQ0RNSW5zdGFuY2VDbGVhcktleTo6c3RvcmVSZWNvcmRPZktleVVzYWdl KGNvbnN0IFN0cmluZyYpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjRlYjNkMWUzYTBkYmNmOGZjZTRhMzJhYTA5YTA2ZDk2 NTQwNTRmNy4uMmNmMDBmMTQyMmRjYjExMGRkZjczODFlYjM1ODkyNGM0ZDU5MjUzOSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDE3LTA5LTI1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KKworICAgICAgICBbRU1FXSBBZGQgQ2xlYXJLZXkgc3VwcG9ydCBmb3IgcGVyc2lz dGVudCBzZXNzaW9uIGRhdGEgbG9hZCBhbmQgcmVtb3ZhbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NDQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIFdQRSBiYXNlbGluZXMgZm9yIEVNRSB0 ZXN0cyBhZmZlY3RlZCBieSB0aGUgYWRkaXRpb24gb2YgcGVyc2lzdGVudAorICAgICAgICBzZXNz aW9uIGRhdGEgbG9hZCBhbmQgcmVtb3ZhbCBpbiB0aGUgQ2xlYXJLZXkgaW1wbGVtZW50YXRpb24u CisKKyAgICAgICAgQWxsIHRoZSBhZmZlY3RlZCB0ZXN0cyBwcm9ncmVzcywgYnV0IG1vc3Qgb2Yg dGhlbSBzdGlsbCBkb24ndCBwYXNzCisgICAgICAgIGVudGlyZWx5IGR1ZSB0byBtaXNzaW5nIGZ1 bmN0aW9uYWxpdHkgaW4gdGhlIEdTdHJlYW1lciBwaXBlbGluZS4KKworICAgICAgICAqIHBsYXRm b3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9j bGVhcmtleS1tcDQtcGxheWJhY2stZGVzdHJveS1wZXJzaXN0ZW50LWxpY2Vuc2UtZXhwZWN0ZWQu dHh0OgorICAgICAgICAqIHBsYXRmb3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2VuY3J5cHRlZC1tZWRpYS9jbGVhcmtleS1tcDQtcGxheWJhY2stcGVyc2lzdGVudC1saWNl bnNlLWV2ZW50cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vd3BlL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5 YmFjay1yZXRyaWV2ZS1kZXN0cm95LXBlcnNpc3RlbnQtbGljZW5zZS1leHBlY3RlZC50eHQ6Cisg ICAgICAgICogcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5j cnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1wZXJzaXN0ZW50LWxp Y2Vuc2UtZXhwZWN0ZWQudHh0OgorCiAyMDE3LTA5LTI1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u QGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJydGMvcGVlci1jb25uZWN0aW9uLWF1ZGlvLW11dGUu aHRtbCBpcyBzb21ldGltZXMgZmxha3kKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9jbGVh cmtleS1tcDQtcGxheWJhY2stZGVzdHJveS1wZXJzaXN0ZW50LWxpY2Vuc2UtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1kZXN0cm95LXBlcnNpc3Rl bnQtbGljZW5zZS1leHBlY3RlZC50eHQKaW5kZXggOTIzNDc5MDU5M2YxMTkwNGI5NTNmMTI1MDk3 ZDY2MGNkOTMwNDZmYi4uZmRiZWI0YzEzODExNjI5NGExYWQ2YjkwM2E0YjMwYTRlNDNkODQyMCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1kZXN0cm95 LXBlcnNpc3RlbnQtbGljZW5zZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2Ns ZWFya2V5LW1wNC1wbGF5YmFjay1kZXN0cm95LXBlcnNpc3RlbnQtbGljZW5zZS1leHBlY3RlZC50 eHQKQEAgLTEsMyArMSwzIEBACiAKLUZBSUwgb3JnLnczLmNsZWFya2V5LCBwZXJzaXN0ZW50LWxp Y2Vuc2UsIG1wNCwgcGxheWJhY2ssIGRlc3Ryb3kgYW5kIGFja25vd2xlZGdlIGFzc2VydF91bnJl YWNoZWQ6IE5vdFN1cHBvcnRlZEVycm9yOiBUaGUgb3BlcmF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQu IFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBvcmcudzMuY2xlYXJrZXksIHBlcnNpc3Rl bnQtbGljZW5zZSwgbXA0LCBwbGF5YmFjaywgZGVzdHJveSBhbmQgYWNrbm93bGVkZ2UgCiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9jbGVhcmtleS1tcDQtcGxheWJhY2stcGVyc2lzdGVu dC1saWNlbnNlLWV2ZW50cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93cGUv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9lbmNyeXB0ZWQtbWVkaWEvY2xlYXJrZXkt bXA0LXBsYXliYWNrLXBlcnNpc3RlbnQtbGljZW5zZS1ldmVudHMtZXhwZWN0ZWQudHh0CmluZGV4 IGIyZTM2OWZkYmFjMWVmMjJlOWY5MzE5NDJmODBlNTQ3MzE0MzA5NzcuLmQxZmIxYjJlNzIxMmRk MWRiYjMzZmZiNmY5NGRlNWRlM2FmMGVhYTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm b3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9j bGVhcmtleS1tcDQtcGxheWJhY2stcGVyc2lzdGVudC1saWNlbnNlLWV2ZW50cy1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1wZXJzaXN0ZW50 LWxpY2Vuc2UtZXZlbnRzLWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDMgQEAKIAotRkFJTCBvcmcu dzMuY2xlYXJrZXksIHBlcnNpc3RlbnQtbGljZW5zZSwgbXA0LCBwbGF5YmFjaywgY2hlY2sgZXZl bnRzIGFzc2VydF91bnJlYWNoZWQ6IE5vdFN1cHBvcnRlZEVycm9yOiBUaGUgb3BlcmF0aW9uIGlz IG5vdCBzdXBwb3J0ZWQuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBvcmcudzMuY2xl YXJrZXksIHBlcnNpc3RlbnQtbGljZW5zZSwgbXA0LCBwbGF5YmFjaywgY2hlY2sgZXZlbnRzIGFz c2VydF9lcXVhbHM6IEV4cGVjdGVkIDFzdCBldmVudCB0byBiZSAnZ2VuZXJhdGVyZXF1ZXN0JyBl eHBlY3RlZCAiZ2VuZXJhdGVyZXF1ZXN0IiBidXQgZ290ICJsaWNlbnNlLXJlcXVlc3QiCiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9jbGVhcmtleS1tcDQtcGxheWJhY2stcmV0cmlldmUt ZGVzdHJveS1wZXJzaXN0ZW50LWxpY2Vuc2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlh L2NsZWFya2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1kZXN0cm95LXBlcnNpc3RlbnQtbGljZW5z ZS1leHBlY3RlZC50eHQKaW5kZXggNmJhNGJmMTQzMDM4ZmIwOWU4ZDE3MzBlYzg2ZDM0MjlmYWZj NTNjNS4uZmMxMDYzNzNkZDI1ZjZjMDI1Y2I0YWJkYzhjNGYxYzQwNzVjNDA2MSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1kZXN0cm95 LXBlcnNpc3RlbnQtbGljZW5zZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2Ns ZWFya2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1kZXN0cm95LXBlcnNpc3RlbnQtbGljZW5zZS1l eHBlY3RlZC50eHQKQEAgLTEsMyArMSw1IEBACiAKLUZBSUwgb3JnLnczLmNsZWFya2V5LCBwZXJz aXN0ZW50LWxpY2Vuc2UsIG1wNCwgcGxheWJhY2ssIHJldHJpZXZlLCBwbGF5YmFjayBhbmQgZGVz dHJveSBhc3NlcnRfZXF1YWxzOiBOb3RTdXBwb3J0ZWRFcnJvcjogVGhlIG9wZXJhdGlvbiBpcyBu b3Qgc3VwcG9ydGVkLiBleHBlY3RlZCB0cnVlIGJ1dCBnb3QgZmFsc2UKK0hhcm5lc3MgRXJyb3Ig KFRJTUVPVVQpLCBtZXNzYWdlID0gbnVsbAorCitUSU1FT1VUIG9yZy53My5jbGVhcmtleSwgcGVy c2lzdGVudC1saWNlbnNlLCBtcDQsIHBsYXliYWNrLCByZXRyaWV2ZSwgcGxheWJhY2sgYW5kIGRl c3Ryb3kgVGVzdCB0aW1lZCBvdXQKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFy a2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1wZXJzaXN0ZW50LWxpY2Vuc2UtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd3BlL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvZW5jcnlwdGVkLW1lZGlhL2NsZWFya2V5LW1wNC1wbGF5YmFjay1yZXRyaWV2ZS1wZXJzaXN0 ZW50LWxpY2Vuc2UtZXhwZWN0ZWQudHh0CmluZGV4IGVkYTRhNTE4MDU3OTUwN2ZlOTYyNjM4MDAy YWY0NjIxMDhhZjFjZGEuLmQ2NTQyNzk0MDVlOGVkNjY2NTFjZTUwNWY5ZDk3NTJkODhkMzNhZTIg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dwZS9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2VuY3J5cHRlZC1tZWRpYS9jbGVhcmtleS1tcDQtcGxheWJhY2stcmV0cmll dmUtcGVyc2lzdGVudC1saWNlbnNlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS93cGUvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9lbmNyeXB0ZWQtbWVkaWEv Y2xlYXJrZXktbXA0LXBsYXliYWNrLXJldHJpZXZlLXBlcnNpc3RlbnQtbGljZW5zZS1leHBlY3Rl ZC50eHQKQEAgLTEsMyArMSw1IEBACiAKLUZBSUwgb3JnLnczLmNsZWFya2V5LCBwZXJzaXN0ZW50 LWxpY2Vuc2UsIG1wNCwgcGxheWJhY2ssIHJldHJpZXZlIGFuZCBwbGF5YmFjayBhc3NlcnRfZXF1 YWxzOiBOb3RTdXBwb3J0ZWRFcnJvcjogVGhlIG9wZXJhdGlvbiBpcyBub3Qgc3VwcG9ydGVkLiBl eHBlY3RlZCB0cnVlIGJ1dCBnb3QgZmFsc2UKK0hhcm5lc3MgRXJyb3IgKFRJTUVPVVQpLCBtZXNz YWdlID0gbnVsbAorCitUSU1FT1VUIG9yZy53My5jbGVhcmtleSwgcGVyc2lzdGVudC1saWNlbnNl LCBtcDQsIHBsYXliYWNrLCByZXRyaWV2ZSBhbmQgcGxheWJhY2sgVGVzdCB0aW1lZCBvdXQKIAo=