101083 2012-11-02 12:09:26 -0700 [BlackBerry] Optimize backspace key handling 2012-11-02 14:12:09 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nima.ghanavatian nima.ghanavatian mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 757443 0 nima.ghanavatian 2012-11-02 12:09:26 -0700 We can reduce the number of messages sent back and fourth on every backspace key by eliminating those going to the input_service. 757468 1 172111 nima.ghanavatian 2012-11-02 12:36:18 -0700 Created attachment 172111 Patch 757513 2 172111 yong.li.webkit 2012-11-02 13:06:52 -0700 Comment on attachment 172111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172111&action=review > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:1494 > + if (m_receivedBackspaceKeyDown) > + m_receivedBackspaceKeyDown = false; the "if" is not needed in this case > Source/WebKit/blackberry/WebKitSupport/InputHandler.h:229 > + bool m_receivedBackspaceKeyDown; initialize in the ctor? 757522 3 172123 nima.ghanavatian 2012-11-02 13:21:43 -0700 Created attachment 172123 Patch 757563 4 172123 webkit.review.bot 2012-11-02 14:12:06 -0700 Comment on attachment 172123 Patch Clearing flags on attachment: 172123 Committed r133343: <http://trac.webkit.org/changeset/133343> 757564 5 webkit.review.bot 2012-11-02 14:12:09 -0700 All reviewed patches have been landed. Closing bug. 172111 2012-11-02 12:36:18 -0700 2012-11-02 13:21:39 -0700 Patch bug-101083-20121102152934.patch text/plain 4336 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1NzZmYTIxOTUzMjQwYWJhOTgwZmFhMzEwNGIyOGM1NWZlMzhlN2YyLi40MzJiMGNkNDVh Mzc2OTg4NTA0ZTZhZGNmNjA4ZGRiOTRhNmI5NWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0xMS0wMiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBPcHRpbWl6ZSBiYWNr c3BhY2Uga2V5IGhhbmRsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDEwODMKKworICAgICAgICBQUjIzMzU5MQorICAgICAgICBPcHRpbWl6ZSBi YWNrc3BhY2Uga2V5IGhhbmRsaW5nLiBTb21lIG9mIHRoZXNlIGNhbGxzIGFyZSBub3QKKyAgICAg ICAgcmVxdWlyZWQgYnkgSU1GIHNpbmNlIHRoZSBpbnB1dF9zZXJ2aWNlIGFscmVhZHkgcHJvY2Vz c2VzIHRoZSBiYWNrc3BhY2Uga2V5CisgICAgICAgIGFuZCB1cGRhdGVzIHRoZSBzdGF0ZSBiZWZv cmUgcGFzc2luZyB1cyB0aGUga2V5LgorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkg TWlrZSBGZW50b24uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQmxvY2tpbmcgY2FsbHMgd2l0aCBhIGZsYWcgdGhhdCB3ZSBjbGVhciBpbW1lZGlhdGVs eSBhZnRlcgorICAgICAgICBwcm9jZXNzaW5nIGEgYmFja3NwYWNlIGtleWRvd24uCisKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6bm9kZVRleHRDaGFuZ2VkKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZWxlY3Rpb25DaGFuZ2VkKToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToK KyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRI YW5kbGVyKToKKwogMjAxMi0xMS0wMiAgT3R0byBEZXJlayBDaGV1bmcgIDxvdGNoZXVuZ0ByaW0u Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBBZGRpbmcgd2luZG93LmV4dGVybmFsIHRvIG91 ciBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCBjYTI2N2MwZDNkYTUxY2M1NDcwZWU0ZDIyMTczYTRk NzgyYmFlNDlmLi43YmVlZWNhNmYzOTczMjJhMTM4MzE0NjdkZjBjYTMwZmZlYzEyZGZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5jcHAKQEAgLTEwMTgsMTAgKzEwMTgsNyBAQCB2b2lkIElucHV0SGFuZGxlcjo6c2V0 SW5wdXRWYWx1ZShjb25zdCBXVEY6OlN0cmluZyYgdmFsdWUpCiAKIHZvaWQgSW5wdXRIYW5kbGVy Ojpub2RlVGV4dENoYW5nZWQoY29uc3QgTm9kZSogbm9kZSkKIHsKLSAgICBpZiAocHJvY2Vzc2lu Z0NoYW5nZSgpIHx8ICFub2RlKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobm9kZSAhPSBt X2N1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAgaWYgKHByb2Nlc3NpbmdDaGFuZ2UoKSB8fCAhbm9k ZSB8fCBub2RlICE9IG1fY3VycmVudEZvY3VzRWxlbWVudCB8fCBtX3JlY2VpdmVkQmFja3NwYWNl S2V5RG93bikKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAi SW5wdXRIYW5kbGVyOjpub2RlVGV4dENoYW5nZWQiKTsKQEAgLTEzODcsNiArMTM4NCw5IEBAIHZv aWQgSW5wdXRIYW5kbGVyOjpzZWxlY3Rpb25DaGFuZ2VkKCkKIAogICAgIEFTU0VSVChtX2N1cnJl bnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCkgJiYgbV9jdXJyZW50Rm9jdXNFbGVtZW50LT5kb2N1 bWVudCgpLT5mcmFtZSgpKTsKIAorICAgIGlmIChtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bikK KyAgICAgICAgcmV0dXJuOworCiAgICAgaW50IG5ld1NlbGVjdGlvblN0YXJ0ID0gc2VsZWN0aW9u U3RhcnQoKTsKICAgICBpbnQgbmV3U2VsZWN0aW9uRW5kID0gc2VsZWN0aW9uRW5kKCk7CiAKQEAg LTE0NTUsNiArMTQ1NSw5IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0 KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiB7CiAgICAgSW5wdXRM b2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0IHJlY2Vp dmVkIGNoYXJhY3Rlcj0lbGMsIHR5cGU9JWQiLCBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCBr ZXlib2FyZEV2ZW50LnR5cGUoKSk7CiAKKyAgICAvLyBDbGVhcmluZyB0aGUgbV9yZWNlaXZlZEJh Y2tzcGFjZUtleURvd24gc3RhdGUgb24gYW55IEtleWJvYXJkRXZlbnQuCisgICAgbV9yZWNlaXZl ZEJhY2tzcGFjZUtleURvd24gPSBmYWxzZTsKKwogICAgIC8vIEVuYWJsZSBpbnB1dCBtb2RlIGlm IHdlIGFyZSBwcm9jZXNzaW5nIGEga2V5IGV2ZW50LgogICAgIHNldElucHV0TW9kZUVuYWJsZWQo KTsKIApAQCAtMTQ4MCw5ICsxNDgzLDE2IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXli b2FyZElucHV0KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAg ICAgIGlmIChpc0tleUNoYXIpCiAgICAgICAgICAgICB0eXBlID0gUGxhdGZvcm06OktleWJvYXJk RXZlbnQ6OktleURvd247CiAKKyAgICAgICAgLy8gSWYgd2UgcmVjZWl2ZSB0aGUgS2V5RG93biBv ZiBhIEJhY2tzcGFjZSwgc2V0IHRoaXMgZmxhZyB0byBwcmV2ZW50IHNlbmRpbmcgdW5uZWNlc3Nh cnkgc2VsZWN0aW9uIGFuZCBjYXJldCBjaGFuZ2VzIHRvIElNRi4KKyAgICAgICAgaWYgKGtleWJv YXJkRXZlbnQuY2hhcmFjdGVyKCkgPT0gS0VZQ09ERV9CQUNLU1BBQ0UgJiYgdHlwZSA9PSBQbGF0 Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5RG93bikKKyAgICAgICAgICAgIG1fcmVjZWl2ZWRCYWNr c3BhY2VLZXlEb3duID0gdHJ1ZTsKKwogICAgICAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCBh ZGp1c3RlZEtleWJvYXJkRXZlbnQoa2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSwgdHlwZSwgYWRq dXN0ZWRNb2RpZmllcnMpOwogICAgICAgICBrZXlib2FyZEV2ZW50SGFuZGxlZCA9IGZvY3VzZWRG cmFtZS0+ZXZlbnRIYW5kbGVyKCktPmtleUV2ZW50KFBsYXRmb3JtS2V5Ym9hcmRFdmVudChhZGp1 c3RlZEtleWJvYXJkRXZlbnQpKTsKIAorICAgICAgICBpZiAobV9yZWNlaXZlZEJhY2tzcGFjZUtl eURvd24pCisgICAgICAgICAgICBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93biA9IGZhbHNlOwor CiAgICAgICAgIGlmIChpc0tleUNoYXIpIHsKICAgICAgICAgICAgIHR5cGUgPSBQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudDo6S2V5VXA7CiAgICAgICAgICAgICBhZGp1c3RlZEtleWJvYXJkRXZlbnQg PSBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudChrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCB0eXBl LCBhZGp1c3RlZE1vZGlmaWVycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oCmluZGV4IGFkNTY5Nzk0YjAyMjRhMjQ1MDY0 ZDA3OWE1MmJlNTdkZTNhMGM2NDguLjEyMmVmOTE4NjMwNWZmYjZhODRiNGU3OGQwZThlY2Y5YjIx YzZjZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L0lucHV0SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0lucHV0SGFuZGxlci5oCkBAIC0yMjUsNiArMjI1LDggQEAgcHJpdmF0ZToKIAogICAgIGRv dWJsZSBtX2ZvY3VzWm9vbVNjYWxlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgbV9mb2N1c1pv b21Mb2NhdGlvbjsKKworICAgIGJvb2wgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd247CiB9Owog CiB9Cg== 172123 2012-11-02 13:21:43 -0700 2012-11-02 14:12:06 -0700 Patch bug-101083-20121102161458.patch text/plain 4495 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1NzZmYTIxOTUzMjQwYWJhOTgwZmFhMzEwNGIyOGM1NWZlMzhlN2YyLi40MzJiMGNkNDVh Mzc2OTg4NTA0ZTZhZGNmNjA4ZGRiOTRhNmI5NWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0xMS0wMiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBPcHRpbWl6ZSBiYWNr c3BhY2Uga2V5IGhhbmRsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDEwODMKKworICAgICAgICBQUjIzMzU5MQorICAgICAgICBPcHRpbWl6ZSBi YWNrc3BhY2Uga2V5IGhhbmRsaW5nLiBTb21lIG9mIHRoZXNlIGNhbGxzIGFyZSBub3QKKyAgICAg ICAgcmVxdWlyZWQgYnkgSU1GIHNpbmNlIHRoZSBpbnB1dF9zZXJ2aWNlIGFscmVhZHkgcHJvY2Vz c2VzIHRoZSBiYWNrc3BhY2Uga2V5CisgICAgICAgIGFuZCB1cGRhdGVzIHRoZSBzdGF0ZSBiZWZv cmUgcGFzc2luZyB1cyB0aGUga2V5LgorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkg TWlrZSBGZW50b24uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQmxvY2tpbmcgY2FsbHMgd2l0aCBhIGZsYWcgdGhhdCB3ZSBjbGVhciBpbW1lZGlhdGVs eSBhZnRlcgorICAgICAgICBwcm9jZXNzaW5nIGEgYmFja3NwYWNlIGtleWRvd24uCisKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6bm9kZVRleHRDaGFuZ2VkKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZWxlY3Rpb25DaGFuZ2VkKToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToK KyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRI YW5kbGVyKToKKwogMjAxMi0xMS0wMiAgT3R0byBEZXJlayBDaGV1bmcgIDxvdGNoZXVuZ0ByaW0u Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBBZGRpbmcgd2luZG93LmV4dGVybmFsIHRvIG91 ciBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCBjYTI2N2MwZDNkYTUxY2M1NDcwZWU0ZDIyMTczYTRk NzgyYmFlNDlmLi5mZGNjMDVkNmMxM2RiNjgzZGYwMWQxNWQ4MzRhZDNlZWIxYTkyOWQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5jcHAKQEAgLTE0MCw2ICsxNDAsNyBAQCBJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxl cihXZWJQYWdlUHJpdmF0ZSogcGFnZSkKICAgICAsIG1fcmVxdWVzdCgwKQogICAgICwgbV9wcm9j ZXNzaW5nVHJhbnNhY3Rpb25JZCgtMSkKICAgICAsIG1fZm9jdXNab29tU2NhbGUoMC4wKQorICAg ICwgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24oZmFsc2UpCiB7CiB9CiAKQEAgLTEwMTgsMTAg KzEwMTksNyBAQCB2b2lkIElucHV0SGFuZGxlcjo6c2V0SW5wdXRWYWx1ZShjb25zdCBXVEY6OlN0 cmluZyYgdmFsdWUpCiAKIHZvaWQgSW5wdXRIYW5kbGVyOjpub2RlVGV4dENoYW5nZWQoY29uc3Qg Tm9kZSogbm9kZSkKIHsKLSAgICBpZiAocHJvY2Vzc2luZ0NoYW5nZSgpIHx8ICFub2RlKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBpZiAobm9kZSAhPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQpCisg ICAgaWYgKHByb2Nlc3NpbmdDaGFuZ2UoKSB8fCAhbm9kZSB8fCBub2RlICE9IG1fY3VycmVudEZv Y3VzRWxlbWVudCB8fCBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bikKICAgICAgICAgcmV0dXJu OwogCiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpub2RlVGV4dENo YW5nZWQiKTsKQEAgLTEzODcsNiArMTM4NSw5IEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZWxlY3Rp b25DaGFuZ2VkKCkKIAogICAgIEFTU0VSVChtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50 KCkgJiYgbV9jdXJyZW50Rm9jdXNFbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpKTsKIAorICAg IGlmIChtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bikKKyAgICAgICAgcmV0dXJuOworCiAgICAg aW50IG5ld1NlbGVjdGlvblN0YXJ0ID0gc2VsZWN0aW9uU3RhcnQoKTsKICAgICBpbnQgbmV3U2Vs ZWN0aW9uRW5kID0gc2VsZWN0aW9uRW5kKCk7CiAKQEAgLTE0NTUsNiArMTQ1Niw5IEBAIGJvb2wg SW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRmb3JtOjpLZXlib2Fy ZEV2ZW50JiBrZXlib2FyZEV2CiB7CiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRI YW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0IHJlY2VpdmVkIGNoYXJhY3Rlcj0lbGMsIHR5cGU9 JWQiLCBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCBrZXlib2FyZEV2ZW50LnR5cGUoKSk7CiAK KyAgICAvLyBDbGVhcmluZyB0aGUgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24gc3RhdGUgb24g YW55IEtleWJvYXJkRXZlbnQuCisgICAgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24gPSBmYWxz ZTsKKwogICAgIC8vIEVuYWJsZSBpbnB1dCBtb2RlIGlmIHdlIGFyZSBwcm9jZXNzaW5nIGEga2V5 IGV2ZW50LgogICAgIHNldElucHV0TW9kZUVuYWJsZWQoKTsKIApAQCAtMTQ4MCw5ICsxNDg0LDE1 IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRmb3Jt OjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgICAgIGlmIChpc0tleUNoYXIpCiAgICAg ICAgICAgICB0eXBlID0gUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd247CiAKKyAgICAg ICAgLy8gSWYgd2UgcmVjZWl2ZSB0aGUgS2V5RG93biBvZiBhIEJhY2tzcGFjZSwgc2V0IHRoaXMg ZmxhZyB0byBwcmV2ZW50IHNlbmRpbmcgdW5uZWNlc3Nhcnkgc2VsZWN0aW9uIGFuZCBjYXJldCBj aGFuZ2VzIHRvIElNRi4KKyAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCkgPT0g S0VZQ09ERV9CQUNLU1BBQ0UgJiYgdHlwZSA9PSBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5 RG93bikKKyAgICAgICAgICAgIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlEb3duID0gdHJ1ZTsKKwog ICAgICAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCBhZGp1c3RlZEtleWJvYXJkRXZlbnQoa2V5 Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSwgdHlwZSwgYWRqdXN0ZWRNb2RpZmllcnMpOwogICAgICAg ICBrZXlib2FyZEV2ZW50SGFuZGxlZCA9IGZvY3VzZWRGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmtl eUV2ZW50KFBsYXRmb3JtS2V5Ym9hcmRFdmVudChhZGp1c3RlZEtleWJvYXJkRXZlbnQpKTsKIAor ICAgICAgICBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93biA9IGZhbHNlOworCiAgICAgICAgIGlm IChpc0tleUNoYXIpIHsKICAgICAgICAgICAgIHR5cGUgPSBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVu dDo6S2V5VXA7CiAgICAgICAgICAgICBhZGp1c3RlZEtleWJvYXJkRXZlbnQgPSBQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudChrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCB0eXBlLCBhZGp1c3RlZE1v ZGlmaWVycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9JbnB1dEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0lucHV0SGFuZGxlci5oCmluZGV4IGFkNTY5Nzk0YjAyMjRhMjQ1MDY0ZDA3OWE1MmJlNTdk ZTNhMGM2NDguLjEyMmVmOTE4NjMwNWZmYjZhODRiNGU3OGQwZThlY2Y5YjIxYzZjZTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFu ZGxlci5oCkBAIC0yMjUsNiArMjI1LDggQEAgcHJpdmF0ZToKIAogICAgIGRvdWJsZSBtX2ZvY3Vz Wm9vbVNjYWxlOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgbV9mb2N1c1pvb21Mb2NhdGlvbjsK KworICAgIGJvb2wgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd247CiB9OwogCiB9Cg==