178569 2017-10-19 23:21:04 -0700 [Curl] Clean up old style code in old curl files. 2017-11-15 13:02:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham buildbot commit-queue don.olmstead galpeter pvollan rniwa webkit-bug-importer oldest_to_newest 1362580 0 basuke 2017-10-19 23:21:04 -0700 Some old files uses #ifdef style include blocker which should be replaced with #pragma once. Also singletons should be defined as NeverDestroy. 1362605 1 324370 basuke 2017-10-20 01:03:19 -0700 Created attachment 324370 patch 1362629 2 324370 commit-queue 2017-10-20 02:22:58 -0700 Comment on attachment 324370 patch Clearing flags on attachment: 324370 Committed r223752: <https://trac.webkit.org/changeset/223752> 1362630 3 commit-queue 2017-10-20 02:22:59 -0700 All reviewed patches have been landed. Closing bug. 1372320 4 webkit-bug-importer 2017-11-15 13:02:04 -0800 <rdar://problem/35568653> 324370 2017-10-20 01:03:19 -0700 2017-10-20 02:22:58 -0700 patch 178569-1.diff text/plain 26943 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMzVlNmJiZWQxMC4uNzlkMWJlYzRmZjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1OCBAQAorMjAxNy0xMC0yMCAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIENsZWFuIHVwIG9sZCBzdHlsZSBjb2RlIGluIG9sZCBj dXJsIGZpbGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc4NTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQXV0aGVudGljYXRpb25DaGFsbGVuZ2UuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ2VydGlmaWNhdGVJbmZvLmg6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckN1cmwuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlRW50cnkuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvQ3VybENhY2hlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDdXJs Q2FjaGVNYW5hZ2VyOjpzaW5nbGV0b24pOgorICAgICAgICAoV2ViQ29yZTo6Q3VybENhY2hlTWFu YWdlcjo6Z2V0SW5zdGFuY2UpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv Y3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJs L0N1cmxDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxDb250ZXh0OjpzaW5nbGV0 b24pOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5oOgorICAg ICAgICAoV2ViQ29yZTo6Q3VybENvbnRleHQ6OnNpbmdsZXRvbik6IERlbGV0ZWQuCisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxKb2JNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkN1cmxKb2JNYW5hZ2VyOjpzaW5nbGV0b24pOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsSm9iTWFuYWdlci5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VybEpvYk1h bmFnZXI6OnNpbmdsZXRvbik6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9j dXJsL0N1cmxSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpzZXR1 cFRyYW5zZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3Qu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3REZWxlZ2F0ZS5o OgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVzcG9uc2UuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkN1cmxSZXNwb25zZTo6aXNvbGF0ZWRDb3B5IGNvbnN0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFNTTEhhbmRsZS5oOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvY3VybC9DdXJsU1NMVmVyaWZpZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvRG93bmxvYWRCdW5kbGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvTXVsdGlwYXJ0SGFuZGxlLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJs L1Jlc291cmNlRXJyb3IuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3Vy Y2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVDdXJsRGVsZWdhdGU6OmNyZWF0ZUN1cmxSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpjdXJsRGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpjdXJsRGlkUmVjZWl2ZUJ1 ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZTo6Y3Vy bERpZENvbXBsZXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVn YXRlOjpjdXJsRGlkRmFpbFdpdGhFcnJvcik6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9j dXJsL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 OjpSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojp1 cGRhdGVGcm9tRGVsZWdhdGVQcmVzZXJ2aW5nT2xkUHJvcGVydGllcyk6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmNmVVJMUmVxdWVzdCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3Q6Omh0dHBQaXBlbGluaW5nRW5hYmxlZCk6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnNldEhUVFBQaXBlbGluaW5nRW5hYmxlZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1SZXF1ZXN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJjZVJlcXVl c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3Jt SFRUUEJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVJl c291cmNlSFRUUEJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1Bs YXRmb3JtU2V0QXNJc29sYXRlZENvcHkpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3Vy bC9SZXNvdXJjZVJlc3BvbnNlQ3VybC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlOjppc0FwcGVuZGFibGVIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VS ZXNwb25zZTo6UmVzb3VyY2VSZXNwb25zZSk6CisKIDIwMTctMTAtMTkgIERhbmllbCBCYXRlcyAg PGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSAiPSBkZWZhdWx0IiB0byBkZW5vdGUg ZGVmYXVsdCBjb25zdHJ1Y3RvciBvciBkZXN0cnVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQXV0aGVudGljYXRpb25DaGFsbGVuZ2UuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9BdXRoZW50aWNhdGlvbkNoYWxsZW5n ZS5oCmluZGV4IGNhODZlM2I4ZGVhLi5kY2NhZDhlNGNjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0F1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlLmgKQEAgLTIzLDggKzIzLDggQEAKICAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4gCiAgKi8KLSNpZm5kZWYgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VfaAotI2RlZmluZSBBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZV9oCisKKyNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiQXV0aGVu dGljYXRpb25DaGFsbGVuZ2VCYXNlLmgiCiAjaW5jbHVkZSAiQXV0aGVudGljYXRpb25DbGllbnQu aCIKQEAgLTU1LDYgKzU1LDQgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8QXV0aGVudGljYXRpb25D bGllbnQ+IG1fYXV0aGVudGljYXRpb25DbGllbnQ7CiB9OwogCi19Ci0KLSNlbmRpZgorfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0NlcnRpZmljYXRlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0NlcnRpZmljYXRlSW5mby5oCmluZGV4IDA4NjE4MzA0MDRmLi43OThiZjFlMmMz NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0NlcnRp ZmljYXRlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D ZXJ0aWZpY2F0ZUluZm8uaApAQCAtMjMsOCArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgQ2VydGlmaWNhdGVJbmZvX2gKLSNkZWZpbmUg Q2VydGlmaWNhdGVJbmZvX2gKKyNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50 ZWQuaCIKIApAQCAtMzcsNiArMzYsNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBjb250YWluc05vblJv b3RTSEExU2lnbmVkQ2VydGlmaWNhdGUoKSBjb25zdCB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVy biBmYWxzZTsgfQogfTsKIAotfQotCi0jZW5kaWYKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJD dXJsLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyQ3Vy bC5oCmluZGV4IDcwOTE0N2Q4Y2ViLi5jYmYxODFlNDJhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckN1cmwuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyQ3VybC5oCkBAIC01Myw0ICs1 Myw0IEBAIGNsYXNzIENvb2tpZUphckN1cmxGaWxlU3lzdGVtIDogcHVibGljIENvb2tpZUphckN1 cmwgewogICAgIHZvaWQgZGVsZXRlQWxsQ29va2llc01vZGlmaWVkU2luY2UoY29uc3QgTmV0d29y a1N0b3JhZ2VTZXNzaW9uJiwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCkg b3ZlcnJpZGU7CiB9OwogCi19Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlRW50cnkuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVFbnRyeS5oCmluZGV4 IDNiMGIyMDU1MmMwLi45MmQ2YmMzM2E0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZUVudHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZUVudHJ5LmgKQEAgLTI0LDggKzI0LDcgQEAK ICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBDdXJsQ2FjaGVFbnRyeV9oCi0jZGVmaW5l IEN1cmxDYWNoZUVudHJ5X2gKKyNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiRmlsZVN5c3RlbS5o IgogI2luY2x1ZGUgIkhUVFBIZWFkZXJNYXAuaCIKQEAgLTk3LDYgKzk2LDQgQEAgcHJpdmF0ZToK ICAgICBib29sIGNsb3NlQ29udGVudEZpbGUoKTsKIH07CiAKLX0KLQotI2VuZGlmIC8vIEN1cmxD YWNoZUVudHJ5X2gKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcAppbmRl eCAzMTUzMGYzNWEwMS4uMzViZmUyZWYyYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlTWFuYWdlci5jcHAKQEAgLTM3LDE2 ICszNywxNyBAQAogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlSW50ZXJuYWwuaCIKICNpbmNsdWRl ICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUg PHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAog I2RlZmluZSBJT19CVUZGRVJTSVpFIDQwOTYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1DdXJs Q2FjaGVNYW5hZ2VyJiBDdXJsQ2FjaGVNYW5hZ2VyOjpnZXRJbnN0YW5jZSgpCitDdXJsQ2FjaGVN YW5hZ2VyJiBDdXJsQ2FjaGVNYW5hZ2VyOjpzaW5nbGV0b24oKQogewotICAgIHN0YXRpYyBDdXJs Q2FjaGVNYW5hZ2VyIGluc3RhbmNlOwotICAgIHJldHVybiBpbnN0YW5jZTsKKyAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8Q3VybENhY2hlTWFuYWdlcj4gc2hhcmVkSW5zdGFuY2U7CisgICAgcmV0 dXJuIHNoYXJlZEluc3RhbmNlOwogfQogCiBDdXJsQ2FjaGVNYW5hZ2VyOjpDdXJsQ2FjaGVNYW5h Z2VyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D dXJsQ2FjaGVNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENhY2hlTWFuYWdlci5oCmluZGV4IGY4NDk4NzE3M2MyLi40ZTI0OWM5YzJiMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZU1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hl TWFuYWdlci5oCkBAIC0yNCw4ICsyNCw3IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5k ZWYgQ3VybENhY2hlTWFuYWdlcl9oCi0jZGVmaW5lIEN1cmxDYWNoZU1hbmFnZXJfaAorI3ByYWdt YSBvbmNlCiAKICNpbmNsdWRlICJDdXJsQ2FjaGVFbnRyeS5oIgogI2luY2x1ZGUgIlJlc291cmNl SGFuZGxlLmgiCkBAIC0zNyw5ICszNiw5IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IEN1cmxDYWNoZU1hbmFnZXIgewotCisgICAgZnJpZW5kIE5ldmVyRGVzdHJveWVkPEN1cmxDYWNo ZU1hbmFnZXI+OwogcHVibGljOgotICAgIHN0YXRpYyBDdXJsQ2FjaGVNYW5hZ2VyJiBnZXRJbnN0 YW5jZSgpOworICAgIHN0YXRpYyBDdXJsQ2FjaGVNYW5hZ2VyJiBzaW5nbGV0b24oKTsKIAogICAg IHZvaWQgc2V0Q2FjaGVEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiAgICAgY29uc3QgU3RyaW5n JiBjYWNoZURpcmVjdG9yeSgpIHsgcmV0dXJuIG1fY2FjaGVEaXI7IH0KQEAgLTgwLDYgKzc5LDQg QEAgcHJpdmF0ZToKICAgICB2b2lkIHJlYWRDYWNoZWREYXRhKGNvbnN0IFN0cmluZyYsIFJlc291 cmNlSGFuZGxlKiwgUmVzb3VyY2VSZXNwb25zZSYpOwogfTsKIAotfQotCi0jZW5kaWYgLy8gQ3Vy bENhY2hlTWFuYWdlcl9oCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcAppbmRleCAzNThi YWU3ODlmZS4uNDViMzBiMTA0NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1 ZGUgIkhUVFBIZWFkZXJNYXAuaCIKICNpbmNsdWRlIDxOZXR3b3JrTG9hZE1ldHJpY3MuaD4KICNp bmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2lmIE9TKFdJTkRPV1MpCkBAIC0z OSw4ICs0MCw2IEBACiAjaW5jbHVkZSA8c2hsd2FwaS5oPgogI2VuZGlmCiAKLXVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBDU3RyaW5nIGNv b2tpZUphclBhdGgoKQpAQCAtNzcsNiArNzYsMTIgQEAgc3RhdGljIENTdHJpbmcgY29va2llSmFy UGF0aCgpCiAKIC8vIEN1cmxDb250ZXh0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAorQ3VybENvbnRleHQmIEN1cmxD b250ZXh0OjpzaW5nbGV0b24oKQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxDdXJsQ29u dGV4dD4gc2hhcmVkSW5zdGFuY2U7CisgICAgcmV0dXJuIHNoYXJlZEluc3RhbmNlOworfQorCiBD dXJsQ29udGV4dDo6Q3VybENvbnRleHQoKQogOiBtX2Nvb2tpZUphckZpbGVOYW1lIHsgY29va2ll SmFyUGF0aCgpIH0KICwgbV9jb29raWVKYXIgeyBzdGQ6Om1ha2VfdW5pcXVlPENvb2tpZUphckN1 cmxGaWxlU3lzdGVtPigpIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL0N1cmxDb250ZXh0LmgKaW5kZXggOWJjZDNiN2YyNGYuLjkyZDNiYWM2ZmMwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQu aApAQCAtOTIsNyArOTIsNyBAQCBwcml2YXRlOgogCiBjbGFzcyBDdXJsQ29udGV4dCA6IHB1Ymxp YyBDdXJsR2xvYmFsIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDdXJsQ29udGV4dCk7Ci0K KyAgICBmcmllbmQgTmV2ZXJEZXN0cm95ZWQ8Q3VybENvbnRleHQ+OwogcHVibGljOgogICAgIHN0 cnVjdCBQcm94eUluZm8gewogICAgICAgICBTdHJpbmcgaG9zdDsKQEAgLTEwNCwxMSArMTA0LDcg QEAgcHVibGljOgogICAgICAgICBjb25zdCBTdHJpbmcgdXJsKCkgY29uc3Q7CiAgICAgfTsKIAot ICAgIHN0YXRpYyBDdXJsQ29udGV4dCYgc2luZ2xldG9uKCkKLSAgICB7Ci0gICAgICAgIHN0YXRp YyBDdXJsQ29udGV4dCBzaGFyZWQ7Ci0gICAgICAgIHJldHVybiBzaGFyZWQ7Ci0gICAgfQorICAg IHN0YXRpYyBDdXJsQ29udGV4dCYgc2luZ2xldG9uKCk7CiAKICAgICB2aXJ0dWFsIH5DdXJsQ29u dGV4dCgpOwogCkBAIC0xNDIsNyArMTM4LDYgQEAgcHJpdmF0ZToKICAgICBDdXJsQ29udGV4dCgp OwogICAgIHZvaWQgaW5pdENvb2tpZVNlc3Npb24oKTsKIAotCiAjaWZuZGVmIE5ERUJVRwogICAg IEZJTEUqIG1fbG9nRmlsZSB7IG51bGxwdHIgfTsKICAgICBib29sIG1fdmVyYm9zZSB7IGZhbHNl IH07CkBAIC0yOTYsNCArMjkxLDQgQEAgcHJpdmF0ZToKICAgICBDdXJsU0xpc3QgbV9yZXF1ZXN0 SGVhZGVyczsKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsSm9iTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybEpvYk1hbmFnZXIuY3BwCmlu ZGV4IGM3MmQ2NTc1MzhkLi43NWM2ZDExODc0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxKb2JNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybEpvYk1hbmFnZXIuY3BwCkBAIC0zMCw2ICsz MCw4IEBACiAKICNpZiBVU0UoQ1VSTCkKIAorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5o PgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8qCkBAIC03Nyw2ICs3OSwxMiBAQCBwcml2YXRl OgogICAgIEhhc2hNYXA8Q1VSTCosIEN1cmxKb2JDbGllbnQqPiBtX2FjdGl2ZUpvYnM7CiB9Owog CitDdXJsSm9iTWFuYWdlciYgQ3VybEpvYk1hbmFnZXI6OnNpbmdsZXRvbigpCit7CisgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPEN1cmxKb2JNYW5hZ2VyPiBzaGFyZWRJbnN0YW5jZTsKKyAgICBy ZXR1cm4gc2hhcmVkSW5zdGFuY2U7Cit9CisKIGJvb2wgQ3VybEpvYk1hbmFnZXI6OmFkZChDdXJs Sm9iQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsSm9iTWFuYWdl ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxKb2JNYW5hZ2Vy LmgKaW5kZXggN2EwOGM0ZWI4MGUuLmI2NmYyM2I3Y2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybEpvYk1hbmFnZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybEpvYk1hbmFnZXIuaApAQCAtNTEsMTQg KzUxLDEwIEBAIHB1YmxpYzoKIAogY2xhc3MgQ3VybEpvYk1hbmFnZXIgewogICAgIFdURl9NQUtF X05PTkNPUFlBQkxFKEN1cmxKb2JNYW5hZ2VyKTsKKyAgICBmcmllbmQgTmV2ZXJEZXN0cm95ZWQ8 Q3VybEpvYk1hbmFnZXI+OwogcHVibGljOgotICAgIHN0YXRpYyBDdXJsSm9iTWFuYWdlciYgc2lu Z2xldG9uKCkKLSAgICB7Ci0gICAgICAgIHN0YXRpYyBDdXJsSm9iTWFuYWdlciBzaGFyZWQ7Ci0g ICAgICAgIHJldHVybiBzaGFyZWQ7Ci0gICAgfQorICAgIHN0YXRpYyBDdXJsSm9iTWFuYWdlciYg c2luZ2xldG9uKCk7CiAKLSAgICBDdXJsSm9iTWFuYWdlcigpID0gZGVmYXVsdDsKICAgICB+Q3Vy bEpvYk1hbmFnZXIoKSB7IHN0b3BUaHJlYWQoKTsgfQogCiAgICAgYm9vbCBhZGQoQ3VybEpvYkNs aWVudCopOwpAQCAtNjcsNiArNjMsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBjYWxsT25Kb2JUaHJl YWQoV1RGOjpGdW5jdGlvbjx2b2lkKCk+JiYpOwogCiBwcml2YXRlOgorICAgIEN1cmxKb2JNYW5h Z2VyKCkgPSBkZWZhdWx0OworCiAgICAgdm9pZCBzdGFydFRocmVhZElmTmVlZGVkKCk7CiAgICAg dm9pZCBzdG9wVGhyZWFkSWZOb01vcmVKb2JSdW5uaW5nKCk7CiAgICAgdm9pZCBzdG9wVGhyZWFk KCk7CkBAIC04NCw0ICs4Miw0IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3J1blRocmVhZCB7IGZh bHNlIH07CiB9OwogCi19Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcAppbmRleCA5MWVi ZDhkYmRmOS4uNGMyYzE4N2ZhZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcApAQCAtMTUyLDcgKzE1Miw3IEBAIENVUkwq IEN1cmxSZXF1ZXN0OjpzZXR1cFRyYW5zZmVyKCkKICAgICBtX2N1cmxIYW5kbGUtPnNldFVybCht X3JlcXVlc3QudXJsKCkpOwogICAgIG1fY3VybEhhbmRsZS0+YXBwZW5kUmVxdWVzdEhlYWRlcnMo bV9yZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKSk7CiAKLSAgICBhdXRvIG1ldGhvZCA9IG1fcmVx dWVzdC5odHRwTWV0aG9kKCk7CisgICAgY29uc3QgYXV0byYgbWV0aG9kID0gbV9yZXF1ZXN0Lmh0 dHBNZXRob2QoKTsKICAgICBpZiAobWV0aG9kID09ICJHRVQiKQogICAgICAgICBtX2N1cmxIYW5k bGUtPmVuYWJsZUh0dHBHZXRSZXF1ZXN0KCk7CiAgICAgZWxzZSBpZiAobWV0aG9kID09ICJQT1NU IikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJs UmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1 ZXN0LmgKaW5kZXggNTVkMDdiMmM4NzYuLjQwYmM1ZTVhYTU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaApAQCAtMTU3LDQgKzE1 Nyw0IEBAIHByaXZhdGU6CiAgICAgTmV0d29ya0xvYWRNZXRyaWNzIG1fbmV0d29ya0xvYWRNZXRy aWNzOwogfTsKIAotfQorfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0RGVsZWdhdGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdERlbGVnYXRlLmgK aW5kZXggMWIwMWU2Y2JhMjAuLmY3ZjViY2E5MmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3REZWxlZ2F0ZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdERlbGVnYXRlLmgKQEAg LTQxLDQgKzQxLDQgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjdXJsRGlkRmFpbFdpdGhF cnJvcihjb25zdCBSZXNvdXJjZUVycm9yJikgPSAwOwogfTsKIAotfQorfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L0N1cmxSZXNwb25zZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxSZXNwb25zZS5oCmluZGV4IDA5NWU2OGIyYTQwLi41MDI4OTE3MGI1NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXNwb25zZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVzcG9uc2UuaApAQCAt NDEsNyArNDEsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNvcHkuc3RhdHVzQ29kZSA9IHN0YXR1c0Nv ZGU7CiAgICAgICAgIGNvcHkuZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gZXhwZWN0ZWRDb250ZW50 TGVuZ3RoOwogCi0gICAgICAgIGZvciAoYXV0byBoZWFkZXIgOiBoZWFkZXJzKQorICAgICAgICBm b3IgKGNvbnN0IGF1dG8mIGhlYWRlciA6IGhlYWRlcnMpCiAgICAgICAgICAgICBjb3B5LmhlYWRl cnMuYXBwZW5kKGhlYWRlci5pc29sYXRlZENvcHkoKSk7CiAKICAgICAgICAgY29weS5jb25uZWN0 UG9ydCA9IGNvbm5lY3RQb3J0OwpAQCAtNTksNCArNTksNCBAQCBwdWJsaWM6CiAgICAgbG9uZyBh dmFpbGFibGVIdHRwQXV0aCB7IDAgfTsKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsU1NM SGFuZGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFNTTEhh bmRsZS5oCmluZGV4IDZiM2JmOGQzNTIyLi44NTNiNDU2ODc3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxTU0xIYW5kbGUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFNTTEhhbmRsZS5oCkBAIC02Myw1 ICs2Myw0IEBAIHByaXZhdGU6CiAgICAgSGFzaE1hcDxTdHJpbmcsIENsaWVudENlcnRpZmljYXRl LCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+IG1fYWxsb3dlZENsaWVudEhvc3RzOwogfTsKIAot Ci19Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFNTTFZlcmlmaWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFNTTFZlcmlmaWVyLmgKaW5kZXggMDU0YjFiOTU5YmYu LjRiOTUzMGQ2MWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvQ3VybFNTTFZlcmlmaWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0N1cmxTU0xWZXJpZmllci5oCkBAIC02Nyw5ICs2Nyw5IEBAIHByaXZhdGU6CiAK ICAgICBTU0xDZXJ0aWZpY2F0ZUZsYWdzIGNvbnZlcnRUb1NTTENlcnRpZmljYXRlRmxhZ3MoY29u c3QgdW5zaWduZWQmKTsKIAotICAgIEN1cmxIYW5kbGUqIG1fY3VybEhhbmRsZSB7IG51bGxwdHIg fTsKKyAgICBDdXJsSGFuZGxlKiBtX2N1cmxIYW5kbGUgeyB9OwogICAgIFN0cmluZyBtX2hvc3RO YW1lOwogICAgIGludCBtX3NzbEVycm9ycyB7IDAgfTsKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9Eb3dubG9hZEJ1bmRsZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L0Rvd25sb2FkQnVuZGxlLmgKaW5kZXggOGRlMjI0NWFhM2YuLmMxMjVkZWIxOGY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRG93bmxvYWRCdW5kbGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRG93bmxvYWRCdW5k bGUuaApAQCAtMjMsOCArMjMsNyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCiAgKi8KIAotI2lmbmRlZiBE b3dubG9hZEJ1bmRsZV9oCi0jZGVmaW5lIERvd25sb2FkQnVuZGxlX2gKKyNwcmFnbWEgb25jZQog CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KIApAQCAtMzcsNSArMzYsMyBAQCBjb25zdCBTdHJp bmcmIGZpbGVFeHRlbnNpb24oKTsKIAogfSAvLyBuYW1lc3BhY2UgRG93bmxvYWRCdW5kbGUKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlmIC8vIERvd25sb2FkQnVuZGxlX2gKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9NdWx0aXBhcnRIYW5k bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9NdWx0aXBhcnRIYW5k bGUuaAppbmRleCBmODVkMWI3NTE2Yy4uZjdlZDc0NmJjOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9NdWx0aXBhcnRIYW5kbGUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvTXVsdGlwYXJ0SGFuZGxlLmgKQEAgLTIz LDggKzIzLDggQEAKICAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwotI2lmbmRl ZiBNdWx0aXBhcnRIYW5kbGVfaAotI2RlZmluZSBNdWx0aXBhcnRIYW5kbGVfaAorCisjcHJhZ21h IG9uY2UKIAogI2luY2x1ZGUgIkhUVFBIZWFkZXJNYXAuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhh bmRsZS5oIgpAQCAtNzksNCArNzksMyBAQCBwcml2YXRlOgogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQotI2VuZGlmIC8vIE11bHRpcGFydEhhbmRsZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VFcnJvci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3IuaAppbmRleCA2NGMxMzA5 NTBmNS4uY2EyYzA1OTYzZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3IuaApAQCAtNjEsNSArNjEsNCBAQCBwcml2YXRlOgog ICAgIHVuc2lnbmVkIG1fc3NsRXJyb3JzIHsgMCB9OwogfTsKIAotfQotCit9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlLmNwcAppbmRleCA1MDBl ZDViYjk0NC4uOGI4NTc3MzhmNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl LmNwcApAQCAtMTU2LDE0ICsxNTYsMTQgQEAgUmVmPEN1cmxSZXF1ZXN0PiBSZXNvdXJjZUhhbmRs ZUN1cmxEZWxlZ2F0ZTo6Y3JlYXRlQ3VybFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JgogCiAgICAg Ym9vbCBoYXNDYWNoZUhlYWRlcnMgPSByZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKS5jb250YWlu cyhIVFRQSGVhZGVyTmFtZTo6SWZNb2RpZmllZFNpbmNlKSB8fCByZXF1ZXN0Lmh0dHBIZWFkZXJG aWVsZHMoKS5jb250YWlucyhIVFRQSGVhZGVyTmFtZTo6SWZOb25lTWF0Y2gpOwogICAgIGlmICgh aGFzQ2FjaGVIZWFkZXJzKSB7Ci0gICAgICAgIGF1dG8mIGNhY2hlID0gQ3VybENhY2hlTWFuYWdl cjo6Z2V0SW5zdGFuY2UoKTsKKyAgICAgICAgYXV0byYgY2FjaGUgPSBDdXJsQ2FjaGVNYW5hZ2Vy OjpzaW5nbGV0b24oKTsKICAgICAgICAgVVJMIGNhY2hlVXJsID0gcmVxdWVzdC51cmwoKTsKICAg ICAgICAgY2FjaGVVcmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CiAKICAgICAgICAgaWYg KGNhY2hlLmlzQ2FjaGVkKGNhY2hlVXJsKSkgewogICAgICAgICAgICAgY2FjaGUuYWRkQ2FjaGVF bnRyeUNsaWVudChjYWNoZVVybCwgbV9oYW5kbGUpOwogCi0gICAgICAgICAgICBmb3IgKGF1dG8g ZW50cnkgOiBjYWNoZS5yZXF1ZXN0SGVhZGVycyhjYWNoZVVybCkpCisgICAgICAgICAgICBmb3Ig KGNvbnN0IGF1dG8mIGVudHJ5IDogY2FjaGUucmVxdWVzdEhlYWRlcnMoY2FjaGVVcmwpKQogICAg ICAgICAgICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRlckZpZWxkKGVudHJ5LmtleSwgZW50cnku dmFsdWUpOwogCiAgICAgICAgICAgICBtX2FkZGVkQ2FjaGVWYWxpZGF0aW9uSGVhZGVycyA9IHRy dWU7CkBAIC0yMTgsNyArMjE4LDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZTo6 Y3VybERpZFJlY2VpdmVSZXNwb25zZShjb25zdCBDdXJsUmVzcG9uc2UmIHJlY2UKICAgICAgICAg ICAgIFVSTCBjYWNoZVVybCA9IG1fY3VycmVudFJlcXVlc3QudXJsKCk7CiAgICAgICAgICAgICBj YWNoZVVybC5yZW1vdmVGcmFnbWVudElkZW50aWZpZXIoKTsKIAotICAgICAgICAgICAgaWYgKEN1 cmxDYWNoZU1hbmFnZXI6OmdldEluc3RhbmNlKCkuZ2V0Q2FjaGVkUmVzcG9uc2UoY2FjaGVVcmws IHJlc3BvbnNlKCkpKSB7CisgICAgICAgICAgICBpZiAoQ3VybENhY2hlTWFuYWdlcjo6c2luZ2xl dG9uKCkuZ2V0Q2FjaGVkUmVzcG9uc2UoY2FjaGVVcmwsIHJlc3BvbnNlKCkpKSB7CiAgICAgICAg ICAgICAgICAgaWYgKG1fYWRkZWRDYWNoZVZhbGlkYXRpb25IZWFkZXJzKSB7CiAgICAgICAgICAg ICAgICAgICAgIHJlc3BvbnNlKCkuc2V0SFRUUFN0YXR1c0NvZGUoMjAwKTsKICAgICAgICAgICAg ICAgICAgICAgcmVzcG9uc2UoKS5zZXRIVFRQU3RhdHVzVGV4dCgiT0siKTsKQEAgLTIyNiw3ICsy MjYsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpjdXJsRGlkUmVjZWl2ZVJl c3BvbnNlKGNvbnN0IEN1cmxSZXNwb25zZSYgcmVjZQogICAgICAgICAgICAgfQogICAgICAgICB9 CiAKLSAgICAgICAgQ3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5kaWRSZWNlaXZlUmVz cG9uc2UoKm1faGFuZGxlLCByZXNwb25zZSgpKTsKKyAgICAgICAgQ3VybENhY2hlTWFuYWdlcjo6 c2luZ2xldG9uKCkuZGlkUmVjZWl2ZVJlc3BvbnNlKCptX2hhbmRsZSwgcmVzcG9uc2UoKSk7CiAK ICAgICAgICAgYXV0byBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqbV9oYW5kbGUpOwogICAgICAg ICBtX2hhbmRsZS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UocmVzcG9uc2Uo KSkpOwpAQCAtMjQzLDcgKzI0Myw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6 OmN1cmxEaWRSZWNlaXZlQnVmZmVyKFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVmZmVyCiAgICAgaWYg KG1fbXVsdGlwYXJ0SGFuZGxlKQogICAgICAgICBtX211bHRpcGFydEhhbmRsZS0+Y29udGVudFJl Y2VpdmVkKGJ1ZmZlci0+ZGF0YSgpLCBidWZmZXItPnNpemUoKSk7CiAgICAgZWxzZSBpZiAobV9o YW5kbGUtPmNsaWVudCgpKSB7Ci0gICAgICAgIEN1cmxDYWNoZU1hbmFnZXI6OmdldEluc3RhbmNl KCkuZGlkUmVjZWl2ZURhdGEoKm1faGFuZGxlLCBidWZmZXItPmRhdGEoKSwgYnVmZmVyLT5zaXpl KCkpOworICAgICAgICBDdXJsQ2FjaGVNYW5hZ2VyOjpzaW5nbGV0b24oKS5kaWRSZWNlaXZlRGF0 YSgqbV9oYW5kbGUsIGJ1ZmZlci0+ZGF0YSgpLCBidWZmZXItPnNpemUoKSk7CiAgICAgICAgIG1f aGFuZGxlLT5jbGllbnQoKS0+ZGlkUmVjZWl2ZUJ1ZmZlcihtX2hhbmRsZSwgV1RGTW92ZShidWZm ZXIpLCBidWZmZXItPnNpemUoKSk7CiAgICAgfQogfQpAQCAtMjYyLDcgKzI2Miw3IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmN1cmxEaWRDb21wbGV0ZSgpCiAgICAgICAgIG1f bXVsdGlwYXJ0SGFuZGxlLT5jb250ZW50RW5kZWQoKTsKIAogICAgIGlmIChtX2hhbmRsZS0+Y2xp ZW50KCkpIHsKLSAgICAgICAgQ3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5kaWRGaW5p c2hMb2FkaW5nKCptX2hhbmRsZSk7CisgICAgICAgIEN1cmxDYWNoZU1hbmFnZXI6OnNpbmdsZXRv bigpLmRpZEZpbmlzaExvYWRpbmcoKm1faGFuZGxlKTsKICAgICAgICAgbV9oYW5kbGUtPmNsaWVu dCgpLT5kaWRGaW5pc2hMb2FkaW5nKG1faGFuZGxlKTsKICAgICB9CiB9CkBAIC0yNzQsNyArMjc0 LDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZTo6Y3VybERpZEZhaWxXaXRoRXJy b3IoY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3UKICAgICBpZiAoY2FuY2VsbGVkT3JDbGllbnRs ZXNzKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEN1cmxDYWNoZU1hbmFnZXI6OmdldEluc3Rh bmNlKCkuZGlkRmFpbCgqbV9oYW5kbGUpOworICAgIEN1cmxDYWNoZU1hbmFnZXI6OnNpbmdsZXRv bigpLmRpZEZhaWwoKm1faGFuZGxlKTsKICAgICBtX2hhbmRsZS0+Y2xpZW50KCktPmRpZEZhaWwo bV9oYW5kbGUsIHJlc291cmNlRXJyb3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VSZXF1ZXN0LmgKaW5kZXggN2RiZjY0ZGZi NjguLjFiYzNmZjAyMDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlUmVxdWVzdC5oCkBAIC0yNCw4ICsyNCw3IEBACiAgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLSNpZm5kZWYgUmVzb3VyY2VSZXF1ZXN0X2gKLSNkZWZpbmUgUmVzb3Vy Y2VSZXF1ZXN0X2gKKyNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0QmFz ZS5oIgogCkBAIC0zMyw1NiArMzIsNTQgQEAgdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX0NGVVJMUmVx dWVzdCogQ0ZVUkxSZXF1ZXN0UmVmOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSAgICBjbGFz cyBSZXNvdXJjZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7Ci0gICAgcHVi bGljOgotICAgICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpCi0gICAgICAg ICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgVXNl UHJvdG9jb2xDYWNoZVBvbGljeSkKLSAgICAgICAgewotICAgICAgICB9CitjbGFzcyBSZXNvdXJj ZVJlcXVlc3QgOiBwdWJsaWMgUmVzb3VyY2VSZXF1ZXN0QmFzZSB7CitwdWJsaWM6CisgICAgUmVz b3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKQorICAgICAgICA6IFJlc291cmNlUmVxdWVz dEJhc2UoVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkK KyAgICB7CisgICAgfQogCi0gICAgICAgIFJlc291cmNlUmVxdWVzdChjb25zdCBVUkwmIHVybCkK LSAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2FjaGVQ b2xpY3kpCi0gICAgICAgIHsKLSAgICAgICAgfQorICAgIFJlc291cmNlUmVxdWVzdChjb25zdCBV UkwmIHVybCkKKyAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNlUHJvdG9jb2xD YWNoZVBvbGljeSkKKyAgICB7CisgICAgfQogCi0gICAgICAgIFJlc291cmNlUmVxdWVzdChjb25z dCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQ b2xpY3kgcG9saWN5ID0gVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKLSAgICAgICAgICAgIDogUmVz b3VyY2VSZXF1ZXN0QmFzZSh1cmwsIHBvbGljeSkKLSAgICAgICAgewotICAgICAgICAgICAgc2V0 SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKLSAgICAgICAgfQorICAgIFJlc291cmNlUmVxdWVzdChj b25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgUmVzb3VyY2VSZXF1ZXN0Q2Fj aGVQb2xpY3kgcG9saWN5ID0gVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKKyAgICAgICAgOiBSZXNv dXJjZVJlcXVlc3RCYXNlKHVybCwgcG9saWN5KQorICAgIHsKKyAgICAgICAgc2V0SFRUUFJlZmVy cmVyKHJlZmVycmVyKTsKKyAgICB9CiAKLSAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KCkKLSAgICAg ICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShVUkwoKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGlj eSkKLSAgICAgICAgewotICAgICAgICB9CisgICAgUmVzb3VyY2VSZXF1ZXN0KCkKKyAgICAgICAg OiBSZXNvdXJjZVJlcXVlc3RCYXNlKFVSTCgpLCBVc2VQcm90b2NvbENhY2hlUG9saWN5KQorICAg IHsKKyAgICB9CiAKLSAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KENGVVJMUmVxdWVzdFJlZikKLSAg ICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSgpCi0gICAgICAgIHsKLSAgICAgICAgfQor ICAgIFJlc291cmNlUmVxdWVzdChDRlVSTFJlcXVlc3RSZWYpCisgICAgICAgIDogUmVzb3VyY2VS ZXF1ZXN0QmFzZSgpCisgICAgeworICAgIH0KIAotICAgICAgICB2b2lkIHVwZGF0ZUZyb21EZWxl Z2F0ZVByZXNlcnZpbmdPbGRQcm9wZXJ0aWVzKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgZGVsZWdh dGVQcm92aWRlZFJlcXVlc3QpIHsgKnRoaXMgPSBkZWxlZ2F0ZVByb3ZpZGVkUmVxdWVzdDsgfQor ICAgIHZvaWQgdXBkYXRlRnJvbURlbGVnYXRlUHJlc2VydmluZ09sZFByb3BlcnRpZXMoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiBkZWxlZ2F0ZVByb3ZpZGVkUmVxdWVzdCkgeyAqdGhpcyA9IGRlbGVn YXRlUHJvdmlkZWRSZXF1ZXN0OyB9CiAKLSAgICAgICAgLy8gTmVlZGVkIGZvciBjb21wYXRpYmls aXR5LgotICAgICAgICBDRlVSTFJlcXVlc3RSZWYgY2ZVUkxSZXF1ZXN0KEhUVFBCb2R5VXBkYXRl UG9saWN5KSBjb25zdCB7IHJldHVybiAwOyB9CisgICAgLy8gTmVlZGVkIGZvciBjb21wYXRpYmls aXR5LgorICAgIENGVVJMUmVxdWVzdFJlZiBjZlVSTFJlcXVlc3QoSFRUUEJvZHlVcGRhdGVQb2xp Y3kpIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAotICAgICAgICAvLyBUaGUgZm9sbG93aW5nIHR3byBz dHVicyBhcmUgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBDRk5ldHdvcmssIGFuZCBhcmUgbm90IHVz ZWQuCi0gICAgICAgIHN0YXRpYyBib29sIGh0dHBQaXBlbGluaW5nRW5hYmxlZCgpIHsgcmV0dXJu IGZhbHNlOyB9Ci0gICAgICAgIHN0YXRpYyB2b2lkIHNldEhUVFBQaXBlbGluaW5nRW5hYmxlZChi b29sKSB7IH0KKyAgICAvLyBUaGUgZm9sbG93aW5nIHR3byBzdHVicyBhcmUgZm9yIGNvbXBhdGli aWxpdHkgd2l0aCBDRk5ldHdvcmssIGFuZCBhcmUgbm90IHVzZWQuCisgICAgc3RhdGljIGJvb2wg aHR0cFBpcGVsaW5pbmdFbmFibGVkKCkgeyByZXR1cm4gZmFsc2U7IH0KKyAgICBzdGF0aWMgdm9p ZCBzZXRIVFRQUGlwZWxpbmluZ0VuYWJsZWQoYm9vbCkgeyB9CiAKLSAgICBwcml2YXRlOgotICAg ICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0QmFzZTsKK3ByaXZhdGU6CisgICAgZnJp ZW5kIGNsYXNzIFJlc291cmNlUmVxdWVzdEJhc2U7CiAKLSAgICAgICAgdm9pZCBkb1VwZGF0ZVBs YXRmb3JtUmVxdWVzdCgpIHsgfQotICAgICAgICB2b2lkIGRvVXBkYXRlUmVzb3VyY2VSZXF1ZXN0 KCkgeyB9Ci0gICAgICAgIHZvaWQgZG9VcGRhdGVQbGF0Zm9ybUhUVFBCb2R5KCkgeyB9Ci0gICAg ICAgIHZvaWQgZG9VcGRhdGVSZXNvdXJjZUhUVFBCb2R5KCkgeyB9CisgICAgdm9pZCBkb1VwZGF0 ZVBsYXRmb3JtUmVxdWVzdCgpIHsgfQorICAgIHZvaWQgZG9VcGRhdGVSZXNvdXJjZVJlcXVlc3Qo KSB7IH0KKyAgICB2b2lkIGRvVXBkYXRlUGxhdGZvcm1IVFRQQm9keSgpIHsgfQorICAgIHZvaWQg ZG9VcGRhdGVSZXNvdXJjZUhUVFBCb2R5KCkgeyB9CiAKLSAgICAgICAgdm9pZCBkb1BsYXRmb3Jt U2V0QXNJc29sYXRlZENvcHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JikgeyB9CisgICAgdm9pZCBk b1BsYXRmb3JtU2V0QXNJc29sYXRlZENvcHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JikgeyB9CiAK LSAgICAgICAgc3RhdGljIGJvb2wgc19odHRwUGlwZWxpbmluZ0VuYWJsZWQ7Ci0gICAgfTsKKyAg ICBzdGF0aWMgYm9vbCBzX2h0dHBQaXBlbGluaW5nRW5hYmxlZDsKK307CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKLQotI2VuZGlmIC8vIFJlc291cmNlUmVxdWVzdF9oCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VSZXNwb25zZUN1cmwu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlUmVzcG9u c2VDdXJsLmNwcAppbmRleCAwODE5NzRkZGNlYy4uMTQ4MGM4NDdjZDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZVJlc3BvbnNlQ3VybC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlUmVz cG9uc2VDdXJsLmNwcApAQCAtNjgsNyArNjgsNyBAQCBib29sIFJlc291cmNlUmVzcG9uc2U6Omlz QXBwZW5kYWJsZUhlYWRlcihjb25zdCBTdHJpbmcgJmtleSkKICAgICBpZiAoa2V5LnN0YXJ0c1dp dGgoIngtIiwgLyogY2FzZVNlbnNpdGl2ZSAqLyBmYWxzZSkpCiAgICAgICAgIHJldHVybiB0cnVl OwogCi0gICAgZm9yIChhdXRvJiBoZWFkZXIgOiBhcHBlbmRhYmxlSGVhZGVycykgeworICAgIGZv ciAoY29uc3QgYXV0byYgaGVhZGVyIDogYXBwZW5kYWJsZUhlYWRlcnMpIHsKICAgICAgICAgaWYg KGVxdWFsSWdub3JpbmdBU0NJSUNhc2Uoa2V5LCBoZWFkZXIpKQogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQpAQCAtODEsNyArODEsNyBAQCBSZXNvdXJjZVJlc3BvbnNlOjpSZXNvdXJj ZVJlc3BvbnNlKGNvbnN0IEN1cmxSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAgICAgc2V0SFRUUFN0 YXR1c0NvZGUocmVzcG9uc2Uuc3RhdHVzQ29kZSk7CiAKLSAgICBmb3IgKGF1dG8gaGVhZGVyIDog cmVzcG9uc2UuaGVhZGVycykKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGhlYWRlciA6IHJlc3BvbnNl LmhlYWRlcnMpCiAgICAgICAgIGFwcGVuZEhUVFBIZWFkZXJGaWVsZChoZWFkZXIpOwogCiAgICAg c2V0TWltZVR5cGUoZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShodHRwSGVhZGVyRmllbGQo SFRUUEhlYWRlck5hbWU6OkNvbnRlbnRUeXBlKSkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5kZXggY2NiYmU3NDQ0Y2IuLmE1ZTZlN2IxNTY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMTAt MjAgIEJhc3VrZSBTdXp1a2kgIDxCYXN1a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtD dXJsXSBDbGVhbiB1cCBvbGQgc3R5bGUgY29kZSBpbiBvbGQgY3VybCBmaWxlcy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODU2OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ2FjaGUuY3BwOgor ICAgICAgICAoV2ViQ2FjaGU6OmNhY2hlRm9sZGVyKToKKyAgICAgICAgKFdlYkNhY2hlOjpzZXRD YWNoZUZvbGRlcik6CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojpz ZXRDYWNoZU1vZGVsKToKKwogMjAxNy0xMC0xOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtTZXR0aW5nc10gTW92ZSBnbG9iYWwgc2V0dGluZ3MgaW50byB0aGVpciBv d24gZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ2FjaGUuY3Bw IGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ2FjaGUuY3BwCmluZGV4IDU5MWFmYTU5MDI1 Li43NTYzMmRmMDIxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ2Fj aGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNhY2hlLmNwcApAQCAtMjQ1 LDcgKzI0NSw3IEBAIEhSRVNVTFQgV2ViQ2FjaGU6OmRpc2FibGVkKF9PdXRfIEJPT0wqIGRpc2Fi bGVkKQogSFJFU1VMVCBXZWJDYWNoZTo6Y2FjaGVGb2xkZXIoX19kZXJlZl9vdXRfb3B0IEJTVFIq IGxvY2F0aW9uKQogewogI2lmIFVTRShDVVJMKQotICAgIFN0cmluZyBjYWNoZUZvbGRlciA9IFdl YkNvcmU6OkN1cmxDYWNoZU1hbmFnZXI6OmdldEluc3RhbmNlKCkuY2FjaGVEaXJlY3RvcnkoKTsK KyAgICBTdHJpbmcgY2FjaGVGb2xkZXIgPSBXZWJDb3JlOjpDdXJsQ2FjaGVNYW5hZ2VyOjpzaW5n bGV0b24oKS5jYWNoZURpcmVjdG9yeSgpOwogICAgICpsb2NhdGlvbiA9IFdlYkNvcmU6OkJTdHJp bmcoY2FjaGVGb2xkZXIpLnJlbGVhc2UoKTsKICAgICByZXR1cm4gU19PSzsKICNlbGlmIFVTRShD RlVSTENPTk5FQ1RJT04pCkBAIC0yNjEsNyArMjYxLDcgQEAgSFJFU1VMVCBXZWJDYWNoZTo6c2V0 Q2FjaGVGb2xkZXIoX0luXyBCU1RSIGxvY2F0aW9uKQogewogI2lmIFVTRShDVVJMKQogICAgIFN0 cmluZyBjYWNoZUZvbGRlcihsb2NhdGlvbiwgU3lzU3RyaW5nTGVuKGxvY2F0aW9uKSk7Ci0gICAg V2ViQ29yZTo6Q3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5zZXRDYWNoZURpcmVjdG9y eShjYWNoZUZvbGRlcik7CisgICAgV2ViQ29yZTo6Q3VybENhY2hlTWFuYWdlcjo6c2luZ2xldG9u KCkuc2V0Q2FjaGVEaXJlY3RvcnkoY2FjaGVGb2xkZXIpOwogICAgIHJldHVybiBTX09LOwogI2Vs aWYgVVNFKENGVVJMQ09OTkVDVElPTikKICAgICBSZXRhaW5QdHI8Q0ZVUkxDYWNoZVJlZj4gY2Fj aGUgPSBhZG9wdENGKENGVVJMQ2FjaGVDb3B5U2hhcmVkVVJMQ2FjaGUoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvd2luL1dlYlZpZXcuY3BwCmluZGV4IDRmY2U5YzZhMWU1Li5mN2FmNzZmYmFjZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAKQEAgLTUxMyw3ICs1MTMsNyBAQCB2b2lkIFdlYlZp ZXc6OnNldENhY2hlTW9kZWwoV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsKQogICAgIENGSW5kZXgg Y2FjaGVNZW1vcnlDYXBhY2l0eSA9IDA7CiAgICAgQ0ZJbmRleCBjYWNoZURpc2tDYXBhY2l0eSA9 IDA7CiAjZWxpZiBVU0UoQ1VSTCkKLSAgICBjYWNoZURpcmVjdG9yeSA9IEN1cmxDYWNoZU1hbmFn ZXI6OmdldEluc3RhbmNlKCkuY2FjaGVEaXJlY3RvcnkoKTsKKyAgICBjYWNoZURpcmVjdG9yeSA9 IEN1cmxDYWNoZU1hbmFnZXI6OnNpbmdsZXRvbigpLmNhY2hlRGlyZWN0b3J5KCk7CiAgICAgbG9u ZyBjYWNoZU1lbW9yeUNhcGFjaXR5ID0gMDsKICAgICBsb25nIGNhY2hlRGlza0NhcGFjaXR5ID0g MDsKICNlbmRpZgpAQCAtNjg0LDcgKzY4NCw3IEBAIHZvaWQgV2ViVmlldzo6c2V0Q2FjaGVNb2Rl bChXZWJDYWNoZU1vZGVsIGNhY2hlTW9kZWwpCiAgICAgQ0ZVUkxDYWNoZVNldE1lbW9yeUNhcGFj aXR5KGNmdXJsQ2FjaGUuZ2V0KCksIGNhY2hlTWVtb3J5Q2FwYWNpdHkpOwogICAgIENGVVJMQ2Fj aGVTZXREaXNrQ2FwYWNpdHkoY2Z1cmxDYWNoZS5nZXQoKSwgY2FjaGVEaXNrQ2FwYWNpdHkpOwog I2VsaWYgVVNFKENVUkwpCi0gICAgQ3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5zZXRT dG9yYWdlU2l6ZUxpbWl0KGNhY2hlRGlza0NhcGFjaXR5KTsKKyAgICBDdXJsQ2FjaGVNYW5hZ2Vy OjpzaW5nbGV0b24oKS5zZXRTdG9yYWdlU2l6ZUxpbWl0KGNhY2hlRGlza0NhcGFjaXR5KTsKICNl bmRpZgogCiAgICAgc19kaWRTZXRDYWNoZU1vZGVsID0gdHJ1ZTsK