60943 2011-05-16 23:06:01 -0700 Disable keyboard input (with exceptions) in full-screen mode. 2011-05-18 00:38:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble oldest_to_newest 404942 0 jer.noble 2011-05-16 23:06:01 -0700 Disable keyboard input (with exceptions) in full-screen mode. 404944 1 jer.noble 2011-05-16 23:06:19 -0700 <rdar://problem/9450785> 404949 2 93740 jer.noble 2011-05-16 23:14:15 -0700 Created attachment 93740 Patch 405429 3 93740 darin 2011-05-17 18:11:11 -0700 Comment on attachment 93740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93740&action=review > Source/WebCore/page/EventHandler.cpp:2442 > + if ((keyCode >= VK_BACK && keyCode <= VK_CAPITAL) > + || (keyCode >= VK_SPACE && keyCode <= VK_DELETE) > + || (keyCode >= VK_OEM_1 && keyCode <= VK_OEM_PLUS) > + || (keyCode >= VK_MULTIPLY && keyCode <= VK_OEM_8)) > + return true; > + > + return false; This seems quite unclear. Is this specific set of key code ranges straight out of some specification? If not, what is the rationale for what keys are listed here and what keys are not? Also, if (x) return true; return false; is an anti-pattern. Just use a return. 405498 4 jer.noble 2011-05-17 21:19:38 -0700 (In reply to comment #3) > (From update of attachment 93740 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93740&action=review > > > Source/WebCore/page/EventHandler.cpp:2442 > > + if ((keyCode >= VK_BACK && keyCode <= VK_CAPITAL) > > + || (keyCode >= VK_SPACE && keyCode <= VK_DELETE) > > + || (keyCode >= VK_OEM_1 && keyCode <= VK_OEM_PLUS) > > + || (keyCode >= VK_MULTIPLY && keyCode <= VK_OEM_8)) > > + return true; > > + > > + return false; > > This seems quite unclear. Is this specific set of key code ranges straight out of some specification? If not, what is the rationale for what keys are listed here and what keys are not? Yes, it's specifically from the proposed Full Screen API: "Toplevel browsing contexts can be in a "keys disabled" state. In this state, the user agent must suppress all keyup, keydown and keypress events whose keyCode is not in one of the following ranges: DOM_VK_CANCEL to DOM_VK_CAPS_LOCK, inclusive DOM_VK_SPACE to DOM_VK_DELETE, inclusive DOM_VK_SEMICOLON to DOM_VK_EQUALS, inclusive DOM_VK_MULTIPLY to DOM_VK_META, inclusive" The key codes listed in the patch are the equivalents to the Mozilla-specific enums in the spec. > Also, if (x) return true; return false; is an anti-pattern. Just use a return. Sure thing. Thanks! 405559 5 jer.noble 2011-05-18 00:38:41 -0700 Committed r86741: <http://trac.webkit.org/changeset/86741> 93740 2011-05-16 23:14:15 -0700 2011-05-17 18:11:11 -0700 Patch bug-60943-20110516231414.patch text/plain 8724 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODY2NTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3MTczMTNiMTgxOGYxMDkzYjMzNGVj ZjFlOWE5MzI0ZjAwNGM2OTU2Li5lZWMyM2YyNjIxMWY3NGQ1NGEzYjM5N2UwZDgwNzI3OTQxYWRl MTVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMTYgIEplcmVteSBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRGlzYWJsZSBrZXlib2FyZCBpbnB1dCAod2l0aCBleGNlcHRpb25zKSBpbiBm dWxsLXNjcmVlbiBtb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjA5NDMKKworICAgICAgICAqIGZ1bGxzY3JlZW4vZnVsbC1zY3JlZW4ta2V5Ym9h cmQtZGlzYWJsZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmdWxsc2NyZWVuL2Z1 bGwtc2NyZWVuLWtleWJvYXJkLWRpc2FibGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZ1bGxz Y3JlZW4vZnVsbC1zY3JlZW4ta2V5Ym9hcmQtZW5hYmxlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGZ1bGxzY3JlZW4vZnVsbC1zY3JlZW4ta2V5Ym9hcmQtZW5hYmxlZC5odG1sOiBB ZGRlZC4KKwogMjAxMS0wNS0xNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFp bC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg2NjQ4LgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1rZXlib2FyZC1kaXNhYmxl ZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLWtleWJv YXJkLWRpc2FibGVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xOGZiMDI2YTQyZDE2NzhlNTZm MjBlYWFjMGZmZTg3NTMxYjNkYzQyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZnVs bHNjcmVlbi9mdWxsLXNjcmVlbi1rZXlib2FyZC1kaXNhYmxlZC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSw2IEBACitFVkVOVCh3ZWJraXRmdWxsc2NyZWVuY2hhbmdlKQorRVhQRUNURUQgKGRvY3Vt ZW50LndlYmtpdElzRnVsbFNjcmVlbiA9PSAndHJ1ZScpIE9LCitFVkVOVChrZXlwcmVzcykKK0VY UEVDVEVEIChldmVudC5rZXlDb2RlID09ICczMicpIE9LCitFTkQgT0YgVEVTVAorVGhpcyB0ZXN0 cyB0aGF0IGZ1bGwgc2NyZWVuIG1vZGUgZG9lcyBub3QgYWxsb3cgYWxwaGFudW1lcmljIGtleSBl dmVudHMuIFByZXNzIHNwYWNlIHRvIGNvbnRpbnVlLCB0aGVuIHByZXNzIGFuIGFscGhhbnVtZXJp YyBrZXksIGZvbGxvd2VkIGJ5IHNwYWNlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZnVsbHNj cmVlbi9mdWxsLXNjcmVlbi1rZXlib2FyZC1kaXNhYmxlZC5odG1sIGIvTGF5b3V0VGVzdHMvZnVs bHNjcmVlbi9mdWxsLXNjcmVlbi1rZXlib2FyZC1kaXNhYmxlZC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI4 MzVmOWExYzk0NDYyZTBlNmU3NjRiMjQ3YmMzNGQ1YmJlZmY5NzEKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLWtleWJvYXJkLWRpc2FibGVkLmh0 bWwKQEAgLTAsMCArMSw0MCBAQAorPGJvZHk+Cis8c2NyaXB0IHNyYz0iZnVsbC1zY3JlZW4tdGVz dC5qcyI+PC9zY3JpcHQ+Cis8cD5UaGlzIHRlc3RzIHRoYXQgZnVsbCBzY3JlZW4gbW9kZSBkb2Vz IG5vdCBhbGxvdyBhbHBoYW51bWVyaWMga2V5IGV2ZW50cy4gIFByZXNzIHNwYWNlIHRvIGNvbnRp bnVlLCB0aGVuIHByZXNzIGFuIGFscGhhbnVtZXJpYyBrZXksIGZvbGxvd2VkIGJ5IHNwYWNlLgor PHNwYW4+PC9zcGFuPgorPHNjcmlwdD4KKyAgICAvLyBCYWlsIG91dCBlYXJseSBpZiB0aGUgZnVs bCBzY3JlZW4gQVBJIGlzIG5vdCBlbmFibGVkIG9yIGlzIG1pc3Npbmc6CisgICAgaWYgKEVsZW1l bnQucHJvdG90eXBlLndlYmtpdFJlcXVlc3RGdWxsU2NyZWVuID09IHVuZGVmaW5lZCkgeworICAg ICAgICBsb2dSZXN1bHQoZmFsc2UsICJFbGVtZW50LnByb3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVs bFNjcmVlbiA9PSB1bmRlZmluZWQiKTsKKyAgICAgICAgZW5kVGVzdCgpOworICAgIH0gZWxzZSB7 CisgICAgICAgIHZhciBjYWxsYmFjazsKKyAgICAgICAgdmFyIGZ1bGxzY3JlZW5DaGFuZ2VkID0g ZnVuY3Rpb24oZXZlbnQpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChjYWxsYmFjaykKKyAg ICAgICAgICAgICAgICBjYWxsYmFjayhldmVudCkKKyAgICAgICAgfTsKKyAgICAgICAgd2FpdEZv ckV2ZW50KGRvY3VtZW50LCAnd2Via2l0ZnVsbHNjcmVlbmNoYW5nZScsIGZ1bGxzY3JlZW5DaGFu Z2VkKTsKKworICAgICAgICB2YXIgc3BhbkVudGVyZWRGdWxsU2NyZWVuID0gZnVuY3Rpb24oKSB7 CisgICAgICAgICAgICBjYWxsYmFjayA9IG51bGw7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo ImRvY3VtZW50LndlYmtpdElzRnVsbFNjcmVlbiIsIHRydWUpOworICAgICAgICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlciAmJiBldmVudFNlbmRlci5rZXlEb3duKSB7CisgICAg ICAgICAgICAgICAgd2FpdEZvckV2ZW50KGRvY3VtZW50LCAna2V5cHJlc3MnLCBrZXlQcmVzc2Vk KTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5rZXlEb3duKCdhJywgW10pOworICAgICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLmtleURvd24oJyAnLCBbXSk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH07CisKKyAgICAgICAgdmFyIGtleVByZXNzZWQgPSBmdW5jdGlvbihldmVudCkgewor ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdldmVudC5rZXlDb2RlJywgMzIpOyAvLyBTcGFjZQor ICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgZG9jdW1lbnQud2Via2l0Q2FuY2Vs RnVsbFNjcmVlbigpOworICAgICAgICB9CisgICAgICAgIHdhaXRGb3JFdmVudChkb2N1bWVudCwg J3dlYmtpdGZ1bGxzY3JlZW5jaGFuZ2UnLCBmdWxsc2NyZWVuQ2hhbmdlZCk7CisKKyAgICAgICAg dmFyIHNwYW4gPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnc3BhbicpWzBdOworICAg ICAgICBjYWxsYmFjayA9IHNwYW5FbnRlcmVkRnVsbFNjcmVlbjsKKyAgICAgICAgcnVuV2l0aEtl eURvd24oZnVuY3Rpb24oKXtzcGFuLndlYmtpdFJlcXVlc3RGdWxsU2NyZWVuKCl9KTsKKyAgICB9 Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1zY3Jl ZW4ta2V5Ym9hcmQtZW5hYmxlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVu L2Z1bGwtc2NyZWVuLWtleWJvYXJkLWVuYWJsZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRh NGI3MzZkOTkzMDgwMmJiMGJhMTJjOTBkYjkwOTk1NTUyYTFhMmQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLWtleWJvYXJkLWVuYWJsZWQtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5nZSkK K0VYUEVDVEVEIChkb2N1bWVudC53ZWJraXRJc0Z1bGxTY3JlZW4gPT0gJ3RydWUnKSBPSworRVZF TlQoa2V5cHJlc3MpCitFWFBFQ1RFRCAoZXZlbnQua2V5Q29kZSA9PSAnOTcnKSBPSworRU5EIE9G IFRFU1QKK1RoaXMgdGVzdHMgdGhhdCBmdWxsIHNjcmVlbiBtb2RlIGRvZXMgbm90IGFsbG93IGFs cGhhbnVtZXJpYyBrZXkgZXZlbnRzLiBQcmVzcyBzcGFjZSB0byBjb250aW51ZSwgdGhlbiBwcmVz cyB0aGUgJ2EnIGtleS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1z Y3JlZW4ta2V5Ym9hcmQtZW5hYmxlZC5odG1sIGIvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxs LXNjcmVlbi1rZXlib2FyZC1lbmFibGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTE3MjZjYjE0NjNmYTcy YjJjMWI5ZmEyZGY1ZTUzMDc1MmEzMjRmMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Z1bGxzY3JlZW4vZnVsbC1zY3JlZW4ta2V5Ym9hcmQtZW5hYmxlZC5odG1sCkBAIC0wLDAgKzEs MzcgQEAKKzxib2R5PgorPHNjcmlwdCBzcmM9ImZ1bGwtc2NyZWVuLXRlc3QuanMiPjwvc2NyaXB0 PgorPHA+VGhpcyB0ZXN0cyB0aGF0IGZ1bGwgc2NyZWVuIG1vZGUgZG9lcyBub3QgYWxsb3cgYWxw aGFudW1lcmljIGtleSBldmVudHMuICBQcmVzcyBzcGFjZSB0byBjb250aW51ZSwgdGhlbiBwcmVz cyB0aGUgJ2EnIGtleS4KKzxzcGFuPjwvc3Bhbj4KKzxzY3JpcHQ+CisgICAgLy8gQmFpbCBvdXQg ZWFybHkgaWYgdGhlIGZ1bGwgc2NyZWVuIEFQSSBpcyBub3QgZW5hYmxlZCBvciBpcyBtaXNzaW5n OgorICAgIGlmIChFbGVtZW50LnByb3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVsbFNjcmVlbiA9PSB1 bmRlZmluZWQpIHsKKyAgICAgICAgbG9nUmVzdWx0KGZhbHNlLCAiRWxlbWVudC5wcm90b3R5cGUu d2Via2l0UmVxdWVzdEZ1bGxTY3JlZW4gPT0gdW5kZWZpbmVkIik7CisgICAgICAgIGVuZFRlc3Qo KTsKKyAgICB9IGVsc2UgeworICAgICAgICB2YXIgY2FsbGJhY2s7CisgICAgICAgIHZhciBmdWxs c2NyZWVuQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2ZW50KQorICAgICAgICB7CisgICAgICAgICAgICBp ZiAoY2FsbGJhY2spCisgICAgICAgICAgICAgICAgY2FsbGJhY2soZXZlbnQpCisgICAgICAgIH07 CisgICAgICAgIHdhaXRGb3JFdmVudChkb2N1bWVudCwgJ3dlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Un LCBmdWxsc2NyZWVuQ2hhbmdlZCk7CisKKyAgICAgICAgdmFyIHNwYW5FbnRlcmVkRnVsbFNjcmVl biA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgY2FsbGJhY2sgPSBudWxsOworICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJkb2N1bWVudC53ZWJraXRJc0Z1bGxTY3JlZW4iLCB0cnVlKTsKKyAg ICAgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIgJiYgZXZlbnRTZW5kZXIu a2V5RG93bikgeworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudChkb2N1bWVudCwgJ2tleXBy ZXNzJywga2V5UHJlc3NlZCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93bign YScsIFtdKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfTsKKyAgICAgICAgCisgICAgICAgIHZh ciBrZXlQcmVzc2VkID0gZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgnZXZlbnQua2V5Q29kZScsIDk3KTsgLy8gJ0EnCisgICAgICAgICAgICBlbmRUZXN0KCk7Cisg ICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQuZ2V0RWxlbWVu dHNCeVRhZ05hbWUoJ3NwYW4nKVswXTsKKyAgICAgICAgY2FsbGJhY2sgPSBzcGFuRW50ZXJlZEZ1 bGxTY3JlZW47CisgICAgICAgIHJ1bldpdGhLZXlEb3duKGZ1bmN0aW9uKCl7c3Bhbi53ZWJraXRS ZXF1ZXN0RnVsbFNjcmVlbihFbGVtZW50LkFMTE9XX0tFWUJPQVJEX0lOUFVUKX0pOworICAgIH0K Kzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDcwODRlZDZkNjNhNjQ0NjgzODY5YWQ5ZTEyMTM4OTRi MDFjMDMyY2UuLmFhYmU1MGY4Yzc3ODM5ZTQxNjFkY2RiMDRhY2ZjNzg0N2RiMTVjNmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNS0xNiAgSmVyZW15IE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBEaXNhYmxlIGtleWJvYXJkIGlucHV0ICh3aXRoIGV4Y2VwdGlvbnMpIGluIGZ1bGwt c2NyZWVuIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MDk0MworCisgICAgICAgIFRlc3RzOiBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLWtleWJv YXJkLWRpc2FibGVkLmh0bWwKKyAgICAgICAgICAgICAgIGZ1bGxzY3JlZW4vZnVsbC1zY3JlZW4t a2V5Ym9hcmQtZW5hYmxlZC5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmlzS2V5RXZlbnRBbGxvd2VkSW5GdWxs U2NyZWVuKTogQWRkZWQuICBJbXBsZW1lbnRzIHRoZSAKKyAgICAgICAgICAgIGxpc3Qgb2YgYWxs b3dlZCBrZXlib2FyZCBldmVudHMgaW4gdGhlIHByb3Bvc2VkIEFQSS4KKyAgICAgICAgKFdlYkNv cmU6OkV2ZW50SGFuZGxlcjo6a2V5RXZlbnQpOiBEaXNjYXJkIGV2ZW50cyB3aGljaCBhcmUgbm90 IGFsbG93ZWQgaW4KKyAgICAgICAgICAgIGZ1bGwtc2NyZWVuIG1vZGUuCisgICAgICAgICogcGFn ZS9FdmVudEhhbmRsZXIuaDoKKwogMjAxMS0wNS0xNiAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgRml4IExlb3BhcmQgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKaW5kZXggMTQ2MjIyYWNkNDdhYjBmZDE2ZjM5MzI5YzgwMGQ5ZjI5OGFm ZTkxYi4uYThiMjVlYzYwOTc4ODk0ODU3NmZjN2RjNzUwMzczNTEwZjc5NGQ2NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMjQyNSwxMCArMjQyNSwzMyBAQCBib29sIEV2 ZW50SGFuZGxlcjo6bmVlZHNLZXlib2FyZEV2ZW50RGlzYW1iaWd1YXRpb25RdWlya3MoKSBjb25z dAogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCitib29sIEV2ZW50SGFu ZGxlcjo6aXNLZXlFdmVudEFsbG93ZWRJbkZ1bGxTY3JlZW4oY29uc3QgUGxhdGZvcm1LZXlib2Fy ZEV2ZW50JiBrZXlFdmVudCkgY29uc3QKK3sKKyAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2Zy YW1lLT5kb2N1bWVudCgpOworICAgIGlmIChkb2N1bWVudC0+d2Via2l0RnVsbFNjcmVlbktleWJv YXJkSW5wdXRBbGxvd2VkKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgaW50IGtleUNv ZGUgPSBrZXlFdmVudC53aW5kb3dzVmlydHVhbEtleUNvZGUoKTsKKyAgICBpZiAoKGtleUNvZGUg Pj0gVktfQkFDSyAmJiBrZXlDb2RlIDw9IFZLX0NBUElUQUwpCisgICAgICAgIHx8IChrZXlDb2Rl ID49IFZLX1NQQUNFICYmIGtleUNvZGUgPD0gVktfREVMRVRFKQorICAgICAgICB8fCAoa2V5Q29k ZSA+PSBWS19PRU1fMSAmJiBrZXlDb2RlIDw9IFZLX09FTV9QTFVTKQorICAgICAgICB8fCAoa2V5 Q29kZSA+PSBWS19NVUxUSVBMWSAmJiBrZXlDb2RlIDw9IFZLX09FTV84KSkKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisjZW5kaWYKKwogYm9vbCBFdmVudEhh bmRsZXI6OmtleUV2ZW50KGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCYgaW5pdGlhbEtleUV2 ZW50KQogewogICAgIFJlZlB0cjxGcmFtZVZpZXc+IHByb3RlY3RvcihtX2ZyYW1lLT52aWV3KCkp OyAKIAorI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKKyAgICBpZiAobV9mcmFtZS0+ZG9jdW1l bnQoKS0+d2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgIWlzS2V5RXZlbnRBbGxvd2VkSW5GdWxsU2Ny ZWVuKGluaXRpYWxLZXlFdmVudCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorCiAg ICAgaWYgKGluaXRpYWxLZXlFdmVudC53aW5kb3dzVmlydHVhbEtleUNvZGUoKSA9PSBWS19DQVBJ VEFMKQogICAgICAgICBjYXBzTG9ja1N0YXRlTWF5SGF2ZUNoYW5nZWQoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmgKaW5kZXggMjZlODg3NGFhNmM2MTgyMDZhYmQ0MWY0YzliMDI0MzIw ZjEwYmIzNi4uMTA3ZjFiYmNkMjc0OGYxYmFhNjkwNzFiNjJiNzdmNjlkNDg0ZjFhZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCkBAIC0zNTEsNiArMzUxLDEwIEBAIHByaXZhdGU6CiAg ICAgUGxhdGZvcm1Nb3VzZUV2ZW50IGN1cnJlbnRQbGF0Zm9ybU1vdXNlRXZlbnQoKSBjb25zdDsK ICNlbmRpZgogCisjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQorICAgIGJvb2wgaXNLZXlFdmVu dEFsbG93ZWRJbkZ1bGxTY3JlZW4oY29uc3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50JikgY29uc3Q7 CisjZW5kaWYKKwogICAgIEZyYW1lKiBtX2ZyYW1lOwogCiAgICAgYm9vbCBtX21vdXNlUHJlc3Nl ZDsK