151755 2015-12-02 10:33:24 -0800 AX: AXObjectCacheMac is passing WebCore enum values directly to VoiceOver 2016-01-07 00:15:01 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dmazzoni webkit-unassigned aboxhall apinheiro cfleizach commit-queue dbates jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 1145605 0 dmazzoni 2015-12-02 10:33:24 -0800 As one example, in AXObjectCacheMac.mm when it's populating the userInfo dictionary to pass to AXPostNotificationWithUserInfo: [userInfo setObject:[NSNumber numberWithInt:intent.type] forKey:NSAccessibilityTextStateChangeTypeKey]; However, intent.type is of type AXTextStateChangeType, an enum defined in WebCore/accessibility/AXTextStateChangeIntent.h, and that numeric value is being passed directly to VoiceOver without any translation. As it is now, adding a new enum value to AXTextStateChangeType (in cross-platform code) would probably break WebKit on Mac. In addition to separating the cross-platform constants from the Mac-specific constants, it'd be fantastic if you could document the protocol a bit more, since none of these keys appear in the 10.11 SDK or anywhere online yet. Thanks. 1145606 1 webkit-bug-importer 2015-12-02 10:33:36 -0800 <rdar://problem/23726751> 1153225 2 268407 d_russell 2016-01-06 14:24:35 -0800 Created attachment 268407 Patch 1153226 3 268407 cfleizach 2016-01-06 14:27:41 -0800 Comment on attachment 268407 Patch looks good 1153379 4 268407 commit-queue 2016-01-07 00:14:56 -0800 Comment on attachment 268407 Patch Clearing flags on attachment: 268407 Committed r194690: <http://trac.webkit.org/changeset/194690> 1153380 5 commit-queue 2016-01-07 00:15:01 -0800 All reviewed patches have been landed. Closing bug. 268407 2016-01-06 14:24:35 -0800 2016-01-07 00:14:56 -0800 Patch 151755.patch text/plain 10206 d_russell RnJvbSBiMzAxNTg1MmEyOWRmMjgzZTQwYjRlYmIxMTM2NTBlMjBiNWRmYjFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb3VnIFJ1c3NlbGwgPGRfcnVzc2VsbEBhcHBsZS5jb20+CkRh dGU6IFdlZCwgNiBKYW4gMjAxNiAxNDoxMzo1NiAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtCdWcg MTUxNzU1XSBBWDogQVhPYmplY3RDYWNoZU1hYyBpcyBwYXNzaW5nIFdlYkNvcmUgZW51bQogdmFs dWVzIGRpcmVjdGx5IHRvIFZvaWNlT3ZlcgoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAxOCArKysKIC4uLi9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0gIHwgMTQyICsrKysrKysrKysrKysrKysrKysr LQogMiBmaWxlcyBjaGFuZ2VkLCAxNTUgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggMmQxZTE4MC4uZThlNmUwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBA CisyMDE2LTAxLTA2ICBEb3VnIFJ1c3NlbGwgIDxkX3J1c3NlbGxAYXBwbGUuY29tPgorCisgICAg ICAgIEFYOiBBWE9iamVjdENhY2hlTWFjIGlzIHBhc3NpbmcgV2ViQ29yZSBlbnVtIHZhbHVlcyBk aXJlY3RseSB0byBWb2ljZU92ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MTc1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW06CisgICAgICAg IChwbGF0Zm9ybUNoYW5nZVR5cGVGb3JXZWJDb3JlQ2hhbmdlVHlwZSk6CisgICAgICAgIChwbGF0 Zm9ybUVkaXRUeXBlRm9yV2ViQ29yZUVkaXRUeXBlKToKKyAgICAgICAgKHBsYXRmb3JtRGlyZWN0 aW9uRm9yV2ViQ29yZURpcmVjdGlvbik6CisgICAgICAgIChwbGF0Zm9ybUdyYW51bGFyaXR5Rm9y V2ViQ29yZUdyYW51bGFyaXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBv c3RUZXh0U3RhdGVDaGFuZ2VQbGF0Zm9ybU5vdGlmaWNhdGlvbik6CisgICAgICAgIChXZWJDb3Jl Ojp0ZXh0UmVwbGFjZW1lbnRDaGFuZ2VEaWN0aW9uYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkFY T2JqZWN0Q2FjaGU6OnBvc3RUZXh0UmVwbGFjZW1lbnRQbGF0Zm9ybU5vdGlmaWNhdGlvbik6CisK IDIwMTYtMDEtMDYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBbQ29jb2FdIFRpbnkgY2xlYW51cCBpbiBGb250UGxhdGZvcm1EYXRhOjpjdEZvbnQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RD YWNoZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2Fj aGVNYWMubW0KaW5kZXggNjNmNDVjNS4uMTdmODE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tCkBAIC0zNCw2ICszNCwx MCBAQAogI2ltcG9ydCAiV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMuaCIKICNpbXBv cnQgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKIAorI2lmIF9faGFzX2luY2x1ZGUoPEhJU2Vy dmljZXMvQWNjZXNzaWJpbGl0eVByaXYuaD4pCisjaW5jbHVkZSA8SElTZXJ2aWNlcy9BY2Nlc3Np YmlsaXR5UHJpdi5oPgorI2VuZGlmCisKICNpZm5kZWYgTlNBY2Nlc3NpYmlsaXR5TGl2ZVJlZ2lv bkNoYW5nZWROb3RpZmljYXRpb24KICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5TGl2ZVJlZ2lvbkNo YW5nZWROb3RpZmljYXRpb24gQCJBWExpdmVSZWdpb25DaGFuZ2VkIgogI2VuZGlmCkBAIC05Myw2 ICs5NywxMzQgQEAKIC8vIFZlcnkgbGFyZ2Ugc3RyaW5ncyBjYW4gbmVnYXRpdmVseSBpbXBhY3Qg dGhlIHBlcmZvcm1hbmNlIG9mIG5vdGlmaWNhdGlvbnMsIHNvIHRoaXMgbGVuZ3RoIGlzIGNob3Nl biB0byB0cnkgdG8gZml0IGFuIGF2ZXJhZ2UgcGFyYWdyYXBoIG9yIGxpbmUgb2YgdGV4dCwgYnV0 IG5vdCBhbGxvdyBzdHJpbmdzIHRvIGJlIGxhcmdlIGVub3VnaCB0byBodXJ0IHBlcmZvcm1hbmNl Lgogc3RhdGljIGNvbnN0IE5TVUludGVnZXIgQVhWYWx1ZUNoYW5nZVRydW5jYXRpb25MZW5ndGgg PSAxMDAwOwogCisvLyBDaGVjayBpZiBwbGF0Zm9ybSBwcm92aWRlcyBlbnVtcyBmb3IgdGV4dCBj aGFuZ2Ugbm90aWZpY2F0aW9ucworI2lmbmRlZiBBWFRleHRTdGF0ZUNoYW5nZURlZmluZWQKKyNk ZWZpbmUgQVhUZXh0U3RhdGVDaGFuZ2VEZWZpbmVkCisKK3R5cGVkZWYgQ0ZfRU5VTShVSW50MzIs IEFYVGV4dFN0YXRlQ2hhbmdlVHlwZSkKK3sKKyAgICBrQVhUZXh0U3RhdGVDaGFuZ2VUeXBlVW5r bm93biwKKyAgICBrQVhUZXh0U3RhdGVDaGFuZ2VUeXBlRWRpdCwKKyAgICBrQVhUZXh0U3RhdGVD aGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSwKKyAgICBrQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0 aW9uRXh0ZW5kLAorICAgIGtBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Cb3VuZGFyeQor fTsKKwordHlwZWRlZiBDRl9FTlVNKFVJbnQzMiwgQVhUZXh0RWRpdFR5cGUpCit7CisgICAga0FY VGV4dEVkaXRUeXBlVW5rbm93biwKKyAgICBrQVhUZXh0RWRpdFR5cGVEZWxldGUsCisgICAga0FY VGV4dEVkaXRUeXBlSW5zZXJ0LAorICAgIGtBWFRleHRFZGl0VHlwZVR5cGluZywKKyAgICBrQVhU ZXh0RWRpdFR5cGVEaWN0YXRpb24sCisgICAga0FYVGV4dEVkaXRUeXBlQ3V0LAorICAgIGtBWFRl eHRFZGl0VHlwZVBhc3RlLAorICAgIGtBWFRleHRFZGl0VHlwZUF0dHJpYnV0ZXNDaGFuZ2UKK307 CisKK3R5cGVkZWYgQ0ZfRU5VTShVSW50MzIsIEFYVGV4dFNlbGVjdGlvbkRpcmVjdGlvbikKK3sK KyAgICBrQVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9uVW5rbm93biA9IDAsCisgICAga0FYVGV4dFNl bGVjdGlvbkRpcmVjdGlvbkJlZ2lubmluZywKKyAgICBrQVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9u RW5kLAorICAgIGtBWFRleHRTZWxlY3Rpb25EaXJlY3Rpb25QcmV2aW91cywKKyAgICBrQVhUZXh0 U2VsZWN0aW9uRGlyZWN0aW9uTmV4dCwKKyAgICBrQVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9uRGlz Y29udGlndW91cworfTsKKwordHlwZWRlZiBDRl9FTlVNKFVJbnQzMiwgQVhUZXh0U2VsZWN0aW9u R3JhbnVsYXJpdHkpCit7CisgICAga0FYVGV4dFNlbGVjdGlvbkdyYW51bGFyaXR5VW5rbm93biwK KyAgICBrQVhUZXh0U2VsZWN0aW9uR3JhbnVsYXJpdHlDaGFyYWN0ZXIsCisgICAga0FYVGV4dFNl bGVjdGlvbkdyYW51bGFyaXR5V29yZCwKKyAgICBrQVhUZXh0U2VsZWN0aW9uR3JhbnVsYXJpdHlM aW5lLAorICAgIGtBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eVNlbnRlbmNlLAorICAgIGtBWFRl eHRTZWxlY3Rpb25HcmFudWxhcml0eVBhcmFncmFwaCwKKyAgICBrQVhUZXh0U2VsZWN0aW9uR3Jh bnVsYXJpdHlQYWdlLAorICAgIGtBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eURvY3VtZW50LAor ICAgIGtBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eUFsbAorfTsKKworI2VuZGlmIC8vIEFYVGV4 dFN0YXRlQ2hhbmdlRGVmaW5lZAorCitzdGF0aWMgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlIHBsYXRm b3JtQ2hhbmdlVHlwZUZvcldlYkNvcmVDaGFuZ2VUeXBlKFdlYkNvcmU6OkFYVGV4dFN0YXRlQ2hh bmdlVHlwZSBjaGFuZ2VUeXBlKQoreworICAgIHN3aXRjaCAoY2hhbmdlVHlwZSkgeworICAgIGNh c2UgV2ViQ29yZTo6QVhUZXh0U3RhdGVDaGFuZ2VUeXBlVW5rbm93bjoKKyAgICAgICAgcmV0dXJu IGtBWFRleHRTdGF0ZUNoYW5nZVR5cGVVbmtub3duOworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0 U3RhdGVDaGFuZ2VUeXBlRWRpdDoKKyAgICAgICAgcmV0dXJuIGtBWFRleHRTdGF0ZUNoYW5nZVR5 cGVFZGl0OworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9u TW92ZToKKyAgICAgICAgcmV0dXJuIGtBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3Zl OworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5k OgorICAgICAgICByZXR1cm4ga0FYVGV4dFN0YXRlQ2hhbmdlVHlwZVNlbGVjdGlvbkV4dGVuZDsK KyAgICB9Cit9CisKK3N0YXRpYyBBWFRleHRFZGl0VHlwZSBwbGF0Zm9ybUVkaXRUeXBlRm9yV2Vi Q29yZUVkaXRUeXBlKFdlYkNvcmU6OkFYVGV4dEVkaXRUeXBlIGNoYW5nZVR5cGUpCit7CisgICAg c3dpdGNoIChjaGFuZ2VUeXBlKSB7CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRFZGl0VHlwZVVu a25vd246CisgICAgICAgIHJldHVybiBrQVhUZXh0RWRpdFR5cGVVbmtub3duOworICAgIGNhc2Ug V2ViQ29yZTo6QVhUZXh0RWRpdFR5cGVEZWxldGU6CisgICAgICAgIHJldHVybiBrQVhUZXh0RWRp dFR5cGVEZWxldGU7CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRFZGl0VHlwZUluc2VydDoKKyAg ICAgICAgcmV0dXJuIGtBWFRleHRFZGl0VHlwZUluc2VydDsKKyAgICBjYXNlIFdlYkNvcmU6OkFY VGV4dEVkaXRUeXBlVHlwaW5nOgorICAgICAgICByZXR1cm4ga0FYVGV4dEVkaXRUeXBlVHlwaW5n OworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0RWRpdFR5cGVEaWN0YXRpb246CisgICAgICAgIHJl dHVybiBrQVhUZXh0RWRpdFR5cGVEaWN0YXRpb247CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRF ZGl0VHlwZUN1dDoKKyAgICAgICAgcmV0dXJuIGtBWFRleHRFZGl0VHlwZUN1dDsKKyAgICBjYXNl IFdlYkNvcmU6OkFYVGV4dEVkaXRUeXBlUGFzdGU6CisgICAgICAgIHJldHVybiBrQVhUZXh0RWRp dFR5cGVQYXN0ZTsKKyAgICBjYXNlIFdlYkNvcmU6OkFYVGV4dEVkaXRUeXBlQXR0cmlidXRlc0No YW5nZToKKyAgICAgICAgcmV0dXJuIGtBWFRleHRFZGl0VHlwZUF0dHJpYnV0ZXNDaGFuZ2U7Cisg ICAgfQorfQorCitzdGF0aWMgQVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9uIHBsYXRmb3JtRGlyZWN0 aW9uRm9yV2ViQ29yZURpcmVjdGlvbihXZWJDb3JlOjpBWFRleHRTZWxlY3Rpb25EaXJlY3Rpb24g ZGlyZWN0aW9uKQoreworICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CisgICAgY2FzZSBXZWJDb3Jl OjpBWFRleHRTZWxlY3Rpb25EaXJlY3Rpb25Vbmtub3duOgorICAgICAgICByZXR1cm4ga0FYVGV4 dFNlbGVjdGlvbkRpcmVjdGlvblVua25vd247CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRTZWxl Y3Rpb25EaXJlY3Rpb25CZWdpbm5pbmc6CisgICAgICAgIHJldHVybiBrQVhUZXh0U2VsZWN0aW9u RGlyZWN0aW9uQmVnaW5uaW5nOworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U2VsZWN0aW9uRGly ZWN0aW9uRW5kOgorICAgICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkRpcmVjdGlvbkVuZDsK KyAgICBjYXNlIFdlYkNvcmU6OkFYVGV4dFNlbGVjdGlvbkRpcmVjdGlvblByZXZpb3VzOgorICAg ICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkRpcmVjdGlvblByZXZpb3VzOworICAgIGNhc2Ug V2ViQ29yZTo6QVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9uTmV4dDoKKyAgICAgICAgcmV0dXJuIGtB WFRleHRTZWxlY3Rpb25EaXJlY3Rpb25OZXh0OworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U2Vs ZWN0aW9uRGlyZWN0aW9uRGlzY29udGlndW91czoKKyAgICAgICAgcmV0dXJuIGtBWFRleHRTZWxl Y3Rpb25EaXJlY3Rpb25EaXNjb250aWd1b3VzOworICAgIH0KK30KKworc3RhdGljIEFYVGV4dFNl bGVjdGlvbkdyYW51bGFyaXR5IHBsYXRmb3JtR3JhbnVsYXJpdHlGb3JXZWJDb3JlR3JhbnVsYXJp dHkoV2ViQ29yZTo6QVhUZXh0U2VsZWN0aW9uR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCit7Cisg ICAgc3dpdGNoIChncmFudWxhcml0eSkgeworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U2VsZWN0 aW9uR3JhbnVsYXJpdHlVbmtub3duOgorICAgICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkdy YW51bGFyaXR5VW5rbm93bjsKKyAgICBjYXNlIFdlYkNvcmU6OkFYVGV4dFNlbGVjdGlvbkdyYW51 bGFyaXR5Q2hhcmFjdGVyOgorICAgICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkdyYW51bGFy aXR5Q2hhcmFjdGVyOworICAgIGNhc2UgV2ViQ29yZTo6QVhUZXh0U2VsZWN0aW9uR3JhbnVsYXJp dHlXb3JkOgorICAgICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkdyYW51bGFyaXR5V29yZDsK KyAgICBjYXNlIFdlYkNvcmU6OkFYVGV4dFNlbGVjdGlvbkdyYW51bGFyaXR5TGluZToKKyAgICAg ICAgcmV0dXJuIGtBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eUxpbmU7CisgICAgY2FzZSBXZWJD b3JlOjpBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eVNlbnRlbmNlOgorICAgICAgICByZXR1cm4g a0FYVGV4dFNlbGVjdGlvbkdyYW51bGFyaXR5U2VudGVuY2U7CisgICAgY2FzZSBXZWJDb3JlOjpB WFRleHRTZWxlY3Rpb25HcmFudWxhcml0eVBhcmFncmFwaDoKKyAgICAgICAgcmV0dXJuIGtBWFRl eHRTZWxlY3Rpb25HcmFudWxhcml0eVBhcmFncmFwaDsKKyAgICBjYXNlIFdlYkNvcmU6OkFYVGV4 dFNlbGVjdGlvbkdyYW51bGFyaXR5UGFnZToKKyAgICAgICAgcmV0dXJuIGtBWFRleHRTZWxlY3Rp b25HcmFudWxhcml0eVBhZ2U7CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRTZWxlY3Rpb25HcmFu dWxhcml0eURvY3VtZW50OgorICAgICAgICByZXR1cm4ga0FYVGV4dFNlbGVjdGlvbkdyYW51bGFy aXR5RG9jdW1lbnQ7CisgICAgY2FzZSBXZWJDb3JlOjpBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0 eUFsbDoKKyAgICAgICAgcmV0dXJuIGtBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eUFsbDsKKyAg ICB9Cit9CisKIC8vIFRoZSBzaW1wbGUgQ29jb2EgY2FsbHMgaW4gdGhpcyBmaWxlIGRvbid0IHRo cm93IGV4Y2VwdGlvbnMuCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTIyOSwxMSArMzYxLDEx IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFRleHRTdGF0ZUNoYW5nZVBsYXRmb3JtTm90aWZp Y2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqCiAgICAgaWYgKG1faXNTeW5jaHJvbml6aW5nU2Vs ZWN0aW9uKQogICAgICAgICBbdXNlckluZm8gc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRo Qm9vbDpZRVNdIGZvcktleTpOU0FjY2Vzc2liaWxpdHlUZXh0U3RhdGVTeW5jS2V5XTsKICAgICBp ZiAoaW50ZW50LnR5cGUgIT0gQVhUZXh0U3RhdGVDaGFuZ2VUeXBlVW5rbm93bikgewotICAgICAg ICBbdXNlckluZm8gc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoSW50OmludGVudC50eXBl XSBmb3JLZXk6TlNBY2Nlc3NpYmlsaXR5VGV4dFN0YXRlQ2hhbmdlVHlwZUtleV07CisgICAgICAg IFt1c2VySW5mbyBzZXRPYmplY3Q6QChwbGF0Zm9ybUNoYW5nZVR5cGVGb3JXZWJDb3JlQ2hhbmdl VHlwZShpbnRlbnQudHlwZSkpIGZvcktleTpOU0FjY2Vzc2liaWxpdHlUZXh0U3RhdGVDaGFuZ2VU eXBlS2V5XTsKICAgICAgICAgc3dpdGNoIChpbnRlbnQudHlwZSkgewogICAgICAgICBjYXNlIEFY VGV4dFN0YXRlQ2hhbmdlVHlwZVNlbGVjdGlvbk1vdmU6CiAgICAgICAgIGNhc2UgQVhUZXh0U3Rh dGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kOgotICAgICAgICAgICAgW3VzZXJJbmZvIHNldE9i amVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEludDppbnRlbnQuc2VsZWN0aW9uLmRpcmVjdGlvbl0g Zm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRTZWxlY3Rpb25EaXJlY3Rpb25dOworICAgICAgICAg ICAgW3VzZXJJbmZvIHNldE9iamVjdDpAKHBsYXRmb3JtRGlyZWN0aW9uRm9yV2ViQ29yZURpcmVj dGlvbihpbnRlbnQuc2VsZWN0aW9uLmRpcmVjdGlvbikpIGZvcktleTpOU0FjY2Vzc2liaWxpdHlU ZXh0U2VsZWN0aW9uRGlyZWN0aW9uXTsKICAgICAgICAgICAgIHN3aXRjaCAoaW50ZW50LnNlbGVj dGlvbi5kaXJlY3Rpb24pIHsKICAgICAgICAgICAgIGNhc2UgQVhUZXh0U2VsZWN0aW9uRGlyZWN0 aW9uVW5rbm93bjoKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTI0MSw3ICszNzMsNyBAQCB2 b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RUZXh0U3RhdGVDaGFuZ2VQbGF0Zm9ybU5vdGlmaWNhdGlv bihBY2Nlc3NpYmlsaXR5T2JqZWN0KgogICAgICAgICAgICAgY2FzZSBBWFRleHRTZWxlY3Rpb25E aXJlY3Rpb25FbmQ6CiAgICAgICAgICAgICBjYXNlIEFYVGV4dFNlbGVjdGlvbkRpcmVjdGlvblBy ZXZpb3VzOgogICAgICAgICAgICAgY2FzZSBBWFRleHRTZWxlY3Rpb25EaXJlY3Rpb25OZXh0Ogot ICAgICAgICAgICAgICAgIFt1c2VySW5mbyBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhJ bnQ6aW50ZW50LnNlbGVjdGlvbi5ncmFudWxhcml0eV0gZm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRl eHRTZWxlY3Rpb25HcmFudWxhcml0eV07CisgICAgICAgICAgICAgICAgW3VzZXJJbmZvIHNldE9i amVjdDpAKHBsYXRmb3JtR3JhbnVsYXJpdHlGb3JXZWJDb3JlR3JhbnVsYXJpdHkoaW50ZW50LnNl bGVjdGlvbi5ncmFudWxhcml0eSkpIGZvcktleTpOU0FjY2Vzc2liaWxpdHlUZXh0U2VsZWN0aW9u R3JhbnVsYXJpdHldOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBB WFRleHRTZWxlY3Rpb25EaXJlY3Rpb25EaXNjb250aWd1b3VzOgogICAgICAgICAgICAgICAgIGJy ZWFrOwpAQCAtMjc1LDcgKzQwNyw3IEBAIHN0YXRpYyBOU0RpY3Rpb25hcnkgKnRleHRSZXBsYWNl bWVudENoYW5nZURpY3Rpb25hcnkoQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0CiAgICAgaWYg KCFsZW5ndGgpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAq Y2hhbmdlID0gW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5OjRd OwotICAgIFtjaGFuZ2Ugc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoSW50OnR5cGVdIGZv cktleTpOU0FjY2Vzc2liaWxpdHlUZXh0RWRpdFR5cGVdOworICAgIFtjaGFuZ2Ugc2V0T2JqZWN0 OkAocGxhdGZvcm1FZGl0VHlwZUZvcldlYkNvcmVFZGl0VHlwZSh0eXBlKSkgZm9yS2V5Ok5TQWNj ZXNzaWJpbGl0eVRleHRFZGl0VHlwZV07CiAgICAgaWYgKGxlbmd0aCA+IEFYVmFsdWVDaGFuZ2VU cnVuY2F0aW9uTGVuZ3RoKSB7CiAgICAgICAgIFtjaGFuZ2Ugc2V0T2JqZWN0OltOU051bWJlciBu dW1iZXJXaXRoSW50Omxlbmd0aF0gZm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRDaGFuZ2VWYWx1 ZUxlbmd0aF07CiAgICAgICAgIHRleHQgPSBbdGV4dCBzdWJzdHJpbmdUb0luZGV4OkFYVmFsdWVD aGFuZ2VUcnVuY2F0aW9uTGVuZ3RoXTsKQEAgLTMwNSw3ICs0MzcsNyBAQCB2b2lkIEFYT2JqZWN0 Q2FjaGU6OnBvc3RUZXh0UmVwbGFjZW1lbnRQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmls aXR5T2JqZWN0KgogICAgICAgICByZXR1cm47CiAKICAgICBOU011dGFibGVEaWN0aW9uYXJ5ICp1 c2VySW5mbyA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTo0 XTsKLSAgICBbdXNlckluZm8gc2V0T2JqZWN0OkAoQVhUZXh0U3RhdGVDaGFuZ2VUeXBlRWRpdCkg Zm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRTdGF0ZUNoYW5nZVR5cGVLZXldOworICAgIFt1c2Vy SW5mbyBzZXRPYmplY3Q6QChwbGF0Zm9ybUNoYW5nZVR5cGVGb3JXZWJDb3JlQ2hhbmdlVHlwZShB WFRleHRTdGF0ZUNoYW5nZVR5cGVFZGl0KSkgZm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRTdGF0 ZUNoYW5nZVR5cGVLZXldOwogCiAgICAgTlNNdXRhYmxlQXJyYXkgKmNoYW5nZXMgPSBbW05TTXV0 YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5OjJdOwogICAgIGlmIChOU0RpY3Rpb25h cnkgKmNoYW5nZSA9IHRleHRSZXBsYWNlbWVudENoYW5nZURpY3Rpb25hcnkob2JqZWN0LCBkZWxl dGlvblR5cGUsIGRlbGV0ZWRUZXh0LCBwb3NpdGlvbikpCi0tIAoyLjUuNCAoQXBwbGUgR2l0LTYx KQoK