178154 2017-10-10 19:49:03 -0700 Enable custom pasteboard data in DumpRenderTree and WebKitTestRunner 2017-10-10 21:13:16 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 124391 1 rniwa rniwa ap buildbot darin sam webkit-bug-importer wenson_hsieh oldest_to_newest 1359013 0 rniwa 2017-10-10 19:49:03 -0700 Enable custom pasteboard on macOS and iOS inside DumpRenderTree and WebKitTestRunner so that we can test the shipping configuration in Safari in our tests. 1359023 1 323375 rniwa 2017-10-10 20:12:16 -0700 Created attachment 323375 Patch 1359024 2 buildbot 2017-10-10 20:14:36 -0700 Attachment 323375 did not pass style-queue: ERROR: Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm:195: The parameter name "data" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 21 files If any of these errors are false positives, please file a bug against check-webkit-style. 1359032 3 323375 wenson_hsieh 2017-10-10 20:50:46 -0700 Comment on attachment 323375 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323375&action=review > Source/WebCore/platform/cocoa/PasteboardCocoa.mm:198 > + if (existingMIMEs.contains(mimeType)) Nice catch! > Source/WebKit/ChangeLog:8 > + Plumed customPasteboardDataEnabled flag to be used in WebKitTestRunner. *Plumbed 1359036 4 rniwa 2017-10-10 21:10:11 -0700 Thanks for the review! (In reply to Wenson Hsieh from comment #3) > Comment on attachment 323375 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323375&action=review > > > Source/WebCore/platform/cocoa/PasteboardCocoa.mm:198 > > + if (existingMIMEs.contains(mimeType)) > > Nice catch! > > > Source/WebKit/ChangeLog:8 > > + Plumed customPasteboardDataEnabled flag to be used in WebKitTestRunner. > > *Plumbed Will fix. 1359037 5 rniwa 2017-10-10 21:12:32 -0700 Committed r223167: <http://trac.webkit.org/changeset/223167> 1359038 6 webkit-bug-importer 2017-10-10 21:13:16 -0700 <rdar://problem/34926645> 323375 2017-10-10 20:12:16 -0700 2017-10-10 20:50:46 -0700 Patch bug-178154-20171010201215.patch text/plain 20867 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzEyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTEwLTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEVuYWJsZSBjdXN0b20gcGFzdGVi b2FyZCBkYXRhIGluIER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgxNTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRyYWN0ZWQgdGhlIGxv Z2ljIHRvIGNvbXB1dGUgdGhlIGRlZmF1bHQgZW5hYmxlZC1uZXNzIG9mIGN1c3RvbSBwYXN0ZWJv YXJkIGRhdGEgYXMKKyAgICAgICAgU2V0dGluZ3M6OmRlZmF1bHRDdXN0b21QYXN0ZWJvYXJkRGF0 YUVuYWJsZWQoKSB0byBiZSBjYWxsZWQgYnkgV2ViS2l0MSBhbmQgV2ViS2l0MiBsYXllcnMuCisK KyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdz OjpkZWZhdWx0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKTogRXh0cmFjdGVkIGZyb20gY3Vz dG9tUGFzdGVib2FyZERhdGFFbmFibGVkLgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmN1 c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCk6IERlbGV0ZWQuIE5vdyBpbmxpbmVkIGluIHRoZSBo ZWFkZXIgZmlsZS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3Jl OjpTZXR0aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJv YXJkOjpyZWFkKTogRml4ZWQgYSBidWcgdGhhdCB3ZSB3ZXJlIGFkZGluZyBNSU1FIHR5cGUgdG8g dGhlIG1hcCBiZWZvcmUgY2hlY2tpbmcgdGhhdAorICAgICAgICB3ZSBjb3VsZCBhY3R1YWxseSBy ZWFkIHRoZSBidWZmZXIuIFdlIHNob3VsZG4ndCBza2lwIGEgdHlwZSAoTlNUSUZGUGJvYXJkVHlw ZSBhbmQga1VUVHlwZVRJRkYgZm9yIG5vdykKKyAgICAgICAgaWYgYW4gZXF1aXZhbGVudCB0eXBl IGhhZCBmYWlsZWQgdG8gcmVhZC4KKwogMjAxNy0xMC0wOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIENhbGxpbmcgZmlsZVN5c3RlbURpcmVjdG9yeUVudHJ5Lmdl dERpcmVjdG9yeSgpIHdpdGggZW1wdHkgcGF0aCBzaG91bGQgbm90IGZhaWwKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiAyMjMxMjQpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDIxICsxNDQsMTcgQEAgc3Rh dGljIEVkaXRpbmdCZWhhdmlvclR5cGUgZWRpdGluZ0JlaGF2aQogICAgIDsKIH0KIAotYm9vbCBT ZXR0aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkKK2Jvb2wgU2V0dGluZ3M6OmRl ZmF1bHRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKQogewotICAgIHN0YXRpYyBzdGQ6Om9u Y2VfZmxhZyBpbml0aWFsaXplQ3VzdG9tUGFzdGVib2FyZERhdGFUb0RlZmF1bHRWYWx1ZTsKLSAg ICBzdGQ6OmNhbGxfb25jZShpbml0aWFsaXplQ3VzdG9tUGFzdGVib2FyZERhdGFUb0RlZmF1bHRW YWx1ZSwgW10gewogI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhf QUxMT1dFRCA+PSAxMTAzMDAKLSAgICAgICAgZ0N1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCA9 IElPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgpIHx8IGR5bGRfZ2V0X3Byb2dyYW1fc2Rr X3ZlcnNpb24oKSA+PSBEWUxEX0lPU19WRVJTSU9OXzExXzM7CisgICAgcmV0dXJuIElPU0FwcGxp Y2F0aW9uOjppc01vYmlsZVNhZmFyaSgpIHx8IGR5bGRfZ2V0X3Byb2dyYW1fc2RrX3ZlcnNpb24o KSA+PSBEWUxEX0lPU19WRVJTSU9OXzExXzM7CiAjZWxpZiBQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NQVhfQUxMT1dFRCA+PSAxMDEzMDAKLSAgICAgICAgZ0N1c3RvbVBhc3Rl Ym9hcmREYXRhRW5hYmxlZCA9IE1hY0FwcGxpY2F0aW9uOjppc1NhZmFyaSgpIHx8IGR5bGRfZ2V0 X3Byb2dyYW1fc2RrX3ZlcnNpb24oKSA+IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTM7CisgICAg cmV0dXJuIE1hY0FwcGxpY2F0aW9uOjppc1NhZmFyaSgpIHx8IGR5bGRfZ2V0X3Byb2dyYW1fc2Rr X3ZlcnNpb24oKSA+IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTM7CiAjZWxpZiBQTEFURk9STShN QUMpCi0gICAgICAgIGdDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQgPSBNYWNBcHBsaWNhdGlv bjo6aXNTYWZhcmkoKTsKKyAgICByZXR1cm4gTWFjQXBwbGljYXRpb246OmlzU2FmYXJpKCk7CiAj ZWxzZQotICAgICAgICBnQ3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkID0gZmFsc2U7CisgICAg cmV0dXJuIGZhbHNlOwogI2VuZGlmCi0gICAgfSk7Ci0gICAgcmV0dXJuIGdDdXN0b21QYXN0ZWJv YXJkRGF0YUVuYWJsZWQ7CiB9CiAKICNpZiBQTEFURk9STShDT0NPQSkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmgJKHJldmlzaW9uIDIyMzEyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzA0LDcgKzMwNCw4IEBAIHB1YmxpYzoKICNlbmRp ZgogCiAgICAgc3RhdGljIHZvaWQgc2V0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKGJvb2wg ZW5hYmxlZCkgeyBnQ3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkID0gZW5hYmxlZDsgfQotICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgp OworICAgIHN0YXRpYyBib29sIGN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpIHsgcmV0dXJu IGdDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQ7IH0KKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgYm9vbCBkZWZhdWx0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCk7CiAKICNpZiBFTkFC TEUoTEVHQUNZX0VOQ1JZUFRFRF9NRURJQSkKICAgICB2b2lkIHNldE1lZGlhS2V5c1N0b3JhZ2VE aXJlY3RvcnkoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpIHsgbV9tZWRpYUtleXNTdG9yYWdlRGly ZWN0b3J5ID0gZGlyZWN0b3J5OyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2Nv YS9QYXN0ZWJvYXJkQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY29jb2EvUGFzdGVib2FyZENvY29hLm1tCShyZXZpc2lvbiAyMjMxMjQpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29jb2EubW0JKHdvcmtpbmcgY29weSkK QEAgLTE5NSw3ICsxOTUsNyBAQCB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZEZpbGVS ZWFkCiAgICAgICAgIGNvbnN0IGNoYXIqIG1pbWVUeXBlID0gaW1hZ2VUeXBlVG9NSU1FVHlwZShp bWFnZVR5cGUpOwogICAgICAgICBpZiAoIW1pbWVUeXBlKQogICAgICAgICAgICAgY29udGludWU7 Ci0gICAgICAgIGlmICghZXhpc3RpbmdNSU1Fcy5hZGQobWltZVR5cGUpLmlzTmV3RW50cnkpCisg ICAgICAgIGlmIChleGlzdGluZ01JTUVzLmNvbnRhaW5zKG1pbWVUeXBlKSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICBhdXRvIGJ1ZmZlciA9IHJlYWRCdWZmZXJGb3JUeXBlV2l0aFNl Y3VyaXR5Q2hlY2soY29jb2FUeXBlKTsKICNpZiBQTEFURk9STShNQUMpCkBAIC0yMDQsNiArMjA0 LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjpyZWFkKFBhc3RlYm9hcmRGaWxlUmVhZAogI2VuZGlmCiAg ICAgICAgIGlmICghYnVmZmVyKQogICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGV4aXN0 aW5nTUlNRXMuYWRkKG1pbWVUeXBlKTsKICAgICAgICAgcmVhZGVyLnJlYWRCdWZmZXIoaW1hZ2VU eXBlVG9GYWtlRmlsZW5hbWUoaW1hZ2VUeXBlKSwgbWltZVR5cGUsIGJ1ZmZlci5yZWxlYXNlTm9u TnVsbCgpKTsKICAgICB9CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjIzMTI0KQorKysgU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAx Ny0xMC0xMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBFbmFi bGUgY3VzdG9tIHBhc3RlYm9hcmQgZGF0YSBpbiBEdW1wUmVuZGVyVHJlZSBhbmQgV2ViS2l0VGVz dFJ1bm5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc4MTU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UGx1bWVkIGN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCBmbGFnIHRvIGJlIHVzZWQgaW4gV2Vi S2l0VGVzdFJ1bm5lci4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRp b25zLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAg ICAgICAoV0tQcmVmZXJlbmNlc1NldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCk6CisgICAg ICAgIChXS1ByZWZlcmVuY2VzR2V0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKwogMjAxNy0xMC0wOSAgSmVyZW15IEpvbmVzICA8amVy ZW15akBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHR5cG8gb2YgdmlydHVhbCBrZXl3b3JkIGlu IFBhZ2VDbGllbnRJbXBsSU9TLmgKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByZWZl cmVuY2VzRGVmaW5pdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgJKHJldmlzaW9uIDIyMzEyNCkKKysrIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAkod29ya2luZyBjb3B5KQpA QCAtMzAzLDYgKzMwMyw3IEBACiAgICAgbWFjcm8oSW5zcGVjdG9yQWRkaXRpb25zRW5hYmxlZCwg aW5zcGVjdG9yQWRkaXRpb25zRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UsICJXZWIgSW5zcGVj dG9yIEFkZGl0aW9ucyIsICJFbmFibGUgYWRkaXRpb25hbCBwYWdlIEFQSXMgdXNlZCBieSB0aGUg V2ViIEluc3BlY3RvciBmcm9udGVuZCBwYWdlIikgXAogICAgIG1hY3JvKERpcmVjdG9yeVVwbG9h ZEVuYWJsZWQsIGRpcmVjdG9yeVVwbG9hZEVuYWJsZWQsIEJvb2wsIGJvb2wsIERFRkFVTFRfRElS RUNUT1JZX1VQTE9BRF9FTkFCTEVELCAiRGlyZWN0b3J5IFVwbG9hZCIsICJpbnB1dC53ZWJraXRk aXJlY3RvcnkgLyBkYXRhVHJhbnNmZXJJdGVtLndlYmtpdEdldEFzRW50cnkoKSIpIFwKICAgICBt YWNybyhEYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQsIGRhdGFUcmFuc2Zlckl0ZW1zRW5hYmxlZCwg Qm9vbCwgYm9vbCwgREVGQVVMVF9EQVRBX1RSQU5TRkVSX0lURU1TX0VOQUJMRUQsICJEYXRhIFRy YW5zZmVyIEl0ZW1zIiwgIkVuYWJsZXMgRGF0YVRyYW5zZmVySXRlbSBpbiB0aGUgY2xpcGJvYXJk IEFQSSIpIFwKKyAgICBtYWNybyhDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQsIGN1c3RvbVBh c3RlYm9hcmREYXRhRW5hYmxlZCwgQm9vbCwgYm9vbCwgV2ViQ29yZTo6U2V0dGluZ3M6OmRlZmF1 bHRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSwgIkN1c3RvbSBwYXRlYm9hcmQgZGF0YSIs ICJFbmFibGUgY3VzdG9tIGNsaXBib2FyZCB0eXBlcyBhbmQgYmV0dGVyIHNlY3VyaXR5IG1vZGVs IGZvciBjbGlwYm9hcmQgQVBJLiIpIFwKICAgICBtYWNybyhXZWJWUkVuYWJsZWQsIHdlYlZSRW5h YmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UsICJXZWJWUiIsICJXZWJWUiBNb2R1bGUgc3VwcG9ydCIp IFwKICAgICBtYWNybyhWaWV3cG9ydEZpdEVuYWJsZWQsIHZpZXdwb3J0Rml0RW5hYmxlZCwgQm9v bCwgYm9vbCwgdHJ1ZSwgIlZpZXdwb3J0IEZpdCIsICJFbmFibGUgdmlld3BvcnQtZml0IHZpZXdw b3J0IHBhcmFtZXRlciIpIFwKICAgICBcCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1ByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMjIzMTI0KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE2ODAsNiArMTY4MCwxNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXREYXRhVHJhbnNmZXJJ dGVtc0VuCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmRhdGFUcmFuc2Zlckl0 ZW1zRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRDdXN0b21QYXN0ZWJvYXJk RGF0YUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQor eworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5h YmxlZChmbGFnKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0Q3VzdG9tUGFzdGVib2FyZERh dGFFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJu IHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpOwor fQorCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXREb3dubG9hZEF0dHJpYnV0ZUVuYWJsZWQoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQogewogICAgIHRvSW1wbChwcmVm ZXJlbmNlc1JlZiktPnNldERvd25sb2FkQXR0cmlidXRlRW5hYmxlZChmbGFnKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1Jl ZlByaXZhdGUuaAkocmV2aXNpb24gMjIzMTI0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDc0LDYg KzQ3NCwxMCBAQCBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0RGF0YVRyYW5zCiBXS19F WFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0RGF0YVRyYW5zZmVySXRlbXNFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0byBmYWxzZQorV0tfRVhQT1JUIHZvaWQgV0tQ cmVmZXJlbmNlc1NldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVm LCBib29sIGZsYWcpOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEN1c3RvbVBhc3Rl Ym9hcmREYXRhRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKKworLy8gRGVmYXVsdHMgdG8gZmFs c2UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRVc2VyVGltaW5nRW5hYmxlZChXS1By ZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dl dFVzZXJUaW1pbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMjIzMTI0KQor KysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMzMzYsNiArMzMzNiw4IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5j ZXMoY29uc3QgV2UKIAogICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVz KCkuc2V0RGF0YVRyYW5zZmVySXRlbXNFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShX ZWJQcmVmZXJlbmNlc0tleTo6ZGF0YVRyYW5zZmVySXRlbXNFbmFibGVkS2V5KCkpKTsKIAorICAg IHNldHRpbmdzLnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZEtl eSgpKSk7CisKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgIFJ1bnRpbWVFbmFi bGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0QXR0YWNobWVudEVsZW1lbnRFbmFibGVk KHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YXR0YWNobWVudEVs ZW1lbnRFbmFibGVkS2V5KCkpKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9t YWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n ZUxvZwkocmV2aXNpb24gMjIzMTI0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTctMTAtMTAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIGN1c3RvbSBwYXN0ZWJv YXJkIGRhdGEgaW4gRHVtcFJlbmRlclRyZWUgYW5kIFdlYktpdFRlc3RSdW5uZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODE1NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBjdXN0b20gcGFz dGVib2FyZCBkYXRhIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVu Y2VLZXlzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW06Cisg ICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKToKKyAgICAgICAgKC1bV2ViUHJl ZmVyZW5jZXMgY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkXSk6IEFkZGVkLgorICAgICAgICAo LVtXZWJQcmVmZXJlbmNlcyBzZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQ6XSk6IEFkZGVk LgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICog V2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5n ZWQ6XSk6CisKIDIwMTctMTAtMDkgIFJvYmluIE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNv bT4KIAogICAgICAgICBNYWtlIHRoZSBuYW1lcyBvZiB0aGUgb3B0aW9ucyBjb25zaXN0ZW50Cklu ZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJp dmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHJldmlzaW9uIDIyMzEyNCkKKysrIFNvdXJjZS9XZWJL aXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE3MSw2ICsxNzEsNyBAQAogI2RlZmluZSBXZWJLaXRTaGFkb3dET01FbmFibGVk UHJlZmVyZW5jZUtleSBAIldlYktpdFNoYWRvd0RPTUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdEN1 c3RvbUVsZW1lbnRzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRDdXN0b21FbGVtZW50c0Vu YWJsZWQiCiAjZGVmaW5lIFdlYktpdERhdGFUcmFuc2Zlckl0ZW1zRW5hYmxlZFByZWZlcmVuY2VL ZXkgQCJXZWJLaXREYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQiCisjZGVmaW5lIFdlYktpdEN1c3Rv bVBhc3RlYm9hcmREYXRhRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRDdXN0b21QYXN0ZWJv YXJkRGF0YUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdENhY2hlQVBJRW5hYmxlZFByZWZlcmVuY2VL ZXkgQCJXZWJLaXRDYWNoZUFQSUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdEZldGNoQVBJRW5hYmxl ZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRGZXRjaEFQSUVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdFdy aXRhYmxlU3RyZWFtQVBJRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRXcml0YWJsZVN0cmVh bUFQSUVuYWJsZWQiCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZp ZXcvV2ViUHJlZmVyZW5jZXMubW0JKHJldmlzaW9uIDIyMzEyNCkKKysrIFNvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTYy Miw2ICs2MjIsNyBAQCArICh2b2lkKWluaXRpYWxpemUKICAgICAgICAgW05TTnVtYmVyIG51bWJl cldpdGhCb29sOllFU10sIFdlYktpdFNoYWRvd0RPTUVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAg ICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgV2ViS2l0Q3VzdG9tRWxlbWVudHNF bmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllF U10sIFdlYktpdERhdGFUcmFuc2Zlckl0ZW1zRW5hYmxlZFByZWZlcmVuY2VLZXksCisgICAgICAg IFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpTZXR0aW5nczo6ZGVmYXVsdEN1c3RvbVBhc3RlYm9h cmREYXRhRW5hYmxlZCgpXSwgV2ViS2l0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkUHJlZmVy ZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIFdlYktpdE1v ZGVybk1lZGlhQ29udHJvbHNFbmFibGVkUHJlZmVyZW5jZUtleSwKICNpZiBFTkFCTEUoV0VCR0wy KQogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCBXZWJLaXRXZWJHTDJFbmFi bGVkUHJlZmVyZW5jZUtleSwKQEAgLTI5ODMsNiArMjk4NCwxNiBAQCAtICh2b2lkKXNldERhdGFU cmFuc2Zlckl0ZW1zRW5hYmxlZDooQk9PCiAgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZv cktleTpXZWJLaXREYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKIH0KIAor LSAoQk9PTCljdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQKK3sKKyAgICByZXR1cm4gW3NlbGYg X2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWRQcmVmZXJl bmNlS2V5XTsKK30KKworLSAodm9pZClzZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQ6KEJP T0wpZmxhZworeworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0Q3Vz dG9tUGFzdGVib2FyZERhdGFFbmFibGVkUHJlZmVyZW5jZUtleV07Cit9CisKIC0gKEJPT0wpY2Fj aGVBUElFbmFibGVkCiB7CiAgICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0 Q2FjaGVBUElFbmFibGVkUHJlZmVyZW5jZUtleV07CkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgJKHJldmlz aW9uIDIyMzEyNCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzNyw2ICs1MzcsOSBAQCBAaW50ZXJm YWNlIFdlYlByZWZlcmVuY2VzIChXZWJQcml2YXRlKQogLSAodm9pZClzZXREYXRhVHJhbnNmZXJJ dGVtc0VuYWJsZWQ6KEJPT0wpZmxhZzsKIC0gKEJPT0wpZGF0YVRyYW5zZmVySXRlbXNFbmFibGVk OwogCistICh2b2lkKXNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZDooQk9PTClmbGFnOwor LSAoQk9PTCljdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQ7CisKIC0gKEJPT0wpY2FjaGVBUElF bmFibGVkOwogLSAodm9pZClzZXRDYWNoZUFQSUVuYWJsZWQ6KEJPT0wpZW5hYmxlZDsKIApJbmRl eDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24g MjIzMTI0KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zMDY2LDYgKzMwNjYsOCBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0No YW5nZWQ6KFdlYlByZWZlcmVuCiAgICAgW1dBS1ZpZXcgX3NldEludGVycG9sYXRpb25RdWFsaXR5 OltwcmVmZXJlbmNlcyBfaW50ZXJwb2xhdGlvblF1YWxpdHldXTsKICNlbmRpZgogCisgICAgc2V0 dGluZ3Muc2V0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKFtwcmVmZXJlbmNlcyBjdXN0b21Q YXN0ZWJvYXJkRGF0YUVuYWJsZWRdKTsKKwogI2lmIEVOQUJMRShMRUdBQ1lfRU5DUllQVEVEX01F RElBKQogICAgIHNldHRpbmdzLnNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoW3ByZWZlcmVu Y2VzIG1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnldKTsKICNlbmRpZgpJbmRleDogVG9vbHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjIzMTYyKQor KysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTct MTAtMTAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxl IGN1c3RvbSBwYXN0ZWJvYXJkIGRhdGEgaW4gRHVtcFJlbmRlclRyZWUgYW5kIFdlYktpdFRlc3RS dW5uZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODE1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIHRoZSBidWcgdGhhdCBMb2NhbFBhc3RlYm9hcmQgd291bGQgZmFpbCB0byBsb2FkIHRoZSBw cm9taXNlIHR5cGUgaWYgZGF0YSBpcyBzZXQgYWZ0ZXIgZGVjbGFyaW5nIHR5cGVzCisgICAgICAg IGJ5IGRlbGF5aW5nIHRoZSBjYWxsIHRvIHByb3ZpZGVEYXRhRm9yVHlwZSB1bnRpbCB3aGVuIGRh dGFGb3JUeXBlIGlzIGNhbGxlZC4KKworICAgICAgICBXaXRob3V0IHRoaXMgZml4LCBmYXN0L2V2 ZW50cy9kcm9wem9uZS0wMDIuaHRtbCB3b3VsZCBzdGFydCBmYWlsaW5nIGFmdGVyIGVuYWJsaW5n IGN1c3RvbSBwYXN0ZWJvYXJkIGRhdGEuCisgICAgICAgIFdpdGggdGhpcyBmaXgsIGZhc3QvZXZl bnRzL2Ryb3B6b25lLTAwNS5odG1sIGFsc28gc3RhcnRzIHBhc3NpbmcuCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChyZXNldFdlYlBy ZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9t YWMvRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkLm1tOgorICAgICAgICAoLVtMb2NhbFBhc3RlYm9h cmQgYWRkVHlwZXM6b3duZXI6XSk6CisgICAgICAgICgtW0xvY2FsUGFzdGVib2FyZCBkYXRhRm9y VHlwZTpdKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoK KyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3Rl bnRWYWx1ZXMpOgorCiAyMDE3LTEwLTEwICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlh LmNvbT4KIAogICAgICAgICBBWDogW0FUS10gQVJJQSBmb3JtIHJvbGUgc2hvdWxkIGJlIG1hcHBl ZCB0byBBVEtfUk9MRV9MQU5ETUFSSzsgbm90IEFUS19ST0xFX0ZPUk0KSW5kZXg6IFRvb2xzL0R1 bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9E dW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0JKHJldmlzaW9uIDIyMzEyNCkKKysr IFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQkod29ya2luZyBjb3B5 KQpAQCAtOTUyLDYgKzk1Miw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0Nv bnNpc3QKICAgICBbcHJlZmVyZW5jZXMgc2V0Q3VzdG9tRWxlbWVudHNFbmFibGVkOllFU107CiAK ICAgICBbcHJlZmVyZW5jZXMgc2V0RGF0YVRyYW5zZmVySXRlbXNFbmFibGVkOllFU107CisgICAg W3ByZWZlcmVuY2VzIHNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZDpZRVNdOwogCiAgICAg W3ByZWZlcmVuY2VzIHNldFdlYkdMMkVuYWJsZWQ6WUVTXTsKICAgICBbcHJlZmVyZW5jZXMgc2V0 V2ViR1BVRW5hYmxlZDpZRVNdOwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBS ZW5kZXJUcmVlUGFzdGVib2FyZC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJl ZS9tYWMvRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkLm1tCShyZXZpc2lvbiAyMjMxMjQpCisrKyBU b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAK IEBpbnRlcmZhY2UgTG9jYWxQYXN0ZWJvYXJkIDogTlNQYXN0ZWJvYXJkIHsKKyAgICBSZXRhaW5Q dHI8aWQ+IF9vd25lcjsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9wYXN0ZWJvYXJkTmFtZTsK ICAgICBOU0ludGVnZXIgX2NoYW5nZUNvdW50OwogCkBAIC0xNDAsMTMgKzE0MSwxMCBAQCBzdGF0 aWMgUmV0YWluUHRyPE5TU3RyaW5nPiB0b1VUSShOU1N0cmluCiAKIC0gKE5TSW50ZWdlcilhZGRU eXBlczooTlNBcnJheSAqKW5ld1R5cGVzIG93bmVyOihpZCluZXdPd25lcgogewotICAgIGZvciAo TlNTdHJpbmcgKnR5cGUgaW4gbmV3VHlwZXMpIHsKKyAgICBfb3duZXIgPSBuZXdPd25lcjsKKyAg ICBmb3IgKE5TU3RyaW5nICp0eXBlIGluIG5ld1R5cGVzKQogICAgICAgICBfdHlwZXMuYWRkKHRv VVRJKHR5cGUpKTsKIAotICAgICAgICBpZiAobmV3T3duZXIgJiYgW25ld093bmVyIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IocGFzdGVib2FyZDpwcm92aWRlRGF0YUZvclR5cGU6KV0pCi0g ICAgICAgICAgICBbbmV3T3duZXIgcGFzdGVib2FyZDpzZWxmIHByb3ZpZGVEYXRhRm9yVHlwZTp0 eXBlXTsKLSAgICB9Ci0KICAgICByZXR1cm4gKytfY2hhbmdlQ291bnQ7CiB9CiAKQEAgLTE5NCw2 ICsxOTIsMTIgQEAgLSAoQk9PTClzZXREYXRhOihOU0RhdGEgKilkYXRhIGZvclR5cGU6KAogCiAt IChOU0RhdGEgKilkYXRhRm9yVHlwZTooTlNTdHJpbmcgKilkYXRhVHlwZQogeworICAgIGlmIChO U0RhdGEgKmRhdGEgPSBfZGF0YS5nZXQodG9VVEkoZGF0YVR5cGUpKS5nZXQoKSkKKyAgICAgICAg cmV0dXJuIGRhdGE7CisKKyAgICBpZiAoX293bmVyICYmIFtfb3duZXIgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihwYXN0ZWJvYXJkOnByb3ZpZGVEYXRhRm9yVHlwZTopXSkKKyAgICAgICAg W19vd25lciBwYXN0ZWJvYXJkOnNlbGYgcHJvdmlkZURhdGFGb3JUeXBlOmRhdGFUeXBlXTsKKwog ICAgIHJldHVybiBfZGF0YS5nZXQodG9VVEkoZGF0YVR5cGUpKS5nZXQoKTsKIH0KIApJbmRleDog VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDIyMzEy NCkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02ODMsNiArNjgzLDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cmVzZXRQcmVm ZXJlbmNlc1RvQwogICAgIFdLUHJlZmVyZW5jZXNTZXRJbnRlcmFjdGl2ZUZvcm1WYWxpZGF0aW9u RW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldERpc3BsYXlD b250ZW50c0VuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIFdLUHJlZmVyZW5jZXNTZXRE YXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOworICAgIFdLUHJlZmVy ZW5jZXNTZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwog CiAgICAgV0tQcmVmZXJlbmNlc1NldE1vY2tTY3JvbGxiYXJzRW5hYmxlZChwcmVmZXJlbmNlcywg b3B0aW9ucy51c2VNb2NrU2Nyb2xsYmFycyk7CiAgICAgV0tQcmVmZXJlbmNlc1NldE5lZWRzU2l0 ZVNwZWNpZmljUXVpcmtzKHByZWZlcmVuY2VzLCBvcHRpb25zLm5lZWRzU2l0ZVNwZWNpZmljUXVp cmtzKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzEyNCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE3LTEwLTEwICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEVuYWJsZSBjdXN0b20gcGFzdGVib2Fy ZCBkYXRhIGluIER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgxNTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvcGFzdGVib2Fy ZC9kYXRhVHJhbnNmZXItc2V0RGF0YS1nZXREYXRhLWV4cGVjdGVkLnR4dDogUmViYXNlbGluZWQu IE9uZSBtb3JlIHRlc3QgY2FzZSBpcyBwYXNzaW5nIG5vdy4KKyAgICAgICAgKiBmYXN0L2V2ZW50 cy9kcm9wem9uZS0wMDIuaHRtbDogRml4ZWQgdGhlIHRlc3QgdG8gYWNjZXB0IGFuIGltYWdlIHNp bmNlIHdlIG5vIGxvbmdlciBkcm9wIFVSTHMgd2hlbiBkcm9wcGluZworICAgICAgICBhbiBpbWFn ZSBhdm9pZCBsZWFraW5nIGxvY2FsIGZpbGUgcGF0aHMuCisgICAgICAgICogcGxhdGZvcm0vbWFj L1Rlc3RFeHBlY3RhdGlvbnM6IEVuYWJsZWQgZHJvcHpvbmUtMDA1Lmh0bWwgc2luY2UgaXQgc3Rh cnRlZCBwYXNzaW5nIGFmdGVyIGZpeGluZyBMb2NhbFBhc3RlYm9hcmQuCisKIDIwMTctMTAtMDkg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDYWxsaW5nIGZpbGVT eXN0ZW1EaXJlY3RvcnlFbnRyeS5nZXREaXJlY3RvcnkoKSB3aXRoIGVtcHR5IHBhdGggc2hvdWxk IG5vdCBmYWlsCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvZGF0YVRyYW5z ZmVyLXNldERhdGEtZ2V0RGF0YS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZWRpdGluZy9wYXN0ZWJvYXJkL2RhdGFUcmFuc2Zlci1zZXREYXRhLWdldERhdGEtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAyMjMxMjQpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9h cmQvZGF0YVRyYW5zZmVyLXNldERhdGEtZ2V0RGF0YS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29w eSkKQEAgLTUsNyArNSw3IEBAIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi UEEKIAogLS0tIFRlc3Qgc2V0L2dldCAnVVJMJzoKIFBBU1MgZ2V0RGF0YVJlc3VsdFR5cGUgaXMg InN0cmluZyIKLUZBSUwgZ2V0RGF0YVJlc3VsdCBzaG91bGQgYmUgaHR0cDovL3Rlc3QuY29tLy4g V2FzIGh0dHA6Ly90ZXN0LmNvbS4KK1BBU1MgZ2V0RGF0YVJlc3VsdCBpcyAiaHR0cDovL3Rlc3Qu Y29tLyIKIC0tLSBUZXN0IHNldC9nZXQgJ1VSTCcgd2l0aCBtdWx0aXBsZSBVUkxzOgogUEFTUyBn ZXREYXRhUmVzdWx0VHlwZSBpcyAic3RyaW5nIgogRkFJTCBnZXREYXRhUmVzdWx0IHNob3VsZCBi ZSBodHRwOi8vdGVzdC5jb20vLiBXYXMgLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv ZHJvcHpvbmUtMDAyLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv ZHJvcHpvbmUtMDAyLmh0bWwJKHJldmlzaW9uIDIyMzEyNCkKKysrIExheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2Ryb3B6b25lLTAwMi5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw3IEBA IHdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpCiAKIGZ1bmN0aW9uIGNoYW5nZURyb3Bab25lKCkK IHsKLSAgICBkcm9wVGFyZ2V0LnNldEF0dHJpYnV0ZSgid2Via2l0ZHJvcHpvbmUiLCAiIFN0Umlu Rzp0RXhUL3BMYUluIHNUcklORzpUZVh0L1VySS1sSXNUICIgKyBkcm9wRWZmZWN0RWxlbS5vcHRp b25zW2Ryb3BFZmZlY3RFbGVtLnNlbGVjdGVkSW5kZXhdLnZhbHVlKTsKKyAgICBkcm9wVGFyZ2V0 LnNldEF0dHJpYnV0ZSgid2Via2l0ZHJvcHpvbmUiLCAiIFN0UmluRzp0RXhUL3BMYUluIHNUcklO RzpUZVh0L1VySS1sSXNUIGZpbGU6aW1hZ2UvcG5nICIgKyBkcm9wRWZmZWN0RWxlbS5vcHRpb25z W2Ryb3BFZmZlY3RFbGVtLnNlbGVjdGVkSW5kZXhdLnZhbHVlKTsKIH0KIAogZnVuY3Rpb24gcHJp bnREcm9wRXZlbnQoZSkKQEAgLTU1LDcgKzU1LDcgQEAgZnVuY3Rpb24gcnVuVGVzdCgpCiAgICAg dmFyIGVuZFkgPSBkcm9wVGFyZ2V0Lm9mZnNldFRvcCArIGRyb3BUYXJnZXQub2Zmc2V0SGVpZ2h0 IC8gMgogICAgIAogICAgIHZhciBudW1FZmZlY3RzID0gZHJvcEVmZmVjdEVsZW0ub3B0aW9ucy5s ZW5ndGg7Ci0gICAgCisKICAgICBmb3IgKHZhciBqID0gMDsgaiA8IG51bUVmZmVjdHM7ICsraikg ewogICAgICAgICBkcm9wRWZmZWN0RWxlbS5vcHRpb25zW2pdLnNlbGVjdGVkID0gdHJ1ZTsKICAg ICAgICAgY2hhbmdlRHJvcFpvbmUoKTsKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9U ZXN0RXhwZWN0YXRpb25zCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9U ZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAyMjMxMjQpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvVGVzdEV4cGVjdGF0aW9ucwkod29ya2luZyBjb3B5KQpAQCAtMjc2LDkgKzI3Niw2IEBA IHdlYmtpdC5vcmcvYi84MTI4OSBjYW52YXMvcGhpbGlwL3Rlc3RzLzIKIAogd2Via2l0Lm9yZy9i LzgxNDEwIHNjcm9sbGJhcnMvc2Nyb2xsYmFyLW1pZGRsZWNsaWNrLW5vcGFzdGUuaHRtbAogCi0j IEhhcyBmYWlsZWQgc2luY2UgaXRzIGludHJvZHVjdGlvbiBpbiByMTA1ODI2Lgotd2Via2l0Lm9y Zy9iLzYxNjMwIGZhc3QvZXZlbnRzL2Ryb3B6b25lLTAwNS5odG1sIFsgRmFpbHVyZSBdCi0KICMg U3BlbGxpbmcgdGVzdHMgdGhhdCBhcmUgZmxha2V5Lgogd2Via2l0Lm9yZy9iLzgyNTU1IGVkaXRp bmcvc3BlbGxpbmcvc3BlbGxjaGVjay1hc3luYy1tdXRhdGlvbi5odG1sIFsgUGFzcyBGYWlsdXJl IF0KIAo=