140778 2015-01-22 12:47:53 -0800 [Mac][EME] Adopt changes to AVStreamSession class methods 2015-01-22 16:17:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson jonlee webkit-bug-importer oldest_to_newest 1063424 0 jer.noble 2015-01-22 12:47:53 -0800 [Mac][EME] Adopt changes to AVStreamSession class methods 1063468 1 245164 jer.noble 2015-01-22 14:30:43 -0800 Created attachment 245164 Patch 1063479 2 jonlee 2015-01-22 15:03:30 -0800 rdar://problem/19458200 1063522 3 245164 commit-queue 2015-01-22 16:17:10 -0800 Comment on attachment 245164 Patch Clearing flags on attachment: 245164 Committed r178967: <http://trac.webkit.org/changeset/178967> 1063523 4 commit-queue 2015-01-22 16:17:14 -0800 All reviewed patches have been landed. Closing bug. 245164 2015-01-22 14:30:43 -0800 2015-01-22 16:17:10 -0800 Patch bug-140778-20150122143051.patch text/plain 10028 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjM2Y2JmNTZhODU0YWMz Nzg0ZWE0Yjc4MmYwMTFkZTZiZWQ1YjQxNS4uNGI5ZmZmMzMwY2Y4ZmY5YTliYWUxZTAxYmM1M2U5 MTg3YzgxNmY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAxLTIyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW0VNRV0gQWRvcHQg Y2hhbmdlcyB0byBBVlN0cmVhbVNlc3Npb24gY2xhc3MgbWV0aG9kcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNzc4CisgICAgICAgIHJkYXI6Ly9w cm9ibGVtLzE5NDU4MjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQVZTdHJlYW1TZXNzaW9uIGNsYXNzIG1ldGhvZHMgaGF2ZSBhZGRlZCBhICJzdG9y YWdlRGlyZWN0b3J5QXRVUkw6IiBwYXJhbWV0ZXIgc28gYXMgdG8gYmUgYWJsZSB0bworICAgICAg ICByZWFkIGFuZCBtb2RpZnkgcmVjb3JkcyBzdG9yZWQgYXQgbm9uLWRlZmF1bHQgc3RvcmFnZSBs b2NhdGlvbnMuCisKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vz c2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246Om1lZGlhS2V5c1N0 b3JhZ2VEaXJlY3RvcnkpOiBJbXBsZW1lbnQgY2xpZW50IG1ldGhvZCBieSBxdWVyeWluZyBkb2N1 bWVudCBhbmQgc2V0dGluZ3MuCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRp YUtleVNlc3Npb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9DRE1TZXNzaW9uLmg6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lv bk1lZGlhU291cmNlQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW06CisgICAgICAgIChX ZWJDb3JlOjpDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZWxlYXNlS2V5cyk6IENoZWNr IHdoZXRoZXIgdGhlIEFWU3RyZWFtU2Vzc2lvbiBjbGFzcyByZXNwb25kcyB0byBuZXcgc2VsZWN0 b3IgYmVmb3JlIGNhbGxpbmcuCisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uTWVkaWFTb3Vy Y2VBVkZPYmpDOjp1cGRhdGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25N ZWRpYVNvdXJjZUFWRk9iakM6OmdlbmVyYXRlS2V5UmVsZWFzZU1lc3NhZ2UpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnN0b3JhZ2VQYXRo KTogRmV0Y2ggdGhlIHN0b3JhZ2UgcGF0aCBmcm9tIHRoZSBjbGllbnQuCisKIDIwMTUtMDEtMTUg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY11bRU1FXSBD cmFzaCBpbiBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpsYXllckRpZFJlY2VpdmVFcnJv cigpIC0gTlNFcnJvciBub3QgS1ZPIGNvbXBsaWFudCBmb3Iga2V5IE5TVW5kZXJseWluZ0Vycm9y LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRp YUtleVNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9N ZWRpYUtleVNlc3Npb24uY3BwCmluZGV4IGM2NzJkZTA3ZGNiZTUxMWZiM2UxYmJmZjEzODQwMzc1 NTdiMjA2NDkuLjQ4YmRiM2Y3MGI1ODcwM2JkMTEyYzA0YWRhMWM1Nzc4MWFmZGI5MWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNz aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlh S2V5U2Vzc2lvbi5jcHAKQEAgLTMwLDExICszMCwxMyBAQAogCiAjaW5jbHVkZSAiQ0RNLmgiCiAj aW5jbHVkZSAiQ0RNU2Vzc2lvbi5oIgorI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAi RXZlbnQuaCIKICNpbmNsdWRlICJHZW5lcmljRXZlbnRRdWV1ZS5oIgogI2luY2x1ZGUgIk1lZGlh S2V5RXJyb3IuaCIKICNpbmNsdWRlICJNZWRpYUtleU1lc3NhZ2VFdmVudC5oIgogI2luY2x1ZGUg Ik1lZGlhS2V5cy5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIApAQCAtMjIwLDYgKzIyMiwyNyBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6c2VuZEVycm9y KENETVNlc3Npb25DbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlIGVycm9yQ29kZSwgdQogICAgIG1f YXN5bmNFdmVudFF1ZXVlLmVucXVldWVFdmVudChrZXllcnJvckV2ZW50LnJlbGVhc2UoKSk7CiB9 CiAKK1N0cmluZyBNZWRpYUtleVNlc3Npb246Om1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSBj b25zdAoreworICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGRvd25jYXN0PERvY3VtZW50PihzY3Jp cHRFeGVjdXRpb25Db250ZXh0KCkpOworICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgIHJldHVy biBlbXB0eVN0cmluZygpOworCisgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQtPnNl dHRpbmdzKCk7CisgICAgaWYgKCFzZXR0aW5ncykKKyAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5n KCk7CisKKyAgICBTdHJpbmcgc3RvcmFnZURpcmVjdG9yeSA9IHNldHRpbmdzLT5tZWRpYUtleXNT dG9yYWdlRGlyZWN0b3J5KCk7CisgICAgaWYgKHN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQor ICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKworICAgIFNlY3VyaXR5T3JpZ2luKiBvcmln aW4gPSBkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsKKyAgICBpZiAoIW9yaWdpbikKKyAgICAg ICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisKKyAgICByZXR1cm4gcGF0aEJ5QXBwZW5kaW5nQ29t cG9uZW50KHN0b3JhZ2VEaXJlY3RvcnksIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpOwor fQorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5j cnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmgKaW5kZXggNjRkMzA5MjdlNjVkYmFmZWM4N2Vm ZWM1OGJlNDRhMmU4NDUyNzAxZS4uN2FiZWNkMjk4NjEwNTIzMDA1MjhlN2FlODRlNjI1ODkxNWJm MTUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9N ZWRpYUtleVNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1l ZGlhL01lZGlhS2V5U2Vzc2lvbi5oCkBAIC05MCw2ICs5MCw3IEBAIHByb3RlY3RlZDoKICAgICAv LyBDRE1TZXNzaW9uQ2xpZW50CiAgICAgdmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlKFVpbnQ4QXJy YXkqLCBTdHJpbmcgZGVzdGluYXRpb25VUkwpOwogICAgIHZpcnR1YWwgdm9pZCBzZW5kRXJyb3Io TWVkaWFLZXlFcnJvckNvZGUsIHVuc2lnbmVkIGxvbmcgc3lzdGVtQ29kZSk7CisgICAgdmlydHVh bCBTdHJpbmcgbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpIGNvbnN0OwogCiAgICAgTWVkaWFL ZXlzKiBtX2tleXM7CiAgICAgU3RyaW5nIG1fa2V5U3lzdGVtOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ0RNU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ0RNU2Vzc2lvbi5oCmluZGV4IDgwYTg1ZTM1Mzg1NjE3YjNlNGI5 NzI1OTcyMDc4OTFmZmZmZDM1M2EuLmE1MTA2OTYwNmUyOTc3OGI0M2Y5NmZiYjViNzkxZTEzZmZi YzhhYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NETVNl c3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DRE1TZXNzaW9u LmgKQEAgLTUwLDYgKzUwLDggQEAgcHVibGljOgogICAgIH07CiAgICAgdHlwZWRlZiB1bnNpZ25l ZCBzaG9ydCBNZWRpYUtleUVycm9yQ29kZTsKICAgICB2aXJ0dWFsIHZvaWQgc2VuZEVycm9yKE1l ZGlhS2V5RXJyb3JDb2RlLCB1bnNpZ25lZCBsb25nIHN5c3RlbUNvZGUpID0gMDsKKworICAgIHZp cnR1YWwgU3RyaW5nIG1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdCA9IDA7CiB9Owog CiBlbnVtIENETVNlc3Npb25UeXBlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9i akMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMuaAppbmRleCBhNzQ5ZDkzNjkzZWVhNjZjNGJh NGZhMWZmMzRiNDZmODk4YTFiOTlmLi5kY2JjZjAzMTIzMTQ0ZDVkZDBiNDMyOTFmZGMyOWJjNzIz ZWY4YzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1l ZGlhU291cmNlQVZGT2JqQy5oCkBAIC02MSw2ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNl dFNlc3Npb25JZChjb25zdCBTdHJpbmcmIHNlc3Npb25JZCkgeyBtX3Nlc3Npb25JZCA9IHNlc3Np b25JZDsgfQogCiBwcm90ZWN0ZWQ6CisgICAgU3RyaW5nIHN0b3JhZ2VQYXRoKCkgY29uc3Q7CiAg ICAgUGFzc1JlZlB0cjxVaW50OEFycmF5PiBnZW5lcmF0ZUtleVJlbGVhc2VNZXNzYWdlKHVuc2ln bmVkIHNob3J0JiBlcnJvckNvZGUsIHVuc2lnbmVkIGxvbmcmIHN5c3RlbUNvZGUpOwogCiAgICAg VmVjdG9yPFJlZlB0cjxTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQz4+IG1fc291cmNlQnVmZmVy czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3Vy Y2VBVkZPYmpDLm1tCmluZGV4IDExMDE0NmUxODI5MWZiZTEwODViNWFkNDU2NmY1ZWE4OWEyN2Vh ZDUuLjE1OTBhZDVlZGNjMDYxZjJkYjFlZmQ1ZGJjYmNmZWQ3M2ZkMTg4ZWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNl c3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5t bQpAQCAtMzEsNiArMzEsNyBAQAogI2ltcG9ydCAiQ0RNLmgiCiAjaW1wb3J0ICJDRE1TZXNzaW9u LmgiCiAjaW1wb3J0ICJFeGNlcHRpb25Db2RlLmgiCisjaW1wb3J0ICJGaWxlU3lzdGVtLmgiCiAj aW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJNZWRpYVBsYXllci5oIgogI2ltcG9ydCAiU291 cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMuaCIKQEAgLTYxLDggKzYyLDggQEAgU09GVF9MSU5LX0NP TlNUQU5UX01BWV9GQUlMKEFWRm91bmRhdGlvbiwgQVZTdHJlYW1TZXNzaW9uQ29udGVudFByb3Rl Y3Rpb25TZXNzaW8KIC0gKHZvaWQpcmVtb3ZlU3RyZWFtRGF0YVBhcnNlcjooQVZTdHJlYW1EYXRh UGFyc2VyICopc3RyZWFtRGF0YVBhcnNlcjsKIC0gKHZvaWQpZXhwaXJlOwogLSAoTlNEYXRhICop Y29udGVudFByb3RlY3Rpb25TZXNzaW9uSWRlbnRpZmllcjsKLSsgKE5TQXJyYXkgKilwZW5kaW5n RXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6KE5TRGF0YSAqKWFwcElkZW50 aWZpZXI7Ci0rICh2b2lkKXJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHM6KE5TQXJy YXkgKilleHBpcmVkU2Vzc2lvblJlcG9ydHMgd2l0aEFwcElkZW50aWZpZXI6KE5TRGF0YSAqKWFw cElkZW50aWZpZXI7CisrIChOU0FycmF5ICopcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dp dGhBcHBJZGVudGlmaWVyOihOU0RhdGEgKilhcHBJZGVudGlmaWVyIHN0b3JhZ2VEaXJlY3RvcnlB dFVSTDooTlNVUkwgKilzdG9yYWdlVVJMOworKyAodm9pZClyZW1vdmVQZW5kaW5nRXhwaXJlZFNl c3Npb25SZXBvcnRzOihOU0FycmF5ICopZXhwaXJlZFNlc3Npb25SZXBvcnRzIHdpdGhBcHBJZGVu dGlmaWVyOihOU0RhdGEgKilhcHBJZGVudGlmaWVyIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDooTlNV UkwgKilzdG9yYWdlVVJMOwogQGVuZAogCiBAaW50ZXJmYWNlIENETVNlc3Npb25NZWRpYVNvdXJj ZUFWRk9iakNPYnNlcnZlciA6IE5TT2JqZWN0IHsKQEAgLTE0Myw4ICsxNDQsMTEgQEAgdm9pZCBD RE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZWxlYXNlS2V5cygpCiAgICAgICAgIExPRyhN ZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnJlbGVhc2VLZXlzKCVwKSAtIGV4 cGlyaW5nIHN0cmVhbSBzZXNzaW9uIiwgdGhpcyk7CiAgICAgICAgIFttX3N0cmVhbVNlc3Npb24g ZXhwaXJlXTsKIAorICAgICAgICBpZiAoIVtnZXRBVlN0cmVhbVNlc3Npb25DbGFzcygpIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IocGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhB cHBJZGVudGlmaWVyOnN0b3JhZ2VEaXJlY3RvcnlBdFVSTDopXSkKKyAgICAgICAgICAgIHJldHVy bjsKKwogICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0ZURhdGEgPSBhZG9wdE5T KFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1fY2VydGlmaWNhdGUtPmRhdGEoKSBsZW5n dGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsKLSAgICAgICAgTlNBcnJheSogZXhwaXJlZFNl c3Npb25zID0gW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9u UmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKV07CisgICAgICAg IE5TQXJyYXkqIGV4cGlyZWRTZXNzaW9ucyA9IFtnZXRBVlN0cmVhbVNlc3Npb25DbGFzcygpIHBl bmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHNXaXRoQXBwSWRlbnRpZmllcjpjZXJ0aWZpY2F0ZURh dGEuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6c3Rv cmFnZVBhdGgoKV1dOwogICAgICAgICBmb3IgKE5TRGF0YSogZXhwaXJlZFNlc3Npb25EYXRhIGlu IGV4cGlyZWRTZXNzaW9ucykgewogICAgICAgICAgICAgTlNEaWN0aW9uYXJ5ICpleHBpcmVkU2Vz c2lvbiA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gcHJvcGVydHlMaXN0V2l0aERhdGE6 ZXhwaXJlZFNlc3Npb25EYXRhIG9wdGlvbnM6a0NGUHJvcGVydHlMaXN0SW1tdXRhYmxlIGZvcm1h dDpudWxscHRyIGVycm9yOm51bGxwdHJdOwogICAgICAgICAgICAgTlNTdHJpbmcgKnBsYXliYWNr U2Vzc2lvbklkVmFsdWUgPSAoTlNTdHJpbmcgKilbZXhwaXJlZFNlc3Npb24gb2JqZWN0Rm9yS2V5 OlBsYXliYWNrU2Vzc2lvbklkS2V5XTsKQEAgLTIwOCw3ICsyMTIsOSBAQCBib29sIENETVNlc3Np b25NZWRpYVNvdXJjZUFWRk9iakM6OnVwZGF0ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50 OEFycmF5PiYgbgogICAgICAgICB9CiAKICAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gY2VydGlm aWNhdGVEYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczptX2NlcnRp ZmljYXRlLT5kYXRhKCkgbGVuZ3RoOm1fY2VydGlmaWNhdGUtPmxlbmd0aCgpXSk7Ci0gICAgICAg IFtnZXRBVlN0cmVhbVNlc3Npb25DbGFzcygpIHJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lvblJl cG9ydHM6QFttX2V4cGlyZWRTZXNzaW9uLmdldCgpXSB3aXRoQXBwSWRlbnRpZmllcjpjZXJ0aWZp Y2F0ZURhdGEuZ2V0KCldOworCisgICAgICAgIGlmIChbZ2V0QVZTdHJlYW1TZXNzaW9uQ2xhc3Mo KSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lv blJlcG9ydHM6d2l0aEFwcElkZW50aWZpZXI6c3RvcmFnZURpcmVjdG9yeUF0VVJMOildKQorICAg ICAgICAgICAgW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcmVtb3ZlUGVuZGluZ0V4cGlyZWRT ZXNzaW9uUmVwb3J0czpAW21fZXhwaXJlZFNlc3Npb24uZ2V0KCldIHdpdGhBcHBJZGVudGlmaWVy OmNlcnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVV UkxXaXRoUGF0aDpzdG9yYWdlUGF0aCgpXV07CiAgICAgICAgIG1fZXhwaXJlZFNlc3Npb24gPSBu dWxscHRyOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC0zMzEsMTMgKzMzNywyNCBA QCB2b2lkIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnJlbW92ZVNvdXJjZUJ1ZmZlcihT b3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQwogICAgIG1fc291cmNlQnVmZmVycy5yZW1vdmUobV9z b3VyY2VCdWZmZXJzLmZpbmQoc291cmNlQnVmZmVyKSk7CiB9CiAKK1N0cmluZyBDRE1TZXNzaW9u TWVkaWFTb3VyY2VBVkZPYmpDOjpzdG9yYWdlUGF0aCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f Y2xpZW50ID8gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KG1fY2xpZW50LT5tZWRpYUtleXNTdG9y YWdlRGlyZWN0b3J5KCksICJTZWN1cmVTdG9wLnBsaXN0IikgOiBlbXB0eVN0cmluZygpOworfQor CiBQYXNzUmVmUHRyPFVpbnQ4QXJyYXk+IENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6Omdl bmVyYXRlS2V5UmVsZWFzZU1lc3NhZ2UodW5zaWduZWQgc2hvcnQmIGVycm9yQ29kZSwgdW5zaWdu ZWQgbG9uZyYgc3lzdGVtQ29kZSkKIHsKICAgICBBU1NFUlQobV9tb2RlID09IEtleVJlbGVhc2Up OwogICAgIG1fY2VydGlmaWNhdGUgPSBtX2luaXREYXRhOwogICAgIFJldGFpblB0cjxOU0RhdGE+ IGNlcnRpZmljYXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6 bV9jZXJ0aWZpY2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwog Ci0gICAgTlNBcnJheSogZXhwaXJlZFNlc3Npb25zID0gW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNz KCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmlj YXRlRGF0YS5nZXQoKV07CisgICAgaWYgKCFbZ2V0QVZTdHJlYW1TZXNzaW9uQ2xhc3MoKSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHNXaXRo QXBwSWRlbnRpZmllcjpzdG9yYWdlRGlyZWN0b3J5QXRVUkw6KV0pIHsKKyAgICAgICAgZXJyb3JD b2RlID0gTWVkaWFQbGF5ZXI6OktleVN5c3RlbU5vdFN1cHBvcnRlZDsKKyAgICAgICAgc3lzdGVt Q29kZSA9ICchbW9yJzsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisgICAgTlNB cnJheSogZXhwaXJlZFNlc3Npb25zID0gW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcGVuZGlu Z0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5n ZXQoKSBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpzdG9yYWdl UGF0aCgpXV07CiAgICAgaWYgKCFbZXhwaXJlZFNlc3Npb25zIGNvdW50XSkgewogICAgICAgICBM T0coTWVkaWEsICJDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpnZW5lcmF0ZUtleVJlbGVh c2VNZXNzYWdlKCVwKSAtIG5vIGV4cGlyZWQgc2Vzc2lvbnMgZm91bmQiLCB0aGlzKTsKIAo=