237157 2022-02-24 14:10:06 -0800 Use modern Hasher in ContentExtensionsActions 2022-02-25 09:26:32 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez aakash_jain achristensen darin ggaren sam webkit-bug-importer oldest_to_newest 1845747 0 cdumez 2022-02-24 14:10:06 -0800 Use modern Hasher in ContentExtensionsActions. 1845749 1 453136 cdumez 2022-02-24 14:11:57 -0800 Created attachment 453136 Patch 1846000 2 aakash_jain 2022-02-25 06:37:13 -0800 I cancelled https://ews-build.webkit.org/#/builders/68/builds/9129 to speed up ios-wk2 queue. It already finished running layout-tests and the failures looked pre-existing, please have a look though. 1846049 3 ews-feeder 2022-02-25 09:25:27 -0800 Committed r290514 (247798@main): <https://commits.webkit.org/247798@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453136. 1846050 4 webkit-bug-importer 2022-02-25 09:26:32 -0800 <rdar://problem/89477909> 453136 2022-02-24 14:11:57 -0800 2022-02-25 09:25:30 -0800 Patch bug-237157-20220224141156.patch text/plain 10538 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUzYzlkMWE2YjY0MWJk ZGRmNzM1YTFkM2ZmNWE3NTczZTMzMjUzOC4uOThiZmZmNmZiOGM0NGIxMzI4MjUyZjgyYTdlYjkx ZGI4ODljMDU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIG1vZGVybiBIYXNoZXIg aW4gQ29udGVudEV4dGVuc2lvbnNBY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcxNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25B Y3Rpb25zLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6YWRkKToKKyAg ICAgICAgKFdURjo6RGVmYXVsdEhhc2g8V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlJlZGly ZWN0QWN0aW9uPjo6aGFzaCk6CisgICAgICAgIChXVEY6OkRlZmF1bHRIYXNoPFdlYkNvcmU6OkNv bnRlbnRFeHRlbnNpb25zOjpNb2RpZnlIZWFkZXJzQWN0aW9uPjo6aGFzaCk6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6VmFyaWFudEhhc2hlcjo6aGFzaCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6VmVjdG9ySGFzaGVyOjpoYXNo KTogRGVsZXRlZC4KKwogMjAyMi0wMi0yNCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtjc3MtY2FzY2FkZV0gU3VwcG9ydCAncmV2ZXJ0JyBpbiBAa2V5ZnJh bWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50 RXh0ZW5zaW9uQWN0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29u dGVudEV4dGVuc2lvbkFjdGlvbnMuaAppbmRleCBhZDNiOTE3Y2I0N2QyYzZmYWQwMjY2NTdmODYw YjM5YmNhNzhkMzA4Li40NmUwNTgwYzljNmU1NDBmM2I4YjEwOTYwOTBjNTdhYjFiMDNmYzA5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5z aW9uQWN0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRl bnRFeHRlbnNpb25BY3Rpb25zLmgKQEAgLTI5LDcgKzI5LDYgQEAKIAogI2luY2x1ZGUgIkNvbnRl bnRFeHRlbnNpb25TdHJpbmdTZXJpYWxpemF0aW9uLmgiCiAjaW5jbHVkZSA8d3RmL0pTT05WYWx1 ZXMuaD4KLSNpbmNsdWRlIDx3dGYvSGFzaEZ1bmN0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9IYXNo ZXIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMzgsMjkgKzM3LDYgQEAgY2xhc3MgUmVz b3VyY2VSZXF1ZXN0OwogCiBuYW1lc3BhY2UgV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnMgewog Ci0vLyBGSVhNRTogVGhpcyBwcm9iYWJseSBiZWxvbmdzIGluIFdURiwgc3VjaCBhcyBpbiBIYXNo RnVuY3Rpb25zLmguCi1zdHJ1Y3QgVmFyaWFudEhhc2hlciB7Ci0gICAgdGVtcGxhdGUgPHR5cGVu YW1lIFY+Ci0gICAgc3RhdGljIHVpbnQzMl90IGhhc2goViYmIHZhcmlhbnQpCi0gICAgewotICAg ICAgICByZXR1cm4gcGFpckludEhhc2godmFyaWFudC5pbmRleCgpLCBzdGQ6OnZpc2l0KFtdKGNv bnN0IGF1dG8mIHR5cGUpIHsKLSAgICAgICAgICAgIHJldHVybiB0eXBlLmhhc2goKTsKLSAgICAg ICAgfSwgc3RkOjpmb3J3YXJkPFY+KHZhcmlhbnQpKSk7Ci0gICAgfQotfTsKLQotLy8gRklYTUU6 IFRoaXMgcHJvYmFibHkgYmVsb25ncyBpbiBXVEYsIHN1Y2ggYXMgaW4gSGFzaGVyLmguCi1zdHJ1 Y3QgVmVjdG9ySGFzaGVyIHsKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVj4KLSAgICBzdGF0aWMg dWludDMyX3QgaGFzaChWJiYgdmVjdG9yKQotICAgIHsKLSAgICAgICAgSGFzaGVyIGhhc2hlcjsK LSAgICAgICAgZm9yIChhdXRvJiBlbGVtZW50IDogdmVjdG9yKQotICAgICAgICAgICAgYWRkKGhh c2hlciwgZWxlbWVudC5oYXNoKCkpOwotICAgICAgICByZXR1cm4gaGFzaGVyLmhhc2goKTsKLSAg ICB9Ci19OwotCiBzdHJ1Y3QgQWN0aW9uOwogCiB1c2luZyBTZXJpYWxpemVkQWN0aW9uQnl0ZSA9 IHVpbnQ4X3Q7CkBAIC05NSw3ICs3MSw2IEBAIHN0cnVjdCBXRUJDT1JFX0VYUE9SVCBNb2RpZnlI ZWFkZXJzQWN0aW9uIHsKICAgICAgICAgICAgIFN0cmluZyBoZWFkZXI7CiAgICAgICAgICAgICBT dHJpbmcgdmFsdWU7CiAKLSAgICAgICAgICAgIHVpbnQzMl90IGhhc2goKSBjb25zdCB7IHJldHVy biBwYWlySW50SGFzaChoZWFkZXIuaGFzaCgpLCB2YWx1ZS5oYXNoKCkpOyB9CiAgICAgICAgICAg ICBBcHBlbmRPcGVyYXRpb24gaXNvbGF0ZWRDb3B5KCkgY29uc3QgeyByZXR1cm4geyBoZWFkZXIu aXNvbGF0ZWRDb3B5KCksIHZhbHVlLmlzb2xhdGVkQ29weSgpIH07IH0KICAgICAgICAgICAgIGJv b2wgb3BlcmF0b3I9PShjb25zdCBBcHBlbmRPcGVyYXRpb24mIG90aGVyKSBjb25zdCB7IHJldHVy biBvdGhlci5oZWFkZXIgPT0gdGhpcy0+aGVhZGVyICYmIG90aGVyLnZhbHVlID09IHRoaXMtPnZh bHVlOyB9CiAgICAgICAgIH07CkBAIC0xMDMsMjEgKzc4LDE4IEBAIHN0cnVjdCBXRUJDT1JFX0VY UE9SVCBNb2RpZnlIZWFkZXJzQWN0aW9uIHsKICAgICAgICAgICAgIFN0cmluZyBoZWFkZXI7CiAg ICAgICAgICAgICBTdHJpbmcgdmFsdWU7CiAKLSAgICAgICAgICAgIHVpbnQzMl90IGhhc2goKSBj b25zdCB7IHJldHVybiBwYWlySW50SGFzaChoZWFkZXIuaGFzaCgpLCB2YWx1ZS5oYXNoKCkpOyB9 CiAgICAgICAgICAgICBTZXRPcGVyYXRpb24gaXNvbGF0ZWRDb3B5KCkgY29uc3QgeyByZXR1cm4g eyBoZWFkZXIuaXNvbGF0ZWRDb3B5KCksIHZhbHVlLmlzb2xhdGVkQ29weSgpIH07IH0KICAgICAg ICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBTZXRPcGVyYXRpb24mIG90aGVyKSBjb25zdCB7 IHJldHVybiBvdGhlci5oZWFkZXIgPT0gdGhpcy0+aGVhZGVyICYmIG90aGVyLnZhbHVlID09IHRo aXMtPnZhbHVlOyB9CiAgICAgICAgIH07CiAgICAgICAgIHN0cnVjdCBSZW1vdmVPcGVyYXRpb24g ewogICAgICAgICAgICAgU3RyaW5nIGhlYWRlcjsKIAotICAgICAgICAgICAgdWludDMyX3QgaGFz aCgpIGNvbnN0IHsgcmV0dXJuIGhlYWRlci5oYXNoKCk7IH0KICAgICAgICAgICAgIFJlbW92ZU9w ZXJhdGlvbiBpc29sYXRlZENvcHkoKSBjb25zdCB7IHJldHVybiB7IGhlYWRlci5pc29sYXRlZENv cHkoKSB9OyB9CiAgICAgICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgUmVtb3ZlT3BlcmF0 aW9uJiBvdGhlcikgY29uc3QgeyByZXR1cm4gb3RoZXIuaGVhZGVyID09IHRoaXMtPmhlYWRlcjsg fQogICAgICAgICB9OwogICAgICAgICB1c2luZyBPcGVyYXRpb25WYXJpYW50ID0gc3RkOjp2YXJp YW50PEFwcGVuZE9wZXJhdGlvbiwgU2V0T3BlcmF0aW9uLCBSZW1vdmVPcGVyYXRpb24+OwogICAg ICAgICBPcGVyYXRpb25WYXJpYW50IG9wZXJhdGlvbjsKIAotICAgICAgICB1aW50MzJfdCBoYXNo KCkgY29uc3QgeyByZXR1cm4gVmFyaWFudEhhc2hlcjo6aGFzaChvcGVyYXRpb24pOyB9CiAgICAg ICAgIHN0YXRpYyBFeHBlY3RlZDxNb2RpZnlIZWFkZXJJbmZvLCBzdGQ6OmVycm9yX2NvZGU+IHBh cnNlKGNvbnN0IEpTT046OlZhbHVlJik7CiAgICAgICAgIE1vZGlmeUhlYWRlckluZm8gaXNvbGF0 ZWRDb3B5KCkgY29uc3Q7CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBNb2RpZnlIZWFk ZXJJbmZvJikgY29uc3Q7CkBAIC0xNDIsNyArMTE0LDYgQEAgc3RydWN0IFdFQkNPUkVfRVhQT1JU IE1vZGlmeUhlYWRlcnNBY3Rpb24gewogICAgIE1vZGlmeUhlYWRlcnNBY3Rpb24oRGVsZXRlZFZh bHVlVGFnKSA6IGhhc2hUYWJsZVR5cGUoSGFzaFRhYmxlVHlwZTo6RGVsZXRlZCkgeyB9CiAgICAg Ym9vbCBpc0RlbGV0ZWRWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIGhhc2hUYWJsZVR5cGUgPT0gSGFz aFRhYmxlVHlwZTo6RGVsZXRlZDsgfQogCi0gICAgdWludDMyX3QgaGFzaCgpIGNvbnN0IHsgcmV0 dXJuIHBhaXJJbnRIYXNoKFZlY3Rvckhhc2hlcjo6aGFzaChyZXF1ZXN0SGVhZGVycyksIFZlY3Rv ckhhc2hlcjo6aGFzaChyZXNwb25zZUhlYWRlcnMpKTsgfQogICAgIHN0YXRpYyBFeHBlY3RlZDxN b2RpZnlIZWFkZXJzQWN0aW9uLCBzdGQ6OmVycm9yX2NvZGU+IHBhcnNlKGNvbnN0IEpTT046Ok9i amVjdCYpOwogICAgIE1vZGlmeUhlYWRlcnNBY3Rpb24gaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CiAg ICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE1vZGlmeUhlYWRlcnNBY3Rpb24mKSBjb25zdDsKQEAg LTE1NiwxNCArMTI3LDEyIEBAIHN0cnVjdCBXRUJDT1JFX0VYUE9SVCBSZWRpcmVjdEFjdGlvbiB7 CiAgICAgc3RydWN0IEV4dGVuc2lvblBhdGhBY3Rpb24gewogICAgICAgICBTdHJpbmcgZXh0ZW5z aW9uUGF0aDsKIAotICAgICAgICB1aW50MzJfdCBoYXNoKCkgY29uc3QgeyByZXR1cm4gZXh0ZW5z aW9uUGF0aC5oYXNoKCk7IH0KICAgICAgICAgRXh0ZW5zaW9uUGF0aEFjdGlvbiBpc29sYXRlZENv cHkoKSBjb25zdCB7IHJldHVybiB7IGV4dGVuc2lvblBhdGguaXNvbGF0ZWRDb3B5KCkgfTsgfQog ICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgRXh0ZW5zaW9uUGF0aEFjdGlvbiYgb3RoZXIp IGNvbnN0IHsgcmV0dXJuIG90aGVyLmV4dGVuc2lvblBhdGggPT0gdGhpcy0+ZXh0ZW5zaW9uUGF0 aDsgfQogICAgIH07CiAgICAgc3RydWN0IFJlZ2V4U3Vic3RpdHV0aW9uQWN0aW9uIHsKICAgICAg ICAgU3RyaW5nIHJlZ2V4U3Vic3RpdHV0aW9uOwogCi0gICAgICAgIHVpbnQzMl90IGhhc2goKSBj b25zdCB7IHJldHVybiByZWdleFN1YnN0aXR1dGlvbi5oYXNoKCk7IH0KICAgICAgICAgUmVnZXhT dWJzdGl0dXRpb25BY3Rpb24gaXNvbGF0ZWRDb3B5KCkgY29uc3QgeyByZXR1cm4geyByZWdleFN1 YnN0aXR1dGlvbi5pc29sYXRlZENvcHkoKSB9OyB9CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShj b25zdCBSZWdleFN1YnN0aXR1dGlvbkFjdGlvbiYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIG90aGVy LnJlZ2V4U3Vic3RpdHV0aW9uID09IHRoaXMtPnJlZ2V4U3Vic3RpdHV0aW9uOyB9CiAgICAgfTsK QEAgLTE3NCw3ICsxNDMsNiBAQCBzdHJ1Y3QgV0VCQ09SRV9FWFBPUlQgUmVkaXJlY3RBY3Rpb24g ewogICAgICAgICAgICAgICAgIGJvb2wgcmVwbGFjZU9ubHkgeyBmYWxzZSB9OwogICAgICAgICAg ICAgICAgIFN0cmluZyB2YWx1ZTsKIAotICAgICAgICAgICAgICAgIHVpbnQzMl90IGhhc2goKSBj b25zdCB7IHJldHVybiBjb21wdXRlSGFzaChrZXksIHJlcGxhY2VPbmx5LCB2YWx1ZSk7IH0KICAg ICAgICAgICAgICAgICBzdGF0aWMgRXhwZWN0ZWQ8UXVlcnlLZXlWYWx1ZSwgc3RkOjplcnJvcl9j b2RlPiBwYXJzZShjb25zdCBKU09OOjpWYWx1ZSYpOwogICAgICAgICAgICAgICAgIFF1ZXJ5S2V5 VmFsdWUgaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CiAgICAgICAgICAgICAgICAgYm9vbCBvcGVyYXRv cj09KGNvbnN0IFF1ZXJ5S2V5VmFsdWUmKSBjb25zdDsKQEAgLTE4Niw3ICsxNTQsNiBAQCBzdHJ1 Y3QgV0VCQ09SRV9FWFBPUlQgUmVkaXJlY3RBY3Rpb24gewogICAgICAgICAgICAgVmVjdG9yPFF1 ZXJ5S2V5VmFsdWU+IGFkZE9yUmVwbGFjZVBhcmFtczsKICAgICAgICAgICAgIFZlY3RvcjxTdHJp bmc+IHJlbW92ZVBhcmFtczsKIAotICAgICAgICAgICAgdWludDMyX3QgaGFzaCgpIGNvbnN0IHsg cmV0dXJuIGNvbXB1dGVIYXNoKFZlY3Rvckhhc2hlcjo6aGFzaChhZGRPclJlcGxhY2VQYXJhbXMp LCByZW1vdmVQYXJhbXMpOyB9CiAgICAgICAgICAgICBzdGF0aWMgRXhwZWN0ZWQ8UXVlcnlUcmFu c2Zvcm0sIHN0ZDo6ZXJyb3JfY29kZT4gcGFyc2UoY29uc3QgSlNPTjo6T2JqZWN0Jik7CiAgICAg ICAgICAgICBRdWVyeVRyYW5zZm9ybSBpc29sYXRlZENvcHkoKSBjb25zdDsKICAgICAgICAgICAg IGJvb2wgb3BlcmF0b3I9PShjb25zdCBRdWVyeVRyYW5zZm9ybSYpIGNvbnN0OwpAQCAtMjA2LDcg KzE3Myw2IEBAIHN0cnVjdCBXRUJDT1JFX0VYUE9SVCBSZWRpcmVjdEFjdGlvbiB7CiAgICAgICAg IFN0cmluZyBzY2hlbWU7CiAgICAgICAgIFN0cmluZyB1c2VybmFtZTsKIAotICAgICAgICB1aW50 MzJfdCBoYXNoKCkgY29uc3QgeyByZXR1cm4gY29tcHV0ZUhhc2goZnJhZ21lbnQuaGFzaCgpLCBo b3N0Lmhhc2goKSwgcGFzc3dvcmQuaGFzaCgpLCBwYXRoLmhhc2goKSwgcG9ydCwgVmFyaWFudEhh c2hlcjo6aGFzaChxdWVyeVRyYW5zZm9ybSksIHNjaGVtZS5oYXNoKCksIHVzZXJuYW1lLmhhc2go KSk7IH0KICAgICAgICAgc3RhdGljIEV4cGVjdGVkPFVSTFRyYW5zZm9ybUFjdGlvbiwgc3RkOjpl cnJvcl9jb2RlPiBwYXJzZShjb25zdCBKU09OOjpPYmplY3QmKTsKICAgICAgICAgVVJMVHJhbnNm b3JtQWN0aW9uIGlzb2xhdGVkQ29weSgpIGNvbnN0OwogICAgICAgICBib29sIG9wZXJhdG9yPT0o Y29uc3QgVVJMVHJhbnNmb3JtQWN0aW9uJikgY29uc3Q7CkBAIC0yMTgsNyArMTg0LDYgQEAgc3Ry dWN0IFdFQkNPUkVfRVhQT1JUIFJlZGlyZWN0QWN0aW9uIHsKICAgICBzdHJ1Y3QgVVJMQWN0aW9u IHsKICAgICAgICAgU3RyaW5nIHVybDsKIAotICAgICAgICB1aW50MzJfdCBoYXNoKCkgY29uc3Qg eyByZXR1cm4gdXJsLmhhc2goKTsgfQogICAgICAgICBVUkxBY3Rpb24gaXNvbGF0ZWRDb3B5KCkg Y29uc3QgeyByZXR1cm4geyB1cmwuaXNvbGF0ZWRDb3B5KCkgfTsgfQogICAgICAgICBib29sIG9w ZXJhdG9yPT0oY29uc3QgVVJMQWN0aW9uJiBvdGhlcikgY29uc3QgeyByZXR1cm4gb3RoZXIudXJs ID09IHRoaXMtPnVybDsgfQogICAgIH07CkBAIC0yMzYsNyArMjAxLDYgQEAgc3RydWN0IFdFQkNP UkVfRVhQT1JUIFJlZGlyZWN0QWN0aW9uIHsKICAgICBSZWRpcmVjdEFjdGlvbihFbXB0eVZhbHVl VGFnKSA6IGhhc2hUYWJsZVR5cGUoSGFzaFRhYmxlVHlwZTo6RW1wdHkpIHsgfQogICAgIFJlZGly ZWN0QWN0aW9uKERlbGV0ZWRWYWx1ZVRhZykgOiBoYXNoVGFibGVUeXBlKEhhc2hUYWJsZVR5cGU6 OkRlbGV0ZWQpIHsgfQogICAgIGJvb2wgaXNEZWxldGVkVmFsdWUoKSBjb25zdCB7IHJldHVybiBo YXNoVGFibGVUeXBlID09IEhhc2hUYWJsZVR5cGU6OkRlbGV0ZWQ7IH0KLSAgICB1aW50MzJfdCBo YXNoKCkgY29uc3QgeyByZXR1cm4gVmFyaWFudEhhc2hlcjo6aGFzaChhY3Rpb24pOyB9CiAKICAg ICBzdGF0aWMgRXhwZWN0ZWQ8UmVkaXJlY3RBY3Rpb24sIHN0ZDo6ZXJyb3JfY29kZT4gcGFyc2Uo Y29uc3QgSlNPTjo6T2JqZWN0Jik7CiAgICAgUmVkaXJlY3RBY3Rpb24gaXNvbGF0ZWRDb3B5KCkg Y29uc3Q7CkBAIC0yNTgsMTMgKzIyMiw3MyBAQCB1c2luZyBBY3Rpb25EYXRhID0gc3RkOjp2YXJp YW50PAogICAgIFJlZGlyZWN0QWN0aW9uCiA+OwogCitpbmxpbmUgdm9pZCBhZGQoSGFzaGVyJiBo YXNoZXIsIGNvbnN0IE1vZGlmeUhlYWRlcnNBY3Rpb246Ok1vZGlmeUhlYWRlckluZm86OkFwcGVu ZE9wZXJhdGlvbiYgb3BlcmF0aW9uKQoreworICAgIGFkZChoYXNoZXIsIG9wZXJhdGlvbi5oZWFk ZXIsIG9wZXJhdGlvbi52YWx1ZSk7Cit9CisKK2lubGluZSB2b2lkIGFkZChIYXNoZXImIGhhc2hl ciwgY29uc3QgTW9kaWZ5SGVhZGVyc0FjdGlvbjo6TW9kaWZ5SGVhZGVySW5mbzo6U2V0T3BlcmF0 aW9uJiBvcGVyYXRpb24pCit7CisgICAgYWRkKGhhc2hlciwgb3BlcmF0aW9uLmhlYWRlciwgb3Bl cmF0aW9uLnZhbHVlKTsKK30KKworaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25z dCBNb2RpZnlIZWFkZXJzQWN0aW9uOjpNb2RpZnlIZWFkZXJJbmZvOjpSZW1vdmVPcGVyYXRpb24m IG9wZXJhdGlvbikKK3sKKyAgICBhZGQoaGFzaGVyLCBvcGVyYXRpb24uaGVhZGVyKTsKK30KKwor aW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBNb2RpZnlIZWFkZXJzQWN0aW9u OjpNb2RpZnlIZWFkZXJJbmZvJiBpbmZvKQoreworICAgIGFkZChoYXNoZXIsIGluZm8ub3BlcmF0 aW9uKTsKK30KKworaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBSZWRpcmVj dEFjdGlvbjo6RXh0ZW5zaW9uUGF0aEFjdGlvbiYgYWN0aW9uKQoreworICAgIGFkZChoYXNoZXIs IGFjdGlvbi5leHRlbnNpb25QYXRoKTsKK30KKworaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFz aGVyLCBjb25zdCBSZWRpcmVjdEFjdGlvbjo6UmVnZXhTdWJzdGl0dXRpb25BY3Rpb24mIGFjdGlv bikKK3sKKyAgICBhZGQoaGFzaGVyLCBhY3Rpb24ucmVnZXhTdWJzdGl0dXRpb24pOworfQorCitp bmxpbmUgdm9pZCBhZGQoSGFzaGVyJiBoYXNoZXIsIGNvbnN0IFJlZGlyZWN0QWN0aW9uOjpVUkxU cmFuc2Zvcm1BY3Rpb246OlF1ZXJ5VHJhbnNmb3JtOjpRdWVyeUtleVZhbHVlJiBxdWVyeUtleVZh bHVlKQoreworICAgIGFkZChoYXNoZXIsIHF1ZXJ5S2V5VmFsdWUua2V5LCBxdWVyeUtleVZhbHVl LnJlcGxhY2VPbmx5LCBxdWVyeUtleVZhbHVlLnZhbHVlKTsKK30KKworaW5saW5lIHZvaWQgYWRk KEhhc2hlciYgaGFzaGVyLCBjb25zdCBSZWRpcmVjdEFjdGlvbjo6VVJMVHJhbnNmb3JtQWN0aW9u OjpRdWVyeVRyYW5zZm9ybSYgdHJhbnNmb3JtKQoreworICAgIGFkZChoYXNoZXIsIHRyYW5zZm9y bS5hZGRPclJlcGxhY2VQYXJhbXMsIHRyYW5zZm9ybS5yZW1vdmVQYXJhbXMpOworfQorCitpbmxp bmUgdm9pZCBhZGQoSGFzaGVyJiBoYXNoZXIsIGNvbnN0IFJlZGlyZWN0QWN0aW9uOjpVUkxBY3Rp b24mIGFjdGlvbikKK3sKKyAgICBhZGQoaGFzaGVyLCBhY3Rpb24udXJsKTsKK30KKworaW5saW5l IHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBSZWRpcmVjdEFjdGlvbjo6VVJMVHJhbnNm b3JtQWN0aW9uJiBhY3Rpb24pCit7CisgICAgYWRkKGhhc2hlciwgYWN0aW9uLmZyYWdtZW50LCBh Y3Rpb24uaG9zdCwgYWN0aW9uLnBhc3N3b3JkLCBhY3Rpb24ucGF0aCwgYWN0aW9uLnBvcnQsIGFj dGlvbi5xdWVyeVRyYW5zZm9ybSwgYWN0aW9uLnNjaGVtZSwgYWN0aW9uLnVzZXJuYW1lKTsKK30K KworaW5saW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBSZWRpcmVjdEFjdGlvbiYg YWN0aW9uKQoreworICAgIGFkZChoYXNoZXIsIGFjdGlvbi5hY3Rpb24pOworfQorCitpbmxpbmUg dm9pZCBhZGQoSGFzaGVyJiBoYXNoZXIsIGNvbnN0IE1vZGlmeUhlYWRlcnNBY3Rpb24mIGFjdGlv bikKK3sKKyAgICBhZGQoaGFzaGVyLCBhY3Rpb24ucmVxdWVzdEhlYWRlcnMsIGFjdGlvbi5yZXNw b25zZUhlYWRlcnMpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlOjpDb250ZW50RXh0ZW5z aW9ucwogCiBuYW1lc3BhY2UgV1RGIHsKIAogdGVtcGxhdGU8PiBzdHJ1Y3QgRGVmYXVsdEhhc2g8 V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlJlZGlyZWN0QWN0aW9uPiB7CiAgICAgdXNpbmcg QWN0aW9uID0gV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlJlZGlyZWN0QWN0aW9uOwotICAg IHN0YXRpYyB1aW50MzJfdCBoYXNoKGNvbnN0IEFjdGlvbiYgYWN0aW9uKSB7IHJldHVybiBhY3Rp b24uaGFzaCgpOyB9CisgICAgc3RhdGljIHVpbnQzMl90IGhhc2goY29uc3QgQWN0aW9uJiBhY3Rp b24pIHsgcmV0dXJuIGNvbXB1dGVIYXNoKGFjdGlvbik7IH0KICAgICBzdGF0aWMgYm9vbCBlcXVh bChjb25zdCBBY3Rpb24mIGEsIGNvbnN0IEFjdGlvbiYgYikgeyByZXR1cm4gYSA9PSBiOyB9CiAg ICAgc3RhdGljIGNvbnN0ZXhwciBib29sIHNhZmVUb0NvbXBhcmVUb0VtcHR5T3JEZWxldGVkID0g dHJ1ZTsKIH07CkBAIC0yNzIsNyArMjk2LDcgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgSGFzaFRyYWl0 czxXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6UmVkaXJlY3RBY3Rpb24+IDogcHVibGkKIAog dGVtcGxhdGU8PiBzdHJ1Y3QgRGVmYXVsdEhhc2g8V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6 Ok1vZGlmeUhlYWRlcnNBY3Rpb24+IHsKICAgICB1c2luZyBBY3Rpb24gPSBXZWJDb3JlOjpDb250 ZW50RXh0ZW5zaW9uczo6TW9kaWZ5SGVhZGVyc0FjdGlvbjsKLSAgICBzdGF0aWMgdWludDMyX3Qg aGFzaChjb25zdCBBY3Rpb24mIGFjdGlvbikgeyByZXR1cm4gYWN0aW9uLmhhc2goKTsgfQorICAg IHN0YXRpYyB1aW50MzJfdCBoYXNoKGNvbnN0IEFjdGlvbiYgYWN0aW9uKSB7IHJldHVybiBjb21w dXRlSGFzaChhY3Rpb24pOyB9CiAgICAgc3RhdGljIGJvb2wgZXF1YWwoY29uc3QgQWN0aW9uJiBh LCBjb25zdCBBY3Rpb24mIGIpIHsgcmV0dXJuIGEgPT0gYjsgfQogICAgIHN0YXRpYyBjb25zdGV4 cHIgYm9vbCBzYWZlVG9Db21wYXJlVG9FbXB0eU9yRGVsZXRlZCA9IHRydWU7CiB9Owo=