180083 2017-11-28 08:38:39 -0800 [EME] Add support of multi keys from different sessions in CDMinstanceClearKey 2018-01-23 04:08:30 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bandou.yacine webkit-unassigned calvaris commit-queue olivier.blin webkit-bug-importer zan oldest_to_newest 1375350 0 bandou.yacine 2017-11-28 08:38:39 -0800 Add support of multi keys from different MediaKeySession in CDMinstanceClearKey Use case: Two sessions of MediaKeysession, one for the audio track and one for the video track and a single CDMinstanceClearKey that receives the keys of both sessions, so it should cache these keys in a vector in order to send them to the Decryptors 1375356 1 327753 bandou.yacine 2017-11-28 08:55:01 -0800 Created attachment 327753 Patch 1375774 2 327753 calvaris 2017-11-29 04:42:24 -0800 Comment on attachment 327753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327753&action=review I think in this case we would be duplicating the keys so I'd suggest checking for the keys to be inside the Vector before adding a new one. Another issue I see is that a little bit below, the vector is cleared and probably we don't want to clear the keys that are still associated with a session. I think this logic is flawed and needs more work. Maybe Žan can correct me if I am wrong. > Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp:545 > + for (auto& key : keyVector) > + m_keys.append(key); If you wanted to do this, which I don't think is what I'd really want, you could use appendVector. 1376250 3 bandou.yacine 2017-11-30 02:09:11 -0800 (In reply to Xabier Rodríguez Calvar from comment #2) > Comment on attachment 327753 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=327753&action=review > > I think in this case we would be duplicating the keys so I'd suggest > checking for the keys to be inside the Vector before adding a new one. > I agree > Another issue I see is that a little bit below, the vector is cleared and > probably we don't want to clear the keys that are still associated with a > session. I think this logic is flawed and needs more work. > I'll check > Maybe Žan can correct me if I am wrong. > > > Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp:545 > > + for (auto& key : keyVector) > > + m_keys.append(key); > > If you wanted to do this, which I don't think is what I'd really want, you > could use appendVector. 1389980 4 331486 bandou.yacine 2018-01-17 06:01:51 -0800 Created attachment 331486 Patch 1390435 5 331486 calvaris 2018-01-17 23:47:53 -0800 Comment on attachment 331486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331486&action=review Can you explain a bit more how this works? > Source/WebCore/ChangeLog:8 > + Add support of multi keys from different MediaKeySession in CDMinstanceClearKey. CDMInstanceClearKey > Source/WebCore/ChangeLog:9 > + The single CDMinstanceClearKey that receives the keys of different sessions ditto 1390480 6 331614 bandou.yacine 2018-01-18 05:23:08 -0800 Created attachment 331614 Patch 1392019 7 331614 commit-queue 2018-01-23 04:07:47 -0800 Comment on attachment 331614 Patch Clearing flags on attachment: 331614 Committed r227409: <https://trac.webkit.org/changeset/227409> 1392020 8 commit-queue 2018-01-23 04:07:48 -0800 All reviewed patches have been landed. Closing bug. 1392021 9 webkit-bug-importer 2018-01-23 04:08:30 -0800 <rdar://problem/36771885> 327753 2017-11-28 08:55:01 -0800 2018-01-17 06:01:46 -0800 Patch bug-180083-20171128175500.patch text/plain 1931 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTMyYjAyYzcwMzZiZmRl NGFhYmYxYmFkNWIzYzM4YjBjZDVhMGQzYy4uZjAyMGE3NmMyNDAxODY3MTFjODBjMGY1ZTFmYTI1 MTI1Y2E4ODkyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTExLTI4ICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV0gQWRkIHN1cHBvcnQgb2YgbXVsdGkga2V5cyBmcm9tIGRpZmZlcmVudCBzZXNzaW9ucyBp biBDRE1pbnN0YW5jZUNsZWFyS2V5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODAwODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgc3VwcG9ydCBvZiBtdWx0aSBrZXlzIGZyb20gZGlmZmVyZW50IE1l ZGlhS2V5U2Vzc2lvbiBpbiBDRE1pbnN0YW5jZUNsZWFyS2V5LgorICAgICAgICBVc2UgY2FzZToK KyAgICAgICAgVHdvIHNlc3Npb25zIG9mIE1lZGlhS2V5c2Vzc2lvbiwgb25lIGZvciB0aGUgYXVk aW8gdHJhY2sgYW5kIG9uZSBmb3IgdGhlIHZpZGVvIHRyYWNrIGFuZAorICAgICAgICBhIHNpbmds ZSBDRE1pbnN0YW5jZUNsZWFyS2V5IHRoYXQgcmVjZWl2ZXMgdGhlIGtleXMgb2YgYm90aCBzZXNz aW9ucywgc28gaXQgc2hvdWxkIGNhY2hlCisgICAgICAgIHRoZXNlIGtleXMgaW4gYSB2ZWN0b3Ig aW4gb3JkZXIgdG8gc2VuZCB0aGVtIHRvIHRoZSBEZWNyeXB0b3IuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNlKToKKwogMjAxNy0xMS0y OCAgWWFjaW5lIEJhbmRvdSAgPHlhY2luZS5iYW5kb3VfZXh0QHNvZnRhdGhvbWUuY29tPgogCiAg ICAgICAgIFtFTUVdIEFkZCB0aGUgQ0VOQyBpbml0RGF0YSBzdXBwb3J0IGluIENsZWFyS2V5IENE TQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xl YXJrZXkvQ0RNQ2xlYXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVk bWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IDQwMzgxMzk4ZjFiODYzOTQxNDYy OGJlNmQ4ZjliYmQ1NTI2OGM5ZjguLjhjOTA0OWQ3MGE0NTNkMWNkNWI5M2EyOWVlYWJjMTVlMTU1 NWY0ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlh L2NsZWFya2V5L0NETUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9l bmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTU0MSw3ICs1NDEsOCBA QCB2b2lkIENETUluc3RhbmNlQ2xlYXJLZXk6OnVwZGF0ZUxpY2Vuc2UoY29uc3QgU3RyaW5nJiBz ZXNzaW9uSWQsIExpY2Vuc2VUeXBlLCBjbwogICAgICAgICB9CiAKICAgICAgICAgLy8gQ2FjaGUg dGhlIGtleSBpbmZvcm1hdGlvbiBWZWN0b3Igb24gQ0RNSW5zdGFuY2UgZm9yIGVhc2llciBhY2Nl c3MgZnJvbSB0aGUgcGlwZWxpbmUuCi0gICAgICAgIG1fa2V5cyA9IGtleVZlY3RvcjsKKyAgICAg ICAgZm9yIChhdXRvJiBrZXkgOiBrZXlWZWN0b3IpCisgICAgICAgICAgICBtX2tleXMuYXBwZW5k KGtleSk7CiAKICAgICAgICAgZGlzcGF0Y2hDYWxsYmFjayhmYWxzZSwgV1RGTW92ZShjaGFuZ2Vk S2V5cyksIFN1Y2Nlc3NWYWx1ZTo6U3VjY2VlZGVkKTsKICAgICAgICAgcmV0dXJuOwo= 331486 2018-01-17 06:01:51 -0800 2018-01-18 05:23:03 -0800 Patch bug-180083-20180117150149.patch text/plain 3798 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYxMGM1NTFkZWViODVi ZDI4ZTBjZDliZDA1OTQwNDNkYTQwYTA2Zi4uNjAyMzEyYWM2MWFjNWUyZDY0YTAxZDUwNjVhMzU3 MTA5NDM2MGQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAxLTE3ICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV0gQWRkIHN1cHBvcnQgb2YgbXVsdGkga2V5cyBmcm9tIGRpZmZlcmVudCBzZXNzaW9ucyBp biBDRE1pbnN0YW5jZUNsZWFyS2V5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODAwODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgc3VwcG9ydCBvZiBtdWx0aSBrZXlzIGZyb20gZGlmZmVyZW50IE1l ZGlhS2V5U2Vzc2lvbiBpbiBDRE1pbnN0YW5jZUNsZWFyS2V5LgorICAgICAgICBUaGUgc2luZ2xl IENETWluc3RhbmNlQ2xlYXJLZXkgdGhhdCByZWNlaXZlcyB0aGUga2V5cyBvZiBkaWZmZXJlbnQg c2Vzc2lvbnMKKyAgICAgICAgc2hvdWxkIHJldHVybiBhbGwgdGhlc2Uga2V5cyBpbnN0ZWFkIG9m IHRoZSBsYXN0IGtleXMsIGluIG9yZGVyIHRvIHNlbmQgdGhlbQorICAgICAgICB0byB0aGUgZGVj cnlwdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RN Q2xlYXJLZXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VDbGVhcktleTo6a2V5 cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVM aWNlbnNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1D bGVhcktleS5oOgorCiAyMDE4LTAxLTE1ICBZYWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9l eHRAc29mdGF0aG9tZS5jb20+CiAgICAgICAgIFtFTUVdW0dTdHJlYW1lcl0gQWRkIHRoZSBmdWxs LXNhbXBsZSBlbmNyeXB0aW9uIHN1cHBvcnQgaW4gdGhlIEdTdHJlYW1lciBDbGVhcktleSBkZWNy eXB0b3IKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 MDA4MApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEv Y2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlw dGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IDk3ODRmOTNkMDYxN2E0ZWZh NWEzZTIyMzJlMGE3ODUwMzI1Y2M0YTguLjg1NTUxYmY1M2YyNWU4ZGM2NWFiZmJlMjk0ZDNmYTdi ZTc1MDdjOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1l ZGlhL2NsZWFya2V5L0NETUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTQ4MCw2ICs0ODAs MTYgQEAgdm9pZCBDRE1JbnN0YW5jZUNsZWFyS2V5OjpyZXF1ZXN0TGljZW5zZShMaWNlbnNlVHlw ZSwgY29uc3QgQXRvbWljU3RyaW5nJiBpbml0RGEKICAgICAgICAgfSk7CiB9CiAKK2NvbnN0IFZl Y3RvcjxDRE1JbnN0YW5jZUNsZWFyS2V5OjpLZXk+IENETUluc3RhbmNlQ2xlYXJLZXk6OmtleXMo KSBjb25zdAoreworICAgIC8vIFJldHVybiB0aGUga2V5cyBvZiBhbGwgc2Vzc2lvbnMuCisgICAg VmVjdG9yPENETUluc3RhbmNlQ2xlYXJLZXk6OktleT4gYWxsS2V5cyB7IH07CisgICAgZm9yIChh dXRvJiBrZXkgOiBDbGVhcktleVN0YXRlOjpzaW5nbGV0b24oKS5rZXlzKCkudmFsdWVzKCkpCisg ICAgICAgIGFsbEtleXMuYXBwZW5kVmVjdG9yKGtleSk7CisKKyAgICByZXR1cm4gYWxsS2V5czsK K30KKwogdm9pZCBDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNlKGNvbnN0IFN0cmlu ZyYgc2Vzc2lvbklkLCBMaWNlbnNlVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJiByZXNwb25zZSwg TGljZW5zZVVwZGF0ZUNhbGxiYWNrIGNhbGxiYWNrKQogewogICAgIC8vIFVzZSBhIGhlbHBlciBm dW5jdG9yIHRoYXQgc2NoZWR1bGVzIHRoZSBjYWxsYmFjayBkaXNwYXRjaCwgYXZvaWRpbmcKQEAg LTU2NSw5ICs1NzUsNiBAQCB2b2lkIENETUluc3RhbmNlQ2xlYXJLZXk6OnVwZGF0ZUxpY2Vuc2Uo Y29uc3QgU3RyaW5nJiBzZXNzaW9uSWQsIExpY2Vuc2VUeXBlLCBjbwogICAgICAgICAgICAgY2hh bmdlZEtleXMgPSBXVEZNb3ZlKGtleVN0YXR1c1ZlY3Rvcik7CiAgICAgICAgIH0KIAotICAgICAg ICAvLyBDYWNoZSB0aGUga2V5IGluZm9ybWF0aW9uIFZlY3RvciBvbiBDRE1JbnN0YW5jZSBmb3Ig ZWFzaWVyIGFjY2VzcyBmcm9tIHRoZSBwaXBlbGluZS4KLSAgICAgICAgbV9rZXlzID0ga2V5VmVj dG9yOwotCiAgICAgICAgIGRpc3BhdGNoQ2FsbGJhY2soZmFsc2UsIFdURk1vdmUoY2hhbmdlZEtl eXMpLCBTdWNjZXNzVmFsdWU6OlN1Y2NlZWRlZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC01NzYsNyArNTgzLDYgQEAgdm9pZCBDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNl KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkLCBMaWNlbnNlVHlwZSwgY28KICAgICBpZiAocGFyc2VM aWNlbnNlUmVsZWFzZUFja25vd2xlZGdlbWVudEZvcm1hdCgqcm9vdCkpIHsKICAgICAgICAgLy8g RklYTUU6IFJldHJpZXZlIHRoZSBrZXkgSUQgaW5mb3JtYXRpb24gYW5kIHVzZSBpdCB0byB2YWxp ZGF0ZSB0aGUga2V5cyBmb3IgdGhpcyBzZXNzaW9uSWQuCiAgICAgICAgIENsZWFyS2V5U3RhdGU6 OnNpbmdsZXRvbigpLmtleXMoKS5yZW1vdmUoc2Vzc2lvbklkKTsKLSAgICAgICAgbV9rZXlzLmNs ZWFyKCk7CiAgICAgICAgIGRpc3BhdGNoQ2FsbGJhY2sodHJ1ZSwgc3RkOjpudWxsb3B0LCBTdWNj ZXNzVmFsdWU6OlN1Y2NlZWRlZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVh cktleS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkv Q0RNQ2xlYXJLZXkuaAppbmRleCAwNzg0NTQzZGMzNDZhYjM2ZmMyZjgyNzFhNGZhYzdiMmRkZTc3 ZmY2Li5kOThmZTA3ZDEwNWQyYjEwODBhYmQzZDUzZjE3NGRkMDMxZjQxN2M5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVh cktleS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFy a2V5L0NETUNsZWFyS2V5LmgKQEAgLTEwMiwxMSArMTAyLDEwIEBAIHB1YmxpYzoKICAgICAgICAg UmVmUHRyPFNoYXJlZEJ1ZmZlcj4ga2V5VmFsdWVEYXRhOwogICAgIH07CiAKLSAgICBjb25zdCBW ZWN0b3I8S2V5PiYga2V5cygpIGNvbnN0IHsgcmV0dXJuIG1fa2V5czsgfQorICAgIGNvbnN0IFZl Y3RvcjxLZXk+IGtleXMoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBXZWFrUHRyRmFjdG9yeTxD RE1JbnN0YW5jZUNsZWFyS2V5PiBtX3dlYWtQdHJGYWN0b3J5OwotICAgIFZlY3RvcjxLZXk+IG1f a2V5czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 331614 2018-01-18 05:23:08 -0800 2018-01-23 04:07:47 -0800 Patch bug-180083-20180118142307.patch text/plain 4359 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYxMGM1NTFkZWViODVi ZDI4ZTBjZDliZDA1OTQwNDNkYTQwYTA2Zi4uNjBjZjlmNzc3ZjI4ZGExMGVlMjA4ZjMwMThkMmZl MzYzOTI5ZTM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTAxLTE3ICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAg W0VNRV0gQWRkIHN1cHBvcnQgb2YgbXVsdGkga2V5cyBmcm9tIGRpZmZlcmVudCBzZXNzaW9ucyBp biBDRE1pbnN0YW5jZUNsZWFyS2V5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODAwODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgc3VwcG9ydCBvZiBtdWx0aSBrZXlzIGZyb20gZGlmZmVyZW50IE1l ZGlhS2V5U2Vzc2lvbiBpbiBDRE1JbnN0YW5jZUNsZWFyS2V5LgorCisgICAgICAgIEN1cnJlbnRs eSB0aGUgQ0RNSW5zdGFuY2VDbGVhcktleSBtYW5hZ2VzIHR3byAibV9rZXlzIiwgb25lIGlzIGEg V1RGOjpWZWN0b3IKKyAgICAgICAgd2hlcmUgaXQgc3RvcmVzIHRoZSBsaXN0IG9mIGxhc3QgYWRk ZWQga2V5cywgYW4gb3RoZXIgd2hpY2ggaXMgZGVmaW5lZCBpbiB0aGUKKyAgICAgICAgQ2xlYXJL ZXlTdGF0ZTo6c2luZ2xldG9uIGl0IGlzIGEgV1RGOjpIYXNoTWFwLCBpbiB0aGlzIGxhc3Qgb25l LCBpdCBzdG9yZXMgdGhlCisgICAgICAgIGtleXMgbGlzdHMgb2YgZWFjaCBjcmVhdGVkIHNlc3Np b24uCisKKyAgICAgICAgVGhlIG1ldGhvZCAia2V5cygpIiBvZiBDRE1JbnN0YW5jZUNsZWFyS2V5 IHJldHVybnMgdGhlIGZpcnN0ICJtX2tleXMiIHdoaWNoCisgICAgICAgIGNvbnRhaW5zIGp1c3Qg dGhlIGxpc3Qgb2YgbGFzdCBrZXlzLgorCisgICAgICAgIFRoZSBnb2FsIG9mIHRoaXMgY29tbWl0 IGlzIHRvIHJldHVybiBhbGwga2V5cyBsaXN0cyBvZiBhbGwgc2Vzc2lvbnMsIHRodXMKKyAgICAg ICAgd2UgcmVtb3ZlIHRoZSAibV9rZXlzIiB3aGljaCBpcyBXVEY6OlZlY3RvciBhbmQgd2UgbW9k aWZ5IHRoZSBtZXRob2QKKyAgICAgICAgImtleXMoKSIgdG8gcmV0dXJuIGFsbCBrZXlzIGxpc3Rz LCB3aGljaCBpcyBzdG9yZWQgaW4gIm1fa2V5cyIgV1RGOjpIYXNoTWFwLAorICAgICAgICBpbiBv bmUgVmVjdG9yIGluc3RlYWQgb2YgcmV0dXJuIGp1c3QgdGhlIGxpc3Qgb2YgbGFzdCBrZXlzLgor CisgICAgICAgICogcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VDbGVhcktleTo6a2V5cyBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5o OgorCiAyMDE4LTAxLTE1ICBZYWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdV9leHRAc29mdGF0 aG9tZS5jb20+CiAgICAgICAgIFtFTUVdW0dTdHJlYW1lcl0gQWRkIHRoZSBmdWxsLXNhbXBsZSBl bmNyeXB0aW9uIHN1cHBvcnQgaW4gdGhlIEdTdHJlYW1lciBDbGVhcktleSBkZWNyeXB0b3IKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDA4MApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkv Q0RNQ2xlYXJLZXkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEv Y2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCmluZGV4IDk3ODRmOTNkMDYxN2E0ZWZhNWEzZTIyMzJl MGE3ODUwMzI1Y2M0YTguLjg1NTUxYmY1M2YyNWU4ZGM2NWFiZmJlMjk0ZDNmYTdiZTc1MDdjOWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFy a2V5L0NETUNsZWFyS2V5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0 ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAKQEAgLTQ4MCw2ICs0ODAsMTYgQEAgdm9p ZCBDRE1JbnN0YW5jZUNsZWFyS2V5OjpyZXF1ZXN0TGljZW5zZShMaWNlbnNlVHlwZSwgY29uc3Qg QXRvbWljU3RyaW5nJiBpbml0RGEKICAgICAgICAgfSk7CiB9CiAKK2NvbnN0IFZlY3RvcjxDRE1J bnN0YW5jZUNsZWFyS2V5OjpLZXk+IENETUluc3RhbmNlQ2xlYXJLZXk6OmtleXMoKSBjb25zdAor eworICAgIC8vIFJldHVybiB0aGUga2V5cyBvZiBhbGwgc2Vzc2lvbnMuCisgICAgVmVjdG9yPENE TUluc3RhbmNlQ2xlYXJLZXk6OktleT4gYWxsS2V5cyB7IH07CisgICAgZm9yIChhdXRvJiBrZXkg OiBDbGVhcktleVN0YXRlOjpzaW5nbGV0b24oKS5rZXlzKCkudmFsdWVzKCkpCisgICAgICAgIGFs bEtleXMuYXBwZW5kVmVjdG9yKGtleSk7CisKKyAgICByZXR1cm4gYWxsS2V5czsKK30KKwogdm9p ZCBDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNlKGNvbnN0IFN0cmluZyYgc2Vzc2lv bklkLCBMaWNlbnNlVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJiByZXNwb25zZSwgTGljZW5zZVVw ZGF0ZUNhbGxiYWNrIGNhbGxiYWNrKQogewogICAgIC8vIFVzZSBhIGhlbHBlciBmdW5jdG9yIHRo YXQgc2NoZWR1bGVzIHRoZSBjYWxsYmFjayBkaXNwYXRjaCwgYXZvaWRpbmcKQEAgLTU2NSw5ICs1 NzUsNiBAQCB2b2lkIENETUluc3RhbmNlQ2xlYXJLZXk6OnVwZGF0ZUxpY2Vuc2UoY29uc3QgU3Ry aW5nJiBzZXNzaW9uSWQsIExpY2Vuc2VUeXBlLCBjbwogICAgICAgICAgICAgY2hhbmdlZEtleXMg PSBXVEZNb3ZlKGtleVN0YXR1c1ZlY3Rvcik7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBDYWNo ZSB0aGUga2V5IGluZm9ybWF0aW9uIFZlY3RvciBvbiBDRE1JbnN0YW5jZSBmb3IgZWFzaWVyIGFj Y2VzcyBmcm9tIHRoZSBwaXBlbGluZS4KLSAgICAgICAgbV9rZXlzID0ga2V5VmVjdG9yOwotCiAg ICAgICAgIGRpc3BhdGNoQ2FsbGJhY2soZmFsc2UsIFdURk1vdmUoY2hhbmdlZEtleXMpLCBTdWNj ZXNzVmFsdWU6OlN1Y2NlZWRlZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC01NzYsNyAr NTgzLDYgQEAgdm9pZCBDRE1JbnN0YW5jZUNsZWFyS2V5Ojp1cGRhdGVMaWNlbnNlKGNvbnN0IFN0 cmluZyYgc2Vzc2lvbklkLCBMaWNlbnNlVHlwZSwgY28KICAgICBpZiAocGFyc2VMaWNlbnNlUmVs ZWFzZUFja25vd2xlZGdlbWVudEZvcm1hdCgqcm9vdCkpIHsKICAgICAgICAgLy8gRklYTUU6IFJl dHJpZXZlIHRoZSBrZXkgSUQgaW5mb3JtYXRpb24gYW5kIHVzZSBpdCB0byB2YWxpZGF0ZSB0aGUg a2V5cyBmb3IgdGhpcyBzZXNzaW9uSWQuCiAgICAgICAgIENsZWFyS2V5U3RhdGU6OnNpbmdsZXRv bigpLmtleXMoKS5yZW1vdmUoc2Vzc2lvbklkKTsKLSAgICAgICAgbV9rZXlzLmNsZWFyKCk7CiAg ICAgICAgIGRpc3BhdGNoQ2FsbGJhY2sodHJ1ZSwgc3RkOjpudWxsb3B0LCBTdWNjZXNzVmFsdWU6 OlN1Y2NlZWRlZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJL ZXkuaAppbmRleCAwNzg0NTQzZGMzNDZhYjM2ZmMyZjgyNzFhNGZhYzdiMmRkZTc3ZmY2Li5kOThm ZTA3ZDEwNWQyYjEwODBhYmQzZDUzZjE3NGRkMDMxZjQxN2M5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFya2V5L0NETUNs ZWFyS2V5LmgKQEAgLTEwMiwxMSArMTAyLDEwIEBAIHB1YmxpYzoKICAgICAgICAgUmVmUHRyPFNo YXJlZEJ1ZmZlcj4ga2V5VmFsdWVEYXRhOwogICAgIH07CiAKLSAgICBjb25zdCBWZWN0b3I8S2V5 PiYga2V5cygpIGNvbnN0IHsgcmV0dXJuIG1fa2V5czsgfQorICAgIGNvbnN0IFZlY3RvcjxLZXk+ IGtleXMoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBXZWFrUHRyRmFjdG9yeTxDRE1JbnN0YW5j ZUNsZWFyS2V5PiBtX3dlYWtQdHJGYWN0b3J5OwotICAgIFZlY3RvcjxLZXk+IG1fa2V5czsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK