157695 2016-05-13 17:01:09 -0700 REGRESSION(r200894): This change broke the iOS build (Requested by ryanhaddad on #webkit). 2016-05-13 17:02:54 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 157689 1 commit-queue commit-queue andersca enrica ryanhaddad oldest_to_newest 1192971 0 commit-queue 2016-05-13 17:01:09 -0700 http://trac.webkit.org/changeset/200894 broke the build: This change broke the iOS build (Requested by ryanhaddad on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1192973 1 278896 commit-queue 2016-05-13 17:01:37 -0700 Created attachment 278896 ROLLOUT of r200894 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1192974 2 278896 ryanhaddad 2016-05-13 17:02:51 -0700 Comment on attachment 278896 ROLLOUT of r200894 Clearing flags on attachment: 278896 Committed r200901: <http://trac.webkit.org/changeset/200901> 1192975 3 ryanhaddad 2016-05-13 17:02:54 -0700 All reviewed patches have been landed. Closing bug. 278896 2016-05-13 17:01:37 -0700 2016-05-13 17:02:51 -0700 ROLLOUT of r200894 bug-157695-20160513170229.patch text/plain 14908 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwOTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ4OTMwMjM4ZTkzOTc5 NGU1MTFjMGY4ZTEzZjJiYmMwYTNlNGE1Mi4uZGZmNDQzYjdlNWQzYjIwZDAwNDUwZjc4M2YxOGJk N2E0NTkwNjY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA1LTEzICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjAwODk0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU3Njk1CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYnJva2UgdGhlIGlP UyBidWlsZCAoUmVxdWVzdGVkIGJ5IHJ5YW5oYWRkYWQgb24KKyAgICAgICAgI3dlYmtpdCkuCisK KyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJSZW1vdmUgdW51c2VkIGlu aXRpYWxpemVyIGZvciBXZWJFdmVudCBvbiBpT1MuIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3Njg5CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtp dC5vcmcvY2hhbmdlc2V0LzIwMDg5NAorCiAyMDE2LTA1LTEzICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgYWxsIHByb3RlY3RvciB2YXJpYWJsZXMg dGhhdCBzaG91bGQgYmUgY2FsbGVkIGBwcm90ZWN0ZWRUaGlzYApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4 IDk4NDA0OWJiYTU5MDU0MTM0M2JhNmM2ODk2MDUyY2M3YjFmZjE2M2UuLmI4MGY1ODUyZTc1YjNh MzU5YzJmOTgwZGZjNGRmZTE0MTY0MTUwZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxNi0wNS0xMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIwMDg5NC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzY5NQorCisgICAgICAgIFRo aXMgY2hhbmdlIGJyb2tlIHRoZSBpT1MgYnVpbGQgKFJlcXVlc3RlZCBieSByeWFuaGFkZGFkIG9u CisgICAgICAgICN3ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAg ICAgICAiUmVtb3ZlIHVudXNlZCBpbml0aWFsaXplciBmb3IgV2ViRXZlbnQgb24gaU9TLiIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzY4OQorICAg ICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yMDA4OTQKKwogMjAxNi0wNS0x MyAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1 bnVzZWQgaW5pdGlhbGl6ZXIgZm9yIFdlYkV2ZW50IG9uIGlPUy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1dlYkV2ZW50LmgKaW5kZXggOWQ3MmYwMDNkOTY0NjlkYzIyNTU3YmQ5MTc5MWRkNGNj YzI1NzgzOS4uOGVkYWRkNjdjYTM5NzMwNTAxODYzMWY0MDBiMTJmOWViNjE4M2VmNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50LmgKQEAgLTg2LDkgKzg2LDExIEBAIFdFQkNP UkVfRVhQT1JUIEBpbnRlcmZhY2UgV2ViRXZlbnQgOiBOU09iamVjdCB7CiAgICAgTlNTdHJpbmcg Kl9jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM7CiAgICAgV2ViRXZlbnRGbGFncyBfbW9kaWZp ZXJGbGFnczsKICAgICBCT09MIF9rZXlSZXBlYXRpbmc7CisgICAgQk9PTCBfcG9wdXBWYXJpYW50 OyAvLyBGSVhNRTogdG8gYmUgcmVtb3ZlZAogICAgIE5TVUludGVnZXIgX2tleWJvYXJkRmxhZ3M7 CiAgICAgdWludDE2X3QgX2tleUNvZGU7CiAgICAgQk9PTCBfdGFiS2V5OworICAgIFdlYkV2ZW50 Q2hhcmFjdGVyU2V0IF9jaGFyYWN0ZXJTZXQ7CiAgICAgCiAgICAgZmxvYXQgX2RlbHRhWDsKICAg ICBmbG9hdCBfZGVsdGFZOwpAQCAtMTI1LDYgKzEyNywxOCBAQCBXRUJDT1JFX0VYUE9SVCBAaW50 ZXJmYWNlIFdlYkV2ZW50IDogTlNPYmplY3QgewogICAgICAgICAgICAgICAgICAgICAgICAgZ2Vz dHVyZVNjYWxlOihmbG9hdClnZXN0dXJlU2NhbGUKICAgICAgICAgICAgICAgICAgICAgIGdlc3R1 cmVSb3RhdGlvbjooZmxvYXQpZ2VzdHVyZVJvdGF0aW9uOwogCisvLyBGSVhNRTogdGhpcyBpcyBk ZXByZWNhdGVkLiBJdCB3aWxsIGJlIHJlbW92ZWQgd2hlbiBVSUtpdCBhZG9wdHMgdGhlIG5ldyBv bmUgYmVsb3cuCistIChXZWJFdmVudCAqKWluaXRXaXRoS2V5RXZlbnRUeXBlOihXZWJFdmVudFR5 cGUpdHlwZQorICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVTdGFtcDooQ0ZUaW1lSW50ZXJ2 YWwpdGltZVN0YW1wCisgICAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJzOihOU1N0cmlu ZyAqKWNoYXJhY3RlcnMKKyAgICAgICBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6KE5TU3Ry aW5nICopY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzCisgICAgICAgICAgICAgICAgICAgICAg ICAgbW9kaWZpZXJzOihXZWJFdmVudEZsYWdzKW1vZGlmaWVycworICAgICAgICAgICAgICAgICAg ICAgICBpc1JlcGVhdGluZzooQk9PTClyZXBlYXRpbmcKKyAgICAgICAgICAgICAgICAgICAgaXNQ b3B1cFZhcmlhbnQ6KEJPT0wpcG9wdXBWYXJpYW50CisgICAgICAgICAgICAgICAgICAgICAgICAg ICBrZXlDb2RlOih1aW50MTZfdClrZXlDb2RlCisgICAgICAgICAgICAgICAgICAgICAgICAgIGlz VGFiS2V5OihCT09MKXRhYktleQorICAgICAgICAgICAgICAgICAgICAgIGNoYXJhY3RlclNldDoo V2ViRXZlbnRDaGFyYWN0ZXJTZXQpY2hhcmFjdGVyU2V0OworCiAtIChXZWJFdmVudCAqKWluaXRX aXRoS2V5RXZlbnRUeXBlOihXZWJFdmVudFR5cGUpdHlwZQogICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWVTdGFtcDooQ0ZUaW1lSW50ZXJ2YWwpdGltZVN0YW1wCiAgICAgICAgICAgICAgICAg ICAgICAgICBjaGFyYWN0ZXJzOihOU1N0cmluZyAqKWNoYXJhY3RlcnMKQEAgLTE0OCw5ICsxNjIs MTIgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJFdmVudCA6IE5TT2JqZWN0IHsKIEBw cm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSBXZWJFdmVudEZsYWdzIG1vZGlmaWVyRmxhZ3M7 CiBAcHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSwgZ2V0dGVyID0gaXNLZXlSZXBlYXRpbmcp IEJPT0wga2V5UmVwZWF0aW5nOwogCisvLyBGSVhNRTogdGhpcyBpcyBkZXByZWNhdGVkLiBJdCB3 aWxsIGJlIHJlbW92ZWQgd2hlbiBVSUtpdCBhZG9wdHMgdGhlIG5ldyBpbml0V2l0aEtleUV2ZW50 VHlwZS4KK0Bwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXIgPSBpc1BvcHVwVmFy aWFudCkgQk9PTCBwb3B1cFZhcmlhbnQ7CiBAcHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkg TlNVSW50ZWdlciBrZXlib2FyZEZsYWdzOwogQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHkp IHVpbnQxNl90IGtleUNvZGU7CiBAcHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSwgZ2V0dGVy ID0gaXNUYWJLZXkpIEJPT0wgdGFiS2V5OworQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHkp IFdlYkV2ZW50Q2hhcmFjdGVyU2V0IGNoYXJhY3RlclNldDsKIAogLy8gU2Nyb2xsIFdoZWVsCiBA cHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkgZmxvYXQgZGVsdGFYOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCmluZGV4IDAxNWRiMzEyMTM0NGEwOWMxMDVhMjJhYzc5 NjlkZWQyMjAwNGQ5ZWIuLmExNjkzOTVkOTU0OTkyZGQzNjQ3NDllMmVjYmQ0NjgwODRiODg1NTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQubW0KQEAgLTEyNywxMiArMTI3 LDU0IEBAIHN0YXRpYyBpbnQgd2luZG93c0tleUNvZGVGb3JDaGFyQ29kZUlPUyh1bmljaGFyIGNo YXJDb2RlKQogICAgICAgIGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczooTlNTdHJpbmcgKilj aGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMKICAgICAgICAgICAgICAgICAgICAgICAgICBtb2Rp ZmllcnM6KFdlYkV2ZW50RmxhZ3MpbW9kaWZpZXJzCiAgICAgICAgICAgICAgICAgICAgICAgIGlz UmVwZWF0aW5nOihCT09MKXJlcGVhdGluZworICAgICAgICAgICAgICAgICAgICBpc1BvcHVwVmFy aWFudDooQk9PTClwb3B1cFZhcmlhbnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleUNv ZGU6KHVpbnQxNl90KWtleUNvZGUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgaXNUYWJLZXk6 KEJPT0wpdGFiS2V5CisgICAgICAgICAgICAgICAgICAgICAgY2hhcmFjdGVyU2V0OihXZWJFdmVu dENoYXJhY3RlclNldCljaGFyYWN0ZXJTZXQKK3sKKyAgICBzZWxmID0gW3N1cGVyIGluaXRdOwor ICAgIGlmICghc2VsZikKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAKKyAgICBfdHlwZSA9IHR5 cGU7CisgICAgX3RpbWVzdGFtcCA9IHRpbWVTdGFtcDsKKworICAgIF9jaGFyYWN0ZXJzID0gW2No YXJhY3RlcnMgcmV0YWluXTsKKyAgICBfY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzID0gW2No YXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycyByZXRhaW5dOworICAgIF9tb2RpZmllckZsYWdzID0g bW9kaWZpZXJzOworICAgIF9rZXlSZXBlYXRpbmcgPSByZXBlYXRpbmc7CisgICAgX3BvcHVwVmFy aWFudCA9IHBvcHVwVmFyaWFudDsKKyAgICBfdGFiS2V5ID0gdGFiS2V5OworICAgIF9jaGFyYWN0 ZXJTZXQgPSBjaGFyYWN0ZXJTZXQ7CisKKyAgICBpZiAoa2V5Q29kZSkKKyAgICAgICAgX2tleUNv ZGUgPSB3aW5kb3dzS2V5Q29kZUZvcktleUNvZGUoa2V5Q29kZSk7CisKKyAgICAvLyBOT1RFOiB0 aGlzIHByZXNlcnZlcyB0aGUgb3JpZ2luYWwgc2VtYW50aWNzIHdoaWNoIHVzZWQgdGhlCisgICAg Ly8gY2hhcmFjdGVycyBzdHJpbmcgZm9yIHRoZSBrZXlDb2RlLiBUaGlzIHNob3VsZCBiZSBjaGFu Z2VkIGluIGlPUyA0LjAgdG8KKyAgICAvLyBhbGxvdyB0aGUgY2xpZW50IHRvIGV4cGxpY2l0bHkg c3BlY2lmeSBhIGtleUNvZGUsIG90aGVyd2lzZSBkZWZhdWx0IHRvCisgICAgLy8gbWFwcGluZyB0 aGUgY2hhcmFjdGVycyBzdHJpbmcgdG8gYSBrZXlDb2RlLgorICAgIC8vIGUuZy4gYWRkIGFuICdl bHNlJyBiZWZvcmUgdGhpcyAnaWYnLgorICAgIGlmIChbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZp ZXJzIGxlbmd0aF0gPT0gMSkgeworICAgICAgICB1bmljaGFyIGNoID0gW2NoYXJhY3RlcnNJZ25v cmluZ01vZGlmaWVycyBjaGFyYWN0ZXJBdEluZGV4OjBdOworICAgICAgICBfa2V5Q29kZSA9IHdp bmRvd3NLZXlDb2RlRm9yQ2hhckNvZGVJT1MoY2gpOworICAgIH0KKworICAgIHJldHVybiBzZWxm OworfQorCisKKy0gKFdlYkV2ZW50ICopaW5pdFdpdGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlw ZSl0eXBlCisgICAgICAgICAgICAgICAgICAgICAgICAgdGltZVN0YW1wOihDRlRpbWVJbnRlcnZh bCl0aW1lU3RhbXAKKyAgICAgICAgICAgICAgICAgICAgICAgIGNoYXJhY3RlcnM6KE5TU3RyaW5n ICopY2hhcmFjdGVycworICAgICAgIGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczooTlNTdHJp bmcgKiljaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMKKyAgICAgICAgICAgICAgICAgICAgICAg ICBtb2RpZmllcnM6KFdlYkV2ZW50RmxhZ3MpbW9kaWZpZXJzCisgICAgICAgICAgICAgICAgICAg ICAgIGlzUmVwZWF0aW5nOihCT09MKXJlcGVhdGluZwogICAgICAgICAgICAgICAgICAgICAgICAg IHdpdGhGbGFnczooTlNVSW50ZWdlcilmbGFncwogICAgICAgICAgICAgICAgICAgICAgICAgICAg a2V5Q29kZToodWludDE2X3Qpa2V5Q29kZQogICAgICAgICAgICAgICAgICAgICAgICAgICBpc1Rh YktleTooQk9PTCl0YWJLZXkKICAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJTZXQ6KFdl YkV2ZW50Q2hhcmFjdGVyU2V0KWNoYXJhY3RlclNldAogewotICAgIFVOVVNFRF9QQVJBTShjaGFy YWN0ZXJTZXQpOwogICAgIHNlbGYgPSBbc3VwZXIgaW5pdF07CiAgICAgaWYgKCFzZWxmKQogICAg ICAgICByZXR1cm4gbmlsOwpAQCAtMTQ2LDYgKzE4OCw3IEBAIHN0YXRpYyBpbnQgd2luZG93c0tl eUNvZGVGb3JDaGFyQ29kZUlPUyh1bmljaGFyIGNoYXJDb2RlKQogICAgIF9rZXlSZXBlYXRpbmcg PSByZXBlYXRpbmc7CiAgICAgX2tleWJvYXJkRmxhZ3MgPSBmbGFnczsKICAgICBfdGFiS2V5ID0g dGFiS2V5OworICAgIF9jaGFyYWN0ZXJTZXQgPSBjaGFyYWN0ZXJTZXQ7CiAgICAgCiAgICAgaWYg KGtleUNvZGUpCiAgICAgICAgIF9rZXlDb2RlID0gd2luZG93c0tleUNvZGVGb3JLZXlDb2RlKGtl eUNvZGUpOwpAQCAtMjMzLDYgKzI3NiwyNSBAQCBzdGF0aWMgaW50IHdpbmRvd3NLZXlDb2RlRm9y Q2hhckNvZGVJT1ModW5pY2hhciBjaGFyQ29kZSkKICAgICByZXR1cm4gQCJVbmtub3duIjsKIH0K IAorLSAoTlNTdHJpbmcgKilfY2hhcmFjdGVyU2V0RGVzY3JpcHRpb24KK3sKKyAgICBzd2l0Y2gg KF9jaGFyYWN0ZXJTZXQpIHsKKyAgICAgICAgY2FzZSBXZWJFdmVudENoYXJhY3RlclNldEFTQ0lJ OgorICAgICAgICAgICAgcmV0dXJuIEAiV2ViRXZlbnRDaGFyYWN0ZXJTZXRBU0NJSSI7CisgICAg ICAgIGNhc2UgV2ViRXZlbnRDaGFyYWN0ZXJTZXRTeW1ib2w6CisgICAgICAgICAgICByZXR1cm4g QCJXZWJFdmVudENoYXJhY3RlclNldFN5bWJvbCI7CisgICAgICAgIGNhc2UgV2ViRXZlbnRDaGFy YWN0ZXJTZXREaW5nYmF0czoKKyAgICAgICAgICAgIHJldHVybiBAIldlYkV2ZW50Q2hhcmFjdGVy U2V0RGluZ2JhdHMiOworICAgICAgICBjYXNlIFdlYkV2ZW50Q2hhcmFjdGVyU2V0VW5pY29kZToK KyAgICAgICAgICAgIHJldHVybiBAIldlYkV2ZW50Q2hhcmFjdGVyU2V0VW5pY29kZSI7CisgICAg ICAgIGNhc2UgV2ViRXZlbnRDaGFyYWN0ZXJTZXRGdW5jdGlvbktleXM6CisgICAgICAgICAgICBy ZXR1cm4gQCJXZWJFdmVudENoYXJhY3RlclNldEZ1bmN0aW9uS2V5cyI7CisgICAgICAgIGRlZmF1 bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CisgICAgcmV0dXJu IEAiVW5rbm93biI7Cit9CisKIC0gKE5TU3RyaW5nICopX3RvdWNoTG9jYXRpb25zRGVzY3JpcHRp b246KE5TQXJyYXkgKilsb2NhdGlvbnMKIHsKICAgICBCT09MIHNob3VsZEFkZENvbW1hID0gTk87 CkBAIC0yOTcsNyArMzU5LDcgQEAgc3RhdGljIGludCB3aW5kb3dzS2V5Q29kZUZvckNoYXJDb2Rl SU9TKHVuaWNoYXIgY2hhckNvZGUpCiAgICAgICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmlu Z1dpdGhGb3JtYXQ6QCJsb2NhdGlvbjogKCVmLCAlZikgZGVsdGFYOiAlZiBkZWx0YVk6ICVmIiwg X2xvY2F0aW9uSW5XaW5kb3cueCwgX2xvY2F0aW9uSW5XaW5kb3cueSwgX2RlbHRhWCwgX2RlbHRh WV07CiAgICAgICAgIGNhc2UgV2ViRXZlbnRLZXlEb3duOgogICAgICAgICBjYXNlIFdlYkV2ZW50 S2V5VXA6Ci0gICAgICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJj aGFyczogJUAgY2hhcnNOb01vZGlmaWVyczogJUAgZmxhZ3M6ICVkIHJlcGVhdGluZzogJWQga2V5 Ym9hcmRGbGFnczogJWx1IGtleUNvZGUgJWQsIGlzVGFiOiAlZCIsIF9jaGFyYWN0ZXJzLCBfY2hh cmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzLCBfbW9kaWZpZXJGbGFncywgX2tleVJlcGVhdGluZywg c3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oX2tleWJvYXJkRmxhZ3MpLCBfa2V5Q29kZSwgX3Rh YktleV07CisgICAgICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJj aGFyczogJUAgY2hhcnNOb01vZGlmaWVyczogJUAgZmxhZ3M6ICVkIHJlcGVhdGluZzogJWQga2V5 Ym9hcmRGbGFnczogJWx1IGtleUNvZGUgJWQsIGlzVGFiOiAlZCBjaGFyU2V0OiAlQCIsIF9jaGFy YWN0ZXJzLCBfY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzLCBfbW9kaWZpZXJGbGFncywgX2tl eVJlcGVhdGluZywgc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZz4oX2tleWJvYXJkRmxhZ3MpLCBf a2V5Q29kZSwgX3RhYktleSwgW3NlbGYgX2NoYXJhY3RlclNldERlc2NyaXB0aW9uXV07CiAgICAg ICAgIGNhc2UgV2ViRXZlbnRUb3VjaEJlZ2luOgogICAgICAgICBjYXNlIFdlYkV2ZW50VG91Y2hD aGFuZ2U6CiAgICAgICAgIGNhc2UgV2ViRXZlbnRUb3VjaEVuZDoKQEAgLTM0Niw2ICs0MDgsMTMg QEAgc3RhdGljIGludCB3aW5kb3dzS2V5Q29kZUZvckNoYXJDb2RlSU9TKHVuaWNoYXIgY2hhckNv ZGUpCiAgICAgcmV0dXJuIF9rZXlSZXBlYXRpbmc7CiB9CiAKKy8vIEZJWE1FOiB0byBiZSByZW1v dmVkCistIChCT09MKWlzUG9wdXBWYXJpYW50Cit7CisgICAgQVNTRVJUKF90eXBlID09IFdlYkV2 ZW50S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVudEtleVVwKTsKKyAgICByZXR1cm4gX3BvcHVw VmFyaWFudDsKK30KKwogLSAoTlNVSW50ZWdlcilrZXlib2FyZEZsYWdzCiB7CiAgICAgQVNTRVJU KF90eXBlID09IFdlYkV2ZW50S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVudEtleVVwKTsKQEAg LTM2NCw2ICs0MzMsMTIgQEAgc3RhdGljIGludCB3aW5kb3dzS2V5Q29kZUZvckNoYXJDb2RlSU9T KHVuaWNoYXIgY2hhckNvZGUpCiAgICAgcmV0dXJuIF90YWJLZXk7CiB9CiAKKy0gKFdlYkV2ZW50 Q2hhcmFjdGVyU2V0KWNoYXJhY3RlclNldAoreworICAgIEFTU0VSVChfdHlwZSA9PSBXZWJFdmVu dEtleURvd24gfHwgX3R5cGUgPT0gV2ViRXZlbnRLZXlVcCk7CisgICAgcmV0dXJuIF9jaGFyYWN0 ZXJTZXQ7Cit9CisKIC0gKGZsb2F0KWRlbHRhWAogewogICAgIEFTU0VSVChfdHlwZSA9PSBXZWJF dmVudFNjcm9sbFdoZWVsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViSFRNTFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1t CmluZGV4IGRiMDk3YWVkMGE0ZGNiYTcyNWYxY2VhMmQzODJjZmY1YTRmNTIzN2UuLmUwMDkwZjM2 YzMwMjI5ZmNmNWM4ODU0YjRkNTAyYmE0OTQxM2VmNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQpAQCAtNjUxMSw2ICs2NTExLDEwIEBAIHN0YXRpYyBCT09MIHdy aXRpbmdEaXJlY3Rpb25LZXlCaW5kaW5nc0VuYWJsZWQoKQogI2RlZmluZSBrV2ViQmFja3NwYWNl S2V5ICAgICAweDAwMDgKICNkZWZpbmUga1dlYlJldHVybktleSAgICAgICAgMHgwMDBkCiAjZGVm aW5lIGtXZWJEZWxldGVLZXkgICAgICAgIDB4MDA3RgorI2RlZmluZSBrV2ViTGVmdEFycm93S2V5 ICAgICAweDAwQUMKKyNkZWZpbmUga1dlYlVwQXJyb3dLZXkgICAgICAgMHgwMEFECisjZGVmaW5l IGtXZWJSaWdodEFycm93S2V5ICAgIDB4MDBBRQorI2RlZmluZSBrV2ViRG93bkFycm93S2V5ICAg ICAweDAwQUYKICNkZWZpbmUga1dlYkRlbGV0ZUZvcndhcmRLZXkgMHhGNzI4CiAgICAgCiAtIChC T09MKV9oYW5kbGVFZGl0aW5nS2V5RXZlbnQ6KEtleWJvYXJkRXZlbnQgKil3Y0V2ZW50CkBAIC02 NTIyLDM2ICs2NTI2LDc5IEBAIHN0YXRpYyBCT09MIHdyaXRpbmdEaXJlY3Rpb25LZXlCaW5kaW5n c0VuYWJsZWQoKQogICAgIC8vIGVtYmVkZGVkIGFzIHRoZSB3aG9sZSB2aWV3LCBhcyBpbiBNYWls LCBhbmQgdGFicyBzaG91bGQgaW5wdXQgdGFicyBhcyBleHBlY3RlZAogICAgIC8vIGluIGEgdGV4 dCBlZGl0b3IuCiAgICAgCisgICAgLy8gRklYTUUgLSB0aGlzIGNvZGUgd2lsbCBicmVhayB3aGVu IGNvbnRlbnQgZWRpdGFibGUgaXMgc3VwcG9ydGVkLgogICAgIGlmIChjb25zdCBQbGF0Zm9ybUtl eWJvYXJkRXZlbnQqIHBsYXRmb3JtRXZlbnQgPSB3Y0V2ZW50LT5rZXlFdmVudCgpKSB7CiAgICAg ICAgIFdlYkV2ZW50ICpldmVudCA9IHBsYXRmb3JtRXZlbnQtPmV2ZW50KCk7CiAgICAgICAgIGlm ICghW1tzZWxmIF93ZWJWaWV3XSBpc0VkaXRhYmxlXSAmJiBldmVudC5pc1RhYktleSkgCiAgICAg ICAgICAgICByZXR1cm4gTk87CiAgICAgICAgIAotICAgICAgICBOU1N0cmluZyAqcyA9IFtldmVu dCBjaGFyYWN0ZXJzXTsKLSAgICAgICAgaWYgKCFzLmxlbmd0aCkKLSAgICAgICAgICAgIHJldHVy biBOTzsKLSAgICAgICAgV2ViVmlldyogd2ViVmlldyA9IFtzZWxmIF93ZWJWaWV3XTsKLSAgICAg ICAgc3dpdGNoIChbcyBjaGFyYWN0ZXJBdEluZGV4OjBdKSB7Ci0gICAgICAgIGNhc2Uga1dlYkJh Y2tzcGFjZUtleToKLSAgICAgICAgY2FzZSBrV2ViRGVsZXRlS2V5OgotICAgICAgICAgICAgW1t3 ZWJWaWV3IF9VSUtpdERlbGVnYXRlRm9yd2FyZGVyXSBkZWxldGVGcm9tSW5wdXRXaXRoRmxhZ3M6 ZXZlbnQua2V5Ym9hcmRGbGFnc107Ci0gICAgICAgICAgICByZXR1cm4gWUVTOwotICAgICAgICBj YXNlIGtXZWJFbnRlcktleToKLSAgICAgICAgY2FzZSBrV2ViUmV0dXJuS2V5OgotICAgICAgICAg ICAgaWYgKHBsYXRmb3JtRXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OkNo YXIpIHsKLSAgICAgICAgICAgICAgICAvLyBNYXAgXHIgZnJvbSBIVyBrZXlib2FyZCB0byBcbiB0 byBtYXRjaCB0aGUgYmVoYXZpb3Igb2YgdGhlIHNvZnQga2V5Ym9hcmQuCi0gICAgICAgICAgICAg ICAgW1t3ZWJWaWV3IF9VSUtpdERlbGVnYXRlRm9yd2FyZGVyXSBhZGRJbnB1dFN0cmluZzpAIlxu IiB3aXRoRmxhZ3M6MF07Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKKyAgICAgICAgLy8g Tm93IHByb2Nlc3MgdGhlIGtleSBub3JtYWxseQorICAgICAgICBCT09MIHNoaWZ0ID0gcGxhdGZv cm1FdmVudC0+c2hpZnRLZXkoKTsKKyAgICAgICAgCisgICAgICAgIHN3aXRjaCAoZXZlbnQuY2hh cmFjdGVyU2V0KSB7CisgICAgICAgICAgICBjYXNlIFdlYkV2ZW50Q2hhcmFjdGVyU2V0U3ltYm9s OiB7CisgICAgICAgICAgICAgICAgU0VMIHNlbCA9IDA7CisgICAgICAgICAgICAgICAgTlNTdHJp bmcgKnMgPSBbZXZlbnQgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzXTsKKyAgICAgICAgICAg ICAgICBpZiAoW3MgbGVuZ3RoXSA9PSAwKQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICBzd2l0Y2ggKFtzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKKyAgICAgICAg ICAgICAgICAgICAgY2FzZSBrV2ViTGVmdEFycm93S2V5OgorICAgICAgICAgICAgICAgICAgICAg ICAgc2VsID0gc2hpZnQgPyBAc2VsZWN0b3IobW92ZUxlZnRBbmRNb2RpZnlTZWxlY3Rpb246KSA6 IEBzZWxlY3Rvcihtb3ZlTGVmdDopOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYlVwQXJyb3dLZXk6CisgICAgICAgICAgICAgICAg ICAgICAgICBzZWwgPSBzaGlmdCA/IEBzZWxlY3Rvcihtb3ZlVXBBbmRNb2RpZnlTZWxlY3Rpb246 KSA6IEBzZWxlY3Rvcihtb3ZlVXA6KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgICAgICAgICBjYXNlIGtXZWJSaWdodEFycm93S2V5OgorICAgICAgICAgICAg ICAgICAgICAgICAgc2VsID0gc2hpZnQgPyBAc2VsZWN0b3IobW92ZVJpZ2h0QW5kTW9kaWZ5U2Vs ZWN0aW9uOikgOiBAc2VsZWN0b3IobW92ZVJpZ2h0Oik7CisgICAgICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBrV2ViRG93bkFycm93S2V5OgorICAg ICAgICAgICAgICAgICAgICAgICAgc2VsID0gc2hpZnQgPyBAc2VsZWN0b3IobW92ZURvd25BbmRN b2RpZnlTZWxlY3Rpb246KSA6IEBzZWxlY3Rvcihtb3ZlRG93bjopOworICAgICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChz ZWwpIHsKKyAgICAgICAgICAgICAgICAgICAgW3NlbGYgcGVyZm9ybVNlbGVjdG9yOnNlbCB3aXRo T2JqZWN0OnNlbGZdOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gWUVTOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBjYXNlIGtXZWJEZWxldGVGb3J3YXJkS2V5OgotICAgICAgICAg ICAgW3NlbGYgZGVsZXRlRm9yd2FyZDpzZWxmXTsKLSAgICAgICAgICAgIHJldHVybiBZRVM7Ci0g ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgpID09 IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6Q2hhcikgewotICAgICAgICAgICAgICAgIFtbd2ViVmll dyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6ZXZlbnQuY2hhcmFjdGVy cyB3aXRoRmxhZ3M6ZXZlbnQua2V5Ym9hcmRGbGFnc107Ci0gICAgICAgICAgICAgICAgcmV0dXJu IFlFUzsKKyAgICAgICAgICAgIGNhc2UgV2ViRXZlbnRDaGFyYWN0ZXJTZXRBU0NJSToKKyAgICAg ICAgICAgIGNhc2UgV2ViRXZlbnRDaGFyYWN0ZXJTZXRVbmljb2RlOiB7CisgICAgICAgICAgICAg ICAgTlNTdHJpbmcgKnMgPSBbZXZlbnQgY2hhcmFjdGVyc107CisgICAgICAgICAgICAgICAgaWYg KFtzIGxlbmd0aF0gPT0gMCkKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICAgICAgV2ViVmlldyogd2ViVmlldyA9IFtzZWxmIF93ZWJWaWV3XTsKKyAgICAgICAgICAgICAg ICBzd2l0Y2ggKFtzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKKyAgICAgICAgICAgICAgICAgICAg Y2FzZSBrV2ViQmFja3NwYWNlS2V5OgorICAgICAgICAgICAgICAgICAgICBjYXNlIGtXZWJEZWxl dGVLZXk6CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogcmVtb3ZlIHRoZSBjYWxs IHRvIGRlbGV0ZUZyb21JbnB1dCB3aGVuIFVJS2l0IGltcGxlbWVudHMgZGVsZXRlRnJvbUlucHV0 V2l0aEZsYWdzLgorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKFt3ZWJWaWV3IHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IoZGVsZXRlRnJvbUlucHV0V2l0aEZsYWdzOildKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFtbd2ViVmlldyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0g ZGVsZXRlRnJvbUlucHV0V2l0aEZsYWdzOmV2ZW50LmtleWJvYXJkRmxhZ3NdOworICAgICAgICAg ICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtbd2ViVmll dyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gZGVsZXRlRnJvbUlucHV0XTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBZRVM7CisgICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYkVu dGVyS2V5OgorICAgICAgICAgICAgICAgICAgICBjYXNlIGtXZWJSZXR1cm5LZXk6CisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgpID09IFBsYXRmb3JtS2V5 Ym9hcmRFdmVudDo6Q2hhcikgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIE1hcCBc ciBmcm9tIEhXIGtleWJvYXJkIHRvIFxuIHRvIG1hdGNoIHRoZSBiZWhhdmlvciBvZiB0aGUgc29m dCBrZXlib2FyZC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBbW3dlYlZpZXcgX1VJS2l0 RGVsZWdhdGVGb3J3YXJkZXJdIGFkZElucHV0U3RyaW5nOkAiXG4iIHdpdGhGbGFnczowXTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gWUVTOworICAgICAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE5POworICAgICAgICAgICAg ICAgICAgICBjYXNlIGtXZWJEZWxldGVGb3J3YXJkS2V5OgorICAgICAgICAgICAgICAgICAgICAg ICAgW3NlbGYgZGVsZXRlRm9yd2FyZDpzZWxmXTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBZRVM7CisgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6IHsgICAgICAgICAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHBsYXRmb3JtRXZlbnQtPnR5cGUoKSA9 PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OkNoYXIpIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBbW3dlYlZpZXcgX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJdIGFkZElucHV0U3RyaW5nOmV2 ZW50LmNoYXJhY3RlcnMgd2l0aEZsYWdzOmV2ZW50LmtleWJvYXJkRmxhZ3NdOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBZRVM7CisgICAgICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gTk87CisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICB9CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIHJldHVybiBOTzsKICAg ICAgICAgfQogICAgIH0KICAgICByZXR1cm4gTk87Cg==