235596 2022-01-25 10:15:42 -0800 Deduplication for @keyframes rules should account for animation-composition 2022-01-25 11:42:42 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189299 1 graouts graouts clopez dino ews-watchlist graouts koivisto webkit-bug-importer youennf oldest_to_newest 1833760 0 graouts 2022-01-25 10:15:42 -0800 Deduplication for @keyframes rules should account for animation-composition 1833761 1 449938 graouts 2022-01-25 10:17:24 -0800 Created attachment 449938 Patch 1833763 2 ews-watchlist 2022-01-25 10:21:27 -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 1833780 3 webkit-bug-importer 2022-01-25 10:45:20 -0800 <rdar://problem/88032537> 1833799 4 ews-feeder 2022-01-25 11:42:38 -0800 Committed r288571 (246394@main): <https://commits.webkit.org/246394@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449938. 449938 2022-01-25 10:17:24 -0800 2022-01-25 11:42:40 -0800 Patch bug-235596-20220125191723.patch text/plain 11959 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA4MWVjZDNjZjA5MjFh NjQzMDhmNDNhOWU5NWE1YWY2NDNiN2JhZi4uMmU0ZjkzY2ZlMzhiOTk2YzU2NTI5MTlkZjliMjE2 ZWY3Zjk5ZDcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAxLTI1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIERlZHVwbGljYXRpb24g Zm9yIEBrZXlmcmFtZXMgcnVsZXMgc2hvdWxkIGFjY291bnQgZm9yIGFuaW1hdGlvbi1jb21wb3Np dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1 NTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IENTUyBBbmltYXRpb25zIExldmVsIDIgc3BlYyByZWNlbnRseSBjaGFuZ2VkIHRvIGFjY291bnQg Zm9yIGFuaW1hdGlvbi1jb21wb3NpdGlvbgorICAgICAgICB3aGVuIGRlZHVwbGljYXRpbmcgQGtl eWZyYW1lcyBydWxlcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL3B1 bGwvNjk3NCkuCisKKyAgICAgICAgKiBhbmltYXRpb24vQ29tcG9zaXRlT3BlcmF0aW9uLmg6Cisg ICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZTo6UmVzb2x2ZXI6OmtleWZyYW1lUnVsZXNGb3JOYW1lIGNvbnN0KToKKwogMjAyMi0wMS0yNSAg QW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZWZhY3RvciBL ZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJhbWVzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FuaW1hdGlvbi9Db21wb3NpdGVPcGVyYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlv bi9Db21wb3NpdGVPcGVyYXRpb24uaAppbmRleCA0Y2JiYzE0MjQwNTc5YjZlOTAzYjAxNTYyY2Jk MGFlMWZjODJjZmY2Li43NGE4MGU2NGZiNjM0ZmU4NzAwZWY4ZjUxYTIyYTViZGIyMWE0YWY5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ29tcG9zaXRlT3BlcmF0aW9uLmgK KysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NvbXBvc2l0ZU9wZXJhdGlvbi5oCkBAIC0y Niw2ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgPG9wdGlvbmFsPgorI2luY2x1 ZGUgPHd0Zi9IYXNoVHJhaXRzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMzYsMyAr MzcsNyBAQCBlbnVtIGNsYXNzIENvbXBvc2l0ZU9wZXJhdGlvbiA6IHVpbnQ4X3QgeyBSZXBsYWNl LCBBZGQsIEFjY3VtdWxhdGUgfTsKIHN0ZDo6b3B0aW9uYWw8Q29tcG9zaXRlT3BlcmF0aW9uPiB0 b0NvbXBvc2l0ZU9wZXJhdGlvbihjb25zdCBDU1NWYWx1ZSYpOwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCisKK25hbWVzcGFjZSBXVEYgewordGVtcGxhdGU8PiBzdHJ1Y3QgRGVmYXVsdEhhc2g8 V2ViQ29yZTo6Q29tcG9zaXRlT3BlcmF0aW9uPiA6IEludEhhc2g8V2ViQ29yZTo6Q29tcG9zaXRl T3BlcmF0aW9uPiB7IH07Cit9IC8vIG5hbWVzcGFjZSBXVEYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVSZXNvbHZlci5jcHAKaW5kZXggZjUzNWNjNjM5MTcxZmYzZGQxYTI4MWRmNjRmYjk2ZmE3OWQ2 M2YxYi4uMTkxYzZlMDk2ZmE1NjcyNjFhMWE4YjMxYThhYjg2ODUzZGU5MjQ2ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTMyMCw2ICszMjAsMTQgQEAgVmVjdG9y PFJlZjxTdHlsZVJ1bGVLZXlmcmFtZT4+IFJlc29sdmVyOjprZXlmcmFtZVJ1bGVzRm9yTmFtZShj b25zdCBBdG9tU3RyaW5nJgogICAgIGlmIChpdCA9PSBtX2tleWZyYW1lc1J1bGVNYXAuZW5kKCkp CiAgICAgICAgIHJldHVybiB7IH07CiAKKyAgICBhdXRvIGNvbXBvc2l0ZU9wZXJhdGlvbkZvcktl eWZyYW1lID0gW10oUmVmPFN0eWxlUnVsZUtleWZyYW1lPiBrZXlmcmFtZSkgLT4gQ29tcG9zaXRl T3BlcmF0aW9uIHsKKyAgICAgICAgaWYgKGF1dG8gY29tcG9zaXRlT3BlcmF0aW9uQ1NTVmFsdWUg PSBrZXlmcmFtZS0+cHJvcGVydGllcygpLmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlB bmltYXRpb25Db21wb3NpdGlvbikpIHsKKyAgICAgICAgICAgIGlmIChhdXRvIGNvbXBvc2l0ZU9w ZXJhdGlvbiA9IHRvQ29tcG9zaXRlT3BlcmF0aW9uKCpjb21wb3NpdGVPcGVyYXRpb25DU1NWYWx1 ZSkpCisgICAgICAgICAgICAgICAgcmV0dXJuICpjb21wb3NpdGVPcGVyYXRpb247CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIEFuaW1hdGlvbjo6aW5pdGlhbENvbXBvc2l0ZU9wZXJhdGlvbigp OworICAgIH07CisKICAgICBhdXRvIHRpbWluZ0Z1bmN0aW9uRm9yS2V5ZnJhbWUgPSBbXShSZWY8 U3R5bGVSdWxlS2V5ZnJhbWU+IGtleWZyYW1lKSAtPiBSZWZQdHI8Y29uc3QgVGltaW5nRnVuY3Rp b24+IHsKICAgICAgICAgaWYgKGF1dG8gdGltaW5nRnVuY3Rpb25DU1NWYWx1ZSA9IGtleWZyYW1l LT5wcm9wZXJ0aWVzKCkuZ2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUFuaW1hdGlvblRp bWluZ0Z1bmN0aW9uKSkgewogICAgICAgICAgICAgaWYgKGF1dG8gdGltaW5nRnVuY3Rpb24gPSBU aW1pbmdGdW5jdGlvbjo6Y3JlYXRlRnJvbUNTU1ZhbHVlKCp0aW1pbmdGdW5jdGlvbkNTU1ZhbHVl KSkKQEAgLTM0MiwxMyArMzUwLDE0IEBAIFZlY3RvcjxSZWY8U3R5bGVSdWxlS2V5ZnJhbWU+PiBS ZXNvbHZlcjo6a2V5ZnJhbWVSdWxlc0Zvck5hbWUoY29uc3QgQXRvbVN0cmluZyYKICAgICBhdXRv KiBrZXlmcmFtZXNSdWxlID0gaXQtPnZhbHVlLmdldCgpOwogICAgIGF1dG8qIGtleWZyYW1lcyA9 ICZrZXlmcmFtZXNSdWxlLT5rZXlmcmFtZXMoKTsKIAotICAgIHVzaW5nIEtleWZyYW1lVW5pcXVl S2V5ID0gc3RkOjpwYWlyPGRvdWJsZSwgUmVmUHRyPGNvbnN0IFRpbWluZ0Z1bmN0aW9uPj47Cisg ICAgdXNpbmcgS2V5ZnJhbWVVbmlxdWVLZXkgPSBzdGQ6OnR1cGxlPGRvdWJsZSwgUmVmUHRyPGNv bnN0IFRpbWluZ0Z1bmN0aW9uPiwgQ29tcG9zaXRlT3BlcmF0aW9uPjsKICAgICBhdXRvIGhhc0R1 cGxpY2F0ZUtleXMgPSBbJl0oKSAtPiBib29sIHsKICAgICAgICAgSGFzaFNldDxLZXlmcmFtZVVu aXF1ZUtleT4gdW5pcXVlS2V5ZnJhbWVLZXlzOwogICAgICAgICBmb3IgKGF1dG8mIGtleWZyYW1l IDogKmtleWZyYW1lcykgeworICAgICAgICAgICAgYXV0byBjb21wb3NpdGVPcGVyYXRpb24gPSBj b21wb3NpdGVPcGVyYXRpb25Gb3JLZXlmcmFtZShrZXlmcmFtZSk7CiAgICAgICAgICAgICBhdXRv IHRpbWluZ0Z1bmN0aW9uID0gdW5pcXVlVGltaW5nRnVuY3Rpb25Gb3JLZXlmcmFtZShrZXlmcmFt ZSk7CiAgICAgICAgICAgICBmb3IgKGF1dG8ga2V5IDoga2V5ZnJhbWUtPmtleXMoKSkgewotICAg ICAgICAgICAgICAgIGlmICghdW5pcXVlS2V5ZnJhbWVLZXlzLmFkZCh7IGtleSwgdGltaW5nRnVu Y3Rpb24gfSkpCisgICAgICAgICAgICAgICAgaWYgKCF1bmlxdWVLZXlmcmFtZUtleXMuYWRkKHsg a2V5LCB0aW1pbmdGdW5jdGlvbiwgY29tcG9zaXRlT3BlcmF0aW9uIH0pKQogICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMzYwLDE5 ICszNjksMjEgQEAgVmVjdG9yPFJlZjxTdHlsZVJ1bGVLZXlmcmFtZT4+IFJlc29sdmVyOjprZXlm cmFtZVJ1bGVzRm9yTmFtZShjb25zdCBBdG9tU3RyaW5nJgogCiAgICAgLy8gRklYTUU6IElmIEhh c2hNYXBzIGNvdWxkIGhhdmUgUmVmPD4gYXMgdmFsdWUgdHlwZXMsIHdlIHdvdWxkbid0IG5lZWQK ICAgICAvLyB0byBjb3B5IHRoZSBIYXNoTWFwIGludG8gYSBWZWN0b3IuCi0gICAgVmVjdG9yPFJl ZjxTdHlsZVJ1bGVLZXlmcmFtZT4+IGRlZHVwbGljYXRlZEtleWZyYW1lczsKICAgICAvLyBNZXJn ZSBrZXlmcmFtZXMgd2l0aCBhIHNpbWlsYXIgb2Zmc2V0IGFuZCB0aW1pbmcgZnVuY3Rpb24uCisg ICAgVmVjdG9yPFJlZjxTdHlsZVJ1bGVLZXlmcmFtZT4+IGRlZHVwbGljYXRlZEtleWZyYW1lczsK ICAgICBIYXNoTWFwPEtleWZyYW1lVW5pcXVlS2V5LCBSZWZQdHI8U3R5bGVSdWxlS2V5ZnJhbWU+ PiBrZXlmcmFtZXNNYXA7CiAgICAgZm9yIChhdXRvJiBvcmlnaW5hbEtleWZyYW1lIDogKmtleWZy YW1lcykgeworICAgICAgICBhdXRvIGNvbXBvc2l0ZU9wZXJhdGlvbiA9IGNvbXBvc2l0ZU9wZXJh dGlvbkZvcktleWZyYW1lKG9yaWdpbmFsS2V5ZnJhbWUpOwogICAgICAgICBhdXRvIHRpbWluZ0Z1 bmN0aW9uID0gdW5pcXVlVGltaW5nRnVuY3Rpb25Gb3JLZXlmcmFtZShvcmlnaW5hbEtleWZyYW1l KTsKICAgICAgICAgZm9yIChhdXRvIGtleSA6IG9yaWdpbmFsS2V5ZnJhbWUtPmtleXMoKSkgewot ICAgICAgICAgICAgaWYgKGF1dG8ga2V5ZnJhbWUgPSBrZXlmcmFtZXNNYXAuZ2V0KHsga2V5LCB0 aW1pbmdGdW5jdGlvbiB9KSkKKyAgICAgICAgICAgIEtleWZyYW1lVW5pcXVlS2V5IHVuaXF1ZUtl eSB7IGtleSwgdGltaW5nRnVuY3Rpb24sIGNvbXBvc2l0ZU9wZXJhdGlvbiB9OworICAgICAgICAg ICAgaWYgKGF1dG8ga2V5ZnJhbWUgPSBrZXlmcmFtZXNNYXAuZ2V0KHVuaXF1ZUtleSkpCiAgICAg ICAgICAgICAgICAga2V5ZnJhbWUtPm11dGFibGVQcm9wZXJ0aWVzKCkubWVyZ2VBbmRPdmVycmlk ZU9uQ29uZmxpY3Qob3JpZ2luYWxLZXlmcmFtZS0+cHJvcGVydGllcygpKTsKICAgICAgICAgICAg IGVsc2UgewogICAgICAgICAgICAgICAgIGF1dG8gc3R5bGVSdWxlS2V5ZnJhbWUgPSBTdHlsZVJ1 bGVLZXlmcmFtZTo6Y3JlYXRlKE11dGFibGVTdHlsZVByb3BlcnRpZXM6OmNyZWF0ZSgpKTsKICAg ICAgICAgICAgICAgICBzdHlsZVJ1bGVLZXlmcmFtZS5wdHIoKS0+c2V0S2V5KGtleSk7CiAgICAg ICAgICAgICAgICAgc3R5bGVSdWxlS2V5ZnJhbWUucHRyKCktPm11dGFibGVQcm9wZXJ0aWVzKCku bWVyZ2VBbmRPdmVycmlkZU9uQ29uZmxpY3Qob3JpZ2luYWxLZXlmcmFtZS0+cHJvcGVydGllcygp KTsKLSAgICAgICAgICAgICAgICBrZXlmcmFtZXNNYXAuc2V0KHsga2V5LCB0aW1pbmdGdW5jdGlv biB9LCBzdHlsZVJ1bGVLZXlmcmFtZS5wdHIoKSk7CisgICAgICAgICAgICAgICAga2V5ZnJhbWVz TWFwLnNldCh1bmlxdWVLZXksIHN0eWxlUnVsZUtleWZyYW1lLnB0cigpKTsKICAgICAgICAgICAg ICAgICBkZWR1cGxpY2F0ZWRLZXlmcmFtZXMuYXBwZW5kKHN0eWxlUnVsZUtleWZyYW1lKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg ZTgxODUxOWMyYjZiOGRhYzJmYzlhY2EwYTUyMDVmMTEzMGNkNmI2ZS4uYzRkMDk1MWZmNzdkZTkx YTc4YmVhMjkwNDBmZGNkMGZjNjY5MzE0NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDEtMjUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRGVkdXBsaWNhdGlvbiBmb3IgQGtleWZyYW1lcyBydWxlcyBz aG91bGQgYWNjb3VudCBmb3IgYW5pbWF0aW9uLWNvbXBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU1OTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBvcnQgdGVzdCByZWNlbnRseSBhZGRl ZCBpbiBXUFQgdmlhIGh0dHBzOi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0L3B1 bGwvMzI0OTUuCisgICAgICAgIFdlIHBhc3MgdGhlbSBhbGwgd2l0aCB0aGUgc291cmNlIGNoYW5n ZS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvS2V5 ZnJhbWVFZmZlY3QtZ2V0S2V5ZnJhbWVzLnRlbnRhdGl2ZS1leHBlY3RlZC50eHQ6CisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9LZXlmcmFtZUVmZmVjdC1n ZXRLZXlmcmFtZXMudGVudGF0aXZlLmh0bWw6CisKIDIwMjItMDEtMjUgIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIFBh cnNpbmcgc3VwcG9ydCBmb3IgY29udGFpbmVyLW5hbWUgcHJvcGVydHkKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1hbmltYXRp b25zL0tleWZyYW1lRWZmZWN0LWdldEtleWZyYW1lcy50ZW50YXRpdmUtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1h dGlvbnMvS2V5ZnJhbWVFZmZlY3QtZ2V0S2V5ZnJhbWVzLnRlbnRhdGl2ZS1leHBlY3RlZC50eHQK aW5kZXggYmMxZGZjMmI1OTdhODRhZjg0M2Y4MTMxYWZkYTBlOTMzYTgxM2Q1Ny4uNTU1OWIwMGRi MWM2NWFjZjQwMTNhYjU4Y2JmMTU1YjU5NzRkYzhhMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvS2V5ZnJh bWVFZmZlY3QtZ2V0S2V5ZnJhbWVzLnRlbnRhdGl2ZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMv S2V5ZnJhbWVFZmZlY3QtZ2V0S2V5ZnJhbWVzLnRlbnRhdGl2ZS1leHBlY3RlZC50eHQKQEAgLTE3 LDYgKzE3LDggQEAgUEFTUyBLZXlmcmFtZUVmZmVjdC5nZXRLZXlmcmFtZXMoKSByZXR1cm5zIGV4 cGVjdGVkIGZyYW1lcyBmb3IgYW4gYW5pbWF0aW9uIHdpdGgKIFBBU1MgS2V5ZnJhbWVFZmZlY3Qu Z2V0S2V5ZnJhbWVzKCkgcmV0dXJucyBleHBlY3RlZCBmcmFtZXMgZm9yIGFuIGFuaW1hdGlvbiB3 aXRoIG11bHRpcGxlIGtleWZyYW1lcyBmb3IgdGhlIHNhbWUgdGltZSwgYW5kIGFsbCB3aXRoIHRo ZSBzYW1lIGVhc2luZyBmdW5jdGlvbgogUEFTUyBLZXlmcmFtZUVmZmVjdC5nZXRLZXlmcmFtZXMo KSByZXR1cm5zIGV4cGVjdGVkIGZyYW1lcyBmb3IgYW4gYW5pbWF0aW9uIHdpdGggbXVsdGlwbGUg a2V5ZnJhbWVzIGZvciB0aGUgc2FtZSB0aW1lIGFuZCB3aXRoIGRpZmZlcmVudCBlYXNpbmcgZnVu Y3Rpb25zCiBQQVNTIEtleWZyYW1lRWZmZWN0LmdldEtleWZyYW1lcygpIHJldHVybnMgZXhwZWN0 ZWQgZnJhbWVzIGZvciBhbiBhbmltYXRpb24gd2l0aCBtdWx0aXBsZSBrZXlmcmFtZXMgZm9yIHRo ZSBzYW1lIHRpbWUgYW5kIHdpdGggZGlmZmVyZW50IGJ1dCBlcXVpdmFsZW50IGVhc2luZyBmdW5j dGlvbnMKK1BBU1MgS2V5ZnJhbWVFZmZlY3QuZ2V0S2V5ZnJhbWVzKCkgcmV0dXJucyBleHBlY3Rl ZCBmcmFtZXMgZm9yIGFuIGFuaW1hdGlvbiB3aXRoIG11bHRpcGxlIGtleWZyYW1lcyBmb3IgdGhl IHNhbWUgdGltZSBhbmQgd2l0aCBkaWZmZXJlbnQgY29tcG9zaXRlIG9wZXJhdGlvbnMKK1BBU1Mg S2V5ZnJhbWVFZmZlY3QuZ2V0S2V5ZnJhbWVzKCkgcmV0dXJucyBleHBlY3RlZCBmcmFtZXMgZm9y IGFuIGFuaW1hdGlvbiB3aXRoIG11bHRpcGxlIGtleWZyYW1lcyBmb3IgdGhlIHNhbWUgdGltZSBh bmQgd2l0aCBkaWZmZXJlbnQgZWFzaW5nIGZ1bmN0aW9ucyBhbmQgY29tcG9zaXRlIG9wZXJhdGlv bnMKIFBBU1MgS2V5ZnJhbWVFZmZlY3QuZ2V0S2V5ZnJhbWVzKCkgcmV0dXJucyBleHBlY3RlZCBm cmFtZXMgZm9yIG92ZXJsYXBwaW5nIGtleWZyYW1lcwogUEFTUyBLZXlmcmFtZUVmZmVjdC5nZXRL ZXlmcmFtZXMoKSByZXR1cm5zIGV4cGVjdGVkIHZhbHVlcyBmb3IgYW5pbWF0aW9ucyB3aXRoIGZp bHRlciBwcm9wZXJ0aWVzIGFuZCBtaXNzaW5nIGtleWZyYW1lcwogUEFTUyBLZXlmcmFtZUVmZmVj dC5nZXRLZXlmcmFtZXMoKSByZXR1cm5zIGV4cGVjdGVkIHZhbHVlcyBmb3IgYW5pbWF0aW9uIHdp dGggZHJvcC1zaGFkb3cgb2YgZmlsdGVyIHByb3BlcnR5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9LZXlm cmFtZUVmZmVjdC1nZXRLZXlmcmFtZXMudGVudGF0aXZlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtYW5pbWF0aW9ucy9LZXlmcmFtZUVm ZmVjdC1nZXRLZXlmcmFtZXMudGVudGF0aXZlLmh0bWwKaW5kZXggNTdiY2Y5OWYxNjc5ZWJkZGM0 NTM5YzllOGQ2OWYyOTJlYWVkNWFjYi4uZGYzMTljMjUyNjU2OWEyZmNjYmY4YjQxMDZjNmJkZTM4 N2JlNTcyNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWFuaW1hdGlvbnMvS2V5ZnJhbWVFZmZlY3QtZ2V0S2V5ZnJhbWVzLnRl bnRhdGl2ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1hbmltYXRpb25zL0tleWZyYW1lRWZmZWN0LWdldEtleWZyYW1lcy50ZW50 YXRpdmUuaHRtbApAQCAtMTI1LDYgKzEyNSwyOCBAQAogICB0byAgIHsgbWFyZ2luLXRvcDogMjBw eDsgbWFyZ2luLXJpZ2h0OiAyMHB4OyBtYXJnaW4tYm90dG9tOiAyMHB4OyB9CiB9CiAKK0BrZXlm cmFtZXMgYW5pbS1tZXJnZS1vZmZzZXQtYW5kLWNvbXBvc2l0ZSB7CisgIGZyb20geyBjb2xvcjog cmdiKDAsIDAsIDApOyBhbmltYXRpb24tY29tcG9zaXRpb246IGFkZDsgfQorICB0byAgIHsgY29s b3I6IHJnYigyNTUsIDI1NSwgMjU1KTsgfQorICBmcm9tIHsgbWFyZ2luLXRvcDogOHB4OyBhbmlt YXRpb24tY29tcG9zaXRpb246IGFjY3VtdWxhdGU7IH0KKyAgdG8gICB7IG1hcmdpbi10b3A6IDE2 cHg7IH0KKyAgZnJvbSB7IGZvbnQtc2l6ZTogMTZweDsgYW5pbWF0aW9uLWNvbXBvc2l0aW9uOiBh ZGQ7IH0KKyAgdG8gICB7IGZvbnQtc2l6ZTogMzJweDsgfQorICBmcm9tIHsgcGFkZGluZy1sZWZ0 OiAycHg7IGFuaW1hdGlvbi1jb21wb3NpdGlvbjogYWNjdW11bGF0ZTsgfQorICB0byAgIHsgcGFk ZGluZy1sZWZ0OiA0cHg7IH0KK30KKworQGtleWZyYW1lcyBhbmltLW1lcmdlLW9mZnNldC1lYXNp bmctYW5kLWNvbXBvc2l0ZSB7CisgIGZyb20geyBjb2xvcjogcmdiKDAsIDAsIDApOyBhbmltYXRp b24tY29tcG9zaXRpb246IGFkZDsgfQorICB0byAgIHsgY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1 KTsgfQorICBmcm9tIHsgbWFyZ2luLXRvcDogOHB4OyBhbmltYXRpb24tY29tcG9zaXRpb246IGFj Y3VtdWxhdGU7IH0KKyAgdG8gICB7IG1hcmdpbi10b3A6IDE2cHg7IH0KKyAgZnJvbSB7IGZvbnQt c2l6ZTogMTZweDsgYW5pbWF0aW9uLWNvbXBvc2l0aW9uOiBhZGQ7IGFuaW1hdGlvbi10aW1pbmct ZnVuY3Rpb246IGxpbmVhcjsgfQorICB0byAgIHsgZm9udC1zaXplOiAzMnB4OyB9CisgIGZyb20g eyBwYWRkaW5nLWxlZnQ6IDJweDsgYW5pbWF0aW9uLWNvbXBvc2l0aW9uOiBhY2N1bXVsYXRlOyB9 CisgIHRvICAgeyBwYWRkaW5nLWxlZnQ6IDRweDsgfQorfQorCiBAa2V5ZnJhbWVzIGFuaW0tb3Zl cnJpZGluZyB7CiAgIGZyb20gICAgICAgICAgeyBwYWRkaW5nLXRvcDogNTBweCB9CiAgIDUwJSwg ZnJvbSAgICAgeyBwYWRkaW5nLXRvcDogMzBweCB9IC8qIHdpbnM6IDAlICovCkBAIC01MjgsNiAr NTUwLDQ4IEBAIHRlc3QodCA9PiB7CiAgICAnYW5pbWF0aW9uIHdpdGggbXVsdGlwbGUga2V5ZnJh bWVzIGZvciB0aGUgc2FtZSB0aW1lIGFuZCB3aXRoICcgKwogICAgJ2RpZmZlcmVudCBidXQgZXF1 aXZhbGVudCBlYXNpbmcgZnVuY3Rpb25zJyk7CiAKK3Rlc3QodCA9PiB7CisgIGNvbnN0IGRpdiA9 IGFkZERpdih0KTsKKyAgZGl2LnN0eWxlLmFuaW1hdGlvbiA9ICdhbmltLW1lcmdlLW9mZnNldC1h bmQtY29tcG9zaXRlIDEwMHMnOworCisgIGNvbnN0IGZyYW1lcyA9IGdldEtleWZyYW1lcyhkaXYp OworCisgIGNvbnN0IGV4cGVjdGVkID0gWworICAgIHsgb2Zmc2V0OiAwLCBjb21wdXRlZE9mZnNl dDogMCwgZWFzaW5nOiAiZWFzZSIsIGNvbXBvc2l0ZTogImFkZCIsCisgICAgICBjb2xvcjogInJn YigwLCAwLCAwKSIsIGZvbnRTaXplOiAiMTZweCIgfSwKKyAgICB7IG9mZnNldDogMCwgY29tcHV0 ZWRPZmZzZXQ6IDAsIGVhc2luZzogImVhc2UiLCBjb21wb3NpdGU6ICJhY2N1bXVsYXRlIiwKKyAg ICAgIG1hcmdpblRvcDogIjhweCIsIHBhZGRpbmdMZWZ0OiAiMnB4IiB9LAorICAgIHsgb2Zmc2V0 OiAxLCBjb21wdXRlZE9mZnNldDogMSwgZWFzaW5nOiAiZWFzZSIsIGNvbXBvc2l0ZTogImF1dG8i LAorICAgICAgY29sb3I6ICJyZ2IoMjU1LCAyNTUsIDI1NSkiLCBmb250U2l6ZTogIjMycHgiLCBt YXJnaW5Ub3A6ICIxNnB4IiwKKyAgICAgIHBhZGRpbmdMZWZ0OiAiNHB4IiB9LAorICBdOworICBh c3NlcnRfZnJhbWVfbGlzdHNfZXF1YWwoZnJhbWVzLCBleHBlY3RlZCk7Cit9LCAnS2V5ZnJhbWVF ZmZlY3QuZ2V0S2V5ZnJhbWVzKCkgcmV0dXJucyBleHBlY3RlZCBmcmFtZXMgZm9yIGFuICcgKwor ICAgJ2FuaW1hdGlvbiB3aXRoIG11bHRpcGxlIGtleWZyYW1lcyBmb3IgdGhlIHNhbWUgdGltZSBh bmQgd2l0aCAnICsKKyAgICdkaWZmZXJlbnQgY29tcG9zaXRlIG9wZXJhdGlvbnMnKTsKKwordGVz dCh0ID0+IHsKKyAgY29uc3QgZGl2ID0gYWRkRGl2KHQpOworICBkaXYuc3R5bGUuYW5pbWF0aW9u ID0gJ2FuaW0tbWVyZ2Utb2Zmc2V0LWVhc2luZy1hbmQtY29tcG9zaXRlIDEwMHMnOworCisgIGNv bnN0IGZyYW1lcyA9IGdldEtleWZyYW1lcyhkaXYpOworCisgIGNvbnN0IGV4cGVjdGVkID0gWwor ICAgIHsgb2Zmc2V0OiAwLCBjb21wdXRlZE9mZnNldDogMCwgZWFzaW5nOiAiZWFzZSIsIGNvbXBv c2l0ZTogImFkZCIsCisgICAgICBjb2xvcjogInJnYigwLCAwLCAwKSIgfSwKKyAgICB7IG9mZnNl dDogMCwgY29tcHV0ZWRPZmZzZXQ6IDAsIGVhc2luZzogImVhc2UiLCBjb21wb3NpdGU6ICJhY2N1 bXVsYXRlIiwKKyAgICAgIG1hcmdpblRvcDogIjhweCIsIHBhZGRpbmdMZWZ0OiAiMnB4IiB9LAor ICAgIHsgb2Zmc2V0OiAwLCBjb21wdXRlZE9mZnNldDogMCwgZWFzaW5nOiAibGluZWFyIiwgY29t cG9zaXRlOiAiYWRkIiwKKyAgICAgIGZvbnRTaXplOiAiMTZweCIgfSwKKyAgICB7IG9mZnNldDog MSwgY29tcHV0ZWRPZmZzZXQ6IDEsIGVhc2luZzogImVhc2UiLCBjb21wb3NpdGU6ICJhdXRvIiwK KyAgICAgIGNvbG9yOiAicmdiKDI1NSwgMjU1LCAyNTUpIiwgZm9udFNpemU6ICIzMnB4IiwgbWFy Z2luVG9wOiAiMTZweCIsCisgICAgICBwYWRkaW5nTGVmdDogIjRweCIgfSwKKyAgXTsKKyAgYXNz ZXJ0X2ZyYW1lX2xpc3RzX2VxdWFsKGZyYW1lcywgZXhwZWN0ZWQpOworfSwgJ0tleWZyYW1lRWZm ZWN0LmdldEtleWZyYW1lcygpIHJldHVybnMgZXhwZWN0ZWQgZnJhbWVzIGZvciBhbiAnICsKKyAg ICdhbmltYXRpb24gd2l0aCBtdWx0aXBsZSBrZXlmcmFtZXMgZm9yIHRoZSBzYW1lIHRpbWUgYW5k IHdpdGggJyArCisgICAnZGlmZmVyZW50IGVhc2luZyBmdW5jdGlvbnMgYW5kIGNvbXBvc2l0ZSBv cGVyYXRpb25zJyk7CisKIHRlc3QodCA9PiB7CiAgIGNvbnN0IGRpdiA9IGFkZERpdih0KTsKICAg ZGl2LnN0eWxlLmFuaW1hdGlvbiA9ICdhbmltLW92ZXJyaWRpbmcgMTAwcyc7Cg==