116367 2013-05-17 17:27:29 -0700 Share code between WebKit1 and WebKit2 StorageArea subclasses 2013-05-17 18:04:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca buildbot rniwa oldest_to_newest 890746 0 andersca 2013-05-17 17:27:29 -0700 Share code between WebKit1 and WebKit2 StorageArea subclasses 890747 1 202174 andersca 2013-05-17 17:30:57 -0700 Created attachment 202174 Patch 890757 2 202174 buildbot 2013-05-17 17:53:24 -0700 Comment on attachment 202174 Patch Attachment 202174 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/494476 890760 3 202177 andersca 2013-05-17 17:55:47 -0700 Created attachment 202177 Patch 890762 4 202177 kling 2013-05-17 18:02:32 -0700 Comment on attachment 202177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202177&action=review r=me. > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). OOPS! 890764 5 andersca 2013-05-17 18:04:22 -0700 Committed r150313: <http://trac.webkit.org/changeset/150313> 202174 2013-05-17 17:30:57 -0700 2013-05-17 17:55:45 -0700 Patch bug-116367-20130517172950.patch text/plain 13917 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWUzMmNmMTliZmExMWM1 OGM3YWM0ZmJlOGYzNTdlYzUzMzNjODM1YS4uN2M0MTViYzI3Njc0ZDM2MDJhY2NkOTYwMTM1Zjhj NmVlN2Q0Yzk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDEzLTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2hhcmUgY29kZSBi ZXR3ZWVuIFdlYktpdDEgYW5kIFdlYktpdDIgU3RvcmFnZUFyZWEgc3ViY2xhc3NlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MzY3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3Rv cmFnZUl0ZW1zKToKKyAgICAgICAgUmVtb3ZlIGVjIHBhcmFtZXRlci4KKworICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuaDoKKyAgICAgICAgQWRkIGZvcndhcmQg ZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OnNlc3Npb25TdG9yYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkRP TVdpbmRvdzo6bG9jYWxTdG9yYWdlKToKKyAgICAgICAgU3RvcmFnZTo6U3RvcmFnZUFyZWEgcmV0 dXJucyBhIHJlZmVyZW5jZSBub3cuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6bGVuZ3RoKToKKyAgICAgICAgQ2hlY2sgdGhhdCB0 aGUgc3RvcmFnZSBhcmVhIGNhbiBiZSBhY2Nlc3NlZCBieSB0aGUgZnJhbWUsIGFuZCB0aGF0IGl0 J3Mgbm90IGRpc2FibGVkIGJ5IHByaXZhdGUgYnJvd3NpbmcuCisgICAgICAgIFRoZW4gY2FsbCBk b3duIHRvIHRoZSAobm93IHNpbXBsaWZpZWQpIFN0b3JhZ2VBcmVhOjpsZW5ndGgoKS4KKworICAg ICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKToKKyAg ICAgICAgTmV3IGhlbHBlciBmdW5jdGlvbiB0aGF0J3MgYmFzZWQgb24gU3RvcmFnZUFyZWFJbXBs OjpkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZSwgYnV0IHJlb3JkZXJlZAorICAgICAg ICB0byBtYWtlIGl0IGVhc2llciB0byBmb2xsb3cuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3Jh Z2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2U6OmFyZWEpOgorICAgICAgICBSZXR1cm4g YSByZWZlcmVuY2UuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OnN0b3JhZ2VUeXBlKToKKyAgICAgICAg QWRkIHRoaXMgbmV3IHZpcnR1YWwgbWVtYmVyIGZ1bmNpdG9uIHRoYXQncyBuZWVkZWQgYnkgU3Rv cmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nLgorCisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlQXJlYUltcGw6Omxlbmd0aCk6CisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBjb2RlLgor CisyMDEzLTA1LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgTW92ZSBTdG9yYWdlIG1lbWJlciBmdW5jdGlvbnMgb3V0IG9mIGxpbmUKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjM2NAogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggYjhjNmY3ZTQxYzNhYzFlNzc4NWE4NWFkNTgzNmM1OWFjZWJkYzVmZi4uOWI2M2JiYzdi ODg4ODlkYzE2ZjMwZmQwNjc2ZTBlYTExNjM3OGM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTA1LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK KyAgICAgICAgU2hhcmUgY29kZSBiZXR3ZWVuIFdlYktpdDEgYW5kIFdlYktpdDIgU3RvcmFnZUFy ZWEgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE2MzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjpsZW5ndGgpOgorICAgICAgICBSZW1vdmUgY29kZSB0 aGF0J3Mgbm93IGluIFN0b3JhZ2U6Omxlbmd0aC4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdl QXJlYUltcGw6OnN0b3JhZ2VUeXBlKToKKyAgICAgICAgTWFrZSB0aGlzIGEgdmlydHVhbCBtZW1i ZXIgZnVuY3Rpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmg6CisKIDIwMTMtMDUtMTcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAg ICAgICAgIEhlYWRlcnMgYW5kIGZvb3RlcnMgd2lsbCBzb21ldGltZXMgZGlzYXBwZWFyIGFuZCBy ZS1hcHBlYXIgZHVyaW5nIHBhZ2UgbG9hZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKaW5kZXggODZiZDY0YjY1NjhjNTg4 NmM5NTNhOTdiODYwZGYzNjNlYzEwMzQ5My4uNzZkOTA1YTQxNTY4ZTA5NzgwOWYwMjZmYmYzZjY5 MDkxNzY4NjY3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCB2b2lkIEluc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUl0ZW1zKEVycm9yU3RyaW5nKiBlcnJvclN0 cmluZywgY29ucwogICAgIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFy cmF5PFN0cmluZz4gPiA+IHN0b3JhZ2VJdGVtcyA9IFR5cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVp bGRlcjo6QXJyYXk8U3RyaW5nPiA+OjpjcmVhdGUoKTsKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMg PSAwOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJlYS0+bGVuZ3RoKGVj LCBmcmFtZSk7ICsraSkgeworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJl YS0+bGVuZ3RoKCk7ICsraSkgewogICAgICAgICBTdHJpbmcgbmFtZShzdG9yYWdlQXJlYS0+a2V5 KGksIGVjLCBmcmFtZSkpOwogICAgICAgICBpZiAoaGFkRXhjZXB0aW9uKGVjLCBlcnJvclN0cmlu ZykpCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmgKaW5kZXggYjNmNGQ2ZTczYWFhYzQ3MjhjNmY1 YmQxMTc4NWNiZTAwZGIyZWY5ZC4uZWM3NmVhNWFmMjM3Yzc5MzhjMDlmM2Q3MGEwNmRkNmI0YWE2 OGFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0 b3JhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlQWdlbnQuaApAQCAtNDQsNiArNDQsNyBAQCBjbGFzcyBJbnNwZWN0b3JQYWdlQWdlbnQ7 CiBjbGFzcyBJbnNwZWN0b3JTdGF0ZTsKIGNsYXNzIEluc3RydW1lbnRpbmdBZ2VudHM7CiBjbGFz cyBQYWdlOworY2xhc3MgU2VjdXJpdHlPcmlnaW47CiBjbGFzcyBTdG9yYWdlOwogY2xhc3MgU3Rv cmFnZUFyZWE7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAppbmRleCBmMzFmN2NiN2E4OWVk MjZjZDlhNzJlMjk2ZThlNmNkNDk0YmZmZGQxLi5kNWM1Yjc2YzY0YjM4YjU5ZGQ2NzZjMDZkY2M1 MjU5OTY0MzY5MDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC03NTEsNyArNzUx LDcgQEAgU3RvcmFnZSogRE9NV2luZG93OjpzZXNzaW9uU3RvcmFnZShFeGNlcHRpb25Db2RlJiBl YykgY29uc3QKICAgICB9CiAKICAgICBpZiAobV9zZXNzaW9uU3RvcmFnZSkgewotICAgICAgICBp ZiAoIW1fc2Vzc2lvblN0b3JhZ2UtPmFyZWEoKS0+Y2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkg eworICAgICAgICBpZiAoIW1fc2Vzc2lvblN0b3JhZ2UtPmFyZWEoKS5jYW5BY2Nlc3NTdG9yYWdl KG1fZnJhbWUpKSB7CiAgICAgICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgICAg IHJldHVybiAwOwogICAgICAgICB9CkBAIC03ODcsNyArNzg3LDcgQEAgU3RvcmFnZSogRE9NV2lu ZG93Ojpsb2NhbFN0b3JhZ2UoRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0CiAgICAgfQogCiAgICAg aWYgKG1fbG9jYWxTdG9yYWdlKSB7Ci0gICAgICAgIGlmICghbV9sb2NhbFN0b3JhZ2UtPmFyZWEo KS0+Y2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkgeworICAgICAgICBpZiAoIW1fbG9jYWxTdG9y YWdlLT5hcmVhKCkuY2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkgewogICAgICAgICAgICAgZWMg PSBTRUNVUklUWV9FUlI7CiAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZS5jcHAKaW5kZXggZGRiNTBhYWEwOTU0ODBiOThmZmM1MmQ3MDIyNTY5 ZTczM2QyNTMyYy4uMjUyMGZhNjdhMGMxYzgxYWVmMDJkZTliMzI1NWJhNmZmYjE5NDUwZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwCkBAIC0yNiw4ICsyNiwxMSBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlN0b3JhZ2UuaCIKIAorI2luY2x1ZGUgIkRvY3VtZW50Lmgi CisjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgorI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlICJTdG9yYWdlQXJlYS5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CkBAIC01Nyw3ICs2MCwxNiBAQCBTdG9yYWdlOjp+U3RvcmFnZSgpCiAKIHVuc2lnbmVkIFN0 b3JhZ2U6Omxlbmd0aChFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKIHsKLSAgICByZXR1cm4gbV9z dG9yYWdlQXJlYS0+bGVuZ3RoKGVjLCBtX2ZyYW1lKTsKKyAgICBlYyA9IDA7CisgICAgaWYgKCFt X3N0b3JhZ2VBcmVhLT5jYW5BY2Nlc3NTdG9yYWdlKG1fZnJhbWUpKSB7CisgICAgICAgIGVjID0g U0VDVVJJVFlfRVJSOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICBpZiAoaXNEaXNh YmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJu IG1fc3RvcmFnZUFyZWEtPmxlbmd0aCgpOwogfQogCiBTdHJpbmcgU3RvcmFnZTo6a2V5KHVuc2ln bmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKQEAgLTkwLDQgKzEwMiwxNyBAQCBi b29sIFN0b3JhZ2U6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBl YykgY29uc3QKICAgICByZXR1cm4gbV9zdG9yYWdlQXJlYS0+Y29udGFpbnMoa2V5LCBlYywgbV9m cmFtZSk7CiB9CiAKK2Jvb2wgU3RvcmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkg Y29uc3QKK3sKKyAgICBpZiAoIW1fZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobV9zdG9y YWdlQXJlYS0+c3RvcmFnZVR5cGUoKSA9PSBMb2NhbFN0b3JhZ2UpIHsKKyAgICAgICAgaWYgKFNj aGVtZVJlZ2lzdHJ5OjphbGxvd3NMb2NhbFN0b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93c2luZyht X2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5wcm90b2NvbCgpKSkKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9T dG9yYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuaAppbmRleCAxMjkwNzU5 ZDA4NWJkNDljZTFmMjE1M2NkYjI1NzY3MmZjNjM4NjAzLi4xZTlmZGFiNzZjNDg3N2M3MDRiZmNj Zjg1YjQyODBkNGE2NTgwNjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuaApAQCAtNTIsMTEg KzUyLDEzIEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyKEV4Y2VwdGlvbkNvZGUmKTsKICAgICBi b29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJikgY29uc3Q7CiAK LSAgICBTdG9yYWdlQXJlYSAqIGFyZWEoKSBjb25zdCB7IHJldHVybiBtX3N0b3JhZ2VBcmVhLmdl dCgpOyB9CisgICAgU3RvcmFnZUFyZWEmIGFyZWEoKSBjb25zdCB7IHJldHVybiAqbV9zdG9yYWdl QXJlYTsgfQogCiBwcml2YXRlOgogICAgIFN0b3JhZ2UoRnJhbWUqLCBQYXNzUmVmUHRyPFN0b3Jh Z2VBcmVhPik7CiAKKyAgICBib29sIGlzRGlzYWJsZWRCeVByaXZhdGVCcm93c2luZygpIGNvbnN0 OworCiAgICAgY29uc3QgUmVmUHRyPFN0b3JhZ2VBcmVhPiBtX3N0b3JhZ2VBcmVhOwogfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oIGIvU291cmNl L1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oCmluZGV4IDg2MGZlZjJmMGQxMzA4ZGFkNTIw ZDYzMzZiOGQ0ZjkyNWI3NjMwMTguLmUzOTljZmM1NjhkODczZmMwZDU2NDdlMjRkNjRmZjA1Zjgx ZmM2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWEuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhLmgKQEAgLTM0LDcgKzM0LDYg QEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRnJhbWU7Ci1jbGFzcyBTZWN1cml0eU9y aWdpbjsKIGNsYXNzIFN0b3JhZ2VTeW5jTWFuYWdlcjsKIHR5cGVkZWYgaW50IEV4Y2VwdGlvbkNv ZGU7CiBlbnVtIFN0b3JhZ2VUeXBlIHsgTG9jYWxTdG9yYWdlLCBTZXNzaW9uU3RvcmFnZSB9OwpA QCAtNDUsNyArNDQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2Ug QVBJCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIERvY3VtZW50IGluc3RlYWQgb2YgRnJh bWUuIEFsc28sIHRoYXQgcGFyYW1ldGVyIHNob3VsZCBnbyBmaXJzdC4KLSAgICB2aXJ0dWFsIHVu c2lnbmVkIGxlbmd0aChFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7Cisg ICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoKSA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcga2V5 KHVuc2lnbmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7 CiAgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9u Q29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVt KGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb25Db2RlJiwg RnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CkBAIC01NCw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBG cmFtZSogc291cmNlRnJhbWUpID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9y YWdlKEZyYW1lKikgPSAwOworICAgIHZpcnR1YWwgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBj b25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHNpemVfdCBtZW1vcnlCeXRlc1VzZWRCeUNhY2hlKCkg PSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKaW5kZXgg MzMwYzNmYWE1NmJmZGVhMmY1NzM3YzQyOWJiODNkYzA4MGEwZjkwOS4uMjJkMWNiMjQ2MjBjNTAw NmEyYmNmYmQxZmZkYzI1NTFjZGE0MDljYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3Rv cmFnZUFyZWFJbXBsLmNwcApAQCAtMTA5LDYgKzEwOSwxMSBAQCBib29sIFN0b3JhZ2VBcmVhSW1w bDo6Y2FuQWNjZXNzU3RvcmFnZShGcmFtZSogZnJhbWUpCiAgICAgcmV0dXJuIGZyYW1lICYmIGZy YW1lLT5wYWdlKCk7CiB9CiAKK1N0b3JhZ2VUeXBlIFN0b3JhZ2VBcmVhSW1wbDo6c3RvcmFnZVR5 cGUoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0b3JhZ2VUeXBlOworfQorCiBib29sIFN0b3Jh Z2VBcmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUq IGZyYW1lKSBjb25zdAogewogICAgIGlmICghZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cHJp dmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQpAQCAtMTE4LDE2ICsxMjMsOCBAQCBib29sIFN0b3JhZ2VB cmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUqIGZy YW1lKSBjb25zdAogICAgIHJldHVybiAhU2NoZW1lUmVnaXN0cnk6OmFsbG93c0xvY2FsU3RvcmFn ZUFjY2Vzc0luUHJpdmF0ZUJyb3dzaW5nKGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdp bigpLT5wcm90b2NvbCgpKTsKIH0KIAotdW5zaWduZWQgU3RvcmFnZUFyZWFJbXBsOjpsZW5ndGgo RXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkKK3Vuc2lnbmVkIFN0b3JhZ2VBcmVhSW1w bDo6bGVuZ3RoKCkKIHsKLSAgICBlYyA9IDA7Ci0gICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKGZy YW1lKSkgewotICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7Ci0g ICAgfQotICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShmcmFtZSkpCi0g ICAgICAgIHJldHVybiAwOwotCiAgICAgQVNTRVJUKCFtX2lzU2h1dGRvd24pOwogICAgIGJsb2Nr VW50aWxJbXBvcnRDb21wbGV0ZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9y YWdlL1N0b3JhZ2VBcmVhSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJl YUltcGwuaAppbmRleCBmYTgyY2Q1YWIzMmIzODk5MzQwM2YwM2ZkM2I5MjU1MTc2YWFmZWJjLi5l M2JjOTdiOTMyODVhOWM4NDNkN2ZmZWJmNmVhYTYwYjYzYmQzNGNlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAgLTQ0LDggKzQ0LDcgQEAgcHVibGljOgogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4gY3JlYXRlKFN0b3JhZ2VUeXBlLCBQ YXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgUGFzc1JlZlB0cjxTdG9yYWdlU3luY01hbmFnZXI+ LCB1bnNpZ25lZCBxdW90YSk7CiAgICAgdmlydHVhbCB+U3RvcmFnZUFyZWFJbXBsKCk7CiAKLSAg ICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2UgQVBJIChhbmQgY29udGFpbnMpCi0gICAgdmlydHVh bCB1bnNpZ25lZCBsZW5ndGgoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZF UlJJREU7CisgICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291 cmNlRnJhbWUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIGdldEl0ZW0oY29uc3QgU3Ry aW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IHZhbHVlLCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKQEAg LTU0LDYgKzUzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25zdCBT dHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7 CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShGcmFtZSogc291cmNlRnJhbWUp IE9WRVJSSURFOworICAgIHZpcnR1YWwgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCBP VkVSUklERTsKIAogICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKSBP VkVSUklERTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZUFyZWFJbXBsLmNwcAppbmRleCBiMDIyYTg5NmU2YWJkMzAxODllMmVlYTU0MmZiOGU4 OTdlNGNmMjIwLi43Y2U2YjVjMzk1MWQxZjdlNTQxNGI2ZWY2N2RiMjI4YTEwMTJiNzUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmNwcApAQCAtNTksMjIgKzU5LDggQEAgU3RvcmFnZUFyZWFJbXBsOjp+U3RvcmFnZUFyZWFJ bXBsKCkKIHsKIH0KIAotU3RvcmFnZVR5cGUgU3RvcmFnZUFyZWFJbXBsOjpzdG9yYWdlVHlwZSgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPnN0b3JhZ2VUeXBlKCk7Ci19 Ci0KLXVuc2lnbmVkIFN0b3JhZ2VBcmVhSW1wbDo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmIGVjLCBG cmFtZSogc291cmNlRnJhbWUpCit1bnNpZ25lZCBTdG9yYWdlQXJlYUltcGw6Omxlbmd0aCgpCiB7 Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsK LSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLQot ICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShzb3VyY2VGcmFtZSkpCi0g ICAgICAgIHJldHVybiAwOwotCiAgICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPmxlbmd0aCgp OwogfQogCkBAIC0xNzQsNiArMTYwLDExIEBAIGJvb2wgU3RvcmFnZUFyZWFJbXBsOjpjYW5BY2Nl c3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkKICAgICByZXR1cm4gZnJhbWUgJiYgZnJhbWUtPnBhZ2Uo KTsKIH0KIAorU3RvcmFnZVR5cGUgU3RvcmFnZUFyZWFJbXBsOjpzdG9yYWdlVHlwZSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPnN0b3JhZ2VUeXBlKCk7Cit9CisKIHNp emVfdCBTdG9yYWdlQXJlYUltcGw6Om1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKQogewogICAgIHJl dHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0 b3JhZ2VBcmVhSW1wbC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhSW1wbC5oCmluZGV4IDVlNjQxYjMwMzNiNDExM2NmMWM0MTE4ZmUyNWYwMDhhZmRmN2Jh MDQuLmMxZGI1MDcxZTRkMmVmNWRjYmM4NDZlYTU4YjQ3OThlYTI1MWViNTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAg LTM1LDE5ICszNSwxOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgU3RvcmFnZUFyZWFN YXA7CiAKLWNsYXNzIFN0b3JhZ2VBcmVhSW1wbCA6IHB1YmxpYyBXZWJDb3JlOjpTdG9yYWdlQXJl YSB7CitjbGFzcyBTdG9yYWdlQXJlYUltcGwgRklOQUwgOiBwdWJsaWMgV2ViQ29yZTo6U3RvcmFn ZUFyZWEgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4g Y3JlYXRlKFBhc3NSZWZQdHI8U3RvcmFnZUFyZWFNYXA+KTsKICAgICB2aXJ0dWFsIH5TdG9yYWdl QXJlYUltcGwoKTsKIAogICAgIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQoKSBjb25zdCB7IHJldHVy biBtX3N0b3JhZ2VBcmVhSUQ7IH0KLSAgICBXZWJDb3JlOjpTdG9yYWdlVHlwZSBzdG9yYWdlVHlw ZSgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0b3JhZ2VBcmVhSW1wbChQYXNzUmVmUHRyPFN0 b3JhZ2VBcmVhTWFwPik7CiAKICAgICAvLyBXZWJDb3JlOjpTdG9yYWdlQXJlYS4KLSAgICB2aXJ0 dWFsIHVuc2lnbmVkIGxlbmd0aChXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJh bWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCwgV2ViQ29y ZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7 CiAgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgV2ViQ29yZTo6 RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCB2b2lkIHNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYg dmFsdWUsIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJh bWUpIE9WRVJSSURFOwpAQCAtNTUsNiArNTQsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBjbGVhcihXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZy YW1lKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBr ZXksIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKFdlYkNvcmU6OkZy YW1lKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCBXZWJDb3JlOjpTdG9yYWdlVHlwZSBzdG9yYWdl VHlwZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNl ZEJ5Q2FjaGUoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW5jcmVtZW50QWNjZXNzQ291 bnQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGVjcmVtZW50QWNjZXNzQ291bnQoKSBP VkVSUklERTsK 202177 2013-05-17 17:55:47 -0700 2013-05-17 18:02:32 -0700 Patch bug-116367-20130517175439.patch text/plain 15438 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWUzMmNmMTliZmExMWM1 OGM3YWM0ZmJlOGYzNTdlYzUzMzNjODM1YS4uN2M0MTViYzI3Njc0ZDM2MDJhY2NkOTYwMTM1Zjhj NmVlN2Q0Yzk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDEzLTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2hhcmUgY29kZSBi ZXR3ZWVuIFdlYktpdDEgYW5kIFdlYktpdDIgU3RvcmFnZUFyZWEgc3ViY2xhc3NlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MzY3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3Rv cmFnZUl0ZW1zKToKKyAgICAgICAgUmVtb3ZlIGVjIHBhcmFtZXRlci4KKworICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuaDoKKyAgICAgICAgQWRkIGZvcndhcmQg ZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OnNlc3Npb25TdG9yYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkRP TVdpbmRvdzo6bG9jYWxTdG9yYWdlKToKKyAgICAgICAgU3RvcmFnZTo6U3RvcmFnZUFyZWEgcmV0 dXJucyBhIHJlZmVyZW5jZSBub3cuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6bGVuZ3RoKToKKyAgICAgICAgQ2hlY2sgdGhhdCB0 aGUgc3RvcmFnZSBhcmVhIGNhbiBiZSBhY2Nlc3NlZCBieSB0aGUgZnJhbWUsIGFuZCB0aGF0IGl0 J3Mgbm90IGRpc2FibGVkIGJ5IHByaXZhdGUgYnJvd3NpbmcuCisgICAgICAgIFRoZW4gY2FsbCBk b3duIHRvIHRoZSAobm93IHNpbXBsaWZpZWQpIFN0b3JhZ2VBcmVhOjpsZW5ndGgoKS4KKworICAg ICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKToKKyAg ICAgICAgTmV3IGhlbHBlciBmdW5jdGlvbiB0aGF0J3MgYmFzZWQgb24gU3RvcmFnZUFyZWFJbXBs OjpkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZSwgYnV0IHJlb3JkZXJlZAorICAgICAg ICB0byBtYWtlIGl0IGVhc2llciB0byBmb2xsb3cuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3Jh Z2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2U6OmFyZWEpOgorICAgICAgICBSZXR1cm4g YSByZWZlcmVuY2UuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OnN0b3JhZ2VUeXBlKToKKyAgICAgICAg QWRkIHRoaXMgbmV3IHZpcnR1YWwgbWVtYmVyIGZ1bmNpdG9uIHRoYXQncyBuZWVkZWQgYnkgU3Rv cmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nLgorCisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlQXJlYUltcGw6Omxlbmd0aCk6CisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBjb2RlLgor CisyMDEzLTA1LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgTW92ZSBTdG9yYWdlIG1lbWJlciBmdW5jdGlvbnMgb3V0IG9mIGxpbmUKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjM2NAogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggYjhjNmY3ZTQxYzNhYzFlNzc4NWE4NWFkNTgzNmM1OWFjZWJkYzVmZi4uOWI2M2JiYzdi ODg4ODlkYzE2ZjMwZmQwNjc2ZTBlYTExNjM3OGM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTA1LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK KyAgICAgICAgU2hhcmUgY29kZSBiZXR3ZWVuIFdlYktpdDEgYW5kIFdlYktpdDIgU3RvcmFnZUFy ZWEgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE2MzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjpsZW5ndGgpOgorICAgICAgICBSZW1vdmUgY29kZSB0 aGF0J3Mgbm93IGluIFN0b3JhZ2U6Omxlbmd0aC4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdl QXJlYUltcGw6OnN0b3JhZ2VUeXBlKToKKyAgICAgICAgTWFrZSB0aGlzIGEgdmlydHVhbCBtZW1i ZXIgZnVuY3Rpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmg6CisKIDIwMTMtMDUtMTcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAg ICAgICAgIEhlYWRlcnMgYW5kIGZvb3RlcnMgd2lsbCBzb21ldGltZXMgZGlzYXBwZWFyIGFuZCBy ZS1hcHBlYXIgZHVyaW5nIHBhZ2UgbG9hZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKaW5kZXggODZiZDY0YjY1NjhjNTg4 NmM5NTNhOTdiODYwZGYzNjNlYzEwMzQ5My4uNzZkOTA1YTQxNTY4ZTA5NzgwOWYwMjZmYmYzZjY5 MDkxNzY4NjY3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCB2b2lkIEluc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUl0ZW1zKEVycm9yU3RyaW5nKiBlcnJvclN0 cmluZywgY29ucwogICAgIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkFy cmF5PFN0cmluZz4gPiA+IHN0b3JhZ2VJdGVtcyA9IFR5cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVp bGRlcjo6QXJyYXk8U3RyaW5nPiA+OjpjcmVhdGUoKTsKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMg PSAwOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJlYS0+bGVuZ3RoKGVj LCBmcmFtZSk7ICsraSkgeworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJl YS0+bGVuZ3RoKCk7ICsraSkgewogICAgICAgICBTdHJpbmcgbmFtZShzdG9yYWdlQXJlYS0+a2V5 KGksIGVjLCBmcmFtZSkpOwogICAgICAgICBpZiAoaGFkRXhjZXB0aW9uKGVjLCBlcnJvclN0cmlu ZykpCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmgKaW5kZXggYjNmNGQ2ZTczYWFhYzQ3MjhjNmY1 YmQxMTc4NWNiZTAwZGIyZWY5ZC4uZWM3NmVhNWFmMjM3Yzc5MzhjMDlmM2Q3MGEwNmRkNmI0YWE2 OGFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0 b3JhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlQWdlbnQuaApAQCAtNDQsNiArNDQsNyBAQCBjbGFzcyBJbnNwZWN0b3JQYWdlQWdlbnQ7 CiBjbGFzcyBJbnNwZWN0b3JTdGF0ZTsKIGNsYXNzIEluc3RydW1lbnRpbmdBZ2VudHM7CiBjbGFz cyBQYWdlOworY2xhc3MgU2VjdXJpdHlPcmlnaW47CiBjbGFzcyBTdG9yYWdlOwogY2xhc3MgU3Rv cmFnZUFyZWE7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAppbmRleCBmMzFmN2NiN2E4OWVk MjZjZDlhNzJlMjk2ZThlNmNkNDk0YmZmZGQxLi5kNWM1Yjc2YzY0YjM4YjU5ZGQ2NzZjMDZkY2M1 MjU5OTY0MzY5MDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC03NTEsNyArNzUx LDcgQEAgU3RvcmFnZSogRE9NV2luZG93OjpzZXNzaW9uU3RvcmFnZShFeGNlcHRpb25Db2RlJiBl YykgY29uc3QKICAgICB9CiAKICAgICBpZiAobV9zZXNzaW9uU3RvcmFnZSkgewotICAgICAgICBp ZiAoIW1fc2Vzc2lvblN0b3JhZ2UtPmFyZWEoKS0+Y2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkg eworICAgICAgICBpZiAoIW1fc2Vzc2lvblN0b3JhZ2UtPmFyZWEoKS5jYW5BY2Nlc3NTdG9yYWdl KG1fZnJhbWUpKSB7CiAgICAgICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgICAg IHJldHVybiAwOwogICAgICAgICB9CkBAIC03ODcsNyArNzg3LDcgQEAgU3RvcmFnZSogRE9NV2lu ZG93Ojpsb2NhbFN0b3JhZ2UoRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0CiAgICAgfQogCiAgICAg aWYgKG1fbG9jYWxTdG9yYWdlKSB7Ci0gICAgICAgIGlmICghbV9sb2NhbFN0b3JhZ2UtPmFyZWEo KS0+Y2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkgeworICAgICAgICBpZiAoIW1fbG9jYWxTdG9y YWdlLT5hcmVhKCkuY2FuQWNjZXNzU3RvcmFnZShtX2ZyYW1lKSkgewogICAgICAgICAgICAgZWMg PSBTRUNVUklUWV9FUlI7CiAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZS5jcHAKaW5kZXggZGRiNTBhYWEwOTU0ODBiOThmZmM1MmQ3MDIyNTY5 ZTczM2QyNTMyYy4uMjUyMGZhNjdhMGMxYzgxYWVmMDJkZTliMzI1NWJhNmZmYjE5NDUwZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwCkBAIC0yNiw4ICsyNiwxMSBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlN0b3JhZ2UuaCIKIAorI2luY2x1ZGUgIkRvY3VtZW50Lmgi CisjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgorI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlICJTdG9yYWdlQXJlYS5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CkBAIC01Nyw3ICs2MCwxNiBAQCBTdG9yYWdlOjp+U3RvcmFnZSgpCiAKIHVuc2lnbmVkIFN0 b3JhZ2U6Omxlbmd0aChFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKIHsKLSAgICByZXR1cm4gbV9z dG9yYWdlQXJlYS0+bGVuZ3RoKGVjLCBtX2ZyYW1lKTsKKyAgICBlYyA9IDA7CisgICAgaWYgKCFt X3N0b3JhZ2VBcmVhLT5jYW5BY2Nlc3NTdG9yYWdlKG1fZnJhbWUpKSB7CisgICAgICAgIGVjID0g U0VDVVJJVFlfRVJSOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICBpZiAoaXNEaXNh YmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJu IG1fc3RvcmFnZUFyZWEtPmxlbmd0aCgpOwogfQogCiBTdHJpbmcgU3RvcmFnZTo6a2V5KHVuc2ln bmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKQEAgLTkwLDQgKzEwMiwxNyBAQCBi b29sIFN0b3JhZ2U6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBl YykgY29uc3QKICAgICByZXR1cm4gbV9zdG9yYWdlQXJlYS0+Y29udGFpbnMoa2V5LCBlYywgbV9m cmFtZSk7CiB9CiAKK2Jvb2wgU3RvcmFnZTo6aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkg Y29uc3QKK3sKKyAgICBpZiAoIW1fZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobV9zdG9y YWdlQXJlYS0+c3RvcmFnZVR5cGUoKSA9PSBMb2NhbFN0b3JhZ2UpIHsKKyAgICAgICAgaWYgKFNj aGVtZVJlZ2lzdHJ5OjphbGxvd3NMb2NhbFN0b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93c2luZyht X2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5wcm90b2NvbCgpKSkKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9T dG9yYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuaAppbmRleCAxMjkwNzU5 ZDA4NWJkNDljZTFmMjE1M2NkYjI1NzY3MmZjNjM4NjAzLi4xZTlmZGFiNzZjNDg3N2M3MDRiZmNj Zjg1YjQyODBkNGE2NTgwNjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuaApAQCAtNTIsMTEg KzUyLDEzIEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyKEV4Y2VwdGlvbkNvZGUmKTsKICAgICBi b29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJikgY29uc3Q7CiAK LSAgICBTdG9yYWdlQXJlYSAqIGFyZWEoKSBjb25zdCB7IHJldHVybiBtX3N0b3JhZ2VBcmVhLmdl dCgpOyB9CisgICAgU3RvcmFnZUFyZWEmIGFyZWEoKSBjb25zdCB7IHJldHVybiAqbV9zdG9yYWdl QXJlYTsgfQogCiBwcml2YXRlOgogICAgIFN0b3JhZ2UoRnJhbWUqLCBQYXNzUmVmUHRyPFN0b3Jh Z2VBcmVhPik7CiAKKyAgICBib29sIGlzRGlzYWJsZWRCeVByaXZhdGVCcm93c2luZygpIGNvbnN0 OworCiAgICAgY29uc3QgUmVmUHRyPFN0b3JhZ2VBcmVhPiBtX3N0b3JhZ2VBcmVhOwogfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oIGIvU291cmNl L1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oCmluZGV4IDg2MGZlZjJmMGQxMzA4ZGFkNTIw ZDYzMzZiOGQ0ZjkyNWI3NjMwMTguLmUzOTljZmM1NjhkODczZmMwZDU2NDdlMjRkNjRmZjA1Zjgx ZmM2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWEuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhLmgKQEAgLTM0LDcgKzM0LDYg QEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRnJhbWU7Ci1jbGFzcyBTZWN1cml0eU9y aWdpbjsKIGNsYXNzIFN0b3JhZ2VTeW5jTWFuYWdlcjsKIHR5cGVkZWYgaW50IEV4Y2VwdGlvbkNv ZGU7CiBlbnVtIFN0b3JhZ2VUeXBlIHsgTG9jYWxTdG9yYWdlLCBTZXNzaW9uU3RvcmFnZSB9OwpA QCAtNDUsNyArNDQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2Ug QVBJCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIERvY3VtZW50IGluc3RlYWQgb2YgRnJh bWUuIEFsc28sIHRoYXQgcGFyYW1ldGVyIHNob3VsZCBnbyBmaXJzdC4KLSAgICB2aXJ0dWFsIHVu c2lnbmVkIGxlbmd0aChFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7Cisg ICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoKSA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcga2V5 KHVuc2lnbmVkIGluZGV4LCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7 CiAgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9u Q29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVt KGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb25Db2RlJiwg RnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CkBAIC01NCw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBG cmFtZSogc291cmNlRnJhbWUpID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9y YWdlKEZyYW1lKikgPSAwOworICAgIHZpcnR1YWwgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBj b25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHNpemVfdCBtZW1vcnlCeXRlc1VzZWRCeUNhY2hlKCkg PSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKaW5kZXgg MzMwYzNmYWE1NmJmZGVhMmY1NzM3YzQyOWJiODNkYzA4MGEwZjkwOS4uMjJkMWNiMjQ2MjBjNTAw NmEyYmNmYmQxZmZkYzI1NTFjZGE0MDljYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9TdG9yYWdlQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3Rv cmFnZUFyZWFJbXBsLmNwcApAQCAtMTA5LDYgKzEwOSwxMSBAQCBib29sIFN0b3JhZ2VBcmVhSW1w bDo6Y2FuQWNjZXNzU3RvcmFnZShGcmFtZSogZnJhbWUpCiAgICAgcmV0dXJuIGZyYW1lICYmIGZy YW1lLT5wYWdlKCk7CiB9CiAKK1N0b3JhZ2VUeXBlIFN0b3JhZ2VBcmVhSW1wbDo6c3RvcmFnZVR5 cGUoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0b3JhZ2VUeXBlOworfQorCiBib29sIFN0b3Jh Z2VBcmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUq IGZyYW1lKSBjb25zdAogewogICAgIGlmICghZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cHJp dmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQpAQCAtMTE4LDE2ICsxMjMsOCBAQCBib29sIFN0b3JhZ2VB cmVhSW1wbDo6ZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoY29uc3QgRnJhbWUqIGZy YW1lKSBjb25zdAogICAgIHJldHVybiAhU2NoZW1lUmVnaXN0cnk6OmFsbG93c0xvY2FsU3RvcmFn ZUFjY2Vzc0luUHJpdmF0ZUJyb3dzaW5nKGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdp bigpLT5wcm90b2NvbCgpKTsKIH0KIAotdW5zaWduZWQgU3RvcmFnZUFyZWFJbXBsOjpsZW5ndGgo RXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBmcmFtZSkKK3Vuc2lnbmVkIFN0b3JhZ2VBcmVhSW1w bDo6bGVuZ3RoKCkKIHsKLSAgICBlYyA9IDA7Ci0gICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKGZy YW1lKSkgewotICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7Ci0g ICAgfQotICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShmcmFtZSkpCi0g ICAgICAgIHJldHVybiAwOwotCiAgICAgQVNTRVJUKCFtX2lzU2h1dGRvd24pOwogICAgIGJsb2Nr VW50aWxJbXBvcnRDb21wbGV0ZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9y YWdlL1N0b3JhZ2VBcmVhSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJl YUltcGwuaAppbmRleCBmYTgyY2Q1YWIzMmIzODk5MzQwM2YwM2ZkM2I5MjU1MTc2YWFmZWJjLi5l M2JjOTdiOTMyODVhOWM4NDNkN2ZmZWJmNmVhYTYwYjYzYmQzNGNlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAgLTQ0LDggKzQ0LDcgQEAgcHVibGljOgogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4gY3JlYXRlKFN0b3JhZ2VUeXBlLCBQ YXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgUGFzc1JlZlB0cjxTdG9yYWdlU3luY01hbmFnZXI+ LCB1bnNpZ25lZCBxdW90YSk7CiAgICAgdmlydHVhbCB+U3RvcmFnZUFyZWFJbXBsKCk7CiAKLSAg ICAvLyBUaGUgSFRNTDUgRE9NIFN0b3JhZ2UgQVBJIChhbmQgY29udGFpbnMpCi0gICAgdmlydHVh bCB1bnNpZ25lZCBsZW5ndGgoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZF UlJJREU7CisgICAgdmlydHVhbCB1bnNpZ25lZCBsZW5ndGgoKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291 cmNlRnJhbWUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIGdldEl0ZW0oY29uc3QgU3Ry aW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IHZhbHVlLCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKQEAg LTU0LDYgKzUzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25zdCBT dHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7 CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShGcmFtZSogc291cmNlRnJhbWUp IE9WRVJSSURFOworICAgIHZpcnR1YWwgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCBP VkVSUklERTsKIAogICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKSBP VkVSUklERTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2Uv U3RvcmFnZUFyZWFJbXBsLmNwcAppbmRleCBiMDIyYTg5NmU2YWJkMzAxODllMmVlYTU0MmZiOGU4 OTdlNGNmMjIwLi43Y2U2YjVjMzk1MWQxZjdlNTQxNGI2ZWY2N2RiMjI4YTEwMTJiNzUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmNwcApAQCAtNTksMjIgKzU5LDggQEAgU3RvcmFnZUFyZWFJbXBsOjp+U3RvcmFnZUFyZWFJ bXBsKCkKIHsKIH0KIAotU3RvcmFnZVR5cGUgU3RvcmFnZUFyZWFJbXBsOjpzdG9yYWdlVHlwZSgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPnN0b3JhZ2VUeXBlKCk7Ci19 Ci0KLXVuc2lnbmVkIFN0b3JhZ2VBcmVhSW1wbDo6bGVuZ3RoKEV4Y2VwdGlvbkNvZGUmIGVjLCBG cmFtZSogc291cmNlRnJhbWUpCit1bnNpZ25lZCBTdG9yYWdlQXJlYUltcGw6Omxlbmd0aCgpCiB7 Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsK LSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLQot ICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFtZShzb3VyY2VGcmFtZSkpCi0g ICAgICAgIHJldHVybiAwOwotCiAgICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPmxlbmd0aCgp OwogfQogCkBAIC0xNzQsNiArMTYwLDExIEBAIGJvb2wgU3RvcmFnZUFyZWFJbXBsOjpjYW5BY2Nl c3NTdG9yYWdlKEZyYW1lKiBmcmFtZSkKICAgICByZXR1cm4gZnJhbWUgJiYgZnJhbWUtPnBhZ2Uo KTsKIH0KIAorU3RvcmFnZVR5cGUgU3RvcmFnZUFyZWFJbXBsOjpzdG9yYWdlVHlwZSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPnN0b3JhZ2VUeXBlKCk7Cit9CisKIHNp emVfdCBTdG9yYWdlQXJlYUltcGw6Om1lbW9yeUJ5dGVzVXNlZEJ5Q2FjaGUoKQogewogICAgIHJl dHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0 b3JhZ2VBcmVhSW1wbC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhSW1wbC5oCmluZGV4IDVlNjQxYjMwMzNiNDExM2NmMWM0MTE4ZmUyNWYwMDhhZmRmN2Jh MDQuLmMxZGI1MDcxZTRkMmVmNWRjYmM4NDZlYTU4YjQ3OThlYTI1MWViNTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYUltcGwuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAg LTM1LDE5ICszNSwxOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgU3RvcmFnZUFyZWFN YXA7CiAKLWNsYXNzIFN0b3JhZ2VBcmVhSW1wbCA6IHB1YmxpYyBXZWJDb3JlOjpTdG9yYWdlQXJl YSB7CitjbGFzcyBTdG9yYWdlQXJlYUltcGwgRklOQUwgOiBwdWJsaWMgV2ViQ29yZTo6U3RvcmFn ZUFyZWEgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4g Y3JlYXRlKFBhc3NSZWZQdHI8U3RvcmFnZUFyZWFNYXA+KTsKICAgICB2aXJ0dWFsIH5TdG9yYWdl QXJlYUltcGwoKTsKIAogICAgIHVpbnQ2NF90IHN0b3JhZ2VBcmVhSUQoKSBjb25zdCB7IHJldHVy biBtX3N0b3JhZ2VBcmVhSUQ7IH0KLSAgICBXZWJDb3JlOjpTdG9yYWdlVHlwZSBzdG9yYWdlVHlw ZSgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0b3JhZ2VBcmVhSW1wbChQYXNzUmVmUHRyPFN0 b3JhZ2VBcmVhTWFwPik7CiAKICAgICAvLyBXZWJDb3JlOjpTdG9yYWdlQXJlYS4KLSAgICB2aXJ0 dWFsIHVuc2lnbmVkIGxlbmd0aChXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJh bWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCwgV2ViQ29y ZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7 CiAgICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgV2ViQ29yZTo6 RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCB2b2lkIHNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYg dmFsdWUsIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJh bWUpIE9WRVJSSURFOwpAQCAtNTUsNiArNTQsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBjbGVhcihXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29yZTo6RnJhbWUqIHNvdXJjZUZy YW1lKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBr ZXksIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NTdG9yYWdlKFdlYkNvcmU6OkZy YW1lKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCBXZWJDb3JlOjpTdG9yYWdlVHlwZSBzdG9yYWdl VHlwZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgc2l6ZV90IG1lbW9yeUJ5dGVzVXNl ZEJ5Q2FjaGUoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW5jcmVtZW50QWNjZXNzQ291 bnQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGVjcmVtZW50QWNjZXNzQ291bnQoKSBP VkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlQXJlYU1hcC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZUFyZWFNYXAuY3BwCmluZGV4IDBiZDQyMmJhYTQ3MGJjYzI0MDkzYmFiZjk1MTFjNjAwZjVk MGRhMDUuLjM4MjU2M2I3NTM5NjE5Y2M5OWI4NTRiNGQ1YWUyNzJhNGU2MGJkZmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNw cApAQCAtMzIwLDggKzMyMCw4IEBAIHZvaWQgU3RvcmFnZUFyZWFNYXA6OmRpc3BhdGNoU2Vzc2lv blN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjCiAgICAgICAgIGlm ICghc3RvcmFnZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIFN0b3JhZ2VBcmVh SW1wbCogc3RvcmFnZUFyZWEgPSBzdGF0aWNfY2FzdDxTdG9yYWdlQXJlYUltcGwqPihzdG9yYWdl LT5hcmVhKCkpOwotICAgICAgICBpZiAoc3RvcmFnZUFyZWEtPnN0b3JhZ2VBcmVhSUQoKSA9PSBz b3VyY2VTdG9yYWdlQXJlYUlEKSB7CisgICAgICAgIFN0b3JhZ2VBcmVhSW1wbCYgc3RvcmFnZUFy ZWEgPSBzdGF0aWNfY2FzdDxTdG9yYWdlQXJlYUltcGwmPihzdG9yYWdlLT5hcmVhKCkpOworICAg ICAgICBpZiAoc3RvcmFnZUFyZWEuc3RvcmFnZUFyZWFJRCgpID09IHNvdXJjZVN0b3JhZ2VBcmVh SUQpIHsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgdGhlIHN0b3JhZ2UgYXJlYSB0aGF0IGNhdXNl ZCB0aGUgZXZlbnQgdG8gYmUgZGlzcGF0Y2hlZC4KICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CkBAIC0zNTAsOCArMzUwLDggQEAgdm9pZCBTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hM b2NhbFN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb24KICAgICAg ICAgICAgIGlmICghc3RvcmFnZSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAg ICAgICAgU3RvcmFnZUFyZWFJbXBsKiBzdG9yYWdlQXJlYSA9IHN0YXRpY19jYXN0PFN0b3JhZ2VB cmVhSW1wbCo+KHN0b3JhZ2UtPmFyZWEoKSk7Ci0gICAgICAgICAgICBpZiAoc3RvcmFnZUFyZWEt PnN0b3JhZ2VBcmVhSUQoKSA9PSBzb3VyY2VTdG9yYWdlQXJlYUlEKSB7CisgICAgICAgICAgICBT dG9yYWdlQXJlYUltcGwmIHN0b3JhZ2VBcmVhID0gc3RhdGljX2Nhc3Q8U3RvcmFnZUFyZWFJbXBs Jj4oc3RvcmFnZS0+YXJlYSgpKTsKKyAgICAgICAgICAgIGlmIChzdG9yYWdlQXJlYS5zdG9yYWdl QXJlYUlEKCkgPT0gc291cmNlU3RvcmFnZUFyZWFJRCkgewogICAgICAgICAgICAgICAgIC8vIFRo aXMgaXMgdGhlIHN0b3JhZ2UgYXJlYSB0aGF0IGNhdXNlZCB0aGUgZXZlbnQgdG8gYmUgZGlzcGF0 Y2hlZC4KICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0K