112716 2013-03-19 10:53:41 -0700 [BlackBerry] Don't handle keyboard scrolling shortcuts in webkit 2013-03-19 12:16:47 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 chutten chutten mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 858467 0 chutten 2013-03-19 10:53:41 -0700 ...that's what the client is for! This is a holdover from previous eras that can now be safely removed. 858490 1 193869 chutten 2013-03-19 11:04:49 -0700 Created attachment 193869 Patch 858493 2 193869 mifenton 2013-03-19 11:06:25 -0700 Comment on attachment 193869 Patch Good cleanup. 858496 3 193869 rwlbuis 2013-03-19 11:08:23 -0700 Comment on attachment 193869 Patch Nice cleanup indeed. 858498 4 193870 chutten 2013-03-19 11:12:22 -0700 Created attachment 193870 Patch 858503 5 193870 rwlbuis 2013-03-19 11:13:42 -0700 Comment on attachment 193870 Patch LGTM. 858586 6 193870 webkit.review.bot 2013-03-19 12:16:44 -0700 Comment on attachment 193870 Patch Clearing flags on attachment: 193870 Committed r146233: <http://trac.webkit.org/changeset/146233> 858587 7 webkit.review.bot 2013-03-19 12:16:47 -0700 All reviewed patches have been landed. Closing bug. 193869 2013-03-19 11:04:49 -0700 2013-03-19 11:12:19 -0700 Patch bug-112716-20130319135230.patch text/plain 4056 chutten U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0NjVkNWIzYTkyNGVjY2VjNzMxMjFjZWQ4YzA1ODRlMjVlZjg0ZmI0Li5hMDBlZjFkMzJj ZWU3MTZjMzMyMGI5YTNlMjYxNTcxM2Q1MjJmOGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0wMy0xOSAgQ2hyaXMgSHV0dGVuLUN6YXBza2kg IDxjaHV0dGVuQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCBo YW5kbGUga2V5Ym9hcmQgc2Nyb2xsaW5nIHNob3J0Y3V0cyBpbiB3ZWJraXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjcxNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb21tZW50IGlzIHJpZ2h0 LCB0aGlzIGlzbid0IHRoZSBjb3JyZWN0IHBsYWNlIHRvIGhhbmRsZSBrZXlib2FyZAorICAgICAg ICBzY3JvbGxpbmcgc2hvcnRjdXRzLiBUaGF0J3Mgd2hhdCB3ZSBoYXZlIGNsaWVudHMgZm9yLgor CisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpXZWJQYWdlOjprZXlFdmVudCk6CisKIDIwMTMtMDMtMTggIEFsYmVydG8gR2FyY2lhICA8YWdh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQcmV2ZW50IHRleHQgc2Vs ZWN0aW9uIGluc2lkZSBDb2xvdXIgYW5kIERhdGUvVGltZSBpbnB1dCBmaWVsZHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDAxY2FmMDMwOTJkMTliNTk4MDE1 MTZkNjg4ZWE3ZGVmYWFkODlmMDUuLjJjYWIwNjNlYjE1YzNmZjQyMTIxMzlkNWU1OTQxYmQxOGE1 ZjQ3NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtNDI3 Myw1NCArNDI3Myw2IEBAIHZvaWQgV2ViUGFnZTo6c2V0Rm9yY2VkVGV4dEVuY29kaW5nKGNvbnN0 IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGVuY29kaW5nCiAgICAgICAgIHJldHVybiBk LT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+bG9hZGVyKCktPnJlbG9hZFdpdGhPdmVycmlkZUVuY29k aW5nKGVuY29kaW5nKTsKIH0KIAotc3RhdGljIHZvaWQgaGFuZGxlU2Nyb2xsaW5nKHVuc2lnbmVk IGNoYXJhY3RlciwgV2ViUGFnZVByaXZhdGUqIHNjcm9sbGVyKQotewotICAgIGNvbnN0IGludCBz Y3JvbGxGYWN0b3IgPSAyMDsKLSAgICBpbnQgZHggPSAwLCBkeSA9IDA7Ci0gICAgc3dpdGNoIChj aGFyYWN0ZXIpIHsKLSAgICBjYXNlIEtFWUNPREVfTEVGVDoKLSAgICAgICAgZHggPSAtc2Nyb2xs RmFjdG9yOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEtFWUNPREVfUklHSFQ6Ci0gICAgICAg IGR4ID0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEtFWUNPREVfVVA6 Ci0gICAgICAgIGR5ID0gLXNjcm9sbEZhY3RvcjsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBL RVlDT0RFX0RPV046Ci0gICAgICAgIGR5ID0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsK LSAgICBjYXNlIEtFWUNPREVfUEdfVVA6Ci0gICAgICAgIEFTU0VSVChzY3JvbGxlcik7Ci0gICAg ICAgIGR5ID0gc2Nyb2xsRmFjdG9yIC0gc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXplKCkuaGVp Z2h0KCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgS0VZQ09ERV9QR19ET1dOOgotICAgICAg ICBBU1NFUlQoc2Nyb2xsZXIpOwotICAgICAgICBkeSA9IHNjcm9sbGVyLT5hY3R1YWxWaXNpYmxl U2l6ZSgpLmhlaWdodCgpIC0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsKLSAgICB9Ci0K LSAgICBpZiAoZHggfHwgZHkpIHsKLSAgICAgICAgLy8gRG9uJ3QgdXNlIHRoZSBzY3JvbGxCeSBm dW5jdGlvbiBiZWNhdXNlIGl0IHRyaWdnZXJzIHRoZSBzY3JvbGwgYXMgb3JpZ2luYXRpbmcgZnJv bSBCbGFja0JlcnJ5Ci0gICAgICAgIC8vIGJ1dCB0aGVuIGl0IGV4cGVjdHMgYSBzZXBhcmF0ZSBp bnZhbGlkYXRlIHdoaWNoIGlzbid0IHNlbnQgaW4gdGhpcyBjYXNlLgotICAgICAgICBBU1NFUlQo c2Nyb2xsZXIgJiYgc2Nyb2xsZXItPm1fbWFpbkZyYW1lICYmIHNjcm9sbGVyLT5tX21haW5GcmFt ZS0+dmlldygpKTsKLSAgICAgICAgSW50UG9pbnQgcG9zKHNjcm9sbGVyLT5zY3JvbGxQb3NpdGlv bigpICsgSW50U2l6ZShkeCwgZHkpKTsKLQotICAgICAgICAvLyBQcmV2ZW50IG92ZXIgc2Nyb2xs aW5nIGZvciBhcnJvd3MgYW5kIFBhZ2UgdXAvZG93bi4KLSAgICAgICAgaWYgKHBvcy54KCkgPCAw KQotICAgICAgICAgICAgcG9zLnNldFgoMCk7Ci0gICAgICAgIGlmIChwb3MueSgpIDwgMCkKLSAg ICAgICAgICAgIHBvcy5zZXRZKDApOwotICAgICAgICBpZiAocG9zLngoKSArIHNjcm9sbGVyLT5h Y3R1YWxWaXNpYmxlU2l6ZSgpLndpZHRoKCkgPiBzY3JvbGxlci0+Y29udGVudHNTaXplKCkud2lk dGgoKSkKLSAgICAgICAgICAgIHBvcy5zZXRYKHNjcm9sbGVyLT5jb250ZW50c1NpemUoKS53aWR0 aCgpIC0gc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXplKCkud2lkdGgoKSk7Ci0gICAgICAgIGlm IChwb3MueSgpICsgc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXplKCkuaGVpZ2h0KCkgPiBzY3Jv bGxlci0+Y29udGVudHNTaXplKCkuaGVpZ2h0KCkpCi0gICAgICAgICAgICBwb3Muc2V0WShzY3Jv bGxlci0+Y29udGVudHNTaXplKCkuaGVpZ2h0KCkgLSBzY3JvbGxlci0+YWN0dWFsVmlzaWJsZVNp emUoKS5oZWlnaHQoKSk7Ci0KLSAgICAgICAgc2Nyb2xsZXItPm1fbWFpbkZyYW1lLT52aWV3KCkt PnNldFNjcm9sbFBvc2l0aW9uKHBvcyk7Ci0gICAgICAgIHNjcm9sbGVyLT5tX2NsaWVudC0+c2Ny b2xsQ2hhbmdlZCgpOwotICAgIH0KLX0KLQogYm9vbCBXZWJQYWdlOjprZXlFdmVudChjb25zdCBQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVudCkKIHsKICAgICBpZiAoIWQtPm1f bWFpbkZyYW1lLT52aWV3KCkpCkBAIC00MzMxLDE2ICs0MjgzLDcgQEAgYm9vbCBXZWJQYWdlOjpr ZXlFdmVudChjb25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVudCkKIAog ICAgIEFTU0VSVChkLT5tX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpKTsKIAotICAgIGJvb2wgaGFu ZGxlZCA9IGQtPm1faW5wdXRIYW5kbGVyLT5oYW5kbGVLZXlib2FyZElucHV0KGtleWJvYXJkRXZl bnQpOwotCi0gICAgLy8gVGhpcyBpcyBob3RrZXkgaGFuZGxpbmcgYW5kIHBlcmhhcHMgZG9lc24n dCBiZWxvbmcgaGVyZS4KLSAgICBpZiAoIWhhbmRsZWQgJiYga2V5Ym9hcmRFdmVudC50eXBlKCkg PT0gUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24gJiYgIWQtPm1faW5wdXRIYW5kbGVy LT5pc0lucHV0TW9kZSgpICYmICFrZXlib2FyZEV2ZW50Lm1vZGlmaWVycygpKSB7Ci0gICAgICAg IEludFBvaW50IHByZXZpb3VzUG9zID0gZC0+c2Nyb2xsUG9zaXRpb24oKTsKLSAgICAgICAgaGFu ZGxlU2Nyb2xsaW5nKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCksIGQpOwotICAgICAgICBoYW5k bGVkID0gcHJldmlvdXNQb3MgIT0gZC0+c2Nyb2xsUG9zaXRpb24oKTsKLSAgICB9Ci0KLSAgICBy ZXR1cm4gaGFuZGxlZDsKKyAgICByZXR1cm4gZC0+bV9pbnB1dEhhbmRsZXItPmhhbmRsZUtleWJv YXJkSW5wdXQoa2V5Ym9hcmRFdmVudCk7CiB9CiAKIGJvb2wgV2ViUGFnZTo6ZGVsZXRlVGV4dFJl bGF0aXZlVG9DdXJzb3IodW5zaWduZWQgaW50IGxlZnRPZmZzZXQsIHVuc2lnbmVkIGludCByaWdo dE9mZnNldCkK 193870 2013-03-19 11:12:22 -0700 2013-03-19 12:16:44 -0700 Patch bug-112716-20130319140003.patch text/plain 4119 chutten U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0NjVkNWIzYTkyNGVjY2VjNzMxMjFjZWQ4YzA1ODRlMjVlZjg0ZmI0Li5hNDk5ZDUzYTU5 ZjRhOTlkOTE2ZGQ5MmRkYTRjYWY2NTRkOWY3OTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMy0xOSAgQ2hyaXMgSHV0dGVuLUN6YXBza2kg IDxjaHV0dGVuQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCBo YW5kbGUga2V5Ym9hcmQgc2Nyb2xsaW5nIHNob3J0Y3V0cyBpbiB3ZWJraXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjcxNgorCisgICAgICAgIElu Zm9ybWFsbHkgUmV2aWV3ZWQgYnkgTWlrZSBGZW50b24gKG1pZmVudG9uQHJpbS5jb20pCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb21tZW50IGlz IHJpZ2h0LCB0aGlzIGlzbid0IHRoZSBjb3JyZWN0IHBsYWNlIHRvIGhhbmRsZSBrZXlib2FyZAor ICAgICAgICBzY3JvbGxpbmcgc2hvcnRjdXRzLiBUaGF0J3Mgd2hhdCB3ZSBoYXZlIGNsaWVudHMg Zm9yLgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJQYWdlOjprZXlFdmVudCk6CisKIDIwMTMtMDMtMTggIEFsYmVydG8gR2FyY2lh ICA8YWdhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQcmV2ZW50IHRl eHQgc2VsZWN0aW9uIGluc2lkZSBDb2xvdXIgYW5kIERhdGUvVGltZSBpbnB1dCBmaWVsZHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDAxY2FmMDMwOTJkMTli NTk4MDE1MTZkNjg4ZWE3ZGVmYWFkODlmMDUuLjJjYWIwNjNlYjE1YzNmZjQyMTIxMzlkNWU1OTQx YmQxOGE1ZjQ3NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApA QCAtNDI3Myw1NCArNDI3Myw2IEBAIHZvaWQgV2ViUGFnZTo6c2V0Rm9yY2VkVGV4dEVuY29kaW5n KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGVuY29kaW5nCiAgICAgICAgIHJl dHVybiBkLT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+bG9hZGVyKCktPnJlbG9hZFdpdGhPdmVycmlk ZUVuY29kaW5nKGVuY29kaW5nKTsKIH0KIAotc3RhdGljIHZvaWQgaGFuZGxlU2Nyb2xsaW5nKHVu c2lnbmVkIGNoYXJhY3RlciwgV2ViUGFnZVByaXZhdGUqIHNjcm9sbGVyKQotewotICAgIGNvbnN0 IGludCBzY3JvbGxGYWN0b3IgPSAyMDsKLSAgICBpbnQgZHggPSAwLCBkeSA9IDA7Ci0gICAgc3dp dGNoIChjaGFyYWN0ZXIpIHsKLSAgICBjYXNlIEtFWUNPREVfTEVGVDoKLSAgICAgICAgZHggPSAt c2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEtFWUNPREVfUklHSFQ6Ci0g ICAgICAgIGR4ID0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEtFWUNP REVfVVA6Ci0gICAgICAgIGR5ID0gLXNjcm9sbEZhY3RvcjsKLSAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBLRVlDT0RFX0RPV046Ci0gICAgICAgIGR5ID0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBi cmVhazsKLSAgICBjYXNlIEtFWUNPREVfUEdfVVA6Ci0gICAgICAgIEFTU0VSVChzY3JvbGxlcik7 Ci0gICAgICAgIGR5ID0gc2Nyb2xsRmFjdG9yIC0gc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXpl KCkuaGVpZ2h0KCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgS0VZQ09ERV9QR19ET1dOOgot ICAgICAgICBBU1NFUlQoc2Nyb2xsZXIpOwotICAgICAgICBkeSA9IHNjcm9sbGVyLT5hY3R1YWxW aXNpYmxlU2l6ZSgpLmhlaWdodCgpIC0gc2Nyb2xsRmFjdG9yOwotICAgICAgICBicmVhazsKLSAg ICB9Ci0KLSAgICBpZiAoZHggfHwgZHkpIHsKLSAgICAgICAgLy8gRG9uJ3QgdXNlIHRoZSBzY3Jv bGxCeSBmdW5jdGlvbiBiZWNhdXNlIGl0IHRyaWdnZXJzIHRoZSBzY3JvbGwgYXMgb3JpZ2luYXRp bmcgZnJvbSBCbGFja0JlcnJ5Ci0gICAgICAgIC8vIGJ1dCB0aGVuIGl0IGV4cGVjdHMgYSBzZXBh cmF0ZSBpbnZhbGlkYXRlIHdoaWNoIGlzbid0IHNlbnQgaW4gdGhpcyBjYXNlLgotICAgICAgICBB U1NFUlQoc2Nyb2xsZXIgJiYgc2Nyb2xsZXItPm1fbWFpbkZyYW1lICYmIHNjcm9sbGVyLT5tX21h aW5GcmFtZS0+dmlldygpKTsKLSAgICAgICAgSW50UG9pbnQgcG9zKHNjcm9sbGVyLT5zY3JvbGxQ b3NpdGlvbigpICsgSW50U2l6ZShkeCwgZHkpKTsKLQotICAgICAgICAvLyBQcmV2ZW50IG92ZXIg c2Nyb2xsaW5nIGZvciBhcnJvd3MgYW5kIFBhZ2UgdXAvZG93bi4KLSAgICAgICAgaWYgKHBvcy54 KCkgPCAwKQotICAgICAgICAgICAgcG9zLnNldFgoMCk7Ci0gICAgICAgIGlmIChwb3MueSgpIDwg MCkKLSAgICAgICAgICAgIHBvcy5zZXRZKDApOwotICAgICAgICBpZiAocG9zLngoKSArIHNjcm9s bGVyLT5hY3R1YWxWaXNpYmxlU2l6ZSgpLndpZHRoKCkgPiBzY3JvbGxlci0+Y29udGVudHNTaXpl KCkud2lkdGgoKSkKLSAgICAgICAgICAgIHBvcy5zZXRYKHNjcm9sbGVyLT5jb250ZW50c1NpemUo KS53aWR0aCgpIC0gc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXplKCkud2lkdGgoKSk7Ci0gICAg ICAgIGlmIChwb3MueSgpICsgc2Nyb2xsZXItPmFjdHVhbFZpc2libGVTaXplKCkuaGVpZ2h0KCkg PiBzY3JvbGxlci0+Y29udGVudHNTaXplKCkuaGVpZ2h0KCkpCi0gICAgICAgICAgICBwb3Muc2V0 WShzY3JvbGxlci0+Y29udGVudHNTaXplKCkuaGVpZ2h0KCkgLSBzY3JvbGxlci0+YWN0dWFsVmlz aWJsZVNpemUoKS5oZWlnaHQoKSk7Ci0KLSAgICAgICAgc2Nyb2xsZXItPm1fbWFpbkZyYW1lLT52 aWV3KCktPnNldFNjcm9sbFBvc2l0aW9uKHBvcyk7Ci0gICAgICAgIHNjcm9sbGVyLT5tX2NsaWVu dC0+c2Nyb2xsQ2hhbmdlZCgpOwotICAgIH0KLX0KLQogYm9vbCBXZWJQYWdlOjprZXlFdmVudChj b25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVudCkKIHsKICAgICBpZiAo IWQtPm1fbWFpbkZyYW1lLT52aWV3KCkpCkBAIC00MzMxLDE2ICs0MjgzLDcgQEAgYm9vbCBXZWJQ YWdlOjprZXlFdmVudChjb25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVu dCkKIAogICAgIEFTU0VSVChkLT5tX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpKTsKIAotICAgIGJv b2wgaGFuZGxlZCA9IGQtPm1faW5wdXRIYW5kbGVyLT5oYW5kbGVLZXlib2FyZElucHV0KGtleWJv YXJkRXZlbnQpOwotCi0gICAgLy8gVGhpcyBpcyBob3RrZXkgaGFuZGxpbmcgYW5kIHBlcmhhcHMg ZG9lc24ndCBiZWxvbmcgaGVyZS4KLSAgICBpZiAoIWhhbmRsZWQgJiYga2V5Ym9hcmRFdmVudC50 eXBlKCkgPT0gUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24gJiYgIWQtPm1faW5wdXRI YW5kbGVyLT5pc0lucHV0TW9kZSgpICYmICFrZXlib2FyZEV2ZW50Lm1vZGlmaWVycygpKSB7Ci0g ICAgICAgIEludFBvaW50IHByZXZpb3VzUG9zID0gZC0+c2Nyb2xsUG9zaXRpb24oKTsKLSAgICAg ICAgaGFuZGxlU2Nyb2xsaW5nKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCksIGQpOwotICAgICAg ICBoYW5kbGVkID0gcHJldmlvdXNQb3MgIT0gZC0+c2Nyb2xsUG9zaXRpb24oKTsKLSAgICB9Ci0K LSAgICByZXR1cm4gaGFuZGxlZDsKKyAgICByZXR1cm4gZC0+bV9pbnB1dEhhbmRsZXItPmhhbmRs ZUtleWJvYXJkSW5wdXQoa2V5Ym9hcmRFdmVudCk7CiB9CiAKIGJvb2wgV2ViUGFnZTo6ZGVsZXRl VGV4dFJlbGF0aXZlVG9DdXJzb3IodW5zaWduZWQgaW50IGxlZnRPZmZzZXQsIHVuc2lnbmVkIGlu dCByaWdodE9mZnNldCkK