204024 2019-11-08 14:37:48 -0800 [WebAuthn] Add quirk needed to support legacy Google NFC Titan security keys 2019-11-19 16:39:29 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=204251 InRadar P2 Normal --- 181943 1 jiewen_tan jiewen_tan alex.gaynor bfulgham ddkilzer jiewen_tan webkit-bug-importer oldest_to_newest 1588844 0 jiewen_tan 2019-11-08 14:37:48 -0800 Add quirk needed to support legacy Google NFC Titan security keys. 1588845 1 jiewen_tan 2019-11-08 14:38:19 -0800 <rdar://problem/56962320> 1588848 2 383167 jiewen_tan 2019-11-08 14:46:17 -0800 Created attachment 383167 Patch 1588859 3 383167 bfulgham 2019-11-08 15:07:43 -0800 Comment on attachment 383167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383167&action=review r=me, but please run the autoreleasepool stuff by David before committing. > Source/WebKit/ChangeLog:12 > + of those legacy key. actually speak U2F, indicating we are interacting with one of these legacy keys. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:52 > +{ Should the code in here be wrapped in @autoreleasepool? > Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:53 > + auto versionData = [session transceive:adoptNS([[NSData alloc] initWithBytes:kCtapNfcAppletSelectionCommand length:sizeof(kCtapNfcAppletSelectionCommand)]).get()]; auto *versionData maybe? > Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:61 > + // of those legacy key. Same rephrasing I suggest above. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:-71 > - @autoreleasepool { Why don't you need the @autoreleasepool block anymore? Did you check with David Kilzer to see if this is good to do? > Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:94 > + auto responseData = [m_session transceive:adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]).get()]; auto *responseData = 1588861 4 bfulgham 2019-11-08 15:08:01 -0800 CCing David Kilzer to look at the @autoreleasepool stuff. 1588869 5 383167 jiewen_tan 2019-11-08 15:38:17 -0800 Comment on attachment 383167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383167&action=review Thanks Brent for r+ this patch. >> Source/WebKit/ChangeLog:12 >> + of those legacy key. > > actually speak U2F, indicating we are interacting with one of these legacy keys. Fixed. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:52 >> +{ > > Should the code in here be wrapped in @autoreleasepool? Before, I used [NSData dataWithBytes:data.data() length:data.size()] which is not wrapped with adoptNS. Now, I switched to adoptNS([[NSData alloc] initWithBytes:kCtapNfcAppletSelectionCommand length:sizeof(kCtapNfcAppletSelectionCommand)]).get(). It should be fine. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:53 >> + auto versionData = [session transceive:adoptNS([[NSData alloc] initWithBytes:kCtapNfcAppletSelectionCommand length:sizeof(kCtapNfcAppletSelectionCommand)]).get()]; > > auto *versionData maybe? Yes. Right. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:61 >> + // of those legacy key. > > Same rephrasing I suggest above. Fixed. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:-71 >> - @autoreleasepool { > > Why don't you need the @autoreleasepool block anymore? Did you check with David Kilzer to see if this is good to do? Same as above. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:94 >> + auto responseData = [m_session transceive:adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]).get()]; > > auto *responseData = Fixed. 1588883 6 383177 jiewen_tan 2019-11-08 16:24:46 -0800 Created attachment 383177 Patch for landing 1588904 7 jiewen_tan 2019-11-08 17:09:27 -0800 Committed r252297: <https://trac.webkit.org/changeset/252297> 383167 2019-11-08 14:46:17 -0800 2019-11-08 15:07:43 -0800 Patch bug-204024-20191108144617.patch text/plain 6738 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkYjc2M2MzYWYwNTVj ZmQ5N2UzNzg0NjAyMWMxZTcyYjUyMjlkMi4uZGI4MDBmOTlkZDFiZWZjNmUxZWQzZmE4ZjMyYmI1 ZTExZGU2MGEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTExLTA4ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBBZGQg cXVpcmsgbmVlZGVkIHRvIHN1cHBvcnQgbGVnYWN5IEdvb2dsZSBORkMgVGl0YW4gc2VjdXJpdHkg a2V5cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0 MDI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Njk2MjMyMD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0cy4K KworICAgICAgICAqIE1vZHVsZXMvd2ViYXV0aG4vZmlkby9GaWRvQ29uc3RhbnRzLmg6CisKIDIw MTktMTEtMDcgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBB TkdMRSBiYWNrZW5kIGZvciBpT1MgZGV2aWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI3NWNhZjY4MTg3YTExMzJk Y2FhNDY5MGY5YzA0YzNmZTA0ZWM5ZmEuLmJiNzFmNmQzM2Q4YTI0Y2I2OWJlMjEwZDRkYmI4MzFl OTcyNDU0YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMTEtMDggIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEFkZCBxdWly ayBuZWVkZWQgdG8gc3VwcG9ydCBsZWdhY3kgR29vZ2xlIE5GQyBUaXRhbiBzZWN1cml0eSBrZXlz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQwMjQK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU2OTYyMzIwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWUgbGVnYWN5IFUyRiBrZXlzIHN1Y2ggYXMg R29vZ2xlIFQxIFRpdGFuIGRvbid0IHVuZGVyc3RhbmQgdGhlIEZJRE8gYXBwbGV0IGNvbW1hbmQu IEluc3RlYWQsCisgICAgICAgIHRoZXkgYXJlIGNvbmZpZ3VyZWQgdG8gb25seSBoYXZlIHRoZSBG SURPIGFwcGxldC4gVGhlcmVmb3JlLCB3aGVuIHRoZSBhYm92ZSBjb21tYW5kIGZhaWxzLCB3ZQor ICAgICAgICB1c2UgVTJGX1ZFUlNJT04gY29tbWFuZCB0byBkb3VibGUgY2hlY2sgaWYgdGhlIGNv bm5lY3RlZCB0YWcgY2FuIGFjdHVhbGx5IHNwZWFrIFUyRiBhbmQgaXMgb25lCisgICAgICAgIG9m IHRob3NlIGxlZ2FjeSBrZXkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQ29jb2EvTmZjQ29ubmVjdGlvbi5tbToKKyAgICAgICAgKFdlYktpdDo6Zmlkbzo6Y29tcGFy ZVZlcnNpb24pOgorICAgICAgICAoV2ViS2l0OjpmaWRvOjp0cnlTZWxlY3RGaWRvQXBwbGV0KToK KyAgICAgICAgKFdlYktpdDo6TmZjQ29ubmVjdGlvbjo6dHJhbnNhY3QgY29uc3QpOgorICAgICAg ICAoV2ViS2l0OjpOZmNDb25uZWN0aW9uOjpkaWREZXRlY3RUYWdzKToKKwogMjAxOS0xMS0wNiAg Smlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0g UmV0dXJuIE5vdEFsbG93ZWRFcnJvciBpbW1lZGlhdGVseSBmb3IgVUkgY2FuY2VsbGF0aW9ucwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9maWRvL0ZpZG9Db25z dGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vZmlkby9GaWRvQ29uc3Rh bnRzLmgKaW5kZXggNjVkZDhjZGU3OWVmNTJlN2I2MDAyMGI2OGM0NWZhNDk5MmQyZDM0Ni4uNzQ2 ODI5YmI0NDk3MzE0ZTZjNTIxMWI3NWUwZjA5Y2I4NmMxNjM4MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9maWRvL0ZpZG9Db25zdGFudHMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8vRmlkb0NvbnN0YW50cy5oCkBAIC0yMjMs NiArMjIzLDEzIEBAIGNvbnN0IGNoYXIga1UyZlZlcnNpb25bXSA9ICJVMkZfVjIiOwogY29uc3Qg dWludDMyX3Qga0N0YXBIaWRVc2FnZVBhZ2UgPSAweEYxRDA7CiBjb25zdCB1aW50MzJfdCBrQ3Rh cEhpZFVzYWdlID0gMHgwMTsKIAorLy8gVTJGX1ZFUlNJT04gY29tbWFuZAorLy8gaHR0cHM6Ly9m aWRvYWxsaWFuY2Uub3JnL3NwZWNzL2ZpZG8tdTJmLXYxLjItcHMtMjAxNzA0MTEvZmlkby11MmYt cmF3LW1lc3NhZ2UtZm9ybWF0cy12MS4yLXBzLTIwMTcwNDExLmh0bWwjZ2V0dmVyc2lvbi1yZXF1 ZXN0LWFuZC1yZXNwb25zZS0tLXUyZl92ZXJzaW9uCitjb25zdCB1aW50OF90IGtDdGFwTmZjVTJm VmVyc2lvbkNvbW1hbmRbXSA9IHsKKyAgICAweDAwLCAweDAzLCAweDAwLCAweDAwLCAvLyBDTEEs IElOUywgUDEsIFAyCisgICAgMHgwMCwgLy8gTAorfTsKKwogLy8gQ1RBUE5GQyBBcHBsZXQgc2Vs ZWN0aW9uIGNvbW1hbmQgYW5kIHJlc3BvbnNlcwogLy8gaHR0cHM6Ly9maWRvYWxsaWFuY2Uub3Jn L3NwZWNzL2ZpZG8tdjIuMC1wcy0yMDE5MDEzMC9maWRvLWNsaWVudC10by1hdXRoZW50aWNhdG9y LXByb3RvY29sLXYyLjAtcHMtMjAxOTAxMzAuaHRtbCNuZmMtYXBwbGV0LXNlbGVjdGlvbgogY29u c3QgdWludDhfdCBrQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmRbXSA9IHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL05mY0Nv bm5lY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9D b2NvYS9OZmNDb25uZWN0aW9uLm1tCmluZGV4IDhlZDcxZWU2ZjI0MWE3NDU4YzBmNjA1ZDNlZDhh MWQ0ZGI1NTZhYTcuLjgzZmUzNzI4OGFjNGEzOTAzZmQzNzFjMzhiZmQ0YWRhZWUxNTkwMWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29h L05mY0Nvbm5lY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vQ29jb2EvTmZjQ29ubmVjdGlvbi5tbQpAQCAtMzksMTAgKzM5LDMzIEBAIHVzaW5n IG5hbWVzcGFjZSBmaWRvOwogbmFtZXNwYWNlIHsKIGlubGluZSBib29sIGNvbXBhcmVWZXJzaW9u KE5TRGF0YSAqZGF0YSwgY29uc3QgdWludDhfdCB2ZXJzaW9uW10sIHNpemVfdCB2ZXJzaW9uU2l6 ZSkKIHsKKyAgICBpZiAoIWRhdGEpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoZGF0 YS5sZW5ndGggIT0gdmVyc2lvblNpemUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1 cm4gIW1lbWNtcChkYXRhLmJ5dGVzLCB2ZXJzaW9uLCB2ZXJzaW9uU2l6ZSk7CiB9CisKKy8vIENv bmZpcm0gdGhlIEZJRE8gYXBwbGV0IGlzIGF2YWxpYWJsZS4KKy8vIGh0dHBzOi8vZmlkb2FsbGlh bmNlLm9yZy9zcGVjcy9maWRvLXYyLjAtcHMtMjAxOTAxMzAvZmlkby1jbGllbnQtdG8tYXV0aGVu dGljYXRvci1wcm90b2NvbC12Mi4wLXBzLTIwMTkwMTMwLmh0bWwjbmZjLWFwcGxldC1zZWxlY3Rp b24KK3N0YXRpYyBib29sIHRyeVNlbGVjdEZpZG9BcHBsZXQoTkZSZWFkZXJTZXNzaW9uICpzZXNz aW9uKQoreworICAgIGF1dG8gdmVyc2lvbkRhdGEgPSBbc2Vzc2lvbiB0cmFuc2NlaXZlOmFkb3B0 TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6a0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25D b21tYW5kIGxlbmd0aDpzaXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25Db21tYW5kKV0pLmdl dCgpXTsKKyAgICBpZiAoY29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFwTmZjQXBwbGV0 U2VsZWN0aW9uVTJmLCBzaXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25VMmYpKQorICAgICAg ICB8fCBjb21wYXJlVmVyc2lvbih2ZXJzaW9uRGF0YSwga0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25D dGFwLCBzaXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25DdGFwKSkpCisgICAgICAgIHJldHVy biB0cnVlOworCisgICAgLy8gU29tZSBsZWdhY3kgVTJGIGtleXMgc3VjaCBhcyBHb29nbGUgVDEg VGl0YW4gZG9uJ3QgdW5kZXJzdGFuZCB0aGUgRklETyBhcHBsZXQgY29tbWFuZC4gSW5zdGVhZCwK KyAgICAvLyB0aGV5IGFyZSBjb25maWd1cmVkIHRvIG9ubHkgaGF2ZSB0aGUgRklETyBhcHBsZXQu IFRoZXJlZm9yZSwgd2hlbiB0aGUgYWJvdmUgY29tbWFuZCBmYWlscywgd2UKKyAgICAvLyB1c2Ug VTJGX1ZFUlNJT04gY29tbWFuZCB0byBkb3VibGUgY2hlY2sgaWYgdGhlIGNvbm5lY3RlZCB0YWcg Y2FuIGFjdHVhbGx5IHNwZWFrIFUyRiBhbmQgaXMgb25lCisgICAgLy8gb2YgdGhvc2UgbGVnYWN5 IGtleS4KKyAgICB2ZXJzaW9uRGF0YSA9IFtzZXNzaW9uIHRyYW5zY2VpdmU6YWRvcHROUyhbW05T RGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczprQ3RhcE5mY1UyZlZlcnNpb25Db21tYW5kIGxlbmd0 aDpzaXplb2Yoa0N0YXBOZmNVMmZWZXJzaW9uQ29tbWFuZCldKS5nZXQoKV07CisgICAgaWYgKGNv bXBhcmVWZXJzaW9uKHZlcnNpb25EYXRhLCBrQ3RhcE5mY0FwcGxldFNlbGVjdGlvblUyZiwgc2l6 ZW9mKGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9uVTJmKSkpCisgICAgICAgIHJldHVybiB0cnVlOwor CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB9IC8vIG5hbWVzcGFjZQogCiBSZWY8TmZjQ29ubmVj dGlvbj4gTmZjQ29ubmVjdGlvbjo6Y3JlYXRlKFJldGFpblB0cjxORlJlYWRlclNlc3Npb24+JiYg c2Vzc2lvbiwgTmZjU2VydmljZSYgc2VydmljZSkKQEAgLTY4LDEwICs5MSw4IEBAIE5mY0Nvbm5l Y3Rpb246On5OZmNDb25uZWN0aW9uKCkKIFZlY3Rvcjx1aW50OF90PiBOZmNDb25uZWN0aW9uOjp0 cmFuc2FjdChWZWN0b3I8dWludDhfdD4mJiBkYXRhKSBjb25zdAogewogICAgIFZlY3Rvcjx1aW50 OF90PiByZXNwb25zZTsKLSAgICBAYXV0b3JlbGVhc2Vwb29sIHsKLSAgICAgICAgYXV0byByZXNw b25zZURhdGEgPSBbbV9zZXNzaW9uIHRyYW5zY2VpdmU6W05TRGF0YSBkYXRhV2l0aEJ5dGVzOmRh dGEuZGF0YSgpIGxlbmd0aDpkYXRhLnNpemUoKV1dOwotICAgICAgICByZXNwb25zZS5hcHBlbmQo cmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4ocmVzcG9uc2VEYXRhLmJ5dGVzKSwgcmVz cG9uc2VEYXRhLmxlbmd0aCk7Ci0gICAgfQorICAgIGF1dG8gcmVzcG9uc2VEYXRhID0gW21fc2Vz c2lvbiB0cmFuc2NlaXZlOmFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6ZGF0 YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXSkuZ2V0KCldOworICAgIHJlc3BvbnNlLmFwcGVu ZChyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihyZXNwb25zZURhdGEuYnl0ZXMpLCBy ZXNwb25zZURhdGEubGVuZ3RoKTsKICAgICByZXR1cm4gcmVzcG9uc2U7CiB9CiAKQEAgLTEwNCwx NCArMTI1LDkgQEAgdm9pZCBOZmNDb25uZWN0aW9uOjpkaWREZXRlY3RUYWdzKE5TQXJyYXkgKnRh Z3MpCiAgICAgICAgIGlmICh0YWcudHlwZSAhPSBORlRhZ1R5cGVHZW5lcmljNEEgfHwgIVttX3Nl c3Npb24gY29ubmVjdFRhZzp0YWddKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAg Ly8gQ29uZmlybSB0aGUgRklETyBhcHBsZXQgaXMgYXZhbGlhYmxlIGJlZm9yZSByZXR1cm4uCi0g ICAgICAgIC8vIGh0dHBzOi8vZmlkb2FsbGlhbmNlLm9yZy9zcGVjcy9maWRvLXYyLjAtcHMtMjAx OTAxMzAvZmlkby1jbGllbnQtdG8tYXV0aGVudGljYXRvci1wcm90b2NvbC12Mi4wLXBzLTIwMTkw MTMwLmh0bWwjbmZjLWFwcGxldC1zZWxlY3Rpb24KLSAgICAgICAgQGF1dG9yZWxlYXNlcG9vbCB7 Ci0gICAgICAgICAgICBhdXRvIHZlcnNpb25EYXRhID0gW21fc2Vzc2lvbiB0cmFuc2NlaXZlOltO U0RhdGEgZGF0YVdpdGhCeXRlczprQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmQgbGVuZ3Ro OnNpemVvZihrQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmQpXV07Ci0gICAgICAgICAgICBp ZiAoIXZlcnNpb25EYXRhIHx8ICghY29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFwTmZj QXBwbGV0U2VsZWN0aW9uVTJmLCBzaXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25VMmYpKSAm JiAhY29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9uQ3Rh cCwgc2l6ZW9mKGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9uQ3RhcCkpKSkgewotICAgICAgICAgICAg ICAgIFttX3Nlc3Npb24gZGlzY29ubmVjdFRhZ107Ci0gICAgICAgICAgICAgICAgY29udGludWU7 Ci0gICAgICAgICAgICB9CisgICAgICAgIGlmICghdHJ5U2VsZWN0Rmlkb0FwcGxldChtX3Nlc3Np b24uZ2V0KCkpKSB7CisgICAgICAgICAgICBbbV9zZXNzaW9uIGRpc2Nvbm5lY3RUYWddOworICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBtX3NlcnZpY2UtPmRpZENv bm5lY3RUYWcoKTsK 383177 2019-11-08 16:24:46 -0800 2019-11-08 17:09:43 -0800 Patch for landing bug-204024-20191108162446.patch text/plain 6798 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkYjc2M2MzYWYwNTVj ZmQ5N2UzNzg0NjAyMWMxZTcyYjUyMjlkMi4uZjA0OTc1MDc3M2I2ZTM3MGJlZDlkMWZjODZkZjI3 ZmNjNDBhZDQwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTExLTA4ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBBZGQg cXVpcmsgbmVlZGVkIHRvIHN1cHBvcnQgbGVnYWN5IEdvb2dsZSBORkMgVGl0YW4gc2VjdXJpdHkg a2V5cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0 MDI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Njk2MjMyMD4KKworICAgICAgICBSZXZpZXdl ZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIENvdmVyZWQgYnkgbWFudWFsIHRlc3RzLgor CisgICAgICAgICogTW9kdWxlcy93ZWJhdXRobi9maWRvL0ZpZG9Db25zdGFudHMuaDoKKwogMjAx OS0xMS0wNyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIEFO R0xFIGJhY2tlbmQgZm9yIGlPUyBkZXZpY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjc1Y2FmNjgxODdhMTEzMmRj YWE0NjkwZjljMDRjM2ZlMDRlYzlmYS4uYjU0ODZjZjM0MGZjODU4ODk1Yzc2YTA3MjY0NDY0N2I3 YTk0NmViMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOS0xMS0wOCAgSmlld2VuIFRh biAgPGppZXdlbl90YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQWRkIHF1aXJr IG5lZWRlZCB0byBzdXBwb3J0IGxlZ2FjeSBHb29nbGUgTkZDIFRpdGFuIHNlY3VyaXR5IGtleXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDAyNAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTY5NjIzMjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBTb21lIGxlZ2FjeSBVMkYga2V5cyBzdWNoIGFzIEdv b2dsZSBUMSBUaXRhbiBkb24ndCB1bmRlcnN0YW5kIHRoZSBGSURPIGFwcGxldCBjb21tYW5kLiBJ bnN0ZWFkLAorICAgICAgICB0aGV5IGFyZSBjb25maWd1cmVkIHRvIG9ubHkgaGF2ZSB0aGUgRklE TyBhcHBsZXQuIFRoZXJlZm9yZSwgd2hlbiB0aGUgYWJvdmUgY29tbWFuZCBmYWlscywgd2UKKyAg ICAgICAgdXNlIFUyRl9WRVJTSU9OIGNvbW1hbmQgdG8gZG91YmxlIGNoZWNrIGlmIHRoZSBjb25u ZWN0ZWQgdGFnIGNhbiBhY3R1YWxseSBzcGVhayBVMkYsIGluZGljYXRpbmcKKyAgICAgICAgd2Ug YXJlIGludGVyYWN0aW5nIHdpdGggb25lIG9mIHRoZXNlIGxlZ2FjeSBrZXlzLgorCisgICAgICAg ICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL05mY0Nvbm5lY3Rpb24ubW06Cisg ICAgICAgIChXZWJLaXQ6OmZpZG86OmNvbXBhcmVWZXJzaW9uKToKKyAgICAgICAgKFdlYktpdDo6 Zmlkbzo6dHJ5U2VsZWN0Rmlkb0FwcGxldCk6CisgICAgICAgIChXZWJLaXQ6Ok5mY0Nvbm5lY3Rp b246OnRyYW5zYWN0IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6TmZjQ29ubmVjdGlvbjo6ZGlk RGV0ZWN0VGFncyk6CisKIDIwMTktMTEtMDYgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIFJldHVybiBOb3RBbGxvd2VkRXJyb3IgaW1tZWRp YXRlbHkgZm9yIFVJIGNhbmNlbGxhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViYXV0aG4vZmlkby9GaWRvQ29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmF1dGhuL2ZpZG8vRmlkb0NvbnN0YW50cy5oCmluZGV4IDY1ZGQ4Y2RlNzllZjUyZTdi NjAwMjBiNjhjNDVmYTQ5OTJkMmQzNDYuLjc0NjgyOWJiNDQ5NzMxNGU2YzUyMTFiNzVlMGYwOWNi ODZjMTYzODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vZmlk by9GaWRvQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9m aWRvL0ZpZG9Db25zdGFudHMuaApAQCAtMjIzLDYgKzIyMywxMyBAQCBjb25zdCBjaGFyIGtVMmZW ZXJzaW9uW10gPSAiVTJGX1YyIjsKIGNvbnN0IHVpbnQzMl90IGtDdGFwSGlkVXNhZ2VQYWdlID0g MHhGMUQwOwogY29uc3QgdWludDMyX3Qga0N0YXBIaWRVc2FnZSA9IDB4MDE7CiAKKy8vIFUyRl9W RVJTSU9OIGNvbW1hbmQKKy8vIGh0dHBzOi8vZmlkb2FsbGlhbmNlLm9yZy9zcGVjcy9maWRvLXUy Zi12MS4yLXBzLTIwMTcwNDExL2ZpZG8tdTJmLXJhdy1tZXNzYWdlLWZvcm1hdHMtdjEuMi1wcy0y MDE3MDQxMS5odG1sI2dldHZlcnNpb24tcmVxdWVzdC1hbmQtcmVzcG9uc2UtLS11MmZfdmVyc2lv bgorY29uc3QgdWludDhfdCBrQ3RhcE5mY1UyZlZlcnNpb25Db21tYW5kW10gPSB7CisgICAgMHgw MCwgMHgwMywgMHgwMCwgMHgwMCwgLy8gQ0xBLCBJTlMsIFAxLCBQMgorICAgIDB4MDAsIC8vIEwK K307CisKIC8vIENUQVBORkMgQXBwbGV0IHNlbGVjdGlvbiBjb21tYW5kIGFuZCByZXNwb25zZXMK IC8vIGh0dHBzOi8vZmlkb2FsbGlhbmNlLm9yZy9zcGVjcy9maWRvLXYyLjAtcHMtMjAxOTAxMzAv Zmlkby1jbGllbnQtdG8tYXV0aGVudGljYXRvci1wcm90b2NvbC12Mi4wLXBzLTIwMTkwMTMwLmh0 bWwjbmZjLWFwcGxldC1zZWxlY3Rpb24KIGNvbnN0IHVpbnQ4X3Qga0N0YXBOZmNBcHBsZXRTZWxl Y3Rpb25Db21tYW5kW10gPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9OZmNDb25uZWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTmZjQ29ubmVjdGlvbi5tbQppbmRleCA4 ZWQ3MWVlNmYyNDFhNzQ1OGMwZjYwNWQzZWQ4YTFkNGRiNTU2YWE3Li5iY2FlYTQ2MGZiYTRhMzQy NTA4MDU3ZjI0NjlkMGYyNjg5MTY4N2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9OZmNDb25uZWN0aW9uLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL05mY0Nvbm5lY3Rpb24u bW0KQEAgLTM5LDEwICszOSwzMyBAQCB1c2luZyBuYW1lc3BhY2UgZmlkbzsKIG5hbWVzcGFjZSB7 CiBpbmxpbmUgYm9vbCBjb21wYXJlVmVyc2lvbihOU0RhdGEgKmRhdGEsIGNvbnN0IHVpbnQ4X3Qg dmVyc2lvbltdLCBzaXplX3QgdmVyc2lvblNpemUpCiB7CisgICAgaWYgKCFkYXRhKQorICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKGRhdGEubGVuZ3RoICE9IHZlcnNpb25TaXplKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJuICFtZW1jbXAoZGF0YS5ieXRlcywgdmVyc2lv biwgdmVyc2lvblNpemUpOwogfQorCisvLyBDb25maXJtIHRoZSBGSURPIGFwcGxldCBpcyBhdmFs aWFibGUuCisvLyBodHRwczovL2ZpZG9hbGxpYW5jZS5vcmcvc3BlY3MvZmlkby12Mi4wLXBzLTIw MTkwMTMwL2ZpZG8tY2xpZW50LXRvLWF1dGhlbnRpY2F0b3ItcHJvdG9jb2wtdjIuMC1wcy0yMDE5 MDEzMC5odG1sI25mYy1hcHBsZXQtc2VsZWN0aW9uCitzdGF0aWMgYm9vbCB0cnlTZWxlY3RGaWRv QXBwbGV0KE5GUmVhZGVyU2Vzc2lvbiAqc2Vzc2lvbikKK3sKKyAgICBhdXRvICp2ZXJzaW9uRGF0 YSA9IFtzZXNzaW9uIHRyYW5zY2VpdmU6YWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhC eXRlczprQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmQgbGVuZ3RoOnNpemVvZihrQ3RhcE5m Y0FwcGxldFNlbGVjdGlvbkNvbW1hbmQpXSkuZ2V0KCldOworICAgIGlmIChjb21wYXJlVmVyc2lv bih2ZXJzaW9uRGF0YSwga0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25VMmYsIHNpemVvZihrQ3RhcE5m Y0FwcGxldFNlbGVjdGlvblUyZikpCisgICAgICAgIHx8IGNvbXBhcmVWZXJzaW9uKHZlcnNpb25E YXRhLCBrQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkN0YXAsIHNpemVvZihrQ3RhcE5mY0FwcGxldFNl bGVjdGlvbkN0YXApKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAvLyBTb21lIGxlZ2Fj eSBVMkYga2V5cyBzdWNoIGFzIEdvb2dsZSBUMSBUaXRhbiBkb24ndCB1bmRlcnN0YW5kIHRoZSBG SURPIGFwcGxldCBjb21tYW5kLiBJbnN0ZWFkLAorICAgIC8vIHRoZXkgYXJlIGNvbmZpZ3VyZWQg dG8gb25seSBoYXZlIHRoZSBGSURPIGFwcGxldC4gVGhlcmVmb3JlLCB3aGVuIHRoZSBhYm92ZSBj b21tYW5kIGZhaWxzLCB3ZQorICAgIC8vIHVzZSBVMkZfVkVSU0lPTiBjb21tYW5kIHRvIGRvdWJs ZSBjaGVjayBpZiB0aGUgY29ubmVjdGVkIHRhZyBjYW4gYWN0dWFsbHkgc3BlYWsgVTJGLCBpbmRp Y2F0aW5nCisgICAgLy8gd2UgYXJlIGludGVyYWN0aW5nIHdpdGggb25lIG9mIHRoZXNlIGxlZ2Fj eSBrZXlzLgorICAgIHZlcnNpb25EYXRhID0gW3Nlc3Npb24gdHJhbnNjZWl2ZTphZG9wdE5TKFtb TlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOmtDdGFwTmZjVTJmVmVyc2lvbkNvbW1hbmQgbGVu Z3RoOnNpemVvZihrQ3RhcE5mY1UyZlZlcnNpb25Db21tYW5kKV0pLmdldCgpXTsKKyAgICBpZiAo Y29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9uVTJmLCBz aXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25VMmYpKSkKKyAgICAgICAgcmV0dXJuIHRydWU7 CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0gLy8gbmFtZXNwYWNlCiAKIFJlZjxOZmNDb25u ZWN0aW9uPiBOZmNDb25uZWN0aW9uOjpjcmVhdGUoUmV0YWluUHRyPE5GUmVhZGVyU2Vzc2lvbj4m JiBzZXNzaW9uLCBOZmNTZXJ2aWNlJiBzZXJ2aWNlKQpAQCAtNjgsMTAgKzkxLDggQEAgTmZjQ29u bmVjdGlvbjo6fk5mY0Nvbm5lY3Rpb24oKQogVmVjdG9yPHVpbnQ4X3Q+IE5mY0Nvbm5lY3Rpb246 OnRyYW5zYWN0KFZlY3Rvcjx1aW50OF90PiYmIGRhdGEpIGNvbnN0CiB7CiAgICAgVmVjdG9yPHVp bnQ4X3Q+IHJlc3BvbnNlOwotICAgIEBhdXRvcmVsZWFzZXBvb2wgewotICAgICAgICBhdXRvIHJl c3BvbnNlRGF0YSA9IFttX3Nlc3Npb24gdHJhbnNjZWl2ZTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6 ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXV07Ci0gICAgICAgIHJlc3BvbnNlLmFwcGVu ZChyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihyZXNwb25zZURhdGEuYnl0ZXMpLCBy ZXNwb25zZURhdGEubGVuZ3RoKTsKLSAgICB9CisgICAgYXV0byAqcmVzcG9uc2VEYXRhID0gW21f c2Vzc2lvbiB0cmFuc2NlaXZlOmFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6 ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXSkuZ2V0KCldOworICAgIHJlc3BvbnNlLmFw cGVuZChyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihyZXNwb25zZURhdGEuYnl0ZXMp LCByZXNwb25zZURhdGEubGVuZ3RoKTsKICAgICByZXR1cm4gcmVzcG9uc2U7CiB9CiAKQEAgLTEw NCwxNCArMTI1LDkgQEAgdm9pZCBOZmNDb25uZWN0aW9uOjpkaWREZXRlY3RUYWdzKE5TQXJyYXkg KnRhZ3MpCiAgICAgICAgIGlmICh0YWcudHlwZSAhPSBORlRhZ1R5cGVHZW5lcmljNEEgfHwgIVtt X3Nlc3Npb24gY29ubmVjdFRhZzp0YWddKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAg ICAgLy8gQ29uZmlybSB0aGUgRklETyBhcHBsZXQgaXMgYXZhbGlhYmxlIGJlZm9yZSByZXR1cm4u Ci0gICAgICAgIC8vIGh0dHBzOi8vZmlkb2FsbGlhbmNlLm9yZy9zcGVjcy9maWRvLXYyLjAtcHMt MjAxOTAxMzAvZmlkby1jbGllbnQtdG8tYXV0aGVudGljYXRvci1wcm90b2NvbC12Mi4wLXBzLTIw MTkwMTMwLmh0bWwjbmZjLWFwcGxldC1zZWxlY3Rpb24KLSAgICAgICAgQGF1dG9yZWxlYXNlcG9v bCB7Ci0gICAgICAgICAgICBhdXRvIHZlcnNpb25EYXRhID0gW21fc2Vzc2lvbiB0cmFuc2NlaXZl OltOU0RhdGEgZGF0YVdpdGhCeXRlczprQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmQgbGVu Z3RoOnNpemVvZihrQ3RhcE5mY0FwcGxldFNlbGVjdGlvbkNvbW1hbmQpXV07Ci0gICAgICAgICAg ICBpZiAoIXZlcnNpb25EYXRhIHx8ICghY29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFw TmZjQXBwbGV0U2VsZWN0aW9uVTJmLCBzaXplb2Yoa0N0YXBOZmNBcHBsZXRTZWxlY3Rpb25VMmYp KSAmJiAhY29tcGFyZVZlcnNpb24odmVyc2lvbkRhdGEsIGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9u Q3RhcCwgc2l6ZW9mKGtDdGFwTmZjQXBwbGV0U2VsZWN0aW9uQ3RhcCkpKSkgewotICAgICAgICAg ICAgICAgIFttX3Nlc3Npb24gZGlzY29ubmVjdFRhZ107Ci0gICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gICAgICAgICAgICB9CisgICAgICAgIGlmICghdHJ5U2VsZWN0Rmlkb0FwcGxldChtX3Nl c3Npb24uZ2V0KCkpKSB7CisgICAgICAgICAgICBbbV9zZXNzaW9uIGRpc2Nvbm5lY3RUYWddOwor ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBtX3NlcnZpY2UtPmRp ZENvbm5lY3RUYWcoKTsK