101967 2012-11-12 12:38:59 -0800 [BlackBerry] Ensure we only receive one KeyUp per key event 2012-11-12 18:01:43 -0800 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 oldest_to_newest 764680 0 nima.ghanavatian 2012-11-12 12:38:59 -0800 We are creating some synthetic keyUps which cause dual keyUp processing when the original event comes in. Filtering when to create it synthetically and when to allow the original to be processed. 764695 1 173694 nima.ghanavatian 2012-11-12 12:48:45 -0800 Created attachment 173694 Patch 764706 2 173694 rwlbuis 2012-11-12 12:57:47 -0800 Comment on attachment 173694 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173694&action=review Looks good in general, some issues to be cleared up. > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:1589 > + if (m_expectedKeyUpChar == keyboardEvent.character() || (WTF::isASCIIUpper(m_expectedKeyUpChar) && m_expectedKeyUpChar == WTF::toASCIIUpper(keyboardEvent.character()))) { You should not need the WTF:: prefix. > Source/WebKit/blackberry/WebKitSupport/InputHandler.h:241 > + short unsigned int m_expectedKeyUpChar; What type do you want? This does not seem right. 764750 3 173707 nima.ghanavatian 2012-11-12 13:31:12 -0800 Created attachment 173707 Patch 764754 4 173707 rwlbuis 2012-11-12 13:33:52 -0800 Comment on attachment 173707 Patch LGTM. 765062 5 173707 webkit.review.bot 2012-11-12 18:01:39 -0800 Comment on attachment 173707 Patch Clearing flags on attachment: 173707 Committed r134333: <http://trac.webkit.org/changeset/134333> 765063 6 webkit.review.bot 2012-11-12 18:01:43 -0800 All reviewed patches have been landed. Closing bug. 173694 2012-11-12 12:48:45 -0800 2012-11-12 13:31:08 -0800 Patch bug-101967-20121112154136.patch text/plain 8452 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzOTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwNTYyNTVmMTk4ZGIyZmVhNTljYTFlZTY0MDc3MDEyYjBlOWMyODA4Li5kNWNjYzZiMzM4 ODJhYTc0ODliZjVhMWFhYWFjNjQ0YjhkNGY5NTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMi0xMS0xMiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgogCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbnN1cmUgd2Ugb25s eSByZWNlaXZlIG9uZSBLZXlVcCBwZXIga2V5IGV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgY3JlYXRpbmcgc3ludGhldGljIEtleVVw cyB0b28gb2Z0ZW4sIGFuZCBnZXQgaW50byB0cm91YmxlIHNpbmNlIElNRiB3aWxsIHNlbmQgdXAg YSBLZXlVcCBvbiBhbGwga2V5IGV2ZW50cy4KKyAgICAgICAgRnVydGhlcm1vcmUsIHRoZXNlIEtl eVVwcyBjYW4gYXJyaXZlIGJvdGggd2hlbiB3ZSBhcmUgY29tcG9zaW5nIGFuZCBub3QuIFRvIGJ5 cGFzcyB0aGlzIGNoZWNrLCB3ZSBhcmUgc3RvcmluZyB0aGUgS2V5RG93bgorICAgICAgICBjaGFy YWN0ZXIgYW5kIGNvbXBhcmluZyBhZ2FpbnN0IGl0IG9uIEtleVVwLgorCisgICAgICAgIEludGVy bmFsbHkgcmV2aWV3ZWQgYnkgTWlrZSBGZW50b24uCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0 L0lucHV0SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFu ZGxlcjo6SW5wdXRIYW5kbGVyKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRI YW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjppbnNlcnRUZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjpzZXRUZXh0KToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRIYW5kbGVyKToKKworMjAxMi0xMS0xMiAgTmltYSBH aGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkByaW0uY29tPgorCiAgICAgICAgIFtCbGFja0JlcnJ5 XSBVc2Uga2V5ZXZlbnRzIGluc3RlYWQgb2YgZWRpdG9yIGNvbW1hbmRzIGZvciBiYWNrc3BhY2UK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTY2Mwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1 dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5w dXRIYW5kbGVyLmNwcAppbmRleCA1MTMzNjdhMDdlZTdjYzExNTFlYTk1ZmUyMzExMzI3OWYyNzM2 ODVjLi5iNWIzMGFjMTFiYzg1ZmFlMzE2MTA2MzczZTY5MjAzYmVjNWE0ZjMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxl ci5jcHAKQEAgLTE0NSw2ICsxNDUsNyBAQCBJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcihXZWJQ YWdlUHJpdmF0ZSogcGFnZSkKICAgICAsIG1fcHJvY2Vzc2luZ1RyYW5zYWN0aW9uSWQoLTEpCiAg ICAgLCBtX2ZvY3VzWm9vbVNjYWxlKDAuMCkKICAgICAsIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlE b3duKGZhbHNlKQorICAgICwgbV9leHBlY3RlZEtleVVwQ2hhcigwKQogewogfQogCkBAIC0xNTc3 LDkgKzE1NzgsMjMgQEAgYm9vbCBJbnB1dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQoY29u c3QgUGxhdGZvcm06OktleWJvYXJkRXZlbnQmIGtleWJvYXJkRXYKICAgICAvLyBFbmFibGUgaW5w dXQgbW9kZSBpZiB3ZSBhcmUgcHJvY2Vzc2luZyBhIGtleSBldmVudC4KICAgICBzZXRJbnB1dE1v ZGVFbmFibGVkKCk7CiAKKyAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6VHlwZSB0eXBlID0g a2V5Ym9hcmRFdmVudC50eXBlKCk7CisgICAgLyoKKyAgICAgKiBJTUYgc2VuZHMgdXMgYW4gdW5h ZHVsdGVyZWQgS2V5VXAgZm9yIGFsbCBrZXkgcHJlc3Nlcy4gVGhpcyBrZXkgZXZlbnQgc2hvdWxk IGJlIGFsbG93ZWQgdG8gYmUgcHJvY2Vzc2VkIGF0IGFsbCB0aW1lcy4KKyAgICAgKiBXZSBieXBh c3MgdGhlIGNoZWNrIGJlY2F1c2UgdGhlIHN0YXRlIG9mIGNvbXBvc2l0aW9uIGhhcyBubyBpbXBs aWNhdGlvbiBvbiB0aGlzIGtleSBldmVudC4KKyAgICAgKiBJbiBvcmRlciB0byBlbnN1cmUgd2Ug YWxsb3cgdGhlIGNvcnJlY3Qga2V5IGV2ZW50IHRocm91Z2gsIHdlIGtlZXAgdHJhY2sgb2Yga2V5 IGRvd24gZXZlbnRzIHdpdGggbV9leHBlY3RlZEtleVVwQ2hhci4KKyAgICAqLworICAgIGlmICh0 eXBlID09IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlVcCkgeworICAgICAgICAvLyBXaGVu IElNRiBhdXRvLWNhcGl0YWxpemVzIGEgS2V5RG93biwgc2F5IHRoZSBmaXJzdCBsZXR0ZXIgb2Yg YSBuZXcgc2VudGVuY2UsIG91ciBLZXlVcCB3aWxsIHN0aWxsIGJlIGluIGxvd2VyY2FzZS4KKyAg ICAgICAgaWYgKG1fZXhwZWN0ZWRLZXlVcENoYXIgPT0ga2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIo KSB8fCAoV1RGOjppc0FTQ0lJVXBwZXIobV9leHBlY3RlZEtleVVwQ2hhcikgJiYgbV9leHBlY3Rl ZEtleVVwQ2hhciA9PSBXVEY6OnRvQVNDSUlVcHBlcihrZXlib2FyZEV2ZW50LmNoYXJhY3Rlcigp KSkpIHsKKyAgICAgICAgICAgIG1fZXhwZWN0ZWRLZXlVcENoYXIgPSAwOworICAgICAgICAgICAg Y2hhbmdlSXNQYXJ0T2ZDb21wb3NpdGlvbiA9IHRydWU7CisgICAgICAgIH0KKyAgICB9CisKICAg ICAvLyBJZiB3ZSBhcmVuJ3Qgc3BlY2lmaWNhbGx5IHBhcnQgb2YgYSBjb21wb3NpdGlvbiwgZmFp bCwgSU1GIHNob3VsZCBuZXZlciBzZW5kIGtleSBpbnB1dAogICAgIC8vIHdoaWxlIGNvbXBvc2lu ZyB0ZXh0LiBJZiBJTUYgaGFzIGZhaWxlZCwgd2Ugc2hvdWxkIGhhdmUgYWxyZWFkeSBmaW5pc2hl ZCB0aGUKLSAgICAvLyBjb21wb3NpdGlvbiBtYW51YWxseS4KKyAgICAvLyBjb21wb3NpdGlvbiBt YW51YWxseS4gVGhlcmUgaXMgYSBjYXZlYXQgZm9yIEtleVVwIHdoaWNoIGlzIGV4cGxhaW5lZCBh Ym92ZS4KICAgICBpZiAoIWNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24gJiYgY29tcG9zaXRpb25B Y3RpdmUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC0xNTkyLDE2ICsxNjA3LDE4IEBA IGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRmb3JtOjpL ZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgQVNTRVJUKG1fd2ViUGFnZS0+bV9wYWdlLT5m b2N1c0NvbnRyb2xsZXIoKSk7CiAgICAgYm9vbCBrZXlib2FyZEV2ZW50SGFuZGxlZCA9IGZhbHNl OwogICAgIGlmIChGcmFtZSogZm9jdXNlZEZyYW1lID0gbV93ZWJQYWdlLT5tX3BhZ2UtPmZvY3Vz Q29udHJvbGxlcigpLT5mb2N1c2VkRnJhbWUoKSkgewotICAgICAgICBib29sIGlzS2V5Q2hhciA9 IGtleWJvYXJkRXZlbnQudHlwZSgpID09IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlDaGFy OwotICAgICAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6VHlwZSB0eXBlID0ga2V5Ym9hcmRF dmVudC50eXBlKCk7CisgICAgICAgIGJvb2wgaXNLZXlDaGFyID0gdHlwZSA9PSBQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudDo6S2V5Q2hhcjsKIAogICAgICAgICAvLyBJZiB0aGlzIGlzIGEgS2V5Q2hh ciB0eXBlIHRoZW4gd2UgaGFuZGxlIGl0IGFzIGEga2V5ZG93biBmb2xsb3dlZCBieSBhIGtleSB1 cC4KICAgICAgICAgaWYgKGlzS2V5Q2hhcikKICAgICAgICAgICAgIHR5cGUgPSBQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudDo6S2V5RG93bjsKKyAgICAgICAgZWxzZSBpZiAodHlwZSA9PSBQbGF0Zm9y bTo6S2V5Ym9hcmRFdmVudDo6S2V5RG93bikgeworICAgICAgICAgICAgbV9leHBlY3RlZEtleVVw Q2hhciA9IGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCk7CiAKLSAgICAgICAgLy8gSWYgd2UgcmVj ZWl2ZSB0aGUgS2V5RG93biBvZiBhIEJhY2tzcGFjZSwgc2V0IHRoaXMgZmxhZyB0byBwcmV2ZW50 IHNlbmRpbmcgdW5uZWNlc3Nhcnkgc2VsZWN0aW9uIGFuZCBjYXJldCBjaGFuZ2VzIHRvIElNRi4K LSAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCkgPT0gS0VZQ09ERV9CQUNLU1BB Q0UgJiYgdHlwZSA9PSBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5RG93bikKLSAgICAgICAg ICAgIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlEb3duID0gdHJ1ZTsKKyAgICAgICAgICAgIC8vIElm IHdlIHJlY2VpdmUgdGhlIEtleURvd24gb2YgYSBCYWNrc3BhY2UsIHNldCB0aGlzIGZsYWcgdG8g cHJldmVudCBzZW5kaW5nIHVubmVjZXNzYXJ5IHNlbGVjdGlvbiBhbmQgY2FyZXQgY2hhbmdlcyB0 byBJTUYuCisgICAgICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSA9PSBLRVlD T0RFX0JBQ0tTUEFDRSkKKyAgICAgICAgICAgICAgICBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93 biA9IHRydWU7CisgICAgICAgIH0KIAogICAgICAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCBh ZGp1c3RlZEtleWJvYXJkRXZlbnQoa2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSwgdHlwZSwgYWRq dXN0ZWRNb2RpZmllcnMpOwogICAgICAgICBrZXlib2FyZEV2ZW50SGFuZGxlZCA9IGZvY3VzZWRG cmFtZS0+ZXZlbnRIYW5kbGVyKCktPmtleUV2ZW50KFBsYXRmb3JtS2V5Ym9hcmRFdmVudChhZGp1 c3RlZEtleWJvYXJkRXZlbnQpKTsKQEAgLTE2NDIsNyArMTY1OSw2IEBAIHZvaWQgSW5wdXRIYW5k bGVyOjppbnNlcnRUZXh0KGNvbnN0IFdURjo6U3RyaW5nJiBzdHJpbmcpCiAKICAgICBBU1NFUlQo bV9jdXJyZW50Rm9jdXNFbGVtZW50LT5kb2N1bWVudCgpICYmIG1fY3VycmVudEZvY3VzRWxlbWVu dC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSAmJiBtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50 KCktPmZyYW1lKCktPmVkaXRvcigpKTsKICAgICBFZGl0b3IqIGVkaXRvciA9IG1fY3VycmVudEZv Y3VzRWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCk7Ci0KICAgICBlZGl0b3It PmNvbW1hbmQoIkluc2VydFRleHQiKS5leGVjdXRlKHN0cmluZyk7CiB9CiAKQEAgLTIyMzEsNyAr MjI0Nyw3IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpzZXRUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCog c3Bhbm5hYmxlU3RyaW5nKQogICAgICAgICAgICAgcmV0dXJuIGVkaXRvci0+Y29tbWFuZCgiSW5z ZXJ0VGV4dCIpLmV4ZWN1dGUodGV4dFRvSW5zZXJ0LnJpZ2h0KDEpKTsKICAgICAgICAgfQogICAg ICAgICBJbnB1dExvZyhMb2dMZXZlbEluZm8sICJJbnB1dEhhbmRsZXI6OnNldFRleHQgU2luZ2xl IHRyYWlsaW5nIGNoYXJhY3RlciBkZXRlY3RlZC4iKTsKLSAgICAgICAgcmV0dXJuIGhhbmRsZUtl eWJvYXJkSW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZlbnQodGV4dFRvSW5zZXJ0W3RleHRMZW5n dGggLSAxXSwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleUNoYXIsIDApLCBmYWxzZSAvKiBj aGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKKyAgICAgICAgcmV0dXJuIGhhbmRsZUtleWJv YXJkSW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZlbnQodGV4dFRvSW5zZXJ0W3RleHRMZW5ndGgg LSAxXSwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24sIDApLCBmYWxzZSAvKiBjaGFu Z2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKICAgICB9CiAKICAgICAvLyBJZiBubyBzcGFucyBo YXZlIGNoYW5nZWQsIHRyZWF0IGl0IGFzIGEgZGVsZXRlIG9wZXJhdGlvbi4KQEAgLTIyNTQsNyAr MjI3MCw3IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpzZXRUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCog c3Bhbm5hYmxlU3RyaW5nKQogICAgIC8vIElmIHRoZXJlIGlzIG5vIHRleHQgdG8gYWRkIGp1c3Qg ZGVsZXRlLgogICAgIGlmICghdGV4dExlbmd0aCkgewogICAgICAgICBpZiAoc2VsZWN0aW9uQWN0 aXZlKCkpCi0gICAgICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudChLRVlDT0RFX0JBQ0tTUEFDRSwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6 OktleUNoYXIsIDApLCB0cnVlIC8qIGNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24gKi8pOworICAg ICAgICAgICAgcmV0dXJuIGhhbmRsZUtleWJvYXJkSW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZl bnQoS0VZQ09ERV9CQUNLU1BBQ0UsIFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlEb3duLCAw KSwgdHJ1ZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKIAogICAgICAgICAvLyBO b3RoaW5nIHRvIGRvLgogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTIyNzcsNyArMjI5Myw3IEBA IGJvb2wgSW5wdXRIYW5kbGVyOjpzZXRUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCogc3Bhbm5hYmxl U3RyaW5nKQogICAgICAgICAvLyBIYW5kbGUgc2luZ2xlIGtleSBub24tYXR0cmlidXRlZCBlbnRy eSBhcyBrZXkgcHJlc3MgcmF0aGVyIHRoYW4gaW5zZXJ0IHRvIGFsbG93CiAgICAgICAgIC8vIHRy aWdnZXJpbmcgb2YgamF2YXNjcmlwdCBldmVudHMuCiAgICAgICAgIElucHV0TG9nKExvZ0xldmVs SW5mbywgIklucHV0SGFuZGxlcjo6c2V0VGV4dCBTaW5nbGUgY2hhcmFjdGVyIGVudHJ5IHRyZWF0 ZWQgYXMga2V5LXByZXNzIGluIHRoZSBhYnNlbnNlIG9mIHNwYW5zLiIpOwotICAgICAgICByZXR1 cm4gaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNl cnRbMF0sIFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlDaGFyLCAwKSwgdHJ1ZSAvKiBjaGFu Z2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKKyAgICAgICAgcmV0dXJuIGhhbmRsZUtleWJvYXJk SW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZlbnQodGV4dFRvSW5zZXJ0WzBdLCBQbGF0Zm9ybTo6 S2V5Ym9hcmRFdmVudDo6S2V5RG93biwgMCksIHRydWUgLyogY2hhbmdlSXNQYXJ0T2ZDb21wb3Np dGlvbiAqLyk7CiAgICAgfQogCiAgICAgLy8gUGVyZm9ybSB0aGUgdGV4dCBjaGFuZ2UgYXMgYSBz aW5nbGUgY29tbWFuZCBpZiB0aGVyZSBpcyBvbmUuCkBAIC0yMjg3LDcgKzIzMDMsNyBAQCBib29s IElucHV0SGFuZGxlcjo6c2V0VGV4dChzcGFubmFibGVfc3RyaW5nX3QqIHNwYW5uYWJsZVN0cmlu ZykKICAgICB9CiAKICAgICBpZiAocmVxdWlyZXNTcGFjZUtleVByZXNzKQotICAgICAgICBoYW5k bGVLZXlib2FyZElucHV0KFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50KDMyIC8qIHNwYWNlICovLCBQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5Q2hhciwgMCksIHRydWUgLyogY2hhbmdlSXNQYXJ0 T2ZDb21wb3NpdGlvbiAqLyk7CisgICAgICAgIGhhbmRsZUtleWJvYXJkSW5wdXQoUGxhdGZvcm06 OktleWJvYXJkRXZlbnQoMzIgLyogc3BhY2UgKi8sIFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpL ZXlEb3duLCAwKSwgdHJ1ZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKIAogICAg IElucHV0TG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c2V0VGV4dCBSZXF1ZXN0IGJl aW5nIHByb2Nlc3NlZC4gVGV4dCBhZnRlciBwcm9jZXNzaW5nICclcyciLCBlbGVtZW50VGV4dCgp LmxhdGluMSgpLmRhdGEoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKaW5kZXggYjdmM2JlM2U0MGNhNTYwNjgwZGZk NzU1MTYwYjdiMjhhNzEyYzYzOS4uNjk1M2I4YTMwYmUyODk1ZjA1OTM0NzcyZTM5ZTc3ZTE5OGY3 NTA4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv SW5wdXRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmgKQEAgLTIzOCw2ICsyMzgsNyBAQCBwcml2YXRlOgogICAgIFdlYkNv cmU6OkZsb2F0UG9pbnQgbV9mb2N1c1pvb21Mb2NhdGlvbjsKIAogICAgIGJvb2wgbV9yZWNlaXZl ZEJhY2tzcGFjZUtleURvd247CisgICAgc2hvcnQgdW5zaWduZWQgaW50IG1fZXhwZWN0ZWRLZXlV cENoYXI7CiB9OwogCiB9Cg== 173707 2012-11-12 13:31:12 -0800 2012-11-12 18:01:39 -0800 Patch bug-101967-20121112162403.patch text/plain 8438 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2M2Y2YzIyNzE5NTE1YmJhMWZkOTY4NWY5YjY1NTQ2YWFjZTcwZDY5Li4yM2VjMWQxNWI3 MmEwMjEyYTljZGM5NDg2ZjIxZGZjMTcyZjk0YmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMi0xMS0xMiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgogCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbnN1cmUgd2Ugb25s eSByZWNlaXZlIG9uZSBLZXlVcCBwZXIga2V5IGV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgY3JlYXRpbmcgc3ludGhldGljIEtleVVw cyB0b28gb2Z0ZW4sIGFuZCBnZXQgaW50byB0cm91YmxlIHNpbmNlIElNRiB3aWxsIHNlbmQgdXAg YSBLZXlVcCBvbiBhbGwga2V5IGV2ZW50cy4KKyAgICAgICAgRnVydGhlcm1vcmUsIHRoZXNlIEtl eVVwcyBjYW4gYXJyaXZlIGJvdGggd2hlbiB3ZSBhcmUgY29tcG9zaW5nIGFuZCBub3QuIFRvIGJ5 cGFzcyB0aGlzIGNoZWNrLCB3ZSBhcmUgc3RvcmluZyB0aGUgS2V5RG93bgorICAgICAgICBjaGFy YWN0ZXIgYW5kIGNvbXBhcmluZyBhZ2FpbnN0IGl0IG9uIEtleVVwLgorCisgICAgICAgIEludGVy bmFsbHkgcmV2aWV3ZWQgYnkgTWlrZSBGZW50b24uCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0 L0lucHV0SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFu ZGxlcjo6SW5wdXRIYW5kbGVyKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRI YW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjppbnNlcnRUZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjpzZXRUZXh0KToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRIYW5kbGVyKToKKworMjAxMi0xMS0xMiAgTmltYSBH aGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkByaW0uY29tPgorCiAgICAgICAgIFtCbGFja0JlcnJ5 XSBVc2Uga2V5ZXZlbnRzIGluc3RlYWQgb2YgZWRpdG9yIGNvbW1hbmRzIGZvciBiYWNrc3BhY2UK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTY2Mwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1 dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5w dXRIYW5kbGVyLmNwcAppbmRleCBiMGYyNmU4NjAxYzIwOTIzYzA0MzU2ZWI1YzdkM2MzZjVhN2Zk ZDNiLi5mYTJkMDJlNzFlNTMyNTQ5ZDY4MDNiZDkyNzRmNmMwMzJhMTBiNTM1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxl ci5jcHAKQEAgLTE0NSw2ICsxNDUsNyBAQCBJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcihXZWJQ YWdlUHJpdmF0ZSogcGFnZSkKICAgICAsIG1fcHJvY2Vzc2luZ1RyYW5zYWN0aW9uSWQoLTEpCiAg ICAgLCBtX2ZvY3VzWm9vbVNjYWxlKDAuMCkKICAgICAsIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlE b3duKGZhbHNlKQorICAgICwgbV9leHBlY3RlZEtleVVwQ2hhcigwKQogewogfQogCkBAIC0xNTgw LDkgKzE1ODEsMjMgQEAgYm9vbCBJbnB1dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQoY29u c3QgUGxhdGZvcm06OktleWJvYXJkRXZlbnQmIGtleWJvYXJkRXYKICAgICAvLyBFbmFibGUgaW5w dXQgbW9kZSBpZiB3ZSBhcmUgcHJvY2Vzc2luZyBhIGtleSBldmVudC4KICAgICBzZXRJbnB1dE1v ZGVFbmFibGVkKCk7CiAKKyAgICBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6VHlwZSB0eXBlID0g a2V5Ym9hcmRFdmVudC50eXBlKCk7CisgICAgLyoKKyAgICAgKiBJTUYgc2VuZHMgdXMgYW4gdW5h ZHVsdGVyZWQgS2V5VXAgZm9yIGFsbCBrZXkgcHJlc3Nlcy4gVGhpcyBrZXkgZXZlbnQgc2hvdWxk IGJlIGFsbG93ZWQgdG8gYmUgcHJvY2Vzc2VkIGF0IGFsbCB0aW1lcy4KKyAgICAgKiBXZSBieXBh c3MgdGhlIGNoZWNrIGJlY2F1c2UgdGhlIHN0YXRlIG9mIGNvbXBvc2l0aW9uIGhhcyBubyBpbXBs aWNhdGlvbiBvbiB0aGlzIGtleSBldmVudC4KKyAgICAgKiBJbiBvcmRlciB0byBlbnN1cmUgd2Ug YWxsb3cgdGhlIGNvcnJlY3Qga2V5IGV2ZW50IHRocm91Z2gsIHdlIGtlZXAgdHJhY2sgb2Yga2V5 IGRvd24gZXZlbnRzIHdpdGggbV9leHBlY3RlZEtleVVwQ2hhci4KKyAgICAqLworICAgIGlmICh0 eXBlID09IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlVcCkgeworICAgICAgICAvLyBXaGVu IElNRiBhdXRvLWNhcGl0YWxpemVzIGEgS2V5RG93biwgc2F5IHRoZSBmaXJzdCBsZXR0ZXIgb2Yg YSBuZXcgc2VudGVuY2UsIG91ciBLZXlVcCB3aWxsIHN0aWxsIGJlIGluIGxvd2VyY2FzZS4KKyAg ICAgICAgaWYgKG1fZXhwZWN0ZWRLZXlVcENoYXIgPT0ga2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIo KSB8fCAoaXNBU0NJSVVwcGVyKG1fZXhwZWN0ZWRLZXlVcENoYXIpICYmIG1fZXhwZWN0ZWRLZXlV cENoYXIgPT0gdG9BU0NJSVVwcGVyKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCkpKSkgeworICAg ICAgICAgICAgbV9leHBlY3RlZEtleVVwQ2hhciA9IDA7CisgICAgICAgICAgICBjaGFuZ2VJc1Bh cnRPZkNvbXBvc2l0aW9uID0gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8vIElmIHdl IGFyZW4ndCBzcGVjaWZpY2FsbHkgcGFydCBvZiBhIGNvbXBvc2l0aW9uLCBmYWlsLCBJTUYgc2hv dWxkIG5ldmVyIHNlbmQga2V5IGlucHV0CiAgICAgLy8gd2hpbGUgY29tcG9zaW5nIHRleHQuIElm IElNRiBoYXMgZmFpbGVkLCB3ZSBzaG91bGQgaGF2ZSBhbHJlYWR5IGZpbmlzaGVkIHRoZQotICAg IC8vIGNvbXBvc2l0aW9uIG1hbnVhbGx5LgorICAgIC8vIGNvbXBvc2l0aW9uIG1hbnVhbGx5LiBU aGVyZSBpcyBhIGNhdmVhdCBmb3IgS2V5VXAgd2hpY2ggaXMgZXhwbGFpbmVkIGFib3ZlLgogICAg IGlmICghY2hhbmdlSXNQYXJ0T2ZDb21wb3NpdGlvbiAmJiBjb21wb3NpdGlvbkFjdGl2ZSgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTE1OTUsMTYgKzE2MTAsMTggQEAgYm9vbCBJbnB1 dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQoY29uc3QgUGxhdGZvcm06OktleWJvYXJkRXZl bnQmIGtleWJvYXJkRXYKICAgICBBU1NFUlQobV93ZWJQYWdlLT5tX3BhZ2UtPmZvY3VzQ29udHJv bGxlcigpKTsKICAgICBib29sIGtleWJvYXJkRXZlbnRIYW5kbGVkID0gZmFsc2U7CiAgICAgaWYg KEZyYW1lKiBmb2N1c2VkRnJhbWUgPSBtX3dlYlBhZ2UtPm1fcGFnZS0+Zm9jdXNDb250cm9sbGVy KCktPmZvY3VzZWRGcmFtZSgpKSB7Ci0gICAgICAgIGJvb2wgaXNLZXlDaGFyID0ga2V5Ym9hcmRF dmVudC50eXBlKCkgPT0gUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleUNoYXI7Ci0gICAgICAg IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpUeXBlIHR5cGUgPSBrZXlib2FyZEV2ZW50LnR5cGUo KTsKKyAgICAgICAgYm9vbCBpc0tleUNoYXIgPSB0eXBlID09IFBsYXRmb3JtOjpLZXlib2FyZEV2 ZW50OjpLZXlDaGFyOwogCiAgICAgICAgIC8vIElmIHRoaXMgaXMgYSBLZXlDaGFyIHR5cGUgdGhl biB3ZSBoYW5kbGUgaXQgYXMgYSBrZXlkb3duIGZvbGxvd2VkIGJ5IGEga2V5IHVwLgogICAgICAg ICBpZiAoaXNLZXlDaGFyKQogICAgICAgICAgICAgdHlwZSA9IFBsYXRmb3JtOjpLZXlib2FyZEV2 ZW50OjpLZXlEb3duOworICAgICAgICBlbHNlIGlmICh0eXBlID09IFBsYXRmb3JtOjpLZXlib2Fy ZEV2ZW50OjpLZXlEb3duKSB7CisgICAgICAgICAgICBtX2V4cGVjdGVkS2V5VXBDaGFyID0ga2V5 Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKTsKIAotICAgICAgICAvLyBJZiB3ZSByZWNlaXZlIHRoZSBL ZXlEb3duIG9mIGEgQmFja3NwYWNlLCBzZXQgdGhpcyBmbGFnIHRvIHByZXZlbnQgc2VuZGluZyB1 bm5lY2Vzc2FyeSBzZWxlY3Rpb24gYW5kIGNhcmV0IGNoYW5nZXMgdG8gSU1GLgotICAgICAgICBp ZiAoa2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSA9PSBLRVlDT0RFX0JBQ0tTUEFDRSAmJiB0eXBl ID09IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlEb3duKQotICAgICAgICAgICAgbV9yZWNl aXZlZEJhY2tzcGFjZUtleURvd24gPSB0cnVlOworICAgICAgICAgICAgLy8gSWYgd2UgcmVjZWl2 ZSB0aGUgS2V5RG93biBvZiBhIEJhY2tzcGFjZSwgc2V0IHRoaXMgZmxhZyB0byBwcmV2ZW50IHNl bmRpbmcgdW5uZWNlc3Nhcnkgc2VsZWN0aW9uIGFuZCBjYXJldCBjaGFuZ2VzIHRvIElNRi4KKyAg ICAgICAgICAgIGlmIChrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpID09IEtFWUNPREVfQkFDS1NQ QUNFKQorICAgICAgICAgICAgICAgIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlEb3duID0gdHJ1ZTsK KyAgICAgICAgfQogCiAgICAgICAgIFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50IGFkanVzdGVkS2V5 Ym9hcmRFdmVudChrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCB0eXBlLCBhZGp1c3RlZE1vZGlm aWVycyk7CiAgICAgICAgIGtleWJvYXJkRXZlbnRIYW5kbGVkID0gZm9jdXNlZEZyYW1lLT5ldmVu dEhhbmRsZXIoKS0+a2V5RXZlbnQoUGxhdGZvcm1LZXlib2FyZEV2ZW50KGFkanVzdGVkS2V5Ym9h cmRFdmVudCkpOwpAQCAtMTY0NSw3ICsxNjYyLDYgQEAgdm9pZCBJbnB1dEhhbmRsZXI6Omluc2Vy dFRleHQoY29uc3QgV1RGOjpTdHJpbmcmIHN0cmluZykKIAogICAgIEFTU0VSVChtX2N1cnJlbnRG b2N1c0VsZW1lbnQtPmRvY3VtZW50KCkgJiYgbV9jdXJyZW50Rm9jdXNFbGVtZW50LT5kb2N1bWVu dCgpLT5mcmFtZSgpICYmIG1fY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUo KS0+ZWRpdG9yKCkpOwogICAgIEVkaXRvciogZWRpdG9yID0gbV9jdXJyZW50Rm9jdXNFbGVtZW50 LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5lZGl0b3IoKTsKLQogICAgIGVkaXRvci0+Y29tbWFuZCgi SW5zZXJ0VGV4dCIpLmV4ZWN1dGUoc3RyaW5nKTsKIH0KIApAQCAtMjIzNCw3ICsyMjUwLDcgQEAg Ym9vbCBJbnB1dEhhbmRsZXI6OnNldFRleHQoc3Bhbm5hYmxlX3N0cmluZ190KiBzcGFubmFibGVT dHJpbmcpCiAgICAgICAgICAgICByZXR1cm4gZWRpdG9yLT5jb21tYW5kKCJJbnNlcnRUZXh0Iiku ZXhlY3V0ZSh0ZXh0VG9JbnNlcnQucmlnaHQoMSkpOwogICAgICAgICB9CiAgICAgICAgIElucHV0 TG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c2V0VGV4dCBTaW5nbGUgdHJhaWxpbmcg Y2hhcmFjdGVyIGRldGVjdGVkLiIpOwotICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1 dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNlcnRbdGV4dExlbmd0aCAtIDFdLCBQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5Q2hhciwgMCksIGZhbHNlIC8qIGNoYW5nZUlzUGFy dE9mQ29tcG9zaXRpb24gKi8pOworICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1dChQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNlcnRbdGV4dExlbmd0aCAtIDFdLCBQbGF0 Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5RG93biwgMCksIGZhbHNlIC8qIGNoYW5nZUlzUGFydE9m Q29tcG9zaXRpb24gKi8pOwogICAgIH0KIAogICAgIC8vIElmIG5vIHNwYW5zIGhhdmUgY2hhbmdl ZCwgdHJlYXQgaXQgYXMgYSBkZWxldGUgb3BlcmF0aW9uLgpAQCAtMjI1Nyw3ICsyMjczLDcgQEAg Ym9vbCBJbnB1dEhhbmRsZXI6OnNldFRleHQoc3Bhbm5hYmxlX3N0cmluZ190KiBzcGFubmFibGVT dHJpbmcpCiAgICAgLy8gSWYgdGhlcmUgaXMgbm8gdGV4dCB0byBhZGQganVzdCBkZWxldGUuCiAg ICAgaWYgKCF0ZXh0TGVuZ3RoKSB7CiAgICAgICAgIGlmIChzZWxlY3Rpb25BY3RpdmUoKSkKLSAg ICAgICAgICAgIHJldHVybiBoYW5kbGVLZXlib2FyZElucHV0KFBsYXRmb3JtOjpLZXlib2FyZEV2 ZW50KEtFWUNPREVfQkFDS1NQQUNFLCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5Q2hhciwg MCksIHRydWUgLyogY2hhbmdlSXNQYXJ0T2ZDb21wb3NpdGlvbiAqLyk7CisgICAgICAgICAgICBy ZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudChLRVlDT0RF X0JBQ0tTUEFDRSwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24sIDApLCB0cnVlIC8q IGNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24gKi8pOwogCiAgICAgICAgIC8vIE5vdGhpbmcgdG8g ZG8uCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjI4MCw3ICsyMjk2LDcgQEAgYm9vbCBJbnB1 dEhhbmRsZXI6OnNldFRleHQoc3Bhbm5hYmxlX3N0cmluZ190KiBzcGFubmFibGVTdHJpbmcpCiAg ICAgICAgIC8vIEhhbmRsZSBzaW5nbGUga2V5IG5vbi1hdHRyaWJ1dGVkIGVudHJ5IGFzIGtleSBw cmVzcyByYXRoZXIgdGhhbiBpbnNlcnQgdG8gYWxsb3cKICAgICAgICAgLy8gdHJpZ2dlcmluZyBv ZiBqYXZhc2NyaXB0IGV2ZW50cy4KICAgICAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjpzZXRUZXh0IFNpbmdsZSBjaGFyYWN0ZXIgZW50cnkgdHJlYXRlZCBhcyBrZXkt cHJlc3MgaW4gdGhlIGFic2Vuc2Ugb2Ygc3BhbnMuIik7Ci0gICAgICAgIHJldHVybiBoYW5kbGVL ZXlib2FyZElucHV0KFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50KHRleHRUb0luc2VydFswXSwgUGxh dGZvcm06OktleWJvYXJkRXZlbnQ6OktleUNoYXIsIDApLCB0cnVlIC8qIGNoYW5nZUlzUGFydE9m Q29tcG9zaXRpb24gKi8pOworICAgICAgICByZXR1cm4gaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0 Zm9ybTo6S2V5Ym9hcmRFdmVudCh0ZXh0VG9JbnNlcnRbMF0sIFBsYXRmb3JtOjpLZXlib2FyZEV2 ZW50OjpLZXlEb3duLCAwKSwgdHJ1ZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsK ICAgICB9CiAKICAgICAvLyBQZXJmb3JtIHRoZSB0ZXh0IGNoYW5nZSBhcyBhIHNpbmdsZSBjb21t YW5kIGlmIHRoZXJlIGlzIG9uZS4KQEAgLTIyOTAsNyArMjMwNiw3IEBAIGJvb2wgSW5wdXRIYW5k bGVyOjpzZXRUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCogc3Bhbm5hYmxlU3RyaW5nKQogICAgIH0K IAogICAgIGlmIChyZXF1aXJlc1NwYWNlS2V5UHJlc3MpCi0gICAgICAgIGhhbmRsZUtleWJvYXJk SW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZlbnQoMzIgLyogc3BhY2UgKi8sIFBsYXRmb3JtOjpL ZXlib2FyZEV2ZW50OjpLZXlDaGFyLCAwKSwgdHJ1ZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0 aW9uICovKTsKKyAgICAgICAgaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0Zm9ybTo6S2V5Ym9hcmRF dmVudCgzMiAvKiBzcGFjZSAqLywgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24sIDAp LCB0cnVlIC8qIGNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24gKi8pOwogCiAgICAgSW5wdXRMb2co TG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRUZXh0IFJlcXVlc3QgYmVpbmcgcHJvY2Vz c2VkLiBUZXh0IGFmdGVyIHByb2Nlc3NpbmcgJyVzJyIsIGVsZW1lbnRUZXh0KCkubGF0aW4xKCku ZGF0YSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvSW5wdXRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9JbnB1dEhhbmRsZXIuaAppbmRleCBiN2YzYmUzZTQwY2E1NjA2ODBkZmQ3NTUxNjBiN2Iy OGE3MTJjNjM5Li5hMzgxNmRjNjA3NTJmYmM4MjAxZDUwMDU5OWViYTVkMGQ1ZGZkM2M3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRs ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuaApAQCAtMjM4LDYgKzIzOCw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6RmxvYXRQ b2ludCBtX2ZvY3VzWm9vbUxvY2F0aW9uOwogCiAgICAgYm9vbCBtX3JlY2VpdmVkQmFja3NwYWNl S2V5RG93bjsKKyAgICB1bnNpZ25lZCBzaG9ydCBtX2V4cGVjdGVkS2V5VXBDaGFyOwogfTsKIAog fQo=