193988 2019-01-29 15:12:40 -0800 [Cocoa][EME] Modern EME uses a different path for SecureStop data than Legacy EME 2019-01-31 11:52:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson ews-watchlist jonlee webkit-bug-importer oldest_to_newest 1499753 0 jer.noble 2019-01-29 15:12:40 -0800 [Cocoa][EME] Modern EME uses a different path for SecureStop data than Legacy EME 1499771 1 360514 jer.noble 2019-01-29 15:44:01 -0800 Created attachment 360514 Patch 1499773 2 webkit-bug-importer 2019-01-29 15:45:50 -0800 <rdar://problem/47649195> 1499774 3 ews-watchlist 2019-01-29 15:46:16 -0800 Attachment 360514 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:426: Missing space around : in range-based for statement [whitespace/colon] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:485: Missing space around : in range-based for statement [whitespace/colon] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1500683 4 360514 commit-queue 2019-01-31 11:52:20 -0800 Comment on attachment 360514 Patch Clearing flags on attachment: 360514 Committed r240804: <https://trac.webkit.org/changeset/240804> 1500684 5 commit-queue 2019-01-31 11:52:22 -0800 All reviewed patches have been landed. Closing bug. 360514 2019-01-29 15:44:01 -0800 2019-01-31 11:52:20 -0800 Patch bug-193988-20190129154400.patch text/plain 10905 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3ODMxMDlkMmFhYjc5 ZThmOGZlMTczODM2MDNkNjVjYWJhMWYzYS4uMDI3NjY3NTRjMjMxNTk2NjkyNjRhMGQ3YjJkZDFk ZjkxODRjMWIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTAxLTI5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV1bRU1FXSBNb2Rl cm4gRU1FIHVzZXMgYSBkaWZmZXJlbnQgcGF0aCBmb3IgU2VjdXJlU3RvcCBkYXRhIHRoYW4gTGVn YWN5IEVNRQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkzOTg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW9kZXJuIEVNRSBpcyB3cml0aW5nIFNlY3VyZVN0b3AgZGF0YSBhcyBhIGZpbGUgYXQgdGhlIHNh bWUgcGF0aCBhcyB0aGUKKyAgICAgICAgZGlyZWN0b3J5IHVzZWQgYnkgTGVnYWN5IEVNRTsgbWVh bmluZywgd2hlbiBNb2Rlcm4gRU1FIGF0dGVtcHRzIHRvIHdyaXRlCisgICAgICAgIHRvIHRoYXQg ZmlsZSwgaXQgd2lsbCBmYWlsIGJlY2F1c2UgYSBkaXJlY3RvcnkgZXhpc3RzIGF0IHRoZSBzYW1l IHBhdGguCisKKyAgICAgICAgQWRkIGEgbWlncmF0aW9uIHN0ZXAgdG8gdGFrZSBjYXJlIG9mIHRo b3NlIGluc3RhbmNlcyB3aGVyZSBNb2Rlcm4gRU1FIFNlY3VyZQorICAgICAgICBTdG9wIGRhdGEg d2FzIGFscmVhZHkgd3JpdHRlbiB0byBkaXNrLCBhbmQgbW92ZSB0aGF0IHByZXZpb3VzbHkgd3Jp dHRlbiBkYXRhCisgICAgICAgIHRvIHRoZSBjb3JyZWN0IGZpbGUgcGF0aC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlT dHJlYW1pbmdBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW06CisgICAgICAg IChXZWJDb3JlOjpDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6aW5pdGlhbGl6 ZVdpdGhDb25maWd1cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlRmFpclBs YXlTdHJlYW1pbmdBVkZPYmpDOjpzZXRTdG9yYWdlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYkNv cmU6OkNETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6dXBkYXRlTGlj ZW5zZSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OmxvYWRTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNl U2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6cmVtb3ZlU2Vzc2lvbkRhdGEpOgorICAg ICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpD OjplbnN1cmVTZXNzaW9uKToKKwogMjAxOS0wMS0yOSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdW0VNRV0gcGVyc2lzdGVudC11c2FnZS1yZWNvcmQg ZGF0YSBub3QgaXNzdWVkIGFmdGVyIE1lZGlhS2V5U2Vzc2lvbi5yZW1vdmUoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN SW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1p bmdBVkZPYmpDLmgKaW5kZXggZDdhMTkwMGYxMDUyNjkzN2E3ZGZlMjRmNmFhNDAxMjRlMjg4YTFl MS4uNjFmZmM1MjA1YmQyYWQ0MmViYzg2YzMyN2Y1NTk0YmI2YzdkMTE3NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5z dGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFt aW5nQVZGT2JqQy5oCkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFN0cmlu ZyYga2V5U3lzdGVtKCkgY29uc3QgZmluYWw7CiAKLSAgICBOU1VSTCAqc3RvcmFnZURpcmVjdG9y eSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RvcmFnZURpcmVjdG9yeS5nZXQoKTsgfQorICAgIE5TVVJM ICpzdG9yYWdlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9zdG9yYWdlVVJMLmdldCgpOyB9CiAgICAg Ym9vbCBwZXJzaXN0ZW50U3RhdGVBbGxvd2VkKCkgY29uc3QgeyByZXR1cm4gbV9wZXJzaXN0ZW50 U3RhdGVBbGxvd2VkOyB9CiAgICAgU2hhcmVkQnVmZmVyKiBzZXJ2ZXJDZXJ0aWZpY2F0ZSgpIGNv bnN0IHsgcmV0dXJuIG1fc2VydmVyQ2VydGlmaWNhdGUuZ2V0KCk7IH0KIApAQCAtNzYsNyArNzYs NyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fc2VydmVy Q2VydGlmaWNhdGU7CiAgICAgYm9vbCBtX3BlcnNpc3RlbnRTdGF0ZUFsbG93ZWQgeyB0cnVlIH07 Ci0gICAgUmV0YWluUHRyPE5TVVJMPiBtX3N0b3JhZ2VEaXJlY3Rvcnk7CisgICAgUmV0YWluUHRy PE5TVVJMPiBtX3N0b3JhZ2VVUkw7CiAgICAgVmVjdG9yPFdlYWtQdHI8Q0RNSW5zdGFuY2VTZXNz aW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDPj4gbV9zZXNzaW9uczsKIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NE TUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVh bWluZ0FWRk9iakMubW0KaW5kZXggYzA1MDUyMGIzNTU5NGQ5ODI1MTQ3MDQ0OWY5ZjAwZmMxMjYw MzcyZS4uN2U5MWM0YzQwZDUxYjBjNDk0NTQ5ODE5NTlkYjk3MzIxMDIxNmU3NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN SW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0 cmVhbWluZ0FWRk9iakMubW0KQEAgLTM4LDYgKzM4LDcgQEAKICNpbXBvcnQgPG9iamMvcnVudGlt ZS5oPgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvQVZGb3VuZGF0aW9uU1BJLmg+CiAjaW1wb3J0IDx3 dGYvQWxnb3JpdGhtcy5oPgorI2ltcG9ydCA8d3RmL0ZpbGVTeXN0ZW0uaD4KICNpbXBvcnQgPHd0 Zi9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgogCkBAIC0x NzAsNyArMTcxLDcgQEAgQ0RNSW5zdGFuY2U6OlN1Y2Nlc3NWYWx1ZSBDRE1JbnN0YW5jZUZhaXJQ bGF5U3RyZWFtaW5nQVZGT2JqQzo6aW5pdGlhbGl6ZVdpdGhDb24KICAgICBpZiAoY29uZmlndXJh dGlvbi5wZXJzaXN0ZW50U3RhdGUgIT0gQ0RNUmVxdWlyZW1lbnQ6OlJlcXVpcmVkICYmIChjb25m aWd1cmF0aW9uLnNlc3Npb25UeXBlcy5jb250YWlucyhDRE1TZXNzaW9uVHlwZTo6UGVyc2lzdGVu dFVzYWdlUmVjb3JkKSB8fCBjb25maWd1cmF0aW9uLnNlc3Npb25UeXBlcy5jb250YWlucyhDRE1T ZXNzaW9uVHlwZTo6UGVyc2lzdGVudExpY2Vuc2UpKSkKICAgICAgICAgcmV0dXJuIEZhaWxlZDsK IAotICAgIGlmIChjb25maWd1cmF0aW9uLnBlcnNpc3RlbnRTdGF0ZSA9PSBDRE1SZXF1aXJlbWVu dDo6UmVxdWlyZWQgJiYgIW1fc3RvcmFnZURpcmVjdG9yeSkKKyAgICBpZiAoY29uZmlndXJhdGlv bi5wZXJzaXN0ZW50U3RhdGUgPT0gQ0RNUmVxdWlyZW1lbnQ6OlJlcXVpcmVkICYmICFtX3N0b3Jh Z2VVUkwpCiAgICAgICAgIHJldHVybiBGYWlsZWQ7CiAKICAgICBpZiAoY29uZmlndXJhdGlvbi5z ZXNzaW9uVHlwZXMuY29udGFpbnMoQ0RNU2Vzc2lvblR5cGU6OlBlcnNpc3RlbnRMaWNlbnNlKSAm JiAhc3VwcG9ydHNQZXJzaXN0ZW50S2V5cygpKQpAQCAtMjAyLDEwICsyMDMsMzAgQEAgQ0RNSW5z dGFuY2U6OlN1Y2Nlc3NWYWx1ZSBDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6 c2V0U2VydmVyQ2VydGlmaWMKIAogQ0RNSW5zdGFuY2U6OlN1Y2Nlc3NWYWx1ZSBDRE1JbnN0YW5j ZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6c2V0U3RvcmFnZURpcmVjdG9yeShjb25zdCBTdHJp bmcmIHN0b3JhZ2VEaXJlY3RvcnkpCiB7Ci0gICAgaWYgKHN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0 eSgpKQotICAgICAgICBtX3N0b3JhZ2VEaXJlY3RvcnkgPSBuaWw7Ci0gICAgZWxzZQotICAgICAg ICBtX3N0b3JhZ2VEaXJlY3RvcnkgPSBhZG9wdE5TKFtbTlNVUkwgYWxsb2NdIGluaXRGaWxlVVJM V2l0aFBhdGg6c3RvcmFnZURpcmVjdG9yeSBpc0RpcmVjdG9yeTpZRVNdKTsKKyAgICBpZiAoc3Rv cmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpIHsKKyAgICAgICAgbV9zdG9yYWdlVVJMID0gbmlsOwor ICAgICAgICByZXR1cm4gU3VjY2VlZGVkOworICAgIH0KKworICAgIGF1dG8gc3RvcmFnZVBhdGgg PSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoc3RvcmFnZURpcmVjdG9yeSwg IlNlY3VyZVN0b3AucGxpc3QiKTsKKworICAgIGlmICghRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhz dG9yYWdlRGlyZWN0b3J5KSkgeworICAgICAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VBbGxEaXJl Y3RvcmllcyhzdG9yYWdlRGlyZWN0b3J5KSkKKyAgICAgICAgICAgIHJldHVybiBGYWlsZWQ7Cisg ICAgfSBlbHNlIGlmICghRmlsZVN5c3RlbTo6ZmlsZUlzRGlyZWN0b3J5KHN0b3JhZ2VEaXJlY3Rv cnksIEZpbGVTeXN0ZW06OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6OlllcykpIHsKKyAgICAg ICAgYXV0byB0ZW1wRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6Y3JlYXRlVGVtcG9yYXJ5RGlyZWN0 b3J5KEAiTWVkaWFLZXlzIik7CisgICAgICAgIGlmICghdGVtcERpcmVjdG9yeSkKKyAgICAgICAg ICAgIHJldHVybiBGYWlsZWQ7CisKKyAgICAgICAgYXV0byB0ZW1wU3RvcmFnZVBhdGggPSBGaWxl U3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQodGVtcERpcmVjdG9yeSwgRmlsZVN5c3Rl bTo6cGF0aEdldEZpbGVOYW1lKHN0b3JhZ2VQYXRoKSk7CisgICAgICAgIGlmICghRmlsZVN5c3Rl bTo6bW92ZUZpbGUoc3RvcmFnZURpcmVjdG9yeSwgdGVtcFN0b3JhZ2VQYXRoKSkKKyAgICAgICAg ICAgIHJldHVybiBGYWlsZWQ7CisKKyAgICAgICAgaWYgKCFGaWxlU3lzdGVtOjptb3ZlRmlsZSh0 ZW1wRGlyZWN0b3J5LCBzdG9yYWdlRGlyZWN0b3J5KSkKKyAgICAgICAgICAgIHJldHVybiBGYWls ZWQ7CisgICAgfQorCisgICAgbV9zdG9yYWdlVVJMID0gYWRvcHROUyhbW05TVVJMIGFsbG9jXSBp bml0RmlsZVVSTFdpdGhQYXRoOnN0b3JhZ2VQYXRoIGlzRGlyZWN0b3J5Ok5PXSk7CiAgICAgcmV0 dXJuIFN1Y2NlZWRlZDsKIH0KIApAQCAtMzQxLDE1ICszNjIsMTUgQEAgdm9pZCBDRE1JbnN0YW5j ZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnVwZGF0ZUxpY2Vuc2UoY29uc3QgU3Ry aW5nJiwgTGkKICAgICAgICAgICAgIFtleHBpcmVkU2Vzc2lvbnMgYWRkT2JqZWN0OnNlc3Npb24u Z2V0KCldOwogCiAgICAgICAgIGF1dG8qIGNlcnRpZmljYXRlID0gbV9pbnN0YW5jZS0+c2VydmVy Q2VydGlmaWNhdGUoKTsKLSAgICAgICAgYXV0byogc3RvcmFnZURpcmVjdG9yeSA9IG1faW5zdGFu Y2UtPnN0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICAgICAgYXV0byogc3RvcmFnZVVSTCA9IG1faW5z dGFuY2UtPnN0b3JhZ2VVUkwoKTsKIAotICAgICAgICBpZiAoIWNlcnRpZmljYXRlIHx8ICFzdG9y YWdlRGlyZWN0b3J5KSB7CisgICAgICAgIGlmICghY2VydGlmaWNhdGUgfHwgIXN0b3JhZ2VVUkwp IHsKICAgICAgICAgICAgIGNhbGxiYWNrKGZhbHNlLCBXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9w dCwgV1RGOjpudWxsb3B0LCBGYWlsZWQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKICAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gYXBwSWRlbnRpZmllciA9IGNlcnRpZmljYXRl LT5jcmVhdGVOU0RhdGEoKTsKLSAgICAgICAgW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygp IHJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHM6ZXhwaXJlZFNlc3Npb25zLmdldCgp IHdpdGhBcHBJZGVudGlmaWVyOmFwcElkZW50aWZpZXIuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0 VVJMOnN0b3JhZ2VEaXJlY3RvcnldOworICAgICAgICBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNs YXNzKCkgcmVtb3ZlUGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0czpleHBpcmVkU2Vzc2lvbnMu Z2V0KCkgd2l0aEFwcElkZW50aWZpZXI6YXBwSWRlbnRpZmllci5nZXQoKSBzdG9yYWdlRGlyZWN0 b3J5QXRVUkw6c3RvcmFnZVVSTF07CiAgICAgICAgIGNhbGxiYWNrKGZhbHNlLCB7IH0sIFdURjo6 bnVsbG9wdCwgV1RGOjpudWxsb3B0LCBTdWNjZWVkZWQpOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMzg5LDggKzQxMCw4IEBAIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJl YW1pbmdBVkZPYmpDOjpsb2FkU2Vzc2lvbihMaWNlbnNlVHlwZSBsaWNlbnNlCiB7CiAgICAgVU5V U0VEX1BBUkFNKG9yaWdpbik7CiAgICAgaWYgKGxpY2Vuc2VUeXBlID09IExpY2Vuc2VUeXBlOjpQ ZXJzaXN0ZW50VXNhZ2VSZWNvcmQpIHsKLSAgICAgICAgYXV0byogc3RvcmFnZURpcmVjdG9yeSA9 IG1faW5zdGFuY2UtPnN0b3JhZ2VEaXJlY3RvcnkoKTsKLSAgICAgICAgaWYgKCFtX2luc3RhbmNl LT5wZXJzaXN0ZW50U3RhdGVBbGxvd2VkKCkgfHwgc3RvcmFnZURpcmVjdG9yeSkgeworICAgICAg ICBhdXRvKiBzdG9yYWdlVVJMID0gbV9pbnN0YW5jZS0+c3RvcmFnZVVSTCgpOworICAgICAgICBp ZiAoIW1faW5zdGFuY2UtPnBlcnNpc3RlbnRTdGF0ZUFsbG93ZWQoKSB8fCBzdG9yYWdlVVJMKSB7 CiAgICAgICAgICAgICBjYWxsYmFjayhXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9wdCwgV1RGOjpu dWxsb3B0LCBGYWlsZWQsIFNlc3Npb25Mb2FkRmFpbHVyZTo6TWlzbWF0Y2hlZFNlc3Npb25UeXBl KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtNDAyLDcgKzQyMyw3IEBAIHZv aWQgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpsb2FkU2Vzc2lv bihMaWNlbnNlVHlwZSBsaWNlbnNlCiAKICAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gYXBwSWRl bnRpZmllciA9IGNlcnRpZmljYXRlLT5jcmVhdGVOU0RhdGEoKTsKICAgICAgICAgS2V5U3RhdHVz VmVjdG9yIGNoYW5nZWRLZXlzOwotICAgICAgICBmb3IgKE5TRGF0YSogZXhwaXJlZFNlc3Npb25E YXRhIGluIFtnZXRBVkNvbnRlbnRLZXlTZXNzaW9uQ2xhc3MoKSBwZW5kaW5nRXhwaXJlZFNlc3Np b25SZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6YXBwSWRlbnRpZmllci5nZXQoKSBzdG9yYWdlRGly ZWN0b3J5QXRVUkw6c3RvcmFnZURpcmVjdG9yeV0pIHsKKyAgICAgICAgZm9yIChOU0RhdGEqIGV4 cGlyZWRTZXNzaW9uRGF0YSBpbiBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcGVuZGlu Z0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmFwcElkZW50aWZpZXIuZ2V0 KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOnN0b3JhZ2VVUkxdKSB7CiAgICAgICAgICAgICBOU0Rp Y3Rpb25hcnkgKmV4cGlyZWRTZXNzaW9uID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBw cm9wZXJ0eUxpc3RXaXRoRGF0YTpleHBpcmVkU2Vzc2lvbkRhdGEgb3B0aW9uczprQ0ZQcm9wZXJ0 eUxpc3RJbW11dGFibGUgZm9ybWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0cl07CiAgICAgICAgICAg ICBOU1N0cmluZyAqcGxheWJhY2tTZXNzaW9uSWRWYWx1ZSA9IChOU1N0cmluZyAqKVtleHBpcmVk U2Vzc2lvbiBvYmplY3RGb3JLZXk6UGxheWJhY2tTZXNzaW9uSWRLZXldOwogICAgICAgICAgICAg aWYgKCFbcGxheWJhY2tTZXNzaW9uSWRWYWx1ZSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFz c11dKQpAQCAtNDUwLDEwICs0NzEsMTAgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxh eVN0cmVhbWluZ0FWRk9iakM6OnJlbW92ZVNlc3Npb25EYXRhKGNvbnN0IFN0cmluZyYKICAgICBb bV9zZXNzaW9uIGV4cGlyZV07CiAKICAgICBpZiAobGljZW5zZVR5cGUgPT0gTGljZW5zZVR5cGU6 OlBlcnNpc3RlbnRVc2FnZVJlY29yZCkgewotICAgICAgICBhdXRvKiBzdG9yYWdlRGlyZWN0b3J5 ID0gbV9pbnN0YW5jZS0+c3RvcmFnZURpcmVjdG9yeSgpOworICAgICAgICBhdXRvKiBzdG9yYWdl VVJMID0gbV9pbnN0YW5jZS0+c3RvcmFnZVVSTCgpOwogICAgICAgICBhdXRvKiBjZXJ0aWZpY2F0 ZSA9IG1faW5zdGFuY2UtPnNlcnZlckNlcnRpZmljYXRlKCk7CiAKLSAgICAgICAgaWYgKCFtX2lu c3RhbmNlLT5wZXJzaXN0ZW50U3RhdGVBbGxvd2VkKCkgfHwgIXN0b3JhZ2VEaXJlY3RvcnkgfHwg IWNlcnRpZmljYXRlKSB7CisgICAgICAgIGlmICghbV9pbnN0YW5jZS0+cGVyc2lzdGVudFN0YXRl QWxsb3dlZCgpIHx8ICFzdG9yYWdlVVJMIHx8ICFjZXJ0aWZpY2F0ZSkgewogICAgICAgICAgICAg Y2FsbGJhY2soeyB9LCBXVEY6Om51bGxvcHQsIEZhaWxlZCk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KQEAgLTQ2MSw3ICs0ODIsNyBAQCB2b2lkIENETUluc3RhbmNlU2Vzc2lvbkZh aXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6cmVtb3ZlU2Vzc2lvbkRhdGEoY29uc3QgU3RyaW5nJgog ICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBhcHBJZGVudGlmaWVyID0gY2VydGlmaWNhdGUtPmNy ZWF0ZU5TRGF0YSgpOwogICAgICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlQXJyYXk+IGV4cGlyZWRT ZXNzaW9uc0FycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CiAg ICAgICAgIEtleVN0YXR1c1ZlY3RvciBjaGFuZ2VkS2V5czsKLSAgICAgICAgZm9yIChOU0RhdGEq IGV4cGlyZWRTZXNzaW9uRGF0YSBpbiBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcGVu ZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmFwcElkZW50aWZpZXIu Z2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOnN0b3JhZ2VEaXJlY3RvcnldKSB7CisgICAgICAg IGZvciAoTlNEYXRhKiBleHBpcmVkU2Vzc2lvbkRhdGEgaW4gW2dldEFWQ29udGVudEtleVNlc3Np b25DbGFzcygpIHBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHNXaXRoQXBwSWRlbnRpZmllcjph cHBJZGVudGlmaWVyLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDpzdG9yYWdlVVJMXSkgewog ICAgICAgICAgICAgTlNEaWN0aW9uYXJ5ICpleHBpcmVkU2Vzc2lvbiA9IFtOU1Byb3BlcnR5TGlz dFNlcmlhbGl6YXRpb24gcHJvcGVydHlMaXN0V2l0aERhdGE6ZXhwaXJlZFNlc3Npb25EYXRhIG9w dGlvbnM6a0NGUHJvcGVydHlMaXN0SW1tdXRhYmxlIGZvcm1hdDpudWxscHRyIGVycm9yOm51bGxw dHJdOwogICAgICAgICAgICAgTlNTdHJpbmcgKnBsYXliYWNrU2Vzc2lvbklkVmFsdWUgPSAoTlNT dHJpbmcgKilbZXhwaXJlZFNlc3Npb24gb2JqZWN0Rm9yS2V5OlBsYXliYWNrU2Vzc2lvbklkS2V5 XTsKICAgICAgICAgICAgIGlmICghW3BsYXliYWNrU2Vzc2lvbklkVmFsdWUgaXNLaW5kT2ZDbGFz czpbTlNTdHJpbmcgY2xhc3NdXSkKQEAgLTY4OSwxMSArNzEwLDExIEBAIEFWQ29udGVudEtleVNl c3Npb24qIENETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6ZW5zdXJl U2Vzc2lvbigpCiAgICAgaWYgKG1fc2Vzc2lvbikKICAgICAgICAgcmV0dXJuIG1fc2Vzc2lvbi5n ZXQoKTsKIAotICAgIGF1dG8qIHN0b3JhZ2VEaXJlY3RvcnkgPSBtX2luc3RhbmNlLT5zdG9yYWdl RGlyZWN0b3J5KCk7Ci0gICAgaWYgKCFtX2luc3RhbmNlLT5wZXJzaXN0ZW50U3RhdGVBbGxvd2Vk KCkgfHwgIXN0b3JhZ2VEaXJlY3RvcnkpCisgICAgYXV0byBzdG9yYWdlVVJMID0gbV9pbnN0YW5j ZS0+c3RvcmFnZVVSTCgpOworICAgIGlmICghbV9pbnN0YW5jZS0+cGVyc2lzdGVudFN0YXRlQWxs b3dlZCgpIHx8ICFzdG9yYWdlVVJMKQogICAgICAgICBtX3Nlc3Npb24gPSBbZ2V0QVZDb250ZW50 S2V5U2Vzc2lvbkNsYXNzKCkgY29udGVudEtleVNlc3Npb25XaXRoS2V5U3lzdGVtOmdldEFWQ29u dGVudEtleVN5c3RlbUZhaXJQbGF5U3RyZWFtaW5nKCldOwogICAgIGVsc2UKLSAgICAgICAgbV9z ZXNzaW9uID0gW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIGNvbnRlbnRLZXlTZXNzaW9u V2l0aEtleVN5c3RlbTpnZXRBVkNvbnRlbnRLZXlTeXN0ZW1GYWlyUGxheVN0cmVhbWluZygpIHN0 b3JhZ2VEaXJlY3RvcnlBdFVSTDpzdG9yYWdlRGlyZWN0b3J5XTsKKyAgICAgICAgbV9zZXNzaW9u ID0gW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIGNvbnRlbnRLZXlTZXNzaW9uV2l0aEtl eVN5c3RlbTpnZXRBVkNvbnRlbnRLZXlTeXN0ZW1GYWlyUGxheVN0cmVhbWluZygpIHN0b3JhZ2VE aXJlY3RvcnlBdFVSTDpzdG9yYWdlVVJMXTsKIAogICAgIGlmICghbV9zZXNzaW9uKQogICAgICAg ICByZXR1cm4gbnVsbHB0cjsK