109957 2013-02-15 11:25:59 -0800 Remove const from a bunch of StorageArea member functions 2013-02-15 12:07:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin darin kling oldest_to_newest 834206 0 andersca 2013-02-15 11:25:59 -0800 Remove const from a bunch of StorageArea member functions 834210 1 188606 andersca 2013-02-15 11:27:51 -0800 Created attachment 188606 Patch 834235 2 kling 2013-02-15 11:55:49 -0800 I think that this removes useful documentation from the code about which functions on the StorageArea interface are conceptually read-only. :( 834242 3 andersca 2013-02-15 11:59:01 -0800 (In reply to comment #2) > I think that this removes useful documentation from the code about which functions on the StorageArea interface are conceptually read-only. :( I don’t think it makes much sense to use const for an abstract class where implementations can do pretty much anything. That’s the reason why none of our client member functions are const. 834256 4 andersca 2013-02-15 12:07:33 -0800 Committed r143031: <http://trac.webkit.org/changeset/143031> 188606 2013-02-15 11:27:51 -0800 2013-02-15 11:59:52 -0800 Patch bug-109957-20130215112418.patch text/plain 18968 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE2MWU1NTYwMTU2ZTQ3 MmRiNTdkZTJiZjNjYWJmOWZmOWU0OGEyYi4uM2QyMTM0YTU0N2E0ZjM5ZDk4OGZjZmFjZTRiOTgx OWM3YzFiNTlmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGNvbnN0 IGZyb20gYSBidW5jaCBvZiBTdG9yYWdlQXJlYSBtZW1iZXIgZnVuY3Rpb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5NTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yYWdlQXJlYSBpcyBhbiBh YnN0cmFjdCBiYXNlIGNsYXNzLCBhbmQgaXRzIHN1YmNsYXNzZXMgbWlnaHQgd2FudCB0byBtdXRh dGUgdGhlIG9iamVjdAorICAgICAgICB3aGVuIGNlcnRhaW4gbWVtYmVyIGZ1bmN0aW9ucyBhcmUg Y2FsbGVkIHNvIHJlbW92ZSBjb25zdCBmcm9tIGFsbCBtZW1iZXIgZnVuY3Rpb25zLgorCisgICAg ICAgICogc3RvcmFnZS9TdG9yYWdlQXJlYS5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg IChTdG9yYWdlQXJlYSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYTo6flN0b3JhZ2VB cmVhKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhOjppbmNyZW1lbnRBY2Nlc3NDb3Vu dCk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYTo6ZGVjcmVtZW50QWNjZXNzQ291bnQp OgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWE6OmNsb3NlRGF0YWJhc2VJZklkbGUpOgor ICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlN0b3JhZ2VBcmVhSW1wbDo6Y2FuQWNjZXNzU3RvcmFnZSk6CisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlQXJlYUltcGw6Omxlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUlt cGw6OmtleSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OmdldEl0ZW0pOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWFJbXBsOjpjb250YWlucyk6CisgICAgICAgIChX ZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6Om1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUpOgorICAgICAg ICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmg6CisgICAgICAgIChTdG9yYWdlQXJlYUltcGwp OgorCiAyMDEzLTAyLTE1ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgogCiAgICAg ICAgIFtDU1MgRXhjbHVzaW9uc10gRW5hYmxlIHNoYXBlLWluc2lkZSBzdXBwb3J0IGZvciBjaXJj bGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGNiMzE2ZTAxZWVhN2E0NTM5YjExOWZi NzJmMWZkOTkxNWZjNGZmMmUuLjU0ZTc1ZjExMGI1YTg0Yjg2ZmJmMzIxMWYxNzU5YTQwNTU5YTky Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTMtMDIt MTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1v dmUgY29uc3QgZnJvbSBhIGJ1bmNoIG9mIFN0b3JhZ2VBcmVhIG1lbWJlciBmdW5jdGlvbnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk1NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBmb3Ig V2ViQ29yZSBjaGFuZ2VzLgorCisgICAgICAgICogc3JjL1N0b3JhZ2VBcmVhUHJveHkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWFQcm94eTo6bGVuZ3RoKToKKyAgICAgICAgKFdl YkNvcmU6OlN0b3JhZ2VBcmVhUHJveHk6OmtleSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdl QXJlYVByb3h5OjpnZXRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhUHJveHk6 OmNvbnRhaW5zKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhUHJveHk6OmNhbkFjY2Vz c1N0b3JhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWFQcm94eTo6bWVtb3J5Qnl0 ZXNVc2VkQnlDYWNoZSk6CisgICAgICAgICogc3JjL1N0b3JhZ2VBcmVhUHJveHkuaDoKKyAgICAg ICAgKFN0b3JhZ2VBcmVhUHJveHkpOgorCiAyMDEzLTAyLTE1ICBLZWlzaGkgSGF0dG9yaSAgPGtl aXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIFBhZ2VQb3B1cENvbnRyb2xsZXIuZm9ybWF0TW9u dGggc2hvdWxkIHN1cHBvcnQgc2hvcnQgbW9udGggZm9ybWF0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzA3MTdh YTIwNTU0ZDE4ZWNlNWQ1ZjY0MTdlMjkxOGJiZGY5NmUzNi4uYmRhYTYwN2U3ZWFlYjcxNDQ2NGNm NzE4ODdlNWM4MDA0NTNiNjAwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAy LTE1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZlIGNvbnN0IGZyb20gYSBidW5jaCBvZiBTdG9yYWdlQXJlYSBtZW1iZXIgZnVuY3Rpb25zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5NTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgZm9y IFdlYkNvcmUgY2hhbmdlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdl QXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94eTo6bGVuZ3Ro KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94eTo6a2V5KToKKyAgICAgICAgKFdl YktpdDo6U3RvcmFnZUFyZWFQcm94eTo6Z2V0SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VBcmVhUHJveHk6OmNvbnRhaW5zKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94 eTo6Y2FuQWNjZXNzU3RvcmFnZSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhUHJveHk6 Om1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlQXJlYVByb3h5Lmg6CisgICAgICAgIChTdG9yYWdlQXJlYVByb3h5KToKKwogMjAxMy0w Mi0xNSAgU3VkYXJzYW5hIE5hZ2luZW5pICA8c3VkYXJzYW5hLm5hZ2luZW5pQGludGVsLmNvbT4K IAogICAgICAgICBbRUZMXVtXSzJdIFVzZSBDIEFQSSBpbnNpZGUgQmF0dGVyeVByb3ZpZGVyIGFu ZCBOZXR3b3JrSW5mb1Byb3ZpZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdl L1N0b3JhZ2VBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhLmgKaW5k ZXggODczNDlhNmViYzhhNTcxYWVhNGI4ZDMyZWJlMWQ0MmQ4YzAzMzIyMC4uODYwZmVmMmYwZDEz MDhkYWQ1MjBkNjMzNmI4ZDRmOTI1Yjc2MzAxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3RvcmFnZS9TdG9yYWdlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFn ZUFyZWEuaApAQCAtMzMsMzUgKzMzLDM0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotICAg IGNsYXNzIEZyYW1lOwotICAgIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwotICAgIGNsYXNzIFN0b3Jh Z2VTeW5jTWFuYWdlcjsKLSAgICB0eXBlZGVmIGludCBFeGNlcHRpb25Db2RlOwotICAgIGVudW0g U3RvcmFnZVR5cGUgeyBMb2NhbFN0b3JhZ2UsIFNlc3Npb25TdG9yYWdlIH07CitjbGFzcyBGcmFt ZTsKK2NsYXNzIFNlY3VyaXR5T3JpZ2luOworY2xhc3MgU3RvcmFnZVN5bmNNYW5hZ2VyOwordHlw ZWRlZiBpbnQgRXhjZXB0aW9uQ29kZTsKK2VudW0gU3RvcmFnZVR5cGUgeyBMb2NhbFN0b3JhZ2Us IFNlc3Npb25TdG9yYWdlIH07CiAKLSAgICAvLyBUaGlzIGludGVyZmFjZSBpcyByZXF1aXJlZCBm b3IgQ2hyb21pdW0gc2luY2UgdGhlc2UgYWN0aW9ucyBuZWVkIHRvIGJlIHByb3hpZWQgYmV0d2Vl biBwcm9jZXNzZXMuCi0gICAgY2xhc3MgU3RvcmFnZUFyZWEgOiBwdWJsaWMgUmVmQ291bnRlZDxT dG9yYWdlQXJlYT4gewotICAgIHB1YmxpYzoKLSAgICAgICAgdmlydHVhbCB+U3RvcmFnZUFyZWEo KSB7IH0KK2NsYXNzIFN0b3JhZ2VBcmVhIDogcHVibGljIFJlZkNvdW50ZWQ8U3RvcmFnZUFyZWE+ IHsKK3B1YmxpYzoKKyAgICB2aXJ0dWFsIH5TdG9yYWdlQXJlYSgpIHsgfQogCi0gICAgICAgIC8v IFRoZSBIVE1MNSBET00gU3RvcmFnZSBBUEkKLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBw YXNzIERvY3VtZW50IGluc3RlYWQgb2YgRnJhbWUuIEFsc28sIHRoYXQgcGFyYW1ldGVyIHNob3Vs ZCBnbyBmaXJzdC4KLSAgICAgICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoRXhjZXB0aW9uQ29k ZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3QgPSAwOwotICAgICAgICB2aXJ0dWFsIFN0cmlu ZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUp IGNvbnN0ID0gMDsKLSAgICAgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcm IGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3QgPSAwOwotICAg ICAgICB2aXJ0dWFsIHZvaWQgc2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwotICAgICAg ICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29k ZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgY2xlYXIo RXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwotICAgICAgICB2aXJ0dWFs IGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSog c291cmNlRnJhbWUpIGNvbnN0ID0gMDsKKyAgICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2UgQVBJ CisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIERvY3VtZW50IGluc3RlYWQgb2YgRnJhbWUu IEFsc28sIHRoYXQgcGFyYW1ldGVyIHNob3VsZCBnbyBmaXJzdC4KKyAgICB2aXJ0dWFsIHVuc2ln bmVkIGxlbmd0aChFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CisgICAg dmlydHVhbCBTdHJpbmcga2V5KHVuc2lnbmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUq IHNvdXJjZUZyYW1lKSA9IDA7CisgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJp bmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOworICAgIHZp cnR1YWwgdm9pZCBzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVl LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CisgICAgdmlydHVhbCB2 b2lkIHJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSog c291cmNlRnJhbWUpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgY2xlYXIoRXhjZXB0aW9uQ29kZSYs IEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOworICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25z dCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwog Ci0gICAgICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKikgY29uc3QgPSAw OworICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKikgPSAwOwogCi0gICAg ICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKSBjb25zdCA9IDA7Cisg ICAgdmlydHVhbCBzaXplX3QgbWVtb3J5Qnl0ZXNVc2VkQnlDYWNoZSgpID0gMDsKIAotICAgICAg ICB2aXJ0dWFsIHZvaWQgaW5jcmVtZW50QWNjZXNzQ291bnQoKSB7IH0KLSAgICAgICAgdmlydHVh bCB2b2lkIGRlY3JlbWVudEFjY2Vzc0NvdW50KCkgeyB9Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBj bG9zZURhdGFiYXNlSWZJZGxlKCkgeyB9Ci0gICAgfTsKKyAgICB2aXJ0dWFsIHZvaWQgaW5jcmVt ZW50QWNjZXNzQ291bnQoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGVjcmVtZW50QWNjZXNzQ291 bnQoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgY2xvc2VEYXRhYmFzZUlmSWRsZSgpIHsgfQorfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhSW1wbC5jcHAKaW5kZXggOGQ4NWNjNTlmMjBmZWMwYzM5NDVjMjJkN2M4ODA5MmJjMWM4 OWI5OC4uZWRkNTg5OGM5NjU4MmNlZmVlMmM5MGM0MWE3OTAwNTQ0NjQyMDAzNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcApAQCAtMTA0LDcgKzEwNCw3IEBA IFN0b3JhZ2VBcmVhSW1wbDo6U3RvcmFnZUFyZWFJbXBsKFN0b3JhZ2VBcmVhSW1wbCogYXJlYSkK ICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CiB9CiAKLWJvb2wgU3RvcmFnZUFyZWFJbXBsOjpj YW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkgY29uc3QKK2Jvb2wgU3RvcmFnZUFyZWFJbXBs OjpjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkKIHsKICAgICByZXR1cm4gZnJhbWUgJiYg ZnJhbWUtPnBhZ2UoKTsKIH0KQEAgLTExOCw3ICsxMTgsNyBAQCBib29sIFN0b3JhZ2VBcmVhSW1w bDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUqIGZyYW1lKSBj b25zdAogICAgIHJldHVybiAhU2NoZW1lUmVnaXN0cnk6OmFsbG93c0xvY2FsU3RvcmFnZUFjY2Vz c0luUHJpdmF0ZUJyb3dzaW5nKGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5w cm90b2NvbCgpKTsKIH0KIAotdW5zaWduZWQgU3RvcmFnZUFyZWFJbXBsOjpsZW5ndGgoRXhjZXB0 aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkgY29uc3QKK3Vuc2lnbmVkIFN0b3JhZ2VBcmVhSW1w bDo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCiB7CiAgICAgZWMgPSAw OwogICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShmcmFtZSkpIHsKQEAgLTEzNCw3ICsxMzQsNyBA QCB1bnNpZ25lZCBTdG9yYWdlQXJlYUltcGw6Omxlbmd0aChFeGNlcHRpb25Db2RlJiBlYywgRnJh bWUqIGZyYW1lKSBjb25zdAogICAgIHJldHVybiBtX3N0b3JhZ2VNYXAtPmxlbmd0aCgpOwogfQog Ci1TdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjprZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNv ZGUmIGVjLCBGcmFtZSogZnJhbWUpIGNvbnN0CitTdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjprZXko dW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCiB7CiAgICAg ZWMgPSAwOwogICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShmcmFtZSkpIHsKQEAgLTE1MCw3ICsx NTAsNyBAQCBTdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjprZXkodW5zaWduZWQgaW5kZXgsIEV4Y2Vw dGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpIGNvbgogICAgIHJldHVybiBtX3N0b3JhZ2VNYXAt PmtleShpbmRleCk7CiB9CiAKLVN0cmluZyBTdG9yYWdlQXJlYUltcGw6OmdldEl0ZW0oY29uc3Qg U3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpIGNvbnN0CitTdHJp bmcgU3RvcmFnZUFyZWFJbXBsOjpnZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25D b2RlJiBlYywgRnJhbWUqIGZyYW1lKQogewogICAgIGVjID0gMDsKICAgICBpZiAoIWNhbkFjY2Vz c1N0b3JhZ2UoZnJhbWUpKSB7CkBAIC0yNTQsNyArMjU0LDcgQEAgdm9pZCBTdG9yYWdlQXJlYUlt cGw6OmNsZWFyKEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCiAgICAgU3RvcmFnZUV2 ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2goU3RyaW5nKCksIFN0cmluZygpLCBTdHJpbmcoKSwgbV9z dG9yYWdlVHlwZSwgbV9zZWN1cml0eU9yaWdpbi5nZXQoKSwgZnJhbWUpOwogfQogCi1ib29sIFN0 b3JhZ2VBcmVhSW1wbDo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUm IGVjLCBGcmFtZSogZnJhbWUpIGNvbnN0Citib29sIFN0b3JhZ2VBcmVhSW1wbDo6Y29udGFpbnMo Y29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCiB7CiAg ICAgZWMgPSAwOwogICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShmcmFtZSkpIHsKQEAgLTMxNyw3 ICszMTcsNyBAQCB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6YmxvY2tVbnRpbEltcG9ydENvbXBsZXRl KCkgY29uc3QKICAgICAgICAgbV9zdG9yYWdlQXJlYVN5bmMtPmJsb2NrVW50aWxJbXBvcnRDb21w bGV0ZSgpOwogfQogCi1zaXplX3QgU3RvcmFnZUFyZWFJbXBsOjptZW1vcnlCeXRlc1VzZWRCeUNh Y2hlKCkgY29uc3QKK3NpemVfdCBTdG9yYWdlQXJlYUltcGw6Om1lbW9yeUJ5dGVzVXNlZEJ5Q2Fj aGUoKQogewogICAgIHJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9TdG9yYWdlQXJlYUltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFy ZWFJbXBsLmgKaW5kZXggZTM5NDU1NjQ2ZTNjMjViYzVkZWNhNTAzODkxNWY2NzdhNzE2OWM2ZS4u MGEwMTQ0MmZjNmE4MWJhNDEwNmZlOWEwOTk1MjMzODk2ZTZkMjVlYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCkBAIC00NCwxNyArNDQsMTcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIH5TdG9yYWdlQXJlYUltcGwoKTsKIAogICAgICAg ICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2UgQVBJIChhbmQgY29udGFpbnMpCi0gICAgICAgIHZp cnR1YWwgdW5zaWduZWQgbGVuZ3RoKEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUp IGNvbnN0OwotICAgICAgICB2aXJ0dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4Y2Vw dGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIGNvbnN0OwotICAgICAgICB2aXJ0dWFsIFN0 cmluZyBnZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNv dXJjZUZyYW1lKSBjb25zdDsKLSAgICAgICAgdmlydHVhbCB2b2lkIHNldEl0ZW0oY29uc3QgU3Ry aW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291 cmNlRnJhbWUpOwotICAgICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSXRlbShjb25zdCBTdHJpbmcm IGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSk7Ci0gICAgICAgIHZpcnR1 YWwgdm9pZCBjbGVhcihFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKTsKLSAgICAg ICAgdmlydHVhbCBib29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2Rl JiwgRnJhbWUqIHNvdXJjZUZyYW1lKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCB1bnNpZ25lZCBs ZW5ndGgoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CisgICAg ICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCwgRXhjZXB0aW9uQ29kZSYsIEZy YW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CisgICAgICAgIHZpcnR1YWwgU3RyaW5nIGdldEl0 ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUp IE9WRVJSSURFOworICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0SXRlbShjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFt ZSkgT1ZFUlJJREU7CisgICAgICAgIHZpcnR1YWwgdm9pZCByZW1vdmVJdGVtKGNvbnN0IFN0cmlu ZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKKyAg ICAgICAgdmlydHVhbCB2b2lkIGNsZWFyKEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJh bWUpIE9WRVJSSURFOworICAgICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5n JiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwogCi0g ICAgICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBzb3VyY2VGcmFtZSkg Y29uc3Q7CisgICAgICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBzb3Vy Y2VGcmFtZSkgT1ZFUlJJREU7CiAKLSAgICAgICAgdmlydHVhbCBzaXplX3QgbWVtb3J5Qnl0ZXNV c2VkQnlDYWNoZSgpIGNvbnN0OworICAgICAgICB2aXJ0dWFsIHNpemVfdCBtZW1vcnlCeXRlc1Vz ZWRCeUNhY2hlKCkgT1ZFUlJJREU7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGluY3JlbWVudEFj Y2Vzc0NvdW50KCk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkZWNyZW1lbnRBY2Nlc3NDb3VudCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvU3RvcmFnZUFyZWFQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9TdG9yYWdlQXJlYVByb3h5LmNwcApp bmRleCA4ZjM2YWEyMWVjZGQxODRjMjY3ZmU1MWVhYjQ4ZGUzNTVmOTc3M2NlLi43MDk4YmE3MzE0 ZDYxMWFkMzBkYTVjYTA4NmQwNmQzNWYwOWU4NTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9TdG9yYWdlQXJlYVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9TdG9yYWdlQXJlYVByb3h5LmNwcApAQCAtNjIsNyArNjIsNyBAQCBTdG9yYWdl QXJlYVByb3h5Ojp+U3RvcmFnZUFyZWFQcm94eSgpCiB7CiB9CiAKLXVuc2lnbmVkIFN0b3JhZ2VB cmVhUHJveHk6Omxlbmd0aChFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZyYW1lKSBjb25zdAor dW5zaWduZWQgU3RvcmFnZUFyZWFQcm94eTo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFt ZSogZnJhbWUpCiB7CiAgICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKGZyYW1lKSkgewogICAgICAg ICBlYyA9IFNFQ1VSSVRZX0VSUjsKQEAgLTcyLDcgKzcyLDcgQEAgdW5zaWduZWQgU3RvcmFnZUFy ZWFQcm94eTo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpIGNvbnN0CiAg ICAgcmV0dXJuIG1fc3RvcmFnZUFyZWEtPmxlbmd0aCgpOwogfQogCi1TdHJpbmcgU3RvcmFnZUFy ZWFQcm94eTo6a2V5KHVuc2lnbmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZy YW1lKSBjb25zdAorU3RyaW5nIFN0b3JhZ2VBcmVhUHJveHk6OmtleSh1bnNpZ25lZCBpbmRleCwg RXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBpZiAoIWNhbkFjY2Vzc1N0 b3JhZ2UoZnJhbWUpKSB7CiAgICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOwpAQCAtODIsNyArODIs NyBAQCBTdHJpbmcgU3RvcmFnZUFyZWFQcm94eTo6a2V5KHVuc2lnbmVkIGluZGV4LCBFeGNlcHRp b25Db2RlJiBlYywgRnJhbWUqIGZyYW1lKSBjbwogICAgIHJldHVybiBtX3N0b3JhZ2VBcmVhLT5r ZXkoaW5kZXgpOwogfQogCi1TdHJpbmcgU3RvcmFnZUFyZWFQcm94eTo6Z2V0SXRlbShjb25zdCBT dHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkgY29uc3QKK1N0cmlu ZyBTdG9yYWdlQXJlYVByb3h5OjpnZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25D b2RlJiBlYywgRnJhbWUqIGZyYW1lKQogewogICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShmcmFt ZSkpIHsKICAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7CkBAIC0xMjMsNyArMTIzLDcgQEAgdm9p ZCBTdG9yYWdlQXJlYVByb3h5OjpjbGVhcihFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZyYW1l KQogICAgIG1fc3RvcmFnZUFyZWEtPmNsZWFyKGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSk7CiB9 CiAKLWJvb2wgU3RvcmFnZUFyZWFQcm94eTo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4 Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpIGNvbnN0Citib29sIFN0b3JhZ2VBcmVhUHJv eHk6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUq IGZyYW1lKQogewogICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShmcmFtZSkpIHsKICAgICAgICAg ZWMgPSBTRUNVUklUWV9FUlI7CkBAIC0xMzIsNyArMTMyLDcgQEAgYm9vbCBTdG9yYWdlQXJlYVBy b3h5Ojpjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1l KiBmcmEKICAgICByZXR1cm4gIWdldEl0ZW0oa2V5LCBlYywgZnJhbWUpLmlzTnVsbCgpOwogfQog Ci1ib29sIFN0b3JhZ2VBcmVhUHJveHk6OmNhbkFjY2Vzc1N0b3JhZ2UoRnJhbWUqIGZyYW1lKSBj b25zdAorYm9vbCBTdG9yYWdlQXJlYVByb3h5OjpjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBmcmFt ZSkKIHsKICAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+cGFnZSgpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CkBAIC0xNDYsNyArMTQ2LDcgQEAgYm9vbCBTdG9yYWdlQXJlYVByb3h5OjpjYW5BY2Nl c3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkgY29uc3QKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1z aXplX3QgU3RvcmFnZUFyZWFQcm94eTo6bWVtb3J5Qnl0ZXNVc2VkQnlDYWNoZSgpIGNvbnN0Citz aXplX3QgU3RvcmFnZUFyZWFQcm94eTo6bWVtb3J5Qnl0ZXNVc2VkQnlDYWNoZSgpCiB7CiAgICAg cmV0dXJuIG1fc3RvcmFnZUFyZWEtPm1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3JhZ2VBcmVhUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3JhZ2VBcmVhUHJveHkuaAppbmRleCA0YTk2YzBk ODEwNTVmMWU3YTcyNTQ2OGNiOTgzZjg3ZWJkZDgyODc4Li40ZmVlOTJlYWNmMGRhNDEwZWEzZjBi NzIxODI2ZTMyYTY5ZmI1NWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9TdG9yYWdlQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvU3Rv cmFnZUFyZWFQcm94eS5oCkBAIC00OCwxNyArNDgsMTcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg flN0b3JhZ2VBcmVhUHJveHkoKTsKIAogICAgIC8vIFRoZSBIVE1MNSBET00gU3RvcmFnZSBBUEkK LSAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aChFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJj ZUZyYW1lKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4 Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIGNvbnN0OwotICAgIHZpcnR1YWwgU3Ry aW5nIGdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291 cmNlRnJhbWUpIGNvbnN0OworICAgIHZpcnR1YWwgdW5zaWduZWQgbGVuZ3RoKEV4Y2VwdGlvbkNv ZGUmLCBGcmFtZSogc291cmNlRnJhbWUpOworICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25l ZCBpbmRleCwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSk7CisgICAgdmlydHVh bCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1l KiBzb3VyY2VGcmFtZSk7CiAgICAgdmlydHVhbCB2b2lkIHNldEl0ZW0oY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJh bWUpOwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBFeGNl cHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKTsKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXIo RXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSk7Ci0gICAgdmlydHVhbCBib29sIGNv bnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZy YW1lKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXks IEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpOwogCi0gICAgdmlydHVhbCBib29s IGNhbkFjY2Vzc1N0b3JhZ2UoRnJhbWUqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuQWNj ZXNzU3RvcmFnZShGcmFtZSopOwogCi0gICAgdmlydHVhbCBzaXplX3QgbWVtb3J5Qnl0ZXNVc2Vk QnlDYWNoZSgpIGNvbnN0OworICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2Fj aGUoKTsKIAogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoTG9jYWxTdG9yYWdlRXZlbnQoCiAgICAg ICAgICAgICBQYWdlR3JvdXAqLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRW YWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmNwcAppbmRleCBhZDg3YTI0OGI5 N2EyOTQ2NGQzZGE2ZDNjYTQyNDY3ODUwNDdmNDgzLi5mMThkZWJjOTMzZjAwYWIxZjlmODBkOTIy MGFlNGE2MjM0YzFkNDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuY3BwCkBAIC01OSwyMSArNTksMjEgQEAgU3RvcmFn ZUFyZWFQcm94eTo6flN0b3JhZ2VBcmVhUHJveHkoKQogICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgp LmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6U3RvcmFnZU1hbmFnZXI6OkRlc3Ryb3lTdG9y YWdlQXJlYShtX3N0b3JhZ2VBcmVhSUQpLCAwKTsKIH0KIAotdW5zaWduZWQgU3RvcmFnZUFyZWFQ cm94eTo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIGNvbnN0Cit1 bnNpZ25lZCBTdG9yYWdlQXJlYVByb3h5OjpsZW5ndGgoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBz b3VyY2VGcmFtZSkKIHsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMuCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAKLVN0cmluZyBTdG9yYWdlQXJlYVBy b3h5OjprZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJh bWUpIGNvbnN0CitTdHJpbmcgU3RvcmFnZUFyZWFQcm94eTo6a2V5KHVuc2lnbmVkIGluZGV4LCBF eGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKQogewogICAgIC8vIEZJWE1FOiBJbXBs ZW1lbnQgdGhpcy4KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gU3RyaW5n KCk7CiB9CiAKLVN0cmluZyBTdG9yYWdlQXJlYVByb3h5OjpnZXRJdGVtKGNvbnN0IFN0cmluZyYg a2V5LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSBjb25zdAorU3RyaW5nIFN0 b3JhZ2VBcmVhUHJveHk6OmdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUm LCBGcmFtZSogc291cmNlRnJhbWUpCiB7CiAgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgog ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtOTgsMTggKzk4LDE4IEBAIHZvaWQgU3RvcmFn ZUFyZWFQcm94eTo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkKICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotYm9vbCBTdG9yYWdlQXJlYVByb3h5Ojpjb250 YWlucyhjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFt ZSkgY29uc3QKK2Jvb2wgU3RvcmFnZUFyZWFQcm94eTo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBr ZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpCiB7CiAgICAgLy8gRklYTUU6 IEltcGxlbWVudCB0aGlzLgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBTdG9yYWdlQXJl YVByb3h5OjpjYW5BY2Nlc3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkgY29uc3QKK2Jvb2wgU3RvcmFn ZUFyZWFQcm94eTo6Y2FuQWNjZXNzU3RvcmFnZShGcmFtZSogZnJhbWUpCiB7CiAgICAgcmV0dXJu IGZyYW1lICYmIGZyYW1lLT5wYWdlKCk7CiB9CiAKLXNpemVfdCBTdG9yYWdlQXJlYVByb3h5Ojpt ZW1vcnlCeXRlc1VzZWRCeUNhY2hlKCkgY29uc3QKK3NpemVfdCBTdG9yYWdlQXJlYVByb3h5Ojpt ZW1vcnlCeXRlc1VzZWRCeUNhY2hlKCkKIHsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMu CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuaAppbmRleCA4YTMzOTZmNDRlOTI3YTZm M2M3NzdjZTk2YzJmZTk5Y2NiMDY1YjIzLi5mN2RmNzE5ODQwNGM0N2FlODcxNjIxYjg4YWRjMjI4 OWI0N2RiMDlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZUFyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlQXJlYVByb3h5LmgKQEAgLTQxLDE1ICs0MSwxNSBAQCBwcml2YXRlOgogICAgIFN0 b3JhZ2VBcmVhUHJveHkoU3RvcmFnZU5hbWVzcGFjZVByb3h5KiwgUGFzc1JlZlB0cjxXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbj4pOwogCiAgICAgLy8gV2ViQ29yZTo6U3RvcmFnZUFyZWEuCi0gICAg dmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoV2ViQ29yZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6 OkZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3QgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCBTdHJpbmcg a2V5KHVuc2lnbmVkIGluZGV4LCBXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJh bWUqIHNvdXJjZUZyYW1lKSBjb25zdCBPVkVSUklERTsKLSAgICB2aXJ0dWFsIFN0cmluZyBnZXRJ dGVtKGNvbnN0IFN0cmluZyYga2V5LCBXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6 RnJhbWUqIHNvdXJjZUZyYW1lKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHVuc2lnbmVk IGxlbmd0aChXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZy YW1lKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIFdl YkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUpIE9WRVJS SURFOworICAgIHZpcnR1YWwgU3RyaW5nIGdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIFdlYkNv cmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJp bmcmIHZhbHVlLCBXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJj ZUZyYW1lKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSXRlbShjb25zdCBTdHJp bmcmIGtleSwgV2ViQ29yZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VG cmFtZSkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyKFdlYkNvcmU6OkV4Y2VwdGlv bkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwotICAgIHZpcnR1 YWwgYm9vbCBjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSwgV2ViQ29yZTo6RXhjZXB0aW9uQ29k ZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgY29uc3QgT1ZFUlJJREU7Ci0gICAgdmly dHVhbCBib29sIGNhbkFjY2Vzc1N0b3JhZ2UoV2ViQ29yZTo6RnJhbWUqKSBjb25zdCBPVkVSUklE RTsKLSAgICB2aXJ0dWFsIHNpemVfdCBtZW1vcnlCeXRlc1VzZWRCeUNhY2hlKCkgY29uc3QgT1ZF UlJJREU7CisgICAgdmlydHVhbCBib29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBXZWJD b3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklE RTsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShXZWJDb3JlOjpGcmFtZSopIE9W RVJSSURFOworICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW5jcmVtZW50QWNjZXNzQ291bnQoKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIHZvaWQgZGVjcmVtZW50QWNjZXNzQ291bnQoKSBPVkVSUklERTsKICAgICB2 aXJ0dWFsIHZvaWQgY2xvc2VEYXRhYmFzZUlmSWRsZSgpIE9WRVJSSURFOwo=