237228 2022-02-25 14:43:46 -0800 Use the modern Hasher more in Content Extensions code 2022-02-25 17:22:25 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren sam webkit-bug-importer oldest_to_newest 1846196 0 cdumez 2022-02-25 14:43:46 -0800 Use the modern Hasher more in Content Extensions code. 1846197 1 453266 cdumez 2022-02-25 14:45:34 -0800 Created attachment 453266 Patch 1846246 2 ews-feeder 2022-02-25 17:21:07 -0800 Committed r290538 (247816@main): <https://commits.webkit.org/247816@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453266. 1846248 3 webkit-bug-importer 2022-02-25 17:22:25 -0800 <rdar://problem/89500158> 453266 2022-02-25 14:45:34 -0800 2022-02-25 17:21:11 -0800 Patch bug-237228-20220225144533.patch text/plain 7164 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg4YWU2NGFmMDZiN2Vk MTUyZDdiNzJkM2NkMDM5OWFiMDg2NTkzYi4uM2RlZDdlNjExOWFkY2VlNDk1NjlkZDQ5NmI5Yjk4 NTFmN2M3NWVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRoZSBtb2Rlcm4gSGFz aGVyIG1vcmUgaW4gQ29udGVudCBFeHRlbnNpb25zIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzIyOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRG aWx0ZXJzQWxwaGFiZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6 OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6VGVybUNyZWF0b3JU cmFuc2xhdG9yOjpoYXNoKToKKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZEZp bHRlcnNBbHBoYWJldC5oOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OkNv bWJpbmVkRmlsdGVyc0FscGhhYmV0OjpUZXJtUG9pbnRlckhhc2g6Omhhc2gpOgorICAgICAgICAq IGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25SdWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50RXh0ZW5zaW9uczo6YWRkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRF eHRlbnNpb25zOjpUcmlnZ2VySGFzaDo6aGFzaCk6CisgICAgICAgICogY29udGVudGV4dGVuc2lv bnMvVGVybS5oOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlRlcm06Okdy b3VwOjpvcGVyYXRvcj09IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNp b25zOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlRlcm06OkNo YXJhY3RlclNldDo6aGFzaCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50RXh0ZW5zaW9uczo6VGVybTo6R3JvdXA6Omhhc2ggY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlRlcm06Omhhc2ggY29uc3QpOiBEZWxldGVk LgorCiAyMDIyLTAyLTI1ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtDb2NvYV0gSExTICsgTW9kZXJuIEVNRSBrZXkgcm90YXRpb24gY2F1c2VzIHBsYXliYWNr IHRvIHN0YWxsIGluZGVmaW5pdGVseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVu dGV4dGVuc2lvbnMvQ29tYmluZWRGaWx0ZXJzQWxwaGFiZXQuY3BwIGIvU291cmNlL1dlYkNvcmUv Y29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRGaWx0ZXJzQWxwaGFiZXQuY3BwCmluZGV4IGMyODUx ODQ0ZjVmNjA1Zjg4MDQyYjE5N2JhNmQ3YThiYTY2NTc3OGMuLmY0ZGE2ZDBjMjJjNDZmOTc4NzJl YjYzNzdiYjJjMjNkNzlkOTljNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRl eHRlbnNpb25zL0NvbWJpbmVkRmlsdGVyc0FscGhhYmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZEZpbHRlcnNBbHBoYWJldC5jcHAKQEAgLTM3LDEw ICszNywxNSBAQCBzdHJ1Y3QgVGVybUNyZWF0b3JJbnB1dCB7CiAgICAgVmVjdG9yPHN0ZDo6dW5p cXVlX3B0cjxUZXJtPj4mIGludGVybmVkVGVybXNTdG9yYWdlOwogfTsKIAoraW5saW5lIHZvaWQg YWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBUZXJtQ3JlYXRvcklucHV0JiBpbnB1dCkKK3sKKyAg ICBhZGQoaGFzaGVyLCBpbnB1dC50ZXJtKTsKK30KKwogc3RydWN0IFRlcm1DcmVhdG9yVHJhbnNs YXRvciB7CiAgICAgc3RhdGljIHVuc2lnbmVkIGhhc2goY29uc3QgVGVybUNyZWF0b3JJbnB1dCYg aW5wdXQpCiAgICAgewotICAgICAgICByZXR1cm4gaW5wdXQudGVybS5oYXNoKCk7CisgICAgICAg IHJldHVybiBjb21wdXRlSGFzaChpbnB1dCk7CiAgICAgfQogCiAgICAgc3RhdGljIGlubGluZSBi b29sIGVxdWFsKGNvbnN0IFRlcm0qIHRlcm0sIGNvbnN0IFRlcm1DcmVhdG9ySW5wdXQmIGlucHV0 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRG aWx0ZXJzQWxwaGFiZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbWJp bmVkRmlsdGVyc0FscGhhYmV0LmgKaW5kZXggYzdjZjcyZmNlMzE5MzM2NDYxZmZlZmQxNjUzMTY1 Njg4ZWE4ZjVkMC4uYzAwZTZmM2I0YzhjODRjZWMyOGM3YzNlNmU2MTMyMDVmNDA0YzhiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRGaWx0ZXJz QWxwaGFiZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5l ZEZpbHRlcnNBbHBoYWJldC5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBzdHJ1Y3QgVGVybVBvaW50ZXJIYXNoIHsKLSAgICAgICAgc3RhdGljIHVuc2lnbmVkIGhh c2goY29uc3QgVGVybSoga2V5KSB7IHJldHVybiBrZXktPmhhc2goKTsgfQorICAgICAgICBzdGF0 aWMgdW5zaWduZWQgaGFzaChjb25zdCBUZXJtKiBrZXkpIHsgcmV0dXJuIGNvbXB1dGVIYXNoKCpr ZXkpOyB9CiAgICAgICAgIHN0YXRpYyBpbmxpbmUgYm9vbCBlcXVhbChjb25zdCBUZXJtKiBhLCBj b25zdCBUZXJtKiBiKQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gKmEgPT0gKmI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5z aW9uUnVsZS5oIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVu c2lvblJ1bGUuaAppbmRleCBjNGJjMWYwMDg4NTA4NWZjYjIxMDUwMzk4M2FmNjE4YzM0MGI2MDUz Li43ZTM4ZDBhMmY1NDM0ZTVjOWFmNDNkNTJmYTE5MDFkNDdjODkyN2UzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uUnVsZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25SdWxl LmgKQEAgLTgwLDEwICs4MCwxNSBAQCBzdHJ1Y3QgVHJpZ2dlciB7CiAgICAgfQogfTsKIAoraW5s aW5lIHZvaWQgYWRkKEhhc2hlciYgaGFzaGVyLCBjb25zdCBUcmlnZ2VyJiB0cmlnZ2VyKQorewor ICAgIGFkZChoYXNoZXIsIHRyaWdnZXIudXJsRmlsdGVySXNDYXNlU2Vuc2l0aXZlLCB0cmlnZ2Vy LnVybEZpbHRlciwgdHJpZ2dlci5mbGFncywgdHJpZ2dlci5jb25kaXRpb25zKTsKK30KKwogc3Ry dWN0IFRyaWdnZXJIYXNoIHsKICAgICBzdGF0aWMgdW5zaWduZWQgaGFzaChjb25zdCBUcmlnZ2Vy JiB0cmlnZ2VyKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGNvbXB1dGVIYXNoKHRyaWdnZXIudXJs RmlsdGVySXNDYXNlU2Vuc2l0aXZlLCB0cmlnZ2VyLnVybEZpbHRlciwgdHJpZ2dlci5mbGFncywg dHJpZ2dlci5jb25kaXRpb25zKTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVIYXNoKHRyaWdnZXIp OwogICAgIH0KICAgICBzdGF0aWMgYm9vbCBlcXVhbChjb25zdCBUcmlnZ2VyJiBhLCBjb25zdCBU cmlnZ2VyJiBiKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRl bnNpb25zL1Rlcm0uaCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL1Rlcm0uaApp bmRleCBmMDYyZWZjZTcyZTMyZmViZjg2YmIyM2M0YmNlNmI3OGMyZGE4MzgzLi45NDhmYjI4NjBl NjUwM2I5YmYxODZhMWFmNTUzNGEzMDc3ZjU2MmUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9UZXJtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvVGVybS5oCkBAIC0xMDAsOCArMTAwLDYgQEAgcHVibGljOgogCiAgICAgYm9vbCBv cGVyYXRvcj09KGNvbnN0IFRlcm0mIG90aGVyKSBjb25zdDsKIAotICAgIHVuc2lnbmVkIGhhc2go KSBjb25zdDsKLQogICAgIGJvb2wgaXNFbXB0eVZhbHVlKCkgY29uc3Q7CiAKICNpZiBDT05URU5U X0VYVEVOU0lPTlNfU1RBVEVfTUFDSElORV9ERUJVR0dJTkcKQEAgLTExMyw2ICsxMTEsOCBAQCBw dWJsaWM6CiAjZW5kaWYKICAgICAKIHByaXZhdGU6CisgICAgZnJpZW5kIHZvaWQgYWRkKEhhc2hl ciYsIGNvbnN0IFRlcm0mKTsKKwogICAgIC8vIFRoaXMgaXMgZXhhY3QgZm9yIGNoYXJhY3RlciBz ZXRzIGJ1dCBjb25zZXJ2YXRpdmUgZm9yIGdyb3Vwcy4KICAgICAvLyBUaGUgcmV0dXJuIHZhbHVl IGNhbiBiZSBmYWxzZSBmb3IgYSBncm91cCBlcXVpdmFsZW50IHRvIGEgdW5pdmVyc2FsIHRyYW5z aXRpb24uCiAgICAgYm9vbCBpc1VuaXZlcnNhbFRyYW5zaXRpb24oKSBjb25zdDsKQEAgLTE2NSwx NSArMTY1LDEzIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgJiYgb3RoZXIubV9jaGFyYWN0 ZXJzWzFdID09IG1fY2hhcmFjdGVyc1sxXTsKICAgICAgICAgfQogCi0gICAgICAgIHVuc2lnbmVk IGhhc2goKSBjb25zdAotICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gY29tcHV0ZUhhc2go bV9pbnZlcnRlZCwgbV9jaGFyYWN0ZXJzKTsKLSAgICAgICAgfQotCiAgICAgcHJpdmF0ZToKKyAg ICAgICAgZnJpZW5kIHZvaWQgYWRkKEhhc2hlciYsIGNvbnN0IENoYXJhY3RlclNldCYpOworCiAg ICAgICAgIGJvb2wgbV9pbnZlcnRlZCB7IGZhbHNlIH07CiAgICAgICAgIHN0ZDo6YXJyYXk8dWlu dDY0X3QsIDI+IG1fY2hhcmFjdGVycyB7IDAsIDAgfTsKICAgICB9OworICAgIGZyaWVuZCB2b2lk IGFkZChIYXNoZXImLCBjb25zdCBUZXJtOjpDaGFyYWN0ZXJTZXQmKTsKIAogICAgIHN0cnVjdCBH cm91cCB7CiAgICAgICAgIFZlY3RvcjxUZXJtPiB0ZXJtczsKQEAgLTE4MiwxOCArMTgwLDggQEAg cHJpdmF0ZToKICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIG90aGVyLnRlcm1zID09IHRl cm1zOwogICAgICAgICB9Ci0KLSAgICAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0Ci0gICAgICAg IHsKLSAgICAgICAgICAgIHVuc2lnbmVkIGhhc2ggPSA2NDIxNzQ5OwotICAgICAgICAgICAgZm9y IChjb25zdCBUZXJtJiB0ZXJtIDogdGVybXMpIHsKLSAgICAgICAgICAgICAgICB1bnNpZ25lZCB0 ZXJtSGFzaCA9IHRlcm0uaGFzaCgpOwotICAgICAgICAgICAgICAgIGhhc2ggPSAoaGFzaCA8PCAx NikgXiAoKHRlcm1IYXNoIDw8IDExKSBeIGhhc2gpOwotICAgICAgICAgICAgICAgIGhhc2ggKz0g aGFzaCA+PiAxMTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBoYXNoOwotICAg ICAgICB9CiAgICAgfTsKKyAgICBmcmllbmQgdm9pZCBhZGQoSGFzaGVyJiwgY29uc3QgVGVybTo6 R3JvdXAmKTsKIAogICAgIHVuaW9uIEF0b21EYXRhIHsKICAgICAgICAgQXRvbURhdGEoKQpAQCAt MjEwLDYgKzE5OCwzMSBAQCBwcml2YXRlOgogICAgIH0gbV9hdG9tRGF0YTsKIH07CiAKK2lubGlu ZSB2b2lkIGFkZChIYXNoZXImIGhhc2hlciwgY29uc3QgVGVybTo6Q2hhcmFjdGVyU2V0JiBjaGFy YWN0ZXJTZXQpCit7CisgICAgYWRkKGhhc2hlciwgY2hhcmFjdGVyU2V0Lm1faW52ZXJ0ZWQsIGNo YXJhY3RlclNldC5tX2NoYXJhY3RlcnMpOworfQorCitpbmxpbmUgdm9pZCBhZGQoSGFzaGVyJiBo YXNoZXIsIGNvbnN0IFRlcm06Okdyb3VwJiBncm91cCkKK3sKKyAgICBhZGQoaGFzaGVyLCBncm91 cC50ZXJtcyk7Cit9CisKK2lubGluZSB2b2lkIGFkZChIYXNoZXImIGhhc2hlciwgY29uc3QgVGVy bSYgdGVybSkKK3sKKyAgICBhZGQoaGFzaGVyLCB0ZXJtLm1fdGVybVR5cGUsIHRlcm0ubV9xdWFu dGlmaWVyKTsKKyAgICBzd2l0Y2ggKHRlcm0ubV90ZXJtVHlwZSkgeworICAgIGNhc2UgVGVybTo6 VGVybVR5cGU6OkVtcHR5OgorICAgICAgICBicmVhazsKKyAgICBjYXNlIFRlcm06OlRlcm1UeXBl OjpDaGFyYWN0ZXJTZXQ6CisgICAgICAgIGFkZChoYXNoZXIsIHRlcm0ubV9hdG9tRGF0YS5jaGFy YWN0ZXJTZXQpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFRlcm06OlRlcm1UeXBlOjpHcm91 cDoKKyAgICAgICAgYWRkKGhhc2hlciwgdGVybS5tX2F0b21EYXRhLmdyb3VwKTsKKyAgICAgICAg YnJlYWs7CisgICAgfQorfQorCiAjaWYgQ09OVEVOVF9FWFRFTlNJT05TX1NUQVRFX01BQ0hJTkVf REVCVUdHSU5HCiBpbmxpbmUgU3RyaW5nIHF1YW50aWZpZXJUb1N0cmluZyhBdG9tUXVhbnRpZmll ciBxdWFudGlmaWVyKQogewpAQCAtNTQyLDI0ICs1NTUsNiBAQCBpbmxpbmUgYm9vbCBUZXJtOjpv cGVyYXRvcj09KGNvbnN0IFRlcm0mIG90aGVyKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0K IAotaW5saW5lIHVuc2lnbmVkIFRlcm06Omhhc2goKSBjb25zdAotewotICAgIHVuc2lnbmVkIHBy aW1hcnkgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV90ZXJtVHlwZSkgPDwgMTYgfCBzdGF0aWNf Y2FzdDx1bnNpZ25lZD4obV9xdWFudGlmaWVyKTsKLSAgICB1bnNpZ25lZCBzZWNvbmRhcnkgPSAw OwotICAgIHN3aXRjaCAobV90ZXJtVHlwZSkgewotICAgIGNhc2UgVGVybVR5cGU6OkVtcHR5Ogot ICAgICAgICBzZWNvbmRhcnkgPSA1MjE4NDM5MzsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBU ZXJtVHlwZTo6Q2hhcmFjdGVyU2V0OgotICAgICAgICBzZWNvbmRhcnkgPSBtX2F0b21EYXRhLmNo YXJhY3RlclNldC5oYXNoKCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVGVybVR5cGU6Okdy b3VwOgotICAgICAgICBzZWNvbmRhcnkgPSBtX2F0b21EYXRhLmdyb3VwLmhhc2goKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgfQotICAgIHJldHVybiBwYWlySW50SGFzaChwcmltYXJ5LCBzZWNvbmRh cnkpOwotfQotCiBpbmxpbmUgYm9vbCBUZXJtOjppc0VtcHR5VmFsdWUoKSBjb25zdAogewogICAg IHJldHVybiBtX3Rlcm1UeXBlID09IFRlcm1UeXBlOjpFbXB0eTsK