170349 2017-03-31 11:29:36 -0700 Clean up the "StorageType" enum 2017-03-31 12:27:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson aestes buildbot cdumez commit-queue dbates japhet thorton oldest_to_newest 1293216 0 beidson 2017-03-31 11:29:36 -0700 Clean up the "StorageType" enum 1293219 1 305987 beidson 2017-03-31 11:38:19 -0700 Created attachment 305987 Patch 1293258 2 305987 commit-queue 2017-03-31 12:27:55 -0700 Comment on attachment 305987 Patch Clearing flags on attachment: 305987 Committed r214680: <http://trac.webkit.org/changeset/214680> 1293259 3 commit-queue 2017-03-31 12:27:56 -0700 All reviewed patches have been landed. Closing bug. 305987 2017-03-31 11:38:19 -0700 2017-03-31 12:27:55 -0700 Patch bug-170349-20170331113818.patch text/plain 23946 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE1YjhhOTJjM2U4ZWYy NDY4ZmNjOWYyNmI2OWUyNzE1OThiNmQzMi4uNDBlNmQyMDAwYzU1NWExMjY1YmRjMTVhZWM0NDJl MWEyMTRmZTdmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE3LTAzLTMxICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCB0aGUgIlN0 b3JhZ2VUeXBlIiBlbnVtLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcwMzQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgLSBNYWtlIHRoaXMgYGVudW1gIGludG8gYW4gYGVudW0gY2xhc3NgCisgICAgICAg IC0gQWRkIGEgbmV3IHR5cGUgc3BlY2lmaWMgZm9yICJ0cmFuc2llbnQgbG9jYWwgc3RvcmFnZSIK KworICAgICAgICBObyBuZXcgdGVzdHMgKE5vIGJlaGF2aW9yIGNoYW5nZSkuCisKKyAgICAgICAg KiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIAorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpkaWREaXNwYXRjaERPTVN0b3JhZ2VFdmVudCk6 CisgICAgICAgIAorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aDoKKyAgICAgICAgCisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHA6CisgICAgICAg IAorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdG9y YWdlOjppc0Rpc2FibGVkQnlQcml2YXRlQnJvd3NpbmcpOgorICAgICAgICAKKyAgICAgICAgKiBz dG9yYWdlL1N0b3JhZ2VBcmVhLmg6CisgICAgICAgICgpOiBEZWxldGVkLgorICAgICAgICAKKyAg ICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VFdmVudERpc3BhdGNoZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3RvcmFnZUV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTZXNzaW9uU3RvcmFnZUV2ZW50 c1RvRnJhbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRp c3BhdGNoTG9jYWxTdG9yYWdlRXZlbnRzVG9GcmFtZXMpOgorICAgICAgICAKKyAgICAgICAgKiBz dG9yYWdlL1N0b3JhZ2VUeXBlLmg6CisgICAgICAgIChXZWJDb3JlOjppc0xvY2FsU3RvcmFnZSk6 CisKIDIwMTctMDMtMzEgIFJvbWFpbiBCZWxsZXNzb3J0ICA8cm9tYWluLmJlbGxlc3NvcnRAY3Jm LmNhbm9uLmZyPgogCiAgICAgICAgIFtSZWFkYWJsZSBTdHJlYW1zIEFQSV0gSW1wbGVtZW50IGNs b25lQXJyYXlCdWZmZXIgaW4gV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA3OTdjZDE1ZmFmN2ZkNWVjZGY1 ODQ4MTQ2OTlhMGVmZWI2Y2YxNmM0Li44ODQ1YTVlYmE1NTgyYjIxNDNhZjJhNjMzNDNmOTA5MGI3 MmE2ODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTAzLTMxICBCcmFkeSBFaWRz b24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCB0aGUgIlN0b3JhZ2VU eXBlIiBlbnVtLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTcwMzQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VBcmVhSW1wbDo6ZGlzcGF0Y2hTdG9yYWdlRXZlbnQpOgorICAgICAgICAKKyAgICAgICAgKiBT dG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFn ZU5hbWVzcGFjZUltcGw6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OmdldE9yQ3JlYXRlTG9jYWxTdG9yYWdlTmFt ZXNwYWNlKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OlN0b3JhZ2VO YW1lc3BhY2VJbXBsKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU5hbWVzcGFjZUltcGw6On5T dG9yYWdlTmFtZXNwYWNlSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VOYW1lc3BhY2VJ bXBsOjpjb3B5KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU5hbWVzcGFjZUltcGw6OmNsb3Nl KToKKwogMjAxNy0wMy0yNyAgSkYgQmFzdGllbiAgPGpmYmFzdGllbkBhcHBsZS5jb20+CiAKICAg ICAgICAgbWFrZSBidWlsZCBmaXggZm9yIFdlYkRlZmF1bHRVSURlbGVnYXRlLm0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCBlMGZmMGMzZWRiNGVmNGFmODcyMGU4YTU2M2ViY2M1Yjc5ZDliYjViLi5jYmVkMjZmODRk YjNiZTg3YmI4Y2YxNGU5OTE3YjBmODcwYTlmMDA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTctMDMtMzEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIENsZWFuIHVwIHRoZSAiU3RvcmFnZVR5cGUiIGVudW0uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAzNDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdl QXJlYU1hcC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpTdG9yYWdlQXJl YU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaFN0b3JhZ2VF dmVudCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaFNlc3Npb25T dG9yYWdlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hM b2NhbFN0b3JhZ2VFdmVudCk6CisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VOYW1l c3BhY2VJbXBsOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgIChXZWJL aXQ6OlN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgor ICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTmFtZXNwYWNlSW1wbDo6Y3JlYXRlVHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlKToKKworMjAxNy0wMy0zMSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIGVycm9uZW91c2x5IGNvbW1pdHRlZCBjaGFu Z2VzIGZyb20gcjIxNDA3OAogCiAgICAgICAgIFVucmV2aWV3ZWQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggZTY2M2Q3Y2Y0ODQ2 YTA4M2VjY2Y4YTI4ZmQ1NzQ4MDk5MTZkYTliYy4uMDAwNTA0OWExOTlkYjExNzgxOGFkNjMzNWMx YmVjYmJiNTRmYTIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtMjI1OCw2ICsyMjU4LDcgQEAKIAkJNTE2MTAzQjAxQ0FEQkE3 QTAwMTZCNEM3IC8qIElEQlZhbHVlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDUxNjEwM0FEMUNBREI5QTMwMDE2QjRDNyAvKiBJREJWYWx1ZS5jcHAg Ki87IH07CiAJCTUxNjJDN0Y0MTFGNzdFRkIwMDYxMkVGRSAvKiBTY2hlbWVSZWdpc3RyeS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTYyQzdGMjEx Rjc3RUZBMDA2MTJFRkUgLyogU2NoZW1lUmVnaXN0cnkuY3BwICovOyB9OwogCQk1MTYyQzdGNTEx Rjc3RUZCMDA2MTJFRkUgLyogU2NoZW1lUmVnaXN0cnkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNjJDN0YzMTFGNzdFRkIwMDYxMkVGRSAvKiBTY2hl bWVSZWdpc3RyeS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CisJCTUxNjZEM0NEMUU4RUQ0OEYwMEFENjJFMyAvKiBTdG9yYWdlVHlwZS5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE2NkQzQ0MxRThFRDQxMTAw QUQ2MkUzIC8qIFN0b3JhZ2VUeXBlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKIAkJNTE2OTUzOTcxMzI5QTNDODAwQjkyRDA0IC8qIEljb25EYXRhYmFz ZUJhc2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g NTE2OTUzOTUxMzI5QTNDODAwQjkyRDA0IC8qIEljb25EYXRhYmFzZUJhc2UuY3BwICovOyB9Owog CQk1MTY5NTM5ODEzMjlBM0M4MDBCOTJEMDQgLyogSWNvbkRhdGFiYXNlQmFzZS5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE2OTUzOTYxMzI5QTNDODAw QjkyRDA0IC8qIEljb25EYXRhYmFzZUJhc2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQk1MTZCQjc5NDBDRTkxRTY4MDA1MTJGNzkgLyogSlNUcmVl V2Fsa2VyQ3VzdG9tLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDUxNkJCNzkyMENFOTFFNjgwMDUxMkY3OSAvKiBKU1RyZWVXYWxrZXJDdXN0b20uY3Bw ICovOyB9OwpAQCAtOTkyOCw2ICs5OTI5LDcgQEAKIAkJNTE2NDVCNTIxQjlGODg5QjAwRjc4OUNF IC8qIElEQlZlcnNpb25DaGFuZ2VFdmVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBJREJWZXJzaW9uQ2hhbmdlRXZlbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk1MTY0NUI1MzFCOUY4ODlCMDBGNzg5Q0UgLyogSURCVmVyc2lvbkNoYW5nZUV2 ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IElEQlZlcnNpb25DaGFuZ2VF dmVudC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTY0NUI1NDFCOUY4OEU4MDBG Nzg5Q0UgLyogSURCQ3Vyc29yLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IElEQkN1cnNvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTUxNjZEM0ND MUU4RUQ0MTEwMEFENjJFMyAvKiBTdG9yYWdlVHlwZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBTdG9yYWdlVHlwZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1 MTY5NTM5NTEzMjlBM0M4MDBCOTJEMDQgLyogSWNvbkRhdGFiYXNlQmFzZS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJY29uRGF0YWJhc2VCYXNlLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTE2OTUzOTYxMzI5QTNDODAwQjkyRDA0IC8qIEljb25E YXRhYmFzZUJhc2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSWNvbkRhdGFi YXNlQmFzZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTZCQjc5MjBDRTkxRTY4 MDA1MTJGNzkgLyogSlNUcmVlV2Fsa2VyQ3VzdG9tLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IEpTVHJlZVdhbGtlckN1c3RvbS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CkBAIC0xNjg0Miw2ICsxNjg0NCw3IEBACiAJCQkJQzUwRDBFODEwRkY0MjcyOTAw QUMyNjQ0IC8qIFN0b3JhZ2VOYW1lc3BhY2UuaCAqLywKIAkJCQkxQTM3NjM2OTFBMkU2OEJCMDA5 QTdFRTIgLyogU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmNwcCAqLywKIAkJCQkxQTM3NjM2QTFB MkU2OEJCMDA5QTdFRTIgLyogU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmggKi8sCisJCQkJNTE2 NkQzQ0MxRThFRDQxMTAwQUQ2MkUzIC8qIFN0b3JhZ2VUeXBlLmggKi8sCiAJCQkpOwogCQkJaW5k ZW50V2lkdGggPSA0OwogCQkJcGF0aCA9IHN0b3JhZ2U7CkBAIC0yODUwOSw2ICsyODUxMiw3IEBA CiAJCQkJQ0RFN0ZDNDUxODE5MDRCMTAwMkJCQjc3IC8qIE9yZGVySXRlcmF0b3IuaCBpbiBIZWFk ZXJzICovLAogCQkJCTAwMTQ2MjhCMTAzQ0QxREUwMDBCMjBEQiAvKiBPcmlnaW5BY2Nlc3NFbnRy eS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRkU5RTg5RkMxNkUyREMwNTAwQTkwOEY4IC8qIE9yaWdp bkxvY2suaCBpbiBIZWFkZXJzICovLAorCQkJCTUxNjZEM0NEMUU4RUQ0OEYwMEFENjJFMyAvKiBT dG9yYWdlVHlwZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRkQ1ODFGQUYxNTIwRjkxRjAwM0E3QTc1 IC8qIE9zY2lsbGF0b3JOb2RlLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzVFQjVERDBFODFCOERE MDBCMjU5NjUgLyogT3V0bGluZVZhbHVlLmggaW4gSGVhZGVycyAqLywKIAkJCQk3QTI5RjU3MjE4 QzY5NTE0MDA0RDBGODEgLyogT3V0T2ZCYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oIGluIEhlYWRl cnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N U3RvcmFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlQWdlbnQuY3BwCmluZGV4IGZhMDFlYzUyOGFjODcxMDJhZDBlYjU5OGE3NTY1NmQwOWZi MmZlMjguLjYxMTQ4MGNkM2NiM2VjNjBhNTg1ZWMyNTcyYjU1OGVhYzFjYjM0MTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQu Y3BwCkBAIC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiU3RvcmFnZS5oIgogI2luY2x1ZGUgIlN0 b3JhZ2VOYW1lc3BhY2UuaCIKICNpbmNsdWRlICJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIK KyNpbmNsdWRlICJTdG9yYWdlVHlwZS5oIgogI2luY2x1ZGUgIlZvaWRDYWxsYmFjay5oIgogI2lu Y2x1ZGUgPGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZERpc3BhdGNoZXJzLmg+CiAjaW5jbHVk ZSA8aW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5oPgpAQCAtMTYzLDcgKzE2NCw3IEBAIHZvaWQg SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpkaWREaXNwYXRjaERPTVN0b3JhZ2VFdmVudChjb25z dCBTdHJpbmcmIGtleSwgY29uCiAgICAgaWYgKCFtX2VuYWJsZWQpCiAgICAgICAgIHJldHVybjsK IAotICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpET01TdG9yYWdlOjpTdG9yYWdlSWQ+ IGlkID0gc3RvcmFnZUlkKHNlY3VyaXR5T3JpZ2luLCBzdG9yYWdlVHlwZSA9PSBMb2NhbFN0b3Jh Z2UpOworICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpET01TdG9yYWdlOjpTdG9yYWdl SWQ+IGlkID0gc3RvcmFnZUlkKHNlY3VyaXR5T3JpZ2luLCBzdG9yYWdlVHlwZSA9PSBTdG9yYWdl VHlwZTo6TG9jYWwpOwogCiAgICAgaWYgKGtleS5pc051bGwoKSkKICAgICAgICAgbV9mcm9udGVu ZERpc3BhdGNoZXItPmRvbVN0b3JhZ2VJdGVtc0NsZWFyZWQoaWQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDZhMDYw ZTMyN2UxODE4MzhjNDlmZWRhNTQzNTQzMzE0NGFiMjI0OWUuLmE3MjZlZmI0Mjc2M2RlZGMwOWVm YWYwMjdhNTJiNjg3ZDVkMmM3YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTg0LDYgKzg0LDggQEAgY2xhc3MgVVJM OwogY2xhc3MgV2ViS2l0TmFtZWRGbG93OwogY2xhc3MgV29ya2VySW5zcGVjdG9yUHJveHk7CiAK K2VudW0gY2xhc3MgU3RvcmFnZVR5cGU7CisKIHN0cnVjdCBSZXBsYXlQb3NpdGlvbjsKIHN0cnVj dCBXZWJTb2NrZXRGcmFtZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt cHR5Q2xpZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcApp bmRleCA2NzNkNWEyNWY0NmY4YzcyZmE5Y2U1ODU1NDhjZWZhMGJjNTQzYzZjLi5iMTUwODMyMzNk OGI0MzJhOTAxOWRjNzllYjQ4MDhjZjgyMWIzOWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w dHlDbGllbnRzLmNwcApAQCAtNTYsNiArNTYsNyBAQAogI2luY2x1ZGUgIlN0b3JhZ2VBcmVhLmgi CiAjaW5jbHVkZSAiU3RvcmFnZU5hbWVzcGFjZS5oIgogI2luY2x1ZGUgIlN0b3JhZ2VOYW1lc3Bh Y2VQcm92aWRlci5oIgorI2luY2x1ZGUgIlN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiVGV4dENo ZWNrZXJDbGllbnQuaCIKICNpbmNsdWRlICJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5oIgog I2luY2x1ZGUgIlVzZXJDb250ZW50UHJvdmlkZXIuaCIKQEAgLTU0OSw3ICs1NTAsNyBAQCBjbGFz cyBFbXB0eVN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlciBmaW5hbCA6IHB1YmxpYyBTdG9yYWdlTmFt ZXNwYWNlUHJvdmlkZXIgewogICAgICAgICB2b2lkIGNsZWFyKEZyYW1lKikgZmluYWwgeyB9CiAg ICAgICAgIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJikgZmluYWwgeyByZXR1cm4gZmFsc2U7 IH0KICAgICAgICAgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKikgZmluYWwgeyByZXR1cm4g ZmFsc2U7IH0KLSAgICAgICAgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCBmaW5hbCB7 IHJldHVybiBMb2NhbFN0b3JhZ2U7IH0KKyAgICAgICAgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUo KSBjb25zdCBmaW5hbCB7IHJldHVybiBTdG9yYWdlVHlwZTo6TG9jYWw7IH0KICAgICAgICAgc2l6 ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKSBmaW5hbCB7IHJldHVybiAwOyB9CiAgICAgICAg IFNlY3VyaXR5T3JpZ2luRGF0YSBzZWN1cml0eU9yaWdpbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJu IHsgfTsgfQogICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2UuY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcAppbmRleCBiM2UyMDJj YTY4OGI5MTBhMGQwNDU0NDBlZWI5OWZmNDA2N2IzYTFkLi5hNTM4ZTE3NTU4OTg5N2IzYTIwMzU0 OGQxMGU1OGQxNDdlMDAyZDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZS5jcHAKQEAgLTMz LDYgKzMzLDcgQEAKICNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNlY3Vy aXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiU3RvcmFnZUFyZWEuaCIKKyNpbmNsdWRlICJTdG9yYWdl VHlwZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CkBAIC0xNDUsNyArMTQ2LDcgQEAgYm9vbCBTdG9yYWdlOjppc0Rpc2FibGVkQnlQcml2 YXRlQnJvd3NpbmcoKSBjb25zdAogICAgIGlmICghbV9mcmFtZS0+cGFnZSgpLT51c2VzRXBoZW1l cmFsU2Vzc2lvbigpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9zdG9yYWdl QXJlYS0+c3RvcmFnZVR5cGUoKSA9PSBMb2NhbFN0b3JhZ2UpIHsKKyAgICBpZiAoaXNMb2NhbFN0 b3JhZ2UobV9zdG9yYWdlQXJlYS0+c3RvcmFnZVR5cGUoKSkpIHsKICAgICAgICAgaWYgKFNjaGVt ZVJlZ2lzdHJ5OjphbGxvd3NMb2NhbFN0b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93c2luZyhtX2Zy YW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLnByb3RvY29sKCkpKQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvU3RvcmFnZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWEuaApp bmRleCA3NGUxZGNkZDIzZTgzNzM0ZDQwNGM3YTNhYmY1MDVmNTQ1NDUxMTI5Li45NzQzZmRlZDI4 MzQxNzhkZGQ1MmMzOThiY2Y5NDk2MGNjNWVlMzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL1N0b3JhZ2VBcmVhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9y YWdlQXJlYS5oCkBAIC0zNSw3ICszNSw4IEBAIGNsYXNzIEZyYW1lOwogY2xhc3MgU2VjdXJpdHlP cmlnaW47CiBjbGFzcyBTdG9yYWdlU3luY01hbmFnZXI7CiAKLWVudW0gU3RvcmFnZVR5cGUgeyBM b2NhbFN0b3JhZ2UsIFNlc3Npb25TdG9yYWdlIH07CitlbnVtIGNsYXNzIFN0b3JhZ2VUeXBlOwor CiBzdHJ1Y3QgU2VjdXJpdHlPcmlnaW5EYXRhOwogCiBjbGFzcyBTdG9yYWdlQXJlYSA6IHB1Ymxp YyBSZWZDb3VudGVkPFN0b3JhZ2VBcmVhPiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL1N0b3JhZ2VFdmVudERpc3BhdGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlRXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCA2YWIwOGViY2VjOGQxYzJlNGNjOTAy YmMxMTg5ZmFiMjhhMzRiMzZhLi5hYjg5MjYzZDVhNzI3MTFhYTUzOTlmMjBkYjEzNzc2MmY3MTE3 NmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VFdmVudERpc3Bh dGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUV2ZW50RGlzcGF0 Y2hlci5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgog I2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luRGF0YS5oIgogI2luY2x1ZGUgIlN0b3JhZ2VFdmVudC5o IgorI2luY2x1ZGUgIlN0b3JhZ2VUeXBlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAt NzcsNyArNzgsNyBAQCB2b2lkIFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTG9jYWxT dG9yYWdlRXZlbnRzKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdAogCiB2b2lkIFN0b3JhZ2VFdmVu dERpc3BhdGNoZXI6OmRpc3BhdGNoU2Vzc2lvblN0b3JhZ2VFdmVudHNUb0ZyYW1lcyhQYWdlJiBw YWdlLCBjb25zdCBWZWN0b3I8UmVmUHRyPEZyYW1lPj4mIGZyYW1lcywgY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0 IFN0cmluZyYgdXJsLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luKQog ewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRGlzcGF0Y2hET01TdG9yYWdlRXZl bnQocGFnZSwga2V5LCBvbGRWYWx1ZSwgbmV3VmFsdWUsIFNlc3Npb25TdG9yYWdlLCBzZWN1cml0 eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpLnB0cigpKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmRpZERpc3BhdGNoRE9NU3RvcmFnZUV2ZW50KHBhZ2UsIGtleSwgb2xkVmFsdWUsIG5l d1ZhbHVlLCBTdG9yYWdlVHlwZTo6U2Vzc2lvbiwgc2VjdXJpdHlPcmlnaW4uc2VjdXJpdHlPcmln aW4oKS5wdHIoKSk7CiAKICAgICBmb3IgKGF1dG8mIGZyYW1lIDogZnJhbWVzKSB7CiAgICAgICAg IGF1dG8gcmVzdWx0ID0gZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpLT5zZXNzaW9uU3Rv cmFnZSgpOwpAQCAtODksNyArOTAsNyBAQCB2b2lkIFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRp c3BhdGNoU2Vzc2lvblN0b3JhZ2VFdmVudHNUb0ZyYW1lcyhQYWdlJiBwYWdlLCBjbwogdm9pZCBT dG9yYWdlRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaExvY2FsU3RvcmFnZUV2ZW50c1RvRnJhbWVz KFBhZ2VHcm91cCYgcGFnZUdyb3VwLCBjb25zdCBWZWN0b3I8UmVmUHRyPEZyYW1lPj4mIGZyYW1l cywgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmlu ZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEm IHNlY3VyaXR5T3JpZ2luKQogewogICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2VHcm91cC5wYWdl cygpKQotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZERpc3BhdGNoRE9NU3Rv cmFnZUV2ZW50KCpwYWdlLCBrZXksIG9sZFZhbHVlLCBuZXdWYWx1ZSwgTG9jYWxTdG9yYWdlLCBz ZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdpbigpLnB0cigpKTsKKyAgICAgICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWREaXNwYXRjaERPTVN0b3JhZ2VFdmVudCgqcGFnZSwga2V5LCBv bGRWYWx1ZSwgbmV3VmFsdWUsIFN0b3JhZ2VUeXBlOjpMb2NhbCwgc2VjdXJpdHlPcmlnaW4uc2Vj dXJpdHlPcmlnaW4oKS5wdHIoKSk7CiAKICAgICBmb3IgKGF1dG8mIGZyYW1lIDogZnJhbWVzKSB7 CiAgICAgICAgIGF1dG8gcmVzdWx0ID0gZnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpLT5s b2NhbFN0b3JhZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFn ZVR5cGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVR5cGUuaApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5jZjM0Zjk2YzcwMGIzNDFhNWI0YzcxNWZkODg4Y2E2MDZlYzEyOTA1Ci0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHlwZS5oCkBAIC0wLDAgKzEsNDEg QEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAq IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ CisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21h IG9uY2UKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitlbnVtIGNsYXNzIFN0b3JhZ2VUeXBlIHsK KyAgICBTZXNzaW9uLAorICAgIExvY2FsLAorICAgIFRyYW5zaWVudExvY2FsLAorfTsKKworaW5s aW5lIGJvb2wgaXNMb2NhbFN0b3JhZ2UoU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUpCit7CisgICAg cmV0dXJuIHN0b3JhZ2VUeXBlID09IFN0b3JhZ2VUeXBlOjpMb2NhbCB8fCBzdG9yYWdlVHlwZSA9 PSBTdG9yYWdlVHlwZTo6VHJhbnNpZW50TG9jYWw7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKaW5kZXggYzViN2Vi YTA4NTg1Y2QwMTMyNmE0MWM5MmY4Yzk1ZDBmMzM1MTU4YS4uZWJiODBmMmM5MTcyZGQ2NWI1NTVj YWVhNzJkNzI0YWYwNDBhZjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0 b3JhZ2VBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VBcmVh SW1wbC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3Jp Z2luRGF0YS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU3RvcmFnZUV2ZW50RGlzcGF0Y2hlci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvU3RvcmFnZU1hcC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU3RvcmFn ZVR5cGUuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKQEAgLTI5MCw3ICsyOTEsNyBAQCB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6Y2xvc2VE YXRhYmFzZUlmSWRsZSgpCiAKIHZvaWQgU3RvcmFnZUFyZWFJbXBsOjpkaXNwYXRjaFN0b3JhZ2VF dmVudChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3Ry aW5nJiBuZXdWYWx1ZSwgRnJhbWUqIHNvdXJjZUZyYW1lKQogewotICAgIGlmIChtX3N0b3JhZ2VU eXBlID09IExvY2FsU3RvcmFnZSkKKyAgICBpZiAoaXNMb2NhbFN0b3JhZ2UobV9zdG9yYWdlVHlw ZSkpCiAgICAgICAgIFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTG9jYWxTdG9yYWdl RXZlbnRzKGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCBtX3NlY3VyaXR5T3JpZ2luLCBzb3VyY2VG cmFtZSk7CiAgICAgZWxzZQogICAgICAgICBTdG9yYWdlRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRj aFNlc3Npb25TdG9yYWdlRXZlbnRzKGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCBtX3NlY3VyaXR5 T3JpZ2luLCBzb3VyY2VGcmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2Uv U3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VO YW1lc3BhY2VJbXBsLmNwcAppbmRleCBjZmZhYmUwMTVkZWE2ZWMwZGYzMGVlNGMwNTczNzgzMTli N2QxYTJmLi4xOGVjNGU4YWMzODQzZjMxZTEyNjdhZWI2NjllYWFmMmYzYThiN2I1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKQEAgLTI5LDYg KzI5LDcgQEAKICNpbmNsdWRlICJTdG9yYWdlU3luY01hbmFnZXIuaCIKICNpbmNsdWRlICJTdG9y YWdlVHJhY2tlci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvU3RvcmFnZU1hcC5oPgorI2luY2x1ZGUg PFdlYkNvcmUvU3RvcmFnZVR5cGUuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogI2lu Y2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hh c2guaD4KQEAgLTQ2LDcgKzQ3LDcgQEAgc3RhdGljIEhhc2hNYXA8U3RyaW5nLCBTdG9yYWdlTmFt ZXNwYWNlSW1wbCo+JiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2VNYXAoKQogCiBSZWY8U3RvcmFnZU5h bWVzcGFjZUltcGw+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5h bWVzcGFjZSh1bnNpZ25lZCBxdW90YSkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTdG9y YWdlTmFtZXNwYWNlSW1wbChTZXNzaW9uU3RvcmFnZSwgU3RyaW5nKCksIHF1b3RhKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKCpuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwoU3RvcmFnZVR5cGU6OlNl c3Npb24sIFN0cmluZygpLCBxdW90YSkpOwogfQogCiBSZWY8U3RvcmFnZU5hbWVzcGFjZUltcGw+ IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZShj b25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCwgdW5zaWduZWQgcXVvdGEpCkBAIC01Nyw3ICs1OCw3 IEBAIFJlZjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OmdldE9y Q3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlCiAgICAgaWYgKHNsb3QpCiAgICAgICAgIHJldHVy biAqc2xvdDsKIAotICAgIFJlZjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gc3RvcmFnZU5hbWVzcGFj ZSA9IGFkb3B0UmVmKCpuZXcgU3RvcmFnZU5hbWVzcGFjZUltcGwoTG9jYWxTdG9yYWdlLCBkYXRh YmFzZVBhdGgsIHF1b3RhKSk7CisgICAgUmVmPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBzdG9yYWdl TmFtZXNwYWNlID0gYWRvcHRSZWYoKm5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChTdG9yYWdlVHlw ZTo6TG9jYWwsIGRhdGFiYXNlUGF0aCwgcXVvdGEpKTsKICAgICBzbG90ID0gc3RvcmFnZU5hbWVz cGFjZS5wdHIoKTsKIAogICAgIHJldHVybiBzdG9yYWdlTmFtZXNwYWNlOwpAQCAtNzAsNyArNzEs NyBAQCBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6U3RvcmFnZU5hbWVzcGFjZUltcGwoU3RvcmFnZVR5 cGUgc3RvcmFnZVR5cGUsIGNvbnN0IFN0cmluZwogICAgICwgbV9xdW90YShxdW90YSkKICAgICAs IG1faXNTaHV0ZG93bihmYWxzZSkKIHsKLSAgICBpZiAobV9zdG9yYWdlVHlwZSA9PSBMb2NhbFN0 b3JhZ2UgJiYgIW1fcGF0aC5pc0VtcHR5KCkpCisgICAgaWYgKGlzTG9jYWxTdG9yYWdlKG1fc3Rv cmFnZVR5cGUpICYmICFtX3BhdGguaXNFbXB0eSgpKQogICAgICAgICBtX3N5bmNNYW5hZ2VyID0g U3RvcmFnZVN5bmNNYW5hZ2VyOjpjcmVhdGUobV9wYXRoKTsKIH0KIApAQCAtNzgsNyArNzksNyBA QCBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6flN0b3JhZ2VOYW1lc3BhY2VJbXBsKCkKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCi0gICAgaWYgKG1fc3RvcmFnZVR5cGUgPT0gTG9jYWxT dG9yYWdlKSB7CisgICAgaWYgKGlzTG9jYWxTdG9yYWdlKG1fc3RvcmFnZVR5cGUpKSB7CiAgICAg ICAgIEFTU0VSVChsb2NhbFN0b3JhZ2VOYW1lc3BhY2VNYXAoKS5nZXQobV9wYXRoKSA9PSB0aGlz KTsKICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlTWFwKCkucmVtb3ZlKG1fcGF0aCk7CiAg ICAgfQpAQCAtOTEsNyArOTIsNyBAQCBSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gU3RvcmFnZU5h bWVzcGFjZUltcGw6OmNvcHkoUGFnZSopCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK ICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7Ci0gICAgQVNTRVJUKG1fc3RvcmFnZVR5cGUgPT0g U2Vzc2lvblN0b3JhZ2UpOworICAgIEFTU0VSVChtX3N0b3JhZ2VUeXBlID09IFN0b3JhZ2VUeXBl OjpTZXNzaW9uKTsKIAogICAgIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gbmV3TmFtZXNw YWNlID0gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3BhY2VJbXBsKG1fc3RvcmFnZVR5cGUsIG1f cGF0aCwgbV9xdW90YSkpOwogCkBAIC0xMjMsNyArMTI0LDcgQEAgdm9pZCBTdG9yYWdlTmFtZXNw YWNlSW1wbDo6Y2xvc2UoKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBJZiB3ZSdyZSBzZXNz aW9uIHN0b3JhZ2UsIHdlIHNob3VsZG4ndCBuZWVkIHRvIGRvIGFueSB3b3JrIGhlcmUuCi0gICAg aWYgKG1fc3RvcmFnZVR5cGUgPT0gU2Vzc2lvblN0b3JhZ2UpIHsKKyAgICBpZiAobV9zdG9yYWdl VHlwZSA9PSBTdG9yYWdlVHlwZTo6U2Vzc2lvbikgewogICAgICAgICBBU1NFUlQoIW1fc3luY01h bmFnZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKaW5kZXggMzZkNTkxODE0YWVh OTJlMmNlNzJlMmVlMjZjYjRjYjBhMDk0YjliMS4uNWY4Yjg3NzBhNTg0MDg0ZTY4MWEzYTA1M2Q0 MDdlZTUyMjBkZmNmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VBcmVhTWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3BwCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSA8V2Vi Q29yZS9TdG9yYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlRXZlbnREaXNwYXRjaGVy Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlTWFwLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9T dG9yYWdlVHlwZS5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNzAsNyArNzEs OCBAQCBTdG9yYWdlQXJlYU1hcDo6U3RvcmFnZUFyZWFNYXAoU3RvcmFnZU5hbWVzcGFjZUltcGwq IHN0b3JhZ2VOYW1lc3BhY2UsIFJlZjxXZWJDbwogICAgICwgbV9oYXNQZW5kaW5nR2V0VmFsdWVz KGZhbHNlKQogewogICAgIHN3aXRjaCAobV9zdG9yYWdlVHlwZSkgewotICAgIGNhc2UgV2ViQ29y ZTo6TG9jYWxTdG9yYWdlOgorICAgIGNhc2UgU3RvcmFnZVR5cGU6OkxvY2FsOgorICAgIGNhc2Ug U3RvcmFnZVR5cGU6OlRyYW5zaWVudExvY2FsOgogICAgICAgICBpZiAoU2VjdXJpdHlPcmlnaW4q IHRvcExldmVsT3JpZ2luID0gc3RvcmFnZU5hbWVzcGFjZS0+dG9wTGV2ZWxPcmlnaW4oKSkKICAg ICAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9u KCktPnNlbmQoTWVzc2FnZXM6OlN0b3JhZ2VNYW5hZ2VyOjpDcmVhdGVUcmFuc2llbnRMb2NhbFN0 b3JhZ2VNYXAobV9zdG9yYWdlTWFwSUQsIHN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VOYW1lc3Bh Y2VJRCgpLCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbigqdG9wTGV2ZWxP cmlnaW4pLCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbihtX3NlY3VyaXR5 T3JpZ2luKSksIDApOwogICAgICAgICBlbHNlCkBAIC03OCw3ICs4MCw3IEBAIFN0b3JhZ2VBcmVh TWFwOjpTdG9yYWdlQXJlYU1hcChTdG9yYWdlTmFtZXNwYWNlSW1wbCogc3RvcmFnZU5hbWVzcGFj ZSwgUmVmPFdlYkNvCiAKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIFdlYkNvcmU6OlNlc3Np b25TdG9yYWdlOgorICAgIGNhc2UgU3RvcmFnZVR5cGU6OlNlc3Npb246CiAgICAgICAgIFdlYlBy b2Nlc3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2Fn ZXM6OlN0b3JhZ2VNYW5hZ2VyOjpDcmVhdGVTZXNzaW9uU3RvcmFnZU1hcChtX3N0b3JhZ2VNYXBJ RCwgc3RvcmFnZU5hbWVzcGFjZS0+c3RvcmFnZU5hbWVzcGFjZUlEKCksIFNlY3VyaXR5T3JpZ2lu RGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4pKSwgMCk7CiAgICAgICAg IGJyZWFrOwogICAgIH0KQEAgLTMwMiw3ICszMDQsNyBAQCB2b2lkIFN0b3JhZ2VBcmVhTWFwOjpk aXNwYXRjaFN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBT dAogICAgICAgICBhcHBseUNoYW5nZShrZXksIG5ld1ZhbHVlKTsKICAgICB9CiAKLSAgICBpZiAo c3RvcmFnZVR5cGUoKSA9PSBTZXNzaW9uU3RvcmFnZSkKKyAgICBpZiAoc3RvcmFnZVR5cGUoKSA9 PSBTdG9yYWdlVHlwZTo6U2Vzc2lvbikKICAgICAgICAgZGlzcGF0Y2hTZXNzaW9uU3RvcmFnZUV2 ZW50KHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJp bmcpOwogICAgIGVsc2UKICAgICAgICAgZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudChzb3VyY2VT dG9yYWdlQXJlYUlELCBrZXksIG9sZFZhbHVlLCBuZXdWYWx1ZSwgdXJsU3RyaW5nKTsKQEAgLTMx NSw3ICszMTcsNyBAQCB2b2lkIFN0b3JhZ2VBcmVhTWFwOjpjbGVhckNhY2hlKCkKIAogdm9pZCBT dG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hTZXNzaW9uU3RvcmFnZUV2ZW50KHVpbnQ2NF90IHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVl LCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKLSAg ICBBU1NFUlQoc3RvcmFnZVR5cGUoKSA9PSBTZXNzaW9uU3RvcmFnZSk7CisgICAgQVNTRVJUKHN0 b3JhZ2VUeXBlKCkgPT0gU3RvcmFnZVR5cGU6OlNlc3Npb24pOwogCiAgICAgLy8gTmFtZXNwYWNl IElEcyBmb3Igc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFjZXMgYXJlIGVxdWl2YWxlbnQgdG8gd2Vi IHBhZ2UgSURzCiAgICAgLy8gc28gd2UgY2FuIGdldCB0aGUgcmlnaHQgcGFnZSBoZXJlLgpAQCAt MzQ5LDcgKzM1MSw3IEBAIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU2Vzc2lvblN0b3Jh Z2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjCiAKIHZvaWQgU3RvcmFnZUFy ZWFNYXA6OmRpc3BhdGNoTG9jYWxTdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNlU3RvcmFnZUFy ZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0 cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQogewotICAgIEFTU0VSVChz dG9yYWdlVHlwZSgpID09IExvY2FsU3RvcmFnZSk7CisgICAgQVNTRVJUKGlzTG9jYWxTdG9yYWdl KHN0b3JhZ2VUeXBlKCkpKTsKIAogICAgIFZlY3RvcjxSZWZQdHI8RnJhbWU+PiBmcmFtZXM7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFt ZXNwYWNlSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFn ZU5hbWVzcGFjZUltcGwuY3BwCmluZGV4IGI5OWIzODVlODdlZThiNWYyMTUyNDI5NWQxYmI0ZjVi OWNkYmI0NzQuLjFhMzc1MmI5NzFiMTdkYTM2NDE3OWIxMDA2ZjU4ZDZkMDY2ODEyODYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNl SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VO YW1lc3BhY2VJbXBsLmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUGFn ZUdyb3VwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgogI2luY2x1ZGUg PFdlYkNvcmUvU2V0dGluZ3MuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1N0b3JhZ2VUeXBlLmg+CiAK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC00MSwxNyArNDIsMTcgQEAgbmFtZXNwYWNl IFdlYktpdCB7CiAKIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNlSW1wbD4gU3RvcmFnZU5hbWVzcGFj ZUltcGw6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IGlkZW50aWZpZXIs IHVuc2lnbmVkIHF1b3RhSW5CeXRlcykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3Jh Z2VOYW1lc3BhY2VJbXBsKFNlc3Npb25TdG9yYWdlLCBpZGVudGlmaWVyLCBudWxscHRyLCBxdW90 YUluQnl0ZXMpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3BhY2VJbXBs KFN0b3JhZ2VUeXBlOjpTZXNzaW9uLCBpZGVudGlmaWVyLCBudWxscHRyLCBxdW90YUluQnl0ZXMp KTsKIH0KIAogUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2VJbXBsPiBTdG9yYWdlTmFtZXNwYWNlSW1w bDo6Y3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IGlkZW50aWZpZXIsIHVuc2ln bmVkIHF1b3RhSW5CeXRlcykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1l c3BhY2VJbXBsKExvY2FsU3RvcmFnZSwgaWRlbnRpZmllciwgbnVsbHB0ciwgcXVvdGFJbkJ5dGVz KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChTdG9yYWdl VHlwZTo6TG9jYWwsIGlkZW50aWZpZXIsIG51bGxwdHIsIHF1b3RhSW5CeXRlcykpOwogfQogCiBS ZWZQdHI8U3RvcmFnZU5hbWVzcGFjZUltcGw+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpjcmVhdGVU cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UodWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4mIHRvcExldmVsT3JpZ2luLCB1aW50NjRfdCBxdW90YUluQnl0ZXMp CiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChMb2NhbFN0 b3JhZ2UsIGlkZW50aWZpZXIsICZ0b3BMZXZlbE9yaWdpbiwgcXVvdGFJbkJ5dGVzKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlSW1wbChTdG9yYWdlVHlwZTo6VHJh bnNpZW50TG9jYWwsIGlkZW50aWZpZXIsICZ0b3BMZXZlbE9yaWdpbiwgcXVvdGFJbkJ5dGVzKSk7 CiB9CiAKIFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpTdG9yYWdlTmFtZXNwYWNlSW1wbChXZWJDb3Jl OjpTdG9yYWdlVHlwZSBzdG9yYWdlVHlwZSwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCBX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbiogdG9wTGV2ZWxPcmlnaW4sIHVuc2lnbmVkIHF1b3RhSW5C eXRlcykK