143348 2015-04-02 15:26:17 -0700 [WK2][NetworkCache] Drop HTTP method from NetworkCache::Key 2015-07-31 17:43:49 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143448 1 cdumez cdumez cgarcia commit-queue koivisto oldest_to_newest 1082359 0 cdumez 2015-04-02 15:26:17 -0700 Drop HTTP method from NetworkCache::Key as we only cache GET responses for now. Even when we start caching HEAD responses, we likely will not want the method to be part of the key because: - A HEAD response can be used to update the headers of a previously cached response to GET - A cached GET response may be used to satisfy subsequent HEAD requests 1082363 1 250013 cdumez 2015-04-02 15:27:58 -0700 Created attachment 250013 Patch 1082385 2 250013 koivisto 2015-04-02 16:15:19 -0700 Comment on attachment 250013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250013&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h:80 > - static const unsigned version = 2; > + static const unsigned version = 3; You shouldn't do this. The old entries will get cleaned during normal cache shrinks (and in an unlikely event of hash collision will fail to validate). Version updates are meant to be used when the directory structure changes and be paired with code that deletes the old directory structure. 1082388 3 koivisto 2015-04-02 16:19:20 -0700 It could be renamed to diskLayoutVersion or something similarly informative. 1082389 4 cdumez 2015-04-02 16:20:30 -0700 Committed r182296: <http://trac.webkit.org/changeset/182296> 1083124 5 commit-queue 2015-04-06 11:34:45 -0700 Re-opened since this is blocked by bug 143448 1113919 6 257979 cdumez 2015-07-31 16:42:10 -0700 Created attachment 257979 Patch 1113920 7 cdumez 2015-07-31 16:42:40 -0700 We can land again now that efficacy logging has been disabled. 1113936 8 257979 commit-queue 2015-07-31 17:43:44 -0700 Comment on attachment 257979 Patch Clearing flags on attachment: 257979 Committed r187698: <http://trac.webkit.org/changeset/187698> 1113937 9 commit-queue 2015-07-31 17:43:49 -0700 All reviewed patches have been landed. Closing bug. 250013 2015-04-02 15:27:58 -0700 2015-07-31 16:42:07 -0700 Patch bug-143348-20150402152713.patch text/plain 6713 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODhiMjE5MzA0NWUzYWI2 NTViMDQ2N2FhY2JiYWI5ODQ2YTY4ZDZjMC4uYWM1MWNlNTQ0M2NhOTA5Njg1MDgzNmQ5NTY1YjRh OTNkZjRiNGE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA0LTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl1bTmV0d29ya0NhY2hl XSBEcm9wIEhUVFAgbWV0aG9kIGZyb20gTmV0d29ya0NhY2hlOjpLZXkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzM0OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3AgSFRUUCBtZXRob2QgZnJvbSBO ZXR3b3JrQ2FjaGU6OktleSBhcyB3ZSBvbmx5IGNhY2hlIEdFVCByZXNwb25zZXMKKyAgICAgICAg Zm9yIG5vdy4gRXZlbiB3aGVuIHdlIHN0YXJ0IGNhY2hpbmcgSEVBRCByZXNwb25zZXMsIHdlIGxp a2VseSB3aWxsIG5vdAorICAgICAgICB3YW50IHRoZSBtZXRob2QgdG8gYmUgcGFydCBvZiB0aGUg a2V5IGJlY2F1c2U6CisgICAgICAgIC0gQSBIRUFEIHJlc3BvbnNlIGNhbiBiZSB1c2VkIHRvIHVw ZGF0ZSB0aGUgaGVhZGVycyBvZiBhIHByZXZpb3VzbHkgY2FjaGVkIHJlc3BvbnNlIHRvIEdFVAor ICAgICAgICAtIEEgY2FjaGVkIEdFVCByZXNwb25zZSBtYXkgYmUgdXNlZCB0byBzYXRpc2Z5IHN1 YnNlcXVlbnQgSEVBRCByZXF1ZXN0cworCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjptYWtlQ2Fj aGVLZXkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6S2V5OjpLZXkpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OktleTo6b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlOjpLZXk6OmNvbXB1dGVIYXNoKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpLZXk6Om9wZXJhdG9yPT0pOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OktleTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpLZXk6OmRlY29k ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5Lmg6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6S2V5OjptZXRob2QpOiBEZWxldGVkLgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaDoKKwogMjAx NS0wNC0wMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBN YWtlIGNoZWNrVVJMUmVjZWl2ZWRGcm9tV2ViUHJvY2VzcyBub3QgcmVseSBvbiBkZXRhaWxzIG9m IHBsYXRmb3JtIFVSTCBpbXBsZW1lbnRhdGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IGQ5YzU5ZjJiNWI3MDll MzNlZDA2ZTAyMTgxNTFlZWU2NTI2ZjZjN2QuLjliZTA2NWZkMGMxYmQ3MjczODBhZDBkNmQ1MGZk ZjFhYmZkYTJkMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlLmNwcApAQCAtOTIsNyArOTIsNyBAQCBzdGF0aWMgS2V5IG1ha2VD YWNoZUtleShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiAjZW5kaWYK ICAgICBpZiAocGFydGl0aW9uLmlzRW1wdHkoKSkKICAgICAgICAgcGFydGl0aW9uID0gQVNDSUlM aXRlcmFsKCJObyBwYXJ0aXRpb24iKTsKLSAgICByZXR1cm4geyByZXF1ZXN0Lmh0dHBNZXRob2Qo KSwgcGFydGl0aW9uLCByZXF1ZXN0LnVybCgpLnN0cmluZygpICB9OworICAgIHJldHVybiB7IHBh cnRpdGlvbiwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSB9OwogfQogCiBzdGF0aWMgU3RyaW5nIGhl YWRlclZhbHVlRm9yVmFyeShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFN0cmluZyYgaGVhZGVyTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVLZXkuY3BwCmluZGV4IDIwODE4MjgxZjM1 MDdmYTAzMDM0ZTY0MzRjYjUwOTM2NTU3MzcyMzEuLjk1OTg0YTdjZDQ2NTFkODY0NjZhODhhNGMz ZGU2YTlhZTk3YTQxOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZUtleS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmNwcApAQCAtMzcsMTYgKzM3LDE0IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogbmFtZXNwYWNlIE5ldHdvcmtDYWNoZSB7CiAKIEtleTo6S2V5KGNvbnN0 IEtleSYgbykKLSAgICA6IG1fbWV0aG9kKG8ubV9tZXRob2QuaXNvbGF0ZWRDb3B5KCkpCi0gICAg LCBtX3BhcnRpdGlvbihvLm1fcGFydGl0aW9uLmlzb2xhdGVkQ29weSgpKQorICAgIDogbV9wYXJ0 aXRpb24oby5tX3BhcnRpdGlvbi5pc29sYXRlZENvcHkoKSkKICAgICAsIG1faWRlbnRpZmllcihv Lm1faWRlbnRpZmllci5pc29sYXRlZENvcHkoKSkKICAgICAsIG1faGFzaChvLm1faGFzaCkKIHsK IH0KIAotS2V5OjpLZXkoY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgcGFydGl0 aW9uLCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIpCi0gICAgOiBtX21ldGhvZChtZXRob2QuaXNv bGF0ZWRDb3B5KCkpCi0gICAgLCBtX3BhcnRpdGlvbihwYXJ0aXRpb24uaXNvbGF0ZWRDb3B5KCkp CitLZXk6OktleShjb25zdCBTdHJpbmcmIHBhcnRpdGlvbiwgY29uc3QgU3RyaW5nJiBpZGVudGlm aWVyKQorICAgIDogbV9wYXJ0aXRpb24ocGFydGl0aW9uLmlzb2xhdGVkQ29weSgpKQogICAgICwg bV9pZGVudGlmaWVyKGlkZW50aWZpZXIuaXNvbGF0ZWRDb3B5KCkpCiAgICAgLCBtX2hhc2goY29t cHV0ZUhhc2goKSkKIHsKQEAgLTU0LDcgKzUyLDYgQEAgS2V5OjpLZXkoY29uc3QgU3RyaW5nJiBt ZXRob2QsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uLCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIK IAogS2V5JiBLZXk6Om9wZXJhdG9yPShjb25zdCBLZXkmIG90aGVyKQogewotICAgIG1fbWV0aG9k ID0gb3RoZXIubV9tZXRob2QuaXNvbGF0ZWRDb3B5KCk7CiAgICAgbV9wYXJ0aXRpb24gPSBvdGhl ci5tX3BhcnRpdGlvbi5pc29sYXRlZENvcHkoKTsKICAgICBtX2lkZW50aWZpZXIgPSBvdGhlci5t X2lkZW50aWZpZXIuaXNvbGF0ZWRDb3B5KCk7CiAgICAgbV9oYXNoID0gb3RoZXIubV9oYXNoOwpA QCAtNzksNyArNzYsNiBAQCBLZXk6Okhhc2hUeXBlIEtleTo6Y29tcHV0ZUhhc2goKSBjb25zdAog ICAgIC8vIFdlIGRvbid0IHJlYWxseSBuZWVkIGEgY3J5cHRvZ3JhcGhpYyBoYXNoLiBUaGUga2V5 IGlzIGFsd2F5cyB2ZXJpZmllZCBhZ2FpbnN0IHRoZSBlbnRyeSBoZWFkZXIuCiAgICAgLy8gTUQ1 IGp1c3QgaGFwcGVucyB0byBiZSBzdWl0YWJseSBzaXplZCwgZmFzdCBhbmQgYXZhaWxhYmxlLgog ICAgIE1ENSBtZDU7Ci0gICAgaGFzaFN0cmluZyhtZDUsIG1fbWV0aG9kKTsKICAgICBoYXNoU3Ry aW5nKG1kNSwgbV9wYXJ0aXRpb24pOwogICAgIGhhc2hTdHJpbmcobWQ1LCBtX2lkZW50aWZpZXIp OwogICAgIE1ENTo6RGlnZXN0IGhhc2g7CkBAIC0xMjEsMTIgKzExNywxMSBAQCBib29sIEtleTo6 c3RyaW5nVG9IYXNoKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBIYXNoVHlwZSYgaGFzaCkKIAogYm9v bCBLZXk6Om9wZXJhdG9yPT0oY29uc3QgS2V5JiBvdGhlcikgY29uc3QKIHsKLSAgICByZXR1cm4g bV9oYXNoID09IG90aGVyLm1faGFzaCAmJiBtX21ldGhvZCA9PSBvdGhlci5tX21ldGhvZCAmJiBt X3BhcnRpdGlvbiA9PSBvdGhlci5tX3BhcnRpdGlvbiAmJiBtX2lkZW50aWZpZXIgPT0gb3RoZXIu bV9pZGVudGlmaWVyOworICAgIHJldHVybiBtX2hhc2ggPT0gb3RoZXIubV9oYXNoICYmIG1fcGFy dGl0aW9uID09IG90aGVyLm1fcGFydGl0aW9uICYmIG1faWRlbnRpZmllciA9PSBvdGhlci5tX2lk ZW50aWZpZXI7CiB9CiAKIHZvaWQgS2V5OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QK IHsKLSAgICBlbmNvZGVyIDw8IG1fbWV0aG9kOwogICAgIGVuY29kZXIgPDwgbV9wYXJ0aXRpb247 CiAgICAgZW5jb2RlciA8PCBtX2lkZW50aWZpZXI7CiAgICAgZW5jb2RlciA8PCBtX2hhc2g7CkBA IC0xMzQsNyArMTI5LDcgQEAgdm9pZCBLZXk6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25z dAogCiBib29sIEtleTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIEtleSYga2V5KQogewotICAg IHJldHVybiBkZWNvZGVyLmRlY29kZShrZXkubV9tZXRob2QpICYmIGRlY29kZXIuZGVjb2RlKGtl eS5tX3BhcnRpdGlvbikgJiYgZGVjb2Rlci5kZWNvZGUoa2V5Lm1faWRlbnRpZmllcikgJiYgZGVj b2Rlci5kZWNvZGUoa2V5Lm1faGFzaCk7CisgICAgcmV0dXJuIGRlY29kZXIuZGVjb2RlKGtleS5t X3BhcnRpdGlvbikgJiYgZGVjb2Rlci5kZWNvZGUoa2V5Lm1faWRlbnRpZmllcikgJiYgZGVjb2Rl ci5kZWNvZGUoa2V5Lm1faGFzaCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5oIGIvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmgKaW5kZXggNjc5NTZjOGU4YzYz NmQ2OTE5YTUwYzU2Y2ExM2Y0ODljMDM0ZTk3OS4uNzE1ZmUwZDU5NTUzMWNhOThlNjAxYTRmNzQ5 OWJiZTNmMTFiYmViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlS2V5LmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmgKQEAgLTQ0LDE0ICs0NCwxMyBAQCBwdWJsaWM6CiAg ICAgS2V5KCkgeyB9CiAgICAgS2V5KGNvbnN0IEtleSYpOwogICAgIEtleShLZXkmJikgPSBkZWZh dWx0OwotICAgIEtleShjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgU3RyaW5nJiBwYXJ0aXRp b24sIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcik7CisgICAgS2V5KGNvbnN0IFN0cmluZyYgcGFy dGl0aW9uLCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIpOwogCiAgICAgS2V5JiBvcGVyYXRvcj0o Y29uc3QgS2V5Jik7CiAgICAgS2V5JiBvcGVyYXRvcj0oS2V5JiYpID0gZGVmYXVsdDsKIAogICAg IGJvb2wgaXNOdWxsKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyLmlzTnVsbCgpOyB9CiAK LSAgICBjb25zdCBTdHJpbmcmIG1ldGhvZCgpIGNvbnN0IHsgcmV0dXJuIG1fbWV0aG9kOyB9CiAg ICAgY29uc3QgU3RyaW5nJiBwYXJ0aXRpb24oKSBjb25zdCB7IHJldHVybiBtX3BhcnRpdGlvbjsg fQogICAgIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRp ZmllcjsgfQogCkBAIC03Myw3ICs3Miw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSGFzaFR5 cGUgY29tcHV0ZUhhc2goKSBjb25zdDsKIAotICAgIFN0cmluZyBtX21ldGhvZDsKICAgICBTdHJp bmcgbV9wYXJ0aXRpb247CiAgICAgU3RyaW5nIG1faWRlbnRpZmllcjsKICAgICBIYXNoVHlwZSBt X2hhc2g7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgKaW5kZXggYzFiZTI4OGVhYmUxZjJkYTY0MGFkNjc2MTU3 NzAxZTk1ZjdiZDM3Yy4uYjE3NWYxNDNkMGMzNWNjOTAwNjVkN2UwN2E0ODRmN2Y3OWQxYzc1MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlU3RvcmFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2UuaApAQCAtNzcsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRNYXhpbXVtU2l6ZShzaXplX3QpOwogICAgIHZvaWQgY2xlYXIoKTsKIAotICAgIHN0YXRpYyBj b25zdCB1bnNpZ25lZCB2ZXJzaW9uID0gMjsKKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgdmVy c2lvbiA9IDM7CiAKICAgICBjb25zdCBTdHJpbmcmIGJhc2VEaXJlY3RvcnlQYXRoKCkgY29uc3Qg eyByZXR1cm4gbV9iYXNlRGlyZWN0b3J5UGF0aDsgfQogICAgIGNvbnN0IFN0cmluZyYgZGlyZWN0 b3J5UGF0aCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlyZWN0b3J5UGF0aDsgfQo= 257979 2015-07-31 16:42:10 -0700 2015-07-31 17:43:44 -0700 Patch bug-143348-20150731164208.patch text/plain 6454 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3Njg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGUxNmVkMjk0NjgzMzg2 NTViOGJjY2JhMDM4NWE2MzNhZTZhYmIzZC4uZDY5NWJiOTNhNzExYzUyMGFiNzkwMWFkMjdmYjA0 OTVjZWNjNjI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA3LTMxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl1bTmV0d29ya0NhY2hl XSBEcm9wIEhUVFAgbWV0aG9kIGZyb20gTmV0d29ya0NhY2hlOjpLZXkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzM0OAorCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIERyb3AgSFRUUCBtZXRob2QgZnJvbSBO ZXR3b3JrQ2FjaGU6OktleSBhcyB3ZSBvbmx5IGNhY2hlIEdFVCByZXNwb25zZXMKKyAgICAgICAg Zm9yIG5vdy4gRXZlbiB3aGVuIHdlIHN0YXJ0IGNhY2hpbmcgSEVBRCByZXNwb25zZXMsIHdlIGxp a2VseSB3aWxsIG5vdAorICAgICAgICB3YW50IHRoZSBtZXRob2QgdG8gYmUgcGFydCBvZiB0aGUg a2V5IGJlY2F1c2U6CisgICAgICAgIC0gQSBIRUFEIHJlc3BvbnNlIGNhbiBiZSB1c2VkIHRvIHVw ZGF0ZSB0aGUgaGVhZGVycyBvZiBhIHByZXZpb3VzbHkgY2FjaGVkIHJlc3BvbnNlIHRvIEdFVAor ICAgICAgICAtIEEgY2FjaGVkIEdFVCByZXNwb25zZSBtYXkgYmUgdXNlZCB0byBzYXRpc2Z5IHN1 YnNlcXVlbnQgSEVBRCByZXF1ZXN0cworCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjptYWtlQ2Fj aGVLZXkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6S2V5OjpLZXkpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OktleTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtDYWNoZTo6S2V5OjpkZWNvZGUpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2Fj aGU6OktleTo6b3BlcmF0b3I9KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nh Y2hlOjpLZXk6OmNvbXB1dGVIYXNoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpLZXk6OmVuY29kZSk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlS2V5Lmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 S2V5OjptZXRob2QpOiBEZWxldGVkLgorCiAyMDE1LTA3LTMxICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBwYXJhbWV0ZXIgbmFtZSB0 eXBvIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuY3BwCmluZGV4IDY3MGFjMDAyZGM1NzkzODM4MTc1NjViZmJkZWM0Mjc2MWYx MTNjYjQuLjU2NDQyMTFiMDI1NjM5NGRhMzc5ZjM3YmM0NGM0NGZhY2IxMDE4YjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cApAQCAtMTEzLDcgKzExMyw3IEBAIHN0YXRpYyBLZXkgbWFrZUNhY2hlS2V5KGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKICAgICAvLyBGSVhNRTogVGhpcyBpbXBsZW1l bnRzIG1pbmltYWwgUmFuZ2UgaGVhZGVyIGRpc2sgY2FjaGUgc3VwcG9ydC4gV2UgZG9uJ3QgcGFy c2UKICAgICAvLyByYW5nZXMgc28gb25seSB0aGUgc2FtZSBleGFjdCByYW5nZSByZXF1ZXN0IHdp bGwgYmUgc2VydmVkIGZyb20gdGhlIGNhY2hlLgogICAgIFN0cmluZyByYW5nZSA9IHJlcXVlc3Qu aHR0cEhlYWRlckZpZWxkKFdlYkNvcmU6OkhUVFBIZWFkZXJOYW1lOjpSYW5nZSk7Ci0gICAgcmV0 dXJuIHsgcmVxdWVzdC5odHRwTWV0aG9kKCksIHBhcnRpdGlvbiwgcmFuZ2UsIHJlcXVlc3QudXJs KCkuc3RyaW5nKCkgIH07CisgICAgcmV0dXJuIHsgcGFydGl0aW9uLCByYW5nZSwgcmVxdWVzdC51 cmwoKS5zdHJpbmcoKSB9OwogfQogCiBzdGF0aWMgU3RyaW5nIGhlYWRlclZhbHVlRm9yVmFyeShj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgaGVh ZGVyTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUtleS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVLZXkuY3BwCmluZGV4IGM2NDBiZDAwOTQzMjE2ODRlZGRjYjg1YzI0ZGEz Y2YxMjA4ZTMzOGUuLjBiOTFiYWVmOThjNmY1YTIxMTI4ZGM5ZTdkZDgzOGJmNzllYmY3MGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZUtleS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29y a0NhY2hlS2V5LmNwcApAQCAtMzcsMTcgKzM3LDE1IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogbmFt ZXNwYWNlIE5ldHdvcmtDYWNoZSB7CiAKIEtleTo6S2V5KGNvbnN0IEtleSYgbykKLSAgICA6IG1f bWV0aG9kKG8ubV9tZXRob2QuaXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBtX3BhcnRpdGlvbihvLm1f cGFydGl0aW9uLmlzb2xhdGVkQ29weSgpKQorICAgIDogbV9wYXJ0aXRpb24oby5tX3BhcnRpdGlv bi5pc29sYXRlZENvcHkoKSkKICAgICAsIG1faWRlbnRpZmllcihvLm1faWRlbnRpZmllci5pc29s YXRlZENvcHkoKSkKICAgICAsIG1fcmFuZ2Uoby5tX3JhbmdlLmlzb2xhdGVkQ29weSgpKQogICAg ICwgbV9oYXNoKG8ubV9oYXNoKQogewogfQogCi1LZXk6OktleShjb25zdCBTdHJpbmcmIG1ldGhv ZCwgY29uc3QgU3RyaW5nJiBwYXJ0aXRpb24sIGNvbnN0IFN0cmluZyYgcmFuZ2UsIGNvbnN0IFN0 cmluZyYgaWRlbnRpZmllcikKLSAgICA6IG1fbWV0aG9kKG1ldGhvZC5pc29sYXRlZENvcHkoKSkK LSAgICAsIG1fcGFydGl0aW9uKHBhcnRpdGlvbi5pc29sYXRlZENvcHkoKSkKK0tleTo6S2V5KGNv bnN0IFN0cmluZyYgcGFydGl0aW9uLCBjb25zdCBTdHJpbmcmIHJhbmdlLCBjb25zdCBTdHJpbmcm IGlkZW50aWZpZXIpCisgICAgOiBtX3BhcnRpdGlvbihwYXJ0aXRpb24uaXNvbGF0ZWRDb3B5KCkp CiAgICAgLCBtX2lkZW50aWZpZXIoaWRlbnRpZmllci5pc29sYXRlZENvcHkoKSkKICAgICAsIG1f cmFuZ2UocmFuZ2UuaXNvbGF0ZWRDb3B5KCkpCiAgICAgLCBtX2hhc2goY29tcHV0ZUhhc2goKSkK QEAgLTU2LDcgKzU0LDYgQEAgS2V5OjpLZXkoY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0 cmluZyYgcGFydGl0aW9uLCBjb25zdCBTdHJpbmcmIHJhbmdlLCBjb24KIAogS2V5JiBLZXk6Om9w ZXJhdG9yPShjb25zdCBLZXkmIG90aGVyKQogewotICAgIG1fbWV0aG9kID0gb3RoZXIubV9tZXRo b2QuaXNvbGF0ZWRDb3B5KCk7CiAgICAgbV9wYXJ0aXRpb24gPSBvdGhlci5tX3BhcnRpdGlvbi5p c29sYXRlZENvcHkoKTsKICAgICBtX2lkZW50aWZpZXIgPSBvdGhlci5tX2lkZW50aWZpZXIuaXNv bGF0ZWRDb3B5KCk7CiAgICAgbV9yYW5nZSA9IG90aGVyLm1fcmFuZ2UuaXNvbGF0ZWRDb3B5KCk7 CkBAIC04NSw3ICs4Miw2IEBAIEtleTo6SGFzaFR5cGUgS2V5Ojpjb21wdXRlSGFzaCgpIGNvbnN0 CiAgICAgLy8gV2UgZG9uJ3QgcmVhbGx5IG5lZWQgYSBjcnlwdG9ncmFwaGljIGhhc2guIFRoZSBr ZXkgaXMgYWx3YXlzIHZlcmlmaWVkIGFnYWluc3QgdGhlIGVudHJ5IGhlYWRlci4KICAgICAvLyBT SEExIGp1c3QgaGFwcGVucyB0byBiZSBzdWl0YWJseSBzaXplZCwgZmFzdCBhbmQgYXZhaWxhYmxl LgogICAgIFNIQTEgc2hhMTsKLSAgICBoYXNoU3RyaW5nKHNoYTEsIG1fbWV0aG9kKTsKICAgICBo YXNoU3RyaW5nKHNoYTEsIG1fcGFydGl0aW9uKTsKICAgICBoYXNoU3RyaW5nKHNoYTEsIG1faWRl bnRpZmllcik7CiAgICAgaGFzaFN0cmluZyhzaGExLCBtX3JhbmdlKTsKQEAgLTEyOCwxMiArMTI0 LDExIEBAIGJvb2wgS2V5OjpzdHJpbmdUb0hhc2goY29uc3QgU3RyaW5nJiBzdHJpbmcsIEhhc2hU eXBlJiBoYXNoKQogCiBib29sIEtleTo6b3BlcmF0b3I9PShjb25zdCBLZXkmIG90aGVyKSBjb25z dAogewotICAgIHJldHVybiBtX2hhc2ggPT0gb3RoZXIubV9oYXNoICYmIG1fbWV0aG9kID09IG90 aGVyLm1fbWV0aG9kICYmIG1fcGFydGl0aW9uID09IG90aGVyLm1fcGFydGl0aW9uICYmIG1faWRl bnRpZmllciA9PSBvdGhlci5tX2lkZW50aWZpZXIgJiYgbV9yYW5nZSA9PSBvdGhlci5tX3Jhbmdl OworICAgIHJldHVybiBtX2hhc2ggPT0gb3RoZXIubV9oYXNoICYmIG1fcGFydGl0aW9uID09IG90 aGVyLm1fcGFydGl0aW9uICYmIG1faWRlbnRpZmllciA9PSBvdGhlci5tX2lkZW50aWZpZXIgJiYg bV9yYW5nZSA9PSBvdGhlci5tX3JhbmdlOwogfQogCiB2b2lkIEtleTo6ZW5jb2RlKEVuY29kZXIm IGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgZW5jb2RlciA8PCBtX21ldGhvZDsKICAgICBlbmNvZGVy IDw8IG1fcGFydGl0aW9uOwogICAgIGVuY29kZXIgPDwgbV9pZGVudGlmaWVyOwogICAgIGVuY29k ZXIgPDwgbV9yYW5nZTsKQEAgLTE0Miw3ICsxMzcsNyBAQCB2b2lkIEtleTo6ZW5jb2RlKEVuY29k ZXImIGVuY29kZXIpIGNvbnN0CiAKIGJvb2wgS2V5OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg S2V5JiBrZXkpCiB7Ci0gICAgcmV0dXJuIGRlY29kZXIuZGVjb2RlKGtleS5tX21ldGhvZCkgJiYg ZGVjb2Rlci5kZWNvZGUoa2V5Lm1fcGFydGl0aW9uKSAmJiBkZWNvZGVyLmRlY29kZShrZXkubV9p ZGVudGlmaWVyKSAmJiBkZWNvZGVyLmRlY29kZShrZXkubV9yYW5nZSkgJiYgZGVjb2Rlci5kZWNv ZGUoa2V5Lm1faGFzaCk7CisgICAgcmV0dXJuIGRlY29kZXIuZGVjb2RlKGtleS5tX3BhcnRpdGlv bikgJiYgZGVjb2Rlci5kZWNvZGUoa2V5Lm1faWRlbnRpZmllcikgJiYgZGVjb2Rlci5kZWNvZGUo a2V5Lm1fcmFuZ2UpICYmIGRlY29kZXIuZGVjb2RlKGtleS5tX2hhc2gpOwogfQogCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVL ZXkuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtl eS5oCmluZGV4IGI5ZTY2NWRiYmY2NWEzNzhhOTc5MWJjMTRmZTJiOTY4ZjhiYjlmMDkuLjJjZGFl MzA1ZmIxMjM3YTVjMWI4YWFjMzY3ZTQxMjMxZjZhYjg3MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUtleS5oCkBAIC00NCwx NCArNDQsMTMgQEAgcHVibGljOgogICAgIEtleSgpIHsgfQogICAgIEtleShjb25zdCBLZXkmKTsK ICAgICBLZXkoS2V5JiYpID0gZGVmYXVsdDsKLSAgICBLZXkoY29uc3QgU3RyaW5nJiBtZXRob2Qs IGNvbnN0IFN0cmluZyYgcGFydGl0aW9uLCBjb25zdCBTdHJpbmcmIHJhbmdlLCBjb25zdCBTdHJp bmcmIGlkZW50aWZpZXIpOworICAgIEtleShjb25zdCBTdHJpbmcmIHBhcnRpdGlvbiwgY29uc3Qg U3RyaW5nJiByYW5nZSwgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKTsKIAogICAgIEtleSYgb3Bl cmF0b3I9KGNvbnN0IEtleSYpOwogICAgIEtleSYgb3BlcmF0b3I9KEtleSYmKSA9IGRlZmF1bHQ7 CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllci5pc051bGwo KTsgfQogCi0gICAgY29uc3QgU3RyaW5nJiBtZXRob2QoKSBjb25zdCB7IHJldHVybiBtX21ldGhv ZDsgfQogICAgIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9wYXJ0 aXRpb247IH0KICAgICBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBt X2lkZW50aWZpZXI7IH0KIApAQCAtNzEsNyArNzAsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAg IEhhc2hUeXBlIGNvbXB1dGVIYXNoKCkgY29uc3Q7CiAKLSAgICBTdHJpbmcgbV9tZXRob2Q7CiAg ICAgU3RyaW5nIG1fcGFydGl0aW9uOwogICAgIFN0cmluZyBtX2lkZW50aWZpZXI7CiAgICAgU3Ry aW5nIG1fcmFuZ2U7Cg==