135511 2014-08-01 10:12:29 -0700 REGRESSION (r169357): Disabling "allow plug-ins" doesn't stick on quit/relaunch 2014-08-01 11:23:09 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P1 Normal --- 1 mitz mitz ap bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1026255 0 mitz 2014-08-01 10:12:29 -0700 <rdar://problem/17862013> When opening Safari, the Allow Plug-ins option in preferences is enabled, even if it has been previously disabled. This was caused by <http://trac.webkit.org/r169357>. 1026257 1 235892 mitz 2014-08-01 10:19:37 -0700 Created attachment 235892 Respect user defaults when overrides are registered 1026277 2 235892 ap 2014-08-01 11:09:39 -0700 Comment on attachment 235892 Respect user defaults when overrides are registered View in context: https://bugs.webkit.org/attachment.cgi?id=235892&action=review Nice. > Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm:62 > + if (!m_identifier) > + return false; I don't understand this addition, didn't we use to assert in makeKey? Why does this need to be a runtime check? 1026282 3 235892 mitz 2014-08-01 11:21:37 -0700 Comment on attachment 235892 Respect user defaults when overrides are registered View in context: https://bugs.webkit.org/attachment.cgi?id=235892&action=review >> Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm:62 >> + return false; > > I don't understand this addition, didn't we use to assert in makeKey? Why does this need to be a runtime check? registerDefaultBoolValueForKey calls platformGetBoolUserValueForKey even if the identifier is empty. I guess I could have added the checks there, but it seems logical to handle the no-identifier (and therefore no user defaults) case here. 1026284 4 mitz 2014-08-01 11:23:09 -0700 Fixed in <http://trac.webkit.org/r171928>. 235892 2014-08-01 10:19:37 -0700 2014-08-01 11:21:37 -0700 Respect user defaults when overrides are registered bug-135511-20140801101924.patch text/plain 11952 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTkxOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBACisyMDE0LTA4LTAxICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3ODYy MDEzPiBSRUdSRVNTSU9OIChyMTY5MzU3KTogRGlzYWJsaW5nICJhbGxvdyBwbHVnLWlucyIgZG9l c24ndCBzdGljayBvbiBxdWl0L3JlbGF1bmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTaW5jZSB0aGUgdmFsdWVzIG1hcCBpbiB0aGUgcHJlZmVyZW5j ZXMgc3RvcmUgZG9lc27igJl0IGluY2x1ZGUgdmFsdWVzIHRoYXQgYXJlIGVxdWFsIHRvIHRoZQor ICAgICAgICBkZWZhdWx0cywgd2UgbmVlZCB0byB1cGRhdGUgaXQgd2hlbiBhIG5ldyBkZWZhdWx0 IGlzIHJlZ2lzdGVyZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6Y3JlYXRlV2l0aExlZ2FjeURlZmF1 bHRzKTogQ2hhbmdlZCB0byB1c2UgbmV3IG1lbWJlciBmdW5jdGlvbnMKKyAgICAgICAgZm9yIHJl Z2lzdGVyaW5nIGRlZmF1bHRzLgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cmVn aXN0ZXJEZWZhdWx0Qm9vbFZhbHVlRm9yS2V5KTogQWRkZWQuIFNldHMgYW4gb3ZlcnJpZGUgZGVm YXVsdAorICAgICAgICBpbiB0aGUgc3RvcmUsIGFuZCBzZXRzIHRoZSB1c2VyIGRlZmF1bHQsIGlm IHRoZXJlIGlzIG9uZSwgb24gdG9wIG9mIGl0LgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJl bmNlczo6cmVnaXN0ZXJEZWZhdWx0VUludDMyVmFsdWVGb3JLZXkpOiBEaXR0by4KKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaDogRGVjbGFyZWQgbmV3IG1lbWJlciBmdW5jdGlv bnMgZm9yIGdldHRpbmcgdGhlIHVzZXIgZGVmYXVsdAorICAgICAgICB2YWx1ZSBmb3IgYSBrZXku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYlByZWZlcmVuY2VzRWZsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0U3RyaW5nVXNlclZhbHVlRm9y S2V5KTogQWRkZWQgYW4gaW1wbGVtZW50YXRpb24gdGhhdAorICAgICAgICByZXR1cm5zIGZhbHNl LCBiZWNhdXNlIHRoZSBFRkwgcG9ydCBkb2VzbuKAmXQgc3VwcG9ydCBwZXJzaXN0ZW50IHVzZXIg ZGVmYXVsdHMuCisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldEJv b2xVc2VyVmFsdWVGb3JLZXkpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5j ZXM6OnBsYXRmb3JtR2V0VUludDMyVXNlclZhbHVlRm9yS2V5KTogRGl0dG8uCisgICAgICAgIChX ZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldERvdWJsZVVzZXJWYWx1ZUZvcktleSk6 IERpdHRvLgorCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJQcmVmZXJlbmNlc0d0ay5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldFN0cmluZ1VzZXJW YWx1ZUZvcktleSk6IERpdHRvIGZvciB0aGUgR1RLIHBvcnQuCisgICAgICAgIChXZWJLaXQ6Oldl YlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldEJvb2xVc2VyVmFsdWVGb3JLZXkpOiBEaXR0by4KKyAg ICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0VUludDMyVXNlclZhbHVl Rm9yS2V5KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9y bUdldERvdWJsZVVzZXJWYWx1ZUZvcktleSk6IERpdHRvLgorCisgICAgICAgICogVUlQcm9jZXNz L21hYy9XZWJQcmVmZXJlbmNlc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5j ZXM6OnBsYXRmb3JtR2V0U3RyaW5nVXNlclZhbHVlRm9yS2V5KTogQWRkZWQuIFJlcGxhY2VzCisg ICAgICAgIHNldFN0cmluZ1ZhbHVlSWZJblVzZXJEZWZhdWx0cywgb24gd2hpY2ggaXQgaXMgYmFz ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldEJvb2xVc2Vy VmFsdWVGb3JLZXkpOiBTaW1pbGFybHkgZm9yIGJvb2xlYW5zLgorICAgICAgICAoV2ViS2l0OjpX ZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1HZXRVSW50MzJVc2VyVmFsdWVGb3JLZXkpOiBTaW1pbGFy bHkgZm9yIGludGVnZXJzLgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZv cm1HZXREb3VibGVVc2VyVmFsdWVGb3JLZXkpOiBTaW1pbGFybHkgZm9yIGRvdWJsZXMuCisgICAg ICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUluaXRpYWxpemVTdG9yZSk6IENo YW5nZWQgdG8gdXNlIHRoZSBhYm92ZSBmdW5jdGlvbnMuCisKIDIwMTQtMDgtMDEgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDTWFrZV0gR1RL IGFuZCBFRkwgYXJlIHVzaW5nIFBST0pFQ1RfVkVSU0lPTl9QQVRDSCB0byBkZWZpbmUgdGhlIG1p Y3JvIHZlcnNpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNl cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVu Y2VzLmNwcAkocmV2aXNpb24gMTcxODU5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsMTAgKzQ1LDEwIEBAIFBhc3NS ZWZQdHI8V2ViUHJlZmVyZW5jZXM+IFdlYlByZWZlcmVuY2UKIFBhc3NSZWZQdHI8V2ViUHJlZmVy ZW5jZXM+IFdlYlByZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMoY29uc3QgU3Ry aW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3RyaW5nJiBn bG9iYWxEZWJ1Z0tleVByZWZpeCkKIHsKICAgICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IHByZWZl cmVuY2VzID0gYWRvcHRSZWYobmV3IFdlYlByZWZlcmVuY2VzKGlkZW50aWZpZXIsIGtleVByZWZp eCwgZ2xvYmFsRGVidWdLZXlQcmVmaXgpKTsKLSAgICBwcmVmZXJlbmNlcy0+bV9zdG9yZS5zZXRP dmVycmlkZURlZmF1bHRzQm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpqYXZhRW5h YmxlZEtleSgpLCB0cnVlKTsKLSAgICBwcmVmZXJlbmNlcy0+bV9zdG9yZS5zZXRPdmVycmlkZURl ZmF1bHRzQm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpqYXZhRW5hYmxlZEZvckxv Y2FsRmlsZXNLZXkoKSwgdHJ1ZSk7Ci0gICAgcHJlZmVyZW5jZXMtPm1fc3RvcmUuc2V0T3ZlcnJp ZGVEZWZhdWx0c0Jvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6cGx1Z2luc0VuYWJs ZWRLZXkoKSwgdHJ1ZSk7Ci0gICAgcHJlZmVyZW5jZXMtPm1fc3RvcmUuc2V0T3ZlcnJpZGVEZWZh dWx0c1VJbnQzMlZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzdG9yYWdlQmxvY2tpbmdQ b2xpY3lLZXkoKSwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OkFsbG93QWxsU3RvcmFnZSk7Cisg ICAgcHJlZmVyZW5jZXMtPnJlZ2lzdGVyRGVmYXVsdEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJl bmNlc0tleTo6amF2YUVuYWJsZWRLZXkoKSwgdHJ1ZSk7CisgICAgcHJlZmVyZW5jZXMtPnJlZ2lz dGVyRGVmYXVsdEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6amF2YUVuYWJsZWRG b3JMb2NhbEZpbGVzS2V5KCksIHRydWUpOworICAgIHByZWZlcmVuY2VzLT5yZWdpc3RlckRlZmF1 bHRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnBsdWdpbnNFbmFibGVkS2V5KCks IHRydWUpOworICAgIHByZWZlcmVuY2VzLT5yZWdpc3RlckRlZmF1bHRVSW50MzJWYWx1ZUZvcktl eShXZWJQcmVmZXJlbmNlc0tleTo6c3RvcmFnZUJsb2NraW5nUG9saWN5S2V5KCksIFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luOjpBbGxvd0FsbFN0b3JhZ2UpOwogICAgIHJldHVybiBwcmVmZXJlbmNl cy5yZWxlYXNlKCk7CiB9CiAKQEAgLTE5Miw0ICsxOTIsMjAgQEAgYm9vbCBXZWJQcmVmZXJlbmNl czo6YW55UGFnZXNBcmVVc2luZ1ByaQogICAgIHJldHVybiBwcml2YXRlQnJvd3NpbmdQYWdlQ291 bnQ7CiB9CiAKK3ZvaWQgV2ViUHJlZmVyZW5jZXM6OnJlZ2lzdGVyRGVmYXVsdEJvb2xWYWx1ZUZv cktleShjb25zdCBTdHJpbmcmIGtleSwgYm9vbCB2YWx1ZSkKK3sKKyAgICBtX3N0b3JlLnNldE92 ZXJyaWRlRGVmYXVsdHNCb29sVmFsdWVGb3JLZXkoa2V5LCB2YWx1ZSk7CisgICAgYm9vbCB1c2Vy VmFsdWU7CisgICAgaWYgKHBsYXRmb3JtR2V0Qm9vbFVzZXJWYWx1ZUZvcktleShrZXksIHVzZXJW YWx1ZSkpCisgICAgICAgIG1fc3RvcmUuc2V0Qm9vbFZhbHVlRm9yS2V5KGtleSwgdXNlclZhbHVl KTsKK30KKwordm9pZCBXZWJQcmVmZXJlbmNlczo6cmVnaXN0ZXJEZWZhdWx0VUludDMyVmFsdWVG b3JLZXkoY29uc3QgU3RyaW5nJiBrZXksIHVpbnQzMl90IHZhbHVlKQoreworICAgIG1fc3RvcmUu c2V0T3ZlcnJpZGVEZWZhdWx0c1VJbnQzMlZhbHVlRm9yS2V5KGtleSwgdmFsdWUpOworICAgIHVp bnQzMl90IHVzZXJWYWx1ZTsKKyAgICBpZiAocGxhdGZvcm1HZXRVSW50MzJVc2VyVmFsdWVGb3JL ZXkoa2V5LCB1c2VyVmFsdWUpKQorICAgICAgICBtX3N0b3JlLnNldFVJbnQzMlZhbHVlRm9yS2V5 KGtleSwgdXNlclZhbHVlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gMTcxODU5KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTkxLDYgKzkxLDE0IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHVwZGF0ZVByaXZhdGVC cm93c2luZ1ZhbHVlKGJvb2wgdmFsdWUpOwogCisgICAgdm9pZCByZWdpc3RlckRlZmF1bHRCb29s VmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiwgYm9vbCk7CisgICAgdm9pZCByZWdpc3RlckRlZmF1 bHRVSW50MzJWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmLCB1aW50MzJfdCk7CisKKyAgICBib29s IHBsYXRmb3JtR2V0U3RyaW5nVXNlclZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYga2V5LCBTdHJp bmcmIHVzZXJWYWx1ZSk7CisgICAgYm9vbCBwbGF0Zm9ybUdldEJvb2xVc2VyVmFsdWVGb3JLZXko Y29uc3QgU3RyaW5nJiwgYm9vbCYpOworICAgIGJvb2wgcGxhdGZvcm1HZXRVSW50MzJVc2VyVmFs dWVGb3JLZXkoY29uc3QgU3RyaW5nJiwgdWludDMyX3QmKTsKKyAgICBib29sIHBsYXRmb3JtR2V0 RG91YmxlVXNlclZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYsIGRvdWJsZSYpOworCiAgICAgY29u c3QgU3RyaW5nIG1faWRlbnRpZmllcjsKICAgICBjb25zdCBTdHJpbmcgbV9rZXlQcmVmaXg7CiAg ICAgY29uc3QgU3RyaW5nIG1fZ2xvYmFsRGVidWdLZXlQcmVmaXg7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlByZWZlcmVuY2VzRWZsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlByZWZlcmVuY2VzRWZsLmNwcAkocmV2aXNp b24gMTcxODU5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQcmVmZXJlbmNl c0VmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDQgKzYwLDI4IEBAIHZvaWQgV2ViUHJlZmVy ZW5jZXM6OnBsYXRmb3JtVXBkYXRlRmxvYXQKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCiti b29sIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldFN0cmluZ1VzZXJWYWx1ZUZvcktleShjb25z dCBTdHJpbmcmLCBTdHJpbmcmKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgcmV0dXJu IGZhbHNlOworfQorCitib29sIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldEJvb2xVc2VyVmFs dWVGb3JLZXkoY29uc3QgU3RyaW5nJiwgYm9vbCYpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0 VUludDMyVXNlclZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYsIHVpbnQzMl90JikKK3sKKyAgICBu b3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBXZWJQcmVmZXJl bmNlczo6cGxhdGZvcm1HZXREb3VibGVVc2VyVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiwgZG91 YmxlJikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiBmYWxzZTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L1dlYlByZWZlcmVuY2VzR3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZ3RrL1dlYlByZWZlcmVuY2VzR3RrLmNwcAkocmV2aXNpb24gMTcxODU5KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcmVmZXJlbmNlc0d0ay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTYxLDQgKzYxLDI4IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtVXBk YXRlRmxvYXQKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCitib29sIFdlYlByZWZlcmVuY2Vz OjpwbGF0Zm9ybUdldFN0cmluZ1VzZXJWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmLCBTdHJpbmcm KQoreworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29s IFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUdldEJvb2xVc2VyVmFsdWVGb3JLZXkoY29uc3QgU3Ry aW5nJiwgYm9vbCYpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKK2Jvb2wgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0VUludDMyVXNlclZhbHVlRm9y S2V5KGNvbnN0IFN0cmluZyYsIHVpbnQzMl90JikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1HZXRE b3VibGVVc2VyVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiwgZG91YmxlJikKK3sKKyAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgIHJldHVybiBmYWxzZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlByZWZlcmVuY2VzTWFj Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJlZmVy ZW5jZXNNYWMubW0JKHJldmlzaW9uIDE3MTg1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV2ViUHJlZmVyZW5jZXNNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQxLDUxICs0MSw2 NiBAQCBzdGF0aWMgaW5saW5lIE5TU3RyaW5nKiBtYWtlS2V5KE5TU3RyaW5nCiAgICAgcmV0dXJu IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAlQCVAIiwgaWRlbnRpZmllciwga2V5UHJl Zml4LCBrZXldOwogfQogCi1zdGF0aWMgdm9pZCBzZXRTdHJpbmdWYWx1ZUlmSW5Vc2VyRGVmYXVs dHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29u c3QgU3RyaW5nJiBrZXksIFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQorYm9vbCBXZWJQcmVm ZXJlbmNlczo6cGxhdGZvcm1HZXRTdHJpbmdVc2VyVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiBr ZXksIFN0cmluZyYgdXNlclZhbHVlKQogewotICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVs dHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIs IGtleVByZWZpeCwga2V5KV07CisgICAgaWYgKCFtX2lkZW50aWZpZXIpCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwgbV9rZXlQcmVmaXgs IGtleSldOwogICAgIGlmICghb2JqZWN0KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVy biBmYWxzZTsKICAgICBpZiAoIVtvYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3Nd XSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBzdG9yZS5z ZXRTdHJpbmdWYWx1ZUZvcktleShrZXksIChOU1N0cmluZyAqKW9iamVjdCk7CisgICAgdXNlclZh bHVlID0gKE5TU3RyaW5nICopb2JqZWN0OworICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMg dm9pZCBzZXRCb29sVmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmll ciwgY29uc3QgU3RyaW5nJiBrZXlQcmVmaXgsIGNvbnN0IFN0cmluZyYga2V5LCBXZWJQcmVmZXJl bmNlc1N0b3JlJiBzdG9yZSkKK2Jvb2wgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0Qm9vbFVz ZXJWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgYm9vbCYgdXNlclZhbHVlKQogewotICAg IGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVj dEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtleVByZWZpeCwga2V5KV07CisgICAgaWYgKCFt X2lkZW50aWZpZXIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlkIG9iamVjdCA9IFtb TlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5 KG1faWRlbnRpZmllciwgbV9rZXlQcmVmaXgsIGtleSldOwogICAgIGlmICghb2JqZWN0KQotICAg ICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIVtvYmplY3QgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihib29sVmFsdWUpXSkKLSAgICAgICAgcmV0dXJuOwor ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBzdG9yZS5zZXRCb29sVmFsdWVGb3JLZXkoa2V5 LCBbb2JqZWN0IGJvb2xWYWx1ZV0pOworICAgIHVzZXJWYWx1ZSA9IFtvYmplY3QgYm9vbFZhbHVl XTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZvaWQgc2V0VUludDMyVmFsdWVJZklu VXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBrZXlQ cmVmaXgsIGNvbnN0IFN0cmluZyYga2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKK2Jv b2wgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtR2V0VUludDMyVXNlclZhbHVlRm9yS2V5KGNvbnN0 IFN0cmluZyYga2V5LCB1aW50MzJfdCYgdXNlclZhbHVlKQogewotICAgIGlkIG9iamVjdCA9IFtb TlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5 KGlkZW50aWZpZXIsIGtleVByZWZpeCwga2V5KV07CisgICAgaWYgKCFtX2lkZW50aWZpZXIpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMg c3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwg bV9rZXlQcmVmaXgsIGtleSldOwogICAgIGlmICghb2JqZWN0KQotICAgICAgICByZXR1cm47Cisg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIVtvYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3RvcihpbnRWYWx1ZSldKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgIHN0b3JlLnNldFVJbnQzMlZhbHVlRm9yS2V5KGtleSwgW29iamVjdCBpbnRW YWx1ZV0pOworICAgIHVzZXJWYWx1ZSA9IFtvYmplY3QgaW50VmFsdWVdOworICAgIHJldHVybiB0 cnVlOwogfQogCi1zdGF0aWMgdm9pZCBzZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29u c3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3Ry aW5nJiBrZXksIFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQorYm9vbCBXZWJQcmVmZXJlbmNl czo6cGxhdGZvcm1HZXREb3VibGVVc2VyVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiBrZXksIGRv dWJsZSYgdXNlclZhbHVlKQogewotICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3Rh bmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTptYWtlS2V5KGlkZW50aWZpZXIsIGtleVBy ZWZpeCwga2V5KV07CisgICAgaWYgKCFtX2lkZW50aWZpZXIpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIGlkIG9iamVjdCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdIG9iamVjdEZvcktleTptYWtlS2V5KG1faWRlbnRpZmllciwgbV9rZXlQcmVmaXgsIGtleSld OwogICAgIGlmICghb2JqZWN0KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICBpZiAoIVtvYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihkb3VibGVW YWx1ZSldKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHN0 b3JlLnNldERvdWJsZVZhbHVlRm9yS2V5KGtleSwgW29iamVjdCBkb3VibGVWYWx1ZV0pOworICAg IHVzZXJWYWx1ZSA9IFtvYmplY3QgZG91YmxlVmFsdWVdOworICAgIHJldHVybiB0cnVlOwogfQog Ci0KIHN0YXRpYyBpZCBkZWJ1Z1VzZXJEZWZhdWx0c1ZhbHVlKE5TU3RyaW5nICppZGVudGlmaWVy LCBOU1N0cmluZyAqa2V5UHJlZml4LCBOU1N0cmluZyAqZ2xvYmFsRGVidWdLZXlQcmVmaXgsIE5T U3RyaW5nICprZXkpCiB7CiAgICAgQVNTRVJUKGtleVByZWZpeCk7CkBAIC0xMjksNyArMTQ0LDkg QEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplUwogICAgICAgICByZXR1 cm47CiAKICNkZWZpbmUgSU5JVElBTElaRV9QUkVGRVJFTkNFX0ZST01fTlNVU0VSREVGQVVMVFMo S2V5VXBwZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVmYXVsdFZhbHVlKSBcCi0gICAg c2V0IyNUeXBlTmFtZSMjVmFsdWVJZkluVXNlckRlZmF1bHRzKG1faWRlbnRpZmllciwgbV9rZXlQ cmVmaXgsIFdlYlByZWZlcmVuY2VzS2V5OjpLZXlMb3dlciMjS2V5KCksIG1fc3RvcmUpOworICAg IFR5cGUgdXNlciMjS2V5VXBwZXIjI1ZhbHVlOyBcCisgICAgaWYgKHBsYXRmb3JtR2V0IyNUeXBl TmFtZSMjVXNlclZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpLZXlMb3dlciMjS2V5KCks IHVzZXIjI0tleVVwcGVyIyNWYWx1ZSkpIFwKKyAgICAgICAgbV9zdG9yZS5zZXQjI1R5cGVOYW1l IyNWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6S2V5TG93ZXIjI0tleSgpLCB1c2VyIyNL ZXlVcHBlciMjVmFsdWUpOwogCiAgICAgRk9SX0VBQ0hfV0VCS0lUX1BSRUZFUkVOQ0UoSU5JVElB TElaRV9QUkVGRVJFTkNFX0ZST01fTlNVU0VSREVGQVVMVFMpCiAK