130996 2014-03-31 17:52:08 -0700 Add a new -[WKPreferences initWithUserDefaultsPrefixKey:] initializer 2014-03-31 18:02:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 996067 0 andersca 2014-03-31 17:52:08 -0700 Add a new -[WKPreferences initWithUserDefaultsPrefixKey:] initializer 996068 1 228222 andersca 2014-03-31 17:53:41 -0700 Created attachment 228222 Patch 996071 2 andersca 2014-03-31 18:02:31 -0700 Committed r166553: <http://trac.webkit.org/changeset/166553> 228222 2014-03-31 17:53:41 -0700 2014-03-31 18:00:18 -0700 Patch bug-130996-20140331175321.patch text/plain 14512 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWQ4NzkxMzJkMmMyYTcx NTYyNjYwYTEwNDVmMzQ5YzFmYTRkMTVkZC4uOGViOTViZTFkY2ZkMzBhY2YwNzY1ZWEzZDlkNGI1 ZDJlMjg4NTljOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE0LTAzLTMxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgbmV3IC1b V0tQcmVmZXJlbmNlcyBpbml0V2l0aFVzZXJEZWZhdWx0c1ByZWZpeEtleTpdIGluaXRpYWxpemVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA5OTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSAi a2V5IHByZWZpeCIgdG8gdGhlIFdlYktpdDo6V2ViUHJlZmVyZW5jZXMgY3JlYXRlIGZ1bmN0aW9u LCBzbyB3ZSBjYW4gdXNlIGEgZGlmZmVyZW50CisgICAgICAgIGtleSBwcmVmaXggKCJXZWJLaXQi KSBmb3IgdGhlIG1vZGVybiBBUEkgYW5kIG5vdCBwb2xsdXRlIHRoZSB1c2VyIGRlZmF1bHRzIG5h bWVzcGFjZSB3aXRoCisgICAgICAgIHRoZSBvbGQga2V5IHByZWZpeCAoIldlYktpdDIuIikuCisg ICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAg ICAgICAgKFdLUHJlZmVyZW5jZXNDcmVhdGUpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0NyZWF0 ZVdpdGhJZGVudGlmaWVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVy ZW5jZXMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW06 CisgICAgICAgICgtW1dLUHJlZmVyZW5jZXMgaW5pdF0pOgorICAgICAgICAoLVtXS1ByZWZlcmVu Y2VzIGluaXRXaXRoVXNlckRlZmF1bHRzUHJlZml4S2V5Ol0pOgorICAgICAgICAoLVtXS1ByZWZl cmVuY2VzIHVzZXJEZWZhdWx0c1ByZWZpeEtleV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OldlYlBhZ2VHcm91 cCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJlZmVyZW5jZXM6OldlYlByZWZlcmVuY2VzKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OmNy ZWF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQcmVmZXJlbmNlc01hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6bWFrZUtleSk6CisgICAgICAgIChXZWJLaXQ6OnNldFN0cmluZ1ZhbHVl SWZJblVzZXJEZWZhdWx0cyk6CisgICAgICAgIChXZWJLaXQ6OnNldEJvb2xWYWx1ZUlmSW5Vc2Vy RGVmYXVsdHMpOgorICAgICAgICAoV2ViS2l0OjpzZXRVSW50MzJWYWx1ZUlmSW5Vc2VyRGVmYXVs dHMpOgorICAgICAgICAoV2ViS2l0OjpzZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVTdHJpbmdW YWx1ZUZvcktleSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVw ZGF0ZUJvb2xWYWx1ZUZvcktleSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpw bGF0Zm9ybVVwZGF0ZVVJbnQzMlZhbHVlRm9yS2V5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJl ZmVyZW5jZXM6OnBsYXRmb3JtVXBkYXRlRG91YmxlVmFsdWVGb3JLZXkpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVGbG9hdFZhbHVlRm9yS2V5KToKKwog MjAxNC0wMy0zMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggdGhlIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXMuY3BwCmluZGV4IDQ1MzdiMTlkMzYwZTdiZjFjMTIxY2RkYmVjZjZlNWJj OWViZGE3Y2IuLjdkOTQ3MWI1OWRhOWZjOWZhMGY3NWQzN2I4ODM1ZmE3OTJlMDZiNTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKQEAg LTQzLDEzICs0MywxMyBAQCBXS1R5cGVJRCBXS1ByZWZlcmVuY2VzR2V0VHlwZUlEKCkKIAogV0tQ cmVmZXJlbmNlc1JlZiBXS1ByZWZlcmVuY2VzQ3JlYXRlKCkKIHsKLSAgICBSZWZQdHI8V2ViUHJl ZmVyZW5jZXM+IHByZWZlcmVuY2VzID0gV2ViUHJlZmVyZW5jZXM6OmNyZWF0ZShTdHJpbmcoKSk7 CisgICAgUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBwcmVmZXJlbmNlcyA9IFdlYlByZWZlcmVuY2Vz OjpjcmVhdGUoU3RyaW5nKCksICJXZWJLaXQyLiIpOwogICAgIHJldHVybiB0b0FQSShwcmVmZXJl bmNlcy5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIAogV0tQcmVmZXJlbmNlc1JlZiBXS1ByZWZl cmVuY2VzQ3JlYXRlV2l0aElkZW50aWZpZXIoV0tTdHJpbmdSZWYgaWRlbnRpZmllclJlZikKIHsK LSAgICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IHByZWZlcmVuY2VzID0gV2ViUHJlZmVyZW5jZXM6 OmNyZWF0ZSh0b1dURlN0cmluZyhpZGVudGlmaWVyUmVmKSk7CisgICAgUmVmUHRyPFdlYlByZWZl cmVuY2VzPiBwcmVmZXJlbmNlcyA9IFdlYlByZWZlcmVuY2VzOjpjcmVhdGUodG9XVEZTdHJpbmco aWRlbnRpZmllclJlZiksICJXZWJLaXQyLiIpOwogICAgIHJldHVybiB0b0FQSShwcmVmZXJlbmNl cy5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMuaAppbmRleCA1YWFmYzdkNWMyMmQyZjQxMDky MTdlYmRiZDM5NmYxM2Q2OTM0NGY4Li4yMWYxMjZiMjQ4OTkyZDI2MzM4NjI3MGFlNmYwNmU1YmRi NmIwYzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL UHJlZmVyZW5jZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL UHJlZmVyZW5jZXMuaApAQCAtMzUsNiArMzUsMTAgQEAKIFdLX0FQSV9DTEFTUwogQGludGVyZmFj ZSBXS1ByZWZlcmVuY2VzIDogTlNPYmplY3QKIAorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoVXNl ckRlZmF1bHRzUHJlZml4S2V5OihOU1N0cmluZyAqKXVzZXJEZWZhdWx0c1ByZWZpeEtleSBXS19E RVNJR05BVEVEX0lOSVRJQUxJWkVSOworCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkp IE5TU3RyaW5nICp1c2VyRGVmYXVsdHNQcmVmaXhLZXk7CisKIEBwcm9wZXJ0eSAobm9uYXRvbWlj KSBDR0Zsb2F0IG1pbmltdW1Gb250U2l6ZTsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tCmluZGV4IDVlNGNiN2NlMDlk NWQwOTY5N2I5Nzg5YmVkN2ZmYTQxZjU0ODFkMTIuLjc3NzNmMjc0OWYzMmNiNDk1MjIzMGIxZjE0 YTFlNjAyZDJkYmI4MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tQcmVmZXJlbmNlcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLUHJlZmVyZW5jZXMubW0KQEAgLTI5LDE5ICsyOSwzNCBAQAogI2lmIFdLX0FQSV9F TkFCTEVECiAKICNpbXBvcnQgIldlYlByZWZlcmVuY2VzLmgiCisjaW1wb3J0IDx3dGYvUmV0YWlu UHRyLmg+CiAKIEBpbXBsZW1lbnRhdGlvbiBXS1ByZWZlcmVuY2VzCit7CisgICAgUmV0YWluUHRy PE5TU3RyaW5nPiBfdXNlckRlZmF1bHRzUHJlZml4S2V5OworfQogCiAtIChpbnN0YW5jZXR5cGUp aW5pdAogeworICAgIHJldHVybiBbc2VsZiBpbml0V2l0aFVzZXJEZWZhdWx0c1ByZWZpeEtleTpu aWxdOworfQorCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhVc2VyRGVmYXVsdHNQcmVmaXhLZXk6 KE5TU3RyaW5nICopdXNlckRlZmF1bHRzUHJlZml4S2V5Cit7CiAgICAgaWYgKCEoc2VsZiA9IFtz dXBlciBpbml0XSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBfcHJlZmVyZW5jZXMgPSBX ZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpjcmVhdGUoU3RyaW5nKCkpOworICAgIF91c2VyRGVmYXVs dHNQcmVmaXhLZXkgPSBhZG9wdE5TKFt1c2VyRGVmYXVsdHNQcmVmaXhLZXkgY29weV0pOwogCisg ICAgX3ByZWZlcmVuY2VzID0gV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6Y3JlYXRlKF91c2VyRGVm YXVsdHNQcmVmaXhLZXkuZ2V0KCksICJXZWJLaXQiKTsKICAgICByZXR1cm4gc2VsZjsKIH0KIAor LSAoTlNTdHJpbmcgKil1c2VyRGVmYXVsdHNQcmVmaXhLZXkKK3sKKyAgICByZXR1cm4gX3VzZXJE ZWZhdWx0c1ByZWZpeEtleS5nZXQoKTsKK30KKwogLSAoQ0dGbG9hdCltaW5pbXVtRm9udFNpemUK IHsKICAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT5taW5pbXVtRm9udFNpemUoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAKaW5kZXggMTdhMTIzODBlNjUxZGM2MzAz ZWMxN2MyOGNjOWZlZTIwMDU5MjdlYy4uYmFiODM0Njc2ZTZiYjk0YWMyODc0OTJhZjZmNDM1ODE0 MTkzYTA5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91 cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAKQEAg LTg0LDcgKzg0LDcgQEAgc3RhdGljIFdlYlBhZ2VHcm91cERhdGEgcGFnZUdyb3VwRGF0YShjb25z dCBTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW4KIAogV2ViUGFnZUdyb3VwOjpX ZWJQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBib29sIHZpc2libGVUb0luamVj dGVkQnVuZGxlLCBib29sIHZpc2libGVUb0hpc3RvcnlDbGllbnQpCiAgICAgOiBtX2RhdGEocGFn ZUdyb3VwRGF0YShpZGVudGlmaWVyLCB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZSwgdmlzaWJsZVRv SGlzdG9yeUNsaWVudCkpCi0gICAgLCBtX3ByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzOjpjcmVh dGUobV9kYXRhLmlkZW50aWZlcikpCisgICAgLCBtX3ByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2Vz OjpjcmVhdGUobV9kYXRhLmlkZW50aWZlciwgIi5XZWJLaXQyIikpCiB7CiAgICAgd2ViUGFnZUdy b3VwTWFwKCkuc2V0KG1fZGF0YS5wYWdlR3JvdXBJRCwgdGhpcyk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmNwcAppbmRleCAwZjdkYTc5ZmQyZjYwNTU2OTUy OTEzYTM5YmQ4Yjg1ZGNiOGE3ZDYyLi43YzM5YzVjOWI1ODlmZWJjYzJhZjBiNTNhNjk4M2Q0OWI5 YmJhZmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5j ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5jcHAK QEAgLTM2LDE0ICszNiwxNiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIC8vIEluc3RlYWQgb2YgdHJh Y2tpbmcgcHJpdmF0ZSBicm93c2luZyBzdGF0ZSBhcyBhIGJvb2xlYW4gcHJlZmVyZW5jZSwgd2Ug c2hvdWxkIGxldCB0aGUgY2xpZW50IHByb3ZpZGUgc3RvcmFnZSBzZXNzaW9ucyBleHBsaWNpdGx5 Lgogc3RhdGljIHVuc2lnbmVkIHByaXZhdGVCcm93c2luZ1BhZ2VDb3VudDsKIAotV2ViUHJlZmVy ZW5jZXM6OldlYlByZWZlcmVuY2VzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcikKK1dlYlByZWZl cmVuY2VzOjpXZWJQcmVmZXJlbmNlcyhjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0 cmluZyYga2V5UHJlZml4KQogICAgIDogbV9pZGVudGlmaWVyKGlkZW50aWZpZXIpCisgICAgLCBt X2tleVByZWZpeChrZXlQcmVmaXgpCiB7CiAgICAgcGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKTsK IH0KIAogV2ViUHJlZmVyZW5jZXM6OldlYlByZWZlcmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2Vz JiBvdGhlcikKLSAgICA6IG1fc3RvcmUob3RoZXIubV9zdG9yZSkKKyAgICA6IG1fa2V5UHJlZml4 KG90aGVyLm1fa2V5UHJlZml4KQorICAgICwgbV9zdG9yZShvdGhlci5tX3N0b3JlKQogewogICAg IHBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcmVmZXJlbmNlcy5oCmluZGV4IGRkNWUyZDE1YzY2YWJlYjFlNGJiZGIxZWJiZDg5Y2I0ZDI5 OTQ4ZTYuLmM2YTJhODc3YWQwYTc3MzlhNDlmYzQzYTgwNTYyOWE4YjU3Y2U5YzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCkBAIC00Myw5ICs0Myw5IEBAIGNs YXNzIFdlYlBhZ2VQcm94eTsKIAogY2xhc3MgV2ViUHJlZmVyZW5jZXMgOiBwdWJsaWMgQVBJOjpP YmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpQcmVmZXJlbmNlcz4gewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBp ZGVudGlmaWVyKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBjcmVhdGUo Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCkKICAgICB7 Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViUHJlZmVyZW5jZXMoaWRlbnRpZmllcikp OworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlByZWZlcmVuY2VzKGlkZW50aWZpZXIs IGtleVByZWZpeCkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgfldlYlByZWZlcmVuY2VzKCk7CkBA IC03MSw3ICs3MSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBhbnlQYWdlc0FyZVVzaW5n UHJpdmF0ZUJyb3dzaW5nKCk7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgV2ViUHJlZmVyZW5j ZXMoY29uc3QgU3RyaW5nJik7CisgICAgZXhwbGljaXQgV2ViUHJlZmVyZW5jZXMoY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJik7CiAgICAgV2ViUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVy ZW5jZXMmKTsKIAogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKTsKQEAgLTkxLDcg KzkxLDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgdXBkYXRlUHJpdmF0ZUJyb3dzaW5nVmFsdWUo Ym9vbCB2YWx1ZSk7CiAKLSAgICBTdHJpbmcgbV9pZGVudGlmaWVyOworICAgIGNvbnN0IFN0cmlu ZyBtX2lkZW50aWZpZXI7CisgICAgY29uc3QgU3RyaW5nIG1fa2V5UHJlZml4OwogICAgIFdlYlBy ZWZlcmVuY2VzU3RvcmUgbV9zdG9yZTsKIAogICAgIEhhc2hTZXQ8V2ViUGFnZVByb3h5Kj4gbV9w YWdlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJlZmVy ZW5jZXNNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlByZWZlcmVuY2Vz TWFjLm1tCmluZGV4IGI0ZGNlZjVmMzBiNmI3ZDRmYjYxOTc4N2Q5OTU2ZGNjMTAxMGZjNmYuLmMz YzNiNDU1YWFlYzllMmU1YThkNWM4N2EzZDgzZGVkZTY4NmIwZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJlZmVyZW5jZXNNYWMubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQcmVmZXJlbmNlc01hYy5tbQpAQCAtMzEsMTcgKzMx LDIzIEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1zdGF0aWMgaW5saW5lIE5TU3RyaW5nKiBt YWtlS2V5KGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBiYXNlS2V5KQor c3RhdGljIGlubGluZSBOU1N0cmluZyogbWFrZUtleShOU1N0cmluZyAqaWRlbnRpZmllciwgTlNT dHJpbmcgKmtleVByZWZpeCwgTlNTdHJpbmcgKmtleSkKIHsKLSAgICBpZiAoIWlkZW50aWZpZXIp Ci0gICAgICAgIHJldHVybiBuc1N0cmluZ0Zyb21XZWJDb3JlU3RyaW5nKG1ha2VTdHJpbmcoIldl YktpdDIiLCBiYXNlS2V5KSk7CisgICAgQVNTRVJUKGtleVByZWZpeCk7CisgICAgQVNTRVJUKGtl eSk7CiAKLSAgICByZXR1cm4gbnNTdHJpbmdGcm9tV2ViQ29yZVN0cmluZyhtYWtlU3RyaW5nKGlk ZW50aWZpZXIsICIuV2ViS2l0MiIsIGJhc2VLZXkpKTsKKyAgICBpZiAoIWlkZW50aWZpZXIpIHsK KyAgICAgICAgLy8gQWxsb3cgcHJlZmVyZW5jZXMgdGhhdCBkb24ndCBoYXZlIGEgcHJlZml4IHRv IGJlIG92ZXJyaWRkZW4gYnkgdXNpbmcgdGhlIGtleVByZWZpeC4KKyAgICAgICAgLy8gRm9yIHRo ZSBsZWdhY3kgQyBTUEksIHRoaXMgaXMg4oCcV2ViS2l0Mi7igJ0gYW5kIGZvciB0aGUgbW9kZXJu IEFQSSBpdCdzIOKAnFdlYktpdOKAnS4KKyAgICAgICAgcmV0dXJuIFtrZXlQcmVmaXggc3RyaW5n QnlBcHBlbmRpbmdTdHJpbmc6a2V5XTsKKyAgICB9CisKKyAgICByZXR1cm4gW05TU3RyaW5nIHN0 cmluZ1dpdGhGb3JtYXQ6QCIlQCVAJUAiLCBpZGVudGlmaWVyLCBrZXlQcmVmaXgsIGtleV07CiB9 CiAKLXN0YXRpYyB2b2lkIHNldFN0cmluZ1ZhbHVlSWZJblVzZXJEZWZhdWx0cyhjb25zdCBTdHJp bmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBz dG9yZSkKK3N0YXRpYyB2b2lkIHNldFN0cmluZ1ZhbHVlSWZJblVzZXJEZWZhdWx0cyhjb25zdCBT dHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5UHJlZml4LCBjb25zdCBTdHJpbmcm IGtleSwgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiB7Ci0gICAgaWQgb2JqZWN0ID0gW1tO U1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9yS2V5Om1ha2VLZXko aWRlbnRpZmllciwga2V5KV07CisgICAgaWQgb2JqZWN0ID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9yS2V5Om1ha2VLZXkoaWRlbnRpZmllciwga2V5UHJl Zml4LCBrZXkpXTsKICAgICBpZiAoIW9iamVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIGlmICgh W29iamVjdCBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQpAQCAtNTAsOSArNTYsOSBA QCBzdGF0aWMgdm9pZCBzZXRTdHJpbmdWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3RyaW5n JiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbgogICAgIHN0b3JlLnNldFN0cmluZ1ZhbHVlRm9yS2V5 KGtleSwgKE5TU3RyaW5nICopb2JqZWN0KTsKIH0KIAotc3RhdGljIHZvaWQgc2V0Qm9vbFZhbHVl SWZJblVzZXJEZWZhdWx0cyhjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYg a2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKK3N0YXRpYyB2b2lkIHNldEJvb2xWYWx1 ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcm IGtleVByZWZpeCwgY29uc3QgU3RyaW5nJiBrZXksIFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3Jl KQogewotICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdIG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtleSldOworICAgIGlkIG9iamVj dCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTpt YWtlS2V5KGlkZW50aWZpZXIsIGtleVByZWZpeCwga2V5KV07CiAgICAgaWYgKCFvYmplY3QpCiAg ICAgICAgIHJldHVybjsKICAgICBpZiAoIVtvYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihib29sVmFsdWUpXSkKQEAgLTYxLDkgKzY3LDkgQEAgc3RhdGljIHZvaWQgc2V0Qm9vbFZh bHVlSWZJblVzZXJEZWZhdWx0cyhjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYKICAgICBzdG9yZS5zZXRCb29sVmFsdWVGb3JLZXkoa2V5LCBbb2JqZWN0IGJvb2xWYWx1ZV0p OwogfQogCi1zdGF0aWMgdm9pZCBzZXRVSW50MzJWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3Qg U3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleSwgV2ViUHJlZmVyZW5jZXNTdG9y ZSYgc3RvcmUpCitzdGF0aWMgdm9pZCBzZXRVSW50MzJWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29u c3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3Ry aW5nJiBrZXksIFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogewotICAgIGlkIG9iamVjdCA9 IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtl S2V5KGlkZW50aWZpZXIsIGtleSldOworICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMg c3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtl eVByZWZpeCwga2V5KV07CiAgICAgaWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybjsKICAgICBp ZiAoIVtvYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihpbnRWYWx1ZSldKQpAQCAt NzIsOSArNzgsOSBAQCBzdGF0aWMgdm9pZCBzZXRVSW50MzJWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMo Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbgogICAgIHN0b3JlLnNldFVJbnQz MlZhbHVlRm9yS2V5KGtleSwgW29iamVjdCBpbnRWYWx1ZV0pOwogfQogCi1zdGF0aWMgdm9pZCBz ZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBj b25zdCBTdHJpbmcmIGtleSwgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCitzdGF0aWMgdm9p ZCBzZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3RyaW5nJiBrZXksIFdlYlByZWZlcmVu Y2VzU3RvcmUmIHN0b3JlKQogewotICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3Rh bmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtleSld OworICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNd IG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtleVByZWZpeCwga2V5KV07CiAgICAg aWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoIVtvYmplY3QgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihkb3VibGVWYWx1ZSldKQpAQCAtODYsNyArOTIsNyBAQCBzdGF0 aWMgdm9pZCBzZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVu dGlmaWVyLCBjb25zdCBTdHJpbgogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFs aXplU3RvcmUoKQogewogI2RlZmluZSBJTklUSUFMSVpFX1BSRUZFUkVOQ0VfRlJPTV9OU1VTRVJE RUZBVUxUUyhLZXlVcHBlciwgS2V5TG93ZXIsIFR5cGVOYW1lLCBUeXBlLCBEZWZhdWx0VmFsdWUp IFwKLSAgICBzZXQjI1R5cGVOYW1lIyNWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMobV9pZGVudGlmaWVy LCBXZWJQcmVmZXJlbmNlc0tleTo6S2V5TG93ZXIjI0tleSgpLCBtX3N0b3JlKTsKKyAgICBzZXQj I1R5cGVOYW1lIyNWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMobV9pZGVudGlmaWVyLCBtX2tleVByZWZp eCwgV2ViUHJlZmVyZW5jZXNLZXk6OktleUxvd2VyIyNLZXkoKSwgbV9zdG9yZSk7CiAKICAgICBG T1JfRUFDSF9XRUJLSVRfUFJFRkVSRU5DRShJTklUSUFMSVpFX1BSRUZFUkVOQ0VfRlJPTV9OU1VT RVJERUZBVUxUUykKIApAQCAtOTgsNyArMTA0LDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxh dGZvcm1VcGRhdGVTdHJpbmdWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3QK ICAgICBpZiAoIW1faWRlbnRpZmllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgW1tOU1VzZXJE ZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0T2JqZWN0Om5zU3RyaW5nRnJvbVdlYkNv cmVTdHJpbmcodmFsdWUpIGZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwga2V5KV07CisgICAg W1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0T2JqZWN0Om5zU3RyaW5n RnJvbVdlYkNvcmVTdHJpbmcodmFsdWUpIGZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwgbV9r ZXlQcmVmaXgsIGtleSldOwogfQogCiB2b2lkIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVwZGF0 ZUJvb2xWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgYm9vbCB2YWx1ZSkKQEAgLTEwNiw3 ICsxMTIsNyBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVwZGF0ZUJvb2xWYWx1ZUZv cktleShjb25zdCBTdHJpbmcmIGtleSwgYm9vbCB2YWx1ZQogICAgIGlmICghbV9pZGVudGlmaWVy KQogICAgICAgICByZXR1cm47CiAKLSAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRl ZmF1bHRzXSBzZXRCb29sOnZhbHVlIGZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwga2V5KV07 CisgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Qm9vbDp2YWx1 ZSBmb3JLZXk6bWFrZUtleShtX2lkZW50aWZpZXIsIG1fa2V5UHJlZml4LCBrZXkpXTsKIH0KIAog dm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVVSW50MzJWYWx1ZUZvcktleShjb25z dCBTdHJpbmcmIGtleSwgdWludDMyX3QgdmFsdWUpCkBAIC0xMTQsNyArMTIwLDcgQEAgdm9pZCBX ZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVVSW50MzJWYWx1ZUZvcktleShjb25zdCBTdHJp bmcmIGtleSwgdWludDMyX3QKICAgICBpZiAoIW1faWRlbnRpZmllcikKICAgICAgICAgcmV0dXJu OwogCi0gICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0SW50ZWdl cjp2YWx1ZSBmb3JLZXk6bWFrZUtleShtX2lkZW50aWZpZXIsIGtleSldOworICAgIFtbTlNVc2Vy RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEludGVnZXI6dmFsdWUgZm9yS2V5Om1h a2VLZXkobV9pZGVudGlmaWVyLCBtX2tleVByZWZpeCwga2V5KV07CiB9CiAKIHZvaWQgV2ViUHJl ZmVyZW5jZXM6OnBsYXRmb3JtVXBkYXRlRG91YmxlVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiBr ZXksIGRvdWJsZSB2YWx1ZSkKQEAgLTEyMiw3ICsxMjgsNyBAQCB2b2lkIFdlYlByZWZlcmVuY2Vz OjpwbGF0Zm9ybVVwZGF0ZURvdWJsZVZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYga2V5LCBkb3Vi bGUgdgogICAgIGlmICghbV9pZGVudGlmaWVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBbW05T VXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXREb3VibGU6dmFsdWUgZm9yS2V5 Om1ha2VLZXkobV9pZGVudGlmaWVyLCBrZXkpXTsKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5k YXJkVXNlckRlZmF1bHRzXSBzZXREb3VibGU6dmFsdWUgZm9yS2V5Om1ha2VLZXkobV9pZGVudGlm aWVyLCBtX2tleVByZWZpeCwga2V5KV07CiB9CiAKIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnBsYXRm b3JtVXBkYXRlRmxvYXRWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgZmxvYXQgdmFsdWUp CkBAIC0xMzAsNyArMTM2LDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVG bG9hdFZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYga2V5LCBmbG9hdCB2YWwKICAgICBpZiAoIW1f aWRlbnRpZmllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c10gc2V0RmxvYXQ6dmFsdWUgZm9yS2V5Om1ha2VLZXkobV9pZGVudGlm aWVyLCBrZXkpXTsKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBz ZXRGbG9hdDp2YWx1ZSBmb3JLZXk6bWFrZUtleShtX2lkZW50aWZpZXIsIG1fa2V5UHJlZml4LCBr ZXkpXTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==