109702 2013-02-13 08:44:06 -0800 Add a CDMClient class which allows the CDM to query for the currently attached MediaPlayer. 2013-02-15 17:05:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109644 109739 1 jer.noble jer.noble ddorwin eric.carlson feature-media-reviews ojan.autocc webkit.review.bot oldest_to_newest 831939 0 jer.noble 2013-02-13 08:44:06 -0800 Add a CDMClient class which allows the CDM to query for the currently attached MediaPlayer. 832485 1 188215 jer.noble 2013-02-13 16:23:40 -0800 Created attachment 188215 Patch 834450 2 188215 eric.carlson 2013-02-15 16:09:21 -0800 Comment on attachment 188215 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188215&action=review > Source/WebCore/Modules/encryptedmedia/CDM.h:50 > + virtual MediaPlayer* CDMMediaPlayer(CDM*) = 0; The upper case "CDMMediaPlayer" seems odd, "cdmMediaPlayer" maybe? Also, can it be const? > Source/WebCore/Modules/encryptedmedia/CDM.h:76 > + CDMClient* client() { return m_client; } const? > Source/WebCore/Modules/encryptedmedia/CDM.h:79 > + MediaPlayer* mediaPlayer(); Ditto. > Source/WebCore/Modules/encryptedmedia/MediaKeys.h:56 > + HTMLMediaElement* mediaElement(); const. Do you need to implement this? > Source/WebCore/Modules/encryptedmedia/MediaKeys.h:61 > + virtual MediaPlayer* CDMMediaPlayer(CDM*); OVERRIDE. 834497 3 jer.noble 2013-02-15 16:46:15 -0800 (In reply to comment #2) > (From update of attachment 188215 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188215&action=review > > > Source/WebCore/Modules/encryptedmedia/CDM.h:50 > > + virtual MediaPlayer* CDMMediaPlayer(CDM*) = 0; > > The upper case "CDMMediaPlayer" seems odd, "cdmMediaPlayer" maybe? Also, can it be const? I'll change the case. It can be const, but that implies constness in a lot of other places (and in the CDM parameter too). > > Source/WebCore/Modules/encryptedmedia/CDM.h:76 > > + CDMClient* client() { return m_client; } > > const? Sure. > > Source/WebCore/Modules/encryptedmedia/CDM.h:79 > > + MediaPlayer* mediaPlayer(); > > Ditto. Sure, but this implies a const CDM* parameter in cdmMediaPlayer(). > > Source/WebCore/Modules/encryptedmedia/MediaKeys.h:56 > > + HTMLMediaElement* mediaElement(); > > const. > > Do you need to implement this? Not technically, but yes. (It's actually implemented in a future patch.) > > Source/WebCore/Modules/encryptedmedia/MediaKeys.h:61 > > + virtual MediaPlayer* CDMMediaPlayer(CDM*); > > OVERRIDE. OK. 834515 4 jer.noble 2013-02-15 17:05:10 -0800 Committed r143072: <http://trac.webkit.org/changeset/143072> 188215 2013-02-13 16:23:40 -0800 2013-02-15 16:09:14 -0800 Patch bug-109702-20130213162008.patch text/plain 7503 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjczMTkzMzU0NzU4OTE5 NGYzMzNmNTkwZDFiYWQ5NzQ2YTAzMWM5NC4uZjY2ZTQ2YTQ4ZTMzZjY2YWM4OGYxNGU3M2E2NjA3 NmE1MjEyMzMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTEzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIENETUNsaWVudCBj bGFzcyB3aGljaCBhbGxvd3MgdGhlIENETSB0byBxdWVyeSBmb3IgdGhlIGN1cnJlbnRseSBhdHRh Y2hlZCBNZWRpYVBsYXllci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwOTcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFNvbWUgQ0RNIGltcGxlbWVudGF0aW9ucyB3aWxsIG5lZWQgdG8gd29yayBjbG9z ZWx5IHdpdGggYW4gYXNzb2NpYXRlZAorICAgICAgICBNZWRpYVBsYXllciBpbiBvcmRlciB0byBn ZW5lcmF0ZSBrZXkgcmVxdWVzdHMgYW5kIHByb3ZpZGUga2V5cy4gQWRkIGEKKyAgICAgICAgY2xp ZW50IHByb3RvY29sIHRvIGJlIGltcGxlbWVudGVkIGJ5IHRoZSBNZWRpYUtleXMgb2JqZWN0IHdo aWNoIGNhbgorICAgICAgICBwcm92aWRlIGFjY2VzcyB0byB0aGUgYXNzb2NpYXRlZCBNZWRpYVBs YXllciBpZiBwcmVzZW50LgorCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0RNOjpDRE0pOiBJbml0aWFsaXplIHRoZSBtX2NsaWVu dCBpdmFyLgorICAgICAgICAoV2ViQ29yZTo6Q0RNOjptZWRpYVBsYXllcik6IFBhc3MgdG8gdGhl IGNsaWVudCwgaWYgcHJlc2VudC4KKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NE TS5oOgorICAgICAgICAoV2ViQ29yZTo6Q0RNOjpjbGllbnQpOiBTaW1wbGUgZ2V0dGVyLgorICAg ICAgICAoV2ViQ29yZTo6Q0RNOjpzZXRDbGllbnQpOiBTaW1wbGUgc2V0dGVyLgorICAgICAgICAq IE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhS2V5czo6TWVkaWFLZXlzKTogSW5pdGlhbGl6ZSB0aGUgbV9tZWRpYUVsZW1lbnQgaXZh cgorICAgICAgICAgICAgYW5kIGNhbGwgc2V0Q2xpZW50KCkgb24gdGhlIHBhc3NlZCBpbiBDRE0u CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleXM6OnNldE1lZGlhRWxlbWVudCk6IFNpbXBsZSBz ZXR0ZXIuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleXM6OkNETU1lZGlhUGxheWVyKTogUmV0 cmlldmUgdGhlIE1lZGlhUGxheWVyIGZyb20KKyAgICAgICAgICAgIHRoZSBtX21lZGlhRWxlbWVu dCBpZiBwcmVzZW50LgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlz Lmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6On5IVE1MTWVkaWFFbGVtZW50KTogQ2FsbCBzZXRNZWRpYUtl eXMoMCkKKyAgICAgICAgICAgIHRvIGNsZWFyIHRoZSBtZWRpYUVsZW1lbnQgaW4gYW55IGFzc29j aWF0ZWQgTWVkaWFLZXlzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0 TWVkaWFLZXlzKTogQ2xlYXIgdGhlIG1lZGlhRWxlbWVudCBvbgorICAgICAgICAgICAgYW55IGFz c29jaWF0ZWQgTWVkaWFLZXlzLCBhbmQgc2V0IHRoZSBtZWRpYUVsZW1lbnQgb24gdGhlIG5ld2x5 CisgICAgICAgICAgICBhc3NvY2lhdGVkIE1lZGlhS2V5cy4KKwogMjAxMy0wMi0xMiAgSmVyIE5v YmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYUtleVNlc3Npb24gc2hv dWxkIG5vdCBiZSBHQ2Qgd2hpbGUgZmlyaW5nIGV2ZW50IGxpc3RlbmVycyBvciB3aXRoIGN1c3Rv bSBwcm9wZXJ0aWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0 ZWRtZWRpYS9DRE0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9D RE0uY3BwCmluZGV4IGY4NjY1MzUzNWQ2OTYwNjkzZTEwYWUwMzRmZTllYWQ3ZGI4MWYxNzMuLmU5 OWJlODNmNDI0ZTU2YzE3MDJlZDk3ODEyYTQxMzQyYmFkZjAyOWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5jcHAKQEAgLTkyLDYgKzkyLDcgQEAgUGFz c093blB0cjxDRE0+IENETTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKQogCiBDRE06 OkNETShjb25zdCBTdHJpbmcmIGtleVN5c3RlbSkKICAgICA6IG1fa2V5U3lzdGVtKGtleVN5c3Rl bSkKKyAgICAsIG1fY2xpZW50KDApCiB7CiAgICAgbV9wcml2YXRlID0gQ0RNRmFjdG9yeUZvcktl eVN5c3RlbShrZXlTeXN0ZW0pLT5jb25zdHJ1Y3Rvcih0aGlzKTsKIH0KQEAgLTExMCw2ICsxMTEs MTMgQEAgUGFzc093blB0cjxDRE1TZXNzaW9uPiBDRE06OmNyZWF0ZVNlc3Npb24oKQogICAgIHJl dHVybiBtX3ByaXZhdGUtPmNyZWF0ZVNlc3Npb24oKTsKIH0KIAorTWVkaWFQbGF5ZXIqIENETTo6 bWVkaWFQbGF5ZXIoKQoreworICAgIGlmICghbV9jbGllbnQpCisgICAgICAgIHJldHVybiAwOwor ICAgIHJldHVybiBtX2NsaWVudC0+Q0RNTWVkaWFQbGF5ZXIodGhpcyk7Cit9CisKIH0KIAogI2Vu ZGlmIC8vIEVOQUJMRShFTkNSWVBURURfTUVESUFfVjIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9lbmNyeXB0ZWRtZWRpYS9DRE0uaAppbmRleCAwYmMzZTg4YzRhODJhNTkxNWMzNWU2MmYzZGYz MTBkYjEwNDRkMzgwLi4zOGY2NjMyNzRmMjc0YjIzYTk3NDc3NWY4NzgyYzc3MzYzZDdiMjFjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmgKQEAgLTM4LDEz ICszOCwxOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBDRE07CiBjbGFzcyBDRE1Qcml2 YXRlSW50ZXJmYWNlOwogY2xhc3MgQ0RNU2Vzc2lvbjsKLWNsYXNzIE1lZGlhS2V5RXJyb3I7Ci1j bGFzcyBNZWRpYUtleVNlc3Npb247Ci1jbGFzcyBNZWRpYUtleXM7CitjbGFzcyBNZWRpYVBsYXll cjsKIAogdHlwZWRlZiBQYXNzT3duUHRyPENETVByaXZhdGVJbnRlcmZhY2U+ICgqQ3JlYXRlQ0RN KShDRE0qKTsKIHR5cGVkZWYgYm9vbCAoKkNETVN1cHBvcnRzS2V5U3lzdGVtKShjb25zdCBTdHJp bmcmKTsKIAorY2xhc3MgQ0RNQ2xpZW50IHsKK3B1YmxpYzoKKyAgICB2aXJ0dWFsIH5DRE1DbGll bnQoKSB7IH0KKworICAgIHZpcnR1YWwgTWVkaWFQbGF5ZXIqIENETU1lZGlhUGxheWVyKENETSop ID0gMDsKK307CisKIGNsYXNzIENETVNlc3Npb24gewogcHVibGljOgogICAgIENETVNlc3Npb24o KSB7IH0KQEAgLTY4LDExICs3MywxNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBTdHJpbmcmIGtl eVN5c3RlbSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5U3lzdGVtOyB9CiAKKyAgICBDRE1DbGllbnQq IGNsaWVudCgpIHsgcmV0dXJuIG1fY2xpZW50OyB9CisgICAgdm9pZCBzZXRDbGllbnQoQ0RNQ2xp ZW50KiBjbGllbnQpIHsgbV9jbGllbnQgPSBjbGllbnQ7IH0KKworICAgIE1lZGlhUGxheWVyKiBt ZWRpYVBsYXllcigpOworCiBwcml2YXRlOgogICAgIENETShjb25zdCBTdHJpbmcmIGtleVN5c3Rl bSk7CiAKICAgICBTdHJpbmcgbV9rZXlTeXN0ZW07CiAgICAgT3duUHRyPENETVByaXZhdGVJbnRl cmZhY2U+IG1fcHJpdmF0ZTsKKyAgICBDRE1DbGllbnQqIG1fY2xpZW50OwogfTsKIAogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMuY3Bw CmluZGV4IDdjMDZhNTg2ZDNjMGMwYTFmMzQxMGMwZWUzNTc5NmM3ZjAxNzk1ZWQuLjY0NWExMjJj YjczNTg0NDNhOGQ3MzU5MDg2ZjBiMDNjZWRmZWRiM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5jcHAKQEAgLTMwLDYgKzMwLDcg QEAKIAogI2luY2x1ZGUgIkNETS5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKKyNpbmNsdWRl ICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiTWVkaWFLZXlNZXNzYWdlRXZlbnQuaCIK ICNpbmNsdWRlICJNZWRpYUtleVNlc3Npb24uaCIKICNpbmNsdWRlICJVVUlELmgiCkBAIC02NSw5 ICs2NiwxMSBAQCBQYXNzUmVmUHRyPE1lZGlhS2V5cz4gTWVkaWFLZXlzOjpjcmVhdGUoY29uc3Qg U3RyaW5nJiBrZXlTeXN0ZW0sIEV4Y2VwdGlvbkNvZGUmCiB9CiAKIE1lZGlhS2V5czo6TWVkaWFL ZXlzKGNvbnN0IFN0cmluZyYga2V5U3lzdGVtLCBQYXNzT3duUHRyPENETT4gY2RtKQotICAgIDog bV9rZXlTeXN0ZW0oa2V5U3lzdGVtKQorICAgIDogbV9tZWRpYUVsZW1lbnQoMCkKKyAgICAsIG1f a2V5U3lzdGVtKGtleVN5c3RlbSkKICAgICAsIG1fY2RtKGNkbSkKIHsKKyAgICBtX2NkbS0+c2V0 Q2xpZW50KHRoaXMpOwogfQogCiBNZWRpYUtleXM6On5NZWRpYUtleXMoKQpAQCAtMTE1LDYgKzEx OCwxOCBAQCBQYXNzUmVmUHRyPE1lZGlhS2V5U2Vzc2lvbj4gTWVkaWFLZXlzOjpjcmVhdGVTZXNz aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbgogICAgIHJldHVybiBzZXNzaW9uOwogfQog Cit2b2lkIE1lZGlhS2V5czo6c2V0TWVkaWFFbGVtZW50KEhUTUxNZWRpYUVsZW1lbnQqIGVsZW1l bnQpCit7CisgICAgbV9tZWRpYUVsZW1lbnQgPSBlbGVtZW50OworfQorCitNZWRpYVBsYXllciog TWVkaWFLZXlzOjpDRE1NZWRpYVBsYXllcihDRE0qKQoreworICAgIGlmIChtX21lZGlhRWxlbWVu dCkKKyAgICAgICAgcmV0dXJuIG1fbWVkaWFFbGVtZW50LT5wbGF5ZXIoKTsKKyAgICByZXR1cm4g MDsKK30KKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL01lZGlhS2V5cy5oCmluZGV4IGE4NzAwODM3MzE0ZWYxZDU4ZTVkODdmYTQyZmFk NjRjNDFjNTQyM2QuLjU5MjQ3Y2FkMTlkNzlkMzRkMmFhMjVkZTIyMDQwNmMyMjJkZWYzNWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMu aApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQV9WMikKIAor I2luY2x1ZGUgIkNETS5oIgogI2luY2x1ZGUgIkV2ZW50VGFyZ2V0LmgiCiAjaW5jbHVkZSAiRXhj ZXB0aW9uQ29kZS5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KQEAgLTM5LDEwICs0MCwxMCBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIENETTsKIGNsYXNzIE1lZGlhS2V5U2Vz c2lvbjsKK2NsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7CiAKLWNsYXNzIE1lZGlhS2V5cyA6IHB1Ymxp YyBSZWZDb3VudGVkPE1lZGlhS2V5cz4geworY2xhc3MgTWVkaWFLZXlzIDogcHVibGljIFJlZkNv dW50ZWQ8TWVkaWFLZXlzPiwgcHVibGljIENETUNsaWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8TWVkaWFLZXlzPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0sIEV4 Y2VwdGlvbkNvZGUmKTsKICAgICB+TWVkaWFLZXlzKCk7CkBAIC01MiwxMSArNTMsMTggQEAgcHVi bGljOgogICAgIGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKCkgY29uc3QgeyByZXR1cm4gbV9rZXlT eXN0ZW07IH0KICAgICBDRE0qIGNkbSgpIHsgcmV0dXJuIG1fY2RtLmdldCgpOyB9CiAKKyAgICBI VE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQoKTsKKyAgICB2b2lkIHNldE1lZGlhRWxlbWVu dChIVE1MTWVkaWFFbGVtZW50Kik7CisKIHByb3RlY3RlZDoKKyAgICAvLyBDRE1DbGllbnQ6Cisg ICAgdmlydHVhbCBNZWRpYVBsYXllciogQ0RNTWVkaWFQbGF5ZXIoQ0RNKik7CisKICAgICBNZWRp YUtleXMoY29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0sIFBhc3NPd25QdHI8Q0RNPik7CiAKICAgICBW ZWN0b3I8UmVmUHRyPE1lZGlhS2V5U2Vzc2lvbj4gPiBtX3Nlc3Npb25zOwogCisgICAgSFRNTE1l ZGlhRWxlbWVudCogbV9tZWRpYUVsZW1lbnQ7CiAgICAgU3RyaW5nIG1fa2V5U3lzdGVtOwogICAg IE93blB0cjxDRE0+IG1fY2RtOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCmluZGV4IDc0N2ZmNzFkOTZkMDBlMTNlNWY4OTIzNTA1NjE5MmQ2ZDA3NjQ4YWEuLmZi MTJhMDYyMjc5NWFiOWI4ZTQ1ZjhiOWI0ZGU5NjYyNDkxY2FjODMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzQ5LDYgKzM0OSwxMCBAQCBIVE1MTWVkaWFF bGVtZW50Ojp+SFRNTE1lZGlhRWxlbWVudCgpCiAgICAgc2V0U291cmNlU3RhdGUoTWVkaWFTb3Vy Y2U6OmNsb3NlZEtleXdvcmQoKSk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShFTkNSWVBURURfTUVE SUFfVjIpCisgICAgc2V0TWVkaWFLZXlzKDApOworI2VuZGlmCisKICAgICByZW1vdmVFbGVtZW50 RnJvbURvY3VtZW50TWFwKHRoaXMsIGRvY3VtZW50KCkpOwogfQogCkBAIC0xOTk1LDcgKzE5OTks MTQgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllcktleU5lZWRlZChNZWRpYVBs YXllciosIFVpbnQ4QXJyYXkqIGluaXREYXRhKQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNl dE1lZGlhS2V5cyhNZWRpYUtleXMqIG1lZGlhS2V5cykKIHsKKyAgICBpZiAobV9tZWRpYUtleXMg PT0gbWVkaWFLZXlzKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAobV9tZWRpYUtleXMpCisg ICAgICAgIG1fbWVkaWFLZXlzLT5zZXRNZWRpYUVsZW1lbnQoMCk7CiAgICAgbV9tZWRpYUtleXMg PSBtZWRpYUtleXM7CisgICAgaWYgKG1fbWVkaWFLZXlzKQorICAgICAgICBtX21lZGlhS2V5cy0+ c2V0TWVkaWFFbGVtZW50KHRoaXMpOwogfQogI2VuZGlmCiAK