219710 2020-12-09 14:58:10 -0800 [WebAuthn] Adopt new UI for the Platform Authenticator getAssertion flow 2020-12-11 22:21:43 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181943 1 jiewen_tan jiewen_tan bfulgham jiewen_tan webkit-bug-importer oldest_to_newest 1713315 0 jiewen_tan 2020-12-09 14:58:10 -0800 Adopt new UI for the Platform Authenticator getAssertion flow. 1713316 1 webkit-bug-importer 2020-12-09 14:58:38 -0800 <rdar://problem/72154800> 1714208 2 416081 jiewen_tan 2020-12-11 18:16:25 -0800 Created attachment 416081 Patch 1714211 3 416081 bfulgham 2020-12-11 18:32:31 -0800 Comment on attachment 416081 Patch r=me 1714216 4 jiewen_tan 2020-12-11 18:42:29 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 416081 [details] > Patch > > r=me Thanks Brent for r+ this patch. Will cq+ it once all bots are green. 1714225 5 ews-feeder 2020-12-11 21:19:59 -0800 Committed r270730: <https://trac.webkit.org/changeset/270730> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416081. 416081 2020-12-11 18:16:25 -0800 2020-12-11 21:19:59 -0800 Patch bug-219710-20201211181624.patch text/plain 14412 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJiYTdhNTkxNmFlYTcz MGJlOThlZWI5MmJkYjJmN2UyOGM3MzIxZS4uMzA1NGU3MjViNjM1ZDE2MTRkYzQ3ZTg4Yzk2YTVk YWVhOTlmNzQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEyLTExICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBBZG9w dCBuZXcgVUkgZm9yIHRoZSBQbGF0Zm9ybSBBdXRoZW50aWNhdG9yIGdldEFzc2VydGlvbiBmbG93 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk3MTAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcyMTU0ODAwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgbWFudWFsIHRlc3RzLgorCisg ICAgICAgICogTW9kdWxlcy93ZWJhdXRobi9BdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OkF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZTo6bGFD b250ZXh0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkF1dGhlbnRpY2F0b3JBc3NlcnRpb25S ZXNwb25zZTo6c2V0TEFDb250ZXh0KToKKwogMjAyMC0xMi0xMSAgRXJpYyBDYXJsc29uICA8ZXJp Yy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIEFkZCBFeHBlcmltZW50YWwg Vm9yYmlzIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNDlhYTRkNTNiNGU3YzllMzllODNhZTA4ZjU3OGIy OGQ0NGJlZWNjNS4uMDYyMzA5MzU3MjhiNzAxMGQ2NTE1YTBmMDZhNDg4MDFhYmViNGE0OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAyMC0xMi0xMSAgSmlld2VuIFRhbiAgPGppZXdlbl90 YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQWRvcHQgbmV3IFVJIGZvciB0aGUg UGxhdGZvcm0gQXV0aGVudGljYXRvciBnZXRBc3NlcnRpb24gZmxvdworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NzEwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS83MjE1NDgwMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGFkb3B0cyB0aGUgbmV3IFVJIGZvciB0aGUgcGxhdGZvcm0g YXV0aGVudGljYXRvciBnZXRBc3NlcnRpb24gZmxvdy4gSXQncyBtb3JlIG9yIGxlc3MKKyAgICAg ICAgdGhlIHNhbWUgYXMgdGhlIHNlY3VyaXR5IGtleSBvbmUgZXhjZXB0IGFuIExBQ29udGV4dCB3 aWxsIGJlIHBhc3NlZCBpbiBmcm9tIHRoZSBVSS4gTm93IExvY2FsQXV0aGVudGljYXRvcgorICAg ICAgICB3aWxsIGp1c3QgdXRpbGl6ZSB0aGUgTEFDb250ZXh0IGZyb20gdGhlIFVJLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhlbnRpY2F0b3JQcmVz ZW50ZXJDb29yZGluYXRvci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlv bi9Db2NvYS9BdXRoZW50aWNhdG9yUHJlc2VudGVyQ29vcmRpbmF0b3IubW06CisgICAgICAgIChX ZWJLaXQ6OkF1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvcjo6QXV0aGVudGljYXRvclBy ZXNlbnRlckNvb3JkaW5hdG9yKToKKyAgICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRvclByZXNl bnRlckNvb3JkaW5hdG9yOjp+QXV0aGVudGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yKToKKyAg ICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yOjpzZWxlY3RB c3NlcnRpb25SZXNwb25zZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dGhlbnRpY2F0b3JQcmVzZW50 ZXJDb29yZGluYXRvcjo6ZGlkU2VsZWN0QXNzZXJ0aW9uUmVzcG9uc2UpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW06Cisg ICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVHZXRBc3NlcnRpb25B ZnRlclJlc3BvbnNlU2VsZWN0ZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9Db2NvYS9XS0FTQ0F1dGhvcml6YXRpb25QcmVzZW50ZXJEZWxlZ2F0ZS5tbToKKyAgICAg ICAgKC1bV0tBU0NBdXRob3JpemF0aW9uUHJlc2VudGVyRGVsZWdhdGUgYXV0aG9yaXphdGlvblBy ZXNlbnRlcjpjcmVkZW50aWFsUmVxdWVzdGVkRm9yTG9naW5DaG9pY2U6YXV0aGVudGljYXRlZENv bnRleHQ6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjAtMTItMTEgIEppZXdlbiBUYW4gIDxq aWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIEFkb3B0IG5ldyBVSSBm b3IgdGhlIFNlY3VyaXR5IEtleSBnZXRBc3NlcnRpb24gZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9BdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2Uu aCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vQXV0aGVudGljYXRvckFzc2VydGlv blJlc3BvbnNlLmgKaW5kZXggNWRjZDAzNzUwZjJlYWZjMDBiMzM2ZjFhYTY4YWVjOWI0NTI3Yzc4 Zi4uMmFkNjY1ZTEyODE4MDNhMjIyMmZlMjM2ZWU2MDU0YmJkYzlhZjEwMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9BdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVz cG9uc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL0F1dGhlbnRpY2F0 b3JBc3NlcnRpb25SZXNwb25zZS5oCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSA8d3RmL1Jl dGFpblB0ci5oPgogI2luY2x1ZGUgPHd0Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaD4KIAorT0JK Q19DTEFTUyBMQUNvbnRleHQ7CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQXV0aGVu dGljYXRvckFzc2VydGlvblJlc3BvbnNlIDogcHVibGljIEF1dGhlbnRpY2F0b3JSZXNwb25zZSB7 CkBAIC00NywxMiArNDksMTQgQEAgcHVibGljOgogICAgIGNvbnN0IFN0cmluZyYgZGlzcGxheU5h bWUoKSBjb25zdCB7IHJldHVybiBtX2Rpc3BsYXlOYW1lOyB9CiAgICAgc2l6ZV90IG51bWJlck9m Q3JlZGVudGlhbHMoKSBjb25zdCB7IHJldHVybiBtX251bWJlck9mQ3JlZGVudGlhbHM7IH0KICAg ICBTZWNBY2Nlc3NDb250cm9sUmVmIGFjY2Vzc0NvbnRyb2woKSBjb25zdCB7IHJldHVybiBtX2Fj Y2Vzc0NvbnRyb2wuZ2V0KCk7IH0KKyAgICBMQUNvbnRleHQgKiBsYUNvbnRleHQoKSBjb25zdCB7 IHJldHVybiBtX2xhQ29udGV4dC5nZXQoKTsgfQogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz ZXRBdXRoZW50aWNhdG9yRGF0YShWZWN0b3I8dWludDhfdD4mJik7CiAgICAgdm9pZCBzZXRTaWdu YXR1cmUoUmVmPEFycmF5QnVmZmVyPiYmIHNpZ25hdHVyZSkgeyBtX3NpZ25hdHVyZSA9IFdURk1v dmUoc2lnbmF0dXJlKTsgfQogICAgIHZvaWQgc2V0TmFtZShjb25zdCBTdHJpbmcmIG5hbWUpIHsg bV9uYW1lID0gbmFtZTsgfQogICAgIHZvaWQgc2V0RGlzcGxheU5hbWUoY29uc3QgU3RyaW5nJiBk aXNwbGF5TmFtZSkgeyBtX2Rpc3BsYXlOYW1lID0gZGlzcGxheU5hbWU7IH0KICAgICB2b2lkIHNl dE51bWJlck9mQ3JlZGVudGlhbHMoc2l6ZV90IG51bWJlck9mQ3JlZGVudGlhbHMpIHsgbV9udW1i ZXJPZkNyZWRlbnRpYWxzID0gbnVtYmVyT2ZDcmVkZW50aWFsczsgfQorICAgIHZvaWQgc2V0TEFD b250ZXh0KExBQ29udGV4dCAqY29udGV4dCkgeyBtX2xhQ29udGV4dCA9IGNvbnRleHQ7IH0KIAog cHJpdmF0ZToKICAgICBBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2UoUmVmPEFycmF5QnVm ZmVyPiYmLCBSZWY8QXJyYXlCdWZmZXI+JiYsIFJlZjxBcnJheUJ1ZmZlcj4mJiwgUmVmUHRyPEFy cmF5QnVmZmVyPiYmKTsKQEAgLTY5LDYgKzczLDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9k aXNwbGF5TmFtZTsKICAgICBzaXplX3QgbV9udW1iZXJPZkNyZWRlbnRpYWxzIHsgMCB9OwogICAg IFJldGFpblB0cjxTZWNBY2Nlc3NDb250cm9sUmVmPiBtX2FjY2Vzc0NvbnRyb2w7CisgICAgUmV0 YWluUHRyPExBQ29udGV4dD4gbV9sYUNvbnRleHQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlv bi9Db2NvYS9BdXRoZW50aWNhdG9yUHJlc2VudGVyQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhlbnRpY2F0b3JQcmVzZW50 ZXJDb29yZGluYXRvci5oCmluZGV4IDQzYzZjMDU4ZjQ0MmFjMWRhNjc5NDM0ZjQ5NDcyMmMzYzU4 MTIwODAuLjYzZDA3MGMzZGU3ZDI4NzY2YjVjYTg2Y2U4YTM1ZTQ5MGZlNmNkNDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhl bnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29yZGlu YXRvci5oCkBAIC0zNSwxNSArMzUsMTIgQEAKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAj aW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAorT0JKQ19DTEFTUyBBU0NBdXRob3JpemF0aW9uUHJl c2VudGF0aW9uQ29udGV4dDsKIE9CSkNfQ0xBU1MgQVNDQXV0aG9yaXphdGlvblByZXNlbnRlcjsK IE9CSkNfQ0xBU1MgQVNDTG9naW5DaG9pY2VQcm90b2NvbDsKIE9CSkNfQ0xBU1MgTEFDb250ZXh0 OwogT0JKQ19DTEFTUyBXS0FTQ0F1dGhvcml6YXRpb25QcmVzZW50ZXJEZWxlZ2F0ZTsKIAotbmFt ZXNwYWNlIFdlYkNvcmUgewotY2xhc3MgQXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlOwot fQotCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgQXV0aGVudGljYXRvck1hbmFnZXI7CkBA IC01Niw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICB1c2luZyBDcmVkZW50aWFsUmVxdWVzdEhhbmRs ZXIgPSBGdW5jdGlvbjx2b2lkKCk+OwogCiAgICAgQXV0aGVudGljYXRvclByZXNlbnRlckNvb3Jk aW5hdG9yKGNvbnN0IEF1dGhlbnRpY2F0b3JNYW5hZ2VyJiwgY29uc3QgU3RyaW5nJiBycElkLCBj b25zdCBUcmFuc3BvcnRTZXQmLCBXZWJDb3JlOjpDbGllbnREYXRhVHlwZSk7CisgICAgfkF1dGhl bnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvcigpOwogCiAgICAgdm9pZCB1cGRhdGVQcmVzZW50 ZXIoV2ViQXV0aGVudGljYXRpb25TdGF0dXMpOwogICAgIHZvaWQgcmVxdWVzdFBpbih1aW50NjRf dCByZXRyaWVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFN0cmluZyYpPiYmKTsKQEAg LTY2LDEwICs2NCwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDcmVkZW50aWFsUmVxdWVzdEhh bmRsZXIoQ3JlZGVudGlhbFJlcXVlc3RIYW5kbGVyJiYgaGFuZGxlcikgeyBtX2NyZWRlbnRpYWxS ZXF1ZXN0SGFuZGxlciA9IFdURk1vdmUoaGFuZGxlcik7IH0KICAgICB2b2lkIHNldExBQ29udGV4 dChMQUNvbnRleHQgKik7CiAKLSAgICB2b2lkIGRpZFNlbGVjdEFzc2VydGlvblJlc3BvbnNlKEFT Q0xvZ2luQ2hvaWNlUHJvdG9jb2wgKik7CisgICAgdm9pZCBkaWRTZWxlY3RBc3NlcnRpb25SZXNw b25zZShBU0NMb2dpbkNob2ljZVByb3RvY29sICosIExBQ29udGV4dCAqKTsKIAogcHJpdmF0ZToK ICAgICBXZWFrUHRyPEF1dGhlbnRpY2F0b3JNYW5hZ2VyPiBtX21hbmFnZXI7CisgICAgUmV0YWlu UHRyPEFTQ0F1dGhvcml6YXRpb25QcmVzZW50YXRpb25Db250ZXh0PiBtX2NvbnRleHQ7CiAgICAg UmV0YWluUHRyPEFTQ0F1dGhvcml6YXRpb25QcmVzZW50ZXI+IG1fcHJlc2VudGVyOwogICAgIFJl dGFpblB0cjxXS0FTQ0F1dGhvcml6YXRpb25QcmVzZW50ZXJEZWxlZ2F0ZT4gbV9wcmVzZW50ZXJE ZWxlZ2F0ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vQ29jb2EvQXV0aGVudGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvQXV0aGVudGljYXRv clByZXNlbnRlckNvb3JkaW5hdG9yLm1tCmluZGV4IDdlOTIxYWJiMDg2NDc1MDJhZjhhNGRlYzQx NmE2NTU2ZTI4YTIyNGYuLjg5ODU2Zjg2MDhkMmI2Y2QzNWI0MTgyMmI5YjkyMGM1ZWU2NTUxZjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0Nv Y29hL0F1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvci5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9BdXRoZW50aWNhdG9yUHJlc2Vu dGVyQ29vcmRpbmF0b3IubW0KQEAgLTQxLDIwICs0MSwyMCBAQCBBdXRoZW50aWNhdG9yUHJlc2Vu dGVyQ29vcmRpbmF0b3I6OkF1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvcihjb25zdCBB dXRoZQogICAgIDogbV9tYW5hZ2VyKG1ha2VXZWFrUHRyKG1hbmFnZXIpKQogewogI2lmIEhBVkUo QVNDX0FVVEhfVUkpCi0gICAgYXV0byBwcmVzZW50YXRpb25Db250ZXh0ID0gYWRvcHROUyhbYWxs b2NBU0NBdXRob3JpemF0aW9uUHJlc2VudGF0aW9uQ29udGV4dEluc3RhbmNlKCkgaW5pdFdpdGhS ZXF1ZXN0Q29udGV4dDpudWxscHRyIGFwcElkZW50aWZpZXI6bnVsbHB0cl0pOworICAgIG1fY29u dGV4dCA9IGFkb3B0TlMoW2FsbG9jQVNDQXV0aG9yaXphdGlvblByZXNlbnRhdGlvbkNvbnRleHRJ bnN0YW5jZSgpIGluaXRXaXRoUmVxdWVzdENvbnRleHQ6bnVsbHB0ciBhcHBJZGVudGlmaWVyOm51 bGxwdHJdKTsKICAgICBpZiAoW2dldEFTQ0F1dGhvcml6YXRpb25QcmVzZW50YXRpb25Db250ZXh0 Q2xhc3MoKSBpbnN0YW5jZXNSZXNwb25kVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0U2VydmljZU5h bWU6KV0pCi0gICAgICAgIFtwcmVzZW50YXRpb25Db250ZXh0IHNldFNlcnZpY2VOYW1lOnJwSWRd OworICAgICAgICBbbV9jb250ZXh0IHNldFNlcnZpY2VOYW1lOnJwSWRdOwogCiAgICAgc3dpdGNo ICh0eXBlKSB7CiAgICAgY2FzZSBDbGllbnREYXRhVHlwZTo6Q3JlYXRlOgogICAgICAgICBpZiAo dHJhbnNwb3J0cy5jb250YWlucyhBdXRoZW50aWNhdG9yVHJhbnNwb3J0OjpJbnRlcm5hbCkpCi0g ICAgICAgICAgICBbcHJlc2VudGF0aW9uQ29udGV4dCBhZGRMb2dpbkNob2ljZTphZG9wdE5TKFth bGxvY0FTQ1BsYXRmb3JtUHVibGljS2V5Q3JlZGVudGlhbExvZ2luQ2hvaWNlSW5zdGFuY2UoKSBp bml0UmVnaXN0cmF0aW9uQ2hvaWNlXSkuZ2V0KCldOworICAgICAgICAgICAgW21fY29udGV4dCBh ZGRMb2dpbkNob2ljZTphZG9wdE5TKFthbGxvY0FTQ1BsYXRmb3JtUHVibGljS2V5Q3JlZGVudGlh bExvZ2luQ2hvaWNlSW5zdGFuY2UoKSBpbml0UmVnaXN0cmF0aW9uQ2hvaWNlXSkuZ2V0KCldOwog ICAgICAgICBpZiAodHJhbnNwb3J0cy5jb250YWlucyhBdXRoZW50aWNhdG9yVHJhbnNwb3J0OjpV c2IpIHx8IHRyYW5zcG9ydHMuY29udGFpbnMoQXV0aGVudGljYXRvclRyYW5zcG9ydDo6TmZjKSkK LSAgICAgICAgICAgIFtwcmVzZW50YXRpb25Db250ZXh0IGFkZExvZ2luQ2hvaWNlOmFkb3B0TlMo W2FsbG9jQVNDU2VjdXJpdHlLZXlQdWJsaWNLZXlDcmVkZW50aWFsTG9naW5DaG9pY2VJbnN0YW5j ZSgpIGluaXRSZWdpc3RyYXRpb25DaG9pY2VdKS5nZXQoKV07CisgICAgICAgICAgICBbbV9jb250 ZXh0IGFkZExvZ2luQ2hvaWNlOmFkb3B0TlMoW2FsbG9jQVNDU2VjdXJpdHlLZXlQdWJsaWNLZXlD cmVkZW50aWFsTG9naW5DaG9pY2VJbnN0YW5jZSgpIGluaXRSZWdpc3RyYXRpb25DaG9pY2VdKS5n ZXQoKV07CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ2xpZW50RGF0YVR5cGU6OkdldDoKICAg ICAgICAgaWYgKHRyYW5zcG9ydHMuY29udGFpbnMoQXV0aGVudGljYXRvclRyYW5zcG9ydDo6VXNi KSB8fCB0cmFuc3BvcnRzLmNvbnRhaW5zKEF1dGhlbnRpY2F0b3JUcmFuc3BvcnQ6Ok5mYykpCi0g ICAgICAgICAgICBbcHJlc2VudGF0aW9uQ29udGV4dCBhZGRMb2dpbkNob2ljZTphZG9wdE5TKFth bGxvY0FTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3JlZGVudGlhbExvZ2luQ2hvaWNlSW5zdGFuY2Uo KSBpbml0QXNzZXJ0aW9uUGxhY2Vob2xkZXJDaG9pY2VdKS5nZXQoKV07CisgICAgICAgICAgICBb bV9jb250ZXh0IGFkZExvZ2luQ2hvaWNlOmFkb3B0TlMoW2FsbG9jQVNDU2VjdXJpdHlLZXlQdWJs aWNLZXlDcmVkZW50aWFsTG9naW5DaG9pY2VJbnN0YW5jZSgpIGluaXRBc3NlcnRpb25QbGFjZWhv bGRlckNob2ljZV0pLmdldCgpXTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC03NiwxMCArNzYsMTggQEAgQXV0aGVudGljYXRv clByZXNlbnRlckNvb3JkaW5hdG9yOjpBdXRoZW50aWNhdG9yUHJlc2VudGVyQ29vcmRpbmF0b3Io Y29uc3QgQXV0aGUKICAgICAgICAgICAgICAgICBtYW5hZ2VyLT5jYW5jZWwoKTsKICAgICAgICAg fSk7CiAgICAgfSk7Ci0gICAgW21fcHJlc2VudGVyIHByZXNlbnRBdXRob3JpemF0aW9uV2l0aENv bnRleHQ6cHJlc2VudGF0aW9uQ29udGV4dC5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0 aW9uSGFuZGxlci5nZXQoKV07CisgICAgW21fcHJlc2VudGVyIHByZXNlbnRBdXRob3JpemF0aW9u V2l0aENvbnRleHQ6bV9jb250ZXh0LmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25I YW5kbGVyLmdldCgpXTsKICNlbmRpZiAvLyBIQVZFKEFTQ19BVVRIX1VJKQogfQogCitBdXRoZW50 aWNhdG9yUHJlc2VudGVyQ29vcmRpbmF0b3I6On5BdXRoZW50aWNhdG9yUHJlc2VudGVyQ29vcmRp bmF0b3IoKQoreworICAgIGlmIChtX2xhQ29udGV4dEhhbmRsZXIpCisgICAgICAgIG1fbGFDb250 ZXh0SGFuZGxlcihudWxscHRyKTsKKyAgICBpZiAobV9yZXNwb25zZUhhbmRsZXIpCisgICAgICAg IG1fcmVzcG9uc2VIYW5kbGVyKG51bGxwdHIpOworfQorCiB2b2lkIEF1dGhlbnRpY2F0b3JQcmVz ZW50ZXJDb29yZGluYXRvcjo6dXBkYXRlUHJlc2VudGVyKFdlYkF1dGhlbnRpY2F0aW9uU3RhdHVz KQogewogICAgIC8vIEZJWE1FKDIxOTcxMyk6IEFkb3B0IG5ldyBVSSBmb3IgdGhlIHVwZGF0ZSBm bG93LgpAQCAtMTE0LDcgKzEyMiwyNSBAQCB2b2lkIEF1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29y ZGluYXRvcjo6c2VsZWN0QXNzZXJ0aW9uUmVzcG9uc2UoVmVjdG9yPFJlZjxBdXRoZQogICAgICAg ICBbbV9wcmVzZW50ZXIgdXBkYXRlSW50ZXJmYWNlV2l0aExvZ2luQ2hvaWNlczpsb2dpbkNob2lj ZXMuZ2V0KCldOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIC8vIEZJWE1FKDIxOTcxMCk6 IEFkb3B0IG5ldyBVSSBmb3IgdGhlIFBsYXRmb3JtIEF1dGhlbnRpY2F0b3IgZ2V0QXNzZXJ0aW9u IGZsb3cuCisKKyAgICBpZiAoc291cmNlID09IFdlYkF1dGhlbnRpY2F0aW9uU291cmNlOjpMb2Nh bCkgeworICAgICAgICBhdXRvIGxvZ2luQ2hvaWNlcyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJh eSBhbGxvY10gaW5pdF0pOworCisgICAgICAgIGZvciAoYXV0byYgcmVzcG9uc2UgOiByZXNwb25z ZXMpIHsKKyAgICAgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IHVzZXJIYW5kbGU7CisgICAgICAg ICAgICBpZiAocmVzcG9uc2UtPnVzZXJIYW5kbGUoKSkKKyAgICAgICAgICAgICAgICB1c2VySGFu ZGxlID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczpyZXNwb25zZS0+dXNl ckhhbmRsZSgpLT5kYXRhKCkgbGVuZ3RoOnJlc3BvbnNlLT51c2VySGFuZGxlKCktPmJ5dGVMZW5n dGgoKV0pOworCisgICAgICAgICAgICBhdXRvIGxvZ2luQ2hvaWNlID0gYWRvcHROUyhbYWxsb2NB U0NQbGF0Zm9ybVB1YmxpY0tleUNyZWRlbnRpYWxMb2dpbkNob2ljZUluc3RhbmNlKCkgaW5pdFdp dGhOYW1lOnJlc3BvbnNlLT5uYW1lKCkgZGlzcGxheU5hbWU6cmVzcG9uc2UtPmRpc3BsYXlOYW1l KCkgdXNlckhhbmRsZTp1c2VySGFuZGxlLmdldCgpXSk7CisgICAgICAgICAgICBbbG9naW5DaG9p Y2VzIGFkZE9iamVjdDpsb2dpbkNob2ljZS5nZXQoKV07CisKKyAgICAgICAgICAgIG1fY3JlZGVu dGlhbHMuYWRkKChBU0NMb2dpbkNob2ljZVByb3RvY29sICopbG9naW5DaG9pY2UuZ2V0KCksIFdU Rk1vdmUocmVzcG9uc2UpKTsKKyAgICAgICAgfQorCisgICAgICAgIFtsb2dpbkNob2ljZXMgYWRk T2JqZWN0c0Zyb21BcnJheTpbbV9jb250ZXh0IGxvZ2luQ2hvaWNlc11dOyAvLyBBZGRzIHRoZSBz ZWN1cml0eSBrZXkgb3B0aW9uIGlmIGV4aXN0cy4KKyAgICAgICAgW21fcHJlc2VudGVyIHVwZGF0 ZUludGVyZmFjZVdpdGhMb2dpbkNob2ljZXM6bG9naW5DaG9pY2VzLmdldCgpXTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KICNlbmRpZiAvLyBIQVZFKEFTQ19BVVRIX1VJKQogfQogCkBAIC0xNDcs MTIgKzE3MywxNSBAQCB2b2lkIEF1dGhlbnRpY2F0b3JQcmVzZW50ZXJDb29yZGluYXRvcjo6c2V0 TEFDb250ZXh0KExBQ29udGV4dCAqY29udGV4dCkKICAgICBtX2xhQ29udGV4dCA9IGNvbnRleHQ7 CiB9CiAKLXZvaWQgQXV0aGVudGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yOjpkaWRTZWxlY3RB c3NlcnRpb25SZXNwb25zZShBU0NMb2dpbkNob2ljZVByb3RvY29sICpsb2dpbkNob2ljZSkKK3Zv aWQgQXV0aGVudGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yOjpkaWRTZWxlY3RBc3NlcnRpb25S ZXNwb25zZShBU0NMb2dpbkNob2ljZVByb3RvY29sICpsb2dpbkNob2ljZSwgTEFDb250ZXh0ICpj b250ZXh0KQogewogICAgIGF1dG8gcmVzcG9uc2UgPSBtX2NyZWRlbnRpYWxzLnRha2UobG9naW5D aG9pY2UpOwogICAgIGlmICghcmVzcG9uc2UpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChj b250ZXh0KQorICAgICAgICByZXNwb25zZS0+c2V0TEFDb250ZXh0KGNvbnRleHQpOworCiAgICAg bV9yZXNwb25zZUhhbmRsZXIocmVzcG9uc2UuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRp Y2F0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2Nv YS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KaW5kZXggZDhmZDdmZDhmMjdlMTgzMmM1YWI4ZjQyMWM0 NzFlNDIyMTIyMjk1My4uNWI0NWJjMjhiNTcyNDM0MzBkMzIyNzg1N2JjMGIxNmU1NDQwMTYzZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29j b2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQpAQCAtNTMxLDYgKzUz MSwyNCBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVHZXRBc3NlcnRpb25BZnRl clJlc3BvbnNlU2VsZWN0ZWQoUmVmPFdlYkNvcmU6OgogICAgIEFTU0VSVChtX3N0YXRlID09IFN0 YXRlOjpSZXF1ZXN0UmVjZWl2ZWQpOwogICAgIG1fc3RhdGUgPSBTdGF0ZTo6UmVzcG9uc2VTZWxl Y3RlZDsKIAorICAgIGlmICh3ZWJBdXRoZW50aWNhdGlvbk1vZGVybkVuYWJsZWQoKSkgeworICAg ICAgICBhdXRvIGFjY2Vzc0NvbnRyb2xSZWYgPSByZXNwb25zZS0+YWNjZXNzQ29udHJvbCgpOwor ICAgICAgICBMQUNvbnRleHQgKmNvbnRleHQgPSByZXNwb25zZS0+bGFDb250ZXh0KCk7CisgICAg ICAgIGF1dG8gY2FsbGJhY2sgPSBbCisgICAgICAgICAgICB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRy KCp0aGlzKSwKKyAgICAgICAgICAgIHJlc3BvbnNlID0gV1RGTW92ZShyZXNwb25zZSkKKyAgICAg ICAgXSAoTG9jYWxDb25uZWN0aW9uOjpVc2VyVmVyaWZpY2F0aW9uIHZlcmlmaWNhdGlvbikgbXV0 YWJsZSB7CisgICAgICAgICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgICAgICAg ICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAg IHdlYWtUaGlzLT5jb250aW51ZUdldEFzc2VydGlvbkFmdGVyVXNlclZlcmlmaWNhdGlvbihXVEZN b3ZlKHJlc3BvbnNlKSwgdmVyaWZpY2F0aW9uLCByZXNwb25zZS0+bGFDb250ZXh0KCkpOworICAg ICAgICB9OworCisgICAgICAgIG1fY29ubmVjdGlvbi0+dmVyaWZ5VXNlcihhY2Nlc3NDb250cm9s UmVmLCBjb250ZXh0LCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKICAgICBhdXRvJiByZXF1ZXN0T3B0aW9ucyA9IFdURjo6Z2V0PFB1YmxpY0tleUNyZWRlbnRp YWxSZXF1ZXN0T3B0aW9ucz4ocmVxdWVzdERhdGEoKS5vcHRpb25zKTsKIAogICAgIGF1dG8gYWNj ZXNzQ29udHJvbFJlZiA9IHJlc3BvbnNlLT5hY2Nlc3NDb250cm9sKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XS0FTQ0F1dGhv cml6YXRpb25QcmVzZW50ZXJEZWxlZ2F0ZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL1dLQVNDQXV0aG9yaXphdGlvblByZXNlbnRlckRlbGVnYXRl Lm1tCmluZGV4IDM0YWEzMTcwM2Q3Njg4YTRlNGE3Y2YwMzQ5ODQxMGVhNmQ0NTcwZGQuLjBhYWFj NjQzYzQ1Y2Q5MGUwYzQyNmVmY2M4M2JiNmZhN2JmOWE2MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dLQVNDQXV0aG9yaXphdGlv blByZXNlbnRlckRlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1 dGhlbnRpY2F0aW9uL0NvY29hL1dLQVNDQXV0aG9yaXphdGlvblByZXNlbnRlckRlbGVnYXRlLm1t CkBAIC02NCwxMiArNjQsMjAgQEAgLSAodm9pZClhdXRob3JpemF0aW9uUHJlc2VudGVyOihBU0NB dXRob3JpemF0aW9uUHJlc2VudGVyICopcHJlc2VudGVyIGNyZWRlbnRpYWwKIAogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CisKKyAgICAgICAgaWYgKCFbKEFTQ1BsYXRmb3JtUHVibGlj S2V5Q3JlZGVudGlhbExvZ2luQ2hvaWNlICopbG9naW5DaG9pY2UgaXNSZWdpc3RyYXRpb25SZXF1 ZXN0XSkgeworICAgICAgICAgICAgW3NlbGYgZGlzcGF0Y2hDb29yZGluYXRvckNhbGxiYWNrOlts b2dpbkNob2ljZSwgY29udGV4dCA9IHJldGFpblB0cihjb250ZXh0KV0gKFdlYktpdDo6QXV0aGVu dGljYXRvclByZXNlbnRlckNvb3JkaW5hdG9yJiBjb29yZGluYXRvcikgbXV0YWJsZSB7CisgICAg ICAgICAgICAgICAgY29vcmRpbmF0b3IuZGlkU2VsZWN0QXNzZXJ0aW9uUmVzcG9uc2UoKEFTQ0xv Z2luQ2hvaWNlUHJvdG9jb2wgKilsb2dpbkNob2ljZSwgY29udGV4dC5nZXQoKSk7CisgICAgICAg ICAgICB9XTsKKworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAgfQogCiAgICAg aWYgKFtsb2dpbkNob2ljZSBpc0tpbmRPZkNsYXNzOldlYktpdDo6Z2V0QVNDU2VjdXJpdHlLZXlQ dWJsaWNLZXlDcmVkZW50aWFsTG9naW5DaG9pY2VDbGFzcygpXSkgewogICAgICAgICBpZiAoWyhB U0NTZWN1cml0eUtleVB1YmxpY0tleUNyZWRlbnRpYWxMb2dpbkNob2ljZSAqKWxvZ2luQ2hvaWNl IGxvZ2luQ2hvaWNlS2luZF0gPT0gQVNDU2VjdXJpdHlLZXlQdWJsaWNLZXlDcmVkZW50aWFsTG9n aW5DaG9pY2VLaW5kQXNzZXJ0aW9uKSB7CiAgICAgICAgICAgICBbc2VsZiBkaXNwYXRjaENvb3Jk aW5hdG9yQ2FsbGJhY2s6W2xvZ2luQ2hvaWNlXSAoV2ViS2l0OjpBdXRoZW50aWNhdG9yUHJlc2Vu dGVyQ29vcmRpbmF0b3ImIGNvb3JkaW5hdG9yKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAgICBj b29yZGluYXRvci5kaWRTZWxlY3RBc3NlcnRpb25SZXNwb25zZSgoQVNDTG9naW5DaG9pY2VQcm90 b2NvbCAqKWxvZ2luQ2hvaWNlKTsKKyAgICAgICAgICAgICAgICBjb29yZGluYXRvci5kaWRTZWxl Y3RBc3NlcnRpb25SZXNwb25zZSgoQVNDTG9naW5DaG9pY2VQcm90b2NvbCAqKWxvZ2luQ2hvaWNl LCBuaWwpOwogICAgICAgICAgICAgfV07CiAKICAgICAgICAgICAgIHJldHVybjsK