91248 2012-07-13 08:19:03 -0700 [BlackBerry] Add support for attributes to define keyboard and enter key type on the Virtual Keyboard 2012-07-13 10:23:33 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mifenton mifenton tonikitoo webkit.review.bot oldest_to_newest 669055 0 mifenton 2012-07-13 08:19:03 -0700 In order to support html specification for the desired keyboard and enter key type on the VKB we must add a blackberry specific attribute on input elements. 669147 1 152282 mifenton 2012-07-13 09:54:04 -0700 Created attachment 152282 Patch 669185 2 152282 webkit.review.bot 2012-07-13 10:23:29 -0700 Comment on attachment 152282 Patch Clearing flags on attachment: 152282 Committed r122599: <http://trac.webkit.org/changeset/122599> 669186 3 webkit.review.bot 2012-07-13 10:23:33 -0700 All reviewed patches have been landed. Closing bug. 152282 2012-07-13 09:54:04 -0700 2012-07-13 10:23:29 -0700 Patch 0001-2012-07-13-Mike-Fenton-mifenton-rim.com.patch text/plain 9591 mifenton RnJvbSA3MTA3MTY2Y2JlNDk0ZmIxMTlhNjc3ZDA3ODNiNWNkNTc1ZmYxZDlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog RnJpLCAxMyBKdWwgMjAxMiAxMToxMDowMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDct MTMgIE1pa2UgRmVudG9uICA8bWlmZW50b25AcmltLmNvbT4KCiAgICAgICAgUFIgMTc0NzMzLgoK ICAgICAgICBBZGQgZGF0YS1ibGFja2JlcnJ5LXZpcnR1YWwta2V5Ym9hcmQtdHlwZSBhbmQKICAg ICAgICBkYXRhLWJsYWNrYmVycnktdmlydHVhbC1rZXlib2FyZC1lbnRlci1rZXkgdG8KICAgICAg ICBlbmFibGUgY29uZmlndXJhdGlvbiBvZiB0aGUgZGVzaXJlZCB2aXJ0dWFsIGtleWJvYXJkCiAg ICAgICAgdXNpbmcgZWxlbWVudCBhdHRyaWJ1dGVzLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgKiBBcGkvV2ViUGFnZUNsaWVudC5oOgogICAgICAgICogV2Vi S2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OmNvbnZlcnRTdHJpbmdUb0tleWJvYXJkVHlwZSk6CiAgICAgICAgKFdlYktpdCk6CiAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6a2V5Ym9hcmRUeXBlQXR0cmlidXRlKToKICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0Ojpjb252ZXJ0U3RyaW5nVG9LZXlib2FyZEVudGVyeUtleVR5cGUpOgog ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OmtleWJvYXJkRW50ZXJLZXlUeXBlQXR0cmlidXRl KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRG b2N1c2VkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQu aCAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgICAg ICAgICAgICAgICAgIHwgICAyNSArKysrCiAuLi4vYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5jcHAgICAgICB8ICAxMTkgKysrKysrKysrKysrKysrKysrKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMTQzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaAppbmRleCA3ZDgwM2RlLi4yNzQyNDky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaApAQCAt MTM1LDcgKzEzNSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5Q29udGVudFJl bmRlcmVkKGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBy ZXNpemVTdXJmYWNlSWZOZWVkZWQoKSA9IDA7CiAKLSAgICB2aXJ0dWFsIHZvaWQgaW5wdXRGb2N1 c0dhaW5lZChQbGF0Zm9ybTo6QmxhY2tCZXJyeUlucHV0VHlwZSwgaW50IGlucHV0U3R5bGUpID0g MDsKKyAgICB2aXJ0dWFsIHZvaWQgaW5wdXRGb2N1c0dhaW5lZChQbGF0Zm9ybTo6QmxhY2tCZXJy eUlucHV0VHlwZSwgaW50IGlucHV0U3R5bGUsIFBsYXRmb3JtOjpWaXJ0dWFsS2V5Ym9hcmRUeXBl LCBQbGF0Zm9ybTo6VmlydHVhbEtleWJvYXJkRW50ZXJLZXlUeXBlKSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIGlucHV0Rm9jdXNMb3N0KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBpbnB1dFRleHRD aGFuZ2VkKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBpbnB1dFNlbGVjdGlvbkNoYW5nZWQodW5z aWduZWQgc2VsZWN0aW9uU3RhcnQsIHVuc2lnbmVkIHNlbGVjdGlvbkVuZCkgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggNmNiNmNkZS4uYzFmOTNjMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDctMTMgIE1pa2UgRmVu dG9uICA8bWlmZW50b25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQWRkIHN1cHBv cnQgZm9yIGF0dHJpYnV0ZXMgdG8gZGVmaW5lIGtleWJvYXJkIGFuZCBlbnRlciBrZXkgdHlwZSBv biB0aGUgVmlydHVhbCBLZXlib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTEyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBQUiAxNzQ3MzMuCisKKyAgICAgICAgQWRkIGRhdGEtYmxhY2tiZXJyeS12 aXJ0dWFsLWtleWJvYXJkLXR5cGUgYW5kCisgICAgICAgIGRhdGEtYmxhY2tiZXJyeS12aXJ0dWFs LWtleWJvYXJkLWVudGVyLWtleSB0bworICAgICAgICBlbmFibGUgY29uZmlndXJhdGlvbiBvZiB0 aGUgZGVzaXJlZCB2aXJ0dWFsIGtleWJvYXJkCisgICAgICAgIHVzaW5nIGVsZW1lbnQgYXR0cmli dXRlcy4KKworICAgICAgICBSZXZpZXdlZCBJbnRlcm5hbGx5IGJ5IEdlbiBNYWsuCisKKyAgICAg ICAgKiBBcGkvV2ViUGFnZUNsaWVudC5oOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6Y29udmVydFN0cmluZ1Rv S2V5Ym9hcmRUeXBlKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OmtleWJvYXJkVHlwZUF0dHJpYnV0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OmNvbnZlcnRTdHJpbmdUb0tleWJvYXJkRW50ZXJLZXlUeXBlKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6a2V5Ym9hcmRFbnRlcktleVR5cGVBdHRyaWJ1dGUpOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRGb2N1c2VkKToKKwog MjAxMi0wNy0xMiAgQmVuamFtaW4gQyBNZXllciAgPGJtZXllckByaW0uY29tPgogCiAgICAgICAg IFdlYlBhZ2U6OmV4ZWN1dGVKYXZhU2NyaXB0RnVuY3Rpb24gY3Jhc2hlcyB3aGVuIHRoZXJlIGlz IGFuIGV4Y2VwdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKaW5kZXggYzljNTIwMC4uZDljYjIyZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgi CiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJI VE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5jbHVk ZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTE9wdEdyb3VwRWxlbWVudC5oIgpAQCAtMjEy LDYgKzIxMywxMTcgQEAgc3RhdGljIGludCBpbnB1dFN0eWxlKEJsYWNrQmVycnlJbnB1dFR5cGUg dHlwZSwgY29uc3QgRWxlbWVudCogZWxlbWVudCkKICAgICByZXR1cm4gREVGQVVMVF9TVFlMRTsK IH0KIAorc3RhdGljIFZpcnR1YWxLZXlib2FyZFR5cGUgY29udmVydFN0cmluZ1RvS2V5Ym9hcmRU eXBlKGNvbnN0IEF0b21pY1N0cmluZyYgc3RyaW5nKQoreworICAgIERFRklORV9TVEFUSUNfTE9D QUwoQXRvbWljU3RyaW5nLCBEZWZhdWx0LCAoImRlZmF1bHQiKSk7CisgICAgREVGSU5FX1NUQVRJ Q19MT0NBTChBdG9taWNTdHJpbmcsIFVybCwgKCJ1cmwiKSk7CisgICAgREVGSU5FX1NUQVRJQ19M T0NBTChBdG9taWNTdHJpbmcsIEVtYWlsLCAoImVtYWlsIikpOworICAgIERFRklORV9TVEFUSUNf TE9DQUwoQXRvbWljU3RyaW5nLCBQYXNzd29yZCwgKCJwYXNzd29yZCIpKTsKKyAgICBERUZJTkVf U1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgV2ViLCAoIndlYiIpKTsKKyAgICBERUZJTkVfU1RB VElDX0xPQ0FMKEF0b21pY1N0cmluZywgTnVtYmVyLCAoIm51bWJlciIpKTsKKyAgICBERUZJTkVf U1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgU3ltYm9sLCAoInN5bWJvbCIpKTsKKyAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgUGhvbmUsICgicGhvbmUiKSk7CisgICAgREVG SU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIFBpbiwgKCJwaW4iKSk7CisgICAgREVGSU5F X1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIEhleCwgKCJoZXhhZGVjaW1hbCIpKTsKKworICAg IGlmIChzdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gVktCVHlwZU5vdFNldDsKKyAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoc3RyaW5nLCBEZWZhdWx0KSkKKyAgICAgICAgcmV0dXJu IFZLQlR5cGVEZWZhdWx0OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShzdHJpbmcsIFVybCkp CisgICAgICAgIHJldHVybiBWS0JUeXBlVXJsOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShz dHJpbmcsIEVtYWlsKSkKKyAgICAgICAgcmV0dXJuIFZLQlR5cGVFbWFpbDsKKyAgICBpZiAoZXF1 YWxJZ25vcmluZ0Nhc2Uoc3RyaW5nLCBQYXNzd29yZCkpCisgICAgICAgIHJldHVybiBWS0JUeXBl UGFzc3dvcmQ7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywgV2ViKSkKKyAgICAg ICAgcmV0dXJuIFZLQlR5cGVXZWI7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywg TnVtYmVyKSkKKyAgICAgICAgcmV0dXJuIFZLQlR5cGVOdW1QdW5jOworICAgIGlmIChlcXVhbEln bm9yaW5nQ2FzZShzdHJpbmcsIFN5bWJvbCkpCisgICAgICAgIHJldHVybiBWS0JUeXBlU3ltYm9s OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShzdHJpbmcsIFBob25lKSkKKyAgICAgICAgcmV0 dXJuIFZLQlR5cGVQaG9uZTsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoc3RyaW5nLCBQaW4p IHx8IGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywgSGV4KSkKKyAgICAgICAgcmV0dXJuIFZLQlR5 cGVQaW47CisgICAgcmV0dXJuIFZLQlR5cGVOb3RTZXQ7Cit9CisKK3N0YXRpYyBWaXJ0dWFsS2V5 Ym9hcmRUeXBlIGtleWJvYXJkVHlwZUF0dHJpYnV0ZShjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBl bGVtZW50KQoreworICAgIERFRklORV9TVEFUSUNfTE9DQUwoUXVhbGlmaWVkTmFtZSwga2V5Ym9h cmRUeXBlQXR0ciwgKG51bGxBdG9tLCAiZGF0YS1ibGFja2JlcnJ5LXZpcnR1YWwta2V5Ym9hcmQt dHlwZSIsIG51bGxBdG9tKSk7CisKKyAgICBpZiAoZWxlbWVudC0+ZmFzdEhhc0F0dHJpYnV0ZShr ZXlib2FyZFR5cGVBdHRyKSkgeworICAgICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlU3RyaW5n ID0gZWxlbWVudC0+ZmFzdEdldEF0dHJpYnV0ZShrZXlib2FyZFR5cGVBdHRyKTsKKyAgICAgICAg cmV0dXJuIGNvbnZlcnRTdHJpbmdUb0tleWJvYXJkVHlwZShhdHRyaWJ1dGVTdHJpbmcpOworICAg IH0KKworICAgIGlmIChlbGVtZW50LT5pc0Zvcm1Db250cm9sRWxlbWVudCgpKSB7CisgICAgICAg IGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1lbnQqIGZvcm1FbGVtZW50ID0gc3RhdGljX2Nhc3Q8 Y29uc3QgSFRNTEZvcm1Db250cm9sRWxlbWVudCo+KGVsZW1lbnQpOworICAgICAgICBpZiAoZm9y bUVsZW1lbnQtPmZvcm0oKSAmJiBmb3JtRWxlbWVudC0+Zm9ybSgpLT5mYXN0SGFzQXR0cmlidXRl KGtleWJvYXJkVHlwZUF0dHIpKSB7CisgICAgICAgICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRl U3RyaW5nID0gZm9ybUVsZW1lbnQtPmZvcm0oKS0+ZmFzdEdldEF0dHJpYnV0ZShrZXlib2FyZFR5 cGVBdHRyKTsKKyAgICAgICAgICAgIHJldHVybiBjb252ZXJ0U3RyaW5nVG9LZXlib2FyZFR5cGUo YXR0cmlidXRlU3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBWS0JUeXBl Tm90U2V0OworfQorCitzdGF0aWMgVmlydHVhbEtleWJvYXJkRW50ZXJLZXlUeXBlIGNvbnZlcnRT dHJpbmdUb0tleWJvYXJkRW50ZXJLZXlUeXBlKGNvbnN0IEF0b21pY1N0cmluZyYgc3RyaW5nKQor eworICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBEZWZhdWx0LCAoImRlZmF1 bHQiKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIENvbm5lY3QsICgi Y29ubmVjdCIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgRG9uZSwg KCJkb25lIikpOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBHbywgKCJn byIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgSm9pbiwgKCJqb2lu IikpOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBOZXh0LCAoIm5leHQi KSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIFNlYXJjaCwgKCJzZWFy Y2giKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIFNlbmQsICgic2Vu ZCIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgU3VibWl0LCAoInN1 Ym1pdCIpKTsKKworICAgIGlmIChzdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gVktC RW50ZXJLZXlOb3RTZXQ7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywgRGVmYXVs dCkpCisgICAgICAgIHJldHVybiBWS0JFbnRlcktleURlZmF1bHQ7CisgICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKHN0cmluZywgQ29ubmVjdCkpCisgICAgICAgIHJldHVybiBWS0JFbnRlcktleUNv bm5lY3Q7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywgRG9uZSkpCisgICAgICAg IHJldHVybiBWS0JFbnRlcktleURvbmU7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmlu ZywgR28pKQorICAgICAgICByZXR1cm4gVktCRW50ZXJLZXlHbzsKKyAgICBpZiAoZXF1YWxJZ25v cmluZ0Nhc2Uoc3RyaW5nLCBKb2luKSkKKyAgICAgICAgcmV0dXJuIFZLQkVudGVyS2V5Sm9pbjsK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoc3RyaW5nLCBOZXh0KSkKKyAgICAgICAgcmV0dXJu IFZLQkVudGVyS2V5TmV4dDsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoc3RyaW5nLCBTZWFy Y2gpKQorICAgICAgICByZXR1cm4gVktCRW50ZXJLZXlTZWFyY2g7CisgICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKHN0cmluZywgU2VuZCkpCisgICAgICAgIHJldHVybiBWS0JFbnRlcktleVNlbmQ7 CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHN0cmluZywgU3VibWl0KSkKKyAgICAgICAgcmV0 dXJuIFZLQkVudGVyS2V5U3VibWl0OworICAgIHJldHVybiBWS0JFbnRlcktleU5vdFNldDsKK30K Kworc3RhdGljIFZpcnR1YWxLZXlib2FyZEVudGVyS2V5VHlwZSBrZXlib2FyZEVudGVyS2V5VHlw ZUF0dHJpYnV0ZShjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQoreworICAgIERFRklO RV9TVEFUSUNfTE9DQUwoUXVhbGlmaWVkTmFtZSwga2V5Ym9hcmRFbnRlcktleVR5cGVBdHRyLCAo bnVsbEF0b20sICJkYXRhLWJsYWNrYmVycnktdmlydHVhbC1rZXlib2FyZC1lbnRlci1rZXkiLCBu dWxsQXRvbSkpOworCisgICAgaWYgKGVsZW1lbnQtPmZhc3RIYXNBdHRyaWJ1dGUoa2V5Ym9hcmRF bnRlcktleVR5cGVBdHRyKSkgeworICAgICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlU3RyaW5n ID0gZWxlbWVudC0+ZmFzdEdldEF0dHJpYnV0ZShrZXlib2FyZEVudGVyS2V5VHlwZUF0dHIpOwor ICAgICAgICByZXR1cm4gY29udmVydFN0cmluZ1RvS2V5Ym9hcmRFbnRlcktleVR5cGUoYXR0cmli dXRlU3RyaW5nKTsKKyAgICB9CisKKyAgICBpZiAoZWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1l bnQoKSkgeworICAgICAgICBjb25zdCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50KiBmb3JtRWxlbWVu dCA9IHN0YXRpY19jYXN0PGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1lbnQqPihlbGVtZW50KTsK KyAgICAgICAgaWYgKGZvcm1FbGVtZW50LT5mb3JtKCkgJiYgZm9ybUVsZW1lbnQtPmZvcm0oKS0+ ZmFzdEhhc0F0dHJpYnV0ZShrZXlib2FyZEVudGVyS2V5VHlwZUF0dHIpKSB7CisgICAgICAgICAg ICBBdG9taWNTdHJpbmcgYXR0cmlidXRlU3RyaW5nID0gZm9ybUVsZW1lbnQtPmZvcm0oKS0+ZmFz dEdldEF0dHJpYnV0ZShrZXlib2FyZEVudGVyS2V5VHlwZUF0dHIpOworICAgICAgICAgICAgcmV0 dXJuIGNvbnZlcnRTdHJpbmdUb0tleWJvYXJkRW50ZXJLZXlUeXBlKGF0dHJpYnV0ZVN0cmluZyk7 CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gVktCRW50ZXJLZXlOb3RTZXQ7Cit9CisK IFdURjo6U3RyaW5nIElucHV0SGFuZGxlcjo6ZWxlbWVudFRleHQoKQogewogICAgIGlmICghaXNB Y3RpdmVUZXh0RWRpdCgpKQpAQCAtNDc5LDggKzU5MSwxMSBAQCB2b2lkIElucHV0SGFuZGxlcjo6 c2V0RWxlbWVudEZvY3VzZWQoRWxlbWVudCogZWxlbWVudCkKICAgICBCbGFja0JlcnJ5SW5wdXRU eXBlIHR5cGUgPSBlbGVtZW50VHlwZShlbGVtZW50KTsKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1l bnRUZXh0RWRpdE1hc2sgPSBpbnB1dFN0eWxlKHR5cGUsIGVsZW1lbnQpOwogCi0gICAgRm9jdXNM b2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50Rm9jdXNlZCwgVHlwZT0l ZCwgU3R5bGU9JWQiLCB0eXBlLCBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUZXh0RWRpdE1hc2spOwot ICAgIG1fd2ViUGFnZS0+bV9jbGllbnQtPmlucHV0Rm9jdXNHYWluZWQodHlwZSwgbV9jdXJyZW50 Rm9jdXNFbGVtZW50VGV4dEVkaXRNYXNrKTsKKyAgICBWaXJ0dWFsS2V5Ym9hcmRUeXBlIGtleWJv YXJkVHlwZSA9IGtleWJvYXJkVHlwZUF0dHJpYnV0ZShlbGVtZW50KTsKKyAgICBWaXJ0dWFsS2V5 Ym9hcmRFbnRlcktleVR5cGUgZW50ZXJLZXlUeXBlID0ga2V5Ym9hcmRFbnRlcktleVR5cGVBdHRy aWJ1dGUoZWxlbWVudCk7CisKKyAgICBGb2N1c0xvZyhMb2dMZXZlbEluZm8sICJJbnB1dEhhbmRs ZXI6OnNldEVsZW1lbnRGb2N1c2VkLCBUeXBlPSVkLCBTdHlsZT0lZCwgS2V5Ym9hcmQgVHlwZT0l ZCwgRW50ZXIgS2V5PSVkIiwgdHlwZSwgbV9jdXJyZW50Rm9jdXNFbGVtZW50VGV4dEVkaXRNYXNr LCBrZXlib2FyZFR5cGUsIGVudGVyS2V5VHlwZSk7CisgICAgbV93ZWJQYWdlLT5tX2NsaWVudC0+ aW5wdXRGb2N1c0dhaW5lZCh0eXBlLCBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUZXh0RWRpdE1hc2ss IGtleWJvYXJkVHlwZSwgZW50ZXJLZXlUeXBlKTsKIAogICAgIGhhbmRsZUlucHV0TG9jYWxlQ2hh bmdlZChtX3dlYlBhZ2UtPm1fd2ViU2V0dGluZ3MtPmlzV3JpdGluZ0RpcmVjdGlvblJUTCgpKTsK IAotLSAKMS43LjkuNQoK