196164 2019-03-22 16:18:15 -0700 Animated keyboard scrolling is extremely chaotic 2019-03-25 13:55:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin commit-queue dino simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1520517 0 thorton 2019-03-22 16:18:15 -0700 Animated keyboard scrolling is extremely chaotic 1520518 1 365773 thorton 2019-03-22 16:18:28 -0700 Created attachment 365773 Patch 1520519 2 thorton 2019-03-22 16:18:30 -0700 <rdar://problem/48702444> 1520544 3 365773 thorton 2019-03-22 17:22:14 -0700 Comment on attachment 365773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365773&action=review > Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm:360 > + WTFLogAlways("THORTON STOP"); Obviously without this 🙃 1520799 4 365773 simon.fraser 2019-03-24 23:33:48 -0700 Comment on attachment 365773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365773&action=review > Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h:65 > +- (BOOL)hasScrollingKeyPressed; I don't like this term. It's no clear if it means "scrolling key is currently depressed", or "scrolling key was pressed sometime in the past". 1520802 5 thorton 2019-03-24 23:48:07 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 365773 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=365773&action=review > > > Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h:65 > > +- (BOOL)hasScrollingKeyPressed; > > I don't like this term. It's no clear if it means "scrolling key is > currently depressed", or "scrolling key was pressed sometime in the past". As you might be able to tell from the renaming in this patch, I'm having the same fight with myself :D I'll try a third name. 1520969 6 365889 thorton 2019-03-25 13:09:56 -0700 Created attachment 365889 Patch 1520971 7 365889 simon.fraser 2019-03-25 13:18:12 -0700 Comment on attachment 365889 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365889&action=review > Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h:65 > +- (BOOL)hasScrollingKeyDown; scrollTriggeringKeyIsPressed / scrollTriggeringKeyIsDown? 1520972 8 365890 thorton 2019-03-25 13:20:50 -0700 Created attachment 365890 Patch 1520994 9 365890 commit-queue 2019-03-25 13:55:38 -0700 Comment on attachment 365890 Patch Clearing flags on attachment: 365890 Committed r243454: <https://trac.webkit.org/changeset/243454> 1520995 10 commit-queue 2019-03-25 13:55:40 -0700 All reviewed patches have been landed. Closing bug. 365773 2019-03-22 16:18:28 -0700 2019-03-25 13:09:55 -0700 Patch bug-196164-20190322161828.patch text/plain 5537 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZhYjhhNTg2NmEwY2UwNDEz ZWJjNGMxODkyMDc1MDdlNGJiOWRlNjQuLmJhMGY4NjU2ZWJiNDdmM2VmMzVjMmQ2NDYyNjg1MzY4 ODRjNjE3OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDMtMjIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQW5pbWF0ZWQga2V5Ym9h cmQgc2Nyb2xsaW5nIGlzIGV4dHJlbWVseSBjaGFvdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYxNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzAyNDQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX2ludGVycHJldEtleUV2ZW50OmlzQ2hhckV2ZW50Ol0pOgorICAg ICAgICBDb25zdW1lIGtleWJvYXJkIGV2ZW50cyBpbnN0ZWFkIG9mIGludGVycHJldGluZyB0aGVt IHRyYWRpdGlvbmFsbHkKKyAgICAgICAgaWYgV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGlz IGFuaW1hdGluZy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGlu Z0FuaW1hdG9yLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5n QW5pbWF0b3IubW06CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBiZWdp bldpdGhFdmVudDpdKToKKyAgICAgICAgKC1bV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGhh bmRsZUtleUV2ZW50Ol0pOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Ig c3RvcEFuaW1hdGVkU2Nyb2xsXSk6CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmlt YXRvciBoYXNTY3JvbGxpbmdLZXlQcmVzc2VkXSk6CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3Jv bGxpbmdBbmltYXRvciBkaXNwbGF5TGlua0ZpcmVkOl0pOgorICAgICAgICAoLVtXS0tleWJvYXJk U2Nyb2xsVmlld0FuaW1hdG9yIGhhc1Njcm9sbGluZ0tleVByZXNzZWRdKToKKyAgICAgICAgRXhw b3NlIHRoZSBjdXJyZW50IHN0YXRlIG9mIGludGVyYWN0aXZlIHNjcm9sbGluZywgYW5kIHJlbmFt ZSB0aGUgcmVsYXRlZCBtZW1iZXIuCisKIDIwMTktMDMtMjIgIEtlaXRoIFJvbGxpbiAgPGtyb2xs aW5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBUaGluTFRPIHN1cHBvcnQgaW4gUHJvZHVj dGlvbiBidWlsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDU0NmI0NDE2YTY2ODFmMzE1NWQ4YTA2Njc3 OGQ3OWFhZjVkZTY1ZjcuLmNjOTY4MGMzNWMzNWI1N2ViNDFjNTBkNGE2MWQyYjdhMzBiZmViMjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDQ0OSw3ICs0NDQ5LDcgQEAgLSAoQk9PTClfaW50ZXJwcmV0 S2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudCBpc0NoYXJFdmVudDooQk9PTClpc0NoYXJFdmVu dAogICAgIGlmICghY29udGVudEVkaXRhYmxlICYmIGV2ZW50LmlzVGFiS2V5KQogICAgICAgICBy ZXR1cm4gTk87CiAKLSAgICBpZiAoW19rZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGJlZ2luV2l0 aEV2ZW50OmV2ZW50XSkKKyAgICBpZiAoW19rZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGJlZ2lu V2l0aEV2ZW50OmV2ZW50XSB8fCBbX2tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IgaGFzU2Nyb2xs aW5nS2V5UHJlc3NlZF0pCiAgICAgICAgIHJldHVybiBZRVM7CiAKICAgICBVSUtleWJvYXJkSW1w bCAqa2V5Ym9hcmQgPSBbVUlLZXlib2FyZEltcGwgc2hhcmVkSW5zdGFuY2VdOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRv ci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmlt YXRvci5oCmluZGV4IGM3YjMwNDE0Mjc2ZTUyZWIyYWUzNzViOWUxMjUwOTViYjhhMGRkMjIuLmQx MGQ2YmU1MzBiYWViODAzNWZlYTVlNzI0ODNlNzVmYmY3NWIyNjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9y LmgKQEAgLTYyLDYgKzYyLDggQEAgZW51bSBjbGFzcyBTY3JvbGxpbmdEaXJlY3Rpb24gOiB1aW50 OF90IHsKIC0gKEJPT0wpYmVnaW5XaXRoRXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudDsKIC0gKHZv aWQpaGFuZGxlS2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudDsKIAorLSAoQk9PTCloYXNTY3Jv bGxpbmdLZXlQcmVzc2VkOworCiBAcHJvcGVydHkgKG5vbmF0b21pYywgd2VhaykgaWQgPFdLS2V5 Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3JEZWxlZ2F0ZT4gZGVsZWdhdGU7CiAKIEBlbmQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5p bWF0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGlu Z0FuaW1hdG9yLm1tCmluZGV4IGQ4N2U2NWRjNjVjNzQwNzU0NzYyNDE1NmQwZTgxN2VhOTBiYTU0 YjkuLjIwMTVlNjI4ODk3Mjg1MGM3Y2RhNWViNDhmZjMyZWJhNWI5NmI2ZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Iu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdB bmltYXRvci5tbQpAQCAtOTksNyArOTksNyBAQCBAaW1wbGVtZW50YXRpb24gV0tLZXlib2FyZFNj cm9sbGluZ0FuaW1hdG9yIHsKIAogICAgIE9wdGlvbmFsPFdlYktpdDo6S2V5Ym9hcmRTY3JvbGw+ IF9jdXJyZW50U2Nyb2xsOwogCi0gICAgQk9PTCBfaGFzUHJlc3NlZFNjcm9sbGluZ0tleTsKKyAg ICBCT09MIF9oYXNTY3JvbGxpbmdLZXlQcmVzc2VkOwogCiAgICAgV2ViQ29yZTo6RmxvYXRTaXpl IF92ZWxvY2l0eTsgLy8gUG9pbnRzIHBlciBzZWNvbmQuCiAKQEAgLTI5NSwxMyArMjk1LDEzIEBA IC0gKEJPT0wpYmVnaW5XaXRoRXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudAogICAgIGlmICghc2Ny b2xsKQogICAgICAgICByZXR1cm4gTk87CiAKLSAgICBpZiAoX2hhc1ByZXNzZWRTY3JvbGxpbmdL ZXkpCisgICAgaWYgKF9oYXNTY3JvbGxpbmdLZXlQcmVzc2VkKQogICAgICAgICByZXR1cm4gTk87 CiAKICAgICBpZiAoIVtfc2Nyb2xsYWJsZSBydWJiZXJiYW5kYWJsZURpcmVjdGlvbnNdLmF0KGJv eFNpZGUoc2Nyb2xsLT5kaXJlY3Rpb24pKSkKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgX2hh c1ByZXNzZWRTY3JvbGxpbmdLZXkgPSBZRVM7CisgICAgX2hhc1Njcm9sbGluZ0tleVByZXNzZWQg PSBZRVM7CiAgICAgX2N1cnJlbnRTY3JvbGwgPSBzY3JvbGw7CiAKICNpZiBFTkFCTEUoQU5JTUFU RURfS0VZQk9BUkRfU0NST0xMSU5HKQpAQCAtMzI4LDEzICszMjgsMTMgQEAgLSAoQk9PTCliZWdp bldpdGhFdmVudDooOjpXZWJFdmVudCAqKWV2ZW50CiAKIC0gKHZvaWQpaGFuZGxlS2V5RXZlbnQ6 KDo6V2ViRXZlbnQgKilldmVudAogewotICAgIGlmICghX2hhc1ByZXNzZWRTY3JvbGxpbmdLZXkp CisgICAgaWYgKCFfaGFzU2Nyb2xsaW5nS2V5UHJlc3NlZCkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgYXV0byBzY3JvbGwgPSBbc2VsZiBrZXlib2FyZFNjcm9sbEZvckV2ZW50OmV2ZW50XTsKICAg ICBpZiAoIXNjcm9sbCB8fCBldmVudC50eXBlID09IFdlYkV2ZW50S2V5VXApIHsKICAgICAgICAg W3NlbGYgc3RvcEFuaW1hdGVkU2Nyb2xsXTsKLSAgICAgICAgX2hhc1ByZXNzZWRTY3JvbGxpbmdL ZXkgPSBOTzsKKyAgICAgICAgX2hhc1Njcm9sbGluZ0tleVByZXNzZWQgPSBOTzsKICAgICB9CiB9 CiAKQEAgLTM1Nyw2ICszNTcsNyBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBmYXJ0aGVz dFBvaW50SW5EaXJlY3Rpb24oV2ViQ29yZTo6RmxvYXRQb2ludCBhLCBXZWJDbwogCiAtICh2b2lk KXN0b3BBbmltYXRlZFNjcm9sbAogeworICAgIFdURkxvZ0Fsd2F5cygiVEhPUlRPTiBTVE9QIik7 CiAgICAgaWYgKCFfY3VycmVudFNjcm9sbCkKICAgICAgICAgcmV0dXJuOwogCkBAIC0zODIsNiAr MzgzLDExIEBAIC0gKHZvaWQpc3RvcEFuaW1hdGVkU2Nyb2xsCiAjZW5kaWYKIH0KIAorLSAoQk9P TCloYXNTY3JvbGxpbmdLZXlQcmVzc2VkCit7CisgICAgcmV0dXJuIF9oYXNTY3JvbGxpbmdLZXlQ cmVzc2VkOworfQorCiAtICh2b2lkKXdpbGxTdGFydEludGVyYWN0aXZlU2Nyb2xsCiB7CiAgICAg Ly8gSWYgdGhlIHVzZXIgdG91Y2hlcyB0aGUgc2NyZWVuIHRvIHN0YXJ0IGFuIGludGVyYWN0aXZl IHNjcm9sbCwgc3RvcCBldmVyeXRoaW5nLgpAQCAtNDU4LDcgKzQ2NCw3IEBAIC0gKHZvaWQpZGlz cGxheUxpbmtGaXJlZDooQ0FEaXNwbGF5TGluayAqKXNlbmRlcgogCiAgICAgLy8gSWYgd2UndmUg ZWZmZWN0aXZlbHkgc3RvcHBlZCBzY3JvbGxpbmcsIGFuZCBubyBrZXkgaXMgcHJlc3NlZCwKICAg ICAvLyBzaHV0IGRvd24gdGhlIGRpc3BsYXkgbGluay4KLSAgICBpZiAoIV9oYXNQcmVzc2VkU2Ny b2xsaW5nS2V5ICYmIF92ZWxvY2l0eS5kaWFnb25hbExlbmd0aFNxdWFyZWQoKSA8IDEpIHsKKyAg ICBpZiAoIV9oYXNTY3JvbGxpbmdLZXlQcmVzc2VkICYmIF92ZWxvY2l0eS5kaWFnb25hbExlbmd0 aFNxdWFyZWQoKSA8IDEpIHsKICAgICAgICAgW19zY3JvbGxhYmxlIGRpZEZpbmlzaFNjcm9sbGlu Z107CiAgICAgICAgIFtzZWxmIHN0b3BEaXNwbGF5TGlua107CiAgICAgICAgIF92ZWxvY2l0eSA9 IHsgfTsKQEAgLTU2NCw2ICs1NzAsMTEgQEAgLSAodm9pZCloYW5kbGVLZXlFdmVudDooOjpXZWJF dmVudCAqKWV2ZW50CiAgICAgcmV0dXJuIFtfYW5pbWF0b3IgaGFuZGxlS2V5RXZlbnQ6ZXZlbnRd OwogfQogCistIChCT09MKWhhc1Njcm9sbGluZ0tleVByZXNzZWQKK3sKKyAgICByZXR1cm4gW19h bmltYXRvciBoYXNTY3JvbGxpbmdLZXlQcmVzc2VkXTsKK30KKwogLSAoQk9PTClpc0tleWJvYXJk U2Nyb2xsYWJsZQogewogICAgIGlmICghX2RlbGVnYXRlUmVzcG9uZHNUb0lzS2V5Ym9hcmRTY3Jv bGxhYmxlKQo= 365889 2019-03-25 13:09:56 -0700 2019-03-25 13:20:49 -0700 Patch bug-196164-20190325130956.patch text/plain 5302 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJiNTYwYzRmNzQ0ODdjZWUy MmUyZGJmOTk2YjRiZGU0YjU0NjUwZmUuLmQ3ZjYzZjU3MTY4MDAzZmQ3OTc2NzUyNDY1YjVhY2Qx ODI2OGIwNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDMtMjUgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQW5pbWF0ZWQga2V5Ym9h cmQgc2Nyb2xsaW5nIGlzIGV4dHJlbWVseSBjaGFvdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYxNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzAyNDQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX2ludGVycHJldEtleUV2ZW50OmlzQ2hhckV2ZW50Ol0pOgorICAg ICAgICBDb25zdW1lIGtleWJvYXJkIGV2ZW50cyBpbnN0ZWFkIG9mIGludGVycHJldGluZyB0aGVt IHRyYWRpdGlvbmFsbHkKKyAgICAgICAgaWYgV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGlz IGFuaW1hdGluZy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGlu Z0FuaW1hdG9yLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5n QW5pbWF0b3IubW06CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBiZWdp bldpdGhFdmVudDpdKToKKyAgICAgICAgKC1bV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIGhh bmRsZUtleUV2ZW50Ol0pOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Ig c3RvcEFuaW1hdGVkU2Nyb2xsXSk6CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmlt YXRvciBoYXNTY3JvbGxpbmdLZXlEb3duXSk6CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxp bmdBbmltYXRvciBkaXNwbGF5TGlua0ZpcmVkOl0pOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Ny b2xsVmlld0FuaW1hdG9yIGhhc1Njcm9sbGluZ0tleURvd25dKToKKyAgICAgICAgRXhwb3NlIHRo ZSBjdXJyZW50IHN0YXRlIG9mIGludGVyYWN0aXZlIHNjcm9sbGluZywgYW5kIHJlbmFtZSB0aGUg cmVsYXRlZCBtZW1iZXIuCisKIDIwMTktMDMtMjUgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUu Y29tPgogCiAgICAgICAgIFtBcHBsZSBQYXldIFJlbW92ZSB0aGUgQXZhaWxhYmxlUGF5bWVudE5l dHdvcmtzIHN5bmNocm9ub3VzIG1lc3NhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDU0NmI0NDE2YTY2 ODFmMzE1NWQ4YTA2Njc3OGQ3OWFhZjVkZTY1ZjcuLmViMjkwOWZjZmM3NDgzY2YyNmY3NjFhYzI3 ZDk0YTlhMmEyMmM0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDQ0OSw3ICs0NDQ5LDcgQEAgLSAo Qk9PTClfaW50ZXJwcmV0S2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudCBpc0NoYXJFdmVudDoo Qk9PTClpc0NoYXJFdmVudAogICAgIGlmICghY29udGVudEVkaXRhYmxlICYmIGV2ZW50LmlzVGFi S2V5KQogICAgICAgICByZXR1cm4gTk87CiAKLSAgICBpZiAoW19rZXlib2FyZFNjcm9sbGluZ0Fu aW1hdG9yIGJlZ2luV2l0aEV2ZW50OmV2ZW50XSkKKyAgICBpZiAoW19rZXlib2FyZFNjcm9sbGlu Z0FuaW1hdG9yIGJlZ2luV2l0aEV2ZW50OmV2ZW50XSB8fCBbX2tleWJvYXJkU2Nyb2xsaW5nQW5p bWF0b3IgaGFzU2Nyb2xsaW5nS2V5RG93bl0pCiAgICAgICAgIHJldHVybiBZRVM7CiAKICAgICBV SUtleWJvYXJkSW1wbCAqa2V5Ym9hcmQgPSBbVUlLZXlib2FyZEltcGwgc2hhcmVkSW5zdGFuY2Vd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3Jv bGxpbmdBbmltYXRvci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRT Y3JvbGxpbmdBbmltYXRvci5oCmluZGV4IGM3YjMwNDE0Mjc2ZTUyZWIyYWUzNzViOWUxMjUwOTVi YjhhMGRkMjIuLjI1N2EyNmUwYmZhZjEzMDkyNDEwNmM1NzAzMTQ3MjE1Zjg4ZTI5YjcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5p bWF0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9s bGluZ0FuaW1hdG9yLmgKQEAgLTYyLDYgKzYyLDggQEAgZW51bSBjbGFzcyBTY3JvbGxpbmdEaXJl Y3Rpb24gOiB1aW50OF90IHsKIC0gKEJPT0wpYmVnaW5XaXRoRXZlbnQ6KDo6V2ViRXZlbnQgKill dmVudDsKIC0gKHZvaWQpaGFuZGxlS2V5RXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudDsKIAorLSAo Qk9PTCloYXNTY3JvbGxpbmdLZXlEb3duOworCiBAcHJvcGVydHkgKG5vbmF0b21pYywgd2Vhaykg aWQgPFdLS2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3JEZWxlZ2F0ZT4gZGVsZWdhdGU7CiAKIEBl bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Ny b2xsaW5nQW5pbWF0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2Fy ZFNjcm9sbGluZ0FuaW1hdG9yLm1tCmluZGV4IGQ4N2U2NWRjNjVjNzQwNzU0NzYyNDE1NmQwZTgx N2VhOTBiYTU0YjkuLmRmMzdmNGMwOGYwZTNhMDk3YTc0NDhlZWU3OWNhYzgzNzcxN2NiZGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5n QW5pbWF0b3IubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRT Y3JvbGxpbmdBbmltYXRvci5tbQpAQCAtOTksNyArOTksNyBAQCBAaW1wbGVtZW50YXRpb24gV0tL ZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIHsKIAogICAgIE9wdGlvbmFsPFdlYktpdDo6S2V5Ym9h cmRTY3JvbGw+IF9jdXJyZW50U2Nyb2xsOwogCi0gICAgQk9PTCBfaGFzUHJlc3NlZFNjcm9sbGlu Z0tleTsKKyAgICBCT09MIF9oYXNTY3JvbGxpbmdLZXlEb3duOwogCiAgICAgV2ViQ29yZTo6Rmxv YXRTaXplIF92ZWxvY2l0eTsgLy8gUG9pbnRzIHBlciBzZWNvbmQuCiAKQEAgLTI5NSwxMyArMjk1 LDEzIEBAIC0gKEJPT0wpYmVnaW5XaXRoRXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudAogICAgIGlm ICghc2Nyb2xsKQogICAgICAgICByZXR1cm4gTk87CiAKLSAgICBpZiAoX2hhc1ByZXNzZWRTY3Jv bGxpbmdLZXkpCisgICAgaWYgKF9oYXNTY3JvbGxpbmdLZXlEb3duKQogICAgICAgICByZXR1cm4g Tk87CiAKICAgICBpZiAoIVtfc2Nyb2xsYWJsZSBydWJiZXJiYW5kYWJsZURpcmVjdGlvbnNdLmF0 KGJveFNpZGUoc2Nyb2xsLT5kaXJlY3Rpb24pKSkKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAg X2hhc1ByZXNzZWRTY3JvbGxpbmdLZXkgPSBZRVM7CisgICAgX2hhc1Njcm9sbGluZ0tleURvd24g PSBZRVM7CiAgICAgX2N1cnJlbnRTY3JvbGwgPSBzY3JvbGw7CiAKICNpZiBFTkFCTEUoQU5JTUFU RURfS0VZQk9BUkRfU0NST0xMSU5HKQpAQCAtMzI4LDEzICszMjgsMTMgQEAgLSAoQk9PTCliZWdp bldpdGhFdmVudDooOjpXZWJFdmVudCAqKWV2ZW50CiAKIC0gKHZvaWQpaGFuZGxlS2V5RXZlbnQ6 KDo6V2ViRXZlbnQgKilldmVudAogewotICAgIGlmICghX2hhc1ByZXNzZWRTY3JvbGxpbmdLZXkp CisgICAgaWYgKCFfaGFzU2Nyb2xsaW5nS2V5RG93bikKICAgICAgICAgcmV0dXJuOwogCiAgICAg YXV0byBzY3JvbGwgPSBbc2VsZiBrZXlib2FyZFNjcm9sbEZvckV2ZW50OmV2ZW50XTsKICAgICBp ZiAoIXNjcm9sbCB8fCBldmVudC50eXBlID09IFdlYkV2ZW50S2V5VXApIHsKICAgICAgICAgW3Nl bGYgc3RvcEFuaW1hdGVkU2Nyb2xsXTsKLSAgICAgICAgX2hhc1ByZXNzZWRTY3JvbGxpbmdLZXkg PSBOTzsKKyAgICAgICAgX2hhc1Njcm9sbGluZ0tleURvd24gPSBOTzsKICAgICB9CiB9CiAKQEAg LTM4Miw2ICszODIsMTEgQEAgLSAodm9pZClzdG9wQW5pbWF0ZWRTY3JvbGwKICNlbmRpZgogfQog CistIChCT09MKWhhc1Njcm9sbGluZ0tleURvd24KK3sKKyAgICByZXR1cm4gX2hhc1Njcm9sbGlu Z0tleURvd247Cit9CisKIC0gKHZvaWQpd2lsbFN0YXJ0SW50ZXJhY3RpdmVTY3JvbGwKIHsKICAg ICAvLyBJZiB0aGUgdXNlciB0b3VjaGVzIHRoZSBzY3JlZW4gdG8gc3RhcnQgYW4gaW50ZXJhY3Rp dmUgc2Nyb2xsLCBzdG9wIGV2ZXJ5dGhpbmcuCkBAIC00NTgsNyArNDYzLDcgQEAgLSAodm9pZClk aXNwbGF5TGlua0ZpcmVkOihDQURpc3BsYXlMaW5rICopc2VuZGVyCiAKICAgICAvLyBJZiB3ZSd2 ZSBlZmZlY3RpdmVseSBzdG9wcGVkIHNjcm9sbGluZywgYW5kIG5vIGtleSBpcyBwcmVzc2VkLAog ICAgIC8vIHNodXQgZG93biB0aGUgZGlzcGxheSBsaW5rLgotICAgIGlmICghX2hhc1ByZXNzZWRT Y3JvbGxpbmdLZXkgJiYgX3ZlbG9jaXR5LmRpYWdvbmFsTGVuZ3RoU3F1YXJlZCgpIDwgMSkgewor ICAgIGlmICghX2hhc1Njcm9sbGluZ0tleURvd24gJiYgX3ZlbG9jaXR5LmRpYWdvbmFsTGVuZ3Ro U3F1YXJlZCgpIDwgMSkgewogICAgICAgICBbX3Njcm9sbGFibGUgZGlkRmluaXNoU2Nyb2xsaW5n XTsKICAgICAgICAgW3NlbGYgc3RvcERpc3BsYXlMaW5rXTsKICAgICAgICAgX3ZlbG9jaXR5ID0g eyB9OwpAQCAtNTY0LDYgKzU2OSwxMSBAQCAtICh2b2lkKWhhbmRsZUtleUV2ZW50Oig6OldlYkV2 ZW50ICopZXZlbnQKICAgICByZXR1cm4gW19hbmltYXRvciBoYW5kbGVLZXlFdmVudDpldmVudF07 CiB9CiAKKy0gKEJPT0wpaGFzU2Nyb2xsaW5nS2V5RG93bgoreworICAgIHJldHVybiBbX2FuaW1h dG9yIGhhc1Njcm9sbGluZ0tleURvd25dOworfQorCiAtIChCT09MKWlzS2V5Ym9hcmRTY3JvbGxh YmxlCiB7CiAgICAgaWYgKCFfZGVsZWdhdGVSZXNwb25kc1RvSXNLZXlib2FyZFNjcm9sbGFibGUp Cg== 365890 2019-03-25 13:20:50 -0700 2019-03-25 13:55:38 -0700 Patch bug-196164-20190325132049.patch text/plain 5426 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJiNTYwYzRmNzQ0ODdjZWUy MmUyZGJmOTk2YjRiZGU0YjU0NjUwZmUuLjY2NGVhYmExMjc1YzU4NzE0YTJkYjE3NzUwODY4N2Rk ZDY0Mzg0N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDMtMjUgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQW5pbWF0ZWQga2V5Ym9h cmQgc2Nyb2xsaW5nIGlzIGV4dHJlbWVseSBjaGFvdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYxNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzAyNDQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9pbnRlcnByZXRLZXlFdmVudDppc0NoYXJFdmVudDpdKToKKyAgICAg ICAgQ29uc3VtZSBrZXlib2FyZCBldmVudHMgaW5zdGVhZCBvZiBpbnRlcnByZXRpbmcgdGhlbSB0 cmFkaXRpb25hbGx5CisgICAgICAgIGlmIFdLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBpcyBh bmltYXRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdB bmltYXRvci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0Fu aW1hdG9yLm1tOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IgYmVnaW5X aXRoRXZlbnQ6XSk6CisgICAgICAgICgtW1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBoYW5k bGVLZXlFdmVudDpdKToKKyAgICAgICAgKC1bV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yIHN0 b3BBbmltYXRlZFNjcm9sbF0pOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0 b3Igc2Nyb2xsVHJpZ2dlcmluZ0tleUlzUHJlc3NlZF0pOgorICAgICAgICAoLVtXS0tleWJvYXJk U2Nyb2xsaW5nQW5pbWF0b3IgZGlzcGxheUxpbmtGaXJlZDpdKToKKyAgICAgICAgKC1bV0tLZXli b2FyZFNjcm9sbFZpZXdBbmltYXRvciBzY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVzc2VkXSk6Cisg ICAgICAgIEV4cG9zZSB0aGUgY3VycmVudCBzdGF0ZSBvZiBpbnRlcmFjdGl2ZSBzY3JvbGxpbmcs IGFuZCByZW5hbWUgdGhlIHJlbGF0ZWQgbWVtYmVyLgorCiAyMDE5LTAzLTI1ICBBbmR5IEVzdGVz ICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXBwbGUgUGF5XSBSZW1vdmUgdGhlIEF2 YWlsYWJsZVBheW1lbnROZXR3b3JrcyBzeW5jaHJvbm91cyBtZXNzYWdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpp bmRleCA1NDZiNDQxNmE2NjgxZjMxNTVkOGEwNjY3NzhkNzlhYWY1ZGU2NWY3Li4zNmI1NzI3Njlm YTBmZjc0MzRiY2FmYjhlNTBhYjA2ZTE3ZGNlNGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTQ0NDks NyArNDQ0OSw3IEBAIC0gKEJPT0wpX2ludGVycHJldEtleUV2ZW50Oig6OldlYkV2ZW50ICopZXZl bnQgaXNDaGFyRXZlbnQ6KEJPT0wpaXNDaGFyRXZlbnQKICAgICBpZiAoIWNvbnRlbnRFZGl0YWJs ZSAmJiBldmVudC5pc1RhYktleSkKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgaWYgKFtfa2V5 Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBiZWdpbldpdGhFdmVudDpldmVudF0pCisgICAgaWYgKFtf a2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciBiZWdpbldpdGhFdmVudDpldmVudF0gfHwgW19rZXli b2FyZFNjcm9sbGluZ0FuaW1hdG9yIHNjcm9sbFRyaWdnZXJpbmdLZXlJc1ByZXNzZWRdKQogICAg ICAgICByZXR1cm4gWUVTOwogCiAgICAgVUlLZXlib2FyZEltcGwgKmtleWJvYXJkID0gW1VJS2V5 Ym9hcmRJbXBsIHNoYXJlZEluc3RhbmNlXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuaAppbmRleCBjN2IzMDQx NDI3NmU1MmViMmFlMzc1YjllMTI1MDk1YmI4YTBkZDIyLi4zZmY4M2I2NTVhY2MwZGU3Y2FiODI0 ZTljYTMzNWEyNGUyNzVlMmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5oCkBAIC02Miw2ICs2Miw4IEBA IGVudW0gY2xhc3MgU2Nyb2xsaW5nRGlyZWN0aW9uIDogdWludDhfdCB7CiAtIChCT09MKWJlZ2lu V2l0aEV2ZW50Oig6OldlYkV2ZW50ICopZXZlbnQ7CiAtICh2b2lkKWhhbmRsZUtleUV2ZW50Oig6 OldlYkV2ZW50ICopZXZlbnQ7CiAKKy0gKEJPT0wpc2Nyb2xsVHJpZ2dlcmluZ0tleUlzUHJlc3Nl ZDsKKwogQHByb3BlcnR5IChub25hdG9taWMsIHdlYWspIGlkIDxXS0tleWJvYXJkU2Nyb2xsVmll d0FuaW1hdG9yRGVsZWdhdGU+IGRlbGVnYXRlOwogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5tbQpp bmRleCBkODdlNjVkYzY1Yzc0MDc1NDc2MjQxNTZkMGU4MTdlYTkwYmE1NGI5Li4zZjMwMTk4NmVm NDViZDA0ODIxYTk0ZmI5MjFhYmQ1MjRlN2YyZTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IubW0KQEAg LTk5LDcgKzk5LDcgQEAgQGltcGxlbWVudGF0aW9uIFdLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRv ciB7CiAKICAgICBPcHRpb25hbDxXZWJLaXQ6OktleWJvYXJkU2Nyb2xsPiBfY3VycmVudFNjcm9s bDsKIAotICAgIEJPT0wgX2hhc1ByZXNzZWRTY3JvbGxpbmdLZXk7CisgICAgQk9PTCBfc2Nyb2xs VHJpZ2dlcmluZ0tleUlzUHJlc3NlZDsKIAogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBfdmVsb2Np dHk7IC8vIFBvaW50cyBwZXIgc2Vjb25kLgogCkBAIC0yOTUsMTMgKzI5NSwxMyBAQCAtIChCT09M KWJlZ2luV2l0aEV2ZW50Oig6OldlYkV2ZW50ICopZXZlbnQKICAgICBpZiAoIXNjcm9sbCkKICAg ICAgICAgcmV0dXJuIE5POwogCi0gICAgaWYgKF9oYXNQcmVzc2VkU2Nyb2xsaW5nS2V5KQorICAg IGlmIChfc2Nyb2xsVHJpZ2dlcmluZ0tleUlzUHJlc3NlZCkKICAgICAgICAgcmV0dXJuIE5POwog CiAgICAgaWYgKCFbX3Njcm9sbGFibGUgcnViYmVyYmFuZGFibGVEaXJlY3Rpb25zXS5hdChib3hT aWRlKHNjcm9sbC0+ZGlyZWN0aW9uKSkpCiAgICAgICAgIHJldHVybiBOTzsKIAotICAgIF9oYXNQ cmVzc2VkU2Nyb2xsaW5nS2V5ID0gWUVTOworICAgIF9zY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVz c2VkID0gWUVTOwogICAgIF9jdXJyZW50U2Nyb2xsID0gc2Nyb2xsOwogCiAjaWYgRU5BQkxFKEFO SU1BVEVEX0tFWUJPQVJEX1NDUk9MTElORykKQEAgLTMyOCwxMyArMzI4LDEzIEBAIC0gKEJPT0wp YmVnaW5XaXRoRXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudAogCiAtICh2b2lkKWhhbmRsZUtleUV2 ZW50Oig6OldlYkV2ZW50ICopZXZlbnQKIHsKLSAgICBpZiAoIV9oYXNQcmVzc2VkU2Nyb2xsaW5n S2V5KQorICAgIGlmICghX3Njcm9sbFRyaWdnZXJpbmdLZXlJc1ByZXNzZWQpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGF1dG8gc2Nyb2xsID0gW3NlbGYga2V5Ym9hcmRTY3JvbGxGb3JFdmVudDpl dmVudF07CiAgICAgaWYgKCFzY3JvbGwgfHwgZXZlbnQudHlwZSA9PSBXZWJFdmVudEtleVVwKSB7 CiAgICAgICAgIFtzZWxmIHN0b3BBbmltYXRlZFNjcm9sbF07Ci0gICAgICAgIF9oYXNQcmVzc2Vk U2Nyb2xsaW5nS2V5ID0gTk87CisgICAgICAgIF9zY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVzc2Vk ID0gTk87CiAgICAgfQogfQogCkBAIC0zODIsNiArMzgyLDExIEBAIC0gKHZvaWQpc3RvcEFuaW1h dGVkU2Nyb2xsCiAjZW5kaWYKIH0KIAorLSAoQk9PTClzY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVz c2VkCit7CisgICAgcmV0dXJuIF9zY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVzc2VkOworfQorCiAt ICh2b2lkKXdpbGxTdGFydEludGVyYWN0aXZlU2Nyb2xsCiB7CiAgICAgLy8gSWYgdGhlIHVzZXIg dG91Y2hlcyB0aGUgc2NyZWVuIHRvIHN0YXJ0IGFuIGludGVyYWN0aXZlIHNjcm9sbCwgc3RvcCBl dmVyeXRoaW5nLgpAQCAtNDU4LDcgKzQ2Myw3IEBAIC0gKHZvaWQpZGlzcGxheUxpbmtGaXJlZDoo Q0FEaXNwbGF5TGluayAqKXNlbmRlcgogCiAgICAgLy8gSWYgd2UndmUgZWZmZWN0aXZlbHkgc3Rv cHBlZCBzY3JvbGxpbmcsIGFuZCBubyBrZXkgaXMgcHJlc3NlZCwKICAgICAvLyBzaHV0IGRvd24g dGhlIGRpc3BsYXkgbGluay4KLSAgICBpZiAoIV9oYXNQcmVzc2VkU2Nyb2xsaW5nS2V5ICYmIF92 ZWxvY2l0eS5kaWFnb25hbExlbmd0aFNxdWFyZWQoKSA8IDEpIHsKKyAgICBpZiAoIV9zY3JvbGxU cmlnZ2VyaW5nS2V5SXNQcmVzc2VkICYmIF92ZWxvY2l0eS5kaWFnb25hbExlbmd0aFNxdWFyZWQo KSA8IDEpIHsKICAgICAgICAgW19zY3JvbGxhYmxlIGRpZEZpbmlzaFNjcm9sbGluZ107CiAgICAg ICAgIFtzZWxmIHN0b3BEaXNwbGF5TGlua107CiAgICAgICAgIF92ZWxvY2l0eSA9IHsgfTsKQEAg LTU2NCw2ICs1NjksMTEgQEAgLSAodm9pZCloYW5kbGVLZXlFdmVudDooOjpXZWJFdmVudCAqKWV2 ZW50CiAgICAgcmV0dXJuIFtfYW5pbWF0b3IgaGFuZGxlS2V5RXZlbnQ6ZXZlbnRdOwogfQogCist IChCT09MKXNjcm9sbFRyaWdnZXJpbmdLZXlJc1ByZXNzZWQKK3sKKyAgICByZXR1cm4gW19hbmlt YXRvciBzY3JvbGxUcmlnZ2VyaW5nS2V5SXNQcmVzc2VkXTsKK30KKwogLSAoQk9PTClpc0tleWJv YXJkU2Nyb2xsYWJsZQogewogICAgIGlmICghX2RlbGVnYXRlUmVzcG9uZHNUb0lzS2V5Ym9hcmRT Y3JvbGxhYmxlKQo=