199490 2019-07-03 19:55:40 -0700 Touching media controls sometimes shows software keyboard 2019-07-05 09:22:50 -0700 1 1 1 Unclassified WebKit HTML Editing Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson bdakin commit-queue megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1550168 0 eric.carlson 2019-07-03 19:55:40 -0700 Touching media controls immediately after page load sometimes shows software keyboard. 1550169 1 eric.carlson 2019-07-03 19:55:52 -0700 <rdar://problem/52076270> 1550170 2 373450 eric.carlson 2019-07-03 19:59:49 -0700 Created attachment 373450 Patch 1550269 3 373450 wenson_hsieh 2019-07-04 14:12:00 -0700 Comment on attachment 373450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373450&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:2899 > + if (oldFocusedElement == newFocusedElement && newFocusedElement->isContentEditable()) I got a chance to debug this a bit — a few observations… 1. newFocusedElement in this case is <INPUT id='' type='text' class='active’> when tapping on the media controls. 2. It looks like this change would make the bug go away by preventing the <INPUT id='' type='text' class='active’> from being refocused. This is because the input element itself is not content editable, but rather, is a text form control (which contains an editable area). 1550276 4 373473 wenson_hsieh 2019-07-04 15:41:55 -0700 Created attachment 373473 Patch 1550371 5 eric.carlson 2019-07-05 08:48:13 -0700 Thanks Wenson! 1550393 6 373473 commit-queue 2019-07-05 09:22:49 -0700 Comment on attachment 373473 Patch Clearing flags on attachment: 373473 Committed r247158: <https://trac.webkit.org/changeset/247158> 1550394 7 commit-queue 2019-07-05 09:22:50 -0700 All reviewed patches have been landed. Closing bug. 373450 2019-07-03 19:59:49 -0700 2019-07-04 15:41:54 -0700 Patch bug-199490-20190703195948.patch text/plain 1667 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM5MzllMmEwMWY3NzYwYTIw NWI1OGE5ZmZkNTNmNDhiNmRhY2FhNzQuLjBkNTRjMTFiMzAyYmEyNGQ2ODE0ZDQyMjQ1N2FjOTFl MmVhZjJmZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDctMDMgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVG91Y2hpbmcgbWVkaWEg Y29udHJvbHMgc29tZXRpbWVzIHNob3dzIHNvZnR3YXJlIGtleWJvYXJkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk0OTAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUyMDc2MjcwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpkaXNwYXRjaFRvdWNoRXZlbnQpOiBPbmx5IHJlZm9jdXMgY29udGVu dEVkaXRhYmxlIGVsZW1lbnRzLgorCiAyMDE5LTA3LTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBXZWJTb2NrZXRzOiBhZGQgc3VwcG9ydCBm b3Igc2VuZGluZyBibG9iIG1lc3NhZ2VzIHdoZW4gdXNpbmcgd2ViIHNvY2tldHMgcGxhdGZvcm0g QVBJcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRl eCAzYmNmMGQ3ODVmZmY1MmRhMTdiMTA2ZWJhYzhmNmZkMGRkMmE0YjcyLi40YzM0NDBkZmFmMmEw OWU0NTA2MjhlMThhNWUwYmM1MGZiZjU4OWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjg5Niw3ICsyODk2LDcgQEAgdm9pZCBXZWJQYWdl OjpkaXNwYXRjaFRvdWNoRXZlbnQoY29uc3QgV2ViVG91Y2hFdmVudCYgdG91Y2hFdmVudCwgYm9v bCYgaGFuZGxlZCkKICAgICBpZiAoaGFuZGxlZCAmJiBvbGRGb2N1c2VkRWxlbWVudCkgewogICAg ICAgICBhdXRvIG5ld0ZvY3VzZWRGcmFtZSA9IG1ha2VSZWZQdHIobV9wYWdlLT5mb2N1c0NvbnRy b2xsZXIoKS5mb2N1c2VkRnJhbWUoKSk7CiAgICAgICAgIGF1dG8gbmV3Rm9jdXNlZEVsZW1lbnQg PSBtYWtlUmVmUHRyKG5ld0ZvY3VzZWRGcmFtZSA/IG5ld0ZvY3VzZWRGcmFtZS0+ZG9jdW1lbnQo KS0+Zm9jdXNlZEVsZW1lbnQoKSA6IG51bGxwdHIpOwotICAgICAgICBpZiAob2xkRm9jdXNlZEVs ZW1lbnQgPT0gbmV3Rm9jdXNlZEVsZW1lbnQpCisgICAgICAgIGlmIChvbGRGb2N1c2VkRWxlbWVu dCA9PSBuZXdGb2N1c2VkRWxlbWVudCAmJiBuZXdGb2N1c2VkRWxlbWVudC0+aXNDb250ZW50RWRp dGFibGUoKSkKICAgICAgICAgICAgIGVsZW1lbnREaWRSZWZvY3VzKCpuZXdGb2N1c2VkRWxlbWVu dCk7CiAgICAgfQogfQo= 373473 2019-07-04 15:41:55 -0700 2019-07-05 09:22:49 -0700 Patch bug-199490-20190704154154.patch text/plain 19646 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY5NGVkZWZjNzNkNTc1YTFj NzRkZmIzM2IxNzBkNzFiMGEyZGI5NzEuLmE3M2MwN2Y4ZmQ1OWU2N2M0NDViZjNhMmE0NGM1MmI1 M2M5M2Y5MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTktMDctMDQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgVG91Y2hpbmcgbWVkaWEg Y29udHJvbHMgc29tZXRpbWVzIHNob3dzIHNvZnR3YXJlIGtleWJvYXJkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk0OTAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUyMDc2MjcwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEluIHIyNDMwNDQsIHdlIGFkZGVkIGEgY29tcGF0aWJpbGl0eSBoYWNrIGZv ciBHb29nbGUgU2xpZGVzIChhbmQgb3RoZXIgRy1zdWl0ZSBwcm9wZXJ0aWVzKSB0byBhbGxvdyB0 aGUgb24tCisgICAgICAgIHNjcmVlbiBrZXlib2FyZCB0byBzaG93IHVwIGFmdGVyIGEgcHJldmVu dGVkIHRvdWNoIGV2ZW50IGluIHRoZSBjYXNlIHdoZXJlIGFuIGVsZW1lbnQgd2FzIGFscmVhZHkg Zm9jdXNlZCwgZXZlbgorICAgICAgICBpZiB0aGUgdG91Y2ggZXZlbnQgaGFuZGxlciBkb2Vzbid0 IGV4cGxpY2l0bHkgcmVmb2N1cyB0aGUgZWxlbWVudC4gSG93ZXZlciwgdGhpcyBtZWFucyB0aGF0 IGlmIGEgcmVndWxhciB0ZXh0CisgICAgICAgIGZpZWxkIChvciBvdGhlciBmb3JtIGNvbnRyb2wp IGhhcyBiZWVuIHByb2dyYW1tYXRpY2FsbHkgZm9jdXNlZCwgdGhlbiBpbnRlcmFjdGluZyB3aXRo IGFueSBvdGhlciBlbGVtZW50IHRoYXQKKyAgICAgICAgcHJldmVudHMgZGVmYXVsdCBvbiB0b3Vj aHN0YXJ0IHdpbGwgY2F1c2UgdXMgdG8gc2hvdyB0aGUga2V5Ym9hcmQgZm9yIHRoYXQgZm9jdXNl ZCBlbGVtZW50LgorCisgICAgICAgIFRvIG1pdGlnYXRlIHRoaXMsIG9ubHkgZmFsbCBkb3duIHRo aXMgcmVmb2N1c2luZyBjb2RlcGF0aCBpbiB0aGUgY2FzZSB3aGVyZSB0aGUgZm9jdXNlZCBlbGVt ZW50IGlzIGEgaGlkZGVuCisgICAgICAgIGVkaXRhYmxlIGVsZW1lbnQgKGluIHRoZSBzdHlsZSBv ZiBtYW55IEdvb2dsZSBwcm9kdWN0aXZpdHkgd2ViIGFwcHMpLiBGb3Igbm9uLWhpZGRlbiBlZGl0 YWJsZSBlbGVtZW50cyB0aGF0IGFyZQorICAgICAgICBhbHJlYWR5IGZvY3VzZWQsIHRoaXMgcmVm b2N1c2luZyBsb2dpYyBpcyBub3QgbmVjZXNzYXJ5LCBzaW5jZSB0aGUgdXNlciBzaG91bGQgYmUg YWJsZSB0byBpbnRlcmFjdCB3aXRoIHRoZQorICAgICAgICBjb250cm9sIHRvIHNob3cgdGhlIGtl eWJvYXJkIGFueXdheXM7IGZvciBoaWRkZW4gZWRpdGFibGUgYXJlYXMsIHRoaXMgY29tcGF0aWJp bGl0eSBoYWNrIGlzIGFjdHVhbGx5IG5lZWRlZCwKKyAgICAgICAgc2luY2UgdGhlcmUgaXMgdHlw aWNhbGx5IG5vIG90aGVyIHdheSBmb3IgYSB1c2VyIHRvIGZvY3VzIHRoZXNlIGVsZW1lbnRzIGFu ZCBzaG93IGFuIG9uLXNjcmVlbiBrZXlib2FyZC4KKworICAgICAgICBUZXN0czogIGZhc3QvZXZl bnRzL3RvdWNoL2lvcy9zaG93LWtleWJvYXJkLWFmdGVyLXByZXZlbnRpbmctdG91Y2hzdGFydC5o dG1sCisgICAgICAgICAgICAgICAgZmFzdC9ldmVudHMvdG91Y2gvaW9zL2RvLW5vdC1zaG93LWtl eWJvYXJkLWFmdGVyLXByZXZlbnRpbmctdG91Y2hzdGFydC5odG1sCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRp c3BhdGNoVG91Y2hFdmVudCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmlzVHJhbnNwYXJlbnRPckZ1bGx5Q2xpcHBlZCBjb25zdCk6 CisKKyAgICAgICAgUmVuYW1lZCBmcm9tIGVuY2xvc2luZ0xheWVySXNUcmFuc3BhcmVudE9yRnVs bHlDbGlwcGVkLCBhbmQgcHVsbGVkIG91dCBpbnRvIGEgcHJpdmF0ZSBoZWxwZXIgbWV0aG9kLgor CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBsYXRmb3JtRWRpdG9yU3RhdGUgY29uc3QpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXF1ZXN0RXZhc2lvblJlY3RzQWJvdmVTZWxlY3Rp b24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6ZW5jbG9zaW5nTGF5ZXJJc1RyYW5zcGFyZW50T3JGdWxs eUNsaXBwZWQpOiBEZWxldGVkLgorCiAyMDE5LTA3LTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25f aHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIENsaWNrIGV2ZW50cyBvbiBvdXRlciBwYWdlIGFy ZSBub3QgYmVpbmcgZGlzcGF0Y2hlZCBjb3JyZWN0bHkgYWZ0ZXIgdG91Y2gtem9vbWluZyB3aXRo aW4gYW4gaWZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCmluZGV4IDNhNzNlYjgyN2I5M2Q0OGI1NDRiYzg2NDRhMzE5Yjk3OTNmNWUwYTEuLmE1YzZm NGFiYmMwMTQ5NTAyNzQ1N2JjZmFkZjE0N2E3NGE3MmRkYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0yODk2LDcgKzI4OTYsNyBAQCB2b2lk IFdlYlBhZ2U6OmRpc3BhdGNoVG91Y2hFdmVudChjb25zdCBXZWJUb3VjaEV2ZW50JiB0b3VjaEV2 ZW50LCBib29sJiBoYW5kbGVkKQogICAgIGlmIChoYW5kbGVkICYmIG9sZEZvY3VzZWRFbGVtZW50 KSB7CiAgICAgICAgIGF1dG8gbmV3Rm9jdXNlZEZyYW1lID0gbWFrZVJlZlB0cihtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRGcmFtZSgpKTsKICAgICAgICAgYXV0byBuZXdGb2N1c2Vk RWxlbWVudCA9IG1ha2VSZWZQdHIobmV3Rm9jdXNlZEZyYW1lID8gbmV3Rm9jdXNlZEZyYW1lLT5k b2N1bWVudCgpLT5mb2N1c2VkRWxlbWVudCgpIDogbnVsbHB0cik7Ci0gICAgICAgIGlmIChvbGRG b2N1c2VkRWxlbWVudCA9PSBuZXdGb2N1c2VkRWxlbWVudCkKKyAgICAgICAgaWYgKG9sZEZvY3Vz ZWRFbGVtZW50ID09IG5ld0ZvY3VzZWRFbGVtZW50ICYmIGlzVHJhbnNwYXJlbnRPckZ1bGx5Q2xp cHBlZCgqbmV3Rm9jdXNlZEVsZW1lbnQpKQogICAgICAgICAgICAgZWxlbWVudERpZFJlZm9jdXMo Km5ld0ZvY3VzZWRFbGVtZW50KTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggNzQ4NTUzNGUyN2JlMGNhOWJjZjU1MjQ0OWRlNGIwMTgz ODdmMTllMS4uNGUwY2U0YTQ3OTI3ZDYxNzZmNWJhOWFhYTU1ZThhZDJmNDQzYjJhZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTQ0OSw2ICsxNDQ5 LDcgQEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgdm9pZCBkaWRD aG9vc2VGaWxlc0Zvck9wZW5QYW5lbFdpdGhEaXNwbGF5U3RyaW5nQW5kSWNvbihjb25zdCBWZWN0 b3I8U3RyaW5nPiYsIGNvbnN0IFN0cmluZyYgZGlzcGxheVN0cmluZywgY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiBpY29uRGF0YSk7CisgICAgYm9vbCBpc1RyYW5zcGFyZW50T3JGdWxseUNsaXBw ZWQoY29uc3QgV2ViQ29yZTo6RWxlbWVudCYpIGNvbnN0OwogI2VuZGlmCiAKICNpZiBFTkFCTEUo U0FOREJPWF9FWFRFTlNJT05TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBhNWFiMWI2YjYxMjNhMGZkNTQ2OWE5MzA3M2Fi MDc0MDAxMjI0OTY4Li5iM2I1Zjg1OTdlMDFjNDU0ZGViN2I3OWVmNWQ0OWUzZDAxMzk5MWRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbQpAQCAtMTg0LDkgKzE4NCwxMyBAQCBzdGF0aWMgdm9pZCBjb21wdXRlRWRpdGFibGVSb290 SGFzQ29udGVudEFuZFBsYWluVGV4dChjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZQogICAgIGRh dGEuaGFzUGxhaW5UZXh0ID0gZGF0YS5oYXNDb250ZW50ICYmIGhhc0FueVBsYWluVGV4dChSYW5n ZTo6Y3JlYXRlKHJvb3QtPmRvY3VtZW50KCksIFZpc2libGVQb3NpdGlvbiB7IHN0YXJ0SW5FZGl0 YWJsZVJvb3QgfSwgVmlzaWJsZVBvc2l0aW9uIHsgbGFzdFBvc2l0aW9uSW5Ob2RlKHJvb3QpIH0p KTsKIH0KIAotc3RhdGljIGJvb2wgZW5jbG9zaW5nTGF5ZXJJc1RyYW5zcGFyZW50T3JGdWxseUNs aXBwZWQoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlcikKK2Jvb2wgV2ViUGFnZTo6aXNUcmFu c3BhcmVudE9yRnVsbHlDbGlwcGVkKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0CiB7Ci0g ICAgYXV0byogZW5jbG9zaW5nTGF5ZXIgPSByZW5kZXJlci5lbmNsb3NpbmdMYXllcigpOworICAg IGF1dG8qIHJlbmRlcmVyID0gZWxlbWVudC5yZW5kZXJlcigpOworICAgIGlmICghcmVuZGVyZXIp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8qIGVuY2xvc2luZ0xheWVyID0gcmVu ZGVyZXItPmVuY2xvc2luZ0xheWVyKCk7CiAgICAgcmV0dXJuIGVuY2xvc2luZ0xheWVyICYmIGVu Y2xvc2luZ0xheWVyLT5pc1RyYW5zcGFyZW50T3JGdWxseUNsaXBwZWRSZXNwZWN0aW5nUGFyZW50 RnJhbWVzKCk7CiB9CiAKQEAgLTI2Myw5ICsyNjcsOCBAQCB2b2lkIFdlYlBhZ2U6OnBsYXRmb3Jt RWRpdG9yU3RhdGUoRnJhbWUmIGZyYW1lLCBFZGl0b3JTdGF0ZSYgcmVzdWx0LCBJbmNsdWRlUG9z dAogICAgICAgICAgICAgcG9zdExheW91dERhdGEuY2FyZXRDb2xvciA9IHJlbmRlcmVyLnN0eWxl KCkuY2FyZXRDb2xvcigpOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZXN1bHQuaXNDb250ZW50 RWRpdGFibGUpIHsKLSAgICAgICAgICAgIGF1dG8gY29udGFpbmVyID0gbWFrZVJlZlB0cihzZWxl Y3Rpb24ucm9vdEVkaXRhYmxlRWxlbWVudCgpKTsKLSAgICAgICAgICAgIGlmIChjb250YWluZXIg JiYgY29udGFpbmVyLT5yZW5kZXJlcigpKQotICAgICAgICAgICAgICAgIHBvc3RMYXlvdXREYXRh LmVkaXRhYmxlUm9vdElzVHJhbnNwYXJlbnRPckZ1bGx5Q2xpcHBlZCA9IGVuY2xvc2luZ0xheWVy SXNUcmFuc3BhcmVudE9yRnVsbHlDbGlwcGVkKCpjb250YWluZXItPnJlbmRlcmVyKCkpOworICAg ICAgICAgICAgaWYgKGF1dG8gY29udGFpbmVyID0gbWFrZVJlZlB0cihzZWxlY3Rpb24ucm9vdEVk aXRhYmxlRWxlbWVudCgpKSkKKyAgICAgICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5lZGl0YWJs ZVJvb3RJc1RyYW5zcGFyZW50T3JGdWxseUNsaXBwZWQgPSBpc1RyYW5zcGFyZW50T3JGdWxseUNs aXBwZWQoKmNvbnRhaW5lcik7CiAgICAgICAgIH0KICAgICAgICAgY29tcHV0ZUVkaXRhYmxlUm9v dEhhc0NvbnRlbnRBbmRQbGFpblRleHQoc2VsZWN0aW9uLCBwb3N0TGF5b3V0RGF0YSk7CiAgICAg fQpAQCAtMTc5NSw3ICsxNzk4LDcgQEAgdm9pZCBXZWJQYWdlOjpyZXF1ZXN0RXZhc2lvblJlY3Rz QWJvdmVTZWxlY3Rpb24oQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWMKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIGlmICghbV9mb2N1c2VkRWxlbWVudCB8fCAhbV9mb2N1c2Vk RWxlbWVudC0+cmVuZGVyZXIoKSB8fCBlbmNsb3NpbmdMYXllcklzVHJhbnNwYXJlbnRPckZ1bGx5 Q2xpcHBlZCgqbV9mb2N1c2VkRWxlbWVudC0+cmVuZGVyZXIoKSkpIHsKKyAgICBpZiAoIW1fZm9j dXNlZEVsZW1lbnQgfHwgIW1fZm9jdXNlZEVsZW1lbnQtPnJlbmRlcmVyKCkgfHwgaXNUcmFuc3Bh cmVudE9yRnVsbHlDbGlwcGVkKCptX2ZvY3VzZWRFbGVtZW50KSkgewogICAgICAgICByZXBseSh7 IH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjk4Myw3ICsyOTg2LDcgQEAgdm9pZCBX ZWJQYWdlOjpnZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKEZvY3VzZWRFbGVtZW50SW5mb3Jt YXRpb24mIGluZm9ybWF0aW8KICAgICAgICAgaW5mb3JtYXRpb24uaXNSZWFkT25seSA9IGZhbHNl OwogICAgIH0KIAotICAgIGlmIChtX2ZvY3VzZWRFbGVtZW50LT5kb2N1bWVudCgpLnF1aXJrcygp LnNob3VsZFN1cHByZXNzQXV0b2NvcnJlY3Rpb25BbmRBdXRvY2FwdGlhbGl6YXRpb25JbkhpZGRl bkVkaXRhYmxlQXJlYXMoKSAmJiBtX2ZvY3VzZWRFbGVtZW50LT5yZW5kZXJlcigpICYmIGVuY2xv c2luZ0xheWVySXNUcmFuc3BhcmVudE9yRnVsbHlDbGlwcGVkKCptX2ZvY3VzZWRFbGVtZW50LT5y ZW5kZXJlcigpKSkgeworICAgIGlmIChtX2ZvY3VzZWRFbGVtZW50LT5kb2N1bWVudCgpLnF1aXJr cygpLnNob3VsZFN1cHByZXNzQXV0b2NvcnJlY3Rpb25BbmRBdXRvY2FwdGlhbGl6YXRpb25Jbkhp ZGRlbkVkaXRhYmxlQXJlYXMoKSAmJiBpc1RyYW5zcGFyZW50T3JGdWxseUNsaXBwZWQoKm1fZm9j dXNlZEVsZW1lbnQpKSB7CiAgICAgICAgIGluZm9ybWF0aW9uLmF1dG9jYXBpdGFsaXplVHlwZSA9 IEF1dG9jYXBpdGFsaXplVHlwZU5vbmU7CiAgICAgICAgIGluZm9ybWF0aW9uLmlzQXV0b2NvcnJl Y3QgPSBmYWxzZTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggNTQ5Mjk0NTliYWI4ZDIzMjA4ZWZiNDY2NmU2MjdlNjJmMmUwZGUwOC4u NDY4NGFlNTU2ZjMxODQzODBiN2RjMTA5NDdhZDQ0YWU4MTY5OTUyZiAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5 LTA3LTA0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAg IFRvdWNoaW5nIG1lZGlhIGNvbnRyb2xzIHNvbWV0aW1lcyBzaG93cyBzb2Z0d2FyZSBrZXlib2Fy ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NDkw CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjA3NjI3MD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIHBsdW1iaW5nIGZvciBhIG5ldyB0ZXN0 aW5nIGhvb2sgdG8gY2hlY2sgd2hldGhlciBvciBub3QgdGhlcmUgaXMgYW4gYWN0aXZlIGlucHV0 IHNlc3Npb24uIFNlZSBvdGhlcgorICAgICAgICBDaGFuZ2VMb2cgZW50cmllcyBmb3IgbW9yZSBk ZXRhaWwuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9pb3MvVUlTY3JpcHRDb250cm9sbGVy SU9TLm1tOgorICAgICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXI6Omhhc0lucHV0U2Vzc2lv biBjb25zdCk6CisgICAgICAgICogVGVzdFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRleHQvQmlu ZGluZ3MvVUlTY3JpcHRDb250cm9sbGVyLmlkbDoKKyAgICAgICAgKiBUZXN0UnVubmVyU2hhcmVk L1VJU2NyaXB0Q29udGV4dC9VSVNjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpV SVNjcmlwdENvbnRyb2xsZXI6Omhhc0lucHV0U2Vzc2lvbiBjb25zdCk6CisgICAgICAgICogVGVz dFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRleHQvVUlTY3JpcHRDb250cm9sbGVyLmg6CisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tOgorICAg ICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXI6Omhhc0lucHV0U2Vzc2lvbiBjb25zdCk6CisK IDIwMTktMDctMDEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4K IAogICAgICAgICBBZGQgbmV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gU1BJIHdp dGggcHJlZmVyZW5jZXMgYW5kIHVzZXJJbmZvCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv aW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbQppbmRleCBiYTFmM2VkYTczZWU5Y2MzZjM5MjU0 MDQ2NGRiMjJiMGE5YjcxMTdhLi5kN2VhNDY2NWUzODRiNTdhNTdmMjg2ZGRlYTRmMjNiMTA0ODQy ZDI4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9pb3MvVUlTY3JpcHRDb250cm9s bGVySU9TLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2lvcy9VSVNjcmlwdENvbnRyb2xs ZXJJT1MubW0KQEAgLTI4Nyw2ICsyODcsMTEgQEAgYm9vbCBVSVNjcmlwdENvbnRyb2xsZXI6Omlz U2hvd2luZ0tleWJvYXJkKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgVUlT Y3JpcHRDb250cm9sbGVyOjpoYXNJbnB1dFNlc3Npb24oKSBjb25zdAoreworICAgIHJldHVybiBm YWxzZTsKK30KKwogZG91YmxlIFVJU2NyaXB0Q29udHJvbGxlcjo6bWluaW11bVpvb21TY2FsZSgp IGNvbnN0CiB7CiAgICAgcmV0dXJuIGdXZWJTY3JvbGxWaWV3Lm1pbmltdW1ab29tU2NhbGU7CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0UnVubmVyU2hhcmVkL1VJU2NyaXB0Q29udGV4dC9CaW5kaW5n cy9VSVNjcmlwdENvbnRyb2xsZXIuaWRsIGIvVG9vbHMvVGVzdFJ1bm5lclNoYXJlZC9VSVNjcmlw dENvbnRleHQvQmluZGluZ3MvVUlTY3JpcHRDb250cm9sbGVyLmlkbAppbmRleCAzYjY5Y2RlMTI3 NTNkNDEzMDNjNjE1MjljZjc2Yjg0MDJjZmFiNDFmLi45ZTg2OGNlYzI2OWI4YTkxMzg5ZTM2MTQ2 ZmQ0ZDBhMDU0ODg0NjRkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UnVubmVyU2hhcmVkL1VJU2Ny aXB0Q29udGV4dC9CaW5kaW5ncy9VSVNjcmlwdENvbnRyb2xsZXIuaWRsCisrKyBiL1Rvb2xzL1Rl c3RSdW5uZXJTaGFyZWQvVUlTY3JpcHRDb250ZXh0L0JpbmRpbmdzL1VJU2NyaXB0Q29udHJvbGxl ci5pZGwKQEAgLTIyNCw2ICsyMjQsNyBAQCBpbnRlcmZhY2UgVUlTY3JpcHRDb250cm9sbGVyIHsK ICAgICBhdHRyaWJ1dGUgb2JqZWN0IGRpZFNob3dLZXlib2FyZENhbGxiYWNrOwogICAgIGF0dHJp YnV0ZSBvYmplY3QgZGlkSGlkZUtleWJvYXJkQ2FsbGJhY2s7CiAgICAgcmVhZG9ubHkgYXR0cmli dXRlIGJvb2xlYW4gaXNTaG93aW5nS2V5Ym9hcmQ7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJv b2xlYW4gaGFzSW5wdXRTZXNzaW9uOwogCiAgICAgYXR0cmlidXRlIG9iamVjdCBkaWRTaG93TWVu dUNhbGxiYWNrOwogICAgIGF0dHJpYnV0ZSBvYmplY3QgZGlkSGlkZU1lbnVDYWxsYmFjazsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RSdW5uZXJTaGFyZWQvVUlTY3JpcHRDb250ZXh0L1VJU2NyaXB0 Q29udHJvbGxlci5jcHAgYi9Ub29scy9UZXN0UnVubmVyU2hhcmVkL1VJU2NyaXB0Q29udGV4dC9V SVNjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDFiZWRkN2ViMTZmNzQ1OTYxNjE5OTg4NWE0ZmQy MTBhM2VlYjc2ZDUuLjBmOGRiMTMzYWRkM2IxYmM2MTZiZWU5NThhMDVlNWU3ZWYwMDRkMzEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RSdW5uZXJTaGFyZWQvVUlTY3JpcHRDb250ZXh0L1VJU2NyaXB0 Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvVGVzdFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRl eHQvVUlTY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNDUzLDYgKzQ1MywxMSBAQCBib29sIFVJU2Ny aXB0Q29udHJvbGxlcjo6aXNTaG93aW5nS2V5Ym9hcmQoKSBjb25zdAogICAgIHJldHVybiBmYWxz ZTsKIH0KIAorYm9vbCBVSVNjcmlwdENvbnRyb2xsZXI6Omhhc0lucHV0U2Vzc2lvbigpIGNvbnN0 Cit7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBkb3VibGUgVUlTY3JpcHRDb250cm9sbGVyOjp6 b29tU2NhbGUoKSBjb25zdAogewogICAgIHJldHVybiAxOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFJ1bm5lclNoYXJlZC9VSVNjcmlwdENvbnRleHQvVUlTY3JpcHRDb250cm9sbGVyLmggYi9Ub29s cy9UZXN0UnVubmVyU2hhcmVkL1VJU2NyaXB0Q29udGV4dC9VSVNjcmlwdENvbnRyb2xsZXIuaApp bmRleCAwYmVkYzA0YTEyZWM0YWMzYzIzNDBiNDA3ZDc3ZTBiMGVjZWRiOGE3Li4xOGUxOGFiOWM5 ODAxOTlkMGM4MDcwYjMwNzJiZjg1MGIxZWIzNjE5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UnVu bmVyU2hhcmVkL1VJU2NyaXB0Q29udGV4dC9VSVNjcmlwdENvbnRyb2xsZXIuaAorKysgYi9Ub29s cy9UZXN0UnVubmVyU2hhcmVkL1VJU2NyaXB0Q29udGV4dC9VSVNjcmlwdENvbnRyb2xsZXIuaApA QCAtMTYzLDYgKzE2Myw3IEBAIHB1YmxpYzoKICAgICBKU1ZhbHVlUmVmIGRpZEhpZGVLZXlib2Fy ZENhbGxiYWNrKCkgY29uc3Q7CiAKICAgICBib29sIGlzU2hvd2luZ0tleWJvYXJkKCkgY29uc3Q7 CisgICAgYm9vbCBoYXNJbnB1dFNlc3Npb24oKSBjb25zdDsKIAogICAgIHZvaWQgc2V0RGlkSGlk ZU1lbnVDYWxsYmFjayhKU1ZhbHVlUmVmKTsKICAgICBKU1ZhbHVlUmVmIGRpZEhpZGVNZW51Q2Fs bGJhY2soKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1VJ U2NyaXB0Q29udHJvbGxlcklPUy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1VJU2Ny aXB0Q29udHJvbGxlcklPUy5tbQppbmRleCA5OTMzMTUwNTAzZjQ4OWQ1Njc4MTFhMzUxMzJjNWVk NWM1YTQ3N2M5Li45NTVmNjU0NjFkYzMyMTAwYWFlZWNjYTZiMDY2ZmVkNzEwZTU3YTkyIDEwMDY0 NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9VSVNjcmlwdENvbnRyb2xsZXJJT1Mu bW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9T Lm1tCkBAIC02MjUsNiArNjI1LDExIEBAIGJvb2wgVUlTY3JpcHRDb250cm9sbGVyOjppc1Nob3dp bmdLZXlib2FyZCgpIGNvbnN0CiAgICAgcmV0dXJuIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24o KS5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZpZXcoKS5zaG93aW5nS2V5Ym9hcmQ7CiB9CiAKK2Jv b2wgVUlTY3JpcHRDb250cm9sbGVyOjpoYXNJbnB1dFNlc3Npb24oKSBjb25zdAoreworICAgIHJl dHVybiBUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkubWFpbldlYlZpZXcoKS0+cGxhdGZvcm1W aWV3KCkuaXNJbnRlcmFjdGluZ1dpdGhGb3JtQ29udHJvbDsKK30KKwogdm9pZCBVSVNjcmlwdENv bnRyb2xsZXI6OmFwcGx5QXV0b2NvcnJlY3Rpb24oSlNTdHJpbmdSZWYgbmV3U3RyaW5nLCBKU1N0 cmluZ1JlZiBvbGRTdHJpbmcsIEpTVmFsdWVSZWYgY2FsbGJhY2spCiB7CiAgICAgdW5zaWduZWQg Y2FsbGJhY2tJRCA9IG1fY29udGV4dC0+cHJlcGFyZUZvckFzeW5jVGFzayhjYWxsYmFjaywgQ2Fs bGJhY2tUeXBlTm9uUGVyc2lzdGVudCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjY2YjM1OTE2YzZlZGU3M2EwMGM1N2Zi NzQ0YjVjOTE4ZmI5OGNkMC4uYzNiMzM3ODMzNWJhN2I4NmI2Y2FkMGE2ZTRmNTQ4Mjc4YjEwZmE3 NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA3LTA0ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRvdWNoaW5nIG1lZGlhIGNvbnRyb2xzIHNv bWV0aW1lcyBzaG93cyBzb2Z0d2FyZSBrZXlib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NDkwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 MjA3NjI3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRzIGEgbmV3IGxheW91dCB0ZXN0IHRvIHZlcmlmeSB0aGF0IHRoZSBrZXlib2FyZCBvbmx5 IGFwcGVhcnMgYWZ0ZXIgYSBoYW5kbGVkIHRvdWNoIGV2ZW50IGlmIHRoZSBmb2N1c2VkCisgICAg ICAgIGVsZW1lbnQgaXMgaW5zaWRlIGEgaGlkZGVuIGVkaXRhYmxlIGFyZWE7IG90aGVyd2lzZSwg dGhlIGtleWJvYXJkIHNob3VsZCBub3QgYmUgcHJlc2VudC4KKworICAgICAgICAqIGZhc3QvZXZl bnRzL3RvdWNoL2lvcy9kby1ub3Qtc2hvdy1rZXlib2FyZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNo c3RhcnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy90b3VjaC9p b3MvZG8tbm90LXNob3cta2V5Ym9hcmQtYWZ0ZXItcHJldmVudGluZy10b3VjaHN0YXJ0Lmh0bWw6 IEFkZGVkLgorCisgICAgICAgIFRoaXMgdGVzdCBwYXNzZXMgYXMgbG9uZyBhcyB3ZSBkaWRuJ3Qg YmVnaW4gc2hvd2luZyB0aGUga2V5Ym9hcmQgYWZ0ZXIgdGFwcGluZy4KKworICAgICAgICAqIGZh c3QvZXZlbnRzL3RvdWNoL2lvcy9zaG93LWtleWJvYXJkLWFmdGVyLXByZXZlbnRpbmctdG91Y2hz dGFydC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvaW9zL3Nob3ct a2V5Ym9hcmQtYWZ0ZXItcHJldmVudGluZy10b3VjaHN0YXJ0Lmh0bWw6CisKKyAgICAgICAgQWRq dXN0IHRoaXMgZXhpc3RpbmcgdGVzdCB0byBtYWtlIHRoZSBmb2N1c2VkIHRleHRhcmVhIGhpZGRl bi4KKworICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAgICAgICh3aW5kb3cu VUlIZWxwZXIuaGFzSW5wdXRTZXNzaW9uKToKKworICAgICAgICBBZGQgYSBuZXcgdGVzdGluZyBo b29rIHRvIGNoZWNrIHdoZXRoZXIgdGhlcmUgaXMgYW4gYWN0aXZlIGlucHV0IHNlc3Npb24uCisK IDIwMTktMDctMDMgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAg ICAgICAgQ2xpY2sgZXZlbnRzIG9uIG91dGVyIHBhZ2UgYXJlIG5vdCBiZWluZyBkaXNwYXRjaGVk IGNvcnJlY3RseSBhZnRlciB0b3VjaC16b29taW5nIHdpdGhpbiBhbiBpZnJhbWUKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy9kby1ub3Qtc2hvdy1rZXlib2Fy ZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNoc3RhcnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvdG91Y2gvaW9zL2RvLW5vdC1zaG93LWtleWJvYXJkLWFmdGVyLXByZXZlbnRp bmctdG91Y2hzdGFydC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGRjN2ZmNzE3MThlOTdkMGMz ZTE4NjdjMTgxMjM5Y2FjMmY0NWYxZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZXZlbnRzL3RvdWNoL2lvcy9kby1ub3Qtc2hvdy1rZXlib2FyZC1hZnRlci1wcmV2ZW50aW5n LXRvdWNoc3RhcnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKKworVmVyaWZpZXMgdGhh dCB0aGUga2V5Ym9hcmQgZG9lcyBub3Qgc2hvdyB1cCBldmVuIGFmdGVyIHByZXZlbnRpbmcgZGVm YXVsdCBvbiB0b3VjaHN0YXJ0IHdoZW4gYSByZWd1bGFyIGlucHV0IGZpZWxkIGlzIGZvY3VzZWQu IFRvIG1hbnVhbGx5IHRlc3QsIHRhcCB0aGUgcmVkIGJveDsgdGhlIGtleWJvYXJkIHNob3VsZCBu b3QgYXBwZWFyLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKK1BBU1MgaGFzSW5wdXRT ZXNzaW9uIGlzIGZhbHNlCitQQVNTIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQgaXMgdGV4dGFyZWEK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9pb3MvZG8tbm90LXNob3cta2V5 Ym9hcmQtYWZ0ZXItcHJldmVudGluZy10b3VjaHN0YXJ0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy90b3VjaC9pb3MvZG8tbm90LXNob3cta2V5Ym9hcmQtYWZ0ZXItcHJldmVudGluZy10 b3VjaHN0YXJ0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTIyNWZiMzY5NDU1YmI5OTU3ZDNhNjRjZTY2MDU5 YWQxYjQyNDI2NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Rv dWNoL2lvcy9kby1ub3Qtc2hvdy1rZXlib2FyZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNoc3RhcnQu aHRtbApAQCAtMCwwICsxLDQ4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0Pgor PHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0 PgorPHN0eWxlPgoraHRtbCwgYm9keSB7CisgICAgd2lkdGg6IDEwMCU7CisgICAgaGVpZ2h0OiAx MDAlOworICAgIG1hcmdpbjogMDsKK30KKwordGV4dGFyZWEsICN0YXJnZXQgeworICAgIHdpZHRo OiAxMDAlOworICAgIGhlaWdodDogMTAwcHg7Cit9CisKKyN0YXJnZXQgeworICAgIGJhY2tncm91 bmQtY29sb3I6IHRvbWF0bzsKKyAgICBvcGFjaXR5OiAwLjI1OworfQorPC9zdHlsZT4KKzwvaGVh ZD4KKzxib2R5PgorICAgIDx0ZXh0YXJlYT48L3RleHRhcmVhPgorICAgIDxkaXYgaWQ9InRhcmdl dCI+PC9kaXY+CisgICAgPHByZSBpZD0iZGVzY3JpcHRpb24iPjwvcHJlPgorICAgIDxwcmUgaWQ9 ImNvbnNvbGUiPjwvcHJlPgorPC9ib2R5PgorPHNjcmlwdD4KKyAgICBqc1Rlc3RJc0FzeW5jID0g dHJ1ZTsKKyAgICB0ZXh0YXJlYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoInRleHRhcmVhIik7 CisgICAgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOworICAgIHRh cmdldC5hZGRFdmVudExpc3RlbmVyKCJ0b3VjaHN0YXJ0IiwgZXZlbnQgPT4gZXZlbnQucHJldmVu dERlZmF1bHQoKSk7CisKKyAgICBkZXNjcmlwdGlvbigiVmVyaWZpZXMgdGhhdCB0aGUga2V5Ym9h cmQgZG9lcyBub3Qgc2hvdyB1cCBldmVuIGFmdGVyIHByZXZlbnRpbmcgZGVmYXVsdCBvbiB0b3Vj aHN0YXJ0IHdoZW4gYSByZWd1bGFyIGlucHV0IGZpZWxkIGlzIGZvY3VzZWQuIFRvIG1hbnVhbGx5 IHRlc3QsIHRhcCB0aGUgcmVkIGJveDsgdGhlIGtleWJvYXJkIHNob3VsZCBub3QgYXBwZWFyLiIp OworCisgICAgYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgpID0+IHsKKyAgICAgICAg dGV4dGFyZWEuZm9jdXMoKTsKKyAgICAgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVFbGVtZW50 KHRhcmdldCk7CisgICAgICAgIGF3YWl0IFVJSGVscGVyLmVuc3VyZVByZXNlbnRhdGlvblVwZGF0 ZSgpOworICAgICAgICBoYXNJbnB1dFNlc3Npb24gPSBhd2FpdCBVSUhlbHBlci5oYXNJbnB1dFNl c3Npb24oKTsKKyAgICAgICAgc2hvdWxkQmUoImhhc0lucHV0U2Vzc2lvbiIsICJmYWxzZSIpOwor ICAgICAgICBzaG91bGRCZSgiZG9jdW1lbnQuYWN0aXZlRWxlbWVudCIsICJ0ZXh0YXJlYSIpOwor ICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9KTsKKzwvc2NyaXB0PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL3Nob3cta2V5Ym9hcmQt YWZ0ZXItcHJldmVudGluZy10b3VjaHN0YXJ0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvZXZlbnRzL3RvdWNoL2lvcy9zaG93LWtleWJvYXJkLWFmdGVyLXByZXZlbnRpbmctdG91Y2hz dGFydC1leHBlY3RlZC50eHQKaW5kZXggZDhjNDViZjY5NzdhZTcxYmI5NDAxZjViN2MxYzFlMjZj NzljODJhMS4uMDJmNzkzNTg2ZDExMWFhZjEzMzU3MjY3ODM4ZmNkOWNiZmFhOTk2NiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL3Nob3cta2V5Ym9hcmQtYWZ0 ZXItcHJldmVudGluZy10b3VjaHN0YXJ0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2V2ZW50cy90b3VjaC9pb3Mvc2hvdy1rZXlib2FyZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNo c3RhcnQtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCi1WZXJpZmllcyB0aGF0IHRoZSBr ZXlib2FyZCBzaG93cyB1cCBldmVuIGFmdGVyIHByZXZlbnRpbmcgZGVmYXVsdCBvbiB0b3VjaHN0 YXJ0LiBUbyBtYW51YWxseSB0ZXN0LCB0YXAgdGhlIHRleHRhcmVhOyB0aGUgdGV4dGFyZWEgc2hv dWxkIHJlbWFpbiBmb2N1c2VkLCBhbmQgdGhlIGtleWJvYXJkIHNob3VsZCBhcHBlYXIuCitWZXJp ZmllcyB0aGF0IHRoZSBrZXlib2FyZCBzaG93cyB1cCBldmVuIGFmdGVyIHByZXZlbnRpbmcgZGVm YXVsdCBvbiB0b3VjaHN0YXJ0IHdoZW4gZm9jdXNpbmcgYSBoaWRkZW4gZWRpdGFibGUgYXJlYS4g VG8gbWFudWFsbHkgdGVzdCwgdGFwIHRoZSByZWQgYm94OyB0aGUgdGV4dGFyZWEgc2hvdWxkIHJl bWFpbiBmb2N1c2VkLCBhbmQgdGhlIGtleWJvYXJkIHNob3VsZCBhcHBlYXIuCiAKIE9uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv dG91Y2gvaW9zL3Nob3cta2V5Ym9hcmQtYWZ0ZXItcHJldmVudGluZy10b3VjaHN0YXJ0Lmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9pb3Mvc2hvdy1rZXlib2FyZC1hZnRlci1w cmV2ZW50aW5nLXRvdWNoc3RhcnQuaHRtbAppbmRleCBiMjVhZjAzMGU0YjM0N2FiMGNhYjNjNzYy NTRhZGI1NmI0YjZjYWU0Li40OGE2YWQ3MjVhNjA2ODkzMzM3ZGFkYWUyNTRhM2U2OTQyN2U0ZGU0 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9pb3Mvc2hvdy1rZXli b2FyZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNoc3RhcnQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2V2ZW50cy90b3VjaC9pb3Mvc2hvdy1rZXlib2FyZC1hZnRlci1wcmV2ZW50aW5nLXRvdWNo c3RhcnQuaHRtbApAQCAtMTAsMjkgKzEwLDQ1IEBAIGh0bWwsIGJvZHkgewogICAgIG1hcmdpbjog MDsKIH0KIAotdGV4dGFyZWEgewordGV4dGFyZWEsICN0YXJnZXQgewogICAgIHdpZHRoOiAxMDAl OwogICAgIGhlaWdodDogMTAwcHg7Ci0gICAgZm9udC1zaXplOiA1MHB4OwotICAgIHRleHQtYWxp Z246IGNlbnRlcjsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwOworfQorCisj dGFyZ2V0IHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0b21hdG87CisgICAgei1pbmRleDogMTsK KyAgICBvcGFjaXR5OiAwLjI1OworfQorCit0ZXh0YXJlYSB7CisgICAgb3BhY2l0eTogMDsKK30K KworI2Rlc2NyaXB0aW9uIHsKKyAgICBtYXJnaW4tdG9wOiAxMDBweDsKIH0KIDwvc3R5bGU+CiA8 L2hlYWQ+CiA8Ym9keT4KICAgICA8dGV4dGFyZWE+PC90ZXh0YXJlYT4KKyAgICA8ZGl2IGlkPSJ0 YXJnZXQiPjwvZGl2PgogICAgIDxwcmUgaWQ9ImRlc2NyaXB0aW9uIj48L3ByZT4KICAgICA8cHJl IGlkPSJjb25zb2xlIj48L3ByZT4KIDwvYm9keT4KIDxzY3JpcHQ+CiAgICAganNUZXN0SXNBc3lu YyA9IHRydWU7CiAgICAgdGV4dGFyZWEgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJ0ZXh0YXJl YSIpOworICAgIHRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0YXJnZXQiKTsKKyAg ICB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigidG91Y2hzdGFydCIsIGV2ZW50ID0+IGV2ZW50LnBy ZXZlbnREZWZhdWx0KCkpOwogCi0gICAgZGVzY3JpcHRpb24oIlZlcmlmaWVzIHRoYXQgdGhlIGtl eWJvYXJkIHNob3dzIHVwIGV2ZW4gYWZ0ZXIgcHJldmVudGluZyBkZWZhdWx0IG9uIHRvdWNoc3Rh cnQuIFRvIG1hbnVhbGx5IHRlc3QsIHRhcCB0aGUgdGV4dGFyZWE7IHRoZSB0ZXh0YXJlYSBzaG91 bGQgcmVtYWluIGZvY3VzZWQsIGFuZCB0aGUga2V5Ym9hcmQgc2hvdWxkIGFwcGVhci4iKTsKKyAg ICBkZXNjcmlwdGlvbigiVmVyaWZpZXMgdGhhdCB0aGUga2V5Ym9hcmQgc2hvd3MgdXAgZXZlbiBh ZnRlciBwcmV2ZW50aW5nIGRlZmF1bHQgb24gdG91Y2hzdGFydCB3aGVuIGZvY3VzaW5nIGEgaGlk ZGVuIGVkaXRhYmxlIGFyZWEuIFRvIG1hbnVhbGx5IHRlc3QsIHRhcCB0aGUgcmVkIGJveDsgdGhl IHRleHRhcmVhIHNob3VsZCByZW1haW4gZm9jdXNlZCwgYW5kIHRoZSBrZXlib2FyZCBzaG91bGQg YXBwZWFyLiIpOwogCi0gICAgdGV4dGFyZWEuYWRkRXZlbnRMaXN0ZW5lcigidG91Y2hzdGFydCIs IGV2ZW50ID0+IGV2ZW50LnByZXZlbnREZWZhdWx0KCkpOwogICAgIGFkZEV2ZW50TGlzdGVuZXIo ImxvYWQiLCBhc3luYyAoKSA9PiB7CiAgICAgICAgIHRleHRhcmVhLmZvY3VzKCk7Ci0gICAgICAg IGF3YWl0IFVJSGVscGVyLmFjdGl2YXRlRWxlbWVudEFuZFdhaXRGb3JJbnB1dFNlc3Npb24odGV4 dGFyZWEpOworICAgICAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0ZUVsZW1lbnRBbmRXYWl0Rm9y SW5wdXRTZXNzaW9uKHRhcmdldCk7CiAgICAgICAgIHRlc3RQYXNzZWQoImtleWJvYXJkIHdhcyBz aG93bi4iKTsKICAgICAgICAgc2hvdWxkQmUoImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQiLCAidGV4 dGFyZWEiKTsKICAgICAgICAgdGV4dGFyZWEuYmx1cigpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxw ZXIuanMKaW5kZXggOWViOTdkMDcwZWViNGQwY2Q0YzRjODlkMWVkODY1MGY0YzU1Y2ViYy4uOTY2 ODRhYWI5ZTQ4MzVhNTE3MTI4M2VkMTU2OGZjODFiYmZhMTNjMSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcworKysgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMv dWktaGVscGVyLmpzCkBAIC0zNzIsNiArMzcyLDEzIEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNz IFVJSGVscGVyIHsKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgc3RhdGljIGhhc0lucHV0U2Vz c2lvbigpCisgICAgeworICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7Cisg ICAgICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KCJ1aUNvbnRyb2xsZXIuaGFzSW5wdXRT ZXNzaW9uIiwgcmVzdWx0ID0+IHJlc29sdmUocmVzdWx0ID09PSAidHJ1ZSIpKTsKKyAgICAgICAg fSk7CisgICAgfQorCiAgICAgc3RhdGljIGlzUHJlc2VudGluZ01vZGFsbHkoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4gewo=