237454 2022-03-03 15:49:51 -0800 [WebAuthn] Provide [ASCAgent performAutoFillAuthorizationRequestsForContext] SPI with frameID 2022-03-07 09:38:21 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham webkit-bug-importer oldest_to_newest 1848097 0 pascoe 2022-03-03 15:49:51 -0800 For conditional mediation support, [ASCAgent performAutoFillAuthorizationRequestsForContext] needs to be able to determine which frame the request came from to properly show results. 1848098 1 webkit-bug-importer 2022-03-03 15:50:01 -0800 <rdar://problem/89782147> 1848136 2 453802 pascoe 2022-03-03 17:31:40 -0800 Created attachment 453802 Patch 1848368 3 453802 bfulgham 2022-03-04 11:58:29 -0800 Comment on attachment 453802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453802&action=review r=me, but I think the SPI might benefit from some tweaks. > Source/WebKit/Platform/spi/Cocoa/AuthenticationServicesCoreSPI.h:255 > +@property (nonatomic, nullable, copy) NSNumber *webFrameID; Nit: Given that GlobalFrameIdentifier is a struct that holds a pageID and a frameID, I wonder if this SPI would have been better designed using a similar struct. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:239 > +static RetainPtr<ASCCredentialRequestContext> configurationAssertionRequestContext(const PublicKeyCredentialRequestOptions& options, Vector<uint8_t> hash, std::optional<WebCore::MediationRequirement> mediation, std::optional<WebCore::GlobalFrameIdentifier> frameID) Nit: I suggest 'globalFrameID' (rather than frameID) to distinguish between the "frame-only" ID used in some code, versus this pair of frame and page. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:265 > + if (frameID && [requestContext respondsToSelector:@selector(setWebFrameID:)] && [requestContext respondsToSelector:@selector(setWebPageID:)]) { It would be nice to remember to remove these 'respondsToSelector' checks in the future, as they do incur a cost. I also wonder if it's ever possible for a version of the OS that responds to 'setWebFrameID' wouldn't also respond to 'setWebPageID'. > Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:309 > + result = configurationAssertionRequestContext(options, requestData.hash, requestData.mediation, requestData.frameID); I really dislike the 'frameID' accessor for this GlobalFrameID (which is a pair of Page/Frame). But that's not due to this change. 1848441 4 453878 pascoe 2022-03-04 16:10:36 -0800 Created attachment 453878 Patch for landing 1848803 5 ews-feeder 2022-03-07 09:38:18 -0800 Committed r290893 (248124@main): <https://commits.webkit.org/248124@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453878. 453802 2022-03-03 17:31:40 -0800 2022-03-04 16:10:34 -0800 Patch bug-237454-20220303173139.patch text/plain 4633 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYxMzA2NTAyMzhjZTY5NTVk YmY4YjViNjEzZWZlMWQ0NDhjNjA1ZDkuLmM4MTQ4NDI2ODZmOGNhNDJjYWM3NTVhMWM3ZTQwN2M5 NTE2YjNjZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDMtMDMgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUHJvdmlkZSBnbG9i YWwgZnJhbWUgaWRlbnRpZmllciB0byBBU0NBZ2VudCBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ1NAorICAgICAgICByZGFyOi8vcHJvYmxl bS84OTc4MjE0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEZvciBwdXJwb3NlcyByZWxhdGVkIHRvIGNvbmRpdGlvbmFsIG1lZGlhdGlvbiwgdGhlIEFT Q0FnZW50IFNQSQorICAgICAgICBuZWVkIHRvIGtub3cgd2hhdCBmcmFtZSByZXF1ZXN0ZWQgdGhl IGFzc2VydGlvbi4gVGhpcyBwYXRjaCBzdGFydHMKKyAgICAgICAgcGFzc2luZyB0aGF0IGFsb25n LgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2VydmljZXND b3JlU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dl YkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0Ojpjb25m aWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVzdENvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJB dXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eTo6Y29udGV4dEZvclJlcXVlc3QpOgorCiAyMDIy LTAzLTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5h bWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGVJbWFnZVNhbXBsZSB0byBNZWRpYVNhbXBsZUFW Rk9iakM6OmNyZWF0ZUZyb21QaXhlbEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Q bGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTUEkuaCBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU1BJ LmgKaW5kZXggNDI0OTkwZmE3YmQxNDc1MjA1MjEwN2ZjM2FkMjE4NGM4NTFkNTMyOC4uN2IxN2Vi YjkyMTU5YjBiYzRmNDU0M2I1ZjMwY2M3MmY5ZWM2NzAwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTUEkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9Db2NvYS9BdXRoZW50aWNhdGlvblNlcnZp Y2VzQ29yZVNQSS5oCkBAIC0yNTEsNiArMjUxLDggQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdl ciwgQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlKSB7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgbnVs bGFibGUsIGNvcHkpIEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxBc3NlcnRpb25PcHRpb25zICpzZWN1 cml0eUtleUNyZWRlbnRpYWxBc3NlcnRpb25PcHRpb25zOwogCiBAcHJvcGVydHkgKG5vbmF0b21p YykgQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlIHJlcXVlc3RTdHlsZTsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNOdW1iZXIgKndlYlBhZ2VJRDsKK0Bwcm9wZXJ0eSAo bm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNOdW1iZXIgKndlYkZyYW1lSUQ7CiAKIEBlbmQK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v Q29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRp bmF0b3JQcm94eS5tbQppbmRleCBkZTE3NGQzZjgyOTA3YTNkZTllMmMyZTQwMDdlZWMwMDNjZDcx ZTFmLi45ZjI2NzlmOTNlNzUxOTYxZDg2ZDAyMjY5MjY4YWYzZTNmOTNmNjRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRo ZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94 eS5tbQpAQCAtMjM2LDcgKzIzNiw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJl cXVlc3RDb250ZXh0PiBjb25maWd1cmVSZWdpc3RyYXRpb25SZXF1ZXN0Q29udGV4CiAgICAgcmV0 dXJuIHJlcXVlc3RDb250ZXh0OwogfQogCi1zdGF0aWMgUmV0YWluUHRyPEFTQ0NyZWRlbnRpYWxS ZXF1ZXN0Q29udGV4dD4gY29uZmlndXJhdGlvbkFzc2VydGlvblJlcXVlc3RDb250ZXh0KGNvbnN0 IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyYgb3B0aW9ucywgVmVjdG9yPHVpbnQ4 X3Q+IGhhc2gsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWF0aW9uUmVxdWlyZW1lbnQ+IG1l ZGlhdGlvbikKK3N0YXRpYyBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiBj b25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVzdENvbnRleHQoY29uc3QgUHVibGljS2V5Q3JlZGVu dGlhbFJlcXVlc3RPcHRpb25zJiBvcHRpb25zLCBWZWN0b3I8dWludDhfdD4gaGFzaCwgc3RkOjpv cHRpb25hbDxXZWJDb3JlOjpNZWRpYXRpb25SZXF1aXJlbWVudD4gbWVkaWF0aW9uLCBzdGQ6Om9w dGlvbmFsPFdlYkNvcmU6Okdsb2JhbEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCkKIHsKICAgICBB U0NDcmVkZW50aWFsUmVxdWVzdFR5cGVzIHJlcXVlc3RUeXBlcyA9IEFTQ0NyZWRlbnRpYWxSZXF1 ZXN0VHlwZVBsYXRmb3JtUHVibGljS2V5QXNzZXJ0aW9uIHwgQVNDQ3JlZGVudGlhbFJlcXVlc3RU eXBlU2VjdXJpdHlLZXlQdWJsaWNLZXlBc3NlcnRpb247CiAKQEAgLTI2Miw2ICsyNjIsMTAgQEAg c3RhdGljIFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQ+IGNvbmZpZ3VyYXRp b25Bc3NlcnRpb25SZXF1ZXN0Q29udGUKICAgICBbcmVxdWVzdENvbnRleHQgc2V0UmVseWluZ1Bh cnR5SWRlbnRpZmllcjpvcHRpb25zLnJwSWRdOwogICAgIGlmIChtZWRpYXRpb24gPT0gTWVkaWF0 aW9uUmVxdWlyZW1lbnQ6OkNvbmRpdGlvbmFsICYmIFtyZXF1ZXN0Q29udGV4dCByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHNldFJlcXVlc3RTdHlsZTopXSkKICAgICAgICAgcmVxdWVzdENv bnRleHQuZ2V0KCkucmVxdWVzdFN0eWxlID0gQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlQXV0b0Zp bGw7CisgICAgaWYgKGZyYW1lSUQgJiYgW3JlcXVlc3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3Ioc2V0V2ViRnJhbWVJRDopXSAmJiBbcmVxdWVzdENvbnRleHQgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3RvcihzZXRXZWJQYWdlSUQ6KV0pIHsKKyAgICAgICAgcmVxdWVzdENv bnRleHQuZ2V0KCkud2ViRnJhbWVJRCA9IFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRMb25n OmZyYW1lSUQtPmZyYW1lSUQudG9VSW50NjQoKV07CisgICAgICAgIHJlcXVlc3RDb250ZXh0Lmdl dCgpLndlYlBhZ2VJRCA9IFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRMb25nOmZyYW1lSUQt PnBhZ2VJRC50b1VJbnQ2NCgpXTsKKyAgICB9CiAKICAgICBpZiAocmVxdWVzdFR5cGVzICYgQVND Q3JlZGVudGlhbFJlcXVlc3RUeXBlUGxhdGZvcm1QdWJsaWNLZXlBc3NlcnRpb24pIHsKICAgICAg ICAgYXV0byBhc3NlcnRpb25PcHRpb25zID0gYWRvcHROUyhhbGxvY0FTQ1B1YmxpY0tleUNyZWRl bnRpYWxBc3NlcnRpb25PcHRpb25zSW5zdGFuY2UoKSk7CkBAIC0zMDIsNyArMzA2LDcgQEAgUmV0 YWluUHRyPEFTQ0NyZWRlbnRpYWxSZXF1ZXN0Q29udGV4dD4gV2ViQXV0aGVudGljYXRvckNvb3Jk aW5hdG9yUHJveHk6OmNvbnRleHQKICAgICBXVEY6OnN3aXRjaE9uKHJlcXVlc3REYXRhLm9wdGlv bnMsIFsmXShjb25zdCBQdWJsaWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zJiBvcHRpb25z KSB7CiAgICAgICAgIHJlc3VsdCA9IGNvbmZpZ3VyZVJlZ2lzdHJhdGlvblJlcXVlc3RDb250ZXh0 KG9wdGlvbnMsIHJlcXVlc3REYXRhLmhhc2gpOwogICAgIH0sIFsmXShjb25zdCBQdWJsaWNLZXlD cmVkZW50aWFsUmVxdWVzdE9wdGlvbnMmIG9wdGlvbnMpIHsKLSAgICAgICAgcmVzdWx0ID0gY29u ZmlndXJhdGlvbkFzc2VydGlvblJlcXVlc3RDb250ZXh0KG9wdGlvbnMsIHJlcXVlc3REYXRhLmhh c2gsIHJlcXVlc3REYXRhLm1lZGlhdGlvbik7CisgICAgICAgIHJlc3VsdCA9IGNvbmZpZ3VyYXRp b25Bc3NlcnRpb25SZXF1ZXN0Q29udGV4dChvcHRpb25zLCByZXF1ZXN0RGF0YS5oYXNoLCByZXF1 ZXN0RGF0YS5tZWRpYXRpb24sIHJlcXVlc3REYXRhLmZyYW1lSUQpOwogICAgIH0pOwogICAgIHJl dHVybiByZXN1bHQ7CiB9Cg== 453878 2022-03-04 16:10:36 -0800 2022-03-07 09:38:19 -0800 Patch for landing bug-237454-20220304161035.patch text/plain 10071 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNiN2I4YmYzZTkzN2Q5ZmRh MzM3MDY5ZjQxN2Y3NTEwYjJkMzdiNDQuLmViNmE1ZGQ4YTdhY2NlYTA3M2M2MDEyYjhiMjJlNmI1 NTYxZWI4ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDMtMDQgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUHJvdmlkZSBnbG9i YWwgZnJhbWUgaWRlbnRpZmllciB0byBBU0NBZ2VudCBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzQ1NAorICAgICAgICByZGFyOi8vcHJvYmxl bS84OTc4MjE0NworCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAg ICAgRm9yIHB1cnBvc2VzIHJlbGF0ZWQgdG8gY29uZGl0aW9uYWwgbWVkaWF0aW9uLCB0aGUgQVND QWdlbnQgU1BJCisgICAgICAgIG5lZWQgdG8ga25vdyB3aGF0IGZyYW1lIHJlcXVlc3RlZCB0aGUg YXNzZXJ0aW9uLiBUaGlzIHBhdGNoIHN0YXJ0cworICAgICAgICBwYXNzaW5nIHRoYXQgYWxvbmcu CisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0Nv cmVTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQXV0aGVudGlj YXRvck1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpBdXRoZW50aWNhdG9yTWFuYWdlcjo6 Y2FuY2VsUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6OkF1dGhlbnRpY2F0b3JNYW5hZ2VyOjpy dW5QYW5lbCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1 dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU29mdExpbmsuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTb2Z0TGlu ay5tbToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OmNvbmZpZ3Vy YXRpb25Bc3NlcnRpb25SZXF1ZXN0Q29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhl bnRpY2F0b3JDb29yZGluYXRvclByb3h5Ojpjb250ZXh0Rm9yUmVxdWVzdCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0aW9uUmVxdWVzdERhdGEu aDoKKwogMjAyMi0wMy0wNCAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CiAKICAgICAg ICAgW1dlYkF1dGhuXSBEb24ndCB1c2UgZGVjaWRlUG9saWN5Rm9yTG9jYWxBdXRoZW50aWNhdG9y IGZvciBXZWIgQXV0aGVudGljYXRpb24gTW9kZXJuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1BsYXRmb3JtL3NwaS9Db2NvYS9BdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZVNQSS5oIGIvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVT UEkuaAppbmRleCA0MjQ5OTBmYTdiZDE0NzUyMDUyMTA3ZmMzYWQyMTg0Yzg1MWQ1MzI4Li5mM2M4 MGViMjBjZTg3ZTY2ZjMzNDI2ZDk5NGIxMjdmM2I0OTY0OWRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL3NwaS9Db2NvYS9BdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZVNQSS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2Vy dmljZXNDb3JlU1BJLmgKQEAgLTIzNCw2ICsyMzQsMTMgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50 ZWdlciwgQVNDcmVkZW50aWFsUmVxdWVzdFN0eWxlKSB7CiAgICAgQVNDcmVkZW50aWFsUmVxdWVz dFN0eWxlQXV0b0ZpbGwsCiB9OwogCitAY2xhc3MgQVNDR2xvYmFsRnJhbWVJZGVudGlmaWVyOwor CitAaW50ZXJmYWNlIEFTQ0dsb2JhbEZyYW1lSWRlbnRpZmllciA6IE5TT2JqZWN0IDxOU1NlY3Vy ZUNvZGluZz4KK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSBOU051bWJlciAqd2ViUGFnZUlE OworQHByb3BlcnR5IChub25hdG9taWMsIGNvcHkpIE5TTnVtYmVyICp3ZWJGcmFtZUlEOworQGVu ZAorCiBAaW50ZXJmYWNlIEFTQ0NyZWRlbnRpYWxSZXF1ZXN0Q29udGV4dCA6IE5TT2JqZWN0IDxO U1NlY3VyZUNvZGluZz4KIAogLSAoaW5zdGFuY2V0eXBlKWluaXQgTlNfVU5BVkFJTEFCTEU7CkBA IC0yNTIsNiArMjU5LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgQVNDcmVkZW50aWFs UmVxdWVzdFN0eWxlKSB7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBBU0NyZWRlbnRpYWxSZXF1 ZXN0U3R5bGUgcmVxdWVzdFN0eWxlOwogCitAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUs IGNvcHkpIEFTQ0dsb2JhbEZyYW1lSWRlbnRpZmllciAqZ2xvYmFsRnJhbWVJRDsKIEBlbmQKIAog QHByb3RvY29sIEFTQ0NyZWRlbnRpYWxQcm90b2NvbCA8TlNPYmplY3QsIE5TU2VjdXJlQ29kaW5n PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v QXV0aGVudGljYXRvck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0 aGVudGljYXRpb24vQXV0aGVudGljYXRvck1hbmFnZXIuY3BwCmluZGV4IDY1NzJmNTM5NTk4ZWY0 MWRkMTAzMDVhY2VlYzhmMTg3ZDhkNTI1MjUuLjY5ZTM5M2Y2ZGIyOGFhNjBlODVlNTBjZWUzZWQy YTBjZDVlZDNlNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhl bnRpY2F0aW9uL0F1dGhlbnRpY2F0b3JNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdG9yTWFuYWdlci5jcHAKQEAgLTE5 OCw3ICsxOTgsNyBAQCB2b2lkIEF1dGhlbnRpY2F0b3JNYW5hZ2VyOjpjYW5jZWxSZXF1ZXN0KGNv bnN0IFBhZ2VJZGVudGlmaWVyJiBwYWdlSUQsIGNvbnN0IHN0ZAogewogICAgIGlmICghbV9wZW5k aW5nQ29tcGxldGlvbkhhbmRsZXIpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAoYXV0byBwZW5k aW5nRnJhbWVJRCA9IG1fcGVuZGluZ1JlcXVlc3REYXRhLmZyYW1lSUQpIHsKKyAgICBpZiAoYXV0 byBwZW5kaW5nRnJhbWVJRCA9IG1fcGVuZGluZ1JlcXVlc3REYXRhLmdsb2JhbEZyYW1lSUQpIHsK ICAgICAgICAgaWYgKHBlbmRpbmdGcmFtZUlELT5wYWdlSUQgIT0gcGFnZUlEKQogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICBpZiAoZnJhbWVJRCAmJiBmcmFtZUlEICE9IHBlbmRpbmdGcmFt ZUlELT5mcmFtZUlEKQpAQCAtNDQ3LDggKzQ0Nyw4IEBAIHZvaWQgQXV0aGVudGljYXRvck1hbmFn ZXI6OnJ1blBhbmVsKCkKICAgICBhdXRvKiBwYWdlID0gbV9wZW5kaW5nUmVxdWVzdERhdGEucGFn ZS5nZXQoKTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKLSAgICBBU1NFUlQobV9w ZW5kaW5nUmVxdWVzdERhdGEuZnJhbWVJRCAmJiBwYWdlLT53ZWJQYWdlSUQoKSA9PSBtX3BlbmRp bmdSZXF1ZXN0RGF0YS5mcmFtZUlELT5wYWdlSUQpOwotICAgIGF1dG8qIGZyYW1lID0gcGFnZS0+ cHJvY2VzcygpLndlYkZyYW1lKG1fcGVuZGluZ1JlcXVlc3REYXRhLmZyYW1lSUQtPmZyYW1lSUQp OworICAgIEFTU0VSVChtX3BlbmRpbmdSZXF1ZXN0RGF0YS5nbG9iYWxGcmFtZUlEICYmIHBhZ2Ut PndlYlBhZ2VJRCgpID09IG1fcGVuZGluZ1JlcXVlc3REYXRhLmdsb2JhbEZyYW1lSUQtPnBhZ2VJ RCk7CisgICAgYXV0byogZnJhbWUgPSBwYWdlLT5wcm9jZXNzKCkud2ViRnJhbWUobV9wZW5kaW5n UmVxdWVzdERhdGEuZ2xvYmFsRnJhbWVJRC0+ZnJhbWVJRCk7CiAgICAgaWYgKCFmcmFtZSkKICAg ICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9BdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZVNvZnRMaW5rLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9BdXRoZW50 aWNhdGlvblNlcnZpY2VzQ29yZVNvZnRMaW5rLmgKaW5kZXggN2I2OTg3OGNjMTFiYjQ4ZjIzYzQ2 N2VkNDEzODgwNWEzNGU2YWY2Mi4uMGQ5OWIzM2UzNmI1YTFlMjUxYWY2YTI1YTczNmViNWE0NzIy MTBhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTb2Z0TGluay5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhlbnRpY2F0aW9u U2VydmljZXNDb3JlU29mdExpbmsuaApAQCAtNDAsNiArNDAsNyBAQCBTT0ZUX0xJTktfQ0xBU1Nf Rk9SX0hFQURFUihXZWJLaXQsIEFTQ0F1dGhvcml6YXRpb25QcmVzZW50YXRpb25Db250ZXh0KTsK IFNPRlRfTElOS19DTEFTU19GT1JfSEVBREVSKFdlYktpdCwgQVNDQXV0aG9yaXphdGlvblByZXNl bnRlcik7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX0hFQURFUihXZWJLaXQsIEFTQ0F1dGhvcml6YXRp b25SZW1vdGVQcmVzZW50ZXIpOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9IRUFERVIoV2ViS2l0LCBB U0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQpOworU09GVF9MSU5LX0NMQVNTX0ZPUl9IRUFERVIo V2ViS2l0LCBBU0NHbG9iYWxGcmFtZUlkZW50aWZpZXIpOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9I RUFERVIoV2ViS2l0LCBBU0NXZWJBdXRoZW50aWNhdGlvbkV4dGVuc2lvbnNDbGllbnRJbnB1dHMp OwogU09GVF9MSU5LX0NMQVNTX0ZPUl9IRUFERVIoV2ViS2l0LCBBU0NQbGF0Zm9ybVB1YmxpY0tl eUNyZWRlbnRpYWxBc3NlcnRpb24pOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9IRUFERVIoV2ViS2l0 LCBBU0NQbGF0Zm9ybVB1YmxpY0tleUNyZWRlbnRpYWxMb2dpbkNob2ljZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9BdXRoZW50 aWNhdGlvblNlcnZpY2VzQ29yZVNvZnRMaW5rLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmVTb2Z0TGlu ay5tbQppbmRleCAwYmI2ZmRmZDQyZjMzNWYzOTM0Y2JhZjA4NWY1NjQ1ZTkyMTczYjAyLi5iYTEw MTBjZjE1MzVmZDUxODQyOWJmODJhMTU5MjhmY2JiODdhMGJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9BdXRoZW50aWNhdGlvblNl cnZpY2VzQ29yZVNvZnRMaW5rLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1 dGhlbnRpY2F0aW9uL0NvY29hL0F1dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU29mdExpbmsubW0K QEAgLTQwLDYgKzQwLDcgQEAgU09GVF9MSU5LX0NMQVNTX0ZPUl9TT1VSQ0UoV2ViS2l0LCBBdXRo ZW50aWNhdGlvblNlcnZpY2VzQ29yZSwgQVNDQXV0aG9yaXphdGlvblAKIFNPRlRfTElOS19DTEFT U19GT1JfU09VUkNFKFdlYktpdCwgQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmUsIEFTQ0F1dGhv cml6YXRpb25QcmVzZW50ZXIpOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9TT1VSQ0UoV2ViS2l0LCBB dXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZSwgQVNDQXV0aG9yaXphdGlvblJlbW90ZVByZXNlbnRl cik7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX1NPVVJDRShXZWJLaXQsIEF1dGhlbnRpY2F0aW9uU2Vy dmljZXNDb3JlLCBBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQpOworU09GVF9MSU5LX0NMQVNT X0ZPUl9TT1VSQ0VfT1BUSU9OQUwoV2ViS2l0LCBBdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZSwg QVNDR2xvYmFsRnJhbWVJZGVudGlmaWVyKTsKIFNPRlRfTElOS19DTEFTU19GT1JfU09VUkNFX09Q VElPTkFMKFdlYktpdCwgQXV0aGVudGljYXRpb25TZXJ2aWNlc0NvcmUsIEFTQ1dlYkF1dGhlbnRp Y2F0aW9uRXh0ZW5zaW9uc0NsaWVudElucHV0cyk7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX1NPVVJD RShXZWJLaXQsIEF1dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlLCBBU0NQbGF0Zm9ybVB1YmxpY0tl eUNyZWRlbnRpYWxBc3NlcnRpb24pOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9TT1VSQ0UoV2ViS2l0 LCBBdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZSwgQVNDUGxhdGZvcm1QdWJsaWNLZXlDcmVkZW50 aWFsTG9naW5DaG9pY2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRo ZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbQppbmRleCBkZTE3NGQzZjgyOTA3YTNkZTllMmMy ZTQwMDdlZWMwMDNjZDcxZTFmLi42ZDljMDhkMTA1OGY4YjlhNTMzZWU5Yzc5MjE1NTM0YTk3NTQ3 ZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlv bi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9y Q29vcmRpbmF0b3JQcm94eS5tbQpAQCAtMjM2LDcgKzIzNiw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8 QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiBjb25maWd1cmVSZWdpc3RyYXRpb25SZXF1ZXN0 Q29udGV4CiAgICAgcmV0dXJuIHJlcXVlc3RDb250ZXh0OwogfQogCi1zdGF0aWMgUmV0YWluUHRy PEFTQ0NyZWRlbnRpYWxSZXF1ZXN0Q29udGV4dD4gY29uZmlndXJhdGlvbkFzc2VydGlvblJlcXVl c3RDb250ZXh0KGNvbnN0IFB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyYgb3B0aW9u cywgVmVjdG9yPHVpbnQ4X3Q+IGhhc2gsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWF0aW9u UmVxdWlyZW1lbnQ+IG1lZGlhdGlvbikKK3N0YXRpYyBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJl cXVlc3RDb250ZXh0PiBjb25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVzdENvbnRleHQoY29uc3Qg UHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zJiBvcHRpb25zLCBWZWN0b3I8dWludDhf dD4gaGFzaCwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpNZWRpYXRpb25SZXF1aXJlbWVudD4gbWVk aWF0aW9uLCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Okdsb2JhbEZyYW1lSWRlbnRpZmllcj4gZ2xv YmFsRnJhbWVJRCkKIHsKICAgICBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVzIHJlcXVlc3RUeXBl cyA9IEFTQ0NyZWRlbnRpYWxSZXF1ZXN0VHlwZVBsYXRmb3JtUHVibGljS2V5QXNzZXJ0aW9uIHwg QVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBlU2VjdXJpdHlLZXlQdWJsaWNLZXlBc3NlcnRpb247CiAK QEAgLTI2Miw2ICsyNjIsMTIgQEAgc3RhdGljIFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVz dENvbnRleHQ+IGNvbmZpZ3VyYXRpb25Bc3NlcnRpb25SZXF1ZXN0Q29udGUKICAgICBbcmVxdWVz dENvbnRleHQgc2V0UmVseWluZ1BhcnR5SWRlbnRpZmllcjpvcHRpb25zLnJwSWRdOwogICAgIGlm IChtZWRpYXRpb24gPT0gTWVkaWF0aW9uUmVxdWlyZW1lbnQ6OkNvbmRpdGlvbmFsICYmIFtyZXF1 ZXN0Q29udGV4dCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldFJlcXVlc3RTdHlsZTop XSkKICAgICAgICAgcmVxdWVzdENvbnRleHQuZ2V0KCkucmVxdWVzdFN0eWxlID0gQVNDcmVkZW50 aWFsUmVxdWVzdFN0eWxlQXV0b0ZpbGw7CisgICAgaWYgKGdsb2JhbEZyYW1lSUQgJiYgW3JlcXVl c3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0R2xvYmFsRnJhbWVJRDop XSkgeworICAgICAgICBhdXRvIGFzY0dsb2JhbEZyYW1lSUQgPSBhZG9wdE5TKFthbGxvY0FTQ0ds b2JhbEZyYW1lSWRlbnRpZmllckluc3RhbmNlKCkgaW5pdF0pOworICAgICAgICBhc2NHbG9iYWxG cmFtZUlELmdldCgpLndlYkZyYW1lSUQgPSBbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkTG9u ZzpnbG9iYWxGcmFtZUlELT5mcmFtZUlELnRvVUludDY0KCldOworICAgICAgICBhc2NHbG9iYWxG cmFtZUlELmdldCgpLndlYlBhZ2VJRCA9IFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRMb25n Omdsb2JhbEZyYW1lSUQtPnBhZ2VJRC50b1VJbnQ2NCgpXTsKKyAgICAgICAgcmVxdWVzdENvbnRl eHQuZ2V0KCkuZ2xvYmFsRnJhbWVJRCA9IGFzY0dsb2JhbEZyYW1lSUQuZ2V0KCk7CisgICAgfQog CiAgICAgaWYgKHJlcXVlc3RUeXBlcyAmIEFTQ0NyZWRlbnRpYWxSZXF1ZXN0VHlwZVBsYXRmb3Jt UHVibGljS2V5QXNzZXJ0aW9uKSB7CiAgICAgICAgIGF1dG8gYXNzZXJ0aW9uT3B0aW9ucyA9IGFk b3B0TlMoYWxsb2NBU0NQdWJsaWNLZXlDcmVkZW50aWFsQXNzZXJ0aW9uT3B0aW9uc0luc3RhbmNl KCkpOwpAQCAtMzAyLDcgKzMwOCw3IEBAIFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENv bnRleHQ+IFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Ojpjb250ZXh0CiAgICAgV1RG Ojpzd2l0Y2hPbihyZXF1ZXN0RGF0YS5vcHRpb25zLCBbJl0oY29uc3QgUHVibGljS2V5Q3JlZGVu dGlhbENyZWF0aW9uT3B0aW9ucyYgb3B0aW9ucykgewogICAgICAgICByZXN1bHQgPSBjb25maWd1 cmVSZWdpc3RyYXRpb25SZXF1ZXN0Q29udGV4dChvcHRpb25zLCByZXF1ZXN0RGF0YS5oYXNoKTsK ICAgICB9LCBbJl0oY29uc3QgUHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zJiBvcHRp b25zKSB7Ci0gICAgICAgIHJlc3VsdCA9IGNvbmZpZ3VyYXRpb25Bc3NlcnRpb25SZXF1ZXN0Q29u dGV4dChvcHRpb25zLCByZXF1ZXN0RGF0YS5oYXNoLCByZXF1ZXN0RGF0YS5tZWRpYXRpb24pOwor ICAgICAgICByZXN1bHQgPSBjb25maWd1cmF0aW9uQXNzZXJ0aW9uUmVxdWVzdENvbnRleHQob3B0 aW9ucywgcmVxdWVzdERhdGEuaGFzaCwgcmVxdWVzdERhdGEubWVkaWF0aW9uLCByZXF1ZXN0RGF0 YS5nbG9iYWxGcmFtZUlEKTsKICAgICB9KTsKICAgICByZXR1cm4gcmVzdWx0OwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vV2ViQXV0aGVu dGljYXRpb25SZXF1ZXN0RGF0YS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vV2ViQXV0aGVudGljYXRpb25SZXF1ZXN0RGF0YS5oCmluZGV4IGI4Mzk2NTA0ZTFj OTQzMWQ0YWZlMzA2NzA3YTgwOWRmNDczZWE4ZWEuLjk4YjZlZDA5YWI2ZDg4YTM0OWJiN2Y5Njhm ZmRhZjA4Mjg4YTAzNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1 dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0aW9uUmVxdWVzdERhdGEuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdGlvblJlcXVl c3REYXRhLmgKQEAgLTUxLDcgKzUxLDcgQEAgc3RydWN0IFdlYkF1dGhlbnRpY2F0aW9uUmVxdWVz dERhdGEgewogICAgIFdlYWtQdHI8V2ViUGFnZVByb3h5PiBwYWdlOwogICAgIFdlYkF1dGhlbnRp Y2F0aW9uUGFuZWxSZXN1bHQgcGFuZWxSZXN1bHQgeyBXZWJBdXRoZW50aWNhdGlvblBhbmVsUmVz dWx0OjpVbmF2YWlsYWJsZSB9OwogICAgIFJlZlB0cjxBUEk6OldlYkF1dGhlbnRpY2F0aW9uUGFu ZWw+IHBhbmVsOwotICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6R2xvYmFsRnJhbWVJZGVudGlm aWVyPiBmcmFtZUlEOworICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6R2xvYmFsRnJhbWVJZGVu dGlmaWVyPiBnbG9iYWxGcmFtZUlEOwogICAgIFdlYktpdDo6RnJhbWVJbmZvRGF0YSBmcmFtZUlu Zm87CiAKICAgICBib29sIHByb2Nlc3NpbmdVc2VyR2VzdHVyZTsK