238486 2022-03-28 21:37:37 -0700 Regression: WebsiteDataStore fails to read experimental feature values from NSUserDefaults 2022-03-30 22:10:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen cdumez ggaren sihui_liu webkit-bug-importer oldest_to_newest 1855905 0 sihui_liu 2022-03-28 21:37:37 -0700 ... 1855906 1 455991 sihui_liu 2022-03-28 21:42:49 -0700 Created attachment 455991 Patch 1856206 2 sihui_liu 2022-03-29 14:57:08 -0700 Ping reviewers 1856474 3 455991 achristensen 2022-03-30 10:59:53 -0700 Comment on attachment 455991 Patch This is responding to the change in Safari, but we should be moving towards using SPI to set these values in WKWebsiteDataStoreConfiguration instead of having WebKit read from defaults. 1856592 4 456180 sihui_liu 2022-03-30 15:39:50 -0700 Created attachment 456180 Patch for landing 1856684 5 ews-feeder 2022-03-30 22:09:45 -0700 Committed r292141 (249048@main): <https://commits.webkit.org/249048@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456180. 1856685 6 webkit-bug-importer 2022-03-30 22:10:17 -0700 <rdar://problem/91085159> 455991 2022-03-28 21:42:49 -0700 2022-03-30 15:39:47 -0700 Patch bug-238486-20220328214249.patch text/plain 7349 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNiZDg5NThhMDlkZjY3ZTJj MWEzNGI3Njk3NmY3YjE3MTE3NGY4OTQuLjJjZGJlOTg5YmMzNTVmMDA3NWUyMGJmY2Q1ZTM0MTVh MzgxNzEzMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDMtMjggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbjogZmFpbHMgdG8g cmVhZCBleHBlcmltZW50YWwgZmVhdHVyZSB2YWx1ZXMgZnJvbSBOU1VzZXJEZWZhdWx0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4NDg2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJvbSByZGFyOi8v NDYzNTI1NDIsIFNhZmFyaSBubyBsb25nZXIgdXNlcyAiRXhwZXJpbWVudGFsIiBhcyBwcmVmaXgg Zm9yIGV4cGVyaW1lbnRhbCBmZWF0dXJlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRl RGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Omlu dGVybmFsRmVhdHVyZUVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpleHBlcmltZW50YWxGZWF0 dXJlRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnRoaXJkUGFy dHlDb29raWVCbG9ja2luZ01vZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0 YVN0b3JlOjpwbGF0Zm9ybVNldE5ldHdvcmtQYXJhbWV0ZXJzKToKKwogMjAyMi0wMy0yOCAgU2lo dWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIGN1c3RvbSBz dG9yYWdlIHBhdGhzIGZvciBJbmRleGVkREIgYW5kIExvY2FsU3RvcmFnZSBieSBkZWZhdWx0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJz aXRlRGF0YVN0b3JlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KaW5kZXggMzA5YTc1NDRiNjQzOWJiNGFm NzgxNWUyNjcwMTkxOGY1ZmY4MjM4Yi4uM2UyYmZiNWY5NmZkOGQ3OTMyNmU1NzZlOTJmYmU0ZjJh YWJlMzUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQpAQCAtNzksMzkg Kzc5LDQwIEBAIHN0YXRpYyBzdGQ6OmF0b21pYzxib29sPiBoYXNJbml0aWFsaXplZEFwcEJvdW5k RG9tYWlucyA9IGZhbHNlOwogc3RhdGljIHN0ZDo6YXRvbWljPGJvb2w+IGtleUV4aXN0cyA9IGZh bHNlOwogI2VuZGlmCiAKLSNpZiBFTkFCTEUoSU5URUxMSUdFTlRfVFJBQ0tJTkdfUFJFVkVOVElP TikKLVdlYkNvcmU6OlRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgV2Vic2l0ZURhdGFTdG9y ZTo6dGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSgpIGNvbnN0CitzdGF0aWMgYm9vbCBpbnRl cm5hbEZlYXR1cmVFbmFibGVkKGNvbnN0IFN0cmluZyYga2V5LCBib29sIGRlZmF1bHRWYWx1ZSA9 IGZhbHNlKQogewotICAgIGlmICghbV90aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKSB7Ci0g ICAgICAgIE5TVXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtOU1VzZXJEZWZhdWx0cyBzdGFuZGFy ZFVzZXJEZWZhdWx0c107Ci0gICAgICAgIGlmIChbZGVmYXVsdHMgYm9vbEZvcktleTpbTlNTdHJp bmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgV2ViUHJlZmVyZW5jZXNLZXk6 OmlzVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nRGlzYWJsZWRLZXkoKS5jcmVhdGVDRlN0cmluZygp LmdldCgpXV0pCi0gICAgICAgICAgICBtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgPSBX ZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGxPblNpdGVzV2l0aG91dFVz ZXJJbnRlcmFjdGlvbjsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV90aGlyZFBhcnR5Q29v a2llQmxvY2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6 QWxsOwotICAgIH0KLSAgICByZXR1cm4gKm1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTsK KyAgICBhdXRvIGRlZmF1bHRzS2V5ID0gYWRvcHROUyhbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0 aEZvcm1hdDpAIkludGVybmFsRGVidWclQCIsIHN0YXRpY19jYXN0PE5TU3RyaW5nICo+KGtleSld KTsKKyAgICBpZiAoW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0 Rm9yS2V5OmRlZmF1bHRzS2V5LmdldCgpXSAhPSBuaWwpCisgICAgICAgIHJldHVybiBbW05TVXNl ckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OmRlZmF1bHRzS2V5Lmdl dCgpXTsKKworICAgIHJldHVybiBkZWZhdWx0VmFsdWU7CiB9Ci0jZW5kaWYKIAotc3RhdGljIGJv b2wgaW50ZXJuYWxGZWF0dXJlRW5hYmxlZChjb25zdCBTdHJpbmcmIGtleSwgYm9vbCBkZWZhdWx0 VmFsdWUgPSBmYWxzZSkKK3N0YXRpYyBib29sIGV4cGVyaW1lbnRhbEZlYXR1cmVFbmFibGVkKGNv bnN0IFN0cmluZyYga2V5LCBib29sIGRlZmF1bHRWYWx1ZSA9IGZhbHNlKQogewotICAgIGF1dG8g ZGVmYXVsdHNLZXkgPSBhZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9ybWF0OkAi SW50ZXJuYWxEZWJ1ZyVAIiwgc3RhdGljX2Nhc3Q8TlNTdHJpbmcgKj4oa2V5KV0pOworICAgIGF1 dG8gZGVmYXVsdHNLZXkgPSBhZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9ybWF0 OkAiV2ViS2l0RXhwZXJpbWVudGFsJUAiLCBzdGF0aWNfY2FzdDxOU1N0cmluZyAqPihrZXkpXSk7 CiAgICAgaWYgKFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZv cktleTpkZWZhdWx0c0tleS5nZXQoKV0gIT0gbmlsKQogICAgICAgICByZXR1cm4gW1tOU1VzZXJE ZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpkZWZhdWx0c0tleS5nZXQo KV07CiAKKyAgICAvLyBXZSB3cml0ZSB0byBkZWZhdXRscyB2aWEgV2ViUHJlZnJlbmNlczo6c2V0 W0tleV0gZnVuY3Rpb25zLCBzZWUgV2ViUHJlZmVyZW5jZXNHZXR0ZXJTZXR0ZXJzLmNwcC5lcmIu CisgICAgaWYgKFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZv cktleTprZXldICE9IG5pbCkKKyAgICAgICAgcmV0dXJuIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRh cmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6a2V5XTsKKwogICAgIHJldHVybiBkZWZhdWx0VmFs dWU7CiB9CiAKLXN0YXRpYyBib29sIGV4cGVyaW1lbnRhbEZlYXR1cmVFbmFibGVkKGNvbnN0IFN0 cmluZyYga2V5KQorI2lmIEVOQUJMRShJTlRFTExJR0VOVF9UUkFDS0lOR19QUkVWRU5USU9OKQor V2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSBXZWJzaXRlRGF0YVN0b3JlOjp0 aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKCkgY29uc3QKIHsKLSNpZiBQTEFURk9STShNQUMp Ci0gICAgY29uc3RleHByIE5TU3RyaW5nICpmb3JtYXQgPSBAIkV4cGVyaW1lbnRhbCVAIjsKLSNl bHNlCi0gICAgY29uc3RleHByIE5TU3RyaW5nICpmb3JtYXQgPSBAIldlYktpdEV4cGVyaW1lbnRh bCVAIjsKLSNlbmRpZgotICAgIGF1dG8gZGVmYXVsdHNLZXkgPSBhZG9wdE5TKFtbTlNTdHJpbmcg YWxsb2NdIGluaXRXaXRoRm9ybWF0OmZvcm1hdCwgc3RhdGljX2Nhc3Q8TlNTdHJpbmcgKj4oa2V5 KV0pOwotICAgIHJldHVybiBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBi b29sRm9yS2V5OmRlZmF1bHRzS2V5LmdldCgpXTsKKyAgICBpZiAoIW1fdGhpcmRQYXJ0eUNvb2tp ZUJsb2NraW5nTW9kZSkgeworICAgICAgICBpZiAoZXhwZXJpbWVudGFsRmVhdHVyZUVuYWJsZWQo V2ViUHJlZmVyZW5jZXNLZXk6OmlzVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nRGlzYWJsZWRLZXko KSkpCisgICAgICAgICAgICBtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgPSBXZWJDb3Jl OjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGxPblNpdGVzV2l0aG91dFVzZXJJbnRl cmFjdGlvbjsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV90aGlyZFBhcnR5Q29va2llQmxv Y2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsOwor ICAgIH0KKyAgICByZXR1cm4gKm1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTsKIH0KKyNl bmRpZgogCiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnBsYXRmb3JtU2V0TmV0d29ya1BhcmFtZXRl cnMoV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CkBAIC0xMjYsMTAg KzEyNywxMCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnBsYXRmb3JtU2V0TmV0d29ya1BhcmFt ZXRlcnMoV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMmCiAjaWYgRU5BQkxFKElOVEVMTElHRU5U X1RSQUNLSU5HX1BSRVZFTlRJT04pCiAgICAgZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rl YnVnTW9kZSA9IFtkZWZhdWx0cyBib29sRm9yS2V5OkAiSVRQRGVidWdNb2RlIl07CiAKLSAgICBp ZiAoW2RlZmF1bHRzIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJFeHBl cmltZW50YWwlQCIsIFdlYlByZWZlcmVuY2VzS2V5Ojppc1NhbWVTaXRlU3RyaWN0RW5mb3JjZW1l bnRFbmFibGVkS2V5KCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKV1dKQorICAgIGlmIChleHBlcmlt ZW50YWxGZWF0dXJlRW5hYmxlZChXZWJQcmVmZXJlbmNlc0tleTo6aXNTYW1lU2l0ZVN0cmljdEVu Zm9yY2VtZW50RW5hYmxlZEtleSgpKSkKICAgICAgICAgc2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVu dEVuYWJsZWQgPSBXZWJDb3JlOjpTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50RW5hYmxlZDo6WWVz OwogCi0gICAgaWYgKFtkZWZhdWx0cyBib29sRm9yS2V5OltOU1N0cmluZyBzdHJpbmdXaXRoRm9y bWF0OkAiRXhwZXJpbWVudGFsJUAiLCBXZWJQcmVmZXJlbmNlc0tleTo6aXNGaXJzdFBhcnR5V2Vi c2l0ZURhdGFSZW1vdmFsRGlzYWJsZWRLZXkoKS5jcmVhdGVDRlN0cmluZygpLmdldCgpXV0pCisg ICAgaWYgKGV4cGVyaW1lbnRhbEZlYXR1cmVFbmFibGVkKFdlYlByZWZlcmVuY2VzS2V5Ojppc0Zp cnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxEaXNhYmxlZEtleSgpKSkKICAgICAgICAgZmlyc3RQ YXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGUgPSBXZWJDb3JlOjpGaXJzdFBhcnR5V2Vic2l0ZURh dGFSZW1vdmFsTW9kZTo6Tm9uZTsKICAgICBlbHNlIHsKICAgICAgICAgaWYgKFtkZWZhdWx0cyBi b29sRm9yS2V5OltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiSW50ZXJuYWxEZWJ1ZyVAIiwg V2ViUHJlZmVyZW5jZXNLZXk6OmlzRmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbFJlcHJvVGVz dGluZ0VuYWJsZWRLZXkoKS5jcmVhdGVDRlN0cmluZygpLmdldCgpXV0pCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWZjN2UyZDRkY2Q1MjBhMTcz NGQ5NThmZjY0YTM0NThkMDE2NGNkNi4uNDlhOGVlZWI1MjA2M2IzYWY5MWZkNDQ2ZWZkN2JmMTFi MDAyYjdkOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAzLTI4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBw bGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb246IGZhaWxzIHRvIHJlYWQgZXhwZXJpbWVudGFs IGZlYXR1cmUgdmFsdWVzIGZyb20gTlNVc2VyRGVmYXVsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ4NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAgIChURVNUKToKKwog MjAyMi0wMy0yOCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb QVQtU1BJXSBhY2Nlc3NpYmlsaXR5L25hdGl2ZS10ZXh0LWNvbnRyb2wtYXR0cmlidXRlZC1zdHJp bmcuaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1t CmluZGV4IDY2ZjkyNWFjNjRkNjgwZjk5ZWYzZTM2MmVjYmU1MzIzNmVjZGFjODQuLjIxY2I3NDQ3 OGY5NjkzZDQ0YWY5YTdhOTZmM2Y0NWUyNmMxNTdkYTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1t CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCkBAIC00MDEsMTIgKzQwMSw3IEBAIFRFU1QoV2ViS2l0LCBBbHRl cm5hdGl2ZVNlcnZpY2VzRGVmYXVsdERpcmVjdG9yeUNyZWF0aW9uKQogICAgIC8vIFdlIGFsd2F5 cyBjcmVhdGUgdGhlIHBhdGgsIGV2ZW4gaWYgSFRUUC8zIGlzIHR1cm5lZCBvZmYuCiAgICAgRVhQ RUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRo OmRlZmF1bHREaXJlY3RvcnkucGF0aF0pOwogCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIE5TU3Ry aW5nICprZXkgPSBAIkV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7Ci0jZWxzZQogICAgIE5TU3Ry aW5nICprZXkgPSBAIldlYktpdEV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7Ci0jZW5kaWYKLSAg ICAKICAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRPYmplY3Q6 W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10gZm9yS2V5OmtleV07CiAKICAgICBhdXRvIGNv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOwo= 456180 2022-03-30 15:39:50 -0700 2022-03-30 22:09:47 -0700 Patch for landing bug-238486-20220330153949.patch text/plain 7277 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjMTQzMmY2ZWRjYTc4NmFh MDJjZDBjMDRiYjUyNGRhM2NmNDAzYTUuLjU1OTc5Mjk1ZmY0NTFlMjU0NWI2OTgwNTEwZDc0MDIw YWMzYzAzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDMtMzAgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbjogV2Vic2l0ZURh dGFTdG9yZSBmYWlscyB0byByZWFkIGV4cGVyaW1lbnRhbCBmZWF0dXJlIHZhbHVlcyBmcm9tIE5T VXNlckRlZmF1bHRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzg0ODYKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisg ICAgICAgIEZyb20gcmRhcjovLzQ2MzUyNTQyLCBTYWZhcmkgbm8gbG9uZ2VyIHVzZXMgIkV4cGVy aW1lbnRhbCIgYXMgcHJlZml4IGZvciBleHBlcmltZW50YWwgZmVhdHVyZXMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgor ICAgICAgICAoV2ViS2l0OjppbnRlcm5hbEZlYXR1cmVFbmFibGVkKToKKyAgICAgICAgKFdlYktp dDo6ZXhwZXJpbWVudGFsRmVhdHVyZUVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRl RGF0YVN0b3JlOjp0aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlIGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cGxhdGZvcm1TZXROZXR3b3JrUGFyYW1ldGVycyk6 CisKIDIwMjItMDMtMzAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFNvdXJjZXM6IHRoZSBtYXBwZWQgZmlsZSBVUkwgb2YgYSBSZXNw b25zZSBMb2NhbCBPdmVycmlkZSBzaG91bGQgYmUgY2xpY2thYmxlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29j b2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRl RGF0YVN0b3JlQ29jb2EubW0KaW5kZXggMzA5YTc1NDRiNjQzOWJiNGFmNzgxNWUyNjcwMTkxOGY1 ZmY4MjM4Yi4uODMxYWI0N2QwMDU0YjA0YWZkN2RjY2NkNWM5ZThlNGY3ODA0NzhkOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQpAQCAtNzksMzkgKzc5LDM3IEBAIHN0YXRp YyBzdGQ6OmF0b21pYzxib29sPiBoYXNJbml0aWFsaXplZEFwcEJvdW5kRG9tYWlucyA9IGZhbHNl Owogc3RhdGljIHN0ZDo6YXRvbWljPGJvb2w+IGtleUV4aXN0cyA9IGZhbHNlOwogI2VuZGlmCiAK LSNpZiBFTkFCTEUoSU5URUxMSUdFTlRfVFJBQ0tJTkdfUFJFVkVOVElPTikKLVdlYkNvcmU6OlRo aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgV2Vic2l0ZURhdGFTdG9yZTo6dGhpcmRQYXJ0eUNv b2tpZUJsb2NraW5nTW9kZSgpIGNvbnN0CisvLyBGSVhNRTogd2Ugc2hvdWxkIG5vdCByZWFkIHRo ZSB2YWx1ZXMgZnJvbSBOU1VzZXJEZWZhdWx0czsgd2Ugc2hvdWxkIGxldCBjbGllbnRzIHdobyBz ZXQgdGhlIHZhbHVlcyB0byBwYXNzIHRoZW0gdmlhIGNvbmZpZ3VyYXRpb24uCitzdGF0aWMgYm9v bCBpbnRlcm5hbEZlYXR1cmVFbmFibGVkKGNvbnN0IFN0cmluZyYga2V5LCBib29sIGRlZmF1bHRW YWx1ZSA9IGZhbHNlKQogewotICAgIGlmICghbV90aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2Rl KSB7Ci0gICAgICAgIE5TVXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtOU1VzZXJEZWZhdWx0cyBz dGFuZGFyZFVzZXJEZWZhdWx0c107Ci0gICAgICAgIGlmIChbZGVmYXVsdHMgYm9vbEZvcktleTpb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwgV2ViUHJlZmVyZW5j ZXNLZXk6OmlzVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nRGlzYWJsZWRLZXkoKS5jcmVhdGVDRlN0 cmluZygpLmdldCgpXV0pCi0gICAgICAgICAgICBtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01v ZGUgPSBXZWJDb3JlOjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGxPblNpdGVzV2l0 aG91dFVzZXJJbnRlcmFjdGlvbjsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV90aGlyZFBh cnR5Q29va2llQmxvY2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZTo6QWxsOwotICAgIH0KLSAgICByZXR1cm4gKm1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZTsKKyAgICBhdXRvIGRlZmF1bHRzS2V5ID0gYWRvcHROUyhbW05TU3RyaW5nIGFsbG9jXSBp bml0V2l0aEZvcm1hdDpAIkludGVybmFsRGVidWclQCIsIHN0YXRpY19jYXN0PE5TU3RyaW5nICo+ KGtleSldKTsKKyAgICBpZiAoW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10g b2JqZWN0Rm9yS2V5OmRlZmF1bHRzS2V5LmdldCgpXSAhPSBuaWwpCisgICAgICAgIHJldHVybiBb W05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OmRlZmF1bHRz S2V5LmdldCgpXTsKKworICAgIHJldHVybiBkZWZhdWx0VmFsdWU7CiB9Ci0jZW5kaWYKIAotc3Rh dGljIGJvb2wgaW50ZXJuYWxGZWF0dXJlRW5hYmxlZChjb25zdCBTdHJpbmcmIGtleSwgYm9vbCBk ZWZhdWx0VmFsdWUgPSBmYWxzZSkKK3N0YXRpYyBib29sIGV4cGVyaW1lbnRhbEZlYXR1cmVFbmFi bGVkKGNvbnN0IFN0cmluZyYga2V5LCBib29sIGRlZmF1bHRWYWx1ZSA9IGZhbHNlKQogewotICAg IGF1dG8gZGVmYXVsdHNLZXkgPSBhZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9y bWF0OkAiSW50ZXJuYWxEZWJ1ZyVAIiwgc3RhdGljX2Nhc3Q8TlNTdHJpbmcgKj4oa2V5KV0pOwor ICAgIGF1dG8gZGVmYXVsdHNLZXkgPSBhZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRo Rm9ybWF0OkAiV2ViS2l0RXhwZXJpbWVudGFsJUAiLCBzdGF0aWNfY2FzdDxOU1N0cmluZyAqPihr ZXkpXSk7CiAgICAgaWYgKFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9i amVjdEZvcktleTpkZWZhdWx0c0tleS5nZXQoKV0gIT0gbmlsKQogICAgICAgICByZXR1cm4gW1tO U1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpkZWZhdWx0c0tl eS5nZXQoKV07CiAKICAgICByZXR1cm4gZGVmYXVsdFZhbHVlOwogfQogCi1zdGF0aWMgYm9vbCBl eHBlcmltZW50YWxGZWF0dXJlRW5hYmxlZChjb25zdCBTdHJpbmcmIGtleSkKKyNpZiBFTkFCTEUo SU5URUxMSUdFTlRfVFJBQ0tJTkdfUFJFVkVOVElPTikKK1dlYkNvcmU6OlRoaXJkUGFydHlDb29r aWVCbG9ja2luZ01vZGUgV2Vic2l0ZURhdGFTdG9yZTo6dGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZSgpIGNvbnN0CiB7Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIGNvbnN0ZXhwciBOU1N0cmlu ZyAqZm9ybWF0ID0gQCJFeHBlcmltZW50YWwlQCI7Ci0jZWxzZQotICAgIGNvbnN0ZXhwciBOU1N0 cmluZyAqZm9ybWF0ID0gQCJXZWJLaXRFeHBlcmltZW50YWwlQCI7Ci0jZW5kaWYKLSAgICBhdXRv IGRlZmF1bHRzS2V5ID0gYWRvcHROUyhbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0aEZvcm1hdDpm b3JtYXQsIHN0YXRpY19jYXN0PE5TU3RyaW5nICo+KGtleSldKTsKLSAgICByZXR1cm4gW1tOU1Vz ZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpkZWZhdWx0c0tleS5n ZXQoKV07CisgICAgaWYgKCFtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUpIHsKKyAgICAg ICAgaWYgKGV4cGVyaW1lbnRhbEZlYXR1cmVFbmFibGVkKFdlYlByZWZlcmVuY2VzS2V5Ojppc1Ro aXJkUGFydHlDb29raWVCbG9ja2luZ0Rpc2FibGVkS2V5KCkpKQorICAgICAgICAgICAgbV90aGly ZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlID0gV2ViQ29yZTo6VGhpcmRQYXJ0eUNvb2tpZUJsb2Nr aW5nTW9kZTo6QWxsT25TaXRlc1dpdGhvdXRVc2VySW50ZXJhY3Rpb247CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIG1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSA9IFdlYkNvcmU6OlRo aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbDsKKyAgICB9CisgICAgcmV0dXJuICptX3Ro aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU7CiB9CisjZW5kaWYKIAogdm9pZCBXZWJzaXRlRGF0 YVN0b3JlOjpwbGF0Zm9ybVNldE5ldHdvcmtQYXJhbWV0ZXJzKFdlYnNpdGVEYXRhU3RvcmVQYXJh bWV0ZXJzJiBwYXJhbWV0ZXJzKQogewpAQCAtMTI2LDEwICsxMjQsMTAgQEAgdm9pZCBXZWJzaXRl RGF0YVN0b3JlOjpwbGF0Zm9ybVNldE5ldHdvcmtQYXJhbWV0ZXJzKFdlYnNpdGVEYXRhU3RvcmVQ YXJhbWV0ZXJzJgogI2lmIEVOQUJMRShJTlRFTExJR0VOVF9UUkFDS0lOR19QUkVWRU5USU9OKQog ICAgIGVuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgPSBbZGVmYXVsdHMgYm9v bEZvcktleTpAIklUUERlYnVnTW9kZSJdOwogCi0gICAgaWYgKFtkZWZhdWx0cyBib29sRm9yS2V5 OltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiRXhwZXJpbWVudGFsJUAiLCBXZWJQcmVmZXJl bmNlc0tleTo6aXNTYW1lU2l0ZVN0cmljdEVuZm9yY2VtZW50RW5hYmxlZEtleSgpLmNyZWF0ZUNG U3RyaW5nKCkuZ2V0KCldXSkKKyAgICBpZiAoZXhwZXJpbWVudGFsRmVhdHVyZUVuYWJsZWQoV2Vi UHJlZmVyZW5jZXNLZXk6OmlzU2FtZVNpdGVTdHJpY3RFbmZvcmNlbWVudEVuYWJsZWRLZXkoKSkp CiAgICAgICAgIHNhbWVTaXRlU3RyaWN0RW5mb3JjZW1lbnRFbmFibGVkID0gV2ViQ29yZTo6U2Ft ZVNpdGVTdHJpY3RFbmZvcmNlbWVudEVuYWJsZWQ6OlllczsKIAotICAgIGlmIChbZGVmYXVsdHMg Ym9vbEZvcktleTpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkV4cGVyaW1lbnRhbCVAIiwg V2ViUHJlZmVyZW5jZXNLZXk6OmlzRmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbERpc2FibGVk S2V5KCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKV1dKQorICAgIGlmIChleHBlcmltZW50YWxGZWF0 dXJlRW5hYmxlZChXZWJQcmVmZXJlbmNlc0tleTo6aXNGaXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1v dmFsRGlzYWJsZWRLZXkoKSkpCiAgICAgICAgIGZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxN b2RlID0gV2ViQ29yZTo6Rmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGU6Ok5vbmU7CiAg ICAgZWxzZSB7CiAgICAgICAgIGlmIChbZGVmYXVsdHMgYm9vbEZvcktleTpbTlNTdHJpbmcgc3Ry aW5nV2l0aEZvcm1hdDpAIkludGVybmFsRGVidWclQCIsIFdlYlByZWZlcmVuY2VzS2V5Ojppc0Zp cnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxSZXByb1Rlc3RpbmdFbmFibGVkS2V5KCkuY3JlYXRl Q0ZTdHJpbmcoKS5nZXQoKV1dKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IGNlZDEzM2I1MTIwNzFkYjk4OGZjMjcyMGNmN2I5YjUxOTEzNzBkZGIu LjBiMDExNjhlZjVjMjI4MzU1ZGFiOTVkNDc1MGVmYjRkYmNiMDE0YTEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAy Mi0wMy0zMCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdy ZXNzaW9uOiBXZWJzaXRlRGF0YVN0b3JlIGZhaWxzIHRvIHJlYWQgZXhwZXJpbWVudGFsIGZlYXR1 cmUgdmFsdWVzIGZyb20gTlNVc2VyRGVmYXVsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ4NgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXgg Q2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIy LTAzLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb TWVyZ2UtUXVldWVdIEFkZCBSZXZpZXdlcnMgdG8gY29tbWl0IG1lc3NhZ2UgKEZvbGxvdy11cCBm aXgpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dl YnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDY2ZjkyNWFj NjRkNjgwZjk5ZWYzZTM2MmVjYmU1MzIzNmVjZGFjODQuLjIxY2I3NDQ3OGY5NjkzZDQ0YWY5YTdh OTZmM2Y0NWUyNmMxNTdkYTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhz Lm1tCkBAIC00MDEsMTIgKzQwMSw3IEBAIFRFU1QoV2ViS2l0LCBBbHRlcm5hdGl2ZVNlcnZpY2Vz RGVmYXVsdERpcmVjdG9yeUNyZWF0aW9uKQogICAgIC8vIFdlIGFsd2F5cyBjcmVhdGUgdGhlIHBh dGgsIGV2ZW4gaWYgSFRUUC8zIGlzIHR1cm5lZCBvZmYuCiAgICAgRVhQRUNUX1RSVUUoW1tOU0Zp bGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmRlZmF1bHREaXJlY3Rv cnkucGF0aF0pOwogCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIE5TU3RyaW5nICprZXkgPSBAIkV4 cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7Ci0jZWxzZQogICAgIE5TU3RyaW5nICprZXkgPSBAIldl YktpdEV4cGVyaW1lbnRhbEhUVFAzRW5hYmxlZCI7Ci0jZW5kaWYKLSAgICAKICAgICBbW05TVXNl ckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJl cldpdGhCb29sOllFU10gZm9yS2V5OmtleV07CiAKICAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOwo=