140232 2015-01-07 17:06:13 -0800 Text not drawn or white-on-white for "Close Page"/"Go Back" button on safe browsing warning page 2015-01-08 13:56:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino bfulgham commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1059648 0 dino 2015-01-07 17:06:13 -0800 Text not drawn or white-on-white for "Close Page"/"Go Back" button on safe browsing warning page 1059649 1 dino 2015-01-07 17:06:36 -0800 <rdar://problem/19371010> 1059651 2 244225 dino 2015-01-07 17:10:14 -0800 Created attachment 244225 Patch 1059656 3 244225 dino 2015-01-07 17:23:22 -0800 Comment on attachment 244225 Patch Hold on this. Anders says I should nuke it (nearly) all. 1059898 4 244279 dino 2015-01-08 11:56:23 -0800 Created attachment 244279 Patch 1059911 5 dino 2015-01-08 12:25:10 -0800 Committed r178124: <http://trac.webkit.org/changeset/178124> 1059937 6 bfulgham 2015-01-08 13:29:53 -0800 Whoops! Missed a couple. Windows build fix committed in r178130. <http://trac.webkit.org/changeset/178130>. 1059943 7 bfulgham 2015-01-08 13:56:05 -0800 ... and an extra symbol: Another Windows build fix committed in r178131. <http://trac.webkit.org/changeset/178131>. 244225 2015-01-07 17:10:14 -0800 2015-01-08 11:56:16 -0800 Patch bug-140232-20150108121017.patch text/plain 1680 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ0MWYxM2E0MjRhM2U0 ODJhM2JjNmEwNDZkZDEwNWMwOWQ1Nzk3Mi4uNDdjNWMzM2Y4Y2Y1NmQzMGJiOGYzZWQ2ODhkYmFl NDYzYzE4YmJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAxLTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IG5vdCBkcmF3biBvciB3 aGl0ZS1vbi13aGl0ZSBmb3IgIkNsb3NlIFBhZ2UiLyJHbyBCYWNrIiBidXR0b24gb24gc2FmZSBi cm93c2luZyB3YXJuaW5nIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0MDIzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkzNzEwMTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0 byBzdXBwb3J0IGRlZmF1bHQgYnV0dG9uIHN0eWxpbmcgZXZlbiB3aGVuIGFwcGxpY2F0aW9uIGNo cm9tZQorICAgICAgICBtb2RlIGlzIG5vdCBlbmFibGVkIChpdCB3YXMgYSBiaXQgd2VpcmQgdGhh dCB0aGlzIHdhcyBleHBvc2VkIGFzIGEgU2V0dGluZworICAgICAgICBhbnl3YXkpLiBXZSBzaG91 bGQgcmVuZGVyIGFzIGEgZGVmYXVsdCBidXR0b24gd2hlbmV2ZXIgY29udGVudCBzZXRzCisgICAg ICAgIHRoZSBwcm9wcmlldGFyeSAtd2Via2l0LWFwcGVhcmFuY2UuCisKKyAgICAgICAgRm9yIG5v cm1hbCBXZWIgY29udGVudCB0aGVyZSBzaG91bGQgYmUgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lOjppc0RlZmF1bHQpOiBEb24ndCB0ZXN0IGZvciBhcHBsaWNhdGlvbiBjaHJv bWUgbW9kZS4KKwogMjAxNS0wMS0wNSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgog CiAgICAgICAgIFRyaWVkIHRvIGZpeCB0aGUgaU9TIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZS5jcHAKaW5kZXggNTZjMzBjODUxYzQ5NDVkNzNjZmUwNWZhYzZkNWJl OWQ2YTk2MzUwOS4uM2MzNDRmMzFjYzg1NDFjZmU1NzFjOTExOTJhOGZiODA3N2JlZDI3MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCkBAIC04NzQsOSArODc0LDYg QEAgYm9vbCBSZW5kZXJUaGVtZTo6aXNEZWZhdWx0KGNvbnN0IFJlbmRlck9iamVjdCYgbykgY29u c3QKICAgICBpZiAoIWlzQWN0aXZlKG8pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBp ZiAoIW8uZnJhbWUoKS5zZXR0aW5ncygpLmFwcGxpY2F0aW9uQ2hyb21lTW9kZSgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgCiAgICAgcmV0dXJuIG8uc3R5bGUoKS5hcHBlYXJhbmNlKCkg PT0gRGVmYXVsdEJ1dHRvblBhcnQ7CiB9CiAK 244279 2015-01-08 11:56:23 -0800 2015-01-08 11:59:19 -0800 Patch bug-140232-20150109065625.patch text/plain 18101 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ0MWYxM2E0MjRhM2U0 ODJhM2JjNmEwNDZkZDEwNWMwOWQ1Nzk3Mi4uODIwYzZlYTI1OTYxOGQ2NmZkMTdlNTA0ODg1ODNk MTlkZTAzMWU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTAxLTA4ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IG5vdCBkcmF3biBvciB3 aGl0ZS1vbi13aGl0ZSBmb3IgIkNsb3NlIFBhZ2UiLyJHbyBCYWNrIiBidXR0b24gb24gc2FmZSBi cm93c2luZyB3YXJuaW5nIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0MDIzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkzNzEwMTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0 byBzdXBwb3J0IGRlZmF1bHQgYnV0dG9uIHN0eWxpbmcgZXZlbiB3aGVuIGFwcGxpY2F0aW9uIGNo cm9tZQorICAgICAgICBtb2RlIGlzIG5vdCBlbmFibGVkIChpdCB3YXMgYSBiaXQgd2VpcmQgdGhh dCB0aGlzIHdhcyBleHBvc2VkIGFzIGEgU2V0dGluZworICAgICAgICBhbnl3YXkpLiBXZSBzaG91 bGQgcmVuZGVyIGFzIGEgZGVmYXVsdCBidXR0b24gd2hlbmV2ZXIgY29udGVudCBzZXRzCisgICAg ICAgIHRoZSBwcm9wcmlldGFyeSAtd2Via2l0LWFwcGVhcmFuY2UuIFRoaXMgbWVhbnMgd2UgZG9u J3QgbmVlZCB0aGUKKyAgICAgICAgYXBwbGljYXRpb25DaHJvbWVNb2RlIHNldHRpbmcuCisKKyAg ICAgICAgRm9yIG5vcm1hbCBXZWIgY29udGVudCB0aGVyZSBzaG91bGQgYmUgbm8gY2hhbmdlIGlu IGJlaGF2aW9yLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5pbjogUmVtb3ZlIGFwcGxpY2F0 aW9uQ2hyb21lTW9kZQorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6aXNEZWZhdWx0KTogRG9uJ3QgdGVzdCBmb3IgdGhl IHNldHRpbmcuCisKIDIwMTUtMDEtMDUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4K IAogICAgICAgICBUcmllZCB0byBmaXggdGhlIGlPUyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRl eCA2Y2JlYTM3OTcxNzY4ZDViZTM0MGYyM2MzZGIxZDgwZGFkYjdlODJiLi45MDE1ODUyYjFiNWVk YjBmZTA5YTU5YzdmYzJkMDc3M2MwMzRmOTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjQgQEAKKzIwMTUtMDEtMDggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAg ICAgIFRleHQgbm90IGRyYXduIG9yIHdoaXRlLW9uLXdoaXRlIGZvciAiQ2xvc2UgUGFnZSIvIkdv IEJhY2siIGJ1dHRvbiBvbiBzYWZlIGJyb3dzaW5nIHdhcm5pbmcgcGFnZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMjMyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xOTM3MTAxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZW1vdmUgdGhlIGFwcGxpY2F0aW9uQ2hyb21lTW9kZSBzZXR0aW5nLCBi dXQgbGVhdmUgc3R1YnMgaW4gdG8gbWFrZQorICAgICAgICBzdXJlIGV4aXN0aW5nIGJpbmFyaWVz IGRvbid0IGJyZWFrLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xp ZW50Lm1tOgorICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyIGluaXRdKToK KyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oOgorICAgICAgICAq IFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW06CisgICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGlu aXRpYWxpemVdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgYXBwbGljYXRpb25DaHJvbWVN b2RlRW5hYmxlZF0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBzZXRBcHBsaWNhdGlvbkNo cm9tZU1vZGVFbmFibGVkOl0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAg ICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDE1LTAxLTAxICBKZWZm IE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgdXNlci12aXNpYmxl IGNvcHlyaWdodCBzdHJpbmdzIHRvIGluY2x1ZGUgMjAxNQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGRm OWY4NWQ5ODRlZjk4N2QyOTYyNWE1ZTQwMmFjNTM3NDhlNTg1NGMuLmYxZGE4MGI4YmQ4MzI4ODli ZGY1Y2M5MDBhYTcyNzBlMjQ2OWZiMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBA QAorMjAxNS0wMS0wOCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAg VGV4dCBub3QgZHJhd24gb3Igd2hpdGUtb24td2hpdGUgZm9yICJDbG9zZSBQYWdlIi8iR28gQmFj ayIgYnV0dG9uIG9uIHNhZmUgYnJvd3Npbmcgd2FybmluZyBwYWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDAyMzIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE5MzcxMDEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB0aGUgYXBwbGljYXRpb25DaHJvbWVNb2RlIHNldHRpbmcsIGJ1dCBs ZWF2ZSBzdHVicyBpbiB0byBtYWtlCisgICAgICAgIHN1cmUgZXhpc3RpbmcgYmluYXJpZXMgZG9u J3QgYnJlYWsuCisKKyAgICAgICAgKiBXZWJQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXZWJQ cmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1bHRTZXR0aW5ncyk6CisgICAgICAgIChXZWJQcmVm ZXJlbmNlczo6aW5BcHBsaWNhdGlvbkNocm9tZU1vZGUpOgorICAgICAgICAoV2ViUHJlZmVyZW5j ZXM6OnNldEFwcGxpY2F0aW9uQ2hyb21lTW9kZSk6CisgICAgICAgICogV2ViVmlldy5jcHA6Cisg ICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQpOgorCiAyMDE0LTEyLTI5 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgQW5vdGhl ciBhdHRlbXB0IGF0IGZpeGluZyB0aGUgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2VhOWIyNDkyZGI4 NzNmNmY4NWY1ZGE0YTQ2MjI2MzRjOTRkMmE2OS4uOWE1YzNiMzUzNzU2ZGE4YjY1N2NkMjI0MTkz NDIyZTZiYWVjZGQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAxLTA4ICBE ZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IG5vdCBkcmF3biBv ciB3aGl0ZS1vbi13aGl0ZSBmb3IgIkNsb3NlIFBhZ2UiLyJHbyBCYWNrIiBidXR0b24gb24gc2Fm ZSBicm93c2luZyB3YXJuaW5nIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0MDIzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkzNzEwMTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl IHRoZSBhcHBsaWNhdGlvbkNocm9tZU1vZGUgc2V0dGluZywgYnV0IGxlYXZlIHN0dWJzIGluIHRv IG1ha2UKKyAgICAgICAgc3VyZSBleGlzdGluZyBiaW5hcmllcyBkb24ndCBicmVhay4KKworICAg ICAgICAqIFNoYXJlZC9BUEkvYy9XS0RlcHJlY2F0ZWRGdW5jdGlvbnMuY3BwOgorICAgICAgICAo V0tQcmVmZXJlbmNlc1NldEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQpOgorICAgICAgICAo V0tQcmVmZXJlbmNlc0dldEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQpOgorICAgICAgICAq IFNoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldEFwcGxp Y2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAoV0tQcmVmZXJlbmNl c0dldEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rv clBhZ2VHcm91cHM6OmNyZWF0ZUluc3BlY3RvclBhZ2VHcm91cCk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRh dGVQcmVmZXJlbmNlcyk6CisKIDIwMTUtMDEtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBDaGFuZ2UgbW9yZSBjb25uZWN0aW9uIHBvaW50ZXJzIHRv IHJlZmVyZW5jZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4g Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCmluZGV4IDFlZjhjODQ3MTg0NDdhZDU3 YWM5Mzk4ODgzNjVlNzI3MmZlN2RhYTEuLmU3MzBhMjAwNWUxNWE2NmY0YjM5MDQ2NjA5MzlmYzJj MmJhOTRiNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgpAQCAtMTU1LDcgKzE1NSw2IEBAIGZp eGVkUG9zaXRpb25DcmVhdGVzU3RhY2tpbmdDb250ZXh0IGluaXRpYWw9ZGVmYXVsdEZpeGVkUG9z aXRpb25DcmVhdGVzU3RhY2tpbmdDCiBzeW5jWEhSSW5Eb2N1bWVudHNFbmFibGVkIGluaXRpYWw9 dHJ1ZQogY29va2llRW5hYmxlZCBpbml0aWFsPXRydWUKIG1lZGlhRW5hYmxlZCBpbml0aWFsPXRy dWUKLWFwcGxpY2F0aW9uQ2hyb21lTW9kZSBpbml0aWFsPWZhbHNlCiBET01QYXN0ZUFsbG93ZWQg aW5pdGlhbD1mYWxzZQogCiAjIFdoZW4gZW5hYmxlZCwgd2luZG93LmJsdXIoKSBkb2VzIG5vdCBj aGFuZ2UgZm9jdXMsIGFuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAK aW5kZXggNTZjMzBjODUxYzQ5NDVkNzNjZmUwNWZhYzZkNWJlOWQ2YTk2MzUwOS4uM2MzNDRmMzFj Yzg1NDFjZmU1NzFjOTExOTJhOGZiODA3N2JlZDI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWUuY3BwCkBAIC04NzQsOSArODc0LDYgQEAgYm9vbCBSZW5kZXJUaGVtZTo6 aXNEZWZhdWx0KGNvbnN0IFJlbmRlck9iamVjdCYgbykgY29uc3QKICAgICBpZiAoIWlzQWN0aXZl KG8pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIW8uZnJhbWUoKS5zZXR0aW5n cygpLmFwcGxpY2F0aW9uQ2hyb21lTW9kZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg CiAgICAgcmV0dXJuIG8uc3R5bGUoKS5hcHBlYXJhbmNlKCkgPT0gRGVmYXVsdEJ1dHRvblBhcnQ7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbQppbmRleCA5ZTE5ZmYyZmEyMTg2MGYwZjBhOThlN2NiMjBlYzc5NTRk ZDdmNTcyLi5mMDdkMmMyMjA1MzhmMmU0ZjFkY2RmY2E2ZTQzYmQ2MTFkZDUxNDQwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQu bW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xp ZW50Lm1tCkBAIC0zOTUsNyArMzk1LDYgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVu dDo6YXBwZW5kKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkVVJMLCBjb25zdCBTdHJpbmcKIAogICAg IFdlYlByZWZlcmVuY2VzICpwcmVmZXJlbmNlcyA9IFtbV2ViUHJlZmVyZW5jZXMgYWxsb2NdIGlu aXRdOwogICAgIFtwcmVmZXJlbmNlcyBzZXRBbGxvd3NBbmltYXRlZEltYWdlczpZRVNdOwotICAg IFtwcmVmZXJlbmNlcyBzZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkOllFU107CiAgICAg W3ByZWZlcmVuY2VzIHNldEF1dGhvckFuZFVzZXJTdHlsZXNFbmFibGVkOllFU107CiAgICAgW3By ZWZlcmVuY2VzIHNldEF1dG9zYXZlczpOT107CiAgICAgW3ByZWZlcmVuY2VzIHNldERlZmF1bHRG aXhlZEZvbnRTaXplOjExXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCmluZGV4IGI4M2I1NGJiNzkxNDZkZTc3NGQ3ZTU3NGNi ZDY0NjUwZDliNjM4YWIuLjU3MDdiOTNhNDc2YzY0ZmM0ZGYzY2YwMDYzOGFhMDhiNmUzODhjZTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQ cml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5 c1ByaXZhdGUuaApAQCAtODYsNyArODYsNiBAQAogI2RlZmluZSBXZWJLaXREZXZlbG9wZXJFeHRy YXNFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdERldmVsb3BlckV4dHJhc0VuYWJsZWRQcmVm ZXJlbmNlS2V5IgogI2RlZmluZSBXZWJLaXRKYXZhU2NyaXB0RXhwZXJpbWVudHNFbmFibGVkUHJl ZmVyZW5jZUtleSBAIldlYktpdEphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWRQcmVmZXJlbmNl S2V5IgogI2RlZmluZSBXZWJLaXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZFByZWZlcmVuY2VL ZXkgQCJXZWJLaXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZFByZWZlcmVuY2VLZXkiCi0jZGVm aW5lIFdlYktpdEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2Vi S2l0QXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZFByZWZlcmVuY2VLZXkiCiAjZGVmaW5lIFdl YktpdERPTVRpbWVyc1Rocm90dGxpbmdFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdERPTVRp bWVyc1Rocm90dGxpbmdFbmFibGVkUHJlZmVyZW5jZUtleSIKICNkZWZpbmUgV2ViS2l0V2ViQXJj aGl2ZURlYnVnTW9kZUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0V2ViQXJjaGl2ZURlYnVn TW9kZUVuYWJsZWRQcmVmZXJlbmNlS2V5IgogI2RlZmluZSBXZWJLaXRMb2NhbEZpbGVDb250ZW50 U25pZmZpbmdFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdExvY2FsRmlsZUNvbnRlbnRTbmlm ZmluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZXMubW0KaW5kZXggODk0ZDg0MTExOWM5NTVmZDMwMGU0ZWI0MWJkYTlkZjQzZTVi MzJlNC4uNTQ0ODMyOTFkYTJmYmNmODNmYjJhNzE1ZjQ4ZjQ4ZTEwYmExZThjYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCkBAIC00NzUsNyArNDc1LDYg QEAgcHVibGljOgogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktp dERldmVsb3BlckV4dHJhc0VuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIg bnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdEphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWRQ cmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdl YktpdEF1dGhvckFuZFVzZXJTdHlsZXNFbmFibGVkUHJlZmVyZW5jZUtleSwKLSAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRBcHBsaWNhdGlvbkNocm9tZU1vZGVF bmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllF U10sICBXZWJLaXRET01UaW1lcnNUaHJvdHRsaW5nRW5hYmxlZFByZWZlcmVuY2VLZXksCiAgICAg ICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0V2ViQXJjaGl2ZURlYnVn TW9kZUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJv b2w6Tk9dLCAgIFdlYktpdExvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWRQcmVmZXJlbmNl S2V5LApAQCAtMTIxNiwxNCArMTIxNSwxNCBAQCBwdWJsaWM6CiAgICAgW3NlbGYgX3NldEJvb2xW YWx1ZTpmbGFnIGZvcktleTpXZWJLaXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZFByZWZlcmVu Y2VLZXldOwogfQogCisvLyBGSVhNRTogYXBwbGljYXRpb25DaHJvbWVNb2RlIGlzIG5vIGxvbmdl ciBuZWVkZWQgYnkgVG9ULCBidXQgaXMgc3RpbGwgdXNlZCBpbiBTYWZhcmkgOC4KIC0gKEJPT0wp YXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZAogewotICAgIHJldHVybiBbc2VsZiBfYm9vbFZh bHVlRm9yS2V5OldlYktpdEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWRQcmVmZXJlbmNlS2V5 XTsKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKHZvaWQpc2V0QXBwbGljYXRpb25DaHJvbWVNb2Rl RW5hYmxlZDooQk9PTClmbGFnCiB7Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktl eTpXZWJLaXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkUHJlZmVyZW5jZUtleV07CiB9CiAK IC0gKEJPT0wpZG9tVGltZXJzVGhyb3R0bGluZ0VuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQppbmRleCAwMGNjMzZkNzc3ZTg2OGFhNGNkNWU1YmQ1YmNlODMzYzIwZDQ5NWFm Li45YzZkZTU5OGNmMjc1YjFhNGYxMWJhM2I4NTIxMWQ1Y2YxMTFhZGNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0yMjYyLDcgKzIyNjIsNiBAQCBzdGF0aWMgYm9vbCBu ZWVkc1NlbGZSZXRhaW5XaGlsZUxvYWRpbmdRdWlyaygpCiAgICAgc2V0dGluZ3Muc2V0RGV2ZWxv cGVyRXh0cmFzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZF0pOwog ICAgIHNldHRpbmdzLnNldEphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWQoW3ByZWZlcmVuY2Vz IGphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWRdKTsKICAgICBzZXR0aW5ncy5zZXRBdXRob3JB bmRVc2VyU3R5bGVzRW5hYmxlZChbcHJlZmVyZW5jZXMgYXV0aG9yQW5kVXNlclN0eWxlc0VuYWJs ZWRdKTsKLSAgICBzZXR0aW5ncy5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGUoW3ByZWZlcmVuY2Vz IGFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWRdKTsKIAogICAgIHNldHRpbmdzLnNldE5lZWRz U2l0ZVNwZWNpZmljUXVpcmtzKF9wcml2YXRlLT51c2VTaXRlU3BlY2lmaWNTcG9vZmluZyk7CiAg ICAgc2V0dGluZ3Muc2V0RE9NVGltZXJzVGhyb3R0bGluZ0VuYWJsZWQoW3ByZWZlcmVuY2VzIGRv bVRpbWVyc1Rocm90dGxpbmdFbmFibGVkXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJQcmVmZXJlbmNlcy5j cHAKaW5kZXggNjI2YTAwZGI5YzJkODJlNmI1N2I4N2U5OWZhY2QyNzJkZDBjYzYzYi4uZmNkNmQw ZWE2MTRkZDRhOWUzNDdkOTc3YjY0MDQwNzQ0NGFhYTg0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlBy ZWZlcmVuY2VzLmNwcApAQCAtMjY0LDcgKzI2NCw2IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6Omlu aXRpYWxpemVEZWZhdWx0U2V0dGluZ3MoKQogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1 bHRzLCBDRlNUUihXZWJLaXRDYWNoZU1vZGVsUHJlZmVyZW5jZUtleSksIGNhY2hlTW9kZWxSZWYu Z2V0KCkpOwogCiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RSKFdlYktp dEF1dGhvckFuZFVzZXJTdHlsZXNFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5UcnVl KTsKLSAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0QXBwbGlj YXRpb25DaHJvbWVNb2RlUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7CiAKICAgICBD RkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0T2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5GYWxzZSk7CiAKQEAg LTE0NzIsMTUgKzE0NzEsMTMgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJQcmVmZXJl bmNlczo6YXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoQk9PTCogZW5hYmwKICAgICByZXR1cm4g U19PSzsKIH0KIAotSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6aW5BcHBsaWNhdGlvbkNocm9tZU1v ZGUoQk9PTCogZW5hYmxlZCkKK0hSRVNVTFQgV2ViUHJlZmVyZW5jZXM6OmluQXBwbGljYXRpb25D aHJvbWVNb2RlKEJPT0wqKQogewotICAgICplbmFibGVkID0gYm9vbFZhbHVlRm9yS2V5KFdlYktp dEFwcGxpY2F0aW9uQ2hyb21lTW9kZVByZWZlcmVuY2VLZXkpOwogICAgIHJldHVybiBTX09LOwog fQotICAgIAotSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0QXBwbGljYXRpb25DaHJvbWVNb2Rl KEJPT0wgZW5hYmxlZCkKKworSFJFU1VMVCBXZWJQcmVmZXJlbmNlczo6c2V0QXBwbGljYXRpb25D aHJvbWVNb2RlKEJPT0wpCiB7Ci0gICAgc2V0Qm9vbFZhbHVlKFdlYktpdEFwcGxpY2F0aW9uQ2hy b21lTW9kZVByZWZlcmVuY2VLZXksIGVuYWJsZWQpOwogICAgIHJldHVybiBTX09LOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCmluZGV4IGQ5M2I5YjM2ODRkMTdjNDJjOTI1ODI1NTJlYWQ1MDMyNjk1 YWEzMjAuLjk5ZDNjZGM4M2M3ODg3YjI3MzAwOTZmMjczYjVjZWI4ZDAyMmJjOWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2lu L1dlYlZpZXcuY3BwCkBAIC00OTQ3LDExICs0OTQ3LDYgQEAgSFJFU1VMVCBXZWJWaWV3Ojpub3Rp ZnlQcmVmZXJlbmNlc0NoYW5nZWQoSVdlYk5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogICAg ICAgICBzZXR0aW5ncy5zZXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZChlbmFibGVkKTsKICAg ICB9CiAKLSAgICBociA9IHByZWZzUHJpdmF0ZS0+aW5BcHBsaWNhdGlvbkNocm9tZU1vZGUoJmVu YWJsZWQpOwotICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAgICByZXR1cm4gaHI7Ci0gICAgc2V0 dGluZ3Muc2V0QXBwbGljYXRpb25DaHJvbWVNb2RlKGVuYWJsZWQpOwotCiAgICAgaHIgPSBwcmVm c1ByaXZhdGUtPm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgmZW5hYmxlZCk7CiAg ICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIHJldHVybiBocjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0RlcHJlY2F0ZWRGdW5jdGlvbnMuY3BwIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLRGVwcmVjYXRlZEZ1bmN0aW9ucy5jcHAKaW5kZXggZmIx Mzg4MGM2NmZmYjMxNWM1MmM3NTkwODA2M2EyNmMwMDdjMjJiNC4uMTBlY2ZjZDdmYTdlZGNhYjZk YmM2YTA1YjE2MzNmNDIyYmI3OGFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L0FQSS9jL1dLRGVwcmVjYXRlZEZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL0FQSS9jL1dLRGVwcmVjYXRlZEZ1bmN0aW9ucy5jcHAKQEAgLTUwLDYgKzUwLDkgQEAgV0tf RVhQT1JUIHZvaWQgV0tEaWN0aW9uYXJ5UmVtb3ZlSXRlbShXS011dGFibGVEaWN0aW9uYXJ5UmVm IGRpY3Rpb25hcnksIFdLU3RyaW4KIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRSZWdp b25CYXNlZENvbHVtbnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7CiBXS19F WFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0UmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmKTsKIAorV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEFwcGxpY2F0 aW9uQ2hyb21lTW9kZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCk7CitXS19FWFBPUlQg Ym9vbCBXS1ByZWZlcmVuY2VzR2V0QXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldE11bHRpdGhyZWFk ZWRXZWJHTEVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiwgYm9vbCk7CiBXS19FWFBPUlQgYm9vbCBX S1ByZWZlcmVuY2VzR2V0TXVsdGl0aHJlYWRlZFdlYkdMRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVm KTsKIApAQCAtMTA2LDYgKzEwOSwxNSBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRNdWx0aXRocmVh ZGVkV2ViR0xFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpCiAgICAgcmV0dXJuIGZhbHNlOwogfQog Cit2b2lkIFdLUHJlZmVyZW5jZXNTZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYsIGJvb2wpCit7Cit9CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldEFwcGxpY2F0 aW9uQ2hyb21lTW9kZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZikKK3sKKyAgICByZXR1cm4gZmFs c2U7Cit9CisKIGJvb2wgV0tJbnNwZWN0b3JJc0RlYnVnZ2luZ0phdmFTY3JpcHQoV0tJbnNwZWN0 b3JSZWYpCiB7CiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKaW5kZXggYmJiM2M5NzljYWU4ZjM5OGFlNzk1 OTY1YmFhMTI3MzFjZTcwZDc4NS4uYjYxZTZkNGE4NGVkNWVmNzJhZWU0ZmIxNGU0ZGIwZmMxMTdj NThhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVm aW5pdGlvbnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZp bml0aW9ucy5oCkBAIC0xNDUsNyArMTQ1LDYgQEAKICAgICBtYWNybyhTaG93c1Rvb2xUaXBPdmVy VHJ1bmNhdGVkVGV4dCwgc2hvd3NUb29sVGlwT3ZlclRydW5jYXRlZFRleHQsIEJvb2wsIGJvb2ws IGZhbHNlKSBcCiAgICAgbWFjcm8oTW9ja1Njcm9sbGJhcnNFbmFibGVkLCBtb2NrU2Nyb2xsYmFy c0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oV2ViQXVkaW9FbmFibGVk LCB3ZWJBdWRpb0VuYWJsZWQsIEJvb2wsIGJvb2wsIHRydWUpIFwKLSAgICBtYWNybyhBcHBsaWNh dGlvbkNocm9tZU1vZGVFbmFibGVkLCBhcHBsaWNhdGlvbkNocm9tZU1vZGUsIEJvb2wsIGJvb2ws IGZhbHNlKSBcCiAgICAgbWFjcm8oU3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVyaW5nLCBzdXBw cmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmcsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFj cm8oQmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQsIGJhY2tzcGFjZUtleU5hdmlnYXRpb25F bmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oQ2FyZXRCcm93c2luZ0VuYWJs ZWQsIGNhcmV0QnJvd3NpbmdFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCmluZGV4IGJjNTg3 Nzg4NzI1YWVmZWVmYjI5MDZlNTMwZWU3MTQ4ZDk3ZGQ1N2MuLjA2OTMxYWYwM2RhNmZjYjliZWFj MDk1NjczZDQyMGJiNjc4NzIxODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKQEAgLTc4NywxNiArNzg3LDYgQEAgYm9vbCBXS1ByZWZl cmVuY2VzR2V0V2ViQXVkaW9FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYp CiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPndlYkF1ZGlvRW5hYmxlZCgpOwog fQogCi12b2lkIFdLUHJlZmVyZW5jZXNTZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKLXsKLSAgICB0b0lt cGwocHJlZmVyZW5jZXNSZWYpLT5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkKGVuYWJs ZWQpOwotfQotCi1ib29sIFdLUHJlZmVyZW5jZXNHZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCi17Ci0gICAgcmV0dXJuIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPmFwcGxpY2F0aW9uQ2hyb21lTW9kZSgpOwotfQotCiB2b2lkIFdL UHJlZmVyZW5jZXNTZXRJbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFjZShXS1ByZWZlcmVu Y2VzUmVmLCBib29sKQogewogICAgIC8vIEZJWE1FOiBSZW1vdmUgb25jZSBXZWJLaXQgbmlnaHRs aWVzIGRvbid0IG5lZWQgdG8gc3VwcG9ydCBTYWZhcmkgNiB0aHJ1IDcuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5o CmluZGV4IDE0N2MyMDJmY2FjYjA2ODkwOTUwNzdjMGIzMmQwNTkyYzAzNTI2ZjIuLjdmOWM2ZThh OTU3MTg0ZGY2Y2IzOTMxOTI0NDZiNTllMzFjZmIxNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCkBAIC0x ODAsMTAgKzE4MCw2IEBAIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRTaG93c1Rvb2xU aXBPdmVyVHJ1bmNhdGVkVGV4dChXS1ByZWZlcmVuY2VzUmVmIHByCiBXS19FWFBPUlQgdm9pZCBX S1ByZWZlcmVuY2VzU2V0TW9ja1Njcm9sbGJhcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYsIGJvb2wgZmxhZyk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0 TW9ja1Njcm9sbGJhcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOwog ICAgIAotLy8gRGVmYXVsdHMgdG8gZmFsc2UuCi1XS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2Vz U2V0QXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGVuYWJsZWQpOwotV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEFw cGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl Zik7Ci0KIC8vIERlcHJlY2F0ZWQuIEFsd2F5cyByZXR1cm5zIGZhbHNlLgogV0tfRVhQT1JUIHZv aWQgV0tQcmVmZXJlbmNlc1NldEluc3BlY3RvclVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCk7CiBXS19FWFBPUlQgYm9v bCBXS1ByZWZlcmVuY2VzR2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkluc3BlY3RvclByb3h5LmNwcAppbmRleCAxY2EwNGEzYjhjN2FjOTc3ZTVkZWQ1M2Q3ZDJk ODA5ZWZkYzdmMjlkLi43YWMwYzgxY2M3OGM2ZjU2MjJmZmU4YzYzMDZhMDk2NDZjMTVkNWI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAg LTEwOSw3ICsxMDksNiBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICAgICAgcGFnZUdyb3VwLT5w cmVmZXJlbmNlcygpLnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyh0cnVlKTsKLSAgICAg ICAgcGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLnNldEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJs ZWQodHJ1ZSk7CiAKICAgICAgICAgcmV0dXJuIHBhZ2VHcm91cC5yZWxlYXNlKCk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGRh OWQ2NzhjY2IwZmM5OTY4NGQ3MTJkOGFkYWYwNzg0ZTNiNjcxYzIuLjk5Y2NlZTQyOGEyNmZkZDlm MGRmZjYxNWI5MTE0MjFhZWFlNGEwOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI3OTYsNyArMjc5Niw2IEBAIHZvaWQgV2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiAgICAg c2V0dGluZ3Muc2V0TWVkaWFQbGF5YmFja0FsbG93c0FpclBsYXkoc3RvcmUuZ2V0Qm9vbFZhbHVl Rm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjptZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheUtleSgp KSk7CiAjZW5kaWYKIAotICAgIHNldHRpbmdzLnNldEFwcGxpY2F0aW9uQ2hyb21lTW9kZShzdG9y ZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmFwcGxpY2F0aW9uQ2hyb21l TW9kZUtleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0U3VwcHJlc3Nlc0luY3JlbWVudGFsUmVuZGVy aW5nKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c3VwcHJlc3Nl c0luY3JlbWVudGFsUmVuZGVyaW5nS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRJbmNyZW1lbnRh bFJlbmRlcmluZ1N1cHByZXNzaW9uVGltZW91dEluU2Vjb25kcyhzdG9yZS5nZXREb3VibGVWYWx1 ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6aW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lv blRpbWVvdXRLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25F bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YmFja3Nw YWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXkoKSkpOwo=