203561 2019-10-29 06:46:05 -0700 [Web Animations] Optimize blending for CSS Transitions 2019-10-30 03:25:14 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203588 InRadar P2 Normal --- 1 graouts graouts commit-queue dino simon.fraser tsavell webkit-bug-importer oldest_to_newest 1584893 0 graouts 2019-10-29 06:46:05 -0700 [Web Animations] Optimize blending for CSS Transitions 1584894 1 382178 graouts 2019-10-29 06:50:30 -0700 Created attachment 382178 Patch 1584895 2 webkit-bug-importer 2019-10-29 06:51:44 -0700 <rdar://problem/56705079> 1584919 3 382183 graouts 2019-10-29 08:46:40 -0700 Created attachment 382183 Patch 1584922 4 382183 simon.fraser 2019-10-29 08:53:54 -0700 Comment on attachment 382183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382183&action=review > Source/WebCore/animation/KeyframeEffect.h:144 > + enum class BlendingKeyframesComputationSource : uint8_t { CSSAnimation, CSSTransition, WebAnimation }; This is a bit longwinded. Maybe KeyframesSource? 1584924 5 graouts 2019-10-29 09:00:44 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 382183 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382183&action=review > > > Source/WebCore/animation/KeyframeEffect.h:144 > > + enum class BlendingKeyframesComputationSource : uint8_t { CSSAnimation, CSSTransition, WebAnimation }; > > This is a bit longwinded. Maybe KeyframesSource? We have two types of keyframes: m_parsedKeyframes and m_blendingKeyframes. So I think the Blending part of the name is important. However, I guess we can drop the Computation part. 1584927 6 382185 graouts 2019-10-29 09:09:02 -0700 Created attachment 382185 Patch for landing 1584929 7 382185 commit-queue 2019-10-29 09:10:28 -0700 Comment on attachment 382185 Patch for landing Rejecting attachment 382185 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 382185, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Traceback (most recent call last): File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch", line 84, in <module> main() File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch", line 79, in main WebKitPatch(os.path.abspath(__file__)).main() File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 53, in run changelog_entry = ChangeLog(changelog_path).latest_entry() File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 379, in latest_entry return self.parse_latest_entry_from_file(changelog_file) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 325, in parse_latest_entry_from_file return next(cls.parse_entries_from_file(changelog_file)) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 364, in parse_entries_from_file yield ChangeLogEntry(''.join(entry_lines[:-1]), revision=most_probable_revision) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 114, in __init__ self._parse_entry() File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 232, in _parse_entry self._author = self._committer_list.contributor_by_email(self.author_email()) or self._committer_list.contributor_by_name(self.author_name()) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/config/committers.py", line 386, in contributor_by_email return self._email_to_account_map().get(email.lower()) if email else None File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/common/config/committers.py", line 289, in _email_to_account_map assert(email not in self._accounts_by_email) # We should never have duplicate emails. AssertionError Full output: https://webkit-queues.webkit.org/results/13188437 1584933 8 graouts 2019-10-29 09:17:26 -0700 Committed r251706: <https://trac.webkit.org/changeset/251706> 1585102 9 tsavell 2019-10-29 14:37:37 -0700 The changes in https://trac.webkit.org/changeset/251706/webkit broke webanimations/empty-keyframes-crash.html casting it to crash on Mac debug. History: https://results.webkit.org/?suite=layout-tests&test=webanimations%2Fempty-keyframes-crash.html Log: Application Specific Information: CRASHING TEST: webanimations/empty-keyframes-crash.html Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x00000002eb1b4810 WTFCrash + 16 (Assertions.cpp:305) 1 com.apple.WebCore 0x00000002d8006c6b WTFCrashWithInfo(int, char const*, char const*, int) + 27 2 com.apple.WebCore 0x00000002d9d78ff8 WebCore::KeyframeEffect::setAnimatedPropertiesInStyle(WebCore::RenderStyle&, double) + 168 (KeyframeEffect.cpp:1070) 3 com.apple.WebCore 0x00000002d9d78ce3 WebCore::KeyframeEffect::apply(WebCore::RenderStyle&) + 195 (KeyframeEffect.cpp:1029) https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r251715%20(10173)/webanimations/empty-keyframes-crash-crash-log.txt 1585307 10 graouts 2019-10-30 02:49:55 -0700 Reopening to attach new patch. 1585308 11 382292 graouts 2019-10-30 02:49:58 -0700 Created attachment 382292 Patch 1585309 12 382292 dino 2019-10-30 03:19:54 -0700 Comment on attachment 382292 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382292&action=review > Source/WebCore/animation/KeyframeEffect.cpp:1075 > + for (auto cssPropertyId : properties) > + CSSPropertyAnimation::blendProperties(this, cssPropertyId, &targetStyle, m_blendingKeyframes[0].style(), m_blendingKeyframes[1].style(), iterationProgress); I think you can do *properties.begin() 382178 2019-10-29 06:50:30 -0700 2019-10-29 08:46:31 -0700 Patch bug-203561-20191029145028.patch text/plain 8108 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjY2Q5NDVjMzdlNzA4 ZDIzNDVlYjlhMWQxOTM5MmVlN2RmYjdkOC4uOGRlOTQ5Y2ViZTJmN2FmNzU5ZjRmYmI2ZWM3MmI4 NmM3ZDUwMzA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTEwLTI5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgd29yayBwZXJmb3JtZWQgaW4gS2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUoKSBoYXMgYSBsZXZlbCBv ZiBjb21wbGV4aXR5IHdhcnJhbnRlZCBieSB0aGUKKyAgICAgICAgZmxleGliaWxpdHkgb2YgaG93 IGtleWZyYW1lcyBjYW4gYmUgc3BlY2lmaWVkIHZpYSB0aGUgV2ViIEFuaW1hdGlvbnMgSlMgQVBJ LiBIb3dldmVyLCBpbiB0aGUgY2FzZSBvZiBDU1MgVHJhbnNpdGlvbnMsCisgICAgICAgIHdlIGFs cmVhZHkga25vdyB0aGF0IHRoZXJlIGFyZSBvbmx5IHR3byBrZXlmcmFtZXMsIG9uZSB3aGVyZSBv ZmZzZXQ9MCBhbmQgb25lIHdoZXJlIG9mZnNldD0xLCBhbmQgdGhhdCBvbmx5IGEgc2luZ2xlCisg ICAgICAgIENTUyBwcm9wZXJ0eSBpcyBzcGVjaWZpZWQgc28gd2UgY2FuIHNpbXBsaWZ5IHRoZSBw cm9jZXNzIGdyZWF0bHkuCisKKyAgICAgICAgVG8gZW5zdXJlIHdlIG9ubHkgcGVyZm9ybSB0aGlz IHF1aWNrZXIgYmxlbmRpbmcgb3BlcmF0aW9uIGZvciBrZXlmcmFtZXMgY29tcHV0ZWQgZm9yIGEg Q1NTIFRyYW5zaXRpb24gYW5kIHRoYXQgbm8KKyAgICAgICAgbW9kaWZpY2F0aW9uIHRvIHRoZSBr ZXlmcmFtZXMgaGF2ZSBiZWVuIGFwcGxpZWQgdmlhIHRoZSBXZWIgQW5pbWF0aW9ucyBKUyBBUEkg YWZ0ZXIgdGhlIGZhY3QsIHdlIG5vdyBrZWVwIHRyYWNrCisgICAgICAgIG9mIHdoZXRoZXIgdGhl IGJsZW5kaW5nIGtleWZyYW1lcyAoS2V5ZnJhbWVMaXN0KSB3ZXJlIGdlbmVyYXRlZCBmb3IgYSBD U1MgVHJhbnNpdGlvbiBvciBhIENTUyBBbmltYXRpb24gYW5kIG9ubHkKKyAgICAgICAgdXNlIHRo aXMgaW5mb3JtYXRpb24gdG8gZGVjaWRlIHdoZXRoZXIgd2UncmUgYmxlbmRpbmcgZm9yIGRlY2xh cmF0aXZlIGFuaW1hdGlvbnMuCisKKyAgICAgICAgKiBhbmltYXRpb24vS2V5ZnJhbWVFZmZlY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NLZXlmcmFtZXMp OgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNsZWFyQmxlbmRpbmdLZXlmcmFt ZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRp b25CbGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6 Y29tcHV0ZUNTU1RyYW5zaXRpb25CbGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3Jl OjpLZXlmcmFtZUVmZmVjdDo6c2V0VGFyZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1l RWZmZWN0OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKToKKyAgICAgICAgKiBhbmltYXRp b24vS2V5ZnJhbWVFZmZlY3QuaDoKKwogMjAxOS0xMC0yOCAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAYXBwbGUuY29tPgogCiAgICAgICAgIENTUyBUcmFuc2l0aW9ucyBhbmQgQ1NTIEFuaW1hdGlv bnMgcHJvcGVydGllcyBzaG91bGQgdHJlYXQgdW5pdGxlc3MgMCBhcyBhbiBpbnZhbGlkIHZhbHVl IGZvciB0aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1l RWZmZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAK aW5kZXggZmFkYzZkM2JjMjJjNDk4OWI0NWVmMDExOTExN2EyYmQ1ZDAxZTkwMy4uNjdkMjQ3YTY1 NzNlMmIwZmMwZGMzODgzOGYxNzJjNThlZTkwZjdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmlt YXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCkBAIC03MjYsNyArNzI2LDcgQEAgRXhjZXB0aW9uT3I8 dm9pZD4gS2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NLZXlmcmFtZXMoSlNHbG9iYWxPYmplY3QmIGxl eGljYWxHbG9iYWwKIAogICAgIG1fcGFyc2VkS2V5ZnJhbWVzID0gV1RGTW92ZShwYXJzZWRLZXlm cmFtZXMpOwogCi0gICAgbV9ibGVuZGluZ0tleWZyYW1lcy5jbGVhcigpOworICAgIGNsZWFyQmxl bmRpbmdLZXlmcmFtZXMoKTsKIAogICAgIHJldHVybiB7IH07CiB9CkBAIC03NzIsNiArNzcyLDE0 IEBAIGJvb2wgS2V5ZnJhbWVFZmZlY3Q6OmZvcmNlTGF5b3V0SWZOZWVkZWQoKQogICAgIHJldHVy biB0cnVlOwogfQogCisKK3ZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNsZWFyQmxlbmRpbmdLZXlmcmFt ZXMoKQoreworICAgIG1fYmxlbmRpbmdLZXlmcmFtZXMuY2xlYXIoKTsKKyAgICBtX2JsZW5kaW5n S2V5ZnJhbWVzQ29tcHV0ZWRGb3JDU1NUcmFuc2l0aW9uID0gZmFsc2U7CisgICAgbV9ibGVuZGlu Z0tleWZyYW1lc0NvbXB1dGVkRm9yQ1NTQW5pbWF0aW9uID0gZmFsc2U7Cit9CisKIHZvaWQgS2V5 ZnJhbWVFZmZlY3Q6OnNldEJsZW5kaW5nS2V5ZnJhbWVzKEtleWZyYW1lTGlzdCYgYmxlbmRpbmdL ZXlmcmFtZXMpCiB7CiAgICAgbV9ibGVuZGluZ0tleWZyYW1lcyA9IFdURk1vdmUoYmxlbmRpbmdL ZXlmcmFtZXMpOwpAQCAtOTA5LDYgKzkxNyw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNvbXB1 dGVDU1NBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcygpCiAgICAgICAgICAgICBTdHlsZTo6bG9h ZFBlbmRpbmdSZXNvdXJjZXMoKnN0eWxlLCBtX3RhcmdldC0+ZG9jdW1lbnQoKSwgbV90YXJnZXQu Z2V0KCkpOwogICAgIH0KIAorICAgIG1fYmxlbmRpbmdLZXlmcmFtZXNDb21wdXRlZEZvckNTU0Fu aW1hdGlvbiA9IHRydWU7CiAgICAgc2V0QmxlbmRpbmdLZXlmcmFtZXMoa2V5ZnJhbWVMaXN0KTsK IH0KIApAQCAtOTM2LDYgKzk0NSw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NU cmFuc2l0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5bGUqIG9sCiAgICAgdG9L ZXlmcmFtZVZhbHVlLmFkZFByb3BlcnR5KHByb3BlcnR5KTsKICAgICBrZXlmcmFtZUxpc3QuaW5z ZXJ0KFdURk1vdmUodG9LZXlmcmFtZVZhbHVlKSk7CiAKKyAgICBtX2JsZW5kaW5nS2V5ZnJhbWVz Q29tcHV0ZWRGb3JDU1NUcmFuc2l0aW9uID0gdHJ1ZTsKICAgICBzZXRCbGVuZGluZ0tleWZyYW1l cyhrZXlmcmFtZUxpc3QpOwogfQogCkBAIC05ODgsNyArOTk4LDcgQEAgdm9pZCBLZXlmcmFtZUVm ZmVjdDo6c2V0VGFyZ2V0KFJlZlB0cjxFbGVtZW50PiYmIG5ld1RhcmdldCkKICAgICBpZiAoYXV0 byogZWZmZWN0QW5pbWF0aW9uID0gYW5pbWF0aW9uKCkpCiAgICAgICAgIGVmZmVjdEFuaW1hdGlv bi0+ZWZmZWN0VGFyZ2V0RGlkQ2hhbmdlKHByZXZpb3VzVGFyZ2V0LmdldCgpLCBtX3RhcmdldC5n ZXQoKSk7CiAKLSAgICBtX2JsZW5kaW5nS2V5ZnJhbWVzLmNsZWFyKCk7CisgICAgY2xlYXJCbGVu ZGluZ0tleWZyYW1lcygpOwogCiAgICAgLy8gV2UgbmVlZCB0byBpbnZhbGlkYXRlIHRoZSBlZmZl Y3Qgbm93IHRoYXQgdGhlIHRhcmdldCBoYXMgY2hhbmdlZAogICAgIC8vIHRvIGVuc3VyZSB0aGUg ZWZmZWN0J3Mgc3R5bGVzIGFyZSBhcHBsaWVkIHRvIHRoZSBuZXcgdGFyZ2V0IHJpZ2h0IGF3YXku CkBAIC0xMDU0LDYgKzEwNjQsMTUgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6Z2V0QW5pbWF0ZWRT dHlsZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+JiBhbmltYXRlZFN0eWwKIAogdm9pZCBL ZXlmcmFtZUVmZmVjdDo6c2V0QW5pbWF0ZWRQcm9wZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHlsZSYg dGFyZ2V0U3R5bGUsIGRvdWJsZSBpdGVyYXRpb25Qcm9ncmVzcykKIHsKKyAgICAvLyBJbiB0aGUg Y2FzZSBvZiBDU1MgVHJhbnNpdGlvbnMgd2UgYWxyZWFkeSBrbm93IHRoYXQgdGhlcmUgYXJlIG9u bHkgdHdvIGtleWZyYW1lcywgb25lIHdoZXJlIG9mZnNldD0wIGFuZCBvbmUgd2hlcmUgb2Zmc2V0 PTEsCisgICAgLy8gYW5kIG9ubHkgYSBzaW5nbGUgQ1NTIHByb3BlcnR5IHNvIHdlIGNhbiBzaW1w bHkgYmxlbmQgYmFzZWQgb24gdGhlIHN0eWxlIGF2YWlsYWJsZSBvbiB0aG9zZSBrZXlmcmFtZXMg d2l0aCB0aGUgcHJvdmlkZWQgaXRlcmF0aW9uCisgICAgLy8gcHJvZ3Jlc3Mgd2hpY2ggYWxyZWFk eSBhY2NvdW50cyBmb3IgdGhlIHRyYW5zaXRpb24ncyB0aW1pbmcgZnVuY3Rpb24uCisgICAgaWYg KG1fYmxlbmRpbmdLZXlmcmFtZXNDb21wdXRlZEZvckNTU1RyYW5zaXRpb24pIHsKKyAgICAgICAg QVNTRVJUKGlzPENTU1RyYW5zaXRpb24+KGFuaW1hdGlvbigpKSk7CisgICAgICAgIENTU1Byb3Bl cnR5QW5pbWF0aW9uOjpibGVuZFByb3BlcnRpZXModGhpcywgZG93bmNhc3Q8Q1NTVHJhbnNpdGlv bj4oYW5pbWF0aW9uKCkpLT5wcm9wZXJ0eSgpLCAmdGFyZ2V0U3R5bGUsIG1fYmxlbmRpbmdLZXlm cmFtZXNbMF0uc3R5bGUoKSwgbV9ibGVuZGluZ0tleWZyYW1lc1sxXS5zdHlsZSgpLCBpdGVyYXRp b25Qcm9ncmVzcyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyA0LjQuMy4gVGhl IGVmZmVjdCB2YWx1ZSBvZiBhIGtleWZyYW1lIGVmZmVjdAogICAgIC8vIGh0dHBzOi8vZHJhZnRz LmNzc3dnLm9yZy93ZWItYW5pbWF0aW9ucy0xLyN0aGUtZWZmZWN0LXZhbHVlLW9mLWEta2V5ZnJh bWUtYW5pbWF0aW9uLWVmZmVjdAogICAgIC8vCkBAIC0xMDY0LDkgKzEwODMsNiBAQCB2b2lkIEtl eWZyYW1lRWZmZWN0OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKFJlbmRlclN0eWxlJiB0 YXJnZXRTdHlsZSwgZG91YgogICAgIGlmIChtX2JsZW5kaW5nS2V5ZnJhbWVzLmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgYm9vbCBpc0NTU0FuaW1hdGlvbiA9IGlzPENTU0FuaW1h dGlvbj4oYW5pbWF0aW9uKCkpOwotICAgIGJvb2wgaXNDU1NUcmFuc2l0aW9uID0gaXM8Q1NTVHJh bnNpdGlvbj4oYW5pbWF0aW9uKCkpOwotCiAgICAgZm9yIChhdXRvIGNzc1Byb3BlcnR5SWQgOiBt X2JsZW5kaW5nS2V5ZnJhbWVzLnByb3BlcnRpZXMoKSkgewogICAgICAgICAvLyAxLiBJZiBpdGVy YXRpb24gcHJvZ3Jlc3MgaXMgdW5yZXNvbHZlZCBhYm9ydCB0aGlzIHByb2NlZHVyZS4KICAgICAg ICAgLy8gMi4gTGV0IHRhcmdldCBwcm9wZXJ0eSBiZSB0aGUgbG9uZ2hhbmQgcHJvcGVydHkgZm9y IHdoaWNoIHRoZSBlZmZlY3QgdmFsdWUgaXMgdG8gYmUgY2FsY3VsYXRlZC4KQEAgLTEwODUsNyAr MTEwMSw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5 bGUoUmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAgICAgICAgICAgICBpZiAoIWtleWZy YW1lLmNvbnRhaW5zUHJvcGVydHkoY3NzUHJvcGVydHlJZCkpIHsKICAgICAgICAgICAgICAgICAv LyBJZiB3ZSdyZSBkZWFsaW5nIHdpdGggYSBDU1MgYW5pbWF0aW9uLCB3ZSBjb25zaWRlciB0aGUg Zmlyc3QgYW5kIGxhc3Qga2V5ZnJhbWVzIHRvIGFsd2F5cyBoYXZlIHRoZSBwcm9wZXJ0eSBsaXN0 ZWQKICAgICAgICAgICAgICAgICAvLyBzaW5jZSB0aGUgdW5kZXJseWluZyBzdHlsZSB3YXMgcHJv dmlkZWQgYW5kIHNob3VsZCBiZSBjYXB0dXJlZC4KLSAgICAgICAgICAgICAgICBpZiAoIWlzQ1NT QW5pbWF0aW9uIHx8IChvZmZzZXQgJiYgb2Zmc2V0IDwgMSkpCisgICAgICAgICAgICAgICAgaWYg KCFtX2JsZW5kaW5nS2V5ZnJhbWVzQ29tcHV0ZWRGb3JDU1NBbmltYXRpb24gfHwgKG9mZnNldCAm JiBvZmZzZXQgPCAxKSkKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAoIW9mZnNldCkKQEAgLTExODQsMTAgKzEyMDAsOCBAQCB2b2lk IEtleWZyYW1lRWZmZWN0OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKFJlbmRlclN0eWxl JiB0YXJnZXRTdHlsZSwgZG91YgogCiAgICAgICAgIC8vIDE3LiBMZXQgdHJhbnNmb3JtZWQgZGlz dGFuY2UgYmUgdGhlIHJlc3VsdCBvZiBldmFsdWF0aW5nIHRoZSB0aW1pbmcgZnVuY3Rpb24gYXNz b2NpYXRlZCB3aXRoIHRoZSBmaXJzdCBrZXlmcmFtZSBpbiBpbnRlcnZhbCBlbmRwb2ludHMKICAg ICAgICAgLy8gICAgIHBhc3NpbmcgaW50ZXJ2YWwgZGlzdGFuY2UgYXMgdGhlIGlucHV0IHByb2dy ZXNzLgotICAgICAgICAvLyBXZSBkbyBub3QgbmVlZCB0byBkbyB0aGlzIGZvciBDU1MgVHJhbnNp dGlvbnMgc2luY2UgdGhlIHRpbWluZyBmdW5jdGlvbiBpcyBhcHBsaWVkIHRvIHRoZSBBbmltYXRp b25FZmZlY3QgYXMgYSB3aG9sZSBhbmQgdGh1cwotICAgICAgICAvLyBpdGVyYXRpb25Qcm9ncmVz cyBpcyBhbHJlYWR5IHRyYW5zZm9ybWVkLgogICAgICAgICBhdXRvIHRyYW5zZm9ybWVkRGlzdGFu Y2UgPSBpbnRlcnZhbERpc3RhbmNlOwotICAgICAgICBpZiAoIWlzQ1NTVHJhbnNpdGlvbiAmJiBz dGFydEtleWZyYW1lSW5kZXgpIHsKKyAgICAgICAgaWYgKHN0YXJ0S2V5ZnJhbWVJbmRleCkgewog ICAgICAgICAgICAgaWYgKGF1dG8gZHVyYXRpb24gPSBpdGVyYXRpb25EdXJhdGlvbigpKSB7CiAg ICAgICAgICAgICAgICAgYXV0byByYW5nZUR1cmF0aW9uID0gKGVuZE9mZnNldCAtIHN0YXJ0T2Zm c2V0KSAqIGR1cmF0aW9uLnNlY29uZHMoKTsKICAgICAgICAgICAgICAgICBpZiAoYXV0byogdGlt aW5nRnVuY3Rpb24gPSB0aW1pbmdGdW5jdGlvbkZvcktleWZyYW1lQXRJbmRleChzdGFydEtleWZy YW1lSW5kZXgudmFsdWUoKSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24v S2V5ZnJhbWVFZmZlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVj dC5oCmluZGV4IDRiOGY0ZWQxMzU2OTM1Yjg3N2M2ODZmMTc2YzI3OGNiNGU2Y2E3YzQuLjA0MWRl MTBkNjQzOTFiY2ViMzk2M2U2MTQ3YTg3YzcxYmFlMjkxZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oCkBAIC0xNTEsNiArMTUxLDcgQEAgcHJpdmF0ZToKICAg ICBSZWY8Y29uc3QgQW5pbWF0aW9uPiBiYWNraW5nQW5pbWF0aW9uRm9yQ29tcG9zaXRlZFJlbmRl cmVyKCkgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlZE5lZWRzRm9yY2VkTGF5b3V0KCk7CiAgICAg dm9pZCBjb21wdXRlU3RhY2tpbmdDb250ZXh0SW1wYWN0KCk7CisgICAgdm9pZCBjbGVhckJsZW5k aW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCB1cGRhdGVCbGVuZGluZ0tleWZyYW1lcyhSZW5kZXJT dHlsZSYpOwogICAgIHZvaWQgY29tcHV0ZUNTU0FuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKCk7 CiAgICAgdm9pZCBjb21wdXRlQ1NTVHJhbnNpdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJl bmRlclN0eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKTsKQEAgLTE4 MSw2ICsxODIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9iYWNrZHJvcEZpbHRlckZ1bmN0aW9u TGlzdHNNYXRjaCB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBib29sIG1fY29sb3JGaWx0ZXJGdW5j dGlvbkxpc3RzTWF0Y2ggeyBmYWxzZSB9OworICAgIGJvb2wgbV9ibGVuZGluZ0tleWZyYW1lc0Nv bXB1dGVkRm9yQ1NTVHJhbnNpdGlvbiB7IGZhbHNlIH07CisgICAgYm9vbCBtX2JsZW5kaW5nS2V5 ZnJhbWVzQ29tcHV0ZWRGb3JDU1NBbmltYXRpb24geyBmYWxzZSB9OwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQo= 382183 2019-10-29 08:46:40 -0700 2019-10-29 09:08:58 -0700 Patch bug-203561-20191029164637.patch text/plain 8850 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjY2Q5NDVjMzdlNzA4 ZDIzNDVlYjlhMWQxOTM5MmVlN2RmYjdkOC4uOGRlOTQ5Y2ViZTJmN2FmNzU5ZjRmYmI2ZWM3MmI4 NmM3ZDUwMzA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTEwLTI5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgd29yayBwZXJmb3JtZWQgaW4gS2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUoKSBoYXMgYSBsZXZlbCBv ZiBjb21wbGV4aXR5IHdhcnJhbnRlZCBieSB0aGUKKyAgICAgICAgZmxleGliaWxpdHkgb2YgaG93 IGtleWZyYW1lcyBjYW4gYmUgc3BlY2lmaWVkIHZpYSB0aGUgV2ViIEFuaW1hdGlvbnMgSlMgQVBJ LiBIb3dldmVyLCBpbiB0aGUgY2FzZSBvZiBDU1MgVHJhbnNpdGlvbnMsCisgICAgICAgIHdlIGFs cmVhZHkga25vdyB0aGF0IHRoZXJlIGFyZSBvbmx5IHR3byBrZXlmcmFtZXMsIG9uZSB3aGVyZSBv ZmZzZXQ9MCBhbmQgb25lIHdoZXJlIG9mZnNldD0xLCBhbmQgdGhhdCBvbmx5IGEgc2luZ2xlCisg ICAgICAgIENTUyBwcm9wZXJ0eSBpcyBzcGVjaWZpZWQgc28gd2UgY2FuIHNpbXBsaWZ5IHRoZSBw cm9jZXNzIGdyZWF0bHkuCisKKyAgICAgICAgVG8gZW5zdXJlIHdlIG9ubHkgcGVyZm9ybSB0aGlz IHF1aWNrZXIgYmxlbmRpbmcgb3BlcmF0aW9uIGZvciBrZXlmcmFtZXMgY29tcHV0ZWQgZm9yIGEg Q1NTIFRyYW5zaXRpb24gYW5kIHRoYXQgbm8KKyAgICAgICAgbW9kaWZpY2F0aW9uIHRvIHRoZSBr ZXlmcmFtZXMgaGF2ZSBiZWVuIGFwcGxpZWQgdmlhIHRoZSBXZWIgQW5pbWF0aW9ucyBKUyBBUEkg YWZ0ZXIgdGhlIGZhY3QsIHdlIG5vdyBrZWVwIHRyYWNrCisgICAgICAgIG9mIHdoZXRoZXIgdGhl IGJsZW5kaW5nIGtleWZyYW1lcyAoS2V5ZnJhbWVMaXN0KSB3ZXJlIGdlbmVyYXRlZCBmb3IgYSBD U1MgVHJhbnNpdGlvbiBvciBhIENTUyBBbmltYXRpb24gYW5kIG9ubHkKKyAgICAgICAgdXNlIHRo aXMgaW5mb3JtYXRpb24gdG8gZGVjaWRlIHdoZXRoZXIgd2UncmUgYmxlbmRpbmcgZm9yIGRlY2xh cmF0aXZlIGFuaW1hdGlvbnMuCisKKyAgICAgICAgKiBhbmltYXRpb24vS2V5ZnJhbWVFZmZlY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NLZXlmcmFtZXMp OgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNsZWFyQmxlbmRpbmdLZXlmcmFt ZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRp b25CbGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6 Y29tcHV0ZUNTU1RyYW5zaXRpb25CbGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3Jl OjpLZXlmcmFtZUVmZmVjdDo6c2V0VGFyZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1l RWZmZWN0OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKToKKyAgICAgICAgKiBhbmltYXRp b24vS2V5ZnJhbWVFZmZlY3QuaDoKKwogMjAxOS0xMC0yOCAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAYXBwbGUuY29tPgogCiAgICAgICAgIENTUyBUcmFuc2l0aW9ucyBhbmQgQ1NTIEFuaW1hdGlv bnMgcHJvcGVydGllcyBzaG91bGQgdHJlYXQgdW5pdGxlc3MgMCBhcyBhbiBpbnZhbGlkIHZhbHVl IGZvciB0aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1l RWZmZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAK aW5kZXggZmFkYzZkM2JjMjJjNDk4OWI0NWVmMDExOTExN2EyYmQ1ZDAxZTkwMy4uNDdiODUxMmMy OTI3Nzk0MGYzMmRkODZlNWRiMGQxNzBjNWYwNjhhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmlt YXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCkBAIC03MjYsNyArNzI2LDcgQEAgRXhjZXB0aW9uT3I8 dm9pZD4gS2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NLZXlmcmFtZXMoSlNHbG9iYWxPYmplY3QmIGxl eGljYWxHbG9iYWwKIAogICAgIG1fcGFyc2VkS2V5ZnJhbWVzID0gV1RGTW92ZShwYXJzZWRLZXlm cmFtZXMpOwogCi0gICAgbV9ibGVuZGluZ0tleWZyYW1lcy5jbGVhcigpOworICAgIGNsZWFyQmxl bmRpbmdLZXlmcmFtZXMoKTsKIAogICAgIHJldHVybiB7IH07CiB9CkBAIC03NzIsNiArNzcyLDEz IEBAIGJvb2wgS2V5ZnJhbWVFZmZlY3Q6OmZvcmNlTGF5b3V0SWZOZWVkZWQoKQogICAgIHJldHVy biB0cnVlOwogfQogCisKK3ZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNsZWFyQmxlbmRpbmdLZXlmcmFt ZXMoKQoreworICAgIG1fYmxlbmRpbmdLZXlmcmFtZXNDb21wdXRhdGlvblNvdXJjZSA9IEJsZW5k aW5nS2V5ZnJhbWVzQ29tcHV0YXRpb25Tb3VyY2U6OldlYkFuaW1hdGlvbjsKKyAgICBtX2JsZW5k aW5nS2V5ZnJhbWVzLmNsZWFyKCk7Cit9CisKIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEJsZW5k aW5nS2V5ZnJhbWVzKEtleWZyYW1lTGlzdCYgYmxlbmRpbmdLZXlmcmFtZXMpCiB7CiAgICAgbV9i bGVuZGluZ0tleWZyYW1lcyA9IFdURk1vdmUoYmxlbmRpbmdLZXlmcmFtZXMpOwpAQCAtOTA5LDYg KzkxNiw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRpb25CbGVuZGlu Z0tleWZyYW1lcygpCiAgICAgICAgICAgICBTdHlsZTo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoKnN0 eWxlLCBtX3RhcmdldC0+ZG9jdW1lbnQoKSwgbV90YXJnZXQuZ2V0KCkpOwogICAgIH0KIAorICAg IG1fYmxlbmRpbmdLZXlmcmFtZXNDb21wdXRhdGlvblNvdXJjZSA9IEJsZW5kaW5nS2V5ZnJhbWVz Q29tcHV0YXRpb25Tb3VyY2U6OkNTU0FuaW1hdGlvbjsKICAgICBzZXRCbGVuZGluZ0tleWZyYW1l cyhrZXlmcmFtZUxpc3QpOwogfQogCkBAIC05MzYsNiArOTQ0LDcgQEAgdm9pZCBLZXlmcmFtZUVm ZmVjdDo6Y29tcHV0ZUNTU1RyYW5zaXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJT dHlsZSogb2wKICAgICB0b0tleWZyYW1lVmFsdWUuYWRkUHJvcGVydHkocHJvcGVydHkpOwogICAg IGtleWZyYW1lTGlzdC5pbnNlcnQoV1RGTW92ZSh0b0tleWZyYW1lVmFsdWUpKTsKIAorICAgIG1f YmxlbmRpbmdLZXlmcmFtZXNDb21wdXRhdGlvblNvdXJjZSA9IEJsZW5kaW5nS2V5ZnJhbWVzQ29t cHV0YXRpb25Tb3VyY2U6OkNTU1RyYW5zaXRpb247CiAgICAgc2V0QmxlbmRpbmdLZXlmcmFtZXMo a2V5ZnJhbWVMaXN0KTsKIH0KIApAQCAtOTg4LDcgKzk5Nyw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZl Y3Q6OnNldFRhcmdldChSZWZQdHI8RWxlbWVudD4mJiBuZXdUYXJnZXQpCiAgICAgaWYgKGF1dG8q IGVmZmVjdEFuaW1hdGlvbiA9IGFuaW1hdGlvbigpKQogICAgICAgICBlZmZlY3RBbmltYXRpb24t PmVmZmVjdFRhcmdldERpZENoYW5nZShwcmV2aW91c1RhcmdldC5nZXQoKSwgbV90YXJnZXQuZ2V0 KCkpOwogCi0gICAgbV9ibGVuZGluZ0tleWZyYW1lcy5jbGVhcigpOworICAgIGNsZWFyQmxlbmRp bmdLZXlmcmFtZXMoKTsKIAogICAgIC8vIFdlIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgZWZmZWN0 IG5vdyB0aGF0IHRoZSB0YXJnZXQgaGFzIGNoYW5nZWQKICAgICAvLyB0byBlbnN1cmUgdGhlIGVm ZmVjdCdzIHN0eWxlcyBhcmUgYXBwbGllZCB0byB0aGUgbmV3IHRhcmdldCByaWdodCBhd2F5LgpA QCAtMTA1NCw2ICsxMDYzLDE1IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmdldEFuaW1hdGVkU3R5 bGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiYgYW5pbWF0ZWRTdHlsCiAKIHZvaWQgS2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUoUmVuZGVyU3R5bGUmIHRh cmdldFN0eWxlLCBkb3VibGUgaXRlcmF0aW9uUHJvZ3Jlc3MpCiB7CisgICAgLy8gSW4gdGhlIGNh c2Ugb2YgQ1NTIFRyYW5zaXRpb25zIHdlIGFscmVhZHkga25vdyB0aGF0IHRoZXJlIGFyZSBvbmx5 IHR3byBrZXlmcmFtZXMsIG9uZSB3aGVyZSBvZmZzZXQ9MCBhbmQgb25lIHdoZXJlIG9mZnNldD0x LAorICAgIC8vIGFuZCBvbmx5IGEgc2luZ2xlIENTUyBwcm9wZXJ0eSBzbyB3ZSBjYW4gc2ltcGx5 IGJsZW5kIGJhc2VkIG9uIHRoZSBzdHlsZSBhdmFpbGFibGUgb24gdGhvc2Uga2V5ZnJhbWVzIHdp dGggdGhlIHByb3ZpZGVkIGl0ZXJhdGlvbgorICAgIC8vIHByb2dyZXNzIHdoaWNoIGFscmVhZHkg YWNjb3VudHMgZm9yIHRoZSB0cmFuc2l0aW9uJ3MgdGltaW5nIGZ1bmN0aW9uLgorICAgIGlmICht X2JsZW5kaW5nS2V5ZnJhbWVzQ29tcHV0YXRpb25Tb3VyY2UgPT0gQmxlbmRpbmdLZXlmcmFtZXND b21wdXRhdGlvblNvdXJjZTo6Q1NTVHJhbnNpdGlvbikgeworICAgICAgICBBU1NFUlQoaXM8Q1NT VHJhbnNpdGlvbj4oYW5pbWF0aW9uKCkpKTsKKyAgICAgICAgQ1NTUHJvcGVydHlBbmltYXRpb246 OmJsZW5kUHJvcGVydGllcyh0aGlzLCBkb3duY2FzdDxDU1NUcmFuc2l0aW9uPihhbmltYXRpb24o KSktPnByb3BlcnR5KCksICZ0YXJnZXRTdHlsZSwgbV9ibGVuZGluZ0tleWZyYW1lc1swXS5zdHls ZSgpLCBtX2JsZW5kaW5nS2V5ZnJhbWVzWzFdLnN0eWxlKCksIGl0ZXJhdGlvblByb2dyZXNzKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8vIDQuNC4zLiBUaGUgZWZmZWN0IHZhbHVl IG9mIGEga2V5ZnJhbWUgZWZmZWN0CiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dl Yi1hbmltYXRpb25zLTEvI3RoZS1lZmZlY3QtdmFsdWUtb2YtYS1rZXlmcmFtZS1hbmltYXRpb24t ZWZmZWN0CiAgICAgLy8KQEAgLTEwNjQsOSArMTA4Miw2IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6 OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUoUmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBk b3ViCiAgICAgaWYgKG1fYmxlbmRpbmdLZXlmcmFtZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBib29sIGlzQ1NTQW5pbWF0aW9uID0gaXM8Q1NTQW5pbWF0aW9uPihhbmltYXRp b24oKSk7Ci0gICAgYm9vbCBpc0NTU1RyYW5zaXRpb24gPSBpczxDU1NUcmFuc2l0aW9uPihhbmlt YXRpb24oKSk7Ci0KICAgICBmb3IgKGF1dG8gY3NzUHJvcGVydHlJZCA6IG1fYmxlbmRpbmdLZXlm cmFtZXMucHJvcGVydGllcygpKSB7CiAgICAgICAgIC8vIDEuIElmIGl0ZXJhdGlvbiBwcm9ncmVz cyBpcyB1bnJlc29sdmVkIGFib3J0IHRoaXMgcHJvY2VkdXJlLgogICAgICAgICAvLyAyLiBMZXQg dGFyZ2V0IHByb3BlcnR5IGJlIHRoZSBsb25naGFuZCBwcm9wZXJ0eSBmb3Igd2hpY2ggdGhlIGVm ZmVjdCB2YWx1ZSBpcyB0byBiZSBjYWxjdWxhdGVkLgpAQCAtMTA4NSw3ICsxMTAwLDcgQEAgdm9p ZCBLZXlmcmFtZUVmZmVjdDo6c2V0QW5pbWF0ZWRQcm9wZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHls ZSYgdGFyZ2V0U3R5bGUsIGRvdWIKICAgICAgICAgICAgIGlmICgha2V5ZnJhbWUuY29udGFpbnNQ cm9wZXJ0eShjc3NQcm9wZXJ0eUlkKSkgewogICAgICAgICAgICAgICAgIC8vIElmIHdlJ3JlIGRl YWxpbmcgd2l0aCBhIENTUyBhbmltYXRpb24sIHdlIGNvbnNpZGVyIHRoZSBmaXJzdCBhbmQgbGFz dCBrZXlmcmFtZXMgdG8gYWx3YXlzIGhhdmUgdGhlIHByb3BlcnR5IGxpc3RlZAogICAgICAgICAg ICAgICAgIC8vIHNpbmNlIHRoZSB1bmRlcmx5aW5nIHN0eWxlIHdhcyBwcm92aWRlZCBhbmQgc2hv dWxkIGJlIGNhcHR1cmVkLgotICAgICAgICAgICAgICAgIGlmICghaXNDU1NBbmltYXRpb24gfHwg KG9mZnNldCAmJiBvZmZzZXQgPCAxKSkKKyAgICAgICAgICAgICAgICBpZiAobV9ibGVuZGluZ0tl eWZyYW1lc0NvbXB1dGF0aW9uU291cmNlID09IEJsZW5kaW5nS2V5ZnJhbWVzQ29tcHV0YXRpb25T b3VyY2U6OldlYkFuaW1hdGlvbiB8fCAob2Zmc2V0ICYmIG9mZnNldCA8IDEpKQogICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICghb2Zm c2V0KQpAQCAtMTE4NCwxMCArMTE5OSw4IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1h dGVkUHJvcGVydGllc0luU3R5bGUoUmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAKICAg ICAgICAgLy8gMTcuIExldCB0cmFuc2Zvcm1lZCBkaXN0YW5jZSBiZSB0aGUgcmVzdWx0IG9mIGV2 YWx1YXRpbmcgdGhlIHRpbWluZyBmdW5jdGlvbiBhc3NvY2lhdGVkIHdpdGggdGhlIGZpcnN0IGtl eWZyYW1lIGluIGludGVydmFsIGVuZHBvaW50cwogICAgICAgICAvLyAgICAgcGFzc2luZyBpbnRl cnZhbCBkaXN0YW5jZSBhcyB0aGUgaW5wdXQgcHJvZ3Jlc3MuCi0gICAgICAgIC8vIFdlIGRvIG5v dCBuZWVkIHRvIGRvIHRoaXMgZm9yIENTUyBUcmFuc2l0aW9ucyBzaW5jZSB0aGUgdGltaW5nIGZ1 bmN0aW9uIGlzIGFwcGxpZWQgdG8gdGhlIEFuaW1hdGlvbkVmZmVjdCBhcyBhIHdob2xlIGFuZCB0 aHVzCi0gICAgICAgIC8vIGl0ZXJhdGlvblByb2dyZXNzIGlzIGFscmVhZHkgdHJhbnNmb3JtZWQu CiAgICAgICAgIGF1dG8gdHJhbnNmb3JtZWREaXN0YW5jZSA9IGludGVydmFsRGlzdGFuY2U7Ci0g ICAgICAgIGlmICghaXNDU1NUcmFuc2l0aW9uICYmIHN0YXJ0S2V5ZnJhbWVJbmRleCkgeworICAg ICAgICBpZiAoc3RhcnRLZXlmcmFtZUluZGV4KSB7CiAgICAgICAgICAgICBpZiAoYXV0byBkdXJh dGlvbiA9IGl0ZXJhdGlvbkR1cmF0aW9uKCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIHJhbmdl RHVyYXRpb24gPSAoZW5kT2Zmc2V0IC0gc3RhcnRPZmZzZXQpICogZHVyYXRpb24uc2Vjb25kcygp OwogICAgICAgICAgICAgICAgIGlmIChhdXRvKiB0aW1pbmdGdW5jdGlvbiA9IHRpbWluZ0Z1bmN0 aW9uRm9yS2V5ZnJhbWVBdEluZGV4KHN0YXJ0S2V5ZnJhbWVJbmRleC52YWx1ZSgpKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oIGIvU291cmNl L1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmgKaW5kZXggNGI4ZjRlZDEzNTY5MzVi ODc3YzY4NmYxNzZjMjc4Y2I0ZTZjYTdjNC4uMGZiZDUzMTU5N2RhYjgzMWNmMmVjOTAzMjc2YTc3 YmJmNmE1MzVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1l RWZmZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmgK QEAgLTE0MSw2ICsxNDEsNyBAQCBwcml2YXRlOgogICAgIEtleWZyYW1lRWZmZWN0KEVsZW1lbnQq KTsKIAogICAgIGVudW0gY2xhc3MgQWNjZWxlcmF0ZWRBY3Rpb24gOiB1aW50OF90IHsgUGxheSwg UGF1c2UsIFNlZWssIFN0b3AgfTsKKyAgICBlbnVtIGNsYXNzIEJsZW5kaW5nS2V5ZnJhbWVzQ29t cHV0YXRpb25Tb3VyY2UgOiB1aW50OF90IHsgQ1NTQW5pbWF0aW9uLCBDU1NUcmFuc2l0aW9uLCBX ZWJBbmltYXRpb24gfTsKIAogICAgIHZvaWQgY29weVByb3BlcnRpZXNGcm9tU291cmNlKFJlZjxL ZXlmcmFtZUVmZmVjdD4mJik7CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gcHJvY2Vzc0tleWZyYW1l cyhKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSlNDOjpTdHJvbmc8SlNDOjpKU09iamVjdD4mJik7CkBA IC0xNTEsNiArMTUyLDcgQEAgcHJpdmF0ZToKICAgICBSZWY8Y29uc3QgQW5pbWF0aW9uPiBiYWNr aW5nQW5pbWF0aW9uRm9yQ29tcG9zaXRlZFJlbmRlcmVyKCkgY29uc3Q7CiAgICAgdm9pZCBjb21w dXRlZE5lZWRzRm9yY2VkTGF5b3V0KCk7CiAgICAgdm9pZCBjb21wdXRlU3RhY2tpbmdDb250ZXh0 SW1wYWN0KCk7CisgICAgdm9pZCBjbGVhckJsZW5kaW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCB1 cGRhdGVCbGVuZGluZ0tleWZyYW1lcyhSZW5kZXJTdHlsZSYpOwogICAgIHZvaWQgY29tcHV0ZUNT U0FuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCBjb21wdXRlQ1NTVHJhbnNp dGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSwgY29uc3Qg UmVuZGVyU3R5bGUmIG5ld1N0eWxlKTsKQEAgLTE3MCw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAg IFJlZlB0cjxFbGVtZW50PiBtX3RhcmdldDsKIAogICAgIEFjY2VsZXJhdGVkQWN0aW9uIG1fbGFz dFJlY29yZGVkQWNjZWxlcmF0ZWRBY3Rpb24geyBBY2NlbGVyYXRlZEFjdGlvbjo6U3RvcCB9Owor ICAgIEJsZW5kaW5nS2V5ZnJhbWVzQ29tcHV0YXRpb25Tb3VyY2UgbV9ibGVuZGluZ0tleWZyYW1l c0NvbXB1dGF0aW9uU291cmNlIHsgQmxlbmRpbmdLZXlmcmFtZXNDb21wdXRhdGlvblNvdXJjZTo6 V2ViQW5pbWF0aW9uIH07CiAgICAgSXRlcmF0aW9uQ29tcG9zaXRlT3BlcmF0aW9uIG1faXRlcmF0 aW9uQ29tcG9zaXRlT3BlcmF0aW9uIHsgSXRlcmF0aW9uQ29tcG9zaXRlT3BlcmF0aW9uOjpSZXBs YWNlIH07CiAgICAgQ29tcG9zaXRlT3BlcmF0aW9uIG1fY29tcG9zaXRlT3BlcmF0aW9uIHsgQ29t cG9zaXRlT3BlcmF0aW9uOjpSZXBsYWNlIH07CiAgICAgYm9vbCBtX3Nob3VsZFJ1bkFjY2VsZXJh dGVkIHsgZmFsc2UgfTsK 382185 2019-10-29 09:09:02 -0700 2019-10-30 03:25:14 -0700 Patch for landing bug-203561-20191029170901.patch text/plain 8694 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjY2Q5NDVjMzdlNzA4 ZDIzNDVlYjlhMWQxOTM5MmVlN2RmYjdkOC4uZjNkY2FiMzEwYWZjMTVjN2JjMjdkZDgwY2VhYTY5 NzUzNDMwMzQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTEwLTI5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhlIHdvcmsgcGVyZm9ybWVkIGluIEtleWZy YW1lRWZmZWN0OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKCkgaGFzIGEgbGV2ZWwgb2Yg Y29tcGxleGl0eSB3YXJyYW50ZWQgYnkgdGhlCisgICAgICAgIGZsZXhpYmlsaXR5IG9mIGhvdyBr ZXlmcmFtZXMgY2FuIGJlIHNwZWNpZmllZCB2aWEgdGhlIFdlYiBBbmltYXRpb25zIEpTIEFQSS4g SG93ZXZlciwgaW4gdGhlIGNhc2Ugb2YgQ1NTIFRyYW5zaXRpb25zLAorICAgICAgICB3ZSBhbHJl YWR5IGtub3cgdGhhdCB0aGVyZSBhcmUgb25seSB0d28ga2V5ZnJhbWVzLCBvbmUgd2hlcmUgb2Zm c2V0PTAgYW5kIG9uZSB3aGVyZSBvZmZzZXQ9MSwgYW5kIHRoYXQgb25seSBhIHNpbmdsZQorICAg ICAgICBDU1MgcHJvcGVydHkgaXMgc3BlY2lmaWVkIHNvIHdlIGNhbiBzaW1wbGlmeSB0aGUgcHJv Y2VzcyBncmVhdGx5LgorCisgICAgICAgIFRvIGVuc3VyZSB3ZSBvbmx5IHBlcmZvcm0gdGhpcyBx dWlja2VyIGJsZW5kaW5nIG9wZXJhdGlvbiBmb3Iga2V5ZnJhbWVzIGNvbXB1dGVkIGZvciBhIENT UyBUcmFuc2l0aW9uIGFuZCB0aGF0IG5vCisgICAgICAgIG1vZGlmaWNhdGlvbiB0byB0aGUga2V5 ZnJhbWVzIGhhdmUgYmVlbiBhcHBsaWVkIHZpYSB0aGUgV2ViIEFuaW1hdGlvbnMgSlMgQVBJIGFm dGVyIHRoZSBmYWN0LCB3ZSBub3cga2VlcCB0cmFjaworICAgICAgICBvZiB3aGV0aGVyIHRoZSBi bGVuZGluZyBrZXlmcmFtZXMgKEtleWZyYW1lTGlzdCkgd2VyZSBnZW5lcmF0ZWQgZm9yIGEgQ1NT IFRyYW5zaXRpb24gb3IgYSBDU1MgQW5pbWF0aW9uIGFuZCBvbmx5CisgICAgICAgIHVzZSB0aGlz IGluZm9ybWF0aW9uIHRvIGRlY2lkZSB3aGV0aGVyIHdlJ3JlIGJsZW5kaW5nIGZvciBkZWNsYXJh dGl2ZSBhbmltYXRpb25zLgorCisgICAgICAgICogYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpwcm9jZXNzS2V5ZnJhbWVzKToK KyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0OjpjbGVhckJsZW5kaW5nS2V5ZnJhbWVz KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpjb21wdXRlQ1NTQW5pbWF0aW9u QmxlbmRpbmdLZXlmcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNv bXB1dGVDU1NUcmFuc2l0aW9uQmxlbmRpbmdLZXlmcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6 S2V5ZnJhbWVFZmZlY3Q6OnNldFRhcmdldCk6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVm ZmVjdDo6c2V0QW5pbWF0ZWRQcm9wZXJ0aWVzSW5TdHlsZSk6CisgICAgICAgICogYW5pbWF0aW9u L0tleWZyYW1lRWZmZWN0Lmg6CisKIDIwMTktMTAtMjggIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz QGFwcGxlLmNvbT4KIAogICAgICAgICBDU1MgVHJhbnNpdGlvbnMgYW5kIENTUyBBbmltYXRpb25z IHByb3BlcnRpZXMgc2hvdWxkIHRyZWF0IHVuaXRsZXNzIDAgYXMgYW4gaW52YWxpZCB2YWx1ZSBm b3IgdGltZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVm ZmVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmlu ZGV4IGZhZGM2ZDNiYzIyYzQ5ODliNDVlZjAxMTkxMTdhMmJkNWQwMWU5MDMuLjRmMWQ2MmNjZjg2 OTEwYTUxYWQ4NzhkY2ZlNjdmYzZjYjNjZTM3ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0 aW9uL0tleWZyYW1lRWZmZWN0LmNwcApAQCAtNzI2LDcgKzcyNiw3IEBAIEV4Y2VwdGlvbk9yPHZv aWQ+IEtleWZyYW1lRWZmZWN0Ojpwcm9jZXNzS2V5ZnJhbWVzKEpTR2xvYmFsT2JqZWN0JiBsZXhp Y2FsR2xvYmFsCiAKICAgICBtX3BhcnNlZEtleWZyYW1lcyA9IFdURk1vdmUocGFyc2VkS2V5ZnJh bWVzKTsKIAotICAgIG1fYmxlbmRpbmdLZXlmcmFtZXMuY2xlYXIoKTsKKyAgICBjbGVhckJsZW5k aW5nS2V5ZnJhbWVzKCk7CiAKICAgICByZXR1cm4geyB9OwogfQpAQCAtNzcyLDYgKzc3MiwxMyBA QCBib29sIEtleWZyYW1lRWZmZWN0Ojpmb3JjZUxheW91dElmTmVlZGVkKCkKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAorCit2b2lkIEtleWZyYW1lRWZmZWN0OjpjbGVhckJsZW5kaW5nS2V5ZnJhbWVz KCkKK3sKKyAgICBtX2JsZW5kaW5nS2V5ZnJhbWVzU291cmNlID0gQmxlbmRpbmdLZXlmcmFtZXNT b3VyY2U6OldlYkFuaW1hdGlvbjsKKyAgICBtX2JsZW5kaW5nS2V5ZnJhbWVzLmNsZWFyKCk7Cit9 CisKIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEJsZW5kaW5nS2V5ZnJhbWVzKEtleWZyYW1lTGlz dCYgYmxlbmRpbmdLZXlmcmFtZXMpCiB7CiAgICAgbV9ibGVuZGluZ0tleWZyYW1lcyA9IFdURk1v dmUoYmxlbmRpbmdLZXlmcmFtZXMpOwpAQCAtOTA5LDYgKzkxNiw3IEBAIHZvaWQgS2V5ZnJhbWVF ZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcygpCiAgICAgICAgICAg ICBTdHlsZTo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoKnN0eWxlLCBtX3RhcmdldC0+ZG9jdW1lbnQo KSwgbV90YXJnZXQuZ2V0KCkpOwogICAgIH0KIAorICAgIG1fYmxlbmRpbmdLZXlmcmFtZXNTb3Vy Y2UgPSBCbGVuZGluZ0tleWZyYW1lc1NvdXJjZTo6Q1NTQW5pbWF0aW9uOwogICAgIHNldEJsZW5k aW5nS2V5ZnJhbWVzKGtleWZyYW1lTGlzdCk7CiB9CiAKQEAgLTkzNiw2ICs5NDQsNyBAQCB2b2lk IEtleWZyYW1lRWZmZWN0Ojpjb21wdXRlQ1NTVHJhbnNpdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNv bnN0IFJlbmRlclN0eWxlKiBvbAogICAgIHRvS2V5ZnJhbWVWYWx1ZS5hZGRQcm9wZXJ0eShwcm9w ZXJ0eSk7CiAgICAga2V5ZnJhbWVMaXN0Lmluc2VydChXVEZNb3ZlKHRvS2V5ZnJhbWVWYWx1ZSkp OwogCisgICAgbV9ibGVuZGluZ0tleWZyYW1lc1NvdXJjZSA9IEJsZW5kaW5nS2V5ZnJhbWVzU291 cmNlOjpDU1NUcmFuc2l0aW9uOwogICAgIHNldEJsZW5kaW5nS2V5ZnJhbWVzKGtleWZyYW1lTGlz dCk7CiB9CiAKQEAgLTk4OCw3ICs5OTcsNyBAQCB2b2lkIEtleWZyYW1lRWZmZWN0OjpzZXRUYXJn ZXQoUmVmUHRyPEVsZW1lbnQ+JiYgbmV3VGFyZ2V0KQogICAgIGlmIChhdXRvKiBlZmZlY3RBbmlt YXRpb24gPSBhbmltYXRpb24oKSkKICAgICAgICAgZWZmZWN0QW5pbWF0aW9uLT5lZmZlY3RUYXJn ZXREaWRDaGFuZ2UocHJldmlvdXNUYXJnZXQuZ2V0KCksIG1fdGFyZ2V0LmdldCgpKTsKIAotICAg IG1fYmxlbmRpbmdLZXlmcmFtZXMuY2xlYXIoKTsKKyAgICBjbGVhckJsZW5kaW5nS2V5ZnJhbWVz KCk7CiAKICAgICAvLyBXZSBuZWVkIHRvIGludmFsaWRhdGUgdGhlIGVmZmVjdCBub3cgdGhhdCB0 aGUgdGFyZ2V0IGhhcyBjaGFuZ2VkCiAgICAgLy8gdG8gZW5zdXJlIHRoZSBlZmZlY3QncyBzdHls ZXMgYXJlIGFwcGxpZWQgdG8gdGhlIG5ldyB0YXJnZXQgcmlnaHQgYXdheS4KQEAgLTEwNTQsNiAr MTA2MywxNSBAQCB2b2lkIEtleWZyYW1lRWZmZWN0OjpnZXRBbmltYXRlZFN0eWxlKHN0ZDo6dW5p cXVlX3B0cjxSZW5kZXJTdHlsZT4mIGFuaW1hdGVkU3R5bAogCiB2b2lkIEtleWZyYW1lRWZmZWN0 OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKFJlbmRlclN0eWxlJiB0YXJnZXRTdHlsZSwg ZG91YmxlIGl0ZXJhdGlvblByb2dyZXNzKQogeworICAgIC8vIEluIHRoZSBjYXNlIG9mIENTUyBU cmFuc2l0aW9ucyB3ZSBhbHJlYWR5IGtub3cgdGhhdCB0aGVyZSBhcmUgb25seSB0d28ga2V5ZnJh bWVzLCBvbmUgd2hlcmUgb2Zmc2V0PTAgYW5kIG9uZSB3aGVyZSBvZmZzZXQ9MSwKKyAgICAvLyBh bmQgb25seSBhIHNpbmdsZSBDU1MgcHJvcGVydHkgc28gd2UgY2FuIHNpbXBseSBibGVuZCBiYXNl ZCBvbiB0aGUgc3R5bGUgYXZhaWxhYmxlIG9uIHRob3NlIGtleWZyYW1lcyB3aXRoIHRoZSBwcm92 aWRlZCBpdGVyYXRpb24KKyAgICAvLyBwcm9ncmVzcyB3aGljaCBhbHJlYWR5IGFjY291bnRzIGZv ciB0aGUgdHJhbnNpdGlvbidzIHRpbWluZyBmdW5jdGlvbi4KKyAgICBpZiAobV9ibGVuZGluZ0tl eWZyYW1lc1NvdXJjZSA9PSBCbGVuZGluZ0tleWZyYW1lc1NvdXJjZTo6Q1NTVHJhbnNpdGlvbikg eworICAgICAgICBBU1NFUlQoaXM8Q1NTVHJhbnNpdGlvbj4oYW5pbWF0aW9uKCkpKTsKKyAgICAg ICAgQ1NTUHJvcGVydHlBbmltYXRpb246OmJsZW5kUHJvcGVydGllcyh0aGlzLCBkb3duY2FzdDxD U1NUcmFuc2l0aW9uPihhbmltYXRpb24oKSktPnByb3BlcnR5KCksICZ0YXJnZXRTdHlsZSwgbV9i bGVuZGluZ0tleWZyYW1lc1swXS5zdHlsZSgpLCBtX2JsZW5kaW5nS2V5ZnJhbWVzWzFdLnN0eWxl KCksIGl0ZXJhdGlvblByb2dyZXNzKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8v IDQuNC4zLiBUaGUgZWZmZWN0IHZhbHVlIG9mIGEga2V5ZnJhbWUgZWZmZWN0CiAgICAgLy8gaHR0 cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1hbmltYXRpb25zLTEvI3RoZS1lZmZlY3QtdmFsdWUt b2YtYS1rZXlmcmFtZS1hbmltYXRpb24tZWZmZWN0CiAgICAgLy8KQEAgLTEwNjQsOSArMTA4Miw2 IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUoUmVu ZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAgICAgaWYgKG1fYmxlbmRpbmdLZXlmcmFtZXMu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBib29sIGlzQ1NTQW5pbWF0aW9uID0g aXM8Q1NTQW5pbWF0aW9uPihhbmltYXRpb24oKSk7Ci0gICAgYm9vbCBpc0NTU1RyYW5zaXRpb24g PSBpczxDU1NUcmFuc2l0aW9uPihhbmltYXRpb24oKSk7Ci0KICAgICBmb3IgKGF1dG8gY3NzUHJv cGVydHlJZCA6IG1fYmxlbmRpbmdLZXlmcmFtZXMucHJvcGVydGllcygpKSB7CiAgICAgICAgIC8v IDEuIElmIGl0ZXJhdGlvbiBwcm9ncmVzcyBpcyB1bnJlc29sdmVkIGFib3J0IHRoaXMgcHJvY2Vk dXJlLgogICAgICAgICAvLyAyLiBMZXQgdGFyZ2V0IHByb3BlcnR5IGJlIHRoZSBsb25naGFuZCBw cm9wZXJ0eSBmb3Igd2hpY2ggdGhlIGVmZmVjdCB2YWx1ZSBpcyB0byBiZSBjYWxjdWxhdGVkLgpA QCAtMTA4NSw3ICsxMTAwLDcgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6c2V0QW5pbWF0ZWRQcm9w ZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHlsZSYgdGFyZ2V0U3R5bGUsIGRvdWIKICAgICAgICAgICAg IGlmICgha2V5ZnJhbWUuY29udGFpbnNQcm9wZXJ0eShjc3NQcm9wZXJ0eUlkKSkgewogICAgICAg ICAgICAgICAgIC8vIElmIHdlJ3JlIGRlYWxpbmcgd2l0aCBhIENTUyBhbmltYXRpb24sIHdlIGNv bnNpZGVyIHRoZSBmaXJzdCBhbmQgbGFzdCBrZXlmcmFtZXMgdG8gYWx3YXlzIGhhdmUgdGhlIHBy b3BlcnR5IGxpc3RlZAogICAgICAgICAgICAgICAgIC8vIHNpbmNlIHRoZSB1bmRlcmx5aW5nIHN0 eWxlIHdhcyBwcm92aWRlZCBhbmQgc2hvdWxkIGJlIGNhcHR1cmVkLgotICAgICAgICAgICAgICAg IGlmICghaXNDU1NBbmltYXRpb24gfHwgKG9mZnNldCAmJiBvZmZzZXQgPCAxKSkKKyAgICAgICAg ICAgICAgICBpZiAobV9ibGVuZGluZ0tleWZyYW1lc1NvdXJjZSA9PSBCbGVuZGluZ0tleWZyYW1l c1NvdXJjZTo6V2ViQW5pbWF0aW9uIHx8IChvZmZzZXQgJiYgb2Zmc2V0IDwgMSkpCiAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCFv ZmZzZXQpCkBAIC0xMTg0LDEwICsxMTk5LDggQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6c2V0QW5p bWF0ZWRQcm9wZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHlsZSYgdGFyZ2V0U3R5bGUsIGRvdWIKIAog ICAgICAgICAvLyAxNy4gTGV0IHRyYW5zZm9ybWVkIGRpc3RhbmNlIGJlIHRoZSByZXN1bHQgb2Yg ZXZhbHVhdGluZyB0aGUgdGltaW5nIGZ1bmN0aW9uIGFzc29jaWF0ZWQgd2l0aCB0aGUgZmlyc3Qg a2V5ZnJhbWUgaW4gaW50ZXJ2YWwgZW5kcG9pbnRzCiAgICAgICAgIC8vICAgICBwYXNzaW5nIGlu dGVydmFsIGRpc3RhbmNlIGFzIHRoZSBpbnB1dCBwcm9ncmVzcy4KLSAgICAgICAgLy8gV2UgZG8g bm90IG5lZWQgdG8gZG8gdGhpcyBmb3IgQ1NTIFRyYW5zaXRpb25zIHNpbmNlIHRoZSB0aW1pbmcg ZnVuY3Rpb24gaXMgYXBwbGllZCB0byB0aGUgQW5pbWF0aW9uRWZmZWN0IGFzIGEgd2hvbGUgYW5k IHRodXMKLSAgICAgICAgLy8gaXRlcmF0aW9uUHJvZ3Jlc3MgaXMgYWxyZWFkeSB0cmFuc2Zvcm1l ZC4KICAgICAgICAgYXV0byB0cmFuc2Zvcm1lZERpc3RhbmNlID0gaW50ZXJ2YWxEaXN0YW5jZTsK LSAgICAgICAgaWYgKCFpc0NTU1RyYW5zaXRpb24gJiYgc3RhcnRLZXlmcmFtZUluZGV4KSB7Cisg ICAgICAgIGlmIChzdGFydEtleWZyYW1lSW5kZXgpIHsKICAgICAgICAgICAgIGlmIChhdXRvIGR1 cmF0aW9uID0gaXRlcmF0aW9uRHVyYXRpb24oKSkgewogICAgICAgICAgICAgICAgIGF1dG8gcmFu Z2VEdXJhdGlvbiA9IChlbmRPZmZzZXQgLSBzdGFydE9mZnNldCkgKiBkdXJhdGlvbi5zZWNvbmRz KCk7CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8qIHRpbWluZ0Z1bmN0aW9uID0gdGltaW5nRnVu Y3Rpb25Gb3JLZXlmcmFtZUF0SW5kZXgoc3RhcnRLZXlmcmFtZUluZGV4LnZhbHVlKCkpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuaAppbmRleCA0YjhmNGVkMTM1Njkz NWI4NzdjNjg2ZjE3NmMyNzhjYjRlNmNhN2M0Li4xNzc1OGFhOGVmZDM1YmI2MjM0ODllYWEwNDdm ZTE2ZjNkNzM3MzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJh bWVFZmZlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3Qu aApAQCAtMTQxLDYgKzE0MSw3IEBAIHByaXZhdGU6CiAgICAgS2V5ZnJhbWVFZmZlY3QoRWxlbWVu dCopOwogCiAgICAgZW51bSBjbGFzcyBBY2NlbGVyYXRlZEFjdGlvbiA6IHVpbnQ4X3QgeyBQbGF5 LCBQYXVzZSwgU2VlaywgU3RvcCB9OworICAgIGVudW0gY2xhc3MgQmxlbmRpbmdLZXlmcmFtZXNT b3VyY2UgOiB1aW50OF90IHsgQ1NTQW5pbWF0aW9uLCBDU1NUcmFuc2l0aW9uLCBXZWJBbmltYXRp b24gfTsKIAogICAgIHZvaWQgY29weVByb3BlcnRpZXNGcm9tU291cmNlKFJlZjxLZXlmcmFtZUVm ZmVjdD4mJik7CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gcHJvY2Vzc0tleWZyYW1lcyhKU0M6OkpT R2xvYmFsT2JqZWN0JiwgSlNDOjpTdHJvbmc8SlNDOjpKU09iamVjdD4mJik7CkBAIC0xNTEsNiAr MTUyLDcgQEAgcHJpdmF0ZToKICAgICBSZWY8Y29uc3QgQW5pbWF0aW9uPiBiYWNraW5nQW5pbWF0 aW9uRm9yQ29tcG9zaXRlZFJlbmRlcmVyKCkgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlZE5lZWRz Rm9yY2VkTGF5b3V0KCk7CiAgICAgdm9pZCBjb21wdXRlU3RhY2tpbmdDb250ZXh0SW1wYWN0KCk7 CisgICAgdm9pZCBjbGVhckJsZW5kaW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCB1cGRhdGVCbGVu ZGluZ0tleWZyYW1lcyhSZW5kZXJTdHlsZSYpOwogICAgIHZvaWQgY29tcHV0ZUNTU0FuaW1hdGlv bkJsZW5kaW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCBjb21wdXRlQ1NTVHJhbnNpdGlvbkJsZW5k aW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5 bGUmIG5ld1N0eWxlKTsKQEAgLTE3MCw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxF bGVtZW50PiBtX3RhcmdldDsKIAogICAgIEFjY2VsZXJhdGVkQWN0aW9uIG1fbGFzdFJlY29yZGVk QWNjZWxlcmF0ZWRBY3Rpb24geyBBY2NlbGVyYXRlZEFjdGlvbjo6U3RvcCB9OworICAgIEJsZW5k aW5nS2V5ZnJhbWVzU291cmNlIG1fYmxlbmRpbmdLZXlmcmFtZXNTb3VyY2UgeyBCbGVuZGluZ0tl eWZyYW1lc1NvdXJjZTo6V2ViQW5pbWF0aW9uIH07CiAgICAgSXRlcmF0aW9uQ29tcG9zaXRlT3Bl cmF0aW9uIG1faXRlcmF0aW9uQ29tcG9zaXRlT3BlcmF0aW9uIHsgSXRlcmF0aW9uQ29tcG9zaXRl T3BlcmF0aW9uOjpSZXBsYWNlIH07CiAgICAgQ29tcG9zaXRlT3BlcmF0aW9uIG1fY29tcG9zaXRl T3BlcmF0aW9uIHsgQ29tcG9zaXRlT3BlcmF0aW9uOjpSZXBsYWNlIH07CiAgICAgYm9vbCBtX3No b3VsZFJ1bkFjY2VsZXJhdGVkIHsgZmFsc2UgfTsK 382292 2019-10-30 02:49:58 -0700 2019-10-30 03:22:32 -0700 Patch bug-203561-20191030104957.patch text/plain 3430 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTk2ZWQxMGM0YTJlNDNh N2FhNGM1ODU0YjIyYTUzOTU2YWEyNGMyNC4uZjgzOWMzM2FjM2ZlZjc2MDRiZDZlNzE1NDI5MjQw N2Y0MDhlYmQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTEwLTMwICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3d1cCB0byBmaXggYSBjcmFzaCBm b3VuZCBpbiB3ZWJhbmltYXRpb25zL2VtcHR5LWtleWZyYW1lcy1jcmFzaC5odG1sLiBUaGUgS2V5 ZnJhbWVFZmZlY3QgZm9yIHdoaWNoIHRoZSBibGVuZGluZyBrZXlmcmFtZXMKKyAgICAgICAgd2Vy ZSBnZW5lcmF0ZWRmb3IgYSBDU1MgVHJhbnNpdGlvbiBjb3VsZCBiZSBhcHBsaWVkIHRvIGEgZGlm ZmVyZW50IGFuaW1hdGlvbiwgd2hpY2ggaXMgbm90IGEgQ1NTVHJhbnNpdGlvbiwgd2hpY2ggZG9l cyBub3QgY2hhbmdlCisgICAgICAgIHRoZSBmYWN0IHRoYXQgd2UgY2FuIGJsZW5kIHRoZSBzaW5n bGUgQ1NTIHByb3BlcnR5IHdpdGggdHdvIGZ1bGx5LXF1YWxpZmllZCBrZXlmcmFtZXMgZGlyZWN0 bHkuIFNvIHdlIGNhbiByZW1vdmUgdGhhdCBhc3NlcnRpb24KKyAgICAgICAgYW5kIHNpbXBseSBj aGVjayB0aGF0IHdlIGhhdmUgYSBzaW5nbGUgQ1NTIHByb3BlcnR5IGluc3RlYWQuCisKKyAgICAg ICAgKiBhbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUpOgorCiAyMDE5LTEwLTI5 ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmlt YXRpb25zXSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwIGIvU291cmNlL1dl YkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcAppbmRleCA0ZjFkNjJjY2Y4NjkxMGE1 MWFkODc4ZGNmZTY3ZmM2Y2IzY2UzN2ZlLi43ZmM0NDZmOWRmMWMwNzE4M2U1ZTk3NDhiMTc4MDFm YjNjN2UyYzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVF ZmZlY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5j cHAKQEAgLTEwNjMsMTIgKzEwNjMsMTYgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6Z2V0QW5pbWF0 ZWRTdHlsZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+JiBhbmltYXRlZFN0eWwKIAogdm9p ZCBLZXlmcmFtZUVmZmVjdDo6c2V0QW5pbWF0ZWRQcm9wZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHls ZSYgdGFyZ2V0U3R5bGUsIGRvdWJsZSBpdGVyYXRpb25Qcm9ncmVzcykKIHsKKyAgICBhdXRvJiBw cm9wZXJ0aWVzID0gbV9ibGVuZGluZ0tleWZyYW1lcy5wcm9wZXJ0aWVzKCk7CisKICAgICAvLyBJ biB0aGUgY2FzZSBvZiBDU1MgVHJhbnNpdGlvbnMgd2UgYWxyZWFkeSBrbm93IHRoYXQgdGhlcmUg YXJlIG9ubHkgdHdvIGtleWZyYW1lcywgb25lIHdoZXJlIG9mZnNldD0wIGFuZCBvbmUgd2hlcmUg b2Zmc2V0PTEsCiAgICAgLy8gYW5kIG9ubHkgYSBzaW5nbGUgQ1NTIHByb3BlcnR5IHNvIHdlIGNh biBzaW1wbHkgYmxlbmQgYmFzZWQgb24gdGhlIHN0eWxlIGF2YWlsYWJsZSBvbiB0aG9zZSBrZXlm cmFtZXMgd2l0aCB0aGUgcHJvdmlkZWQgaXRlcmF0aW9uCiAgICAgLy8gcHJvZ3Jlc3Mgd2hpY2gg YWxyZWFkeSBhY2NvdW50cyBmb3IgdGhlIHRyYW5zaXRpb24ncyB0aW1pbmcgZnVuY3Rpb24uCiAg ICAgaWYgKG1fYmxlbmRpbmdLZXlmcmFtZXNTb3VyY2UgPT0gQmxlbmRpbmdLZXlmcmFtZXNTb3Vy Y2U6OkNTU1RyYW5zaXRpb24pIHsKLSAgICAgICAgQVNTRVJUKGlzPENTU1RyYW5zaXRpb24+KGFu aW1hdGlvbigpKSk7Ci0gICAgICAgIENTU1Byb3BlcnR5QW5pbWF0aW9uOjpibGVuZFByb3BlcnRp ZXModGhpcywgZG93bmNhc3Q8Q1NTVHJhbnNpdGlvbj4oYW5pbWF0aW9uKCkpLT5wcm9wZXJ0eSgp LCAmdGFyZ2V0U3R5bGUsIG1fYmxlbmRpbmdLZXlmcmFtZXNbMF0uc3R5bGUoKSwgbV9ibGVuZGlu Z0tleWZyYW1lc1sxXS5zdHlsZSgpLCBpdGVyYXRpb25Qcm9ncmVzcyk7CisgICAgICAgIC8vIFdo aWxlIHRoZXJlIGlzIG9ubHkgYSBzaW5nbGUgcHJvcGVydHkgdG8gcHJvY2VzcywgdGhlIGVhc2ll c3Qgd2F5IHRvIHByb2Nlc3MgaXQgaXMgc3RpbGwgdGhyb3VnaCBhbiBpdGVyYXRpb24uCisgICAg ICAgIEFTU0VSVChwcm9wZXJ0aWVzLnNpemUoKSA9PSAxKTsKKyAgICAgICAgZm9yIChhdXRvIGNz c1Byb3BlcnR5SWQgOiBwcm9wZXJ0aWVzKQorICAgICAgICAgICAgQ1NTUHJvcGVydHlBbmltYXRp b246OmJsZW5kUHJvcGVydGllcyh0aGlzLCBjc3NQcm9wZXJ0eUlkLCAmdGFyZ2V0U3R5bGUsIG1f YmxlbmRpbmdLZXlmcmFtZXNbMF0uc3R5bGUoKSwgbV9ibGVuZGluZ0tleWZyYW1lc1sxXS5zdHls ZSgpLCBpdGVyYXRpb25Qcm9ncmVzcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTEw ODIsNyArMTA4Niw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGll c0luU3R5bGUoUmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAgICAgaWYgKG1fYmxlbmRp bmdLZXlmcmFtZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBmb3IgKGF1dG8g Y3NzUHJvcGVydHlJZCA6IG1fYmxlbmRpbmdLZXlmcmFtZXMucHJvcGVydGllcygpKSB7CisgICAg Zm9yIChhdXRvIGNzc1Byb3BlcnR5SWQgOiBwcm9wZXJ0aWVzKSB7CiAgICAgICAgIC8vIDEuIElm IGl0ZXJhdGlvbiBwcm9ncmVzcyBpcyB1bnJlc29sdmVkIGFib3J0IHRoaXMgcHJvY2VkdXJlLgog ICAgICAgICAvLyAyLiBMZXQgdGFyZ2V0IHByb3BlcnR5IGJlIHRoZSBsb25naGFuZCBwcm9wZXJ0 eSBmb3Igd2hpY2ggdGhlIGVmZmVjdCB2YWx1ZSBpcyB0byBiZSBjYWxjdWxhdGVkLgogICAgICAg ICAvLyAzLiBJZiBhbmltYXRpb24gdHlwZSBvZiB0aGUgdGFyZ2V0IHByb3BlcnR5IGlzIG5vdCBh bmltYXRhYmxlIGFib3J0IHRoaXMgcHJvY2VkdXJlIHNpbmNlIHRoZSBlZmZlY3QgY2Fubm90IGJl IGFwcGxpZWQuCg==