127829 2014-01-28 21:24:43 -0800 IDB: Serialize IDBKeyDatas to disk, not IDBKeys 2014-01-29 08:13:15 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 973298 0 beidson 2014-01-28 21:24:43 -0800 IDB: Serialize IDBKeyDatas to disk, not IDBKeys This makes more sense WRT the purpose of the data object over the object the backs the DOM API. 973299 1 222554 beidson 2014-01-28 21:29:54 -0800 Created attachment 222554 Patch v1 973372 2 222554 commit-queue 2014-01-29 08:13:13 -0800 Comment on attachment 222554 Patch v1 Clearing flags on attachment: 222554 Committed r163020: <http://trac.webkit.org/changeset/163020> 973373 3 commit-queue 2014-01-29 08:13:15 -0800 All reviewed patches have been landed. Closing bug. 222554 2014-01-28 21:29:54 -0800 2014-01-29 08:13:13 -0800 Patch v1 patch text/plain 12931 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYmUyYWU1Li5mNTA1ZTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTQtMDEtMjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogU2VyaWFsaXplIElEQktleURhdGFzIHRvIGRpc2ssIG5vdCBJREJLZXlzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc4MjkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGVuY29kZS9k ZWNvZGUgZnJvbSBJREJLZXkgdG8gSURCS2V5RGF0YS4KKworICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL0lEQktleS5jcHA6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5Lmg6 CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OklEQktleURhdGE6OklEQktleURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6SURC S2V5RGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQktleURhdGE6OmRlY29kZSk6 CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5oOgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisKIDIwMTQtMDEtMjggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE2MjgzNyk6IDUlIHJlZ3Jlc3Npb24gb24g aHRtbDUtZnVsbC1yZW5kZXIgYW5kIDMlIHJlZ3Jlc3Npb24gaW4gRG9Zb3VFdmVuQmVuY2gKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXkuY3BwCmluZGV4IDM3NWExYzMu LjUxOTZkZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QktleS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5LmNw cApAQCAtMjgsNyArMjgsNyBAQAogCiAjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0UpCiAKLSNp bmNsdWRlICJLZXllZENvZGluZy5oIgorI2luY2x1ZGUgIklEQktleURhdGEuaCIKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCkBAIC05OCw0MSArOTgsNiBAQCBib29sIElEQktleTo6aXNFcXVhbChj b25zdCBJREJLZXkqIG90aGVyKSBjb25zdAogICAgIHJldHVybiAhY29tcGFyZShvdGhlcik7CiB9 CiAKLXZvaWQgSURCS2V5OjplbmNvZGUoS2V5ZWRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAotewot ICAgIGVuY29kZXIuZW5jb2RlRW51bSgidHlwZSIsIG1fdHlwZSk7Ci0KLSAgICBzd2l0Y2ggKG1f dHlwZSkgewotICAgIGNhc2UgSW52YWxpZFR5cGU6Ci0gICAgICAgIHJldHVybjsKLSAgICBjYXNl IEFycmF5VHlwZToKLSAgICAgICAgZW5jb2Rlci5lbmNvZGVPYmplY3RzKCJhcnJheSIsIG1fYXJy YXkuYmVnaW4oKSwgbV9hcnJheS5lbmQoKSwgW10oV2ViQ29yZTo6S2V5ZWRFbmNvZGVyJiBlbmNv ZGVyLCBjb25zdCBSZWZQdHI8SURCS2V5PiYga2V5KSB7Ci0gICAgICAgICAgICBlbmNvZGVyLmVu Y29kZU9iamVjdCgiaWRiS2V5IiwgKmtleSwgW10oS2V5ZWRFbmNvZGVyJiBlbmNvZGVyLCBjb25z dCBJREJLZXkmIGtleSkgewotICAgICAgICAgICAgICAgIGtleS5lbmNvZGUoZW5jb2Rlcik7Ci0g ICAgICAgICAgICB9KTsKLSAgICAgICAgfSk7Ci0gICAgICAgIHJldHVybjsKLSAgICBjYXNlIFN0 cmluZ1R5cGU6Ci0gICAgICAgIGVuY29kZXIuZW5jb2RlU3RyaW5nKCJzdHJpbmciLCBtX3N0cmlu Zyk7Ci0gICAgICAgIHJldHVybjsKLSAgICBjYXNlIERhdGVUeXBlOgotICAgIGNhc2UgTnVtYmVy VHlwZToKLSAgICAgICAgZW5jb2Rlci5lbmNvZGVEb3VibGUoIm51bWJlciIsIG1fbnVtYmVyKTsK LSAgICAgICAgcmV0dXJuOwotICAgIGNhc2UgTWluVHlwZToKLSAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLX0KLQotYm9vbCBJREJLZXk6OmRlY29kZShLZXllZERlY29kZXImLCBJREJLZXkmKQot ewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgd2hlbiBJREIgR2V0IHN1cHBvcnQgaXMgaW1wbGVt ZW50ZWQgKDxyZGFyOi8vcHJvYmxlbS8xNTc3OTY0ND4pCi0gICAgcmV0dXJuIGZhbHNlOwotfQot CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJLZXkuaAppbmRleCA2MTc2ZDA5Li45MGI2MmQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXkuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXkuaApAQCAtMzUsOSArMzUsNiBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEtleWVkRGVjb2RlcjsKLWNsYXNzIEtleWVkRW5jb2Rl cjsKLQogY2xhc3MgSURCS2V5IDogcHVibGljIFJlZkNvdW50ZWQ8SURCS2V5PiB7CiBwdWJsaWM6 CiAgICAgdHlwZWRlZiBWZWN0b3I8UmVmUHRyPElEQktleT4+IEtleUFycmF5OwpAQCAtMTUwLDkg KzE0Nyw2IEBAIHB1YmxpYzoKICAgICB1c2luZyBSZWZDb3VudGVkPElEQktleT46OnJlZjsKICAg ICB1c2luZyBSZWZDb3VudGVkPElEQktleT46OmRlcmVmOwogCi0gICAgdm9pZCBlbmNvZGUoS2V5 ZWRFbmNvZGVyJikgY29uc3Q7Ci0gICAgc3RhdGljIGJvb2wgZGVjb2RlKEtleWVkRGVjb2RlciYs IElEQktleSYpOwotCiBwcml2YXRlOgogICAgIElEQktleSgpIDogbV90eXBlKEludmFsaWRUeXBl KSwgbV9udW1iZXIoMCksIG1fc2l6ZUVzdGltYXRlKE92ZXJoZWFkU2l6ZSkgeyB9CiAgICAgSURC S2V5KFR5cGUgdHlwZSwgZG91YmxlIG51bWJlcikgOiBtX3R5cGUodHlwZSksIG1fbnVtYmVyKG51 bWJlciksIG1fc2l6ZUVzdGltYXRlKE92ZXJoZWFkU2l6ZSArIHNpemVvZihkb3VibGUpKSB7IH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5jcHAKaW5k ZXggMWZjODJjZC4uNDZjYTNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCS2V5RGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCS2V5RGF0YS5jcHAKQEAgLTI4LDkgKzI4LDExIEBACiAKICNpZiBFTkFCTEUoSU5E RVhFRF9EQVRBQkFTRSkKIAorI2luY2x1ZGUgIktleWVkQ29kaW5nLmgiCisKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotSURCS2V5RGF0YTo6SURCS2V5RGF0YShJREJLZXkqIGtleSkKK0lEQktleURh dGE6OklEQktleURhdGEoY29uc3QgSURCS2V5KiBrZXkpCiAgICAgOiB0eXBlKElEQktleTo6SW52 YWxpZFR5cGUpCiAgICAgLCBudW1iZXJWYWx1ZSgwKQogICAgICwgaXNOdWxsKGZhbHNlKQpAQCAt MTI2LDYgKzEyOCw0NSBAQCBJREJLZXlEYXRhIElEQktleURhdGE6Omlzb2xhdGVkQ29weSgpIGNv bnN0CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAordm9pZCBJREJLZXlEYXRhOjplbmNvZGUoS2V5 ZWRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAoreworICAgIGVuY29kZXIuZW5jb2RlQm9vbCgibnVs bCIsIGlzTnVsbCk7CisgICAgaWYgKGlzTnVsbCkKKyAgICAgICAgcmV0dXJuOworCisgICAgZW5j b2Rlci5lbmNvZGVFbnVtKCJ0eXBlIiwgdHlwZSk7CisKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAg ICBjYXNlIElEQktleTo6SW52YWxpZFR5cGU6CisgICAgICAgIHJldHVybjsKKyAgICBjYXNlIElE QktleTo6QXJyYXlUeXBlOgorICAgICAgICBlbmNvZGVyLmVuY29kZU9iamVjdHMoImFycmF5Iiwg YXJyYXlWYWx1ZS5iZWdpbigpLCBhcnJheVZhbHVlLmVuZCgpLCBbXShLZXllZEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IElEQktleURhdGEmIGtleSkgeworICAgICAgICAgICAgZW5jb2Rlci5lbmNv ZGVPYmplY3QoImlkYktleURhdGEiLCBrZXksIFtdKEtleWVkRW5jb2RlciYgZW5jb2RlciwgY29u c3QgSURCS2V5RGF0YSYga2V5KSB7CisgICAgICAgICAgICAgICAga2V5LmVuY29kZShlbmNvZGVy KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIGNh c2UgSURCS2V5OjpTdHJpbmdUeXBlOgorICAgICAgICBlbmNvZGVyLmVuY29kZVN0cmluZygic3Ry aW5nIiwgc3RyaW5nVmFsdWUpOworICAgICAgICByZXR1cm47CisgICAgY2FzZSBJREJLZXk6OkRh dGVUeXBlOgorICAgIGNhc2UgSURCS2V5OjpOdW1iZXJUeXBlOgorICAgICAgICBlbmNvZGVyLmVu Y29kZURvdWJsZSgibnVtYmVyIiwgbnVtYmVyVmFsdWUpOworICAgICAgICByZXR1cm47CisgICAg Y2FzZSBJREJLZXk6Ok1pblR5cGU6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKK2Jv b2wgSURCS2V5RGF0YTo6ZGVjb2RlKEtleWVkRGVjb2RlciYsIElEQktleURhdGEmKQoreworICAg IC8vIEZJWE1FOiBJbXBsZW1lbnQgd2hlbiBJREIgR2V0IHN1cHBvcnQgaXMgaW1wbGVtZW50ZWQg KDxyZGFyOi8vcHJvYmxlbS8xNTc3OTY0ND4pCisgICAgcmV0dXJuIGZhbHNlOworfQorCiB9CiAK ICNlbmRpZiAvLyBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuaAppbmRleCA0NjM5ZTYyLi42YTRmNjRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5oCkBAIC0zMiw2 ICszMiw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgS2V5ZWREZWNvZGVyOwor Y2xhc3MgS2V5ZWRFbmNvZGVyOworCiBzdHJ1Y3QgSURCS2V5RGF0YSB7CiAgICAgSURCS2V5RGF0 YSgpCiAgICAgICAgIDogdHlwZShJREJLZXk6OkludmFsaWRUeXBlKQpAQCAtNDAsMTIgKzQzLDE1 IEBAIHN0cnVjdCBJREJLZXlEYXRhIHsKICAgICB7CiAgICAgfQogCi0gICAgSURCS2V5RGF0YShJ REJLZXkqKTsKKyAgICBJREJLZXlEYXRhKGNvbnN0IElEQktleSopOwogCiAgICAgUGFzc1JlZlB0 cjxJREJLZXk+IG1heWJlQ3JlYXRlSURCS2V5KCkgY29uc3Q7CiAKICAgICBJREJLZXlEYXRhIGlz b2xhdGVkQ29weSgpIGNvbnN0OwogCisgICAgdm9pZCBlbmNvZGUoS2V5ZWRFbmNvZGVyJikgY29u c3Q7CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKEtleWVkRGVjb2RlciYsIElEQktleURhdGEmKTsK KwogICAgIElEQktleTo6VHlwZSB0eXBlOwogICAgIFZlY3RvcjxJREJLZXlEYXRhPiBhcnJheVZh bHVlOwogICAgIFN0cmluZyBzdHJpbmdWYWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggMWNm NTQyYi4uZDdmZjdjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4K KysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTMwNzEsMTIgKzMwNzEsMTIg QEAgX19aTjdXZWJDb3JlMjZNb2NrTWVkaWFQbGF5ZXJNZWRpYVNvdXJjZTE5cmVnaXN0ZXJNZWRp YUVuZ2luZUVQRnZQRk4zV1RGMTBQYXNzT3cKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNF KQogX19aTks3V2ViQ29yZTEwSURCS2V5RGF0YTE3bWF5YmVDcmVhdGVJREJLZXlFdgorX19aTks3 V2ViQ29yZTEwSURCS2V5RGF0YTZlbmNvZGVFUk5TXzEyS2V5ZWRFbmNvZGVyRQogX19aTks3V2Vi Q29yZTEwSURCS2V5UGF0aDZlbmNvZGVFUk5TXzEyS2V5ZWRFbmNvZGVyRQogX19aTks3V2ViQ29y ZTExSURCS2V5UmFuZ2U5aXNPbmx5S2V5RXYKIF9fWk5LN1dlYkNvcmUxNUlEQktleVJhbmdlRGF0 YTIybWF5YmVDcmVhdGVJREJLZXlSYW5nZUV2Ci1fX1pOSzdXZWJDb3JlNklEQktleTZlbmNvZGVF Uk5TXzEyS2V5ZWRFbmNvZGVyRQogX19aTks3V2ViQ29yZTZJREJLZXk3aXNWYWxpZEV2Ci1fX1pO N1dlYkNvcmUxMElEQktleURhdGFDMUVQTlNfNklEQktleUUKK19fWk43V2ViQ29yZTEwSURCS2V5 RGF0YUMxRVBLTlNfNklEQktleUUKIF9fWk43V2ViQ29yZTEwSURCS2V5UGF0aEMxRVJLTjNXVEY2 U3RyaW5nRQogX19aTjdXZWJDb3JlMTBJREJLZXlQYXRoQzFFUktOM1dURjZWZWN0b3JJTlMxXzZT dHJpbmdFTG0wRU5TMV8xNUNyYXNoT25PdmVyZmxvd0VFRQogX19aTjdXZWJDb3JlMTBJREJLZXlQ YXRoNmRlY29kZUVSTlNfMTJLZXllZERlY29kZXJFUlMwXwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGUyYTg2Y2Yu LjM2NWNiYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAxNC0wMS0yOCAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgSURCOiBTZXJpYWxpemUgSURC S2V5RGF0YXMgdG8gZGlzaywgbm90IElEQktleXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzgyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNlcmlhbGl6ZSBJREJLZXlEYXRhcywgbm90IElEQktleXMu CisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpkZXNlcmlhbGl6ZUlEQktleVBhdGgpOgorICAgICAgICAo V2ViS2l0OjpzZXJpYWxpemVJREJLZXlEYXRhKToKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3Mv SW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uaDoKKworICAgICAgICAqIERhdGFiYXNlUHJvY2Vz cy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6 OmV4dHJhY3RFeGlzdGluZ01ldGFkYXRhKToKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0 YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OnB1dFJlY29yZCk6CisgICAgICAgIChXZWJLaXQ6OlVu aXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpnZXRLZXlSZWNvcmRGcm9tT2JqZWN0 U3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNR TGl0ZTo6Z2V0S2V5UmFuZ2VSZWNvcmRGcm9tT2JqZWN0U3RvcmUpOgorCisyMDE0LTAxLTI4ICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdW5uZWVk ZWQg4oCcV2ViQ29yZTo64oCdIHByZWZpeGluZyBpbiB0d28gLmNwcCBmaWxlcy4KIAogICAgICAg ICBSdWJiZXJzdGFtcGVkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uY3Bw IGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0 aW9uLmNwcAppbmRleCAxYWY3MjA4Li5kY2Y4NWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvSURCU2VyaWFsaXphdGlvbi5j cHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRlICJBcmd1bWVudEVuY29kZXIuaCIKICNpbmNs dWRlICJLZXllZERlY29kZXIuaCIKICNpbmNsdWRlICJLZXllZEVuY29kZXIuaCIKLSNpbmNsdWRl IDxXZWJDb3JlL0lEQktleS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSURCS2V5RGF0YS5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvSURCS2V5UGF0aC5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK QEAgLTQ0LDE3ICs0NCwxMyBAQCBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzZXJpYWxpemVJREJLZXlQ YXRoKGNvbnN0IElEQktleVBhdGgmIGtleVBhdGgpCiAgICAgcmV0dXJuIGVuY29kZXIuZmluaXNo RW5jb2RpbmcoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OklEQktleVBhdGg+IGRl c2VyaWFsaXplSURCS2V5UGF0aChjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSkKK2Jv b2wgZGVzZXJpYWxpemVJREJLZXlQYXRoKGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBzaXpl LCBJREJLZXlQYXRoJiByZXN1bHQpCiB7CiAgICAgS2V5ZWREZWNvZGVyIGRlY29kZXIoZGF0YSwg c2l6ZSk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPElEQktleVBhdGg+IHJlc3VsdCA9IHN0ZDo6bWFr ZV91bmlxdWU8SURCS2V5UGF0aD4oKTsKLSAgICBpZiAoIUlEQktleVBhdGg6OmRlY29kZShkZWNv ZGVyLCAqcmVzdWx0KSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICByZXR1cm4gcmVz dWx0OworICAgIHJldHVybiBJREJLZXlQYXRoOjpkZWNvZGUoZGVjb2RlciwgcmVzdWx0KTsKIH0K IAotUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gc2VyaWFsaXplSURCS2V5KGNvbnN0IElE QktleSYga2V5KQorUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gc2VyaWFsaXplSURCS2V5 RGF0YShjb25zdCBJREJLZXlEYXRhJiBrZXkpCiB7CiAgICAgS2V5ZWRFbmNvZGVyIGVuY29kZXI7 CiAgICAga2V5LmVuY29kZShlbmNvZGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvSURCU2VyaWFsaXphdGlvbi5oIGIvU291cmNlL1dlYktp dDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmgKaW5kZXggNTVi YTE3ZS4uY2IxYzQ2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJh c2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmgKQEAgLTMyLDE3ICszMiwxOCBA QAogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewotY2xhc3Mg SURCS2V5OwogY2xhc3MgSURCS2V5UGF0aDsKKworc3RydWN0IElEQktleURhdGE7CiB9CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCiBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiBzZXJpYWxp emVJREJLZXlQYXRoKGNvbnN0IFdlYkNvcmU6OklEQktleVBhdGgmKTsKLXN0ZDo6dW5pcXVlX3B0 cjxXZWJDb3JlOjpJREJLZXlQYXRoPiBkZXNlcmlhbGl6ZUlEQktleVBhdGgoY29uc3QgdWludDhf dCogYnVmZmVyLCBzaXplX3QgYnVmZmVyU2l6ZSk7Citib29sIGRlc2VyaWFsaXplSURCS2V5UGF0 aChjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBXZWJDb3JlOjpJREJL ZXlQYXRoJik7CiAKLVJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+IHNlcmlhbGl6ZUlEQktl eShjb25zdCBXZWJDb3JlOjpJREJLZXkmKTsKLVBhc3NSZWZQdHI8V2ViQ29yZTo6SURCS2V5PiBk ZXNlcmlhbGl6ZUlEQktleShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXpl KTsKK1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+IHNlcmlhbGl6ZUlEQktleURhdGEoY29u c3QgV2ViQ29yZTo6SURCS2V5RGF0YSYpOworYm9vbCBkZXNlcmlhbGl6ZUlEQktleShjb25zdCB1 aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBXZWJDb3JlOjpJREJLZXlEYXRhJik7 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdT dG9yZVNRTGl0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERC L3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKaW5kZXggMzYw N2EwMy4uYTA5ZDJmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1Vu aXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcApAQCAtMTk4LDE0ICsxOTgsMTIg QEAgc3RkOjp1bmlxdWVfcHRyPElEQkRhdGFiYXNlTWV0YWRhdGE+IFVuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlU1FMaXRlOjpleHRyYWMKICAgICAgICAgICAgIGludCBrZXlQYXRoU2l6ZTsK ICAgICAgICAgICAgIGNvbnN0IHVpbnQ4X3QqIGtleVBhdGhCdWZmZXIgPSBzdGF0aWNfY2FzdDxj b25zdCB1aW50OF90Kj4oc3FsLmdldENvbHVtbkJsb2IoMiwga2V5UGF0aFNpemUpKTsKIAotICAg ICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPElEQktleVBhdGg+IGtleVBhdGggPSBkZXNlcmlhbGl6 ZUlEQktleVBhdGgoa2V5UGF0aEJ1ZmZlciwga2V5UGF0aFNpemUpOwogCi0gICAgICAgICAgICBp ZiAoIWtleVBhdGgpIHsKKyAgICAgICAgICAgIGlmICghZGVzZXJpYWxpemVJREJLZXlQYXRoKGtl eVBhdGhCdWZmZXIsIGtleVBhdGhTaXplLCBtZXRhZGF0YS5rZXlQYXRoKSkgewogICAgICAgICAg ICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGV4dHJhY3Qga2V5IHBhdGggbWV0YWRhdGEgZnJv bSBkYXRhYmFzZSIpOwogICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBtZXRhZGF0YS5rZXlQYXRoID0gKmtleVBhdGg7CiAgICAgICAg ICAgICBtZXRhZGF0YS5hdXRvSW5jcmVtZW50ID0gc3FsLmdldENvbHVtbkludCgzKTsKICAgICAg ICAgICAgIG1ldGFkYXRhLm1heEluZGV4SWQgPSBzcWwuZ2V0Q29sdW1uSW50NjQoNCk7CiAKQEAg LTU4Myw3ICs1ODEsNyBAQCBib29sIFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRl OjpwdXRSZWNvcmQoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhYwogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogCi0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4ga2V5QnVmZmVyID0gc2Vy aWFsaXplSURCS2V5KGtleSk7CisgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4ga2V5QnVmZmVyID0g c2VyaWFsaXplSURCS2V5RGF0YShJREJLZXlEYXRhKCZrZXkpKTsKICAgICBpZiAoIWtleUJ1ZmZl cikgewogICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBzZXJpYWxpemUgSURCS2V5IHRvIGJl IHN0b3JlZCBpbiB0aGUgZGF0YWJhc2UiKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNjIx LDcgKzYxOSw3IEBAIGJvb2wgVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6Omdl dEtleVJlY29yZEZyb21PYmplY3RTdG9yZShjb25zdCBJREJJCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBrZXlCdWZmZXIgPSBzZXJpYWxp emVJREJLZXkoa2V5KTsKKyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBrZXlCdWZmZXIgPSBzZXJp YWxpemVJREJLZXlEYXRhKElEQktleURhdGEoJmtleSkpOwogICAgIGlmICgha2V5QnVmZmVyKSB7 CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIHNlcmlhbGl6ZSBJREJLZXkgdG8gYmUgc3Rv cmVkIGluIHRoZSBkYXRhYmFzZSIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC02NjcsMTMg KzY2NSwxMyBAQCBib29sIFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpnZXRL ZXlSYW5nZVJlY29yZEZyb21PYmplY3RTdG9yZShjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCi0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbG93ZXJCdWZmZXIgPSBzZXJpYWxp emVJREJLZXkoKmtleVJhbmdlLmxvd2VyKCkpOworICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGxv d2VyQnVmZmVyID0gc2VyaWFsaXplSURCS2V5RGF0YShJREJLZXlEYXRhKGtleVJhbmdlLmxvd2Vy KCkuZ2V0KCkpKTsKICAgICBpZiAoIWxvd2VyQnVmZmVyKSB7CiAgICAgICAgIExPR19FUlJPUigi VW5hYmxlIHRvIHNlcmlhbGl6ZSBJREJLZXkgdG8gYmUgc3RvcmVkIGluIHRoZSBkYXRhYmFzZSIp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZl cj4gdXBwZXJCdWZmZXIgPSBzZXJpYWxpemVJREJLZXkoKmtleVJhbmdlLnVwcGVyKCkpOworICAg IFJlZlB0cjxTaGFyZWRCdWZmZXI+IHVwcGVyQnVmZmVyID0gc2VyaWFsaXplSURCS2V5RGF0YShJ REJLZXlEYXRhKGtleVJhbmdlLnVwcGVyKCkuZ2V0KCkpKTsKICAgICBpZiAoIXVwcGVyQnVmZmVy KSB7CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIHNlcmlhbGl6ZSBJREJLZXkgdG8gYmUg c3RvcmVkIGluIHRoZSBkYXRhYmFzZSIpOwogICAgICAgICByZXR1cm4gZmFsc2U7Cg==