202032 2019-09-19 22:41:39 -0700 Remove some support for < iOS 13 2019-09-20 13:10:45 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201851 InRadar P2 Normal --- 1 krollin krollin achristensen commit-queue dbates webkit-bug-importer oldest_to_newest 1572653 0 krollin 2019-09-19 22:41:39 -0700 Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 130000. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Dan Bates was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. 1572654 1 webkit-bug-importer 2019-09-19 22:41:58 -0700 <rdar://problem/55548468> 1572657 2 379210 krollin 2019-09-19 22:45:59 -0700 Created attachment 379210 Patch 1572832 3 379210 commit-queue 2019-09-20 13:10:44 -0700 Comment on attachment 379210 Patch Clearing flags on attachment: 379210 Committed r250142: <https://trac.webkit.org/changeset/250142> 1572833 4 commit-queue 2019-09-20 13:10:45 -0700 All reviewed patches have been landed. Closing bug. 379210 2019-09-19 22:45:59 -0700 2019-09-20 13:10:44 -0700 Patch bug-202032-20190919224559.patch text/plain 13312 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRhMDEyZjMxMjBiZDMx OTFkYzAyNDNjMzMyOTFkNDZiYmI2MzQ2MS4uMjBmY2M0ODEzNTEwMjhmNWNlMDczYjIxMWJiY2Nj NTdjNjZjYjRjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTA5LTE5ICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBw b3J0IGZvciA8IGlPUyAxMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMDMyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTU0ODQ2OD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc29tZSBz dXBwb3J0IGZvciBpT1MgdmVyc2lvbnMgbGVzcyB0aGFuIDEzLjAuCisKKyAgICAgICAgVXBkYXRl IGNvbmRpdGlvbmFscyB0aGF0IHJlZmVyZW5jZSBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRAorICAgICAgICBhbmQgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCwgYXNzdW1p bmcgdGhhdCB0aGV5IGJvdGggaGF2ZQorICAgICAgICB2YWx1ZXMgPj0gMTMwMDAwLiBUaGlzIG1l YW5zIHRoYXQgZXhwcmVzc2lvbnMgbGlrZQorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPCAxMDEzMDAiIGFyZSBhbHdheXMgRmFsc2UgYW5kCisgICAgICAgICJfX0lQ SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEzMDAiIGFyZSBhbHdheXMgVHJ1ZS4K KworICAgICAgICBUaGlzIHJlbW92YWwgaXMgcGFydCBvZiBhIHNlcmllcyBvZiBwYXRjaGVzIGVm ZmVjdGluZyB0aGUgcmVtb3ZhbCBvZgorICAgICAgICBkZWFkIGNvZGUgZm9yIG9sZCB2ZXJzaW9u cyBvZiBpT1MuIFRoaXMgcGFydGljdWxhciBwYXNzIGludm9sdmVzCisgICAgICAgIGNoYW5nZXMg aW4gd2hpY2ggRGFuIEJhdGVzIHdhcyBpbnZvbHZlZC4gVGhlc2UgY2hhbmdlcyBhcmUgaXNvbGF0 ZWQKKyAgICAgICAgZnJvbSBvdGhlciBzaW1pbGFyIGNoYW5nZXMgaW4gb3JkZXIgdG8gZmFjaWxp dGF0ZSB0aGUgcmV2aWV3aW5nCisgICAgICAgIHByb2Nlc3MuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIC0tIG5vIG5ldyBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybVJlcXVlc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVJlc291cmNlUmVxdWVzdCk6CisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29raWVDb2NvYS5tbToKKyAgICAgICAgKFdl YkNvcmU6OkNvb2tpZTo6b3BlcmF0b3IgTlNIVFRQQ29va2llICogX051bGxhYmxlICBjb25zdCk6 CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5t bToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJjZVJl cXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRm b3JtUmVxdWVzdCk6CisKIDIwMTktMDktMTggIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW92ZSBjaGVjayBvZiBzZXRTb3VyY2VBcHBQaWQgc2VsZWN0b3Ig dGhhdCdzIG5vIGxvbmdlciBuZWVkZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOTY4NmY5MDRjYjU2OGZjMTEwZjhh YjcyNDA0ZDg4NTNkY2Y3OWExZi4uMGMwMTI0M2Y4YTcyNGEzM2NlN2NkYWE4M2EzMWM2ODgyZjdh YWI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxOS0wOS0xOSAgS2VpdGggUm9sbGlu ICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3Ig PCBpT1MgMTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMjAzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTU1NDg0Njg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBm b3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMy4wLgorCisgICAgICAgIFVwZGF0ZSBjb25kaXRp b25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQKKyAg ICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQsIGFzc3VtaW5nIHRoYXQg dGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVzID49IDEzMDAwMC4gVGhpcyBtZWFucyB0aGF0 IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJ UkVEIDwgMTAxMzAwIiBhcmUgYWx3YXlzIEZhbHNlIGFuZAorICAgICAgICAiX19JUEhPTkVfT1Nf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMzAwIiBhcmUgYWx3YXlzIFRydWUuCisKKyAgICAg ICAgVGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBlZmZlY3Rpbmcg dGhlIHJlbW92YWwgb2YKKyAgICAgICAgZGVhZCBjb2RlIGZvciBvbGQgdmVyc2lvbnMgb2YgaU9T LiBUaGlzIHBhcnRpY3VsYXIgcGFzcyBpbnZvbHZlcworICAgICAgICBjaGFuZ2VzIGluIHdoaWNo IERhbiBCYXRlcyB3YXMgaW52b2x2ZWQuIFRoZXNlIGNoYW5nZXMgYXJlIGlzb2xhdGVkCisgICAg ICAgIGZyb20gb3RoZXIgc2ltaWxhciBjaGFuZ2VzIGluIG9yZGVyIHRvIGZhY2lsaXRhdGUgdGhl IHJldmlld2luZworICAgICAgICBwcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2lu dGVycHJldEtleUV2ZW50OmlzQ2hhckV2ZW50Ol0pOgorCiAyMDE5LTA5LTE5ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGZmM2QyN2ZhYmU5MGU0 YjFiZTBkNGEzZjUzM2Q4ODE4OWFmODQxMjkuLjJlNjk4ODI4ZjRhZDJlNzM5ZTEyZTkzNTQyMGJi ZTI4NmE1MTFhZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBA QAorMjAxOS0wOS0xOSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjAzMgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTU1NDg0Njg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMy4w LgorCisgICAgICAgIFVwZGF0ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05f TUFYX0FMTE9XRUQsIGFzc3VtaW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVz ID49IDEzMDAwMC4gVGhpcyBtZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9f SVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwIiBhcmUgYWx3YXlzIEZhbHNl IGFuZAorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMzAw IiBhcmUgYWx3YXlzIFRydWUuCisKKyAgICAgICAgVGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBz ZXJpZXMgb2YgcGF0Y2hlcyBlZmZlY3RpbmcgdGhlIHJlbW92YWwgb2YKKyAgICAgICAgZGVhZCBj b2RlIGZvciBvbGQgdmVyc2lvbnMgb2YgaU9TLiBUaGlzIHBhcnRpY3VsYXIgcGFzcyBpbnZvbHZl cworICAgICAgICBjaGFuZ2VzIGluIHdoaWNoIERhbiBCYXRlcyB3YXMgaW52b2x2ZWQuIFRoZXNl IGNoYW5nZXMgYXJlIGlzb2xhdGVkCisgICAgICAgIGZyb20gb3RoZXIgc2ltaWxhciBjaGFuZ2Vz IGluIG9yZGVyIHRvIGZhY2lsaXRhdGUgdGhlIHJldmlld2luZworICAgICAgICBwcm9jZXNzLgor CisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZp ZXcgX2hhbmRsZUVkaXRpbmdLZXlFdmVudDpdKToKKwogMjAxOS0wOS0xOCAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgLXN1c3BlbmQgYW5kIC1yZXN1bWVB bGxNZWRpYVBsYXliYWNrIHRvIFdlYlZpZXcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKaW5kZXggN2Y0 YTk0YTYwYWUzNDBkYmJjMzA3N2Q3NWJjNWQ1NmI0MDlhYzIzOS4uNWNkMDNjMzQ3ZDk4NDVkNTc3 ZGFlMzI4OTgzM2Y0Njc4NDk1ZGNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKQEAgLTE1Nyw3 ICsxNTcsNyBAQCBzdGF0aWMgaW5saW5lIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IGZyb21Q bGF0Zm9ybVJlcXVlc3RDYWNoZVBvbGljeShDRlVSTFJlcQogICAgIH0KIH0KIAotI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEy MDAwMAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiBzdGF0aWMgQ0ZVUkxSZWYgc2l0ZUZvckNv b2tpZXMoUmVzb3VyY2VSZXF1ZXN0OjpTYW1lU2l0ZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBD RlVSTFJlZiB1cmwpCiB7CiAgICAgc3dpdGNoIChkaXNwb3NpdGlvbikgewpAQCAtMjAwLDcgKzIw MCw3IEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCgpCiAK ICAgICBDRlVSTFJlcXVlc3RTZXRTaG91bGRIYW5kbGVIVFRQQ29va2llcyhjZlJlcXVlc3QsIGFs bG93Q29va2llcygpKTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09T X1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgX0NGVVJMUmVxdWVzdFNldFByb3RvY29sUHJvcGVydHkoY2ZSZXF1ZXN0LCBDRlNUUigi X2tDRkhUVFBDb29raWVQb2xpY3lQcm9wZXJ0eVNpdGVGb3JDb29raWVzIiksIHNpdGVGb3JDb29r aWVzKG1fc2FtZVNpdGVEaXNwb3NpdGlvbiwgdXJsLmdldCgpKSk7CiAKICAgICBpbnQgaXNUb3BT aXRlID0gbV9pc1RvcFNpdGU7CkBAIC0yODUsNyArMjg1LDcgQEAgdm9pZCBSZXNvdXJjZVJlcXVl c3Q6OmRvVXBkYXRlUmVzb3VyY2VSZXF1ZXN0KCkKICAgICBpZiAocmVzb3VyY2VQcmlvcml0aWVz RW5hYmxlZCgpKQogICAgICAgICBtX3ByaW9yaXR5ID0gdG9SZXNvdXJjZUxvYWRQcmlvcml0eShD RlVSTFJlcXVlc3RHZXRSZXF1ZXN0UHJpb3JpdHkobV9jZlJlcXVlc3QuZ2V0KCkpKTsKIAotI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEyMDAwMAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgUmV0YWluUHRyPENGVVJM UmVmPiBzaXRlRm9yQ29va2llcyA9IGFkb3B0Q0YoY2hlY2tlZF9jZl9jYXN0PENGVVJMUmVmPihf Q0ZVUkxSZXF1ZXN0Q29weVByb3RvY29sUHJvcGVydHlGb3JLZXkobV9jZlJlcXVlc3QuZ2V0KCks IENGU1RSKCJfa0NGSFRUUENvb2tpZVBvbGljeVByb3BlcnR5U2l0ZUZvckNvb2tpZXMiKSkpKTsK ICAgICBtX3NhbWVTaXRlRGlzcG9zaXRpb24gPSAhc2l0ZUZvckNvb2tpZXMgPyBTYW1lU2l0ZURp c3Bvc2l0aW9uOjpVbnNwZWNpZmllZCA6IChhcmVSZWdpc3RyYWJsZURvbWFpbnNFcXVhbChzaXRl Rm9yQ29va2llcy5nZXQoKSwgbV91cmwpID8gU2FtZVNpdGVEaXNwb3NpdGlvbjo6U2FtZVNpdGUg OiBTYW1lU2l0ZURpc3Bvc2l0aW9uOjpDcm9zc1NpdGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL0Nvb2tpZUNvY29hLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29raWVDb2NvYS5tbQppbmRleCAzMDdlOWQ0 OTY4OGI3ODcxOTM1YTQ5MGE1YjY3ZWU5ZjdhNTM1MGI1Li4wNGJiYzJiNWViMzExZTRiYzIyMTlm OTQ2N2NkMWUxMjdmNWMzOTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NvY29hL0Nvb2tpZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY29jb2EvQ29va2llQ29jb2EubW0KQEAgLTI5LDcgKzI5LDcgQEAKIC8vIEZJWE1F OiBSZW1vdmUgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4vRU5EIGFuZCBhbGwgX051bGxhYmxlIGFu bm90YXRpb25zIG9uY2Ugd2UgcmVtb3ZlIHRoZSBOU0hUVFBDb29raWUgZm9yd2FyZCBkZWNsYXJh dGlvbiBiZWxvdy4KIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiAKLSNpZiAoUExBVEZPUk0oTUFD KSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUFYX0FMTE9XRUQgPCAxMDE1MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZ KSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMjAwMDAgJiYgX19JUEhP TkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA8IDEzMDAwMCkKKyNpZiAoUExBVEZPUk0oTUFDKSAm JiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCAmJiBfX01BQ19PU19Y X1ZFUlNJT05fTUFYX0FMTE9XRUQgPCAxMDE1MDApCiB0eXBlZGVmIE5TU3RyaW5nICogTlNIVFRQ Q29va2llU3RyaW5nUG9saWN5OwogQGludGVyZmFjZSBOU0hUVFBDb29raWUgKFN0YWdpbmcpCiBA cHJvcGVydHkgKG51bGxhYmxlLCByZWFkb25seSwgY29weSkgTlNIVFRQQ29va2llU3RyaW5nUG9s aWN5IHNhbWVTaXRlUG9saWN5OwpAQCAtODQsNyArODQsNyBAQCBzdGF0aWMgZG91YmxlIGNvb2tp ZUNyZWF0ZWQoTlNIVFRQQ29va2llICpjb29raWUpCiAgICAgcmV0dXJuIDA7CiB9CiAKLSNpZiAo UExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQw MCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JF UVVJUkVEID49IDEyMDAwMCkKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHN0YXRp YyBDb29raWU6OlNhbWVTaXRlUG9saWN5IGNvcmVTYW1lU2l0ZVBvbGljeShOU0hUVFBDb29raWVT dHJpbmdQb2xpY3kgX051bGxhYmxlIHBvbGljeSkKIHsKICAgICBpZiAoIXBvbGljeSkKQEAgLTEy OCw3ICsxMjgsNyBAQCBDb29raWU6OkNvb2tpZShOU0hUVFBDb29raWUgKmNvb2tpZSkKICAgICAs IGNvbW1lbnRVUkwgeyBjb29raWUuY29tbWVudFVSTCB9CiAgICAgLCBwb3J0cyB7IHBvcnRWZWN0 b3JGcm9tTGlzdChjb29raWUucG9ydExpc3QpIH0KIHsKLSNpZiAoUExBVEZPUk0oTUFDKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElP U19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMCkK KyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEwMTQwMCkgfHwgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBBTExPV19ORVdfQVBJX1dJVEhP VVRfR1VBUkRTX0JFR0lOCiAgICAgaWYgKFtjb29raWUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3RvcihzYW1lU2l0ZVBvbGljeSldKQogICAgICAgICBzYW1lU2l0ZSA9IGNvcmVTYW1lU2l0ZVBv bGljeShjb29raWUuc2FtZVNpdGVQb2xpY3kpOwpAQCAtMTY2LDcgKzE2Niw3IEBAIENvb2tpZTo6 b3BlcmF0b3IgTlNIVFRQQ29va2llICogX051bGxhYmxlICgpIGNvbnN0CiAgICAgaWYgKG1heEFn ZSA+IDApCiAgICAgICAgIFtwcm9wZXJ0aWVzIHNldE9iamVjdDpbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIiVmIiwgbWF4QWdlXSBmb3JLZXk6TlNIVFRQQ29va2llTWF4aW11bUFnZV07CiAK LSNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEyMDAwMCkKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgUExBVEZPUk0oSU9TX0ZBTUlMWSkK ICAgICBbcHJvcGVydGllcyBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhEb3VibGU6Y3Jl YXRlZCAvIDEwMDAuMCAtIE5TVGltZUludGVydmFsU2luY2UxOTcwXSBmb3JLZXk6QCJDcmVhdGVk Il07CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY29jb2EvUmVzb3VyY2VSZXF1ZXN0Q29jb2EubW0KaW5kZXggNjVmZGNmYTFmMzA4 YmQxZDViNGQyMjMwZTI0ZDYzMjg3Y2I3NzcxNi4uZWQ1MDg2NjkwMTg3YTc5YjRlZDA0NzgyMGNm MDJiZTQwMzFjNzUyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NvY29hL1Jlc291cmNlUmVxdWVzdENvY29hLm1tCkBAIC04OCw3ICs4OCw3 IEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVJlc291cmNlUmVxdWVzdCgpCiAgICAg bV90aW1lb3V0SW50ZXJ2YWwgPSBbbV9uc1JlcXVlc3QuZ2V0KCkgdGltZW91dEludGVydmFsXTsK ICAgICBtX2ZpcnN0UGFydHlGb3JDb29raWVzID0gW21fbnNSZXF1ZXN0LmdldCgpIG1haW5Eb2N1 bWVudFVSTF07CiAKLSNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlO X1JFUVVJUkVEID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMCkKKyNpZiAoUExBVEZPUk0oTUFDKSAm JiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgUExBVEZPUk0o SU9TX0ZBTUlMWSkKICAgICBVUkwgc2l0ZUZvckNvb2tpZXMgeyBbbV9uc1JlcXVlc3QuZ2V0KCkg X3Byb3BlcnR5Rm9yS2V5OkAiX2tDRkhUVFBDb29raWVQb2xpY3lQcm9wZXJ0eVNpdGVGb3JDb29r aWVzIl0gfTsKICAgICBtX3NhbWVTaXRlRGlzcG9zaXRpb24gPSBzaXRlRm9yQ29va2llcy5pc051 bGwoKSA/IFNhbWVTaXRlRGlzcG9zaXRpb246OlVuc3BlY2lmaWVkIDogKGFyZVJlZ2lzdHJhYmxl RG9tYWluc0VxdWFsKHNpdGVGb3JDb29raWVzLCBtX3VybCkgPyBTYW1lU2l0ZURpc3Bvc2l0aW9u OjpTYW1lU2l0ZSA6IFNhbWVTaXRlRGlzcG9zaXRpb246OkNyb3NzU2l0ZSk7CiAKQEAgLTEzNyw3 ICsxMzcsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJjZUhUVFBCb2R5 KCkKICAgICB9CiB9CiAKLSNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMCkKKyNpZiAoUExBVEZPUk0oTUFD KSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMCkgfHwgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKIHN0YXRpYyBOU1VSTCAqc2l0ZUZvckNvb2tpZXMoUmVzb3VyY2VSZXF1 ZXN0OjpTYW1lU2l0ZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBOU1VSTCAqdXJsKQogewogICAg IHN3aXRjaCAoZGlzcG9zaXRpb24pIHsKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIFJlc291cmNl UmVxdWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybVJlcXVlc3QoKQogICAgICAgICBbbnNSZXF1ZXN0IHNl dEhUVFBNZXRob2Q6aHR0cE1ldGhvZCgpXTsKICAgICBbbnNSZXF1ZXN0IHNldEhUVFBTaG91bGRI YW5kbGVDb29raWVzOmFsbG93Q29va2llcygpXTsKIAotI2lmIChQTEFURk9STShNQUMpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNDAwKSB8fCAoUExBVEZPUk0oSU9T X0ZBTUlMWSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTIwMDAwKQor I2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTAxNDAwKSB8fCBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFtuc1JlcXVlc3QgX3NldFByb3Bl cnR5OnNpdGVGb3JDb29raWVzKG1fc2FtZVNpdGVEaXNwb3NpdGlvbiwgbnNSZXF1ZXN0LlVSTCkg Zm9yS2V5OkAiX2tDRkhUVFBDb29raWVQb2xpY3lQcm9wZXJ0eVNpdGVGb3JDb29raWVzIl07CiAg ICAgW25zUmVxdWVzdCBfc2V0UHJvcGVydHk6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOm1faXNU b3BTaXRlXSBmb3JLZXk6QCJfa0NGSFRUUENvb2tpZVBvbGljeVByb3BlcnR5SXNUb3BMZXZlbE5h dmlnYXRpb24iXTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggOGNmYjliNGFlNjIzMWEyNWFi YmQ0MDJmOWVlYWQ2ZjQyM2U1ZTY0NS4uYjZiYTE4YmUwYjk4ZDgzZmEwZmZhYzY5ZjkwYWNjM2Vl MDI4NDc2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC00ODYwLDEyICs0ODYwLDEwIEBAIC0gKEJPT0wp X2ludGVycHJldEtleUV2ZW50Oig6OldlYkV2ZW50ICopZXZlbnQgaXNDaGFyRXZlbnQ6KEJPT0wp aXNDaGFyRXZlbnQKIAogICAgIFVJS2V5Ym9hcmRJbXBsICprZXlib2FyZCA9IFtVSUtleWJvYXJk SW1wbCBzaGFyZWRJbnN0YW5jZV07CiAKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRCA+PSAxMzAwMDAKICAgICBpZiAoIWlzQ2hhckV2ZW50ICYmIFtrZXlib2FyZCByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKGhhbmRsZUtleVRleHRDb21tYW5kRm9yQ3VycmVudEV2ZW50 KV0gJiYgW2tleWJvYXJkIGhhbmRsZUtleVRleHRDb21tYW5kRm9yQ3VycmVudEV2ZW50XSkKICAg ICAgICAgcmV0dXJuIFlFUzsKICAgICBpZiAoaXNDaGFyRXZlbnQgJiYgW2tleWJvYXJkIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoaGFuZGxlS2V5QXBwQ29tbWFuZEZvckN1cnJlbnRFdmVu dCldICYmIFtrZXlib2FyZCBoYW5kbGVLZXlBcHBDb21tYW5kRm9yQ3VycmVudEV2ZW50XSkKICAg ICAgICAgcmV0dXJuIFlFUzsKLSNlbmRpZgogCiAgICAgLy8gRG9uJ3QgaW5zZXJ0IGNoYXJhY3Rl ciBmb3IgYW4gdW5oYW5kbGVkIENvbW1hbmQta2V5IGtleSBjb21tYW5kLiBUaGlzIG1hdGNoZXMg aU9TIGFuZCBNYWMgcGxhdGZvcm0gY29udmVudGlvbnMuCiAgICAgaWYgKGV2ZW50Lm1vZGlmaWVy RmxhZ3MgJiBXZWJFdmVudEZsYWdNYXNrQ29tbWFuZEtleSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IDJiZmEyNTkzOGQ0ZTIwODFmMGUx YmRhNDEzOTdiNjA0MWFhZmRkZDcuLmE1N2UxMDBmNzQyMTljYzM0YzI1MjI0ODM0ZTUzYWI1ZDA1 Yjc3MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRN TFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJIVE1MVmll dy5tbQpAQCAtNjA3MCwxMiArNjA3MCwxMCBAQCAtIChCT09MKV9oYW5kbGVFZGl0aW5nS2V5RXZl bnQ6KEtleWJvYXJkRXZlbnQgKil3Y0V2ZW50CiAKICAgICAgICAgYm9vbCBpc0NoYXJFdmVudCA9 IHBsYXRmb3JtRXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OkNoYXI7CiAK LSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDAKICAgICAgICAg aWYgKCFpc0NoYXJFdmVudCAmJiBbd2ViVmlldy5fVUlLaXREZWxlZ2F0ZUZvcndhcmRlciBoYW5k bGVLZXlUZXh0Q29tbWFuZEZvckN1cnJlbnRFdmVudF0pCiAgICAgICAgICAgICByZXR1cm4gWUVT OwogICAgICAgICBpZiAoaXNDaGFyRXZlbnQgJiYgW3dlYlZpZXcuX1VJS2l0RGVsZWdhdGVGb3J3 YXJkZXIgaGFuZGxlS2V5QXBwQ29tbWFuZEZvckN1cnJlbnRFdmVudF0pCiAgICAgICAgICAgICBy ZXR1cm4gWUVTOwotI2VuZGlmCiAKICAgICAgICAgTlNTdHJpbmcgKnMgPSBbZXZlbnQgY2hhcmFj dGVyc107CiAgICAgICAgIGlmICghcy5sZW5ndGgpCg==