236020 2022-02-02 08:56:41 -0800 Keyframe resolution methods should use reference instead of pointer parameters 2022-02-02 16:34:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts changseok dino esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1836453 0 graouts 2022-02-02 08:56:41 -0800 Keyframe resolution methods should use reference instead of pointer parameters 1836462 1 450654 graouts 2022-02-02 09:02:30 -0800 Created attachment 450654 Patch 1836698 2 ews-feeder 2022-02-02 16:33:40 -0800 Committed r289014 (246723@main): <https://commits.webkit.org/246723@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450654. 1836700 3 webkit-bug-importer 2022-02-02 16:34:24 -0800 <rdar://problem/88408231> 450654 2022-02-02 09:02:30 -0800 2022-02-02 16:33:42 -0800 Patch bug-236020-20220202180228.patch text/plain 12775 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiODJjMmY2ZTI0ZTdj Y2E5MGFhNjNkOGY2Nzc3OGE5YTczZGFmMi4uMTBmNWI5OTZkOTA0MTRkYTUxZjYyMzI3MWQwYzBl OTQ5OGZkOWVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTAyICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIEtleWZyYW1lIHJlc29s dXRpb24gbWV0aG9kcyBzaG91bGQgdXNlIHJlZmVyZW5jZSBpbnN0ZWFkIG9mIHBvaW50ZXIgcGFy YW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM2MDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIFN0eWxlOjpSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZSgpIG1ldGhvZCB3b3VsZCB0YWtl IGluIGEgYGNvbnN0IFJlbmRlclN0eWxlKmAKKyAgICAgICAgYW5kIGEgYGNvbnN0IFN0eWxlUnVs ZUtleWZyYW1lKmAgYnV0IHRoZXNlIHBhcmFtZXRlcnMgd2VyZSB1c2VkIHdpdGhvdXQgbnVsbCBj aGVja3MuCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyB0aGlzIG1ldGhvZCBzaWduYXR1cmUg dG8gdGFrZSBpbiByZWZlcmVuY2VzIGluc3RlYWQsIHdoaWNoIGludm9sdmVzCisgICAgICAgIGFs c28gY2hhbmdpbmcgdGhlIHNpZ25hdHVyZSBmb3IgU3R5bGU6OlJlc29sdmVyOjprZXlmcmFtZVN0 eWxlc0ZvckFuaW1hdGlvbigpLgorCisgICAgICAgICogYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0OjpnZXRLZXlmcmFtZXMpOgor ICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OnVwZGF0ZUJsZW5kaW5nS2V5ZnJhbWVz KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpjb21wdXRlQ1NTQW5pbWF0aW9u QmxlbmRpbmdLZXlmcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmFw cGx5UGVuZGluZ0FjY2VsZXJhdGVkQWN0aW9ucyk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L0tleWZyYW1lTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUxpc3Q6OmZpbGxJ bXBsaWNpdEtleWZyYW1lcyk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlz dC5oOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGU6OlJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpSZXNvbHZlcjo6a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24pOgorICAgICAgICAq IHN0eWxlL1N0eWxlUmVzb2x2ZXIuaDoKKwogMjAyMi0wMi0wMSAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gVXBkYXRlIGZsYWdz IGluIGludGVybmFsIEdTdHJlYW1lciBzb3VyY2UgYW5kIHNpbmsgZWxlbWVudHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmluZGV4IDMwODk2ZjQxZmQ5MDQ0 ZTdiZGQ5OTY3ZTRkY2E5MDMwOWRhNGMyNTQuLjI3Y2U3Mjk2MDc3Y2UwYjYzM2U4ZjVlMjgzY2M4 NmI5YzQzMzFiOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFt ZUVmZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0 LmNwcApAQCAtNjAyLDEyICs2MDIsMTMgQEAgYXV0byBLZXlmcmFtZUVmZmVjdDo6Z2V0S2V5ZnJh bWVzKERvY3VtZW50JiBkb2N1bWVudCkgLT4gVmVjdG9yPENvbXB1dGVkS2V5ZnJhbWUKICAgICBh dXRvKiB0YXJnZXQgPSBtX3RhcmdldC5nZXQoKTsKICAgICBhdXRvKiByZW5kZXJlciA9IHRoaXMt PnJlbmRlcmVyKCk7CiAgICAgYXV0byogbGFzdFN0eWxlQ2hhbmdlRXZlbnRTdHlsZSA9IHRhcmdl dFN0eWxlYWJsZSgpLT5sYXN0U3R5bGVDaGFuZ2VFdmVudFN0eWxlKCk7CisgICAgYXV0byYgZWxl bWVudFN0eWxlID0gbGFzdFN0eWxlQ2hhbmdlRXZlbnRTdHlsZSA/ICpsYXN0U3R5bGVDaGFuZ2VF dmVudFN0eWxlIDogY3VycmVudFN0eWxlKCk7CiAKICAgICBDb21wdXRlZFN0eWxlRXh0cmFjdG9y IGNvbXB1dGVkU3R5bGVFeHRyYWN0b3IgeyB0YXJnZXQsIGZhbHNlLCBtX3BzZXVkb0lkIH07CiAK ICAgICBLZXlmcmFtZUxpc3QgY29tcHV0ZWRLZXlmcmFtZUxpc3QobV9ibGVuZGluZ0tleWZyYW1l cy5hbmltYXRpb25OYW1lKCkpOwogICAgIGNvbXB1dGVkS2V5ZnJhbWVMaXN0LmNvcHlLZXlmcmFt ZXMobV9ibGVuZGluZ0tleWZyYW1lcyk7Ci0gICAgY29tcHV0ZWRLZXlmcmFtZUxpc3QuZmlsbElt cGxpY2l0S2V5ZnJhbWVzKCptX3RhcmdldCwgbV90YXJnZXQtPnN0eWxlUmVzb2x2ZXIoKSwgbGFz dFN0eWxlQ2hhbmdlRXZlbnRTdHlsZSwgbnVsbHB0cik7CisgICAgY29tcHV0ZWRLZXlmcmFtZUxp c3QuZmlsbEltcGxpY2l0S2V5ZnJhbWVzKCptX3RhcmdldCwgbV90YXJnZXQtPnN0eWxlUmVzb2x2 ZXIoKSwgZWxlbWVudFN0eWxlLCBudWxscHRyKTsKIAogICAgIGF1dG8ga2V5ZnJhbWVSdWxlcyA9 IFsmXSgpIC0+IGNvbnN0IFZlY3RvcjxSZWY8U3R5bGVSdWxlS2V5ZnJhbWU+PiB7CiAgICAgICAg IGlmICghaXM8Q1NTQW5pbWF0aW9uPihhbmltYXRpb24oKSkpCkBAIC04NDgsNyArODQ5LDcgQEAg dm9pZCBLZXlmcmFtZUVmZmVjdDo6dXBkYXRlQmxlbmRpbmdLZXlmcmFtZXMoUmVuZGVyU3R5bGUm IGVsZW1lbnRTdHlsZSwgY29uc3QgU3QKICAgICAgICAgICAgIGtleWZyYW1lTGlzdC5hZGRQcm9w ZXJ0eShzdHlsZVByb3BlcnRpZXMtPnByb3BlcnR5QXQoaSkuaWQoKSk7CiAKICAgICAgICAgYXV0 byBrZXlmcmFtZVJ1bGUgPSBTdHlsZVJ1bGVLZXlmcmFtZTo6Y3JlYXRlKFdURk1vdmUoc3R5bGVQ cm9wZXJ0aWVzKSk7Ci0gICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVSZXNvbHZl ci5zdHlsZUZvcktleWZyYW1lKCptX3RhcmdldCwgJmVsZW1lbnRTdHlsZSwgcmVzb2x1dGlvbkNv bnRleHQsIGtleWZyYW1lUnVsZS5wdHIoKSwga2V5ZnJhbWVWYWx1ZSkpOworICAgICAgICBrZXlm cmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlUmVzb2x2ZXIuc3R5bGVGb3JLZXlmcmFtZSgqbV90YXJn ZXQsIGVsZW1lbnRTdHlsZSwgcmVzb2x1dGlvbkNvbnRleHQsIGtleWZyYW1lUnVsZS5nZXQoKSwg a2V5ZnJhbWVWYWx1ZSkpOwogICAgICAgICBrZXlmcmFtZUxpc3QuaW5zZXJ0KFdURk1vdmUoa2V5 ZnJhbWVWYWx1ZSkpOwogICAgIH0KIApAQCAtMTA0Nyw3ICsxMDQ4LDcgQEAgdm9pZCBLZXlmcmFt ZUVmZmVjdDo6Y29tcHV0ZUNTU0FuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRl clN0eWxlJiB1bmEKIAogICAgIEtleWZyYW1lTGlzdCBrZXlmcmFtZUxpc3QoYmFja2luZ0FuaW1h dGlvbi5uYW1lKCkuc3RyaW5nKTsKICAgICBpZiAoYXV0byogc3R5bGVTY29wZSA9IFN0eWxlOjpT Y29wZTo6Zm9yT3JkaW5hbCgqbV90YXJnZXQsIGJhY2tpbmdBbmltYXRpb24ubmFtZVN0eWxlU2Nv cGVPcmRpbmFsKCkpKQotICAgICAgICBzdHlsZVNjb3BlLT5yZXNvbHZlcigpLmtleWZyYW1lU3R5 bGVzRm9yQW5pbWF0aW9uKCptX3RhcmdldCwgJnVuYW5pbWF0ZWRTdHlsZSwgcmVzb2x1dGlvbkNv bnRleHQsIGtleWZyYW1lTGlzdCk7CisgICAgICAgIHN0eWxlU2NvcGUtPnJlc29sdmVyKCkua2V5 ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oKm1fdGFyZ2V0LCB1bmFuaW1hdGVkU3R5bGUsIHJlc29s dXRpb25Db250ZXh0LCBrZXlmcmFtZUxpc3QpOwogCiAgICAgLy8gRW5zdXJlIHJlc291cmNlIGxv YWRzIGZvciBhbGwgdGhlIGZyYW1lcy4KICAgICBmb3IgKGF1dG8mIGtleWZyYW1lIDoga2V5ZnJh bWVMaXN0KSB7CkBAIC0xNzc3LDcgKzE3NzgsNyBAQCBPcHRpb25TZXQ8QWNjZWxlcmF0ZWRBY3Rp b25BcHBsaWNhdGlvblJlc3VsdD4gS2V5ZnJhbWVFZmZlY3Q6OmFwcGx5UGVuZGluZ0FjY2VsZQog CiAgICAgICAgIEtleWZyYW1lTGlzdCBleHBsaWNpdEtleWZyYW1lcyhtX2JsZW5kaW5nS2V5ZnJh bWVzLmFuaW1hdGlvbk5hbWUoKSk7CiAgICAgICAgIGV4cGxpY2l0S2V5ZnJhbWVzLmNvcHlLZXlm cmFtZXMobV9ibGVuZGluZ0tleWZyYW1lcyk7Ci0gICAgICAgIGV4cGxpY2l0S2V5ZnJhbWVzLmZp bGxJbXBsaWNpdEtleWZyYW1lcygqbV90YXJnZXQsIG1fdGFyZ2V0LT5zdHlsZVJlc29sdmVyKCks IHVuZGVybHlpbmdTdHlsZS5nZXQoKSwgbnVsbHB0cik7CisgICAgICAgIGV4cGxpY2l0S2V5ZnJh bWVzLmZpbGxJbXBsaWNpdEtleWZyYW1lcygqbV90YXJnZXQsIG1fdGFyZ2V0LT5zdHlsZVJlc29s dmVyKCksICp1bmRlcmx5aW5nU3R5bGUsIG51bGxwdHIpOwogICAgICAgICByZXR1cm4gcmVuZGVy ZXItPnN0YXJ0QW5pbWF0aW9uKHRpbWVPZmZzZXQsIGJhY2tpbmdBbmltYXRpb25Gb3JDb21wb3Np dGVkUmVuZGVyZXIoKSwgZXhwbGljaXRLZXlmcmFtZXMpID8gUnVubmluZ0FjY2VsZXJhdGVkOjpZ ZXMgOiBSdW5uaW5nQWNjZWxlcmF0ZWQ6Ok5vOwogICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5jcHAKaW5kZXggNDUzMmUwNDgzOTk1MWU0 OTU1MDFhNWZiOWFmOGQ5ODM5OWYxZjViMy4uOTA0OTczYjc2ZGFiN2Y1ZTYwODg4MzM0ZjNkYzNj M2ZmNjZjNmFhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0tl eWZyYW1lTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0tleWZy YW1lTGlzdC5jcHAKQEAgLTExNiwyMCArMTE2LDIwIEBAIHN0YXRpYyBjb25zdCBTdHlsZVJ1bGVL ZXlmcmFtZSYgaHVuZHJlZFBlcmNlbnRLZXlmcmFtZSgpCiAgICAgcmV0dXJuIHJ1bGUuZ2V0KCku Z2V0KCk7CiB9CiAKLXZvaWQgS2V5ZnJhbWVMaXN0OjpmaWxsSW1wbGljaXRLZXlmcmFtZXMoY29u c3QgRWxlbWVudCYgZWxlbWVudCwgU3R5bGU6OlJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25z dCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50RWxl bWVudFN0eWxlKQordm9pZCBLZXlmcmFtZUxpc3Q6OmZpbGxJbXBsaWNpdEtleWZyYW1lcyhjb25z dCBFbGVtZW50JiBlbGVtZW50LCBTdHlsZTo6UmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0 IFJlbmRlclN0eWxlJiBlbGVtZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVt ZW50U3R5bGUpCiB7CiAgICAgLy8gSWYgdGhlIDAlIGtleWZyYW1lIGlzIG1pc3NpbmcsIGNyZWF0 ZSBpdCAoYnV0IG9ubHkgaWYgdGhlcmUgaXMgYXQgbGVhc3Qgb25lIG90aGVyIGtleWZyYW1lKS4K ICAgICBhdXRvIGluaXRpYWxTaXplID0gc2l6ZSgpOwogICAgIGlmIChpbml0aWFsU2l6ZSA+IDAg JiYgbV9rZXlmcmFtZXNbMF0ua2V5KCkpIHsKICAgICAgICAgS2V5ZnJhbWVWYWx1ZSBrZXlmcmFt ZVZhbHVlKDAsIG51bGxwdHIpOwotICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxl UmVzb2x2ZXIuc3R5bGVGb3JLZXlmcmFtZShlbGVtZW50LCBlbGVtZW50U3R5bGUsIHsgcGFyZW50 RWxlbWVudFN0eWxlIH0sICZ6ZXJvUGVyY2VudEtleWZyYW1lKCksIGtleWZyYW1lVmFsdWUpKTsK KyAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZVJlc29sdmVyLnN0eWxlRm9yS2V5 ZnJhbWUoZWxlbWVudCwgZWxlbWVudFN0eWxlLCB7IHBhcmVudEVsZW1lbnRTdHlsZSB9LCB6ZXJv UGVyY2VudEtleWZyYW1lKCksIGtleWZyYW1lVmFsdWUpKTsKICAgICAgICAgaW5zZXJ0KFdURk1v dmUoa2V5ZnJhbWVWYWx1ZSkpOwogICAgIH0KIAogICAgIC8vIElmIHRoZSAxMDAlIGtleWZyYW1l IGlzIG1pc3NpbmcsIGNyZWF0ZSBpdCAoYnV0IG9ubHkgaWYgdGhlcmUgaXMgYXQgbGVhc3Qgb25l IG90aGVyIGtleWZyYW1lKS4KICAgICBpZiAoaW5pdGlhbFNpemUgPiAwICYmIChtX2tleWZyYW1l c1tzaXplKCkgLSAxXS5rZXkoKSAhPSAxKSkgewogICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZy YW1lVmFsdWUoMSwgbnVsbHB0cik7Ci0gICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5 bGVSZXNvbHZlci5zdHlsZUZvcktleWZyYW1lKGVsZW1lbnQsIGVsZW1lbnRTdHlsZSwgeyBwYXJl bnRFbGVtZW50U3R5bGUgfSwgJmh1bmRyZWRQZXJjZW50S2V5ZnJhbWUoKSwga2V5ZnJhbWVWYWx1 ZSkpOworICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlUmVzb2x2ZXIuc3R5bGVG b3JLZXlmcmFtZShlbGVtZW50LCBlbGVtZW50U3R5bGUsIHsgcGFyZW50RWxlbWVudFN0eWxlIH0s IGh1bmRyZWRQZXJjZW50S2V5ZnJhbWUoKSwga2V5ZnJhbWVWYWx1ZSkpOwogICAgICAgICBpbnNl cnQoV1RGTW92ZShrZXlmcmFtZVZhbHVlKSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5oCmluZGV4IGFlNGEwN2VhMTA2MmQxOTM5OWJi OWYzYjI2YzU4NDBjOWZhYjU1OWMuLjJlYjlkY2RiZTYzNGIyMTFkMzJjZDI1MWJkZmE3YTBlMmNl Y2RlZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFt ZUxpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0 LmgKQEAgLTEwMCw3ICsxMDAsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNvcHlLZXlmcmFtZXMo S2V5ZnJhbWVMaXN0Jik7CiAgICAgYm9vbCBoYXNJbXBsaWNpdEtleWZyYW1lcygpIGNvbnN0Owot ICAgIHZvaWQgZmlsbEltcGxpY2l0S2V5ZnJhbWVzKGNvbnN0IEVsZW1lbnQmLCBTdHlsZTo6UmVz b2x2ZXImLCBjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHls ZSogcGFyZW50RWxlbWVudFN0eWxlKTsKKyAgICB2b2lkIGZpbGxJbXBsaWNpdEtleWZyYW1lcyhj b25zdCBFbGVtZW50JiwgU3R5bGU6OlJlc29sdmVyJiwgY29uc3QgUmVuZGVyU3R5bGUmIGVsZW1l bnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAKICAgICBh dXRvIGJlZ2luKCkgY29uc3QgeyByZXR1cm4gbV9rZXlmcmFtZXMuYmVnaW4oKTsgfQogICAgIGF1 dG8gZW5kKCkgY29uc3QgeyByZXR1cm4gbV9rZXlmcmFtZXMuZW5kKCk7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggYWQ1OWRmMGMyMTUyZDA4YzA3ZGU4ZDMzOWJh OTI4ZTU0NDRiZjVhYS4uYWQ2N2ExZWQ3ZTc1MjgwZTY0ZDkwZDdkNjY0ZThjMDQwYWM5ZTRlNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTI3NSwxNSArMjc1LDE1 IEBAIEVsZW1lbnRTdHlsZSBSZXNvbHZlcjo6c3R5bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFJlc29sdXRpb25DCiAgICAgcmV0dXJuIHsgc3RhdGUudGFrZVN0eWxl KCksIFdURk1vdmUoZWxlbWVudFN0eWxlUmVsYXRpb25zKSB9OwogfQogCi1zdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0IFJlc29sdXRp b25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHlsZVJ1bGVLZXlmcmFtZSoga2V5ZnJhbWUsIEtl eWZyYW1lVmFsdWUmIGtleWZyYW1lVmFsdWUpCitzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+ IFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0 IFJlbmRlclN0eWxlJiBlbGVtZW50U3R5bGUsIGNvbnN0IFJlc29sdXRpb25Db250ZXh0JiBjb250 ZXh0LCBjb25zdCBTdHlsZVJ1bGVLZXlmcmFtZSYga2V5ZnJhbWUsIEtleWZyYW1lVmFsdWUmIGtl eWZyYW1lVmFsdWUpCiB7CiAgICAgTWF0Y2hSZXN1bHQgcmVzdWx0OwotICAgIHJlc3VsdC5hdXRo b3JEZWNsYXJhdGlvbnMuYXBwZW5kKHsgJmtleWZyYW1lLT5wcm9wZXJ0aWVzKCksIFNlbGVjdG9y Q2hlY2tlcjo6TWF0Y2hBbGwsIHByb3BlcnR5QWxsb3dsaXN0Rm9yUHNldWRvSWQoZWxlbWVudFN0 eWxlLT5zdHlsZVR5cGUoKSkgfSk7CisgICAgcmVzdWx0LmF1dGhvckRlY2xhcmF0aW9ucy5hcHBl bmQoeyAma2V5ZnJhbWUucHJvcGVydGllcygpLCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoQWxsLCBw cm9wZXJ0eUFsbG93bGlzdEZvclBzZXVkb0lkKGVsZW1lbnRTdHlsZS5zdHlsZVR5cGUoKSkgfSk7 CiAKICAgICBhdXRvIHN0YXRlID0gU3RhdGUoZWxlbWVudCwgbnVsbHB0ciwgY29udGV4dC5kb2N1 bWVudEVsZW1lbnRTdHlsZSk7CiAKLSAgICBzdGF0ZS5zZXRTdHlsZShSZW5kZXJTdHlsZTo6Y2xv bmVQdHIoKmVsZW1lbnRTdHlsZSkpOwotICAgIHN0YXRlLnNldFBhcmVudFN0eWxlKFJlbmRlclN0 eWxlOjpjbG9uZVB0cihjb250ZXh0LnBhcmVudFN0eWxlID8gKmNvbnRleHQucGFyZW50U3R5bGUg OiAqZWxlbWVudFN0eWxlKSk7CisgICAgc3RhdGUuc2V0U3R5bGUoUmVuZGVyU3R5bGU6OmNsb25l UHRyKGVsZW1lbnRTdHlsZSkpOworICAgIHN0YXRlLnNldFBhcmVudFN0eWxlKFJlbmRlclN0eWxl OjpjbG9uZVB0cihjb250ZXh0LnBhcmVudFN0eWxlID8gKmNvbnRleHQucGFyZW50U3R5bGUgOiBl bGVtZW50U3R5bGUpKTsKIAogICAgIEJ1aWxkZXIgYnVpbGRlcigqc3RhdGUuc3R5bGUoKSwgYnVp bGRlckNvbnRleHQoc3RhdGUpLCByZXN1bHQsIENhc2NhZGVMZXZlbDo6QXV0aG9yKTsKICAgICBi dWlsZGVyLmFwcGx5QWxsUHJvcGVydGllcygpOwpAQCAtMjkyLDkgKzI5Miw5IEBAIHN0ZDo6dW5p cXVlX3B0cjxSZW5kZXJTdHlsZT4gUmVzb2x2ZXI6OnN0eWxlRm9yS2V5ZnJhbWUoY29uc3QgRWxl bWVudCYgZWxlbWVudCwKICAgICBhZGp1c3Rlci5hZGp1c3QoKnN0YXRlLnN0eWxlKCksIHN0YXRl LnVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSgpKTsKIAogICAgIC8vIEFkZCBhbGwgdGhlIGFuaW1h dGluZyBwcm9wZXJ0aWVzIHRvIHRoZSBrZXlmcmFtZS4KLSAgICB1bnNpZ25lZCBwcm9wZXJ0eUNv dW50ID0ga2V5ZnJhbWUtPnByb3BlcnRpZXMoKS5wcm9wZXJ0eUNvdW50KCk7CisgICAgdW5zaWdu ZWQgcHJvcGVydHlDb3VudCA9IGtleWZyYW1lLnByb3BlcnRpZXMoKS5wcm9wZXJ0eUNvdW50KCk7 CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHByb3BlcnR5Q291bnQ7ICsraSkgewotICAg ICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5ID0ga2V5ZnJhbWUtPnByb3BlcnRpZXMoKS5wcm9w ZXJ0eUF0KGkpLmlkKCk7CisgICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHkgPSBrZXlmcmFt ZS5wcm9wZXJ0aWVzKCkucHJvcGVydHlBdChpKS5pZCgpOwogICAgICAgICAvLyBUaGUgYW5pbWF0 aW9uLWNvbXBvc2l0aW9uIGFuZCBhbmltYXRpb24tdGltaW5nLWZ1bmN0aW9uIHdpdGhpbiBrZXlm cmFtZXMgYXJlIHNwZWNpYWwKICAgICAgICAgLy8gYmVjYXVzZSB0aGV5IGFyZSBub3QgYW5pbWF0 ZWQ7IHRoZXkganVzdCBkZXNjcmliZSB0aGUgY29tcG9zaXRlIG9wZXJhdGlvbiBhbmQgdGltaW5n CiAgICAgICAgIC8vIGZ1bmN0aW9uIGJldHdlZW4gdGhpcyBrZXlmcmFtZSBhbmQgdGhlIG5leHQu CkBAIC0zOTMsNyArMzkzLDcgQEAgVmVjdG9yPFJlZjxTdHlsZVJ1bGVLZXlmcmFtZT4+IFJlc29s dmVyOjprZXlmcmFtZVJ1bGVzRm9yTmFtZShjb25zdCBBdG9tU3RyaW5nJgogICAgIHJldHVybiBk ZWR1cGxpY2F0ZWRLZXlmcmFtZXM7CiB9CiAKLXZvaWQgUmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVz Rm9yQW5pbWF0aW9uKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBl bGVtZW50U3R5bGUsIGNvbnN0IFJlc29sdXRpb25Db250ZXh0JiBjb250ZXh0LCBLZXlmcmFtZUxp c3QmIGxpc3QpCit2b2lkIFJlc29sdmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25z dCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSYgZWxlbWVudFN0eWxlLCBjb25z dCBSZXNvbHV0aW9uQ29udGV4dCYgY29udGV4dCwgS2V5ZnJhbWVMaXN0JiBsaXN0KQogewogICAg IGxpc3QuY2xlYXIoKTsKIApAQCAtNDA2LDcgKzQwNiw3IEBAIHZvaWQgUmVzb2x2ZXI6OmtleWZy YW1lU3R5bGVzRm9yQW5pbWF0aW9uKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRl clN0CiAgICAgICAgIC8vIEFkZCB0aGlzIGtleWZyYW1lIHN0eWxlIHRvIGFsbCB0aGUgaW5kaWNh dGVkIGtleSB0aW1lcwogICAgICAgICBmb3IgKGF1dG8ga2V5IDoga2V5ZnJhbWVSdWxlLT5rZXlz KCkpIHsKICAgICAgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCBudWxscHRy KTsKLSAgICAgICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVGb3JLZXlmcmFtZShl bGVtZW50LCBlbGVtZW50U3R5bGUsIGNvbnRleHQsIGtleWZyYW1lUnVsZS5wdHIoKSwga2V5ZnJh bWVWYWx1ZSkpOworICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZUZvcktl eWZyYW1lKGVsZW1lbnQsIGVsZW1lbnRTdHlsZSwgY29udGV4dCwga2V5ZnJhbWVSdWxlLmdldCgp LCBrZXlmcmFtZVZhbHVlKSk7CiAgICAgICAgICAgICBrZXlmcmFtZVZhbHVlLnNldEtleShrZXkp OwogICAgICAgICAgICAgaWYgKGF1dG8gdGltaW5nRnVuY3Rpb25DU1NWYWx1ZSA9IGtleWZyYW1l UnVsZS0+cHJvcGVydGllcygpLmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlBbmltYXRp b25UaW1pbmdGdW5jdGlvbikpCiAgICAgICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRUaW1p bmdGdW5jdGlvbihUaW1pbmdGdW5jdGlvbjo6Y3JlYXRlRnJvbUNTU1ZhbHVlKCp0aW1pbmdGdW5j dGlvbkNTU1ZhbHVlLmdldCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmgKaW5k ZXggODhmZjM2Nzc0MTk2MGUwZGQwODYzM2I5MGYyMGZiMWFhNTRiMDQ0OS4uNDVjYjBlZTYxMDA0 MGI1MzkxMDViNmQ0YzgxZWNhYTMzYWNlYjdmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVz b2x2ZXIuaApAQCAtOTgsNyArOTgsNyBAQCBwdWJsaWM6CiAKICAgICBFbGVtZW50U3R5bGUgc3R5 bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQmLCBjb25zdCBSZXNvbHV0aW9uQ29udGV4dCYsIFJ1 bGVNYXRjaGluZ0JlaGF2aW9yID0gUnVsZU1hdGNoaW5nQmVoYXZpb3I6Ok1hdGNoQWxsUnVsZXMp OwogCi0gICAgdm9pZCBrZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25zdCBFbGVtZW50Jiwg Y29uc3QgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHlsZSwgY29uc3QgUmVzb2x1dGlvbkNvbnRleHQm LCBLZXlmcmFtZUxpc3QmKTsKKyAgICB2b2lkIGtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKGNv bnN0IEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSYgZWxlbWVudFN0eWxlLCBjb25zdCBSZXNv bHV0aW9uQ29udGV4dCYsIEtleWZyYW1lTGlzdCYpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc3Rk Ojp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBwc2V1ZG9TdHlsZUZvckVsZW1lbnQoY29uc3QgRWxl bWVudCYsIGNvbnN0IFBzZXVkb0VsZW1lbnRSZXF1ZXN0JiwgY29uc3QgUmVzb2x1dGlvbkNvbnRl eHQmKTsKIApAQCAtMTE4LDcgKzExOCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkQ3VycmVu dFNWR0ZvbnRGYWNlUnVsZXMoKTsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4g c3R5bGVGb3JLZXlmcmFtZShjb25zdCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqIGVsZW1l bnRTdHlsZSwgY29uc3QgUmVzb2x1dGlvbkNvbnRleHQmLCBjb25zdCBTdHlsZVJ1bGVLZXlmcmFt ZSosIEtleWZyYW1lVmFsdWUmKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IHN0 eWxlRm9yS2V5ZnJhbWUoY29uc3QgRWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlJiBlbGVtZW50 U3R5bGUsIGNvbnN0IFJlc29sdXRpb25Db250ZXh0JiwgY29uc3QgU3R5bGVSdWxlS2V5ZnJhbWUm LCBLZXlmcmFtZVZhbHVlJik7CiAgICAgYm9vbCBpc0FuaW1hdGlvbk5hbWVWYWxpZChjb25zdCBT dHJpbmcmKTsKIAogICAgIC8vIFRoZXNlIG1ldGhvZHMgd2lsbCBnaXZlIGJhY2sgdGhlIHNldCBv ZiBydWxlcyB0aGF0IG1hdGNoZWQgZm9yIGEgZ2l2ZW4gZWxlbWVudCAob3IgYSBwc2V1ZG8tZWxl bWVudCkuCg==