188216 2018-08-01 03:11:46 -0700 [WPE] Use the new key mapper API from WPEBackend 2018-08-03 03:08:05 -0700 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/WebPlatformForEmbedded/WPEBackend/pull/24 P2 Normal --- 188093 1 cgarcia webkit-unassigned bugs-noreply zan oldest_to_newest 1446850 0 cgarcia 2018-08-01 03:11:46 -0700 Use the new key mapper API from WPEBackend 1446851 1 346268 cgarcia 2018-08-01 03:12:21 -0700 Created attachment 346268 WIP 1447567 2 346467 cgarcia 2018-08-03 02:43:26 -0700 Created attachment 346467 Patch 1447569 3 cgarcia 2018-08-03 03:08:05 -0700 Committed r234542: <https://trac.webkit.org/changeset/234542> 346268 2018-08-01 03:12:21 -0700 2018-08-03 02:43:26 -0700 WIP wpe-key-mapper.diff text/plain 8405 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL0V2ZW50U2VuZGVyUHJveHlX UEUuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZlbnRTZW5kZXJQcm94eVdQRS5j cHAKaW5kZXggNTRiMTNlYzZiY2QuLjY5YTRiZDg5ZWM1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcAorKysgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcApAQCAtMzAzLDExICszMDMs MTQgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtleVJlZiwg V0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKIHsKICAgICB1aW50MzJfdCBtb2RpZmllcnMg PSB3a0V2ZW50TW9kaWZpZXJzVG9XUEUod2tNb2RpZmllcnMpOwogICAgIHVpbnQzMl90IGtleVN5 bSA9IHdwZUtleVN5bUZvcktleVJlZihrZXlSZWYsIGxvY2F0aW9uLCAmbW9kaWZpZXJzKTsKLSAg ICAvLyBGSVhNRTogd2UgZG9uJ3QgaGF2ZSBhIHdheSB0byBnZXQgaGFyZHdhcmUga2V5IGNvZGUg aW4gV1BFLgotICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQgeyBzdGF0 aWNfY2FzdDx1aW50MzJfdD4obV90aW1lKSwga2V5U3ltLCAwLCB0cnVlLCBtb2RpZmllcnN9Owor ICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5X21hcHBlcl9tYXBfZW50cnkqIGVudHJpZXM7CisgICAg dWludDMyX3QgZW50cmllc0NvdW50OworICAgIHdwZV9pbnB1dF9rZXlfbWFwcGVyX2dldF9lbnRy aWVzX2Zvcl9rZXlfY29kZSh3cGVfaW5wdXRfa2V5X21hcHBlcl9nZXRfc2luZ2xldG9uKCksIGtl eVN5bSwgJmVudHJpZXMsICZlbnRyaWVzQ291bnQpOworICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5 Ym9hcmRfZXZlbnQgZXZlbnQgeyBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV90aW1lKSwga2V5U3lt LCBlbnRyaWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwg bW9kaWZpZXJzfTsKICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2tleWJvYXJkX2V2ZW50 KG1fdmlld0JhY2tlbmQsICZldmVudCk7CiAgICAgZXZlbnQucHJlc3NlZCA9IGZhbHNlOwogICAg IHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQobV92aWV3QmFja2VuZCwg JmV2ZW50KTsKKyAgICBmcmVlKGVudHJpZXMpOwogfQogCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6 OmFkZFRvdWNoUG9pbnQoaW50IHgsIGludCB5KQpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tl bmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3 QmFja2VuZC5jcHAKaW5kZXggYWIyMWU1YWUyNjkuLjU0ZjQ0ZmY0Y2JlIDEwMDY0NAotLS0gYS9U b29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwCisrKyBiL1Rvb2xzL3dwZS9i YWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5jcHAKQEAgLTIxNywzNiArMjE3LDkgQEAgY29uc3Qg c3RydWN0IHdsX3BvaW50ZXJfbGlzdGVuZXIgV2luZG93Vmlld0JhY2tlbmQ6OnNfcG9pbnRlckxp c3RlbmVyID0gewogCiBjb25zdCBzdHJ1Y3Qgd2xfa2V5Ym9hcmRfbGlzdGVuZXIgV2luZG93Vmll d0JhY2tlbmQ6OnNfa2V5Ym9hcmRMaXN0ZW5lciA9IHsKICAgICAvLyBrZXltYXAKLSAgICBbXSh2 b2lkKiBkYXRhLCBzdHJ1Y3Qgd2xfa2V5Ym9hcmQqLCB1aW50MzJfdCBmb3JtYXQsIGludCBmZCwg dWludDMyX3Qgc2l6ZSkKKyAgICBbXSh2b2lkKiwgc3RydWN0IHdsX2tleWJvYXJkKiwgdWludDMy X3QgZm9ybWF0LCBpbnQgZmQsIHVpbnQzMl90IHNpemUpCiAgICAgewotICAgICAgICBhdXRvJiB3 aW5kb3cgPSAqc3RhdGljX2Nhc3Q8V2luZG93Vmlld0JhY2tlbmQqPihkYXRhKTsKLSAgICAgICAg aWYgKGZvcm1hdCAhPSBXTF9LRVlCT0FSRF9LRVlNQVBfRk9STUFUX1hLQl9WMSkgewotICAgICAg ICAgICAgY2xvc2UoZmQpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAg ICAgdm9pZCogbWFwcGluZyA9IG1tYXAobnVsbHB0ciwgc2l6ZSwgUFJPVF9SRUFELCBNQVBfU0hB UkVELCBmZCwgMCk7Ci0gICAgICAgIGlmIChtYXBwaW5nID09IE1BUF9GQUlMRUQpIHsKLSAgICAg ICAgICAgIGNsb3NlKGZkKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIGF1dG8mIHhrYiA9IHdpbmRvdy5tX3NlYXREYXRhLnhrYjsKLSAgICAgICAgeGtiLmtleW1h cCA9IHhrYl9rZXltYXBfbmV3X2Zyb21fc3RyaW5nKHhrYi5jb250ZXh0LCBzdGF0aWNfY2FzdDxj aGFyKj4obWFwcGluZyksCi0gICAgICAgICAgICBYS0JfS0VZTUFQX0ZPUk1BVF9URVhUX1YxLCBY S0JfS0VZTUFQX0NPTVBJTEVfTk9fRkxBR1MpOwotICAgICAgICBtdW5tYXAobWFwcGluZywgc2l6 ZSk7Ci0gICAgICAgIGNsb3NlKGZkKTsKLQotICAgICAgICBpZiAoIXhrYi5rZXltYXApCi0gICAg ICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgeGtiLnN0YXRlID0geGtiX3N0YXRlX25ldyh4a2Iu a2V5bWFwKTsKLSAgICAgICAgaWYgKCF4a2Iuc3RhdGUpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgeGtiLmluZGV4ZXMuY29udHJvbCA9IHhrYl9rZXltYXBfbW9kX2dldF9pbmRleCh4 a2Iua2V5bWFwLCBYS0JfTU9EX05BTUVfQ1RSTCk7Ci0gICAgICAgIHhrYi5pbmRleGVzLmFsdCA9 IHhrYl9rZXltYXBfbW9kX2dldF9pbmRleCh4a2Iua2V5bWFwLCBYS0JfTU9EX05BTUVfQUxUKTsK LSAgICAgICAgeGtiLmluZGV4ZXMuc2hpZnQgPSB4a2Jfa2V5bWFwX21vZF9nZXRfaW5kZXgoeGti LmtleW1hcCwgWEtCX01PRF9OQU1FX1NISUZUKTsKKyAgICAgICAgd3BlX2lucHV0X2tleV9tYXBw ZXJfdXBkYXRlX2Zyb21fZmQod3BlX2lucHV0X2tleV9tYXBwZXJfZ2V0X3NpbmdsZXRvbigpLCBm b3JtYXQsIGZkLCBzaXplKTsKICAgICB9LAogICAgIC8vIGVudGVyCiAgICAgW10odm9pZCogZGF0 YSwgc3RydWN0IHdsX2tleWJvYXJkKiwgdWludDMyX3QgLypzZXJpYWwqLywgc3RydWN0IHdsX3N1 cmZhY2UqIHN1cmZhY2UsIHN0cnVjdCB3bF9hcnJheSopCkBAIC0yODIsNyArMjU1LDcgQEAgY29u c3Qgc3RydWN0IHdsX2tleWJvYXJkX2xpc3RlbmVyIFdpbmRvd1ZpZXdCYWNrZW5kOjpzX2tleWJv YXJkTGlzdGVuZXIgPSB7CiAgICAgICAgICAgICAgICAgZ19zb3VyY2VfcmVtb3ZlKHNlYXREYXRh LnJlcGVhdERhdGEuZXZlbnRTb3VyY2UpOwogICAgICAgICAgICAgc2VhdERhdGEucmVwZWF0RGF0 YSA9IHsgMCwgMCwgMCwgMCB9OwogICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IFdMX0tFWUJP QVJEX0tFWV9TVEFURV9QUkVTU0VECi0gICAgICAgICAgICAmJiB4a2Jfa2V5bWFwX2tleV9yZXBl YXRzKHNlYXREYXRhLnhrYi5rZXltYXAsIGtleSkpIHsKKyAgICAgICAgICAgICYmIHdwZV9pbnB1 dF9rZXlfbWFwcGVyX2tleV9yZXBlYXRzKHdwZV9pbnB1dF9rZXlfbWFwcGVyX2dldF9zaW5nbGV0 b24oKSwga2V5KSkgewogCiAgICAgICAgICAgICBpZiAoc2VhdERhdGEucmVwZWF0RGF0YS5ldmVu dFNvdXJjZSkKICAgICAgICAgICAgICAgICBnX3NvdXJjZV9yZW1vdmUoc2VhdERhdGEucmVwZWF0 RGF0YS5ldmVudFNvdXJjZSk7CkBAIC0zMDUsMTkgKzI3OCw4IEBAIGNvbnN0IHN0cnVjdCB3bF9r ZXlib2FyZF9saXN0ZW5lciBXaW5kb3dWaWV3QmFja2VuZDo6c19rZXlib2FyZExpc3RlbmVyID0g ewogICAgIC8vIG1vZGlmaWVycwogICAgIFtdKHZvaWQqIGRhdGEsIHN0cnVjdCB3bF9rZXlib2Fy ZCosIHVpbnQzMl90IC8qc2VyaWFsKi8sIHVpbnQzMl90IGRlcHJlc3NlZE1vZHMsIHVpbnQzMl90 IGxhdGNoZWRNb2RzLCB1aW50MzJfdCBsb2NrZWRNb2RzLCB1aW50MzJfdCBncm91cCkKICAgICB7 Ci0gICAgICAgIGF1dG8mIHhrYiA9IHN0YXRpY19jYXN0PFdpbmRvd1ZpZXdCYWNrZW5kKj4oZGF0 YSktPm1fc2VhdERhdGEueGtiOwotCi0gICAgICAgIHhrYl9zdGF0ZV91cGRhdGVfbWFzayh4a2Iu c3RhdGUsIGRlcHJlc3NlZE1vZHMsIGxhdGNoZWRNb2RzLCBsb2NrZWRNb2RzLCAwLCAwLCBncm91 cCk7Ci0KLSAgICAgICAgYXV0byYgbW9kaWZpZXJzID0geGtiLm1vZGlmaWVyczsKLSAgICAgICAg bW9kaWZpZXJzID0gMDsKLSAgICAgICAgYXV0byBjb21wb25lbnQgPSBzdGF0aWNfY2FzdDx4a2Jf c3RhdGVfY29tcG9uZW50PihYS0JfU1RBVEVfTU9EU19ERVBSRVNTRUQgfCBYS0JfU1RBVEVfTU9E U19MQVRDSEVEKTsKLSAgICAgICAgaWYgKHhrYl9zdGF0ZV9tb2RfaW5kZXhfaXNfYWN0aXZlKHhr Yi5zdGF0ZSwgeGtiLmluZGV4ZXMuY29udHJvbCwgY29tcG9uZW50KSkKLSAgICAgICAgICAgIG1v ZGlmaWVycyB8PSB3cGVfaW5wdXRfa2V5Ym9hcmRfbW9kaWZpZXJfY29udHJvbDsKLSAgICAgICAg aWYgKHhrYl9zdGF0ZV9tb2RfaW5kZXhfaXNfYWN0aXZlKHhrYi5zdGF0ZSwgeGtiLmluZGV4ZXMu YWx0LCBjb21wb25lbnQpKQotICAgICAgICAgICAgbW9kaWZpZXJzIHw9IHdwZV9pbnB1dF9rZXli b2FyZF9tb2RpZmllcl9hbHQ7Ci0gICAgICAgIGlmICh4a2Jfc3RhdGVfbW9kX2luZGV4X2lzX2Fj dGl2ZSh4a2Iuc3RhdGUsIHhrYi5pbmRleGVzLnNoaWZ0LCBjb21wb25lbnQpKQotICAgICAgICAg ICAgbW9kaWZpZXJzIHw9IHdwZV9pbnB1dF9rZXlib2FyZF9tb2RpZmllcl9zaGlmdDsKKyAgICAg ICAgYXV0byYga2V5Ym9hcmQgPSBzdGF0aWNfY2FzdDxXaW5kb3dWaWV3QmFja2VuZCo+KGRhdGEp LT5tX3NlYXREYXRhLmtleWJvYXJkOworICAgICAgICBrZXlib2FyZC5tb2RpZmllcnMgPSB3cGVf aW5wdXRfa2V5X21hcHBlcl9nZXRfbW9kaWZpZXJzKHdwZV9pbnB1dF9rZXlfbWFwcGVyX2dldF9z aW5nbGV0b24oKSwgZGVwcmVzc2VkTW9kcywgbGF0Y2hlZE1vZHMsIGxvY2tlZE1vZHMsIGdyb3Vw KTsKICAgICB9LAogICAgIC8vIHJlcGVhdF9pbmZvCiAgICAgW10odm9pZCogZGF0YSwgc3RydWN0 IHdsX2tleWJvYXJkKiwgaW50MzJfdCByYXRlLCBpbnQzMl90IGRlbGF5KQpAQCAtNDgxLDExICs0 NDMsNiBAQCBXaW5kb3dWaWV3QmFja2VuZDo6V2luZG93Vmlld0JhY2tlbmQodWludDMyX3Qgd2lk dGgsIHVpbnQzMl90IGhlaWdodCkKIAogICAgICAgICBpZiAobV9zZWF0KQogICAgICAgICAgICAg d2xfc2VhdF9hZGRfbGlzdGVuZXIobV9zZWF0LCAmc19zZWF0TGlzdGVuZXIsIHRoaXMpOwotCi0g ICAgICAgIG1fc2VhdERhdGEueGtiLmNvbnRleHQgPSB4a2JfY29udGV4dF9uZXcoWEtCX0NPTlRF WFRfTk9fRkxBR1MpOwotICAgICAgICBtX3NlYXREYXRhLnhrYi5jb21wb3NlVGFibGUgPSB4a2Jf Y29tcG9zZV90YWJsZV9uZXdfZnJvbV9sb2NhbGUobV9zZWF0RGF0YS54a2IuY29udGV4dCwgc2V0 bG9jYWxlKExDX0NUWVBFLCBudWxscHRyKSwgWEtCX0NPTVBPU0VfQ09NUElMRV9OT19GTEFHUyk7 Ci0gICAgICAgIGlmIChtX3NlYXREYXRhLnhrYi5jb21wb3NlVGFibGUpCi0gICAgICAgICAgICBt X3NlYXREYXRhLnhrYi5jb21wb3NlU3RhdGUgPSB4a2JfY29tcG9zZV9zdGF0ZV9uZXcobV9zZWF0 RGF0YS54a2IuY29tcG9zZVRhYmxlLCBYS0JfQ09NUE9TRV9TVEFURV9OT19GTEFHUyk7CiAgICAg fQogCiAgICAgbV9ldmVudFNvdXJjZSA9IGdfc291cmNlX25ldygmRXZlbnRTb3VyY2U6OnNvdXJj ZUZ1bmNzLCBzaXplb2YoRXZlbnRTb3VyY2UpKTsKQEAgLTY3NywxNSArNjM0LDkgQEAgdm9pZCBX aW5kb3dWaWV3QmFja2VuZDo6ZGlzcGxheUJ1ZmZlcihFR0xJbWFnZUtIUiBpbWFnZSkKIAogdm9p ZCBXaW5kb3dWaWV3QmFja2VuZDo6aGFuZGxlS2V5RXZlbnQodWludDMyX3Qga2V5LCB1aW50MzJf dCBzdGF0ZSwgdWludDMyX3QgdGltZSkKIHsKLSAgICBhdXRvJiB4a2IgPSBtX3NlYXREYXRhLnhr YjsKLSAgICB1aW50MzJfdCBrZXlzeW0gPSB4a2Jfc3RhdGVfa2V5X2dldF9vbmVfc3ltKHhrYi5z dGF0ZSwga2V5KTsKLQotICAgIGlmICh4a2IuY29tcG9zZVN0YXRlCi0gICAgICAgICYmIHN0YXRl ID09IFdMX0tFWUJPQVJEX0tFWV9TVEFURV9QUkVTU0VECi0gICAgICAgICYmIHhrYl9jb21wb3Nl X3N0YXRlX2ZlZWQoeGtiLmNvbXBvc2VTdGF0ZSwga2V5c3ltKSA9PSBYS0JfQ09NUE9TRV9GRUVE X0FDQ0VQVEVECi0gICAgICAgICYmIHhrYl9jb21wb3NlX3N0YXRlX2dldF9zdGF0dXMoeGtiLmNv bXBvc2VTdGF0ZSkgPT0gWEtCX0NPTVBPU0VfQ09NUE9TRUQpIHsKLSAgICAgICAga2V5c3ltID0g eGtiX2NvbXBvc2Vfc3RhdGVfZ2V0X29uZV9zeW0oeGtiLmNvbXBvc2VTdGF0ZSk7Ci0gICAgfQor ICAgIHVpbnQzMl90IGtleXN5bSA9IHdwZV9pbnB1dF9rZXlfbWFwcGVyX2dldF9rZXlfY29kZSh3 cGVfaW5wdXRfa2V5X21hcHBlcl9nZXRfc2luZ2xldG9uKCksIGtleSwgc3RhdGUgPT0gV0xfS0VZ Qk9BUkRfS0VZX1NUQVRFX1BSRVNTRUQpOworICAgIGlmICgha2V5c3ltKQorICAgICAgICByZXR1 cm47CiAKICAgICBpZiAobV9zZWF0RGF0YS5rZXlib2FyZC50YXJnZXQpIHsKICAgICAgICAgc3Ry dWN0IHdwZV9pbnB1dF9rZXlib2FyZF9ldmVudCBldmVudCA9IHsgdGltZSwga2V5c3ltLCBrZXks ICEhc3RhdGUsIG1vZGlmaWVycygpIH07CkBAIC02OTUsNyArNjQ2LDcgQEAgdm9pZCBXaW5kb3dW aWV3QmFja2VuZDo6aGFuZGxlS2V5RXZlbnQodWludDMyX3Qga2V5LCB1aW50MzJfdCBzdGF0ZSwg dWludDMyX3QgdGkKIAogdWludDMyX3QgV2luZG93Vmlld0JhY2tlbmQ6Om1vZGlmaWVycygpIGNv bnN0CiB7Ci0gICAgdWludDMyX3QgbWFzayA9IG1fc2VhdERhdGEueGtiLm1vZGlmaWVyczsKKyAg ICB1aW50MzJfdCBtYXNrID0gbV9zZWF0RGF0YS5rZXlib2FyZC5tb2RpZmllcnM7CiAgICAgaWYg KG1fc2VhdERhdGEucG9pbnRlci5vYmplY3QpCiAgICAgICAgIG1hc2sgfD0gbV9zZWF0RGF0YS5w b2ludGVyLm1vZGlmaWVyczsKICAgICByZXR1cm4gbWFzazsKZGlmZiAtLWdpdCBhL1Rvb2xzL3dw ZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5oIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRv d1ZpZXdCYWNrZW5kLmgKaW5kZXggN2FlYjgyYTMyMTguLmI3NzM3ZmMxMDY5IDEwMDY0NAotLS0g YS9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuaAorKysgYi9Ub29scy93cGUv YmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuaApAQCAtMjksOCArMjksNiBAQAogI2luY2x1ZGUg InhkZy1zaGVsbC11bnN0YWJsZS12Ni1jbGllbnQtcHJvdG9jb2wuaCIKICNpbmNsdWRlIDxnbGli Lmg+CiAjaW5jbHVkZSA8dW5vcmRlcmVkX21hcD4KLSNpbmNsdWRlIDx4a2Jjb21tb24veGtiY29t bW9uLmg+Ci0jaW5jbHVkZSA8eGtiY29tbW9uL3hrYmNvbW1vbi1jb21wb3NlLmg+CiAKIHR5cGVk ZWYgdm9pZCogRUdMSW1hZ2VLSFI7CiB0eXBlZGVmIHZvaWQqIEVHTFN1cmZhY2U7CkBAIC03Miw2 ICs3MCw3IEBAIHByaXZhdGU6CiAgICAgICAgIHN0cnVjdCB7CiAgICAgICAgICAgICBzdHJ1Y3Qg d2xfa2V5Ym9hcmQqIG9iamVjdCB7IG51bGxwdHIgfTsKICAgICAgICAgICAgIHN0cnVjdCB3bF9z dXJmYWNlKiB0YXJnZXQgeyBudWxscHRyIH07CisgICAgICAgICAgICB1aW50MzJfdCBtb2RpZmll cnMgeyAwIH07CiAgICAgICAgIH0ga2V5Ym9hcmQ7CiAKICAgICAgICAgc3RydWN0IHsKQEAgLTgw LDIwICs3OSw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBib29sIHRyYWNraW5nIHsgZmFsc2Ug fTsKICAgICAgICAgfSB0b3VjaDsKIAotICAgICAgICBzdHJ1Y3QgewotICAgICAgICAgICAgc3Ry dWN0IHhrYl9jb250ZXh0KiBjb250ZXh0IHsgbnVsbHB0ciB9OwotICAgICAgICAgICAgc3RydWN0 IHhrYl9rZXltYXAqIGtleW1hcCB7IG51bGxwdHIgfTsKLSAgICAgICAgICAgIHN0cnVjdCB4a2Jf c3RhdGUqIHN0YXRlIHsgbnVsbHB0ciB9OwotICAgICAgICAgICAgc3RydWN0IHsKLSAgICAgICAg ICAgICAgICB4a2JfbW9kX2luZGV4X3QgY29udHJvbCB7IDAgfTsKLSAgICAgICAgICAgICAgICB4 a2JfbW9kX2luZGV4X3QgYWx0IHsgMCB9OwotICAgICAgICAgICAgICAgIHhrYl9tb2RfaW5kZXhf dCBzaGlmdCB7IDAgfTsKLSAgICAgICAgICAgIH0gaW5kZXhlczsKLSAgICAgICAgICAgIHVpbnQz Ml90IG1vZGlmaWVycyB7IDAgfTsKLSAgICAgICAgICAgIHN0cnVjdCB4a2JfY29tcG9zZV90YWJs ZSogY29tcG9zZVRhYmxlIHsgbnVsbHB0ciB9OwotICAgICAgICAgICAgc3RydWN0IHhrYl9jb21w b3NlX3N0YXRlKiBjb21wb3NlU3RhdGUgeyBudWxscHRyIH07Ci0gICAgICAgIH0geGtiOwotCiAg ICAgICAgIHN0cnVjdCB7CiAgICAgICAgICAgICBpbnQzMl90IHJhdGUgeyAwIH07CiAgICAgICAg ICAgICBpbnQzMl90IGRlbGF5IHsgMCB9Owo= 346467 2018-08-03 02:43:26 -0700 2018-08-03 03:03:40 -0700 Patch wpe-keymapper.diff text/plain 9748 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2Y2Jm YjAxOTdkZS4uNjZiZmJhNWQ5MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOC0wOC0wMyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gVXNlIHRoZSBu ZXcga2V5IG1hcHBlciBBUEkgZnJvbSBXUEVCYWNrZW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODgyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvd3BlL0V2ZW50U2Vu ZGVyUHJveHlXUEUuY3BwOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjprZXlEb3du KTogVXNlIHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZW50cmllc19mb3Jfa2V5X2NvZGUoKSB0 byBnZXQgdGhlIGhhcmR3YXJlIGtleQorICAgICAgICBjb2RlLgorICAgICAgICAqIHdwZS9iYWNr ZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5jcHA6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6 OldpbmRvd1ZpZXdCYWNrZW5kOjpXaW5kb3dWaWV3QmFja2VuZCk6CisgICAgICAgIChXUEVUb29s aW5nQmFja2VuZHM6OldpbmRvd1ZpZXdCYWNrZW5kOjpoYW5kbGVLZXlFdmVudCk6CisgICAgICAg IChXUEVUb29saW5nQmFja2VuZHM6OldpbmRvd1ZpZXdCYWNrZW5kOjptb2RpZmllcnMgY29uc3Qp OgorICAgICAgICAqIHdwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5oOgorCiAyMDE4LTA4 LTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXSBJbXBsZW1lbnQgTW91c2VFdmVudC5idXR0b25zCmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvd3BlL0V2ZW50U2VuZGVyUHJveHlXUEUuY3BwCmluZGV4IDU0YjEzZWM2YmNk Li44OWE5MWRkNmI5NyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZl bnRTZW5kZXJQcm94eVdQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZl bnRTZW5kZXJQcm94eVdQRS5jcHAKQEAgLTMwMywxMSArMzAzLDE0IEBAIHZvaWQgRXZlbnRTZW5k ZXJQcm94eTo6a2V5RG93bihXS1N0cmluZ1JlZiBrZXlSZWYsIFdLRXZlbnRNb2RpZmllcnMgd2tN b2RpZmllcnMsCiB7CiAgICAgdWludDMyX3QgbW9kaWZpZXJzID0gd2tFdmVudE1vZGlmaWVyc1Rv V1BFKHdrTW9kaWZpZXJzKTsKICAgICB1aW50MzJfdCBrZXlTeW0gPSB3cGVLZXlTeW1Gb3JLZXlS ZWYoa2V5UmVmLCBsb2NhdGlvbiwgJm1vZGlmaWVycyk7Ci0gICAgLy8gRklYTUU6IHdlIGRvbid0 IGhhdmUgYSB3YXkgdG8gZ2V0IGhhcmR3YXJlIGtleSBjb2RlIGluIFdQRS4KLSAgICBzdHJ1Y3Qg d3BlX2lucHV0X2tleWJvYXJkX2V2ZW50IGV2ZW50IHsgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KG1f dGltZSksIGtleVN5bSwgMCwgdHJ1ZSwgbW9kaWZpZXJzfTsKKyAgICBzdHJ1Y3Qgd3BlX2lucHV0 X3hrYl9rZXltYXBfZW50cnkqIGVudHJpZXM7CisgICAgdWludDMyX3QgZW50cmllc0NvdW50Owor ICAgIHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZW50cmllc19mb3Jfa2V5X2NvZGUod3BlX2lu cHV0X3hrYl9jb250ZXh0X2dldF9kZWZhdWx0KCksIGtleVN5bSwgJmVudHJpZXMsICZlbnRyaWVz Q291bnQpOworICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQgeyBzdGF0 aWNfY2FzdDx1aW50MzJfdD4obV90aW1lKSwga2V5U3ltLCBlbnRyaWVzQ291bnQgPyBlbnRyaWVz WzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9kaWZpZXJzfTsKICAgICB3cGVfdmll d19iYWNrZW5kX2Rpc3BhdGNoX2tleWJvYXJkX2V2ZW50KG1fdmlld0JhY2tlbmQsICZldmVudCk7 CiAgICAgZXZlbnQucHJlc3NlZCA9IGZhbHNlOwogICAgIHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0 Y2hfa2V5Ym9hcmRfZXZlbnQobV92aWV3QmFja2VuZCwgJmV2ZW50KTsKKyAgICBmcmVlKGVudHJp ZXMpOwogfQogCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmFkZFRvdWNoUG9pbnQoaW50IHgsIGlu dCB5KQpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNw cCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5jcHAKaW5kZXggYWIyMWU1 YWUyNjkuLjY1MjIxZTFkYjE2IDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvV2luZG93 Vmlld0JhY2tlbmQuY3BwCisrKyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2Vu ZC5jcHAKQEAgLTIxNyw5ICsyMTcsOCBAQCBjb25zdCBzdHJ1Y3Qgd2xfcG9pbnRlcl9saXN0ZW5l ciBXaW5kb3dWaWV3QmFja2VuZDo6c19wb2ludGVyTGlzdGVuZXIgPSB7CiAKIGNvbnN0IHN0cnVj dCB3bF9rZXlib2FyZF9saXN0ZW5lciBXaW5kb3dWaWV3QmFja2VuZDo6c19rZXlib2FyZExpc3Rl bmVyID0gewogICAgIC8vIGtleW1hcAotICAgIFtdKHZvaWQqIGRhdGEsIHN0cnVjdCB3bF9rZXli b2FyZCosIHVpbnQzMl90IGZvcm1hdCwgaW50IGZkLCB1aW50MzJfdCBzaXplKQorICAgIFtdKHZv aWQqLCBzdHJ1Y3Qgd2xfa2V5Ym9hcmQqLCB1aW50MzJfdCBmb3JtYXQsIGludCBmZCwgdWludDMy X3Qgc2l6ZSkKICAgICB7Ci0gICAgICAgIGF1dG8mIHdpbmRvdyA9ICpzdGF0aWNfY2FzdDxXaW5k b3dWaWV3QmFja2VuZCo+KGRhdGEpOwogICAgICAgICBpZiAoZm9ybWF0ICE9IFdMX0tFWUJPQVJE X0tFWU1BUF9GT1JNQVRfWEtCX1YxKSB7CiAgICAgICAgICAgICBjbG9zZShmZCk7CiAgICAgICAg ICAgICByZXR1cm47CkBAIC0yMzEsMjIgKzIzMCwxNCBAQCBjb25zdCBzdHJ1Y3Qgd2xfa2V5Ym9h cmRfbGlzdGVuZXIgV2luZG93Vmlld0JhY2tlbmQ6OnNfa2V5Ym9hcmRMaXN0ZW5lciA9IHsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGF1dG8mIHhrYiA9IHdpbmRv dy5tX3NlYXREYXRhLnhrYjsKLSAgICAgICAgeGtiLmtleW1hcCA9IHhrYl9rZXltYXBfbmV3X2Zy b21fc3RyaW5nKHhrYi5jb250ZXh0LCBzdGF0aWNfY2FzdDxjaGFyKj4obWFwcGluZyksCisgICAg ICAgIGF1dG8qIHhrYiA9IHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZGVmYXVsdCgpOworICAg ICAgICBhdXRvKiBrZXltYXAgPSB4a2Jfa2V5bWFwX25ld19mcm9tX3N0cmluZyh3cGVfaW5wdXRf eGtiX2NvbnRleHRfZ2V0X2NvbnRleHQoeGtiKSwgc3RhdGljX2Nhc3Q8Y2hhcio+KG1hcHBpbmcp LAogICAgICAgICAgICAgWEtCX0tFWU1BUF9GT1JNQVRfVEVYVF9WMSwgWEtCX0tFWU1BUF9DT01Q SUxFX05PX0ZMQUdTKTsKICAgICAgICAgbXVubWFwKG1hcHBpbmcsIHNpemUpOwogICAgICAgICBj bG9zZShmZCk7CiAKLSAgICAgICAgaWYgKCF4a2Iua2V5bWFwKQotICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgIHhrYi5zdGF0ZSA9IHhrYl9zdGF0ZV9uZXcoeGtiLmtleW1hcCk7Ci0gICAg ICAgIGlmICgheGtiLnN0YXRlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHhrYi5p bmRleGVzLmNvbnRyb2wgPSB4a2Jfa2V5bWFwX21vZF9nZXRfaW5kZXgoeGtiLmtleW1hcCwgWEtC X01PRF9OQU1FX0NUUkwpOwotICAgICAgICB4a2IuaW5kZXhlcy5hbHQgPSB4a2Jfa2V5bWFwX21v ZF9nZXRfaW5kZXgoeGtiLmtleW1hcCwgWEtCX01PRF9OQU1FX0FMVCk7Ci0gICAgICAgIHhrYi5p bmRleGVzLnNoaWZ0ID0geGtiX2tleW1hcF9tb2RfZ2V0X2luZGV4KHhrYi5rZXltYXAsIFhLQl9N T0RfTkFNRV9TSElGVCk7CisgICAgICAgIHdwZV9pbnB1dF94a2JfY29udGV4dF9zZXRfa2V5bWFw KHhrYiwga2V5bWFwKTsKKyAgICAgICAgeGtiX2tleW1hcF91bnJlZihrZXltYXApOwogICAgIH0s CiAgICAgLy8gZW50ZXIKICAgICBbXSh2b2lkKiBkYXRhLCBzdHJ1Y3Qgd2xfa2V5Ym9hcmQqLCB1 aW50MzJfdCAvKnNlcmlhbCovLCBzdHJ1Y3Qgd2xfc3VyZmFjZSogc3VyZmFjZSwgc3RydWN0IHds X2FycmF5KikKQEAgLTI3NiwxMyArMjY3LDE1IEBAIGNvbnN0IHN0cnVjdCB3bF9rZXlib2FyZF9s aXN0ZW5lciBXaW5kb3dWaWV3QmFja2VuZDo6c19rZXlib2FyZExpc3RlbmVyID0gewogICAgICAg ICBpZiAoIXNlYXREYXRhLnJlcGVhdEluZm8ucmF0ZSkKICAgICAgICAgICAgIHJldHVybjsKIAor ICAgICAgICBhdXRvKiBrZXltYXAgPSB3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2tleW1hcCh3 cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSk7CisKICAgICAgICAgaWYgKHN0YXRl ID09IFdMX0tFWUJPQVJEX0tFWV9TVEFURV9SRUxFQVNFRAogICAgICAgICAgICAgJiYgc2VhdERh dGEucmVwZWF0RGF0YS5rZXkgPT0ga2V5KSB7CiAgICAgICAgICAgICBpZiAoc2VhdERhdGEucmVw ZWF0RGF0YS5ldmVudFNvdXJjZSkKICAgICAgICAgICAgICAgICBnX3NvdXJjZV9yZW1vdmUoc2Vh dERhdGEucmVwZWF0RGF0YS5ldmVudFNvdXJjZSk7CiAgICAgICAgICAgICBzZWF0RGF0YS5yZXBl YXREYXRhID0geyAwLCAwLCAwLCAwIH07CiAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT0gV0xf S0VZQk9BUkRfS0VZX1NUQVRFX1BSRVNTRUQKLSAgICAgICAgICAgICYmIHhrYl9rZXltYXBfa2V5 X3JlcGVhdHMoc2VhdERhdGEueGtiLmtleW1hcCwga2V5KSkgeworICAgICAgICAgICAgJiYga2V5 bWFwICYmIHhrYl9rZXltYXBfa2V5X3JlcGVhdHMoa2V5bWFwLCBrZXkpKSB7CiAKICAgICAgICAg ICAgIGlmIChzZWF0RGF0YS5yZXBlYXREYXRhLmV2ZW50U291cmNlKQogICAgICAgICAgICAgICAg IGdfc291cmNlX3JlbW92ZShzZWF0RGF0YS5yZXBlYXREYXRhLmV2ZW50U291cmNlKTsKQEAgLTMw NSwxOSArMjk4LDggQEAgY29uc3Qgc3RydWN0IHdsX2tleWJvYXJkX2xpc3RlbmVyIFdpbmRvd1Zp ZXdCYWNrZW5kOjpzX2tleWJvYXJkTGlzdGVuZXIgPSB7CiAgICAgLy8gbW9kaWZpZXJzCiAgICAg W10odm9pZCogZGF0YSwgc3RydWN0IHdsX2tleWJvYXJkKiwgdWludDMyX3QgLypzZXJpYWwqLywg dWludDMyX3QgZGVwcmVzc2VkTW9kcywgdWludDMyX3QgbGF0Y2hlZE1vZHMsIHVpbnQzMl90IGxv Y2tlZE1vZHMsIHVpbnQzMl90IGdyb3VwKQogICAgIHsKLSAgICAgICAgYXV0byYgeGtiID0gc3Rh dGljX2Nhc3Q8V2luZG93Vmlld0JhY2tlbmQqPihkYXRhKS0+bV9zZWF0RGF0YS54a2I7Ci0KLSAg ICAgICAgeGtiX3N0YXRlX3VwZGF0ZV9tYXNrKHhrYi5zdGF0ZSwgZGVwcmVzc2VkTW9kcywgbGF0 Y2hlZE1vZHMsIGxvY2tlZE1vZHMsIDAsIDAsIGdyb3VwKTsKLQotICAgICAgICBhdXRvJiBtb2Rp ZmllcnMgPSB4a2IubW9kaWZpZXJzOwotICAgICAgICBtb2RpZmllcnMgPSAwOwotICAgICAgICBh dXRvIGNvbXBvbmVudCA9IHN0YXRpY19jYXN0PHhrYl9zdGF0ZV9jb21wb25lbnQ+KFhLQl9TVEFU RV9NT0RTX0RFUFJFU1NFRCB8IFhLQl9TVEFURV9NT0RTX0xBVENIRUQpOwotICAgICAgICBpZiAo eGtiX3N0YXRlX21vZF9pbmRleF9pc19hY3RpdmUoeGtiLnN0YXRlLCB4a2IuaW5kZXhlcy5jb250 cm9sLCBjb21wb25lbnQpKQotICAgICAgICAgICAgbW9kaWZpZXJzIHw9IHdwZV9pbnB1dF9rZXli b2FyZF9tb2RpZmllcl9jb250cm9sOwotICAgICAgICBpZiAoeGtiX3N0YXRlX21vZF9pbmRleF9p c19hY3RpdmUoeGtiLnN0YXRlLCB4a2IuaW5kZXhlcy5hbHQsIGNvbXBvbmVudCkpCi0gICAgICAg ICAgICBtb2RpZmllcnMgfD0gd3BlX2lucHV0X2tleWJvYXJkX21vZGlmaWVyX2FsdDsKLSAgICAg ICAgaWYgKHhrYl9zdGF0ZV9tb2RfaW5kZXhfaXNfYWN0aXZlKHhrYi5zdGF0ZSwgeGtiLmluZGV4 ZXMuc2hpZnQsIGNvbXBvbmVudCkpCi0gICAgICAgICAgICBtb2RpZmllcnMgfD0gd3BlX2lucHV0 X2tleWJvYXJkX21vZGlmaWVyX3NoaWZ0OworICAgICAgICBhdXRvJiBrZXlib2FyZCA9IHN0YXRp Y19jYXN0PFdpbmRvd1ZpZXdCYWNrZW5kKj4oZGF0YSktPm1fc2VhdERhdGEua2V5Ym9hcmQ7Cisg ICAgICAgIGtleWJvYXJkLm1vZGlmaWVycyA9IHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfbW9k aWZpZXJzKHdwZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBkZXByZXNzZWRNb2Rz LCBsYXRjaGVkTW9kcywgbG9ja2VkTW9kcywgZ3JvdXApOwogICAgIH0sCiAgICAgLy8gcmVwZWF0 X2luZm8KICAgICBbXSh2b2lkKiBkYXRhLCBzdHJ1Y3Qgd2xfa2V5Ym9hcmQqLCBpbnQzMl90IHJh dGUsIGludDMyX3QgZGVsYXkpCkBAIC00ODEsMTEgKzQ2Myw2IEBAIFdpbmRvd1ZpZXdCYWNrZW5k OjpXaW5kb3dWaWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogCiAg ICAgICAgIGlmIChtX3NlYXQpCiAgICAgICAgICAgICB3bF9zZWF0X2FkZF9saXN0ZW5lcihtX3Nl YXQsICZzX3NlYXRMaXN0ZW5lciwgdGhpcyk7Ci0KLSAgICAgICAgbV9zZWF0RGF0YS54a2IuY29u dGV4dCA9IHhrYl9jb250ZXh0X25ldyhYS0JfQ09OVEVYVF9OT19GTEFHUyk7Ci0gICAgICAgIG1f c2VhdERhdGEueGtiLmNvbXBvc2VUYWJsZSA9IHhrYl9jb21wb3NlX3RhYmxlX25ld19mcm9tX2xv Y2FsZShtX3NlYXREYXRhLnhrYi5jb250ZXh0LCBzZXRsb2NhbGUoTENfQ1RZUEUsIG51bGxwdHIp LCBYS0JfQ09NUE9TRV9DT01QSUxFX05PX0ZMQUdTKTsKLSAgICAgICAgaWYgKG1fc2VhdERhdGEu eGtiLmNvbXBvc2VUYWJsZSkKLSAgICAgICAgICAgIG1fc2VhdERhdGEueGtiLmNvbXBvc2VTdGF0 ZSA9IHhrYl9jb21wb3NlX3N0YXRlX25ldyhtX3NlYXREYXRhLnhrYi5jb21wb3NlVGFibGUsIFhL Ql9DT01QT1NFX1NUQVRFX05PX0ZMQUdTKTsKICAgICB9CiAKICAgICBtX2V2ZW50U291cmNlID0g Z19zb3VyY2VfbmV3KCZFdmVudFNvdXJjZTo6c291cmNlRnVuY3MsIHNpemVvZihFdmVudFNvdXJj ZSkpOwpAQCAtNjc3LDE1ICs2NTQsOSBAQCB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5kOjpkaXNwbGF5 QnVmZmVyKEVHTEltYWdlS0hSIGltYWdlKQogCiB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5kOjpoYW5k bGVLZXlFdmVudCh1aW50MzJfdCBrZXksIHVpbnQzMl90IHN0YXRlLCB1aW50MzJfdCB0aW1lKQog ewotICAgIGF1dG8mIHhrYiA9IG1fc2VhdERhdGEueGtiOwotICAgIHVpbnQzMl90IGtleXN5bSA9 IHhrYl9zdGF0ZV9rZXlfZ2V0X29uZV9zeW0oeGtiLnN0YXRlLCBrZXkpOwotCi0gICAgaWYgKHhr Yi5jb21wb3NlU3RhdGUKLSAgICAgICAgJiYgc3RhdGUgPT0gV0xfS0VZQk9BUkRfS0VZX1NUQVRF X1BSRVNTRUQKLSAgICAgICAgJiYgeGtiX2NvbXBvc2Vfc3RhdGVfZmVlZCh4a2IuY29tcG9zZVN0 YXRlLCBrZXlzeW0pID09IFhLQl9DT01QT1NFX0ZFRURfQUNDRVBURUQKLSAgICAgICAgJiYgeGti X2NvbXBvc2Vfc3RhdGVfZ2V0X3N0YXR1cyh4a2IuY29tcG9zZVN0YXRlKSA9PSBYS0JfQ09NUE9T RV9DT01QT1NFRCkgewotICAgICAgICBrZXlzeW0gPSB4a2JfY29tcG9zZV9zdGF0ZV9nZXRfb25l X3N5bSh4a2IuY29tcG9zZVN0YXRlKTsKLSAgICB9CisgICAgdWludDMyX3Qga2V5c3ltID0gd3Bl X2lucHV0X3hrYl9jb250ZXh0X2dldF9rZXlfY29kZSh3cGVfaW5wdXRfeGtiX2NvbnRleHRfZ2V0 X2RlZmF1bHQoKSwga2V5LCBzdGF0ZSA9PSBXTF9LRVlCT0FSRF9LRVlfU1RBVEVfUFJFU1NFRCk7 CisgICAgaWYgKCFrZXlzeW0pCisgICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX3NlYXREYXRh LmtleWJvYXJkLnRhcmdldCkgewogICAgICAgICBzdHJ1Y3Qgd3BlX2lucHV0X2tleWJvYXJkX2V2 ZW50IGV2ZW50ID0geyB0aW1lLCBrZXlzeW0sIGtleSwgISFzdGF0ZSwgbW9kaWZpZXJzKCkgfTsK QEAgLTY5NSw3ICs2NjYsNyBAQCB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5kOjpoYW5kbGVLZXlFdmVu dCh1aW50MzJfdCBrZXksIHVpbnQzMl90IHN0YXRlLCB1aW50MzJfdCB0aQogCiB1aW50MzJfdCBX aW5kb3dWaWV3QmFja2VuZDo6bW9kaWZpZXJzKCkgY29uc3QKIHsKLSAgICB1aW50MzJfdCBtYXNr ID0gbV9zZWF0RGF0YS54a2IubW9kaWZpZXJzOworICAgIHVpbnQzMl90IG1hc2sgPSBtX3NlYXRE YXRhLmtleWJvYXJkLm1vZGlmaWVyczsKICAgICBpZiAobV9zZWF0RGF0YS5wb2ludGVyLm9iamVj dCkKICAgICAgICAgbWFzayB8PSBtX3NlYXREYXRhLnBvaW50ZXIubW9kaWZpZXJzOwogICAgIHJl dHVybiBtYXNrOwpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNr ZW5kLmggYi9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuaAppbmRleCA3YWVi ODJhMzIxOC4uYjc3MzdmYzEwNjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5k b3dWaWV3QmFja2VuZC5oCisrKyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2Vu ZC5oCkBAIC0yOSw4ICsyOSw2IEBACiAjaW5jbHVkZSAieGRnLXNoZWxsLXVuc3RhYmxlLXY2LWNs aWVudC1wcm90b2NvbC5oIgogI2luY2x1ZGUgPGdsaWIuaD4KICNpbmNsdWRlIDx1bm9yZGVyZWRf bWFwPgotI2luY2x1ZGUgPHhrYmNvbW1vbi94a2Jjb21tb24uaD4KLSNpbmNsdWRlIDx4a2Jjb21t b24veGtiY29tbW9uLWNvbXBvc2UuaD4KIAogdHlwZWRlZiB2b2lkKiBFR0xJbWFnZUtIUjsKIHR5 cGVkZWYgdm9pZCogRUdMU3VyZmFjZTsKQEAgLTcyLDYgKzcwLDcgQEAgcHJpdmF0ZToKICAgICAg ICAgc3RydWN0IHsKICAgICAgICAgICAgIHN0cnVjdCB3bF9rZXlib2FyZCogb2JqZWN0IHsgbnVs bHB0ciB9OwogICAgICAgICAgICAgc3RydWN0IHdsX3N1cmZhY2UqIHRhcmdldCB7IG51bGxwdHIg fTsKKyAgICAgICAgICAgIHVpbnQzMl90IG1vZGlmaWVycyB7IDAgfTsKICAgICAgICAgfSBrZXli b2FyZDsKIAogICAgICAgICBzdHJ1Y3QgewpAQCAtODAsMjAgKzc5LDYgQEAgcHJpdmF0ZToKICAg ICAgICAgICAgIGJvb2wgdHJhY2tpbmcgeyBmYWxzZSB9OwogICAgICAgICB9IHRvdWNoOwogCi0g ICAgICAgIHN0cnVjdCB7Ci0gICAgICAgICAgICBzdHJ1Y3QgeGtiX2NvbnRleHQqIGNvbnRleHQg eyBudWxscHRyIH07Ci0gICAgICAgICAgICBzdHJ1Y3QgeGtiX2tleW1hcCoga2V5bWFwIHsgbnVs bHB0ciB9OwotICAgICAgICAgICAgc3RydWN0IHhrYl9zdGF0ZSogc3RhdGUgeyBudWxscHRyIH07 Ci0gICAgICAgICAgICBzdHJ1Y3QgewotICAgICAgICAgICAgICAgIHhrYl9tb2RfaW5kZXhfdCBj b250cm9sIHsgMCB9OwotICAgICAgICAgICAgICAgIHhrYl9tb2RfaW5kZXhfdCBhbHQgeyAwIH07 Ci0gICAgICAgICAgICAgICAgeGtiX21vZF9pbmRleF90IHNoaWZ0IHsgMCB9OwotICAgICAgICAg ICAgfSBpbmRleGVzOwotICAgICAgICAgICAgdWludDMyX3QgbW9kaWZpZXJzIHsgMCB9OwotICAg ICAgICAgICAgc3RydWN0IHhrYl9jb21wb3NlX3RhYmxlKiBjb21wb3NlVGFibGUgeyBudWxscHRy IH07Ci0gICAgICAgICAgICBzdHJ1Y3QgeGtiX2NvbXBvc2Vfc3RhdGUqIGNvbXBvc2VTdGF0ZSB7 IG51bGxwdHIgfTsKLSAgICAgICAgfSB4a2I7Ci0KICAgICAgICAgc3RydWN0IHsKICAgICAgICAg ICAgIGludDMyX3QgcmF0ZSB7IDAgfTsKICAgICAgICAgICAgIGludDMyX3QgZGVsYXkgeyAwIH07 Cg==