221496 2021-02-05 12:07:55 -0800 [Cocoa] Encrypted media segments should generate a parser error if no encrypted media handler is present. 2021-02-08 13:25:45 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble aestes eric.carlson peng.liu6 webkit-bug-importer oldest_to_newest 1726218 0 jer.noble 2021-02-05 12:07:55 -0800 [Cocoa] Encrypted media segments should generate a parser error if no encrypted media handler is present. 1726223 1 jer.noble 2021-02-05 12:10:42 -0800 <rdar://73839984> 1726224 2 419443 jer.noble 2021-02-05 12:11:26 -0800 Created attachment 419443 Patch 1726284 3 419466 jer.noble 2021-02-05 14:40:01 -0800 Created attachment 419466 Patch for landing 1726741 4 ews-feeder 2021-02-08 12:35:17 -0800 commit-queue failed to commit attachment 419466 to WebKit repository. To retry, please set cq+ flag again. 1726767 5 ews-feeder 2021-02-08 13:25:43 -0800 Committed r272544: <https://commits.webkit.org/r272544> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419466. 419443 2021-02-05 12:11:26 -0800 2021-02-05 12:36:47 -0800 Patch bug-221496-20210205121126.patch text/plain 5090 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTRiYjg2NzMxM2Q3ZmM0 ZTgwOTM4Njg0NWI5MmI4NjZjZDQ4ZTQ5My4uYTU2NGUyZGExM2UwNGFmOTVlOGIyZTI4ZDJjYzVm NWM3MjU5NDNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTA1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRW5jcnlwdGVk IG1lZGlhIHNlZ21lbnRzIHNob3VsZCBnZW5lcmF0ZSBhIHBhcnNlciBlcnJvciBpZiBubyBlbmNy eXB0ZWQgbWVkaWEgaGFuZGxlciBpcyBwcmVzZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFdlYk0gZm9ybWF0IHJlYWRlciBkb2VzIG5vdCBz dXBwb3J0IGVuY3J5cHRlZCBtZWRpYSBwYXJzaW5nLCBzbyB0aGUgcGFyc2VyIG11c3QgZ2VuZXJh dGUgYW4gZXJyb3IgcmF0aGVyCisgICAgICAgIHRoYW4gY29udGludWluZyB0byBwYXJzZSBlbmNy eXB0ZWQgbWVkaWEgZGF0YS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1Nv dXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVy UGFyc2VyV2ViTTo6T25FbGVtZW50RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZl clBhcnNlcldlYk06Ok9uVHJhY2tFbnRyeSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5oOgorCiAyMDIxLTAyLTA1ICBKZXIgTm9ibGUg IDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gQ1JBU0ggaW4gTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpyZW1vdmVBdWRpb1JlbmRlcmVyKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1 ZmZlclBhcnNlcldlYk0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j b2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKaW5kZXggMjg2MTdjNmM2ZjU4ZTFmNTQyMWRh N2RlM2RkZDc4MzIyODk4NmQ2Ni4uNjgwNWI0MTU0MzY5MTVhYjQ1OWE2ODY3M2YyNzU5YWI2ZTgx NDA1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev U291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKQEAgLTc3Miw2ICs3NzIs MTEgQEAgU3RhdHVzIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06Ok9uRWxlbWVudEVuZChjb25zdCBF bGVtZW50TWV0YWRhdGEmIG1ldGFkYXRhKQogICAgIElORk9fTE9HX0lGX1BPU1NJQkxFKExPR0lE RU5USUZJRVIsICJzdGF0ZSgiLCBvbGRTdGF0ZSwgIi0+IiwgbV9zdGF0ZSwgIiksIGlkKCIsIG1l dGFkYXRhLmlkLCAiKSwgc2l6ZSgiLCBtZXRhZGF0YS5zaXplLCAiKSIpOwogCiAgICAgaWYgKG1l dGFkYXRhLmlkID09IElkOjprVHJhY2tzKSB7CisgICAgICAgIGlmICghbV9rZXlJZHMuaXNFbXB0 eSgpICYmICFtX2RpZFByb3ZpZGVDb250ZW50S2V5UmVxdWVzdEluaXRpYWxpemF0aW9uRGF0YUZv clRyYWNrSURDYWxsYmFjaykgeworICAgICAgICAgICAgRVJST1JfTE9HX0lGX1BPU1NJQkxFKExP R0lERU5USUZJRVIsICJFbmNvdW50ZXJlZCBlbmNyeXB0ZWQgY29udGVudCB3aXRob3V0IGFuIGtl eSByZXF1ZXN0IGNhbGxiYWNrIik7CisgICAgICAgICAgICByZXR1cm4gU3RhdHVzKFN0YXR1czo6 Q29kZShFcnJvckNvZGU6OkNvbnRlbnRFbmNyeXB0ZWQpKTsKKyAgICAgICAgfQorCiAgICAgICAg IGlmIChtX2luaXRpYWxpemF0aW9uU2VnbWVudEVuY291bnRlcmVkICYmIG1fZGlkUGFyc2VJbml0 aWFsaXphdGlvbkRhdGFDYWxsYmFjaykgewogICAgICAgICAgICAgbV9jYWxsT25DbGllbnRUaHJl YWRDYWxsYmFjayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBpbml0aWFs aXphdGlvblNlZ21lbnQgPSBXVEZNb3ZlKCptX2luaXRpYWxpemF0aW9uU2VnbWVudCldKCkgbXV0 YWJsZSB7CiAgICAgICAgICAgICAgICAgbV9kaWRQYXJzZUluaXRpYWxpemF0aW9uRGF0YUNhbGxi YWNrKFdURk1vdmUoaW5pdGlhbGl6YXRpb25TZWdtZW50KSk7CkBAIC03NzksNiArNzg0LDEyIEBA IFN0YXR1cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpPbkVsZW1lbnRFbmQoY29uc3QgRWxlbWVu dE1ldGFkYXRhJiBtZXRhZGF0YSkKICAgICAgICAgfQogICAgICAgICBtX2luaXRpYWxpemF0aW9u U2VnbWVudEVuY291bnRlcmVkID0gZmFsc2U7CiAgICAgICAgIG1faW5pdGlhbGl6YXRpb25TZWdt ZW50ID0gbnVsbHB0cjsKKworICAgICAgICBpZiAoIW1fa2V5SWRzLmlzRW1wdHkoKSkgeworICAg ICAgICAgICAgZm9yIChhdXRvJiBrZXlJZFBhaXIgOiBtX2tleUlkcykKKyAgICAgICAgICAgICAg ICBtX2RpZFByb3ZpZGVDb250ZW50S2V5UmVxdWVzdEluaXRpYWxpemF0aW9uRGF0YUZvclRyYWNr SURDYWxsYmFjayhXVEZNb3ZlKGtleUlkUGFpci5zZWNvbmQpLCBrZXlJZFBhaXIuZmlyc3QpOwor ICAgICAgICB9CisgICAgICAgIG1fa2V5SWRzLmNsZWFyKCk7CiAgICAgfQogCiAgICAgcmV0dXJu IFN0YXR1cyhTdGF0dXM6OmtPa0NvbXBsZXRlZCk7CkBAIC04ODMsNiArODk0LDI1IEBAIFN0YXR1 cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpPblRyYWNrRW50cnkoY29uc3QgRWxlbWVudE1ldGFk YXRhJiBtZXRhZGF0YSwgY29uCiAgICAgICAgIG1faW5pdGlhbGl6YXRpb25TZWdtZW50LT5hdWRp b1RyYWNrcy5hcHBlbmQoeyBNZWRpYURlc2NyaXB0aW9uV2ViTTo6Y3JlYXRlKFRyYWNrRW50cnko dHJhY2tFbnRyeSkpLCBXVEZNb3ZlKHRyYWNrKSB9KTsKICAgICB9CiAKKyAgICBpZiAodHJhY2tF bnRyeS5jb250ZW50X2VuY29kaW5ncy5pc19wcmVzZW50KCkgJiYgIXRyYWNrRW50cnkuY29udGVu dF9lbmNvZGluZ3MudmFsdWUoKS5lbmNvZGluZ3MuZW1wdHkoKSkgeworICAgICAgICBBTFdBWVNf TE9HX0lGX1BPU1NJQkxFKExPR0lERU5USUZJRVIsICJjb250ZW50X2VuY29kaW5ncyBkZXRlY3Rl ZDoiKTsKKyAgICAgICAgZm9yIChhdXRvJiBlbmNvZGluZyA6IHRyYWNrRW50cnkuY29udGVudF9l bmNvZGluZ3MudmFsdWUoKS5lbmNvZGluZ3MpIHsKKyAgICAgICAgICAgIGlmICghZW5jb2Rpbmcu aXNfcHJlc2VudCgpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBh dXRvJiBlbmNyeXB0aW9uID0gZW5jb2RpbmcudmFsdWUoKS5lbmNyeXB0aW9uOworICAgICAgICAg ICAgaWYgKCFlbmNyeXB0aW9uLmlzX3ByZXNlbnQoKSkKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKworICAgICAgICAgICAgYXV0byYga2V5SWRFbGVtZW50ID0gZW5jcnlwdGlvbi52YWx1ZSgp LmtleV9pZDsKKyAgICAgICAgICAgIGlmICgha2V5SWRFbGVtZW50LmlzX3ByZXNlbnQoKSkKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXV0byYga2V5SWQgPSBrZXlJ ZEVsZW1lbnQudmFsdWUoKTsKKyAgICAgICAgICAgIG1fa2V5SWRzLmFwcGVuZChzdGQ6Om1ha2Vf cGFpcih0cmFja0VudHJ5LnRyYWNrX3VpZC52YWx1ZSgpLCBVaW50OEFycmF5OjpjcmVhdGUoa2V5 SWQuZGF0YSgpLCBrZXlJZC5zaXplKCkpKSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBTdHJp bmdWaWV3IGNvZGVjU3RyaW5nIHsgdHJhY2tFbnRyeS5jb2RlY19pZC52YWx1ZSgpLmRhdGEoKSwg KHVuc2lnbmVkKXRyYWNrRW50cnkuY29kZWNfaWQudmFsdWUoKS5sZW5ndGgoKSB9OwogI2lmIEVO QUJMRShWUDkpCiAgICAgaWYgKGNvZGVjU3RyaW5nID09ICJWX1ZQOSIgJiYgaXNWUDlEZWNvZGVy QXZhaWxhYmxlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uaAppbmRleCBhZjYzNGJi Y2NhOTIwMmU4NDYxMWYyMDhiZjY1ZGI3NjgyMzJkMjE3Li5jMmY3ZDdmMjE5NzkxY2IzZTAzZDY2 ZGFlMGEzMjJlZWJkY2NmMjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5oCkBAIC05 Niw2ICs5Niw3IEBAIHB1YmxpYzoKICAgICAgICAgUmVjZWl2ZWRFYm1sSW5zaWRlU2VnbWVudCwK ICAgICAgICAgVW5zdXBwb3J0ZWRWaWRlb0NvZGVjLAogICAgICAgICBVbnN1cHBvcnRlZEF1ZGlv Q29kZWMsCisgICAgICAgIENvbnRlbnRFbmNyeXB0ZWQsCiAgICAgfTsKIAogICAgIGVudW0gY2xh c3MgU3RhdGUgOiB1aW50OF90IHsKQEAgLTI0OCw2ICsyNDksNyBAQCBwcml2YXRlOgogICAgIHdl Ym06OlN0YXR1cyBPbkZyYW1lKGNvbnN0IHdlYm06OkZyYW1lTWV0YWRhdGEmLCB3ZWJtOjpSZWFk ZXIqLCB1aW50NjRfdCogYnl0ZXNSZW1haW5pbmcpIGZpbmFsOwogCiAgICAgc3RkOjp1bmlxdWVf cHRyPEluaXRpYWxpemF0aW9uU2VnbWVudD4gbV9pbml0aWFsaXphdGlvblNlZ21lbnQ7CisgICAg VmVjdG9yPHN0ZDo6cGFpcjx1aW50NjRfdCwgUmVmPFVpbnQ4QXJyYXk+Pj4gbV9rZXlJZHM7CiAg ICAgd2VibTo6U3RhdHVzIG1fc3RhdHVzOwogICAgIHN0ZDo6dW5pcXVlX3B0cjx3ZWJtOjpXZWJt UGFyc2VyPiBtX3BhcnNlcjsKICAgICBib29sIG1faW5pdGlhbGl6YXRpb25TZWdtZW50RW5jb3Vu dGVyZWQgeyBmYWxzZSB9Owo= 419466 2021-02-05 14:40:01 -0800 2021-02-08 13:25:44 -0800 Patch for landing bug-221496-20210205144000.patch text/plain 5367 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTRiYjg2NzMxM2Q3ZmM0 ZTgwOTM4Njg0NWI5MmI4NjZjZDQ4ZTQ5My4uMzI5ZjBlYTBlMTE2MTliNWIxNzQyOWRlZmIyMTQ4 MzdmYjhhYWFhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTA1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRW5jcnlwdGVk IG1lZGlhIHNlZ21lbnRzIHNob3VsZCBnZW5lcmF0ZSBhIHBhcnNlciBlcnJvciBpZiBubyBlbmNy eXB0ZWQgbWVkaWEgaGFuZGxlciBpcyBwcmVzZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBDYXJsc29uLgorCisgICAgICAgIFRoZSBXZWJNIGZvcm1hdCByZWFkZXIgZG9lcyBub3Qgc3Vw cG9ydCBlbmNyeXB0ZWQgbWVkaWEgcGFyc2luZywgc28gdGhlIHBhcnNlciBtdXN0IGdlbmVyYXRl IGFuIGVycm9yIHJhdGhlcgorICAgICAgICB0aGFuIGNvbnRpbnVpbmcgdG8gcGFyc2UgZW5jcnlw dGVkIG1lZGlhIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3Vy Y2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBh cnNlcldlYk06Ok9uRWxlbWVudEVuZCk6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQ YXJzZXJXZWJNOjpPblRyYWNrRW50cnkpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uaDoKKwogMjAyMS0wMi0wNSAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIENSQVNIIGluIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6cmVtb3ZlQXVkaW9SZW5kZXJlcigpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZm ZXJQYXJzZXJXZWJNLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwCmluZGV4IDI4NjE3YzZjNmY1OGUxZjU0MjFkYTdk ZTNkZGQ3ODMyMjg5ODZkNjYuLjY5ODMxYjAwNmE4NDk1YmI2Y2FjYzZmNTk2ZmNiMmUwMDE5YWJk ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1Nv dXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwCkBAIC00MSw2ICs0MSw3IEBA CiAjaW5jbHVkZSAiVmlkZW9UcmFja1ByaXZhdGVXZWJNLmgiCiAjaW5jbHVkZSAiV2ViTUF1ZGlv VXRpbGl0aWVzQ29jb2EuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9EYXRhVmlldy5oPgor I2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0dlbmVyaWNUeXBlZEFycmF5Vmlld0lubGluZXMuaD4K ICNpbmNsdWRlIDx3ZWJtL3dlYm1fcGFyc2VyLmg+CiAjaW5jbHVkZSA8d3RmL0FsZ29yaXRobXMu aD4KICNpbmNsdWRlIDx3dGYvTG9nZ2VySGVscGVyLmg+CkBAIC03NzIsNiArNzczLDExIEBAIFN0 YXR1cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpPbkVsZW1lbnRFbmQoY29uc3QgRWxlbWVudE1l dGFkYXRhJiBtZXRhZGF0YSkKICAgICBJTkZPX0xPR19JRl9QT1NTSUJMRShMT0dJREVOVElGSUVS LCAic3RhdGUoIiwgb2xkU3RhdGUsICItPiIsIG1fc3RhdGUsICIpLCBpZCgiLCBtZXRhZGF0YS5p ZCwgIiksIHNpemUoIiwgbWV0YWRhdGEuc2l6ZSwgIikiKTsKIAogICAgIGlmIChtZXRhZGF0YS5p ZCA9PSBJZDo6a1RyYWNrcykgeworICAgICAgICBpZiAoIW1fa2V5SWRzLmlzRW1wdHkoKSAmJiAh bV9kaWRQcm92aWRlQ29udGVudEtleVJlcXVlc3RJbml0aWFsaXphdGlvbkRhdGFGb3JUcmFja0lE Q2FsbGJhY2spIHsKKyAgICAgICAgICAgIEVSUk9SX0xPR19JRl9QT1NTSUJMRShMT0dJREVOVElG SUVSLCAiRW5jb3VudGVyZWQgZW5jcnlwdGVkIGNvbnRlbnQgd2l0aG91dCBhbiBrZXkgcmVxdWVz dCBjYWxsYmFjayIpOworICAgICAgICAgICAgcmV0dXJuIFN0YXR1cyhTdGF0dXM6OkNvZGUoRXJy b3JDb2RlOjpDb250ZW50RW5jcnlwdGVkKSk7CisgICAgICAgIH0KKwogICAgICAgICBpZiAobV9p bml0aWFsaXphdGlvblNlZ21lbnRFbmNvdW50ZXJlZCAmJiBtX2RpZFBhcnNlSW5pdGlhbGl6YXRp b25EYXRhQ2FsbGJhY2spIHsKICAgICAgICAgICAgIG1fY2FsbE9uQ2xpZW50VGhyZWFkQ2FsbGJh Y2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgaW5pdGlhbGl6YXRpb25T ZWdtZW50ID0gV1RGTW92ZSgqbV9pbml0aWFsaXphdGlvblNlZ21lbnQpXSgpIG11dGFibGUgewog ICAgICAgICAgICAgICAgIG1fZGlkUGFyc2VJbml0aWFsaXphdGlvbkRhdGFDYWxsYmFjayhXVEZN b3ZlKGluaXRpYWxpemF0aW9uU2VnbWVudCkpOwpAQCAtNzc5LDYgKzc4NSwxMiBAQCBTdGF0dXMg U291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25FbGVtZW50RW5kKGNvbnN0IEVsZW1lbnRNZXRhZGF0 YSYgbWV0YWRhdGEpCiAgICAgICAgIH0KICAgICAgICAgbV9pbml0aWFsaXphdGlvblNlZ21lbnRF bmNvdW50ZXJlZCA9IGZhbHNlOwogICAgICAgICBtX2luaXRpYWxpemF0aW9uU2VnbWVudCA9IG51 bGxwdHI7CisKKyAgICAgICAgaWYgKCFtX2tleUlkcy5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAg IGZvciAoYXV0byYga2V5SWRQYWlyIDogbV9rZXlJZHMpCisgICAgICAgICAgICAgICAgbV9kaWRQ cm92aWRlQ29udGVudEtleVJlcXVlc3RJbml0aWFsaXphdGlvbkRhdGFGb3JUcmFja0lEQ2FsbGJh Y2soV1RGTW92ZShrZXlJZFBhaXIuc2Vjb25kKSwga2V5SWRQYWlyLmZpcnN0KTsKKyAgICAgICAg fQorICAgICAgICBtX2tleUlkcy5jbGVhcigpOwogICAgIH0KIAogICAgIHJldHVybiBTdGF0dXMo U3RhdHVzOjprT2tDb21wbGV0ZWQpOwpAQCAtODgzLDYgKzg5NSwyNSBAQCBTdGF0dXMgU291cmNl QnVmZmVyUGFyc2VyV2ViTTo6T25UcmFja0VudHJ5KGNvbnN0IEVsZW1lbnRNZXRhZGF0YSYgbWV0 YWRhdGEsIGNvbgogICAgICAgICBtX2luaXRpYWxpemF0aW9uU2VnbWVudC0+YXVkaW9UcmFja3Mu YXBwZW5kKHsgTWVkaWFEZXNjcmlwdGlvbldlYk06OmNyZWF0ZShUcmFja0VudHJ5KHRyYWNrRW50 cnkpKSwgV1RGTW92ZSh0cmFjaykgfSk7CiAgICAgfQogCisgICAgaWYgKHRyYWNrRW50cnkuY29u dGVudF9lbmNvZGluZ3MuaXNfcHJlc2VudCgpICYmICF0cmFja0VudHJ5LmNvbnRlbnRfZW5jb2Rp bmdzLnZhbHVlKCkuZW5jb2RpbmdzLmVtcHR5KCkpIHsKKyAgICAgICAgQUxXQVlTX0xPR19JRl9Q T1NTSUJMRShMT0dJREVOVElGSUVSLCAiY29udGVudF9lbmNvZGluZ3MgZGV0ZWN0ZWQ6Iik7Cisg ICAgICAgIGZvciAoYXV0byYgZW5jb2RpbmcgOiB0cmFja0VudHJ5LmNvbnRlbnRfZW5jb2Rpbmdz LnZhbHVlKCkuZW5jb2RpbmdzKSB7CisgICAgICAgICAgICBpZiAoIWVuY29kaW5nLmlzX3ByZXNl bnQoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgYXV0byYgZW5j cnlwdGlvbiA9IGVuY29kaW5nLnZhbHVlKCkuZW5jcnlwdGlvbjsKKyAgICAgICAgICAgIGlmICgh ZW5jcnlwdGlvbi5pc19wcmVzZW50KCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAg ICAgICAgICAgIGF1dG8mIGtleUlkRWxlbWVudCA9IGVuY3J5cHRpb24udmFsdWUoKS5rZXlfaWQ7 CisgICAgICAgICAgICBpZiAoIWtleUlkRWxlbWVudC5pc19wcmVzZW50KCkpCisgICAgICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGF1dG8mIGtleUlkID0ga2V5SWRFbGVtZW50 LnZhbHVlKCk7CisgICAgICAgICAgICBtX2tleUlkcy5hcHBlbmQoc3RkOjptYWtlX3BhaXIodHJh Y2tFbnRyeS50cmFja191aWQudmFsdWUoKSwgVWludDhBcnJheTo6Y3JlYXRlKGtleUlkLmRhdGEo KSwga2V5SWQuc2l6ZSgpKSkpOworICAgICAgICB9CisgICAgfQorCiAgICAgU3RyaW5nVmlldyBj b2RlY1N0cmluZyB7IHRyYWNrRW50cnkuY29kZWNfaWQudmFsdWUoKS5kYXRhKCksICh1bnNpZ25l ZCl0cmFja0VudHJ5LmNvZGVjX2lkLnZhbHVlKCkubGVuZ3RoKCkgfTsKICNpZiBFTkFCTEUoVlA5 KQogICAgIGlmIChjb2RlY1N0cmluZyA9PSAiVl9WUDkiICYmIGlzVlA5RGVjb2RlckF2YWlsYWJs ZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv YS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmgKaW5kZXggYWY2MzRiYmNjYTkyMDJl ODQ2MTFmMjA4YmY2NWRiNzY4MjMyZDIxNy4uYzJmN2Q3ZjIxOTc5MWNiM2UwM2Q2NmRhZTBhMzIy ZWViZGNjZjIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uaApAQCAtOTYsNiArOTYs NyBAQCBwdWJsaWM6CiAgICAgICAgIFJlY2VpdmVkRWJtbEluc2lkZVNlZ21lbnQsCiAgICAgICAg IFVuc3VwcG9ydGVkVmlkZW9Db2RlYywKICAgICAgICAgVW5zdXBwb3J0ZWRBdWRpb0NvZGVjLAor ICAgICAgICBDb250ZW50RW5jcnlwdGVkLAogICAgIH07CiAKICAgICBlbnVtIGNsYXNzIFN0YXRl IDogdWludDhfdCB7CkBAIC0yNDgsNiArMjQ5LDcgQEAgcHJpdmF0ZToKICAgICB3ZWJtOjpTdGF0 dXMgT25GcmFtZShjb25zdCB3ZWJtOjpGcmFtZU1ldGFkYXRhJiwgd2VibTo6UmVhZGVyKiwgdWlu dDY0X3QqIGJ5dGVzUmVtYWluaW5nKSBmaW5hbDsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxJbml0 aWFsaXphdGlvblNlZ21lbnQ+IG1faW5pdGlhbGl6YXRpb25TZWdtZW50OworICAgIFZlY3Rvcjxz dGQ6OnBhaXI8dWludDY0X3QsIFJlZjxVaW50OEFycmF5Pj4+IG1fa2V5SWRzOwogICAgIHdlYm06 OlN0YXR1cyBtX3N0YXR1czsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8d2VibTo6V2VibVBhcnNlcj4g bV9wYXJzZXI7CiAgICAgYm9vbCBtX2luaXRpYWxpemF0aW9uU2VnbWVudEVuY291bnRlcmVkIHsg ZmFsc2UgfTsK