217945 2020-10-20 01:31:57 -0700 [WebAuthn] Determine an AAGUID for the platform authenticators 2020-11-05 00:47:03 -0800 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181943 1 frederic.jahn jiewen_tan bfulgham jiewen_tan smoley webkit-bug-importer oldest_to_newest 1699643 0 frederic.jahn 2020-10-20 01:31:57 -0700 Our implementation (and surely some others) to allow-list certain authenticators is based on them being present in the FIDO Metadata Service. To add Apple Authenticators to the list we would have to hard code a separate code path. If you would generate a uuid and serve them in your attestation plus adding the Apple Authenticators to https://mymds2.fidoalliance.org/ would definitely ensure better interoperability and make the life of developers easier. 1700825 1 smoley 2020-10-22 14:01:38 -0700 Thanks for filing, I'll Cc a few folks here for consideration. 1700826 2 webkit-bug-importer 2020-10-22 14:01:48 -0700 <rdar://problem/70588322> 1702743 3 jiewen_tan 2020-10-29 09:15:03 -0700 <rdar://problem/70811618> 1704354 4 413150 jiewen_tan 2020-11-04 01:50:35 -0800 Created attachment 413150 Patch 1704594 5 413150 bfulgham 2020-11-04 13:52:53 -0800 Comment on attachment 413150 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413150&action=review This looks good to me, but I'd like you to double-check the none-attestation case before we land. > Source/WebKit/ChangeLog:9 > + The AAGUID is randomly generated by CCRandomGenerateBytes. I think we should say: "Relying parties use the AAGUID to recognize supported authenticators. Using a NULL AAGUID blocks them from recognizing Apple products as valid WebAuthentication targets. We need to assign ourselves a GUID representing Apple authenticators, then publish with our attestation certificate and with the FIDO Alliance." It would also be good to reference the communication to the FIDO alliance documenting this GUID (not sure if this would be a pull request, or how that works). > Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:373 > + auto authData = buildAuthData(creationOptions.rp.id, makeCredentialFlags, counter, buildAttestedCredentialData(Vector<uint8_t>(aaguidLength, 0), credentialId, cosePublicKey)); Do we not want to indicate that we are an Apple authenticator for the none-attestation case? From Frederic Jahn's bug report, it sounds like this is needed to decide whether they allow our authenticator at all. If you aren't sure, can you check with Frederic? 1704749 6 413150 jiewen_tan 2020-11-04 23:43:45 -0800 Comment on attachment 413150 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413150&action=review Thanks Brent for r+ this patch. >> Source/WebKit/ChangeLog:9 >> + The AAGUID is randomly generated by CCRandomGenerateBytes. > > I think we should say: > > "Relying parties use the AAGUID to recognize supported authenticators. Using a NULL AAGUID blocks them from recognizing Apple products as valid WebAuthentication targets. We need to assign ourselves a GUID representing Apple authenticators, then publish with our attestation certificate and with the FIDO Alliance." > > It would also be good to reference the communication to the FIDO alliance documenting this GUID (not sure if this would be a pull request, or how that works). Sure. Fixed. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:373 >> + auto authData = buildAuthData(creationOptions.rp.id, makeCredentialFlags, counter, buildAttestedCredentialData(Vector<uint8_t>(aaguidLength, 0), credentialId, cosePublicKey)); > > Do we not want to indicate that we are an Apple authenticator for the none-attestation case? From Frederic Jahn's bug report, it sounds like this is needed to decide whether they allow our authenticator at all. > > If you aren't sure, can you check with Frederic? For none attestation, the AAGUID is required to be all zero. 1704751 7 413262 jiewen_tan 2020-11-04 23:45:15 -0800 Created attachment 413262 Patch for landing 1704768 8 ews-feeder 2020-11-05 00:47:02 -0800 Committed r269420: <https://trac.webkit.org/changeset/269420> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413262. 413150 2020-11-04 01:50:35 -0800 2020-11-04 13:52:53 -0800 Patch bug-217945-20201104015034.patch text/plain 5852 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyZjhlNjJmNWM3MjczYzZj ZTUwNjExYWYyYTY3NDVmMTcwODk1MGMuLjNhZDZlNTFiNjJiNmE3MTkzMzc2ZWY4ODA3YzE4OWI2 ZmRjYzk1ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMTEtMDQgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIERldGVybWlu ZSBhbiBBQUdVSUQgZm9yIHRoZSBwbGF0Zm9ybSBhdXRoZW50aWNhdG9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3OTQ1CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS83MDgxMTYxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgQUFHVUlEIGlzIHJhbmRvbWx5IGdlbmVyYXRlZCBieSBDQ1JhbmRv bUdlbmVyYXRlQnl0ZXMuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRp Y2F0b3IubW06CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvckludGVybmFsOjph YWd1aWRWZWN0b3IpOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhlbnRpY2F0b3I6OmNvbnRp bnVlTWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24pOgorCiAyMDIwLTExLTAyICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBzb21lIHVz ZWxlc3MgY29tbWVudHMgZnJvbSAubWVzc2FnZXMuaW4gZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGlj YXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29h L0xvY2FsQXV0aGVudGljYXRvci5tbQppbmRleCA0ZGM5N2U4OTM5MGU4NWFhYTU1ZWRlNGVmMjgw MWUxYjY3OGIzZGRlLi43NWQ3ZDhlNTdmOGQ3ZGY1YzE2NDU2Y2NmMDc1YmZjOTgyOGQ1YzllIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2Nv YS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCkBAIC01OSw2ICs1OSw3 IEBAIGNvbnN0IHVpbnQ4X3QgZ2V0QXNzZXJ0aW9uRmxhZ3MgPSAwYjAwMDAwMTAxOyAvLyBVUCBh bmQgVVYgYXJlIHNldC4KIC8vIENyZWRlbnRpYWwgSUQgaXMgY3VycmVudGx5IFNIQS0xIG9mIHRo ZSBjb3JyZXNwb25kaW5nIHB1YmxpYyBrZXkuCiBjb25zdCB1aW50MTZfdCBjcmVkZW50aWFsSWRM ZW5ndGggPSAyMDsKIGNvbnN0IHVpbnQ2NF90IGNvdW50ZXIgPSAwOworY29uc3QgdWludDhfdCBh YWd1aWRbXSA9IHsgMHhGMiwgMHg0QSwgMHg4RSwgMHg3MCwgMHhEMCwgMHhEMywgMHhGOCwgMHgy QywgMHgyOSwgMHgzNywgMHgzMiwgMHg1MiwgMHgzQywgMHhDNCwgMHhERSwgMHg1QSB9OyAvLyBS YW5kb21seSBnZW5lcmF0ZWQuCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBlbXB0eVRyYW5zcG9ydHNP ckNvbnRhaW4oY29uc3QgVmVjdG9yPEF1dGhlbnRpY2F0b3JUcmFuc3BvcnQ+JiB0cmFuc3BvcnRz LCBBdXRoZW50aWNhdG9yVHJhbnNwb3J0IHRhcmdldCkKIHsKQEAgLTg1LDYgKzg2LDEzIEBAIHN0 YXRpYyBpbmxpbmUgVmVjdG9yPHVpbnQ4X3Q+IHRvVmVjdG9yKE5TRGF0YSAqZGF0YSkKICAgICBy ZXR1cm4gcmVzdWx0OwogfQogCitzdGF0aWMgaW5saW5lIFZlY3Rvcjx1aW50OF90PiBhYWd1aWRW ZWN0b3IoKQoreworICAgIFZlY3Rvcjx1aW50OF90PiByZXN1bHQ7CisgICAgcmVzdWx0LmFwcGVu ZChhYWd1aWQsIGFhZ3VpZExlbmd0aCk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogc3RhdGlj IGlubGluZSBSZXRhaW5QdHI8TlNEYXRhPiB0b05TRGF0YShjb25zdCBWZWN0b3I8dWludDhfdD4m IGRhdGEpCiB7CiAgICAgcmV0dXJuIGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0 ZXM6ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXSk7CkBAIC0zNTYsMjIgKzM2NCwyMCBA QCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyVXNl clZlcmlmaWNhdGlvbihTZWNBY2Nlc3NDbwogICAgICAgICBbbnNQdWJsaWNLZXlEYXRhIGdldEJ5 dGVzOiB5LmRhdGEoKSByYW5nZTpOU01ha2VSYW5nZSgxICsgRVMyNTZGaWVsZEVsZW1lbnRMZW5n dGgsIEVTMjU2RmllbGRFbGVtZW50TGVuZ3RoKV07CiAgICAgICAgIGNvc2VQdWJsaWNLZXkgPSBl bmNvZGVFUzI1NlB1YmxpY0tleUFzQ0JPUihXVEZNb3ZlKHgpLCBXVEZNb3ZlKHkpKTsKICAgICB9 Ci0gICAgLy8gRklYTUUocmRhcjovL3Byb2JsZW0vMzgzMjA1MTIpOiBEZWZpbmUgQXBwbGUgQUFH VUlELgotICAgIGF1dG8gYXR0ZXN0ZWRDcmVkZW50aWFsRGF0YSA9IGJ1aWxkQXR0ZXN0ZWRDcmVk ZW50aWFsRGF0YShWZWN0b3I8dWludDhfdD4oYWFndWlkTGVuZ3RoLCAwKSwgY3JlZGVudGlhbElk LCBjb3NlUHVibGljS2V5KTsKIAogICAgIC8vIFN0ZXAgMTIuCi0gICAgYXV0byBhdXRoRGF0YSA9 IGJ1aWxkQXV0aERhdGEoY3JlYXRpb25PcHRpb25zLnJwLmlkLCBtYWtlQ3JlZGVudGlhbEZsYWdz LCBjb3VudGVyLCBhdHRlc3RlZENyZWRlbnRpYWxEYXRhKTsKLQogICAgIC8vIFNraXAgQXBwbGUg QXR0ZXN0YXRpb24gZm9yIG5vbmUgYXR0ZXN0YXRpb24uCiAgICAgaWYgKGNyZWF0aW9uT3B0aW9u cy5hdHRlc3RhdGlvbiA9PSBBdHRlc3RhdGlvbkNvbnZleWFuY2VQcmVmZXJlbmNlOjpOb25lKSB7 CiAgICAgICAgIGRlbGV0ZUR1cGxpY2F0ZUNyZWRlbnRpYWwoKTsKIAorICAgICAgICBhdXRvIGF1 dGhEYXRhID0gYnVpbGRBdXRoRGF0YShjcmVhdGlvbk9wdGlvbnMucnAuaWQsIG1ha2VDcmVkZW50 aWFsRmxhZ3MsIGNvdW50ZXIsIGJ1aWxkQXR0ZXN0ZWRDcmVkZW50aWFsRGF0YShWZWN0b3I8dWlu dDhfdD4oYWFndWlkTGVuZ3RoLCAwKSwgY3JlZGVudGlhbElkLCBjb3NlUHVibGljS2V5KSk7CiAg ICAgICAgIGF1dG8gYXR0ZXN0YXRpb25PYmplY3QgPSBidWlsZEF0dGVzdGF0aW9uT2JqZWN0KFdU Rk1vdmUoYXV0aERhdGEpLCAiIiwgeyB9LCBBdHRlc3RhdGlvbkNvbnZleWFuY2VQcmVmZXJlbmNl OjpOb25lKTsKICAgICAgICAgcmVjZWl2ZVJlc3BvbmQoQXV0aGVudGljYXRvckF0dGVzdGF0aW9u UmVzcG9uc2U6OmNyZWF0ZShjcmVkZW50aWFsSWQsIGF0dGVzdGF0aW9uT2JqZWN0KSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKICAgICAvLyBTdGVwIDEzLiBBcHBsZSBBdHRlc3RhdGlvbgor ICAgIGF1dG8gYXV0aERhdGEgPSBidWlsZEF1dGhEYXRhKGNyZWF0aW9uT3B0aW9ucy5ycC5pZCwg bWFrZUNyZWRlbnRpYWxGbGFncywgY291bnRlciwgYnVpbGRBdHRlc3RlZENyZWRlbnRpYWxEYXRh KGFhZ3VpZFZlY3RvcigpLCBjcmVkZW50aWFsSWQsIGNvc2VQdWJsaWNLZXkpKTsKICAgICBhdXRv IG5zQXV0aERhdGEgPSB0b05TRGF0YShhdXRoRGF0YSk7CiAgICAgYXV0byBjYWxsYmFjayA9IFtj cmVkZW50aWFsSWQgPSBXVEZNb3ZlKGNyZWRlbnRpYWxJZCksIGF1dGhEYXRhID0gV1RGTW92ZShh dXRoRGF0YSksIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSAoTlNBcnJheSAqIF9OdWxs YWJsZSBjZXJ0aWZpY2F0ZXMsIE5TRXJyb3IgKiBfTnVsbGFibGUgZXJyb3IpIG11dGFibGUgewog ICAgICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGNmYjI2ZGE5MTI1ODIx MzczMjFiYTQzNjk2MjVhZDczYjM3ZGUyZWUuLjk3ZDhkOGY5MGIwNDg4OWJmNjU5MTcwMzA3ZDgz NjdjNzllYjQyNmUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0xMS0wNCAgSmlld2VuIFRh biAgPGppZXdlbl90YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gRGV0ZXJtaW5l IGFuIEFBR1VJRCBmb3IgdGhlIHBsYXRmb3JtIGF1dGhlbnRpY2F0b3JzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc5NDUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzcwODExNjE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNy ZWF0ZS1zdWNjZXNzLWxvY2FsLmh0dHBzLmh0bWw6CisKIDIwMjAtMTEtMDIgIERpZWdvIFBpbm8g R2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBVbnJldmlld2VkIHRl c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1 Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1 YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRwcy5odG1sCmluZGV4 IDVjNzk3NjBlMTVmMGZjMTUzODNiOWZmNjE3MTNiZjU0NTYyZTJlOTkuLmUyZWFlMDc3MTM5ODlh ZWY1ZGZhNDk5NmI2ZjUyZDRlNzUwY2U3YmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv d3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5o dHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXkt Y3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRwcy5odG1sCkBAIC0zMSw3ICszMSwx MCBAQAogICAgICAgICBhc3NlcnRfZXF1YWxzKGJ5dGVzVG9IZXhTdHJpbmcoYXV0aERhdGEucnBJ ZEhhc2gpLCAiNDk5NjBkZTU4ODBlOGM2ODc0MzQxNzBmNjQ3NjYwNWI4ZmU0YWViOWEyODYzMmM3 OTk1Y2YzYmE4MzFkOTc2MyIpOwogICAgICAgICBhc3NlcnRfZXF1YWxzKGF1dGhEYXRhLmZsYWdz LCA2OSk7CiAgICAgICAgIGFzc2VydF9lcXVhbHMoYXV0aERhdGEuY291bnRlciwgMCk7Ci0gICAg ICAgIGFzc2VydF9lcXVhbHMoYnl0ZXNUb0hleFN0cmluZyhhdXRoRGF0YS5hYWd1aWQpLCAiMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiKTsKKyAgICAgICAgaWYgKGlzTm9uZUF0dGVz dGF0aW9uKQorICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhieXRlc1RvSGV4U3RyaW5nKGF1dGhE YXRhLmFhZ3VpZCksICIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIpOworICAgICAg ICBlbHNlCisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGJ5dGVzVG9IZXhTdHJpbmcoYXV0aERh dGEuYWFndWlkKSwgImYyNGE4ZTcwZDBkM2Y4MmMyOTM3MzI1MjNjYzRkZTVhIik7CiAgICAgICAg IGFzc2VydF9hcnJheV9lcXVhbHMoYXV0aERhdGEuY3JlZGVudGlhbElELCBjcmVkZW50aWFsSUQp OwogICAgICAgICAvLyBDaGVjayBzZWxmIGF0dGVzdGF0aW9uCiAgICAgICAgIGFzc2VydF90cnVl KGNoZWNrUHVibGljS2V5KGF1dGhEYXRhLnB1YmxpY0tleSkpOwo= 413262 2020-11-04 23:45:15 -0800 2020-11-05 00:47:03 -0800 Patch for landing bug-217945-20201104234514.patch text/plain 6114 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyZjhlNjJmNWM3MjczYzZj ZTUwNjExYWYyYTY3NDVmMTcwODk1MGMuLjg1YmRiYjU4NjAxNjcwNDMwMzRjNWRkNjRhMDY5MTU2 M2EzMTdhZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMTEtMDQgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIERldGVybWlu ZSBhbiBBQUdVSUQgZm9yIHRoZSBwbGF0Zm9ybSBhdXRoZW50aWNhdG9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3OTQ1CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS83MDgxMTYxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFt LgorCisgICAgICAgIFJlbHlpbmcgcGFydGllcyB1c2UgdGhlIEFBR1VJRCB0byByZWNvZ25pemUg c3VwcG9ydGVkIGF1dGhlbnRpY2F0b3JzLiBVc2luZyBhIE5VTEwgQUFHVUlEIGJsb2NrcyB0aGVt IGZyb20gcmVjb2duaXppbmcgQXBwbGUgcHJvZHVjdHMgYXMgdmFsaWQgV2ViQXV0aGVudGljYXRp b24gdGFyZ2V0cy4KKyAgICAgICAgV2UgbmVlZCB0byBhc3NpZ24gb3Vyc2VsdmVzIGEgR1VJRCBy ZXByZXNlbnRpbmcgQXBwbGUgYXV0aGVudGljYXRvcnMsIHRoZW4gcHVibGlzaCB3aXRoIG91ciBh dHRlc3RhdGlvbiBjZXJ0aWZpY2F0ZSBhbmQgd2l0aCB0aGUgRklETyBBbGxpYW5jZS4KKworICAg ICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbToKKyAgICAgICAgKFdl YktpdDo6TG9jYWxBdXRoZW50aWNhdG9ySW50ZXJuYWw6OmFhZ3VpZFZlY3Rvcik6CisgICAgICAg IChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVy VXNlclZlcmlmaWNhdGlvbik6CisKIDIwMjAtMTEtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUgdXNlbGVzcyBjb21tZW50cyBmcm9tIC5t ZXNzYWdlcy5pbiBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1t CmluZGV4IDRkYzk3ZTg5MzkwZTg1YWFhNTVlZGU0ZWYyODAxZTFiNjc4YjNkZGUuLjc1ZDdkOGU1 N2Y4ZDdkZjVjMTY0NTZjY2YwNzViZmM5ODI4ZDVjOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9M b2NhbEF1dGhlbnRpY2F0b3IubW0KQEAgLTU5LDYgKzU5LDcgQEAgY29uc3QgdWludDhfdCBnZXRB c3NlcnRpb25GbGFncyA9IDBiMDAwMDAxMDE7IC8vIFVQIGFuZCBVViBhcmUgc2V0LgogLy8gQ3Jl ZGVudGlhbCBJRCBpcyBjdXJyZW50bHkgU0hBLTEgb2YgdGhlIGNvcnJlc3BvbmRpbmcgcHVibGlj IGtleS4KIGNvbnN0IHVpbnQxNl90IGNyZWRlbnRpYWxJZExlbmd0aCA9IDIwOwogY29uc3QgdWlu dDY0X3QgY291bnRlciA9IDA7Citjb25zdCB1aW50OF90IGFhZ3VpZFtdID0geyAweEYyLCAweDRB LCAweDhFLCAweDcwLCAweEQwLCAweEQzLCAweEY4LCAweDJDLCAweDI5LCAweDM3LCAweDMyLCAw eDUyLCAweDNDLCAweEM0LCAweERFLCAweDVBIH07IC8vIFJhbmRvbWx5IGdlbmVyYXRlZC4KIAog c3RhdGljIGlubGluZSBib29sIGVtcHR5VHJhbnNwb3J0c09yQ29udGFpbihjb25zdCBWZWN0b3I8 QXV0aGVudGljYXRvclRyYW5zcG9ydD4mIHRyYW5zcG9ydHMsIEF1dGhlbnRpY2F0b3JUcmFuc3Bv cnQgdGFyZ2V0KQogewpAQCAtODUsNiArODYsMTMgQEAgc3RhdGljIGlubGluZSBWZWN0b3I8dWlu dDhfdD4gdG9WZWN0b3IoTlNEYXRhICpkYXRhKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK3N0 YXRpYyBpbmxpbmUgVmVjdG9yPHVpbnQ4X3Q+IGFhZ3VpZFZlY3RvcigpCit7CisgICAgVmVjdG9y PHVpbnQ4X3Q+IHJlc3VsdDsKKyAgICByZXN1bHQuYXBwZW5kKGFhZ3VpZCwgYWFndWlkTGVuZ3Ro KTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBzdGF0aWMgaW5saW5lIFJldGFpblB0cjxOU0Rh dGE+IHRvTlNEYXRhKGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZGF0YSkKIHsKICAgICByZXR1cm4g YWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczpkYXRhLmRhdGEoKSBsZW5ndGg6 ZGF0YS5zaXplKCldKTsKQEAgLTM1NiwyMiArMzY0LDIwIEBAIHZvaWQgTG9jYWxBdXRoZW50aWNh dG9yOjpjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJVc2VyVmVyaWZpY2F0aW9uKFNlY0FjY2Vz c0NvCiAgICAgICAgIFtuc1B1YmxpY0tleURhdGEgZ2V0Qnl0ZXM6IHkuZGF0YSgpIHJhbmdlOk5T TWFrZVJhbmdlKDEgKyBFUzI1NkZpZWxkRWxlbWVudExlbmd0aCwgRVMyNTZGaWVsZEVsZW1lbnRM ZW5ndGgpXTsKICAgICAgICAgY29zZVB1YmxpY0tleSA9IGVuY29kZUVTMjU2UHVibGljS2V5QXND Qk9SKFdURk1vdmUoeCksIFdURk1vdmUoeSkpOwogICAgIH0KLSAgICAvLyBGSVhNRShyZGFyOi8v cHJvYmxlbS8zODMyMDUxMik6IERlZmluZSBBcHBsZSBBQUdVSUQuCi0gICAgYXV0byBhdHRlc3Rl ZENyZWRlbnRpYWxEYXRhID0gYnVpbGRBdHRlc3RlZENyZWRlbnRpYWxEYXRhKFZlY3Rvcjx1aW50 OF90PihhYWd1aWRMZW5ndGgsIDApLCBjcmVkZW50aWFsSWQsIGNvc2VQdWJsaWNLZXkpOwogCiAg ICAgLy8gU3RlcCAxMi4KLSAgICBhdXRvIGF1dGhEYXRhID0gYnVpbGRBdXRoRGF0YShjcmVhdGlv bk9wdGlvbnMucnAuaWQsIG1ha2VDcmVkZW50aWFsRmxhZ3MsIGNvdW50ZXIsIGF0dGVzdGVkQ3Jl ZGVudGlhbERhdGEpOwotCiAgICAgLy8gU2tpcCBBcHBsZSBBdHRlc3RhdGlvbiBmb3Igbm9uZSBh dHRlc3RhdGlvbi4KICAgICBpZiAoY3JlYXRpb25PcHRpb25zLmF0dGVzdGF0aW9uID09IEF0dGVz dGF0aW9uQ29udmV5YW5jZVByZWZlcmVuY2U6Ok5vbmUpIHsKICAgICAgICAgZGVsZXRlRHVwbGlj YXRlQ3JlZGVudGlhbCgpOwogCisgICAgICAgIGF1dG8gYXV0aERhdGEgPSBidWlsZEF1dGhEYXRh KGNyZWF0aW9uT3B0aW9ucy5ycC5pZCwgbWFrZUNyZWRlbnRpYWxGbGFncywgY291bnRlciwgYnVp bGRBdHRlc3RlZENyZWRlbnRpYWxEYXRhKFZlY3Rvcjx1aW50OF90PihhYWd1aWRMZW5ndGgsIDAp LCBjcmVkZW50aWFsSWQsIGNvc2VQdWJsaWNLZXkpKTsKICAgICAgICAgYXV0byBhdHRlc3RhdGlv bk9iamVjdCA9IGJ1aWxkQXR0ZXN0YXRpb25PYmplY3QoV1RGTW92ZShhdXRoRGF0YSksICIiLCB7 IH0sIEF0dGVzdGF0aW9uQ29udmV5YW5jZVByZWZlcmVuY2U6Ok5vbmUpOwogICAgICAgICByZWNl aXZlUmVzcG9uZChBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZTo6Y3JlYXRlKGNyZWRl bnRpYWxJZCwgYXR0ZXN0YXRpb25PYmplY3QpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIC8vIFN0ZXAgMTMuIEFwcGxlIEF0dGVzdGF0aW9uCisgICAgYXV0byBhdXRoRGF0YSA9IGJ1 aWxkQXV0aERhdGEoY3JlYXRpb25PcHRpb25zLnJwLmlkLCBtYWtlQ3JlZGVudGlhbEZsYWdzLCBj b3VudGVyLCBidWlsZEF0dGVzdGVkQ3JlZGVudGlhbERhdGEoYWFndWlkVmVjdG9yKCksIGNyZWRl bnRpYWxJZCwgY29zZVB1YmxpY0tleSkpOwogICAgIGF1dG8gbnNBdXRoRGF0YSA9IHRvTlNEYXRh KGF1dGhEYXRhKTsKICAgICBhdXRvIGNhbGxiYWNrID0gW2NyZWRlbnRpYWxJZCA9IFdURk1vdmUo Y3JlZGVudGlhbElkKSwgYXV0aERhdGEgPSBXVEZNb3ZlKGF1dGhEYXRhKSwgd2Vha1RoaXMgPSBt YWtlV2Vha1B0cigqdGhpcyldIChOU0FycmF5ICogX051bGxhYmxlIGNlcnRpZmljYXRlcywgTlNF cnJvciAqIF9OdWxsYWJsZSBlcnJvcikgbXV0YWJsZSB7CiAgICAgICAgIEFTU0VSVChSdW5Mb29w Ojppc01haW4oKSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2ZiMjZkYTkxMjU4MjEzNzMyMWJhNDM2OTYyNWFkNzNiMzdk ZTJlZS4uMTEwZWJiNzQwOTM2MmYwZjJkYjdmNjQwZTEyYTIwYjNhZWVjMmQ0NSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDIwLTExLTA0ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5j b20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBEZXRlcm1pbmUgYW4gQUFHVUlEIGZvciB0aGUgcGxh dGZvcm0gYXV0aGVudGljYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNzk0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzA4MTE2MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICAqIGh0dHAvd3B0 L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRw cy5odG1sOgorCiAyMDIwLTExLTAyICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5j b20+CiAKICAgICAgICAgW1dQRV0gVW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZy4gVXBkYXRlIHRl c3QgZXhwZWN0YXRpb25zLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0 aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNjZXNzLWxvY2FsLmh0dHBzLmh0bWwg Yi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jl YXRlLXN1Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbAppbmRleCA1Yzc5NzYwZTE1ZjBmYzE1MzgzYjlm ZjYxNzEzYmY1NDU2MmUyZTk5Li5lMmVhZTA3NzEzOTg5YWVmNWRmYTQ5OTZiNmY1MmQ0ZTc1MGNl N2JiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5 LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nl c3MtbG9jYWwuaHR0cHMuaHRtbApAQCAtMzEsNyArMzEsMTAgQEAKICAgICAgICAgYXNzZXJ0X2Vx dWFscyhieXRlc1RvSGV4U3RyaW5nKGF1dGhEYXRhLnJwSWRIYXNoKSwgIjQ5OTYwZGU1ODgwZThj Njg3NDM0MTcwZjY0NzY2MDViOGZlNGFlYjlhMjg2MzJjNzk5NWNmM2JhODMxZDk3NjMiKTsKICAg ICAgICAgYXNzZXJ0X2VxdWFscyhhdXRoRGF0YS5mbGFncywgNjkpOwogICAgICAgICBhc3NlcnRf ZXF1YWxzKGF1dGhEYXRhLmNvdW50ZXIsIDApOwotICAgICAgICBhc3NlcnRfZXF1YWxzKGJ5dGVz VG9IZXhTdHJpbmcoYXV0aERhdGEuYWFndWlkKSwgIjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwIik7CisgICAgICAgIGlmIChpc05vbmVBdHRlc3RhdGlvbikKKyAgICAgICAgICAgIGFz c2VydF9lcXVhbHMoYnl0ZXNUb0hleFN0cmluZyhhdXRoRGF0YS5hYWd1aWQpLCAiMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgYXNz ZXJ0X2VxdWFscyhieXRlc1RvSGV4U3RyaW5nKGF1dGhEYXRhLmFhZ3VpZCksICJmMjRhOGU3MGQw ZDNmODJjMjkzNzMyNTIzY2M0ZGU1YSIpOwogICAgICAgICBhc3NlcnRfYXJyYXlfZXF1YWxzKGF1 dGhEYXRhLmNyZWRlbnRpYWxJRCwgY3JlZGVudGlhbElEKTsKICAgICAgICAgLy8gQ2hlY2sgc2Vs ZiBhdHRlc3RhdGlvbgogICAgICAgICBhc3NlcnRfdHJ1ZShjaGVja1B1YmxpY0tleShhdXRoRGF0 YS5wdWJsaWNLZXkpKTsK