125104 2013-12-02 14:03:19 -0800 WKPageLoaderClient should be versioned 2013-12-03 06:33:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125140 1 andersca andersca oldest_to_newest 955567 0 andersca 2013-12-02 14:03:19 -0800 WKPageLoaderClient should be versioned 955569 1 218214 andersca 2013-12-02 14:13:44 -0800 Created attachment 218214 Patch 955575 2 218214 sam 2013-12-02 14:20:02 -0800 Comment on attachment 218214 Patch Nice. r=me 955588 3 andersca 2013-12-02 14:33:03 -0800 Committed r159965: <http://trac.webkit.org/changeset/159965> 218214 2013-12-02 14:13:44 -0800 2013-12-02 14:20:02 -0800 Patch bug-125104-20131202141343.patch text/plain 47670 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODhmYWEwYmEyNWIxNDU4 MTE5ZjVlYzg1YTcyMjM3ZDYyNGQwOTUwNi4uYmEzNmU1YzhjOWJhYzVhYmVkYzNkYjA5NzA3MWRl MmEyNjMzYjAzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc0IEBACisyMDEzLTEyLTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlTG9hZGVy Q2xpZW50IHNob3VsZCBiZSB2ZXJzaW9uZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNTEwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBtdWx0aXBsZSB2ZXJzaW9ucyBvZiB0aGUgV0tQYWdlTG9h ZGVyQ2xpZW50IHN0cnVjdC4gSW4gYSBzdWJzZXF1ZW50IHBhdGNoLAorICAgICAgICBXS1BhZ2VM b2FkZXJDbGllbnQgYW5kIGtXS1BhZ2VMb2FkZXJDbGllbnRDdXJyZW50VmVyc2lvbiB3aWxsIGJl IGRlcHJlY2F0ZWQuIEluc3RlYWQsCisgICAgICAgIHVzZXJzIG9mIHRoZSBBUEkgYXJlIHN1cHBv c2VkIHRvIGV4cGxpY2l0bHkgY2hvb3NlIGEgdmVyc2lvbiBhbmQgYSB2ZXJzaW9uZWQgc3RydWN0 LgorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudC5oOgorICAgICAgICBBZGQgYSBuZXcgQVBJ OjpDbGllbnQgY2xhc3Mgd2l0aCBhIG5ldyBDbGllbnRUcmFpdHMgdGVtcGxhdGUgdGhhdCB1c2Vz IHN0ZDo6dHVwbGUgZm9yIHZlcnNpb25zLgorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRy YWl0cy5jcHA6CisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5oOgorICAgICAgICBS ZW1vdmUgV0tQYWdlTG9hZGVyQ2xpZW50IGludGVyZmFjZSBzaXplcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU2V0UGFnZUxvYWRlckNs aWVudCk6CisgICAgICAgIEFkZCBhbiBleHBsaWNpdCBjYXN0IHRvIFdLUGFnZUxvYWRlckNsaWVu dEJhc2UuIEluIGFuIHVwY29taW5nIHBhdGNoLCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50Cisg ICAgICAgIHdpbGwgYmUgY2hhbmdlZCB0byB0YWtlIGEgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSBp bnN0ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUxvYWRlckNsaWVudC5o OgorICAgICAgICBBZGQgbmV3IHZlcnNpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW06CisgICAgICAgIChzZXRVcFBhZ2VM b2FkZXJDbGllbnQpOgorICAgICAgICBVc2UgYW4gZXhwbGljaXQgdmVyc2lvbi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJM b2FkZXJDbGllbnQ6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAo V2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zp c2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50Ojpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJMb2FkZXJDbGllbnQ6OmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZEZpbmlzaExvYWRGb3JGcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6ZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JG cmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6ZGlkU2FtZURvY3VtZW50 TmF2aWdhdGlvbkZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50Ojpk aWRSZWNlaXZlVGl0bGVGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVu dDo6ZGlkRmlyc3RMYXlvdXRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNs aWVudDo6ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUpOgorICAgICAgICAo V2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZExheW91dCk6CisgICAgICAgIChXZWJLaXQ6Oldl YkxvYWRlckNsaWVudDo6ZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5KToKKyAgICAgICAgKFdl YktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUp OgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZFJ1bkluc2VjdXJlQ29udGVu dEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWREZXRlY3RY U1NGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6Y2FuQXV0aGVu dGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpX ZWJMb2FkZXJDbGllbnQ6OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUp OgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZFN0YXJ0UHJvZ3Jlc3MpOgor ICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJDbGllbnQ6OmRpZENoYW5nZVByb2dyZXNzKToKKyAg ICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hQcm9ncmVzcyk6CisgICAg ICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6cHJvY2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2 ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6aW50ZXJhY3Rpb25PY2N1cnJl ZFdoaWxlUHJvY2Vzc1VucmVzcG9uc2l2ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNs aWVudDo6cHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJM b2FkZXJDbGllbnQ6OnByb2Nlc3NEaWRDcmFzaCk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRl ckNsaWVudDo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi TG9hZGVyQ2xpZW50OjpzaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbSk6CisgICAgICAgIChX ZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6d2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKToKKyAg ICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2lu KToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWRCbG9ja0luc2VjdXJlUGx1 Z2luVmVyc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6cGx1Z2luTG9h ZFBvbGljeSk6CisgICAgICAgIEdvIHRocm91Z2ggY2xpZW50LmJhc2UgZXZlcnl3aGVyZS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgQWRkIEFQSTo6 Q2xpZW50VHJhaXRzIHNwZWNpYWxpemF0aW9uLiBDaGFuZ2UgV2ViTG9hZGVyQ2xpZW50IHRvIGRl cml2ZSBmcm9tIEFQSTo6Q2xpZW50PFdLUGFnZUxvYWRlckNsaWVudEJhc2U+LgorCisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6aW5pdGlhbGl6ZUxvYWRlckNsaWVudCk6CisgICAgICAgIFRoaXMgbm93IHRha2VzIGEg V0tQYWdlTG9hZGVyQ2xpZW50QmFzZSouCisgICAgICAgIAogMjAxMy0xMi0wMSAgQ2hhbmdTZW9r IE9oICA8Y2hhbmdzZW9rLm9oQGNvbGxhYm9yYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBH dGsgcG9ydCBCdWlsZCBmaXggYWZ0ZXIgcjE1OTkwMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL0FQSUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudC5o CmluZGV4IDIxY2I1OTRlNWIzZjVjN2VjMDI1M2IxMTRkZTg4ZjA2MmM3NGFhYjMuLmM3NDVjOTVk NmJkZmJlMzM4ZTdlYjgxOWVlZTczYjE3NWU4YTJjMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9BUElDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xp ZW50LmgKQEAgLTI3LDYgKzI3LDY5IEBACiAjZGVmaW5lIEFQSUNsaWVudF9oCiAKICNpbmNsdWRl ICJBUElDbGllbnRUcmFpdHMuaCIKKyNpbmNsdWRlIDxhcnJheT4KKworLy8gRklYTUU6IFRyYW5z aXRpb24gYWxsIGNsaWVudHMgZnJvbSBXZWJLaXQ6OkFQSUNsaWVudCB0byBBUEk6OkNsaWVudC4K K25hbWVzcGFjZSBBUEkgeworCit0ZW1wbGF0ZTx0eXBlbmFtZSBDbGllbnRJbnRlcmZhY2U+IHN0 cnVjdCBDbGllbnRUcmFpdHM7CisKK3RlbXBsYXRlPHR5cGVuYW1lIENsaWVudEludGVyZmFjZT4g Y2xhc3MgQ2xpZW50IHsKKyAgICB0eXBlZGVmIHR5cGVuYW1lIENsaWVudFRyYWl0czxDbGllbnRJ bnRlcmZhY2U+OjpWZXJzaW9ucyBDbGllbnRWZXJzaW9uczsKKyAgICBzdGF0aWMgY29uc3QgaW50 IGxhdGVzdENsaWVudFZlcnNpb24gPSBzdGQ6OnR1cGxlX3NpemU8Q2xpZW50VmVyc2lvbnM+Ojp2 YWx1ZSAtIDE7CisgICAgdHlwZWRlZiB0eXBlbmFtZSBzdGQ6OnR1cGxlX2VsZW1lbnQ8bGF0ZXN0 Q2xpZW50VmVyc2lvbiwgQ2xpZW50VmVyc2lvbnM+Ojp0eXBlIExhdGVzdENsaWVudEludGVyZmFj ZTsKKworICAgIC8vIEhlbHBlciBjbGFzcyB0aGF0IGNhbiByZXR1cm4gYW4gc3RkOjphcnJheSBv ZiBlbGVtZW50IHNpemVzIGluIGEgdHVwbGUuCisgICAgdGVtcGxhdGU8dHlwZW5hbWU+IHN0cnVj dCBJbnRlcmZhY2VTaXplczsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBJbnRlcmZhY2VzPiBz dHJ1Y3QgSW50ZXJmYWNlU2l6ZXM8c3RkOjp0dXBsZTxJbnRlcmZhY2VzLi4uPj4geworICAgICAg ICBzdGF0aWMgc3RkOjphcnJheTxzaXplX3QsIHNpemVvZi4uLihJbnRlcmZhY2VzKT4gc2l6ZXMo KQorICAgICAgICB7CisjaWYgQ09NUElMRVIoQ0xBTkcpCisvLyBXb3JrYXJvdW5kIGZvciBodHRw Oi8vbGx2bS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMTcKKyNwcmFnbWEgY2xhbmcgZGlh Z25vc3RpYyBwdXNoCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdtaXNzaW5n LWJyYWNlcyIKKyNlbmRpZgorICAgICAgICAgICAgcmV0dXJuIHsgc2l6ZW9mKEludGVyZmFjZXMp Li4uIH07CisjaWYgQ09NUElMRVIoQ0xBTkcpCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9w CisjZW5kaWYKKyAgICAgICAgfQorICAgIH07CisKK3B1YmxpYzoKKyAgICBDbGllbnQoKQorICAg IHsKKyNpZiAhQVNTRVJUX0RJU0FCTEVECisgICAgICAgIGF1dG8gaW50ZXJmYWNlU2l6ZXMgPSBJ bnRlcmZhY2VTaXplczxDbGllbnRWZXJzaW9ucz46OnNpemVzKCk7CisgICAgICAgIEFTU0VSVChz dGQ6OmlzX3NvcnRlZChpbnRlcmZhY2VTaXplcy5iZWdpbigpLCBpbnRlcmZhY2VTaXplcy5lbmQo KSkpOworI2VuZGlmCisKKyAgICAgICAgaW5pdGlhbGl6ZShudWxscHRyKTsKKyAgICB9CisKKyAg ICB2b2lkIGluaXRpYWxpemUoY29uc3QgQ2xpZW50SW50ZXJmYWNlKiBjbGllbnQpCisgICAgewor ICAgICAgICBpZiAoY2xpZW50ICYmIGNsaWVudC0+dmVyc2lvbiA9PSBsYXRlc3RDbGllbnRWZXJz aW9uKSB7CisgICAgICAgICAgICBtX2NsaWVudCA9ICpyZWludGVycHJldF9jYXN0PGNvbnN0IExh dGVzdENsaWVudEludGVyZmFjZSo+KGNsaWVudCk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKworICAgICAgICBtZW1zZXQoJm1fY2xpZW50LCAwLCBzaXplb2YobV9jbGllbnQpKTsK KworICAgICAgICBpZiAoY2xpZW50ICYmIGNsaWVudC0+dmVyc2lvbiA8IGxhdGVzdENsaWVudFZl cnNpb24pIHsKKyAgICAgICAgICAgIGF1dG8gaW50ZXJmYWNlU2l6ZXMgPSBJbnRlcmZhY2VTaXpl czxDbGllbnRWZXJzaW9ucz46OnNpemVzKCk7CisKKyAgICAgICAgICAgIG1lbWNweSgmbV9jbGll bnQsIGNsaWVudCwgaW50ZXJmYWNlU2l6ZXNbY2xpZW50LT52ZXJzaW9uXSk7CisgICAgICAgIH0K KyAgICB9CisKKyAgICBjb25zdCBMYXRlc3RDbGllbnRJbnRlcmZhY2UmIGNsaWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1fY2xpZW50OyB9CisKK3Byb3RlY3RlZDoKKyAgICBMYXRlc3RDbGllbnRJbnRl cmZhY2UgbV9jbGllbnQ7Cit9OworCit9IC8vIG5hbWVzcGFjZSBBUEkKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElDbGllbnRUcmFp dHMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHAKaW5kZXgg Nzg4NGQwMzg2Nzk2M2E0NGUxNWE5ZDMzOTgyY2M4MTg2OTMyOGZhNS4uYzZjZWFmZTI4NDI5OGJm ZDE4MDk3NTRmNWRlNmYyNzJkMTgzOWJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL0FQSUNsaWVudFRyYWl0cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNs aWVudFRyYWl0cy5jcHAKQEAgLTY0LDEzICs2NCw2IEBAIGNvbnN0IHNpemVfdCBBUElDbGllbnRU cmFpdHM8V0tQYWdlQ29udGV4dE1lbnVDbGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVyc2lvbltd CiAgICAgc2l6ZW9mKFdLUGFnZUNvbnRleHRNZW51Q2xpZW50KQogfTsKIAotY29uc3Qgc2l6ZV90 IEFQSUNsaWVudFRyYWl0czxXS1BhZ2VMb2FkZXJDbGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVy c2lvbltdID0gewotICAgIG9mZnNldG9mKFdLUGFnZUxvYWRlckNsaWVudCwgZGlkRGV0ZWN0WFNT Rm9yRnJhbWUpLAotICAgIG9mZnNldG9mKFdLUGFnZUxvYWRlckNsaWVudCwgZGlkUmVjZWl2ZUlu dGVudEZvckZyYW1lX3VuYXZhaWxhYmxlKSwKLSAgICBvZmZzZXRvZihXS1BhZ2VMb2FkZXJDbGll bnQsIHBsdWdpbkxvYWRQb2xpY3kpLAotICAgIHNpemVvZihXS1BhZ2VMb2FkZXJDbGllbnQpCi19 OwotCiBjb25zdCBzaXplX3QgQVBJQ2xpZW50VHJhaXRzPFdLUGFnZVBvbGljeUNsaWVudD46Omlu dGVyZmFjZVNpemVzQnlWZXJzaW9uW10gPSB7CiAgICAgb2Zmc2V0b2YoV0tQYWdlUG9saWN5Q2xp ZW50LCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKSwKICAgICBzaXplb2YoV0tQYWdl UG9saWN5Q2xpZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVu dFRyYWl0cy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5oCmluZGV4 IDQ4YTI5NjEyOGZhYWMzMzRkM2VhZmEzNWVkNzAwZWUxOGVlOGNiM2MuLjNjMDBhNGM3MTAzZWVj YmE4NDAzZDhiYTNmYmNiZGY2NTkzZTBiOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9BUElDbGllbnRUcmFpdHMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xp ZW50VHJhaXRzLmgKQEAgLTY0LDEwICs2NCw2IEBAIHRlbXBsYXRlPD4gc3RydWN0IEFQSUNsaWVu dFRyYWl0czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD4gewogICAgIHN0YXRpYyBjb25zdCBzaXpl X3QgaW50ZXJmYWNlU2l6ZXNCeVZlcnNpb25bNF07CiB9OwogCi10ZW1wbGF0ZTw+IHN0cnVjdCBB UElDbGllbnRUcmFpdHM8V0tQYWdlTG9hZGVyQ2xpZW50PiB7Ci0gICAgc3RhdGljIGNvbnN0IHNp emVfdCBpbnRlcmZhY2VTaXplc0J5VmVyc2lvbls0XTsKLX07Ci0KIHRlbXBsYXRlPD4gc3RydWN0 IEFQSUNsaWVudFRyYWl0czxXS1BhZ2VQb2xpY3lDbGllbnQ+IHsKICAgICBzdGF0aWMgY29uc3Qg c2l6ZV90IGludGVyZmFjZVNpemVzQnlWZXJzaW9uWzJdOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggY2E1ODVjYjc5OGEyZGUwNTZiN2RiMTEzNDc3 NzUwYTZmZDEwZTA0ZC4uZDU2YzU3N2U3NDRjNTMwN2NlNGE0NTBkNGUyMjZlYmQwMjM3YmM2YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTY1Myw3ICs2 NTMsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VGb3JtQ2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBj b25zdCBXS1BhZ2VGb3JtQ2xpZW50KiB3a0NsaWVudAogCiB2b2lkIFdLUGFnZVNldFBhZ2VMb2Fk ZXJDbGllbnQoV0tQYWdlUmVmIHBhZ2VSZWYsIGNvbnN0IFdLUGFnZUxvYWRlckNsaWVudCogd2tD bGllbnQpCiB7Ci0gICAgdG9JbXBsKHBhZ2VSZWYpLT5pbml0aWFsaXplTG9hZGVyQ2xpZW50KHdr Q2xpZW50KTsKKyAgICB0b0ltcGwocGFnZVJlZiktPmluaXRpYWxpemVMb2FkZXJDbGllbnQocmVp bnRlcnByZXRfY2FzdDxjb25zdCBXS1BhZ2VMb2FkZXJDbGllbnRCYXNlKj4od2tDbGllbnQpKTsK IH0KIAogdm9pZCBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBj b25zdCBXS1BhZ2VQb2xpY3lDbGllbnQqIHdrQ2xpZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUxvYWRlckNsaWVudC5oCmluZGV4IDFmNTNiZDc2Zjdj ZGU3OGFlOTUwY2Q0Mjg3NzA4YjRlZTc5YTkzODEuLmYwYzBmM2E2YmUxNGEyMjRlMjA5ZmRhM2Nm NTUzMWZmMzIwMzcwM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2VMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlTG9hZGVyQ2xpZW50LmgKQEAgLTcyLDkgKzcyLDE0MCBAQCB0eXBlZGVmIHZvaWQg KCpXS1BhZ2VEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVz ZVdpdGhWMCkoVwogdHlwZWRlZiB2b2lkICgqV0tQYWdlUGx1Z2luRGlkRmFpbENhbGxiYWNrX2Rl cHJlY2F0ZWRGb3JVc2VXaXRoVjEpKFdLUGFnZVJlZiBwYWdlLCBXS0Vycm9yQ29kZSBlcnJvckNv ZGUsIFdLU3RyaW5nUmVmIG1pbWVUeXBlLCBXS1N0cmluZ1JlZiBwbHVnaW5JZGVudGlmaWVyLCBX S1N0cmluZ1JlZiBwbHVnaW5WZXJzaW9uLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIHR5cGVk ZWYgV0tQbHVnaW5Mb2FkUG9saWN5ICgqV0tQYWdlUGx1Z2luTG9hZFBvbGljeUNhbGxiYWNrX2Rl cHJlY2F0ZWRGb3JVc2VXaXRoVjIpKFdLUGFnZVJlZiBwYWdlLCBXS1BsdWdpbkxvYWRQb2xpY3kg Y3VycmVudFBsdWdpbkxvYWRQb2xpY3ksIFdLRGljdGlvbmFyeVJlZiBwbHVnaW5JbmZvRGljdGlv bmFyeSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKLXN0cnVjdCBXS1BhZ2VMb2FkZXJDbGll bnQgewordHlwZWRlZiBzdHJ1Y3QgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSB7CiAgICAgaW50ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB2ZXJzaW9uOwogICAgIGNvbnN0IHZvaWQgKiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xpZW50SW5mbzsKK30gV0tQYWdlTG9hZGVy Q2xpZW50QmFzZTsKKwordHlwZWRlZiBzdHJ1Y3QgV0tQYWdlTG9hZGVyQ2xpZW50VjAgeworICAg IFdLUGFnZUxvYWRlckNsaWVudEJhc2UgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYmFzZTsKKyAgICBXS1BhZ2VEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWU7CisgICAgV0tQYWdlRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9u YWxMb2FkRm9yRnJhbWVDYWxsYmFjayAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0 aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgIGRpZEZhaWxQcm92aXNpb25hbExv YWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRDb21taXRMb2FkRm9yRnJhbWVDYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZENvbW1pdExvYWRGb3JGcmFt ZTsKKyAgICBXS1BhZ2VEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZUNhbGxiYWNrICAgICAg ICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lOworICAgIFdL UGFnZURpZEZpbmlzaExvYWRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZGlkRmluaXNoTG9hZEZvckZyYW1lOworICAgIFdLUGFnZURpZEZhaWxMb2FkV2l0 aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmFpbExv YWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9u Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgIGRpZFNhbWVEb2N1bWVudE5hdmln YXRpb25Gb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRSZWNlaXZlVGl0bGVGb3JGcmFtZUNhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lOwor ICAgIFdLUGFnZURpZEZpcnN0TGF5b3V0Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZGlkRmlyc3RMYXlvdXRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgIGRp ZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lOworICAgIFdLUGFnZURpZFJlbW92 ZUZyYW1lRnJvbUhpZXJhcmNoeUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlk UmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5OworICAgIFdLUGFnZURpZERpc3BsYXlJbnNlY3VyZUNv bnRlbnRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgZGlkRGlzcGxheUluc2Vj dXJlQ29udGVudEZvckZyYW1lOworICAgIFdLUGFnZURpZFJ1bkluc2VjdXJlQ29udGVudEZvckZy YW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgZGlkUnVuSW5zZWN1cmVDb250ZW50 Rm9yRnJhbWU7CisgICAgV0tQYWdlQ2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFj ZUluRnJhbWVDYWxsYmFjayAgICAgICAgICBjYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlv blNwYWNlSW5GcmFtZTsKKyAgICBXS1BhZ2VEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVu Z2VJbkZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNo YWxsZW5nZUluRnJhbWU7CisKKyAgICAvLyBGSVhNRTogTW92ZSB0byBwcm9ncmVzcyBjbGllbnQu CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkaWRTdGFydFByb2dyZXNzOworICAgIFdLUGFnZUxvYWRlckNsaWVu dENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkQ2hh bmdlUHJvZ3Jlc3M7CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hQcm9ncmVzczsKKworICAgIC8v IEZJWE1FOiBUaGVzZSB0aHJlZSBmdW5jdGlvbnMgc2hvdWxkIG5vdCBiZSBwYXJ0IG9mIHRoaXMg Y2xpZW50LgorICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2ZTsKKyAg ICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHByb2Nlc3NEaWRCZWNvbWVSZXNwb25zaXZlOworICAgIFdLUGFnZUxvYWRl ckNsaWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cHJvY2Vzc0RpZENyYXNoOworICAgIFdLUGFnZURpZENoYW5nZUJhY2tGb3J3YXJkTGlzdENhbGxi YWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0 OworICAgIFdLUGFnZVNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICAgc2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW07CisgICAgV0tQ YWdlRGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbkNhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjAgICAgICBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjA7 Cit9IFdLUGFnZUxvYWRlckNsaWVudFYwOworCit0eXBlZGVmIHN0cnVjdCBXS1BhZ2VMb2FkZXJD bGllbnRWMSB7CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlOworICAgIFdLUGFnZURpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgZGlkU3RhcnRQ cm92aXNpb25hbExvYWRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZUNhbGxiYWNrICAgIGRpZFJlY2VpdmVTZXJ2ZXJS ZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOworICAgIFdLUGFnZURpZEZhaWxQcm92 aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgZGlkRmFp bFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOworICAgIFdLUGFnZURpZENvbW1pdExv YWRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkQ29t bWl0TG9hZEZvckZyYW1lOworICAgIFdLUGFnZURpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1l Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9y RnJhbWU7CisgICAgV0tQYWdlRGlkRmluaXNoTG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hMb2FkRm9yRnJhbWU7CisgICAgV0tQYWdl RGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAg ICAgICBkaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lOworICAgIFdLUGFnZURpZFNhbWVEb2N1 bWVudE5hdmlnYXRpb25Gb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgZGlkU2Ft ZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lOworICAgIFdLUGFnZURpZFJlY2VpdmVUaXRsZUZv ckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkUmVjZWl2ZVRp dGxlRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkRmlyc3RMYXlvdXRGb3JGcmFtZUNhbGxiYWNrICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGaXJzdExheW91dEZvckZyYW1lOworICAg IFdLUGFnZURpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lQ2FsbGJhY2sgICAg ICAgICAgICAgICAgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWU7CisgICAg V0tQYWdlRGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5Q2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaWRSZW1vdmVGcmFtZUZyb21IaWVyYXJjaHk7CisgICAgV0tQYWdlRGlkRGlz cGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICBk aWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWU7CisgICAgV0tQYWdlRGlkUnVuSW5zZWN1 cmVDb250ZW50Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRSdW5J bnNlY3VyZUNvbnRlbnRGb3JGcmFtZTsKKyAgICBXS1BhZ2VDYW5BdXRoZW50aWNhdGVBZ2FpbnN0 UHJvdGVjdGlvblNwYWNlSW5GcmFtZUNhbGxiYWNrICAgICAgICAgIGNhbkF1dGhlbnRpY2F0ZUFn YWluc3RQcm90ZWN0aW9uU3BhY2VJbkZyYW1lOworICAgIFdLUGFnZURpZFJlY2VpdmVBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZUluRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgZGlkUmVjZWl2ZUF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFtZTsKKworICAgIC8vIEZJWE1FOiBNb3ZlIHRvIHBy b2dyZXNzIGNsaWVudC4KKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZFN0YXJ0UHJvZ3Jlc3M7CisgICAgV0tQ YWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkaWRDaGFuZ2VQcm9ncmVzczsKKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaFByb2dy ZXNzOworCisgICAgLy8gRklYTUU6IFRoZXNlIHRocmVlIGZ1bmN0aW9ucyBzaG91bGQgbm90IGJl IHBhcnQgb2YgdGhpcyBjbGllbnQuCisgICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9jZXNzRGlkQmVjb21lVW5y ZXNwb25zaXZlOworICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmU7Cisg ICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwcm9jZXNzRGlkQ3Jhc2g7CisgICAgV0tQYWdlRGlkQ2hhbmdlQmFja0Zv cndhcmRMaXN0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRDaGFuZ2VC YWNrRm9yd2FyZExpc3Q7CisgICAgV0tQYWdlU2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1D YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0 SXRlbTsKKyAgICBXS1BhZ2VEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luQ2FsbGJhY2tfZGVwcmVj YXRlZEZvclVzZVdpdGhWMCAgICAgIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW5fZGVwcmVjYXRl ZEZvclVzZVdpdGhWMDsKKworICAgIC8vIFZlcnNpb24gMQorICAgIFdLUGFnZURpZERldGVjdFhT U0ZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRGV0 ZWN0WFNTRm9yRnJhbWU7CisKKyAgICB2b2lkKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dF91bmF2YWlsYWJsZTsKKworICAgIFdLUGFnZVdpbGxHb1RvQmFja0ZvcndhcmRM aXN0SXRlbUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgd2lsbEdvVG9CYWNrRm9y d2FyZExpc3RJdGVtOworCisgICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcmFjdGlvbk9jY3VycmVkV2hpbGVQ cm9jZXNzVW5yZXNwb25zaXZlOworICAgIFdLUGFnZVBsdWdpbkRpZEZhaWxDYWxsYmFja19kZXBy ZWNhdGVkRm9yVXNlV2l0aFYxICAgICAgICAgICAgICAgICAgcGx1Z2luRGlkRmFpbF9kZXByZWNh dGVkRm9yVXNlV2l0aFYxOworfSBXS1BhZ2VMb2FkZXJDbGllbnRWMTsKKwordHlwZWRlZiBzdHJ1 Y3QgV0tQYWdlTG9hZGVyQ2xpZW50VjIgeworICAgIFdLUGFnZUxvYWRlckNsaWVudEJhc2UgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZTsKKyAgICBXS1Bh Z2VEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVDYWxsYmFjayAgICBk aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKKyAgICBX S1BhZ2VEaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAg ICAgICAgICAgIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAgICBX S1BhZ2VEaWRDb21taXRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRGaW5pc2hEb2N1 bWVudExvYWRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlz aERvY3VtZW50TG9hZEZvckZyYW1lOworICAgIFdLUGFnZURpZEZpbmlzaExvYWRGb3JGcmFtZUNh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmluaXNoTG9hZEZvckZy YW1lOworICAgIFdLUGFnZURpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAgICBX S1BhZ2VEaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZTsKKyAgICBXS1BhZ2VE aWRSZWNlaXZlVGl0bGVGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lOworICAgIFdLUGFnZURpZEZpcnN0TGF5b3V0Rm9y RnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmlyc3RMYXlv dXRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JG cmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91 dEZvckZyYW1lOworICAgIFdLUGFnZURpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeUNhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5Owor ICAgIFdLUGFnZURpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZUNhbGxiYWNrICAgICAg ICAgICAgICAgICAgICAgZGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lOworICAgIFdL UGFnZURpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWU7CisgICAgV0tQYWdlQ2FuQXV0 aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWVDYWxsYmFjayAgICAgICAgICBj YW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlSW5GcmFtZTsKKyAgICBXS1BhZ2VE aWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VJbkZyYW1lQ2FsbGJhY2sgICAgICAgICAg ICAgIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWU7CisKKyAgICAvLyBG SVhNRTogTW92ZSB0byBwcm9ncmVzcyBjbGllbnQuCisgICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2Fs bGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRTdGFydFBy b2dyZXNzOworICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGlkQ2hhbmdlUHJvZ3Jlc3M7CisgICAgV0tQYWdlTG9h ZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkaWRGaW5pc2hQcm9ncmVzczsKKworICAgIC8vIEZJWE1FOiBUaGVzZSB0aHJlZSBmdW5jdGlv bnMgc2hvdWxkIG5vdCBiZSBwYXJ0IG9mIHRoaXMgY2xpZW50LgorICAgIFdLUGFnZUxvYWRlckNs aWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJv Y2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2ZTsKKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByb2Nlc3NEaWRCZWNv bWVSZXNwb25zaXZlOworICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc0RpZENyYXNoOworICAgIFdLUGFn ZURpZENoYW5nZUJhY2tGb3J3YXJkTGlzdENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0OworICAgIFdLUGFnZVNob3VsZEdvVG9CYWNr Rm9yd2FyZExpc3RJdGVtQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgc2hvdWxkR29U b0JhY2tGb3J3YXJkTGlzdEl0ZW07CisgICAgV0tQYWdlRGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdp bkNhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAgICAgICBkaWRGYWlsVG9Jbml0aWFsaXpl UGx1Z2luX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjA7CisKKyAgICAvLyBWZXJzaW9uIDEKKyAgICBX S1BhZ2VEaWREZXRlY3RYU1NGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpZERldGVjdFhTU0ZvckZyYW1lOworCisgICAgdm9pZCogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWROZXdG aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRfdW5hdmFpbGFibGU7CisKKyAgICBXS1BhZ2VXaWxs R29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1DYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAg IHdpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbTsKKworICAgIFdLUGFnZUxvYWRlckNsaWVudENh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJhY3Rp b25PY2N1cnJlZFdoaWxlUHJvY2Vzc1VucmVzcG9uc2l2ZTsKKyAgICBXS1BhZ2VQbHVnaW5EaWRG YWlsQ2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMSAgICAgICAgICAgICAgICAgIHBsdWdp bkRpZEZhaWxfZGVwcmVjYXRlZEZvclVzZVdpdGhWMTsKKworICAgIC8vIFZlcnNpb24gMgorICAg IHZvaWQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKCpkaWRSZWNlaXZlSW50ZW50Rm9yRnJhbWVfdW5hdmFpbGFibGUpKHZvaWQp OworICAgIHZvaWQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKCpyZWdpc3RlckludGVudFNlcnZpY2VGb3JGcmFtZV91bmF2YWls YWJsZSkodm9pZCk7CisKKyAgICBXS1BhZ2VEaWRMYXlvdXRDYWxsYmFjayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZExheW91dDsKKyAgICBXS1BhZ2VQbHVn aW5Mb2FkUG9saWN5Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMiAgICAgICAgICAgICAg IHBsdWdpbkxvYWRQb2xpY3lfZGVwcmVjYXRlZEZvclVzZVdpdGhWMjsKKyAgICBXS1BhZ2VQbHVn aW5EaWRGYWlsQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBsdWdpbkRpZEZhaWw7Cit9IFdLUGFnZUxvYWRlckNsaWVudFYyOworCit0eXBlZGVmIHN0cnVj dCBXS1BhZ2VMb2FkZXJDbGllbnRWMyB7CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlOwogICAgIFdLUGFn ZURpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKICAgICBXS1BhZ2VEaWRSZWNl aXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZUNhbGxiYWNrICAgIGRp ZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOwogICAgIFdL UGFnZURpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrICAgICAg ICAgICAgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOwpAQCAtMTI1 LDExICsyNTYsNjQgQEAgc3RydWN0IFdLUGFnZUxvYWRlckNsaWVudCB7CiAKICAgICAvLyBWZXJz aW9uIDMKICAgICBXS1BhZ2VQbHVnaW5Mb2FkUG9saWN5Q2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbkxvYWRQb2xpY3k7Ci19OwotdHlwZWRlZiBzdHJ1 Y3QgV0tQYWdlTG9hZGVyQ2xpZW50IFdLUGFnZUxvYWRlckNsaWVudDsKK30gV0tQYWdlTG9hZGVy Q2xpZW50VjM7CiAKKy8vIEZJWE1FOiBUaGVzZSBzaG91bGQgYmUgZGVwcmVjYXRlZC4KIGVudW0g eyBrV0tQYWdlTG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb24gPSAzIH07Cit0eXBlZGVmIHN0cnVj dCBXS1BhZ2VMb2FkZXJDbGllbnQgeworICAgIGludCAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbjsKKyAgICBjb25z dCB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNsaWVudEluZm87CisgICAgV0tQYWdlRGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JG cmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lOworICAgIFdLUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lv bmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJv dmlzaW9uYWxMb2FkRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdp dGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICBkaWRGYWlsUHJvdmlzaW9uYWxM b2FkV2l0aEVycm9yRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkQ29tbWl0TG9hZEZvckZyYW1lQ2Fs bGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRDb21taXRMb2FkRm9yRnJh bWU7CisgICAgV0tQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZTsKKyAgICBX S1BhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpZEZpbmlzaExvYWRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRGYWlsTG9hZFdp dGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZhaWxM b2FkV2l0aEVycm9yRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkU2FtZURvY3VtZW50TmF2aWdhdGlv bkZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICBkaWRTYW1lRG9jdW1lbnROYXZp Z2F0aW9uRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZTsK KyAgICBXS1BhZ2VEaWRGaXJzdExheW91dEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRpZEZpcnN0TGF5b3V0Rm9yRnJhbWU7CisgICAgV0tQYWdlRGlkRmly c3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICBk aWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRSZW1v dmVGcmFtZUZyb21IaWVyYXJjaHlDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgIGRp ZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeTsKKyAgICBXS1BhZ2VEaWREaXNwbGF5SW5zZWN1cmVD b250ZW50Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgIGRpZERpc3BsYXlJbnNl Y3VyZUNvbnRlbnRGb3JGcmFtZTsKKyAgICBXS1BhZ2VEaWRSdW5JbnNlY3VyZUNvbnRlbnRGb3JG cmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIGRpZFJ1bkluc2VjdXJlQ29udGVu dEZvckZyYW1lOworICAgIFdLUGFnZUNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3Bh Y2VJbkZyYW1lQ2FsbGJhY2sgICAgICAgICAgY2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rp b25TcGFjZUluRnJhbWU7CisgICAgV0tQYWdlRGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlSW5GcmFtZUNhbGxiYWNrICAgICAgICAgICAgICBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25D aGFsbGVuZ2VJbkZyYW1lOworCisgICAgLy8gRklYTUU6IE1vdmUgdG8gcHJvZ3Jlc3MgY2xpZW50 LgorICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGlkU3RhcnRQcm9ncmVzczsKKyAgICBXS1BhZ2VMb2FkZXJDbGll bnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZENo YW5nZVByb2dyZXNzOworICAgIFdLUGFnZUxvYWRlckNsaWVudENhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmluaXNoUHJvZ3Jlc3M7CisKKyAgICAv LyBGSVhNRTogVGhlc2UgdGhyZWUgZnVuY3Rpb25zIHNob3VsZCBub3QgYmUgcGFydCBvZiB0aGlz IGNsaWVudC4KKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHByb2Nlc3NEaWRCZWNvbWVVbnJlc3BvbnNpdmU7Cisg ICAgV0tQYWdlTG9hZGVyQ2xpZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2ZTsKKyAgICBXS1BhZ2VMb2Fk ZXJDbGllbnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHByb2Nlc3NEaWRDcmFzaDsKKyAgICBXS1BhZ2VEaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3RDYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlz dDsKKyAgICBXS1BhZ2VTaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbUNhbGxiYWNrICAgICAg ICAgICAgICAgICAgICAgICAgIHNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtOworICAgIFdL UGFnZURpZEZhaWxUb0luaXRpYWxpemVQbHVnaW5DYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0 aFYwICAgICAgZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYw OworCisgICAgLy8gVmVyc2lvbiAxCisgICAgV0tQYWdlRGlkRGV0ZWN0WFNTRm9yRnJhbWVDYWxs YmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWREZXRlY3RYU1NGb3JGcmFt ZTsKKworICAgIHZvaWQqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0X3Vu YXZhaWxhYmxlOworCisgICAgV0tQYWdlV2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtQ2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW07 CisKKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludGVyYWN0aW9uT2NjdXJyZWRXaGlsZVByb2Nlc3NVbnJlc3Bv bnNpdmU7CisgICAgV0tQYWdlUGx1Z2luRGlkRmFpbENhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VX aXRoVjEgICAgICAgICAgICAgICAgICBwbHVnaW5EaWRGYWlsX2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjE7CiAKKyAgICAvLyBWZXJzaW9uIDIKKyAgICB2b2lkICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgqZGlkUmVjZWl2ZUludGVu dEZvckZyYW1lX3VuYXZhaWxhYmxlKSh2b2lkKTsKKyAgICB2b2lkICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgqcmVnaXN0ZXJJ bnRlbnRTZXJ2aWNlRm9yRnJhbWVfdW5hdmFpbGFibGUpKHZvaWQpOworCisgICAgV0tQYWdlRGlk TGF5b3V0Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkaWRMYXlvdXQ7CisgICAgV0tQYWdlUGx1Z2luTG9hZFBvbGljeUNhbGxiYWNrX2RlcHJlY2F0 ZWRGb3JVc2VXaXRoVjIgICAgICAgICAgICAgICBwbHVnaW5Mb2FkUG9saWN5X2RlcHJlY2F0ZWRG b3JVc2VXaXRoVjI7CisgICAgV0tQYWdlUGx1Z2luRGlkRmFpbENhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5EaWRGYWlsOworCisgICAgLy8gVmVy c2lvbiAzCisgICAgV0tQYWdlUGx1Z2luTG9hZFBvbGljeUNhbGxiYWNrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwbHVnaW5Mb2FkUG9saWN5OworfSBXS1BhZ2VMb2FkZXJD bGllbnQ7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0gYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5tbQppbmRleCA5ZDFmZDM2NDQ4NWNkYTVkOWFjNTA1NTQxZWI5MjcwZDYzNWFmZTgwLi45 ZjZjZmM4N2M0ODRjZjhhZjk5YzI1ZjFiY2U3ZTU2NDJmZjVhNDkyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdD b250ZXh0Q29udHJvbGxlci5tbQpAQCAtNDM1LDExICs0MzUsMTEgQEAgc3RhdGljIHZvaWQgZGlk Q2hhbmdlQmFja0ZvcndhcmRMaXN0KFdLUGFnZVJlZiBwYWdlLCBXS0JhY2tGb3J3YXJkTGlzdEl0 ZW1SZWYgYWQKIAogc3RhdGljIHZvaWQgc2V0VXBQYWdlTG9hZGVyQ2xpZW50KFdLQnJvd3NpbmdD b250ZXh0Q29udHJvbGxlciAqYnJvd3NpbmdDb250ZXh0LCBXZWJQYWdlUHJveHkmIHBhZ2UpCiB7 Ci0gICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRlckNsaWVudDsKKyAgICBXS1BhZ2VMb2FkZXJD bGllbnRWMyBsb2FkZXJDbGllbnQ7CiAgICAgbWVtc2V0KCZsb2FkZXJDbGllbnQsIDAsIHNpemVv Zihsb2FkZXJDbGllbnQpKTsKIAotICAgIGxvYWRlckNsaWVudC52ZXJzaW9uID0ga1dLUGFnZUxv YWRlckNsaWVudEN1cnJlbnRWZXJzaW9uOwotICAgIGxvYWRlckNsaWVudC5jbGllbnRJbmZvID0g YnJvd3NpbmdDb250ZXh0OworICAgIGxvYWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAzOworICAg IGxvYWRlckNsaWVudC5iYXNlLmNsaWVudEluZm8gPSBicm93c2luZ0NvbnRleHQ7CiAgICAgbG9h ZGVyQ2xpZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgPSBkaWRTdGFydFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lOwogICAgIGxvYWRlckNsaWVudC5kaWRSZWNlaXZlU2VydmVyUmVk aXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSA9IGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOwogICAgIGxvYWRlckNsaWVudC5kaWRGYWlsUHJv dmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUgPSBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0 aEVycm9yRm9yRnJhbWU7CkBAIC00NTIsNyArNDUyLDcgQEAgc3RhdGljIHZvaWQgc2V0VXBQYWdl TG9hZGVyQ2xpZW50KFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqYnJvd3NpbmdDb250ZXh0 LAogICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hQcm9ncmVzcyA9IGRpZEZpbmlzaFByb2dyZXNz OwogICAgIGxvYWRlckNsaWVudC5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QgPSBkaWRDaGFuZ2VC YWNrRm9yd2FyZExpc3Q7CiAKLSAgICBwYWdlLmluaXRpYWxpemVMb2FkZXJDbGllbnQoJmxvYWRl ckNsaWVudCk7CisgICAgcGFnZS5pbml0aWFsaXplTG9hZGVyQ2xpZW50KCZsb2FkZXJDbGllbnQu YmFzZSk7CiB9CiAKIHN0YXRpYyBXS1BvbGljeURlY2lzaW9uSGFuZGxlciBtYWtlUG9saWN5RGVj aXNpb25CbG9jayhXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuY3BwCmluZGV4IDllY2E1ZmQ4MDdhNWQx M2RmYWFmNGQ0OGQ3NDdjNDNkNDRlMjMxNGEuLmYyNzFjODk3NjBhODg5YjM5ODU4NDFhN2Q3YzA4 ZGNmZDk4OWIyZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2Fk ZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGll bnQuY3BwCkBAIC00Myw3ICs0Myw3IEBAIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhCiAgICAgaWYg KCFtX2NsaWVudC5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKQogICAgICAgICByZXR1 cm47CiAKLSAgICBtX2NsaWVudC5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHRvQVBJ KHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuY2xpZW50SW5m byk7CisgICAgbV9jbGllbnQuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh0b0FQSShw YWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50 SW5mbyk7CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1l UHJveHkqIGZyYW1lLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBAIC01MSw3ICs1MSw3IEBAIHZv aWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25h bExvYWRGb3JGcmFtZShXZWJQYWdlCiAgICAgaWYgKCFtX2NsaWVudC5kaWRSZWNlaXZlU2VydmVy UmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgbV9jbGllbnQuZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVu dC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5kaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQ cm92aXNpb25hbExvYWRGb3JGcmFtZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh1 c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKIHZvaWQgV2ViTG9hZGVy Q2xpZW50OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2ViUGFnZVBy b3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJy b3IsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBXZWJMb2Fk ZXJDbGllbnQ6OmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZShXZWJQYWdl UHJveHkqIHBhZ2UKICAgICBpZiAoIW1fY2xpZW50LmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRo RXJyb3JGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSks IHRvQVBJKGVycm9yKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAg ICBtX2NsaWVudC5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUodG9BUEko cGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkoZXJyb3IpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xp ZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRDb21t aXRMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwg QVBJOjpPYmplY3QqIHVzZXJEYXRhKQpAQCAtNjcsNyArNjcsNyBAQCB2b2lkIFdlYkxvYWRlckNs aWVudDo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQ cm94eSogZgogICAgIGlmICghbV9jbGllbnQuZGlkQ29tbWl0TG9hZEZvckZyYW1lKQogICAgICAg ICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5kaWRDb21taXRMb2FkRm9yRnJhbWUodG9BUEkocGFn ZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsK KyAgICBtX2NsaWVudC5kaWRDb21taXRMb2FkRm9yRnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZy YW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiB2 b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUoV2ViUGFn ZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgQVBJOjpPYmplY3QqIHVzZXJEYXRh KQpAQCAtNzUsNyArNzUsNyBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZQogICAgIGlmICghbV9j bGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUpCiAgICAgICAgIHJldHVybjsKIAot ICAgIG1fY2xpZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0 b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAg bV9jbGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUodG9BUEkocGFnZSksIHRvQVBJ KGZyYW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQog CiB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94 eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAg LTgzLDcgKzgzLDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZpbmlzaExvYWRGb3JGcmFt ZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGYKICAgICBpZiAoIW1fY2xpZW50 LmRpZEZpbmlzaExvYWRGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQu ZGlkRmluaXNoTG9hZEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVz ZXJEYXRhKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlkRmluaXNoTG9h ZEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9j bGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZh aWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5 KiBmcmFtZSwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IsIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSkKQEAgLTkxLDcgKzkxLDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZhaWxMb2FkV2l0 aEVycm9yRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVAKICAgICBpZiAoIW1f Y2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpCiAgICAgICAgIHJldHVybjsKIAot ICAgIG1fY2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUodG9BUEkocGFnZSksIHRv QVBJKGZyYW1lKSwgdG9BUEkoZXJyb3IpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmNsaWVu dEluZm8pOworICAgIG1fY2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUodG9BUEko cGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkoZXJyb3IpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xp ZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRTYW1l RG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVBy b3h5KiBmcmFtZSwgU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUgdHlwZSwgQVBJOjpPYmplY3Qq IHVzZXJEYXRhKQpAQCAtOTksNyArOTksNyBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkU2Ft ZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRgogICAg IGlmICghbV9jbGllbnQuZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKQogICAgICAg ICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJh bWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodHlwZSksIHRvQVBJKHVzZXJEYXRh KSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHR5cGUpLCB0 b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKIHZvaWQgV2Vi TG9hZGVyQ2xpZW50OjpkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZShXZWJQYWdlUHJveHkqIHBhZ2Us IGNvbnN0IFN0cmluZyYgdGl0bGUsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBBUEk6Ok9iamVjdCog dXNlckRhdGEpCkBAIC0xMDcsNyArMTA3LDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZFJl Y2VpdmVUaXRsZUZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5nJgogICAg IGlmICghbV9jbGllbnQuZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUpCiAgICAgICAgIHJldHVybjsK IAotICAgIG1fY2xpZW50LmRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQ SSh0aXRsZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQu Y2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUodG9BUEko cGFnZSksIHRvQVBJKHRpdGxlLmltcGwoKSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodXNlckRhdGEp LCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6 ZGlkRmlyc3RMYXlvdXRGb3JGcmFtZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkq IGZyYW1lLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBAIC0xMTUsNyArMTE1LDcgQEAgdm9pZCBX ZWJMb2FkZXJDbGllbnQ6OmRpZEZpcnN0TGF5b3V0Rm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdl LCBXZWJGcmFtZVByb3h5KgogICAgIGlmICghbV9jbGllbnQuZGlkRmlyc3RMYXlvdXRGb3JGcmFt ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkRmlyc3RMYXlvdXRGb3JGcmFt ZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmNs aWVudEluZm8pOworICAgIG1fY2xpZW50LmRpZEZpcnN0TGF5b3V0Rm9yRnJhbWUodG9BUEkocGFn ZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudElu Zm8pOwogfQogCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Rm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwg QVBJOjpPYmplY3QqIHVzZXJEYXRhKQpAQCAtMTIzLDcgKzEyMyw3IEBAIHZvaWQgV2ViTG9hZGVy Q2xpZW50OjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZShXZWJQYWdlUHJv eHkqIHBhZ2UsCiAgICAgaWYgKCFtX2NsaWVudC5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXRGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkRmlyc3RWaXN1 YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9B UEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5kaWRGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUp LCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKIHZvaWQg V2ViTG9hZGVyQ2xpZW50OjpkaWRMYXlvdXQoV2ViUGFnZVByb3h5KiBwYWdlLCBMYXlvdXRNaWxl c3RvbmVzIG1pbGVzdG9uZXMsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTEzMSw3ICsxMzEs NyBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkTGF5b3V0KFdlYlBhZ2VQcm94eSogcGFnZSwg TGF5b3V0TWlsZXN0b25lcyBtaWxlc3RvbmVzLAogICAgIGlmICghbV9jbGllbnQuZGlkTGF5b3V0 KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5kaWRMYXlvdXQodG9BUEkocGFnZSks IHRvV0tMYXlvdXRNaWxlc3RvbmVzKG1pbGVzdG9uZXMpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xp ZW50LmNsaWVudEluZm8pOworICAgIG1fY2xpZW50LmRpZExheW91dCh0b0FQSShwYWdlKSwgdG9X S0xheW91dE1pbGVzdG9uZXMobWlsZXN0b25lcyksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQu YmFzZS5jbGllbnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZFJlbW92ZUZy YW1lRnJvbUhpZXJhcmNoeShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1l LCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBAIC0xMzksNyArMTM5LDcgQEAgdm9pZCBXZWJMb2Fk ZXJDbGllbnQ6OmRpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeShXZWJQYWdlUHJveHkqIHBhZ2Us IFdlYkZyYW1lUHIKICAgICBpZiAoIW1fY2xpZW50LmRpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNo eSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkUmVtb3ZlRnJhbWVGcm9tSGll cmFyY2h5KHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGll bnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5 KHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuYmFz ZS5jbGllbnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZERpc3BsYXlJbnNl Y3VyZUNvbnRlbnRGb3JGcmFtZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZy YW1lLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBAIC0xNDcsNyArMTQ3LDcgQEAgdm9pZCBXZWJM b2FkZXJDbGllbnQ6OmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZShXZWJQYWdlUHJv eHkqIHBhZ2UsIFdlYkYKICAgICBpZiAoIW1fY2xpZW50LmRpZERpc3BsYXlJbnNlY3VyZUNvbnRl bnRGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkRGlzcGxheUlu c2VjdXJlQ29udGVudEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVz ZXJEYXRhKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlkRGlzcGxheUlu c2VjdXJlQ29udGVudEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHVz ZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJD bGllbnQ6OmRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwg V2ViRnJhbWVQcm94eSogZnJhbWUsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTE1NSw3ICsx NTUsNyBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJh bWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZQogICAgIGlmICghbV9jbGllbnQuZGlkUnVu SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50 LmRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSks IHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuZGlk UnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9B UEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiB2b2lkIFdlYkxv YWRlckNsaWVudDo6ZGlkRGV0ZWN0WFNTRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJG cmFtZVByb3h5KiBmcmFtZSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQpAQCAtMTYzLDcgKzE2Myw3 IEBAIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWREZXRlY3RYU1NGb3JGcmFtZShXZWJQYWdlUHJv eHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyCiAgICAgaWYgKCFtX2NsaWVudC5kaWREZXRlY3RY U1NGb3JGcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlkRGV0ZWN0WFNT Rm9yRnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodXNlckRhdGEpLCBtX2Ns aWVudC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5kaWREZXRlY3RYU1NGb3JGcmFtZSh0b0FQ SShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xp ZW50SW5mbyk7CiB9CiAKIGJvb2wgV2ViTG9hZGVyQ2xpZW50OjpjYW5BdXRoZW50aWNhdGVBZ2Fp bnN0UHJvdGVjdGlvblNwYWNlSW5GcmFtZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJv eHkqIGZyYW1lLCBXZWJQcm90ZWN0aW9uU3BhY2UqIHByb3RlY3Rpb25TcGFjZSkKQEAgLTE3MSw3 ICsxNzEsNyBAQCBib29sIFdlYkxvYWRlckNsaWVudDo6Y2FuQXV0aGVudGljYXRlQWdhaW5zdFBy b3RlY3Rpb25TcGFjZUluRnJhbWUoV2ViUGFnZVByb3h5KgogICAgIGlmICghbV9jbGllbnQuY2Fu QXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIHJldHVybiBtX2NsaWVudC5jYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJv dGVjdGlvblNwYWNlSW5GcmFtZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShwcm90 ZWN0aW9uU3BhY2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICByZXR1cm4gbV9jbGllbnQu Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUodG9BUEkocGFnZSks IHRvQVBJKGZyYW1lKSwgdG9BUEkocHJvdGVjdGlvblNwYWNlKSwgbV9jbGllbnQuYmFzZS5jbGll bnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZFJlY2VpdmVBdXRoZW50aWNh dGlvbkNoYWxsZW5nZUluRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBm cmFtZSwgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSogYXV0aGVudGljYXRpb25DaGFsbGVu Z2UpCkBAIC0xNzksNyArMTc5LDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZFJlY2VpdmVB dXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUoV2ViUGFnZVByb3h5KiBwYWcKICAgICBpZiAo IW1fY2xpZW50LmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUpCiAgICAg ICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZUluRnJhbWUodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkoYXV0aGVudGljYXRp b25DaGFsbGVuZ2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5kaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VJbkZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFt ZSksIHRvQVBJKGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJ bmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZFN0YXJ0UHJvZ3Jlc3MoV2ViUGFn ZVByb3h5KiBwYWdlKQpAQCAtMTg3LDcgKzE4Nyw3IEBAIHZvaWQgV2ViTG9hZGVyQ2xpZW50Ojpk aWRTdGFydFByb2dyZXNzKFdlYlBhZ2VQcm94eSogcGFnZSkKICAgICBpZiAoIW1fY2xpZW50LmRp ZFN0YXJ0UHJvZ3Jlc3MpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LmRpZFN0YXJ0 UHJvZ3Jlc3ModG9BUEkocGFnZSksIG1fY2xpZW50LmNsaWVudEluZm8pOworICAgIG1fY2xpZW50 LmRpZFN0YXJ0UHJvZ3Jlc3ModG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRDaGFuZ2VQcm9ncmVzcyhXZWJQYWdlUHJv eHkqIHBhZ2UpCkBAIC0xOTUsNyArMTk1LDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZENo YW5nZVByb2dyZXNzKFdlYlBhZ2VQcm94eSogcGFnZSkKICAgICBpZiAoIW1fY2xpZW50LmRpZENo YW5nZVByb2dyZXNzKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5kaWRDaGFuZ2VQ cm9ncmVzcyh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQu ZGlkQ2hhbmdlUHJvZ3Jlc3ModG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hQcm9ncmVzcyhXZWJQYWdlUHJv eHkqIHBhZ2UpCkBAIC0yMDMsNyArMjAzLDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZp bmlzaFByb2dyZXNzKFdlYlBhZ2VQcm94eSogcGFnZSkKICAgICBpZiAoIW1fY2xpZW50LmRpZEZp bmlzaFByb2dyZXNzKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC5kaWRGaW5pc2hQ cm9ncmVzcyh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQu ZGlkRmluaXNoUHJvZ3Jlc3ModG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CiB9CiAKIHZvaWQgV2ViTG9hZGVyQ2xpZW50Ojpwcm9jZXNzRGlkQmVjb21lVW5yZXNwb25zaXZl KFdlYlBhZ2VQcm94eSogcGFnZSkKQEAgLTIxMSw3ICsyMTEsNyBAQCB2b2lkIFdlYkxvYWRlckNs aWVudDo6cHJvY2Vzc0RpZEJlY29tZVVucmVzcG9uc2l2ZShXZWJQYWdlUHJveHkqIHBhZ2UpCiAg ICAgaWYgKCFtX2NsaWVudC5wcm9jZXNzRGlkQmVjb21lVW5yZXNwb25zaXZlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBtX2NsaWVudC5wcm9jZXNzRGlkQmVjb21lVW5yZXNwb25zaXZlKHRvQVBJ KHBhZ2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5wcm9jZXNzRGlkQmVj b21lVW5yZXNwb25zaXZlKHRvQVBJKHBhZ2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwog fQogCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6aW50ZXJhY3Rpb25PY2N1cnJlZFdoaWxlUHJvY2Vz c1VucmVzcG9uc2l2ZShXZWJQYWdlUHJveHkqIHBhZ2UpCkBAIC0yMTksNyArMjE5LDcgQEAgdm9p ZCBXZWJMb2FkZXJDbGllbnQ6OmludGVyYWN0aW9uT2NjdXJyZWRXaGlsZVByb2Nlc3NVbnJlc3Bv bnNpdmUoV2ViUGFnZVByb3h5KgogICAgIGlmICghbV9jbGllbnQuaW50ZXJhY3Rpb25PY2N1cnJl ZFdoaWxlUHJvY2Vzc1VucmVzcG9uc2l2ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGll bnQuaW50ZXJhY3Rpb25PY2N1cnJlZFdoaWxlUHJvY2Vzc1VucmVzcG9uc2l2ZSh0b0FQSShwYWdl KSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQuaW50ZXJhY3Rpb25PY2N1cnJl ZFdoaWxlUHJvY2Vzc1VucmVzcG9uc2l2ZSh0b0FQSShwYWdlKSwgbV9jbGllbnQuYmFzZS5jbGll bnRJbmZvKTsKIH0KIAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OnByb2Nlc3NEaWRCZWNvbWVSZXNw b25zaXZlKFdlYlBhZ2VQcm94eSogcGFnZSkKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIFdlYkxv YWRlckNsaWVudDo6cHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUoV2ViUGFnZVByb3h5KiBwYWdl KQogICAgIGlmICghbV9jbGllbnQucHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUpCiAgICAgICAg IHJldHVybjsKIAotICAgIG1fY2xpZW50LnByb2Nlc3NEaWRCZWNvbWVSZXNwb25zaXZlKHRvQVBJ KHBhZ2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5wcm9jZXNzRGlkQmVj b21lUmVzcG9uc2l2ZSh0b0FQSShwYWdlKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIH0K IAogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OnByb2Nlc3NEaWRDcmFzaChXZWJQYWdlUHJveHkqIHBh Z2UpCkBAIC0yMzUsNyArMjM1LDcgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OnByb2Nlc3NEaWRD cmFzaChXZWJQYWdlUHJveHkqIHBhZ2UpCiAgICAgaWYgKCFtX2NsaWVudC5wcm9jZXNzRGlkQ3Jh c2gpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LnByb2Nlc3NEaWRDcmFzaCh0b0FQ SShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgbV9jbGllbnQucHJvY2Vzc0RpZENy YXNoKHRvQVBJKHBhZ2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiB2b2lkIFdl YkxvYWRlckNsaWVudDo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KFdlYlBhZ2VQcm94eSogcGFn ZSwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogYWRkZWRJdGVtLCBWZWN0b3I8UmVmUHRyPEFQSTo6 T2JqZWN0Pj4qIHJlbW92ZWRJdGVtcykKQEAgLTI0Nyw3ICsyNDcsNyBAQCB2b2lkIFdlYkxvYWRl ckNsaWVudDo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KFdlYlBhZ2VQcm94eSogcGFnZSwgV2Vi QmFja0ZvcndhcgogICAgIGlmIChyZW1vdmVkSXRlbXMgJiYgIXJlbW92ZWRJdGVtcy0+aXNFbXB0 eSgpKQogICAgICAgICByZW1vdmVkSXRlbXNBcnJheSA9IEFQSTo6QXJyYXk6OmNyZWF0ZShzdGQ6 Om1vdmUoKnJlbW92ZWRJdGVtcykpOwogCi0gICAgbV9jbGllbnQuZGlkQ2hhbmdlQmFja0Zvcndh cmRMaXN0KHRvQVBJKHBhZ2UpLCB0b0FQSShhZGRlZEl0ZW0pLCB0b0FQSShyZW1vdmVkSXRlbXNB cnJheS5nZXQoKSksIG1fY2xpZW50LmNsaWVudEluZm8pOworICAgIG1fY2xpZW50LmRpZENoYW5n ZUJhY2tGb3J3YXJkTGlzdCh0b0FQSShwYWdlKSwgdG9BUEkoYWRkZWRJdGVtKSwgdG9BUEkocmVt b3ZlZEl0ZW1zQXJyYXkuZ2V0KCkpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiBi b29sIFdlYkxvYWRlckNsaWVudDo6c2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0oV2ViUGFn ZVByb3h5KiBwYWdlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtKQpAQCAtMjU1LDE2ICsy NTUsMTYgQEAgYm9vbCBXZWJMb2FkZXJDbGllbnQ6OnNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJ dGVtKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViQmFja0YKICAgICAvLyBXZSBzaG91bGQgb25seSBl dmVuIGNvbnNpZGVyaW5nIHNlbmRpbmcgdGhlIHNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVt KCkgY2xpZW50IGNhbGxiYWNrCiAgICAgLy8gZm9yIHZlcnNpb24gMCBjbGllbnRzLiBMYXRlciB2 ZXJzaW9uZWQgY2xpZW50cyBzaG91bGQgZ2V0IHdpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbSgp IGluc3RlYWQsCiAgICAgLy8gYnV0IGR1ZSB0byBYUEMgcmFjZSBjb25kaXRpb25zIHRoaXMgb25l IG1pZ2h0IGhhdmUgYmVlbiBjYWxsZWQgaW5zdGVhZC4KLSAgICBpZiAobV9jbGllbnQudmVyc2lv biA+IDAgfHwgIW1fY2xpZW50LnNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKQorICAgIGlm IChtX2NsaWVudC5iYXNlLnZlcnNpb24gPiAwIHx8ICFtX2NsaWVudC5zaG91bGRHb1RvQmFja0Zv cndhcmRMaXN0SXRlbSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICByZXR1cm4gbV9jbGll bnQuc2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0odG9BUEkocGFnZSksIHRvQVBJKGl0ZW0p LCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICByZXR1cm4gbV9jbGllbnQuc2hvdWxkR29Ub0Jh Y2tGb3J3YXJkTGlzdEl0ZW0odG9BUEkocGFnZSksIHRvQVBJKGl0ZW0pLCBtX2NsaWVudC5iYXNl LmNsaWVudEluZm8pOwogfQogCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6d2lsbEdvVG9CYWNrRm9y d2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSog aXRlbSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmIChtX2NsaWVudC53aWxsR29U b0JhY2tGb3J3YXJkTGlzdEl0ZW0pCi0gICAgICAgIG1fY2xpZW50LndpbGxHb1RvQmFja0Zvcndh cmRMaXN0SXRlbSh0b0FQSShwYWdlKSwgdG9BUEkoaXRlbSksIHRvQVBJKHVzZXJEYXRhKSwgbV9j bGllbnQuY2xpZW50SW5mbyk7CisgICAgICAgIG1fY2xpZW50LndpbGxHb1RvQmFja0ZvcndhcmRM aXN0SXRlbSh0b0FQSShwYWdlKSwgdG9BUEkoaXRlbSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGll bnQuYmFzZS5jbGllbnRJbmZvKTsKIH0KIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJ KQpAQCAtMjc1LDcgKzI3NSw3IEBAIHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRGYWlsVG9Jbml0 aWFsaXplUGx1Z2luKFdlYlBhZ2VQcm94eSogcGFnZSwgSW1tdXRhYmxlRGljCiAgICAgICAgIG1f Y2xpZW50LmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW5fZGVwcmVjYXRlZEZvclVzZVdpdGhWMCgK ICAgICAgICAgICAgIHRvQVBJKHBhZ2UpLAogICAgICAgICAgICAgdG9BUEkocGx1Z2luSW5mb3Jt YXRpb24tPmdldDxXZWJTdHJpbmc+KHBsdWdpbkluZm9ybWF0aW9uTUlNRVR5cGVLZXkoKSkpLAot ICAgICAgICAgICAgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgICAgICAgICBtX2NsaWVudC5i YXNlLmNsaWVudEluZm8pOwogCiAgICAgaWYgKG1fY2xpZW50LnBsdWdpbkRpZEZhaWxfZGVwcmVj YXRlZEZvclVzZVdpdGhWMSkKICAgICAgICAgbV9jbGllbnQucGx1Z2luRGlkRmFpbF9kZXByZWNh dGVkRm9yVXNlV2l0aFYxKApAQCAtMjg0LDE0ICsyODQsMTQgQEAgdm9pZCBXZWJMb2FkZXJDbGll bnQ6OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oV2ViUGFnZVByb3h5KiBwYWdlLCBJbW11dGFi bGVEaWMKICAgICAgICAgICAgIHRvQVBJKHBsdWdpbkluZm9ybWF0aW9uLT5nZXQ8V2ViU3RyaW5n PihwbHVnaW5JbmZvcm1hdGlvbk1JTUVUeXBlS2V5KCkpKSwKICAgICAgICAgICAgIDAsCiAgICAg ICAgICAgICAwLAotICAgICAgICAgICAgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgICAgICAg ICBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogCiAgICAgaWYgKG1fY2xpZW50LnBsdWdpbkRp ZEZhaWwpCiAgICAgICAgIG1fY2xpZW50LnBsdWdpbkRpZEZhaWwoCiAgICAgICAgICAgICB0b0FQ SShwYWdlKSwKICAgICAgICAgICAgIGtXS0Vycm9yQ29kZUNhbm5vdExvYWRQbHVnSW4sCiAgICAg ICAgICAgICB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbiksCi0gICAgICAgICAgICBtX2NsaWVudC5j bGllbnRJbmZvKTsKKyAgICAgICAgICAgIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAK IHZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihXZWJQ YWdlUHJveHkqIHBhZ2UsIEltbXV0YWJsZURpY3Rpb25hcnkqIHBsdWdpbkluZm9ybWF0aW9uKQpA QCAtMzAzLDE0ICszMDMsMTQgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEJsb2NrSW5zZWN1 cmVQbHVnaW5WZXJzaW9uKFdlYlBhZ2VQcm94eSogcGFnZSwgSW1tdXRhYmwKICAgICAgICAgICAg IHRvQVBJKHBsdWdpbkluZm9ybWF0aW9uLT5nZXQ8V2ViU3RyaW5nPihwbHVnaW5JbmZvcm1hdGlv bk1JTUVUeXBlS2V5KCkpKSwKICAgICAgICAgICAgIHRvQVBJKHBsdWdpbkluZm9ybWF0aW9uLT5n ZXQ8V2ViU3RyaW5nPihwbHVnaW5JbmZvcm1hdGlvbkJ1bmRsZUlkZW50aWZpZXJLZXkoKSkpLAog ICAgICAgICAgICAgdG9BUEkocGx1Z2luSW5mb3JtYXRpb24tPmdldDxXZWJTdHJpbmc+KHBsdWdp bkluZm9ybWF0aW9uQnVuZGxlVmVyc2lvbktleSgpKSksCi0gICAgICAgICAgICBtX2NsaWVudC5j bGllbnRJbmZvKTsKKyAgICAgICAgICAgIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAKICAg ICBpZiAobV9jbGllbnQucGx1Z2luRGlkRmFpbCkKICAgICAgICAgbV9jbGllbnQucGx1Z2luRGlk RmFpbCgKICAgICAgICAgICAgIHRvQVBJKHBhZ2UpLAogICAgICAgICAgICAga1dLRXJyb3JDb2Rl SW5zZWN1cmVQbHVnSW5WZXJzaW9uLAogICAgICAgICAgICAgdG9BUEkocGx1Z2luSW5mb3JtYXRp b24pLAotICAgICAgICAgICAgbV9jbGllbnQuY2xpZW50SW5mbyk7CisgICAgICAgICAgICBtX2Ns aWVudC5iYXNlLmNsaWVudEluZm8pOwogfQogCiBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IFdlYkxv YWRlckNsaWVudDo6cGx1Z2luTG9hZFBvbGljeShXZWJQYWdlUHJveHkqIHBhZ2UsIFBsdWdpbk1v ZHVsZUxvYWRQb2xpY3kgY3VycmVudFBsdWdpbkxvYWRQb2xpY3ksIEltbXV0YWJsZURpY3Rpb25h cnkqIHBsdWdpbkluZm9ybWF0aW9uLCBTdHJpbmcmIHVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb24p CkBAIC0zMTksOSArMzE5LDkgQEAgUGx1Z2luTW9kdWxlTG9hZFBvbGljeSBXZWJMb2FkZXJDbGll bnQ6OnBsdWdpbkxvYWRQb2xpY3koV2ViUGFnZVByb3h5KiBwYWdlLCBQbHUKICAgICBQbHVnaW5N b2R1bGVMb2FkUG9saWN5IGxvYWRQb2xpY3kgPSBjdXJyZW50UGx1Z2luTG9hZFBvbGljeTsKIAog ICAgIGlmIChtX2NsaWVudC5wbHVnaW5Mb2FkUG9saWN5X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjIp Ci0gICAgICAgIGxvYWRQb2xpY3kgPSB0b1BsdWdpbk1vZHVsZUxvYWRQb2xpY3kobV9jbGllbnQu cGx1Z2luTG9hZFBvbGljeV9kZXByZWNhdGVkRm9yVXNlV2l0aFYyKHRvQVBJKHBhZ2UpLCB0b1dL UGx1Z2luTG9hZFBvbGljeShjdXJyZW50UGx1Z2luTG9hZFBvbGljeSksIHRvQVBJKHBsdWdpbklu Zm9ybWF0aW9uKSwgbV9jbGllbnQuY2xpZW50SW5mbykpOworICAgICAgICBsb2FkUG9saWN5ID0g dG9QbHVnaW5Nb2R1bGVMb2FkUG9saWN5KG1fY2xpZW50LnBsdWdpbkxvYWRQb2xpY3lfZGVwcmVj YXRlZEZvclVzZVdpdGhWMih0b0FQSShwYWdlKSwgdG9XS1BsdWdpbkxvYWRQb2xpY3koY3VycmVu dFBsdWdpbkxvYWRQb2xpY3kpLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbiksIG1fY2xpZW50LmJh c2UuY2xpZW50SW5mbykpOwogICAgIGVsc2UgaWYgKG1fY2xpZW50LnBsdWdpbkxvYWRQb2xpY3kp Ci0gICAgICAgIGxvYWRQb2xpY3kgPSB0b1BsdWdpbk1vZHVsZUxvYWRQb2xpY3kobV9jbGllbnQu cGx1Z2luTG9hZFBvbGljeSh0b0FQSShwYWdlKSwgdG9XS1BsdWdpbkxvYWRQb2xpY3koY3VycmVu dFBsdWdpbkxvYWRQb2xpY3kpLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbiksICZ1bmF2YWlsYWJp bGl0eURlc2NyaXB0aW9uT3V0LCBtX2NsaWVudC5jbGllbnRJbmZvKSk7CisgICAgICAgIGxvYWRQ b2xpY3kgPSB0b1BsdWdpbk1vZHVsZUxvYWRQb2xpY3kobV9jbGllbnQucGx1Z2luTG9hZFBvbGlj eSh0b0FQSShwYWdlKSwgdG9XS1BsdWdpbkxvYWRQb2xpY3koY3VycmVudFBsdWdpbkxvYWRQb2xp Y3kpLCB0b0FQSShwbHVnaW5JbmZvcm1hdGlvbiksICZ1bmF2YWlsYWJpbGl0eURlc2NyaXB0aW9u T3V0LCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pKTsKIAogICAgIGlmICh1bmF2YWlsYWJpbGl0 eURlc2NyaXB0aW9uT3V0KSB7CiAgICAgICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlVuYXZhaWxh YmlsaXR5RGVzY3JpcHRpb24gPSBhZG9wdFJlZih0b0ltcGwodW5hdmFpbGFiaWxpdHlEZXNjcmlw dGlvbk91dCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRl ckNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5oCmlu ZGV4IDhmNDcxYzU1ZTVjOTRhM2UzOWZhOTVkNGNmY2I4ZTY1NTJhN2I1YWQuLjI3ZDE1YWQwNjE1 ODEyODA3NWQxNmVhNTJlY2FjN2M5N2U4NGZhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViTG9hZGVyQ2xpZW50LmgKQEAgLTM3LDYgKzM3LDExIEBACiAKIG5hbWVzcGFjZSBBUEkg ewogY2xhc3MgT2JqZWN0OworCit0ZW1wbGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFpdHM8V0tQYWdl TG9hZGVyQ2xpZW50QmFzZT4geworICAgIHR5cGVkZWYgc3RkOjp0dXBsZTxXS1BhZ2VMb2FkZXJD bGllbnRWMCwgV0tQYWdlTG9hZGVyQ2xpZW50VjEsIFdLUGFnZUxvYWRlckNsaWVudFYyLCBXS1Bh Z2VMb2FkZXJDbGllbnRWMz4gVmVyc2lvbnM7Cit9OworCiB9CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKQEAgLTUzLDcgKzU4LDcgQEAgY2xhc3MgV2ViRnJhbWVQcm94eTsKIGNsYXNzIFdlYlBhZ2VQ cm94eTsKIGNsYXNzIFdlYlByb3RlY3Rpb25TcGFjZTsKIAotY2xhc3MgV2ViTG9hZGVyQ2xpZW50 IDogcHVibGljIEFQSUNsaWVudDxXS1BhZ2VMb2FkZXJDbGllbnQsIGtXS1BhZ2VMb2FkZXJDbGll bnRDdXJyZW50VmVyc2lvbj4geworY2xhc3MgV2ViTG9hZGVyQ2xpZW50IDogcHVibGljIEFQSTo6 Q2xpZW50PFdLUGFnZUxvYWRlckNsaWVudEJhc2U+IHsKIHB1YmxpYzoKICAgICB2b2lkIGRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSos IEFQSTo6T2JqZWN0Kik7CiAgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92 aXNpb25hbExvYWRGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5KiwgQVBJOjpP YmplY3QqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg MDM3OWIzNmJiNGIzMTg1ZDdmZDVhNTc0YmY0MjIzYTFhNTkxMWY3Mi4uY2ZiNzBmOGM4NmM5MWE0 ZWYwMDVkMjY3NDA2ZDUxYzRjZGNhMTk5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKQEAgLTM5OCw3ICszOTgsNyBAQCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+ IFdlYlBhZ2VQcm94eTo6cmVsYXRlZFBhZ2VzKCkgY29uc3QKICAgICByZXR1cm4gQVBJOjpBcnJh eTo6Y3JlYXRlKHN0ZDo6bW92ZShyZXN1bHQpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6Omlu aXRpYWxpemVMb2FkZXJDbGllbnQoY29uc3QgV0tQYWdlTG9hZGVyQ2xpZW50KiBsb2FkQ2xpZW50 KQordm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVMb2FkZXJDbGllbnQoY29uc3QgV0tQYWdl TG9hZGVyQ2xpZW50QmFzZSogbG9hZENsaWVudCkKIHsKICAgICBtX2xvYWRlckNsaWVudC5pbml0 aWFsaXplKGxvYWRDbGllbnQpOwogICAgIApAQCAtNDA5LDkgKzQwOSw5IEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojppbml0aWFsaXplTG9hZGVyQ2xpZW50KGNvbnN0IFdLUGFnZUxvYWRlckNsaWVudCog bG9hZENsaWVudCkKICAgICAvLyBkaWRGaXJzdExheW91dEluRnJhbWUgYW5kIGRpZEZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dEluRnJhbWUuIEluIHRoZSBtZWFudGltZSwgdGhpcyBpcyByZXF1 aXJlZAogICAgIC8vIGZvciBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eS4KICAgICBXZWJDb3JlOjpM YXlvdXRNaWxlc3RvbmVzIG1pbGVzdG9uZXMgPSAwOwotICAgIGlmIChsb2FkQ2xpZW50LT5kaWRG aXJzdExheW91dEZvckZyYW1lKQorICAgIGlmIChtX2xvYWRlckNsaWVudC5jbGllbnQoKS5kaWRG aXJzdExheW91dEZvckZyYW1lKQogICAgICAgICBtaWxlc3RvbmVzIHw9IFdlYkNvcmU6OkRpZEZp cnN0TGF5b3V0OwotICAgIGlmIChsb2FkQ2xpZW50LT5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRGb3JGcmFtZSkKKyAgICBpZiAobV9sb2FkZXJDbGllbnQuY2xpZW50KCkuZGlkRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUpCiAgICAgICAgIG1pbGVzdG9uZXMgfD0gV2Vi Q29yZTo6RGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0OwogCiAgICAgaWYgKG1pbGVzdG9u ZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggOGU0MmRkMWMz MzExM2EzM2M4MDQzNmU0Mjg3NTA0MDYyNDkzOWQ5Ni4uNzdjM2FlNGZjNjcwOWY0YmRiZDUzMWU1 NmM2Y2RjYjMzYmRkYTYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aApAQCAtMzUzLDcgKzM1Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXRpYWxpemVGaW5kQ2xp ZW50KGNvbnN0IFdLUGFnZUZpbmRDbGllbnQqKTsKICAgICB2b2lkIGluaXRpYWxpemVGaW5kTWF0 Y2hlc0NsaWVudChjb25zdCBXS1BhZ2VGaW5kTWF0Y2hlc0NsaWVudCopOwogICAgIHZvaWQgaW5p dGlhbGl6ZUZvcm1DbGllbnQoY29uc3QgV0tQYWdlRm9ybUNsaWVudCopOwotICAgIHZvaWQgaW5p dGlhbGl6ZUxvYWRlckNsaWVudChjb25zdCBXS1BhZ2VMb2FkZXJDbGllbnQqKTsKKyAgICB2b2lk IGluaXRpYWxpemVMb2FkZXJDbGllbnQoY29uc3QgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSopOwog ICAgIHZvaWQgaW5pdGlhbGl6ZVBvbGljeUNsaWVudChjb25zdCBXS1BhZ2VQb2xpY3lDbGllbnQq KTsKICAgICB2b2lkIGluaXRpYWxpemVVSUNsaWVudChjb25zdCBXS1BhZ2VVSUNsaWVudCopOwog I2lmIFBMQVRGT1JNKEVGTCkK