134164 2014-06-21 14:30:06 -0700 Make it possible to override debug preferences on a per-identifier basis as well as globally 2014-06-21 15:02:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1017338 0 andersca 2014-06-21 14:30:06 -0700 Make it possible to override debug preferences on a per-identifier basis as well as globally 1017339 1 233546 andersca 2014-06-21 14:30:56 -0700 Created attachment 233546 Patch 1017342 2 233546 mitz 2014-06-21 14:57:19 -0700 Comment on attachment 233546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233546&action=review > Source/WebKit2/UIProcess/WebPageGroup.cpp:86 > +// FIXME: Why does the WebPreferences object here use “.WebKit2” instead of “WebKit2.” which all the other constructors use. > +// If it turns out that it's wrong, we can change it to to “WebKit2.” and get rid of the globalDebugKeyPrefix from WebPreferences. Are we using non-ASCII characters in comments now? > Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm:121 > +#undef INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS Why is this necessary here? 1017343 3 andersca 2014-06-21 15:02:51 -0700 Committed r170253: <http://trac.webkit.org/changeset/170253> 233546 2014-06-21 14:30:56 -0700 2014-06-21 14:57:19 -0700 Patch bug-134164-20140621143034.patch text/plain 15346 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWRkMjgxYTkzMjkwMGQx ZGNmOGEzMWMyNzZhMGE2MDMxZTY3ZmVlNi4uNGY5MzA5MDZlZmYxMWUyMWI2N2VlZTQyYjFiNjU1 Njk3NDFkYWJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE0LTA2LTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byBvdmVycmlkZSBkZWJ1ZyBwcmVmZXJlbmNlcyBvbiBhIHBlci1pZGVudGlmaWVyIGJh c2lzIGFzIHdlbGwgYXMgZ2xvYmFsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNDE2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDoKKyAg ICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNLZXlzLmNwcDoKKyAgICAgICAgKiBTaGFyZWQv V2ViUHJlZmVyZW5jZXNLZXlzLmg6CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3Rv cmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpkZWZhdWx0cyk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0NyZWF0ZSk6 CisgICAgICAgIChXS1ByZWZlcmVuY2VzQ3JlYXRlV2l0aElkZW50aWZpZXIpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKC1bV0tQcmVm ZXJlbmNlcyBpbml0XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6V2ViUGFnZUdyb3VwKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJl bmNlczo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OmNyZWF0ZVdp dGhMZWdhY3lEZWZhdWx0cyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpXZWJQ cmVmZXJlbmNlcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmg6CisgICAg ICAgICogVUlQcm9jZXNzL21hYy9XZWJQcmVmZXJlbmNlc01hYy5tbToKKyAgICAgICAgKFdlYktp dDo6bWFrZUtleSk6CisgICAgICAgIChXZWJLaXQ6OmRlYnVnVXNlckRlZmF1bHRzVmFsdWUpOgor ICAgICAgICAoV2ViS2l0OjpzZXREZWJ1Z0Jvb2xWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUpOgor CisyMDE0LTA2LTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgQmVnaW4gd29yayBvbiBkZWNvZGluZyBmb3JtIGRhdGEKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDE2MwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAppbmRleCBlZGFmZjk3MzRj MjRiMTNlNTk1ODdlZTIzYmEzOTZlYjU3Mjc1OGJhLi4xYjEzZjRhZDIxMjcyMmM0NWEzNjA2MTA3 NzUwNGRjNGE0OWIwZmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNEZWZpbml0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVm ZXJlbmNlc0RlZmluaXRpb25zLmgKQEAgLTExNiw5ICsxMTYsNiBAQAogICAgIG1hY3JvKEZvcmNl Q29tcG9zaXRpbmdNb2RlLCBmb3JjZUNvbXBvc2l0aW5nTW9kZSwgQm9vbCwgYm9vbCwgZmFsc2Up IFwKICAgICBtYWNybyhBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkLCBhY2NlbGVyYXRlZERyYXdp bmdFbmFibGVkLCBCb29sLCBib29sLCBERUZBVUxUX0FDQ0VMRVJBVEVEX0RSQVdJTkdfRU5BQkxF RCkgXAogICAgIG1hY3JvKENhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcsIGNhbnZhc1VzZXNB Y2NlbGVyYXRlZERyYXdpbmcsIEJvb2wsIGJvb2wsIERFRkFVTFRfQ0FOVkFTX1VTRVNfQUNDRUxF UkFURURfRFJBV0lORykgXAotICAgIG1hY3JvKENvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGUsIGNv bXBvc2l0aW5nQm9yZGVyc1Zpc2libGUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCi0gICAgbWFjcm8o Q29tcG9zaXRpbmdSZXBhaW50Q291bnRlcnNWaXNpYmxlLCBjb21wb3NpdGluZ1JlcGFpbnRDb3Vu dGVyc1Zpc2libGUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCi0gICAgbWFjcm8oVGlsZWRTY3JvbGxp bmdJbmRpY2F0b3JWaXNpYmxlLCB0aWxlZFNjcm9sbGluZ0luZGljYXRvclZpc2libGUsIEJvb2ws IGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oV2ViR0xFbmFibGVkLCB3ZWJHTEVuYWJsZWQsIEJv b2wsIGJvb2wsIHRydWUpIFwKICAgICBtYWNybyhNdWx0aXRocmVhZGVkV2ViR0xFbmFibGVkLCBt dWx0aXRocmVhZGVkV2ViR0xFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3Jv KEZvcmNlU29mdHdhcmVXZWJHTFJlbmRlcmluZywgZm9yY2VTb2Z0d2FyZVdlYkdMUmVuZGVyaW5n LCBCb29sLCBib29sLCBmYWxzZSkgXApAQCAtMjM3LDYgKzIzNCwxMSBAQAogICAgIG1hY3JvKFN0 b3JhZ2VCbG9ja2luZ1BvbGljeSwgc3RvcmFnZUJsb2NraW5nUG9saWN5LCBVSW50MzIsIHVpbnQz Ml90LCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6QmxvY2tUaGlyZFBhcnR5U3RvcmFnZSkgXAog ICAgIFwKIAorI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfREVCVUdfQk9PTF9QUkVGRVJFTkNFKG1h Y3JvKSBcCisgICAgbWFjcm8oQ29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSwgY29tcG9zaXRpbmdC b3JkZXJzVmlzaWJsZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhDb21wb3NpdGlu Z1JlcGFpbnRDb3VudGVyc1Zpc2libGUsIGNvbXBvc2l0aW5nUmVwYWludENvdW50ZXJzVmlzaWJs ZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhUaWxlZFNjcm9sbGluZ0luZGljYXRv clZpc2libGUsIHRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yVmlzaWJsZSwgQm9vbCwgYm9vbCwgZmFs c2UpIFwKKwogI2lmIFBMQVRGT1JNKENPQ09BKQogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtMjgy LDYgKzI4NCwxMCBAQAogICAgIG1hY3JvKEluc3BlY3RvcldpbmRvd0ZyYW1lLCBpbnNwZWN0b3JX aW5kb3dGcmFtZSwgU3RyaW5nLCBTdHJpbmcsICIiKSBcCiAgICAgXAogCisjZGVmaW5lIEZPUl9F QUNIX1dFQktJVF9ERUJVR19QUkVGRVJFTkNFKG1hY3JvKSBcCisgICAgRk9SX0VBQ0hfV0VCS0lU X0RFQlVHX0JPT0xfUFJFRkVSRU5DRShtYWNybykgXAorICAgIFwKKwogI2RlZmluZSBGT1JfRUFD SF9XRUJLSVRfUFJFRkVSRU5DRShtYWNybykgXAogICAgIEZPUl9FQUNIX1dFQktJVF9CT09MX1BS RUZFUkVOQ0UobWFjcm8pIFwKICAgICBGT1JfRUFDSF9XRUJLSVRfRE9VQkxFX1BSRUZFUkVOQ0Uo bWFjcm8pIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNl c0tleXMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzS2V5cy5jcHAK aW5kZXggOTllMjc2MGYxNmE3MmUzYmZhYjk0MDYwYjEzM2I2MzRkZGJiZGQ1MC4uZmRkMDRmNmZm YTdiMWMzNTZlMWYyMjY3NmViYmM3ZmNkZjFhY2MwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzS2V5cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzS2V5cy5jcHAKQEAgLTM4LDcgKzM4LDggQEAgbmFtZXNwYWNlIFdl YlByZWZlcmVuY2VzS2V5IHsKICAgICAgICAgICAgIHJldHVybiBrZXk7IFwKICAgICAgICAgfQog Ci0gICAgRk9SX0VBQ0hfV0VCS0lUX1BSRUZFUkVOQ0UoREVGSU5FX0tFWV9HRVRURVJTKQorRk9S X0VBQ0hfV0VCS0lUX1BSRUZFUkVOQ0UoREVGSU5FX0tFWV9HRVRURVJTKQorRk9SX0VBQ0hfV0VC S0lUX0RFQlVHX1BSRUZFUkVOQ0UoREVGSU5FX0tFWV9HRVRURVJTKQogCiAjdW5kZWYgREVGSU5F X0tFWV9HRVRURVJTCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVm ZXJlbmNlc0tleXMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0tleXMu aAppbmRleCAyMmZlZTY0YzU4OTdlNDgyNjQyZTA2YzNiMWU5N2YxYzRjNTg2ZmIwLi4wYjhmYmM3 NGVmM2Q2NjU3MzdjYmQyNTJiZWJmYzI0MWFlOGZkMDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNLZXlzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzS2V5cy5oCkBAIC0zNSw2ICszNSw3IEBAIG5hbWVzcGFjZSBXZWJQ cmVmZXJlbmNlc0tleSB7CiAjZGVmaW5lIERFQ0xBUkVfS0VZX0dFVFRFUlMoS2V5VXBwZXIsIEtl eUxvd2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVmYXVsdFZhbHVlKSBjb25zdCBTdHJpbmcmIEtleUxv d2VyIyNLZXkoKTsKIAogRk9SX0VBQ0hfV0VCS0lUX1BSRUZFUkVOQ0UoREVDTEFSRV9LRVlfR0VU VEVSUykKK0ZPUl9FQUNIX1dFQktJVF9ERUJVR19QUkVGRVJFTkNFKERFQ0xBUkVfS0VZX0dFVFRF UlMpCiAKICN1bmRlZiBERUNMQVJFX0tFWV9HRVRURVJTCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcAppbmRleCA1MzAwOGNlNjcyYmFjMzE3ZWM2NzBl NmIzNGZmYjk2MGFmZTVlMzJmLi5jY2NmZjVlNjdlMDBhODQzYjIyYmQyMTAzNzNkMmE5NTcwNTE1 NTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9y ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3Bw CkBAIC0xNjMsNiArMTYzLDcgQEAgc3RhdGljIFdlYlByZWZlcmVuY2VzU3RvcmU6OlZhbHVlTWFw JiBkZWZhdWx0cygpCiAgICAgaWYgKGRlZmF1bHRzLmdldCgpLmlzRW1wdHkoKSkgewogI2RlZmlu ZSBERUZJTkVfREVGQVVMVFMoS2V5VXBwZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVm YXVsdFZhbHVlKSBkZWZhdWx0cy5nZXQoKS5zZXQoV2ViUHJlZmVyZW5jZXNLZXk6OktleUxvd2Vy IyNLZXkoKSwgV2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoKFR5cGUpRGVmYXVsdFZhbHVlKSk7 CiAgICAgICAgIEZPUl9FQUNIX1dFQktJVF9QUkVGRVJFTkNFKERFRklORV9ERUZBVUxUUykKKyAg ICAgICAgRk9SX0VBQ0hfV0VCS0lUX0RFQlVHX1BSRUZFUkVOQ0UoREVGSU5FX0RFRkFVTFRTKQog I3VuZGVmIERFRklORV9ERUZBVUxUUwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCmluZGV4IDkyZTc4ZGIyNGNhZTBkYjEzMDky M2Q1N2E2OWZjZWRiOGMxMWFiZGIuLjllMzk2NTUxYmY4YThiMTQ3NzFmYzBhNmFkMzYxMGJkNWQ5 YjE0OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlcy5jcHAKQEAgLTQzLDEzICs0MywxMyBAQCBXS1R5cGVJRCBXS1ByZWZlcmVuY2VzR2V0VHlw ZUlEKCkKIAogV0tQcmVmZXJlbmNlc1JlZiBXS1ByZWZlcmVuY2VzQ3JlYXRlKCkKIHsKLSAgICBS ZWZQdHI8V2ViUHJlZmVyZW5jZXM+IHByZWZlcmVuY2VzID0gV2ViUHJlZmVyZW5jZXM6OmNyZWF0 ZVdpdGhMZWdhY3lEZWZhdWx0cyhTdHJpbmcoKSwgIldlYktpdDIuIik7CisgICAgUmVmUHRyPFdl YlByZWZlcmVuY2VzPiBwcmVmZXJlbmNlcyA9IFdlYlByZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVn YWN5RGVmYXVsdHMoU3RyaW5nKCksICJXZWJLaXQyLiIsICJXZWJLaXQyLiIpOwogICAgIHJldHVy biB0b0FQSShwcmVmZXJlbmNlcy5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIAogV0tQcmVmZXJl bmNlc1JlZiBXS1ByZWZlcmVuY2VzQ3JlYXRlV2l0aElkZW50aWZpZXIoV0tTdHJpbmdSZWYgaWRl bnRpZmllclJlZikKIHsKLSAgICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IHByZWZlcmVuY2VzID0g V2ViUHJlZmVyZW5jZXM6OmNyZWF0ZVdpdGhMZWdhY3lEZWZhdWx0cyh0b1dURlN0cmluZyhpZGVu dGlmaWVyUmVmKSwgIldlYktpdDIuIik7CisgICAgUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBwcmVm ZXJlbmNlcyA9IFdlYlByZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHModG9XVEZT dHJpbmcoaWRlbnRpZmllclJlZiksICJXZWJLaXQyLiIsICJXZWJLaXQyLiIpOwogICAgIHJldHVy biB0b0FQSShwcmVmZXJlbmNlcy5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tCmluZGV4 IDYyZmRmZGQ2NzA3MjEyZjc1M2JhZThjOGFiYmI0YWI3NzRmNDU1MjAuLjZhYjFkYzBhNDM5NTgw M2U1NjJjZDU3OGM1MmM5M2ZlNDM4MWY3MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0KQEAgLTM5LDcgKzM5LDcgQEAKICAg ICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAg IF9wcmVmZXJlbmNlcyA9IFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OmNyZWF0ZShTdHJpbmcoKSwg IldlYktpdCIpOworICAgIF9wcmVmZXJlbmNlcyA9IFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OmNy ZWF0ZShTdHJpbmcoKSwgIldlYktpdCIsICJXZWJLaXQiKTsKICAgICByZXR1cm4gc2VsZjsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcAppbmRleCBkODhjYjU2 ODRkNGE4Zjk2NDU3NmY4ZmIzZDlhNTIwOWM3MzViNmJhLi5hNjRmOGE4NmI4N2QyYjZkNWUxNGFm YTJlMzFhOTExZWM2YzhkMzg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZUdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdy b3VwLmNwcApAQCAtODIsOSArODIsMTEgQEAgc3RhdGljIFdlYlBhZ2VHcm91cERhdGEgcGFnZUdy b3VwRGF0YShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW4KICAgICBy ZXR1cm4gZGF0YTsKIH0KIAorLy8gRklYTUU6IFdoeSBkb2VzIHRoZSBXZWJQcmVmZXJlbmNlcyBv YmplY3QgaGVyZSB1c2Ug4oCcLldlYktpdDLigJ0gaW5zdGVhZCBvZiDigJxXZWJLaXQyLuKAnSB3 aGljaCBhbGwgdGhlIG90aGVyIGNvbnN0cnVjdG9ycyB1c2UuCisvLyBJZiBpdCB0dXJucyBvdXQg dGhhdCBpdCdzIHdyb25nLCB3ZSBjYW4gY2hhbmdlIGl0IHRvIHRvIOKAnFdlYktpdDIu4oCdIGFu ZCBnZXQgcmlkIG9mIHRoZSBnbG9iYWxEZWJ1Z0tleVByZWZpeCBmcm9tIFdlYlByZWZlcmVuY2Vz LgogV2ViUGFnZUdyb3VwOjpXZWJQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBi b29sIHZpc2libGVUb0luamVjdGVkQnVuZGxlLCBib29sIHZpc2libGVUb0hpc3RvcnlDbGllbnQp CiAgICAgOiBtX2RhdGEocGFnZUdyb3VwRGF0YShpZGVudGlmaWVyLCB2aXNpYmxlVG9JbmplY3Rl ZEJ1bmRsZSwgdmlzaWJsZVRvSGlzdG9yeUNsaWVudCkpCi0gICAgLCBtX3ByZWZlcmVuY2VzKFdl YlByZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMobV9kYXRhLmlkZW50aWZlciwg Ii5XZWJLaXQyIikpCisgICAgLCBtX3ByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzOjpjcmVhdGVX aXRoTGVnYWN5RGVmYXVsdHMobV9kYXRhLmlkZW50aWZlciwgIi5XZWJLaXQyIiwgIldlYktpdDIu IikpCiB7CiAgICAgd2ViUGFnZUdyb3VwTWFwKCkuc2V0KG1fZGF0YS5wYWdlR3JvdXBJRCwgdGhp cyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5j ZXMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmNwcAppbmRl eCAwNzMzMjllMDM3NzM5NTUwYTYxM2U1OWFiNTQ5ZTE0ZDJkM2IwZTA3Li5mODYxNGZkNDAwZThk YzRhOGQ1YzRjZDk5MmM4NGNjZTY3ODhkNWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcmVmZXJlbmNlcy5jcHAKQEAgLTM3LDE0ICszNywxNCBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIC8vIEluc3RlYWQgb2YgdHJhY2tpbmcgcHJpdmF0ZSBicm93c2luZyBzdGF0ZSBhcyBhIGJv b2xlYW4gcHJlZmVyZW5jZSwgd2Ugc2hvdWxkIGxldCB0aGUgY2xpZW50IHByb3ZpZGUgc3RvcmFn ZSBzZXNzaW9ucyBleHBsaWNpdGx5Lgogc3RhdGljIHVuc2lnbmVkIHByaXZhdGVCcm93c2luZ1Bh Z2VDb3VudDsKIAotUGFzc1JlZlB0cjxXZWJQcmVmZXJlbmNlcz4gV2ViUHJlZmVyZW5jZXM6OmNy ZWF0ZShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5UHJlZml4KQor UGFzc1JlZlB0cjxXZWJQcmVmZXJlbmNlcz4gV2ViUHJlZmVyZW5jZXM6OmNyZWF0ZShjb25zdCBT dHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5UHJlZml4LCBjb25zdCBTdHJpbmcm IGdsb2JhbERlYnVnS2V5UHJlZml4KQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViUHJl ZmVyZW5jZXMoaWRlbnRpZmllciwga2V5UHJlZml4KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBXZWJQcmVmZXJlbmNlcyhpZGVudGlmaWVyLCBrZXlQcmVmaXgsIGdsb2JhbERlYnVnS2V5UHJl Zml4KSk7CiB9CiAKLVBhc3NSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IFdlYlByZWZlcmVuY2VzOjpj cmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBT dHJpbmcmIGtleVByZWZpeCkKK1Bhc3NSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IFdlYlByZWZlcmVu Y2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBj b25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3RyaW5nJiBnbG9iYWxEZWJ1Z0tleVByZWZp eCkKIHsKLSAgICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IHByZWZlcmVuY2VzID0gYWRvcHRSZWYo bmV3IFdlYlByZWZlcmVuY2VzKGlkZW50aWZpZXIsIGtleVByZWZpeCkpOworICAgIFJlZlB0cjxX ZWJQcmVmZXJlbmNlcz4gcHJlZmVyZW5jZXMgPSBhZG9wdFJlZihuZXcgV2ViUHJlZmVyZW5jZXMo aWRlbnRpZmllciwga2V5UHJlZml4LCBnbG9iYWxEZWJ1Z0tleVByZWZpeCkpOwogICAgIHByZWZl cmVuY2VzLT5tX3N0b3JlLnNldE92ZXJyaWRlRGVmYXVsdHNCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OmphdmFFbmFibGVkS2V5KCksIHRydWUpOwogICAgIHByZWZlcmVuY2VzLT5t X3N0b3JlLnNldE92ZXJyaWRlRGVmYXVsdHNCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OmphdmFFbmFibGVkRm9yTG9jYWxGaWxlc0tleSgpLCB0cnVlKTsKICAgICBwcmVmZXJlbmNl cy0+bV9zdG9yZS5zZXRPdmVycmlkZURlZmF1bHRzQm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjpwbHVnaW5zRW5hYmxlZEtleSgpLCB0cnVlKTsKQEAgLTUyLDE1ICs1MiwxNyBAQCBQ YXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBXZWJQcmVmZXJlbmNlczo6Y3JlYXRlV2l0aExlZ2Fj eURlZmF1bHRzKGNvbnN0IFN0cmluZwogICAgIHJldHVybiBwcmVmZXJlbmNlcy5yZWxlYXNlKCk7 CiB9CiAKLVdlYlByZWZlcmVuY2VzOjpXZWJQcmVmZXJlbmNlcyhjb25zdCBTdHJpbmcmIGlkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5UHJlZml4KQorV2ViUHJlZmVyZW5jZXM6OldlYlByZWZl cmVuY2VzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBrZXlQcmVmaXgs IGNvbnN0IFN0cmluZyYgZ2xvYmFsRGVidWdLZXlQcmVmaXgpCiAgICAgOiBtX2lkZW50aWZpZXIo aWRlbnRpZmllcikKICAgICAsIG1fa2V5UHJlZml4KGtleVByZWZpeCkKKyAgICAsIG1fZ2xvYmFs RGVidWdLZXlQcmVmaXgoZ2xvYmFsRGVidWdLZXlQcmVmaXgpCiB7CiAgICAgcGxhdGZvcm1Jbml0 aWFsaXplU3RvcmUoKTsKIH0KIAogV2ViUHJlZmVyZW5jZXM6OldlYlByZWZlcmVuY2VzKGNvbnN0 IFdlYlByZWZlcmVuY2VzJiBvdGhlcikKICAgICA6IG1fa2V5UHJlZml4KG90aGVyLm1fa2V5UHJl Zml4KQorICAgICwgbV9nbG9iYWxEZWJ1Z0tleVByZWZpeChvdGhlci5tX2dsb2JhbERlYnVnS2V5 UHJlZml4KQogICAgICwgbV9zdG9yZShvdGhlci5tX3N0b3JlKQogewogICAgIHBsYXRmb3JtSW5p dGlhbGl6ZVN0b3JlKCk7CkBAIC0xODEsNiArMTgzLDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6 dXBkYXRlUHJpdmF0ZUJyb3dzaW5nVmFsdWUoYm9vbCB2YWx1ZSkKICAgICB9IFwKIAogRk9SX0VB Q0hfV0VCS0lUX1BSRUZFUkVOQ0UoREVGSU5FX1BSRUZFUkVOQ0VfR0VUVEVSX0FORF9TRVRURVJT KQorRk9SX0VBQ0hfV0VCS0lUX0RFQlVHX1BSRUZFUkVOQ0UoREVGSU5FX1BSRUZFUkVOQ0VfR0VU VEVSX0FORF9TRVRURVJTKQogCiAjdW5kZWYgREVGSU5FX1BSRUZFUkVOQ0VfR0VUVEVSX0FORF9T RVRURVJTCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJl bmNlcy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmgKaW5kZXgg MWVkZWYzOGNlYThjZTEyYzA1NmJiNGM1NDMzNDY1YzE5YzhhOWY0OC4uOTQwNTJmNzhkOGFlY2M3 NDE4NDQwODY2NzQyZjAxZThjOWJiZjVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlByZWZlcmVuY2VzLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByZWZlcmVuY2VzLmgKQEAgLTQ0LDggKzQ0LDggQEAgY2xhc3MgV2ViUGFnZVByb3h5OwogCiBj bGFzcyBXZWJQcmVmZXJlbmNlcyA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6 OlR5cGU6OlByZWZlcmVuY2VzPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8V2Vi UHJlZmVyZW5jZXM+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYga2V5UHJlZml4KTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQcmVmZXJlbmNlcz4gY3Jl YXRlV2l0aExlZ2FjeURlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3Ry aW5nJiBrZXlQcmVmaXgpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBj cmVhdGUoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwg Y29uc3QgU3RyaW5nJiBnbG9iYWxEZWJ1Z0tleVByZWZpeCk7CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViUHJlZmVyZW5jZXM+IGNyZWF0ZVdpdGhMZWdhY3lEZWZhdWx0cyhjb25zdCBTdHJpbmcm IGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYga2V5UHJlZml4LCBjb25zdCBTdHJpbmcmIGdsb2Jh bERlYnVnS2V5UHJlZml4KTsKIAogICAgIHZpcnR1YWwgfldlYlByZWZlcmVuY2VzKCk7CiAKQEAg LTYxLDYgKzYxLDcgQEAgcHVibGljOgogICAgIFR5cGUgS2V5TG93ZXIoKSBjb25zdDsgXAogCiAg ICAgRk9SX0VBQ0hfV0VCS0lUX1BSRUZFUkVOQ0UoREVDTEFSRV9QUkVGRVJFTkNFX0dFVFRFUl9B TkRfU0VUVEVSUykKKyAgICBGT1JfRUFDSF9XRUJLSVRfREVCVUdfUFJFRkVSRU5DRShERUNMQVJF X1BSRUZFUkVOQ0VfR0VUVEVSX0FORF9TRVRURVJTKQogCiAjdW5kZWYgREVDTEFSRV9QUkVGRVJF TkNFX0dFVFRFUl9BTkRfU0VUVEVSUwogCkBAIC03MCw3ICs3MSw3IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgYm9vbCBhbnlQYWdlc0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKCk7CiAKIHByaXZhdGU6 Ci0gICAgZXhwbGljaXQgV2ViUHJlZmVyZW5jZXMoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5n Jik7CisgICAgZXhwbGljaXQgV2ViUHJlZmVyZW5jZXMoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIGtleVByZWZpeCwgY29uc3QgU3RyaW5nJiBnbG9iYWxEZWJ1Z0tleVBy ZWZpeCk7CiAgICAgV2ViUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXMmKTsKIAogICAg IHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKTsKQEAgLTkyLDYgKzkzLDcgQEAgcHJpdmF0 ZToKIAogICAgIGNvbnN0IFN0cmluZyBtX2lkZW50aWZpZXI7CiAgICAgY29uc3QgU3RyaW5nIG1f a2V5UHJlZml4OworICAgIGNvbnN0IFN0cmluZyBtX2dsb2JhbERlYnVnS2V5UHJlZml4OwogICAg IFdlYlByZWZlcmVuY2VzU3RvcmUgbV9zdG9yZTsKIAogICAgIEhhc2hTZXQ8V2ViUGFnZVByb3h5 Kj4gbV9wYWdlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi UHJlZmVyZW5jZXNNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlByZWZl cmVuY2VzTWFjLm1tCmluZGV4IDRhMTI0ZGUxMjQ0MjU4YWIxNTQxZWIxY2I1OWZhN2I4NTZhMmYz NTguLmMxN2IxNWM5NWU0ODBmYzViYjA0NzUzMTBmNGViMWNiNTNlYjE4NzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJlZmVyZW5jZXNNYWMubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQcmVmZXJlbmNlc01hYy5tbQpAQCAtMzQs NyArMzQsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RhdGljIGlubGluZSBOU1N0cmluZyog bWFrZUtleShOU1N0cmluZyAqaWRlbnRpZmllciwgTlNTdHJpbmcgKmtleVByZWZpeCwgTlNTdHJp bmcgKmtleSkKIHsKLSAgICBBU1NFUlQoaWRlbnRpZmllcik7CisgICAgQVNTRVJUKGlkZW50aWZp ZXIubGVuZ3RoKTsKICAgICBBU1NFUlQoa2V5UHJlZml4KTsKICAgICBBU1NFUlQoa2V5KTsKIApA QCAtODUsOCArODUsNDggQEAgc3RhdGljIHZvaWQgc2V0RG91YmxlVmFsdWVJZkluVXNlckRlZmF1 bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW4KICAgICBzdG9yZS5zZXRE b3VibGVWYWx1ZUZvcktleShrZXksIFtvYmplY3QgZG91YmxlVmFsdWVdKTsKIH0KIAorCitzdGF0 aWMgaWQgZGVidWdVc2VyRGVmYXVsdHNWYWx1ZShOU1N0cmluZyAqaWRlbnRpZmllciwgTlNTdHJp bmcgKmtleVByZWZpeCwgTlNTdHJpbmcgKmdsb2JhbERlYnVnS2V5UHJlZml4LCBOU1N0cmluZyAq a2V5KQoreworICAgIEFTU0VSVChrZXlQcmVmaXgpOworICAgIEFTU0VSVChrZXkpOworCisgICAg TlNVc2VyRGVmYXVsdHMgKnN0YW5kYXJkVXNlckRlZmF1bHRzID0gW05TVXNlckRlZmF1bHRzIHN0 YW5kYXJkVXNlckRlZmF1bHRzXTsKKyAgICBpZCBvYmplY3QgPSBuaWw7CisKKyAgICBpZiAoaWRl bnRpZmllci5sZW5ndGgpCisgICAgICAgIG9iamVjdCA9IFtzdGFuZGFyZFVzZXJEZWZhdWx0cyBv YmplY3RGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIlQCVAJUAiLCBpZGVudGlm aWVyLCBrZXlQcmVmaXgsIGtleV1dOworCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgLy8g QWxsb3cgZGVidWcgcHJlZmVyZW5jZXMgdG8gYmUgc2V0IGdsb2JhbGx5LCB1c2luZyB0aGUgZGVi dWcga2V5IHByZWZpeC4KKyAgICAgICAgb2JqZWN0ID0gW3N0YW5kYXJkVXNlckRlZmF1bHRzIG9i amVjdEZvcktleTpbZ2xvYmFsRGVidWdLZXlQcmVmaXggc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6 a2V5XV07CisgICAgfQorCisgICAgcmV0dXJuIG9iamVjdDsKK30KKworc3RhdGljIHZvaWQgc2V0 RGVidWdCb29sVmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwg Y29uc3QgU3RyaW5nJiBrZXlQcmVmaXgsIGNvbnN0IFN0cmluZyYgZ2xvYmFsRGVidWdLZXlQcmVm aXgsIGNvbnN0IFN0cmluZyYga2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKK3sKKyAg ICBpZCBvYmplY3QgPSBkZWJ1Z1VzZXJEZWZhdWx0c1ZhbHVlKGlkZW50aWZpZXIsIGtleVByZWZp eCwgZ2xvYmFsRGVidWdLZXlQcmVmaXgsIGtleSk7CisgICAgaWYgKCFvYmplY3QpCisgICAgICAg IHJldHVybjsKKyAgICBpZiAoIVtvYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihi b29sVmFsdWUpXSkKKyAgICAgICAgcmV0dXJuOworCisgICAgc3RvcmUuc2V0Qm9vbFZhbHVlRm9y S2V5KGtleSwgW29iamVjdCBib29sVmFsdWVdKTsKK30KKwogdm9pZCBXZWJQcmVmZXJlbmNlczo6 cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKQogeworI3VuZGVmIElOSVRJQUxJWkVfUFJFRkVSRU5D RV9GUk9NX05TVVNFUkRFRkFVTFRTCisKKyNkZWZpbmUgSU5JVElBTElaRV9ERUJVR19QUkVGRVJF TkNFX0ZST01fTlNVU0VSREVGQVVMVFMoS2V5VXBwZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwgVHlw ZSwgRGVmYXVsdFZhbHVlKSBcCisgICAgc2V0RGVidWcjI1R5cGVOYW1lIyNWYWx1ZUlmSW5Vc2Vy RGVmYXVsdHMobV9pZGVudGlmaWVyLCBtX2tleVByZWZpeCwgbV9nbG9iYWxEZWJ1Z0tleVByZWZp eCwgV2ViUHJlZmVyZW5jZXNLZXk6OktleUxvd2VyIyNLZXkoKSwgbV9zdG9yZSk7CisKKyAgICBG T1JfRUFDSF9XRUJLSVRfREVCVUdfUFJFRkVSRU5DRShJTklUSUFMSVpFX0RFQlVHX1BSRUZFUkVO Q0VfRlJPTV9OU1VTRVJERUZBVUxUUykKKworI3VuZGVmIElOSVRJQUxJWkVfREVCVUdfUFJFRkVS RU5DRV9GUk9NX05TVVNFUkRFRkFVTFRTCisKICAgICBpZiAoIW1faWRlbnRpZmllcikKICAgICAg ICAgcmV0dXJuOwogCg==