235014 2022-01-09 05:44:52 -0800 Implicit keyframe for a CSS Animation should always use the underlying style 2022-01-12 12:34:56 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/32301 InRadar P2 Normal --- 235138 1 graouts graouts changseok clopez dino esprehn+autocc ews-watchlist glenn graouts koivisto kondapallykalyan pdr webkit-bug-importer youennf oldest_to_newest 1829292 0 graouts 2022-01-09 05:44:52 -0800 Implicit keyframe for a CSS Animation should always use the underlying style 1829293 1 448698 graouts 2022-01-09 05:49:28 -0800 Created attachment 448698 Patch 1829294 2 graouts 2022-01-09 05:49:57 -0800 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/32301 1829295 3 ews-watchlist 2022-01-09 05:50:38 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1829302 4 448698 koivisto 2022-01-09 06:45:51 -0800 Comment on attachment 448698 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=448698&action=review > Source/WebCore/rendering/style/KeyframeList.cpp:92 > KeyframeValue keyframeValue(keyframe.key(), RenderStyle::clonePtr(*keyframe.style())); > for (auto propertyId : keyframe.properties()) > keyframeValue.addProperty(propertyId); > + keyframeValue.setTimingFunction(keyframe.timingFunction()); > + keyframeValue.setCompositeOperation(keyframe.compositeOperation()); can we just add a copy operator/function to KeyframeValue? 1829330 5 graouts 2022-01-09 10:07:48 -0800 The test failure is due to bug 235019. I'll re-run EWS once that other bug lands. 1829341 6 graouts 2022-01-09 10:27:20 -0800 (In reply to Antti Koivisto from comment #4) > Comment on attachment 448698 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=448698&action=review > > > Source/WebCore/rendering/style/KeyframeList.cpp:92 > > KeyframeValue keyframeValue(keyframe.key(), RenderStyle::clonePtr(*keyframe.style())); > > for (auto propertyId : keyframe.properties()) > > keyframeValue.addProperty(propertyId); > > + keyframeValue.setTimingFunction(keyframe.timingFunction()); > > + keyframeValue.setCompositeOperation(keyframe.compositeOperation()); > > can we just add a copy operator/function to KeyframeValue? Actually, the only two call sites for fillImplicitKeyframes() are places where we make the copies as well, so I think we can wrap this all up into a single function. 1829348 7 graouts 2022-01-09 10:56:50 -0800 (In reply to Antoine Quint from comment #6) > (In reply to Antti Koivisto from comment #4) > > Comment on attachment 448698 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=448698&action=review > > > > > Source/WebCore/rendering/style/KeyframeList.cpp:92 > > > KeyframeValue keyframeValue(keyframe.key(), RenderStyle::clonePtr(*keyframe.style())); > > > for (auto propertyId : keyframe.properties()) > > > keyframeValue.addProperty(propertyId); > > > + keyframeValue.setTimingFunction(keyframe.timingFunction()); > > > + keyframeValue.setCompositeOperation(keyframe.compositeOperation()); > > > > can we just add a copy operator/function to KeyframeValue? > > Actually, the only two call sites for fillImplicitKeyframes() are places > where we make the copies as well, so I think we can wrap this all up into a > single function. Actually, that's not true. I'll attempt to refactor this in a separate patch. 1829354 8 448717 graouts 2022-01-09 12:23:56 -0800 Created attachment 448717 Patch for landing 1829359 9 ews-feeder 2022-01-09 13:20:54 -0800 Committed r287827 (245879@main): <https://commits.webkit.org/245879@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448717. 1829360 10 webkit-bug-importer 2022-01-09 13:21:22 -0800 <rdar://problem/87314805> 448698 2022-01-09 05:49:28 -0800 2022-01-09 06:43:47 -0800 Patch bug-235014-20220109144926.patch text/plain 10757 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjIyY2Y2MWQ1MjEyNjNm MmYxZjA0MDYxMWYwNDRhOWYzYjU4YjFkMC4uYjk5Y2RlNDVmYzE3OWEzZTgyNDNiOTI2M2YwMDcz ODRlNmM0ZjE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAxLTA5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIEltcGxpY2l0IGtleWZy YW1lIGZvciBhIENTUyBBbmltYXRpb24gc2hvdWxkIGFsd2F5cyB1c2UgdGhlIHVuZGVybHlpbmcg c3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NTAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo ZW4gcmVzb2x2aW5nIGtleWZyYW1lcyBmb3IgYSBDU1MgQW5pbWF0aW9uIGluIFN0eWxlOjpSZXNv bHZlcjo6a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oKSwKKyAgICAgICAgd2Ugd291bGQgZmls bCBpbXBsaWNpdCBrZXlmcmFtZXMgYmFzZWQgb24gdGhlIHN0eWxlIGF0IHRoZSB0aW1lIHRoZSBh bmltYXRpb24gd2FzIGNyZWF0ZWQuCisgICAgICAgIEhvd2V2ZXIsIHRoZSB1bmRlcmx5aW5nIHN0 eWxlIG1heSBjaGFuZ2UgYXQgYW55IHBvaW50IHdoaWxlIHRoZSBDU1MgQW5pbWF0aW9uIGlzIGlu IGZsaWdodCwKKyAgICAgICAgc28gd2Ugc2hvdWxkIG5vdCBiZSBmaWxsaW5nIHRob3NlIHZhbHVl cy4KKworICAgICAgICBUaGUgY29kZSB0aGF0IGFjdHVhbGx5IHJlc29sdmVzIGFuaW1hdGVkIHN0 eWxlcyBhbHJlYWR5IGtub3dzIGhvdyB0byBoYW5kbGUgdGhpcyBjYXNlLCB3aGljaAorICAgICAg ICB3ZSBhbHJlYWR5IHN1cHBvcnRlZCBjb3JyZWN0bHkgZm9yIEpTLW9yaWdpbmF0ZWQgYW5pbWF0 aW9ucy4gVGhlIG9ubHkgdGhpbmcgd2UgbmVlZCB0byBkbyBpcworICAgICAgICB0byBlbnN1cmUg d2UgZmlsbCBpbXBsaWNpdCBrZXlmcmFtZXMgd2hlbiBjYWxsaW5nIGdldEtleWZyYW1lcygpLgor CisgICAgICAgIFRoaXMgc3VyZmFjZWQgYW4gaXNzdWUgd2l0aCBLZXlmcmFtZUxpc3Q6OmNvcHlL ZXlmcmFtZXMoKSB3aGVyZSB3ZSBvbmx5IGNvcGllZCB0aGUgc3R5bGVzCisgICAgICAgIGZyb20g b25lIHNldCBvZiBrZXlmcmFtZXMgdG8gYW5vdGhlciwgYnV0IG5vdCB0aGUgdGltaW5nIGZ1bmN0 aW9uLCB3aGljaCB3b3VsZCBjYXVzZSBhCisgICAgICAgIGdldEtleWZyYW1lcygpIHRlc3QgdG8g cmVncmVzcy4gV2Ugc2hvdWxkIGFsc28gbWFrZSBzdXJlIHRvIGNvcHkgdGhlIGNvbXBvc2l0ZSBv cGVyYXRpb24KKyAgICAgICAgZm9yIHdoZW4gd2Ugc3VwcG9ydCB0aGUgYW5pbWF0aW9uLWNvbXBv c2l0aW9uIHByb3BlcnR5IChzZWUgYnVnIDIzMjA4NikuCisKKyAgICAgICAgVGVzdDogaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNo YW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQtaW4tZmxpZ2h0Lmh0bWwKKworICAgICAgICAq IGFuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFt ZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvS2V5ZnJh bWVMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lTGlzdDo6Y29weUtleWZyYW1l cyk6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZTo6UmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKToKKwogMjAyMi0w MS0wNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBJbnNl cnRpbmcgYSBuZXcgQGtleWZyYW1lcyBydWxlIGRvZXMgbm90IHN0YXJ0IGFuaW1hdGlvbnMgdGhh dCBhbHJlYWR5IHVzZWQgdGhpcyBuYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmlt YXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZy YW1lRWZmZWN0LmNwcAppbmRleCA3NWVhOTg1MTQzMTE2YTA4MTM2YmM4ZWVkMDVlZGM1YzUzNTEy ZTBlLi41MjkwOGUzZGM4OGQxNjRhM2UxZmY1MWY4OTRiZjU1M2Q1NzJhZDJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKQEAgLTYzOSwxMyArNjM5LDE3 IEBAIFZlY3RvcjxTdHJvbmc8SlNPYmplY3Q+PiBLZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJhbWVz KEpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvCiAKICAgICAgICAgYXV0byBjb21wdXRlZFN0eWxl RXh0cmFjdG9yID0gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcih0YXJnZXQsIGZhbHNlLCBtX3BzZXVk b0lkKTsKIAorICAgICAgICBLZXlmcmFtZUxpc3QgY29tcHV0ZWRLZXlmcmFtZXMobV9ibGVuZGlu Z0tleWZyYW1lcy5hbmltYXRpb25OYW1lKCkpOworICAgICAgICBjb21wdXRlZEtleWZyYW1lcy5j b3B5S2V5ZnJhbWVzKG1fYmxlbmRpbmdLZXlmcmFtZXMpOworICAgICAgICBjb21wdXRlZEtleWZy YW1lcy5maWxsSW1wbGljaXRLZXlmcmFtZXMoKm1fdGFyZ2V0LCBtX3RhcmdldC0+c3R5bGVSZXNv bHZlcigpLCBsYXN0U3R5bGVDaGFuZ2VFdmVudFN0eWxlLCBudWxscHRyKTsKKwogICAgICAgICAv LyBXZSBuZWVkIHRvIGVzdGFibGlzaCB3aGljaCBwcm9wZXJ0aWVzIGFyZSBpbXBsaWNpdCBmb3Ig MCUgYW5kIDEwMCUuCi0gICAgICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gemVyb0tleWZyYW1l UHJvcGVydGllcyA9IG1fYmxlbmRpbmdLZXlmcmFtZXMucHJvcGVydGllcygpOwotICAgICAgICBI YXNoU2V0PENTU1Byb3BlcnR5SUQ+IG9uZUtleWZyYW1lUHJvcGVydGllcyA9IG1fYmxlbmRpbmdL ZXlmcmFtZXMucHJvcGVydGllcygpOworICAgICAgICBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+IHpl cm9LZXlmcmFtZVByb3BlcnRpZXMgPSBjb21wdXRlZEtleWZyYW1lcy5wcm9wZXJ0aWVzKCk7Cisg ICAgICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gb25lS2V5ZnJhbWVQcm9wZXJ0aWVzID0gY29t cHV0ZWRLZXlmcmFtZXMucHJvcGVydGllcygpOwogICAgICAgICB6ZXJvS2V5ZnJhbWVQcm9wZXJ0 aWVzLnJlbW92ZShDU1NQcm9wZXJ0eUN1c3RvbSk7CiAgICAgICAgIG9uZUtleWZyYW1lUHJvcGVy dGllcy5yZW1vdmUoQ1NTUHJvcGVydHlDdXN0b20pOwotICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IG1fYmxlbmRpbmdLZXlmcmFtZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgIGF1 dG8mIGtleWZyYW1lID0gbV9ibGVuZGluZ0tleWZyYW1lc1tpXTsKKyAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBjb21wdXRlZEtleWZyYW1lcy5zaXplKCk7ICsraSkgeworICAgICAgICAg ICAgYXV0byYga2V5ZnJhbWUgPSBjb21wdXRlZEtleWZyYW1lc1tpXTsKICAgICAgICAgICAgIGlm ICgha2V5ZnJhbWUua2V5KCkpIHsKICAgICAgICAgICAgICAgICBmb3IgKGF1dG8gY3NzUHJvcGVy dHlJZCA6IGtleWZyYW1lLnByb3BlcnRpZXMoKSkKICAgICAgICAgICAgICAgICAgICAgemVyb0tl eWZyYW1lUHJvcGVydGllcy5yZW1vdmUoY3NzUHJvcGVydHlJZCk7CkBAIC02NTUsNyArNjU5LDcg QEAgVmVjdG9yPFN0cm9uZzxKU09iamVjdD4+IEtleWZyYW1lRWZmZWN0OjpnZXRLZXlmcmFtZXMo SlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG8KICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0g ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ibGVuZGluZ0tleWZyYW1lcy5zaXplKCk7 ICsraSkgeworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvbXB1dGVkS2V5ZnJhbWVz LnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAvLyAxLiBJbml0aWFsaXplIGEgZGljdGlvbmFy eSBvYmplY3QsIG91dHB1dCBrZXlmcmFtZSwgdXNpbmcgdGhlIGZvbGxvd2luZyBkZWZpbml0aW9u OgogICAgICAgICAgICAgLy8KICAgICAgICAgICAgIC8vIGRpY3Rpb25hcnkgQmFzZUNvbXB1dGVk S2V5ZnJhbWUgewpAQCAtNjY1LDcgKzY2OSw3IEBAIFZlY3RvcjxTdHJvbmc8SlNPYmplY3Q+PiBL ZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKEpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvCiAg ICAgICAgICAgICAvLyAgICAgIENvbXBvc2l0ZU9wZXJhdGlvbk9yQXV0byBjb21wb3NpdGUgPSAi YXV0byI7CiAgICAgICAgICAgICAvLyB9OwogCi0gICAgICAgICAgICBhdXRvJiBrZXlmcmFtZSA9 IG1fYmxlbmRpbmdLZXlmcmFtZXNbaV07CisgICAgICAgICAgICBhdXRvJiBrZXlmcmFtZSA9IGNv bXB1dGVkS2V5ZnJhbWVzW2ldOwogCiAgICAgICAgICAgICAvLyAyLiBTZXQgb2Zmc2V0LCBjb21w dXRlZE9mZnNldCwgZWFzaW5nIG1lbWJlcnMgb2Ygb3V0cHV0IGtleWZyYW1lIHRvIHRoZSByZXNw ZWN0aXZlIHZhbHVlcyBrZXlmcmFtZSBvZmZzZXQsIGNvbXB1dGVkIGtleWZyYW1lIG9mZnNldCwK ICAgICAgICAgICAgIC8vIGFuZCBrZXlmcmFtZS1zcGVjaWZpYyB0aW1pbmcgZnVuY3Rpb24gb2Yg a2V5ZnJhbWUuCkBAIC02NzMsNyArNjc3LDcgQEAgVmVjdG9yPFN0cm9uZzxKU09iamVjdD4+IEtl eWZyYW1lRWZmZWN0OjpnZXRLZXlmcmFtZXMoSlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG8KICAg ICAgICAgICAgIGNvbXB1dGVkS2V5ZnJhbWUub2Zmc2V0ID0ga2V5ZnJhbWUua2V5KCk7CiAgICAg ICAgICAgICBjb21wdXRlZEtleWZyYW1lLmNvbXB1dGVkT2Zmc2V0ID0ga2V5ZnJhbWUua2V5KCk7 CiAgICAgICAgICAgICAvLyBGb3IgQ1NTIHRyYW5zaXRpb25zLCBhbGwga2V5ZnJhbWVzIHNob3Vs ZCByZXR1cm4gImxpbmVhciIgc2luY2UgdGhlIGVmZmVjdCdzIGdsb2JhbCB0aW1pbmcgZnVuY3Rp b24gYXBwbGllcy4KLSAgICAgICAgICAgIGNvbXB1dGVkS2V5ZnJhbWUuZWFzaW5nID0gaXM8Q1NT VHJhbnNpdGlvbj4oYW5pbWF0aW9uKCkpID8gImxpbmVhciIgOiB0aW1pbmdGdW5jdGlvbkZvcktl eWZyYW1lQXRJbmRleChpKS0+Y3NzVGV4dCgpOworICAgICAgICAgICAgY29tcHV0ZWRLZXlmcmFt ZS5lYXNpbmcgPSBpczxDU1NUcmFuc2l0aW9uPihhbmltYXRpb24oKSkgPyAibGluZWFyIiA6IHRp bWluZ0Z1bmN0aW9uRm9yQmxlbmRpbmdLZXlmcmFtZShrZXlmcmFtZSktPmNzc1RleHQoKTsKIAog ICAgICAgICAgICAgYXV0byBvdXRwdXRLZXlmcmFtZSA9IGNvbnZlcnREaWN0aW9uYXJ5VG9KUyhs ZXhpY2FsR2xvYmFsT2JqZWN0LCAqanNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmxleGljYWxH bG9iYWxPYmplY3QpLCBjb21wdXRlZEtleWZyYW1lKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNwcAppbmRleCA3Y2ZlMTlhYWYyZTZjZDRmNjlj NjFkOTM3MjE5NzhmYWNjZWI3ZjQyLi40OGNlNGIxZThiOWRjNzZlMjkyNDc1OTQ0MGE3MTEzYzQ2 NWM1Yjk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJh bWVMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVM aXN0LmNwcApAQCAtODgsNiArODgsOCBAQCB2b2lkIEtleWZyYW1lTGlzdDo6Y29weUtleWZyYW1l cyhLZXlmcmFtZUxpc3QmIG90aGVyKQogICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZyYW1lVmFs dWUoa2V5ZnJhbWUua2V5KCksIFJlbmRlclN0eWxlOjpjbG9uZVB0cigqa2V5ZnJhbWUuc3R5bGUo KSkpOwogICAgICAgICBmb3IgKGF1dG8gcHJvcGVydHlJZCA6IGtleWZyYW1lLnByb3BlcnRpZXMo KSkKICAgICAgICAgICAgIGtleWZyYW1lVmFsdWUuYWRkUHJvcGVydHkocHJvcGVydHlJZCk7Cisg ICAgICAgIGtleWZyYW1lVmFsdWUuc2V0VGltaW5nRnVuY3Rpb24oa2V5ZnJhbWUudGltaW5nRnVu Y3Rpb24oKSk7CisgICAgICAgIGtleWZyYW1lVmFsdWUuc2V0Q29tcG9zaXRlT3BlcmF0aW9uKGtl eWZyYW1lLmNvbXBvc2l0ZU9wZXJhdGlvbigpKTsKICAgICAgICAgaW5zZXJ0KFdURk1vdmUoa2V5 ZnJhbWVWYWx1ZSkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5j cHAKaW5kZXggMTk5ODEyZDlmNWRkZWI2NmUxMmZjNmEwMDBiNTkyMmU2MjI2YWE2Mi4uZjgzNDA5 MmQzOGUxZjVkM2FhMjczYzM5MTU0ODc0NmQ2NDFkMmVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUv U3R5bGVSZXNvbHZlci5jcHAKQEAgLTM5MSw4ICszOTEsNiBAQCB2b2lkIFJlc29sdmVyOjprZXlm cmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5k ZXJTdAogICAgICAgICAgICAgbGlzdC5pbnNlcnQoV1RGTW92ZShrZXlmcmFtZVZhbHVlKSk7CiAg ICAgICAgIH0KICAgICB9Ci0KLSAgICBsaXN0LmZpbGxJbXBsaWNpdEtleWZyYW1lcyhlbGVtZW50 LCAqdGhpcywgZWxlbWVudFN0eWxlLCBjb250ZXh0LnBhcmVudFN0eWxlKTsKIH0KIAogc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBSZXNvbHZlcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KGNv bnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFBzZXVkb0VsZW1lbnRSZXF1ZXN0JiBwc2V1ZG9F bGVtZW50UmVxdWVzdCwgY29uc3QgUmVzb2x1dGlvbkNvbnRleHQmIGNvbnRleHQpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA3ZmVkMDg1NDBjZDNlZDYwMmMzYTdiMjM5OTNkNGQ2 Y2U4YTc0ZmZhLi4zNzdmN2M3YWMxNTAxNTIxNmYyYTAwMzM3YTNkZWM0MjUyOWQ1Mjk2IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMS0wOSAg QW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KKworICAgICAgICBJbXBsaWNpdCBr ZXlmcmFtZSBmb3IgYSBDU1MgQW5pbWF0aW9uIHNob3VsZCBhbHdheXMgdXNlIHRoZSB1bmRlcmx5 aW5nIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzUwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBuZXcgV1BUIHdoaWNoIGNoYW5nZXMgdGhlIHVuZGVybHlpbmcgc3R5bGUgZm9yIGEg cHJvcGVydHkgdGhhdCBpcyBiZWluZworICAgICAgICBhbmltYXRlZCB3aXRoIGFuIEBrZXlmcmFt ZXMgcnVsZSB0aGF0IGRvZXNuJ3QgZXhwbGljaXRseSBzcGVjaWZ5IHRoaXMgdmFsdWUKKyAgICAg ICAgb24gYWxsIGtleWZyYW1lcy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNoYW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQt aW4tZmxpZ2h0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9hbmltYXRpb24tY2hhbmdlLXVuZGVybHlpbmctdmFsdWUt Y2hhbmdlZC1pbi1mbGlnaHQuaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMDcgIEFudG9pbmUgUXVp bnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW5zZXJ0aW5nIGEgbmV3IEBrZXlm cmFtZXMgcnVsZSBkb2VzIG5vdCBzdGFydCBhbmltYXRpb25zIHRoYXQgYWxyZWFkeSB1c2VkIHRo aXMgbmFtZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNoYW5nZS11bmRlcmx5aW5nLXZh bHVlLWNoYW5nZWQtaW4tZmxpZ2h0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1hbmltYXRpb25zL2FuaW1hdGlvbi1jaGFu Z2UtdW5kZXJseWluZy12YWx1ZS1jaGFuZ2VkLWluLWZsaWdodC1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZDFiZjU4NjhiYWQxOGIzN2Y1YTgyYzA1ZTE2MjcwM2ZlNjBlNDEzNgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1hbmltYXRpb25zL2FuaW1hdGlvbi1jaGFuZ2UtdW5kZXJseWluZy12YWx1ZS1jaGFuZ2Vk LWluLWZsaWdodC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKK1BBU1MgQ2hhbmdpbmcg dGhlIHVuZGVybHlpbmcgdmFsdWUgb2YgYW4gYW5pbWF0ZWQgcHJvcGVydHkgd2l0aCBhbiBpbXBs aWNpdCAwJSBrZXlmcmFtZQorUEFTUyBDaGFuZ2luZyB0aGUgdW5kZXJseWluZyB2YWx1ZSBvZiBh biBhbmltYXRlZCBwcm9wZXJ0eSB3aXRoIGFuIGltcGxpY2l0IDEwMCUga2V5ZnJhbWUKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNoYW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQt aW4tZmxpZ2h0Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9hbmltYXRpb24tY2hhbmdlLXVuZGVybHlpbmctdmFsdWUt Y2hhbmdlZC1pbi1mbGlnaHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NDRlYTczNzg1MzNkYTQwZmQ2MjQz ZDdjMTY1Nzg1MzI1Mzc0Y2RiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNo YW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQtaW4tZmxpZ2h0Lmh0bWwKQEAgLTAsMCArMSw0 MiBAQAorPCFkb2N0eXBlIGh0bWw+Cis8bWV0YSBjaGFyc2V0PXV0Zi04PgorPHRpdGxlPkNoYW5n aW5nIHRoZSB1bmRlcmx5aW5nIHZhbHVlIG9mIGFuIGFuaW1hdGVkIHByb3BlcnR5IHdpdGggaW1w bGljaXQga2V5ZnJhbWVzPC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9k cmFmdHMuY3Nzd2cub3JnL2Nzcy1hbmltYXRpb25zLyI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNl cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0 aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0ic3VwcG9ydC90ZXN0Y29t bW9uLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKworQGtleWZyYW1lcyBpbXBsaWNpdC1mcm9tIHsK KyAgdG8geyBtYXJnaW4tbGVmdDogMTAwcHggfQorfQorCitAa2V5ZnJhbWVzIGltcGxpY2l0LXRv IHsKKyAgZnJvbSB7IG1hcmdpbi1sZWZ0OiAxMDBweCB9Cit9CisKKzwvc3R5bGU+Cis8ZGl2IGlk PSJsb2ciPjwvZGl2PgorPHNjcmlwdD4KKyd1c2Ugc3RyaWN0JzsKKworY29uc3QgaW1wbGljaXRf a2V5ZnJhbWVfdGVzdCA9IChhbmltYXRpb25OYW1lLCBvZmZzZXQpID0+IHsKKyAgICB0ZXN0KHQg PT4geworICAgICAgY29uc3QgZGl2ID0gYWRkRGl2KHQpOworCisgICAgICAvLyBTZXQgdXAgYW5p bWF0aW9uIHRvIGJlIHBhdXNlZCBhbmQgYmUgYXQgaXRzIG1pZC13YXkgcG9pbnQgdGhyb3VnaCBl YXNpbmcuCisgICAgICBkaXYuc3R5bGUuYW5pbWF0aW9uID0gYCR7YW5pbWF0aW9uTmFtZX0gMTBz IHBhdXNlZCBzdGVwcygyLCBzdGFydClgOworICAgICAgY29uc3QgYW5pbWF0aW9uID0gZGl2Lmdl dEFuaW1hdGlvbnMoKVswXTsKKworICAgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxl KGRpdikubWFyZ2luTGVmdCwgIjUwcHgiLCAiQ29tcHV0ZWQgc3R5bGUgYmVmb3JlIGNoYW5naW5n IHRoZSB1bmRlcmx5aW5nIHN0eWxlIik7CisKKyAgICAgIC8vIENoYW5nZSB0aGUgdW5kZXJseWlu ZyB2YWx1ZS4KKyAgICAgIGRpdi5zdHlsZS5tYXJnaW5MZWZ0ID0gIjIwMHB4IjsKKyAgICAgIGFz c2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZShkaXYpLm1hcmdpbkxlZnQsICIxNTBweCIsICJD b21wdXRlZCBzdHlsZSBhZnRlciBjaGFuZ2luZyB0aGUgdW5kZXJseWluZyBzdHlsZSIpOworICAg IH0sIGBDaGFuZ2luZyB0aGUgdW5kZXJseWluZyB2YWx1ZSBvZiBhbiBhbmltYXRlZCBwcm9wZXJ0 eSB3aXRoIGFuIGltcGxpY2l0ICR7b2Zmc2V0fSUga2V5ZnJhbWVgKTsKK307CisKK2ltcGxpY2l0 X2tleWZyYW1lX3Rlc3QoImltcGxpY2l0LWZyb20iLCAiMCIpOworaW1wbGljaXRfa2V5ZnJhbWVf dGVzdCgiaW1wbGljaXQtdG8iLCAiMTAwIik7CisKKzwvc2NyaXB0Pgo= 448717 2022-01-09 12:23:56 -0800 2022-01-09 13:41:50 -0800 Patch for landing bug-235014-20220109212355.patch text/plain 11450 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdmMzNhNzBhMWY5NmJk YzIyMWUzNTc3YmUxMTA4YTRhMDNiNTMxMC4uMDQwMzdlY2Q0YTc4MDQ3YTc1MDg1OTlkMzVjNjcx ZmExNDg0NjJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAxLTA5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIEltcGxpY2l0IGtleWZy YW1lIGZvciBhIENTUyBBbmltYXRpb24gc2hvdWxkIGFsd2F5cyB1c2UgdGhlIHVuZGVybHlpbmcg c3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NTAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdo ZW4gcmVzb2x2aW5nIGtleWZyYW1lcyBmb3IgYSBDU1MgQW5pbWF0aW9uIGluIFN0eWxlOjpSZXNv bHZlcjo6a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oKSwKKyAgICAgICAgd2Ugd291bGQgZmls bCBpbXBsaWNpdCBrZXlmcmFtZXMgYmFzZWQgb24gdGhlIHN0eWxlIGF0IHRoZSB0aW1lIHRoZSBh bmltYXRpb24gd2FzIGNyZWF0ZWQuCisgICAgICAgIEhvd2V2ZXIsIHRoZSB1bmRlcmx5aW5nIHN0 eWxlIG1heSBjaGFuZ2UgYXQgYW55IHBvaW50IHdoaWxlIHRoZSBDU1MgQW5pbWF0aW9uIGlzIGlu IGZsaWdodCwKKyAgICAgICAgc28gd2Ugc2hvdWxkIG5vdCBiZSBmaWxsaW5nIHRob3NlIHZhbHVl cy4KKworICAgICAgICBUaGUgY29kZSB0aGF0IGFjdHVhbGx5IHJlc29sdmVzIGFuaW1hdGVkIHN0 eWxlcyBhbHJlYWR5IGtub3dzIGhvdyB0byBoYW5kbGUgdGhpcyBjYXNlLCB3aGljaAorICAgICAg ICB3ZSBhbHJlYWR5IHN1cHBvcnRlZCBjb3JyZWN0bHkgZm9yIEpTLW9yaWdpbmF0ZWQgYW5pbWF0 aW9ucy4gVGhlIG9ubHkgdGhpbmcgd2UgbmVlZCB0byBkbyBpcworICAgICAgICB0byBlbnN1cmUg d2UgZmlsbCBpbXBsaWNpdCBrZXlmcmFtZXMgd2hlbiBjYWxsaW5nIGdldEtleWZyYW1lcygpLgor CisgICAgICAgIFRoaXMgc3VyZmFjZWQgYW4gaXNzdWUgd2l0aCBLZXlmcmFtZUxpc3Q6OmNvcHlL ZXlmcmFtZXMoKSB3aGVyZSB3ZSBvbmx5IGNvcGllZCB0aGUgc3R5bGVzCisgICAgICAgIGZyb20g b25lIHNldCBvZiBrZXlmcmFtZXMgdG8gYW5vdGhlciwgYnV0IG5vdCB0aGUgdGltaW5nIGZ1bmN0 aW9uLCB3aGljaCB3b3VsZCBjYXVzZSBhCisgICAgICAgIGdldEtleWZyYW1lcygpIHRlc3QgdG8g cmVncmVzcy4gV2Ugc2hvdWxkIGFsc28gbWFrZSBzdXJlIHRvIGNvcHkgdGhlIGNvbXBvc2l0ZSBv cGVyYXRpb24KKyAgICAgICAgZm9yIHdoZW4gd2Ugc3VwcG9ydCB0aGUgYW5pbWF0aW9uLWNvbXBv c2l0aW9uIHByb3BlcnR5IChzZWUgYnVnIDIzMjA4NikuCisKKyAgICAgICAgVGVzdDogaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNo YW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQtaW4tZmxpZ2h0Lmh0bWwKKworICAgICAgICAq IGFuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFt ZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvS2V5ZnJh bWVMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lTGlzdDo6Y29weUtleWZyYW1l cyk6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZTo6UmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKToKKwogMjAyMi0w MS0wOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBJbnRl cnBvbGF0aW9uIGZvciB0aGUgImZpbHRlciIgcHJvcGVydHkgZmFpbHMgd2l0aCBhIHNpbmdsZSBr ZXlmcmFtZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZm ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKaW5k ZXggODQxNDJmZGRlYzc4ZWEyOTI5MGJjZTIyZmQwM2Q3OTI1MTlmYmYyMS4uNjg0ZjljYWY2ZWIy N2VmZjdlZGRiYzY2NDEyODVmNzAyZTE5YTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRp b24vS2V5ZnJhbWVFZmZlY3QuY3BwCkBAIC02MzksNiArNjM5LDEwIEBAIFZlY3RvcjxTdHJvbmc8 SlNPYmplY3Q+PiBLZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKEpTR2xvYmFsT2JqZWN0JiBs ZXhpY2FsR2xvCiAKICAgICAgICAgYXV0byBjb21wdXRlZFN0eWxlRXh0cmFjdG9yID0gQ29tcHV0 ZWRTdHlsZUV4dHJhY3Rvcih0YXJnZXQsIGZhbHNlLCBtX3BzZXVkb0lkKTsKIAorICAgICAgICBL ZXlmcmFtZUxpc3QgY29tcHV0ZWRLZXlmcmFtZXMobV9ibGVuZGluZ0tleWZyYW1lcy5hbmltYXRp b25OYW1lKCkpOworICAgICAgICBjb21wdXRlZEtleWZyYW1lcy5jb3B5S2V5ZnJhbWVzKG1fYmxl bmRpbmdLZXlmcmFtZXMpOworICAgICAgICBjb21wdXRlZEtleWZyYW1lcy5maWxsSW1wbGljaXRL ZXlmcmFtZXMoKm1fdGFyZ2V0LCBtX3RhcmdldC0+c3R5bGVSZXNvbHZlcigpLCBsYXN0U3R5bGVD aGFuZ2VFdmVudFN0eWxlLCBudWxscHRyKTsKKwogICAgICAgICBhdXRvIGtleWZyYW1lUnVsZXMg PSBbJl0oKSAtPiBjb25zdCBWZWN0b3I8UmVmPFN0eWxlUnVsZUtleWZyYW1lPj4gewogICAgICAg ICAgICAgaWYgKCFpczxDU1NBbmltYXRpb24+KGFuaW1hdGlvbigpKSkKICAgICAgICAgICAgICAg ICByZXR1cm4geyB9OwpAQCAtNjQ4LDcgKzY1Miw3IEBAIFZlY3RvcjxTdHJvbmc8SlNPYmplY3Q+ PiBLZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKEpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xv CiAgICAgICAgICAgICBpZiAoIXN0eWxlU2NvcGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHsg fTsKIAotICAgICAgICAgICAgcmV0dXJuIHN0eWxlU2NvcGUtPnJlc29sdmVyKCkua2V5ZnJhbWVS dWxlc0Zvck5hbWUobV9ibGVuZGluZ0tleWZyYW1lcy5hbmltYXRpb25OYW1lKCkpOworICAgICAg ICAgICAgcmV0dXJuIHN0eWxlU2NvcGUtPnJlc29sdmVyKCkua2V5ZnJhbWVSdWxlc0Zvck5hbWUo Y29tcHV0ZWRLZXlmcmFtZXMuYW5pbWF0aW9uTmFtZSgpKTsKICAgICAgICAgfSgpOwogCiAgICAg ICAgIGF1dG8ga2V5ZnJhbWVSdWxlRm9yS2V5ID0gWyZdKGRvdWJsZSBrZXkpIC0+IFN0eWxlUnVs ZUtleWZyYW1lKiB7CkBAIC02NjIsMTIgKzY2NiwxMiBAQCBWZWN0b3I8U3Ryb25nPEpTT2JqZWN0 Pj4gS2V5ZnJhbWVFZmZlY3Q6OmdldEtleWZyYW1lcyhKU0dsb2JhbE9iamVjdCYgbGV4aWNhbEds bwogICAgICAgICB9OwogCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gZXN0YWJsaXNoIHdoaWNoIHBy b3BlcnRpZXMgYXJlIGltcGxpY2l0IGZvciAwJSBhbmQgMTAwJS4KLSAgICAgICAgSGFzaFNldDxD U1NQcm9wZXJ0eUlEPiB6ZXJvS2V5ZnJhbWVQcm9wZXJ0aWVzID0gbV9ibGVuZGluZ0tleWZyYW1l cy5wcm9wZXJ0aWVzKCk7Ci0gICAgICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gb25lS2V5ZnJh bWVQcm9wZXJ0aWVzID0gbV9ibGVuZGluZ0tleWZyYW1lcy5wcm9wZXJ0aWVzKCk7CisgICAgICAg IEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gemVyb0tleWZyYW1lUHJvcGVydGllcyA9IGNvbXB1dGVk S2V5ZnJhbWVzLnByb3BlcnRpZXMoKTsKKyAgICAgICAgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPiBv bmVLZXlmcmFtZVByb3BlcnRpZXMgPSBjb21wdXRlZEtleWZyYW1lcy5wcm9wZXJ0aWVzKCk7CiAg ICAgICAgIHplcm9LZXlmcmFtZVByb3BlcnRpZXMucmVtb3ZlKENTU1Byb3BlcnR5Q3VzdG9tKTsK ICAgICAgICAgb25lS2V5ZnJhbWVQcm9wZXJ0aWVzLnJlbW92ZShDU1NQcm9wZXJ0eUN1c3RvbSk7 Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ibGVuZGluZ0tleWZyYW1lcy5zaXpl KCk7ICsraSkgewotICAgICAgICAgICAgYXV0byYga2V5ZnJhbWUgPSBtX2JsZW5kaW5nS2V5ZnJh bWVzW2ldOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvbXB1dGVkS2V5ZnJhbWVz LnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICBhdXRvJiBrZXlmcmFtZSA9IGNvbXB1dGVkS2V5 ZnJhbWVzW2ldOwogICAgICAgICAgICAgaWYgKCFrZXlmcmFtZS5rZXkoKSkgewogICAgICAgICAg ICAgICAgIGZvciAoYXV0byBjc3NQcm9wZXJ0eUlkIDoga2V5ZnJhbWUucHJvcGVydGllcygpKQog ICAgICAgICAgICAgICAgICAgICB6ZXJvS2V5ZnJhbWVQcm9wZXJ0aWVzLnJlbW92ZShjc3NQcm9w ZXJ0eUlkKTsKQEAgLTY3Nyw3ICs2ODEsNyBAQCBWZWN0b3I8U3Ryb25nPEpTT2JqZWN0Pj4gS2V5 ZnJhbWVFZmZlY3Q6OmdldEtleWZyYW1lcyhKU0dsb2JhbE9iamVjdCYgbGV4aWNhbEdsbwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt X2JsZW5kaW5nS2V5ZnJhbWVzLnNpemUoKTsgKytpKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgY29tcHV0ZWRLZXlmcmFtZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIC8v IDEuIEluaXRpYWxpemUgYSBkaWN0aW9uYXJ5IG9iamVjdCwgb3V0cHV0IGtleWZyYW1lLCB1c2lu ZyB0aGUgZm9sbG93aW5nIGRlZmluaXRpb246CiAgICAgICAgICAgICAvLwogICAgICAgICAgICAg Ly8gZGljdGlvbmFyeSBCYXNlQ29tcHV0ZWRLZXlmcmFtZSB7CkBAIC02ODcsNyArNjkxLDcgQEAg VmVjdG9yPFN0cm9uZzxKU09iamVjdD4+IEtleWZyYW1lRWZmZWN0OjpnZXRLZXlmcmFtZXMoSlNH bG9iYWxPYmplY3QmIGxleGljYWxHbG8KICAgICAgICAgICAgIC8vICAgICAgQ29tcG9zaXRlT3Bl cmF0aW9uT3JBdXRvIGNvbXBvc2l0ZSA9ICJhdXRvIjsKICAgICAgICAgICAgIC8vIH07CiAKLSAg ICAgICAgICAgIGF1dG8mIGtleWZyYW1lID0gbV9ibGVuZGluZ0tleWZyYW1lc1tpXTsKKyAgICAg ICAgICAgIGF1dG8mIGtleWZyYW1lID0gY29tcHV0ZWRLZXlmcmFtZXNbaV07CiAKICAgICAgICAg ICAgIC8vIDIuIFNldCBvZmZzZXQsIGNvbXB1dGVkT2Zmc2V0LCBlYXNpbmcgbWVtYmVycyBvZiBv dXRwdXQga2V5ZnJhbWUgdG8gdGhlIHJlc3BlY3RpdmUgdmFsdWVzIGtleWZyYW1lIG9mZnNldCwg Y29tcHV0ZWQga2V5ZnJhbWUgb2Zmc2V0LAogICAgICAgICAgICAgLy8gYW5kIGtleWZyYW1lLXNw ZWNpZmljIHRpbWluZyBmdW5jdGlvbiBvZiBrZXlmcmFtZS4KQEAgLTY5NSw3ICs2OTksNyBAQCBW ZWN0b3I8U3Ryb25nPEpTT2JqZWN0Pj4gS2V5ZnJhbWVFZmZlY3Q6OmdldEtleWZyYW1lcyhKU0ds b2JhbE9iamVjdCYgbGV4aWNhbEdsbwogICAgICAgICAgICAgY29tcHV0ZWRLZXlmcmFtZS5vZmZz ZXQgPSBrZXlmcmFtZS5rZXkoKTsKICAgICAgICAgICAgIGNvbXB1dGVkS2V5ZnJhbWUuY29tcHV0 ZWRPZmZzZXQgPSBrZXlmcmFtZS5rZXkoKTsKICAgICAgICAgICAgIC8vIEZvciBDU1MgdHJhbnNp dGlvbnMsIGFsbCBrZXlmcmFtZXMgc2hvdWxkIHJldHVybiAibGluZWFyIiBzaW5jZSB0aGUgZWZm ZWN0J3MgZ2xvYmFsIHRpbWluZyBmdW5jdGlvbiBhcHBsaWVzLgotICAgICAgICAgICAgY29tcHV0 ZWRLZXlmcmFtZS5lYXNpbmcgPSBpczxDU1NUcmFuc2l0aW9uPihhbmltYXRpb24oKSkgPyAibGlu ZWFyIiA6IHRpbWluZ0Z1bmN0aW9uRm9yS2V5ZnJhbWVBdEluZGV4KGkpLT5jc3NUZXh0KCk7Cisg ICAgICAgICAgICBjb21wdXRlZEtleWZyYW1lLmVhc2luZyA9IGlzPENTU1RyYW5zaXRpb24+KGFu aW1hdGlvbigpKSA/ICJsaW5lYXIiIDogdGltaW5nRnVuY3Rpb25Gb3JCbGVuZGluZ0tleWZyYW1l KGtleWZyYW1lKS0+Y3NzVGV4dCgpOwogCiAgICAgICAgICAgICBhdXRvIG91dHB1dEtleWZyYW1l ID0gY29udmVydERpY3Rpb25hcnlUb0pTKGxleGljYWxHbG9iYWxPYmplY3QsICpqc0Nhc3Q8SlNE T01HbG9iYWxPYmplY3QqPigmbGV4aWNhbEdsb2JhbE9iamVjdCksIGNvbXB1dGVkS2V5ZnJhbWUp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVM aXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3Bw CmluZGV4IDdjZmUxOWFhZjJlNmNkNGY2OWM2MWQ5MzcyMTk3OGZhY2NlYjdmNDIuLjQ4Y2U0YjFl OGI5ZGM3NmUyOTI0NzU5NDQwYTcxMTNjNDY1YzViOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3BwCkBAIC04OCw2ICs4OCw4IEBAIHZvaWQg S2V5ZnJhbWVMaXN0Ojpjb3B5S2V5ZnJhbWVzKEtleWZyYW1lTGlzdCYgb3RoZXIpCiAgICAgICAg IEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZShrZXlmcmFtZS5rZXkoKSwgUmVuZGVyU3R5bGU6 OmNsb25lUHRyKCprZXlmcmFtZS5zdHlsZSgpKSk7CiAgICAgICAgIGZvciAoYXV0byBwcm9wZXJ0 eUlkIDoga2V5ZnJhbWUucHJvcGVydGllcygpKQogICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5h ZGRQcm9wZXJ0eShwcm9wZXJ0eUlkKTsKKyAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRUaW1pbmdG dW5jdGlvbihrZXlmcmFtZS50aW1pbmdGdW5jdGlvbigpKTsKKyAgICAgICAga2V5ZnJhbWVWYWx1 ZS5zZXRDb21wb3NpdGVPcGVyYXRpb24oa2V5ZnJhbWUuY29tcG9zaXRlT3BlcmF0aW9uKCkpOwog ICAgICAgICBpbnNlcnQoV1RGTW92ZShrZXlmcmFtZVZhbHVlKSk7CiAgICAgfQogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBkNWNlZjFjNGRhZTE2YWY1YzVkYTA0 NDc0OGQyZjBmMTE0MWEwZDdkLi5mNzQ0NjdmNDM3OGUyNzM0ZjkzNWVlZTQ5ZWQ2MTA5YWNiNTQy NDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcApAQCAtMzk5LDggKzM5 OSw2IEBAIHZvaWQgUmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKGNvbnN0IEVs ZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0CiAgICAgICAgICAgICBsaXN0Lmluc2VydChX VEZNb3ZlKGtleWZyYW1lVmFsdWUpKTsKICAgICAgICAgfQogICAgIH0KLQotICAgIGxpc3QuZmls bEltcGxpY2l0S2V5ZnJhbWVzKGVsZW1lbnQsICp0aGlzLCBlbGVtZW50U3R5bGUsIGNvbnRleHQu cGFyZW50U3R5bGUpOwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IFJlc29sdmVy Ojpwc2V1ZG9TdHlsZUZvckVsZW1lbnQoY29uc3QgRWxlbWVudCYgZWxlbWVudCwgY29uc3QgUHNl dWRvRWxlbWVudFJlcXVlc3QmIHBzZXVkb0VsZW1lbnRSZXF1ZXN0LCBjb25zdCBSZXNvbHV0aW9u Q29udGV4dCYgY29udGV4dCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGZkZWYw YzlhNzA2ZWNkMGM4ZDg3N2M3NjAyMmQ1NmVmZjJlZjkwOGUuLjg5ZmE4MTEzNzgzYjdlYzVhMTJi ZjU2ZmNhZGJmYzQ5YTQ1YzQyZGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDIyLTAxLTA5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQu b3JnPgorCisgICAgICAgIEltcGxpY2l0IGtleWZyYW1lIGZvciBhIENTUyBBbmltYXRpb24gc2hv dWxkIGFsd2F5cyB1c2UgdGhlIHVuZGVybHlpbmcgc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTAxNAorCisgICAgICAgIFJldmlld2VkIGJ5 IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEFkZCBhIG5ldyBXUFQgd2hpY2ggY2hhbmdlcyB0 aGUgdW5kZXJseWluZyBzdHlsZSBmb3IgYSBwcm9wZXJ0eSB0aGF0IGlzIGJlaW5nCisgICAgICAg IGFuaW1hdGVkIHdpdGggYW4gQGtleWZyYW1lcyBydWxlIHRoYXQgZG9lc24ndCBleHBsaWNpdGx5 IHNwZWNpZnkgdGhpcyB2YWx1ZQorICAgICAgICBvbiBhbGwga2V5ZnJhbWVzLgorCisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9hbmltYXRpb24tY2hhbmdl LXVuZGVybHlpbmctdmFsdWUtY2hhbmdlZC1pbi1mbGlnaHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1hbmltYXRpb25zL2FuaW1hdGlv bi1jaGFuZ2UtdW5kZXJseWluZy12YWx1ZS1jaGFuZ2VkLWluLWZsaWdodC5odG1sOiBBZGRlZC4K KwogMjAyMi0wMS0wOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAg ICAgICBJbnRlcnBvbGF0aW9uIGZvciB0aGUgImZpbHRlciIgcHJvcGVydHkgZmFpbHMgd2l0aCBh IHNpbmdsZSBrZXlmcmFtZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNoYW5nZS11bmRl cmx5aW5nLXZhbHVlLWNoYW5nZWQtaW4tZmxpZ2h0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1hbmltYXRpb25zL2FuaW1h dGlvbi1jaGFuZ2UtdW5kZXJseWluZy12YWx1ZS1jaGFuZ2VkLWluLWZsaWdodC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZDFiZjU4NjhiYWQxOGIzN2Y1YTgyYzA1ZTE2MjcwM2ZlNjBlNDEzNgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1hbmltYXRpb25zL2FuaW1hdGlvbi1jaGFuZ2UtdW5kZXJseWluZy12YWx1 ZS1jaGFuZ2VkLWluLWZsaWdodC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKK1BBU1Mg Q2hhbmdpbmcgdGhlIHVuZGVybHlpbmcgdmFsdWUgb2YgYW4gYW5pbWF0ZWQgcHJvcGVydHkgd2l0 aCBhbiBpbXBsaWNpdCAwJSBrZXlmcmFtZQorUEFTUyBDaGFuZ2luZyB0aGUgdW5kZXJseWluZyB2 YWx1ZSBvZiBhbiBhbmltYXRlZCBwcm9wZXJ0eSB3aXRoIGFuIGltcGxpY2l0IDEwMCUga2V5ZnJh bWUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5pbWF0aW9uLWNoYW5nZS11bmRlcmx5aW5nLXZhbHVl LWNoYW5nZWQtaW4tZmxpZ2h0Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9hbmltYXRpb24tY2hhbmdlLXVuZGVybHlp bmctdmFsdWUtY2hhbmdlZC1pbi1mbGlnaHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NDRlYTczNzg1MzNk YTQwZmQ2MjQzZDdjMTY1Nzg1MzI1Mzc0Y2RiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvYW5p bWF0aW9uLWNoYW5nZS11bmRlcmx5aW5nLXZhbHVlLWNoYW5nZWQtaW4tZmxpZ2h0Lmh0bWwKQEAg LTAsMCArMSw0MiBAQAorPCFkb2N0eXBlIGh0bWw+Cis8bWV0YSBjaGFyc2V0PXV0Zi04PgorPHRp dGxlPkNoYW5naW5nIHRoZSB1bmRlcmx5aW5nIHZhbHVlIG9mIGFuIGFuaW1hdGVkIHByb3BlcnR5 IHdpdGggaW1wbGljaXQga2V5ZnJhbWVzPC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0i aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1hbmltYXRpb25zLyI+Cis8c2NyaXB0IHNyYz0i L3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291 cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0ic3VwcG9y dC90ZXN0Y29tbW9uLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKworQGtleWZyYW1lcyBpbXBsaWNp dC1mcm9tIHsKKyAgdG8geyBtYXJnaW4tbGVmdDogMTAwcHggfQorfQorCitAa2V5ZnJhbWVzIGlt cGxpY2l0LXRvIHsKKyAgZnJvbSB7IG1hcmdpbi1sZWZ0OiAxMDBweCB9Cit9CisKKzwvc3R5bGU+ Cis8ZGl2IGlkPSJsb2ciPjwvZGl2PgorPHNjcmlwdD4KKyd1c2Ugc3RyaWN0JzsKKworY29uc3Qg aW1wbGljaXRfa2V5ZnJhbWVfdGVzdCA9IChhbmltYXRpb25OYW1lLCBvZmZzZXQpID0+IHsKKyAg ICB0ZXN0KHQgPT4geworICAgICAgY29uc3QgZGl2ID0gYWRkRGl2KHQpOworCisgICAgICAvLyBT ZXQgdXAgYW5pbWF0aW9uIHRvIGJlIHBhdXNlZCBhbmQgYmUgYXQgaXRzIG1pZC13YXkgcG9pbnQg dGhyb3VnaCBlYXNpbmcuCisgICAgICBkaXYuc3R5bGUuYW5pbWF0aW9uID0gYCR7YW5pbWF0aW9u TmFtZX0gMTBzIHBhdXNlZCBzdGVwcygyLCBzdGFydClgOworICAgICAgY29uc3QgYW5pbWF0aW9u ID0gZGl2LmdldEFuaW1hdGlvbnMoKVswXTsKKworICAgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21w dXRlZFN0eWxlKGRpdikubWFyZ2luTGVmdCwgIjUwcHgiLCAiQ29tcHV0ZWQgc3R5bGUgYmVmb3Jl IGNoYW5naW5nIHRoZSB1bmRlcmx5aW5nIHN0eWxlIik7CisKKyAgICAgIC8vIENoYW5nZSB0aGUg dW5kZXJseWluZyB2YWx1ZS4KKyAgICAgIGRpdi5zdHlsZS5tYXJnaW5MZWZ0ID0gIjIwMHB4IjsK KyAgICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZShkaXYpLm1hcmdpbkxlZnQsICIx NTBweCIsICJDb21wdXRlZCBzdHlsZSBhZnRlciBjaGFuZ2luZyB0aGUgdW5kZXJseWluZyBzdHls ZSIpOworICAgIH0sIGBDaGFuZ2luZyB0aGUgdW5kZXJseWluZyB2YWx1ZSBvZiBhbiBhbmltYXRl ZCBwcm9wZXJ0eSB3aXRoIGFuIGltcGxpY2l0ICR7b2Zmc2V0fSUga2V5ZnJhbWVgKTsKK307CisK K2ltcGxpY2l0X2tleWZyYW1lX3Rlc3QoImltcGxpY2l0LWZyb20iLCAiMCIpOworaW1wbGljaXRf a2V5ZnJhbWVfdGVzdCgiaW1wbGljaXQtdG8iLCAiMTAwIik7CisKKzwvc2NyaXB0Pgo=