223436 2021-03-18 04:05:28 -0700 [GStreamer][EME] Remove DRM resources release 2022-06-12 23:53:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 calvaris calvaris bandou.yacine cgarcia eric.carlson ews-watchlist glenn gustavo jer.noble menard olivier.blin philipj pnormand sergio vjaquez webkit-bug-importer oldest_to_newest 1741143 0 calvaris 2021-03-18 04:05:28 -0700 [GStreamer][EME] Remove DRM resources release 1741145 1 423582 calvaris 2021-03-18 04:07:46 -0700 Created attachment 423582 Patch 1741709 2 ews-feeder 2021-03-19 08:04:08 -0700 Committed r274719: <https://commits.webkit.org/r274719> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423582. 1741710 3 webkit-bug-importer 2021-03-19 08:05:15 -0700 <rdar://problem/75620889> 1875223 4 bandou.yacine 2022-06-10 05:41:11 -0700 I think we should let 1875224 5 bandou.yacine 2022-06-10 05:52:58 -0700 we should have left this "CDMInstanceProxy::releaseDecryptionResources" method, in order to be overloaded when we need release the resources. In some proprietary embedded DRM implementation we need to release some resources in order to be able change the DRM system (like passing from PlayReady to Widevine), and start a new playback, before the javascript GC is performed. For example, in some chipsets, we cannot initialize the TEE for multiple DRM systems at the same time. In this EME test page "https://ytlr-cert.appspot.com/2020/main.html?test_type=encryptedmedia-test" we change from Widevine to Playready." 1875485 6 calvaris 2022-06-12 23:53:47 -0700 (In reply to Yacine Bandou from comment #5) > we should have left this "CDMInstanceProxy::releaseDecryptionResources" > method, in order to be overloaded when we need release the resources. > > In some proprietary embedded DRM implementation we need to release some > resources > in order to be able change the DRM system (like passing from PlayReady to > Widevine), and start a new playback, before the javascript GC is performed. > > For example, in some chipsets, we cannot initialize the TEE for multiple DRM > systems at the same time. > > In this EME test page > "https://ytlr-cert.appspot.com/2020/main.html?test_type=encryptedmedia-test" > we change from Widevine to Playready." This was used before giving a spin to all session management and it was creating crashes with certain assets. For now, we don't see that necessary. I think you can keep that downstream if you don't find any other way. 423582 2021-03-18 04:07:46 -0700 2021-03-19 08:04:10 -0700 Patch bug-223436-20210318120745.patch text/plain 11671 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc3NTdiNmJlMzMzNGE5 ZTY2Yjc3MWJhNDI0MGUyY2IxOWYyZmNjNS4uOTkzNGVkZTFlMmU4ZGFmOWEyMmM3ZTFhZGQ4NTY2 OGZlY2Q4Mjg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTAzLTE4ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl1bRU1FXSBSZW1vdmUgRFJNIHJlc291cmNlcyByZWxlYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0MzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWxlYXNpbmcgRFJNIHJlc291cmNl cyBzaG91bGQgbm90IGJlIG5lZWRlZCBhY2NvcmRpbmcgdG8gdGhlCisgICAgICAgIHNwZWMuIElm IHdlIG5lZWRlZCB0aGlzIGluIHRoZSBmdXR1cmUgYmVjYXVzZSBvZiB3aGF0ZXZlciByZWFzb24K KyAgICAgICAgd2UgbmVlZCB0byBzdHVkeSBpdCBhZ2FpbiBpbiBzb21lIG90aGVyIHdheS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL0NETVByb3h5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNETUluc3RhbmNlUHJveHk6OnRyYWNrU2Vzc2lvbik6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVNlc3Npb25Qcm94eTo6cmVtb3ZlRnJvbUluc3RhbmNl UHJveHkpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL0NETVBy b3h5Lmg6CisgICAgICAgIChXZWJDb3JlOjpDRE1Qcm94eTo6cmVsZWFzZURlY3J5cHRpb25SZXNv dXJjZXMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNzaW9uUHJv eHk6OnJlbGVhc2VEZWNyeXB0aW9uUmVzb3VyY2VzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkNETUluc3RhbmNlUHJveHk6OnJlbW92ZVNlc3Npb24pOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6Q0RNSW5zdGFuY2VQcm94eTo6cmVsZWFzZURlY3J5cHRpb25SZXNvdXJjZXMpOiBE ZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFya2V5L0NETUNs ZWFyS2V5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlQ2xlYXJLZXk6OmNyZWF0 ZVNlc3Npb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVByb3h5Q2xlYXJLZXkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q0RNUHJveHlDbGVhcktleTo6cmVsZWFzZURlY3J5cHRpb25SZXNv dXJjZXMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9l bWUvQ0RNUHJveHlDbGVhcktleS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9lbWUvQ0RNVGh1bmRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVRo dW5kZXI6OmNyZWF0ZVNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNz aW9uVGh1bmRlcjo6cmVxdWVzdExpY2Vuc2UpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFu Y2VTZXNzaW9uVGh1bmRlcjo6Y2xvc2VTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNETUlu c3RhbmNlU2Vzc2lvblRodW5kZXI6OnJlbW92ZVNlc3Npb25EYXRhKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuaDoKKwogMjAyMS0wMy0xNiAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvdGVjdCBET01G aWxlU3lzdGVtIHdoZW4gaG9wcGluZyB0byBhIGJhY2tncm91bmQgdGhyZWFkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcm94eS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcm94eS5jcHAKaW5kZXgg ZjJhNWYzMTc2NmE3OGFhYzU5YzMzMzgyNTRiYWI4NGVjMzlhMTQwNC4uNWIxYjVkZmRiZDUxNGRl MjdkNjZlNTQ1ZTcwNGNlZmY5MDRkMmZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VuY3J5cHRlZG1lZGlhL0NETVByb3h5LmNwcApAQCAtMzczLDI0ICszNzMsMTEgQEAg dm9pZCBDRE1JbnN0YW5jZVByb3h5OjpyZW1vdmVBbGxLZXlzRnJvbShjb25zdCBLZXlTdG9yZSYg a2V5U3RvcmUpCiAgICAgbV9rZXlTdG9yZS5yZW1vdmVBbGxLZXlzRnJvbShrZXlTdG9yZSk7CiB9 CiAKLXZvaWQgQ0RNSW5zdGFuY2VQcm94eTo6dHJhY2tTZXNzaW9uKGNvbnN0IENETUluc3RhbmNl U2Vzc2lvblByb3h5JiBzZXNzaW9uKQotewotICAgIEFTU0VSVCghbV9zZXNzaW9ucy5jb250YWlu cyhzZXNzaW9uKSk7Ci0gICAgbV9zZXNzaW9ucy5hZGQoc2Vzc2lvbik7Ci19Ci0KIENETUluc3Rh bmNlU2Vzc2lvblByb3h5OjpDRE1JbnN0YW5jZVNlc3Npb25Qcm94eShDRE1JbnN0YW5jZVByb3h5 JiBpbnN0YW5jZSkKICAgICA6IG1faW5zdGFuY2UobWFrZVdlYWtQdHIoaW5zdGFuY2UpKQogewog fQogCi12b2lkIENETUluc3RhbmNlU2Vzc2lvblByb3h5OjpyZW1vdmVGcm9tSW5zdGFuY2VQcm94 eSgpCi17Ci0gICAgaWYgKCFtX2luc3RhbmNlKQotICAgICAgICByZXR1cm47Ci0gICAgbV9pbnN0 YW5jZS0+cmVtb3ZlU2Vzc2lvbigqdGhpcyk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK IAogI2VuZGlmIC8vIEVOQUJMRShFTkNSWVBURURfTUVESUEpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9DRE1Qcm94eS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvQ0RNUHJveHkuaAppbmRleCA2NzU2OWEwMjRhODEy NmYzZjYxYzliNjE0MTMzNDAyYTM1NGE5NjY0Li44M2VkZDllOTI1NDlmYWFlZjEyNTA1ZTE1M2Vj ZjcyZmViOTMxZmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0 ZWRtZWRpYS9DRE1Qcm94eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRl ZG1lZGlhL0NETVByb3h5LmgKQEAgLTE1OCwxMiArMTU4LDYgQEAgcHVibGljOgogICAgIHZvaWQg dXBkYXRlS2V5U3RvcmUoY29uc3QgS2V5U3RvcmUmIG5ld0tleVN0b3JlKTsKICAgICB2b2lkIHNl dEluc3RhbmNlKENETUluc3RhbmNlUHJveHkqKTsKIAotICAgIHZpcnR1YWwgdm9pZCByZWxlYXNl RGVjcnlwdGlvblJlc291cmNlcygpCi0gICAgewotICAgICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwotICAgICAgICBtX2tleVN0b3JlLnJlbW92ZUFsbEtleXMoKTsKLSAgICB9Ci0KIHByb3Rl Y3RlZDoKICAgICBSZWZQdHI8S2V5SGFuZGxlPiBrZXlIYW5kbGUoY29uc3QgS2V5SURUeXBlJikg Y29uc3Q7CiAgICAgYm9vbCBrZXlBdmFpbGFibGUoY29uc3QgS2V5SURUeXBlJikgY29uc3Q7CkBA IC0yMTIsOCArMjA2LDYgQEAgY2xhc3MgQ0RNSW5zdGFuY2VQcm94eTsKIAogY2xhc3MgQ0RNSW5z dGFuY2VTZXNzaW9uUHJveHkgOiBwdWJsaWMgQ0RNSW5zdGFuY2VTZXNzaW9uLCBwdWJsaWMgQ2Fu TWFrZVdlYWtQdHI8Q0RNSW5zdGFuY2VTZXNzaW9uUHJveHksIFdlYWtQdHJGYWN0b3J5SW5pdGlh bGl6YXRpb246OkVhZ2VyPiB7CiBwdWJsaWM6Ci0gICAgdmlydHVhbCB2b2lkIHJlbGVhc2VEZWNy eXB0aW9uUmVzb3VyY2VzKCkgeyBtX2luc3RhbmNlLmNsZWFyKCk7IH0KLSAgICB2b2lkIHJlbW92 ZUZyb21JbnN0YW5jZVByb3h5KCk7CiAKIHByb3RlY3RlZDoKICAgICBDRE1JbnN0YW5jZVNlc3Np b25Qcm94eShDRE1JbnN0YW5jZVByb3h5Jik7CkBAIC0yNDksMjMgKzI0MSw2IEBAIHB1YmxpYzoK ICAgICB2b2lkIHN0YXJ0ZWRXYWl0aW5nRm9yS2V5KCk7CiAgICAgdm9pZCBzdG9wcGVkV2FpdGlu Z0ZvcktleSgpOwogCi0gICAgdm9pZCByZW1vdmVTZXNzaW9uKGNvbnN0IENETUluc3RhbmNlU2Vz c2lvblByb3h5JiBzZXNzaW9uKSB7IG1fc2Vzc2lvbnMucmVtb3ZlKHNlc3Npb24pOyB9Ci0gICAg dmlydHVhbCB2b2lkIHJlbGVhc2VEZWNyeXB0aW9uUmVzb3VyY2VzKCkKLSAgICB7Ci0gICAgICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIG1fa2V5U3RvcmUucmVtb3ZlQWxsS2V5 cygpOwotICAgICAgICBmb3IgKGF1dG8mIHNlc3Npb24gOiBtX3Nlc3Npb25zKQotICAgICAgICAg ICAgc2Vzc2lvbi5yZWxlYXNlRGVjcnlwdGlvblJlc291cmNlcygpOwotICAgICAgICBtX3Nlc3Np b25zLmNsZWFyKCk7Ci0gICAgICAgIGlmIChtX2NkbVByb3h5KSB7Ci0gICAgICAgICAgICBtX2Nk bVByb3h5LT5yZWxlYXNlRGVjcnlwdGlvblJlc291cmNlcygpOwotICAgICAgICAgICAgbV9jZG1Q cm94eSA9IG51bGxwdHI7Ci0gICAgICAgIH0KLSAgICB9Ci0KLXByb3RlY3RlZDoKLSAgICB2b2lk IHRyYWNrU2Vzc2lvbihjb25zdCBDRE1JbnN0YW5jZVNlc3Npb25Qcm94eSYpOwotCiBwcml2YXRl OgogICAgIFJlZlB0cjxDRE1Qcm94eT4gbV9jZG1Qcm94eTsKICAgICAvLyBGSVhNRTogV2Vha1B0 ciBmb3IgdGhlIG1fcGxheWVyPyBUaGlzIGlzIGFjY2Vzc2VkIGZyb20gYmFja2dyb3VuZCBhbmQg bWFpbiB0aHJlYWRzLCBpdCdzCkBAIC0yNzQsNyArMjQ5LDYgQEAgcHJpdmF0ZToKICAgICBNZWRp YVBsYXllciogbV9wbGF5ZXIgeyBudWxscHRyIH07IC8vIEZJWE1FOiBNYWluVGhyZWFkPFQ+Pwog CiAgICAgc3RkOjphdG9taWM8aW50PiBtX251bURlY3J5cHRvcnNXYWl0aW5nRm9yS2V5IHsgMCB9 OwotICAgIFdlYWtIYXNoU2V0PENETUluc3RhbmNlU2Vzc2lvblByb3h5PiBtX3Nlc3Npb25zOwog CiAgICAgS2V5U3RvcmUgbV9rZXlTdG9yZTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9lbmNyeXB0ZWRtZWRpYS9jbGVhcmtleS9DRE1DbGVhcktleS5j cHAKaW5kZXggYWU0NTcyZjg0ODJmMzkxOGRjNGU2YmQ3NTllMTVmZGZlNmNkOWE3ZC4uNzY2NzQ1 ZTc2MjRmZjU2ZDIwZTc0MzdkNjdhOGNkODUzZmY5ZTIxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZW5jcnlwdGVkbWVkaWEvY2xlYXJrZXkvQ0RNQ2xlYXJLZXkuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VuY3J5cHRlZG1lZGlhL2NsZWFya2V5L0NETUNs ZWFyS2V5LmNwcApAQCAtNDUwLDkgKzQ1MCw3IEBAIGNvbnN0IFN0cmluZyYgQ0RNSW5zdGFuY2VD bGVhcktleTo6a2V5U3lzdGVtKCkgY29uc3QKIAogUmVmUHRyPENETUluc3RhbmNlU2Vzc2lvbj4g Q0RNSW5zdGFuY2VDbGVhcktleTo6Y3JlYXRlU2Vzc2lvbigpCiB7Ci0gICAgYXV0byBuZXdTZXNz aW9uID0gYWRvcHRSZWYobmV3IENETUluc3RhbmNlU2Vzc2lvbkNsZWFyS2V5KCp0aGlzKSk7Ci0g ICAgdHJhY2tTZXNzaW9uKCpuZXdTZXNzaW9uKTsKLSAgICByZXR1cm4gbmV3U2Vzc2lvbjsKKyAg ICByZXR1cm4gYWRvcHRSZWYobmV3IENETUluc3RhbmNlU2Vzc2lvbkNsZWFyS2V5KCp0aGlzKSk7 CiB9CiAKIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9uQ2xlYXJLZXk6OnJlcXVlc3RMaWNlbnNlKExp Y2Vuc2VUeXBlLCBjb25zdCBBdG9tU3RyaW5nJiBpbml0RGF0YVR5cGUsIFJlZjxTaGFyZWRCdWZm ZXI+JiYgaW5pdERhdGEsIExpY2Vuc2VDYWxsYmFjayYmIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA4YWUwZWM0ZGZhNTRk OTI1MGE5M2FkYjVkMDQ3MzU2NGJmOGQ1ODM0Li4yY2RjOTQ2ZGNhODJkZjU2Mjk0ZGEzNTk0YmQ5 Njk2MmQxZDI5Zjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcApAQCAtMjYyLDE0ICsyNjIsNiBAQCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6On5NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQogICAgIGlmIChtX3BpcGVsaW5lKQog ICAgICAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZS5nZXQoKSwgR1NUX1NUQVRF X05VTEwpOwogCi0jaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICB7Ci0gICAgICAgIExv Y2tIb2xkZXIgbG9jayhtX2NkbUF0dGFjaG1lbnRNdXRleCk7Ci0gICAgICAgIGlmIChtX2NkbUlu c3RhbmNlKQotICAgICAgICAgICAgbV9jZG1JbnN0YW5jZS0+cmVsZWFzZURlY3J5cHRpb25SZXNv dXJjZXMoKTsKLSAgICB9Ci0jZW5kaWYKLQogICAgIG1fcGxheWVyID0gbnVsbHB0cjsKICAgICBt X25vdGlmaWVyLT5pbnZhbGlkYXRlKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVByb3h5Q2xlYXJLZXkuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eUNsZWFy S2V5LmNwcAppbmRleCAzODVmNzdiMmVkNDRmNmE4NWRlNjMzN2ZjMjBlMTQ4NGE4NWFmYTY0Li5j YWE5NzJkYzZiNzc3ZDVkZGRmZTRkYzVjNzk0YzMwMmEzMTQ2MTA0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVByb3h5Q2xlYXJL ZXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9l bWUvQ0RNUHJveHlDbGVhcktleS5jcHAKQEAgLTIxNSwxMiArMjE1LDYgQEAgYm9vbCBDRE1Qcm94 eUNsZWFyS2V5OjpjZW5jRGVjcnlwdChDRE1Qcm94eUNsZWFyS2V5OjpjZW5jRGVjcnlwdENvbnRl eHQmIGlucHV0KQogICAgIHJldHVybiBpbnB1dC5pc1N1YnNhbXBsZWQoKSA/IGNlbmNEZWNyeXB0 U3Vic2FtcGxlZChpbnB1dCkgOiBjZW5jRGVjcnlwdEZ1bGxTYW1wbGUoaW5wdXQpOwogfQogCi12 b2lkIENETVByb3h5Q2xlYXJLZXk6OnJlbGVhc2VEZWNyeXB0aW9uUmVzb3VyY2VzKCkKLXsKLSAg ICBjbG9zZUdDcnlwdEhhbmRsZSgpOwotICAgIENETVByb3h5OjpyZWxlYXNlRGVjcnlwdGlvblJl c291cmNlcygpOwotfQotCiB2b2lkIENETVByb3h5Q2xlYXJLZXk6OmNsb3NlR0NyeXB0SGFuZGxl KCkKIHsKICAgICBpZiAobV9nQ3J5cHRIYW5kbGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNUHJveHlDbGVhcktleS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eUNs ZWFyS2V5LmgKaW5kZXggMWU2YjIyNDUwNWU1NDUxNzFlNmJkYTZkZDc1YjQyMWYwMGQ5Y2U3Ny4u ZmY5NmJmYWMxMjlkNmRkM2FlN2M1ZGQwNzc0YmUxYWIyNTQxN2NlMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eUNsZWFy S2V5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2Vt ZS9DRE1Qcm94eUNsZWFyS2V5LmgKQEAgLTExMSw3ICsxMTEsNiBAQCBwcml2YXRlOgogICAgIGJv b2wgY2VuY0RlY3J5cHRGdWxsU2FtcGxlKGNlbmNEZWNyeXB0Q29udGV4dCYpOwogICAgIGJvb2wg Y2VuY0RlY3J5cHRTdWJzYW1wbGVkKGNlbmNEZWNyeXB0Q29udGV4dCYpOwogCi0gICAgdm9pZCBy ZWxlYXNlRGVjcnlwdGlvblJlc291cmNlcygpIGZpbmFsOwogICAgIHZvaWQgY2xvc2VHQ3J5cHRI YW5kbGUoKTsKIAogICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBuaWNlIHRvIHVzZSBzb21ldGhp bmcgaW4gV2ViQ29yZSBmb3IgY3J5cHRvLi4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1UaHVuZGVyLmNwcAppbmRl eCAxYjY3Mjc1NzIyYzAwZDY5MzM3N2Q0MDlkNTdmNDNhMjJiODIzZjViLi5iYzE2ZWNmNzE1NDlk ZTY4NTQxZThhNWFkYTRhOTZhYWNiYWM0YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5jcHAK QEAgLTM5LDcgKzM5LDYgQEAKICNpbmNsdWRlICJHU3RyZWFtZXJFTUVVdGlsaXRpZXMuaCIKICNp bmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVkaWFLZXlNZXNzYWdlVHlwZS5oIgotI2lu Y2x1ZGUgIk1lZGlhS2V5U3RhdHVzLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNp bmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNsdWRlICJXZWJLaXRUaHVuZGVyRGVjcnlwdG9y R1N0cmVhbWVyLmgiCkBAIC0zMjgsNyArMzI3LDYgQEAgUmVmUHRyPENETUluc3RhbmNlU2Vzc2lv bj4gQ0RNSW5zdGFuY2VUaHVuZGVyOjpjcmVhdGVTZXNzaW9uKCkKIHsKICAgICBSZWZQdHI8Q0RN SW5zdGFuY2VTZXNzaW9uVGh1bmRlcj4gbmV3U2Vzc2lvbiA9IGFkb3B0UmVmKG5ldyBDRE1JbnN0 YW5jZVNlc3Npb25UaHVuZGVyKCp0aGlzKSk7CiAgICAgQVNTRVJUKG5ld1Nlc3Npb24pOwotICAg IHRyYWNrU2Vzc2lvbigqbmV3U2Vzc2lvbik7CiAgICAgcmV0dXJuIG5ld1Nlc3Npb247CiB9CiAK QEAgLTUzMyw3ICs1MzEsNiBAQCB2b2lkIENETUluc3RhbmNlU2Vzc2lvblRodW5kZXI6OnJlcXVl c3RMaWNlbnNlKExpY2Vuc2VUeXBlIGxpY2Vuc2VUeXBlLCBjb25zdCBBdAogICAgICAgICBpZiAo IWlzVmFsaWQoKSkgewogICAgICAgICAgICAgR1NUX1dBUk5JTkcoImNyZWF0ZWQgaW52YWxpZCBz ZXNzaW9uICVzIiwgbV9zZXNzaW9uSUQudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBjYWxs YmFjayhpbml0RGF0YS5yZWxlYXNlTm9uTnVsbCgpLCBtX3Nlc3Npb25JRCwgZmFsc2UsIEZhaWxl ZCk7Ci0gICAgICAgICAgICByZW1vdmVGcm9tSW5zdGFuY2VQcm94eSgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKQEAgLTYzNSw4ICs2MzIsNiBAQCB2b2lkIENETUluc3RhbmNl U2Vzc2lvblRodW5kZXI6OmNsb3NlU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JRCwgQ2xv c2VTZXNzaQogICAgIGlmIChtX3Nlc3Npb24gJiYgIW1fc2Vzc2lvbklELmlzRW1wdHkoKSkKICAg ICAgICAgb3BlbmNkbV9zZXNzaW9uX2Nsb3NlKG1fc2Vzc2lvbi5nZXQoKSk7CiAKLSAgICByZW1v dmVGcm9tSW5zdGFuY2VQcm94eSgpOwotCiAgICAgY2FsbGJhY2soKTsKIH0KIApAQCAtNjY5LDgg KzY2NCw2IEBAIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRlcjo6cmVtb3ZlU2Vzc2lvbkRh dGEoY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQsIExpY2VuCiAgICAgfSk7CiAgICAgaWYgKCFtX3Nl c3Npb24gfHwgbV9zZXNzaW9uSUQuaXNFbXB0eSgpIHx8IG9wZW5jZG1fc2Vzc2lvbl9yZW1vdmUo bV9zZXNzaW9uLmdldCgpKSkKICAgICAgICAgc2Vzc2lvbkZhaWx1cmUoKTsKLQotICAgIHJlbW92 ZUZyb21JbnN0YW5jZVByb3h5KCk7CiB9CiAKIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9uVGh1bmRl cjo6c3RvcmVSZWNvcmRPZktleVVzYWdlKGNvbnN0IFN0cmluZyYpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVRodW5kZXIuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRl ci5oCmluZGV4IGZlMzYwY2QxOWQ1YzQzYjc4NjU0NDg5ZDIxY2RmOWYxOWQzZTAzNTkuLjRjYjlj NDZlNWQ4YTQwNDIxYWY5Yzk2MTc2Y2YyMmFmMGY5MmY4YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNVGh1bmRl ci5oCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiQ0RNUHJpdmF0ZS5oIgogI2luY2x1ZGUg IkNETVByb3h5LmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyRU1FVXRpbGl0aWVzLmgiCisjaW5jbHVk ZSAiTWVkaWFLZXlTdGF0dXMuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNsdWRl IDx3dGYvV2Vha1B0ci5oPgogCkBAIC0xMTksMTMgKzEyMCw2IEBAIHB1YmxpYzoKIAogICAgIE9w ZW5DRE1TeXN0ZW0mIHRodW5kZXJTeXN0ZW0oKSBjb25zdCB7IHJldHVybiAqbV90aHVuZGVyU3lz dGVtLmdldCgpOyB9OwogCi0gICAgdm9pZCByZWxlYXNlRGVjcnlwdGlvblJlc291cmNlcygpIGZp bmFsCi0gICAgewotICAgICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgICAgICBDRE1J bnN0YW5jZVByb3h5OjpyZWxlYXNlRGVjcnlwdGlvblJlc291cmNlcygpOwotICAgICAgICBtX3Ro dW5kZXJTeXN0ZW0ucmVzZXQobnVsbHB0cik7Ci0gICAgfQotCiBwcml2YXRlOgogICAgIFRodW5k ZXI6OlVuaXF1ZVRodW5kZXJTeXN0ZW0gbV90aHVuZGVyU3lzdGVtOwogICAgIFN0cmluZyBtX2tl eVN5c3RlbTsKQEAgLTE0NywxNCArMTQxLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q2xpZW50 KFdlYWtQdHI8Q0RNSW5zdGFuY2VTZXNzaW9uQ2xpZW50PiYmIGNsaWVudCkgZmluYWwgeyBtX2Ns aWVudCA9IFdURk1vdmUoY2xpZW50KTsgfQogICAgIHZvaWQgY2xlYXJDbGllbnQoKSBmaW5hbCB7 IG1fY2xpZW50LmNsZWFyKCk7IH0KIAotICAgIHZvaWQgcmVsZWFzZURlY3J5cHRpb25SZXNvdXJj ZXMoKSBmaW5hbAotICAgIHsKLSAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICAg ICAgbV9rZXlTdG9yZS5yZW1vdmVBbGxLZXlzKCk7Ci0gICAgICAgIG1fc2Vzc2lvbi5yZXNldChu dWxscHRyKTsKLSAgICAgICAgQ0RNSW5zdGFuY2VTZXNzaW9uUHJveHk6OnJlbGVhc2VEZWNyeXB0 aW9uUmVzb3VyY2VzKCk7Ci0gICAgfQotCiBwcml2YXRlOgogICAgIE9wdGlvbmFsPENETUluc3Rh bmNlVGh1bmRlciY+IGNkbUluc3RhbmNlVGh1bmRlcigpIGNvbnN0OwogCg==