143829 2015-04-16 07:15:55 -0700 Network Cache: Use SHA1 for key hash 2015-06-12 05:59:33 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 1085912 0 koivisto 2015-04-16 07:15:55 -0700 For consistency with blobs, use SHA1 instead of MD5. This is not a security feature. 1085913 1 250921 koivisto 2015-04-16 07:21:25 -0700 Created attachment 250921 patch 1101572 2 koivisto 2015-06-12 05:59:33 -0700 https://trac.webkit.org/r185500 250921 2015-04-16 07:21:25 -0700 2015-04-16 08:36:31 -0700 patch disk-cache-key-sha1.patch text/plain 5678 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Mjg4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA0LTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBOZXR3b3JrIENhY2hlOiBVc2Ug U0hBMSBmb3Iga2V5IGhhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MzgyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZvciBjb25zaXN0ZW5jeSB3aXRoIGJsb2JzLCB1c2UgU0hBMSBpbnN0ZWFkIG9m IE1ENS4gVGhpcyBpcyBub3QgYSBzZWN1cml0eSByZWxhdGVkLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlQ29kZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlOjpDb2RlcjxNRDU6OkRpZ2VzdD46OmVuY29kZSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q29kZXI8TUQ1OjpEaWdlc3Q+OjpkZWNvZGUpOiBE ZWxldGVkLgorCisgICAgICAgICAgICBObyBsb25nZXIgbmVlZGVkLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlQ29kZXJzLmg6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya0NhY2hlOjpoYXNoU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpL ZXk6OmNvbXB1dGVIYXNoKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVLZXkuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT dG9yYWdlLmg6CisKIDIwMTUtMDQtMTYgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFtFRkxdIERpc2FibGUgYSBmbGFreSBld2tfY29udGV4dF9uZXR3 b3JrX3Byb2Nlc3NfbW9kZWwoKSBBUEkgdGVzdApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlQ29kZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVDb2RlcnMuY3BwCShy ZXZpc2lvbiAxODI4NDApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVDb2RlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQsMTYgKzE3NCw2IEBA IGJvb2wgQ29kZXI8V2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvPjo6ZGUKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAotdm9pZCBDb2RlcjxNRDU6OkRpZ2VzdD46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVy LCBjb25zdCBNRDU6OkRpZ2VzdCYgZGlnZXN0KQotewotICAgIGVuY29kZXIuZW5jb2RlRml4ZWRM ZW5ndGhEYXRhKGRpZ2VzdC5kYXRhKCksIHNpemVvZihkaWdlc3QpKTsKLX0KLQotYm9vbCBDb2Rl cjxNRDU6OkRpZ2VzdD46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBNRDU6OkRpZ2VzdCYgZGln ZXN0KQotewotICAgIHJldHVybiBkZWNvZGVyLmRlY29kZUZpeGVkTGVuZ3RoRGF0YShkaWdlc3Qu ZGF0YSgpLCBzaXplb2YoZGlnZXN0KSk7Ci19Ci0KIHZvaWQgQ29kZXI8U0hBMTo6RGlnZXN0Pjo6 ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFNIQTE6OkRpZ2VzdCYgZGlnZXN0KQogewog ICAgIGVuY29kZXIuZW5jb2RlRml4ZWRMZW5ndGhEYXRhKGRpZ2VzdC5kYXRhKCksIHNpemVvZihk aWdlc3QpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZUNvZGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZUNvZGVycy5oCShyZXZpc2lvbiAxODI4NDApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVDb2RlcnMuaAkod29y a2luZyBjb3B5KQpAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgotI2luY2x1 ZGUgPHd0Zi9NRDUuaD4KICNpbmNsdWRlIDx3dGYvU0hBMS5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KIApAQCAtMjU4LDExICsyNTcsNiBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBDb2RlcjxXZWJD b3JlOjpDZXJ0aWZpCiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mKTsKIH07CiAKLXRlbXBsYXRlPD4gc3RydWN0IENvZGVyPE1ENTo6RGln ZXN0PiB7Ci0gICAgc3RhdGljIHZvaWQgZW5jb2RlKEVuY29kZXImLCBjb25zdCBNRDU6OkRpZ2Vz dCYpOwotICAgIHN0YXRpYyBib29sIGRlY29kZShEZWNvZGVyJiwgTUQ1OjpEaWdlc3QmKTsKLX07 Ci0KIHRlbXBsYXRlPD4gc3RydWN0IENvZGVyPFNIQTE6OkRpZ2VzdD4gewogICAgIHN0YXRpYyB2 b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgU0hBMTo6RGlnZXN0Jik7CiAgICAgc3RhdGljIGJv b2wgZGVjb2RlKERlY29kZXImLCBTSEExOjpEaWdlc3QmKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmNwcAko cmV2aXNpb24gMTgyODQwKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlS2V5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjEsMjkgKzYxLDI4IEBAIEtl eSYgS2V5OjpvcGVyYXRvcj0oY29uc3QgS2V5JiBvdGhlcikKICAgICByZXR1cm4gKnRoaXM7CiB9 CiAKLXN0YXRpYyB2b2lkIGhhc2hTdHJpbmcoTUQ1JiBtZDUsIGNvbnN0IFN0cmluZyYgc3RyaW5n KQorc3RhdGljIHZvaWQgaGFzaFN0cmluZyhTSEExJiBzaGExLCBjb25zdCBTdHJpbmcmIHN0cmlu ZykKIHsKICAgICBjb25zdCB1aW50OF90IHplcm8gPSAwOwogICAgIGlmIChzdHJpbmcuaXM4Qml0 KCkgJiYgc3RyaW5nLmNvbnRhaW5zT25seUFTQ0lJKCkpIHsKLSAgICAgICAgbWQ1LmFkZEJ5dGVz KHN0cmluZy5jaGFyYWN0ZXJzOCgpLCBzdHJpbmcubGVuZ3RoKCkpOwotICAgICAgICBtZDUuYWRk Qnl0ZXMoJnplcm8sIDEpOworICAgICAgICBzaGExLmFkZEJ5dGVzKHN0cmluZy5jaGFyYWN0ZXJz OCgpLCBzdHJpbmcubGVuZ3RoKCkpOworICAgICAgICBzaGExLmFkZEJ5dGVzKCZ6ZXJvLCAxKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBhdXRvIGNTdHJpbmcgPSBzdHJpbmcudXRmOCgp OwotICAgIG1kNS5hZGRCeXRlcyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihjU3Ry aW5nLmRhdGEoKSksIGNTdHJpbmcubGVuZ3RoKCkpOwotICAgIG1kNS5hZGRCeXRlcygmemVybywg MSk7CisgICAgc2hhMS5hZGRCeXRlcyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihj U3RyaW5nLmRhdGEoKSksIGNTdHJpbmcubGVuZ3RoKCkgKyAxKTsKIH0KIAogS2V5OjpIYXNoVHlw ZSBLZXk6OmNvbXB1dGVIYXNoKCkgY29uc3QKIHsKICAgICAvLyBXZSBkb24ndCByZWFsbHkgbmVl ZCBhIGNyeXB0b2dyYXBoaWMgaGFzaC4gVGhlIGtleSBpcyBhbHdheXMgdmVyaWZpZWQgYWdhaW5z dCB0aGUgZW50cnkgaGVhZGVyLgotICAgIC8vIE1ENSBqdXN0IGhhcHBlbnMgdG8gYmUgc3VpdGFi bHkgc2l6ZWQsIGZhc3QgYW5kIGF2YWlsYWJsZS4KLSAgICBNRDUgbWQ1OwotICAgIGhhc2hTdHJp bmcobWQ1LCBtX21ldGhvZCk7Ci0gICAgaGFzaFN0cmluZyhtZDUsIG1fcGFydGl0aW9uKTsKLSAg ICBoYXNoU3RyaW5nKG1kNSwgbV9pZGVudGlmaWVyKTsKLSAgICBNRDU6OkRpZ2VzdCBoYXNoOwot ICAgIG1kNS5jaGVja3N1bShoYXNoKTsKKyAgICAvLyBTSEExIGp1c3QgaGFwcGVucyB0byBiZSBz dWl0YWJseSBzaXplZCwgZmFzdCBhbmQgYXZhaWxhYmxlLgorICAgIFNIQTEgc2hhMTsKKyAgICBo YXNoU3RyaW5nKHNoYTEsIG1fbWV0aG9kKTsKKyAgICBoYXNoU3RyaW5nKHNoYTEsIG1fcGFydGl0 aW9uKTsKKyAgICBoYXNoU3RyaW5nKHNoYTEsIG1faWRlbnRpZmllcik7CisgICAgU0hBMTo6RGln ZXN0IGhhc2g7CisgICAgc2hhMS5jb21wdXRlSGFzaChoYXNoKTsKICAgICByZXR1cm4gaGFzaDsK IH0KIApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlS2V5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlS2V5LmgJKHJldmlzaW9uIDE4Mjg0MCkKKysrIFNvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5oCSh3b3JraW5nIGNvcHkpCkBA IC0yOCw3ICsyOCw3IEBACiAKICNpZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKIAotI2luY2x1ZGUg PHd0Zi9NRDUuaD4KKyNpbmNsdWRlIDx3dGYvU0hBMS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTM5LDcgKzM5LDcgQEAgY2xhc3Mg RGVjb2RlcjsKIAogY2xhc3MgS2V5IHsKIHB1YmxpYzoKLSAgICB0eXBlZGVmIE1ENTo6RGlnZXN0 IEhhc2hUeXBlOworICAgIHR5cGVkZWYgU0hBMTo6RGlnZXN0IEhhc2hUeXBlOwogCiAgICAgS2V5 KCkgeyB9CiAgICAgS2V5KGNvbnN0IEtleSYpOwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAkocmV2 aXNpb24gMTgyODU2KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3RvcmFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MSw3ICs4MSw3IEBAIHB1Ymxp YzoKICAgICBzaXplX3QgYXBwcm94aW1hdGVTaXplKCkgY29uc3Q7CiAgICAgdm9pZCBjbGVhcigp OwogCi0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIHZlcnNpb24gPSAzOworICAgIHN0YXRpYyBj b25zdCB1bnNpZ25lZCB2ZXJzaW9uID0gNDsKIAogICAgIFN0cmluZyBiYXNlUGF0aCgpIGNvbnN0 OwogICAgIFN0cmluZyB2ZXJzaW9uUGF0aCgpIGNvbnN0Owo=