153652 2016-01-29 09:22:58 -0800 Modern IDB: Fix logging that overwhelms python with strings of excessive length 2016-01-29 11:50:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 153021 1 beidson beidson achristensen aestes alecflett commit-queue jsbell oldest_to_newest 1160133 0 beidson 2016-01-29 09:22:58 -0800 Modern IDB: Fix layout tests that overwhelm python with strings of excessive length This happens only in debug builds, but debug builds are a useful test config! 1160134 1 beidson 2016-01-29 09:23:17 -0800 (In reply to comment #0) > Modern IDB: Fix layout tests that overwhelm python with strings of excessive > length > > This happens only in debug builds, but debug builds are a useful test config! Additionally, only debug builds *with* IndexedDB logging enabled. Again, a useful test config. 1160149 2 beidson 2016-01-29 10:03:58 -0800 Modern IDB: Fix logging that overwhelms python with strings of excessive length 1160150 3 270219 beidson 2016-01-29 10:05:26 -0800 Created attachment 270219 Patch v1 1160151 4 commit-queue 2016-01-29 10:07:18 -0800 Attachment 270219 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBKeyData.cpp:264: Non-label code inside switch statements should be indented. [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1160166 5 270223 beidson 2016-01-29 10:53:10 -0800 Created attachment 270223 Patch v2 - Now with more style 1160198 6 270223 commit-queue 2016-01-29 11:43:17 -0800 Comment on attachment 270223 Patch v2 - Now with more style Rejecting attachment 270223 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 270223, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: k1/TestExpectations Hunk #1 FAILED at 273. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/platform/mac-wk1/TestExpectations.rej patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/Modules/indexeddb/IDBKeyData.cpp patching file Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Tim Horton']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/756317 1160208 7 beidson 2016-01-29 11:50:09 -0800 http://trac.webkit.org/changeset/195832 270219 2016-01-29 10:05:26 -0800 2016-01-29 10:53:10 -0800 Patch v1 patch text/plain 4827 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNzI4YjM2Li45Mzk5YTE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IEZpeCBsb2dnaW5nIHRoYXQgb3ZlcndoZWxtcyBweXRob24gd2l0aCBzdHJpbmdzIG9mIGV4 Y2Vzc2l2ZSBsZW5ndGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTM2NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9uczoKKworMjAxNi0wMS0y OSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgVW5yZXZpZXdl ZCB0ZXN0IGdhcmRlbmluZy4KIAogICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVj dGF0aW9uczogRW5hYmxlIHNvbWUgSW5kZXhlZERCIHRlc3RzIHRoYXQgcGFzcy4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxZDQ4MzNhLi4z YWVlOTQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBl Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRp b25zCkBAIC0yNzMsOSArMjczLDUgQEAgc3RvcmFnZS9pbmRleGVkZGIvdHJhbnNhY3Rpb24tY29v cmRpbmF0aW9uLXdpdGhpbi1kYXRhYmFzZS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRk Yi9kYXRhYmFzZS1vZGQtbmFtZXMuaHRtbCBbIFNraXAgXQogc3RvcmFnZS9pbmRleGVkZGIvb2Rk LXN0cmluZ3MuaHRtbCBbIFNraXAgXQogCi0jIFNRTGl0ZSBiYWNrZW5kIHRlc3RzIHRoYXQgd2Vk Z2UgdGhlIGVudGlyZSB0ZXN0aW5nIGhhcm5lc3MKLWltcG9ydGVkL3czYy9pbmRleGVkZGIva2V5 b3JkZXIuaHRtIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXktdHlwZS1hcnJheS5odG1s IFsgU2tpcCBdCi0KICMjIyBFTkQgT0YgKDMpIEluZGV4ZWREQiBmYWlsdXJlcyB3aXRoIFNRTGl0 ZQogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGQyNDM5ZWUuLjgxZWE4NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNi0wMS0y OSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuIElE QjogRml4IGxvZ2dpbmcgdGhhdCBvdmVyd2hlbG1zIHB5dGhvbiB3aXRoIHN0cmluZ3Mgb2YgZXhj ZXNzaXZlIGxlbmd0aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MzY1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyAoVHdvIHNraXBwZWQgdGVzdHMgbm93IHBhc3MpLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJLZXlEYXRhOjpsb2dnaW5nU3RyaW5nKTogTGltaXQgdGhlIGxlbmd0aCBvZiB0aGUgc3Ry aW5nLgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZURh dGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhOjpsb2dnaW5nU3RyaW5n KTogTGltaXQgdGhlIGxlbmd0aCBvZiB0aGUgc3RyaW5nLgorCiAyMDE2LTAxLTI5ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBJbXBs ZW1lbnQgb3ZlcmxheSBzY3JvbGxiYXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQktleURhdGEuY3BwCmluZGV4IGZkMzY1MTkuLmZjMDA4ZTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwCkBAIC0yNTUsMjMg KzI1NSwyNyBAQCBTdHJpbmcgSURCS2V5RGF0YTo6bG9nZ2luZ1N0cmluZygpIGNvbnN0CiAgICAg aWYgKG1faXNOdWxsKQogICAgICAgICByZXR1cm4gIjxudWxsPiI7CiAKKyAgICBTdHJpbmcgcmVz dWx0OworCiAgICAgc3dpdGNoIChtX3R5cGUpIHsKICAgICBjYXNlIEtleVR5cGU6OkludmFsaWQ6 CiAgICAgICAgIHJldHVybiAiPGludmFsaWQ+IjsKICAgICBjYXNlIEtleVR5cGU6OkFycmF5Ogot ICAgICAgICB7Ci0gICAgICAgICAgICBTdHJpbmdCdWlsZGVyIHJlc3VsdDsKLSAgICAgICAgICAg IHJlc3VsdC5hcHBlbmRMaXRlcmFsKCI8YXJyYXk+IC0geyAiKTsKLSAgICAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbV9hcnJheVZhbHVlLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZChtX2FycmF5VmFsdWVbaV0ubG9nZ2luZ1N0cmluZygpKTsKLSAg ICAgICAgICAgICAgICBpZiAoaSA8IG1fYXJyYXlWYWx1ZS5zaXplKCkgLSAxKQotICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKCIgfSIpOwotICAgICAgICAgICAgcmV0dXJu IHJlc3VsdC50b1N0cmluZygpOworICAgIHsKKyAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVy OworICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjxhcnJheT4gLSB7ICIpOworICAgICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYXJyYXlWYWx1ZS5zaXplKCk7ICsraSkgeworICAg ICAgICAgICAgYnVpbGRlci5hcHBlbmQobV9hcnJheVZhbHVlW2ldLmxvZ2dpbmdTdHJpbmcoKSk7 CisgICAgICAgICAgICBpZiAoaSA8IG1fYXJyYXlWYWx1ZS5zaXplKCkgLSAxKQorICAgICAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKICAgICAgICAgfQorICAgICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIiB9Iik7CisgICAgICAgIHJlc3VsdCA9IGJ1aWxkZXIudG9T dHJpbmcoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogICAgIGNhc2UgS2V5VHlwZTo6U3RyaW5n OgotICAgICAgICByZXR1cm4gIjxzdHJpbmc+IC0gIiArIG1fc3RyaW5nVmFsdWU7CisgICAgICAg IHJlc3VsdCA9ICI8c3RyaW5nPiAtICIgKyBtX3N0cmluZ1ZhbHVlOworICAgICAgICBicmVhazsK ICAgICBjYXNlIEtleVR5cGU6OkRhdGU6CiAgICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgi RGF0ZSBtX3R5cGUgLSAlZiIsIG1fbnVtYmVyVmFsdWUpOwogICAgIGNhc2UgS2V5VHlwZTo6TnVt YmVyOgpAQCAtMjgzLDcgKzI4NywxMyBAQCBTdHJpbmcgSURCS2V5RGF0YTo6bG9nZ2luZ1N0cmlu ZygpIGNvbnN0CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIH0K LSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAgIGlmIChyZXN1bHQubGVuZ3RoKCkgPiAx NTApIHsKKyAgICAgICAgcmVzdWx0LnRydW5jYXRlKDE0Nyk7CisgICAgICAgIHJlc3VsdC5hcHBl bmQoV1RGOjpBU0NJSUxpdGVyYWwoIi4uLiIpKTsKKyAgICB9CisKKyAgICByZXR1cm4gcmVzdWx0 OwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQktleVJhbmdlRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJLZXlSYW5nZURhdGEuY3BwCmluZGV4IDBmNGYyOWYuLmUzNjFjYzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlRGF0YS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2VEYXRhLmNwcApA QCAtMTE2LDcgKzExNiwxMyBAQCBib29sIElEQktleVJhbmdlRGF0YTo6aXNWYWxpZCgpIGNvbnN0 CiAjaWZuZGVmIE5ERUJVRwogU3RyaW5nIElEQktleVJhbmdlRGF0YTo6bG9nZ2luZ1N0cmluZygp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1ha2VTdHJpbmcobG93ZXJPcGVuID8gIiggIiA6ICJbICIs IGxvd2VyS2V5LmxvZ2dpbmdTdHJpbmcoKSwgIiwgIiwgdXBwZXJLZXkubG9nZ2luZ1N0cmluZygp LCB1cHBlck9wZW4gPyAiICkiIDogIiBdIik7CisgICAgYXV0byByZXN1bHQgPSBtYWtlU3RyaW5n KGxvd2VyT3BlbiA/ICIoICIgOiAiWyAiLCBsb3dlcktleS5sb2dnaW5nU3RyaW5nKCksICIsICIs IHVwcGVyS2V5LmxvZ2dpbmdTdHJpbmcoKSwgdXBwZXJPcGVuID8gIiApIiA6ICIgXSIpOworICAg IGlmIChyZXN1bHQubGVuZ3RoKCkgPiA0MDApIHsKKyAgICAgICAgcmVzdWx0LnRydW5jYXRlKDM5 Nyk7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoV1RGOjpBU0NJSUxpdGVyYWwoIi4uLiIpKTsKKyAg ICB9CisKKyAgICByZXR1cm4gcmVzdWx0OwogfQogI2VuZGlmCiAK 270223 2016-01-29 10:53:10 -0800 2016-01-29 11:43:17 -0800 Patch v2 - Now with more style patch text/plain 4848 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNzI4YjM2Li45Mzk5YTE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IEZpeCBsb2dnaW5nIHRoYXQgb3ZlcndoZWxtcyBweXRob24gd2l0aCBzdHJpbmdzIG9mIGV4 Y2Vzc2l2ZSBsZW5ndGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTM2NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9uczoKKworMjAxNi0wMS0y OSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgVW5yZXZpZXdl ZCB0ZXN0IGdhcmRlbmluZy4KIAogICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVj dGF0aW9uczogRW5hYmxlIHNvbWUgSW5kZXhlZERCIHRlc3RzIHRoYXQgcGFzcy4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxZDQ4MzNhLi4z YWVlOTQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBl Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRp b25zCkBAIC0yNzMsOSArMjczLDUgQEAgc3RvcmFnZS9pbmRleGVkZGIvdHJhbnNhY3Rpb24tY29v cmRpbmF0aW9uLXdpdGhpbi1kYXRhYmFzZS5odG1sIFsgU2tpcCBdCiBzdG9yYWdlL2luZGV4ZWRk Yi9kYXRhYmFzZS1vZGQtbmFtZXMuaHRtbCBbIFNraXAgXQogc3RvcmFnZS9pbmRleGVkZGIvb2Rk LXN0cmluZ3MuaHRtbCBbIFNraXAgXQogCi0jIFNRTGl0ZSBiYWNrZW5kIHRlc3RzIHRoYXQgd2Vk Z2UgdGhlIGVudGlyZSB0ZXN0aW5nIGhhcm5lc3MKLWltcG9ydGVkL3czYy9pbmRleGVkZGIva2V5 b3JkZXIuaHRtIFsgU2tpcCBdCi1zdG9yYWdlL2luZGV4ZWRkYi9rZXktdHlwZS1hcnJheS5odG1s IFsgU2tpcCBdCi0KICMjIyBFTkQgT0YgKDMpIEluZGV4ZWREQiBmYWlsdXJlcyB3aXRoIFNRTGl0 ZQogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGQyNDM5ZWUuLjgxZWE4NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNi0wMS0y OSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuIElE QjogRml4IGxvZ2dpbmcgdGhhdCBvdmVyd2hlbG1zIHB5dGhvbiB3aXRoIHN0cmluZ3Mgb2YgZXhj ZXNzaXZlIGxlbmd0aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MzY1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyAoVHdvIHNraXBwZWQgdGVzdHMgbm93IHBhc3MpLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJLZXlEYXRhOjpsb2dnaW5nU3RyaW5nKTogTGltaXQgdGhlIGxlbmd0aCBvZiB0aGUgc3Ry aW5nLgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZURh dGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhOjpsb2dnaW5nU3RyaW5n KTogTGltaXQgdGhlIGxlbmd0aCBvZiB0aGUgc3RyaW5nLgorCiAyMDE2LTAxLTI5ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBJbXBs ZW1lbnQgb3ZlcmxheSBzY3JvbGxiYXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQktleURhdGEuY3BwCmluZGV4IGZkMzY1MTkuLjg5ODJiZWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwCkBAIC0yNTUsMjMg KzI1NSwyNiBAQCBTdHJpbmcgSURCS2V5RGF0YTo6bG9nZ2luZ1N0cmluZygpIGNvbnN0CiAgICAg aWYgKG1faXNOdWxsKQogICAgICAgICByZXR1cm4gIjxudWxsPiI7CiAKKyAgICBTdHJpbmcgcmVz dWx0OworCiAgICAgc3dpdGNoIChtX3R5cGUpIHsKICAgICBjYXNlIEtleVR5cGU6OkludmFsaWQ6 CiAgICAgICAgIHJldHVybiAiPGludmFsaWQ+IjsKLSAgICBjYXNlIEtleVR5cGU6OkFycmF5Ogot ICAgICAgICB7Ci0gICAgICAgICAgICBTdHJpbmdCdWlsZGVyIHJlc3VsdDsKLSAgICAgICAgICAg IHJlc3VsdC5hcHBlbmRMaXRlcmFsKCI8YXJyYXk+IC0geyAiKTsKLSAgICAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbV9hcnJheVZhbHVlLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZChtX2FycmF5VmFsdWVbaV0ubG9nZ2luZ1N0cmluZygpKTsKLSAg ICAgICAgICAgICAgICBpZiAoaSA8IG1fYXJyYXlWYWx1ZS5zaXplKCkgLSAxKQotICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKCIgfSIpOwotICAgICAgICAgICAgcmV0dXJu IHJlc3VsdC50b1N0cmluZygpOworICAgIGNhc2UgS2V5VHlwZTo6QXJyYXk6IHsKKyAgICAgICAg U3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjxh cnJheT4gLSB7ICIpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYXJyYXlWYWx1 ZS5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQobV9hcnJheVZhbHVl W2ldLmxvZ2dpbmdTdHJpbmcoKSk7CisgICAgICAgICAgICBpZiAoaSA8IG1fYXJyYXlWYWx1ZS5z aXplKCkgLSAxKQorICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiLCAiKTsK ICAgICAgICAgfQorICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiB9Iik7CisgICAgICAg IHJlc3VsdCA9IGJ1aWxkZXIudG9TdHJpbmcoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogICAg IGNhc2UgS2V5VHlwZTo6U3RyaW5nOgotICAgICAgICByZXR1cm4gIjxzdHJpbmc+IC0gIiArIG1f c3RyaW5nVmFsdWU7CisgICAgICAgIHJlc3VsdCA9ICI8c3RyaW5nPiAtICIgKyBtX3N0cmluZ1Zh bHVlOworICAgICAgICBicmVhazsKICAgICBjYXNlIEtleVR5cGU6OkRhdGU6CiAgICAgICAgIHJl dHVybiBTdHJpbmc6OmZvcm1hdCgiRGF0ZSBtX3R5cGUgLSAlZiIsIG1fbnVtYmVyVmFsdWUpOwog ICAgIGNhc2UgS2V5VHlwZTo6TnVtYmVyOgpAQCAtMjgzLDcgKzI4NiwxMyBAQCBTdHJpbmcgSURC S2V5RGF0YTo6bG9nZ2luZ1N0cmluZygpIGNvbnN0CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAgIGlm IChyZXN1bHQubGVuZ3RoKCkgPiAxNTApIHsKKyAgICAgICAgcmVzdWx0LnRydW5jYXRlKDE0Nyk7 CisgICAgICAgIHJlc3VsdC5hcHBlbmQoV1RGOjpBU0NJSUxpdGVyYWwoIi4uLiIpKTsKKyAgICB9 CisKKyAgICByZXR1cm4gcmVzdWx0OwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlRGF0YS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZURhdGEuY3BwCmluZGV4IDBmNGYyOWYu LmUzNjFjYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QktleVJhbmdlRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCS2V5UmFuZ2VEYXRhLmNwcApAQCAtMTE2LDcgKzExNiwxMyBAQCBib29sIElEQktleVJhbmdl RGF0YTo6aXNWYWxpZCgpIGNvbnN0CiAjaWZuZGVmIE5ERUJVRwogU3RyaW5nIElEQktleVJhbmdl RGF0YTo6bG9nZ2luZ1N0cmluZygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1ha2VTdHJpbmcobG93 ZXJPcGVuID8gIiggIiA6ICJbICIsIGxvd2VyS2V5LmxvZ2dpbmdTdHJpbmcoKSwgIiwgIiwgdXBw ZXJLZXkubG9nZ2luZ1N0cmluZygpLCB1cHBlck9wZW4gPyAiICkiIDogIiBdIik7CisgICAgYXV0 byByZXN1bHQgPSBtYWtlU3RyaW5nKGxvd2VyT3BlbiA/ICIoICIgOiAiWyAiLCBsb3dlcktleS5s b2dnaW5nU3RyaW5nKCksICIsICIsIHVwcGVyS2V5LmxvZ2dpbmdTdHJpbmcoKSwgdXBwZXJPcGVu ID8gIiApIiA6ICIgXSIpOworICAgIGlmIChyZXN1bHQubGVuZ3RoKCkgPiA0MDApIHsKKyAgICAg ICAgcmVzdWx0LnRydW5jYXRlKDM5Nyk7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoV1RGOjpBU0NJ SUxpdGVyYWwoIi4uLiIpKTsKKyAgICB9CisKKyAgICByZXR1cm4gcmVzdWx0OwogfQogI2VuZGlm CiAK