109300 2013-02-08 07:13:01 -0800 [BlackBerry] Add form navigation control state tracking. 2013-02-11 09:19:28 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mifenton mifenton buildbot rniwa rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 828543 0 mifenton 2013-02-08 07:13:01 -0800 SSIA. 828545 1 187315 mifenton 2013-02-08 07:14:03 -0800 Created attachment 187315 Patch 828556 2 webkit.review.bot 2013-02-08 07:31:35 -0800 Attachment 187315 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/blackberry/Api/WebPage.cpp', u'Source/WebKit/blackberry/Api/WebPage.h', u'Source/WebKit/blackberry/Api/WebPageClient.h', u'Source/WebKit/blackberry/ChangeLog', u'Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp', u'Source/WebKit/blackberry/WebKitSupport/InputHandler.h']" exit_code: 1 Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:934: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:936: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:938: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:939: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:940: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:941: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:942: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:943: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:944: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:945: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:946: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:947: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:948: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:949: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:950: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:951: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:952: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:953: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:954: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:955: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 20 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 828635 3 187315 buildbot 2013-02-08 09:32:34 -0800 Comment on attachment 187315 Patch Attachment 187315 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16443652 New failing tests: http/tests/cache/cached-main-resource.html 828697 4 187341 mifenton 2013-02-08 11:35:27 -0800 Created attachment 187341 Updated Patch 829735 5 187341 rwlbuis 2013-02-11 08:45:45 -0800 Comment on attachment 187341 Updated Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187341&action=review > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:948 > + for (int j = i + 1; j < formElementCount; j++) { I think using j twice is confusing. Most compilers can probably deal with it but better not risk anything, and maybe choose more descriptive variable names. 829743 6 187587 mifenton 2013-02-11 08:52:01 -0800 Created attachment 187587 Updated patch with better variable naming. 829754 7 187587 rwlbuis 2013-02-11 08:54:39 -0800 Comment on attachment 187587 Updated patch with better variable naming. LGTM. 829779 8 187587 webkit.review.bot 2013-02-11 09:19:24 -0800 Comment on attachment 187587 Updated patch with better variable naming. Clearing flags on attachment: 187587 Committed r142482: <http://trac.webkit.org/changeset/142482> 829780 9 webkit.review.bot 2013-02-11 09:19:28 -0800 All reviewed patches have been landed. Closing bug. 187315 2013-02-08 07:14:03 -0800 2013-02-08 11:35:27 -0800 Patch 0001-2013-02-08-Mike-Fenton-mifenton-rim.com.patch text/plain 12065 mifenton RnJvbSBkMDViYjAzOTU0MDE3MTBjOTg1NWQ4YjIwMWQ5NjVmN2NiMjc2OTkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog RnJpLCA4IEZlYiAyMDEzIDA5OjMzOjAxIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMy0wMi0w OCAgTWlrZSBGZW50b24gIDxtaWZlbnRvbkByaW0uY29tPgoKICAgICAgICBBZGQgZm9ybSBuYXZp Z2F0aW9uIGNvbnRyb2wgc3RhdGUgdHJhY2tpbmcuCgogICAgICAgICogQXBpL1dlYlBhZ2UuY3Bw OgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjphc3NpZ25Gb2N1 cyk6CiAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQu aDoKICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKToKICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldElucHV0TW9kZUVuYWJs ZWQpOgogICAgICAgIChXZWJLaXQpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0 SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ bnB1dEhhbmRsZXI6OmZvY3VzUHJldmlvdXNGaWVsZCk6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6SW5wdXRIYW5kbGVyOjpzdWJtaXRGb3JtKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRGb2N1c2VkKToKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNlbGVjdGlvbkF0U3RhcnRPZkVsZW1lbnQpOgogICAg ICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaDoKICAgICAgICAoSW5wdXRIYW5kbGVy KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OmRpZFNwZWxsQ2hl Y2tXb3JkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwICAg ICAgICAgICB8ICAgMTUgKysrCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aCAgICAgICAgICAgICB8ICAgIDQgKwogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ2xpZW50LmggICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgIHwgICAyMyArKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwICAgICAgfCAgMTA1ICsrKysrKysrKysrKysrKysrKyst CiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCB8ICAg MTAgKysKIDYgZmlsZXMgY2hhbmdlZCwgMTU3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA3MDlmZTUwLi5i NDk2M2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTI2 MzAsNiArMjYzMCwyMSBAQCB2b2lkIFdlYlBhZ2U6OmFzc2lnbkZvY3VzKFBsYXRmb3JtOjpGb2N1 c0RpcmVjdGlvbiBkaXJlY3Rpb24pCiAgICAgZC0+YXNzaWduRm9jdXMoZGlyZWN0aW9uKTsKIH0K IAordm9pZCBXZWJQYWdlOjpmb2N1c05leHRGaWVsZCgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRs ZXItPmZvY3VzTmV4dEZpZWxkKCk7Cit9CisKK3ZvaWQgV2ViUGFnZTo6Zm9jdXNQcmV2aW91c0Zp ZWxkKCkKK3sKKyAgICBkLT5tX2lucHV0SGFuZGxlci0+Zm9jdXNQcmV2aW91c0ZpZWxkKCk7Cit9 CisKK3ZvaWQgV2ViUGFnZTo6c3VibWl0Rm9ybSgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRsZXIt PnN1Ym1pdEZvcm0oKTsKK30KKwogUGxhdGZvcm06OkludFJlY3QgV2ViUGFnZVByaXZhdGU6OmZv Y3VzTm9kZVJlY3QoKQogewogICAgIEZyYW1lKiBmcmFtZSA9IGZvY3VzZWRPck1haW5GcmFtZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCBiYzIxZTM5Li4yNzg5 Njc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtMjEyLDYgKzIx MiwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldEZvY3VzZWQoYm9vbCk7CiAKKyAgICB2b2lk IGZvY3VzTmV4dEZpZWxkKCk7CisgICAgdm9pZCBmb2N1c1ByZXZpb3VzRmllbGQoKTsKKyAgICB2 b2lkIHN1Ym1pdEZvcm0oKTsKKwogICAgIHZvaWQgY2xlYXJCcm93c2luZ0RhdGEoKTsKICAgICB2 b2lkIGNsZWFySGlzdG9yeSgpOwogICAgIHZvaWQgY2xlYXJDb29raWVzKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmluZGV4IDZlOWZkNGUuLjFmODNm MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCkBA IC0xNDcsNiArMTQ3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBpbnB1dFNlbGVjdGlv bkNoYW5nZWQodW5zaWduZWQgc2VsZWN0aW9uU3RhcnQsIHVuc2lnbmVkIHNlbGVjdGlvbkVuZCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBpbnB1dExlYXJuVGV4dCh3Y2hhcl90KiB0ZXh0LCBpbnQg bGVuZ3RoKSA9IDA7CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0Zvcm1Db250cm9scyhib29sIHZp c2libGUsIGJvb2wgcHJldmlvdXNBY3RpdmUgPSBmYWxzZSwgYm9vbCBuZXh0QWN0aXZlID0gZmFs c2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2hvd1ZpcnR1YWxLZXlib2FyZChib29sKSA9IDA7 CiAKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFNwZWxsaW5nQ2hlY2tpbmdPcHRpb25zKGltZl9z cF90ZXh0X3QmLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdCYgZG9jdW1lbnRD YXJldFJlY3QsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRTaXplJiBzY3JlZW5PZmZz ZXQsIGNvbnN0IGJvb2wgc2hvdWxkTW92ZURpYWxvZykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9D aGFuZ2VMb2cKaW5kZXggYTFjNDU2OC4uZmNiZWYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTMtMDItMDggIE1pa2UgRmVudG9uICA8bWlmZW50 b25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQWRkIGZvcm0gbmF2aWdhdGlvbiBj b250cm9sIHN0YXRlIHRyYWNraW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA5MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGZvcm0gbmF2aWdhdGlvbiBjb250cm9sIHN0YXRlIHRyYWNraW5n LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpXZWJQYWdlOjpmb2N1c05leHRGaWVsZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpmb2N1c1ByZXZpb3VzRmllbGQpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpzdWJtaXRGb3JtKToKKyAgICAgICAg KiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2V0RWxlbWVudFVuZm9jdXNlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRIYW5kbGVy KToKKwogMjAxMy0wMi0wNyAgQ2hhcmxlcyBXZWkgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5j b20uY24+CiAKICAgICAgICAgd2VicGFnZSBuZWVkcyBudWxsIGNoZWNrIGluIEJhY2tpbmdTdG9y ZTo6c2V0Q3VycmVudEJhY2tpbmdTdG9yZU93bmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCAwYTM0NGE2 Li5hNTRiZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKQEAgLTEzMCw2ICsxMzAsOSBAQCBwcml2YXRlOgog SW5wdXRIYW5kbGVyOjpJbnB1dEhhbmRsZXIoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgOiBt X3dlYlBhZ2UocGFnZSkKICAgICAsIG1fY3VycmVudEZvY3VzRWxlbWVudCgwKQorICAgICwgbV9w cmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50KDApCisgICAgLCBtX25leHRGb2N1c2FibGVUZXh0 RWxlbWVudCgwKQorICAgICwgbV9oYXNTdWJtaXRCdXR0b24oZmFsc2UpCiAgICAgLCBtX2lucHV0 TW9kZUVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3Byb2Nlc3NpbmdDaGFuZ2UoZmFsc2UpCiAgICAg LCBtX3Nob3VsZEVuc3VyZUZvY3VzVGV4dEVsZW1lbnRWaXNpYmxlT25TZWxlY3Rpb25DaGFuZ2Vk KGZhbHNlKQpAQCAtMTM5LDYgKzE0Miw3IEBAIElucHV0SGFuZGxlcjo6SW5wdXRIYW5kbGVyKFdl YlBhZ2VQcml2YXRlKiBwYWdlKQogICAgICwgbV9jb21wb3NpbmdUZXh0RW5kKDApCiAgICAgLCBt X3BlbmRpbmdLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoTm9DaGFuZ2UpCiAgICAgLCBtX2RlbGF5 S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKGZhbHNlKQorICAgICwgbV9zZW5kRm9ybVN0YXRlT25O ZXh0S2V5Ym9hcmRSZXF1ZXN0KGZhbHNlKQogICAgICwgbV9yZXF1ZXN0KDApCiAgICAgLCBtX3By b2Nlc3NpbmdUcmFuc2FjdGlvbklkKC0xKQogICAgICwgbV9zaG91bGROb3RpZnlXZWJWaWV3KHRy dWUpCkBAIC04NTcsOCArODYxLDEwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5m b2N1c2VkKGJvb2wgcmVmb2N1c09jY3VyaW5nKQogICAgICAgICBmaW5pc2hDb21wb3NpdGlvbigp OwogCiAgICAgICAgIC8vIE9ubHkgaGlkZSB0aGUga2V5Ym9hcmQgaWYgd2UgYXJlbid0IHJlZm9j dXNpbmcgb24gYSBuZXcgaW5wdXQgZmllbGQuCi0gICAgICAgIGlmICghcmVmb2N1c09jY3VyaW5n KQorICAgICAgICBpZiAoIXJlZm9jdXNPY2N1cmluZykgewogICAgICAgICAgICAgbm90aWZ5Q2xp ZW50T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UsIHRydWUgLyogdHJpZ2dlcmVkQnlG b2N1c0NoYW5nZSAqLyk7CisgICAgICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50LT5zaG93Rm9y bUNvbnRyb2xzKGZhbHNlIC8qIHZpc2libGUgKi8pOworICAgICAgICB9CiAKICAgICAgICAgbV93 ZWJQYWdlLT5tX2NsaWVudC0+aW5wdXRGb2N1c0xvc3QoKTsKIApAQCAtODc3LDYgKzg4Myw5IEBA IHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKGJvb2wgcmVmb2N1c09jY3Vy aW5nKQogICAgIC8vIENsZWFyIHRoZSBub2RlIGRldGFpbHMuCiAgICAgbV9jdXJyZW50Rm9jdXNF bGVtZW50ID0gMDsKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUeXBlID0gVGV4dEVkaXQ7Cisg ICAgbV9wcmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX25leHRGb2N1c2Fi bGVUZXh0RWxlbWVudCA9IDA7CisgICAgbV9oYXNTdWJtaXRCdXR0b24gPSBmYWxzZTsKIH0KIAog Ym9vbCBJbnB1dEhhbmRsZXI6OmlzSW5wdXRNb2RlRW5hYmxlZCgpIGNvbnN0CkBAIC04OTksNiAr OTA4LDkwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkKGJvb2wgYWN0 aXZlKQogICAgICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCkt PnNlbGVjdGlvbigpLT5zZXRGb2N1c2VkKHRydWUpOwogfQogCit2b2lkIElucHV0SGFuZGxlcjo6 dXBkYXRlRm9ybVN0YXRlKCkKK3sKKyAgICBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQg PSAwOworICAgIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX2hhc1N1Ym1p dEJ1dHRvbiA9IGZhbHNlOworCisgICAgaWYgKCFtX2N1cnJlbnRGb2N1c0VsZW1lbnQgfHwgIW1f Y3VycmVudEZvY3VzRWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgSFRNTEZvcm1FbGVtZW50KiBmb3JtRWxlbWVudCA9IHN0YXRpY19jYXN0PEhU TUxGb3JtQ29udHJvbEVsZW1lbnQqPihtX2N1cnJlbnRGb2N1c0VsZW1lbnQuZ2V0KCkpLT5mb3Jt KCk7CisgICAgaWYgKCFmb3JtRWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29uc3Qg VmVjdG9yPEZvcm1Bc3NvY2lhdGVkRWxlbWVudCo+IGZvcm1FbGVtZW50TGlzdCA9IGZvcm1FbGVt ZW50LT5hc3NvY2lhdGVkRWxlbWVudHMoKTsKKyAgICBpbnQgZm9ybUVsZW1lbnRDb3VudCA9IGZv cm1FbGVtZW50TGlzdC5zaXplKCk7CisgICAgaWYgKGZvcm1FbGVtZW50Q291bnQgPCAyKQorICAg ICAgICByZXR1cm47CisKKyAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgZm9ybSBoYXMgJWQgZmllbGRzIiwgZm9ybUVsZW1l bnRDb3VudCk7CisKKyAgICBtX2hhc1N1Ym1pdEJ1dHRvbiA9IHRydWU7CisgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBmb3JtRWxlbWVudENvdW50OyBpKyspIHsKKyAgICAgICAgaWYgKHRvSFRNTEVs ZW1lbnQoZm9ybUVsZW1lbnRMaXN0W2ldKSAhPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAg ICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgIC8vIEZvdW5kIHRoZSBmb2N1c2VkIGVsZW1l bnQsIGdldCB0aGUgbmV4dCBhbmQgcHJldmlvdXMgZWxlbWVudHMgaWYgdGhleSBleGlzdC4KKwor ICAgICAgICAgLy8gUHJldmlvdXMKKyAgICAgICAgIGZvciAoaW50IGogPSBpIC0gMTsgaiA+PSAw OyBqLS0pIHsKKyAgICAgICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gY29uc3RfY2FzdDxIVE1M RWxlbWVudCo+KHRvSFRNTEVsZW1lbnQoZm9ybUVsZW1lbnRMaXN0W2pdKSk7CisgICAgICAgICAg ICAgaWYgKERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVudChlbGVt ZW50KSkgeworICAgICAgICAgICAgICAgICBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQg PSBlbGVtZW50OworICAgICAgICAgICAgICAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJ bmZvLCAiSW5wdXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgZm91bmQgcHJldmlvdXMgZWxlbWVu dCIpOworICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICB9CisgICAgICAgICB9 CisgICAgICAgICAvLyBOZXh0CisgICAgICAgICBmb3IgKGludCBqID0gaSArIDE7IGogPCBmb3Jt RWxlbWVudENvdW50OyBqKyspIHsKKyAgICAgICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gY29u c3RfY2FzdDxIVE1MRWxlbWVudCo+KHRvSFRNTEVsZW1lbnQoZm9ybUVsZW1lbnRMaXN0W2pdKSk7 CisgICAgICAgICAgICAgaWYgKERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxl RWxlbWVudChlbGVtZW50KSkgeworICAgICAgICAgICAgICAgICBtX25leHRGb2N1c2FibGVUZXh0 RWxlbWVudCA9IGVsZW1lbnQ7CisgICAgICAgICAgICAgICAgIElucHV0TG9nKFBsYXRmb3JtOjpM b2dMZXZlbEluZm8sICJJbnB1dEhhbmRsZXI6OnVwZGF0ZUZvcm1TdGF0ZSBmb3VuZCBuZXh0IGVs ZW1lbnQiKTsKKyAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgfQorICAgICAg ICAgfQorICAgIH0KKworICAgIGlmICghbV9uZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQgJiYgIW1f cHJldmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudCkgeworICAgICAgICBtX2hhc1N1Ym1pdEJ1dHRv biA9IGZhbHNlOworICAgICAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgbm8gdmFsaWQgZWxlbWVudHMgZm91bmQsIGNsZWFy aW5nIHN0YXRlLiIpOworfQorCit2b2lkIElucHV0SGFuZGxlcjo6Zm9jdXNOZXh0RmllbGQoKQor eworICAgIGlmICghbV9uZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQpCisgICAgICAgIHJldHVybjsK KworICAgIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50LT5mb2N1cygpOworfQorCit2b2lkIElu cHV0SGFuZGxlcjo6Zm9jdXNQcmV2aW91c0ZpZWxkKCkKK3sKKyAgICBpZiAoIW1fcHJldmlvdXNG b2N1c2FibGVUZXh0RWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcmV2aW91c0Zv Y3VzYWJsZVRleHRFbGVtZW50LT5mb2N1cygpOworfQorCit2b2lkIElucHV0SGFuZGxlcjo6c3Vi bWl0Rm9ybSgpCit7CisgICAgaWYgKCFtX2hhc1N1Ym1pdEJ1dHRvbikKKyAgICAgICAgcmV0dXJu OworCisgICAgSFRNTEZvcm1FbGVtZW50KiBmb3JtRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxG b3JtQ29udHJvbEVsZW1lbnQqPihtX2N1cnJlbnRGb2N1c0VsZW1lbnQuZ2V0KCkpLT5mb3JtKCk7 CisgICAgaWYgKCFmb3JtRWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgSW5wdXRMb2co UGxhdGZvcm06OkxvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c3VibWl0Rm9ybSB0cmlnZ2Vy ZWQiKTsKKyAgICBpZiAoZWxlbWVudFR5cGUobV9jdXJyZW50Rm9jdXNFbGVtZW50LmdldCgpKSA9 PSBJbnB1dFR5cGVUZXh0QXJlYSkKKyAgICAgICAgZm9ybUVsZW1lbnQtPnN1Ym1pdCgpOworICAg IGVsc2UKKyAgICAgICAgaGFuZGxlS2V5Ym9hcmRJbnB1dChQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVu dChLRVlDT0RFX1JFVFVSTiwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleUNoYXIsIDApLCBm YWxzZSAvKiBjaGFuZ2VJc1BhcnRPZkNvbXBvc2l0aW9uICovKTsKK30KKwogc3RhdGljIHZvaWQg YWRkSW5wdXRTdHlsZU1hc2tGb3JLZXlib2FyZFR5cGUoaW50NjRfdCYgaW5wdXRNYXNrLCBWaXJ0 dWFsS2V5Ym9hcmRUeXBlIGtleWJvYXJkVHlwZSkKIHsKICAgICBzd2l0Y2ggKGtleWJvYXJkVHlw ZSkgewpAQCAtOTUyLDYgKzEwNDUsMTIgQEAgdm9pZCBJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRG b2N1c2VkKEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgLy8gTWFyayB0aGlzIGVsZW1lbnQgYXMgYWN0 aXZlIGFuZCBhZGQgdG8gZnJhbWUgc2V0LgogICAgIG1fY3VycmVudEZvY3VzRWxlbWVudCA9IGVs ZW1lbnQ7CiAgICAgbV9jdXJyZW50Rm9jdXNFbGVtZW50VHlwZSA9IFRleHRFZGl0OworICAgIHVw ZGF0ZUZvcm1TdGF0ZSgpOworCisgICAgaWYgKGlzSW5wdXRNb2RlRW5hYmxlZCgpICYmICFtX2Rl bGF5S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKQorICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50 LT5zaG93Rm9ybUNvbnRyb2xzKG1faGFzU3VibWl0QnV0dG9uIC8qIHZpc2libGUgKi8sIG1fcHJl dmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudCwgbV9uZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQpOwor ICAgIGVsc2UKKyAgICAgICAgbV9zZW5kRm9ybVN0YXRlT25OZXh0S2V5Ym9hcmRSZXF1ZXN0ID0g dHJ1ZTsKIAogICAgIC8vIFNlbmQgZGV0YWlscyB0byB0aGUgY2xpZW50IGFib3V0IHRoaXMgZWxl bWVudC4KICAgICBCbGFja0JlcnJ5SW5wdXRUeXBlIHR5cGUgPSBlbGVtZW50VHlwZShlbGVtZW50 KTsKQEAgLTEzOTAsNiArMTQ4OSwxMCBAQCB2b2lkIElucHV0SGFuZGxlcjo6bm90aWZ5Q2xpZW50 T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoYm9vbCB2aXNpYmxlLCBib29sIHRyaQogICAgICAg ICByZXR1cm47CiAKICAgICBpZiAoIW1fZGVsYXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UpIHsK KyAgICAgICAgaWYgKG1fc2VuZEZvcm1TdGF0ZU9uTmV4dEtleWJvYXJkUmVxdWVzdCkgeworICAg ICAgICAgICAgbV93ZWJQYWdlLT5tX2NsaWVudC0+c2hvd0Zvcm1Db250cm9scyhtX2hhc1N1Ym1p dEJ1dHRvbiAvKiB2aXNpYmxlICovLCBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQsIG1f bmV4dEZvY3VzYWJsZVRleHRFbGVtZW50KTsKKyAgICAgICAgICAgIG1fc2VuZEZvcm1TdGF0ZU9u TmV4dEtleWJvYXJkUmVxdWVzdCA9IGZhbHNlOworICAgICAgICB9CiAgICAgICAgIG1fd2ViUGFn ZS0+c2hvd1ZpcnR1YWxLZXlib2FyZCh2aXNpYmxlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmgKaW5kZXggNzljNTFlMi4uNDYxZDQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKQEAgLTk3LDYgKzk3 LDEwIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0SW5wdXRWYWx1ZShjb25zdCBXVEY6OlN0cmlu ZyYpOwogCisgICAgdm9pZCBmb2N1c05leHRGaWVsZCgpOworICAgIHZvaWQgZm9jdXNQcmV2aW91 c0ZpZWxkKCk7CisgICAgdm9pZCBzdWJtaXRGb3JtKCk7CisKICAgICB2b2lkIHNldERlbGF5S2V5 Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKGJvb2wgdmFsdWUpOwogICAgIHZvaWQgcHJvY2Vzc1BlbmRp bmdLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoKTsKIApAQCAtMjE1LDExICsyMTksMTcgQEAgcHJp dmF0ZToKICAgICBib29sIHNob3VsZFNwZWxsQ2hlY2tFbGVtZW50KGNvbnN0IFdlYkNvcmU6OkVs ZW1lbnQqKSBjb25zdDsKICAgICBib29sIGRpZFNwZWxsQ2hlY2tXb3JkKCkgY29uc3QgeyByZXR1 cm4gbV9kaWRTcGVsbENoZWNrV29yZDsgfQogCisgICAgdm9pZCB1cGRhdGVGb3JtU3RhdGUoKTsK KwogICAgIGJvb2wgc2hvdWxkTm90aWZ5V2ViVmlldyhjb25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRF dmVudCYpOwogCiAgICAgV2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKIAogICAgIFJlZlB0cjxX ZWJDb3JlOjpFbGVtZW50PiBtX2N1cnJlbnRGb2N1c0VsZW1lbnQ7CisgICAgUmVmUHRyPFdlYkNv cmU6OkVsZW1lbnQ+IG1fcHJldmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudDsKKyAgICBSZWZQdHI8 V2ViQ29yZTo6RWxlbWVudD4gbV9uZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQ7CisKKyAgICBib29s IG1faGFzU3VibWl0QnV0dG9uOwogICAgIGJvb2wgbV9pbnB1dE1vZGVFbmFibGVkOwogCiAgICAg Ym9vbCBtX3Byb2Nlc3NpbmdDaGFuZ2U7Ci0tIAoxLjcuOS41Cgo= 187341 2013-02-08 11:35:27 -0800 2013-02-11 08:52:01 -0800 Updated Patch 0001-2013-02-08-Mike-Fenton-mifenton-rim.com.patch text/plain 12045 mifenton RnJvbSAwZWU2MTZkNmZjOGE2NDEyYWY1ZDdlOTgzNWNlNjIwMTM4ZWM1OWU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog RnJpLCA4IEZlYiAyMDEzIDA5OjMzOjAxIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMy0wMi0w OCAgTWlrZSBGZW50b24gIDxtaWZlbnRvbkByaW0uY29tPgoKICAgICAgICBBZGQgZm9ybSBuYXZp Z2F0aW9uIGNvbnRyb2wgc3RhdGUgdHJhY2tpbmcuCgogICAgICAgICogQXBpL1dlYlBhZ2UuY3Bw OgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjphc3NpZ25Gb2N1 cyk6CiAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQu aDoKICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKToKICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldElucHV0TW9kZUVuYWJs ZWQpOgogICAgICAgIChXZWJLaXQpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0 SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ bnB1dEhhbmRsZXI6OmZvY3VzUHJldmlvdXNGaWVsZCk6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6SW5wdXRIYW5kbGVyOjpzdWJtaXRGb3JtKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRGb2N1c2VkKToKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNlbGVjdGlvbkF0U3RhcnRPZkVsZW1lbnQpOgogICAg ICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaDoKICAgICAgICAoSW5wdXRIYW5kbGVy KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OmRpZFNwZWxsQ2hl Y2tXb3JkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwICAg ICAgICAgICB8ICAgMTUgKysrCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aCAgICAgICAgICAgICB8ICAgIDQgKwogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ2xpZW50LmggICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgIHwgICAyMyArKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwICAgICAgfCAgMTA1ICsrKysrKysrKysrKysrKysrKyst CiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCB8ICAg MTAgKysKIDYgZmlsZXMgY2hhbmdlZCwgMTU3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA3MDlmZTUwLi5i NDk2M2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTI2 MzAsNiArMjYzMCwyMSBAQCB2b2lkIFdlYlBhZ2U6OmFzc2lnbkZvY3VzKFBsYXRmb3JtOjpGb2N1 c0RpcmVjdGlvbiBkaXJlY3Rpb24pCiAgICAgZC0+YXNzaWduRm9jdXMoZGlyZWN0aW9uKTsKIH0K IAordm9pZCBXZWJQYWdlOjpmb2N1c05leHRGaWVsZCgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRs ZXItPmZvY3VzTmV4dEZpZWxkKCk7Cit9CisKK3ZvaWQgV2ViUGFnZTo6Zm9jdXNQcmV2aW91c0Zp ZWxkKCkKK3sKKyAgICBkLT5tX2lucHV0SGFuZGxlci0+Zm9jdXNQcmV2aW91c0ZpZWxkKCk7Cit9 CisKK3ZvaWQgV2ViUGFnZTo6c3VibWl0Rm9ybSgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRsZXIt PnN1Ym1pdEZvcm0oKTsKK30KKwogUGxhdGZvcm06OkludFJlY3QgV2ViUGFnZVByaXZhdGU6OmZv Y3VzTm9kZVJlY3QoKQogewogICAgIEZyYW1lKiBmcmFtZSA9IGZvY3VzZWRPck1haW5GcmFtZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCBiYzIxZTM5Li4yNzg5 Njc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtMjEyLDYgKzIx MiwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldEZvY3VzZWQoYm9vbCk7CiAKKyAgICB2b2lk IGZvY3VzTmV4dEZpZWxkKCk7CisgICAgdm9pZCBmb2N1c1ByZXZpb3VzRmllbGQoKTsKKyAgICB2 b2lkIHN1Ym1pdEZvcm0oKTsKKwogICAgIHZvaWQgY2xlYXJCcm93c2luZ0RhdGEoKTsKICAgICB2 b2lkIGNsZWFySGlzdG9yeSgpOwogICAgIHZvaWQgY2xlYXJDb29raWVzKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmluZGV4IDZlOWZkNGUuLjFmODNm MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCkBA IC0xNDcsNiArMTQ3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBpbnB1dFNlbGVjdGlv bkNoYW5nZWQodW5zaWduZWQgc2VsZWN0aW9uU3RhcnQsIHVuc2lnbmVkIHNlbGVjdGlvbkVuZCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBpbnB1dExlYXJuVGV4dCh3Y2hhcl90KiB0ZXh0LCBpbnQg bGVuZ3RoKSA9IDA7CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0Zvcm1Db250cm9scyhib29sIHZp c2libGUsIGJvb2wgcHJldmlvdXNBY3RpdmUgPSBmYWxzZSwgYm9vbCBuZXh0QWN0aXZlID0gZmFs c2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2hvd1ZpcnR1YWxLZXlib2FyZChib29sKSA9IDA7 CiAKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFNwZWxsaW5nQ2hlY2tpbmdPcHRpb25zKGltZl9z cF90ZXh0X3QmLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdCYgZG9jdW1lbnRD YXJldFJlY3QsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRTaXplJiBzY3JlZW5PZmZz ZXQsIGNvbnN0IGJvb2wgc2hvdWxkTW92ZURpYWxvZykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9D aGFuZ2VMb2cKaW5kZXggYTFjNDU2OC4uZmNiZWYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTMtMDItMDggIE1pa2UgRmVudG9uICA8bWlmZW50 b25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQWRkIGZvcm0gbmF2aWdhdGlvbiBj b250cm9sIHN0YXRlIHRyYWNraW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA5MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGZvcm0gbmF2aWdhdGlvbiBjb250cm9sIHN0YXRlIHRyYWNraW5n LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpXZWJQYWdlOjpmb2N1c05leHRGaWVsZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpmb2N1c1ByZXZpb3VzRmllbGQpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpzdWJtaXRGb3JtKToKKyAgICAgICAg KiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2V0RWxlbWVudFVuZm9jdXNlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRIYW5kbGVy KToKKwogMjAxMy0wMi0wNyAgQ2hhcmxlcyBXZWkgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5j b20uY24+CiAKICAgICAgICAgd2VicGFnZSBuZWVkcyBudWxsIGNoZWNrIGluIEJhY2tpbmdTdG9y ZTo6c2V0Q3VycmVudEJhY2tpbmdTdG9yZU93bmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCAwYTM0NGE2 Li45ZmUwMGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKQEAgLTEzMCw2ICsxMzAsOSBAQCBwcml2YXRlOgog SW5wdXRIYW5kbGVyOjpJbnB1dEhhbmRsZXIoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgOiBt X3dlYlBhZ2UocGFnZSkKICAgICAsIG1fY3VycmVudEZvY3VzRWxlbWVudCgwKQorICAgICwgbV9w cmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50KDApCisgICAgLCBtX25leHRGb2N1c2FibGVUZXh0 RWxlbWVudCgwKQorICAgICwgbV9oYXNTdWJtaXRCdXR0b24oZmFsc2UpCiAgICAgLCBtX2lucHV0 TW9kZUVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3Byb2Nlc3NpbmdDaGFuZ2UoZmFsc2UpCiAgICAg LCBtX3Nob3VsZEVuc3VyZUZvY3VzVGV4dEVsZW1lbnRWaXNpYmxlT25TZWxlY3Rpb25DaGFuZ2Vk KGZhbHNlKQpAQCAtMTM5LDYgKzE0Miw3IEBAIElucHV0SGFuZGxlcjo6SW5wdXRIYW5kbGVyKFdl YlBhZ2VQcml2YXRlKiBwYWdlKQogICAgICwgbV9jb21wb3NpbmdUZXh0RW5kKDApCiAgICAgLCBt X3BlbmRpbmdLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoTm9DaGFuZ2UpCiAgICAgLCBtX2RlbGF5 S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKGZhbHNlKQorICAgICwgbV9zZW5kRm9ybVN0YXRlT25O ZXh0S2V5Ym9hcmRSZXF1ZXN0KGZhbHNlKQogICAgICwgbV9yZXF1ZXN0KDApCiAgICAgLCBtX3By b2Nlc3NpbmdUcmFuc2FjdGlvbklkKC0xKQogICAgICwgbV9zaG91bGROb3RpZnlXZWJWaWV3KHRy dWUpCkBAIC04NTcsOCArODYxLDEwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5m b2N1c2VkKGJvb2wgcmVmb2N1c09jY3VyaW5nKQogICAgICAgICBmaW5pc2hDb21wb3NpdGlvbigp OwogCiAgICAgICAgIC8vIE9ubHkgaGlkZSB0aGUga2V5Ym9hcmQgaWYgd2UgYXJlbid0IHJlZm9j dXNpbmcgb24gYSBuZXcgaW5wdXQgZmllbGQuCi0gICAgICAgIGlmICghcmVmb2N1c09jY3VyaW5n KQorICAgICAgICBpZiAoIXJlZm9jdXNPY2N1cmluZykgewogICAgICAgICAgICAgbm90aWZ5Q2xp ZW50T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UsIHRydWUgLyogdHJpZ2dlcmVkQnlG b2N1c0NoYW5nZSAqLyk7CisgICAgICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50LT5zaG93Rm9y bUNvbnRyb2xzKGZhbHNlIC8qIHZpc2libGUgKi8pOworICAgICAgICB9CiAKICAgICAgICAgbV93 ZWJQYWdlLT5tX2NsaWVudC0+aW5wdXRGb2N1c0xvc3QoKTsKIApAQCAtODc3LDYgKzg4Myw5IEBA IHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKGJvb2wgcmVmb2N1c09jY3Vy aW5nKQogICAgIC8vIENsZWFyIHRoZSBub2RlIGRldGFpbHMuCiAgICAgbV9jdXJyZW50Rm9jdXNF bGVtZW50ID0gMDsKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUeXBlID0gVGV4dEVkaXQ7Cisg ICAgbV9wcmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX25leHRGb2N1c2Fi bGVUZXh0RWxlbWVudCA9IDA7CisgICAgbV9oYXNTdWJtaXRCdXR0b24gPSBmYWxzZTsKIH0KIAog Ym9vbCBJbnB1dEhhbmRsZXI6OmlzSW5wdXRNb2RlRW5hYmxlZCgpIGNvbnN0CkBAIC04OTksNiAr OTA4LDkwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkKGJvb2wgYWN0 aXZlKQogICAgICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCkt PnNlbGVjdGlvbigpLT5zZXRGb2N1c2VkKHRydWUpOwogfQogCit2b2lkIElucHV0SGFuZGxlcjo6 dXBkYXRlRm9ybVN0YXRlKCkKK3sKKyAgICBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQg PSAwOworICAgIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX2hhc1N1Ym1p dEJ1dHRvbiA9IGZhbHNlOworCisgICAgaWYgKCFtX2N1cnJlbnRGb2N1c0VsZW1lbnQgfHwgIW1f Y3VycmVudEZvY3VzRWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgSFRNTEZvcm1FbGVtZW50KiBmb3JtRWxlbWVudCA9IHN0YXRpY19jYXN0PEhU TUxGb3JtQ29udHJvbEVsZW1lbnQqPihtX2N1cnJlbnRGb2N1c0VsZW1lbnQuZ2V0KCkpLT5mb3Jt KCk7CisgICAgaWYgKCFmb3JtRWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29uc3Qg VmVjdG9yPEZvcm1Bc3NvY2lhdGVkRWxlbWVudCo+IGZvcm1FbGVtZW50TGlzdCA9IGZvcm1FbGVt ZW50LT5hc3NvY2lhdGVkRWxlbWVudHMoKTsKKyAgICBpbnQgZm9ybUVsZW1lbnRDb3VudCA9IGZv cm1FbGVtZW50TGlzdC5zaXplKCk7CisgICAgaWYgKGZvcm1FbGVtZW50Q291bnQgPCAyKQorICAg ICAgICByZXR1cm47CisKKyAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgZm9ybSBoYXMgJWQgZmllbGRzIiwgZm9ybUVsZW1l bnRDb3VudCk7CisKKyAgICBtX2hhc1N1Ym1pdEJ1dHRvbiA9IHRydWU7CisgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBmb3JtRWxlbWVudENvdW50OyBpKyspIHsKKyAgICAgICAgaWYgKHRvSFRNTEVs ZW1lbnQoZm9ybUVsZW1lbnRMaXN0W2ldKSAhPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICAvLyBGb3VuZCB0aGUgZm9jdXNlZCBlbGVtZW50 LCBnZXQgdGhlIG5leHQgYW5kIHByZXZpb3VzIGVsZW1lbnRzIGlmIHRoZXkgZXhpc3QuCisKKyAg ICAgICAgLy8gUHJldmlvdXMKKyAgICAgICAgZm9yIChpbnQgaiA9IGkgLSAxOyBqID49IDA7IGot LSkgeworICAgICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IGNvbnN0X2Nhc3Q8SFRNTEVsZW1l bnQqPih0b0hUTUxFbGVtZW50KGZvcm1FbGVtZW50TGlzdFtqXSkpOworICAgICAgICAgICAgaWYg KERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVudChlbGVtZW50KSkg eworICAgICAgICAgICAgICAgIG1fcHJldmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudCA9IGVsZW1l bnQ7CisgICAgICAgICAgICAgICAgSW5wdXRMb2coUGxhdGZvcm06OkxvZ0xldmVsSW5mbywgIklu cHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlIGZvdW5kIHByZXZpb3VzIGVsZW1lbnQiKTsKKyAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICAv LyBOZXh0CisgICAgICAgIGZvciAoaW50IGogPSBpICsgMTsgaiA8IGZvcm1FbGVtZW50Q291bnQ7 IGorKykgeworICAgICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IGNvbnN0X2Nhc3Q8SFRNTEVs ZW1lbnQqPih0b0hUTUxFbGVtZW50KGZvcm1FbGVtZW50TGlzdFtqXSkpOworICAgICAgICAgICAg aWYgKERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVudChlbGVtZW50 KSkgeworICAgICAgICAgICAgICAgIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50ID0gZWxlbWVu dDsKKyAgICAgICAgICAgICAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgZm91bmQgbmV4dCBlbGVtZW50Iik7CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBp ZiAoIW1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50ICYmICFtX3ByZXZpb3VzRm9jdXNhYmxlVGV4 dEVsZW1lbnQpIHsKKyAgICAgICAgbV9oYXNTdWJtaXRCdXR0b24gPSBmYWxzZTsKKyAgICAgICAg SW5wdXRMb2coUGxhdGZvcm06OkxvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6dXBkYXRlRm9y bVN0YXRlIG5vIHZhbGlkIGVsZW1lbnRzIGZvdW5kLCBjbGVhcmluZyBzdGF0ZS4iKTsKK30KKwor dm9pZCBJbnB1dEhhbmRsZXI6OmZvY3VzTmV4dEZpZWxkKCkKK3sKKyAgICBpZiAoIW1fbmV4dEZv Y3VzYWJsZVRleHRFbGVtZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX25leHRGb2N1c2Fi bGVUZXh0RWxlbWVudC0+Zm9jdXMoKTsKK30KKwordm9pZCBJbnB1dEhhbmRsZXI6OmZvY3VzUHJl dmlvdXNGaWVsZCgpCit7CisgICAgaWYgKCFtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQp CisgICAgICAgIHJldHVybjsKKworICAgIG1fcHJldmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudC0+ Zm9jdXMoKTsKK30KKwordm9pZCBJbnB1dEhhbmRsZXI6OnN1Ym1pdEZvcm0oKQoreworICAgIGlm ICghbV9oYXNTdWJtaXRCdXR0b24pCisgICAgICAgIHJldHVybjsKKworICAgIEhUTUxGb3JtRWxl bWVudCogZm9ybUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Kj4o bV9jdXJyZW50Rm9jdXNFbGVtZW50LmdldCgpKS0+Zm9ybSgpOworICAgIGlmICghZm9ybUVsZW1l bnQpCisgICAgICAgIHJldHVybjsKKworICAgIElucHV0TG9nKFBsYXRmb3JtOjpMb2dMZXZlbElu Zm8sICJJbnB1dEhhbmRsZXI6OnN1Ym1pdEZvcm0gdHJpZ2dlcmVkIik7CisgICAgaWYgKGVsZW1l bnRUeXBlKG1fY3VycmVudEZvY3VzRWxlbWVudC5nZXQoKSkgPT0gSW5wdXRUeXBlVGV4dEFyZWEp CisgICAgICAgIGZvcm1FbGVtZW50LT5zdWJtaXQoKTsKKyAgICBlbHNlCisgICAgICAgIGhhbmRs ZUtleWJvYXJkSW5wdXQoUGxhdGZvcm06OktleWJvYXJkRXZlbnQoS0VZQ09ERV9SRVRVUk4sIFBs YXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlDaGFyLCAwKSwgZmFsc2UgLyogY2hhbmdlSXNQYXJ0 T2ZDb21wb3NpdGlvbiAqLyk7Cit9CisKIHN0YXRpYyB2b2lkIGFkZElucHV0U3R5bGVNYXNrRm9y S2V5Ym9hcmRUeXBlKGludDY0X3QmIGlucHV0TWFzaywgVmlydHVhbEtleWJvYXJkVHlwZSBrZXli b2FyZFR5cGUpCiB7CiAgICAgc3dpdGNoIChrZXlib2FyZFR5cGUpIHsKQEAgLTk1Miw2ICsxMDQ1 LDEyIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50Rm9jdXNlZChFbGVtZW50KiBlbGVt ZW50KQogICAgIC8vIE1hcmsgdGhpcyBlbGVtZW50IGFzIGFjdGl2ZSBhbmQgYWRkIHRvIGZyYW1l IHNldC4KICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnQgPSBlbGVtZW50OwogICAgIG1fY3VycmVu dEZvY3VzRWxlbWVudFR5cGUgPSBUZXh0RWRpdDsKKyAgICB1cGRhdGVGb3JtU3RhdGUoKTsKKwor ICAgIGlmIChpc0lucHV0TW9kZUVuYWJsZWQoKSAmJiAhbV9kZWxheUtleWJvYXJkVmlzaWJpbGl0 eUNoYW5nZSkKKyAgICAgICAgbV93ZWJQYWdlLT5tX2NsaWVudC0+c2hvd0Zvcm1Db250cm9scyht X2hhc1N1Ym1pdEJ1dHRvbiAvKiB2aXNpYmxlICovLCBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVs ZW1lbnQsIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50KTsKKyAgICBlbHNlCisgICAgICAgIG1f c2VuZEZvcm1TdGF0ZU9uTmV4dEtleWJvYXJkUmVxdWVzdCA9IHRydWU7CiAKICAgICAvLyBTZW5k IGRldGFpbHMgdG8gdGhlIGNsaWVudCBhYm91dCB0aGlzIGVsZW1lbnQuCiAgICAgQmxhY2tCZXJy eUlucHV0VHlwZSB0eXBlID0gZWxlbWVudFR5cGUoZWxlbWVudCk7CkBAIC0xMzkwLDYgKzE0ODks MTAgQEAgdm9pZCBJbnB1dEhhbmRsZXI6Om5vdGlmeUNsaWVudE9mS2V5Ym9hcmRWaXNpYmlsaXR5 Q2hhbmdlKGJvb2wgdmlzaWJsZSwgYm9vbCB0cmkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYg KCFtX2RlbGF5S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKSB7CisgICAgICAgIGlmIChtX3NlbmRG b3JtU3RhdGVPbk5leHRLZXlib2FyZFJlcXVlc3QpIHsKKyAgICAgICAgICAgIG1fd2ViUGFnZS0+ bV9jbGllbnQtPnNob3dGb3JtQ29udHJvbHMobV9oYXNTdWJtaXRCdXR0b24gLyogdmlzaWJsZSAq LywgbV9wcmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50LCBtX25leHRGb2N1c2FibGVUZXh0RWxl bWVudCk7CisgICAgICAgICAgICBtX3NlbmRGb3JtU3RhdGVPbk5leHRLZXlib2FyZFJlcXVlc3Qg PSBmYWxzZTsKKyAgICAgICAgfQogICAgICAgICBtX3dlYlBhZ2UtPnNob3dWaXJ0dWFsS2V5Ym9h cmQodmlzaWJsZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oCmluZGV4IDc5YzUx ZTIuLjQ2MWQ0ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0lucHV0SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0lucHV0SGFuZGxlci5oCkBAIC05Nyw2ICs5NywxMCBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHNldElucHV0VmFsdWUoY29uc3QgV1RGOjpTdHJpbmcmKTsKIAorICAgIHZvaWQgZm9j dXNOZXh0RmllbGQoKTsKKyAgICB2b2lkIGZvY3VzUHJldmlvdXNGaWVsZCgpOworICAgIHZvaWQg c3VibWl0Rm9ybSgpOworCiAgICAgdm9pZCBzZXREZWxheUtleWJvYXJkVmlzaWJpbGl0eUNoYW5n ZShib29sIHZhbHVlKTsKICAgICB2b2lkIHByb2Nlc3NQZW5kaW5nS2V5Ym9hcmRWaXNpYmlsaXR5 Q2hhbmdlKCk7CiAKQEAgLTIxNSwxMSArMjE5LDE3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBzaG91 bGRTcGVsbENoZWNrRWxlbWVudChjb25zdCBXZWJDb3JlOjpFbGVtZW50KikgY29uc3Q7CiAgICAg Ym9vbCBkaWRTcGVsbENoZWNrV29yZCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU3BlbGxDaGVja1dv cmQ7IH0KIAorICAgIHZvaWQgdXBkYXRlRm9ybVN0YXRlKCk7CisKICAgICBib29sIHNob3VsZE5v dGlmeVdlYlZpZXcoY29uc3QgUGxhdGZvcm06OktleWJvYXJkRXZlbnQmKTsKIAogICAgIFdlYlBh Z2VQcml2YXRlKiBtX3dlYlBhZ2U7CiAKICAgICBSZWZQdHI8V2ViQ29yZTo6RWxlbWVudD4gbV9j dXJyZW50Rm9jdXNFbGVtZW50OworICAgIFJlZlB0cjxXZWJDb3JlOjpFbGVtZW50PiBtX3ByZXZp b3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQ7CisgICAgUmVmUHRyPFdlYkNvcmU6OkVsZW1lbnQ+IG1f bmV4dEZvY3VzYWJsZVRleHRFbGVtZW50OworCisgICAgYm9vbCBtX2hhc1N1Ym1pdEJ1dHRvbjsK ICAgICBib29sIG1faW5wdXRNb2RlRW5hYmxlZDsKIAogICAgIGJvb2wgbV9wcm9jZXNzaW5nQ2hh bmdlOwotLSAKMS43LjkuNQoK 187587 2013-02-11 08:52:01 -0800 2013-02-11 09:19:24 -0800 Updated patch with better variable naming. 0001-2013-02-08-Mike-Fenton-mifenton-rim.com.patch text/plain 12235 mifenton RnJvbSA1YjBkYWY3NDkyNGNkZTJkZjAwOTc0NGZiNWVkYWUzYTNlYmVjMjBiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog RnJpLCA4IEZlYiAyMDEzIDA5OjMzOjAxIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMy0wMi0w OCAgTWlrZSBGZW50b24gIDxtaWZlbnRvbkByaW0uY29tPgoKICAgICAgICBBZGQgZm9ybSBuYXZp Z2F0aW9uIGNvbnRyb2wgc3RhdGUgdHJhY2tpbmcuCgogICAgICAgICogQXBpL1dlYlBhZ2UuY3Bw OgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjphc3NpZ25Gb2N1 cyk6CiAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQu aDoKICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CiAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKToKICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldElucHV0TW9kZUVuYWJs ZWQpOgogICAgICAgIChXZWJLaXQpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0 SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ bnB1dEhhbmRsZXI6OmZvY3VzUHJldmlvdXNGaWVsZCk6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6SW5wdXRIYW5kbGVyOjpzdWJtaXRGb3JtKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRGb2N1c2VkKToKICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNlbGVjdGlvbkF0U3RhcnRPZkVsZW1lbnQpOgogICAg ICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaDoKICAgICAgICAoSW5wdXRIYW5kbGVy KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OmRpZFNwZWxsQ2hl Y2tXb3JkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwICAg ICAgICAgICB8ICAgMTUgKysrCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aCAgICAgICAgICAgICB8ICAgIDQgKwogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ2xpZW50LmggICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgIHwgICAyMyArKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwICAgICAgfCAgMTA1ICsrKysrKysrKysrKysrKysrKyst CiAuLi4vV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCB8ICAg MTAgKysKIDYgZmlsZXMgY2hhbmdlZCwgMTU3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA3MDlmZTUwLi5i NDk2M2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTI2 MzAsNiArMjYzMCwyMSBAQCB2b2lkIFdlYlBhZ2U6OmFzc2lnbkZvY3VzKFBsYXRmb3JtOjpGb2N1 c0RpcmVjdGlvbiBkaXJlY3Rpb24pCiAgICAgZC0+YXNzaWduRm9jdXMoZGlyZWN0aW9uKTsKIH0K IAordm9pZCBXZWJQYWdlOjpmb2N1c05leHRGaWVsZCgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRs ZXItPmZvY3VzTmV4dEZpZWxkKCk7Cit9CisKK3ZvaWQgV2ViUGFnZTo6Zm9jdXNQcmV2aW91c0Zp ZWxkKCkKK3sKKyAgICBkLT5tX2lucHV0SGFuZGxlci0+Zm9jdXNQcmV2aW91c0ZpZWxkKCk7Cit9 CisKK3ZvaWQgV2ViUGFnZTo6c3VibWl0Rm9ybSgpCit7CisgICAgZC0+bV9pbnB1dEhhbmRsZXIt PnN1Ym1pdEZvcm0oKTsKK30KKwogUGxhdGZvcm06OkludFJlY3QgV2ViUGFnZVByaXZhdGU6OmZv Y3VzTm9kZVJlY3QoKQogewogICAgIEZyYW1lKiBmcmFtZSA9IGZvY3VzZWRPck1haW5GcmFtZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCBiYzIxZTM5Li4yNzg5 Njc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtMjEyLDYgKzIx MiwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldEZvY3VzZWQoYm9vbCk7CiAKKyAgICB2b2lk IGZvY3VzTmV4dEZpZWxkKCk7CisgICAgdm9pZCBmb2N1c1ByZXZpb3VzRmllbGQoKTsKKyAgICB2 b2lkIHN1Ym1pdEZvcm0oKTsKKwogICAgIHZvaWQgY2xlYXJCcm93c2luZ0RhdGEoKTsKICAgICB2 b2lkIGNsZWFySGlzdG9yeSgpOwogICAgIHZvaWQgY2xlYXJDb29raWVzKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCmluZGV4IDZlOWZkNGUuLjFmODNm MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oCkBA IC0xNDcsNiArMTQ3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBpbnB1dFNlbGVjdGlv bkNoYW5nZWQodW5zaWduZWQgc2VsZWN0aW9uU3RhcnQsIHVuc2lnbmVkIHNlbGVjdGlvbkVuZCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBpbnB1dExlYXJuVGV4dCh3Y2hhcl90KiB0ZXh0LCBpbnQg bGVuZ3RoKSA9IDA7CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0Zvcm1Db250cm9scyhib29sIHZp c2libGUsIGJvb2wgcHJldmlvdXNBY3RpdmUgPSBmYWxzZSwgYm9vbCBuZXh0QWN0aXZlID0gZmFs c2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2hvd1ZpcnR1YWxLZXlib2FyZChib29sKSA9IDA7 CiAKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFNwZWxsaW5nQ2hlY2tpbmdPcHRpb25zKGltZl9z cF90ZXh0X3QmLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdCYgZG9jdW1lbnRD YXJldFJlY3QsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRTaXplJiBzY3JlZW5PZmZz ZXQsIGNvbnN0IGJvb2wgc2hvdWxkTW92ZURpYWxvZykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9D aGFuZ2VMb2cKaW5kZXggYTFjNDU2OC4uZmNiZWYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTMtMDItMDggIE1pa2UgRmVudG9uICA8bWlmZW50 b25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQWRkIGZvcm0gbmF2aWdhdGlvbiBj b250cm9sIHN0YXRlIHRyYWNraW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA5MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGZvcm0gbmF2aWdhdGlvbiBjb250cm9sIHN0YXRlIHRyYWNraW5n LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpXZWJQYWdlOjpmb2N1c05leHRGaWVsZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpmb2N1c1ByZXZpb3VzRmllbGQpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpzdWJtaXRGb3JtKToKKyAgICAgICAg KiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ2xpZW50Lmg6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcik6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2V0RWxlbWVudFVuZm9jdXNlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlKToKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAoSW5wdXRIYW5kbGVy KToKKwogMjAxMy0wMi0wNyAgQ2hhcmxlcyBXZWkgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5j b20uY24+CiAKICAgICAgICAgd2VicGFnZSBuZWVkcyBudWxsIGNoZWNrIGluIEJhY2tpbmdTdG9y ZTo6c2V0Q3VycmVudEJhY2tpbmdTdG9yZU93bmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCAwYTM0NGE2 Li5jOWY1NjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKQEAgLTEzMCw2ICsxMzAsOSBAQCBwcml2YXRlOgog SW5wdXRIYW5kbGVyOjpJbnB1dEhhbmRsZXIoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgOiBt X3dlYlBhZ2UocGFnZSkKICAgICAsIG1fY3VycmVudEZvY3VzRWxlbWVudCgwKQorICAgICwgbV9w cmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50KDApCisgICAgLCBtX25leHRGb2N1c2FibGVUZXh0 RWxlbWVudCgwKQorICAgICwgbV9oYXNTdWJtaXRCdXR0b24oZmFsc2UpCiAgICAgLCBtX2lucHV0 TW9kZUVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3Byb2Nlc3NpbmdDaGFuZ2UoZmFsc2UpCiAgICAg LCBtX3Nob3VsZEVuc3VyZUZvY3VzVGV4dEVsZW1lbnRWaXNpYmxlT25TZWxlY3Rpb25DaGFuZ2Vk KGZhbHNlKQpAQCAtMTM5LDYgKzE0Miw3IEBAIElucHV0SGFuZGxlcjo6SW5wdXRIYW5kbGVyKFdl YlBhZ2VQcml2YXRlKiBwYWdlKQogICAgICwgbV9jb21wb3NpbmdUZXh0RW5kKDApCiAgICAgLCBt X3BlbmRpbmdLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoTm9DaGFuZ2UpCiAgICAgLCBtX2RlbGF5 S2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKGZhbHNlKQorICAgICwgbV9zZW5kRm9ybVN0YXRlT25O ZXh0S2V5Ym9hcmRSZXF1ZXN0KGZhbHNlKQogICAgICwgbV9yZXF1ZXN0KDApCiAgICAgLCBtX3By b2Nlc3NpbmdUcmFuc2FjdGlvbklkKC0xKQogICAgICwgbV9zaG91bGROb3RpZnlXZWJWaWV3KHRy dWUpCkBAIC04NTcsOCArODYxLDEwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5m b2N1c2VkKGJvb2wgcmVmb2N1c09jY3VyaW5nKQogICAgICAgICBmaW5pc2hDb21wb3NpdGlvbigp OwogCiAgICAgICAgIC8vIE9ubHkgaGlkZSB0aGUga2V5Ym9hcmQgaWYgd2UgYXJlbid0IHJlZm9j dXNpbmcgb24gYSBuZXcgaW5wdXQgZmllbGQuCi0gICAgICAgIGlmICghcmVmb2N1c09jY3VyaW5n KQorICAgICAgICBpZiAoIXJlZm9jdXNPY2N1cmluZykgewogICAgICAgICAgICAgbm90aWZ5Q2xp ZW50T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UsIHRydWUgLyogdHJpZ2dlcmVkQnlG b2N1c0NoYW5nZSAqLyk7CisgICAgICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50LT5zaG93Rm9y bUNvbnRyb2xzKGZhbHNlIC8qIHZpc2libGUgKi8pOworICAgICAgICB9CiAKICAgICAgICAgbV93 ZWJQYWdlLT5tX2NsaWVudC0+aW5wdXRGb2N1c0xvc3QoKTsKIApAQCAtODc3LDYgKzg4Myw5IEBA IHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50VW5mb2N1c2VkKGJvb2wgcmVmb2N1c09jY3Vy aW5nKQogICAgIC8vIENsZWFyIHRoZSBub2RlIGRldGFpbHMuCiAgICAgbV9jdXJyZW50Rm9jdXNF bGVtZW50ID0gMDsKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUeXBlID0gVGV4dEVkaXQ7Cisg ICAgbV9wcmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX25leHRGb2N1c2Fi bGVUZXh0RWxlbWVudCA9IDA7CisgICAgbV9oYXNTdWJtaXRCdXR0b24gPSBmYWxzZTsKIH0KIAog Ym9vbCBJbnB1dEhhbmRsZXI6OmlzSW5wdXRNb2RlRW5hYmxlZCgpIGNvbnN0CkBAIC04OTksNiAr OTA4LDkwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkKGJvb2wgYWN0 aXZlKQogICAgICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCkt PnNlbGVjdGlvbigpLT5zZXRGb2N1c2VkKHRydWUpOwogfQogCit2b2lkIElucHV0SGFuZGxlcjo6 dXBkYXRlRm9ybVN0YXRlKCkKK3sKKyAgICBtX3ByZXZpb3VzRm9jdXNhYmxlVGV4dEVsZW1lbnQg PSAwOworICAgIG1fbmV4dEZvY3VzYWJsZVRleHRFbGVtZW50ID0gMDsKKyAgICBtX2hhc1N1Ym1p dEJ1dHRvbiA9IGZhbHNlOworCisgICAgaWYgKCFtX2N1cnJlbnRGb2N1c0VsZW1lbnQgfHwgIW1f Y3VycmVudEZvY3VzRWxlbWVudC0+aXNGb3JtQ29udHJvbEVsZW1lbnQoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgSFRNTEZvcm1FbGVtZW50KiBmb3JtRWxlbWVudCA9IHN0YXRpY19jYXN0PEhU TUxGb3JtQ29udHJvbEVsZW1lbnQqPihtX2N1cnJlbnRGb2N1c0VsZW1lbnQuZ2V0KCkpLT5mb3Jt KCk7CisgICAgaWYgKCFmb3JtRWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29uc3Qg VmVjdG9yPEZvcm1Bc3NvY2lhdGVkRWxlbWVudCo+IGZvcm1FbGVtZW50TGlzdCA9IGZvcm1FbGVt ZW50LT5hc3NvY2lhdGVkRWxlbWVudHMoKTsKKyAgICBpbnQgZm9ybUVsZW1lbnRDb3VudCA9IGZv cm1FbGVtZW50TGlzdC5zaXplKCk7CisgICAgaWYgKGZvcm1FbGVtZW50Q291bnQgPCAyKQorICAg ICAgICByZXR1cm47CisKKyAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjp1cGRhdGVGb3JtU3RhdGUgZm9ybSBoYXMgJWQgZmllbGRzIiwgZm9ybUVsZW1l bnRDb3VudCk7CisKKyAgICBtX2hhc1N1Ym1pdEJ1dHRvbiA9IHRydWU7CisgICAgZm9yIChpbnQg Zm9jdXNFbGVtZW50SWQgPSAwOyBmb2N1c0VsZW1lbnRJZCA8IGZvcm1FbGVtZW50Q291bnQ7IGZv Y3VzRWxlbWVudElkKyspIHsKKyAgICAgICAgaWYgKHRvSFRNTEVsZW1lbnQoZm9ybUVsZW1lbnRM aXN0W2ZvY3VzRWxlbWVudElkXSkgIT0gbV9jdXJyZW50Rm9jdXNFbGVtZW50KQorICAgICAgICAg ICAgY29udGludWU7CisKKyAgICAgICAgLy8gRm91bmQgdGhlIGZvY3VzZWQgZWxlbWVudCwgZ2V0 IHRoZSBuZXh0IGFuZCBwcmV2aW91cyBlbGVtZW50cyBpZiB0aGV5IGV4aXN0LgorCisgICAgICAg IC8vIFByZXZpb3VzCisgICAgICAgIGZvciAoaW50IHByZXZpb3VzRWxlbWVudElkID0gZm9jdXNF bGVtZW50SWQgLSAxOyBwcmV2aW91c0VsZW1lbnRJZCA+PSAwOyBwcmV2aW91c0VsZW1lbnRJZC0t KSB7CisgICAgICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gY29uc3RfY2FzdDxIVE1MRWxlbWVu dCo+KHRvSFRNTEVsZW1lbnQoZm9ybUVsZW1lbnRMaXN0W3ByZXZpb3VzRWxlbWVudElkXSkpOwor ICAgICAgICAgICAgaWYgKERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxl bWVudChlbGVtZW50KSkgeworICAgICAgICAgICAgICAgIG1fcHJldmlvdXNGb2N1c2FibGVUZXh0 RWxlbWVudCA9IGVsZW1lbnQ7CisgICAgICAgICAgICAgICAgSW5wdXRMb2coUGxhdGZvcm06Okxv Z0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlIGZvdW5kIHByZXZpb3Vz IGVsZW1lbnQiKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgICAgICAvLyBOZXh0CisgICAgICAgIGZvciAoaW50IG5leHRFbGVtZW50SWQgPSBm b2N1c0VsZW1lbnRJZCArIDE7IG5leHRFbGVtZW50SWQgPCBmb3JtRWxlbWVudENvdW50OyBuZXh0 RWxlbWVudElkKyspIHsKKyAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBjb25zdF9jYXN0 PEhUTUxFbGVtZW50Kj4odG9IVE1MRWxlbWVudChmb3JtRWxlbWVudExpc3RbbmV4dEVsZW1lbnRJ ZF0pKTsKKyAgICAgICAgICAgIGlmIChET01TdXBwb3J0Ojppc1RleHRCYXNlZENvbnRlbnRFZGl0 YWJsZUVsZW1lbnQoZWxlbWVudCkpIHsKKyAgICAgICAgICAgICAgICBtX25leHRGb2N1c2FibGVU ZXh0RWxlbWVudCA9IGVsZW1lbnQ7CisgICAgICAgICAgICAgICAgSW5wdXRMb2coUGxhdGZvcm06 OkxvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6dXBkYXRlRm9ybVN0YXRlIGZvdW5kIG5leHQg ZWxlbWVudCIpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAg ICB9CisgICAgfQorCisgICAgaWYgKCFtX25leHRGb2N1c2FibGVUZXh0RWxlbWVudCAmJiAhbV9w cmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50KSB7CisgICAgICAgIG1faGFzU3VibWl0QnV0dG9u ID0gZmFsc2U7CisgICAgICAgIElucHV0TG9nKFBsYXRmb3JtOjpMb2dMZXZlbEluZm8sICJJbnB1 dEhhbmRsZXI6OnVwZGF0ZUZvcm1TdGF0ZSBubyB2YWxpZCBlbGVtZW50cyBmb3VuZCwgY2xlYXJp bmcgc3RhdGUuIik7Cit9CisKK3ZvaWQgSW5wdXRIYW5kbGVyOjpmb2N1c05leHRGaWVsZCgpCit7 CisgICAgaWYgKCFtX25leHRGb2N1c2FibGVUZXh0RWxlbWVudCkKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9uZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQtPmZvY3VzKCk7Cit9CisKK3ZvaWQgSW5w dXRIYW5kbGVyOjpmb2N1c1ByZXZpb3VzRmllbGQoKQoreworICAgIGlmICghbV9wcmV2aW91c0Zv Y3VzYWJsZVRleHRFbGVtZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX3ByZXZpb3VzRm9j dXNhYmxlVGV4dEVsZW1lbnQtPmZvY3VzKCk7Cit9CisKK3ZvaWQgSW5wdXRIYW5kbGVyOjpzdWJt aXRGb3JtKCkKK3sKKyAgICBpZiAoIW1faGFzU3VibWl0QnV0dG9uKQorICAgICAgICByZXR1cm47 CisKKyAgICBIVE1MRm9ybUVsZW1lbnQqIGZvcm1FbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEZv cm1Db250cm9sRWxlbWVudCo+KG1fY3VycmVudEZvY3VzRWxlbWVudC5nZXQoKSktPmZvcm0oKTsK KyAgICBpZiAoIWZvcm1FbGVtZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBJbnB1dExvZyhQ bGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzdWJtaXRGb3JtIHRyaWdnZXJl ZCIpOworICAgIGlmIChlbGVtZW50VHlwZShtX2N1cnJlbnRGb2N1c0VsZW1lbnQuZ2V0KCkpID09 IElucHV0VHlwZVRleHRBcmVhKQorICAgICAgICBmb3JtRWxlbWVudC0+c3VibWl0KCk7CisgICAg ZWxzZQorICAgICAgICBoYW5kbGVLZXlib2FyZElucHV0KFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50 KEtFWUNPREVfUkVUVVJOLCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5Q2hhciwgMCksIGZh bHNlIC8qIGNoYW5nZUlzUGFydE9mQ29tcG9zaXRpb24gKi8pOworfQorCiBzdGF0aWMgdm9pZCBh ZGRJbnB1dFN0eWxlTWFza0ZvcktleWJvYXJkVHlwZShpbnQ2NF90JiBpbnB1dE1hc2ssIFZpcnR1 YWxLZXlib2FyZFR5cGUga2V5Ym9hcmRUeXBlKQogewogICAgIHN3aXRjaCAoa2V5Ym9hcmRUeXBl KSB7CkBAIC05NTIsNiArMTA0NSwxMiBAQCB2b2lkIElucHV0SGFuZGxlcjo6c2V0RWxlbWVudEZv Y3VzZWQoRWxlbWVudCogZWxlbWVudCkKICAgICAvLyBNYXJrIHRoaXMgZWxlbWVudCBhcyBhY3Rp dmUgYW5kIGFkZCB0byBmcmFtZSBzZXQuCiAgICAgbV9jdXJyZW50Rm9jdXNFbGVtZW50ID0gZWxl bWVudDsKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUeXBlID0gVGV4dEVkaXQ7CisgICAgdXBk YXRlRm9ybVN0YXRlKCk7CisKKyAgICBpZiAoaXNJbnB1dE1vZGVFbmFibGVkKCkgJiYgIW1fZGVs YXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UpCisgICAgICAgIG1fd2ViUGFnZS0+bV9jbGllbnQt PnNob3dGb3JtQ29udHJvbHMobV9oYXNTdWJtaXRCdXR0b24gLyogdmlzaWJsZSAqLywgbV9wcmV2 aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50LCBtX25leHRGb2N1c2FibGVUZXh0RWxlbWVudCk7Cisg ICAgZWxzZQorICAgICAgICBtX3NlbmRGb3JtU3RhdGVPbk5leHRLZXlib2FyZFJlcXVlc3QgPSB0 cnVlOwogCiAgICAgLy8gU2VuZCBkZXRhaWxzIHRvIHRoZSBjbGllbnQgYWJvdXQgdGhpcyBlbGVt ZW50LgogICAgIEJsYWNrQmVycnlJbnB1dFR5cGUgdHlwZSA9IGVsZW1lbnRUeXBlKGVsZW1lbnQp OwpAQCAtMTM5MCw2ICsxNDg5LDEwIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpub3RpZnlDbGllbnRP ZktleWJvYXJkVmlzaWJpbGl0eUNoYW5nZShib29sIHZpc2libGUsIGJvb2wgdHJpCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmICghbV9kZWxheUtleWJvYXJkVmlzaWJpbGl0eUNoYW5nZSkgewor ICAgICAgICBpZiAobV9zZW5kRm9ybVN0YXRlT25OZXh0S2V5Ym9hcmRSZXF1ZXN0KSB7CisgICAg ICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50LT5zaG93Rm9ybUNvbnRyb2xzKG1faGFzU3VibWl0 QnV0dG9uIC8qIHZpc2libGUgKi8sIG1fcHJldmlvdXNGb2N1c2FibGVUZXh0RWxlbWVudCwgbV9u ZXh0Rm9jdXNhYmxlVGV4dEVsZW1lbnQpOworICAgICAgICAgICAgbV9zZW5kRm9ybVN0YXRlT25O ZXh0S2V5Ym9hcmRSZXF1ZXN0ID0gZmFsc2U7CisgICAgICAgIH0KICAgICAgICAgbV93ZWJQYWdl LT5zaG93VmlydHVhbEtleWJvYXJkKHZpc2libGUpOwogICAgICAgICByZXR1cm47CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuaAppbmRleCA3OWM1MWUyLi40NjFkNDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaApAQCAtOTcsNiArOTcs MTAgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRJbnB1dFZhbHVlKGNvbnN0IFdURjo6U3RyaW5n Jik7CiAKKyAgICB2b2lkIGZvY3VzTmV4dEZpZWxkKCk7CisgICAgdm9pZCBmb2N1c1ByZXZpb3Vz RmllbGQoKTsKKyAgICB2b2lkIHN1Ym1pdEZvcm0oKTsKKwogICAgIHZvaWQgc2V0RGVsYXlLZXli b2FyZFZpc2liaWxpdHlDaGFuZ2UoYm9vbCB2YWx1ZSk7CiAgICAgdm9pZCBwcm9jZXNzUGVuZGlu Z0tleWJvYXJkVmlzaWJpbGl0eUNoYW5nZSgpOwogCkBAIC0yMTUsMTEgKzIxOSwxNyBAQCBwcml2 YXRlOgogICAgIGJvb2wgc2hvdWxkU3BlbGxDaGVja0VsZW1lbnQoY29uc3QgV2ViQ29yZTo6RWxl bWVudCopIGNvbnN0OwogICAgIGJvb2wgZGlkU3BlbGxDaGVja1dvcmQoKSBjb25zdCB7IHJldHVy biBtX2RpZFNwZWxsQ2hlY2tXb3JkOyB9CiAKKyAgICB2b2lkIHVwZGF0ZUZvcm1TdGF0ZSgpOwor CiAgICAgYm9vbCBzaG91bGROb3RpZnlXZWJWaWV3KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2 ZW50Jik7CiAKICAgICBXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlOwogCiAgICAgUmVmUHRyPFdl YkNvcmU6OkVsZW1lbnQ+IG1fY3VycmVudEZvY3VzRWxlbWVudDsKKyAgICBSZWZQdHI8V2ViQ29y ZTo6RWxlbWVudD4gbV9wcmV2aW91c0ZvY3VzYWJsZVRleHRFbGVtZW50OworICAgIFJlZlB0cjxX ZWJDb3JlOjpFbGVtZW50PiBtX25leHRGb2N1c2FibGVUZXh0RWxlbWVudDsKKworICAgIGJvb2wg bV9oYXNTdWJtaXRCdXR0b247CiAgICAgYm9vbCBtX2lucHV0TW9kZUVuYWJsZWQ7CiAKICAgICBi b29sIG1fcHJvY2Vzc2luZ0NoYW5nZTsKLS0gCjEuNy45LjUKCg==